Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Willink2014-04-26 18:42:06 +0000
committerEd Willink2014-04-26 18:42:06 +0000
commit0504d60d48c3d3dc63211024ad0032aa98b0bba6 (patch)
treef3d4f5e2d644d020c7c585e81849e4766504c11b /features
parent4335a77f798f57c877bafce371949161204b326a (diff)
downloadorg.eclipse.qvtd-0504d60d48c3d3dc63211024ad0032aa98b0bba6.tar.gz
org.eclipse.qvtd-0504d60d48c3d3dc63211024ad0032aa98b0bba6.tar.xz
org.eclipse.qvtd-0504d60d48c3d3dc63211024ad0032aa98b0bba6.zip
[releng] Use -define.category.qualifier
Diffstat (limited to 'features')
-rw-r--r--features/org.eclipse.qvtd.releng.build-feature/packaging.ant21
1 files changed, 20 insertions, 1 deletions
diff --git a/features/org.eclipse.qvtd.releng.build-feature/packaging.ant b/features/org.eclipse.qvtd.releng.build-feature/packaging.ant
index 572f67431..5364d1fd7 100644
--- a/features/org.eclipse.qvtd.releng.build-feature/packaging.ant
+++ b/features/org.eclipse.qvtd.releng.build-feature/packaging.ant
@@ -26,8 +26,27 @@
</condition>
</target>
+ <target name="-define.category.qualifier">
+ <property name="incubation.qualifier" value="" />
+
+ <!-- if the build.alias is non-empty then use it in preference -->
+ <condition property="category.qualifier" value="${incubation.qualifier}-${build.alias}">
+ <and>
+ <isset property="build.alias" />
+ <length string="${build.alias}" when="greater" length="0" />
+ </and>
+ </condition>
+ <!-- otherwise use the build.id if defined, if not then fall back to an empty string -->
+ <condition property="category.qualifier" value="${incubation.qualifier}-${build.id}" else="${incubation.qualifier}">
+ <and>
+ <isset property="build.id" />
+ <length string="${build.id}" when="greater" length="0" />
+ </and>
+ </condition>
+ </target>
+
<!-- Modify category xml (replace package qualifier) -->
- <target name="-create.category.xml" depends="-define.package.qualifier">
+ <target name="-create.category.xml" depends="-define.category.qualifier">
<loadfile property="modifiedCategoryXml" srcFile="category.xml.template">
<filterchain>
<expandproperties />

Back to the top