fix up my windows conda build setup

PDAL · Mar 31, 2019 · 239480e · 239480e
1 parent 519c923
commit 239480e
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 29 deletions.
diff --git a/scripts/conda/win64-setup.bat b/scripts/conda/win64-setup.bat
@@ -0,0 +1,46 @@
+set CONDA_ENVIRO=pdal-build
+
+call conda config --set always_yes yes
+IF ERRORLEVEL 1 GOTO CLEANUP
+
+call conda remove --name %CONDA_ENVIRO% -y --all
+IF ERRORLEVEL 1 GOTO CLEANUP
+
+call conda create --name %CONDA_ENVIRO% -y
+IF ERRORLEVEL 1 GOTO CLEANUP
+
+call conda activate %CONDA_ENVIRO%
+IF ERRORLEVEL 1 GOTO CLEANUP
+
+call conda config --add channels conda-forge
+IF ERRORLEVEL 1 GOTO CLEANUP
+
+call conda install 	geotiff ^
+					laszip ^
+					nitro ^
+					curl ^
+					gdal ^
+					pcl ^
+					cmake ^
+					eigen ^
+					ninja ^
+					zstd ^
+					numpy ^
+					xz ^
+					libxml2 ^
+					laz-perf ^
+					qhull ^
+					sqlite ^
+					hdf5 ^
+					tiledb
+
+REM IF ERRORLEVEL 1 GOTO CLEANUP
+
+
+
+
+:CLEANUP
+call conda deactivate
+popd
+exit /b
+
diff --git a/scripts/conda/win64.sh → scripts/conda/win64.bat b/scripts/conda/win64.sh → scripts/conda/win64.bat
@@ -4,28 +4,6 @@ del /s /q  %CONDA_ENVIRO%
 mkdir %CONDA_ENVIRO%
 pushd %CONDA_ENVIRO%
 
-set GDAL_VERSION=2.2.4
-set NUMPY_VERSION=1.15.3
-
-call conda config --set always_yes yes
-IF ERRORLEVEL 1 GOTO CLEANUP
-
-call conda remove --name %CONDA_ENVIRO% -y --all
-IF ERRORLEVEL 1 GOTO CLEANUP
-
-call conda create --name %CONDA_ENVIRO% -y
-IF ERRORLEVEL 1 GOTO CLEANUP
-
-call %CONDA_PREFIX%\\Scripts\activate.bat %CONDA_ENVIRO%
-IF ERRORLEVEL 1 GOTO CLEANUP
-
-call conda config --add channels conda-forge
-IF ERRORLEVEL 1 GOTO CLEANUP
-
-call conda install geotiff laszip nitro curl gdal=%GDAL_VERSION% pcl cmake eigen ninja libgdal=%GDAL_VERSION% zstd numpy=%NUMPY_VERSION% xz libxml2 laz-perf qhull sqlite hdf5 oracle-instantclient numpy-base=%NUMPY_VERSION% tiledb
-
-IF ERRORLEVEL 1 GOTO CLEANUP
-
 REM set GENERATOR="Visual Studio 14 2015 Win64"
 REM set GENERATOR="NMake Makefiles"
 set GENERATOR="Ninja"
@@ -39,7 +17,7 @@ cmake -G %GENERATOR% ^
       -DBUILD_PLUGIN_PCL=ON ^
       -DBUILD_PLUGIN_PYTHON=ON ^
       -DBUILD_PLUGIN_PGPOINTCLOUD=ON ^
-      -DBUILD_PLUGIN_OCI=ON ^
+      -DBUILD_PLUGIN_OCI=OFF ^
       -DBUILD_PLUGIN_I3S=ON ^
       -DBUILD_PLUGIN_SQLITE=ON ^
       -DBUILD_PLUGIN_ICEBRIDGE=ON ^
@@ -56,10 +34,4 @@ cmake -G %GENERATOR% ^
       .. --debug-trycompile
 
 call ninja
-IF ERRORLEVEL 1 GOTO CLEANUP
-
-:CLEANUP
-call conda deactivate
-popd
-exit /b