[GRASS-SVN] r65890 - grass-addons/tools/addons

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-08-11 06:14:50 -0700 (Tue, 11 Aug 2015)
New Revision: 65890

Added:
   grass-addons/tools/addons/grass-addons-build.sh
Removed:
   grass-addons/tools/addons/grass-addons-public.sh
Modified:
   grass-addons/tools/addons/grass-addons-publish.sh
Log:
addons: rename support script of build server

Copied: grass-addons/tools/addons/grass-addons-build.sh (from rev 65889, grass-addons/tools/addons/grass-addons-public.sh)
===================================================================
--- grass-addons/tools/addons/grass-addons-build.sh	                        (rev 0)
+++ grass-addons/tools/addons/grass-addons-build.sh	2015-08-11 13:14:50 UTC (rev 65890)
@@ -0,0 +1,58 @@
+#!/bin/bash
+
+# This script builds addons modules (1) and creates tarballs of manual
+# pages, logs (2) for publishing server, see related grass-addons-publish.sh
+# script for details
+#
+# To be run on building server (see crontab.build)
+#
+# original author: Martin Landa
+
+DST=/var/www/grass
+DIST=dist.x86_64-unknown-linux-gnu
+SRC=${HOME}/src/
+
+run=`ps aux | grep "${HOME}/cronjobs/grass-addons.sh c" | wc -l`
+if [ "$run" == "2" ]; then
+    echo "stopped"
+    exit 0
+fi
+
+${SRC}/grass-addons/tools/addons/grass-addons.sh "$1"
+
+if [ $? != 0 ] ; then
+    exit 0
+fi
+
+manuals() {
+    HTMLDIR=addons
+    mkdir $HTMLDIR
+    for dir in `find . -maxdepth 1 -type d`; do
+        if [ -d $dir/docs/html ] ; then
+            for f in `pwd`/$dir/docs/html/*.html ; do 
+                ${SRC}grass-addons/tools/addons/update_manual.py $f http://grass.osgeo.org/grass${1}${2}/manuals
+            done
+            cp -r $dir/docs/html/* $HTMLDIR/ 2>/dev/null
+        fi
+    done
+    cp ${SRC}/grass${1}${2}_release/${DIST}/docs/html/grassdocs.css $HTMLDIR/
+    cp ${SRC}/grass${1}${2}_release/${DIST}/docs/html/grass_logo.png $HTMLDIR/
+    tar czf html.tar.gz $HTMLDIR
+    rm -rf $HTMLDIR
+}
+
+promote() {
+    major=$1
+    minor=$2
+    cd /tmp/.grass${major}/addons
+    tar czf logs.tar.gz logs
+    manuals $major $minor
+    cp logs.tar.gz ${DST}/addons/grass${major}
+    cp modules.xml ${DST}/addons/grass${major}
+    cp html.tar.gz ${DST}/addons/grass${major}
+}
+
+promote 6 4
+promote 7 0
+
+exit 0

Deleted: grass-addons/tools/addons/grass-addons-public.sh
===================================================================
--- grass-addons/tools/addons/grass-addons-public.sh	2015-08-11 13:04:28 UTC (rev 65889)
+++ grass-addons/tools/addons/grass-addons-public.sh	2015-08-11 13:14:50 UTC (rev 65890)
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-DST=/var/www/grass
-DIST=dist.x86_64-unknown-linux-gnu
-SRC=${HOME}/src/
-
-# check previous build
-### ls -lh ${HOME}/.grass*/addons/modules.xml
-
-run=`ps aux | grep "${HOME}/cronjobs/grass-addons.sh c" | wc -l`
-if [ "$run" == "2" ]; then
-    echo "stopped"
-    exit 0
-fi
-
-${SRC}/grass-addons/tools/addons/grass-addons.sh "$1"
-
-if [ $? != 0 ] ; then
-    exit 0
-fi
-
-manuals() {
-    HTMLDIR=addons
-    mkdir $HTMLDIR
-    for dir in `find . -maxdepth 1 -type d`; do
-        if [ -d $dir/docs/html ] ; then
-            for f in `pwd`/$dir/docs/html/*.html ; do 
-                ${SRC}grass-addons/tools/addons/update_manual.py $f http://grass.osgeo.org/grass${1}${2}/manuals
-            done
-            cp -r $dir/docs/html/* $HTMLDIR/ 2>/dev/null
-        fi
-    done
-    cp ${SRC}/grass${1}${2}_release/${DIST}/docs/html/grassdocs.css $HTMLDIR/
-    cp ${SRC}/grass${1}${2}_release/${DIST}/docs/html/grass_logo.png $HTMLDIR/
-    tar czf html.tar.gz $HTMLDIR
-    rm -rf $HTMLDIR
-}
-
-promote() {
-    major=$1
-    minor=$2
-    cd /tmp/.grass${major}/addons
-    tar czf logs.tar.gz logs
-    manuals $major $minor
-    cp logs.tar.gz ${DST}/addons/grass${major}
-    cp modules.xml ${DST}/addons/grass${major}
-    cp html.tar.gz ${DST}/addons/grass${major}
-}
-
-promote 6 4
-promote 7 0
-
-exit 0

Modified: grass-addons/tools/addons/grass-addons-publish.sh
===================================================================
--- grass-addons/tools/addons/grass-addons-publish.sh	2015-08-11 13:04:28 UTC (rev 65889)
+++ grass-addons/tools/addons/grass-addons-publish.sh	2015-08-11 13:14:50 UTC (rev 65890)
@@ -3,6 +3,8 @@
 # This script copies built addons manual pages from the build server
 # and creates index page
 #
+# To be run on publishing server (see crontab.publish)
+#
 # original author: Martin Landa
 # updated for new CMS path MN 8/2015