From 5f6855bb040afc2607edcd0c77c4b76600156416 Mon Sep 17 00:00:00 2001
From: Anna Dushistova <anna.dushistova@gmail.com>
Date: Fri, 26 Mar 2010 01:10:14 +0000
Subject: [PATCH] [releng] Nick's suggestions on build scripts improvements.

---
 releng/org.eclipse.tm.releng/build.properties | 46 ++++------
 releng/org.eclipse.tm.releng/build.xml        | 89 +++++++------------
 releng/org.eclipse.tm.releng/buildExtra.xml   | 25 ------
 3 files changed, 49 insertions(+), 111 deletions(-)

diff --git a/releng/org.eclipse.tm.releng/build.properties b/releng/org.eclipse.tm.releng/build.properties
index f80d9d605db..cca2c23448c 100644
--- a/releng/org.eclipse.tm.releng/build.properties
+++ b/releng/org.eclipse.tm.releng/build.properties
@@ -7,6 +7,7 @@
 # 
 #  Contributors:
 #  Anna Dushistova (Mentor Graphics) - initial API and implementation
+#  Nick Boldt      (RedHat)          - [307014][releng] Improvements to build script for Athena   
 ###############################################################################
 
 ## BEGIN PROJECT BUILD PROPERTIES ##
@@ -26,33 +27,25 @@ branch=HEAD
 mainFeatureToBuildID=org.eclipse.tm.releng.master
 testFeatureToBuildID=org.eclipse.rse.tests
 
-# MUST BE SET #
-#Anna's settings
-#JAVA_HOME=/usr/lib/jvm/jre
-#JAVA_HOME=/usr/java/j2re1.4.2_19
-#JAVA14_HOME=/usr/java/j2re1.4.2_19
-#JAVA50_HOME=/usr/java/jdk1.5.0_15
-#JAVADOC14_HOME=/usr/bin
-#JAVA_FOUNDATION_HOME=/home/anna/cdc-foundation/
-#PACK200_JAVA_HOME=${JAVA50_HOME}
+JAVA60_HOME=${JAVA_HOME}
+JAVA50_HOME=${JAVA_HOME}
+JAVA14_HOME=${JAVA_HOME}
 
-#Default settings
-JAVA60_HOME=/opt/public/common/ibm-java-jdk-ppc-60
-JAVA50_64_HOME=/opt/public/common/ibm-java2-ppc64-50
-JAVA50_HOME=/opt/public/common/ibm-java2-ppc-50
-JAVA14_HOME=/opt/public/common/ibm-java2-142
-JAVA_FOUNDATION_HOME=/opt/public/common/org.eclipse.sdk-feature/libs
-JAVA_HOME=${JAVA50_HOME}
+repositoryURLs=\
+http://download.jboss.org/jbosstools/updates/helios/
+IUsToInstall=org.eclipse.sdk.feature.group+org.eclipse.sdk.ide+org.eclipse.core.net+org.eclipse.equinox.common+org.eclipse.core.runtime+org.eclipse.debug.core+org.eclipse.rcp.feature.group+\
+org.eclipse.emf.feature.group+\
+org.eclipse.xsd.feature.group
 
+#dependencyURLs= http://download.eclipse.org/eclipse/downloads/drops/R-3.5.1-200909170800/eclipse-SDK-3.5.1-linux-gtk-ppc.tar.gz,\
+#http://download.eclipse.org/modeling/emf/emf/downloads/drops/2.5.0/R200906151043/emf-runtime-2.5.0.zip,\
+#http://rxtx.qbang.org/eclipse/downloads/RXTX-runtime-I20071016-1945.zip
+#https://build.eclipse.org/hudson/view/Athena%20CBI/job/cbi-tm-3.2-nightly/ws/build/downloads/RXTX-runtime-I20071016-1945.zip
+dependencyURLs=http://download.eclipse.org/athena/runnables/RXTX-runtime-I20071016-1945.zip
 
-dependencyURLs= http://download.eclipse.org/eclipse/downloads/drops/S-3.6M6-201003121448/eclipse-SDK-3.6M6-linux-gtk-ppc.tar.gz,\
-http://download.eclipse.org/modeling/emf/emf/downloads/drops/2.5.0/R200906151043/emf-runtime-2.5.0.zip,\
-http://download.eclipse.org/athena/runnables/RXTX-runtime-I20071016-1945.zip
-
-#what steps should we do? default: build.steps=buildZips,buildTests,generateDigests,test,publish,cleanup
-build.steps=buildUpdate,buildZips,buildTests,generateDigests,test,publish,cleanup
-#build.steps=buildUpdate
+build.steps=buildUpdate,buildExtra,buildTests,generateDigests,testLocal,publish,cleanup
 
+# this is now set in build.xml
 #localSourceCheckoutDir=/home/anna/RSETM-BUILD-workspace/org.eclipse.tm.tree
 
 compilerArg=-enableJavadoc -encoding ISO-8859-1
@@ -63,13 +56,6 @@ flattenDependencies=true
 parallelCompilation=true
 generateFeatureVersionSuffix=true
 
-
-# For windows, must be explicit about paths using correct slashes (/); dirs with spaces should be avoided
-#relengBuilderDir=C:/workspace/org.eclipse.gef.releng
-#relengBaseBuilderDir=C:/workspace/org.eclipse.releng.basebuilder
-#relengCommonBuilderDir=C:/workspace/org.eclipse.dash.common.releng
-#writableBuildRoot=C:/tmp/build
-
 # use this to omit pack200 step (does not yet work on Windows - https://bugs.eclipse.org/bugs/show_bug.cgi?id=268405)
 skipPack=true
 skipSign=true
diff --git a/releng/org.eclipse.tm.releng/build.xml b/releng/org.eclipse.tm.releng/build.xml
index b2fe69d5e0b..7c7eeed59ea 100644
--- a/releng/org.eclipse.tm.releng/build.xml
+++ b/releng/org.eclipse.tm.releng/build.xml
@@ -1,67 +1,44 @@
-<project default="run" name="org.eclipse.tm.releng.new/build.xml - Run a TM build using the Athena CBI">
+<!-- A sample build file for use with Hudson. Note that forceContextQualifier 
+	 is being set, which overrides tag/branch values found in *.map files 
+-->
+<project default="run">
 	<target name="run">
-		<!-- 
-			1. You must check out the following projects to your workspace:
-		
-				org.eclipse.releng.basebuilder
-				org.eclipse.dash.common.releng 
-				org.eclipse.myproject.releng
-				
-			2. You must provide Ant-Contrib in one of four places:
-			
-				org.eclipse.dash.common.releng/lib/ant-contrib.jar
-				org.eclipse.myproject.releng/lib/ant-contrib.jar
-				${thirdPartyJarsDir}/ant-contrib.jar (path can be customized below) 
-				/usr/share/java/ant-contrib.jar (may require a symlink)
-			
-				You can install Ant-Contrib 1.0b2 via RPM, or download it here:
-			
-				http://downloads.sourceforge.net/ant-contrib/ant-contrib-1.0b2-bin.zip
-			
-			3. If your project's sources are in SVN, you must unpack this zip into the basebuilder project's plugins/ folder:
-			
-				http://downloads.sourceforge.net/svn-pde-build/org.eclipse.pde.build.svn-1.0.1RC2.zip
-				
-			4. To run automated JUnit tests headlessly, you will require Xvfb or Xvnc; without this, 
-				UI tests will be launched into your current OS session (ie., on view port :0) and you may
-				inadvertently interact with them. (Non-UI tests can be run without fear of accidental 
-				interaction and do not have this requirement.) 
-				
-			5. You must also ensure that the path specified for Java, and the version of Eclipse stated in build.properties
-				are correct for your machine. Edit these properties to suit your needs. Note that JAVA*_HOME variables are for 
-				convenience, set in common.releng/server.properties. You can override them in your build.properties, or define 
-				different defaults in server.properties, if you intend to run more than one build on this server.  
-				
-					dependencyURLs=http://download.eclipse.org/eclipse/downloads/drops/S-3.5M5-200902021535/eclipse-SDK-3.5M5-linux-gtk.tar.gz 
-					JAVA_HOME=${JAVA14_HOME}
+		<!-- 0. Set a valid path to JAVA_HOME, if Eclipse's ${java.home}/../bin/javac cannot be found
 		-->
+		<property name="JAVA_HOME" value="${java.home}/.." />
 
-		<!-- load properties and set timestamp for the build -->
-		<property file="build.properties" />
 		<tstamp>
 			<format property="buildTimestamp" pattern="yyyyMMddHHmm" />
 		</tstamp>
+		<property name="forceContextQualifier" value="v${buildTimestamp}" />
 
-		<!-- calculate workspaceDir as parent of this folder, the project's .releng folder (relengBuilderDir) -->
+		<!-- 1. Import these projects using File > Import > Team Project Set > ./psfs/athena.psf.
+			 2. Close the org.eclipse.releng.basebuilder project - it does not need to compile to be of use.
+			 3. You can also define absolute paths for these directories, if relative paths do not work.
+		-->
+		<condition property="relengCommonBuilderDir"
+		           value="${basedir}/../../../org.eclipse.dash.common.releng"
+		           else="${basedir}/../org.eclipse.dash.common.releng"
+		>
+			<available file="${basedir}/../../../org.eclipse.dash.common.releng" type="dir" />
+		</condition>
+		<condition property="relengBaseBuilderDir"
+		           value="${basedir}/../../../org.eclipse.releng.basebuilder"
+		           else="${basedir}/../org.eclipse.releng.basebuilder"
+		>
+			<available file="${basedir}/../../../org.eclipse.releng.basebuilder" type="dir" />
+		</condition>
+
+		<!-- 4. To build from CVS sources using information in the ./maps/*.map files, comment these next two properties
+			 5. Or, to build from sources in the workspace, use these properties. You can also use absolute paths if needed.
+		-->
+		
+		<!--
+		<property name="localSourceCheckoutDir" value="/tmp/build/tm-tree" />
 		<property name="relengBuilderDir" value="${basedir}" />
-		<dirname file="${relengBuilderDir}" property="workspaceDir" />
-
-		<!-- 
-			can build in /tmp, eg., in /tmp/build, or in workspace, eg.,
-			${relengBuilderDir}/build
 		-->
-		<property name="writableBuildRoot" value="/tmp/build" />
-
-		<!-- 
-			can be simple path, eg., 
-			${writableBuildRoot}/${buildType}${buildTimestamp} or longer, eg.,
-			${writableBuildRoot}/${topprojectName}/${projectName}/downloads/drops/${version}/${buildType}${buildTimestamp} or
-			${writableBuildRoot}/${topprojectName}/${projectName}/${subprojectName}/downloads/drops/${version}/${buildType}${buildTimestamp}
-		-->
-		<property name="buildDir" value="${writableBuildRoot}/${buildType}${buildTimestamp}" />
-
-		<!-- invoke a new Eclipse process and launch the build from the common.releng folder -->
-		<property name="relengCommonBuilderDir" value="${workspaceDir}/org.eclipse.dash.common.releng" />
-		<ant antfile="${relengCommonBuilderDir}/buildAll.xml" target="runEclipse" dir="${relengCommonBuilderDir}" />
+		
+		<property file="build.properties" />
+		<ant antfile="${relengCommonBuilderDir}/build.xml" />
 	</target>
 </project>
diff --git a/releng/org.eclipse.tm.releng/buildExtra.xml b/releng/org.eclipse.tm.releng/buildExtra.xml
index a91b0b509b9..d8ea4e44093 100644
--- a/releng/org.eclipse.tm.releng/buildExtra.xml
+++ b/releng/org.eclipse.tm.releng/buildExtra.xml
@@ -153,31 +153,6 @@
 		<antcall target="revealServerStuff" />
 	</target>
 
-	<target name="copyOrbitBundlesToUpdateSite" depends="copyOrbit,copyOrbitSrc">
-	</target>
-
-	<target name="copyOrbit" if="copyOrbit">
-		<copy todir="${orbitDest}/plugins">
-			<fileset dir="${buildDirectory}/plugins">
-				<include name="org.apache.commons.net_*.jar"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="copyOrbitSrc" if="copyOrbitSrc">
-		<copy todir="${orbitDest}/plugins">
-			<fileset dir="${buildDirectory}/plugins">
-				<include name="org.apache.commons.net.source_*.jar"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="packageLicenseFiles">
-		<copy file="${builder}/template/epl-v10.html" todir="${tmpsite}/new/eclipse"/>
-		<copy file="${builder}/template/notice.html" todir="${tmpsite}/new/eclipse"/>
-	</target>
-
-
 	<!-- =====================================================================
 	     Specialized targets hide/reveal the server stuff so it doesn't get packaged
 	     in the client.