diff options
| -rw-r--r-- | data/macros.meson | 7 | ||||
| -rw-r--r-- | docs/markdown/Release-notes-for-0.43.0.md | 4 | ||||
| -rw-r--r-- | docs/markdown/Users.md | 2 | ||||
| -rwxr-xr-x | msi/createmsi.py | 5 | ||||
| -rw-r--r-- | test cases/frameworks/4 qt/meson.build | 2 | ||||
| -rw-r--r-- | test cases/frameworks/4 qt/plugin/plugin.cpp | 5 | ||||
| -rw-r--r-- | test cases/frameworks/4 qt/plugin/plugin.h | 3 |
7 files changed, 22 insertions, 6 deletions
diff --git a/data/macros.meson b/data/macros.meson index e55f7a2..b31f77e 100644 --- a/data/macros.meson +++ b/data/macros.meson @@ -33,4 +33,9 @@ %ninja_install -C %{_vpath_builddir} %meson_test \ - %ninja_test -C %{_vpath_builddir} + %ninja_test -C %{_vpath_builddir} || \ + { rc=$?; \ + echo "-----BEGIN TESTLOG-----"; \ + cat %{_vpath_builddir}/meson-logs/testlog.txt; \ + echo "-----END TESTLOG-----"; \ + exit $rc; } diff --git a/docs/markdown/Release-notes-for-0.43.0.md b/docs/markdown/Release-notes-for-0.43.0.md index c6734f0..ec7a4d5 100644 --- a/docs/markdown/Release-notes-for-0.43.0.md +++ b/docs/markdown/Release-notes-for-0.43.0.md @@ -19,7 +19,7 @@ found. Generators can now be configured to capture the standard output. See `test cases/common/98 gen extra/meson.build` for an example. -# Can index CustomTaget objects +# Can index CustomTarget objects The `CustomTarget` object can now be indexed like an array. The resulting object can be used as a source file for other Targets, this will create a @@ -93,7 +93,7 @@ flags = cc.get_supported_flags(warning_flags) # Better support for shared libraries in non-system paths -Meson has had support for prebuilt object files and static libraries. +Meson has support for prebuilt object files and static libraries. This release adds feature parity to shared libraries that are either in non-standard system paths or shipped as part of your project. On systems that support rpath, Meson automatically adds rpath entries diff --git a/docs/markdown/Users.md b/docs/markdown/Users.md index 46c2654..330c04b 100644 --- a/docs/markdown/Users.md +++ b/docs/markdown/Users.md @@ -43,4 +43,4 @@ If you have a project that uses Meson that you want to add to this list, let us - [Wayland and Weston](https://lists.freedesktop.org/archives/wayland-devel/2016-November/031984.html), a next generation display server (not merged yet) - [ZStandard](https://github.com/facebook/zstd/commit/4dca56ed832c6a88108a2484a8f8ff63d8d76d91) a compression algorithm developed at Facebook (not used by default) -Note that a more up-to-date list of GNOME projects that use Meson can be found here: https://wiki.gnome.org/Initiatives/GnomeGoals/MesonPorting +Note that a more up-to-date list of GNOME projects that use Meson can be found [here](https://wiki.gnome.org/Initiatives/GnomeGoals/MesonPorting). diff --git a/msi/createmsi.py b/msi/createmsi.py index c045a3e..7f165d8 100755 --- a/msi/createmsi.py +++ b/msi/createmsi.py @@ -43,6 +43,9 @@ class PackageGenerator: self.main_xml = 'meson.wxs' self.main_o = 'meson.wixobj' self.bytesize = 32 if '32' in platform.architecture()[0] else 64 + # rely on the environment variable since python architecture may not be the same as system architecture + if 'PROGRAMFILES(X86)' in os.environ: + self.bytesize = 64 self.final_output = 'meson-%s-%d.msi' % (self.version, self.bytesize) self.staging_dirs = ['dist', 'dist2'] if self.bytesize == 64: @@ -50,7 +53,7 @@ class PackageGenerator: self.redist_path = 'C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Redist\\MSVC\\14.11.25325\\MergeModules\\Microsoft_VC141_CRT_x64.msm' else: self.progfile_dir = 'ProgramFilesFolder' - self.redist_path = 'c:\\Program Files\\Microsoft Visual Studio\\2017\\Community\\VC\\Redist\\MSVC\\14.11.25325\\MergeModules\\Microsoft_VC141_CRT_x86.msm' + self.redist_path = 'C:\\Program Files\\Microsoft Visual Studio\\2017\\Community\\VC\\Redist\\MSVC\\14.11.25325\\MergeModules\\Microsoft_VC141_CRT_x86.msm' self.component_num = 0 self.feature_properties = { self.staging_dirs[0]: { diff --git a/test cases/frameworks/4 qt/meson.build b/test cases/frameworks/4 qt/meson.build index c6f108b..39be19f 100644 --- a/test cases/frameworks/4 qt/meson.build +++ b/test cases/frameworks/4 qt/meson.build @@ -77,7 +77,7 @@ foreach qt : ['qt4', 'qt5'] moc_headers : 'plugin/plugin.h', include_directories : plugin_includes ) - plugin = library('plugin', 'plugin/plugin.cpp', pluginpreprocess, + plugin = library(qt + 'plugin', 'plugin/plugin.cpp', pluginpreprocess, include_directories : plugin_includes, dependencies : qtcore) endif diff --git a/test cases/frameworks/4 qt/plugin/plugin.cpp b/test cases/frameworks/4 qt/plugin/plugin.cpp index eeae98d..2c013fe 100644 --- a/test cases/frameworks/4 qt/plugin/plugin.cpp +++ b/test cases/frameworks/4 qt/plugin/plugin.cpp @@ -5,3 +5,8 @@ QString plugin1::getResource() { return "hello world"; } + + +#if QT_VERSION < 0x050000 + Q_EXPORT_PLUGIN2(Plugin1, plugin1) +#endif
\ No newline at end of file diff --git a/test cases/frameworks/4 qt/plugin/plugin.h b/test cases/frameworks/4 qt/plugin/plugin.h index 1138f41..c8e14e4 100644 --- a/test cases/frameworks/4 qt/plugin/plugin.h +++ b/test cases/frameworks/4 qt/plugin/plugin.h @@ -5,7 +5,10 @@ class plugin1:public QObject,public PluginInterface { Q_OBJECT Q_INTERFACES(PluginInterface) +#if QT_VERSION >= 0x050000 Q_PLUGIN_METADATA(IID "demo.PluginInterface" FILE "plugin.json") +#endif + public: QString getResource() override; }; |