diff --git a/releng.wtpbuilder/components/jst-sdk/dependency.xml b/releng.wtpbuilder/components/jst-sdk/dependency.xml index 7942193783e8916a739742e0236ffb084724c424..60c33b44d8a90fc516ef8e786b698f822ce907b6 100644 --- a/releng.wtpbuilder/components/jst-sdk/dependency.xml +++ b/releng.wtpbuilder/components/jst-sdk/dependency.xml @@ -27,6 +27,11 @@ name="groupId" value="jem" /> </antcall> + <antcall target="getAndInstall"> + <param + name="groupId" + value="jempatch" /> + </antcall> <antcall target="getAndInstall"> <param name="groupId" diff --git a/releng.wtpbuilder/components/jst.tests/dependency.xml b/releng.wtpbuilder/components/jst.tests/dependency.xml index 74ab3846018c9a1c11f8cdb4cb66e3749c491056..ddcf602b215e685b30cb18fe4f1d3670df929f75 100644 --- a/releng.wtpbuilder/components/jst.tests/dependency.xml +++ b/releng.wtpbuilder/components/jst.tests/dependency.xml @@ -28,6 +28,11 @@ name="groupId" value="jem" /> </antcall> + <antcall target="getAndInstall"> + <param + name="groupId" + value="jempatch" /> + </antcall> <antcall target="getAndInstall"> <param name="groupId" diff --git a/releng.wtpbuilder/components/jst/dependency.xml b/releng.wtpbuilder/components/jst/dependency.xml index 6d3f241b925233cc408779f50ef57f958f76602c..b5b41376d7b21eccb658b4fc1a43e0b95c9246fb 100644 --- a/releng.wtpbuilder/components/jst/dependency.xml +++ b/releng.wtpbuilder/components/jst/dependency.xml @@ -28,6 +28,11 @@ name="groupId" value="jem" /> </antcall> + <antcall target="getAndInstall"> + <param + name="groupId" + value="jempatch" /> + </antcall> <antcall target="getAndInstall"> <param name="groupId" diff --git a/releng.wtpbuilder/components/wst-sdk/customTargets.xml b/releng.wtpbuilder/components/wst-sdk/customTargets.xml index 60c7d0b2131ed43d45050c309cd97fb599efe6b1..6955250e1b5dde3243da230e5be8b691157729c0 100644 --- a/releng.wtpbuilder/components/wst-sdk/customTargets.xml +++ b/releng.wtpbuilder/components/wst-sdk/customTargets.xml @@ -73,7 +73,17 @@ <zipfileset src="${thirdparty.dir}/${thirdparty.file}" /> </zip> - + + <!-- add zip entries of jempatch, the jem dev. patch --> + <echo message="${buildDirectory}/../" /> + <property file="${buildDirectory}/../installmanifest.properties" /> + <zip + destfile="${buildDirectory}/${buildLabel}/${archiveName}" + update="true" + duplicate="preserve"> + <zipfileset + src="${jempatch.dir}/${jempatch.file}" /> + </zip> <ant antfile="${wtp.builder.home}/scripts/build/buildutilities.xml" diff --git a/releng.wtpbuilder/components/wst-sdk/dependency.xml b/releng.wtpbuilder/components/wst-sdk/dependency.xml index d7895e24ec76afe09ee3ab6a559eceb6bda4089b..245a3c3d600c935dbeab3e5a88f1c639600ed51f 100644 --- a/releng.wtpbuilder/components/wst-sdk/dependency.xml +++ b/releng.wtpbuilder/components/wst-sdk/dependency.xml @@ -33,6 +33,11 @@ <param name="groupId" value="jem" /> + </antcall> + <antcall target="getAndInstall"> + <param + name="groupId" + value="jempatch" /> </antcall> <antcall target="getAndInstall"> <param diff --git a/releng.wtpbuilder/components/wst.tests/dependency.xml b/releng.wtpbuilder/components/wst.tests/dependency.xml index dbb1b4a6f051792371862c4f2cc562c8ee69612d..98b15cff356cce4b5f0159d491a3581269a4ebf4 100644 --- a/releng.wtpbuilder/components/wst.tests/dependency.xml +++ b/releng.wtpbuilder/components/wst.tests/dependency.xml @@ -28,6 +28,11 @@ name="groupId" value="jem" /> </antcall> + <antcall target="getAndInstall"> + <param + name="groupId" + value="jempatch" /> + </antcall> <antcall target="getAndInstall"> <param name="groupId" diff --git a/releng.wtpbuilder/components/wst/customTargets.xml b/releng.wtpbuilder/components/wst/customTargets.xml index 87c3ea4c2dd1f81594889b6cd02b82dcdb1fa679..6cb86806603af28563514025ed7bf85bf514bf0b 100644 --- a/releng.wtpbuilder/components/wst/customTargets.xml +++ b/releng.wtpbuilder/components/wst/customTargets.xml @@ -73,7 +73,17 @@ <zipfileset src="${thirdparty.dir}/${thirdparty.file}" /> </zip> - + + <!-- add zip entries of jempatch, the jem dev. patch --> + <echo message="${buildDirectory}/../" /> + <property file="${buildDirectory}/../installmanifest.properties" /> + <zip + destfile="${buildDirectory}/${buildLabel}/${archiveName}" + update="true" + duplicate="preserve"> + <zipfileset + src="${jempatch.dir}/${jempatch.file}" /> + </zip> <ant antfile="${wtp.builder.home}/scripts/build/buildutilities.xml" diff --git a/releng.wtpbuilder/components/wst/dependency.xml b/releng.wtpbuilder/components/wst/dependency.xml index e020dfc805c1ce8166d46489091bde9ad9c58489..e54c05513a8b894304b914bf4e0adfb49df1519d 100644 --- a/releng.wtpbuilder/components/wst/dependency.xml +++ b/releng.wtpbuilder/components/wst/dependency.xml @@ -33,6 +33,11 @@ name="groupId" value="jem" /> </antcall> + <antcall target="getAndInstall"> + <param + name="groupId" + value="jempatch" /> + </antcall> <antcall target="getAndInstall"> <param name="groupId" diff --git a/releng.wtpbuilder/distribution/wtp.tests/testdependency.xml b/releng.wtpbuilder/distribution/wtp.tests/testdependency.xml index f767fd4f706429b84c745de1bd9b5a528a63cbc1..fb686effa4575f9c935cdab7680d37b871cd7776 100644 --- a/releng.wtpbuilder/distribution/wtp.tests/testdependency.xml +++ b/releng.wtpbuilder/distribution/wtp.tests/testdependency.xml @@ -19,6 +19,9 @@ <antcall target="getAndInstall"> <param name="groupId" value="jem" /> </antcall> + <antcall target="getAndInstall"> + <param name="groupId" value="jempatch" /> + </antcall> <antcall target="getAndInstall"> <param name="groupId" value="eclipse" /> </antcall>