Changeset 17427

Show
Ignore:
Timestamp:
01.10.2008 12:43:54 (11 years ago)
Author:
oranfry
Message:

making targets idempotent

Location:
release-kits
Files:
2 modified

Legend:

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

    r17422 r17427  
    3636    <target name="prepare-core-component"> 
    3737        <!-- delete old stuff to create new components --> 
    38         <delete dir="components"/> 
    39         <mkdir dir="components"/> 
    40         <mkdir dir="components/tmp"/> 
     38        <delete dir="components/tmp/core"/> 
     39        <mkdir dir="components/tmp/core"/> 
    4140                 
    4241        <copy todir="components/tmp/core" overwrite="true"> 
    4342                <fileset dir="distributions/web"> 
    44                     <include name="/**/*"/> 
     43                    <include name="**/*"/> 
    4544                 
    46                     <!-- imagemagick --> 
     45                    <!-- exclude imagemagick --> 
    4746                    <exclude name="bin/windows/imagemagick/**/*"/> 
    4847 
    49                     <!-- ghostscript --> 
     48                    <!-- exclude ghostscript --> 
    5049                    <exclude name="bin/windows/ghostscript/**/*"/> 
    5150 
    52                     <!-- sourcecode --> 
     51                    <!-- exclude sourcecode --> 
    5352                    <exclude name="common-src/**/*"/> 
    5453                    <exclude name="runtime-src/**/*"/> 
     
    7473     
    7574    <target name="prepare-imagemagick-component"> 
     75        <delete dir="components/tmp/imagemagick"/> 
     76        <mkdir dir="components/tmp/imagemagick"/> 
    7677        <copy todir="components/tmp/imagemagick" overwrite="true"> 
    7778            <fileset dir="distributions/web/bin/windows/"> 
     
    9192     
    9293    <target name="prepare-ghostscript-component"> 
     94        <delete dir="components/tmp/ghostscript"/> 
     95        <mkdir dir="components/tmp/ghostscript"/> 
    9396        <copy todir="components/tmp/ghostscript" overwrite="true"> 
    9497            <fileset dir="distributions/web/bin/windows/"> 
     
    108111     
    109112    <target name="prepare-sourcecode-component"> 
     113        <delete dir="components/tmp/sourcecode"/> 
     114        <mkdir dir="components/tmp/sourcecode"/> 
    110115        <copy todir="components/tmp/sourcecode" overwrite="true"> 
    111116                <fileset dir="distributions/web"> 
  • release-kits/wirk3/ant-scripts/create-components.xml

    r17422 r17427  
    4949     
    5050    <target name="prepare-core-component"> 
     51 
    5152        <!-- delete old stuff to create new components --> 
    52         <delete dir="components"/> 
    53         <mkdir dir="components"/> 
    54         <mkdir dir="components/tmp"/> 
     53        <delete dir="components/tmp/core"/> 
     54        <mkdir dir="components/tmp/core"/> 
    5555                 
    5656        <copy todir="components/tmp/core" overwrite="true"> 
     
    9797     
    9898    <target name="prepare-imagemagick-component"> 
     99        <delete dir="components/tmp/imagemagick"/> 
     100        <mkdir dir="components/tmp/imagemagick"/> 
    99101        <copy todir="components/tmp/imagemagick" overwrite="true"> 
    100102            <fileset dir="distribution/greenstone3/gs2build/bin/windows/"> 
     
    113115     
    114116    <target name="prepare-ghostscript-component"> 
     117        <delete dir="components/tmp/ghostscript"/> 
     118        <mkdir dir="components/tmp/ghostscript"/> 
    115119        <copy todir="components/tmp/ghostscript" overwrite="true"> 
    116120            <fileset dir="distribution/greenstone3/gs2build/bin/windows/"> 
     
    127131     
    128132    <target name="prepare-sourcecode-component"> 
     133        <delete dir="components/tmp/sourcecode"/> 
     134        <mkdir dir="components/tmp/sourcecode"/> 
    129135        <copy todir="components/tmp/sourcecode" overwrite="true"> 
    130136                <fileset dir="distribution/greenstone3"> 
     
    144150     
    145151    <target name="prepare-ant-component"> 
     152        <delete dir="components/tmp/ant"/> 
     153        <mkdir dir="components/tmp/ant"/> 
     154 
    146155        <copy todir="components/tmp/ant" overwrite="true"> 
    147156            <fileset dir="distribution/greenstone3/packages"> 
     
    160169     
    161170    <target name="prepare-tomcat-component"> 
     171        <delete dir="components/tmp/tomcat"/> 
     172        <mkdir dir="components/tmp/tomcat"/> 
    162173        <copy todir="components/tmp/tomcat" overwrite="true"> 
    163174            <fileset dir="distribution/greenstone3/packages">