prep for 322 patches

releng.wtpbuilder/distribution/patches32x.build/build.xml

@@ -74,23 +74,7 @@
 
     </target>
 
-    <!-- invoking runbuild.xml targetting getBaseBuilder -->
-    <target
-        name="getBaseBuilder"
-        if="eclipse.builder.fetch">
-        <dirname
-            file="${ant.file}"
-            property="wtbuilder.dir"/>
-        <property
-            name="buildTargets"
-            value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
-        <echo
-            level="info"
-            message="invoking buildTargets: ${buildTargets} -> getBaseBuilder"/>
-        <ant
-            antfile="${buildTargets}"
-            target="getBaseBuilder"/>
-    </target>
+
 
 
     <target
@@ -141,6 +125,22 @@
             message="compilation.problem path buildDirectory: ${buildDirectory}/plugins/*/"/>
     </target>
 
-
+                     <!-- invoking runbuild.xml targetting getBaseBuilder -->
+    <target
+        name="getBaseBuilder"
+        if="eclipse.builder.fetch">
+        <dirname
+            file="${ant.file}"
+            property="wtbuilder.dir"/>
+        <property
+            name="buildTargets"
+            value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
+        <echo
+            level="info"
+            message="invoking buildTargets: ${buildTargets} -> getBaseBuilder"/>
+        <ant
+            antfile="${buildTargets}"
+            target="getBaseBuilder"/>
+    </target>
 
 </project>
\ No newline at end of file

releng.wtpbuilder/distribution/patches32x.package/createFinalRepo.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    This script is to create some zips with core features only.
-    Limited, specialized usefulness, so they are not linked or
-    advertised. That is, could change at any time.
+       create final build repo.
+       Eventually may want to "move" this to each component, in "post build" step? 
+       See http://aniefer.blogspot.com/2009/08/versioning-p2-slides-from-eclipsecon.html
+       for example of comparator.
 -->
 <project
+    name="createFinalRepo"
     default="build"
     basedir=".">
+
+	    <!-- = = = standard properties pattern = = = -->
+	    <!--
+	        Note to be cross-platform, "environment variables" are only
+	        appropriate for some variables, e.g. ones we set, since
+	        properties are case sensitive, even if the environment variables
+	        on your operating system are not, e.g. it will be ${env.Path}
+	        not ${env.PATH} on Windows
+	    -->
+    <property
+        environment="env"/>
+	    <!--
+	        Let users override standard properties, if desired. If
+	        directory, file, or some properties do not exist, then standard
+	        properties will be used.
+	    -->
+    <property
+        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
+
+	    <!-- = = = end standard properties pattern = = = -->
+
+
+
+    <fail
+        unless="wtp.builder.home"/>
+    <property
+        file="${wtp.builder.home}/build.properties"/>
+
+
+	<!-- required to get proper value of branch specific values, for example, 
+            baseComparatorRepoDir, since can vary from forward "integration" stream, 
+            and "maintenance" branch -->
+    <property
+        name="keyCfgFile"
+        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
+    <echo
+        level="info"
+        message="keyCfgFile: ${keyCfgFile}"/>
+    <property
+        file="${keyCfgFile}"/>
+
+    <fail
+        unless="baseComparatorRepoDir"
+        message="baseComparatorRepoDir must be defined for this ant script"/>
+        	
+        	
+        	<!-- if not otherwise set, use these default properties 
+    <property
+        name="repoDownloadBaseURL"
+        value="http://build.eclipse.org/webtools/committers"/> -->
+    <property
+        name="repoDownloadBaseURL"
+        value=".."/>
+
+    <fail
+        unless="env.PROJECT_PROJECTS"/>
+    <fail
+        unless="projectname"/>
+    <property
+        name="labelfile"
+        value="${env.PROJECT_PROJECTS}/${projectname}/workdir/label.properties"/>
+    <available
+        file="${labelfile}"
+        property="labelfileavailable"/>
+    <fail
+        unless="labelfileavailable"/>
+    <property
+        file="${labelfile}"/>
+
+
+    <target
+        name="build"
+        depends="doMirror">
+
+	<!-- add the new build to the composite -->
+    	<!-- 
+    	TODO: after promotion, do we need to delete repo's as directories removed? Or just do occasional cleanup, 
+    	if non-existent child repos are ignored 
+    	TODO: ok to use absolute file system locations for child repos? (And still access via http, later?  
+-->
+ <!-- 
+ 
+ On build machine, URL's to repositories will look similar to following URL: 
+ 
+ http://build.eclipse.org/webtools/committers/wtp-R3.3.0-I/20100914034658/I-3.3.0-20100914034658/repository/
+ 
+ which we translate as follows
+ 
+  repoDownloadBaseURL=http://build.eclipse.org/webtools/committers
+  
+  ${repoDownloadBaseURL}/${projectname}/${timestamp}/${buildLabel}/repository/
+ 
+ repoDownloadBaseURL is machine dependent (will differ from one build machine to another). 
+ 
+ Will be different on "download server", as well. 
+ 
+ -->
+
+        <property
+            name="repoLocation"
+            value="${repoDownloadBaseURL}/committers/${projectname}/${timestamp}/${buildLabel}/repository/"/>
+        <echo
+            message="     
+     adding final build repoository location: 
+         ${repoLocation}
+     to composite repo: 
+         ${baseComparatorRepoDir}"/>
+
+        <p2.composite.repository
+            destination="file:/${baseComparatorRepoDir}">
+            <add>
+                <repository
+                    location="${repoLocation}"/>
+            </add>
+        </p2.composite.repository>
+
+    </target>
+    <target
+        name="init">
+        <available
+            file="${baseComparatorRepoDir}"
+            type="dir"
+            property="baseComparatorRepoDirExists"/>
+    </target>
+	<!-- normally, the "prime repository" should be created from previous release, 
+	or similar, but if that hasn't been done, we'll automatically create an empty 
+	composite repo which we've stored away for simplicity.-->
+    <target
+        name="primeRepo"
+        depends="init"
+        unless="baseComparatorRepoDirExists">
+        <mkdir
+            dir="${baseComparatorRepoDir}"/>
+        <copy
+            todir="${baseComparatorRepoDir}">
+            <fileset
+                dir="${wtp.builder.home}/emptyRepository/"/>
+        </copy>
+    	<!-- could probably just set to true, but we'll use same logic as in init, just in case -->
+        <available
+            file="${baseComparatorRepoDir}"
+            type="dir"
+            property="baseComparatorRepoDirExists"/>
+    </target>
     <target
-        name="build">
-        <!-- final repository work TODO: add comparitor -->
+        name="doMirror"
+        depends="primeRepo">
+        <property
+            name="destinationDir"
+            value="${buildDirectory}/${buildLabel}/repository"/>
+        <echo
+            message="destinationDir: ${destinationDir}"/>
+
         <p2.mirror
-            verbose="true">
-            <repository
-                location="file://${buildDirectory}/${buildLabel}/repository/"
-                name="Web Tools Platform Repository ${buildLabel}"
-                format="file://${buildDirectory}/${buildLabel}/buildrepository/"/>
+            ignoreErrors="true"
+            verbose="true"
+            log="${buildDirectory}/${buildLabel}/finalMirrorRepo.log">
+
+
+            <destination
+                kind="metadata"
+                location="file:/${destinationDir}"
+                name="Web Tools Platform Repository ${buildLabel}"/>
+            <destination
+                kind="artifact"
+                location="file:/${destinationDir}"
+                name="Web Tools Platform Repository ${buildLabel}"/>
             <source>
                 <repository
-                    location="file://${buildDirectory}/${buildLabel}/buildrepository/"/>
+                    location="file:/${buildDirectory}/${buildLabel}/buildrepository/"/>
             </source>
+
+            <comparator
+                comparator="org.eclipse.equinox.p2.repository.tools.jar.comparator"
+                comparatorLog="${buildDirectory}/${buildLabel}/comparator.log">
+                <repository
+                    location="file:/${baseComparatorRepoDir}"/>
+                <exclude>
+                    <artifact
+                        id="org.eclipse.jpt.eclipselink.ui"/>
+                    <artifact
+                        id="org.eclipse.jpt.ui"/>
+                    <artifact
+                        id="org.eclipse.jst.jsp.core.tests"/>
+                </exclude>
+            </comparator>
+
             <slicingoptions
                 followStrict="true"/>
             <iu
                 id="org.eclipse.wst.common_core.feature.patch.feature.group"/>
+        	<!--
+            <iu
+                id="org.eclipse.wst.common_sdk.feature.patch.feature.group"/>
+        	-->
+            <iu
+                query="property[@name='org.eclipse.equinox.p2.type.category']"/>
 
         </p2.mirror>
     </target>
+
 </project>
\ No newline at end of file

releng.wtpbuilder/distribution/patches32x.package/createziptasks.xml

@@ -24,6 +24,7 @@
 	
     <target
         name="createSDKZip">
+        <!--
         <ant
             antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
             target="premirrortasks"/>
@@ -42,6 +43,7 @@
         <ant
             antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
             target="postmirrortasks"/>
+            -->
     </target>
     <target
         name="createTestZip">