Attachment 181003 Details for Bug 315844 – patch

[patch] patch

315844b.txt (text/plain), 16.87 KB, created by Kim Moir

on 2010-10-15 14:43:43 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Kim Moir

Created: 2010-10-15 14:43:43 EDT

Size: 16.87 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.releng.eclipsebuilder
>Index: eclipse/buildConfigs/master/customTargets.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/master/customTargets.xml,v
>retrieving revision 1.54
>diff -u -r1.54 customTargets.xml
>--- eclipse/buildConfigs/master/customTargets.xml	14 Oct 2010 19:38:08 -0000	1.54
>+++ eclipse/buildConfigs/master/customTargets.xml	15 Oct 2010 18:42:34 -0000
>@@ -244,20 +244,19 @@
> 	
> 	
> 	<target name="prePackage">
>-		<echo message="${postingDirectory}/${buildLabel}/ecjsrc-${buildId}.jar" />
>-		<eclipse.publish.featuresAndBundles repository="${buildDirectory}/buildRepo">
>-			<bundles dir="${postingDirectory}/${buildLabel}" includes="ecj-${buildId}.jar" />
>-			<bundles dir="${postingDirectory}/${buildLabel}" includes="ecjsrc-${buildId}.jar" />
>-		</eclipse.publish.featuresAndBundles>
> 	</target>
> 
> 	
> 	
> 	
> 	<target name="postPackage">
>-		<exec executable="zip" dir="okjay">
>+		<exec executable="zip" dir="${buildDirectory}/${buildLabel}">
> 			<arg line="-d ${archiveName} win32** wce** linux** solaris** aix** hpux** macosx** qnx**" />
> 		</exec>
>+		<eclipse.publish.featuresAndBundles repository="file:/${buildDirectory}/buildRepo">
>+			<bundles dir="${postingDirectory}/${buildLabel}" includes="ecj-${buildId}.jar" />
>+			<bundles dir="${postingDirectory}/${buildLabel}" includes="ecjsrc-${buildId}.jar" />
>+		</eclipse.publish.featuresAndBundles>
> 		<exec dir="${buildDirectory}/buildRepo" executable="zip">
> 			<arg line="-r ${archiveFullPath} ." />
> 		</exec>
>Index: eclipse/buildConfigs/master/example_customTargets.xml
>===================================================================
>RCS file: eclipse/buildConfigs/master/example_customTargets.xml
>diff -N eclipse/buildConfigs/master/example_customTargets.xml
>--- eclipse/buildConfigs/master/example_customTargets.xml	17 Sep 2010 13:21:07 -0000	1.4
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,287 +0,0 @@
>-<project name="Build specific targets and properties" default="noDefault">
>-
>-	<property name="postingDirectory" value="${buildDirectory}" />
>-	<property name="archiveName" value="eclipse-master-${buildId}.zip" />
>-	<property name="archiveFullPath" value="${buildDirectory}/${buildLabel}/${archiveName}" />
>-	<property name="mapsRoot" value="${buildDirectory}/maps/org.eclipse.releng/maps" />
>-
>-
>-	
>-	
>-	
>-	
>-	<available property="allElementsFile" file="${builder}/allElements.xml" value="${builder}/allElements.xml" />
>-	<property name="allElementsFile" location="${eclipse.pdebuild.templates}/headless-build/allElements.xml" />
>-
>-	<import file="${allElementsFile}" />
>-	<target name="allElements">
>-		<antcall target="allElementsDelegator" />
>-	</target>
>-
>-	
>-	
>-	<target name="getBaseComponents" depends="checkLocalBase" unless="skipBase">
>-		
>-	</target>
>-
>-	<target name="checkLocalBase">
>-		<available file="${base}" property="skipBase" />
>-	</target>
>-
>-	
>-	
>-	
>-	
>-
>-	<target name="getMapFiles" depends="checkLocalMaps" unless="skipMaps">
>-		<property name="mapsCheckoutTag" value="${mapVersionTag}" />
>-		<cvs cvsRoot="${mapsRepo}" package="${mapsRoot}" dest="${buildDirectory}/maps" tag="${mapsCheckoutTag}" />
>-	</target>
>-
>-	<target name="checkLocalMaps">
>-		<available property="skipMaps" file="${buildDirectory}/maps" />
>-	</target>
>-
>-	<target name="tagMapFiles" if="tagMaps">
>-		<cvs dest="${buildDirectory}/maps/${mapsRoot}" command="tag ${mapsTagTag}" />
>-	</target>
>-
>-	<target name="compareMapFiles" if="compareMaps">
>-		<property file="${mapTag.properties}" />
>-		<property name="cvsDiffFile" value="${buildDirectory}/cvsDiff.txt" />
>-		<cvs cvsRoot="${mapCvsRoot}" dest="${buildDirectory}/maps" command="diff -w -r ${lastMapTag}" output="${cvsDiffFile}" />
>-		<modifiedMaps mapDiffFile="${cvsDiffFile}" />
>-	</target>
>-
>-
>-	
>-
>-	<target name="clean" unless="noclean">
>-		<antcall target="allElements">
>-			<param name="target" value="cleanElement" />
>-		</antcall>
>-	</target>
>-
>-	<target name="gatherLogs">
>-		<mkdir dir="${buildDirectory}/${buildLabel}/compilelogs" />
>-		<antcall target="allElements">
>-			<param name="target" value="gatherLogs" />
>-		</antcall>
>-		<unzip dest="${buildDirectory}/${buildLabel}/compilelogs" overwrite="true">
>-			<fileset dir="${buildDirectory}/features">
>-				<include name="**/*.log.zip" />
>-			</fileset>
>-		</unzip>
>-		<copy todir="${postingDirectory}/${buildLabel}/compilelogs" overwrite="true" failonerror="false">
>-			<fileset dir="${buildDirectory}/features/org.eclipse.platform/feature.temp.folder" />
>-		</copy>
>-		<copy todir="${postingDirectory}/${buildLabel}/compilelogs" overwrite="true" failonerror="false">
>-			<fileset dir="${buildDirectory}/features/org.eclipse.sdk/feature.temp.folder" />
>-		</copy>
>-		<copy todir="${postingDirectory}/${buildLabel}/compilelogs" overwrite="true" failonerror="false">
>-			<fileset dir="${buildDirectory}/features/master-equinox/feature.temp.folder" />
>-		</copy>
>-		<copy todir="${postingDirectory}/${buildLabel}/compilelogs" overwrite="true" failonerror="false">
>-			<fileset dir="${buildDirectory}/features/master-jetty/feature.temp.folder" />
>-		</copy>
>-		<copy todir="${postingDirectory}/${buildLabel}/compilelogs" overwrite="true" failonerror="false">
>-			<fileset dir="${buildDirectory}/features/master-ecf/feature.temp.folder" />
>-		</copy>
>-		<copy todir="${postingDirectory}/${buildLabel}/compilelogs" overwrite="true" failonerror="false">
>-			<fileset dir="${buildDirectory}/features/org.eclipse.help/feature.temp.folder" />
>-		</copy>
>-		<copy todir="${postingDirectory}/${buildLabel}/compilelogs" overwrite="true" failonerror="false">
>-			<fileset dir="${buildDirectory}/features/org.eclipse.pde/feature.temp.folder" />
>-		</copy>
>-		<copy todir="${postingDirectory}/${buildLabel}/compilelogs" overwrite="true" failonerror="false">
>-			<fileset dir="${buildDirectory}/features/org.eclipse.equinox.sdk/feature.temp.folder" />
>-		</copy>
>-		<copy todir="${postingDirectory}/${buildLabel}/compilelogs" overwrite="true" failonerror="false">
>-			<fileset dir="${buildDirectory}/features/org.eclipse.sdk.examples/feature.temp.folder" />
>-		</copy>
>-	</target>
>-
>-	
>-	
>-	
>-	<target name="preSetup">
>-	</target>
>-
>-	
>-	
>-	
>-	<target name="postSetup">
>-	</target>
>-
>-	
>-	
>-	
>-	<target name="preFetch">
>-		<replace dir="${buildDirectory}/maps/org.eclipse.releng/maps" value="${localmirror}" token="download.eclipse.org" />
>-		<replace dir="${buildDirectory}/maps/org.eclipse.releng/maps" value="${cvsuser}" token=":pserver:anonymous" />
>-	</target>
>-
>-	
>-	
>-	
>-	<target name="postFetch">
>-		<replace file="${buildDirectory}/sourceReferences.properties" token=":extssh" value=":pserver"  />	
>-		<ant antfile="${genericTargets}" target="fetchElement">
>-			<property name="type" value="feature" />
>-			<property name="id" value="org.eclipse.equinox.executable" />
>-		</ant>
>-		<zip zipfile="${buildDirectory}/plugins/org.eclipse.platform/launchersrc.zip" basedir="${buildDirectory}/features/org.eclipse.equinox.executable" includes="library/" />
>-		<mkdir dir="${buildDirectory}/features/org.eclipse.platform/launchertmp" />
>-		<mkdir dir="${buildDirectory}/launchertmp" />
>-
>-		
>-		<property name="linux.motif.rootfiles" value="${buildDirectory}/features/org.eclipse.platform/about_files/linux.motif.x86" />
>-		<mkdir dir="${linux.motif.rootfiles}" />
>-		<copy tofile="${linux.motif.rootfiles}/about.html" file="${buildDirectory}/plugins/org.eclipse.swt.motif.linux.x86/about.html" />
>-		<copy todir="${linux.motif.rootfiles}">
>-			<fileset dir="${buildDirectory}/plugins/org.eclipse.swt.motif.linux.x86" includes="about_files/**" />
>-		</copy>
>-
>-		
>-		<property name="linux.gtk.x86.rootfiles" value="${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.x86" />
>-		<mkdir dir="${linux.gtk.x86.rootfiles}" />
>-		<copy tofile="${linux.gtk.x86.rootfiles}/about.html" file="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.x86/about.html" />
>-
>-		<copy todir="${linux.gtk.x86.rootfiles}">
>-			<fileset dir="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.x86" includes="about_files/**" />
>-		</copy>
>-
>-		
>-		<property name="linux.gtk.x86_64.rootfiles" value="${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.x86_64" />
>-		<mkdir dir="${linux.gtk.x86_64.rootfiles}" />
>-		<copy tofile="${linux.gtk.x86_64.rootfiles}/about.html" file="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.x86_64/about.html" />
>-
>-		<copy todir="${linux.gtk.x86_64.rootfiles}">
>-			<fileset dir="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.x86_64" includes="about_files/**" />
>-		</copy>
>-
>-		
>-		<property name="linux.gtk.ppc64.rootfiles" value="${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.ppc64" />
>-		<mkdir dir="${linux.gtk.ppc64.rootfiles}" />
>-		<copy tofile="${linux.gtk.ppc64.rootfiles}/about.html" file="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.ppc64/about.html" />
>-
>-		<copy todir="${linux.gtk.ppc64.rootfiles}">
>-			<fileset dir="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.ppc64" includes="about_files/**" />
>-		</copy>
>-	</target>
>-
>-	
>-	
>-	
>-	<target name="preProcessRepos">
>-	</target>
>-
>-	
>-	
>-	
>-	<target name="postProcessRepos">
>-	</target>
>-
>-	
>-	
>-	
>-	<target name="preGenerate">
>-	</target>
>-
>-	
>-	
>-	
>-	<target name="postGenerate">
>-		<antcall target="clean" />
>-	</target>
>-
>-	
>-	
>-	
>-	<target name="preProcess">
>-		<tstamp>
>-			<format property="preprocess.time" pattern="MM/dd/yyyy HH:mm:ss" />
>-		</tstamp>
>-		<property name="masterTime" value="${buildlogs}/mastertime.txt" />
>-		<echo message="preProcess master feature ${preprocess.time} ${line.separator}" file="${masterTime}" append="true" />
>-		<replace dir="${buildDirectory}/plugins" value="${buildId}" token="@build@">
>-			<include name="**/about.mappings" />
>-		</replace>
>-		<replace dir="${buildDirectory}/features/org.eclipse.platform" value="${buildId}" token="@build@">
>-			<include name="**/config.ini" />
>-		</replace>
>-		<replace dir="${buildDirectory}/features/org.eclipse.sdk" value="${buildId}" token="@build@">
>-			<include name="**/config.ini" />
>-		</replace>
>-	</target>
>-
>-	
>-	
>-	
>-	<target name="postProcess">
>-		<tstamp>
>-			<format property="postprocess.time" pattern="MM/dd/yyyy HH:mm:ss" />
>-		</tstamp>
>-		<property name="masterTime" value="${buildlogs}/mastertime.txt" />
>-		<echo message="postProcess master feature ${postprocess.time} ${line.separator}" file="${masterTime}" append="true" />
>-		<antcall target="gatherLogs" />
>-	</target>
>-
>-	
>-	
>-	
>-	<target name="preAssemble">
>-	</target>
>-
>-	
>-	
>-	
>-	<target name="postAssemble">
>-	</target>
>-
>-	
>-	
>-	
>-	<target name="prePackage">
>-	</target>
>-
>-	
>-	
>-	
>-	<target name="postPackage">
>-		<exec executable="zip" dir="${buildDirectory}/${buildLabel}">
>-			<arg line="-d ${archiveName} win32** wce** linux** solaris** aix** hpux** macosx** qnx**" />
>-		</exec>
>-		<exec dir="${buildDirectory}/buildRepo" executable="zip">
>-			<arg line="-r ${archiveFullPath} ." />
>-		</exec>
>-	</target>
>-
>-	
>-	
>-	
>-	<target name="postBuild">
>-		<antcall target="gatherLogs" />
>-	</target>
>-
>-	
>-	
>-	
>-	<target name="test">
>-	</target>
>-
>-	
>-	
>-	
>-	<target name="publish">
>-	</target>
>-
>-	
>-	
>-	
>-	<target name="noDefault">
>-		<echo message="You must specify a target when invoking this file" />
>-	</target>
>-
>-</project>

Actions: View | Diff

Attachments on bug 315844: 180902 | 181002 | 181003