website update; Lasso is now managed in Subversion

6 files changed, 45 insertions, 25 deletions

diff --git a/website/convert-to-static.py b/website/convert-to-static.py
index 50293ba2..555ecbad 100644
--- a/website/convert-to-static.py
+++ b/website/convert-to-static.py
@@ -39,13 +39,24 @@ class ChangelogFile:
 
 class ChangelogEntry:
     def __init__(self, node):
-        for attr in ('date', 'weekday', 'time', 'isoDate', 'msg', 'author'):
+        for attr in ('date', 'weekday', 'time', 'isoDate', 'msg', 'author', 'revision'):
             try:
                 setattr(self, attr, getText(node.getElementsByTagName(attr)[0].childNodes))
             except IndexError:
                 setattr(self, attr, None)
         self.file = [ChangelogFile(x) for x in node.getElementsByTagName('file')]
 
+class ChangelogSvnEntry:
+    def __init__(self, node):
+        for attr in ('date', 'msg', 'author', 'file'):
+            try:
+                setattr(self, attr, getText(node.getElementsByTagName(attr)[0].childNodes))
+            except IndexError:
+                setattr(self, attr, None)
+        self.revision = node.attributes['revision'].value
+        if self.date:
+            self.time = self.date[11:16]
+
 
 class TestTest:
     def __init__(self, node):
@@ -105,6 +116,8 @@ class Build:
             dom_cl = xml.dom.minidom.parse(file('web' + self.changelog + '.xml'))
             self.last_commit_author = getText(dom_cl.getElementsByTagName('author')[0].childNodes)
             self.nb_commits = len(dom_cl.getElementsByTagName('entry'))
+            if not self.nb_commits:
+                self.nb_commits = len(dom_cl.getElementsByTagName('logentry'))
 
 
 
@@ -124,7 +137,7 @@ for BUILDLOGS_DIR in ('build-logs', 'build-logs-wsf'):
         os.mkdir('web-static/%s' % BUILDLOGS_DIR)
 
     for base, dirs, files in os.walk('web/%s' % BUILDLOGS_DIR):
-        if base.endswith('/CVS'):
+        if base.endswith('/CVS') or base.endswith('/.svn'):
             continue
         for dirname in dirs:
             src_file = os.path.join(base, dirname)
@@ -166,6 +179,15 @@ for BUILDLOGS_DIR in ('build-logs', 'build-logs-wsf'):
                 base_template.generate(fd, {'body': body, 'title': 'ChangeLog', 'section': 'buildbox'})
                 open(dst_file, 'w').write(fd.getvalue())
 
+            if type == 'log':
+                entries = [ChangelogSvnEntry(x) for x in dom.getElementsByTagName('logentry')]
+                fd = StringIO()
+                changelog_template.generate(fd, {'entry': entries})
+                body = fd.getvalue()
+                fd = StringIO()
+                base_template.generate(fd, {'body': body, 'title': 'ChangeLog', 'section': 'buildbox'})
+                open(dst_file, 'w').write(fd.getvalue())
+
             if type == 'testsuites':
                 datetime = getText(dom.getElementsByTagName('datetime')[0].childNodes)
                 title = getText(dom.getElementsByTagName('title')[0].childNodes)
@@ -215,10 +237,10 @@ for BUILDLOGS_DIR in ('build-logs', 'build-logs-wsf'):
 for base, dirs, files in os.walk('web'):
     if '/build-logs' in base or '/news/' in base:
         continue
-    if base.endswith('CVS'):
+    if base.endswith('CVS') or base.endswith('.svn'):
         continue
     for dirname in dirs:
-        if dirname in ('CVS', 'news'):
+        if dirname in ('CVS', 'news', '.svn'):
             continue
         src_file = os.path.join(base, dirname)
         dst_file = 'web-static/' + src_file[4:]
@@ -237,20 +259,15 @@ for base, dirs, files in os.walk('web'):
                 os.stat(dst_file)[stat.ST_MTIME] >= os.stat(src_file)[stat.ST_MTIME]:
             continue
 
-        if ext not in ('.html', '.xml') or filename.startswith('doap.') or \
-                'api-reference' in src_file:
-            if os.path.exists(dst_file):
-                os.unlink(dst_file)
+        if ext not in ('.html', '.xml') or filename.startswith('doap.') or 'api-reference' in src_file:
+	    if os.path.exists(dst_file):
+	        os.unlink(dst_file)
             os.link(src_file, dst_file)
             continue
 
         type = None
         if ext == '.xml':
-            try:
-                dom = xml.dom.minidom.parse(file(src_file))
-            except:
-                print src_file
-                raise
+            dom = xml.dom.minidom.parse(file(src_file))
             type = dom.childNodes[0].nodeName
             dst_file = dst_file.replace('.xml', '.html')
 
diff --git a/website/templates/base.ezt b/website/templates/base.ezt
index e42c1c87..27bf93b9 100644
--- a/website/templates/base.ezt
+++ b/website/templates/base.ezt
@@ -38,7 +38,7 @@
       <li[is section "mailinglists"] id="current"[end]>
        <a href="/mailinglists/">Mailing Lists</a></li>
       <li[is section "buildbox"] id="current"[end]>
-        <a href="/buildbox">CVS Status</a></li>
+        <a href="/buildbox">Subversion Status</a></li>
       <li[is section "links"] id="current"[end]>
         <a href="/links">Related Links</a></li>
       <li><a href="http://labs.libre-entreprise.org/tracker/?atid=206&amp;group_id=31&amp;func=browse">Bug
@@ -55,7 +55,7 @@
 </div>
     
   <div id="content">
-    [is section "buildbox"]<h1>CVS Status</h1>[end]
+    [is section "buildbox"]<h1>Subversion Status</h1>[end]
     [body]
 
      <div id="copyright">
diff --git a/website/templates/changelog.ezt b/website/templates/changelog.ezt
index 69235cf7..871ba954 100644
--- a/website/templates/changelog.ezt
+++ b/website/templates/changelog.ezt
@@ -6,9 +6,14 @@
    <td>[entry.time]</td>
    <td>[entry.author]</td>
    <td>
+    [if-any entry.file]
     [for entry.file]
     <span class="file"><a href="http://labs.libre-entreprise.org/plugins/scmcvs/cvsweb.php/lasso/[entry.file.name]?cvsroot=lasso#rev[entry.file.revision]">[entry.file.name]</a> ([entry.file.revision])</span>
 	[end]
+    [end]
+    [if-any entry.revision]
+    <a href="https://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php?root=lasso&view=rev&rev=[entry.revision]">rev [entry.revision]</a>
+    [end]
    </td>
    <td>
     [entry.msg]
diff --git a/website/web/download/index.xml b/website/web/download/index.xml
index 34ce9a5e..5834aded 100644
--- a/website/web/download/index.xml
+++ b/website/web/download/index.xml
@@ -99,18 +99,16 @@ deb http://deb.entrouvert.org etch main
 	</ul>
 
 
-	<h2>CVS</h2>
+	<h2>Subversion</h2>
 
 	<p>
-	 Lasso is also available through CVS; you can checkout source code
+	 Lasso is also available through Subversion; you can checkout source code
 	 (see below) or browse source files online with <a
-	 href="http://labs.libre-entreprise.org/plugins/scmcvs/cvsweb.php/lasso/?cvsroot=lasso">CVSWeb</a>.
+	 href="https://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/?root=lasso">ViewCVS</a>.
 	</p>
 
 	<pre>
-cvs -d:pserver:anonymous@cvs.labs.libre-entreprise.org:/cvsroot/lasso login
- # just press enter when it asks for a password
-cvs -z3 -d:pserver:anonymous@cvs.labs.libre-entreprise.org:/cvsroot/lasso checkout lasso
+svn checkout svn://labs.libre-entreprise.org/svnroot/lasso/trunk lasso
 </pre>
 
  </body>
diff --git a/website/web/mailinglists/index.xml b/website/web/mailinglists/index.xml
index c5c36407..4e327d9a 100644
--- a/website/web/mailinglists/index.xml
+++ b/website/web/mailinglists/index.xml
@@ -16,9 +16,9 @@
 	   main development mailing list (<a
 	   href="http://lists.labs.libre-entreprise.org/pipermail/lasso-devel/">archives</a>)</li>
 
-	 <li><a href="http://lists.labs.libre-entreprise.org/mailman/listinfo/lasso-cvs-commits">lasso-cvs-commits</a>:
-	   CVS commits are sent here (<a
-	   href="http://lists.labs.libre-entreprise.org/pipermail/lasso-cvs-commits/">archives</a>)</li>
+	 <li><a href="http://lists.labs.libre-entreprise.org/mailman/listinfo/lasso-commits">lasso-commits</a>:
+	   Subversion commits are sent here (<a
+	   href="http://lists.labs.libre-entreprise.org/pipermail/lasso-commits/">archives</a>)</li>
 	</ul>
 	
  </body>
diff --git a/website/web/souk/index.xml b/website/web/souk/index.xml
index 11836333..4b03121f 100644
--- a/website/web/souk/index.xml
+++ b/website/web/souk/index.xml
@@ -29,7 +29,7 @@
   <p>
    Initially, Souk has been developped as a test environment for <a
    href="http://lasso.entrouvert.org">Lasso</a> (See last column in <a
-   href="http://lasso.entrouvert.org/buildbox">CVS Status table</a>).
+   href="http://lasso.entrouvert.org/buildbox">Subversion Status table</a>).
   </p>
 
   <p>