prep for using JEM patch

bf3c0a8e · david_williams · ef8c07a4 · bf3c0a8e · bf3c0a8e · bf3c0a8e
Commit bf3c0a8e authored 18 years ago by david_williams
--- 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"

--- 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"

--- 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"

--- 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"

--- 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

--- 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"

--- 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"

--- 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"

--- 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>