Changeset 3a39c2e in sasview for build_tools

Timestamp:

Feb 13, 2015 3:53:03 AM (10 years ago)

Author:

krzywon

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:

8c9ffde

Parents:

79492222

Message:

Next iteration of the SANS→SAS is complete.

Location:

build_tools

Files:

• get_version.py (modified) (1 diff)
• jenkins_linux_pylint.sh (modified) (1 diff)
• jenkins_linux_test.sh (modified) (1 diff)
• jenkins_rhel6_build.sh (modified) (2 diffs)
• jenkins_win32_build.bat (modified) (1 diff)
• rpm/create_rpm_spec.py (modified) (1 diff)

build_tools/get_version.py

@@ -15 +15 @@
         return __revision__
 
-# Get the version number from the sansview module
+# Get the version number from the sasview module
 # Check to see if we are dealing with a release
 try:
-    import sans.sansview
-    __version__ = sans.sansview.__version__
-    __revision__ = sans.sansview.__build__
+    import sas.sasview
+    __version__ = sas.sasview.__version__
+    __revision__ = sas.sasview.__build__
 except:
-    print "Could not load sansview module"
+    print "Could not load sasview module"
 
 # Get actual revision number if possible

build_tools/jenkins_linux_pylint.sh

@@ -14 +14 @@
 rm -f test/*.txt
 
-$PYLINT --rcfile "$WORKSPACE/build_tools/pylint.rc" -f parseable sasview-install/sasview.egg/sans sansview > test/sansview.txt || exit 0
+$PYLINT --rcfile "$WORKSPACE/build_tools/pylint.rc" -f parseable sasview-install/sasview.egg/sas sasview > test/sasview.txt || exit 0

build_tools/jenkins_linux_test.sh

@@ -12 +12 @@
 export PYTHONPATH=$PYTHONPATH:$WORKSPACE/sasview-install:$WORKSPACE/utils
 
-$PYTHON utest_sansview.py
+$PYTHON utest_sasview.py

build_tools/jenkins_rhel6_build.sh

@@ -54 +54 @@
 #  Run tests
 cd $WORKSPACE/test
-python utest_sansview.py
+python utest_sasview.py
 
 
@@ -66 +66 @@
 cd ${WORKSPACE}/build_tools/rpm
 python create_rpm_spec.py ${SVN_REVISION}
-cp sansview.spec ${HOME}/rpmbuild/SPECS
+cp sasview.spec ${HOME}/rpmbuild/SPECS
 
 cd ${HOME}/rpmbuild/SPECS
-rpmbuild -bb sansview.spec --clean
+rpmbuild -bb sasview.spec --clean
 cp ${HOME}/rpmbuild/RPMS/x86_64/* ${WORKSPACE}/dist
 

build_tools/jenkins_win32_build.bat

@@ -9 +9 @@
 %PYTHON% check_packages.py
 
-set PYTHONPATH=%WORKSPACE%\sansview-install;%PYTHONPATH%
+set PYTHONPATH=%WORKSPACE%\sasview-install;%PYTHONPATH%
 
-RD /S /Q sansview-install
-MD sansview-install
+RD /S /Q sasview-install
+MD sasview-install
 RD /S /Q dist
 RD /S /Q build
 
-rem %PYTHON% -m pip install -t ../sansview-install --no-deps bumps=0.7.5.4
-rem PYTHON% -m pip install -t ../sansview-install --no-deps periodictable=1.3.0
-rem %PYTHON% -m pip install -t ../sansview-install --no-deps pyparsing=1.5.5
+rem %PYTHON% -m pip install -t ../sasview-install --no-deps bumps=0.7.5.4
+rem PYTHON% -m pip install -t ../sasview-install --no-deps periodictable=1.3.0
+rem %PYTHON% -m pip install -t ../sasview-install --no-deps pyparsing=1.5.5
 
 %PYTHON% setup.py build -cmingw32
 %PYTHON% setup.py bdist_egg --skip-build
 cd dist
-%EASY_INSTALL% -d ..\sansview-install sasview*.egg
+%EASY_INSTALL% -d ..\sasview-install sasview*.egg
 
 cd %WORKSPACE%\test
-%PYTHON% utest_sansview.py
+%PYTHON% utest_sasview.py

build_tools/rpm/create_rpm_spec.py

@@ -29 +29 @@
     return newline
 
-input=open("sansview.spec.template",'r')
-output=open("sansview.spec",'w')
+input=open("sasview.spec.template",'r')
+output=open("sasview.spec",'w')
 
 buf = input.read()