GNOME.org
 

[gimp/wip/wormnest/meson: 2/2] WIP build: try to fix meson on Windows


commit 7a93e477d17b61939c4390ef6598a5f7d13b3c36
Author: Jacob Boerema <jgboerema gmail com>
Date:   Thu Sep 30 13:14:14 2021 -0400

    WIP build: try to fix meson on Windows

 app/meson.build                        | 2 +-
 build/windows/meson.build              | 8 ++++++++
 extensions/goat-exercises/meson.build  | 4 +++-
 meson.build                            | 1 +
 plug-ins/file-bmp/meson.build          | 2 +-
 plug-ins/file-dds/meson.build          | 3 ++-
 plug-ins/file-exr/meson.build          | 2 +-
 plug-ins/file-faxg3/meson.build        | 2 +-
 plug-ins/file-fits/meson.build         | 2 +-
 plug-ins/file-fli/meson.build          | 2 +-
 plug-ins/file-ico/meson.build          | 2 +-
 plug-ins/file-jpeg/meson.build         | 2 +-
 plug-ins/file-psd/meson.build          | 2 +-
 plug-ins/file-raw/meson.build          | 1 +
 plug-ins/file-sgi/meson.build          | 2 +-
 plug-ins/file-tiff/meson.build         | 2 +-
 plug-ins/file-webp/meson.build         | 2 +-
 plug-ins/flame/meson.build             | 2 +-
 plug-ins/fractal-explorer/meson.build  | 2 +-
 plug-ins/gfig/meson.build              | 2 +-
 plug-ins/gimpressionist/meson.build    | 2 +-
 plug-ins/gradient-flare/meson.build    | 2 +-
 plug-ins/help-browser/meson.build      | 2 +-
 plug-ins/help/meson.build              | 2 +-
 plug-ins/ifs-compose/meson.build       | 2 +-
 plug-ins/imagemap/meson.build          | 2 +-
 plug-ins/lighting/meson.build          | 2 +-
 plug-ins/map-object/meson.build        | 2 +-
 plug-ins/pagecurl/meson.build          | 2 +-
 plug-ins/print/meson.build             | 2 +-
 plug-ins/script-fu/meson.build         | 2 +-
 plug-ins/selection-to-path/meson.build | 2 +-
 plug-ins/twain/meson.build             | 2 +-
 33 files changed, 43 insertions(+), 30 deletions(-)
---
diff --git a/app/meson.build b/app/meson.build
index 6f615c6e7c..556e86ca9b 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -184,7 +184,7 @@ if platform_windows
     copy: true,
   )
   gui_rc_file = windows.compile_resources(
-    gimp_app_rc,
+    gimp_app_rc_file,
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(gui_rc_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(gui_rc_name),
diff --git a/build/windows/meson.build b/build/windows/meson.build
index 4ec187e3e5..3cd6b3669f 100644
--- a/build/windows/meson.build
+++ b/build/windows/meson.build
@@ -27,6 +27,13 @@ gimp_plugins_rc = custom_target('git-version.h build-time-dependency for gimp_pl
   depends: [gitversion_h],
   output:  ['gimp-plug-ins.rc']
 ).full_path()
+message('gimp_plugins_rc=@0@'.format(gimp_plugins_rc))
+gimp_plugins_rc_full = fs.name(gimp_plugins_rc)
+#gimp_plugins_rc_full = fs.name(gimp_plugins_rc.full_path())
+gimp_plugins_rc_file=fs.name(gimp_plugins_rc_full)
+message('file=@0@'.format(gimp_plugins_rc_file))
+message('gimp_plugins_rc=@0@'.format(gimp_plugins_rc_full))
+
 
 gimp_app_rc = custom_target('git-version.h build-time-dependency for gimp.rc',
   build_by_default: true,
@@ -35,3 +42,4 @@ gimp_app_rc = custom_target('git-version.h build-time-dependency for gimp.rc',
   depends: [gitversion_h],
   output:  ['gimp.rc']
 ).full_path()
+gimp_app_rc_file = fs.name(gimp_app_rc)
diff --git a/extensions/goat-exercises/meson.build b/extensions/goat-exercises/meson.build
index d53b54847a..fcfc92a2d7 100644
--- a/extensions/goat-exercises/meson.build
+++ b/extensions/goat-exercises/meson.build
@@ -8,8 +8,10 @@ plugin_sources = [
 ]
 
 if platform_windows
+  message('gimp_plugins_rc=@0@'.format(gimp_plugins_rc))
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    gimp_plugins_rc_file,
+#    depends: [gimp_plugins_rc,],
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plug_in_name + '-c.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plug_in_name),
diff --git a/meson.build b/meson.build
index 22c167a14e..2a7f98cc64 100644
--- a/meson.build
+++ b/meson.build
@@ -84,6 +84,7 @@ so_version = '@0@.@1@.@2@'.format(lt_current, lt_age, lt_revision)
 
 pkgconfig = import('pkgconfig')
 i18n      = import('i18n')
+fs        = import('fs')
 gnome     = import('gnome')
 pythonmod = import('python')
 simd      = import('unstable-simd')
diff --git a/plug-ins/file-bmp/meson.build b/plug-ins/file-bmp/meson.build
index d1ede2ca25..71836b960d 100644
--- a/plug-ins/file-bmp/meson.build
+++ b/plug-ins/file-bmp/meson.build
@@ -8,7 +8,7 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    gimp_plugins_rc_file,
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/file-dds/meson.build b/plug-ins/file-dds/meson.build
index da8b2fa67b..0390209926 100644
--- a/plug-ins/file-dds/meson.build
+++ b/plug-ins/file-dds/meson.build
@@ -12,7 +12,8 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    gimp_plugins_rc_file,
+#    depends: [gimp_plugins_rc,],
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/file-exr/meson.build b/plug-ins/file-exr/meson.build
index 7ff9237797..ebdaa06884 100644
--- a/plug-ins/file-exr/meson.build
+++ b/plug-ins/file-exr/meson.build
@@ -9,7 +9,7 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    gimp_plugins_rc_file,
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/file-faxg3/meson.build b/plug-ins/file-faxg3/meson.build
index 4642edbd74..b8dee8e8bc 100644
--- a/plug-ins/file-faxg3/meson.build
+++ b/plug-ins/file-faxg3/meson.build
@@ -7,7 +7,7 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    gimp_plugins_rc_file,
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/file-fits/meson.build b/plug-ins/file-fits/meson.build
index 95ba044e53..3c7180934a 100644
--- a/plug-ins/file-fits/meson.build
+++ b/plug-ins/file-fits/meson.build
@@ -7,7 +7,7 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    gimp_plugins_rc_file,
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/file-fli/meson.build b/plug-ins/file-fli/meson.build
index ed4b3d8697..ad11a9c497 100644
--- a/plug-ins/file-fli/meson.build
+++ b/plug-ins/file-fli/meson.build
@@ -7,7 +7,7 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    gimp_plugins_rc_file,
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/file-ico/meson.build b/plug-ins/file-ico/meson.build
index b657e16b38..010acf6bb3 100644
--- a/plug-ins/file-ico/meson.build
+++ b/plug-ins/file-ico/meson.build
@@ -9,7 +9,7 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    gimp_plugins_rc_file,
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/file-jpeg/meson.build b/plug-ins/file-jpeg/meson.build
index 7ba13bc082..f0d4517241 100644
--- a/plug-ins/file-jpeg/meson.build
+++ b/plug-ins/file-jpeg/meson.build
@@ -11,7 +11,7 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    gimp_plugins_rc_file,
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/file-psd/meson.build b/plug-ins/file-psd/meson.build
index 9e13114c1b..35e7c4c4f5 100644
--- a/plug-ins/file-psd/meson.build
+++ b/plug-ins/file-psd/meson.build
@@ -12,7 +12,7 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    gimp_plugins_rc_file,
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/file-raw/meson.build b/plug-ins/file-raw/meson.build
index b16144d0a1..693a781274 100644
--- a/plug-ins/file-raw/meson.build
+++ b/plug-ins/file-raw/meson.build
@@ -15,6 +15,7 @@ foreach plugin_name : file_raw_exes
   if platform_windows
     plugin_rc = configure_file(
       input : gimp_plugins_rc,
+      #depends: [gimp_plugins_rc,],
       output: plugin_name + '.rc',
       copy: true,
     )
diff --git a/plug-ins/file-sgi/meson.build b/plug-ins/file-sgi/meson.build
index 954923654e..b283eef7ec 100644
--- a/plug-ins/file-sgi/meson.build
+++ b/plug-ins/file-sgi/meson.build
@@ -7,7 +7,7 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    gimp_plugins_rc_file,
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/file-tiff/meson.build b/plug-ins/file-tiff/meson.build
index c3d3c51b5a..dbc476e993 100644
--- a/plug-ins/file-tiff/meson.build
+++ b/plug-ins/file-tiff/meson.build
@@ -9,7 +9,7 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    gimp_plugins_rc_file,
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/file-webp/meson.build b/plug-ins/file-webp/meson.build
index 990e0d7e06..c0a20bde38 100644
--- a/plug-ins/file-webp/meson.build
+++ b/plug-ins/file-webp/meson.build
@@ -11,7 +11,7 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    gimp_plugins_rc_file,
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/flame/meson.build b/plug-ins/flame/meson.build
index 6dcd6ea676..67a06fc10a 100644
--- a/plug-ins/flame/meson.build
+++ b/plug-ins/flame/meson.build
@@ -9,7 +9,7 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    gimp_plugins_rc_file,
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/fractal-explorer/meson.build b/plug-ins/fractal-explorer/meson.build
index 865d9ec288..f7bec5f802 100644
--- a/plug-ins/fractal-explorer/meson.build
+++ b/plug-ins/fractal-explorer/meson.build
@@ -9,7 +9,7 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    gimp_plugins_rc_file,
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/gfig/meson.build b/plug-ins/gfig/meson.build
index a77f321018..3c19ec8d85 100644
--- a/plug-ins/gfig/meson.build
+++ b/plug-ins/gfig/meson.build
@@ -25,7 +25,7 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    gimp_plugins_rc_file,
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/gimpressionist/meson.build b/plug-ins/gimpressionist/meson.build
index 8385ebdd91..1d30ce1318 100644
--- a/plug-ins/gimpressionist/meson.build
+++ b/plug-ins/gimpressionist/meson.build
@@ -27,7 +27,7 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    gimp_plugins_rc_file,
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/gradient-flare/meson.build b/plug-ins/gradient-flare/meson.build
index b20f572667..f5b43ff00f 100644
--- a/plug-ins/gradient-flare/meson.build
+++ b/plug-ins/gradient-flare/meson.build
@@ -8,7 +8,7 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    gimp_plugins_rc_file,
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/help-browser/meson.build b/plug-ins/help-browser/meson.build
index a801f400ce..589f9c2696 100644
--- a/plug-ins/help-browser/meson.build
+++ b/plug-ins/help-browser/meson.build
@@ -12,7 +12,7 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    gimp_plugins_rc_file,
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/help/meson.build b/plug-ins/help/meson.build
index 1f07710935..36e7e72b44 100644
--- a/plug-ins/help/meson.build
+++ b/plug-ins/help/meson.build
@@ -11,7 +11,7 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    gimp_plugins_rc_file,
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/ifs-compose/meson.build b/plug-ins/ifs-compose/meson.build
index 2a74c6b362..085e6a9942 100644
--- a/plug-ins/ifs-compose/meson.build
+++ b/plug-ins/ifs-compose/meson.build
@@ -8,7 +8,7 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    gimp_plugins_rc_file,
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/imagemap/meson.build b/plug-ins/imagemap/meson.build
index 7b8868ac96..7596f41560 100644
--- a/plug-ins/imagemap/meson.build
+++ b/plug-ins/imagemap/meson.build
@@ -71,7 +71,7 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    gimp_plugins_rc_file,
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/lighting/meson.build b/plug-ins/lighting/meson.build
index 2a4d756786..5a744cbc94 100644
--- a/plug-ins/lighting/meson.build
+++ b/plug-ins/lighting/meson.build
@@ -15,7 +15,7 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    gimp_plugins_rc_file,
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/map-object/meson.build b/plug-ins/map-object/meson.build
index a1b79b2eb6..8e04979f11 100644
--- a/plug-ins/map-object/meson.build
+++ b/plug-ins/map-object/meson.build
@@ -14,7 +14,7 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    gimp_plugins_rc_file,
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/pagecurl/meson.build b/plug-ins/pagecurl/meson.build
index f2df4fc605..55ea327c60 100644
--- a/plug-ins/pagecurl/meson.build
+++ b/plug-ins/pagecurl/meson.build
@@ -39,7 +39,7 @@ plugin_sources += gnome.compile_resources(
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    gimp_plugins_rc_file,
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/print/meson.build b/plug-ins/print/meson.build
index 9e18589313..4453b07857 100644
--- a/plug-ins/print/meson.build
+++ b/plug-ins/print/meson.build
@@ -15,7 +15,7 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    gimp_plugins_rc_file,
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/script-fu/meson.build b/plug-ins/script-fu/meson.build
index 1a2fb4ccb2..7369208afd 100644
--- a/plug-ins/script-fu/meson.build
+++ b/plug-ins/script-fu/meson.build
@@ -25,7 +25,7 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    gimp_plugins_rc_file,
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/selection-to-path/meson.build b/plug-ins/selection-to-path/meson.build
index 1d008e9547..3aa672ddb7 100644
--- a/plug-ins/selection-to-path/meson.build
+++ b/plug-ins/selection-to-path/meson.build
@@ -14,7 +14,7 @@ plugin_sources = [
 
 if platform_windows
   plugin_sources += windows.compile_resources(
-    gimp_plugins_rc,
+    gimp_plugins_rc_file,
     args: [
       '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
       '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
diff --git a/plug-ins/twain/meson.build b/plug-ins/twain/meson.build
index bf75f25457..2cfb14b14a 100644
--- a/plug-ins/twain/meson.build
+++ b/plug-ins/twain/meson.build
@@ -12,7 +12,7 @@ plugin_sources = [
 ]
 
 plugin_sources += windows.compile_resources(
-  gimp_plugins_rc,
+  gimp_plugins_rc_file,
   args: [
     '--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
     '--define', 'INTERNALNAME_STR="@0@"'    .format(plugin_name),
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]