Changeset 2cff9db in sasview for build_tools

Timestamp:

Aug 12, 2016 6:38:26 AM (8 years ago)

Author:

lewis

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:

b61bd57, 2f12acc

Parents:

efb482a (diff), b636c0ba (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

File:

• build_tools/jenkins_win64_build.bat (modified) (6 diffs)

build_tools/jenkins_win64_build.bat

@@ -4 +4 @@
 set INNO="C:\util\inno\ISCC.exe"
 set GIT_SED=C:\"Program Files"\Git\bin\sed.exe
-
 set SAS_COMPILER=tinycc
-set WORKSPACE=C:\build
 
 set PYTHONPATH=%WORKSPACE%\sasview\utils
@@ -23 +21 @@
 %GIT_SED% -i.bak "s/GIT_COMMIT/%githash%/g" __init__.py
 
-
-
 :: MAKE DIR FOR EGGS ##################################################
 cd %WORKSPACE%
@@ -30 +26 @@
 MD sasview-install
 MD utils
+
+:: TINYCC build ####################################################
+cd %WORKSPACE%
+cd tinycc
+%PYTHON% setup.py build
+xcopy /S build\lib\* %WORKSPACE%\sasview\utils\
 
 
@@ -37 +39 @@
 %PYTHON% setup.py build
 
-
-
 :: SASMODELS doc ######################################################
 cd doc
 make html
-
 
 :: SASMODELS build egg ################################################
@@ -48 +47 @@
 cd sasmodels
 %PYTHON% setup.py bdist_egg
-
 
 :: SASMODELS install egg ##############################################
@@ -79 +77 @@
 
 
-:: TINYCC build ####################################################
-cd %WORKSPACE%
-cd tinycc
-%PYTHON% setup.py build
-xcopy /S build\lib\* %WORKSPACE%\sasview\utils\
-
 :: SASVIEW INSTALLER ##################################################
 cd %WORKSPACE%