Attachment 134823 Details for Bug 270627 – patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch

270627.txt (text/plain), 5.64 KB, created by Kim Moir

on 2009-05-07 13:52:50 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Kim Moir

Created: 2009-05-07 13:52:50 EDT

Size: 5.64 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.doc.isv
>Index: build.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.doc.isv/build.xml,v
>retrieving revision 1.37
>diff -u -r1.37 build.xml
>--- build.xml	14 Apr 2009 20:45:48 -0000	1.37
>+++ build.xml	7 May 2009 17:51:16 -0000
>@@ -44,7 +44,7 @@
> 		<copy todir="${destination.temp.folder}/${full.name}">
> 			<fileset dir="${basedir}" includes="concepts/, gettingStarted/, images/, reference/, tasks/,samples/,guide/,porting/,questions/,*.properties,*.xml,*.zip,*.html,*.htm,*.png,*.css,META-INF/,index/" excludes="build.properties,build.xml,buildDoc.xml" />
> 		</copy>
>-		<eclipse.versionReplacer path="${destination.temp.folder}/${full.name}" version="${version.suffix}" />
>+		<eclipse.versionReplacer path="${destination.temp.folder}/${full.name}" version="v${timestamp}" />
> 	</target>
> 
> 	<target name="build.jars" depends="init">
>#P org.eclipse.jdt.doc.user
>Index: build.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.doc.user/build.xml,v
>retrieving revision 1.31
>diff -u -r1.31 build.xml
>--- build.xml	14 Apr 2009 20:45:50 -0000	1.31
>+++ build.xml	7 May 2009 17:51:17 -0000
>@@ -52,7 +52,7 @@
> 		<copy todir="${destination.temp.folder}/${full.name}">
> 			<fileset dir="${basedir}" includes="*.properties,*.xml,*.zip,*.html,*.htm,*.png,*.css,META-INF/**,index/**,concepts/**, gettingStarted/**, images/**, reference/**, tasks/**, tips/**, whatsNew/**" excludes="build.properties,build.xml" />
> 		</copy>
>-		<eclipse.versionReplacer path="${destination.temp.folder}/${full.name}" version="${version.suffix}" />
>+		<eclipse.versionReplacer path="${destination.temp.folder}/${full.name}" version="v${timestamp}" />
> 	</target>
> 
> 	<target name="build.jars" depends="init" description="Build all the jars for the plug-in: org.eclipse.jdt.doc.user.">
>#P org.eclipse.releng.eclipsebuilder
>Index: buildAll.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/buildAll.xml,v
>retrieving revision 1.233
>diff -u -r1.233 buildAll.xml
>--- buildAll.xml	6 May 2009 15:35:14 -0000	1.233
>+++ buildAll.xml	7 May 2009 17:51:17 -0000
>@@ -518,7 +518,7 @@
> 			</comparator>
> 		</p2.mirror> -->
> 		<p2.metadata.mirror source="file:${reposource}" writeMode="append" destination="file:${buildRepo}" />
>-		<p2.artifact.mirror source="file:${reposource}" baseline="file:${updateSite}" comparatorId="org.eclipse.equinox.p2.repository.tools.jar.comparator" destination="file:${buildRepo}" ignoreErrors="true" comparatorLog="${buildlogs}/comparatorlog.txt" log="${buildlogs}/mirrorlog.txt" />
>+		<p2.artifact.mirror source="file:${reposource}" baseline="file:${updateSite}" comparatorId="org.eclipse.equinox.p2.repository.tools.jar.comparator" destination="file:${buildRepo}" ignoreErrors="false" comparatorLog="${buildlogs}/comparatorlog.txt" log="${buildlogs}/mirrorlog.txt" />
> 		<copy todir="${buildRepo}">
> 			<fileset file="${eclipse.build.configs}/../../extras/sdkinstaller.properties" />
> 		</copy>
>Index: eclipse/buildConfigs/sdk/customTargets.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk/customTargets.xml,v
>retrieving revision 1.63
>diff -u -r1.63 customTargets.xml
>--- eclipse/buildConfigs/sdk/customTargets.xml	6 May 2009 14:40:20 -0000	1.63
>+++ eclipse/buildConfigs/sdk/customTargets.xml	7 May 2009 17:51:17 -0000
>@@ -189,7 +189,12 @@
> 	<target name="postFetch">
> 		<concat destfile="${buildDirectory}/plugins/org.eclipse.platform/build.properties" append="true">qualifier=v${timestamp}</concat>
> 		<concat destfile="${buildDirectory}/plugins/org.eclipse.sdk/build.properties" append="true">qualifier=v${timestamp}</concat>
>-
>+		<concat destfile="${buildDirectory}/plugins/org.eclipse.platform.doc.isv/build.properties" append="true">qualifier=v${timestamp}</concat>
>+		<concat destfile="${buildDirectory}/plugins/org.eclipse.platform.doc.user/build.properties" append="true">qualifier=v${timestamp}</concat>
>+		<concat destfile="${buildDirectory}/plugins/org.eclipse.pde.doc.user/build.properties" append="true">qualifier=v${timestamp}</concat>
>+		<concat destfile="${buildDirectory}/plugins/org.eclipse.jdt.doc.isv/build.properties" append="true">qualifier=v${timestamp}</concat>
>+		<concat destfile="${buildDirectory}/plugins/org.eclipse.jdt.doc.user/build.properties" append="true">qualifier=v${timestamp}</concat>
>+			
> 		<ant antfile="${genericTargets}" target="fetchElement">
> 			<property name="type" value="feature" />
> 			<property name="id" value="org.eclipse.equinox.executable" />
>#P org.eclipse.pde.doc.user
>Index: build.xml
>===================================================================
>RCS file: /cvsroot/eclipse/pde/doc/org.eclipse.pde.doc.user/build.xml,v
>retrieving revision 1.29
>diff -u -r1.29 build.xml
>--- build.xml	14 Apr 2009 20:45:46 -0000	1.29
>+++ build.xml	7 May 2009 17:51:21 -0000
>@@ -40,7 +40,7 @@
> 		<copy todir="${destination.temp.folder}/${full.name}">
> 			<fileset dir="${basedir}" includes="META-INF/,*.properties,*.xml,*.zip,*.html,*.htm,*.png,images/*.png,*.css,index/**,guide/**,tips/**,reference/**,tasks/**,whatsNew/**" excludes="build.properties,build.xml,buildDoc.xml" />
> 		</copy>
>-		<eclipse.versionReplacer path="${destination.temp.folder}/${full.name}" version="${version.suffix}" />
>+		<eclipse.versionReplacer path="${destination.temp.folder}/${full.name}" version="v${timestamp}" />
> 	</target>
> 
> 	<target name="publish.bin.parts" depends="init" if="p2.publish.parts">

Actions: View | Diff

Attachments on bug 270627: 131663 | 134823 | 151877 | 158315 | 160092 | 161608 | 161764 | 163636