Changeset 706bb4e in sasview for build_tools


Ignore:
Timestamp:
Sep 18, 2017 10:20:29 AM (7 years ago)
Author:
Paul Kienzle <pkienzle@…>
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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
60a7820
Parents:
460d3a1 (diff), cfd27dd (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' into ticket-887-reorg

Location:
build_tools
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • build_tools/deploy.bat

    rb61796f r2f6d340  
    33 
    44rem Copy new installer to the temp directory on the test server 
    5 pscp -scp -v -i sasview.ppk C:\jenkins\workspace\SasView_Win7\sasview\sasview\Output\setupSasView.exe sasview@192.168.1.18:AppData\Local\Temp\ 
     5pscp -scp -v -i sasview.ppk C:\jenkins\workspace\SasView_Win7\sasview\installers\Output\setupSasView.exe sasview@192.168.1.18:AppData\Local\Temp\ 
    66rem Execute the test on the remote server 
    77plink -i sasview.ppk -ssh sasview@192.168.1.18 c:\\jenkins\\test_deployment.bat 

  • build_tools/jenkins_linux_build.sh

    r128c287 r2f6d340  
    1414# SET SASVIEW GITHASH 
    1515cd $WORKSPACE 
    16 cd sasview/sasview 
     16cd sasview/src/sas/sasview 
    1717githash=$( git rev-parse HEAD ) 
    1818sed -i.bak s/GIT_COMMIT/$githash/g __init__.py 
    … …  
    8181#cd sasview 
    8282#$PYLINT --rcfile "build_tools/pylint.rc" -f parseable sasview-install/sasview*.egg/sas sasview | tee  test/sasview.txt 
    83  
    84  

  • build_tools/jenkins_osx_build.sh

    rb742b8b5 r2f6d340  
    1717# SET SASVIEW GITHASH 
    1818cd $WORKSPACE 
    19 cd sasview/sasview 
     19cd sasview/src/sas/sasview 
    2020githash=$( git rev-parse HEAD ) 
    2121sed -i.bak s/GIT_COMMIT/$githash/g __init__.py 
    … …  
    8888# BUILD APP 
    8989cd $WORKSPACE 
    90 cd sasview/sasview 
     90cd sasview/installers 
    9191$PYTHON setup_mac.py py2app 
    9292 

  • build_tools/jenkins_win64_build.bat

    rec57735 ra2a1c20  
    11set PYTHON=python.exe 
    22set EASY_INSTALL=easy_install.exe 
    3 set PYLINT= pylint.exe 
     3set PYLINT=pylint.exe 
    44set INNO="C:\util\inno\ISCC.exe" 
    55set GIT_SED=C:\"Program Files"\Git\bin\sed.exe 
    … …  
    1515:: SET SASVIEW GITHASH ################################################ 
    1616cd %WORKSPACE% 
    17 cd sasview\sasview 
     17cd sasview\src\sas\sasview 
    1818git rev-parse HEAD > tmpFile_githash 
    1919SET /p githash= < tmpFile_githash 
    … …  
    8181cd %WORKSPACE% 
    8282cd sasview 
    83 cd sasview 
     83cd installers 
    8484%PYTHON% setup_exe.py py2exe 
    8585%PYTHON% installer_generator.py 

  • build_tools/jenkins_win_build.bat

    r5dab2bc r2f6d340  
    1717:: SET SASVIEW GITHASH ################################################ 
    1818cd %WORKSPACE% 
    19 cd sasview\sasview 
     19cd sasview\src\sas\sasview 
    2020git rev-parse HEAD > tmpFile_githash 
    2121SET /p githash= < tmpFile_githash 
    … …  
    8989cd %WORKSPACE% 
    9090cd sasview 
    91 cd sasview 
     91cd installers 
    9292%PYTHON% setup_exe.py py2exe 
    9393%PYTHON% installer_generator.py 

  • build_tools/travis_build.sh

    r8374dc0 r2f6d340  
    1010 
    1111# SET SASVIEW GITHASH 
    12 cd $WORKSPACE/sasview/sasview 
     12cd $WORKSPACE/sasview/src/sas/sasview 
    1313githash=$( git rev-parse HEAD ) 
    1414sed -i.bak s/GIT_COMMIT/$githash/g __init__.py 
Note: See TracChangeset for help on using the changeset viewer.