Changeset 27389 for main/trunk/release-kits/kits/rk3

Timestamp:

2013-05-21T17:42:35+12:00 (11 years ago)

Author:

ak19

Message:

Moving recently added target to install mac shortcuts around, because they appear in a weird location in the installer.

Location:

main/trunk/release-kits/kits/rk3/installer

Files:

• antinstall-config.xml (modified) (4 diffs)
• build.xml (modified) (2 diffs)

main/trunk/release-kits/kits/rk3/installer/antinstall-config.xml

@@ -117 +117 @@
             displayText=""/>
 
-        <!-- NO FLAX START -->
-
         <!-- if windows|mac -->
         <target
@@ -126 +124 @@
             displayText=""/>
         <!-- /if -->
-
-        <!-- NO FLAX END -->
 
         <target
@@ -151 +147 @@
         <!-- /if -->
 
+        <!-- if mac -->
+        <target
+            target="Installing Mac Shortcuts"
+            diskRequirement="~2.2 MB"
+            defaultValue="true"
+            displayText=""
+            force="true"/>
+        <!-- /if -->
+
         <!-- NO FLAX END -->
 
@@ -180 +185 @@
         <!-- FLAX END -->
 
-        <!-- if mac -->
-        <target
-            target="Installing Mac Shortcuts"
-            diskRequirement="~2.2 MB"
-            defaultValue="true"
-            displayText=""
-            force="true"/>
-        <!-- /if -->
     </page>
 

main/trunk/release-kits/kits/rk3/installer/build.xml

@@ -348 +348 @@
     </target>
 
+    <target name="Installing Mac Shortcuts">
+      <echo>Installing Mac Shortcuts</echo>
+      <ant dir="${installDir}" antfile="build.xml" target="gen-mac-shortcuts" inheritAll="false" />
+    </target>
     
     <target name="Configuring Administration Pages" if="enable.admin.pages">
@@ -373 +377 @@
             email=""/>-->
     </target>
-
-    <target name="Installing Mac Shortcuts">
-      <echo>Installing Mac Shortcuts</echo>
-      <ant dir="${installDir}" antfile="build.xml" target="gen-mac-shortcuts" inheritAll="false" />
-    </target>
     
     <!-- util target to extract the given component -->