Changeset 9687d58 in sasview for build_tools
- Timestamp:
- Apr 10, 2017 2:01:46 AM (7 years ago)
- 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:
- 6c8fb2c
- Parents:
- 9208346 (diff), c6f3aec (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. - Location:
- build_tools
- Files:
-
- 10 added
- 5 edited
-
jenkins_linux_build.sh (modified) (1 diff)
-
jenkins_osx_build.sh (modified) (1 diff)
-
jenkins_win64_build.bat (modified) (1 diff)
-
jenkins_win_build.bat (modified) (1 diff)
-
requirements.txt (modified) (2 diffs)
-
Vagrant/Ubuntu1404/Build_deb_rpm/CMakeLists.txt (added)
-
Vagrant/Ubuntu1404/Build_deb_rpm/README.md (added)
-
Vagrant/Ubuntu1404/Build_deb_rpm/environment.yml (added)
-
Vagrant/Ubuntu1404/Build_deb_rpm/jenkins_linux_deb_rpm_build.sh (added)
-
Vagrant/Ubuntu1404/README.md (added)
-
Vagrant/Ubuntu1404/Vagrantfile (added)
-
Vagrant/Ubuntu1404/provision/bootstrap.sh (added)
-
Vagrant/Ubuntu1404/provision/developer.sh (added)
-
Vagrant/Ubuntu1404/provision/environment.yml (added)
-
Vagrant/Ubuntu1404/provision/miniconda.sh (added)
Legend:
- Unmodified
- Added
- Removed
-
build_tools/jenkins_linux_build.sh
r8ca1ba1 r128c287 37 37 cd sasmodels 38 38 $PYTHON setup.py bdist_egg 39 39 $PYTHON -m sasmodels.model_test all 40 40 41 41 # SASVIEW -
build_tools/jenkins_osx_build.sh
r8ca1ba1 rb742b8b5 37 37 make html 38 38 39 #SASMODELS - BUILDING AND TESTING 39 40 cd $WORKSPACE 40 41 cd sasmodels 41 42 $PYTHON setup.py bdist_egg 42 43 $PYTHON -m sasmodels.model_test all 43 44 44 45 # SASVIEW -
build_tools/jenkins_win64_build.bat
rc313c88 rec57735 47 47 cd sasmodels 48 48 %PYTHON% setup.py bdist_egg 49 %PYTHON% -m sasmodels.model_test all 49 50 50 51 :: SASMODELS install egg ############################################## -
build_tools/jenkins_win_build.bat
r1e5005e r5dab2bc 48 48 cd sasmodels 49 49 %PYTHON% setup.py bdist_egg 50 50 %PYTHON% -m sasmodels.model_test all 51 51 52 52 :: SASMODELS install egg ############################################## -
build_tools/requirements.txt
r785cc657 r131d94b 7 7 reportlab==2.5 8 8 lxml==2.3 9 PIL==1.1.79 #PIL==1.1.7 10 10 periodictable==1.3.0 11 11 bumps==0.7.5.9 12 # numpy==1.6.113 # scipy==0.10.1 12 numpy>=1.7.1 13 scipy>=0.18.0 14 14 # wx==2.8.12.1 15 15 # matplotlib==1.1.0 … … 17 17 sphinx==1.2.1 18 18 h5py==2.5 19 pyopencl==2015.1
Note: See TracChangeset
for help on using the changeset viewer.
