prep for signing
diff --git a/releng.wtpbuilder/scripts/build/signjars.xml b/releng.wtpbuilder/scripts/build/signjars.xml
index 360648b..836ef44 100644
--- a/releng.wtpbuilder/scripts/build/signjars.xml
+++ b/releng.wtpbuilder/scripts/build/signjars.xml
@@ -27,7 +27,6 @@
<property
name="stagingDirectory"
value="/opt/public/download-staging.priv/webtools" />
-
<property
name="signingHistory"
value="${buildDirectory}/signing-${archiveName}.log" />
@@ -76,7 +75,7 @@
<!--push drop to staging directory-->
<echo
message="push drop to staging directory" />
- <!-- this first one creates or replaces file, any others should append -->
+ <!-- this first one creates or replaces file, any others should append -->
<exec
executable="scp"
output="${signingHistory}">
@@ -117,13 +116,13 @@
<!--Wait for signed build to be available -->
<antcall
- target="waitForChangedAttribs">
+ target="waitForChangedAttributes">
<param
name="sshline"
value="david_williams@build.eclipse.org ls -l ${outputFile}" />
<param
- name="originalAttribs"
- value="${originalAttribs}" />
+ name="originalAttributes"
+ value="${originalAttributes}" />
</antcall>
<!--copy zip back to build machine -->
@@ -152,60 +151,55 @@
<!-- Utility tasks -->
<target
- name="compareAttribs">
+ name="compareAttributes">
<!--poll file for change in attributes-->
<exec
executable="ssh"
- outputProperty="polledAttribs">
+ outputProperty="polledAttributes">
<arg
line="${sshline}" />
</exec>
<echo
message="original: ${originalAttributes}" />
<condition
- property="attribChanged">
- <not>
- <contains
- string="${polledAttribs}"
- substring="No such file or directory"
- casesensitive="no" />
- </not>
+ property="attributesChanged">
+ <equals
+ arg1="${originalAttributes}"
+ arg2="${polledAttributes}"
+ trim="true" />
</condition>
<echo
- message="polled: ${polledAttribs}" />
+ message="polled: ${polledAttributes}" />
<antcall
target="writeDiffResult" />
<sleep
seconds="120" />
- <available
- property="attribs.changed"
- file="${buildDirectory}/attribDiff.txt" />
<antcall
- target="waitForChangedAttribs">
+ target="waitForChangedAttributes">
<param
- name="originalAttribs"
- value="${originalAttribs}" />
+ name="originalAttributes"
+ value="${originalAttributes}" />
</antcall>
</target>
<target
name="writeDiffResult"
- if="attribChanged">
+ if="attributesChanged">
<echo
message="original: ${originalAttributes}"
file="${buildDirectory}/attribDiff.txt" />
<echo
- message="new: ${polledAttribs}"
+ message="new: ${polledAttributes}"
file="${buildDirectory}/attribDiff.txt"
append="true" />
</target>
<target
- name="waitForChangedAttribs"
- unless="attribs.changed">
+ name="waitForChangedAttributes"
+ unless="attributesChanged">
<antcall
- target="compareAttribs">
+ target="compareAttributes">
<param
- name="originalAttribs"
- value="${originalAttribs}" />
+ name="originalAttributes"
+ value="${originalAttributes}" />
</antcall>
</target>
<target
@@ -221,5 +215,4 @@
casesensitive="false" />
</condition>
</target>
-
</project>
\ No newline at end of file