From b447d066aa875721e9870332c9f77b74aa8d794b Mon Sep 17 00:00:00 2001
From: Marc Khouzam <marc.khouzam@ericsson.com>
Date: Wed, 14 Jan 2015 15:15:35 -0500
Subject: [PATCH] Bug 457495 - Include packed jars for CDT builds

With this change the build will now contain the
packed jars for each plugin.  They can be seen under
releng/org.eclipse.cdt.repo/target/repository/plugins/*pack.gz.

Those packed jars are removed from the zip file as they just duplicate
the existing jars.

Change-Id: Ida5804e6939f1dd99a5cc169518738bb394198a6
Signed-off-by: Marc Khouzam <marc.khouzam@ericsson.com>
---
 pom.xml                             |  2 +-
 releng/org.eclipse.cdt.repo/pom.xml | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 08afead6494..d4d956199a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -273,7 +273,7 @@
 						<artifactId>target-platform-configuration</artifactId>
 						<version>${tycho-version}</version>
 						<configuration>
-							<includePackedArtifacts>false</includePackedArtifacts>
+							<includePackedArtifacts>true</includePackedArtifacts>
 						</configuration>
 					</plugin>
 					<plugin>
diff --git a/releng/org.eclipse.cdt.repo/pom.xml b/releng/org.eclipse.cdt.repo/pom.xml
index ea4067b1600..39fc50c533d 100644
--- a/releng/org.eclipse.cdt.repo/pom.xml
+++ b/releng/org.eclipse.cdt.repo/pom.xml
@@ -48,6 +48,21 @@
 												<include name="**" />
 											</fileset>
 										</copy>
+
+										<!-- remove the packed files from the zip file to make it smaller -->
+										<unzip src="target/org.eclipse.cdt.repo.zip" dest="target/tmp"/>
+										<delete file="target/org.eclipse.cdt.repo.zip"/>
+										<delete>
+											<fileset dir="target/tmp">
+												<include name="plugins/*.pack.gz"/>
+											</fileset>
+										</delete>
+										<zip destfile="target/org.eclipse.cdt.repo.zip">
+											<fileset dir="target/tmp">
+												<include name="**"/>
+											</fileset>
+										</zip>
+									 	<delete dir="target/tmp"/>
 									</target>
 								</configuration>
 								<goals>