OSX build trial

esa · Sep 14, 2019 · 50444fa · 50444fa
1 parent afe051a
commit 50444fa
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 33 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,22 +9,22 @@ env:
 
 matrix:
   include:
-    - env: PAGMO_PLUGINS_NONFREE_BUILD="manylinux64Py37" DOCKER_IMAGE="pagmo2/manylinux1_x86_64_with_deps"
-      sudo: required
-      services:
-      - docker
-    - env: PAGMO_PLUGINS_NONFREE_BUILD="manylinux64Py36" DOCKER_IMAGE="pagmo2/manylinux1_x86_64_with_deps"
-      sudo: required
-      services:
-      - docker
-    - env: PAGMO_PLUGINS_NONFREE_BUILD="manylinux64Py27" DOCKER_IMAGE="pagmo2/manylinux1_x86_64_with_deps"
-      sudo: required
-      services:
-      - docker
-    - env: PAGMO_PLUGINS_NONFREE_BUILD="manylinux64Py27mu" DOCKER_IMAGE="pagmo2/manylinux1_x86_64_with_deps"
-      sudo: required
-      services:
-      - docker
+#    - env: PAGMO_PLUGINS_NONFREE_BUILD="manylinux64Py37" DOCKER_IMAGE="pagmo2/manylinux1_x86_64_with_deps"
+#      sudo: required
+#      services:
+#      - docker
+#    - env: PAGMO_PLUGINS_NONFREE_BUILD="manylinux64Py36" DOCKER_IMAGE="pagmo2/manylinux1_x86_64_with_deps"
+#      sudo: required
+#      services:
+#      - docker
+#    - env: PAGMO_PLUGINS_NONFREE_BUILD="manylinux64Py27" DOCKER_IMAGE="pagmo2/manylinux1_x86_64_with_deps"
+#      sudo: required
+#      services:
+#      - docker
+#    - env: PAGMO_PLUGINS_NONFREE_BUILD="manylinux64Py27mu" DOCKER_IMAGE="pagmo2/manylinux1_x86_64_with_deps"
+#      sudo: required
+#      services:
+#      - docker
 # - env: PAGMO_PLUGINS_NONFREE_BUILD="DebugGCC"
 #   dist: bionic
 #   compiler: gcc
@@ -90,18 +90,14 @@ matrix:
 #      apt:
 #        sources:
 #        - ubuntu-toolchain-r-test
-  #- env: PAGMO_PLUGINS_NONFREE_BUILD="OSXDebug"
-  #  os: osx
-  #  osx_image: xcode6.4
-  #- env: PAGMO_PLUGINS_NONFREE_BUILD="OSXRelease"
-  #  os: osx
-  #  osx_image: xcode6.4
-  #- env: PAGMO_BUILD="OSXPython36"
-  #  os: osx
-  #  osx_image: xcode6.4
-  #- env: PAGMO_BUILD="OSXPython27"
-  #  os: osx
-  #  osx_image: xcode6.4
+  - env: PAGMO_PLUGINS_NONFREE_BUILD="OSXDebug"
+    os: osx
+  - env: PAGMO_PLUGINS_NONFREE_BUILD="OSXRelease"
+    os: osx
+  - env: PAGMO_BUILD="OSXPython36"
+    os: osx
+  - env: PAGMO_BUILD="OSXPython27"
+    os: osx
 script:
 - mkdir build
 - cd build

diff --git a/tools/install_travis.sh b/tools/install_travis.sh
@@ -125,15 +125,15 @@ elif [[ "${PAGMO_PLUGINS_NONFREE_BUILD}" == Python* ]]; then
 elif [[ "${PAGMO_PLUGINS_NONFREE_BUILD}" == OSXPython* ]]; then
     export CXX=clang++
     export CC=clang
+    # Install pagmo_plugins_nonfree
+    cmake -DCMAKE_INSTALL_PREFIX=$deps_dir -DCMAKE_PREFIX_PATH=$deps_dir -DBoost_NO_BOOST_CMAKE=ON -DCMAKE_BUILD_TYPE=Release -DPPNF_BUILD_TESTS=no -DPPNF_BUILD_CPP=yes -DPPNF_BUILD_PYTHON=no ../;
+    make install VERBOSE=1;
     # Install pygmo_plugins_nonfree.
-    cmake -DCMAKE_INSTALL_PREFIX=$deps_dir -DCMAKE_PREFIX_PATH=$deps_dir -DCMAKE_BUILD_TYPE=Debug -DPPNF_BUILD_PYTHON=yes ../;
+    cmake -DCMAKE_INSTALL_PREFIX=$deps_dir -DCMAKE_PREFIX_PATH=$deps_dir -DBoost_NO_BOOST_CMAKE=ON -DCMAKE_BUILD_TYPE=Release -DPPNF_BUILD_TESTS=no -DPPNF_BUILD_CPP=no -DPPNF_BUILD_PYTHON=yes ../;
     make install VERBOSE=1;
-    ipcluster start --daemonize=True;
-    # Give some time for the cluster to start up.
-    sleep 20;
     # Move out of the build dir.
     cd ../tools
-    python -c "import pygmo_plugins_nonfree as pg7; pg7.test.run_test_suite(1)";
+    python -c "import pygmo_plugins_nonfree as ppnf; ppnf.test.run_test_suite(1)";
 elif [[ "${PAGMO_PLUGINS_NONFREE_BUILD}" == manylinux* ]]; then
     cd ..;
     docker pull ${DOCKER_IMAGE};