Changeset 16732

Timestamp:

2008-08-13T09:17:53+12:00 (16 years ago)

Author:

oranfry

Message:

simplified rk script after ant took over -sim, -from, -descend and -to flags

File:

• release-kits/shared/linux/rk (modified) (3 diffs)

release-kits/shared/linux/rk

@@ -16 +16 @@
     echo "usage: $rk_name [-sim] [-from <target>] [other-args]"
     echo "  -sim"
-    echo "      (shortcut for -Dexecute=false)"
     echo "      simulation only, don't actually do anything"
     echo
     echo "  -from <target>"
-    echo "      (shortcut for -Dresume.from=<target>)"
     echo "      start execution from the target with the given target address"
-    echo "      first level targets can be referred to by name. E.g., -from compile is the same as -from 1"
+    echo
+    echo "  -to <target>"
+    echo "      stop execution just before the target with the given target address"
+    echo
     echo
     echo "  -descend <target>"
-    echo "      (shortcut for -Dresume.descend=<target>)"
-    echo "      execute only the descendents of the target specified with -from"
-    echo "      for example, with -descend 3, targets 3.1, 3.2, 3.3 etc. would be executed, but execution
-    echo "      would stop before target 4
+    echo "      execute only the target with the given address, including subtargets"
     echo
     echo "  -cp"
@@ -48 +46 @@
 CLASSPATH=$CLASSPATH:$RK_HOME/packages/ant-installer/classes
 
+#set ANT_HOME
+export ANT_HOME=$RK_HOME/packages/ant
+
 #create the command
-toexec="$RK_HOME/packages/ant/bin/ant -lib `pwd`/installer/classes -f $RK_HOME/ant-scripts/build.xml -Dbasedir=`pwd` -D$rk_name.home=$RK_HOME"
+toexec="$ANT_HOME/bin/ant -addressing -lib `pwd`/installer/classes -f $RK_HOME/ant-scripts/build.xml -Dbasedir=`pwd` -D$rk_name.home=$RK_HOME"
 
 #pass on the arguments
@@ -57 +58 @@
         show_help
         exit
-
     elif [ "$1" == "-cp" ]; then
         echo $CLASSPATH
         exit
-
-    elif [ "$1" == "-sim" ]; then
-        toexec="$toexec -Dexecute=false"
-        shift
-
-    elif [ "$1" == "-descend" ]; then
-        toexec="$toexec -Dresume.descend="
-        descend=`echo $2 | sed 's/compile/1/g' | sed 's/create-distributions/2/g' | sed 's/create-installer/3/g' | sed 's/wrap/4/g'`
-        toexec=$toexec$descend
-        shift 2
-
-    elif [ "$1" == "-from" ]; then
-
-        toexec="$toexec -Dresume.from="
-        from=`echo $2 | sed 's/compile/1/g' | sed 's/create-distributions/2/g' | sed 's/create-installer/3/g' | sed 's/wrap/4/g'`
-        toexec=$toexec$from
-        shift 2
-
-    elif [ "$1" == "-to" ]; then
-
-        toexec="$toexec -Dresume.to="
-        to=`echo $2 | sed 's/compile/1/g' | sed 's/create-distributions/2/g' | sed 's/create-installer/3/g' | sed 's/wrap/4/g'`
-        toexec=$toexec$to
-        shift 2
-
-
     else
         toexec="$toexec $1"