Changeset 21386 for main

Timestamp:

2009-12-22T10:49:52+13:00 (14 years ago)

Author:

oranfry

Message:

rearranging into one release kit

Location:

main/trunk/release-kits

Files:

• bin/cdrk2 (added)
• bin/derk (added)
• bin/rk (modified) (4 diffs)
• bin/rk2 (added)
• bin/rk3 (added)
• bin/sork2 (added)
• bin/sork3 (added)
• kits (added)
• kits/cdrk2 (moved) (moved from main/trunk/release-kits/cdrk2 )
• kits/derk (moved) (moved from main/trunk/release-kits/derk )
• kits/rk2 (copied) (copied from main/trunk/release-kits/rk2 )
• kits/rk2/bin (deleted)
• kits/rk3 (moved) (moved from main/trunk/release-kits/rk3 )
• kits/sork2 (moved) (moved from main/trunk/release-kits/sork2 )
• kits/sork3 (moved) (moved from main/trunk/release-kits/sork3 )
• rk2/ant-scripts (deleted)
• rk2/build.xml (deleted)
• rk2/resources (deleted)
• rk2/setup.bat (deleted)

main/trunk/release-kits/bin/rk

@@ -1 +1 @@
 #!/bin/bash
 
-#determine requested release kit
-echo $0
-exit
-
-
-
 function show_title() {
+    echo "RK_HOME: $RK_HOME"
     echo "O---------------------------------------------O"
     echo 
@@ -17 +12 @@
 }
 
-#pre checks
-if [ "$rk_name" == "" ]; then
-    echo "rk_name not set";
-    exit;
-elif [ "$RK_HOME" == "" ]; then
-    echo "RK_HOME not set";
-    exit
-fi
-
 function show_help {
-
     echo "$rk_name - $rk_fullname"
-    echo "Helps you to create releases from the Repository"
+    echo "Automatically creates Greenstone releases"
     echo
-    echo "usage: $rk_name [-sim] [-from <target>] [other-args]"
-    echo "  -sim"
-    echo "      simulation only, don't actually do anything"
-    echo
+    echo "usage: $rk_name [-help|-cmd] [ANT_ARGS]"
     echo "  -help"
     echo "      show this help screen"
-    echo
-    echo "  -from <target>"
-    echo "      start execution from the target with the given target address"
-    echo
-    echo "  -to <target>"
-    echo "      stop execution just before the target with the given target address"
-    echo
-    echo "  -descend <target>"
-    echo "      execute only the target with the given address, including subtargets"
-    echo
     echo
     echo "  -cmd"
     echo "      show the ant command being used by $rk_name"
     echo
-    echo "  -properties"
-    echo "      show the properties required/allowed in $rk_name-build.properties"
-
+    echo "  ANT_ARGS"
+    echo "      Additional arguments to be passed to ant"
 }
 
-#cd up a level or two if needed
-if [ ! -e "$rk_name-build.properties" ]; then
-    if [ -e "../$rk_name-build.properties" ]; then
-        RKOLDPWD=`pwd`
-        cd ..
-    elif [ -e "../../$rk_name-build.properties" ]; then
-        RKOLDPWD=`pwd`
-        cd ../..
-    fi
+#determine requested release kit
+rk_name="$(basename $0)"
+export RK_HOME="$(cd "$(dirname "$0")/.." && pwd)"
+
+if [ "$rk_name" == "rk2" ]; then
+    rk_fullname="Release Kit for Greenstone2"
+elif [ "$rk_name" == "rk3" ]; then
+        rk_fullname="Release Kit for Greenstone3"
+else
+    echo "Unrecognised release-kit name '$rk_name'" >&2
+    exit
 fi
 
-#set ANT_HOME
-export ANT_HOME=$RK_HOME/core/ant
+
+#cd up a level or two if needed
+if [ -e "$rk_name-build.properties" ]; then
+    pushd .
+elif [ -e "../$rk_name-build.properties" ]; then
+    pushd ..
+elif [ -e "../../$rk_name-build.properties" ]; then
+    pushd ../..
+else
+    echo "couldn't find file $rk_name-build.properties"
+    echo "it should exist in the top level of the release"
+    exit
+fi
+
+#make sure ant has enough memory
 export ANT_OPTS=-Xmx800M
 
 #create the command
-toexec="ant -lib `pwd`/installer/classes -f $RK_HOME/ant-scripts/build.xml -Dbasedir=`pwd` -D$rk_name.home=$RK_HOME"
+toexec="ant -lib `pwd`/installer/classes -f $RK_HOME/$rk_name/ant-scripts/build.xml -Dbasedir=`pwd` -D$rk_name.home=$RK_HOME"
 
 #pass on the arguments
@@ -89 +75 @@
 done
 
-if [ "$target" != "" ]; then
-    toexec="$toexec $target"
-fi
-
-#execute (or show the command to be executed)
+#show the command to be executed
 if [ "$show_cmd" == "true" ]; then
     echo $toexec
+#execute
 else
     show_title | tee ${rk_name}.out
@@ -101 +84 @@
 fi
 
-if [ "$RKOLDPWD" != "" ]; then
-    cd $RKOLDPWD
-fi
-
+#go back to original dir
+popd