[magnum] Properly deploy plugins #3191

Squareys · 2018-04-02T23:27:38Z

I finally fixed the plugin deployment of the magnum package (see mosra/magnum#235)! As this is the first time I came in contact with Powershell, you may want to have a close look at that.

Also, to be able to build --head with upcoming features properly, I added the repective features and incremented the CONTROL-file version.

@mosra may want to have a quick glance at the depedencies of new features.

Thanks in advance,
Jonathan.

Squareys · 2018-04-03T11:09:04Z

@mosra Done with the changes discussed on gitter! :)

mosra

Thanks a lot. 👍

Tricky question: does this automagically copy also dependencies of the plugins? (e.g. is libpng DLL that PngImporter depends on copied as well?) Or does vcpkg handle that part already? :)

mosra · 2018-04-03T11:12:14Z

ports/magnum-plugins/portfile.cmake

@@ -41,6 +43,7 @@ vcpkg_configure_cmake(
    OPTIONS
        ${_COMPONENT_FLAGS}
        -DBUILD_STATIC=${BUILD_STATIC}
+        -DBUILD_PLUGINS_STATIC=${DBUILD_PLUGINS_STATIC}


Hmm, maybe just have a single BUILD_PLUGINS_STATIC variable and set it to both? Also, you have DBUILD there ;)

-DBUILD_STATIC=${BUILD_PLUGINS_STATIC} -DBUILD_PLUGINS_STATIC=${BUILD_PLUGINS_STATIC}

mosra · 2018-04-03T11:18:09Z

ports/magnum/CONTROL

-Build-Depends: freeglut
+Feature: anyaudioimporter
+Description: (Upcoming) AnyAudioImporter plugin
+Build-Depends: magnum[trade]


magnum[audio] instead

mosra · 2018-04-03T11:19:11Z

ports/magnum/CONTROL

+
+Feature: glutapplication
+Description: GlutApplication library
+Build-Depends: freeglut


Build-Depends: freeglut, magnum[gl]

mosra · 2018-04-03T11:19:33Z

ports/magnum/CONTROL

-Description: MeshTools library
+Feature: opengltester
+Description: OpenGLTester library
+Build-Depends: corrade[testsuite]


Build-Depends: corrade[testsuite], magnum[gl]

mosra · 2018-04-03T11:20:33Z

ports/magnum/CONTROL

+Description: (Upcoming) Trade library
+
+Feature: wavaudioimporter
+Description: WavAudioImporter plugin
 Build-Depends: magnum[audio]

 Feature: windowlesswglapplication
 Description: WindowlessWglApplication library

 Feature: wglcontext
 Description: WglContext library


Build-Depends: magnum[gl]

mosra · 2018-04-03T11:22:14Z

ports/magnum/CONTROL

+
+Feature: distancefieldconverter
+Description: magnum-distancefieldconverter utility
+Build-Depends: magnum[texturetools]

 Feature: fontconverter
 Description: magnum-fontconverter utility
 Build-Depends: magnum[text]


Build-Depends: magnum[text], magnum[gl]

mosra · 2018-04-03T11:22:45Z

ports/magnum/CONTROL

+
+Feature: distancefieldconverter
+Description: magnum-distancefieldconverter utility
+Build-Depends: magnum[texturetools]


Build-Depends: magnum[texturetools], magnum[gl]

mosra · 2018-04-03T11:25:06Z

ports/magnum-plugins/CONTROL

@@ -79,3 +87,6 @@ Feature: stbvorbisaudioimporter
 Description: StbVorbisAudioImporter plugin
 Build-Depends: magnum[audio]

+Feature: tinygltfimporter
+Description: (Upcoming) TinyGltfImporter plugin


This is not upcoming anymore :)

Well, it's not in the release that has been tagged in the accompanying portfile.cmake, so "in perspective of the last release" it is indeed upcoming until that is tagged :)

Ah, sure, true, then leave it there. Sorry, my perception of time is mixed up again :)

mosra · 2018-04-03T11:25:56Z

ports/magnum-plugins/CONTROL

@@ -1,31 +1,35 @@
 Source: magnum-plugins
-Version: 2018.02-1
-Build-Depends: magnum
+Version: 2018.02-2


Why no Build-Depends: magnum?

I removed the magnum[trade] and didn't think :D

mosra · 2018-04-03T11:27:06Z

scripts/buildsystems/msbuild/applocal.ps1

 resolve($targetBinary)
-Write-Verbose $($g_searched | out-string)


Why this was removed?

Good question, thanks!

Squareys · 2018-04-03T11:54:02Z

does this automagically copy also dependencies of the plugins? (e.g. is libpng DLL that PngImporter depends on copied as well?) Or does vcpkg handle that part already? :)

Not so tricky answer: Yes! :D

Signed-off-by: Squareys <squareys@googlemail.com>

Prepares upcoming move of those sublibraries and allows building --head immediately. For current release this only adds some unused cmake flags that will be ignored. Signed-off-by: Squareys <squareys@googlemail.com>

Squareys · 2018-04-03T12:18:47Z

@mosra Done making the requested changes, thank you very much for the review!

@ras0219-msft This is now ready to merge, thanks for the help with mosra/magnum#235 !
PS: A while ago I opened this issue here, it would be great to get some brief feedback on that.

And sort features alphabetically. Signed-off-by: Squareys <squareys@googlemail.com>

Signed-off-by: Squareys <squareys@googlemail.com>

Squareys · 2018-04-05T05:57:23Z

@mosra Added the two missing feature dependencies, as discussed per gitter.

You may need to reapprove.

Signed-off-by: Squareys <squareys@googlemail.com>

Squareys · 2018-04-15T16:34:56Z

@ras0219-msft This is ready to be merged. (In case it wasn't clear)

ras0219-msft · 2018-04-19T02:33:08Z

Thanks, this looks good to me as well!

Squareys force-pushed the magnum-deploy-plugins branch from e025958 to b8a14e8 Compare April 2, 2018 23:34

Squareys mentioned this pull request Apr 2, 2018

2D / pixel coords, vcpkg plugin workflow mosra/magnum#235

Closed

Squareys force-pushed the magnum-deploy-plugins branch from b8a14e8 to 3816f3f Compare April 3, 2018 11:08

mosra reviewed Apr 3, 2018

View reviewed changes

[magnum] Properly deploy magnum plugins

5a375b5

Signed-off-by: Squareys <squareys@googlemail.com>

Squareys force-pushed the magnum-deploy-plugins branch from 3816f3f to 2491c82 Compare April 3, 2018 12:13

Squareys added 2 commits April 3, 2018 14:13

[magnum-plugins] Add tinygltfimporter feature

dbda060

Signed-off-by: Squareys <squareys@googlemail.com>

[magnum][magnum-plugins] Add features: trade and any*

5d83844

Prepares upcoming move of those sublibraries and allows building --head immediately. For current release this only adds some unused cmake flags that will be ignored. Signed-off-by: Squareys <squareys@googlemail.com>

Squareys force-pushed the magnum-deploy-plugins branch from 2491c82 to a8dc3df Compare April 3, 2018 12:14

Squareys added 2 commits April 3, 2018 14:21

[magnum] Add gl feature, cleanup dependencies, mark upcoming features

0e3381a

And sort features alphabetically. Signed-off-by: Squareys <squareys@googlemail.com>

[magnum-plugins] Prepare renaming of static flag for --head installs

f17a99d

Signed-off-by: Squareys <squareys@googlemail.com>

Squareys force-pushed the magnum-deploy-plugins branch from d5a5b90 to f17a99d Compare April 3, 2018 12:21

mosra approved these changes Apr 3, 2018

View reviewed changes

[magnum] Add two missing feature dependencies

16939e8

Signed-off-by: Squareys <squareys@googlemail.com>

[magnum] Enable magnum[any*] features by default

dbc21d4

Signed-off-by: Squareys <squareys@googlemail.com>

mosra approved these changes Apr 6, 2018

View reviewed changes

ras0219-msft merged commit 3a3fa5c into microsoft:master Apr 19, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[magnum] Properly deploy plugins #3191

[magnum] Properly deploy plugins #3191

Squareys commented Apr 2, 2018

Squareys commented Apr 3, 2018

mosra left a comment

mosra Apr 3, 2018

mosra Apr 3, 2018

mosra Apr 3, 2018

mosra Apr 3, 2018

mosra Apr 3, 2018

mosra Apr 3, 2018

mosra Apr 3, 2018

mosra Apr 3, 2018

Squareys Apr 3, 2018

mosra Apr 3, 2018

mosra Apr 3, 2018

Squareys Apr 3, 2018

mosra Apr 3, 2018

Squareys Apr 3, 2018

Squareys commented Apr 3, 2018

Squareys commented Apr 3, 2018 •

edited

Squareys commented Apr 5, 2018

Squareys commented Apr 15, 2018

ras0219-msft commented Apr 19, 2018

		resolve($targetBinary)
		Write-Verbose $($g_searched \| out-string)

[magnum] Properly deploy plugins #3191

[magnum] Properly deploy plugins #3191

Conversation

Squareys commented Apr 2, 2018

Squareys commented Apr 3, 2018

mosra left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Squareys commented Apr 3, 2018

Squareys commented Apr 3, 2018 • edited

Squareys commented Apr 5, 2018

Squareys commented Apr 15, 2018

ras0219-msft commented Apr 19, 2018

Squareys commented Apr 3, 2018 •

edited