Changeset 20190

Show
Ignore:
Timestamp:
10.08.2009 12:12:07 (11 years ago)
Author:
oranfry
Message:

copy correct uninstaller script on windows, and prevent erroneous progress output at install

Location:
release-kits/shared
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • release-kits/shared/core/ant-scripts/init.xml

    r20112 r20190  
    316316        <!-- windows --> 
    317317        <else><if><bool><equals arg1="${rk.os}" arg2="windows"/></bool> 
    318             <copy file="${rk.home}/core/uninstaller/Uninstall.sh" todir="distributions/web"/> 
     318            <copy file="${rk.home}/core/uninstaller/Uninstall.bat" todir="distributions/web"/> 
    319319 
    320320        <!-- else fail --> 
     
    346346            <delete dir="distributions/web"/> 
    347347            <mkdir dir="distributions"/> 
    348             <exec executable="cp"><arg line="-r compiled distributions/web"/></exec> 
     348            <exec executable="cp" failonerror="true"><arg line="-r compiled distributions/web"/></exec> 
    349349 
    350350        <!-- else fail --> 
  • release-kits/shared/greenstone3/installer/build.xml

    r20084 r20190  
    7171 
    7272        <echo>Extracting core component</echo> 
    73         <ant target="extract-component"><property name="component.name" value="core"/></ant> 
     73        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="core.lzma"/></patternset></unzip> 
     74        <!-- if windows --><exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x core.lzma"/></exec><!-- /if --> 
     75        <!-- if linux|mac --><sevenzip task="decode" input="${basedir}/core.lzma" output="${basedir}/core.comp"/><!-- /if --> 
     76        <delete file="core.lzma"/> 
     77        <unzip src="${basedir}/core.comp" dest="${installDir}"/> 
     78        <delete file="core.comp"/> 
    7479 
    7580        <echo>Setting binaries to executable</echo> 
     
    130135 
    131136        <echo>Installing ImageMagick</echo> 
    132         <ant target="extract-component"><property name="component.name" value="imagemagick"/></ant> 
     137        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="imagemagick.lzma"/></patternset></unzip> 
     138        <!-- if windows --><exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x imagemagick.lzma"/></exec><!-- /if --> 
     139        <!-- if linux|mac --><sevenzip task="decode" input="${basedir}/imagemagick.lzma" output="${basedir}/imagemagick.comp"/><!-- /if --> 
     140        <delete file="imagemagick.lzma"/> 
     141        <unzip src="${basedir}/imagemagick.comp" dest="${installDir}"/> 
     142        <delete file="imagemagick.comp"/> 
    133143 
    134144        <echo>Setting binaries to executable</echo> 
     
    145155 
    146156        <echo>Installing Ghostscript</echo> 
    147         <ant target="extract-component"><property name="component.name" value="ghostscript"/></ant> 
     157        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="ghostscript.lzma"/></patternset></unzip> 
     158        <!-- if windows --><exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x ghostscript.lzma"/></exec><!-- /if --> 
     159        <!-- if linux|mac --><sevenzip task="decode" input="${basedir}/ghostscript.lzma" output="${basedir}/ghostscript.comp"/><!-- /if --> 
     160        <delete file="ghostscript.lzma"/> 
     161        <unzip src="${basedir}/ghostscript.comp" dest="${installDir}"/> 
     162        <delete file="ghostscript.comp"/> 
    148163 
    149164        <echo>Setting binaries to executable</echo> 
     
    161176        <echo>Installing Tomcat (packages/tomcat)</echo> 
    162177        <mkdir dir="packages"/> 
    163         <ant target="extract-component"><property name="component.name" value="tomcat"/></ant> 
     178        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="tomcat.lzma"/></patternset></unzip> 
     179        <!-- if windows --><exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x tomcat.lzma"/></exec><!-- /if --> 
     180        <!-- if linux|mac --><sevenzip task="decode" input="${basedir}/tomcat.lzma" output="${basedir}/tomcat.comp"/><!-- /if --> 
     181        <delete file="tomcat.lzma"/> 
     182        <unzip src="${basedir}/tomcat.comp" dest="${installDir}"/> 
     183        <delete file="tomcat.comp"/> 
     184 
    164185 
    165186        <echo>Changing tomcat ports tomcat's server.xml</echo> 
     
    237258    <!-- util target to extract the given component --> 
    238259    <!-- pass in ${component.name} as a param --> 
     260    <!-- unused at this time as causes display errors in installer gui! 
    239261    <target name="extract-component"> 
    240         <!-- extract the component into place --> 
     262        <!- - extract the component into place - -> 
    241263        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="${component.name}.lzma"/></patternset></unzip> 
    242         <!-- if windows --> 
     264        <!- - if windows - -> 
    243265        <exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x ${component.name}.lzma"/></exec> 
    244         <!-- /if --> 
    245         <!-- if linux|mac --> 
     266        <!- - /if - -> 
     267        <!- - if linux|mac - -> 
    246268        <sevenzip task="decode" input="${basedir}/${component.name}.lzma" output="${basedir}/${component.name}.comp"/> 
    247         <!-- /if --> 
     269        <!- - /if - -> 
    248270        <delete file="${component.name}.lzma"/> 
    249271        <unzip src="${basedir}/${component.name}.comp" dest="${installDir}"/> 
    250272        <delete file="${component.name}.comp"/> 
    251273    </target> 
     274    --> 
    252275 
    253276</project>