From 295dfa97807eef5424e45401619dd0b20b86e448 Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Mon, 11 Sep 2006 14:47:51 +0000
Subject: [PATCH] [156043] gather logs does not includ nested features -
 alternative workaround

---
 .../org.eclipse.wst.feature/feature.xml       | 27 -----------------
 .../components/wst/customTargets.xml          | 30 +++++++++++++++++++
 2 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/assembly/features/org.eclipse.wst.feature/feature.xml b/assembly/features/org.eclipse.wst.feature/feature.xml
index d0c12acc8..a23cebc66 100644
--- a/assembly/features/org.eclipse.wst.feature/feature.xml
+++ b/assembly/features/org.eclipse.wst.feature/feature.xml
@@ -52,33 +52,6 @@
          id="org.wsdl4j.feature"
          version="0.0.0"/>
 
-   <includes
-         id="org.eclipse.wst.common_core.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.server_core.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.xml_core.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.ws_core.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.web_core.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.rdb_core.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.common_ui.feature"
-         version="0.0.0"/>
 
 
 
diff --git a/releng.wtpbuilder/components/wst/customTargets.xml b/releng.wtpbuilder/components/wst/customTargets.xml
index e1491a20f..0437c3ebc 100644
--- a/releng.wtpbuilder/components/wst/customTargets.xml
+++ b/releng.wtpbuilder/components/wst/customTargets.xml
@@ -212,6 +212,36 @@
                 <include name="**/*.log.zip" />
             </fileset>
         </unzip>
+        
+        <!-- workaround: see https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 -->
+        <copy todir="${postingDirectory}/${buildLabel}/compilelogs" overwrite="true">
+            <fileset dir="${buildDirectory}/features/org.eclipse.wst.common_ui.feature/feature.temp.folder" />
+        </copy>
+        
+        <copy todir="${postingDirectory}/${buildLabel}/compilelogs" overwrite="true">
+            <fileset dir="${buildDirectory}/features/org.eclipse.wst.server_ui.feature/feature.temp.folder" />
+        </copy>
+        
+        <copy todir="${postingDirectory}/${buildLabel}/compilelogs" overwrite="true">
+            <fileset dir="${buildDirectory}/features/org.eclipse.wst.server_ui.feature/feature.temp.folder" />
+        </copy>
+        
+        <copy todir="${postingDirectory}/${buildLabel}/compilelogs" overwrite="true">
+            <fileset dir="${buildDirectory}/features/org.eclipse.wst.xml_ui.feature/feature.temp.folder" />
+        </copy>
+        
+        <copy todir="${postingDirectory}/${buildLabel}/compilelogs" overwrite="true">
+            <fileset dir="${buildDirectory}/features/org.eclipse.wst.ws_ui.feature/feature.temp.folder" />
+        </copy>
+        
+        <copy todir="${postingDirectory}/${buildLabel}/compilelogs" overwrite="true">
+            <fileset dir="${buildDirectory}/features/org.eclipse.wst.web_ui.feature/feature.temp.folder" />
+        </copy>
+        
+        <copy todir="${postingDirectory}/${buildLabel}/compilelogs" overwrite="true">
+            <fileset dir="${buildDirectory}/features/org.eclipse.wst.rdb_ui.feature/feature.temp.folder" />
+        </copy>
+        
     </target>
 
     <target name="clean" unless="noclean">
-- 
GitLab