From a6ecbb273965046a485b91f61fe0e3e2a4b222ba Mon Sep 17 00:00:00 2001
From: David Dykstal <david_dykstal@us.ibm.com>
Date: Mon, 24 Apr 2006 21:54:32 +0000
Subject: [PATCH] updating build scripts, removing specialized procedures

---
 releng/org.eclipse.rse.build/build.properties |  4 ++
 releng/org.eclipse.rse.build/build.xml        |  1 +
 .../org.eclipse.rse.build/customTargets.xml   | 37 +++++++++++++++----
 .../org.eclipse.rse.build/genericTargets.xml  |  8 +++-
 4 files changed, 41 insertions(+), 9 deletions(-)
 create mode 100644 releng/org.eclipse.rse.build/build.properties

diff --git a/releng/org.eclipse.rse.build/build.properties b/releng/org.eclipse.rse.build/build.properties
new file mode 100644
index 00000000000..e101eafe6f0
--- /dev/null
+++ b/releng/org.eclipse.rse.build/build.properties
@@ -0,0 +1,4 @@
+buildId=1.0M1-200604220100
+archivePrefix=eclipse
+buildLabel=S-1.0M1-200604220100
+collectingFolder=COLLECTOR
\ No newline at end of file
diff --git a/releng/org.eclipse.rse.build/build.xml b/releng/org.eclipse.rse.build/build.xml
index 1616d8e1982..9d251efc26d 100644
--- a/releng/org.eclipse.rse.build/build.xml
+++ b/releng/org.eclipse.rse.build/build.xml
@@ -48,6 +48,7 @@
 	<!-- ===================================================================== -->
 	<!-- ******* add in the descriptions for each of the top level targets to the target decl -->
 	<target name="main" description="the main build target">
+		<echo message="**********************************************************"/>
 		<antcall target="preBuild" />
 		<antcall target="fetch" />
 		<antcall target="generate" />
diff --git a/releng/org.eclipse.rse.build/customTargets.xml b/releng/org.eclipse.rse.build/customTargets.xml
index 3995d79e76f..f952dbc74d6 100644
--- a/releng/org.eclipse.rse.build/customTargets.xml
+++ b/releng/org.eclipse.rse.build/customTargets.xml
@@ -25,31 +25,47 @@
 
 	<!-- ===================================================================== -->
 	<!-- Targets to assemble the built elements for particular configurations  -->
-	<!-- These generally call the generated assemble scripts (named in -->
-	<!-- ${assembleScriptName}) but may also add pre and post processing -->
-	<!-- Add one target for each root element and each configuration -->
+	<!-- These generally call the generated assemble scripts (named in         -->
+	<!-- ${assembleScriptName}) but may also add pre and post processing       -->
+	<!-- Add one target for each root element and each configuration           -->
 	<!-- ===================================================================== -->
 
 	<target name="assemble.org.eclipse.rse.core">
+		<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
+		</ant>
+		<!--
 		<antcall target="buildFeature">
 			<param name="featureFolder" value="${buildDirectory}\features\org.eclipse.rse.core" />
 		</antcall>
+		-->
 	</target>
 	<target name="assemble.org.eclipse.rse.local">
+		<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
+		</ant>
+		<!--
 		<antcall target="buildFeature">
 			<param name="featureFolder" value="${buildDirectory}\features\org.eclipse.rse.local" />
 		</antcall>
+		-->
 	</target>
 	<target name="assemble.org.eclipse.rse.ftp">
+		<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
+		</ant>
+		<!--
 		<antcall target="buildFeature">
 			<param name="featureFolder" value="${buildDirectory}\features\org.eclipse.rse.ftp" />
 		</antcall>
+		-->
 	</target>
 	<target name="assemble.org.eclipse.rse.dstore">
+		<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
+		</ant>
+		<!--
 		<antcall target="serverruntime" />
 		<antcall target="buildFeature">
 			<param name="featureFolder" value="${buildDirectory}\features\org.eclipse.rse.dstore" />
 		</antcall>
+		-->
 	</target>
 
 	<target name="dstore_extra_server.jar">
@@ -63,7 +79,7 @@
 
 	<target name="serverruntime">
 		<antcall target="dstore_extra_server.jar" />
-		<property name="universalserverfilelist" value="${buildDirectory}/plugins/org.eclipse.dstore.core/dstore_core.jar,
+		<!-- property name="universalserverfilelist" value="${buildDirectory}/plugins/org.eclipse.dstore.core/dstore_core.jar,
 	    	${buildDirectory}/plugins/org.eclipse.dstore.extra/serverruntime/dstore_extra_server.jar,
 	    	${buildDirectory}/plugins/org.eclipse.rse.services.dstore/patterns.dat,
 	    	${buildDirectory}/plugins/org.eclipse.rse.services/clientserver.jar,
@@ -78,7 +94,7 @@
 	    	${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime/daemon.linux,
 	    	${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime/win.env.bat,
 	    	${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime/daemon.win.bat,
-	    	${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime/run.win.bat" />
+	    	${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime/run.win.bat" /-->
 
 		<delete dir="${packageDirectory}\rseserver" />
 		<mkdir dir="${packageDirectory}\rseserver" />
@@ -163,6 +179,7 @@
 	<target name="preFetch">
 		<!-- clean up the old driver -->
 		<!--	<delete includeEmptyDirs="true">-->
+		<!--
 		<fileset dir="${buildDirectory}\plugins" casesensitive="yes" defaultexcludes="no">
 			<include name="org.eclipse.*/**" />
 		</fileset>
@@ -180,6 +197,7 @@
 		<fileset dir="${head}\eclipse\features" casesensitive="yes" defaultexcludes="no">
 			<include name="org.eclipse.*/**" />
 		</fileset>
+		-->
 		<!--	</delete>-->
 	</target>
 
@@ -205,12 +223,19 @@
 	<!-- Steps to do before running the build.xmls for the elements being built. -->
 	<!-- ===================================================================== -->
 	<target name="preProcess">
+		<antcall target="allElements">
+			<param name="target" value="gatherSources" />
+		</antcall>
 	</target>
 
 	<!-- ===================================================================== -->
 	<!-- Steps to do after running the build.xmls for the elements being built. -->
 	<!-- ===================================================================== -->
 	<target name="postProcess">
+		<antcall target="serverruntime" />
+		<antcall target="allElements">
+			<param name="target" value="gatherLogs" />
+		</antcall>
 	</target>
 
 	<!-- ===================================================================== -->
@@ -232,9 +257,7 @@
 		<mkdir dir="${packageDirectory}" />
 
 		<property name="packageRuntimeDirectory" location="${packageDirectory}\runtime" />
-		<property name="packageRuntimeRootDirectory" location="${packageRuntimeDirectory}\eclipse" />
 		<mkdir dir="${packageRuntimeDirectory}" />
-		<mkdir dir="${packageRuntimeRootDirectory}" />
 
 		<unzip src="${buildDirectory}\features\org.eclipse.rse.core\org.eclipse.rse.core_1.0.0.bin.dist.zip" dest="${packageRuntimeRootDirectory}" />
 		<unzip src="${buildDirectory}\features\org.eclipse.rse.dstore\org.eclipse.rse.dstore_1.0.0.bin.dist.zip" dest="${packageRuntimeRootDirectory}" />
diff --git a/releng/org.eclipse.rse.build/genericTargets.xml b/releng/org.eclipse.rse.build/genericTargets.xml
index 0887a11e5be..dca458c20b2 100644
--- a/releng/org.eclipse.rse.build/genericTargets.xml
+++ b/releng/org.eclipse.rse.build/genericTargets.xml
@@ -73,11 +73,16 @@
 	<ant antfile="build.xml" dir="${elementPath}" target="build.jars">
 		<property name="target" value="build.jars"/>
 	</ant>
+	<!-- dwd
+	<ant antfile="build.xml" dir="${elementPath}" target="build.sources">
+		<property name="target" value="build.sources"/>
+	</ant>
+	-->
 </target>
 
 <!-- **********************
 1) the gather targets do more than just gather.  These are packaging targets.
-We need to continue ot separate the two concepts (gather and package) as
+We need to continue to separate the two concepts (gather and package) as
 the packaging is different if we wanted to create an update site packaging
 (for example).  The gathers are commented out for now as the new generated
 scripts do not seem to have them.
@@ -101,7 +106,6 @@ set here?
 <!-- Gather source for a build element -->
 <!-- ===================================================================== -->
 <target name="gatherSources" description="Gathering source distribution..." depends="init">
-	<!--suspect:  this call is required to create the *.src.zip inside each plugin-->
 	<ant antfile="build.xml" dir="${elementPath}" target="build.sources">
 		<property name="os" value="${os}" />
 		<property name="ws" value="${ws}" />