[cantarell-fonts: 1/2] Use meson rewrite command




commit c6b9d9f55b8fa9138ea8e28e5d047d14ef39f365
Author: Nikolaus Waxweiler <madigens gmail com>
Date:   Fri Aug 27 20:53:46 2021 +0000

    Use meson rewrite command

 .gitlab-ci.yml              |  9 ++++++---
 prebuilt/meson.build        | 17 +++++++++++------
 scripts/flip-prebuilt-on.py | 18 ------------------
 3 files changed, 17 insertions(+), 27 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3cb30d5e..ab985962 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,8 +10,8 @@ build-default:
     - ninja -C build install
 
     # Make a dist package with prebuilt binaries.
-    - python3 scripts/flip-prebuilt-on.py meson_options.txt
-    - git add meson_options.txt
+    - meson rewrite default-options set useprebuilt true
+    - git add meson.build
     - cp /usr/local/share/fonts/cantarell/*.otf prebuilt
     - git add prebuilt/*.otf
     - git config --global user.email "you example com"
@@ -37,7 +37,10 @@ build-just-statics:
     - ninja -C build install
 
     # Make a dist package with prebuilt binaries.
-    - git add meson_options.txt
+    - meson rewrite default-options set buildstatics true
+    - meson rewrite default-options set buildvf false
+    - meson rewrite default-options set useprebuilt true
+    - git add meson.build
     - cp /usr/local/share/fonts/cantarell/*.otf prebuilt
     - git add prebuilt/*.otf
     - git config --global user.email "you example com"
diff --git a/prebuilt/meson.build b/prebuilt/meson.build
index 78ed3134..1dfad3c6 100644
--- a/prebuilt/meson.build
+++ b/prebuilt/meson.build
@@ -1,6 +1,11 @@
-install_data('Cantarell-Thin.otf', install_dir : fontsdir)
-install_data('Cantarell-Light.otf', install_dir : fontsdir)
-install_data('Cantarell-Regular.otf', install_dir : fontsdir)
-install_data('Cantarell-Bold.otf', install_dir : fontsdir)
-install_data('Cantarell-ExtraBold.otf', install_dir : fontsdir)
-install_data('Cantarell-VF.otf', install_dir : fontsdir)
+if get_option('buildstatics') == true
+    install_data('Cantarell-Thin.otf', install_dir : fontsdir)
+    install_data('Cantarell-Light.otf', install_dir : fontsdir)
+    install_data('Cantarell-Regular.otf', install_dir : fontsdir)
+    install_data('Cantarell-Bold.otf', install_dir : fontsdir)
+    install_data('Cantarell-ExtraBold.otf', install_dir : fontsdir)
+endif
+
+if get_option('buildvf') == true
+    install_data('Cantarell-VF.otf', install_dir : fontsdir)
+endif


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]