Merge pull request #62 from gidden/travis

Travis
cyclus · Apr 23, 2015 · ecfe93e · ecfe93e
2 parents 95a708c + f361a24
commit ecfe93e
Show file tree

Hide file tree

Showing 7 changed files with 90 additions and 23 deletions.
diff --git a/cycamore/build.sh b/cycamore/build.sh
@@ -1,19 +1,38 @@
 #!/bin/bash
 
-mkdir build; cd build;
+mkdir build
+cd build
 export LD_LIBRARY_PATH=$PREFIX/lib/
 export CMAKE_LIBRARY_PATH=$PREFIX/lib/
 export PATH=$PREFIX/bin:$PATH
 export MACOSX_DEPLOYMENT_TARGET=
+
 $PREFIX/bin/cyclus --version
-if [[  `uname` == 'Linux' ]]; then
 
-    cmake ..  -DCMAKE_INSTALL_PREFIX=$PREFIX -DCYCLUS_ROOT_DIR=$PREFIX -DBOOST_ROOT=$PREFIX  -DBOOST_LIBRARYDIR=$PREFIX/lib -DBoost_NO_SYSTEM_PATHS=ON -DCMAKE_BUILD_TYPE=Release -DLAPACK_LIBRARIES=$PREFIX/lib/liblapack.so -DBLAS_LIBRARIES=$PREFIX/lib/libblas.so
+if [[  `uname` == 'Linux' ]]; then
+    cmake ..   \
+	-DCMAKE_INSTALL_PREFIX=$PREFIX  \
+	-DCYCLUS_ROOT_DIR=$PREFIX  \
+	-DHDF5_ROOT=$PREFIX  \
+	-DBOOST_ROOT=$PREFIX   \
+	-DBOOST_LIBRARYDIR=$PREFIX/lib  \
+	-DBoost_NO_SYSTEM_PATHS=ON  \
+	-DCMAKE_BUILD_TYPE=Release  \
+	-DLAPACK_LIBRARIES=$PREFIX/lib/liblapack.so  \
+	-DBLAS_LIBRARIES=$PREFIX/lib/libblas.so
 else
-
-export DYLD_FALLBACK_LIBRARY_PATH=$PREFIX/lib/cyclus:$PREFIX/lib
-cmake ..  -DCMAKE_INSTALL_PREFIX=$PREFIX  -DCYCLUS_ROOT_DIR=$PREFIX -DCOIN_ROOT_DIR=$PREFIX -DBOOST_ROOT=$PREFIX   -DLAPACK_LIBRARIES=$PREFIX/lib/liblapack.dylib -DBLAS_LIBRARIES=$PREFIX/lib/libblas.dylib
+    export DYLD_FALLBACK_LIBRARY_PATH=$PREFIX/lib/cyclus:$PREFIX/lib
+    cmake ..   \
+	-DCMAKE_INSTALL_PREFIX=$PREFIX   \
+	-DCYCLUS_ROOT_DIR=$PREFIX  \
+	-DHDF5_ROOT=$PREFIX  \
+	-DCOIN_ROOT_DIR=$PREFIX  \
+	-DBOOST_ROOT=$PREFIX    \
+	-DLAPACK_LIBRARIES=$PREFIX/lib/liblapack.dylib  \
+	-DBLAS_LIBRARIES=$PREFIX/lib/libblas.dylib
 fi
+
 make 
 make install
+
 echo DONE
diff --git a/cycamore/meta.yaml b/cycamore/meta.yaml
@@ -4,8 +4,9 @@ package:
 
 # Only use fn and url for polyphemus compatability
 source:
-  fn: cycamore-src.tar.gz
-  url: https://github.com/cyclus/cycamore/archive/develop.tar.gz
+  fn: cycamore-src.tar.gz # ["TRAVIS" not in environ] 
+  url: https://github.com/cyclus/cycamore/archive/develop.tar.gz # ["TRAVIS" not in environ]
+  path: ..  # ["TRAVIS" in environ]
 
 requirements:
    build:
@@ -15,6 +16,11 @@ requirements:
    run:
     - cyclus
 
+test:
+  requires:
+    - nose
+    - pytables
+
 build:
   string: nightly
 

diff --git a/cycamore/post-link.sh b/cycamore/post-link.sh
@@ -1,3 +1,6 @@
+
+echo "post-link.sh, PREFIX: $PREFIX"
+
 mv $PREFIX/bin/cycamore_unit_tests $PREFIX/bin/cycamore_unit_tests_base
 echo "
 #!/bin/bash

diff --git a/cycamore/pre-link.sh b/cycamore/pre-link.sh
@@ -1,5 +1,6 @@
 
-echo $PREFIX
+echo "pre-link.sh, PREFIX: $PREFIX"
+
 export LD_LIBRARY_PATH=$PREFIX/lib/:$LD_LIBRARY_PATH
 export CMAKE_LIBRARY_PATH=$PREFIX/lib/:$CMAKE_LIBRARY_PATH
 
diff --git a/cyclus/build.sh b/cyclus/build.sh
@@ -5,20 +5,51 @@ cd build
 export LD_LIBRARY_PATH=$PREFIX/lib/
 export CMAKE_LIBRARY_PATH=$PREFIX/lib/
 export PATH=$PREFIX/bin:$PATH
+
 export MACOSX_DEPLOYMENT_TARGET=
-if [[  `uname` == 'Linux' ]]; then
-    cmake ..  -DCMAKE_INSTALL_PREFIX=$PREFIX -DBOOST_ROOT=$PREFIX  -DBOOST_LIBRARYDIR=$PREFIX/lib -DBoost_NO_SYSTEM_PATHS=ON -DCMAKE_BUILD_TYPE=Release -DLAPACK_LIBRARIES=$PREFIX/lib/liblapack.so -DBLAS_LIBRARIES=$PREFIX/lib/libblas.so
-else
 
+# 
+# Previous iterations have ahd trouble with hdf build vs. link
+# versions. Something like the following has helped in the past.
+#
+#### hack fix for hdf5 issues
+### if [[  `uname` == 'Linux' ]]; then
+###   ln -s $PREFIX/lib/libhdf5.so.9 $PREFIX/lib/libhdf5.so.8
+###   ln -s $PREFIX/lib/libhdf5_hl.so.9 $PREFIX/lib/libhdf5_hl.so.8
+### else
+###   ln -s $PREFIX/lib/libhdf5.9.dylib $PREFIX/lib/libhdf5.8.dylib
+###   ln -s $PREFIX/lib/libhdf5_hl.9.dylib $PREFIX/lib/libhdf5_hl.8.dylib
+### fi
 
-echo $CFLAGS
-echo $LDFLAGS
-export MACOSX_DEPLOYMENT_TARGET=
-export DYLD_LIBRARY_PATH=$PREFIX/lib
-export LDFLAGS="-headerpad_max_install_names -headerpad"
-export CFLAGS="-headerpad_max_install_names -headerpad"
-export CXXFLAGS=
-    cmake ..  -DCMAKE_INSTALL_PREFIX=$PREFIX  -DCOIN_ROOT_DIR=$PREFIX -DBOOST_ROOT=$PREFIX -DCMAKE_BUILD_TYPE=Release  -DLAPACK_LIBRARIES=$PREFIX/lib/liblapack.dylib -DBLAS_LIBRARIES=$PREFIX/lib/libblas.dylib
+if [[  `uname` == 'Linux' ]]; then
+    cmake .. \
+	-DCMAKE_INSTALL_PREFIX=$PREFIX \
+	-DHDF5_ROOT=$PREFIX \
+	-DBOOST_ROOT=$PREFIX \
+	-DBOOST_LIBRARYDIR=$PREFIX/lib \
+	-DBoost_NO_SYSTEM_PATHS=ON \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DLAPACK_LIBRARIES=$PREFIX/lib/liblapack.so \
+	-DBLAS_LIBRARIES=$PREFIX/lib/libblas.so
+else
+    echo $CFLAGS
+    echo $LDFLAGS
+    export MACOSX_DEPLOYMENT_TARGET=
+    export DYLD_LIBRARY_PATH=$PREFIX/lib
+    export LDFLAGS="-headerpad_max_install_names -headerpad"
+    export CFLAGS="-headerpad_max_install_names -headerpad"
+    export CXXFLAGS=
+    cmake .. \
+	-DCMAKE_INSTALL_PREFIX=$PREFIX \
+	-DHDF5_ROOT=$PREFIX \
+	-DCOIN_ROOT_DIR=$PREFIX \
+	-DBOOST_ROOT=$PREFIX \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DLAPACK_LIBRARIES=$PREFIX/lib/liblapack.dylib \
+	-DBLAS_LIBRARIES=$PREFIX/lib/libblas.dylib
 fi
+
 make VERBOSE=1
 make install
+
+cd ..
diff --git a/cyclus/meta.yaml b/cyclus/meta.yaml
@@ -4,8 +4,9 @@ package:
 
 # Only use fn and url for polyphemus compatability
 source:
-  fn: cyclus-src.tar.gz 
-  url: https://github.com/cyclus/cyclus/archive/develop.tar.gz 
+  fn: cyclus-src.tar.gz # ["TRAVIS" not in environ] 
+  url: https://github.com/cyclus/cyclus/archive/develop.tar.gz # ["TRAVIS" not in environ]
+  path: ..  # ["TRAVIS" in environ]
 
 requirements:
    build:
@@ -37,6 +38,11 @@ requirements:
     - gettext # [osx]
     - pkg-config-lite # [osx]
 
+test:
+  requires:
+    - nose
+    - pytables
+
 build:
   string: nightly
 

diff --git a/cyclus/post-link.sh b/cyclus/post-link.sh
@@ -1,4 +1,5 @@
-#/bin/bash
+
+echo "post-link.sh, PREFIX: $PREFIX"
 
 mv $PREFIX/bin/cyclus $PREFIX/bin/cyclus_base
 echo "