Changeset 3a39c2e in sasview for build_tools


Ignore:
Timestamp:
Feb 13, 2015 1:53:03 AM (9 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:
6 edited

Legend:

Unmodified
Added
Removed
  • build_tools/get_version.py

    r5709051 r3a39c2e  
    1515        return __revision__ 
    1616 
    17 # Get the version number from the sansview module 
     17# Get the version number from the sasview module 
    1818# Check to see if we are dealing with a release 
    1919try: 
    20     import sans.sansview 
    21     __version__ = sans.sansview.__version__ 
    22     __revision__ = sans.sansview.__build__ 
     20    import sas.sasview 
     21    __version__ = sas.sasview.__version__ 
     22    __revision__ = sas.sasview.__build__ 
    2323except: 
    24     print "Could not load sansview module" 
     24    print "Could not load sasview module" 
    2525 
    2626# Get actual revision number if possible 
  • build_tools/jenkins_linux_pylint.sh

    r9939b16 r3a39c2e  
    1414rm -f test/*.txt 
    1515 
    16 $PYLINT --rcfile "$WORKSPACE/build_tools/pylint.rc" -f parseable sasview-install/sasview.egg/sans sansview > test/sansview.txt || exit 0 
     16$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

    r21b7a49 r3a39c2e  
    1212export PYTHONPATH=$PYTHONPATH:$WORKSPACE/sasview-install:$WORKSPACE/utils 
    1313 
    14 $PYTHON utest_sansview.py 
     14$PYTHON utest_sasview.py 
  • build_tools/jenkins_rhel6_build.sh

    rb44da61 r3a39c2e  
    5454#  Run tests 
    5555cd $WORKSPACE/test 
    56 python utest_sansview.py 
     56python utest_sasview.py 
    5757 
    5858 
     
    6666cd ${WORKSPACE}/build_tools/rpm 
    6767python create_rpm_spec.py ${SVN_REVISION} 
    68 cp sansview.spec ${HOME}/rpmbuild/SPECS 
     68cp sasview.spec ${HOME}/rpmbuild/SPECS 
    6969 
    7070cd ${HOME}/rpmbuild/SPECS 
    71 rpmbuild -bb sansview.spec --clean 
     71rpmbuild -bb sasview.spec --clean 
    7272cp ${HOME}/rpmbuild/RPMS/x86_64/* ${WORKSPACE}/dist 
    7373 
  • build_tools/jenkins_win32_build.bat

    rb44da61 r3a39c2e  
    99%PYTHON% check_packages.py 
    1010 
    11 set PYTHONPATH=%WORKSPACE%\sansview-install;%PYTHONPATH% 
     11set PYTHONPATH=%WORKSPACE%\sasview-install;%PYTHONPATH% 
    1212 
    13 RD /S /Q sansview-install 
    14 MD sansview-install 
     13RD /S /Q sasview-install 
     14MD sasview-install 
    1515RD /S /Q dist 
    1616RD /S /Q build 
    1717 
    18 rem %PYTHON% -m pip install -t ../sansview-install --no-deps bumps=0.7.5.4 
    19 rem PYTHON% -m pip install -t ../sansview-install --no-deps periodictable=1.3.0 
    20 rem %PYTHON% -m pip install -t ../sansview-install --no-deps pyparsing=1.5.5 
     18rem %PYTHON% -m pip install -t ../sasview-install --no-deps bumps=0.7.5.4 
     19rem PYTHON% -m pip install -t ../sasview-install --no-deps periodictable=1.3.0 
     20rem %PYTHON% -m pip install -t ../sasview-install --no-deps pyparsing=1.5.5 
    2121 
    2222%PYTHON% setup.py build -cmingw32 
    2323%PYTHON% setup.py bdist_egg --skip-build 
    2424cd dist 
    25 %EASY_INSTALL% -d ..\sansview-install sasview*.egg 
     25%EASY_INSTALL% -d ..\sasview-install sasview*.egg 
    2626 
    2727cd %WORKSPACE%\test 
    28 %PYTHON% utest_sansview.py 
     28%PYTHON% utest_sasview.py 
  • build_tools/rpm/create_rpm_spec.py

    rf6f0c7b r3a39c2e  
    2929    return newline 
    3030 
    31 input=open("sansview.spec.template",'r') 
    32 output=open("sansview.spec",'w') 
     31input=open("sasview.spec.template",'r') 
     32output=open("sasview.spec",'w') 
    3333 
    3434buf = input.read() 
Note: See TracChangeset for help on using the changeset viewer.