Menu
▾
▴
[Rubyeclipse-commit] org.rubypeople.rdt.build/bootstrap customTargets.xml,1.13,1.14
|
From: Markus B. <mba...@us...> - 2005-12-12 23:44:26
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.build/bootstrap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30342/bootstrap Modified Files: customTargets.xml Log Message: new target for packaging, determine feature version for integration build Index: customTargets.xml =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.build/bootstrap/customTargets.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** customTargets.xml 26 Sep 2005 22:22:46 -0000 1.13 --- customTargets.xml 12 Dec 2005 23:44:13 -0000 1.14 *************** *** 64,70 **** <format property="build.tstamp" pattern="5MMddhhmm"/> </tstamp> ! <condition property="featureVersion" value="${nightlyBuildFeatureVersionPrefix}${build.tstamp}"> <equals arg1="${buildType}" arg2="N"/> </condition> <fail unless="featureVersion" message="Property featureVersion must be set. Either directly or in case of a nightly build with nightlyBuildFeatureVersionPrefix."/> <echo message="Using featureVersion: ${featureVersion}."/> --- 64,73 ---- <format property="build.tstamp" pattern="5MMddhhmm"/> </tstamp> ! <condition property="featureVersion" value="${nightlyBuildFeatureVersionPrefix}${build.tstamp}NGT"> <equals arg1="${buildType}" arg2="N"/> </condition> + <condition property="featureVersion" value="${nightlyBuildFeatureVersionPrefix}${build.tstamp}INT"> + <equals arg1="${buildType}" arg2="I"/> + </condition> <fail unless="featureVersion" message="Property featureVersion must be set. Either directly or in case of a nightly build with nightlyBuildFeatureVersionPrefix."/> <echo message="Using featureVersion: ${featureVersion}."/> *************** *** 85,89 **** <!-- ===================================================================== --> <target name="postFetch"> ! <antcall target="replaceVersionsForNightlyBuild"/> <replace file="${buildDirectory}/features/org.rubypeople.rdt/feature.xml"> <replacefilter token="<!--@@INCLUDES@@-->" value="<includes id="org.rubypeople.rdt.source" version="${featureVersion}"/>"/> --- 88,93 ---- <!-- ===================================================================== --> <target name="postFetch"> ! ! <antcall target="replaceVersions"/> <replace file="${buildDirectory}/features/org.rubypeople.rdt/feature.xml"> <replacefilter token="<!--@@INCLUDES@@-->" value="<includes id="org.rubypeople.rdt.source" version="${featureVersion}"/>"/> *************** *** 93,101 **** </replace> </target> ! <target name="replaceVersionsForNightlyBuild" if="baseFeatureVersion"> <replace dir="${buildDirectory}/features"> <include name="org.rubypeople.*/feature.xml"/> <replacefilter token="${baseFeatureVersion}" value="${featureVersion}" /> ! <replacefilter token="http://rubyeclipse.sourceforge.net/updatesite" value="http://rubyeclipse.sourceforge.net/nightlyBuild/updateSite" /> </replace> <replace dir="${buildDirectory}/plugins"> --- 97,113 ---- </replace> </target> ! ! <target name="replaceVersions" if="baseFeatureVersion"> ! <condition property="updateSiteUrl" ! value="http://rubyeclipse.sourceforge.net/nightlyBuild/updateSite" ! else="http://updatesite.rubypeople.org/rdt/integration"> ! <isset property="isNightlyBuild"/> ! </condition> ! <echo message="Nightly or integration build: replacing version ${baseFeatureVersion} with ${featureVersion}"/> ! <echo message="Setting update-site URL: ${updateSiteUrl}"/> <replace dir="${buildDirectory}/features"> <include name="org.rubypeople.*/feature.xml"/> <replacefilter token="${baseFeatureVersion}" value="${featureVersion}" /> ! <replacefilter token="http://rubyeclipse.sourceforge.net/updatesite" value="${updateSiteUrl}" /> </replace> <replace dir="${buildDirectory}/plugins"> *************** *** 145,150 **** <property name="UpdateSiteStagingLocation" value="${buildDirectory}/updateSite"/> <property name="sitePackagePrefix" value="org.rubypeople.updatesite"/> ! <antcall target="generateUpdateSite"/> <antcall target="test"/> </target> <!-- ===================================================================== --> --- 157,163 ---- <property name="UpdateSiteStagingLocation" value="${buildDirectory}/updateSite"/> <property name="sitePackagePrefix" value="org.rubypeople.updatesite"/> ! <antcall target="generateUpdateSite"/> <antcall target="test"/> + <antcall target="package"/> </target> <!-- ===================================================================== --> *************** *** 209,212 **** --- 222,263 ---- </echo> </target> + + <target name="package"> + <echo message="Creating and filling ${buildResultsDirectory}" /> + <mkdir dir="${buildResultsDirectory}"/> + <mkdir dir="${buildResultsDirectory}/logs"/> + + <copy todir="${buildResultsDirectory}/logs" flatten="true"> + <fileset dir="${buildDirectory}"> + <include name="**/*.log"/> + </fileset> + </copy> + <copy todir="${buildResultsDirectory}" flatten="true"> + <fileset dir="${buildDirectory}"> + <include name="**/org.rubypeople.rdt-*.zip"/> + <include name="**/Changelog.txt"/> + <!-- exclude the org.rubypeople.rdt-tests-*.zip file --> + <exclude name="**/*-tests-*"/> + </fileset> + <fileset dir="${eclipseAutomatedTestHome}/results/html"> + <include name="*.html"/> + </fileset> + </copy> + <copy file="${buildDirectory}/workspace-rdt-tests/.metadata/.log" tofile="${buildResultsDirectory}/logs/testsWorkspace.log"/> + + <mkdir dir="${buildResultsDirectory}/updateSite"/> + <copy todir="${buildResultsDirectory}/updateSite"> + <fileset dir="${buildDirectory}/updateSite"/> + </copy> + + <mkdir dir="${buildResultsDirectory}/doc"/> + <copy todir="${buildResultsDirectory}/doc"> + <fileset dir="${buildDirectory}/plugins/org.rubypeople.rdt.doc.user"> + <include name="html/**/*"/> + <include name="images/**/*"/> + </fileset> + </copy> + + </target> <!-- ===================================================================== --> <!-- Steps to do to publish the build results --> |
