damned-lies r694 - trunk

[claudep svn gnome org]

Author: claudep
Date: Sat Jan 12 14:55:04 2008
New Revision: 694
URL: http://svn.gnome.org/viewvc/damned-lies?rev=694&view=rev

Log:
2008-01-12  Claude Paroz  <claude 2xlibre net>

	* modules.py: Handle 'subpath' property, if available.
	* gnome-modules.xml.in:
	* releases.xml.in: Use new 'subpath' property for Release Notes, and
	split module. Fixes #508116.

Modified:
   trunk/ChangeLog
   trunk/gnome-modules.xml.in
   trunk/modules.py
   trunk/releases.xml.in

Modified: trunk/gnome-modules.xml.in
==============================================================================
--- trunk/gnome-modules.xml.in	(original)
+++ trunk/gnome-modules.xml.in	Sat Jan 12 14:55:04 2008
@@ -1445,18 +1445,33 @@
   <module id="regexxer">
     <branch id="HEAD"/>
   </module>
-  <module id="release-notes">
-    <_description>GNOME Release Notes</_description>
+  <module id="release-notes-2-18">
+    <_description>GNOME 2.18 Release Notes</_description>
     <scmmodule>gnomeweb-wml</scmmodule>
+    <scmroot type="svn">
+      <path>http://svn.gnome.org/svn</path>
+      <subpath>www.gnome.org/start/2.18/notes</subpath>
+    </scmroot>
+    <scmweb>http://svn.gnome.org/viewcvs/gnomeweb-wml/trunk/www.gnome.org/start/2.18/notes</scmweb>
     <branch id="HEAD">
-      <scmweb>http://svn.gnome.org/viewcvs/gnomeweb-wml/trunk/www.gnome.org/start</scmweb>
-      <document id="release-notes-2.20">
-        <_description>GNOME 2.20 release notes</_description>
-        <directory>www.gnome.org/start/2.20/notes/docbook</directory>
-      </document>
       <document id="release-notes-2.18">
-        <_description>GNOME 2.18 release notes</_description>
-        <directory>www.gnome.org/start/2.18/notes/docbook</directory>
+        <_description>GNOME 2.18 Release Notes</_description>
+        <directory>docbook</directory>
+      </document>
+    </branch>
+  </module>
+  <module id="release-notes-2-20">
+    <_description>GNOME 2.20 Release Notes</_description>
+    <scmmodule>gnomeweb-wml</scmmodule>
+    <scmroot type="svn">
+      <path>http://svn.gnome.org/svn</path>
+      <subpath>www.gnome.org/start/2.20/notes</subpath>
+    </scmroot>
+    <scmweb>http://svn.gnome.org/viewcvs/gnomeweb-wml/trunk/www.gnome.org/start/2.20/notes</scmweb>
+    <branch id="HEAD">
+      <document id="release-notes-2.20">
+        <_description>GNOME 2.20 Release Notes</_description>
+        <directory>docbook</directory>
       </document>
     </branch>
   </module>

Modified: trunk/modules.py
==============================================================================
--- trunk/modules.py	(original)
+++ trunk/modules.py	Sat Jan 12 14:55:04 2008
@@ -135,6 +135,8 @@
                     svnpath += "/trunk"
                 else:
                     svnpath += "/branches/" + branch
+                if self.module["scmroot"].has_key("subpath"):
+                    svnpath += "/%s" % self.module["scmroot"]["subpath"]
                 commandList.append("cd \"%(localroot)s\" && svn co --non-interactive %(svnpath)s \"%(dir)s\"" % {
                     "localroot" : localroot,
                     "svnpath" : svnpath,

Modified: trunk/releases.xml.in
==============================================================================
--- trunk/releases.xml.in	(original)
+++ trunk/releases.xml.in	Sat Jan 12 14:55:04 2008
@@ -248,7 +248,8 @@
     <_description>GNOME Infrastructure</_description>
     <module id="damned-lies"/>
     <module id="library-web"/>
-    <module id="release-notes"/>
+    <module id="release-notes-2-18"/>
+    <module id="release-notes-2-20"/>
   </release>
   <release id="gnome-2-16" status="official" stringfrozen="true">
     <_description>GNOME 2.16 (old stable)</_description>