Switch to xcode10

.travis-ci.sh

@@ -5,8 +5,6 @@
 
 set -e
 
-CPP_LINT_URL="https://raw.githubusercontent.com/google/styleguide/gh-pages/cpplint/cpplint.py";
-
 COVERITY_SCAN_BUILD_URL="https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh"
 
 SPELLINGBLACKLIST=$(cat <<-BLACKLIST
@@ -236,7 +234,8 @@ else
     # Silence all deprecated declarations on Linux due to auto_ptr making the build log too long
     export DISTCHECK_CONFIGURE_FLAGS='--enable-rdm-tests --enable-ja-rule --enable-e133 CPPFLAGS=-Wno-deprecated-declarations'
   else
-    export DISTCHECK_CONFIGURE_FLAGS='--enable-rdm-tests --enable-ja-rule --enable-e133'
+    # Silence all deprecated declarations on OS X due to auto_ptr making the build log too long
+    export DISTCHECK_CONFIGURE_FLAGS='--enable-rdm-tests --enable-ja-rule --enable-e133 CPPFLAGS=-Wno-deprecated-declarations'
   fi
   travis_fold start "autoreconf"
   autoreconf -i;

.travis.yml

@@ -182,7 +182,7 @@ jobs:
           sources:
            - ubuntu-toolchain-r-test
 #    - os: osx
-#      osx_image: xcode9.4
+#      osx_image: xcode12.2
 #      compiler: clang
 #      env:
 #      - TASK='compile'
@@ -198,7 +198,7 @@ jobs:
 #           - libftdi0
 #          update: false
 #    - os: osx
-#      osx_image: xcode9.4
+#      osx_image: xcode12.2
 #      compiler: gcc
 #      env:
 #      - TASK='compile'
@@ -214,7 +214,7 @@ jobs:
 #           - libftdi0
 #          update: false
 #    - os: osx
-#      osx_image: xcode9.4
+#      osx_image: xcode12.2
 #      compiler: clang
 #      env:
 #      - TASK='compile'
@@ -230,7 +230,7 @@ jobs:
 #           - libftdi0
 #          update: false
 #    - os: osx
-#      osx_image: xcode9.4
+#      osx_image: xcode12.2
 #      compiler: gcc
 #      env:
 #      - TASK='compile'
@@ -246,7 +246,7 @@ jobs:
 #           - libftdi0
 #          update: false
     - os: osx
-      osx_image: xcode9.4
+      osx_image: xcode12.2
       compiler: clang
       env:
       - TASK='compile'
@@ -262,7 +262,7 @@ jobs:
            - libftdi # install the latest cppunit, which needs C++11
           update: false
     - os: osx
-      osx_image: xcode9.4
+      osx_image: xcode12.2
       compiler: gcc
       env:
       - TASK='compile'
@@ -319,57 +319,57 @@ jobs:
            - moreutils
   allow_failures:
 #    - os: osx
-#      osx_image: xcode9.4
+#      osx_image: xcode12.2
 #      compiler: clang
 #      env:
 #      - TASK='compile'
 #      - CPPUNIT='1.13'
 #      - LIBFTDI='0'
 #    - os: osx
-#      osx_image: xcode9.4
+#      osx_image: xcode12.2
 #      compiler: clang
 #      env:
 #      - TASK='compile'
 #      - CPPUNIT='1.14'
 #      - LIBFTDI='0'
 #    - os: osx
-#      osx_image: xcode9.4
+#      osx_image: xcode12.2
 #      compiler: gcc
 #      env:
 #      - TASK='compile'
 #      - CPPUNIT='1.13'
 #      - LIBFTDI='0'
 #    - os: osx
-#      osx_image: xcode9.4
+#      osx_image: xcode12.2
 #      compiler: gcc
 #      env:
 #      - TASK='compile'
 #      - CPPUNIT='1.14'
 #      - LIBFTDI='0'
 #    - os: osx
-#      osx_image: xcode9.4
+#      osx_image: xcode12.2
 #      compiler: clang
 #      env:
 #      - TASK='compile'
 #      - CPPUNIT='1.14'
 #      - LIBFTDI='1'
 #    - os: osx
-#      osx_image: xcode9.4
+#      osx_image: xcode12.2
 #      compiler: gcc
 #      env:
 #      - TASK='compile'
 #      - CPPUNIT='1.14'
 #      - LIBFTDI='1'
     - os: osx
-      osx_image: xcode9.4
+      osx_image: xcode12.2
       compiler: clang
       env:
       - TASK='compile'
       - CPPUNIT='1.14'
       - PROTOBUF='latest'
       - LIBFTDI='1'
     - os: osx
-      osx_image: xcode9.4
+      osx_image: xcode12.2
       compiler: gcc
       env:
       - TASK='compile'

common/protocol/Makefile.mk

@@ -2,10 +2,10 @@ EXTRA_DIST += common/protocol/Ola.proto
 
 # The .h files are included elsewhere so we have to put them in BUILT_SOURCES
 built_sources += \
-    common/protocol/Ola.pb.cc \
-    common/protocol/Ola.pb.h \
-    common/protocol/OlaService.pb.h \
-    common/protocol/OlaService.pb.cpp
+    $(top_builddir)/common/protocol/Ola.pb.cc \
+    $(top_builddir)/common/protocol/Ola.pb.h \
+    $(top_builddir)/common/protocol/OlaService.pb.h \
+    $(top_builddir)/common/protocol/OlaService.pb.cpp
 
 # LIBRARIES
 ##################################################

common/rdm/Makefile.mk

@@ -1,6 +1,6 @@
 built_sources += \
-    common/rdm/Pids.pb.cc \
-    common/rdm/Pids.pb.h
+    $(top_builddir)/common/rdm/Pids.pb.cc \
+    $(top_builddir)/common/rdm/Pids.pb.h
 
 # LIBRARIES
 ##################################################

common/rpc/Makefile.mk

@@ -1,10 +1,10 @@
 built_sources += \
-    common/rpc/Rpc.pb.cc \
-    common/rpc/Rpc.pb.h \
-    common/rpc/TestService.pb.cc \
-    common/rpc/TestService.pb.h \
-    common/rpc/TestServiceService.pb.cpp \
-    common/rpc/TestServiceService.pb.h
+    $(top_builddir)/common/rpc/Rpc.pb.cc \
+    $(top_builddir)/common/rpc/Rpc.pb.h \
+    $(top_builddir)/common/rpc/TestService.pb.cc \
+    $(top_builddir)/common/rpc/TestService.pb.h \
+    $(top_builddir)/common/rpc/TestServiceService.pb.cpp \
+    $(top_builddir)/common/rpc/TestServiceService.pb.h
 
 # LIBRARIES
 ##################################################

include/ola/Makefile.mk

@@ -41,7 +41,7 @@ nodist_pkginclude_HEADERS += include/ola/plugin_id.h
 
 # BUILT_SOURCES is our only option here since we can't override the generated
 # automake rules for common/libolacommon.la
-built_sources += include/ola/plugin_id.h
+built_sources += $(top_builddir)/include/ola/plugin_id.h
 
 include/ola/plugin_id.h: include/ola/Makefile.mk include/ola/make_plugin_id.sh common/protocol/Ola.proto
 	mkdir -p $(top_builddir)/include/ola

plugins/artnet/messages/Makefile.mk

@@ -15,8 +15,9 @@ nodist_artnetinclude_HEADERS = \
     plugins/artnet/messages/ArtNetConfigMessages.pb.h
 
 
-built_sources += plugins/artnet/messages/ArtNetConfigMessages.pb.cc \
-                 plugins/artnet/messages/ArtNetConfigMessages.pb.h
+built_sources += \
+    $(top_builddir)/plugins/artnet/messages/ArtNetConfigMessages.pb.cc \
+    $(top_builddir)/plugins/artnet/messages/ArtNetConfigMessages.pb.h
 
 nodist_plugins_artnet_messages_libolaartnetconf_la_SOURCES = \
     plugins/artnet/messages/ArtNetConfigMessages.pb.cc

plugins/e131/messages/Makefile.mk

@@ -14,8 +14,9 @@ e131includedir = $(includedir)/ola/e131
 nodist_e131include_HEADERS = \
     plugins/e131/messages/E131ConfigMessages.pb.h
 
-built_sources += plugins/e131/messages/E131ConfigMessages.pb.cc \
-                 plugins/e131/messages/E131ConfigMessages.pb.h
+built_sources += \
+    $(top_builddir)/plugins/e131/messages/E131ConfigMessages.pb.cc \
+    $(top_builddir)/plugins/e131/messages/E131ConfigMessages.pb.h
 
 nodist_plugins_e131_messages_libolae131conf_la_SOURCES = \
     plugins/e131/messages/E131ConfigMessages.pb.cc

plugins/usbpro/messages/Makefile.mk

@@ -13,8 +13,9 @@ usbproincludedir = $(includedir)/ola/usbpro
 nodist_usbproinclude_HEADERS = \
     plugins/usbpro/messages/UsbProConfigMessages.pb.h
 
-built_sources += plugins/usbpro/messages/UsbProConfigMessages.pb.cc \
-                 plugins/usbpro/messages/UsbProConfigMessages.pb.h
+built_sources += \
+    $(top_builddir)/plugins/usbpro/messages/UsbProConfigMessages.pb.cc \
+    $(top_builddir)/plugins/usbpro/messages/UsbProConfigMessages.pb.h
 
 nodist_plugins_usbpro_messages_libolausbproconf_la_SOURCES = \
     plugins/usbpro/messages/UsbProConfigMessages.pb.cc

protoc/Makefile.mk

@@ -14,7 +14,7 @@ protoc_ola_protoc_plugin_SOURCES = \
     protoc/ServiceGenerator.h \
     protoc/StrUtil.cpp \
     protoc/StrUtil.h \
-	protoc/ola-protoc-generator-plugin.cpp
+    protoc/ola-protoc-generator-plugin.cpp
 protoc_ola_protoc_plugin_CXXFLAGS = $(COMMON_PROTOBUF_CXXFLAGS)
 protoc_ola_protoc_plugin_LDADD = $(libprotobuf_LIBS) -lprotoc
 

python/ola/Makefile.mk

@@ -15,12 +15,12 @@ usbpro_proto = $(usbpro_path)/UsbProConfigMessages.proto
 
 if BUILD_PYTHON_LIBS
 output_files = \
-    python/ola/ArtNetConfigMessages_pb2.py \
-    python/ola/Ola_pb2.py \
-    python/ola/UsbProConfigMessages_pb2.py \
-    python/ola/Pids_pb2.py \
-    python/ola/PidStoreLocation.py \
-    python/ola/Version.py
+    $(top_builddir)/python/ola/ArtNetConfigMessages_pb2.py \
+    $(top_builddir)/python/ola/Ola_pb2.py \
+    $(top_builddir)/python/ola/UsbProConfigMessages_pb2.py \
+    $(top_builddir)/python/ola/Pids_pb2.py \
+    $(top_builddir)/python/ola/PidStoreLocation.py \
+    $(top_builddir)/python/ola/Version.py
 built_sources += $(output_files)
 
 nodist_pkgpython_PYTHON = $(output_files)

python/ola/rpc/Makefile.mk

@@ -8,7 +8,7 @@ nodist_rpcpython_PYTHON = python/ola/rpc/Rpc_pb2.py
 rpcpython_PYTHON = python/ola/rpc/SimpleRpcController.py \
                    python/ola/rpc/StreamRpcChannel.py \
                    python/ola/rpc/__init__.py
-built_sources += python/ola/rpc/Rpc_pb2.py
+built_sources += $(top_builddir)/python/ola/rpc/Rpc_pb2.py
 endif
 
 python/ola/rpc/Rpc_pb2.py: common/rpc/Rpc.proto

tools/ola_trigger/Makefile.mk

@@ -46,9 +46,9 @@ tools_ola_trigger_ola_trigger_LDADD = common/libolacommon.la \
                                       $(LEXLIB)
 
 built_sources += \
-    tools/ola_trigger/lex.yy.cpp \
-    tools/ola_trigger/config.tab.cpp \
-    tools/ola_trigger/config.tab.h
+    $(top_builddir)/tools/ola_trigger/lex.yy.cpp \
+    $(top_builddir)/tools/ola_trigger/config.tab.cpp \
+    $(top_builddir)/tools/ola_trigger/config.tab.h
 
 tools/ola_trigger/lex.yy.cpp: tools/ola_trigger/Makefile.mk tools/ola_trigger/config.lex
 	$(LEX) -o$(top_builddir)/tools/ola_trigger/lex.yy.cpp $(srcdir)/tools/ola_trigger/config.lex