Merge pull request #1524 from mapbox/1524-build-render-on-travis

Build mbgl-render on Travis

Makefile

@@ -203,9 +203,10 @@ android-project: android-lib
 render: Makefile/project
 	$(MAKE) -C build/$(HOST) BUILDTYPE=$(BUILDTYPE) mbgl-render
 
-.PHONY: xrender run-xrender
+.PHONY: xrender
+xrender: XCPRETTY := $(shell ./scripts/xcpretty.sh)
 xrender: Xcode/project
-	xcodebuild -project ./build/osx/gyp/osx.xcodeproj -configuration $(BUILDTYPE) -target mbgl-render -jobs $(JOBS)
+	xcodebuild -project ./build/osx/gyp/osx.xcodeproj -configuration $(BUILDTYPE) -target mbgl-render -jobs $(JOBS) $(XCPRETTY)
 
 
 ##### Maintenace operations ####################################################

bin/render.gypi

@@ -34,12 +34,11 @@
         'ldflags': [
           '<@(glfw3_ldflags)',
           '<@(uv_ldflags)',
-          '<@(boost_ldflags)',
-          '-lboost_program_options'
         ],
         'libraries': [
           '<@(glfw3_static_libs)',
           '<@(uv_static_libs)',
+          '<@(boost_program_options_static_libs)'
         ],
       },
 

configure

@@ -46,6 +46,7 @@ case ${MASON_PLATFORM} in
         LIBUV_VERSION=0.10.28
         ZLIB_VERSION=system
         BOOST_VERSION=1.57.0
+        BOOST_PROGRAM_OPTIONS_VERSION=1.57.0
         NUNICODE_VERSION=1.5.1
         LIBZIP_VERSION=0.11.2
         ;;
@@ -104,7 +105,11 @@ CONFIG="# Do not edit. Generated by the configure script.
 if [ ! -z ${BOOST_VERSION} ]; then
     mason install boost ${BOOST_VERSION}
     CONFIG+="    'boost_cflags%': $(quote_flags $(mason cflags boost ${BOOST_VERSION})),"$LN
-    CONFIG+="    'boost_ldflags%': $(quote_flags $(mason ldflags boost ${BOOST_VERSION})),"$LN
+fi
+
+if [ ! -z ${BOOST_PROGRAM_OPTIONS_VERSION} ]; then
+    mason install boost_libprogram_options ${BOOST_PROGRAM_OPTIONS_VERSION}
+    CONFIG+="    'boost_program_options_static_libs%': $(quote_flags $(mason static_libs boost_libprogram_options ${BOOST_VERSION})),"$LN
 fi
 
 if [ ! -z ${OPENSSL_VERSION} ]; then

scripts/linux/run.sh

@@ -43,6 +43,9 @@ git submodule update --init styles
 mapbox_time "compile_program" \
 make linux -j${JOBS} BUILDTYPE=${BUILDTYPE}
 
+mapbox_time "compile_render_binary" \
+make render -j${JOBS} BUILDTYPE=${BUILDTYPE}
+
 mapbox_time "compile_tests" \
 make test -j${JOBS} BUILDTYPE=${BUILDTYPE}
 

scripts/osx/run.sh

@@ -23,5 +23,8 @@ git submodule update --init styles
 mapbox_time "compile_program" \
 make xosx -j${JOBS} BUILDTYPE=${BUILDTYPE}
 
+mapbox_time "compile_render_binary" \
+make xrender -j${JOBS} BUILDTYPE=${BUILDTYPE}
+
 mapbox_time "compile_tests" \
 make xtest -j${JOBS} BUILDTYPE=${BUILDTYPE}