Changeset 17367

Show
Ignore:
Timestamp:
25.09.2008 10:36:59 (11 years ago)
Author:
oranfry
Message:

use the compressed components instead of the loose files

Location:
release-kits/wirk3/ant-scripts
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • release-kits/wirk3/ant-scripts/build.xml

    r17339 r17367  
    1515    <property name="bundled.version.tomcat" value="5.5.25"/> 
    1616    <property name="bundled.version.ant" value="1.6.5"/> 
     17    <property name="bundled.version.imagemagick" value="6.4.3"/> 
     18    <property name="bundled.version.ghostscript" value="8.63"/> 
    1719 
    1820    <!-- the size of the resourse chunks to be put in the wrapped installer --> 
     
    3032    <import file="compile.xml"/> 
    3133    <import file="create-distribution.xml"/> 
     34    <import file="create-components.xml"/> 
    3235    <import file="create-installer.xml"/> 
    3336    <import file="wrap.xml"/> 
     
    3740        <antcall target="compile"/> 
    3841        <antcall target="create-distribution"/> 
     42        <antcall target="create-components"/> 
    3943        <antcall target="create-installer"/> 
    4044        <antcall target="wrap"/> 
    4145    </target> 
    4246     
     47     
     48 
    4349</project> 
  • release-kits/wirk3/ant-scripts/create-installer.xml

    r17337 r17367  
    2020            <fileset dir="${wirk3.home}/windows/installer-classes"/> 
    2121            <fileset dir="${wirk3.home}/greenstone3/installer-classes"/> 
     22            <fileset dir="${wirk3.home}/packages/7za" includes="7za.exe"/> 
     23            <fileset file="${basedir}/distribution/greenstone3/LICENSE.txt"/> 
    2224        </copy> 
    2325 
    2426        <!-- some classes from jars, unpacked to be repacked into installer --> 
    2527        <unjar src="${wirk3.home}/ant-scripts/tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/> 
     28        <unjar src="${wirk3.home}/ant-scripts/tasks/7-zip/7z.jar" dest="${basedir}/installer/classes"/> 
     29        <!--<unjar src="${wirk3.home}/ant-scripts/tasks/orangevolt/roxes-win32forjava-1.1.1.jar" dest="${basedir}/installer/classes"/> 
     30        <unjar src="${wirk3.home}/ant-scripts/tasks/orangevolt/orangevolt-ant-tasks-1.3.8.jar" dest="${basedir}/installer/classes"/>--> 
    2631        <delete dir="${basedir}/installer/classes/META-INF"/> 
    2732 
     
    4247 
    4348            <zipfileset dir="${basedir}/installer/classes" includes="**/*" /> 
    44             <zipfileset dir="${basedir}/distribution/greenstone3" includes="**/*" /> 
     49            <zipfileset dir="${basedir}/components" includes="*.lzma" /> 
    4550             
    4651        </installer> 
    4752 
     53        <dcff file="${basedir}/installer/antinstall-config.xml" startTag=".*&lt;!-- start full --&gt;.*" endTag=".*&lt;!-- end full --&gt;.*" /> 
     54         
     55        <installer file="${basedir}/installer/Greenstone-${version}-win32-minimal.jar" 
     56                    compress="true" 
     57                    extractType="NonExtractor" 
     58                    installConfig="${basedir}/installer/antinstall-config.xml" 
     59                    buildFile="${basedir}/installer/build.xml" 
     60                    antInstallLib="${wirk3.home}/packages/ant-installer/lib" 
     61                    antLib="${wirk3.home}/packages/ant/lib" 
     62                    validateConfig="true" 
     63                    icons="bluecurve"> 
     64                <zipfileset dir="${basedir}/installer/classes" includes="**/*" /> 
     65                <zipfileset dir="${basedir}/components" includes="core.lzma,sourcecode.lzma" /> 
     66                <zipfileset dir="${basedir}/distribution/greenstone3" includes="LICENSE.txt" /> 
     67        </installer> 
    4868    </target> 
     69 
    4970     
    5071</project>