Update travis for submodules
@@ -30,26 +30,22 @@ before_install:
- conda install coverage
install:
- - echo $(pwd)
- - echo $TRAVIS_BRANCH
- - cd ../
- - git clone https://github.com/imperialcollegelondon/xbeam
- - cd xbeam
- - export exists=`git show-ref refs/remotes/origin/$TRAVIS_BRANCH`
- - if [ -n "$exists" ]; then export LIBS_BRANCH=$TRAVIS_BRANCH; else export LIBS_BRANCH=master; fi
- - echo $LIBS_BRANCH
- - git checkout $LIBS_BRANCH
+ - git submodule init
+ - git submodule update
+ - cd lib/xbeam
+# - export exists=`git show-ref refs/remotes/origin/$TRAVIS_BRANCH`
+# - if [ -n "$exists" ]; then export LIBS_BRANCH=$TRAVIS_BRANCH; else export LIBS_BRANCH=master; fi
+# - echo $LIBS_BRANCH
+# - git checkout $LIBS_BRANCH
- export LAPACK_LIB_DIR=$(conda info --json | python -c "import sys, json; print(json.load(sys.stdin)['active_prefix'])")/lib
- make install
- - cd ../
- - git clone --branch=$LIBS_BRANCH https://github.com/imperialcollegelondon/uvlm
- - cd uvlm
+ - cd ../UVLM
- export PREFIX=$(conda info --json | python -c "import sys, json; print(json.load(sys.stdin)['active_prefix'])")
- export EIGEN3_INCLUDE_DIR=$PREFIX/include/eigen3
- export MKL_ROOT=$PREFIX
- make
- - cp lib/* ../sharpy/lib
- - cd ../sharpy
+# - cp lib/* ../sharpy/lib
+ - cd ../../sharpy
- git fetch -t
- source bin/sharpy_vars.sh
