Changeset 1780d8b in sasview

Timestamp:

Apr 8, 2016 1:44:36 AM (9 years ago)

Author:

trnielsen

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:

7b15990, fa4ea80, 70be725

Parents:

dcdca68

Message:

Update OS_X build script to the new code structure

File:

• build_tools/jenkins_osx_build.sh (modified) (1 diff)

build_tools/jenkins_osx_build.sh

@@ -1 +1 @@
 export PATH=$PATH:/usr/local/bin/
+
+
+PYTHON=${PYTHON:-`which python`}
+EASY_INSTALL=${EASY_INSTALL:-`which easy_install`}
+PYLINT=${PYLINT:-`which pylint`}
+
+export PYTHONPATH=$PYTHONPATH:$WORKSPACE/sasview/utils
+export PYTHONPATH=$PYTHONPATH:$WORKSPACE/sasview/sasview-install
+export LC_ALL=en_US.UTF-8
+export LANG=en_US.UTF-8
+
 
 cd $WORKSPACE
 
-export PYTHONPATH=$WORKSPACE/sasview-install:$WORKSPACE/utils:$PYTHONPATH
+# SASMODLES
+cd $WORKSPACE
+cd sasmodels
 
-##########################################################################
-# Use git/svn scripts
+rm -rf build
+rm -rf dist
 
-#  Check dependencies
-cd $WORKSPACE
-if [ ! -d "utils" ]; then
-    mkdir utils
-fi
+$PYTHON setup.py clean
+$PYTHON setup.py build
 
 
-# BUILD_CODE
+# SASMODLES - BUILD DOCS
+cd  doc
+make html
+
 cd $WORKSPACE
-/bin/sh -xe build_tools/jenkins_linux_build.sh
+cd sasmodels
+$PYTHON setup.py bdist_egg
 
 
-# TEST_CODE
+# SASVIEW
 cd $WORKSPACE
-/bin/sh -xe build_tools/jenkins_linux_test.sh
+cd sasview
+rm -rf sasview-install
+mkdir  sasview-install
+rm -rf utils
+mkdir  utils
+rm -rf dist
+rm -rf build
 
 
-# BUILD DOCS
-export LC_ALL=en_US.UTF-8
-export LANG=en_US.UTF-8
+# INSTALL SASMODELS
 cd $WORKSPACE
-python setup.py docs
+cd sasmodels
+cd dist
+$EASY_INSTALL -d $WORKSPACE/sasview/utils sasmodels*.egg
 
 
-# BUILD_egg with new docs
+# BUILD SASVIEW
 cd $WORKSPACE
-python setup.py bdist_egg --skip-build
+cd sasview
+$PYTHON setup.py clean
+$PYTHON setup.py build
+$PYTHON setup.py docs
 
 
-# PYLINT_CODE
-#cd $WORKSPACE
-#/bin/sh -xe build_tools/jenkins_linux_pylint.sh
+# SASVIEW BUILD_egg with new docs
+cd $WORKSPACE
+cd sasview
+python setup.py bdist_egg
+cd dist
+$EASY_INSTALL -d $WORKSPACE/sasview/sasview-install sasview*.egg
+
+# TEST
+cd $WORKSPACE
+cd sasview
+cd test
+$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
 
 
 # BUILD APP
-cd $WORKSPACE/sasview
+cd $WORKSPACE
+cd sasview/sasview
 python setup_mac.py py2app
 
-#cd $WORKSPACE/sasview/dist
-#tar -czf `python -c "import pkg_resources;print '%s.tar.gz SasView-%s.app' % (pkg_resources.get_distribution('sasview').egg_name(),pkg_resources.get_distribution('sasview').version)"`