Feature/cmake static plugins by mathisloge · Pull Request #4291 · mapnik/mapnik

mathisloge · 2022-02-02T23:51:11Z

@artemp I needed to refactor the plugin logic a bit. I've introduced a new class datasource_plugin which has a common interface. So multiple static plugins with the same on_plugin_load logic can exist.

BUT as it now builds correctly and most tests are both in dynamic and static configuration good, the static configuration still has some flaws: the problem with singeltons then arises. e.g. the image_reader registration won't work correctly, since the compiler optimizes those calls away.

wip static plugins add remaining datasources wip formatting

…e/cmake-static

mathisloge · 2022-02-06T14:26:44Z

So I've now added a mapnik::setup() function which should be called before any other method of mapnik. Currently this only registers the image_readers.

This would mean a very big breaking change, since users have to add this function to their source code. IMHO the global initialisation with functions a little opaque, as it is not clear what happens when or why something might not happen.

The plugins are working now in static and dynamic configurations.

But I don't know how i can express the additional things in SCons.

fix merge remove old DATASOURCE_PLUGIN call fix memory_datasource wip wip fix temp return fix install wip before_unload linux remove docker remove docker comments add windows error message if libmapnik=static and plugins=dynamic fix false plugin macro plugin default de/constructor to remove UB simplyfy plugin targets - add fpic fix makro simplyfy use unique_ptr for plugin handle rename option static plugins replace local init with fnc call call setup everywhere init datasource_static

…e/cmake-static

codecov · 2022-02-07T18:09:41Z

Codecov Report

Base: 74.90% // Head: 75.00% // Increases project coverage by +0.10% 🎉

Coverage data is based on head (7cce5ce) compared to base (e811958).
Patch coverage: 78.59% of modified lines in pull request are covered.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #4291      +/-   ##
==========================================
+ Coverage   74.90%   75.00%   +0.10%     
==========================================
  Files         511      524      +13     
  Lines       36689    36774      +85     
==========================================
+ Hits        27482    27584     +102     
+ Misses       9207     9190      -17

Impacted Files	Coverage Δ
include/mapnik/datasource.hpp	`100.00% <ø> (ø)`
include/mapnik/webp_io.hpp	`61.76% <ø> (+17.55%)`	⬆️
src/webp_io.cpp	`0.00% <0.00%> (ø)`
src/memory_datasource.cpp	`64.10% <25.00%> (-1.69%)`	⬇️
include/mapnik/json/geojson_grammar_x3_def.hpp	`64.70% <33.33%> (ø)`
include/mapnik/wkt/wkt_grammar_x3_def.hpp	`62.50% <50.00%> (ø)`
...ns/input/base/include/mapnik/datasource_plugin.hpp	`50.00% <50.00%> (ø)`
plugins/input/csv/csv_datasource.cpp	`90.87% <66.66%> (-0.33%)`	⬇️
plugins/input/gdal/gdal_datasource.cpp	`72.50% <66.66%> (-2.50%)`	⬇️
plugins/input/geobuf/geobuf_datasource.cpp	`69.72% <66.66%> (+0.85%)`	⬆️
... and 89 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

…e/cmake-static

mathisloge · 2022-02-09T14:52:02Z

@artemp thoughts on this?

artemp · 2022-02-09T15:01:53Z

@artemp thoughts on this?

@mathisloge 👍 for reminding me! I'd like to understand more about potential implications but I didn't have a chance to look into this, yet. Will try to find time, thanks!

src/plugin.cpp

This reverts commit f485897.

…e/cmake-static

mathisloge · 2022-12-09T14:59:30Z

@artemp yey!
I've got the necessary bits finally together.
Could you review this PR?
From the functionality it is mergable.

mathisloge · 2023-01-09T10:59:12Z

@artemp do you had any chance to review this? :)

artemp · 2023-01-09T11:05:11Z

@artemp do you had any chance to review this? :)

Happy New Year @mathisloge :) !

Q. How to ensure static build favours linking to static (*.a) dependecies?
E.g RUNTIME_LINK: Set preference for linking dependencies (shared|static) ?

mathisloge · 2023-01-10T09:16:03Z

Happy New Year @artemp 🥳

How to ensure static build favours linking to static (*.a) dependecies?

I don't know of any reliable way of doing it. I would leave that to the user and the user has to make sure to pass the correct config file locations or paths to cmake config / pkg-config files when configuring the project. E.g. you can set https://cmake.org/cmake/help/latest/variable/CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH.html#variable:CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH to disable the system path and make sure that only the passed paths are used.

…e/cmake-static

mathisloge · 2023-01-16T18:55:59Z

@artemp needed to rebase.
You can merge this now :)

Feature/cmake static plugins

mathisloge added 10 commits November 15, 2021 15:32

initial docker

4b66137

test workflow

500728e

all branches

7195448

check out correctly

c6619d0

wip

c5d3d9c

delete all data

92b1dba

Merge branch 'master' of https://github.com/mapnik/mapnik

61dd5dc

Merge branch 'fix/windows-utf8' of https://github.com/mathisloge/mapnik

7bccb2a

static plugins

2d846dd

wip static plugins add remaining datasources wip formatting

Merge branch 'master' of https://github.com/mapnik/mapnik into featur…

8a1f257

…e/cmake-static

mathisloge force-pushed the feature/cmake-static branch from 77d34f3 to c6059c7 Compare February 3, 2022 16:58

mathisloge added 2 commits February 7, 2022 15:35

[CMake] add msvc EHsc option

49ef468

mathisloge force-pushed the feature/cmake-static branch from 28abee1 to 49ef468 Compare February 7, 2022 14:35

Merge branch 'master' of https://github.com/mapnik/mapnik into featur…

65dde2c

…e/cmake-static

mathisloge added 2 commits February 8, 2022 16:49

Merge branch 'master' of https://github.com/mapnik/mapnik into featur…

f9e69b4

…e/cmake-static

[Changelog] describe breaking changes

c0d52ce

[CMake] fix rename MAPNIK_STATIC_PLUGINS => BUILD_SHARED_PLUGINS

6fcdcca

mathisloge commented Feb 9, 2022

View reviewed changes

src/plugin.cpp Outdated Show resolved Hide resolved

mathisloge mentioned this pull request Feb 11, 2022

CMake build support #4191

Merged

15 tasks

mathisloge added 3 commits February 14, 2022 10:14

[datasource] add plugin_registered function

0f0e06c

[tests] also test when using static

ee63a6f

[datasource] call after_load for static plugins

45568e8

artemp marked this pull request as ready for review February 15, 2022 11:09

mathisloge marked this pull request as draft February 15, 2022 11:15

mathisloge marked this pull request as ready for review February 15, 2022 11:16

mathisloge added 10 commits August 16, 2022 21:03

wip

54b0381

default crt = 0N

f6bcdac

precommit

f485897

Revert "precommit"

2b7456f

This reverts commit f485897.

Merge branch 'master' of https://github.com/mapnik/mapnik into featur…

213be37

…e/cmake-static

precommit

eb3823a

depend on formatting

3ab8e80

Merge branch 'master' of https://github.com/mapnik/mapnik into featur…

cf78c2a

…e/cmake-static

simplify cmake

e6553ef

Merge branch 'master' of https://github.com/mapnik/mapnik into featur…

b9379f9

…e/cmake-static

mathisloge mentioned this pull request Aug 23, 2022

Using cmake-js instead of node-gyp mapnik/node-mapnik#985

Open

mathisloge added 7 commits August 23, 2022 21:37

resolve double defined symbol

4cd4985

better export [wip]

ce8bd25

Merge branch 'master' of https://github.com/mapnik/mapnik into featur…

7d267b4

…e/cmake-static

Merge branch 'master' of https://github.com/mapnik/mapnik into featur…

df1ff42

…e/cmake-static

fix vcpkg for static

0071eb1

Merge branch 'master' of https://github.com/mapnik/mapnik into featur…

be46202

…e/cmake-static

Finalize static plugins

bc38652

mathisloge force-pushed the feature/cmake-static branch from fb91a0e to bc38652 Compare December 9, 2022 13:48

artemp previously approved these changes Jan 14, 2023

View reviewed changes

Merge branch 'master' of https://github.com/mapnik/mapnik into featur…

7cce5ce

…e/cmake-static

mathisloge dismissed artemp’s stale review via 7cce5ce January 16, 2023 18:55

artemp approved these changes Jan 17, 2023

View reviewed changes

artemp merged commit 4e064b8 into mapnik:master Jan 17, 2023

leedejun pushed a commit to leedejun/mapnik that referenced this pull request Dec 26, 2023

Merge pull request mapnik#4291 from mathisloge/feature/cmake-static

1851c67

Feature/cmake static plugins

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature/cmake static plugins#4291

Feature/cmake static plugins#4291
artemp merged 49 commits intomapnik:masterfrom
mathisloge:feature/cmake-static

mathisloge commented Feb 2, 2022 •

edited

Loading

Uh oh!

mathisloge commented Feb 6, 2022

Uh oh!

codecov bot commented Feb 7, 2022 •

edited

Loading

Uh oh!

mathisloge commented Feb 9, 2022

Uh oh!

artemp commented Feb 9, 2022

Uh oh!

Uh oh!

mathisloge commented Dec 9, 2022

Uh oh!

mathisloge commented Jan 9, 2023

Uh oh!

artemp commented Jan 9, 2023 •

edited

Loading

Uh oh!

mathisloge commented Jan 10, 2023

Uh oh!

mathisloge commented Jan 16, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

mathisloge commented Feb 2, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mathisloge commented Feb 6, 2022

Uh oh!

codecov bot commented Feb 7, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

mathisloge commented Feb 9, 2022

Uh oh!

artemp commented Feb 9, 2022

Uh oh!

Uh oh!

mathisloge commented Dec 9, 2022

Uh oh!

mathisloge commented Jan 9, 2023

Uh oh!

artemp commented Jan 9, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mathisloge commented Jan 10, 2023

Uh oh!

mathisloge commented Jan 16, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

mathisloge commented Feb 2, 2022 •

edited

Loading

codecov bot commented Feb 7, 2022 •

edited

Loading

artemp commented Jan 9, 2023 •

edited

Loading