freetype-commit
[Top][All Lists]
Advanced

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

[freetype2] master 1b69fb9 40/68: * meson.build: Set project version.


From: Werner Lemberg
Subject: [freetype2] master 1b69fb9 40/68: * meson.build: Set project version.
Date: Fri, 5 Mar 2021 09:29:40 -0500 (EST)

branch: master
commit 1b69fb9bdb78265707b00e97ab274c42a2334670
Author: Xavier Claessens <xavier.claessens@collabora.com>
Commit: Werner Lemberg <wl@gnu.org>

    * meson.build: Set project version.
---
 ChangeLog   | 4 ++++
 meson.build | 9 +++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8f81b09..d5521c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2021-02-09  Xavier Claessens  <xavier.claessens@collabora.com>
+
+       * meson.build: Set project version.
+
 2021-02-04  Werner Lemberg  <wl@gnu.org>
 
        [base] Fix Netpbm tracing message.
diff --git a/meson.build b/meson.build
index 339492c..dac0e6b 100644
--- a/meson.build
+++ b/meson.build
@@ -13,9 +13,10 @@
 
 
 project('freetype2', 'c',
-  version: '2.10.4',
   meson_version: '>= 0.55.0',
   default_options: ['default_library=both'],
+  version: run_command('builds/meson/extract_freetype_version.py',
+                       'include/freetype/freetype.h').stdout().strip(),
 )
 
 #
@@ -29,10 +30,6 @@ project('freetype2', 'c',
 python = import('python')
 python_exe = python.find_installation(required: true)
 
-ft2_version = run_command(python_exe,
-  files('builds/meson/extract_freetype_version.py'),
-  files('include/freetype/freetype.h')).stdout().strip()
-
 ft2_so_version = run_command(python_exe,
   files('builds/meson/extract_libtool_version.py'),
   '--soversion',
@@ -378,7 +375,7 @@ gen_docs = custom_target('freetype2 reference 
documentation',
   input: ft2_public_headers + ft2_config_headers,
   command: [python_exe,
     files('builds/meson/generate_reference_docs.py'),
-    '--version=' + ft2_version,
+    '--version=' + meson.project_version(),
     '--input-dir=' + meson.source_root(),
     '--output-dir=@OUTPUT@'
   ],



reply via email to

[Prev in Thread] Current Thread [Next in Thread]