Changeset cfe472e in sasview for build_tools

Timestamp:

Feb 27, 2015 8:33:57 PM (9 years ago)

Author:

butler

Branches:

master, 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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

3f5d75b

Parents:

906a325 (diff), 4ddf30e4 (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' of ​https://github.com/SasView/sasview.git

Location:

build_tools

Files:

• get_version.py (deleted)
• jenkins_linux_build.sh (modified) (1 diff)
• rpm/create_rpm_spec.py (deleted)
• rpm/sasview.spec.template (deleted)

build_tools/jenkins_linux_build.sh

@@ -24 +24 @@
 
 cd $WORKSPACE/dist
-ln -s sasview*.egg sasview.egg || true
-$EASY_INSTALL -N -d ../sasview-install sasview.egg
+# ln -s sasview*.egg sasview.egg || true
+$EASY_INSTALL -N -d ../sasview-install sasview*.egg