Changeset 17645

Show
Ignore:
Timestamp:
30.10.2008 15:46:18 (11 years ago)
Author:
oranfry
Message:

cleanup stray zipfiles, and the new imagemagick component

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

Legend:

Unmodified
Added
Removed
  • release-kits/lirk3/ant-scripts/create-components.xml

    r17447 r17645  
    44    <!-- create components from the distribution folder --> 
    55    <target name="create-components"> 
    6         <antcall target="create-core-component" /> 
    7         <antcall target="create-sourcecode-component" /> 
    8         <antcall target="create-ant-component" /> 
    9         <antcall target="create-tomcat-component" /> 
     6        <antcall target="prepare-components" /> 
     7        <antcall target="compress-components" /> 
    108    </target> 
    119 
    12     <target name="create-core-component"> 
     10    <target name="prepare-components"> 
    1311        <antcall target="prepare-core-component" /> 
    14         <antcall target="compress-core-component" /> 
     12        <antcall target="prepare-sourcecode-component" /> 
     13        <antcall target="prepare-ant-component" /> 
     14        <antcall target="prepare-tomcat-component" /> 
     15        <antcall target="prepare-imagemagick-component" /> 
     16 
    1517    </target> 
    1618 
    17     <target name="create-sourcecode-component"> 
    18         <antcall target="prepare-sourcecode-component" /> 
     19    <target name="compress-components"> 
     20        <antcall target="compress-core-component" /> 
    1921        <antcall target="compress-sourcecode-component" />   
     22        <antcall target="compress-ant-component" /> 
     23        <antcall target="compress-tomcat-component" /> 
     24        <antcall target="compress-imagemagick-component" /> 
    2025    </target> 
    21          
    22     <target name="create-ant-component"> 
    23         <antcall target="prepare-ant-component" /> 
    24         <antcall target="compress-ant-component" />  
    25     </target> 
    26          
    27     <target name="create-tomcat-component"> 
    28         <antcall target="prepare-tomcat-component" /> 
    29         <antcall target="compress-tomcat-component" />   
    30     </target> 
     26 
    3127     
    3228    <target name="prepare-core-component"> 
     
    4036 
    4137                <!-- exclude sourcecode --> 
     38                <exclude name="src"/> 
    4239                <exclude name="src/**/*"/> 
     40                <exclude name="gs2build/common-src"/> 
    4341                <exclude name="gs2build/common-src/**/*"/> 
     42                <exclude name="gs2build/build-src"/> 
    4443                <exclude name="gs2build/build-src/**/*"/> 
     44                <exclude name="gs2build/runtime-src"/> 
    4545                <exclude name="gs2build/runtime-src/**/*"/> 
    4646                 
    4747                <!-- exclude ant --> 
     48                <exclude name="packages/ant"/> 
    4849                <exclude name="packages/ant/**/*"/> 
    4950 
    5051                <!-- exclude tomcat --> 
     52                <exclude name="packages/tomcat"/> 
    5153                <exclude name="packages/tomcat/**/*"/> 
     54                 
     55                <!-- exclude imagemagick --> 
     56                <exclude name="distributions/greenstone3/gs2build/bin/linux/imagemagick"/> 
     57                <exclude name="distributions/greenstone3/gs2build/bin/linux/imagemagick/**/*"/> 
    5258 
    5359            </fileset> 
     
    5561         
    5662        <!-- do some cleanup --> 
    57         <delete dir="components/tmp/core/gs2build/common-src"/> 
     63<!--        <delete dir="components/tmp/core/gs2build/common-src"/> 
    5864        <delete dir="components/tmp/core/gs2build/build-src"/> 
    5965        <delete dir="components/tmp/core/gs2build/runtime-src"/> 
    6066        <delete dir="components/tmp/core/gs2build/bin/windows/imagemagick"/> 
    61         <delete dir="components/tmp/core/gs2build/bin/windows/ghostscript"/> 
     67        <delete dir="components/tmp/core/gs2build/bin/windows/ghostscript"/>--> 
    6268                 
    6369        <zip destfile="components/core.comp" basedir="components/tmp/core" compress="false" /> 
     
    123129    <target name="compress-tomcat-component"> 
    124130        <sevenzip task="encode" input="components/tomcat.comp" output="components/tomcat.lzma" dictionnary="26"/> 
    125     </target>    
     131    </target> 
     132 
     133    <target name="prepare-imagemagick-component"> 
     134 
     135        <delete dir="components/tmp/imagemagick"/> 
     136        <mkdir dir="components/tmp/imagemagick"/> 
     137 
     138        <copy todir="components/tmp/imagemagick" overwrite="true"> 
     139            <fileset dir="distribution/greenstone3/gs2build/bin/linux"> 
     140                <include name="imagemagick/**/*"/> 
     141            </fileset> 
     142        </copy> 
     143                 
     144        <zip destfile="components/imagemagick.comp" basedir="components/tmp/imagemagick" compress="false" includes="**/*"/> 
     145    </target> 
     146         
     147    <target name="compress-imagemagick-component"> 
     148        <sevenzip task="encode" input="components/imagemagick.comp" output="components/imagemagick.lzma" dictionnary="26"/> 
     149    </target> 
    126150     
    127151</project> 
  • release-kits/lirk3/ant-scripts/create-distribution.xml

    r17523 r17645  
    3131        <antcall target="insert-user-manual"/> 
    3232        <antcall target="insert-compiled-binaries"/> 
     33        <antcall target="export-imagemagick-linux-binaries" /> 
    3334        <antcall target="insert-uninstaller"><param name="script-format" value="sh"/></antcall> <!-- from rk3-targets --> 
    3435        <antcall target="rename-build-xml-for-transit"/> 
     
    4243            <export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distribution/greenstone3"/> 
    4344            <export srcurl="${svn.root}/gli/${branch.path}" destPath="distribution/greenstone3/gli"/> 
     45        </svn> 
     46    </target> 
     47     
     48    <target name="export-imagemagick-linux-binaries"> 
     49        <delete dir="distribution/greenstone3/gs2build/bin/linux/imagemagick"/> 
     50        <svn> 
     51            <export srcurl="${svn.root}/other-projects/trunk/linux-binaries/imagemagick" destPath="distribution/greenstone3/gs2build/bin/linux/imagemagick"/> 
    4452        </svn> 
    4553    </target> 
  • release-kits/lirk3/ant-scripts/operations-on-gs3home.xml

    r17461 r17645  
    5959        <antcall target="get-xml-parser"/> 
    6060 
    61         <delete file="${packages.home}/*.zip"/> 
     61        <delete> 
     62            <fileset dir="${packages.home}" includes="*.zip"/> 
     63        </delete> 
     64 
    6265 
    6366        <!-- documented collections -->