Attachment 123553 Details for Bug 260582 – New patch using the newly renamed task

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

[patch] New patch using the newly renamed task

260582-scripts.patch (text/plain), 16.65 KB, created by Pascal Rapicault

on 2009-01-23 11:44:16 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Pascal Rapicault

Created: 2009-01-23 11:44:16 EST

Size: 16.65 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.build
>Index: templates/headless-build/build.properties
>===================================================================
>RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build/templates/headless-build/build.properties,v
>retrieving revision 1.19
>diff -u -r1.19 build.properties
>--- templates/headless-build/build.properties	29 Oct 2008 17:10:39 -0000	1.19
>+++ templates/headless-build/build.properties	23 Jan 2009 16:43:20 -0000
>@@ -4,7 +4,7 @@
> # are made available under the terms of the Eclipse Public License v1.0
> # which accompanies this distribution, and is available at
> # http://www.eclipse.org/legal/epl-v10.html
>-# 
>+#
> # Contributors:
> #     IBM Corporation - initial API and implementation
> ###############################################################################
>@@ -13,9 +13,9 @@
> # Typical users need only update the following properties:
> #    baseLocation - where things you are building against are installed
> #    bootclasspath - The base jars to compile against (typicaly rt.jar)
>-#    configs - the list of {os, ws, arch} configurations to build.  
>+#    configs - the list of {os, ws, arch} configurations to build.
> #
>-# Of course any of the settings here can be overridden by spec'ing 
>+# Of course any of the settings here can be overridden by spec'ing
> # them on the command line (e.g., -DbaseLocation=d:/eclipse
> 
> #The type of the top level element we are building,  generally "feature"
>@@ -36,8 +36,8 @@
> # The location underwhich all of the build output will be collected.
> collectingFolder=${archivePrefix}
> 
>-# The list of {os, ws, arch} configurations to build.  This 
>-# value is a '&' separated list of ',' separate triples.  For example, 
>+# The list of {os, ws, arch} configurations to build.  This
>+# value is a '&' separated list of ',' separate triples.  For example,
> #     configs=win32,win32,x86 & linux,motif,x86
> # By default the value is *,*,*
> configs = *, *, *
>@@ -53,10 +53,10 @@
> #	macosx, carbon, ppc
> 
> # By default PDE creates one archive (result) per entry listed in the configs property.
>-# Setting this value to true will cause PDE to only create one output containing all 
>+# Setting this value to true will cause PDE to only create one output containing all
> # artifacts for all the platforms listed in the configs property.
> # To control the output format for the group, add a "group, group, group - <format>" entry to the
>-# archivesFormat. 
>+# archivesFormat.
> #groupConfigurations=true
> 
> #The format of the archive. By default a zip is created using antZip.
>@@ -82,7 +82,7 @@
> #parallelCompilation=true
> #parallelThreadCount=
> #parallelThreadsPerProcessor=
>-	
>+
> #Set to true if you want the output to be ready for an update jar (no site.xml generated)
> #outputUpdateJars = false
> 
>@@ -107,7 +107,7 @@
> #Arguments to send to the tar executable
> tarargs=
> 
>-#Control the creation of a file containing the version included in each configuration - on by default 
>+#Control the creation of a file containing the version included in each configuration - on by default
> #generateVersionsLists=false
> 
> ############## BUILD NAMING CONTROL ################
>@@ -129,15 +129,15 @@
> timestamp=007
> 
> #The value to be used for the qualifier of a plugin or feature when you want to override the value computed by pde.
>-#The value will only be applied to plugin or features indicating build.properties, qualifier = context 
>+#The value will only be applied to plugin or features indicating build.properties, qualifier = context
> #forceContextQualifier=<the value for the qualifier>
> 
>-#Enable / disable the generation of a suffix for the features that use .qualifier. 
>-#The generated suffix is computed according to the content of the feature   
>+#Enable / disable the generation of a suffix for the features that use .qualifier.
>+#The generated suffix is computed according to the content of the feature
> #generateFeatureVersionSuffix=true
> 
> ############# BASE CONTROL #############
>-# Settings for the base Eclipse components and Java class libraries 
>+# Settings for the base Eclipse components and Java class libraries
> # against which you are building.
> # Base location for anything the build needs to compile against.  For example,
> # in most RCP app or a plug-in,  the baseLocation should be the location of a previously
>@@ -145,6 +145,12 @@
> 
> base=<path/to/parent/of/eclipse>
> baseLocation=${base}/eclipse
>+
>+#Folder containing repositories whose content is needed to compile against
>+#repoBaseLocation=${base}/repos
>+#Folder where the content of the repositories from ${repoBaseLocation} will be made available as a form suitable to be compiled against
>+#transformedRepoLocation=${base}/transformedRepos
>+
> #Os/Ws/Arch/nl of the eclipse specified by baseLocation
> baseos=win32
> basews=win32
>@@ -157,7 +163,7 @@
> resolution.devMode=false
> 
> #pluginPath is a list of locations in which to find plugins and features.  This list is separated by the platform file separator (; or :)
>-#a location is one of:  
>+#a location is one of:
> #- the location of the jar or folder that is the plugin or feature : /path/to/foo.jar or /path/to/foo
> #- a directory that contains a /plugins or /features subdirectory
> #- the location of a feature.xml, or for 2.1 style plugins, the plugin.xml or fragment.xml
>@@ -184,11 +190,11 @@
> 
> ############ REPOSITORY CONTROL ###############
> # This section defines properties parameterizing the repositories where plugins, fragments
>-# bundles and features are being obtained from. 
>+# bundles and features are being obtained from.
> 
> # The tags to use when fetching elements to build.
>-# By default thebuilder will use whatever is in the maps.  
>-# This value takes the form of a comma separated list of repository identifier (like used in the map files) and the 
>+# By default thebuilder will use whatever is in the maps.
>+# This value takes the form of a comma separated list of repository identifier (like used in the map files) and the
> # overriding value
> # For example fetchTag=CVS=HEAD, SVN=v20050101
> # fetchTag=HEAD
>@@ -199,7 +205,7 @@
> # The location of the Java jars to compile against.  Typically the rt.jar for your JDK/JRE
> #bootclasspath=${java.home}/lib/rt.jar
> 
>-# specific JRE locations to compile against. These values are used to compile bundles specifying a 
>+# specific JRE locations to compile against. These values are used to compile bundles specifying a
> # Bundle-RequiredExecutionEnvironment. Uncomment and set values for environments that you support
> #CDC-1.0/Foundation-1.0= /path/to/rt.jar
> #CDC-1.1/Foundation-1.1=
>@@ -222,7 +228,7 @@
> logExtension=.log
> 
> # Whether or not to include debug info in the output jars
>-javacDebugInfo=false 
>+javacDebugInfo=false
> 
> # Whether or not to fail the build if there are compiler errors
> javacFailOnError=true
>Index: templates/headless-build/customTargets.xml
>===================================================================
>RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build/templates/headless-build/customTargets.xml,v
>retrieving revision 1.3
>diff -u -r1.3 customTargets.xml
>--- templates/headless-build/customTargets.xml	28 Nov 2007 22:32:55 -0000	1.3
>+++ templates/headless-build/customTargets.xml	23 Jan 2009 16:43:20 -0000
>@@ -86,6 +86,18 @@
> 	</target>
> 
> 	
>+	
>+	
>+	<target name="preProcessRepos">
>+	</target>
>+
>+	
>+	
>+	
>+	<target name="postProcessRepos">
>+	</target>
>+	
>+	
> 	
> 	
> 	<target name="preGenerate">
>Index: scripts/build.xml
>===================================================================
>RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build/scripts/build.xml,v
>retrieving revision 1.15
>diff -u -r1.15 build.xml
>--- scripts/build.xml	13 Feb 2006 22:10:04 -0000	1.15
>+++ scripts/build.xml	23 Jan 2009 16:43:19 -0000
>@@ -18,11 +18,12 @@
> 
> 
> 
>-<target name="main" description="the main build target">	
>-  	<antcall target="preBuild" /> 
>+<target name="main" description="the main build target">
>+  	<antcall target="preBuild" />
>+	<antcall target="processRepos"/>
>  	<antcall target="fetch" />
>-	<antcall target="generate" /> 
>-	<antcall target="process" /> 
>+	<antcall target="generate" />
>+	<antcall target="process" />
> 	<antcall target="assemble" />
> 	<antcall target="package" />
> 	<antcall target="postBuild" />
>@@ -34,8 +35,8 @@
> 
> <target name="preBuild">
> 	<mkdir dir="${buildDirectory}" />
>-	<ant antfile="${customTargets}" target="preSetup" /> 
>-	<ant antfile="${customTargets}" target="getMapFiles" /> 
>+	<ant antfile="${customTargets}" target="preSetup" />
>+	<ant antfile="${customTargets}" target="getMapFiles" />
> 	<concat destfile="${buildDirectory}/directory.txt" fixlastline="yes">
> 		<fileset dir="${buildDirectory}" includes="maps/**/*.map"/>
> 	</concat>
>@@ -43,6 +44,18 @@
> </target>
> 
> 
>+
>+
>+
>+<target name="processRepos" if="repoBaseLocation">
>+	<subant antfile="${customTargets}" target="preProcessRepos" failonerror="false" buildpath="."/>
>+	<ant antfile="${customTargets}" target="allElements">
>+		<property name="target" value="transformRepos" />
>+	</ant>
>+	<subant antfile="${customTargets}" target="postProcessRepos" failonerror="false" buildpath="."/>
>+</target>
>+
>+
> 
> 
> <target name="fetch" unless="skipFetch">
>@@ -51,7 +64,7 @@
> 	<ant antfile="${customTargets}" target="allElements">
> 		<property name="target" value="fetchElement" />
> 	</ant>
>-	
>+
> 	<ant antfile="${customTargets}" target="postFetch"/>
> </target>
> 
>@@ -64,7 +77,7 @@
> 	<ant antfile="${customTargets}" target="allElements">
> 		<property name="target" value="generateScript" />
> 	</ant>
>-	<ant antfile="${customTargets}" target="postGenerate"/>	
>+	<ant antfile="${customTargets}" target="postGenerate"/>
> </target>
> 
> 
>@@ -91,7 +104,7 @@
> 	<ant antfile="${customTargets}" target="allElements">
> 		<property name="target" value="assembleElement"/>
> 	</ant>
>-	<ant antfile="${customTargets}" target="postAssemble"/>	
>+	<ant antfile="${customTargets}" target="postAssemble"/>
> </target>
> 
> 
>@@ -102,7 +115,7 @@
> 	<ant antfile="${customTargets}" target="allElements">
> 		<property name="target" value="packageElement"/>
> 	</ant>
>-	<ant antfile="${customTargets}" target="postPackage"/>	
>+	<ant antfile="${customTargets}" target="postPackage"/>
> </target>
> 
> 
>Index: scripts/genericTargets.xml
>===================================================================
>RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build/scripts/genericTargets.xml,v
>retrieving revision 1.26
>diff -u -r1.26 genericTargets.xml
>--- scripts/genericTargets.xml	31 Oct 2008 20:30:54 -0000	1.26
>+++ scripts/genericTargets.xml	23 Jan 2009 16:43:19 -0000
>@@ -41,9 +41,9 @@
> 		fetchTag="${fetchTag}"
> 		configInfo="${configs}"
> 		baseLocation="${baseLocation}"
>-		pluginPath="${pluginPath}"
>+		pluginPath="${transformedRepoLocation}${path.separator}${pluginPath}"
> 	/>
>-	
>+
> 	
> 	<ant antfile="${buildDirectory}/fetch_${id}.xml">
> 		
>@@ -65,8 +65,8 @@
> 
> 
> <target name="generateScript" description="Generating build scripts..." depends="init">
>-	<eclipse.buildScript 
>-		elements="${type}@${id}" 
>+	<eclipse.buildScript
>+		elements="${type}@${id}"
> 		buildDirectory="${buildDirectory}"
> 		configInfo="${configs}"
> 		baseLocation="${baseLocation}"
>@@ -82,7 +82,7 @@
> 		generatedVersionLength="${generatedVersionLength}"
> 		generateVersionsLists="${generateVersionsLists}"
> 		groupConfiguration="${groupConfigurations}"
>-		pluginPath="${pluginPath}"
>+		pluginPath="${transformedRepoLocation}${path.separator}${pluginPath}"
> 		filteredDependencyCheck="${filteredDependencyCheck}"
> 		platformProperties="${platformProperties}"
> 		filterP2Base="${filterP2Base}"
>@@ -107,19 +107,19 @@
> 		<property name="target" value="build.jars"/>
> 	</ant>
> </target>
>-	
>+
> <target name="processFlat" if="flattenDependencies" description="Compile in flattened dependency order">
> 	<ant antfile="compile.${id}.xml" dir="${buildDirectory}"/>
> </target>
>-	
>+
> 
> 
>@@ -130,7 +130,7 @@
> 	
> 	<ant antfile="build.xml" dir="${elementPath}" target="zip.distribution">
> 		<property name="os" value="${os}" />
>-		<property name="ws" value="${ws}" />	
>+		<property name="ws" value="${ws}" />
> 	</ant>
> </target>
> 
>@@ -141,11 +141,11 @@
> 	
> 	<ant antfile="build.xml" dir="${elementPath}" target="build.sources">
> 		<property name="os" value="${os}" />
>-		<property name="ws" value="${ws}" />	
>+		<property name="ws" value="${ws}" />
> 	</ant>
> 	<ant antfile="build.xml" dir="${elementPath}" target="zip.sources">
> 		<property name="os" value="${os}" />
>-		<property name="ws" value="${ws}" />	
>+		<property name="ws" value="${ws}" />
> 	</ant>
> </target>
> 
>@@ -179,7 +179,7 @@
> <target name="packageElement" description="Packaging the build..." depends="init">
> 	<ant antfile="package.${id}.all.xml" dir="${buildDirectory}"/>
> </target>
>-	
>+
> 
> 
> 
>@@ -190,4 +190,13 @@
> 	<property name="elementPath" value="${buildDirectory}/${type}s/${id}" />
> </target>
> 
>+
>+
>+
>+<target name="transformRepos">
>+	<p2.repo2runnable destination="${transformedRepoLocation}">
>+		<source dir="${repoBaseLocation}/" includes="*"/>
>+	</p2.repo2runnable>
>+</target>
>+
> </project>
>Index: scripts/productBuild/productBuild.xml
>===================================================================
>RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build/scripts/productBuild/productBuild.xml,v
>retrieving revision 1.7
>diff -u -r1.7 productBuild.xml
>--- scripts/productBuild/productBuild.xml	22 Jan 2008 23:17:47 -0000	1.7
>+++ scripts/productBuild/productBuild.xml	23 Jan 2009 16:43:19 -0000
>@@ -17,7 +17,8 @@
> 
> 
> <target name="main" description="the main build target">	
>-  	<antcall target="preBuild" /> 
>+  	<antcall target="preBuild" />
>+	<antcall target="processRepos"/>
> 	<antcall target="generateFeature"> 
> 		<param name="verify" value="false"/>
> 	</antcall>

Actions: View | Diff

Attachments on bug 260582: 123304 | 123553