Changeset f4a1433 in sasview for build_tools


Ignore:
Timestamp:
Oct 24, 2017 2:44:26 AM (7 years ago)
Author:
Piotr Rozyczko <rozyczko@…>
Branches:
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
Children:
fca1f50, d6b234b
Parents:
16afe01 (diff), 5582b078 (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 ESS_GUI

Location:
build_tools
Files:
10 added
9 edited

Legend:

Unmodified
Added
Removed

  • build_tools/conda/periodictable/meta.yaml

    r55bde35 r36ca21e  
    11package: 
    22  name: periodictable 
    3   version: !!str 1.4.1 
     3  version: !!str 1.5.0 
    44 
    55source: 
    6   fn: periodictable-1.4.1.tar.gz 
    7   url: https://pypi.python.org/packages/source/p/periodictable/periodictable-1.4.1.tar.gz 
    8   md5: 7246b63cc0b6b1be6e86b6616f9e866e 
     6  fn: periodictable-1.5.0.tar.gz 
     7  url: https://pypi.python.org/packages/source/p/periodictable/periodictable-1.5.0.tar.gz 
     8  md5: f7e0d8199b0fe829868d24a0a734398e 
    99#  patches: 
    1010   # List any patch files here 

  • build_tools/deploy.bat

    r661bd79 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 r724af06  
    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 
    … …  
    6363$PYTHON setup.py build docs bdist_egg 
    6464 
     65# CREATE PDF FROM LATEX 
     66#cd $WORKSPACE 
     67#cd sasview/docs/sphinx-docs/build/latex 
     68#pdflatex SasView.tex 
    6569 
    6670# INSTALL SASVIEW 
    … …  
    8185#cd sasview 
    8286#$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_rhel6_build.sh

    r243fbc0 r36ca21e  
    2929"$EASY_INSTALL" -d "$WORKSPACE/utils" pyparsing==1.5.5 
    3030"$EASY_INSTALL" -d "$WORKSPACE/utils" bumps==0.7.5.9 
    31 "$EASY_INSTALL" -d "$WORKSPACE/utils" periodictable==1.3.0 
     31"$EASY_INSTALL" -d "$WORKSPACE/utils" periodictable==1.5.0 
    3232python deps.py 
    3333 
    … …  
    4444# Build SasView ########################################################### 
    4545export PYTHONPATH=$PYTHONPATH:$WORKSPACE/$SASVIEW_INSTALL:$WORKSPACE/utils 
    46 python setup.py bdist_egg  
     46python setup.py bdist_egg 
    4747 
    4848 

  • 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/requirements.txt

    r131d94b r36ca21e  
    88lxml==2.3 
    99#PIL==1.1.7 
    10 periodictable==1.3.0 
     10periodictable==1.5.0 
    1111bumps==0.7.5.9 
    1212numpy>=1.7.1 

  • 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.