diff options
| author | vlorenzo | 2012-01-27 14:36:59 +0000 |
|---|---|---|
| committer | vlorenzo | 2012-01-27 14:36:59 +0000 |
| commit | cdd176a1e4422893d3efc925d3f6a6a6a7a4999d (patch) | |
| tree | 30792e12e3519696f646f58f7260331ba98fc215 /releng | |
| parent | 25bdb6652813b782fe3f1ff783e1950014d3e9f2 (diff) | |
| download | org.eclipse.papyrus-cdd176a1e4422893d3efc925d3f6a6a6a7a4999d.tar.gz org.eclipse.papyrus-cdd176a1e4422893d3efc925d3f6a6a6a7a4999d.tar.xz org.eclipse.papyrus-cdd176a1e4422893d3efc925d3f6a6a6a7a4999d.zip | |
NEW - Bug 365919: [Architecture - SVN - Build] Rewrite the Build
https://bugs.eclipse.org/bugs/show_bug.cgi?id=365919
use a regex that matches the paths on all Hudson slaves
Diffstat (limited to 'releng')
4 files changed, 7 insertions, 6 deletions
diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.properties b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.properties index 8a7c7c1c1f1..c15c1eb01c5 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.properties +++ b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.properties @@ -24,8 +24,9 @@ jdk1.5.dir=/shared/common/jdk-1.5.0-22.x86_64 jdk_1.6=/shared/common/sun-jdk1.6.0_21_x64 org.eclipse.update.jarprocessor.pack200.buckminster=${jdk_1.6}/jre/bin + # the following two properties are used to fix the SVN references in the BOM, for building a correct PSF # the location from the rmap -bom.local.source.tree=/opt/users/hudsonbuild/workspace/papyrus-trunk-extra-nightly/sourceTree/ +bom.source.tree.pattern=repository=".*?/papyrus-trunk-extra-nightly(?:/.*?)?/sourceTree/(.*?)" # the corresponding location on the SVN -bom.svn.source.tree=file:///svnroot/modeling/org.eclipse.mdt.papyrus/trunk/ +bom.source.tree.replacement=repository="file:///svnroot/modeling/org.eclipse.mdt.papyrus/trunk/\\1" diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.xml b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.xml index ea3150642a7..c3a3c91caa0 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.xml +++ b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.xml @@ -266,7 +266,7 @@ <!-- Generate the psf --> <echo message="Generating psf" /> - <replace file="${build.root}/papyrus_bom.xml" token="${bom.local.source.tree}" value="${bom.svn.source.tree}"/> + <replaceregexp file="${build.root}/papyrus_bom.xml" match="${bom.source.tree.pattern}" replace="${bom.source.tree.replacement}" byline="true"/> <xslt style="${build.config.root.dir}/xsl/psf/bom2repository.xsl" in="${build.root}/papyrus_bom.xml" out="repository.xml" /> <xslt style="${build.config.root.dir}/xsl/psf/repository2subversive.xsl" in="repository.xml" out="${result}/subversive_${build.type}.psf" /> <xslt style="${build.config.root.dir}/xsl/psf/repository2subclipse.xsl" in="repository.xml" out="${result}/subclipse_${build.type}.psf" /> diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.properties b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.properties index 6fd709f7137..be3972ea2c9 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.properties +++ b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.properties @@ -46,9 +46,9 @@ pde.feature.range.generation=false # the following two properties are used to fix the SVN references in the BOM, for building a correct PSF # the location from the rmap -bom.local.source.tree=/opt/users/hudsonbuild/workspace/papyrus-trunk-nightly/sourceTree/ +bom.source.tree.pattern=repository=".*?/papyrus-trunk-nightly(?:/.*?)?/sourceTree/(.*?)" # the corresponding location on the SVN -bom.svn.source.tree=file:///svnroot/modeling/org.eclipse.mdt.papyrus/trunk/ +bom.source.tree.replacement=repository="file:///svnroot/modeling/org.eclipse.mdt.papyrus/trunk/\\1" # for debugging only #skip.site.p2=true diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.xml b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.xml index b9299703948..c70ab96e17c 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.xml +++ b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.xml @@ -266,7 +266,7 @@ <!-- Generate the psf --> <echo message="Generating psf" /> - <replace file="${build.root}/papyrus_bom.xml" token="${bom.local.source.tree}" value="${bom.svn.source.tree}"/> + <replaceregexp file="${build.root}/papyrus_bom.xml" match="${bom.source.tree.pattern}" replace="${bom.source.tree.replacement}" byline="true"/> <xslt style="${build.config.root.dir}/xsl/psf/bom2repository.xsl" in="${build.root}/papyrus_bom.xml" out="repository.xml" /> <xslt style="${build.config.root.dir}/xsl/psf/repository2subversive.xsl" in="repository.xml" out="${result}/subversive_${build.type}.psf" /> <xslt style="${build.config.root.dir}/xsl/psf/repository2subclipse.xsl" in="repository.xml" out="${result}/subclipse_${build.type}.psf" /> |