From 1069e41afc7f010955d422f3035dbab6d6019401 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Fri, 30 Jun 2006 10:58:04 +0000
Subject: [PATCH] Fix timestamp handling for S-builds

---
 .../org.eclipse.rse.build/customTargets.xml   | 45 ++++++++++---------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/releng/org.eclipse.rse.build/customTargets.xml b/releng/org.eclipse.rse.build/customTargets.xml
index c94970de542..fe18cc823da 100644
--- a/releng/org.eclipse.rse.build/customTargets.xml
+++ b/releng/org.eclipse.rse.build/customTargets.xml
@@ -77,7 +77,7 @@
 	<!-- ===================================================================== -->
 	<!-- Steps to do before setup -->
 	<!-- ===================================================================== -->
-	<target name="preSetup">
+	<target name="preSetup" depends="myInit">
 		<echo message="builder = ${builder}"/>
 		<echo message="builderDirectory = ${builderDirectory}"/>
 		<echo message="buildProperties = ${buildProperties}"/>
@@ -87,10 +87,30 @@
 		<echo message="buildName = ${buildName}"/>
 		<echo message="buildType = ${buildType}"/>
 		<echo message="buildLabel = ${buildLabel}"/>
+		<echo message="tstamp = ${DSTAMP}-${TSTAMP} of ${dateLong}"/>
 		<echo message="archivePrefix = ${archivePrefix}"/>
 		<echo message="collectingFolder = ${collectingFolder}"/>
 	</target>
 
+	<target name="myInit">
+		<tstamp>
+			<format property="dateLong" pattern="MMM d, yyyy"/>
+		</tstamp>
+		<property name="messagefile" value="message.in"/>
+		<property name="xxmailto" value="dsdp-tm-cvs-commit@eclipse.org"/>
+		<property name="mailto" value="martin.oberhuber@windriver.com"/>
+		<property name="remotedir" value="moberhuber@dev.eclipse.org:downloads-tm/downloads/drops"/>
+		<condition property="doUpload">
+			<equals arg1="${publishDirectory}" arg2=""/>
+		</condition>
+		<condition property="doCopy">
+			<not><equals arg1="${publishDirectory}" arg2=""/></not>
+		</condition>
+		<condition property="dropDir" value="S-${buildId}-${DSTAMP}${TSTAMP}" else="${buildId}">
+			<equals arg1="${buildType}" arg2="S"/>
+		</condition>
+	</target>
+
 	<!-- ===================================================================== -->
 	<!-- Steps to do after setup but before starting the build proper -->
 	<!-- ===================================================================== -->
@@ -212,17 +232,14 @@
 		<condition property="buildTypeLong" value="Nightly"><equals arg1="${buildType}" arg2="N"/></condition>
 		<condition property="buildTypeLong" value="Integration"><equals arg1="${buildType}" arg2="I"/></condition>
 		<condition property="buildTypeLong" value="Stable"><equals arg1="${buildType}" arg2="S"/></condition>
-		<tstamp prefix="makeindex">
-			<format property="dateLong" pattern="MMM d, yyyy"/>
-		</tstamp>
 		<replace file="${packageDirectory}/${dropDir}/index.php">
 			<replacefilter token="@buildTypeLong@" value="${buildTypeLong}"/>
-			<replacefilter token="@dateLong@" value="${makeindex.dateLong}"/>
+			<replacefilter token="@dateLong@" value="${dateLong}"/>
 			<replacefilter token="@dropDir@" value="${dropDir}"/>
 			<replacefilter token="@buildId@" value="${buildId}"/>
 		</replace>
 		<replace file="${packageDirectory}/${dropDir}/buildNotes.php">
-			<replacefilter token="@dateLong@" value="${makeindex.dateLong}"/>
+			<replacefilter token="@dateLong@" value="${dateLong}"/>
 			<replacefilter token="@buildId@" value="${buildId}"/>
 		</replace>
 		<antcall target="publish"/>
@@ -243,22 +260,6 @@
 		<antcall target="mail"/>
 	</target>
 
-	<target name="myInit">
-		<property name="messagefile" value="message.in"/>
-		<property name="xxmailto" value="dsdp-tm-cvs-commit@eclipse.org"/>
-		<property name="mailto" value="martin.oberhuber@windriver.com"/>
-		<property name="remotedir" value="moberhuber@dev.eclipse.org:downloads-tm/downloads/drops"/>
-		<condition property="doUpload">
-			<equals arg1="${publishDirectory}" arg2=""/>
-		</condition>
-		<condition property="doCopy">
-			<not><equals arg1="${publishDirectory}" arg2=""/></not>
-		</condition>
-		<condition property="dropDir" value="S-${buildId}-${DSTAMP}${TSTAMP}" else="${buildId}">
-			<equals arg1="${buildType}" arg2="S"/>
-		</condition>
-	</target>
-
 	<target name="publishCopy" depends="myInit" if="doCopy" unless="hasErrors">
 		<mkdir dir="${publishDirectory}/${dropDir}" />
 		<copy todir="${publishDirectory}/${dropDir}">