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

List:       kde-commits
Subject:    [websites/quality-kde-org] tools: updates a-plenty
From:       Allen Winter <allen.winter () kdab ! com>
Date:       2012-08-26 20:45:09
Message-ID: 20120826204509.C5768A6094 () git ! kde ! org
[Download RAW message or body]

Git commit 0e1734bd3244c49b6fbc3986abb28c444a1a1ddf by Allen Winter.
Committed on 26/08/2012 at 22:44.
Pushed by winterz into branch 'master'.

updates a-plenty

M  +1    -1    tools/update-cmakedoc
M  +3    -4    tools/update-man
M  +1    -1    tools/update-mapper
M  +6    -7    tools/update-qch
M  +3    -4    tools/update-qch-man
M  +5    -2    tools/update-scripts

http://commits.kde.org/websites/quality-kde-org/0e1734bd3244c49b6fbc3986abb28c444a1a1ddf

diff --git a/tools/update-cmakedoc b/tools/update-cmakedoc
index 85488b8..0826301 100755
--- a/tools/update-cmakedoc
+++ b/tools/update-cmakedoc
@@ -1,7 +1,7 @@
 #!/bin/sh
 CMAKE=/usr/bin/cmake
 MEINPROC=/usr/bin/meinproc4
-# Path to kdelibs source code (use $HOME since this is the stable 4.8 branch)
+# Path to kdelibs source code (use $HOME since this is the stable branch)
 TOPSRC=$HOME
 # Path to stylesheets
 SSPATH=/usr/share/apps/ksgmltools2/customization/
diff --git a/tools/update-man b/tools/update-man
index 93645b0..9990cfc 100755
--- a/tools/update-man
+++ b/tools/update-man
@@ -2,8 +2,7 @@
 
 prog=/mnt/ebn/src/kde-4.x/kdesdk/scripts/kdedoxyman.sh
 
-trunkver="4.8"
-branchver="4.7"
+BRANCH="4.9"
 
 topsrc=/mnt/ebn/src
 topdox=/mnt/ebn/apache/api.kde.org/man
@@ -23,9 +22,9 @@ TRUNK_MODULE()
 
 BRANCH_MODULE()
 {
-  cd $topsrc/kde-$branchver/$1
+  cd $topsrc/kde-$BRANCH/$1
   $prog -d .
-  tar cvfj $topdox/$1-$branchver-man.tar.bz2 man
+  tar cvfj $topdox/$1-$BRANCH-man.tar.bz2 man
 }
 
 QT()
diff --git a/tools/update-mapper b/tools/update-mapper
index 426f37b..9891b0f 100755
--- a/tools/update-mapper
+++ b/tools/update-mapper
@@ -22,7 +22,7 @@ GEN_NAMESPACEMAP=$BINPATH/gennamespacemapper.sh
 GEN_PROJECTMAP=$BINPATH/genprojectmapper.sh
 
 # KDE SC components to generate the search maps
-components="4.x 4.8 3.5"
+components="4.x 4.9 3.5"
 
 # KDE SC modules to generate the search maps
 modules=`ls $SOURCES/kde-4.x`
diff --git a/tools/update-qch b/tools/update-qch
index 9f2851b..2c75bfe 100755
--- a/tools/update-qch
+++ b/tools/update-qch
@@ -2,8 +2,7 @@
 
 prog=/mnt/ebn/src/kde-4.x/kdesdk/scripts/kdedoxyqt.sh
 
-trunkver="4.8"
-branchver="4.7"
+BRANCH="4.9"
 
 topsrc=/mnt/ebn/src
 topdox=/mnt/ebn/apache/api.kde.org/qch
@@ -17,15 +16,15 @@ fi
 TRUNK_MODULE()
 {
   cd $topsrc/kde-4.x/$1
-  $prog -n $1 -x $trunkver
-  mv -f apidocs/qch/$1-$trunkver.qch $topdox/$1-"4.x".qch
+  $prog -n $1 -x 4.x
+  mv -f apidocs/qch/$1-4.x.qch $topdox/$1-"4.x".qch
 }
 
 BRANCH_MODULE()
 {
-  cd $topsrc/kde-$branchver/$1
-  $prog -n $1 -x $branchver
-  mv -f apidocs/qch/$1-$branchver.qch $topdox/$1-$branchver.qch
+  cd $topsrc/kde-$BRANCH/$1
+  $prog -n $1 -x $BRANCH
+  mv -f apidocs/qch/$1-$BRANCH.qch $topdox/$1-$BRANCH.qch
 }
 
 SUPPORT_MODULE()
diff --git a/tools/update-qch-man b/tools/update-qch-man
index 6652932..cc081dc 100755
--- a/tools/update-qch-man
+++ b/tools/update-qch-man
@@ -7,8 +7,7 @@ TOPMAN=/srv/www/api.kde.org/man
 TEMPDIR=/srv/tmp/qchman
 
 # Versions to work on....
-#trunkver="4.8"
-#branchver="4.7"
+BRANCH="4.9"
 
 # Functions...
 generate_qch_man()
@@ -57,8 +56,8 @@ generate_qch_man kdelibs 4.x kde-4.x
 generate_qch_man kdepimlibs 4.x kde-4.x
 
 # Generate for latest branch
-generate_qch_man kdelibs 4.8 kde-4.8
-generate_qch_man kdepimlibs 4.8 kde-4.8
+generate_qch_man kdelibs $BRANCH kde-"$BRANCH"
+generate_qch_man kdepimlibs $BRANCH kde-"$BRANCH"
 
 # Generate for individual projects...
 generate_qch phonon kdesupport kdesupport
diff --git a/tools/update-scripts b/tools/update-scripts
index a292e7a..b59c5ab 100755
--- a/tools/update-scripts
+++ b/tools/update-scripts
@@ -1,4 +1,7 @@
 #!/bin/bash
+
+BRANCH="4.9"
+
 update_git()
 {
     cd $HOME
@@ -34,8 +37,8 @@ bash $HOME/krazy/install.sh $HOME/krazy-install/
 
 # kdelibs - needed to build apidox properly as it needs full exec permissions which /srv doesn't have...
 update_git kdelibs git://anongit.kde.org/kdelibs
-#we rely on the version in the KDE/4.8 branch
-( cd $HOME/kdelibs; git checkout KDE/4.8 )
+#we rely on the version in the KDE/$BRANCH branch
+( cd $HOME/kdelibs; git checkout KDE/$BRANCH )
 
 # kdesdk - git checkout script + man/qch generation
 update_svn sdk-scripts trunk/KDE/kdesdk/scripts
[prev in list] [next in list] [prev in thread] [next in thread]