Changeset 17378 for release-kits/wirk2

Show
Ignore:
Timestamp:
25.09.2008 12:20:31 (11 years ago)
Author:
oranfry
Message:

use the individually zipped components instead of loose files

Location:
release-kits/wirk2/ant-scripts
Files:
3 modified

Legend:

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

    r17308 r17378  
    1919    <property name="rk.os" value="windows" /> 
    2020 
     21    <property name="bundled.version.imagemagick" value="6.4.3"/> 
     22    <property name="bundled.version.ghostscript" value="8.63"/> 
     23     
    2124    <!-- IMPORT OTHER ANT SCRIPTS --> 
    2225    <import file="shared-ant-scripts/init.xml"/> 
     
    2528    <import file="compile.xml"/> 
    2629    <import file="create-distribution.xml"/> 
     30    <import file="create-components.xml"/> 
    2731    <import file="create-installer.xml"/> 
    2832    <import file="wrap.xml"/> 
     
    3236        <antcall target="compile"/> 
    3337        <antcall target="create-distribution"/> 
     38        <antcall target="create-components"/> 
    3439        <antcall target="create-installer"/> 
    3540        <antcall target="wrap"/> 
  • release-kits/wirk2/ant-scripts/create-installer.xml

    r17308 r17378  
    1616            <fileset dir="${wirk2.home}/greenstone2/installer-classes"/> 
    1717            <fileset dir="${wirk2.home}/windows/installer-classes"/> 
     18            <fileset dir="${wirk2.home}/packages/7za" includes="7za.exe"/> 
     19            <fileset file="${basedir}/distributions/web/LICENSE.txt"/> 
    1820        </copy> 
    1921        <unjar src="${wirk2.home}/ant-scripts/tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/> 
     
    2426 
    2527    <target name="compile-installer"> 
     28         
    2629        <installer file="${basedir}/installer/greenstone-${version}-win32.jar" 
    2730            compress="true" 
     
    3538             
    3639            <zipfileset dir="${basedir}/installer/classes" includes="**/*" /> 
    37             <zipfileset dir="${basedir}/distributions/web" includes="**/*" /> 
     40            <zipfileset dir="${basedir}/components" includes="*.lzma" /> 
     41        </installer> 
     42         
     43        <dcff file="${basedir}/installer/antinstall-config.xml" startTag=".*&lt;!-- start full --&gt;.*" endTag=".*&lt;!-- end full --&gt;.*" /> 
     44         
     45        <installer file="${basedir}/installer/Greenstone-${version}-win32-minimal.jar" 
     46            compress="true" 
     47            extractType="NonExtractor" 
     48            installConfig="${basedir}/installer/antinstall-config.xml" 
     49            buildFile="${basedir}/installer/build.xml" 
     50            antInstallLib="${wirk2.home}/packages/ant-installer/lib" 
     51            antLib="${wirk2.home}/packages/ant/lib" 
     52            validateConfig="true" 
     53            icons="bluecurve"> 
     54             
     55            <zipfileset dir="${basedir}/installer/classes" includes="**/*" /> 
     56            <zipfileset dir="${basedir}/components" includes="core.lzma" /> 
    3857        </installer> 
    3958         
  • release-kits/wirk2/ant-scripts/wrap.xml

    r17308 r17378  
    100100    <target name="link-wrapper"> 
    101101        <exec executable="link" dir="${basedir}/wrapped-installer/build"> 
    102             <arg line="/OUT:..\greenstone-${version}-win32.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper.res"/> 
     102            <arg line="/OUT:..\Greenstone-${version}-win32.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper.res"/> 
    103103        </exec> 
    104104    </target>