[library-web] make it possible to look for doc tarballs in versioned directories



commit d9d1e6f10570ef6cb55509ad965d5f981bdd8475
Author: Frédéric Péters <fpeters 0d be>
Date:   Sun Feb 11 10:18:48 2018 +0100

    make it possible to look for doc tarballs in versioned directories

 data/overlay.xml.in    |    6 +++---
 src/modtypes/gtkdoc.py |    4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/data/overlay.xml.in b/data/overlay.xml.in
index a3a9ef5..dea678b 100644
--- a/data/overlay.xml.in
+++ b/data/overlay.xml.in
@@ -173,7 +173,7 @@
       <extra-devel-releases>3.89</extra-devel-releases>
       <extra-devel-releases>3.91</extra-devel-releases>
       <extra-devel-releases>3.93</extra-devel-releases>
-      
<doc-tarball-location>https://download.gnome.org/docs/gtk+/gsk-docs-VERSION.tar.xz</doc-tarball-location>
+      
<doc-tarball-location>https://download.gnome.org/docs/gtk+/{VERSION_ONE_DOT}/gsk-docs-{VERSION_FULL}.tar.xz</doc-tarball-location>
     </document>
     <document doc_module="gdk2" channel="devel" weight="0.88">
       <category>api-base</category>
@@ -205,7 +205,7 @@
       <extra-devel-releases>3.89</extra-devel-releases>
       <extra-devel-releases>3.91</extra-devel-releases>
       <extra-devel-releases>3.93</extra-devel-releases>
-      
<doc-tarball-location>https://download.gnome.org/docs/gtk+/gdk-docs-VERSION.tar.xz</doc-tarball-location>
+      
<doc-tarball-location>https://download.gnome.org/docs/gtk+/{VERSION_ONE_DOT}/gdk-docs-{VERSION_FULL}.tar.xz</doc-tarball-location>
     </document>
     <document doc_module="gtk2" channel="devel" weight="0.87">
       <category>api-base</category>
@@ -241,7 +241,7 @@
       <extra-devel-releases>3.89</extra-devel-releases>
       <extra-devel-releases>3.91</extra-devel-releases>
       <extra-devel-releases>3.93</extra-devel-releases>
-      
<doc-tarball-location>https://download.gnome.org/docs/gtk+/gtk-docs-VERSION.tar.xz</doc-tarball-location>
+      
<doc-tarball-location>https://download.gnome.org/docs/gtk+/{VERSION_ONE_DOT}/gtk-docs-{VERSION_FULL}.tar.xz</doc-tarball-location>
     </document>
     <document doc_module="libxml2" channel="devel" category="api" weight="0.86">
       <category>api-base</category>
diff --git a/src/modtypes/gtkdoc.py b/src/modtypes/gtkdoc.py
index 7989daf..cc274d8 100644
--- a/src/modtypes/gtkdoc.py
+++ b/src/modtypes/gtkdoc.py
@@ -127,7 +127,9 @@ class GtkDocModule(DocModule):
                         # an external location?
                         tarball_location = app.overlay.get_doc_tarball_location(self.modulename)
                         if tarball_location:
-                            tarball_location = tarball_location.replace('VERSION', self.version)
+                            tarball_location =
+                            tarball_location.replace('{VERSION_FULL}', self.version).replace(
+                                    '{VERSION_ONE_DOT}', self.one_dot_version)
                             htmlfiles_dir = os.path.join(ext_dirname, 'doc-tarballs', self.dirname, 'html')
                             if not os.path.exists(htmlfiles_dir):
                                 logging.debug('extracting %s' % tarball_location)


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