[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[jetty-commit] r1363 - eclipse/trunk

Author: jmcconnell
Date: 2010-03-05 20:18:39 -0500 (Fri, 05 Mar 2010)
New Revision: 1363

Modified:
   eclipse/trunk/sign.xml
Log:
fighting c&p ant

Modified: eclipse/trunk/sign.xml
===================================================================
--- eclipse/trunk/sign.xml	2010-03-06 00:54:05 UTC (rev 1362)
+++ eclipse/trunk/sign.xml	2010-03-06 01:18:39 UTC (rev 1363)
@@ -14,7 +14,6 @@
 
 	<property name="mailStatus" value="nomail" />
 
-
 	<!-- echo timestamp into log: format can be "MM/dd/yyyy hh:mm:ss aa" or "hh:mm:ss" -->
 	<target name="-timestamp">
 		<tstamp>
@@ -64,7 +63,7 @@
 ----------	
 Please report a bug to webmaster@xxxxxxxxxxx quoting this message.
  
-</echo>
+						</echo>
 						<!--antcall target="signMasterZipHasFailed" /-->
 					</then>
 					<else>
@@ -77,21 +76,11 @@
 										<echo>Sleep for ${signed.zip.check.interval.seconds} seconds...</echo>
 										<sleep seconds="${signed.zip.check.interval.seconds}" />
 										<antcall target="-timestamp" inheritAll="false" />
-										<if>
-											<equals arg1="${buildServerUser}" arg2="" />
-											<then>
+										
 												<antcallback target="checkForSignedZip" return="-foundSignedZip">
 													<param name="execline" value="${outputFile}" />
 												</antcallback>
-											</then>
-											<else>
-												<antcallback target="checkForSignedZip" return="-foundSignedZip">
-													<param name="execline"
-													       value="${buildServerUser} &quot;ls ${outputFile}&quot;"
-													/>
-												</antcallback>
-											</else>
-										</if>
+											
 										<if>
 											<not>
 												<isset property="-foundSignedZip" />
@@ -110,52 +99,24 @@
 						<if>
 							<isset property="-foundSignedZip" />
 							<then>
-								<!-- if we got the ${outputFile}, retrieve it via copy or scp, then clean up -->
-								<if>
-									<equals arg1="${buildServerUser}" arg2="" />
-									<then>
 										<copy file="${outputFile}" todir="${buildDirectory}/${buildLabel}" />
 										<delete includeEmptyDirs="true">
 											<fileset dir="${signingDirOutput}" />
 											<fileset file="${signingDir}/${masterZip}" />
-										</delete>
-									</then>
-									<else>
-										<exec dir="."
-										      executable="scp"
-										      output="${buildDirectory}/signing.txt"
-										      append="true"
-										>
-											<arg line="${buildServerUser}:${outputFile} ${buildDirectory}/${buildLabel}"
-											/>
-										</exec>
-										<exec dir="."
-										      executable="ssh"
-										      output="${buildDirectory}/signing.txt"
-										      append="true"
-										>
-											<arg line="${buildServerUser} &quot;/bin/rm -rf ${signingDirOutput} ${signingDir}/${masterZip}&quot;"
-											/>
-										</exec>
-									</else>
-								</if>
+										</delete>			
 							</then>
 							<else>
 								<echo>Warning!
 Signed zip check failed after ${signed.zip.check.limit} checks every ${signed.zip.check.interval.seconds} seconds.
 Check ${buildDirectory}/signing.txt for any signs of error which might explain this failure.
-</echo>
+								</echo>
 								<!--antcall target="signMasterZipHasFailed" /-->
 							</else>
 						</if>
-
 					</else>
 				</if>
 			</then>
 		</if>
-
-
-
 	</target>
 
 	<!--poll file for change in attributes: while running /usr/bin/sign, you can watch ${java.io.tmpdir}/jarsigner for progress, where ${java.io.tmpdir} == /tmp -->
@@ -165,7 +126,6 @@
 			<arg line="${execline}" />
 		</exec>
 
-
 		<if>
 			<or>
 				<!-- failure conditions -->
@@ -193,7 +153,7 @@
 Check your ssh keys and ensure you are authorized to connect as ${buildServerUser}.
 You can also set a different default value in build.properties for buildServerUser if needed.
  
-</fail>
+				</fail>
 			</then>
 		</if>
 		<echo>${-checkResults}</echo>
@@ -206,7 +166,4 @@
 			</or>
 		</condition>
 	</target>
-
-
-
 </project>