Show
Ignore:
Timestamp:
28.11.2013 17:49:20 (6 years ago)
Author:
ak19
Message:

jts21 - Removed unused installer targets and variables, renamed some java variables, made installing a JRE an optional installation component

Location:
other-projects/expeditee-release-kits/kits/rke
Files:
4 modified

Legend:

Unmodified
Added
Removed
  • other-projects/expeditee-release-kits/kits/rke/ant-scripts/create-installer.xml

    r28695 r28717  
    6161 
    6262        <!-- calculate the size of: core --> 
    63         <length property="component.bytesize.core-without-jre" mode="all"><fileset file="${basedir}/components/core.comp"/></length> 
    64         <if><bool><equals arg1="${rk.os}" arg2="windows"/></bool> 
    65             <math result="component.bytesize.core" operand1="${component.bytesize.core-without-jre}" operation="+" operand2="${component.bytesize.windows-java}" datatype="int"/> 
    66         <else><if><bool><equals arg1="${rk.os}" arg2="linux"/></bool> 
    67             <math result="component.bytesize.core" operand1="${component.bytesize.core-without-jre}" operation="+" operand2="${component.bytesize.linux-java}" datatype="int"/> 
    68         <else> 
    69             <property name="component.bytesize.core" value="${component.bytesize.core-without-jre}"/> 
    70         </else></if></else></if> 
     63        <length property="component.bytesize.core" mode="all"><fileset file="${basedir}/components/core.comp"/></length> 
    7164        <math result="component.megabytesize.core" operand1="${component.bytesize.core}" operation="/" operand2="1048576" datatype="int"/> 
    7265        <property name="component.size.core" value="${component.megabytesize.core} MB"/> 
    7366 
    74         <!-- calculate the size of: imagemagick --> 
    75         <length property="component.bytesize.imagemagick" mode="all"><fileset file="${basedir}/components/imagemagick.comp"/></length> 
    76         <math result="component.megabytesize.imagemagick" operand1="${component.bytesize.imagemagick}" operation="/" operand2="1048576" datatype="int"/> 
    77         <property name="component.size.imagemagick" value="${component.megabytesize.imagemagick} MB"/> 
     67        <!-- calculate the size of: jre --> 
     68        <math result="component.megabytesize.java" operand1="${component.bytesize.java}" operation="/" operand2="1048576" datatype="int"/> 
     69        <property name="component.size.java" value="${component.megabytesize.java} MB"/> 
    7870 
    79         <!-- calculate the size of: ghostscript --> 
    80         <length property="component.bytesize.ghostscript" mode="all"><fileset file="${basedir}/components/ghostscript.comp"/></length> 
    81         <math result="component.megabytesize.ghostscript" operand1="${component.bytesize.ghostscript}" operation="/" operand2="1048576" datatype="int"/> 
    82         <property name="component.size.ghostscript" value="${component.megabytesize.ghostscript} MB"/> 
    83          
    84         <!-- calculate the size of: apache httpd --> 
    85         <length property="component.bytesize.httpd" mode="all"><fileset file="${basedir}/components/apachehttpd.comp"/></length> 
    86         <math result="component.megabytesize.httpd" operand1="${component.bytesize.httpd}" operation="/" operand2="1048576" datatype="int"/> 
    87         <property name="component.size.httpd" value="${component.megabytesize.httpd} MB"/> 
    88          
    89         <!-- calculate the size of: tomcat --> 
    90         <length property="component.bytesize.tomcat" mode="all"><fileset file="${basedir}/components/tomcat.comp"/></length> 
    91         <math result="component.megabytesize.tomcat" operand1="${component.bytesize.tomcat}" operation="/" operand2="1048576" datatype="int"/> 
    92         <property name="component.size.tomcat" value="${component.megabytesize.tomcat} MB"/> 
    93  
    94         <!-- EXT --> 
    95         <!-- calculate the size of: amp (and put it into the components directory) --> 
    96         <if><bool><and><equals arg1="${amp.enabled}" arg2="true"/><not><available file="${rk.home}/ext/amp.lzma"/></not></and></bool> 
    97           <fail>amp.lzma file not found in the release kit ext directory</fail> 
    98         </if> 
    99  
    100         <if><bool><and><equals arg1="${amp.enabled}" arg2="true"/></and></bool> 
    101           <echo>Copying amp.lzma to compontents directory</echo> 
    102           <copy file="${rk.home}/ext/amp.lzma" todir="${basedir}/components"/> 
    103           <property name="component.size.amp" value="257 MB"/> 
    104         </if> 
    105         <!-- /EXT --> 
    10671 
    10772        <echo>**** OS: ${rk.os}</echo> 
     
    11176        <dcff file="installer/build.xml" startTag="&lt;!--\s*if\s*(?!.*${rk.os})[^ ]+\s*--&gt;" endTag="&lt;!--\s*/if\s*--&gt;" /> 
    11277 
    113         <!-- EXT --> 
    114         <if><bool><not><equals arg1="${amp.enabled}" arg2="true"/></not></bool> 
    115            
    116           <dcff file="installer/antinstall-config.xml" startTag="&lt;!-- start amp --&gt;" endTag="&lt;!-- end amp --&gt;" /> 
    117           <dcff file="installer/build.xml" startTag="&lt;!-- start amp --&gt;" endTag="&lt;!-- end amp --&gt;" /> 
    118         </if> 
    119         <!-- /EXT --> 
    12078        <!-- put the concrete values of things in the config --> 
    12179        <rsr> 
    12280            <fileset dir="${basedir}/installer" includes="*.xml"/> 
    123 <!--            <job pattern="@projectname@" replacement="${projectname}"/> 
    124 --> 
     81            <job pattern="@projectname@" replacement="${projectname}"/> 
    12582            <job pattern="@version@" replacement="${version}${version-extra}"/> 
    12683            <job pattern="@component.size.core@" replacement="${component.size.core}"/> 
    127             <job pattern="@component.size.tomcat@" replacement="${component.size.tomcat}"/> 
    128             <job pattern="@component.size.imagemagick@" replacement="${component.size.imagemagick}"/> 
    129             <job pattern="@component.size.ghostscript@" replacement="${component.size.ghostscript}"/> 
    130             <job pattern="@component.size.httpd@" replacement="${component.size.httpd}"/> 
     84            <job pattern="@component.size.java@" replacement="${component.size.java}"/> 
    13185            <job pattern="@java.min.version@" replacement="${java.min.version}"/> 
    13286            <job pattern="@java.extracted@" replacement="${java.extracted}"/> 
     
    149103        </if>    
    150104 
    151         <!-- EXT --> 
    152         <if><bool><equals arg1="${amp.enabled}" arg2="true"/></bool> 
    153           <rsr> 
    154             <fileset dir="${basedir}/installer" includes="*.xml"/> 
    155             <job pattern="@component.size.amp@" replacement="${component.size.amp}"/> 
    156           </rsr> 
    157         </if> 
    158         <!-- /EXT --> 
    159  
    160105        <!-- put the concrete values of things in the text --> 
    161106        <rsr> 
     
    165110            <job pattern="@version.major@" replacement="${version.major}"/> 
    166111            <job pattern="@java.min.version@" replacement="${java.min.version}"/> 
    167             <job pattern="@bundled.version.imagemagick@" replacement="${bundled.version.imagemagick}"/> 
    168             <job pattern="@bundled.version.ghostscript@" replacement="${bundled.version.ghostscript}"/> 
    169             <job pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/> 
    170112            <job pattern="@bundled.version.windows-java@" replacement="${bundled.version.windows-java}"/> 
    171113            <job pattern="@bundled.version.linux-java@" replacement="${bundled.version.linux-java}"/> 
  • other-projects/expeditee-release-kits/kits/rke/ant-scripts/wrap.xml

    r28695 r28717  
    2222            <rsr file="wrapped-installer/wrapper.cpp"> 
    2323                <job pattern="@projectname@" replacement="${projectname}"/> 
    24                 <job pattern="@java.installer@" replacement="${windows-java.installer}"/> 
     24                <job pattern="@java.installer@" replacement="${java.installer}"/> 
    2525                <job pattern="@java.min.version@" replacement="${java.min.version}"/> 
    2626                <job pattern="@bundled.version.java@" replacement="${bundled.version.windows-java}"/> 
     
    3333            <!-- split the resources into chunks, creating a resource script of the chunks --> 
    3434            <rsplit 
    35                 resource="${rk.home}/shared/windows/wrapper/${windows-java.installer}" 
     35                resource="${rk.home}/shared/windows/wrapper/${java.installer}" 
    3636                outputDir="wrapped-installer"                    
    3737                resourceScript="wrapped-installer/wrapper.rc" 
     
    7878 
    7979            <!-- copy bundled files into place --> 
    80             <copy todir="wrapped-installer" file="${rk.home}/shared/linux/${linux-java.installer}"/> 
     80            <copy todir="wrapped-installer" file="${rk.home}/shared/linux/${java.installer}"/> 
    8181            <copy tofile="wrapped-installer/${projectname}.jar" file="installer/${projectname}-${version}${version-extra}-${os.suffix}.jar"/> 
    8282 
     
    8484            <rsr file="wrapped-installer/wrapper.cpp"> 
    8585                <job pattern="@projectname@" replacement="${projectname}"/> 
    86                 <job pattern="@java.installer@" replacement="${linux-java.installer}"/> 
     86                <job pattern="@java.installer@" replacement="${java.installer}"/> 
    8787                <job pattern="@java.extracted@" replacement="${java.extracted}"/> 
    8888                <job pattern="@java.min.version@" replacement="${java.min.version}"/> 
     
    9595            </exec> 
    9696            <exec executable="/usr/bin/objcopy" dir="wrapped-installer"> 
    97               <arg line="-I binary -O elf64-x86-64 -B i386 --redefine-sym _binary_${linux-java.installer}_start=java --readonly-text ${linux-java.installer} java.o"/> 
     97              <arg line="-I binary -O elf64-x86-64 -B i386 --redefine-sym _binary_${java.installer}_start=java --readonly-text ${java.installer} java.o"/> 
    9898            </exec> 
    9999 
     
    103103              </exec> 
    104104              <exec executable="/usr/bin/objcopy" dir="wrapped-installer" failonerror="true"> 
    105                 <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_${linux-java.installer}_start=java --readonly-text ${linux-java.installer} java.o"/> 
     105                <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_${java.installer}_start=java --readonly-text ${java.installer} java.o"/> 
    106106              </exec> 
    107107             </else> 
     
    118118 
    119119            <!-- figure out java size --> 
    120             <exec executable="ls" dir="wrapped-installer" outputproperty="java.ls"><arg line="-l ${linux-java.installer}"/></exec> 
     120            <exec executable="ls" dir="wrapped-installer" outputproperty="java.ls"><arg line="-l ${java.installer}"/></exec> 
    121121            <exec executable="sed" inputstring="${java.ls}" outputproperty="java.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec> 
    122122 
  • other-projects/expeditee-release-kits/kits/rke/installer/antinstall-config.xml

    r28710 r28717  
    6666        <comment name="choose-components"/> 
    6767 
    68         <!-- if linux|windows --> 
    69         <target 
    70             target="Initialising" 
    71             diskRequirement="x" 
    72             defaultValue="true" 
    73             displayText="x" 
    74             force="true" 
    75             hidden="true"/> 
    76         <!-- /if --> 
    77  
    7868        <target 
    7969            target="Installing Core System" 
     
    8373            force="true"/> 
    8474 
    85         <!-- 
     75        <!-- if linux|windows --> 
    8676        <target 
    87                 target="Installing Apache Web Server" 
    88             diskRequirement="@component.size.httpd@" 
     77            target="Installing Java Runtime" 
     78            diskRequirement="@component.size.java@" 
    8979            displayText="" 
    9080            defaultValue="true"/> 
    91  
    92         <target 
    93             target="Installing ImageMagick" 
    94             diskRequirement="@component.size.imagemagick@" 
    95             defaultValue="true"  
    96             displayText=""/> 
    97         --> 
    98  
    99         <!-- if windows|mac --> 
    100         <target 
    101             target="Installing Ghostscript" 
    102             diskRequirement="@component.size.ghostscript@" 
    103             defaultValue="true"  
    104             displayText=""/> 
    10581        <!-- /if --> 
    106  
    107  
    108         <!-- start cdrom --> 
    109         <!-- the size of this component has to be maintained manually as we can't 
    110             know at compile time how big the documented examples are --> 
    111         <!-- 
    112         <target 
    113             target="Installing Documented Examples" 
    114             diskRequirement="108 MB" 
    115             defaultValue="true"  
    116             displayText=""/> 
    117         --> 
    118         <!-- end cdrom --> 
    11982 
    12083        <!-- if windows --> 
     
    12891    </page> 
    12992 
    130     <!-- page to ask if we should enable admin pages --> 
    131     <!-- 
    132     <page type="input" name="admin-pages" displayText=""> 
    133         <comment name="admin-expl"/> 
    134         <comment name="admin-expl-2"/> 
    135         <comment name="admin-expl-3"/> 
    136         <checkbox property="enable.admin.pages" displayText="" defaultValue="false"/> 
    137     </page> 
    138     --> 
    139  
    140     <!-- only if they said yes above, set a password --> 
    141     <!-- 
    142     <page type="input" name="admin-password" displayText="" ifProperty="(${enable.admin.pages}==true)" target="Configuring Administration Pages"> 
    143         <comment name="admin-password-expl"/> 
    144         <validated property="admin.password" defaultValue="" displayText="" regex="^.{3,20}$"/> 
    145     </page> 
    146     --> 
    147  
    14893    <!-- progress page --> 
    14994    <page type="progress" name="progress" showTargets="true" displayText=""/> 
  • other-projects/expeditee-release-kits/kits/rke/installer/build.xml

    r28695 r28717  
    6767    </target> 
    6868 
    69     <!-- copy jre --> 
    70     <target name="Initialising" if="bundled.java.exists"> 
    71         <mkdir dir="${installDir}/packages"/> 
    72         <copy todir="${installDir}/packages/jre" failonerror="false"> 
    73             <fileset dir="../@java.extracted@"/> 
    74         </copy> 
    75         <chmod dir="${installDir}/packages/jre/bin" includes="*" perm="775"/>        
    76     </target> 
    7769 
    7870    <!-- core system --> 
     
    10092        <!-- end web --> 
    10193 
    102         <!-- start cdrom --> 
    103         <copy todir="${installDir}"> 
    104             <fileset dir="${orig.dir}/Software/core/all"/> 
    105             <fileset dir="${orig.dir}/Software/core/${rk.os}"/><!-- /if --> 
    106         </copy> 
    107         <!-- if windows --> 
    108         <copy todir="${installDir}/packages/jre" failonerror="false"> 
    109             <fileset dir="${orig.dir}/Java/Windows/jre"/> 
    110         </copy> 
    111         <!-- /if --> 
    112         <!-- end cdrom --> 
    113  
    11494        <echo>Setting Binaries to Executable</echo> 
    11595        <chmod dir="${installDir}" includes="*.sh,*.bash" perm="775"/> 
    116         <chmod dir="${installDir}/bin" includes="*" perm="775"/> 
     96        <!-- <chmod dir="${installDir}/bin" includes="*" perm="775"/>  
    11797        <chmod dir="${installDir}/cgi-bin/${shell.name}" includes="*" perm="775"/> 
    11898        <chmod dir="${installDir}/bin/script" includes="**/*" perm="775"/> 
    119         <chmod dir="${installDir}/gli" includes="*.sh" perm="775"/> 
     99        <chmod dir="${installDir}/gli" includes="*.sh" perm="775"/> --> 
    120100        <!-- if linux|mac --> 
    121         <chmod dir="${installDir}/bin/${shell.name}" includes="**/*" perm="775"/> 
    122         <!-- /if --> 
    123  
    124         <echo>Filling in concrete values in config files</echo> 
    125         <copy file="${installDir}/cgi-bin/${shell.name}/gsdlsite.cfg.in" tofile="${installDir}/cgi-bin/${shell.name}/gsdlsite.cfg"/> 
    126         <rsr file="${installDir}/cgi-bin/${shell.name}/gsdlsite.cfg" pattern="&quot;?\*\*GSDLHOME\*\*&quot;?" replacement="&quot;${installDir.local}&quot;"/> 
    127  
    128         <echo>Correcting perl shebangs in perl scripts</echo> 
     101        <!-- <chmod dir="${installDir}/bin/${shell.name}" includes="**/*" perm="775"/> --> 
     102        <!-- /if --> 
     103 
    129104        <!-- if linux|mac --> 
    130         <exec executable="which" outputproperty="perl.executable"><arg value="perl"/></exec> 
    131         <rsr file="${installDir}/cgi-bin/${shell.name}/gliserver.pl" pattern="^#!.*" replacement="#!${perl.executable} -w" lines="1"/> 
    132         <rsr file="${installDir}/cgi-bin/${shell.name}/metadata-server.pl" pattern="^#!.*" replacement="#!${perl.executable} -w" lines="1"/> 
    133         <rsr file="${installDir}/cgi-bin/${shell.name}/checksum.pl" pattern="^#!.*" replacement="#!${perl.executable} -w" lines="1"/> 
    134         <!-- /if --> 
    135         <!-- if windows --> 
    136         <property name="perl.executable" value="${installDir.local}\bin\windows\perl\bin\perl.exe"/> 
    137         <rsr file="${installDir}/cgi-bin/${shell.name}/gliserver.pl" pattern="^#!.*" replacement="#!${perl.executable} -w" lines="1"/> 
    138         <rsr file="${installDir}/cgi-bin/${shell.name}/metadata-server.pl" pattern="^#!.*" replacement="#!${perl.executable} -w" lines="1"/> 
    139         <rsr file="${installDir}/cgi-bin/${shell.name}/checksum.pl" pattern="^#!.*" replacement="#!${perl.executable} -w" lines="1"/> 
    140         <!-- /if --> 
    141  
    142         <echo>Creating the english dictionary</echo> 
    143         <copy file="${installDir}/gli/classes/dictionary.properties" tofile="${installDir}/gli/classes/dictionary_en.properties"/> 
    144  
    145         <!-- if linux|mac --> 
     105        <!-- 
    146106        <echo>Set the installation locale in config files</echo> 
    147107        <rsr file="${installDir}/setup.bash" pattern="^gsdllang=.*" replacement="gsdllang=${language}"/> 
    148108        <rsr file="${installDir}/gli/gli.sh" pattern="^glilang=.*" replacement="glilang=${language}"/> 
    149109        <rsr file="${installDir}/gli/gems.sh" pattern="^glilang=.*" replacement="glilang=${language}"/> 
    150         <!-- /if --> 
     110        --> 
     111        <!-- /if --> 
     112        <!-- 
    151113        <rsr 
    152114            file="${installDir}/gli/classes/xml/config.xml" 
     
    158120 
    159121        <echo message="Creating installation properties file"/> 
     122        --> 
    160123        <!-- if linux|mac --> 
    161         <echo file="${installDir}/etc/installation.properties">#this file is just a placeholder for now</echo> 
     124        <!-- <echo file="${installDir}/etc/installation.properties">#this file is just a placeholder for now</echo> --> 
    162125        <!-- /if --> 
    163126        <!-- if windows --> 
    164         <echo file="${installDir}\etc\installation.properties">installed.startmenu.path:${startmenu.path.unix}</echo> 
     127        <!-- <echo file="${installDir}\etc\installation.properties">installed.startmenu.path:${startmenu.path.unix}</echo> --> 
    165128        <!-- /if --> 
    166129         
    167130        <!-- if mac --> 
     131        <!-- 
    168132        <copy file="${installDir}/gli.app/Contents/document.wflow.in" tofile="${installDir}/gli.app/Contents/document.wflow"/> 
    169133        <rsr file="${installDir}/gli.app/Contents/document.wflow" pattern="\*\*GSDLHOME\*\*" replacement="${installDir}"/> 
     
    180144        <chmod dir="${installDir}" includes="*.app" perm="755"/> 
    181145        <chmod dir="${installDir}" includes="*.app/**/*" perm="755"/> 
    182         <!-- /if --> 
    183     </target> 
    184  
    185     <!-- Apache HTTPD  --> 
    186     <target name="Installing Apache Web Server"> 
    187         <echo>Installing the Apache Web Server</echo> 
    188  
    189         <!-- start web --> 
    190         <unzip src="${antinstaller.jar}" dest="${basedir}"> 
    191             <patternset> 
    192                 <include name="apachehttpd.lzma"/> 
    193             </patternset> 
    194         </unzip> 
    195  
    196         <!-- if linux|mac --> 
    197         <sevenzip task="decode" input="${basedir}/apachehttpd.lzma" output="${basedir}/apachehttpd.comp"/> 
    198         <!-- /if --> 
    199         <!-- if windows --> 
    200         <exec dir="${basedir}" executable="${basedir}/7za.exe"> 
    201             <arg line="x apachehttpd.lzma"/> 
    202         </exec> 
    203         <!-- /if --> 
    204         <unzip src="${basedir}/apachehttpd.comp" dest="${installDir}"/> 
    205         <delete file="apachehttpd.comp"/> 
    206         <!-- end web --> 
    207  
    208         <!-- start cdrom --> 
    209         <mkdir dir="${installDir}/apache-httpd"/> 
    210         <mkdir dir="${installDir}/apache-httpd/${shell.name}"/> 
    211         <copy todir="${installDir}/apache-httpd/${shell.name}"> 
    212             <fileset dir="${orig.dir}/Software/apache-httpd/${shell.name}"/> 
     146        --> 
     147        <!-- /if --> 
     148    </target> 
     149 
     150    <!-- <target name="Initialising" if="bundled.java.exists"> --> 
     151    <!-- Java Runtime  --> 
     152    <target name="Installing Java Runtime"> 
     153        <echo>Installing the Java Runtime</echo> 
     154        <mkdir dir="${installDir}/packages"/> 
     155        <copy todir="${installDir}/packages/jre" failonerror="false"> 
     156            <fileset dir="../@java.extracted@"/> 
    213157        </copy> 
    214         <!-- end cdrom --> 
    215  
    216         <!-- if linux|mac --> 
    217         <chmod dir="${installDir}/apache-httpd/${shell.name}/bin" includes="*" perm="775"/> 
    218         <chmod dir="${installDir}/apache-httpd/${shell.name}" includes="*.sh" perm="775"/> 
    219         <echo>Setting up apache web server</echo> 
    220         <exec dir="${installDir}" executable="${installDir}/apache-httpd/${shell.name}/install-bindist.sh"> 
    221             <arg value="${installDir}/apache-httpd/${shell.name}"/> 
    222         </exec> 
    223         <!-- /if --> 
    224     </target> 
    225  
    226     <!-- ImageMagick --> 
    227     <target name="Installing ImageMagick"> 
    228         <echo>Installing ImageMagick</echo> 
    229         <!-- start web --> 
    230         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="imagemagick.lzma"/></patternset></unzip> 
    231         <!-- if linux|mac --><sevenzip task="decode" input="${basedir}/imagemagick.lzma" output="${basedir}/imagemagick.comp"/><!-- /if --> 
    232         <!-- if windows --><exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x imagemagick.lzma"/></exec><!-- /if --> 
    233         <delete file="imagemagick.lzma"/> 
    234         <unzip src="${basedir}/imagemagick.comp" dest="${installDir}"/> 
    235         <delete file="imagemagick.comp"/> 
    236         <!-- end web --> 
    237  
    238         <!-- start cdrom --> 
    239         <copy todir="${installDir}"> 
    240             <fileset dir="${orig.dir}/Software/imagemagick/${rk.os}"/> 
    241         </copy> 
    242         <!-- end cdrom --> 
    243  
    244         <if><bool><available file="${installDir}/bin/${shell.name}/imagemagick" type="dir"/></bool> 
    245             <chmod dir="${installDir}/bin/${shell.name}/imagemagick/bin" includes="*" perm="775"/> 
    246         <else> 
    247             <chmod dir="${installDir}/ext/imagemagick/${shell.name}/bin" includes="*" perm="775"/> 
    248         </else> 
    249         </if> 
    250  
    251     </target> 
    252  
    253     <!-- Ghostscript --> 
    254     <target name="Installing Ghostscript" depends=""> 
    255         <echo message="Installing Ghostscript"/> 
    256         <!-- start web --> 
    257         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="ghostscript.lzma"/></patternset></unzip> 
    258         <!-- if linux|mac --><sevenzip task="decode" input="${basedir}/ghostscript.lzma" output="${basedir}/ghostscript.comp"/><!-- /if --> 
    259         <!-- if windows --><exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x ghostscript.lzma"/></exec><!-- /if --> 
    260         <delete file="ghostscript.lzma"/> 
    261         <unzip src="${basedir}/ghostscript.comp" dest="${installDir}" /> 
    262         <delete file="ghostscript.comp"/> 
    263         <!-- end web --> 
    264  
    265         <!-- start cdrom --> 
    266         <copy todir="${installDir}"> 
    267             <fileset dir="${orig.dir}/Software/ghostscript/${rk.os}"/> 
    268         </copy> 
    269         <!-- end cdrom --> 
    270  
    271         <chmod dir="${installDir}/bin/${shell.name}/ghostscript/bin" includes="*" perm="775"/> 
    272     </target>    
     158        <chmod dir="${installDir}/packages/jre/bin" includes="*" perm="775"/>        
     159    </target> 
    273160 
    274161    <!-- Start menu shortcuts -->