Changeset 21394 for main/trunk/release-kits/kits/rk2/ant-scripts/create-cdrom-components.xml

Timestamp:

2009-12-22T14:52:32+13:00 (14 years ago)

Author:

oranfry

Message:

moving specific stuff out of general area

File:

• main/trunk/release-kits/kits/rk2/ant-scripts/create-cdrom-components.xml (modified) (3 diffs)

main/trunk/release-kits/kits/rk2/ant-scripts/create-cdrom-components.xml

@@ -106 +106 @@
             <mkdir dir="cdrom/dist/Java/Linux"/>
             <exec executable="cp">
-                <arg value="${rk2.home}/linux/jre_bin"/>
+                <arg value="${rk.home}/shared/linux/jre_bin"/>
                 <arg value="cdrom/dist/Java/Linux"/>
             </exec>
             <!--
             don't extract to save space
-            <exec dir="cdrom/dist/Java/Linux" executable="${rk2.home}/linux/jre_bin"/>
+            <exec dir="cdrom/dist/Java/Linux" executable="${rk.home}/shared/linux/jre_bin"/>
             <exec dir="cdrom/dist/Java/Linux" executable="tar"><arg value="-xf"/><arg value="jre.tar"/></exec>
             <delete file="cdrom/dist/Java/Linux/jre.tar"/>
@@ -118 +118 @@
         <else><if><bool><or><equals arg1="${rk.os}" arg2="windows"/></or></bool>
             <mkdir dir="cdrom/dist/Java/Windows"/>
-            <exec dir="cdrom/dist/Java/Windows" executable="${rk2.home}/windows/wrapper/jre.exe"/>
+            <exec dir="cdrom/dist/Java/Windows" executable="${rk.home}/shared/windows/wrapper/jre.exe"/>
 
         </if></else></if>
@@ -163 +163 @@
             <mkdir dir="wrapped-installer/cdrom"/>
             <!-- create app for cdrom installer -->
-            <copy todir="cdrom/dist/Greenstone-${version}-MacOS.app"><fileset dir="${rk2.home}/mac/Wrapper.app"/></copy>
-            <copy todir="cdrom/dist/Greenstone-${version}-MacOS.app/Contents/Resources" file="${rk2.home}/greenstone2/icon/icon.icns"/>
+            <copy todir="cdrom/dist/Greenstone-${version}-MacOS.app"><fileset dir="${rk.home}/shared/mac/Wrapper.app"/></copy>
+            <copy todir="cdrom/dist/Greenstone-${version}-MacOS.app/Contents/Resources" file="${rk.home}/shared/greenstone2/icon/icon.icns"/>
             <chmod file="cdrom/dist/Greenstone-${version}-MacOS.app/Contents/MacOS/JavaApplicationStub" perm="+x"/>