current build scriptHEADx86master

7 files changed, 438 insertions, 423 deletions

diff --git a/build.sh b/build.sh
index 13123f2..a2b7436 100644
--- a/build.sh
+++ b/build.sh
@@ -1,73 +1,63 @@
-#!/bin/bash
-#====================================================================================
-#  Copyright (c) 2008 The Eclipse Foundation and others.
-# All rights reserved. This program and the accompanying materials
-# 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
-#====================================================================================
-
-BUILD_DATE=`date +%Y%m%d`
-BUILD_TIME=`date +%H%M`
-TIMESTAMP=${BUILD_DATE}${BUILD_TIME}
+#!/bin/bash

+#====================================================================================

+#  Copyright (c) 2008 The Eclipse Foundation and others.

+# All rights reserved. This program and the accompanying materials

+# 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

+#====================================================================================

+

+BUILD_DATE=`date +%Y%m%d`

+BUILD_TIME=`date +%H%M`

+TIMESTAMP=${BUILD_DATE}${BUILD_TIME}

 BUILD_TYPE=R

-
-if [ -f /opt/ibm/java2-ppc-50/bin/java ]; then
-	# We're running on the build server. Configure the environment for there.
+

+	# We're running on the build server. Configure the environment for there.

 	java=/shared/common/jdk1.7.0-latest/jre/bin/java

-	sharedDir=/shared/technology/actf
-	base=${sharedDir}/base/
-	eclipseRoot=${base}/eclipse
-	configurationFolder=${sharedDir}/build/org.eclipse.actf.visualization.releng
-	buildRoot=${sharedDir}/build/root
-else
-	# running on Desktop. 
-	java=java
-	sharedDir=${HOME}
-	base=${HOME}
-	eclipseRoot=${base}/eclipse
-	configurationFolder=${HOME}/build/org.eclipse.actf.visualization.releng
-	buildRoot=${HOME}/eclipse.actf.build
-fi
-
-# Find the launcher JAR and PDE Build Plugin directory for the current platform.
-launcherJar=`find ${eclipseRoot} -type f -name 'org.eclipse.equinox.launcher_*.jar' -print0`
-pdeBuildPlugin=`find ${eclipseRoot} -type d -name 'org.eclipse.pde.build_*' -print0`
-jarprocessorJar=`find ${eclipseRoot} -type f -name 'org.eclipse.equinox.p2.jarprocessor_*.jar' -print0`
-
-tempDir=${buildRoot}/temp
-buildDirectory=${buildRoot}/workspace
-prereqDir=${sharedDir}/pre-req
-updateSite=${buildDirectory}/repository
-
-
-# What feature are we building?
-featureId=org.eclipse.actf.visualization.sdk
-
-${java} -jar ${launcherJar} \
-	-application org.eclipse.ant.core.antRunner \
-	-buildfile ${pdeBuildPlugin}/scripts/build.xml \
-	-DbuildDirectory=${buildDirectory} \
-	-Dbuilder=${configurationFolder} \
-	-DbuildId=${TIMESTAMP} \
-	-DbuildType=${BUILD_TYPE} \
-	-Dtimestamp=${TIMESTAMP} \
-	-Dbase=${base} \
-	-DupdateSite=${updateSite} \
-	-DtempDir=${tempDir} \
-	-DfeatureId=${featureId} \
-	-DlauncherJar=${launcherJar} \
-	-DjarprocessorJar=${jarprocessorJar} \
+	sharedDir=/shared/technology/actf

+	base=${sharedDir}/base/

+	eclipseRoot=${base}/eclipse

+	configurationFolder=${sharedDir}/build/org.eclipse.actf.visualization.releng

+	buildRoot=${sharedDir}/build/root

+

+# Find the launcher JAR and PDE Build Plugin directory for the current platform.

+launcherJar=`find ${eclipseRoot} -type f -name 'org.eclipse.equinox.launcher_*.jar' -print0`

+pdeBuildPlugin=`find ${eclipseRoot} -type d -name 'org.eclipse.pde.build_*' -print0`

+jarprocessorJar=`find ${eclipseRoot} -type f -name 'org.eclipse.equinox.p2.jarprocessor_*.jar' -print0`

+

+tempDir=${buildRoot}/temp

+buildDirectory=${buildRoot}/workspace

+prereqDir=${sharedDir}/pre-req

+updateSite=${buildDirectory}/repository

+

+

+# What feature are we building?

+featureId=org.eclipse.actf.visualization.sdk

+

+${java} -jar ${launcherJar} \

+	-application org.eclipse.ant.core.antRunner \

+	-buildfile ${pdeBuildPlugin}/scripts/build.xml \

+	-DbuildDirectory=${buildDirectory} \

+	-Dbuilder=${configurationFolder} \

+	-DbuildId=${TIMESTAMP} \

+	-DbuildType=${BUILD_TYPE} \

+	-Dtimestamp=${TIMESTAMP} \

+	-Dbase=${base} \

+	-DupdateSite=${updateSite} \

+	-DtempDir=${tempDir} \

+	-DfeatureId=${featureId} \

+	-DlauncherJar=${launcherJar} \

+	-DjarprocessorJar=${jarprocessorJar} \

 	-DOOO_HOME=${prereqDir}/OOo \

 	-vmargs -Xmx1024m

-
-${java} -jar ${launcherJar} \
-   -application org.eclipse.equinox.p2.publisher.UpdateSitePublisher \
-   -metadataRepository file:${updateSite}/ \
-   -artifactRepository file:${updateSite}/ \
-   -source ${buildDirectory}/repository/ \
-   -config win32.win32.x86 \
-   -reusePack200Files \
+

+${java} -jar ${launcherJar} \

+   -application org.eclipse.equinox.p2.publisher.UpdateSitePublisher \

+   -metadataRepository file:${updateSite}/ \

+   -artifactRepository file:${updateSite}/ \

+   -source ${buildDirectory}/repository/ \

+   -config win32.win32.x86 \

+   -reusePack200Files \

    -publishArtifacts \

    -compress 

 

diff --git a/clean.sh b/clean.sh
index 4840726..353451f 100644
--- a/clean.sh
+++ b/clean.sh
@@ -1,26 +1,20 @@
-#!/bin/bash
-#====================================================================================
-#  Copyright (c) 2008 The Eclipse Foundation and others.
-# All rights reserved. This program and the accompanying materials
-# 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
-#====================================================================================
-
-if [ -f /opt/ibm/java2-ppc-50/bin/java ]; then
-	# We're running on the build server. Configure the environment for there.
-	buildRoot=/shared/technology/actf/build/root
-else
-	# running on Desktop.
-	buildRoot=${HOME}/eclipse.actf.build
-fi
-
-buildDirectory=${buildRoot}/workspace
-
-rm -f ${buildDirectory}/*.*
-rm -rf ${buildDirectory}/plugins
-rm -rf ${buildDirectory}/features
-rm -rf ${buildDirectory}/repository/*
+#!/bin/bash

+#====================================================================================

+#  Copyright (c) 2008 The Eclipse Foundation and others.

+# All rights reserved. This program and the accompanying materials

+# 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

+#====================================================================================

+

+	buildRoot=/shared/technology/actf/build/root

+

+buildDirectory=${buildRoot}/workspace

+

+rm -f ${buildDirectory}/*.*

+rm -rf ${buildDirectory}/plugins

+rm -rf ${buildDirectory}/features

+rm -rf ${buildDirectory}/repository/*

 rm -rf ${buildDirectory}/scmCache/*

 rm -rf /shared/technology/actf/base/eclipse/plugins/*/scripts/scmCache/*

 

diff --git a/createUpdateSite.xml b/createUpdateSite.xml
index b1e5158..056b633 100644
--- a/createUpdateSite.xml
+++ b/createUpdateSite.xml
@@ -1,77 +1,77 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project 
-  default="createUpdateSite"
-  name="Create Update Site">
-
-  <property name="archiveName" value="org.eclipse.actf.visualization-${buildId}.zip"/>
-  <property name="archiveDir" value="${buildDirectory}/${buildLabel}"/>
-  <property name="tempDir" value="${buildDirectory}/temp"/>
-
-  <target name="createUpdateSite">
-    <antcall target="createSiteXML" />
-    <antcall target="updateZIP" />
-    <antcall target="pack200" />
-    <antcall target="populateUpdateSite"/>
-    <antcall target="cleanup" />
-  </target>
-
-  <target name="createSiteXML">
-    <echo message="Creating site.xml" />
-    <copy 
-      file="${builder}/templates/site.xml" 
-      tofile="${tempDir}/site.xml" />
-    <replace file="${tempDir}/site.xml" 
-      token="XXXXXXXXXXXXX"
-      value="${buildLabel}">
-    </replace>
-  </target>
-
-  <target name="updateZIP">
-    <echo message="Update ZIP file" />
-    <zip destfile="${archiveDir}/${archiveName}"
-      update="true">
-      <zipfileset 
-        dir="${tempDir}" 
-      	includes="site.xml" 
-      	fullpath="eclipse/site.xml"/>
-      <zipgroupfileset dir="${archiveDir}" includes="org.eclipse.actf.visualization.*.zip" />
-    </zip>
-  </target>
-
-  <target name="pack200">
-    <echo message="Running pack200" />
-    <property name="pack200tempDir" value="${tempDir}/pack"/>
-    <mkdir dir="${pack200tempDir}" />
-    <java 
-      jar="${jarprocessorJar}" 
-      fork="true" 
-      failonerror="true" 
-      dir="${tempDir}"
-      append="true"
-      output="${tempDir}/pack200.out"
-      error="${tempDir}/pack200.err">
-      <arg line="-verbose -outputDir ${pack200tempDir} -processAll -repack -pack ${archiveDir}/${archiveName}"/>      
-    </java>
-    <move file="${pack200tempDir}/${archiveName}" todir="${archiveDir}" overwrite="true" />
-  </target>
-
-  <target name="populateUpdateSite">
-    <echo message="Upload new content to update site: ${updateSite}" />
-    <unzip 
-      src="${archiveDir}/${archiveName}"
-      dest="${updateSite}"
-      overwrite="true">
-      <mapper 
-        type="regexp" 
-        from="^eclipse/(.*)" 
-        to="\1"/>
-    </unzip>
-  </target>
-
-  <target name="cleanup">
-    <echo message="Remove site.xml file" />
-    <delete file="${tempDir}/site.xml" />
-<!--    <delete dir="${tempDir}" />  -->
-  </target>
-
+<?xml version="1.0" encoding="UTF-8"?>

+<project 

+  default="createUpdateSite"

+  name="Create Update Site">

+

+  <property name="archiveName" value="org.eclipse.actf.visualization-${buildId}.zip"/>

+  <property name="archiveDir" value="${buildDirectory}/${buildLabel}"/>

+  <property name="tempDir" value="${buildDirectory}/temp"/>

+

+  <target name="createUpdateSite">

+    <antcall target="createSiteXML" />

+    <antcall target="updateZIP" />

+    <antcall target="pack200" />

+    <antcall target="populateUpdateSite"/>

+    <antcall target="cleanup" />

+  </target>

+

+  <target name="createSiteXML">

+    <echo message="Creating site.xml" />

+    <copy 

+      file="${builder}/templates/site.xml" 

+      tofile="${tempDir}/site.xml" />

+    <replace file="${tempDir}/site.xml" 

+      token="XXXXXXXXXXXXX"

+      value="${buildLabel}">

+    </replace>

+  </target>

+

+  <target name="updateZIP">

+    <echo message="Update ZIP file" />

+    <zip destfile="${archiveDir}/${archiveName}"

+      update="true">

+      <zipfileset 

+        dir="${tempDir}" 

+      	includes="site.xml" 

+      	fullpath="eclipse/site.xml"/>

+      <zipgroupfileset dir="${archiveDir}" includes="org.eclipse.actf.visualization.*.zip" />

+    </zip>

+  </target>

+

+  <target name="pack200">

+    <echo message="Running pack200" />

+    <property name="pack200tempDir" value="${tempDir}/pack"/>

+    <mkdir dir="${pack200tempDir}" />

+    <java 

+      jar="${jarprocessorJar}" 

+      fork="true" 

+      failonerror="true" 

+      dir="${tempDir}"

+      append="true"

+      output="${tempDir}/pack200.out"

+      error="${tempDir}/pack200.err">

+      <arg line="-verbose -outputDir ${pack200tempDir} -processAll -repack -pack ${archiveDir}/${archiveName}"/>      

+    </java>

+    <move file="${pack200tempDir}/${archiveName}" todir="${archiveDir}" overwrite="true" />

+  </target>

+

+  <target name="populateUpdateSite">

+    <echo message="Upload new content to update site: ${updateSite}" />

+    <unzip 

+      src="${archiveDir}/${archiveName}"

+      dest="${updateSite}"

+      overwrite="true">

+      <mapper 

+        type="regexp" 

+        from="^eclipse/(.*)" 

+        to="\1"/>

+    </unzip>

+  </target>

+

+  <target name="cleanup">

+    <echo message="Remove site.xml file" />

+    <delete file="${tempDir}/site.xml" />

+<!--    <delete dir="${tempDir}" />  -->

+  </target>

+

 </project>
\ No newline at end of file
diff --git a/customTargets.xml b/customTargets.xml
index 3b1d0d4..e5b0db7 100644
--- a/customTargets.xml
+++ b/customTargets.xml
@@ -1,186 +1,186 @@
-<project name="Build specific targets and properties" default="noDefault">
-
-	<!-- ===================================================================== -->
-	<!-- Run a given ${target} on all elements being built -->
-	<!-- Add on <ant> task for each top level element being built. -->
-	<!-- ===================================================================== -->
-	<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" />-->
- 		<ant antfile="${genericTargets}" target="${target}">
-	 		<property name="type" value="feature" />
-	 		<property name="id" value="org.eclipse.actf.visualization.sdk" />
- 		</ant>		
- 		<ant antfile="${genericTargets}" target="${target}">
-	 		<property name="type" value="feature" />
-	 		<property name="id" value="org.eclipse.actf.visualization.ui.wst" />
- 		</ant>
- 		<ant antfile="${genericTargets}" target="${target}">
-	 		<property name="type" value="feature" />
-	 		<property name="id" value="org.eclipse.actf.visualization.ui.pdt" />
- 		</ant>
-	</target>
-	
-	<!-- ===================================================================== -->
-	<!-- ===================================================================== -->
-	<target name="getBaseComponents" depends="checkLocalBase" unless="skipBase">
-		<get src="${eclipseBaseURL}" dest="${buildDirectory}/../temp-base.zip" />
-		<unzip dest="${base}" overwrite="true" src="${buildDirectory}/../temp-base.zip" />
-	</target>
-
-	<target name="checkLocalBase">
-		<available file="${base}" property="skipBase" />
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Check out map files from correct repository -->
-	<!-- Replace values for mapsCheckoutTag as desired. -->
-	<!-- ===================================================================== -->
-	<target name="getMapFiles" depends="checkLocalMaps" unless="skipMaps">
-		<property name="mapsCheckoutTag" value="HEAD" />
-		<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="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>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before setup -->
-	<!-- ===================================================================== -->
-	<target name="preSetup">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after setup but before starting the build proper -->
-	<!-- ===================================================================== -->
-	<target name="postSetup">
-		<antcall target="getBaseComponents" />
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before fetching the build elements -->
-	<!-- ===================================================================== -->
-	<target name="preFetch">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after fetching the build elements -->
-	<!-- ===================================================================== -->
-	<target name="postFetch">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before generating the build scripts. -->
-	<!-- ===================================================================== -->
-	<target name="preGenerate">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after generating the build scripts. -->
-	<!-- ===================================================================== -->
-	<target name="postGenerate">
-		<antcall target="clean" />
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before running the build.xmls for the elements being built. -->
-	<!-- ===================================================================== -->
-	<target name="preProcess">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after running the build.xmls for the elements being built. -->
-	<!-- ===================================================================== -->
-	<target name="postProcess">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before running assemble. -->
-	<!-- ===================================================================== -->
-	<target name="preAssemble">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after  running assemble. -->
-	<!-- ===================================================================== -->
-	<target name="postAssemble">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before running package. -->
-	<!-- ===================================================================== -->
-	<target name="prePackage">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after  running package. -->
-	<!-- ===================================================================== -->
-	<target name="postPackage">
-    	<ant antfile="${builder}/signJars.xml" target="signJars">
-    		<property name="id" value="org.eclipse.actf.visualization.sdk" />
-    	</ant>
-	    <ant antfile="${builder}/signJars.xml" target="signJars">
-	    	<property name="id" value="org.eclipse.actf.visualization.ui.pdt" />
-	    </ant>
-	    <ant antfile="${builder}/signJars.xml" target="signJars">
-	    	<property name="id" value="org.eclipse.actf.visualization.ui.wst" />
-	    </ant>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the build is done. -->
-	<!-- ===================================================================== -->
-	<target name="postBuild">
-    <ant antfile="${builder}/createUpdateSite.xml"
-         target="createUpdateSite" />
-		<antcall target="gatherLogs" />
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do to test the build results -->
-	<!-- ===================================================================== -->
-	<target name="test">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do to publish the build results -->
-	<!-- ===================================================================== -->
-	<target name="publish">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Default target                                                        -->
-	<!-- ===================================================================== -->
-	<target name="noDefault">
-		<echo message="You must specify a target when invoking this file" />
-	</target>
-
-</project>
+<project name="Build specific targets and properties" default="noDefault">

+

+	<!-- ===================================================================== -->

+	<!-- Run a given ${target} on all elements being built -->

+	<!-- Add on <ant> task for each top level element being built. -->

+	<!-- ===================================================================== -->

+	<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" />-->

+ 		<ant antfile="${genericTargets}" target="${target}">

+	 		<property name="type" value="feature" />

+	 		<property name="id" value="org.eclipse.actf.visualization.sdk" />

+ 		</ant>		

+ 		<ant antfile="${genericTargets}" target="${target}">

+	 		<property name="type" value="feature" />

+	 		<property name="id" value="org.eclipse.actf.visualization.ui.wst" />

+ 		</ant>

+ 		<ant antfile="${genericTargets}" target="${target}">

+	 		<property name="type" value="feature" />

+	 		<property name="id" value="org.eclipse.actf.visualization.ui.pdt" />

+ 		</ant>

+	</target>

+	

+	<!-- ===================================================================== -->

+	<!-- ===================================================================== -->

+	<target name="getBaseComponents" depends="checkLocalBase" unless="skipBase">

+		<get src="${eclipseBaseURL}" dest="${buildDirectory}/../temp-base.zip" />

+		<unzip dest="${base}" overwrite="true" src="${buildDirectory}/../temp-base.zip" />

+	</target>

+

+	<target name="checkLocalBase">

+		<available file="${base}" property="skipBase" />

+	</target>

+

+	<!-- ===================================================================== -->

+	<!-- Check out map files from correct repository -->

+	<!-- Replace values for mapsCheckoutTag as desired. -->

+	<!-- ===================================================================== -->

+	<target name="getMapFiles" depends="checkLocalMaps" unless="skipMaps">

+		<property name="mapsCheckoutTag" value="HEAD" />

+		<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="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>

+	</target>

+

+	<!-- ===================================================================== -->

+	<!-- Steps to do before setup -->

+	<!-- ===================================================================== -->

+	<target name="preSetup">

+	</target>

+

+	<!-- ===================================================================== -->

+	<!-- Steps to do after setup but before starting the build proper -->

+	<!-- ===================================================================== -->

+	<target name="postSetup">

+		<antcall target="getBaseComponents" />

+	</target>

+

+	<!-- ===================================================================== -->

+	<!-- Steps to do before fetching the build elements -->

+	<!-- ===================================================================== -->

+	<target name="preFetch">

+	</target>

+

+	<!-- ===================================================================== -->

+	<!-- Steps to do after fetching the build elements -->

+	<!-- ===================================================================== -->

+	<target name="postFetch">

+	</target>

+

+	<!-- ===================================================================== -->

+	<!-- Steps to do before generating the build scripts. -->

+	<!-- ===================================================================== -->

+	<target name="preGenerate">

+	</target>

+

+	<!-- ===================================================================== -->

+	<!-- Steps to do after generating the build scripts. -->

+	<!-- ===================================================================== -->

+	<target name="postGenerate">

+		<antcall target="clean" />

+	</target>

+

+	<!-- ===================================================================== -->

+	<!-- Steps to do before running the build.xmls for the elements being built. -->

+	<!-- ===================================================================== -->

+	<target name="preProcess">

+	</target>

+

+	<!-- ===================================================================== -->

+	<!-- Steps to do after running the build.xmls for the elements being built. -->

+	<!-- ===================================================================== -->

+	<target name="postProcess">

+	</target>

+

+	<!-- ===================================================================== -->

+	<!-- Steps to do before running assemble. -->

+	<!-- ===================================================================== -->

+	<target name="preAssemble">

+	</target>

+

+	<!-- ===================================================================== -->

+	<!-- Steps to do after  running assemble. -->

+	<!-- ===================================================================== -->

+	<target name="postAssemble">

+	</target>

+

+	<!-- ===================================================================== -->

+	<!-- Steps to do before running package. -->

+	<!-- ===================================================================== -->

+	<target name="prePackage">

+	</target>

+

+	<!-- ===================================================================== -->

+	<!-- Steps to do after  running package. -->

+	<!-- ===================================================================== -->

+	<target name="postPackage">

+    	<ant antfile="${builder}/signJars.xml" target="signJars">

+    		<property name="id" value="org.eclipse.actf.visualization.sdk" />

+    	</ant>

+	    <ant antfile="${builder}/signJars.xml" target="signJars">

+	    	<property name="id" value="org.eclipse.actf.visualization.ui.pdt" />

+	    </ant>

+	    <ant antfile="${builder}/signJars.xml" target="signJars">

+	    	<property name="id" value="org.eclipse.actf.visualization.ui.wst" />

+	    </ant>

+	</target>

+

+	<!-- ===================================================================== -->

+	<!-- Steps to do after the build is done. -->

+	<!-- ===================================================================== -->

+	<target name="postBuild">

+    <ant antfile="${builder}/createUpdateSite.xml"

+         target="createUpdateSite" />

+		<antcall target="gatherLogs" />

+	</target>

+

+	<!-- ===================================================================== -->

+	<!-- Steps to do to test the build results -->

+	<!-- ===================================================================== -->

+	<target name="test">

+	</target>

+

+	<!-- ===================================================================== -->

+	<!-- Steps to do to publish the build results -->

+	<!-- ===================================================================== -->

+	<target name="publish">

+	</target>

+

+	<!-- ===================================================================== -->

+	<!-- Default target                                                        -->

+	<!-- ===================================================================== -->

+	<target name="noDefault">

+		<echo message="You must specify a target when invoking this file" />

+	</target>

+

+</project>

diff --git a/signJars.xml b/signJars.xml
index c884b92..61b588f 100644
--- a/signJars.xml
+++ b/signJars.xml
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project default="signJars" name="Sign all jar files with Eclipse Foundation key">
-
-	<property name="sign.archiveName" value="${id}-${buildId}-win32.win32.x86.zip" />
-	<property name="sign.archiveDir" value="${buildDirectory}/${buildLabel}" />
-	<property name="sign.signInputDir" value="/opt/public/download-staging.priv/technology/actf/visualization" />
-	<property name="sign.inputFile" value="${sign.signInputDir}/${sign.archiveName}" />
-	<property name="sign.signOutputDir" value="${sign.signInputDir}/output" />
-	<property name="sign.outputFile" value="${sign.signOutputDir}/${sign.archiveName}" />
-
-	<target name="signJars" depends="test.signer.exists" if="signer.exists">
-		<mkdir dir="${sign.signOutputDir}" />
-		<chmod dir="${sign.signOutputDir}" perm="ugo+rw" />
-
-		<copy file="${sign.archiveDir}/${sign.archiveName}" todir="${sign.signInputDir}" overwrite="true" />
-		<!-- TODO add pack.properties to zip file -->
-
-		<echo message="Start the external sign script" />
-		<exec executable="/usr/bin/sign" dir="${sign.signInputDir}" output="sign.out" error="sign.err" append="true">
-			<arg value="${sign.inputFile}" />
-			<arg value="nomail" />
-			<arg value="${sign.signOutputDir}" />
-		</exec>
-
-		<echo message="Waiting for file ${sign.outputFile}" />
+<?xml version="1.0" encoding="UTF-8"?>

+<project default="signJars" name="Sign all jar files with Eclipse Foundation key">

+

+	<property name="sign.archiveName" value="${id}-${buildId}-win32.win32.x86.zip" />

+	<property name="sign.archiveDir" value="${buildDirectory}/${buildLabel}" />

+	<property name="sign.signInputDir" value="/opt/public/download-staging.priv/technology/actf/visualization" />

+	<property name="sign.inputFile" value="${sign.signInputDir}/${sign.archiveName}" />

+	<property name="sign.signOutputDir" value="${sign.signInputDir}/output" />

+	<property name="sign.outputFile" value="${sign.signOutputDir}/${sign.archiveName}" />

+

+	<target name="signJars" depends="test.signer.exists" if="signer.exists">

+		<mkdir dir="${sign.signOutputDir}" />

+		<chmod dir="${sign.signOutputDir}" perm="ugo+rw" />

+

+		<copy file="${sign.archiveDir}/${sign.archiveName}" todir="${sign.signInputDir}" overwrite="true" />

+		<!-- TODO add pack.properties to zip file -->

+

+		<echo message="Start the external sign script" />

+		<exec executable="/usr/bin/sign" dir="${sign.signInputDir}" output="sign.out" error="sign.err" append="true">

+			<arg value="${sign.inputFile}" />

+			<arg value="nomail" />

+			<arg value="${sign.signOutputDir}" />

+		</exec>

+

+		<echo message="Waiting for file ${sign.outputFile}" />

 		<waitfor maxwait="60" maxwaitunit="minute" checkevery="5" checkeveryunit="second">

-			<available file="${sign.outputFile}" />
-		</waitfor>
-
-		<sleep seconds="10" />
-		<echo message="Copying signed zip file to old location" />
-		<copy file="${sign.outputFile}" todir="${sign.archiveDir}" overwrite="true" />
-
-	</target>
-
-	<!-- This target tests to see if the signer is available. We'll only attempt to sign if it does. -->
-	<target name="test.signer.exists">
-		<available file="/usr/bin/sign" property="signer.exists"/> 
-	</target>
-
-</project>
\ No newline at end of file
+			<available file="${sign.outputFile}" />

+		</waitfor>

+

+		<sleep seconds="10" />

+		<echo message="Copying signed zip file to old location" />

+		<copy file="${sign.outputFile}" todir="${sign.archiveDir}" overwrite="true" />

+

+	</target>

+

+	<!-- This target tests to see if the signer is available. We'll only attempt to sign if it does. -->

+	<target name="test.signer.exists">

+		<available file="/usr/bin/sign" property="signer.exists"/> 

+	</target>

+

+</project>

diff --git a/templates/site.xml b/templates/site.xml
index 17a9c5d..c42425b 100644
--- a/templates/site.xml
+++ b/templates/site.xml
@@ -1,33 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site pack200="true" 
-      mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/technology/actf/1.3/update-site/site.xml&amp;format=xml">
-   <description url="http://download.eclipse.org/technology/actf/1.3/update-site/">
-      Eclipse Accessibility Tools Framework (ACTF)
-   </description>
-   <feature url="http://www.eclipse.org/downloads/download.php?file=/technology/actf/1.3/update-site/features/org.eclipse.actf.visualization.sdk_1.3.0.XXXXXXXXXXXXX.jar&r=1" id="org.eclipse.actf.visualization.sdk" version="1.3.0.XXXXXXXXXXXXX" os="win32" ws="win32" arch="x86">
-      <category name="ACTF Visualizaiton SDK"/>
-   </feature>
-   <feature url="http://www.eclipse.org/downloads/download.php?file=/technology/actf/1.3/update-site/features/org.eclipse.actf.visualization_1.3.0.XXXXXXXXXXXXX.jar&r=1" id="org.eclipse.actf.visualization" version="1.3.0.XXXXXXXXXXXXX" os="win32" ws="win32" arch="x86">
-      <category name="ACTF Visualizaiton SDK"/>
+<?xml version="1.0" encoding="UTF-8"?>

+<site pack200="true" mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/technology/actf/1.5/update-site/site.xml&amp;format=xml">

+   <description url="http://download.eclipse.org/technology/actf/1.5/update-site/">

+      Eclipse Accessibility Tools Framework (ACTF)

+   </description>

+   <feature url="features/org.eclipse.actf.visualization.sdk_1.5.1.XXXXXXXXXXXXX.jar" id="org.eclipse.actf.visualization.sdk" version="1.5.1.XXXXXXXXXXXXX" os="win32" ws="win32" arch="x86">

+      <category name="ACTF Visualizaiton SDK"/>

+   </feature>

+   <feature url="features/org.eclipse.actf.visualization_1.5.1.XXXXXXXXXXXXX.jar" id="org.eclipse.actf.visualization" version="1.5.1.XXXXXXXXXXXXX" os="win32" ws="win32" arch="x86">

+      <category name="ACTF Visualizaiton SDK"/>

       <category name="ACTF Visualizaiton UI Extensions for Web Development Environment"/>

-   </feature>
-   <feature url="http://www.eclipse.org/downloads/download.php?file=/technology/actf/1.3/update-site/features/org.eclipse.actf.visualization.source_1.3.0.XXXXXXXXXXXXX.jar&r=1" id="org.eclipse.actf.visualization.source" version="1.3.0.XXXXXXXXXXXXX" os="win32" ws="win32" arch="x86">
-      <category name="ACTF Visualizaiton SDK"/>
-   </feature>
-   <feature url="http://www.eclipse.org/downloads/download.php?file=/technology/actf/1.3/update-site/features/org.eclipse.actf.visualization.ui.pdt_1.3.0.XXXXXXXXXXXXX.jar&r=1" id="org.eclipse.actf.visualization.ui.pdt" version="1.3.0.XXXXXXXXXXXXX" os="win32" ws="win32" arch="x86">
-      <category name="ACTF Visualizaiton UI Extensions for Web Development Environment"/>
-   </feature>
-   <feature url="http://www.eclipse.org/downloads/download.php?file=/technology/actf/1.3/update-site/features/org.eclipse.actf.visualization.ui.wst_1.3.0.XXXXXXXXXXXXX.jar&r=1" id="org.eclipse.actf.visualization.ui.wst" version="1.3.0.XXXXXXXXXXXXX" os="win32" ws="win32" arch="x86">
-      <category name="ACTF Visualizaiton UI Extensions for Web Development Environment"/>
-   </feature>
-   <category-def name="ACTF Visualizaiton SDK" label="ACTF Visualizaiton SDK">
-      <description>
-         ACTF Visualizaiton SDK
-      </description>
-   </category-def>
-   <category-def name="ACTF Visualizaiton UI Extensions for Web Development Environment" label="ACTF Visualizaiton UI Extensions for Web Development Environment">
-      <description>
-         ACTF Visualizaiton UI Extensions for Web Development Environment
-      </description>
-   </category-def>
-</site>
+   </feature>

+   <feature url="features/org.eclipse.actf.visualization.source_1.5.1.XXXXXXXXXXXXX.jar" id="org.eclipse.actf.visualization.source" version="1.5.1.XXXXXXXXXXXXX" os="win32" ws="win32" arch="x86">

+      <category name="ACTF Visualizaiton SDK"/>

+   </feature>

+   <feature url="features/org.eclipse.actf.visualization.ui.pdt_1.5.1.XXXXXXXXXXXXX.jar" id="org.eclipse.actf.visualization.ui.pdt" version="1.5.1.XXXXXXXXXXXXX" os="win32" ws="win32" arch="x86">

+      <category name="ACTF Visualizaiton UI Extensions for Web Development Environment"/>

+   </feature>

+   <feature url="features/org.eclipse.actf.visualization.ui.wst_1.5.1.XXXXXXXXXXXXX.jar" id="org.eclipse.actf.visualization.ui.wst" version="1.5.1.XXXXXXXXXXXXX" os="win32" ws="win32" arch="x86">

+      <category name="ACTF Visualizaiton UI Extensions for Web Development Environment"/>

+   </feature>

+   <category-def name="ACTF Visualizaiton SDK" label="ACTF Visualizaiton SDK">

+      <description>

+         ACTF Visualizaiton SDK

+      </description>

+   </category-def>

+   <category-def name="ACTF Visualizaiton UI Extensions for Web Development Environment" label="ACTF Visualizaiton UI Extensions for Web Development Environment">

+      <description>

+         ACTF Visualizaiton UI Extensions for Web Development Environment

+      </description>

+   </category-def>

+</site>

diff --git a/templates/site.xml_update b/templates/site.xml_update
new file mode 100644
index 0000000..6ab1872
--- /dev/null
+++ b/templates/site.xml_update
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site pack200="true" mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/technology/actf/1.3/update-site/site.xml&amp;format=xml">
+   <description url="http://download.eclipse.org/technology/actf/1.3/update-site/">
+      Eclipse Accessibility Tools Framework (ACTF)
+   </description>
+   <feature url="features/org.eclipse.actf.visualization.sdk_1.3.0.XXXXXXXXXXXXX.jar" id="org.eclipse.actf.visualization.sdk" version="1.3.0.XXXXXXXXXXXXX" os="win32" ws="win32" arch="x86">
+      <category name="ACTF Visualizaiton SDK"/>
+   </feature>
+   <feature url="features/org.eclipse.actf.visualization_1.3.0.XXXXXXXXXXXXX.jar" id="org.eclipse.actf.visualization" version="1.3.0.XXXXXXXXXXXXX" os="win32" ws="win32" arch="x86">
+      <category name="ACTF Visualizaiton SDK"/>
+      <category name="ACTF Visualizaiton UI Extensions for Web Development Environment"/>
+   </feature>
+   <feature url="features/org.eclipse.actf.visualization.source_1.3.0.XXXXXXXXXXXXX.jar" id="org.eclipse.actf.visualization.source" version="1.3.0.XXXXXXXXXXXXX" os="win32" ws="win32" arch="x86">
+      <category name="ACTF Visualizaiton SDK"/>
+   </feature>
+   <feature url="features/org.eclipse.actf.visualization.ui.pdt_1.3.0.XXXXXXXXXXXXX.jar" id="org.eclipse.actf.visualization.ui.pdt" version="1.3.0.XXXXXXXXXXXXX" os="win32" ws="win32" arch="x86">
+      <category name="ACTF Visualizaiton UI Extensions for Web Development Environment"/>
+   </feature>
+   <feature url="features/org.eclipse.actf.visualization.ui.wst_1.3.0.XXXXXXXXXXXXX.jar" id="org.eclipse.actf.visualization.ui.wst" version="1.3.0.XXXXXXXXXXXXX" os="win32" ws="win32" arch="x86">
+      <category name="ACTF Visualizaiton UI Extensions for Web Development Environment"/>
+   </feature>
+   <category-def name="ACTF Visualizaiton SDK" label="ACTF Visualizaiton SDK">
+      <description>
+         ACTF Visualizaiton SDK
+      </description>
+   </category-def>
+   <category-def name="ACTF Visualizaiton UI Extensions for Web Development Environment" label="ACTF Visualizaiton UI Extensions for Web Development Environment">
+      <description>
+         ACTF Visualizaiton UI Extensions for Web Development Environment
+      </description>
+   </category-def>
+</site>