Skip to content

Commit 4ccf161

Browse files
author
Dane Springmeyer
committed
remove depedence on python bindings
1 parent 544fe48 commit 4ccf161

File tree

1 file changed

+0
-44
lines changed

1 file changed

+0
-44
lines changed

build.bat

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -52,21 +52,10 @@ IF %ERRORLEVEL% NEQ 0 GOTO ERROR
5252

5353

5454
:: includes
55-
SET PYTHON_DIR=%ROOTDIR%\tmp-bin\python2-x86-32
56-
if %BOOSTADDRESSMODEL% EQU 64 (
57-
SET PYTHON_DIR=%ROOTDIR%\tmp-bin\python2
58-
)
5955
SET ICU_VERSION=54
6056

6157
IF %FASTBUILD% EQU 1 GOTO DOFASTBUILD
6258

63-
::xcopy /Q /D /Y %PYTHON_INCLUDE_DIR%\*.* %MAPNIK_SDK%\include\python
64-
xcopy /Q /D /Y %PYTHON_DIR%\include\*.* %MAPNIK_SDK%\include\
65-
IF %ERRORLEVEL% NEQ 0 GOTO ERROR
66-
::SET INCLUDE=%MAPNIK_SDK%\include\python;%INCLUDE%
67-
xcopy /Q /D /Y %PYTHON_DIR%\libs\python27.lib %MAPNIK_SDK%\lib\
68-
IF %ERRORLEVEL% NEQ 0 GOTO ERROR
69-
7059
xcopy /q /d %DEPSDIR%\harfbuzz-build\harfbuzz\hb-version.h %MAPNIK_SDK%\include\harfbuzz\ /Y
7160
IF %ERRORLEVEL% NEQ 0 GOTO ERROR
7261
xcopy /q /d %DEPSDIR%\harfbuzz\src\hb.h %MAPNIK_SDK%\include\harfbuzz\ /Y
@@ -407,29 +396,14 @@ IF %ERRORLEVEL% NEQ 0 GOTO ERROR
407396

408397
xcopy /q /d ..\fonts\dejavu-fonts-ttf-2.34\ttf\*ttf %MAPNIK_SDK%\lib\mapnik\fonts\ /Y
409398
IF %ERRORLEVEL% NEQ 0 GOTO ERROR
410-
:: move python binding into local testable location
411-
:: * hack from http://stackoverflow.com/a/14488464/2333354
412-
:: because otherwise xcopy can't tell if its a file or directory and will prompt
413-
xcopy /q /s /d .\build\lib\python2.7\mapnik\_mapnik.pyd ..\bindings\python\mapnik\_mapnik.pyd* /Y
414-
echo from os.path import normpath,join,dirname > ..\bindings\python\mapnik\paths.py
415-
echo mapniklibpath = '%MAPNIK_SDK%/lib/mapnik' >> ..\bindings\python\mapnik\paths.py
416-
echo mapniklibpath = normpath(join(dirname(__file__),mapniklibpath)) >> ..\bindings\python\mapnik\paths.py
417-
echo inputpluginspath = join(mapniklibpath,'input') >> ..\bindings\python\mapnik\paths.py
418-
echo fontscollectionpath = join(mapniklibpath,'fonts') >> ..\bindings\python\mapnik\paths.py
419-
echo __all__ = [mapniklibpath,inputpluginspath,fontscollectionpath] >> ..\bindings\python\mapnik\paths.py
420399

421400
:: plugins
422401
xcopy /q .\build\lib\mapnik\input\*.input %MAPNIK_SDK%\lib\mapnik\input\ /Y
423402
IF %ERRORLEVEL% NEQ 0 GOTO ERROR
424403

425-
::copy python bindings
426-
xcopy /q /d ..\bindings\python\mapnik\*.* %MAPNIK_SDK%\python\2.7\site-packages\mapnik\
427-
428404
::write batch file to set mapnik environment vars
429405
echo @ECHO OFF> %MAPNIK_SDK%\set-env-vars.bat
430406
echo SET SDKDIR=%%~dp0>> %MAPNIK_SDK%\set-env-vars.bat
431-
echo SET PYTHONPATH=%%SDKDIR%%python\2.7\site-packages;%%PYTHONPATH%%>> %MAPNIK_SDK%\set-env-vars.bat
432-
::echo SET MAPNIK_INPUT_PLUGINS_DIRECTORY=%%SDKDIR%%lib\mapnik\input>> %MAPNIK_SDK%\set-env-vars.bat
433407
echo SET ICU_DATA=%%SDKDIR%%share\icu>> %MAPNIK_SDK%\set-env-vars.bat
434408
echo SET PATH=%%SDKDIR%%bin;%%PATH%%>> %MAPNIK_SDK%\set-env-vars.bat
435409
echo SET PATH=%%SDKDIR%%lib;%%PATH%%>> %MAPNIK_SDK%\set-env-vars.bat
@@ -464,15 +438,6 @@ for %%t in (build\test\*test.exe) do ( call %%t -d %CD%\.. )
464438
IF %IGNOREFAILEDTESTS% EQU 0 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
465439
IF %IGNOREFAILEDTESTS% EQU 1 SET ERRORLEVEL=0
466440

467-
if NOT EXIST get-pip.py (
468-
wget https://bootstrap.pypa.io/get-pip.py --no-check-certificate
469-
IF %ERRORLEVEL% NEQ 0 GOTO ERROR
470-
python get-pip.py
471-
IF %ERRORLEVEL% NEQ 0 GOTO ERROR
472-
pip.exe install nose
473-
IF %ERRORLEVEL% NEQ 0 GOTO ERROR
474-
)
475-
476441
IF %ERRORLEVEL% NEQ 0 GOTO ERROR
477442
SET GDAL_DATA=%MAPNIK_SDK%\share\gdal
478443
if NOT EXIST %GDAL_DATA% (
@@ -495,15 +460,6 @@ if NOT EXIST %MAPNIK_SDK%\share\icu\icudt%ICU_VERSION%l.dat (
495460
echo f | xcopy /q /d /Y icudt%ICU_VERSION%l_only_collator_and_breakiterator.dat %MAPNIK_SDK%\share\icu\icudt%ICU_VERSION%l.dat
496461
)
497462

498-
SET PYTHONPATH=%CD%\..\bindings\python
499-
:: all visual tests should pass on windows
500-
:: some python tests are expected to fail
501-
::python ..\tests\run_tests.py -q
502-
python ..\tests\visual_tests\test.py -q
503-
ECHO IGNOREFAILEDTESTS %IGNOREFAILEDTESTS%
504-
IF %IGNOREFAILEDTESTS% EQU 0 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
505-
IF %IGNOREFAILEDTESTS% EQU 1 SET ERRORLEVEL=0
506-
507463
GOTO DONE
508464

509465
:ERROR

0 commit comments

Comments
 (0)