Rearranging scripts

2019-01-08 21:30:34 -05:00 · 2019-01-08 21:30:34 -05:00 · 5f829b2767
parent d561ed6b79
commit 5f829b2767
5 changed files with 6 additions and 4 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -10,9 +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: 
-    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then bash travis-ci/build_macos.sh; fi
-    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then bash travis-ci/build_linux.sh; fi
+    - bash travis-ci/build_common.sh
 cache:
    directories:
     - /home/travis/build/wxWidgets/staticlib
--- a/travis-ci/build_linux.sh
+++ b/travis-ci/build_linux.sh
@ -1 +0,0 @@
-exec $HOME/build/cjcliffe/CubicSDR/travis-ci/build_common.sh
--- a/travis-ci/build_macos.sh
+++ b/travis-ci/build_macos.sh
@ -1 +0,0 @@
-exec $HOME/build/cjcliffe/CubicSDR/travis-ci/build_common.sh
--- a/travis-ci/prep_linux.sh
+++ b/travis-ci/prep_linux.sh
@ -0,0 +1 @@
+echo "Linux specific stuff goes here"
--- a/travis-ci/prep_macos.sh
+++ b/travis-ci/prep_macos.sh
@ -0,0 +1 @@
+echo "MacOS-specific stuff goes here"
				`@ -1 +0,0 @@`
				`exec $HOME/build/cjcliffe/CubicSDR/travis-ci/build_common.sh`