Changeset 14772

Show
Ignore:
Timestamp:
06.11.2007 10:25:08 (12 years ago)
Author:
oranfry
Message:

we are no longer changing version numbers in any subtargets of the create-release target

Files:
1 modified

Legend:

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

    r14771 r14772  
    646646    <target name="linux-preparation"> 
    647647        <addressedcall target="checkout-gsdl-indexers-gli" /> 
    648         <!--<addressedcall target="set-version-numbers" />--> 
    649648        <addressedcall target="insert-windows-perl" /> 
    650649        <addressedcall target="prepare-to-build-demo-collection" /> 
     
    670669    <target name="mac-preparation"> 
    671670        <addressedcall target="mac-checkout-gsdl"/> 
    672         <!--<addressedcall target="mac-set-version-numbers"/>--> 
    673671    </target> 
    674672 
     
    706704        </if> 
    707705    </target> 
    708  
    709 <!--    <target name="set-version-numbers"> 
    710         <if><bool><istrue value="${execute}"/></bool> 
    711  
    712         </if> 
    713     </target> --> 
    714  
    715 <!--    <target name="commit-version-numbers"> 
    716         <if><bool><istrue value="${execute}"/></bool> 
    717  
    718             <if><bool><not><equals arg1="${version}" arg2="trunk"/></not></bool> 
    719                 <svn> 
    720                     <commit file="${release.dir}/gsdl/gli/src/org/greenstone/gatherer/Gatherer.java" message="checking-in version number change"/> 
    721                     <commit file="${release.dir}/gsdl/Install.sh"  message="checking-in version number change"/> 
    722                 </svn> 
    723             </if> 
    724  
    725         </if> 
    726     </target>--> 
    727706 
    728707    <target name="insert-windows-perl"> 
     
    837816            <echo level="info">checkout indexers</echo> 
    838817            <exec executable="/usr/bin/ssh"><arg line="${username}:${password}@shuttle cd ${mac.release.dir}/gsdl; PATH=$PATH:/usr/local/bin svn co ${svn.root}/indexers/${branch.path} indexers" /></exec> 
    839  
    840         </if> 
    841     </target> 
    842  
    843     <target name="mac-set-version-numbers"> 
    844         <if><bool><istrue value="${execute}"/></bool> 
    845  
    846  
    847             <echo level="info">bring over the files that need changing</echo> 
    848             <exec executable="/usr/bin/scp"><arg line="${username}@shuttle:${mac.release.dir}/gsdl/lib/gsdlconf.h ${basedir}/temp" /></exec> 
    849             <exec executable="/usr/bin/scp"><arg line="${username}@shuttle:${mac.release.dir}/gsdl/Install.sh ${basedir}/temp" /></exec> 
    850  
    851             <echo level="info">change them</echo> 
    852             <echo level="info">Set version number in lib/gsdlconf.h</echo> 
    853             <rsr file="${basedir}/temp/gsdlconf.h" pattern="(#define GSDL_VERSION) &quot;.\...&quot;" replacement="$1 &quot;${version}&quot;" /> 
    854             <echo level="info">Set version number in Install.sh</echo> 
    855             <rsr file="${basedir}/temp/Install.sh" pattern="(echo &quot;Version: ).*(&quot; .*)" replacement="$1${version}$2" /> 
    856  
    857             <echo level="info">send them back</echo> 
    858             <exec executable="/usr/bin/scp"><arg line="${basedir}/temp/Install.sh ${username}@shuttle:${mac.release.dir}/gsdl" /></exec> 
    859             <exec executable="/usr/bin/scp"><arg line="${basedir}/temp/gsdlconf.h ${username}@shuttle:${mac.release.dir}/gsdl/lib" /></exec> 
    860818 
    861819        </if>