Show
Ignore:
Timestamp:
24.09.2014 20:33:07 (5 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/release-kits/kits/rk3/installer/build.xml

    r29331 r29335  
    124124 
    125125        <echo>Correcting perl shebangs in perl scripts</echo> 
    126         <ant dir="${installDir}" antfile="build.xml" target="set-perl-shebangs" inheritAll="false" /> 
     126        <ant dir="${installDir}" antfile="build.xml" target="set-perl-shebangs" inheritAll="false"> 
     127            <!-- if windows --> 
     128            <property name="perl.path" value="${installDir}\gs2build\bin\windows\perl\bin\"/> 
     129            <!-- /if --> 
     130        </ant> 
    127131 
    128132 
     
    155159        <!-- /if --> 
    156160 
     161        <!-- if windows|linux --> 
     162        <echo>Deleting mac shortcuts</echo> 
     163        <delete dir="${installDir}/gs3-server.app"/> 
     164        <delete dir="${installDir}/gli.app"/> 
     165        <delete dir="${installDir}/client-gli.app"/> 
     166        <delete dir="${installDir}/gems.app"/> 
     167        <!-- /if -->         
     168         
    157169        <!-- if mac --> 
    158         <echo>Installing Mac Shortcuts</echo> 
     170        <echo>Installing Mac Shortcuts</echo> 
    159171        <ant dir="${installDir}" antfile="build.xml" target="gen-mac-shortcuts" inheritAll="false" /> 
    160172        <!-- need to give executable permissions to the Mac shortcuts --> 
     
    184196    </target> 
    185197 
     198    <!-- Dummy target to redirect display of subtargets resulting from ant calls to the gen-mac-shortcuts 
     199         and set-perl-shebangs to this dummy target instead of to the Installing ImageMagick target below --> 
     200    <target name="Adjusting Permissions" /> 
     201     
    186202    <target name="Installing ImageMagick"> 
    187203 
     
    300316            workingDirectory="${installDir}\gli" 
    301317            iconFile="${installDir}\resources\images\librarian.ico" 
     318            iconIndex="0" /> 
     319 
     320        <shortcut 
     321            file="${startmenu.path}\Remote Greenstone Librarian Interface (Client GLI).lnk" 
     322            execute="${installDir}\gli\client-gli.bat" 
     323            workingDirectory="${installDir}\gli" 
     324            iconFile="${installDir}\resources\images\clientgli.ico" 
    302325            iconIndex="0" /> 
    303326