From 797f075e379f371299bcb92570cb7589fb38076f Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Wed, 9 Sep 2020 14:23:41 +0100
Subject: [PATCH] Move most documentation into pressure-vessel/ directory

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 meson.build                                   |  4 --
 .../CONTRIBUTING.md                           |  0
 README.md => pressure-vessel/README.md        |  0
 .../THIRD-PARTY.md                            |  0
 {man => pressure-vessel}/adverb.1.md          |  0
 pressure-vessel/build-relocatable-install.py  |  2 +-
 {man => pressure-vessel}/launch.1.md          |  0
 {man => pressure-vessel}/launcher.1.md        |  0
 {man => pressure-vessel}/locale-gen.1.md      |  0
 {man => pressure-vessel/man}/meson.build      | 44 ------------------
 pressure-vessel/meson.build                   | 46 +++++++++++++++++++
 {man => pressure-vessel}/test-ui.1.md         |  0
 {man => pressure-vessel}/try-setlocale.1.md   |  0
 {man => pressure-vessel}/unruntime.1.md       |  0
 {man => pressure-vessel}/wrap.1.md            |  0
 15 files changed, 47 insertions(+), 49 deletions(-)
 rename CONTRIBUTING.md => pressure-vessel/CONTRIBUTING.md (100%)
 rename README.md => pressure-vessel/README.md (100%)
 rename THIRD-PARTY.md => pressure-vessel/THIRD-PARTY.md (100%)
 rename {man => pressure-vessel}/adverb.1.md (100%)
 rename {man => pressure-vessel}/launch.1.md (100%)
 rename {man => pressure-vessel}/launcher.1.md (100%)
 rename {man => pressure-vessel}/locale-gen.1.md (100%)
 rename {man => pressure-vessel/man}/meson.build (58%)
 rename {man => pressure-vessel}/test-ui.1.md (100%)
 rename {man => pressure-vessel}/try-setlocale.1.md (100%)
 rename {man => pressure-vessel}/unruntime.1.md (100%)
 rename {man => pressure-vessel}/wrap.1.md (100%)

diff --git a/meson.build b/meson.build
index 7bb317e46..2566fe664 100644
--- a/meson.build
+++ b/meson.build
@@ -183,10 +183,6 @@ endif
 
 subdir('pressure-vessel')
 
-if get_option('man')
-  subdir('man')
-endif
-
 subdir('tests')
 
 # vim:set sw=2 sts=2 et:
diff --git a/CONTRIBUTING.md b/pressure-vessel/CONTRIBUTING.md
similarity index 100%
rename from CONTRIBUTING.md
rename to pressure-vessel/CONTRIBUTING.md
diff --git a/README.md b/pressure-vessel/README.md
similarity index 100%
rename from README.md
rename to pressure-vessel/README.md
diff --git a/THIRD-PARTY.md b/pressure-vessel/THIRD-PARTY.md
similarity index 100%
rename from THIRD-PARTY.md
rename to pressure-vessel/THIRD-PARTY.md
diff --git a/man/adverb.1.md b/pressure-vessel/adverb.1.md
similarity index 100%
rename from man/adverb.1.md
rename to pressure-vessel/adverb.1.md
diff --git a/pressure-vessel/build-relocatable-install.py b/pressure-vessel/build-relocatable-install.py
index 1444627e8..ec6cde277 100755
--- a/pressure-vessel/build-relocatable-install.py
+++ b/pressure-vessel/build-relocatable-install.py
@@ -263,7 +263,7 @@ def main():
             )
 
         install(
-            os.path.join(args.srcdir, 'THIRD-PARTY.md'),
+            os.path.join(args.srcdir, 'pressure-vessel', 'THIRD-PARTY.md'),
             os.path.join(installation, 'metadata', 'README.txt'),
             0o644,
         )
diff --git a/man/launch.1.md b/pressure-vessel/launch.1.md
similarity index 100%
rename from man/launch.1.md
rename to pressure-vessel/launch.1.md
diff --git a/man/launcher.1.md b/pressure-vessel/launcher.1.md
similarity index 100%
rename from man/launcher.1.md
rename to pressure-vessel/launcher.1.md
diff --git a/man/locale-gen.1.md b/pressure-vessel/locale-gen.1.md
similarity index 100%
rename from man/locale-gen.1.md
rename to pressure-vessel/locale-gen.1.md
diff --git a/man/meson.build b/pressure-vessel/man/meson.build
similarity index 58%
rename from man/meson.build
rename to pressure-vessel/man/meson.build
index 22fa8b32d..3e2beb6e7 100644
--- a/man/meson.build
+++ b/pressure-vessel/man/meson.build
@@ -21,48 +21,4 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-pandoc = find_program('pandoc', required : true)
-
-if run_command(pandoc, [
-  '-f', 'markdown-smart',
-  '-t', 'man',
-  '/dev/null',
-]).returncode() == 0
-  pandoc_markdown_nosmart = 'markdown-smart'
-else
-  pandoc_markdown_nosmart = 'markdown'
-endif
-
-foreach tool : [
-  'adverb',
-  'launch',
-  'launcher',
-  'locale-gen',
-  'test-ui',
-  'try-setlocale',
-  'unruntime',
-  'wrap',
-]
-  custom_target(
-    tool + '.1',
-    build_by_default : true,
-    command : [
-      pandoc,
-      '-s',
-      '-o', '@OUTPUT@',
-      '-f', pandoc_markdown_nosmart,
-      '-t', 'man',
-      '@INPUT@',
-    ],
-    input : tool + '.1.md',
-    output : 'pressure-vessel-' + tool + '.1',
-    install : true,
-    install_dir : join_paths(
-      get_option('prefix'),
-      get_option('mandir'),
-      'man1',
-    ),
-  )
-endforeach
-
 # vim:set sw=2 sts=2 et:
diff --git a/pressure-vessel/meson.build b/pressure-vessel/meson.build
index 99b9241d1..fe1dcb70a 100644
--- a/pressure-vessel/meson.build
+++ b/pressure-vessel/meson.build
@@ -242,4 +242,50 @@ if get_option('srcdir') != ''
   )
 endif
 
+if get_option('man')
+  pandoc = find_program('pandoc', required : true)
+
+  if run_command(pandoc, [
+    '-f', 'markdown-smart',
+    '-t', 'man',
+    '/dev/null',
+  ]).returncode() == 0
+    pandoc_markdown_nosmart = 'markdown-smart'
+  else
+    pandoc_markdown_nosmart = 'markdown'
+  endif
+
+  foreach tool : [
+    'adverb',
+    'launch',
+    'launcher',
+    'locale-gen',
+    'test-ui',
+    'try-setlocale',
+    'unruntime',
+    'wrap',
+  ]
+    custom_target(
+      tool + '.1',
+      build_by_default : true,
+      command : [
+        pandoc,
+        '-s',
+        '-o', '@OUTPUT@',
+        '-f', pandoc_markdown_nosmart,
+        '-t', 'man',
+        '@INPUT@',
+      ],
+      input : tool + '.1.md',
+      output : 'pressure-vessel-' + tool + '.1',
+      install : true,
+      install_dir : join_paths(
+        get_option('prefix'),
+        get_option('mandir'),
+        'man1',
+      ),
+    )
+  endforeach
+endif
+
 # vim:set sw=2 sts=2 et:
diff --git a/man/test-ui.1.md b/pressure-vessel/test-ui.1.md
similarity index 100%
rename from man/test-ui.1.md
rename to pressure-vessel/test-ui.1.md
diff --git a/man/try-setlocale.1.md b/pressure-vessel/try-setlocale.1.md
similarity index 100%
rename from man/try-setlocale.1.md
rename to pressure-vessel/try-setlocale.1.md
diff --git a/man/unruntime.1.md b/pressure-vessel/unruntime.1.md
similarity index 100%
rename from man/unruntime.1.md
rename to pressure-vessel/unruntime.1.md
diff --git a/man/wrap.1.md b/pressure-vessel/wrap.1.md
similarity index 100%
rename from man/wrap.1.md
rename to pressure-vessel/wrap.1.md
-- 
GitLab