summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKjell Ahlstedt <kjellahlstedt@gmail.com>2019-09-29 15:48:59 +0200
committerKjell Ahlstedt <kjellahlstedt@gmail.com>2019-09-29 15:48:59 +0200
commit3e9c3bb40484cc5da9b6c520b1d6a825641afd38 (patch)
tree82be8ea5e21bfb937d56e357f1e478a3a518a9dc
parentd28031cb786107c8a4400008ee2e41635ddea992 (diff)
downloadmm-common-3e9c3bb40484cc5da9b6c520b1d6a825641afd38.tar.gz
README, util/build_scripts: Minor changes in documentation
-rw-r--r--README7
-rwxr-xr-xutil/build_scripts/dist-build-scripts.py2
-rwxr-xr-xutil/build_scripts/doc-reference.py2
3 files changed, 7 insertions, 4 deletions
diff --git a/README b/README
index 7c8ad06..3d7286b 100644
--- a/README
+++ b/README
@@ -81,8 +81,11 @@ invoked with run_command() early in a meson.build file. The meson.build file
should contain code similar to
python = import('python').find_installation('python3')
- cmd_py = 'import os, sys\n' \
- + 'sys.exit(0 if os.path.isdir("' + (project_source_root/'.git') + '") else 1)\n'
+ cmd_py = '''
+ import os
+ import sys
+ sys.exit(0 if os.path.isdir("@0@") else 1)
+ '''.format(project_source_root / '.git')
is_git_build = run_command(python, '-c', cmd_py).returncode() == 0
maintainer_mode_opt = get_option('maintainer-mode')
maintainer_mode = maintainer_mode_opt == 'true' or \
diff --git a/util/build_scripts/dist-build-scripts.py b/util/build_scripts/dist-build-scripts.py
index 3ead7cd..7318bc7 100755
--- a/util/build_scripts/dist-build-scripts.py
+++ b/util/build_scripts/dist-build-scripts.py
@@ -17,7 +17,7 @@ dist_script_dir = os.path.join(os.getenv('MESON_DIST_ROOT'), sys.argv[2])
# Create the distribution script directory, if it does not exist.
os.makedirs(dist_script_dir, exist_ok=True)
-# Distribute files that mm-common-prepare has copied to src_script_dir.
+# Distribute files that mm-common-get has copied to src_script_dir.
files = [
'dist-build-scripts.py',
'dist-changelog.py',
diff --git a/util/build_scripts/doc-reference.py b/util/build_scripts/doc-reference.py
index 2b6f552..c3d16b7 100755
--- a/util/build_scripts/doc-reference.py
+++ b/util/build_scripts/doc-reference.py
@@ -147,7 +147,7 @@ def dist_doc():
# Create the distribution directory, if it does not exist.
os.makedirs(os.path.join(doctool_dist_dir, 'reference'), exist_ok=True)
- # Distribute files that mm-common-prepare has copied to MMDOCTOOLDIR.
+ # Distribute files that mm-common-get has copied to MMDOCTOOLDIR.
# shutil.copy() does not copy timestamps.
for file in ['doc-install.pl', 'doc-postprocess.pl', 'doxygen-extra.css', 'tagfile-to-devhelp2.xsl']:
shutil.copy(os.path.join(MMDOCTOOLDIR, file), doctool_dist_dir)