Merge branch 'master' of ssh://dev.eclipse.org/gitroot/e4/org.eclipse…

….orion.server
subtleGradient · Jan 28, 2011 · 3795894 · 3795894
2 parents 07fdc59 + 50e60cb
commit 3795894
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/releng/org.eclipse.orion.releng/builder/customTargets.xml b/releng/org.eclipse.orion.releng/builder/customTargets.xml
@@ -3,6 +3,16 @@
 	<property name="super" value="Build specific targets and properties" />
 	<import file="${eclipse.pdebuild.templates}/headless-build/customTargets.xml"/>
 
+	<!-- bug 335723 
+		This target is overriding the one from productBuild/allElements.xml
+		so that we can use our own packageOverride.xml which does a different 
+		cleanup.assembly target than the one generated by pde.build -->
+	<target name="defaultAssemble">
+		<ant antfile="${builder}/packageOverride.xml" dir="${buildDirectory}">
+			<property name="assembleScriptName" value="${assembleScriptName}" />
+		</ant>
+	</target>
+
 	<!-- Map files are here in the releng project -->
 	<target name="getMapFiles"  unless="skipMaps">
 		<!--<property name="mapsCheckoutTag" value="HEAD" /> -->

diff --git a/releng/org.eclipse.orion.releng/builder/packageOverride.xml b/releng/org.eclipse.orion.releng/builder/packageOverride.xml
@@ -0,0 +1,12 @@
+<project name="package.override">
+
+	<property name="super" value="Assemble org.eclipse.pde.build.container.feature" />
+	<import file="${buildDirectory}/${assembleScriptName}" />
+
+	<!-- bug 335723 -->
+    <target name="cleanup.assembly">
+		<exec executable="rm" dir="${buildDirectory}" >
+			<arg line="-rf ${assemblyTempDir}" />
+		</exec>
+    </target>	
+</project>
diff --git a/releng/org.eclipse.orion.releng/maps/orion.map b/releng/org.eclipse.orion.releng/maps/orion.map
@@ -1,5 +1,5 @@
 #client
-plugin@org.eclipse.orion.client.core=GIT,tag=v20110128-1210,repo=dev.eclipse.org:/gitroot/e4/org.eclipse.orion.client.git,path=bundles/org.eclipse.orion.client.core
+plugin@org.eclipse.orion.client.core=GIT,tag=v20110128-1330,repo=dev.eclipse.org:/gitroot/e4/org.eclipse.orion.client.git,path=bundles/org.eclipse.orion.client.core
 plugin@org.eclipse.orion.client.editor=GIT,tag=v20110124-1700,repo=dev.eclipse.org:/gitroot/e4/org.eclipse.orion.client.git,path=bundles/org.eclipse.orion.client.editor
 plugin@org.eclipse.orion.client.users.ui=GIT,tag=v20110127-1820,repo=dev.eclipse.org:/gitroot/e4/org.eclipse.orion.client.git,path=bundles/org.eclipse.orion.client.users.ui