summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2020-09-22 20:05:37 +0200
committerWerner Lemberg <wl@gnu.org>2020-09-22 20:05:37 +0200
commit3ce0df52e2bba8a8f788a05c705b90fd10275665 (patch)
treef700972039694f9ea35755439938d9d6976257ae
parentd686f2ff9c40235085558fed91a57d05c7656335 (diff)
downloadfreetype2-3ce0df52e2bba8a8f788a05c705b90fd10275665.tar.gz
[meson] Move auxiliary scripts to `builds/meson`.
Suggested by Alexei. * scripts/*.py: Move meson scripts to... * builds/meson/*.py: ... this new location. * meson.build: Updated.
-rw-r--r--ChangeLog11
-rw-r--r--builds/meson/extract_freetype_version.py (renamed from scripts/extract_freetype_version.py)0
-rw-r--r--builds/meson/extract_libtool_version.py (renamed from scripts/extract_libtool_version.py)0
-rw-r--r--builds/meson/generate_reference_docs.py (renamed from scripts/generate_reference_docs.py)0
-rw-r--r--builds/meson/parse_modules_cfg.py (renamed from scripts/parse_modules_cfg.py)0
-rw-r--r--builds/meson/process_ftoption_h.py (renamed from scripts/process_ftoption_h.py)0
-rw-r--r--meson.build16
7 files changed, 19 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 574e818f2..9982953e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2020-09-22 Werner Lemberg <wl@gnu.org>
+
+ [meson] Move auxiliary scripts to `builds/meson`.
+
+ Suggested by Alexei.
+
+ * scripts/*.py: Move meson scripts to...
+ * builds/meson/*.py: ... this new location.
+
+ * meson.build: Updated.
+
2020-09-21 David Turner <david@freetype.org>
Add python script for building tarballs.
diff --git a/scripts/extract_freetype_version.py b/builds/meson/extract_freetype_version.py
index 50e5a5485..50e5a5485 100644
--- a/scripts/extract_freetype_version.py
+++ b/builds/meson/extract_freetype_version.py
diff --git a/scripts/extract_libtool_version.py b/builds/meson/extract_libtool_version.py
index 0569481b3..0569481b3 100644
--- a/scripts/extract_libtool_version.py
+++ b/builds/meson/extract_libtool_version.py
diff --git a/scripts/generate_reference_docs.py b/builds/meson/generate_reference_docs.py
index 219017c9d..219017c9d 100644
--- a/scripts/generate_reference_docs.py
+++ b/builds/meson/generate_reference_docs.py
diff --git a/scripts/parse_modules_cfg.py b/builds/meson/parse_modules_cfg.py
index e0f760561..e0f760561 100644
--- a/scripts/parse_modules_cfg.py
+++ b/builds/meson/parse_modules_cfg.py
diff --git a/scripts/process_ftoption_h.py b/builds/meson/process_ftoption_h.py
index b5f80c314..b5f80c314 100644
--- a/scripts/process_ftoption_h.py
+++ b/builds/meson/process_ftoption_h.py
diff --git a/meson.build b/meson.build
index 35254093a..ea304954e 100644
--- a/meson.build
+++ b/meson.build
@@ -29,11 +29,11 @@ python = import('python')
python_exe = python.find_installation(required: true)
ft2_version = run_command(python_exe,
- files('scripts/extract_freetype_version.py'),
+ files('builds/meson/extract_freetype_version.py'),
files('include/freetype/freetype.h')).stdout().strip()
ft2_libtool_version = run_command(python_exe,
- files('scripts/extract_libtool_version.py'),
+ files('builds/meson/extract_libtool_version.py'),
'--soversion',
files('builds/unix/configure.raw')).stdout().strip()
@@ -46,7 +46,7 @@ ft2_includes = include_directories('include')
ftmodule_h = custom_target('ftmodule.h',
output: 'ftmodule.h',
input: 'modules.cfg',
- command: [python_exe, files('scripts/parse_modules_cfg.py'),
+ command: [python_exe, files('builds/meson/parse_modules_cfg.py'),
'--format=ftmodule.h', '@INPUT@', '--output', '@OUTPUT@'],
install: true,
install_dir: 'include/freetype2/freetype/config',
@@ -57,7 +57,7 @@ ft2_sources = [ftmodule_h]
# FreeType 2 modules.
ft_main_modules = run_command(python_exe,
- files('scripts/parse_modules_cfg.py'),
+ files('builds/meson/parse_modules_cfg.py'),
'--format=main-modules',
files('modules.cfg')).stdout().strip().split()
@@ -78,7 +78,7 @@ endforeach
# NOTE: The `gzip` and `bzip2` aux modules are handled through options.
ft_aux_modules = run_command(python_exe,
- files('scripts/parse_modules_cfg.py'),
+ files('builds/meson/parse_modules_cfg.py'),
'--format=aux-modules',
files('modules.cfg')).stdout().strip().split()
@@ -102,7 +102,7 @@ endforeach
# Normally configured through `modules.cfg`.
base_extensions = run_command(python_exe,
- files('scripts/parse_modules_cfg.py'),
+ files('builds/meson/parse_modules_cfg.py'),
'--format=base-extensions-list',
files('modules.cfg')).stdout().split()
@@ -223,7 +223,7 @@ ft2_deps = []
# Generate `ftoption.h` based on available dependencies.
ftoption_command = [python_exe,
- files('scripts/process_ftoption_h.py'),
+ files('builds/meson/process_ftoption_h.py'),
'@INPUT@', '--output=@OUTPUT@']
# GZip support
@@ -358,7 +358,7 @@ gen_docs = custom_target('freetype2 reference documentation',
output: 'docs',
input: ft2_public_headers + ft2_config_headers,
command: [python_exe,
- files('scripts/generate_reference_docs.py'),
+ files('builds/meson/generate_reference_docs.py'),
'--version=' + ft2_version,
'--input-dir=' + meson.source_root(),
'--output-dir=@OUTPUT@'