Changeset 17311

Show
Ignore:
Timestamp:
17.09.2008 16:23:38 (11 years ago)
Author:
oranfry
Message:

standardised the java bundling stuff

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • release-kits/wirk2/installer/build.xml

    r17257 r17311  
    7979         
    8080        <echo message="Creating admin and demo users"/> 
    81         <adduser txt2db="${installDir}/bin/windows/txt2db" 
     81        <adduser 
     82            txt2db="${installDir}/bin/windows/txt2db" 
    8283            usersDb="${installDir}/etc/users.db" 
    8384            username="admin" 
     
    99100 
    100101        <echo message="Filling in concrete values in config files"/> 
    101         <rsr 
    102             file="${installDir}/setup.bat" 
    103             pattern="\*\*GSDLHOME\*\*" 
    104             replacement="${installDir}"/> 
    105         <rsr 
    106             file="${installDir}/cgi-bin/gsdlsite.cfg" 
    107             pattern="\*\*GSDLHOME\*\*" 
    108             replacement="${installDir}"/> 
    109  
    110         <rsr file="${installDir}/cgi-bin/gsdlsite.cfg" pattern="^(#?httpprefix).*" replacement="$1 /gsdl"/> 
    111         <rsr file="${installDir}/cgi-bin/gsdlsite.cfg" pattern="^(#?httpimg).*" replacement="$1 /gsdl/images"/> 
    112  
     102        <rsr file="${installDir}/setup.bat" pattern="\*\*GSDLHOME\*\*" replacement="${installDir}"/> 
     103        <rsr file="${installDir}/cgi-bin/gsdlsite.cfg"> 
     104            <job pattern="\*\*GSDLHOME\*\*" replacement="${installDir}"/> 
     105            <job pattern="^(#?httpprefix).*" replacement="$1 /gsdl"/> 
     106            <job pattern="^(#?httpimg).*" replacement="$1 /gsdl/images"/> 
     107        </rsr> 
    113108        <rsr file="${installDir}/gsdlsite.cfg" pattern="@gsdlhome@" replacement="${installDir}"/> 
    114109                 
     
    133128        </unzip> 
    134129         
     130    </target> 
     131 
     132    <target name="install-java"> 
     133        <echo>Installing bundled java</echo> 
     134        <mkdir dir="${installDir}/packages"/> 
     135        <copy todir="${installDir}/packages/jre"> 
     136            <fileset dir="../@java.extracted@"/> 
     137        </copy> 
    135138    </target> 
    136139     
     
    160163        <shortcut 
    161164            file="${startmenu.path}\Uninstall.lnk" 
    162             execute="${installDir}\bin\windows\search4j.exe -h packages\jre -l Uninstaller.jar" 
     165            execute="${installDir}\bin\windows\search4j.exe -h packages\jre -l Uninstall.jar" 
    163166            workingDirectory="${installDir}" 
    164167            iconFile="${installDir}\images\icon.ico"