Changeset 9f441a9 in sasview

Timestamp:

May 11, 2016 6:18:18 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:

a9946e9

Parents:

c5d1c37

Message:

Update windows build script

File:

• build_tools/jenkins_win_build.bat (modified) (1 diff)

build_tools/jenkins_win_build.bat

@@ -1 @@
-
-set PYTHON=C:\Python27\python
+set PYTHON=c:\python27\python
 set EASY_INSTALL=c:\python27\scripts\easy_install.exe
-set NEXUSDIR="C:\Program Files (x86)\NeXus Data Format\"
-set PATH=C:\Python27;C:\Python27\Scripts;C:\mingw\bin;%PATH%
-set PYLINT=c:\python27\scripts\pylint
+set PATH=c:\python27;c:\mingw\bin;%PATH%
+set PYLINT= C:\Python27\Scripts\pylint
+set INNO="C:\Program Files (x86)\Inno Setup 5\ISCC.exe"
 
 
-cd %WORKSPACE%\sasview
-%PYTHON% check_packages.py
+set PYTHONPATH=%PYTHONPATH%;%WORKSPACE%\sasview\utils
+set PYTHONPATH=%PYTHONPATH%;%WORKSPACE%\sasview\sasview-install
+
+echo %PYTHONPATH%
+echo %WORKSPACE%
 
 
-cd %WORKSPACE%\sasview
-python setup.py build -cmingw32
+:: MAKE DIR FOR EGGS ##################################################
+cd %WORKSPACE%
+cd sasview
+MD sasview-install
+MD utils
 
 
-cd %WORKSPACE%\sasview
-python setup.py docs
+:: SASMODELS build ####################################################
+cd %WORKSPACE%
+cd sasmodels
+%PYTHON% setup.py build
 
 
-cd %WORKSPACE%\sasview
-python setup.py bdist_egg --skip-build
+
+:: SASMODELS doc ######################################################
+cd doc
+make html
 
 
+:: SASMODELS build egg ################################################
+cd %WORKSPACE%
+cd sasmodels
+%PYTHON% setup.py bdist_egg
+
+
+:: SASMODELS install egg ##############################################
+cd %WORKSPACE%
+cd sasmodels
+cd dist
+echo F | xcopy sasmodels-*.egg sasmodels.egg /Y
+%EASY_INSTALL% -d %WORKSPACE%\sasview\utils sasmodels.egg
+
+
+:: NOW BUILD SASVIEW
+
+:: SASVIEW build egg ################################################
+:: Remember to modify C:\Python27\Lib\distutils\distutils.cfg to you compiler
+cd %WORKSPACE%
+cd sasview
+%PYTHON% setup.py build docs bdist_egg
+
+
+:: SASVIEW utest ######################################################
 cd %WORKSPACE%\sasview\test
 %PYTHON% utest_sasview.py
 
 
-cd %WORKSPACE%\sasview
-mkdir sasview-install
-set PYTHONPATH=%WORKSPACE%\sasview\sasview-install;%PYTHONPATH%
+:: SASVIEW INSTALL EGG ################################################
+cd %WORKSPACE%
+cd sasview
+cd dist
+echo F | xcopy sasview-*.egg sasview.egg /Y
+%EASY_INSTALL% -d %WORKSPACE%\sasview\sasview-install sasview.egg
 
 
-cd %WORKSPACE%\sasview
-cd dist
-%EASY_INSTALL% -d ..\sasview-install sasview-3.1.2-py2.7-win32.egg
-
-
-cd %WORKSPACE%\sasview\sasview
-python setup_exe.py py2exe
-python installer_generator.py
-"C:\Program Files (x86)\Inno Setup 5\ISCC.exe" installer.iss 
-
-
+:: SASVIEW INSTALLER ##################################################
+cd %WORKSPACE%
+cd sasview
+cd sasview
+%PYTHON% setup_exe.py py2exe
+%PYTHON% installer_generator.py
+%INNO% installer.iss
 cd Output
 xcopy setupSasView.exe %WORKSPACE%\sasview\dist
 
+
+:: SASVIEW PYLINT #####################################################
 cd %WORKSPACE%\sasview
-%PYLINT% --rcfile "build_tools/pylint.rc" -f parseable sasview-install/sasview*.egg/sas sasview > test/sasview.txt
+%PYLINT% --rcfile "build_tools/pylint.rc" -f parseable sasview-install/sasview.egg/sas sasview > test/sasview.txt
 
 
-cd  %WORKSPACE%
+:: GO BACK ############################################################
+cd %WORKSPACE%