separate build scripts and add platform logic

.travis.yml

@@ -10,11 +10,11 @@ addons:
       - libgtk-3-dev
       - freeglut3 
       - freeglut3-dev
-before_install:
-    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then bash travis-ci/prep_macos.sh; fi
-    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then bash travis-ci/prep_linux.sh; fi
 script: 
-    - bash travis-ci/build_common.sh
+    - bash travis-ci/build_liquiddsp.sh
+    - bash travis-ci/build_soapysdr.sh
+    - bash travis-ci/build_wxwidgets.sh
+    - bash travis-ci/build_cubicsdr.sh
 cache:
     directories:
      - /home/travis/build/wxWidgets/staticlib

travis-ci/build_cubicsdr.sh

@@ -0,0 +1,7 @@
+# CubicSDR
+cd $HOME/build
+mkdir cjcliffe/CubicSDR-build
+cd cjcliffe/CubicSDR-build
+cmake ../CubicSDR -DCMAKE_BUILD_TYPE=Release -DwxWidgets_CONFIG_EXECUTABLE=$HOME/build/wxWidgets/staticlib/bin/wx-config
+make -j2
+

travis-ci/build_liquiddsp.sh

@@ -0,0 +1,16 @@
+# Liquid-DSP
+cd $HOME/build
+
+mkdir jgaeddert/
+cd jgaeddert/
+git clone https://github.com/jgaeddert/liquid-dsp.git
+
+cd liquid-dsp/
+./bootstrap.sh
+
+echo "Configuring liquid-dsp.."
+./configure > /dev/null
+
+echo "Building liquid-dsp.."
+make -j2 > /dev/null
+sudo make install

travis-ci/build_soapysdr.sh

@@ -0,0 +1,16 @@
+# Soapy SDR
+cd $HOME/build
+
+mkdir pothosware/
+cd pothosware/
+git clone https://github.com/pothosware/SoapySDR.git
+
+mkdir SoapySDR-build
+cd SoapySDR-build
+
+cmake ../SoapySDR -DCMAKE_BUILD_TYPE=Release
+
+echo "Building SoapySDR.."
+make -j2 > /dev/null
+
+sudo make install

travis-ci/build_wxwidgets.sh

@@ -1,50 +1,26 @@
-# Liquid-DSP
-cd $HOME/build
-mkdir jgaeddert/
-cd jgaeddert/
-git clone https://github.com/jgaeddert/liquid-dsp.git
-cd liquid-dsp/
-./bootstrap.sh
-echo "Configuring liquid-dsp.."
-./configure > /dev/null
-echo "Building liquid-dsp.."
-make -j2 > /dev/null
-sudo make install
-
-# Soapy SDR
-cd $HOME/build
-mkdir pothosware/
-cd pothosware/
-git clone https://github.com/pothosware/SoapySDR.git
-mkdir SoapySDR-build
-cd SoapySDR-build
-cmake ../SoapySDR -DCMAKE_BUILD_TYPE=Release
-echo "Building SoapySDR.."
-make -j2 > /dev/null
-sudo make install
-
 # wxWidgets
 if [ ! -f "$HOME/build/wxWidgets/staticlib/bin/wx-config" ]; then
+
 echo "wxWidgets cache not found; building."
 cd $HOME/build
 mkdir -p $HOME/build/wxWidgets/staticlib
 cd wxWidgets
 wget https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.2/wxWidgets-3.1.2.tar.bz2
+
 echo "Unpacking wxWidgets.."
 tar -xvjf wxWidgets-3.1.2.tar.bz2 > /dev/null
 cd wxWidgets-3.1.2/
 ./autogen.sh 
+
+- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then 
 ./configure --with-opengl --disable-shared --enable-monolithic --with-libjpeg --with-libtiff --with-libpng --with-zlib --disable-sdltest --enable-unicode --enable-display --enable-propgrid --disable-webkit --disable-webview --disable-webviewwebkit --prefix=`echo $HOME/build/wxWidgets/staticlib` CXXFLAGS="-std=c++0x"
+fi
+
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+./configure --with-opengl --disable-shared --enable-monolithic --with-libjpeg --with-libtiff --with-libpng --with-zlib --with-mac --disable-sdltest --enable-unicode --enable-display --enable-propgrid --disable-webkit --disable-webview --disable-webviewwebkit --with-macosx-version-min=10.9  --prefix=`echo $HOME/build/wxWidgets/staticlib` CXXFLAGS="-std=c++0x" --with-libiconv=/usr
+
 echo "Building wxWidgets.."
 make -j2
 make install
-fi
-
-
-# CubicSDR
-cd $HOME/build
-mkdir cjcliffe/CubicSDR-build
-cd cjcliffe/CubicSDR-build
-cmake ../CubicSDR -DCMAKE_BUILD_TYPE=Release -DwxWidgets_CONFIG_EXECUTABLE=$HOME/build/wxWidgets/staticlib/bin/wx-config
-make -j2
 
+fi

travis-ci/prep_linux.sh

@@ -1 +0,0 @@
-echo "Linux specific stuff goes here"

travis-ci/prep_macos.sh

@@ -1 +0,0 @@
-echo "MacOS-specific stuff goes here"