prep for orbit jars
diff --git a/releng.wtpbuilder/components/wst-sdk/customTargets.xml b/releng.wtpbuilder/components/wst-sdk/customTargets.xml
index 123c92c..d02b2bc 100644
--- a/releng.wtpbuilder/components/wst-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/wst-sdk/customTargets.xml
@@ -63,6 +63,35 @@
value="${archiveName}" />
</ant>
+ <!-- add zip entries of third party jars -->
+ <!-- kind of crude for now, points back to our cached copy, for now -->
+ <echo message="${buildDirectory}/../" />
+ <property file="${buildDirectory}/../installmanifest.properties" />
+ <zip
+ destfile="${buildDirectory}/${buildLabel}/${archiveName}"
+ update="true"
+ duplicate="preserve">
+ <zipfileset
+ src="${thirdparty.dir}/${thirdparty.file}" />
+ </zip>
+
+
+ <ant
+ antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
+ target="createChecksums">
+ <property
+ name="buildDirectory"
+ value="${buildDirectory}" />
+ <property
+ name="buildLabel"
+ value="${buildLabel}" />
+ <property
+ name="archiveName"
+ value="${archiveName}" />
+ </ant>
+
+
+
</target>
<!-- ===================================================================== -->
@@ -190,7 +219,20 @@
<!-- ===================================================================== -->
<!-- Steps to do before running assemble. -->
<!-- ===================================================================== -->
- <target name="preAssemble"></target>
+ <target name="preAssemble">
+ <ant
+ antfile="${buildDirectory}/plugins/org.eclipse.wst.ws.explorer/build-war.xml">
+ <property
+ name="baseLocation"
+ value="${baseLocation}" />
+ <property
+ name="basedir"
+ value="${buildDirectory}/plugins/org.eclipse.wst.ws.explorer" />
+ <property
+ name="buildDirectory"
+ value="${buildDirectory}" />
+ </ant>
+ </target>
<!-- ===================================================================== -->
<!-- Steps to do after running assemble. -->
@@ -234,6 +276,43 @@
<include name="**/*.log.zip" />
</fileset>
</unzip>
+
+ <!-- workaround: see https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 -->
+ <copy
+ todir="${buildDirectory}/${buildLabel}/compilelogs"
+ overwrite="true">
+ <fileset
+ dir="${buildDirectory}/features/org.eclipse.wst.common_ui.feature/feature.temp.folder" />
+ </copy>
+
+ <copy
+ todir="${buildDirectory}/${buildLabel}/compilelogs"
+ overwrite="true">
+ <fileset
+ dir="${buildDirectory}/features/org.eclipse.wst.server_ui.feature/feature.temp.folder" />
+ </copy>
+
+ <copy
+ todir="${buildDirectory}/${buildLabel}/compilelogs"
+ overwrite="true">
+ <fileset
+ dir="${buildDirectory}/features/org.eclipse.wst.xml_ui.feature/feature.temp.folder" />
+ </copy>
+
+ <copy
+ todir="${buildDirectory}/${buildLabel}/compilelogs"
+ overwrite="true">
+ <fileset
+ dir="${buildDirectory}/features/org.eclipse.wst.ws_ui.feature/feature.temp.folder" />
+ </copy>
+
+ <copy
+ todir="${buildDirectory}/${buildLabel}/compilelogs"
+ overwrite="true">
+ <fileset
+ dir="${buildDirectory}/features/org.eclipse.wst.web_ui.feature/feature.temp.folder" />
+ </copy>
+
</target>
<target