Changeset 5c44f33 in sasview for build_tools


Ignore:
Timestamp:
Feb 18, 2015 11:13:34 AM (5 years ago)
Author:
smk78
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:
3fd3d5a4
Parents:
3342eb3 (diff), 0037131 (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' of https://github.com/SasView/sasview.git

Location:
build_tools/conda
Files:
12 added
3 edited

Legend:

Unmodified
Added
Removed
  • build_tools/conda/README.md

    r981a1d4 rcf20539  
    4848# $ conda config --set binstar_upload yes 
    4949``` 
     50 
     51# Useful Links 
     52 
     53* http://conda.pydata.org/docs/build.html 
  • build_tools/conda/pyopencl/bld.bat

    r20b238df rd7ee8b9b  
     1xcopy %RECIPE_DIR%\bin %PREFIX%\DLLs /E 
     2xcopy %RECIPE_DIR%\include %PREFIX%\include /E 
     3xcopy %RECIPE_DIR%\lib %PREFIX%\libs /E 
     4 
     5xcopy %RECIPE_DIR%\bin %PREFIX%\Library\bin /E 
     6xcopy %RECIPE_DIR%\include %PREFIX%\Library\include /E 
     7xcopy %RECIPE_DIR%\lib %PREFIX%\Library\lib /E 
     8 
     9::"%PYTHON%" setup.py build -cmingw32 
     10"%PYTHON%" configure.py 
     11if errorlevel 1 exit 1 
     12"%PYTHON%" setup.py build 
     13if errorlevel 1 exit 1 
    114"%PYTHON%" setup.py install 
    215if errorlevel 1 exit 1 
  • build_tools/conda/pyopencl/meta.yaml

    r20b238df r0037131  
    3838  run: 
    3939    - python 
     40    - setuptools 
    4041    - numpy 
    4142    - pytools >=2014.2 
Note: See TracChangeset for help on using the changeset viewer.