summaryrefslogtreecommitdiff
path: root/web-export
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2019-10-21 20:21:35 +0200
committerBastien Nocera <hadess@hadess.net>2019-10-22 10:34:22 +0200
commitf97dad781c5a7c99f65617a9509476836d4596cd (patch)
treed30857649fe9700c8fbde6382dd6b3ff88dcba4f /web-export
parentbff389d6675cd998189c90121925c9e59023a87f (diff)
web-export: Add support for building idle-inhibit and secret-service
Those use a Makefile based build system with loads of ancillary files, so we only support building the latest git version.
Diffstat (limited to 'web-export')
-rw-r--r--web-export/specs.idx2
-rwxr-xr-xweb-export/update.py8
2 files changed, 6 insertions, 4 deletions
diff --git a/web-export/specs.idx b/web-export/specs.idx
index 82c60c1..14ebe5d 100644
--- a/web-export/specs.idx
+++ b/web-export/specs.idx
@@ -31,7 +31,9 @@ git:xdg/default-icon-theme:spec/icon-naming-spec.xml 1dc55c9db340a7d0a9ac84e1
# Invalid docbook:
#git:xdg/default-icon-theme:spec/icon-naming-spec.xml db9bb955c0cf20322b149676b908ecd69929d2f1 0.3 icon-naming-spec
+# FIXME does not support rev != master
git:xdg/xdg-specs:idle-inhibit/specification.xml master 0.1 idle-inhibit-spec
+git:xdg/xdg-specs:secret-service/specification.xml master 0.2 secret-service
git:xdg/default-icon-theme:spec/icon-theme-spec.xml fca8fecff452ed188584f22e99e9b96458f697f9 0.13 icon-theme-spec
git:xdg/default-icon-theme:spec/icon-theme-spec.xml 7d2735da96abf7e1d2ce9a56e38240498e2f5e67 0.12 icon-theme-spec
diff --git a/web-export/update.py b/web-export/update.py
index a2beab5..bb1e437 100755
--- a/web-export/update.py
+++ b/web-export/update.py
@@ -39,7 +39,7 @@ HASH = 'md5'
# Specifications with their own build system
# FIXME: would be good to be able to use the same script to generate them
-SELF_BUILT = [ "idle-inhibit-spec", "secret-service-spec" ]
+SELF_BUILT = [ "idle-inhibit-spec", "secret-service" ]
if not spawn.find_executable("xmlto"):
print("ERROR: xmlto is not installed...")
@@ -195,7 +195,9 @@ class SpecObject():
one_chunk_command = None
multiple_chunks_command = None
- if self.ext == '.xml':
+ if self.spec_dir in SELF_BUILT:
+ multiple_chunks_command = ['make', '-C', "../" + os.path.dirname(self.vcs.file)]
+ elif self.ext == '.xml':
one_chunk_command = ['xmlto', '-o', self.spec_dir, 'html-nochunks', path]
multiple_chunks_command = ['xmlto', '-o', html_dir, 'html', path]
elif self.ext == '.sgml':
@@ -278,8 +280,6 @@ for line in lines:
splitted_line = data.split(":")
if data.startswith("git:"):
repo = splitted_line[1]
- if path in SELF_BUILT:
- continue
if USELOCALFILES and (revision != "master" or repo != "xdg/xdg-specs"):
continue
vcs = VcsObject('git', repo, splitted_line[2], revision)