Changeset 27391 for main/trunk/release-kits

Timestamp:

2013-05-22T21:22:07+12:00 (11 years ago)

Author:

ak19

Message:

Changing when mac shortcuts are generated during the installation.

Location:

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

Files:

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

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

@@ -147 +147 @@
         <!-- /if -->
 
-        <!-- if mac -->
-        <target
-            target="Installing Mac Shortcuts"
-            diskRequirement="~2.2 MB"
-            defaultValue="true"
-            displayText=""
-            force="true"/>
-        <!-- /if -->
-
         <!-- NO FLAX END -->
 

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

@@ -158 +158 @@
         <!-- No quotes around GSDLHOME filepath in setup.bat. since the set operations of batchfiles don't want spaces in their assignments, and where quotes are needed in setup.bat, setup.bat handles this itself -->
         <rsr file="${installDir}/gs2build/setup.bat" pattern="&quot;?\*\*GSDLHOME\*\*&quot;?" replacement="${installDir.local}\gs2build" />
+        <!-- /if -->
+
+        <!-- if mac -->
+        <echo>Installing Mac Shortcuts</echo>
+        <ant dir="${installDir}" antfile="build.xml" target="gen-mac-shortcuts" inheritAll="false" />   
         <!-- /if -->
 
@@ -346 +351 @@
 
         <!-- FLAX END -->
-    </target>
-
-    <target name="Installing Mac Shortcuts">
-      <echo>Installing Mac Shortcuts</echo>
-      <ant dir="${installDir}" antfile="build.xml" target="gen-mac-shortcuts" inheritAll="false" />
     </target>