Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MAPNIK] new port added #11656

Closed
wants to merge 23 commits into from
Closed

[MAPNIK] new port added #11656

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
65d7787
MAPNIK port added
am2222 May 29, 2020
0388c5f
MAPNIK port added
am2222 May 29, 2020
d7a333d
addressed issues with the port
am2222 Jun 5, 2020
02d921a
addressed issues with the port
am2222 Jun 5, 2020
240dd5b
Merge branch 'master' into mapnik
am2222 Jun 5, 2020
40d8bbe
Merge branch 'master' into mapnik
am2222 Jun 9, 2020
051e1e9
added mapnik cmake patch
am2222 Jun 9, 2020
7cb32e2
added mapnik cmake patch
am2222 Jun 9, 2020
4cf8157
added mapnik cmake patch
am2222 Jun 9, 2020
079cf3d
Merge branch 'master' into mapnik
am2222 Jun 9, 2020
6acefc5
minor fixes
am2222 Jun 10, 2020
6f9104c
Merge branch 'mapnik' of https://github.com/am2222/vcpkg into mapnik
am2222 Jun 10, 2020
b343e11
minor fixes
am2222 Jun 10, 2020
e07fc0b
Update ports/mapnik/portfile.cmake
am2222 Aug 14, 2020
244c100
Update ports/mapnik/portfile.cmake
am2222 Aug 14, 2020
15df354
Update ports/mapnik/portfile.cmake
am2222 Aug 14, 2020
d1cfabe
Merge branch 'master' into mapnik
am2222 Aug 14, 2020
de01718
Update portfile.cmake
am2222 Aug 16, 2020
3754afd
Update portfile.cmake
am2222 Aug 16, 2020
85b668a
Update portfile.cmake
am2222 Sep 3, 2020
a8f5094
Merge branch 'master' into mapnik
am2222 Sep 9, 2020
4330b18
Update ci.baseline.txt
am2222 Sep 13, 2020
460eb1a
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Dec 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 58 additions & 0 deletions ports/mapnik/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
Source: mapnik
Version: 3.0.22
Homepage: https://github.com/am2222/mapnik-windows/
Description: Mapnik is an open source toolkit for developing mapping applications. Compiling on windows. (unofficial port)
Build-Depends: icu, boost-locale[icu], boost-regex[icu], boost, freetype, tiff, libwebp, libxml2, harfbuzz, libpng, zlib

Feature: WITH_CAIRO
am2222 marked this conversation as resolved.
Show resolved Hide resolved
Description: Cairo renderer
Build-Depends: cairo

Feature: WITH_PROJ4
am2222 marked this conversation as resolved.
Show resolved Hide resolved
Description: PROJ4 Functionalities
Build-Depends: proj4

Feature: WITH_INPUT_CSV
am2222 marked this conversation as resolved.
Show resolved Hide resolved
Description: CSV input plugin

Feature: WITH_INPUT_GDAL
am2222 marked this conversation as resolved.
Show resolved Hide resolved
Description: GDAL input plugin
Build-Depends: gdal

Feature: WITH_INPUT_GEOBUF
am2222 marked this conversation as resolved.
Show resolved Hide resolved
Description: GEOBUF input plugin
Build-Depends: protozero

Feature: WITH_INPUT_GEOJSON
am2222 marked this conversation as resolved.
Show resolved Hide resolved
Description: GEOJSON input plugin

Feature: WITH_INPUT_OGR
am2222 marked this conversation as resolved.
Show resolved Hide resolved
Description: OGR input plugin
Build-Depends: gdal

Feature: WITH_INPUT_PGRASTER
am2222 marked this conversation as resolved.
Show resolved Hide resolved
Description: PGRASTER input plugin
Build-Depends: libodb-pgsql

Feature: WITH_INPUT_POSTGIS
am2222 marked this conversation as resolved.
Show resolved Hide resolved
Description: POSTGIS input plugin
Build-Depends: libodb-pgsql

Feature: WITH_INPUT_RASTER
am2222 marked this conversation as resolved.
Show resolved Hide resolved
Description: RASTER input plugin

Feature: WITH_INPUT_SHAPE
am2222 marked this conversation as resolved.
Show resolved Hide resolved
Description: SHAPE input plugin

Feature: WITH_INPUT_SQLITE
am2222 marked this conversation as resolved.
Show resolved Hide resolved
Description: SQLITE input plugin
Build-Depends: sqlite3

Feature: WITH_INPUT_TOPOJSON
am2222 marked this conversation as resolved.
Show resolved Hide resolved
Description: TOPOJSON input plugin

Feature: WITH_DEMO
am2222 marked this conversation as resolved.
Show resolved Hide resolved
Description: Make Demo Application

Feature: WITH_UTILS
am2222 marked this conversation as resolved.
Show resolved Hide resolved
Description: Make utilities Application including mapnik-rendrer and shapeindex
210 changes: 210 additions & 0 deletions ports/mapnik/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,210 @@
set(MAPNIK_VERSION 3.0.22)
include(vcpkg_common_functions)
am2222 marked this conversation as resolved.
Show resolved Hide resolved
find_program(GIT git)

set(GIT_URL "https://github.com/am2222/mapnik-windows.git")
set(GIT_REV "fdba45cd95b66576e47de2e56d30196bfc9de99d")

set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${PORT})
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You might use vcpkg_from_github() to get the source code. Could you please update this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had to pull the repository with --recurse-submodules which I think vcpkg+from_github() does not support it.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you need do this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think now that I am fetching data from mapnik's repo this issue is also resolved.


if(NOT EXISTS "${SOURCE_PATH}/.git")
message(STATUS "Cloning and fetching submodules")
vcpkg_execute_required_process(
COMMAND ${GIT} clone --recurse-submodules ${GIT_URL} ${SOURCE_PATH}
WORKING_DIRECTORY ${SOURCE_PATH}
LOGNAME clone
)

message(STATUS "Checkout revision ${GIT_REV}")
vcpkg_execute_required_process(
COMMAND ${GIT} checkout ${GIT_REV}
WORKING_DIRECTORY ${SOURCE_PATH}
LOGNAME checkout
)
endif()
message(STATUS "Adding worktree done")
am2222 marked this conversation as resolved.
Show resolved Hide resolved


vcpkg_find_acquire_program(PYTHON2)
get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY)
set(ENV{PATH} "$ENV{PATH};${PYTHON2_DIR}")
am2222 marked this conversation as resolved.
Show resolved Hide resolved

set(BOOST_ROOT ${CURRENT_INSTALLED_DIR})
am2222 marked this conversation as resolved.
Show resolved Hide resolved

if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
set(MAPNIK_STATIC_LIB OFF)
elseif (VCPKG_LIBRARY_LINKAGE STREQUAL static)
set(MAPNIK_STATIC_LIB ON)
endif()

NancyLi1013 marked this conversation as resolved.
Show resolved Hide resolved


am2222 marked this conversation as resolved.
Show resolved Hide resolved
if ("WITH_CAIRO" IN_LIST FEATURES)
set(CMAKE_WITH_CAIRO ON)
else()
set(CMAKE_WITH_CAIRO OFF)
endif()
am2222 marked this conversation as resolved.
Show resolved Hide resolved

if ("WITH_DEMO" IN_LIST FEATURES)
set(CMAKE_DEMO ON)
else()
set(CMAKE_DEMO OFF)
endif()

if ("WITH_GRID" IN_LIST FEATURES)
set(CMAKE_GRID ON)
else()
set(CMAKE_GRID OFF)
endif()


if ("WITH_INPUT_CSV" IN_LIST FEATURES)
set(CMAKE_INPUT_CSV ON)
else()
set(CMAKE_INPUT_CSV OFF)
endif()

if ("WITH_INPUT_GDAL" IN_LIST FEATURES)
set(CMAKE_INPUT_GDAL ON)
else()
set(CMAKE_INPUT_GDAL OFF)
endif()


if ("WITH_INPUT_GEOBUF" IN_LIST FEATURES)
set(CMAKE_GEOBUF ON)
else()
set(CMAKE_GEOBUF OFF)
endif()


NancyLi1013 marked this conversation as resolved.
Show resolved Hide resolved
if ("WITH_INPUT_GEOJSON" IN_LIST FEATURES)
set(CMAKE_GEOJSON ON)
else()
set(CMAKE_GEOJSON OFF)
endif()

if ("WITH_INPUT_OGR" IN_LIST FEATURES)
set(CMAKE_OGR ON)
else()
set(CMAKE_OGR OFF)
endif()


if ("WITH_INPUT_PGRASTER" IN_LIST FEATURES)
set(CMAKE_PGRASTER ON)
else()
set(CMAKE_PGRASTER OFF)
endif()


if ("WITH_INPUT_POSTGIS" IN_LIST FEATURES)
set(CMAKE_POSTGIS ON)
else()
set(CMAKE_POSTGIS OFF)
endif()


if ("WITH_INPUT_RASTER" IN_LIST FEATURES)
set(CMAKE_RASTER ON)
else()
set(CMAKE_RASTER OFF)
endif()



if ("WITH_INPUT_SHAPE" IN_LIST FEATURES)
set(CMAKE_SHAPE ON)
else()
set(CMAKE_SHAPE OFF)
endif()



if ("WITH_INPUT_SQLITE" IN_LIST FEATURES)
set(CMAKE_SQLITE ON)
else()
set(CMAKE_SQLITE OFF)
endif()

if ("WITH_INPUT_TOPOJSON" IN_LIST FEATURES)
set(CMAKE_TOPOJSON ON)
else()
set(CMAKE_TOPOJSON OFF)
endif()

if ("WITH_PROJ4" IN_LIST FEATURES)
set(CMAKE_PROJ4 ON)
else()
set(CMAKE_PROJ4 OFF)
endif()


if ("WITH_UTILS" IN_LIST FEATURES)
set(CMAKE_UTILS ON)
else()
set(CMAKE_UTILS OFF)
endif()

if ("WITH_VIEWER" IN_LIST FEATURES)
set(CMAKE_VIEWER ON)
else()
set(CMAKE_VIEWER OFF)
endif()

vcpkg_configure_cmake(
SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mapnik
# PREFER_NINJA # Disable this option if project cannot be built with Ninja
am2222 marked this conversation as resolved.
Show resolved Hide resolved
# NO_CHARSET_FLAG # automatic templates
am2222 marked this conversation as resolved.
Show resolved Hide resolved
OPTIONS
-DWITH_CAIRO={$CMAKE_WITH_CAIRO}
-DWITH_DEMO={$CMAKE_DEMO}
#-DWITH_GRID={$CMAKE_}
-DWITH_INPUT_CSV={$CMAKE_CSV}
-DWITH_INPUT_GDAL={$CMAKE_GDAL}
-DWITH_INPUT_GEOBUF={$CMAKE_GEOBUF}
-DWITH_INPUT_GEOJSON={$CMAKE_GEOJSON=}
-DWITH_INPUT_OGR={$CMAKE_OGR}
-DWITH_INPUT_PGRASTER={$CMAKE_PGRASTER}
-DWITH_INPUT_POSTGIS={$CMAKE_POSTGIS}
-DWITH_INPUT_RASTER={$CMAKE_RASTER}
-DWITH_INPUT_SHAPE={$CMAKE_SHAPE}
-DWITH_INPUT_SQLITE={$CMAKE_SQLITE}
-DWITH_INPUT_TOPOJSON={$CMAKE_TOPOJSON}
-DWITH_PROJ4={$CMAKE_PROJ4}
-DWITH_UTILS={$CMAKE_UTILS}
#-DWITH_VIEWER={$CMAKE_VIEWER}
-DMAPNIK_STATIC_LIB=${MAPNIK_STATIC_LIB}
-DBOOST_PREFIX=${CURRENT_INSTALLED_DIR}/include
-DFREE_TYPE_INCLUDE=${CURRENT_INSTALLED_DIR}/include/freetype2
)

vcpkg_install_cmake()



am2222 marked this conversation as resolved.
Show resolved Hide resolved
file(COPY ${SOURCE_PATH}/include/mapnik DESTINATION ${CURRENT_PACKAGES_DIR}/include)

vcpkg_copy_pdbs()
file(GLOB EXES "${CURRENT_PACKAGES_DIR}/bin/*.exe")
if(EXES)
file(COPY ${EXES} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/mapnik)
file(REMOVE ${EXES})

vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/mapnik)
am2222 marked this conversation as resolved.
Show resolved Hide resolved
file(COPY ${SOURCE_PATH}/demo/data DESTINATION ${CURRENT_PACKAGES_DIR}/tools/mapnik/demo)
file(COPY ${SOURCE_PATH}/fonts DESTINATION ${CURRENT_PACKAGES_DIR}/tools/mapnik)
file(COPY ${CURRENT_PACKAGES_DIR}/bin/plugins DESTINATION ${CURRENT_PACKAGES_DIR}/tools/mapnik)
endif()

file(GLOB DEBUG_EXES "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe")
if(DEBUG_EXES)
file(REMOVE ${EXES})
endif()

am2222 marked this conversation as resolved.
Show resolved Hide resolved



am2222 marked this conversation as resolved.
Show resolved Hide resolved
am2222 marked this conversation as resolved.
Show resolved Hide resolved
#file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/mapnik RENAME copyright)
file(INSTALL ${SOURCE_PATH}/fonts/unifont_license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/mapnik RENAME fonts_copyright)
am2222 marked this conversation as resolved.
Show resolved Hide resolved
3 changes: 3 additions & 0 deletions scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2033,3 +2033,6 @@ ctp:x64-uwp=skip
ctp:x64-windows=skip
ctp:x64-windows-static=skip
ctp:x86-windows=skip

am2222 marked this conversation as resolved.
Show resolved Hide resolved
mapnik:arm-uwp=fail
mapnik:x64-uwp=fail
am2222 marked this conversation as resolved.
Show resolved Hide resolved