[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [websites/utils-kde-org] /: Fix the secondary source links for
From:       Raphael Kubo da Costa <rakuco () FreeBSD ! org>
Date:       2011-08-20 19:11:42
Message-ID: 20110820191142.660D7A6078 () git ! kde ! org
[Download RAW message or body]

Git commit 31ccca7aee665a82dde4a1fd8050d3911e7c59cb by Raphael Kubo da Costa.
Committed on 20/08/2011 at 21:10.
Pushed by rkcosta into branch 'master'.

Fix the secondary source links for kcharselect and kwallet.

They are in kdelibs, which use a different branch naming scheme, so we
need to adapt. I hope my PHP-fu is good enough for this.

M  +8    -0    includes/class_versionedpath.inc
M  +1    -1    includes/class_websvnlinks.inc
M  +8    -0    projects/kcharselect/project.inc
M  +11   -0    projects/kwalletmanager/project.inc

http://commits.kde.org/websites/utils-kde-org/31ccca7aee665a82dde4a1fd8050d3911e7c59cb


diff --git a/includes/class_versionedpath.inc b/includes/class_versionedpath.inc
index f5ae2af..8d4b764 100644
--- a/includes/class_versionedpath.inc
+++ b/includes/class_versionedpath.inc
@@ -20,6 +20,14 @@ class VersionedPath
     {
         return $this->path;
     }
+
+    /**
+     * @return branch name, like "KDE/4.6" or "4.6"
+     */
+    function branchName($versionId)
+    {
+        return $versionId;
+    }
 }
 
 ?>
diff --git a/includes/class_websvnlinks.inc b/includes/class_websvnlinks.inc
index 8292376..de309cc 100644
--- a/includes/class_websvnlinks.inc
+++ b/includes/class_websvnlinks.inc
@@ -66,7 +66,7 @@ class WebSvnLinks
                 foreach ($otherSourcesList as $name => $path)
                     print
 ",
-   <a href=\"https://projects.kde.org/projects/".$path->path($kdeVersionId)."?rev=".$versionPath."\">".$name."</a>";
 +   <a href=\"https://projects.kde.org/projects/".$path->path($kdeVersionId)."?rev=".$path->branchName($versionPath)."\">".$name."</a>";
  
                 print
 "  </td>\n
diff --git a/projects/kcharselect/project.inc b/projects/kcharselect/project.inc
index 6927606..710ec30 100644
--- a/projects/kcharselect/project.inc
+++ b/projects/kcharselect/project.inc
@@ -18,6 +18,14 @@ class VersionedPathWith3dot5
         else
             return $this->path;
     }
+
+    function branchName($versionId)
+    {
+        if ($versionId=="master")
+            return $versionId;
+
+        return "KDE/" . $versionId;
+    }
 }
 
     $project = new Project("kcharselect","KCharSelect",array("4.8"=>"1.10","4.7"=>"1. \
9","4.6"=>"1.8","4.5"=>"1.7","4.4"=>"1.6","4.3"=>"1.5","4.2"=>"1.4","4.1"=>"1.3","4.0"=>"1.2","3.5"=>"1.1"));
                
diff --git a/projects/kwalletmanager/project.inc \
b/projects/kwalletmanager/project.inc index 2b31901..0896642 100644
--- a/projects/kwalletmanager/project.inc
+++ b/projects/kwalletmanager/project.inc
@@ -1,4 +1,15 @@
 <?php
+class KWalletVersionedPath extends VersionedPath
+{
+    function branchName($versionId)
+    {
+        if ($versionId=="master")
+            return $versionId;
+
+        return "KDE/" . $versionId;
+    }
+}
+
     $project = new Project("kwallet","KDE Wallet \
Manager",array("4.8"=>"1.9","4.7"=>"1.8","4.6"=>"1.7","4.5"=>"1.6","4.4"=>"1.5","4.3"=>"1.4","4.2"=>"1.3","4.1"=>"1.2","4.0"=>"1.1","3.5"=>"1.1"));
                
     $project->setGuiPoFileNameList(new \
                VersionedArrayOfArray(array("kwalletmanager","kcmkwallet")));
     $project->setOtherSourcesList(array("Library"=>new \
VersionedPath("kdelibs/repository/show/kwallet","kdelibs/repository/show/kdeui/")));


[prev in list] [next in list] [prev in thread] [next in thread]