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

Timestamp:

2014-09-24T20:33:07+12:00 (10 years ago)

Author:

ak19

Message:

1. Adding client-gli Windows Start menu shortcut for GS3. 2. Perl path for Windows now works. 3. Mac shortcuts, the .app files, are now deleted in Win and Lin binaries. 4.

File:

• main/trunk/release-kits/kits/rk3/installer/build.xml (modified) (4 diffs)

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

@@ -124 +124 @@
 
         <echo>Correcting perl shebangs in perl scripts</echo>
-        <ant dir="${installDir}" antfile="build.xml" target="set-perl-shebangs" inheritAll="false" />
+        <ant dir="${installDir}" antfile="build.xml" target="set-perl-shebangs" inheritAll="false">
+            <!-- if windows -->
+            <property name="perl.path" value="${installDir}\gs2build\bin\windows\perl\bin\"/>
+            <!-- /if -->
+        </ant>
 
 
@@ -155 +159 @@
         <!-- /if -->
 
+        <!-- if windows|linux -->
+        <echo>Deleting mac shortcuts</echo>
+        <delete dir="${installDir}/gs3-server.app"/>
+        <delete dir="${installDir}/gli.app"/>
+        <delete dir="${installDir}/client-gli.app"/>
+        <delete dir="${installDir}/gems.app"/>
+        <!-- /if -->        
+        
         <!-- if mac -->
-        <echo>Installing Mac Shortcuts</echo>
+        <echo>Installing Mac Shortcuts</echo>
         <ant dir="${installDir}" antfile="build.xml" target="gen-mac-shortcuts" inheritAll="false" />
         <!-- need to give executable permissions to the Mac shortcuts -->
@@ -184 +196 @@
     </target>
 
+    <!-- Dummy target to redirect display of subtargets resulting from ant calls to the gen-mac-shortcuts
+         and set-perl-shebangs to this dummy target instead of to the Installing ImageMagick target below -->
+    <target name="Adjusting Permissions" />
+    
     <target name="Installing ImageMagick">
 
@@ -300 +316 @@
             workingDirectory="${installDir}\gli"
             iconFile="${installDir}\resources\images\librarian.ico"
+            iconIndex="0" />
+
+        <shortcut
+            file="${startmenu.path}\Remote Greenstone Librarian Interface (Client GLI).lnk"
+            execute="${installDir}\gli\client-gli.bat"
+            workingDirectory="${installDir}\gli"
+            iconFile="${installDir}\resources\images\clientgli.ico"
             iconIndex="0" />