GNOME.org
 

[gtkmm-documentation/gtkmm-3-24] meson.build: Specify 'check' option in run_command()

commit c2db659922fdd5f160053f73469dda41b0872741
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date:   Sat Feb 19 09:03:45 2022 +0100

    meson.build: Specify 'check' option in run_command()
    
    The default value will be changed in future Meson releases.
    
    Don't use deprecated python3.path() and execute(..., gui_app: ...).
    Let import('python').find_installation() always find the python
    installation used to run Meson.

 docs/tutorial/meson.build                | 1 +
 examples/book/buildapp/meson.build       | 2 +-
 examples/book/buildapp/step1/meson.build | 5 +++--
 examples/book/buildapp/step2/meson.build | 5 +++--
 examples/book/buildapp/step3/meson.build | 5 +++--
 examples/book/buildapp/step4/meson.build | 5 +++--
 examples/book/buildapp/step5/meson.build | 5 +++--
 examples/book/buildapp/step6/meson.build | 5 +++--
 examples/book/buildapp/step7/meson.build | 5 +++--
 examples/book/buildapp/step8/meson.build | 5 +++--
 examples/book/buildapp/step9/meson.build | 5 +++--
 examples/book/giomm/meson.build          | 1 +
 examples/book/meson.build                | 3 ++-
 examples/book/treeview/meson.build       | 2 +-
 examples/others/meson.build              | 2 +-
 meson.build                              | 6 +++---
 16 files changed, 37 insertions(+), 25 deletions(-)
---
diff --git a/docs/tutorial/meson.build b/docs/tutorial/meson.build
index ff5a0ea..c5aa5db 100644
--- a/docs/tutorial/meson.build
+++ b/docs/tutorial/meson.build
@@ -19,6 +19,7 @@ if xmllint.found()
     validate,
     meson.current_source_dir() / 'can_use_xmllint.xml',
     meson.current_build_dir() / 'can_use_xmllint.stamp',
+    check: false,
   ).returncode() == 0
   if not can_parse_and_validate
     # The DocBook V5.0 package is called docbook5-xml in Ubuntu,
diff --git a/examples/book/buildapp/meson.build b/examples/book/buildapp/meson.build
index 3f97e84..950902f 100644
--- a/examples/book/buildapp/meson.build
+++ b/examples/book/buildapp/meson.build
@@ -58,7 +58,7 @@ foreach ex : examples_book_buildapp
 
   exe_file = executable(ex_name, ex_sources, resources, schemas,
     dependencies: gtkmm_dep,
-    gui_app: true,
+    win_subsystem: 'windows',
     build_by_default: build_examples_by_default
   )
 
diff --git a/examples/book/buildapp/step1/meson.build b/examples/book/buildapp/step1/meson.build
index 4c7225d..559501b 100644
--- a/examples/book/buildapp/step1/meson.build
+++ b/examples/book/buildapp/step1/meson.build
@@ -17,10 +17,11 @@ cpp_sources = [
 
 executable(program_name,
   cpp_sources,
-  dependencies: gtkmm_dep
+  dependencies: gtkmm_dep,
+  win_subsystem: 'windows',
 )
 
-python3 = import('python').find_installation('python3')
+python3 = import('python').find_installation()
 install_cmd = meson.current_source_dir() / 'install-cmd.py'
 
 conf_data = configuration_data()
diff --git a/examples/book/buildapp/step2/meson.build b/examples/book/buildapp/step2/meson.build
index 698241c..dc77031 100644
--- a/examples/book/buildapp/step2/meson.build
+++ b/examples/book/buildapp/step2/meson.build
@@ -21,10 +21,11 @@ resources = gnome.compile_resources('resources',
                                     source_dir: '.')
 executable(program_name,
   cpp_sources, resources,
-  dependencies: gtkmm_dep
+  dependencies: gtkmm_dep,
+  win_subsystem: 'windows',
 )
 
-python3 = import('python').find_installation('python3')
+python3 = import('python').find_installation()
 source_step1_dir = meson.current_source_dir() / '..' / 'step1'
 install_cmd = source_step1_dir / 'install-cmd.py'
 
diff --git a/examples/book/buildapp/step3/meson.build b/examples/book/buildapp/step3/meson.build
index 698241c..dc77031 100644
--- a/examples/book/buildapp/step3/meson.build
+++ b/examples/book/buildapp/step3/meson.build
@@ -21,10 +21,11 @@ resources = gnome.compile_resources('resources',
                                     source_dir: '.')
 executable(program_name,
   cpp_sources, resources,
-  dependencies: gtkmm_dep
+  dependencies: gtkmm_dep,
+  win_subsystem: 'windows',
 )
 
-python3 = import('python').find_installation('python3')
+python3 = import('python').find_installation()
 source_step1_dir = meson.current_source_dir() / '..' / 'step1'
 install_cmd = source_step1_dir / 'install-cmd.py'
 
diff --git a/examples/book/buildapp/step4/meson.build b/examples/book/buildapp/step4/meson.build
index 698241c..dc77031 100644
--- a/examples/book/buildapp/step4/meson.build
+++ b/examples/book/buildapp/step4/meson.build
@@ -21,10 +21,11 @@ resources = gnome.compile_resources('resources',
                                     source_dir: '.')
 executable(program_name,
   cpp_sources, resources,
-  dependencies: gtkmm_dep
+  dependencies: gtkmm_dep,
+  win_subsystem: 'windows',
 )
 
-python3 = import('python').find_installation('python3')
+python3 = import('python').find_installation()
 source_step1_dir = meson.current_source_dir() / '..' / 'step1'
 install_cmd = source_step1_dir / 'install-cmd.py'
 
diff --git a/examples/book/buildapp/step5/meson.build b/examples/book/buildapp/step5/meson.build
index 15414b1..c90e541 100644
--- a/examples/book/buildapp/step5/meson.build
+++ b/examples/book/buildapp/step5/meson.build
@@ -24,10 +24,11 @@ schemas = gnome.compile_schemas(depend_files: 'org.gtkmm.exampleapp.gschema.xml'
 
 executable(program_name,
   cpp_sources, resources, schemas,
-  dependencies: gtkmm_dep
+  dependencies: gtkmm_dep,
+  win_subsystem: 'windows',
 )
 
-python3 = import('python').find_installation('python3')
+python3 = import('python').find_installation()
 source_step1_dir = meson.current_source_dir() / '..' / 'step1'
 install_cmd = source_step1_dir / 'install-cmd.py'
 
diff --git a/examples/book/buildapp/step6/meson.build b/examples/book/buildapp/step6/meson.build
index 15414b1..c90e541 100644
--- a/examples/book/buildapp/step6/meson.build
+++ b/examples/book/buildapp/step6/meson.build
@@ -24,10 +24,11 @@ schemas = gnome.compile_schemas(depend_files: 'org.gtkmm.exampleapp.gschema.xml'
 
 executable(program_name,
   cpp_sources, resources, schemas,
-  dependencies: gtkmm_dep
+  dependencies: gtkmm_dep,
+  win_subsystem: 'windows',
 )
 
-python3 = import('python').find_installation('python3')
+python3 = import('python').find_installation()
 source_step1_dir = meson.current_source_dir() / '..' / 'step1'
 install_cmd = source_step1_dir / 'install-cmd.py'
 
diff --git a/examples/book/buildapp/step7/meson.build b/examples/book/buildapp/step7/meson.build
index 15414b1..c90e541 100644
--- a/examples/book/buildapp/step7/meson.build
+++ b/examples/book/buildapp/step7/meson.build
@@ -24,10 +24,11 @@ schemas = gnome.compile_schemas(depend_files: 'org.gtkmm.exampleapp.gschema.xml'
 
 executable(program_name,
   cpp_sources, resources, schemas,
-  dependencies: gtkmm_dep
+  dependencies: gtkmm_dep,
+  win_subsystem: 'windows',
 )
 
-python3 = import('python').find_installation('python3')
+python3 = import('python').find_installation()
 source_step1_dir = meson.current_source_dir() / '..' / 'step1'
 install_cmd = source_step1_dir / 'install-cmd.py'
 
diff --git a/examples/book/buildapp/step8/meson.build b/examples/book/buildapp/step8/meson.build
index 15414b1..c90e541 100644
--- a/examples/book/buildapp/step8/meson.build
+++ b/examples/book/buildapp/step8/meson.build
@@ -24,10 +24,11 @@ schemas = gnome.compile_schemas(depend_files: 'org.gtkmm.exampleapp.gschema.xml'
 
 executable(program_name,
   cpp_sources, resources, schemas,
-  dependencies: gtkmm_dep
+  dependencies: gtkmm_dep,
+  win_subsystem: 'windows',
 )
 
-python3 = import('python').find_installation('python3')
+python3 = import('python').find_installation()
 source_step1_dir = meson.current_source_dir() / '..' / 'step1'
 install_cmd = source_step1_dir / 'install-cmd.py'
 
diff --git a/examples/book/buildapp/step9/meson.build b/examples/book/buildapp/step9/meson.build
index 15414b1..c90e541 100644
--- a/examples/book/buildapp/step9/meson.build
+++ b/examples/book/buildapp/step9/meson.build
@@ -24,10 +24,11 @@ schemas = gnome.compile_schemas(depend_files: 'org.gtkmm.exampleapp.gschema.xml'
 
 executable(program_name,
   cpp_sources, resources, schemas,
-  dependencies: gtkmm_dep
+  dependencies: gtkmm_dep,
+  win_subsystem: 'windows',
 )
 
-python3 = import('python').find_installation('python3')
+python3 = import('python').find_installation()
 source_step1_dir = meson.current_source_dir() / '..' / 'step1'
 install_cmd = source_step1_dir / 'install-cmd.py'
 
diff --git a/examples/book/giomm/meson.build b/examples/book/giomm/meson.build
index 43733d8..48c129d 100644
--- a/examples/book/giomm/meson.build
+++ b/examples/book/giomm/meson.build
@@ -37,6 +37,7 @@ foreach ex : examples_book_giomm
 
   exe_file = executable(ex_name, ex_sources, resources,
     dependencies: giomm_dep,
+    win_subsystem: 'console',
     build_by_default: build_examples_by_default
   )
 
diff --git a/examples/book/meson.build b/examples/book/meson.build
index 09e0c76..5a163c3 100644
--- a/examples/book/meson.build
+++ b/examples/book/meson.build
@@ -131,6 +131,7 @@ foreach ex : examples_book
     # input/example is not a GUI app.
     exe_file = executable(ex_name, ex_sources, resources,
       dependencies: gtkmm_dep,
+      win_subsystem: 'console',
       cpp_args: has_mkfifo ? [] : [ '-DDONT_HAVE_MKFIFO=1' ],
       build_by_default: build_examples_by_default
     )
@@ -140,7 +141,7 @@ foreach ex : examples_book
 
     exe_file = executable(ex_name, ex_sources, resources,
       dependencies: deps,
-      gui_app: true,
+      win_subsystem: 'windows',
       build_by_default: build_examples_by_default
     )
   endif
diff --git a/examples/book/treeview/meson.build b/examples/book/treeview/meson.build
index 9c5e3dd..39e180d 100644
--- a/examples/book/treeview/meson.build
+++ b/examples/book/treeview/meson.build
@@ -42,7 +42,7 @@ foreach ex : examples_book_treeview
 
   exe_file = executable(ex_name, ex_sources, resources,
     dependencies: gtkmm_dep,
-    gui_app: true,
+    win_subsystem: 'windows',
     build_by_default: build_examples_by_default
   )
 
diff --git a/examples/others/meson.build b/examples/others/meson.build
index 231ff8f..d9ba5ec 100644
--- a/examples/others/meson.build
+++ b/examples/others/meson.build
@@ -42,7 +42,7 @@ foreach ex : examples_others
 
   exe_file = executable(ex_name, ex_sources, resources,
     dependencies: gtkmm_dep,
-    gui_app: true,
+    win_subsystem: 'windows',
     build_by_default: build_examples_by_default
   )
 
diff --git a/meson.build b/meson.build
index d5ef552..4a12ced 100644
--- a/meson.build
+++ b/meson.build
@@ -2,11 +2,11 @@
 
 project('gtkmm-documentation', 'c', 'cpp',
   version: '3.24.1',
+  license: 'GPLv2',
   default_options: [
     'cpp_std=c++14'
   ],
-  meson_version: '>= 0.50.0', # required for python3.path()
-  license: 'GPLv2'
+  meson_version: '>= 0.56.0', # required for executable(win_subsystem:)
 )
 
 python3 = import('python').find_installation()
@@ -92,7 +92,7 @@ if can_add_dist_script
   ]
   # Modify the contents of the distribution directory.
   meson.add_dist_script(
-    python3.path(), extra_dist_cmd,
+    python3, extra_dist_cmd,
     project_source_root,
     project_build_root,
     dont_distribute,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]