Menu
▾
▴
[Rubyeclipse-commit] org.rubypeople.rdt.build/cruiseControl build-RDT.properties,1.1,1.2 build-RDT.xml,1.1,1.2 build.properties,1.1,1.2 config.xml,1.1,1.2 customTargets.xml,1.1,1.2
|
From: Markus B. <mba...@us...> - 2005-12-29 09:45:38
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.build/cruiseControl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29094 Modified Files: build-RDT.properties build-RDT.xml build.properties config.xml customTargets.xml Log Message: updated URLs, deploy target updated, site.xml handling changed Index: build-RDT.properties =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.build/cruiseControl/build-RDT.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** build-RDT.properties 22 Dec 2005 23:13:20 -0000 1.1 --- build-RDT.properties 29 Dec 2005 09:45:25 -0000 1.2 *************** *** 16,21 **** # Make Ant verbose ! #verboseAnt=-verbose ! verboseAnt= eclipseAutomatedTestHome=${rdtBuildHome}/rdt/eclipse-testing rubyInterpreter=/usr/bin/ruby1.6 --- 16,22 ---- # Make Ant verbose ! verboseAnt=-verbose ! #verboseAnt= ! eclipseAutomatedTestHome=${rdtBuildHome}/rdt/eclipse-testing rubyInterpreter=/usr/bin/ruby1.6 Index: customTargets.xml =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.build/cruiseControl/customTargets.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** customTargets.xml 22 Dec 2005 23:13:20 -0000 1.1 --- customTargets.xml 29 Dec 2005 09:45:25 -0000 1.2 *************** *** 195,198 **** --- 195,199 ---- </ant> </target> + <target name="generateUpdateSite"> <!-- Create the directory structure --> *************** *** 205,230 **** <param name="target" value="updateSiteExport"/> </antcall> ! <antcall target="copySiteXmlFromCvs"/> <antcall target="createNightlyBuildSiteXml"/> <delete dir="${buildDirectory}/temp.updatesite"/> </target> ! <target name="copySiteXmlFromCvs" unless="isNightlyBuild"> ! <!-- Grab the rest of the site out of CVS --> ! <mkdir dir="${buildDirectory}/temp.updatesite"/> ! <property name="cvsRoot" value=":ext:cvs.sf.net:/cvsroot/rubyeclipse" /> ! <cvs cvsroot="${cvsRoot}" package="${sitePackagePrefix}" dest="${buildDirectory}/temp.updatesite" tag="${fetchTag}"/> ! <!-- Copy to staging area --> ! <copy todir="${UpdateSiteStagingLocation}"> ! <fileset file="${buildDirectory}/temp.updatesite/${sitePackagePrefix}/site.xml"/> ! </copy> ! </target> ! <target name="createNightlyBuildSiteXml" if="isNightlyOrIntegrationBuild"> <echo file="${UpdateSiteStagingLocation}/site.xml"><?xml version="1.0" encoding="UTF-8"?> <site> ! <description url="http://rubyeclipse.sourceforge.net/nightlyBuild/updateSite/"> The Ruby Development ! Tools update site. </description> <feature url="features/org.rubypeople.rdt_${featureVersion}.jar" id="org.rubypeople.rdt" version="${featureVersion}"> <category ! name="RubyEclipseNightlyBuild"/> </feature> ! <category-def name="RubyEclipseNightlyBuild" label="RDT Nigthly Build"> </category-def> </site> </echo> </target> --- 206,221 ---- <param name="target" value="updateSiteExport"/> </antcall> ! <!-- site.xml files for integration and release builds are handled in build-RDT.xml --> <antcall target="createNightlyBuildSiteXml"/> <delete dir="${buildDirectory}/temp.updatesite"/> </target> ! ! <target name="createNightlyBuildSiteXml" if="isNightlyBuild"> <echo file="${UpdateSiteStagingLocation}/site.xml"><?xml version="1.0" encoding="UTF-8"?> <site> ! <description url="http://updatesite.rubypeople.org/nightly"> The Ruby Development Tools nightly builds. </description> <feature url="features/org.rubypeople.rdt_${featureVersion}.jar" id="org.rubypeople.rdt" version="${featureVersion}"> <category ! name="RubyEclipseNightlyBuilds"/> </feature> ! <category-def name="RubyEclipseNightlyBuilds" label="RDT Nightly Builds"> </category-def> </site> </echo> </target> *************** *** 278,280 **** <echo message="You must specify a target when invoking this file" /> </target> ! </project> \ No newline at end of file --- 269,271 ---- <echo message="You must specify a target when invoking this file" /> </target> ! </project> Index: build-RDT.xml =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.build/cruiseControl/build-RDT.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** build-RDT.xml 22 Dec 2005 23:13:20 -0000 1.1 --- build-RDT.xml 29 Dec 2005 09:45:25 -0000 1.2 *************** *** 62,66 **** <target name="0.7.0.RC1"> <property name="cvsLabel" value="R2005-12-22_0-7-0_RC1"/> ! <property name="label" value="0.7.0.512222200RC1"/> <antcall target="integration"/> </target> --- 62,66 ---- <target name="0.7.0.RC1"> <property name="cvsLabel" value="R2005-12-22_0-7-0_RC1"/> ! <property name="label" value="0.7.0.512282200RC1"/> <antcall target="integration"/> </target> *************** *** 69,73 **** <!-- the only difference to a nightly build is the buildType which leads to setting a differnt updateSiteUrl in feature.xml --> ! <property name="buildDirectory" value="/tmp/rdt-I"/> <!-- properties which should override the values of org.rubypeople.rdt/bootstrap/build.properties must be specified via -D arguments for the call to eclipseRunner --> --- 69,73 ---- <!-- the only difference to a nightly build is the buildType which leads to setting a differnt updateSiteUrl in feature.xml --> ! <property name="buildDirectory" value="/tmp/rdt-${label}"/> <!-- properties which should override the values of org.rubypeople.rdt/bootstrap/build.properties must be specified via -D arguments for the call to eclipseRunner --> *************** *** 79,86 **** </target> ! <target name="deploy"> ! <scp todir="mbarchfe:${deployTargetPassword}@shell.sf.net:/home/bma/"> ! <fileset dir="${buildDirectory}/dist"/> </scp> </target> </project> --- 79,136 ---- </target> ! <target name="updateSiteXml" if="label"> ! <property name="siteXmlFile" value="site.xml"/> ! <property name="placeHolder" value="<!--AddNewFeatureElementHere-->"/> ! <property name="featureUrl" value="features/org.rubypeople.rdt_${label}.jar"/> ! <!-- replacevalue nested element does not support variable replacement. Therefore a two step approach: ! 1. add a feature element ! 2. add newline --> ! <echo message="Adding feature version ${label} to ${siteXmlFile}"/> ! <replace file="${siteXmlFile}" token="${placeHolder}" value="<feature url="${featureUrl}" id="org.rubypeople.rdt" version="${label}"> <category name="RubyEclipseIntegrationBuilds"/> </feature> ${placeHolder}"/> ! <replace file="${siteXmlFile}" token="${placeHolder}"> ! <replacevalue> ! <!--AddNewFeatureElementHere--></replacevalue> ! </replace> ! </target> ! ! <target name="deploy" if="label"> ! <!-- This target is used for manually deploying integration and release builds ! Nightly builds are deployed using cruise controls config.xml file --> ! <property name="downloadUser" value="rubypeople"/> ! <property name="downloadHost" value="download.rubypeople.org"/> ! <property name="buildTypeDirectory" value="integration"/> ! <property name="downloadDirectory" value="~/subdomains/download/httpdocs/${buildTypeDirectory}/${label}"/> ! <property name="updateSiteDirectory" value="~/subdomains/updatesite/httpdocs/${buildTypeDirectory}"/> ! <property name="buildDirectory" value="/tmp/rdt-${label}/dist"/> ! <echo message="Copying ${buildDirectory} to ${downloadUser}@${downloadHost}:${downloadDirectory}"/> ! <sshexec host="${downloadHost}" ! username="${downloadUser}" ! keyfile="${user.home}/.ssh/id_download" ! command="mkdir --parents ${downloadDirectory}"/> ! <scp todir="${downloadUser}:usekeyinsteadofpw@${downloadHost}:${downloadDirectory}" ! keyfile="${user.home}/.ssh/id_download" ! passphrase=""> ! <fileset dir="${buildDirectory}"/> ! </scp> ! <echo message="Copying files to updatesite: ${downloadUser}@${downloadHost}:${downloadDirectory}"/> ! <property name="updateSiteScpUrl" value="${downloadUser}@${downloadHost}:${updateSiteDirectory}"/> ! <scp todir="${updateSiteScpUrl}" ! keyfile="${user.home}/.ssh/id_download" ! passphrase=""> ! <fileset dir="${buildDirectory}/updateSite"> ! <exclude name="site.xml"/> ! </fileset> </scp> + <echo message="Updating site.xml"/> + <property name="siteXmlFile" value="/tmp/site.xml"/> + <scp file="${updateSiteScpUrl}/site.xml" + localTofile="${siteXmlFile}" + keyfile="${user.home}/.ssh/id_download" + passphrase=""/> + <antcall target="updateSiteXml"/> + <scp file="${siteXmlFile}" + todir="${updateSiteScpUrl}" + keyfile="${user.home}/.ssh/id_download" + passphrase=""/> </target> </project> Index: build.properties =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.build/cruiseControl/build.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** build.properties 22 Dec 2005 23:13:20 -0000 1.1 --- build.properties 29 Dec 2005 09:45:25 -0000 1.2 *************** *** 138,141 **** # in case of a nightly or integration build the releaseUpdateSiteURL in feature.xml is # replaced with one of the following entries ! nightlyBuildUpdateSiteURL=http://rubyeclipse.sourceforge.net/nightlyBuild/updateSite ! integrationBuildUpdateSiteURL=http://updatesite.rubypeople.org/rdt/integration \ No newline at end of file --- 138,141 ---- # in case of a nightly or integration build the releaseUpdateSiteURL in feature.xml is # replaced with one of the following entries ! nightlyBuildUpdateSiteURL=http://updatesite.rubypeople.org/nightly ! integrationBuildUpdateSiteURL=http://updatesite.rubypeople.org/integration Index: config.xml =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.build/cruiseControl/config.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** config.xml 22 Dec 2005 23:13:20 -0000 1.1 --- config.xml 29 Dec 2005 09:45:25 -0000 1.2 *************** *** 30,37 **** <publishers> <onsuccess> ! <artifactspublisher ! dir="checkout/RDT/dist" ! dest="artifacts/RDT"/> ! <execute command="/home/bma/dispatchRdtBuildResultsNightly.sh"/> </onsuccess> <email --- 30,50 ---- <publishers> <onsuccess> ! <artifactspublisher ! dir="checkout/RDT/dist" ! dest="artifacts/RDT"/> ! <scp ! sourcedir="checkout/RDT/dist" ! file="." ! options="-r" ! targetuser="rubypeople" ! targethost="download.rubypeople.org" ! targetdir="~/subdomains/download/httpdocs/nightly"/> ! <scp ! sourcedir="checkout/RDT/dist/updateSite" ! file="." ! options="-r" ! targetuser="rubypeople" ! targethost="download.rubypeople.org" ! targetdir="~/subdomains/updatesite/httpdocs/nightly"/> </onsuccess> <email |
