Meson: More fixes for Windows builds #51
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Since we are assured that we are using Python 3.x on when we run Meson, we do not really need to look for the 'python3' executable, but we could just use whatever Python interpreter that is used to run Meson. This will fix situations where it is commonly the case where we may have multiple Python 3.x installations on Windows (www.python.org, and those from Cygwin/mingw-w64), so that Meson really uses one and only one Python installation to run everything that is Python-related, which will thus fix '[meson|ninja] dist' on Visual Studio builds.
It appears that Meson did not construct the paths properly for shutil.copy2() when building in a build directory that is a subdirectory of the sources, when using meson.current_build_dir(), possibly due how path separators are handled. Fix this by constructing the paths using project_build_root / 'MSVC_NMake'.
0cce9f1 to
911322c
Compare
This ensures that on Windows, the version info resources are indeed linked into the libsigc++ DLL.
|
Hi, One question though, is the intended library name sigc++-3.0, or is it sigc-3.0 (likewise for the 2.10.x version)? It seems that the original library name (i.e. autotools/NMake...) does not contain '++'... With blessings, thank you! |
This adds the MSVC files in MSVC_NMake/ that are generated during Meson's configure step to the generated release tarball. The NMake Makefiles are updated so that they will be able to find files that are now in untracked/MSVC_NMake, when a release tarball is generated with Meson.
This makes it less likely for one to accidently mix binaries linked to different CRTs in a single buildtree.
kjellahl
added a commit
that referenced
this pull request
Dec 29, 2019
Pointed out by Chun-wei Fan in PR #51.
kjellahl
added a commit
that referenced
this pull request
Dec 29, 2019
Pointed out by Chun-wei Fan in PR #51.
It's sigc-3.0 and sigc-2.0. I've corrected it. Thanks for noticing. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hi,
I went a bit further to see whether we can build libsigc++ master in maintainer mode even on Visual Studio builds, and it turns out that it is indeed possible, but it does take some extra steps which involved installing
mm-common,doxygen, andGraphViz(GraphVizinvolves installing a pretty recent mingw-w64).It seems though, with the above items installed, we still need one small change to
meson.buildso that things will work, up to and including 'meson dist'.From the commit message:
Since we are assured that we are using Python 3.x on when we run Meson, we do not really need to look for the 'python3' executable, but we could just use whatever Python interpreter that is used to run Meson.
This will fix situations where it is commonly the case where we may have multiple Python 3.x installations on Windows (www.python.org, and those from Cygwin/mingw-w64), so that Meson really uses one and only one Python installation to run everything that is Python-related, which will
thus fix '[meson|ninja] dist' on Visual Studio builds.
I also managed to re-produce the error that was mentioned in 1, in MSVC_NMake/. Apparently, this is only caused when the build directory is a subdirectory of the source tree, so this attempts to fix this, where it looks like Meson is not handling the path separators properly or so.
Another fix added is to build the .rc files on Windows so that we have the version info embedded in the libsigc++ DLL as we did in the NMake Makefiles (and the previous project files).
With blessings, thank you!