Changeset aff7904 in sasview for build_tools/jenkins_osx_build.sh

Timestamp:

Apr 28, 2016 7:38:05 AM (8 years ago)

Author:

wojciech

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:

3371d81

Parents:

5881b17 (diff), 259aaa0 (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:

Conflicts fixed, merged with master

File:

• build_tools/jenkins_osx_build.sh (modified) (2 diffs)

build_tools/jenkins_osx_build.sh

@@ -55 +55 @@
 cd sasview
 $PYTHON setup.py clean
-$PYTHON setup.py build
-#$PYTHON setup.py docs
+$PYTHON setup.py build docs bdist_egg
 
 
-# SASVIEW BUILD_egg with new docs
+# INSTALL SASVIEW
 cd $WORKSPACE
 cd sasview
-$PYTHON setup.py docs bdist_egg
 cd dist
 $EASY_INSTALL -d $WORKSPACE/sasview/sasview-install sasview*.egg
+
 
 # TEST
@@ -72 +71 @@
 #$PYTHON utest_sasview.py
 
-## PYLINT
-#cd $WORKSPACE
-#cd sasview
-#$PYLINT --rcfile "build_tools/pylint.rc" -f parseable sasview-install/sasview*.egg/sas sasview | tee  test/sasview.txt
-
+# PYLINT
+cd $WORKSPACE
+cd sasview
+$PYLINT --rcfile "build_tools/pylint.rc" -f parseable sasview-install/sasview*.egg/sas sasview | tee  test/sasview.txt
 
 # BUILD APP
-#cd $WORKSPACE
-#cd sasview/sasview
-#$PYTHON setup_mac.py py2app
+cd $WORKSPACE
+cd sasview/sasview
+$PYTHON setup_mac.py py2app