summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2016-12-09 15:39:57 +0100
committerWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2016-12-09 15:40:50 +0100
commit3d080e9bd80714c65818feb31cdba131b36b6a3b (patch)
treebf209eac1897371c395fe7ab68e6ba9496c04ca2
parent1954121d82238a97f185dc0cdeaf460f5f4b6a77 (diff)
downloadastra-3d080e9bd80714c65818feb31cdba131b36b6a3b.tar.gz
astra-3d080e9bd80714c65818feb31cdba131b36b6a3b.tar.bz2
astra-3d080e9bd80714c65818feb31cdba131b36b6a3b.tar.xz
astra-3d080e9bd80714c65818feb31cdba131b36b6a3b.zip
Use external boost for conda/win-64
This enables py27 conda packages for win-64.
-rw-r--r--python/conda/bld.bat14
-rw-r--r--python/conda/libastra/bld.bat14
-rw-r--r--python/conda/libastra/meta.yaml1
-rw-r--r--python/conda/meta.yaml1
4 files changed, 13 insertions, 17 deletions
diff --git a/python/conda/bld.bat b/python/conda/bld.bat
index 9da8cd4..15777ce 100644
--- a/python/conda/bld.bat
+++ b/python/conda/bld.bat
@@ -1,27 +1,25 @@
@echo off
-set R=%SRC_DIR%%
+set R=%SRC_DIR%
set B_VC=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64
call "%B_VC%\vcvars64.bat"
-cd /D %R%
+set B_BV=1_62
+set B_BOOST=D:\wjp\boost_%B_BV%_0
-set B_BV=1_61
+cd /D "%B_BOOST%\lib64-msvc-14.0"
mkdir "%R%\lib\x64"
mkdir "%R%\bin\x64\Release_CUDA"
-cd /D %CONDA_PREFIX%\Library\lib
-
-
copy boost_unit_test_framework-vc140-mt-%B_BV%.lib %R%\lib\x64
copy libboost_chrono-vc140-mt-%B_BV%.lib %R%\lib\x64
copy libboost_date_time-vc140-mt-%B_BV%.lib %R%\lib\x64
copy libboost_system-vc140-mt-%B_BV%.lib %R%\lib\x64
copy libboost_thread-vc140-mt-%B_BV%.lib %R%\lib\x64
-cd /D %CONDA_PREFIX%\Library\include
+cd %B_BOOST%
xcopy /i /e /q boost "%R%\lib\include\boost"
@@ -31,5 +29,5 @@ cd python
set VS90COMNTOOLS=%VS140COMNTOOLS%
set CL=/DASTRA_CUDA /DASTRA_PYTHON "/I%R%\include" "/I%R%\lib\include" "/I%CUDA_PATH%\include"
-copy %CONDA_PREFIX%\Library\lib\AstraCuda64.lib astra.lib
+copy "%CONDA_PREFIX%\Library\lib\AstraCuda64.lib" astra.lib
python builder.py build_ext --compiler=msvc install
diff --git a/python/conda/libastra/bld.bat b/python/conda/libastra/bld.bat
index bb7329a..29b894a 100644
--- a/python/conda/libastra/bld.bat
+++ b/python/conda/libastra/bld.bat
@@ -1,25 +1,25 @@
@echo off
-set B_VC=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64
+set R=%SRC_DIR%
+set B_VC=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64
call "%B_VC%\vcvars64.bat"
-set R=%SRC_DIR%
-set B_BV=1_61
+set B_BV=1_62
+set B_BOOST=D:\wjp\boost_%B_BV%_0
+
+cd /D "%B_BOOST%\lib64-msvc-14.0"
mkdir "%R%\lib\x64"
mkdir "%R%\bin\x64\Release_CUDA"
-cd /D %CONDA_PREFIX%\Library\lib
-
-
copy boost_unit_test_framework-vc140-mt-%B_BV%.lib %R%\lib\x64
copy libboost_chrono-vc140-mt-%B_BV%.lib %R%\lib\x64
copy libboost_date_time-vc140-mt-%B_BV%.lib %R%\lib\x64
copy libboost_system-vc140-mt-%B_BV%.lib %R%\lib\x64
copy libboost_thread-vc140-mt-%B_BV%.lib %R%\lib\x64
-cd /D %CONDA_PREFIX%\Library\include
+cd %B_BOOST%
xcopy /i /e /q boost "%R%\lib\include\boost"
diff --git a/python/conda/libastra/meta.yaml b/python/conda/libastra/meta.yaml
index 007cba9..c05a466 100644
--- a/python/conda/libastra/meta.yaml
+++ b/python/conda/libastra/meta.yaml
@@ -15,7 +15,6 @@ build:
requirements:
build:
- - boost ==1.61 # [win]
- vs2015_runtime # [win]
run:
diff --git a/python/conda/meta.yaml b/python/conda/meta.yaml
index 8194d04..942397e 100644
--- a/python/conda/meta.yaml
+++ b/python/conda/meta.yaml
@@ -23,7 +23,6 @@ test:
requirements:
build:
- python
- - boost ==1.61 # [win]
- cython >=0.13
- nomkl # [not win]
- numpy