diff --git a/build.bat b/build.bat deleted file mode 100644 index d9c3294ad..000000000 --- a/build.bat +++ /dev/null @@ -1,362 +0,0 @@ -@echo off - -::git clone https://chromium.googlesource.com/external/gyp.git -::CALL "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86 -::SET PATH=C:\Python27;%PATH% - -::ddt ..\mapnik-sdk -::IF ERRORLEVEL NEQ 0 GOTO ERROR -::ddt build\Release -::IF ERRORLEVEL NEQ 0 GOTO ERROR - -if NOT EXIST gyp ( - CALL git clone https://chromium.googlesource.com/external/gyp.git gyp - IF %ERRORLEVEL% NEQ 0 GOTO ERROR -) - -:: run find command and bail on error -:: this ensures we have the unix find command on path -:: before trying to run gyp -find deps/clipper/src/ -name "*.cpp" -IF %ERRORLEVEL% NEQ 0 GOTO ERROR - -CALL gyp\gyp.bat mapnik.gyp --depth=. ^ - -Dincludes=%CD%/../mapnik-sdk/includes ^ - -Dlibs=%CD%/../mapnik-sdk/libs ^ - -f msvs -G msvs_version=2013 ^ - --generator-output=build ^ - --no-duplicate-basename-check -IF %ERRORLEVEL% NEQ 0 GOTO ERROR - -if NOT EXIST ..\mapnik-sdk ( - mkdir ..\mapnik-sdk - mkdir ..\mapnik-sdk\bin - mkdir ..\mapnik-sdk\includes - mkdir ..\mapnik-sdk\share - mkdir ..\mapnik-sdk\libs - mkdir ..\mapnik-sdk\libs\mapnik\input - mkdir ..\mapnik-sdk\libs\mapnik\fonts -) -IF %ERRORLEVEL% NEQ 0 GOTO ERROR - -SET DEPSDIR=.. - -:: includes -xcopy /i /d /s /q %DEPSDIR%\harfbuzz-build\harfbuzz\hb-version.h ..\mapnik-sdk\includes\harfbuzz\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\harfbuzz\src\hb.h ..\mapnik-sdk\includes\harfbuzz\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -::xcopy /i /d /s /q %DEPSDIR%\harfbuzz\src\hb-icu.h ..\mapnik-sdk\includes\harfbuzz\ /Y -::IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\harfbuzz\src\hb-shape-plan.h ..\mapnik-sdk\includes\harfbuzz\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\harfbuzz\src\hb-shape.h ..\mapnik-sdk\includes\harfbuzz\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\harfbuzz\src\hb-set.h ..\mapnik-sdk\includes\harfbuzz\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\harfbuzz\src\hb-ft.h ..\mapnik-sdk\includes\harfbuzz\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\harfbuzz\src\hb-buffer.h ..\mapnik-sdk\includes\harfbuzz\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\harfbuzz\src\hb-unicode.h ..\mapnik-sdk\includes\harfbuzz\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\harfbuzz\src\hb-common.h ..\mapnik-sdk\includes\harfbuzz\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\harfbuzz\src\hb-blob.h ..\mapnik-sdk\includes\harfbuzz\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\harfbuzz\src\hb-font.h ..\mapnik-sdk\includes\harfbuzz\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\harfbuzz\src\hb-face.h ..\mapnik-sdk\includes\harfbuzz\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\harfbuzz\src\hb-deprecated.h ..\mapnik-sdk\includes\harfbuzz\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\boost_1_56_0\boost ..\mapnik-sdk\includes\boost /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\icu\include\unicode ..\mapnik-sdk\includes\unicode /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\freetype\include ..\mapnik-sdk\includes\freetype2 /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\libxml2\include ..\mapnik-sdk\includes\libxml2 /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\zlib\zlib.h ..\mapnik-sdk\includes\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\zlib\zconf.h ..\mapnik-sdk\includes\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\libpng\png.h ..\mapnik-sdk\includes\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\libpng\pnglibconf.h ..\mapnik-sdk\includes\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\libpng\pngconf.h ..\mapnik-sdk\includes\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\jpeg\jpeglib.h ..\mapnik-sdk\includes\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\jpeg\jconfig.h ..\mapnik-sdk\includes\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\jpeg\jmorecfg.h ..\mapnik-sdk\includes\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\webp\src\webp ..\mapnik-sdk\includes\webp /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\proj\src\proj_api.h ..\mapnik-sdk\includes\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\libtiff\libtiff\tiff.h ..\mapnik-sdk\includes\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\libtiff\libtiff\tiffvers.h ..\mapnik-sdk\includes\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\libtiff\libtiff\tiffconf.h ..\mapnik-sdk\includes\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\libtiff\libtiff\tiffio.h ..\mapnik-sdk\includes\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\cairo\cairo-version.h ..\mapnik-sdk\includes\cairo\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\cairo\src\cairo-features.h ..\mapnik-sdk\includes\cairo\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\cairo\src\cairo.h ..\mapnik-sdk\includes\cairo\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\cairo\src\cairo-deprecated.h ..\mapnik-sdk\includes\cairo\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\cairo\src\cairo-svg.h ..\mapnik-sdk\includes\cairo\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\cairo\src\cairo-svg-surface-private.h ..\mapnik-sdk\includes\cairo\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\cairo\src\cairo-pdf.h ..\mapnik-sdk\includes\cairo\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\cairo\src\cairo-ft.h ..\mapnik-sdk\includes\cairo\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\cairo\src\cairo-ps.h ..\mapnik-sdk\includes\cairo\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\protobuf\vsprojects\include ..\mapnik-sdk\includes\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR - -:: libs -xcopy /i /d /s /q %DEPSDIR%\harfbuzz-build\harfbuzz.lib ..\mapnik-sdk\libs\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\freetype\freetype.lib ..\mapnik-sdk\libs\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\icu\lib\icuuc.lib ..\mapnik-sdk\libs\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\icu\lib\icuin.lib ..\mapnik-sdk\libs\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\icu\bin\icuuc53.dll ..\mapnik-sdk\libs\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\icu\bin\icudt53.dll ..\mapnik-sdk\libs\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\icu\bin\icuin53.dll ..\mapnik-sdk\libs\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\libxml2\win32\bin.msvc\libxml2_a.lib ..\mapnik-sdk\libs\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\libxml2\win32\bin.msvc\libxml2_a_dll.lib ..\mapnik-sdk\libs\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\libxml2\win32\bin.msvc\libxml2.dll ..\mapnik-sdk\libs\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\libxml2\win32\bin.msvc\libxml2.lib ..\mapnik-sdk\libs\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\libtiff\libtiff\libtiff.dll ..\mapnik-sdk\libs\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -::xcopy /i /d /s /q %DEPSDIR%\libtiff\libtiff\libtiff.lib ..\mapnik-sdk\libs\ /Y -::IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\libtiff\libtiff\libtiff_i.lib ..\mapnik-sdk\libs\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\zlib\zlib.lib ..\mapnik-sdk\libs\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\proj\src\proj.lib ..\mapnik-sdk\libs\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\webp\output\release-dynamic\x86\lib\libwebp_dll.lib ..\mapnik-sdk\libs\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\webp\output\release-dynamic\x86\bin\libwebp.dll ..\mapnik-sdk\libs\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\libpng\projects\vstudio\Release\libpng16.lib ..\mapnik-sdk\libs\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\libpng\projects\vstudio\Release\libpng16.dll ..\mapnik-sdk\libs\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\jpeg\libjpeg.lib ..\mapnik-sdk\libs\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\cairo\src\release\cairo-static.lib ..\mapnik-sdk\libs\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\cairo\src\release\cairo.lib ..\mapnik-sdk\libs\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\cairo\src\release\cairo.dll ..\mapnik-sdk\libs\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\boost_1_56_0\stage\lib\* ..\mapnik-sdk\libs\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\protobuf\vsprojects\Release\libprotobuf-lite.lib ..\mapnik-sdk\libs\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR - -:: data -xcopy /i /d /s /q %DEPSDIR%\proj\nad ..\mapnik-sdk\share\proj /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\gdal\data ..\mapnik-sdk\share\gdal -IF %ERRORLEVEL% NEQ 0 GOTO ERROR - -:: bin -xcopy /i /d /s /q %DEPSDIR%\protobuf\vsprojects\Release\protoc.exe ..\mapnik-sdk\bin /Y -xcopy /i /d /s /q mapnik-config.bat ..\mapnik-sdk\bin /Y - -:: headers for plugins -xcopy /i /d /s /q %DEPSDIR%\postgresql\src\interfaces\libpq\libpq-fe.h ..\mapnik-sdk\includes\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\postgresql\src\include\postgres_ext.h ..\mapnik-sdk\includes\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\postgresql\src\include\pg_config_ext.h ..\mapnik-sdk\includes\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\sqlite\sqlite3.h ..\mapnik-sdk\includes\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -::xcopy /i /d /s /q %DEPSDIR%\gdal\gcore\*h ..\mapnik-sdk\includes\gdal\ /Y -::IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\gdal\ogr\ogr_feature.h ..\mapnik-sdk\includes\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\gdal\ogr\ogr_spatialref.h ..\mapnik-sdk\includes\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\gdal\ogr\ogr_geometry.h ..\mapnik-sdk\includes\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\gdal\ogr\ogr_core.h ..\mapnik-sdk\includes\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\gdal\ogr\ogr_featurestyle.h ..\mapnik-sdk\includes\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\gdal\ogr\ogrsf_frmts\ogrsf_frmts.h ..\mapnik-sdk\includes\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\gdal\ogr\ogr_srs_api.h ..\mapnik-sdk\includes\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\gdal\gcore\gdal_priv.h ..\mapnik-sdk\includes\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\gdal\gcore\gdal_frmts.h ..\mapnik-sdk\includes\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\gdal\gcore\gdal.h ..\mapnik-sdk\includes\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\gdal\gcore\gdal_version.h ..\mapnik-sdk\includes\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\gdal\port\cpl_minixml.h ..\mapnik-sdk\includes\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\gdal\port\cpl_atomic_ops.h ..\mapnik-sdk\includes\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\gdal\port\cpl_string.h ..\mapnik-sdk\includes\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\gdal\port\cpl_conv.h ..\mapnik-sdk\includes\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\gdal\port\cpl_vsi.h ..\mapnik-sdk\includes\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\gdal\port\cpl_virtualmem.h ..\mapnik-sdk\includes\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\gdal\port\cpl_error.h ..\mapnik-sdk\includes\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\gdal\port\cpl_progress.h ..\mapnik-sdk\includes\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\gdal\port\cpl_port.h ..\mapnik-sdk\includes\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\gdal\port\cpl_config.h ..\mapnik-sdk\includes\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR - -:: libs for plugins -xcopy /i /d /s /q %DEPSDIR%\postgresql\src\interfaces\libpq\Release\libpq.lib ..\mapnik-sdk\libs\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\postgresql\src\interfaces\libpq\Release\libpq.dll ..\mapnik-sdk\libs\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\sqlite\sqlite3.lib ..\mapnik-sdk\libs\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\gdal\gdal_i.lib ..\mapnik-sdk\libs\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -:: NOTE: impossible to statically link gdal due to: -:: http://stackoverflow.com/questions/4596212/c-odbc-refuses-to-statically-link-to-libcmt-lib-under-vs2010 -::xcopy /i /d /s /q %DEPSDIR%\gdal\gdal.lib ..\mapnik-sdk\libs\ /Y -::IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\gdal\gdal111.dll ..\mapnik-sdk\libs\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\expat\win32\bin\Release\libexpat.lib ..\mapnik-sdk\libs\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q %DEPSDIR%\expat\win32\bin\Release\libexpat.dll ..\mapnik-sdk\libs\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR - -:: detect trouble with mimatched linking -dumpbin /directives ..\mapnik-sdk\libs\*lib | grep LIBCMT - -::msbuild /m:2 /t:mapnik /p:BuildInParellel=true .\build\mapnik.sln /p:Configuration=Release - -msbuild /m:%NUMBER_OF_PROCESSORS% /p:BuildInParellel=true .\build\mapnik.sln /p:Configuration=Release -:: /t:rebuild -:: /v:diag > build.log -IF %ERRORLEVEL% NEQ 0 GOTO ERROR - -:: install mapnik libs -xcopy /i /d /s /q .\build\Release\mapnik.lib ..\mapnik-sdk\libs\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q .\build\Release\mapnik.dll ..\mapnik-sdk\libs\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR - -xcopy /i /d /s /q .\fonts\dejavu-fonts-ttf-2.33\ttf\*ttf ..\mapnik-sdk\libs\mapnik\fonts\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR - -:: move python binding into local testable location -xcopy /i /d /s /q .\build\Release\_mapnik.pyd bindings\python\mapnik\ /Y -echo from os.path import normpath,join,dirname > bindings\python\mapnik\paths.py -echo mapniklibpath = '%CD%/../mapnik-sdk/libs/mapnik' >> bindings\python\mapnik\paths.py -echo mapniklibpath = normpath(join(dirname(__file__),mapniklibpath)) >> bindings\python\mapnik\paths.py -echo inputpluginspath = join(mapniklibpath,'input') >> bindings\python\mapnik\paths.py -echo fontscollectionpath = join(mapniklibpath,'fonts') >> bindings\python\mapnik\paths.py -echo __all__ = [mapniklibpath,inputpluginspath,fontscollectionpath] >> bindings\python\mapnik\paths.py - - -:: plugins -xcopy /i /d /s /q .\build\Release\*input ..\mapnik-sdk\libs\mapnik\input\ /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR - -:: install mapnik headers -xcopy /i /d /s /q .\deps\mapnik\sparsehash ..\mapnik-sdk\includes\mapnik\sparsehash /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q .\deps\agg\include ..\mapnik-sdk\includes\mapnik\agg /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q .\deps\clipper\include ..\mapnik-sdk\includes\mapnik\agg /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -xcopy /i /d /s /q .\include\mapnik ..\mapnik-sdk\includes\mapnik /Y -IF %ERRORLEVEL% NEQ 0 GOTO ERROR - -:: run tests -SET PATH=%CD%\..\mapnik-sdk\libs;%PATH% -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -for %%t in (build\Release\*test.exe) do ( call %%t -d %CD% ) -IF %ERRORLEVEL% NEQ 0 GOTO ERROR - -if NOT EXIST get-pip.py ( - wget https://bootstrap.pypa.io/get-pip.py --no-check-certificate - IF %ERRORLEVEL% NEQ 0 GOTO ERROR - python get-pip.py - IF %ERRORLEVEL% NEQ 0 GOTO ERROR - C:\Python27\Scripts\pip.exe install nose - IF %ERRORLEVEL% NEQ 0 GOTO ERROR -) -xcopy /i /d /s /q .\build\Release\_mapnik.pyd bindings\python\mapnik\_mapnik.pyd -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -SET PYTHONPATH=%CD%\bindings\python -IF %ERRORLEVEL% NEQ 0 GOTO ERROR -SET GDAL_DATA=%CD%\..\mapnik-sdk\share\gdal -if NOT EXIST %GDAL_DATA% ( - mkdir %GDAL_DATA% - IF %ERRORLEVEL% NEQ 0 GOTO ERROR -) -SET PROJ_LIB=%CD%\..\mapnik-sdk\share\proj -if NOT EXIST %PROJ_LIB% ( - mkdir %PROJ_LIB% - IF %ERRORLEVEL% NEQ 0 GOTO ERROR -) -SET ICU_DATA=%CD%\..\mapnik-sdk\share\icu -if NOT EXIST %ICU_DATA% ( - mkdir %ICU_DATA% - IF %ERRORLEVEL% NEQ 0 GOTO ERROR -) - -if NOT EXIST ..\mapnik-sdk\share\icu\icudt53l.dat ( - wget --no-check-certificate https://github.com/mapnik/mapnik-packaging/raw/master/osx/icudt53l_only_collator_and_breakiterator.dat - xcopy /i /f /s /q icudt53l_only_collator_and_breakiterator.dat ..\mapnik-sdk\share\icu\icudt53l.dat /Y -) - -::python tests\run_tests.py -q -::python tests\visual_tests\test.py -q - -GOTO DONE - -:ERROR -echo ----------ERROR MAPNIK -------------- -echo ERRORLEVEL %ERRORLEVEL% - -:DONE -echo DONE building Mapnik - -EXIT /b %ERRORLEVEL% diff --git a/common.gypi b/common.gypi deleted file mode 100644 index 2d9f9fe3e..000000000 --- a/common.gypi +++ /dev/null @@ -1,124 +0,0 @@ -{ - 'target_defaults': { - 'default_configuration': 'Release', - 'msbuild_toolset':'v140', - 'msvs_configuration_platform': 'Win32', - 'msvs_disabled_warnings': [ 4068,4244,4005,4506,4345,4804,4805,4661 ], - 'xcode_settings': { - 'CLANG_CXX_LIBRARY': 'libc++', - 'CLANG_CXX_LANGUAGE_STANDARD':'c++11', - 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', - 'MACOSX_DEPLOYMENT_TARGET':'10.9', - 'WARNING_CFLAGS': [ - '-Wall', - '-Wextra', - '-pedantic', - '-Wno-parentheses', - '-Wno-char-subscripts', - '-Wno-unused-parameter', - '-Wno-c++11-narrowing', - '-Wno-c++11-long-long', - '-Wno-unsequenced', - '-Wno-sign-compare', - '-Wno-unused-function', - '-Wno-redeclared-class-member', - '-Wno-c99-extensions', - '-Wno-c++11-extra-semi', - '-Wno-variadic-macros', - '-Wno-c++11-extensions', - '-Wno-unused-const-variable' - ] - }, - 'msvs_settings': { - 'VCCLCompilerTool': { - 'ObjectFile': '$(IntDir)/%(RelativeDir)/', # support similiarly named files in different directories - 'ExceptionHandling': 1, # /EHsc - 'RuntimeTypeInfo': 'true', # /GR - 'RuntimeLibrary': '2' # 2:/MD - } - }, - 'defines': [ 'BOOST_SPIRIT_USE_PHOENIX_V3=1' ], - 'cflags_cc': ['-std=c++03'], - 'conditions': [ - ['OS=="win"', { - 'defines': ['_WINDOWS'] - }] - ], - 'configurations': { - 'Debug': { - 'defines!': [ - 'NDEBUG' - ], - 'cflags_cc!': [ - '-O3', - '-O2', - '-Os', - '-DNDEBUG' - ], - 'cflags': [ '-g', '-O0' ], - 'defines': [ 'DEBUG' ], - 'xcode_settings': { - 'GCC_OPTIMIZATION_LEVEL': '0', - 'GCC_GENERATE_DEBUGGING_SYMBOLS': 'YES', - 'DEAD_CODE_STRIPPING': 'NO', - 'GCC_INLINES_ARE_PRIVATE_EXTERN': 'NO' - }, - 'msvs_settings': { - 'VCCLCompilerTool': { - 'RuntimeLibrary': '3', # /MDd - 'Optimization': 0, # /Od, no optimization - 'MinimalRebuild': 'false', - 'OmitFramePointers': 'false', - 'BasicRuntimeChecks': 3 # /RTC1 - }, - 'VCLinkerTool': { - 'AdditionalOptions': [ - #'/NODEFAULTLIB:msvcrt.lib' - ] - } - } - }, - 'Release': { - 'cflags': [ '-O3' ], - 'defines': [ 'NDEBUG' ], - 'xcode_settings': { - 'GCC_OPTIMIZATION_LEVEL': '3', - 'GCC_GENERATE_DEBUGGING_SYMBOLS': 'NO', - 'DEAD_CODE_STRIPPING': 'YES', - 'GCC_INLINES_ARE_PRIVATE_EXTERN': 'YES' - }, - 'msvs_settings': { - 'VCCLCompilerTool': { - 'RuntimeLibrary': '2', #0:/MT, 2:/MD, - 'Optimization': 3, # /Ox, full optimization - 'FavorSizeOrSpeed': 1, # /Ot, favour speed over size - 'InlineFunctionExpansion': 2, # /Ob2, inline anything eligible - #'WholeProgramOptimization': 'true', # /GL, whole program optimization, needed for LTCG - 'OmitFramePointers': 'true', - #'EnableFunctionLevelLinking': 'true', - 'EnableIntrinsicFunctions': 'true', - 'AdditionalOptions': [ - '/MP', # compile across multiple CPUs - ], - 'DebugInformationFormat': '0' - }, - 'VCLibrarianTool': { - 'AdditionalOptions': [ - '/LTCG' # link time code generation - ], - }, - 'VCLinkerTool': { - #'LinkTimeCodeGeneration': 1, # link-time code generation - #'OptimizeReferences': 2, # /OPT:REF - #'EnableCOMDATFolding': 2, # /OPT:ICF - 'LinkIncremental': 2, # force incremental linking - 'GenerateDebugInformation': 'false', - 'AdditionalOptions': [ - #'/NODEFAULTLIB:libcmt.lib' - ], - } - } - } - } - } -} diff --git a/mapnik.gyp b/mapnik.gyp deleted file mode 100644 index 0b6e110ce..000000000 --- a/mapnik.gyp +++ /dev/null @@ -1,531 +0,0 @@ -{ - 'includes': [ - './common.gypi' - ], - 'variables': { - 'includes%':'', - 'libs%':'', - 'common_defines': [ - 'BIGINT', - 'BOOST_REGEX_HAS_ICU', - 'HAVE_JPEG', - 'MAPNIK_USE_PROJ4', - 'HAVE_PNG', - 'HAVE_TIFF', - 'HAVE_WEBP', - 'MAPNIK_THREADSAFE', - 'HAVE_CAIRO', - 'GRID_RENDERER', - 'SVG_RENDERER' - ], - 'common_includes': [ - './include', # mapnik - './deps/', # mapnik/sparsehash - './deps/agg/include/', # agg - './deps/clipper/include/', # clipper - './', # boost shim - '<@(includes)/', - '<@(includes)/freetype2', - '<@(includes)/libxml2', - '<@(includes)/cairo' - ], - "conditions": [ - ["OS=='win'", { - 'common_defines': [ - 'LIBXML_STATIC', # static libxml: libxml2_a.lib - 'BOOST_VARIANT_DO_NOT_USE_VARIADIC_TEMPLATES', - 'BOOST_LIB_TOOLSET="vc140"', - 'BOOST_COMPILER="14.0"' - ], - 'common_libraries': [] - }, { - 'common_defines': ['SHAPE_MEMORY_MAPPED_FILE','U_CHARSET_IS_UTF8=1'], - 'common_libraries': [ - '-Wl,-search_paths_first', - '-stdlib=libstdc++', - '-L<@(libs)' - ] - }] - ] - }, - 'targets': [ - { - 'target_name': 'mapnik', - 'product_name': 'mapnik', - 'type': 'shared_library', - 'sources': [ - '