Changeset c416a17 in sasview for build_tools

Timestamp:

May 26, 2017 7:41:44 AM (8 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

c1e380e

Parents:

6964d44 (diff), 7132e49 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into ESS_GUI

Location:

build_tools

Files:

• travis_build.sh (modified) (2 diffs)
• Vagrant/Ubuntu1404/Build_deb_rpm/CMakeLists.txt (added)
• Vagrant/Ubuntu1404/Build_deb_rpm/README.md (added)
• Vagrant/Ubuntu1404/Build_deb_rpm/environment.yml (added)
• Vagrant/Ubuntu1404/Build_deb_rpm/jenkins_linux_deb_rpm_build.sh (added)
• Vagrant/Ubuntu1404/README.md (added)
• Vagrant/Ubuntu1404/Vagrantfile (added)
• Vagrant/Ubuntu1404/provision/bootstrap.sh (added)
• Vagrant/Ubuntu1404/provision/developer.sh (added)
• Vagrant/Ubuntu1404/provision/environment.yml (added)
• Vagrant/Ubuntu1404/provision/miniconda.sh (added)

build_tools/travis_build.sh

@@ -1 @@
-# Simplified build for Travic CI
+# Simplified build for Travis CI
 # No documentation is built
 export PATH=$PATH:/usr/local/bin/
@@ -38 +38 @@
 cd $WORKSPACE/sasview
 $PYTHON setup.py clean
-$PYTHON setup.py build docs bdist_egg
+# $PYTHON setup.py build docs bdist_egg
+$PYTHON setup.py bdist_egg
 
 # INSTALL SASVIEW