Changeset 14826

Show
Ignore:
Timestamp:
20.11.2007 11:29:24 (12 years ago)
Author:
oranfry
Message:

various changes

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • other-projects/trunk/gs2-release-maker/build.xml

    r14772 r14826  
    165165        <echo level="info">Determining the branch path...</echo> 
    166166        <if> 
    167             <bool> 
    168                 <equals arg1="trunk" arg2="${version}"/> 
    169             </bool> 
    170             <property name="branch.path" value="trunk"/> 
    171  
    172             <else> 
    173                 <property name="branch.path" value="branches/${version}"/> 
    174             </else> 
     167            <bool><not><isset property="branch.path"/></not></bool> 
     168            <if> 
     169                <bool> 
     170                    <equals arg1="trunk" arg2="${version}"/> 
     171                </bool> 
     172                <property name="branch.path" value="trunk"/> 
     173                <else> 
     174                    <property name="branch.path" value="branches/${version}"/> 
     175                </else> 
     176            </if> 
    175177        </if> 
    176178        <echo level="info">Branch Path: ${branch.path}</echo> 
     
    567569            <move file="${release.dir}/installer/gsdl/linux-web/disk1" tofile="${release.dir}/installer/gsdl/linux-web/gsdl-${version}-unix"/> 
    568570 
    569             <echo level="info">tar to the release-${version} directory</echo> 
    570             <tar destfile="${release.dir}/release-${version}/gsdl-${version}-unix.tar.gz" basedir="${release.dir}/installer/gsdl/linux-web/gsdl-${version}-unix" compression="gzip" /> 
    571  
     571            <echo level="info">tar it up</echo> 
     572            <exec executable="tar" dir="${release.dir}/installer/gsdl/linux-web"><arg line="-czf gsdl-${version}-unix.tar.gz gsdl-${version}-unix"/></exec> 
     573            <echo level="info">move to the release-${version} directory</echo> 
     574            <move file="${release.dir}/installer/gsdl/linux-web/gsdl-${version}-unix.tar.gz" tofile="${release.dir}/release-${version}/gsdl-${version}-unix.tar.gz"/> 
    572575        </if> 
    573576    </target> 
     
    595598            <move file="${release.dir}/installer/gsdl/macOSx-web/disk1" tofile="${release.dir}/installer/gsdl/macOSx-web/gsdl-${version}-macOSx"/> 
    596599 
    597             <echo level="info">tar to the release-${version} directory</echo> 
    598             <tar destfile="${release.dir}/release-${version}/gsdl-${version}-macOSx.tar.gz" basedir="${release.dir}/installer/gsdl/macOSx-web/gsdl-${version}-macOSx" compression="gzip" /> 
    599  
    600  
     600            <echo level="info">tar it up</echo> 
     601            <exec executable="tar" dir="${release.dir}/installer/gsdl/macOSx-web"><arg line="-czf gsdl-${version}-macOSx.tar.gz gsdl-${version}-macOSx"/></exec> 
     602            <echo level="info">move to the release-${version} directory</echo> 
     603            <move file="${release.dir}/installer/gsdl/macOSx-web/gsdl-${version}-macOSx.tar.gz" tofile="${release.dir}/release-${version}/gsdl-${version}-macOSx.tar.gz"/> 
    601604        </if> 
    602605    </target> 
     
    626629 
    627630            <echo level="info">tar to the release-${version} directory</echo> 
    628             <tar destfile="${release.dir}/release-${version}/gsdl-${version}-src.tar.gz" basedir="${release.dir}/dist/gsdl-${version}-src" compression="gzip" /> 
     631            <exec executable="tar" dir="${release.dir}/dist"><arg line="-czf gsdl-${version}-src.tar.gz gsdl-${version}-src"/></exec> 
     632            <echo level="info">move to the release-${version} directory</echo> 
     633            <move file="${release.dir}/dist/gsdl-${version}-src.tar.gz" tofile="${release.dir}/release-${version}/gsdl-${version}-src.tar.gz"/> 
    629634 
    630635        </if>