Changeset 21384

Timestamp:

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

Author:

oranfry

Message:

all the *rk2s being replaced by rk2

Location:

main/trunk/release-kits

Files:

• lirk2 (deleted)
• mark2 (deleted)
• shared/core/ant-installer/build.xml (moved) (moved from main/trunk/release-kits/shared/core/ant-installer/build/build.xml ) (1 diff)
• shared/core/ant-installer/lib (modified) (1 prop)
• shared/core/build.xml (modified) (1 diff)
• shared/linux/rk (modified) (3 diffs)
• wirk2 (deleted)

main/trunk/release-kits/shared/core/ant-installer/build.xml

@@ -3 +3 @@
 This is a normal Ant build file to build the release for sourceforge
 -->
-<project name="Installation Build"  default="build"  basedir="..">
+<project name="Installation Build"  default="build">
 
     <!-- Project properties -->

main/trunk/release-kits/shared/core/build.xml

@@ -6 +6 @@
             <property name="crypt.jar" value="${basedir}/lib/crypt.jar"/>
         </ant>
+        <ant dir="ant-installer" inheritAll="false">
+            <property name="antlib" value="${ant.home}/lib"/>
+        </ant>
     </target>
 

main/trunk/release-kits/shared/linux/rk

@@ -66 +66 @@
 
 #create the command
-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"
+toexec="ant -lib `pwd`/installer/classes -f $RK_HOME/ant-scripts/build.xml -Dbasedir=`pwd` -D$rk_name.home=$RK_HOME"
 
 #pass on the arguments
@@ -76 +76 @@
     elif [ "$1" == "-cmd" ]; then
         show_cmd=true
-    elif [ "$1" == "-properties" ]; then
-        target="properties"
-    elif [ "$1" == "-sim" ]; then
-        toexec="$toexec $1"
-        sim_mode=on
     else
         toexec="$toexec $1"
@@ -95 +90 @@
 if [ "$show_cmd" == "true" ]; then
     echo $toexec
-elif [ "$sim_mode" == "on" ]; then
-    show_title
-    $toexec
-elif [ "$target" == "properties" ]; then
-    show_title
-    $toexec
 else
     show_title | tee ${rk_name}.out