prep for signing
diff --git a/releng.wtpbuilder/components/xsl/build.properties b/releng.wtpbuilder/components/xsl/build.properties
index dda1de7..95512aa 100644
--- a/releng.wtpbuilder/components/xsl/build.properties
+++ b/releng.wtpbuilder/components/xsl/build.properties
@@ -34,4 +34,4 @@
# using the JDT Compiler Adapter to compile.
javacVerbose=true
-sign=false
\ No newline at end of file
+sign=true
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/xsl_sdk/build.properties b/releng.wtpbuilder/components/xsl_sdk/build.properties
index b114f70..9b2e603 100644
--- a/releng.wtpbuilder/components/xsl_sdk/build.properties
+++ b/releng.wtpbuilder/components/xsl_sdk/build.properties
@@ -34,4 +34,4 @@
# using the JDT Compiler Adapter to compile.
javacVerbose=true
-sign=false
+sign=true
diff --git a/releng.wtpbuilder/scripts/build/signjars.xml b/releng.wtpbuilder/scripts/build/signjars.xml
index 836ef44..763f2c5 100644
--- a/releng.wtpbuilder/scripts/build/signjars.xml
+++ b/releng.wtpbuilder/scripts/build/signjars.xml
@@ -72,13 +72,27 @@
line="-r ${packtmp}/${archiveName} ${wtp.builder.home}/scripts/build/pack.properties" />
</exec>
- <!--push drop to staging directory-->
+
+ <!--copy zip file to staging directory-->
+
+ <!--make positive that staging area is completely clean-->
<echo
- message="push drop to staging directory" />
- <!-- this first one creates or replaces file, any others should append -->
+ message="delete any possible files in staging area " />
+ <!-- this first output creates or replaces signingHistory file, all subsequent ones should append -->
+ <exec
+ executable="ssh"
+ output="${signingHistory}">
+ <arg
+ line="david_williams@build.eclipse.org /bin/rm -rf ${stagingDirectory}/*" />
+ </exec>
+
+
+ <echo
+ message="copying zip file to staging directory" />
<exec
executable="scp"
- output="${signingHistory}">
+ output="${signingHistory}"
+ append="true">
<arg
line="${packtmp}/${archiveName} david_williams@build.eclipse.org:${stagingDirectory}" />
</exec>
@@ -92,6 +106,16 @@
<!-- establish Original Attributes -->
+ <!-- this first count is just to confirm there is only one file there ...
+ in future, we may want to fail here, if not -->
+ <exec
+ executable="ssh"
+ outputProperty="originalNFiles">
+ <arg
+ line="david_williams@build.eclipse.org ls -l ${stagingDirectory} | ws -l" />
+ </exec>
+ <echo
+ message="original Number of Files: ${originalNFiles}" />
<exec
executable="ssh"
outputProperty="originalAttributes">
@@ -118,9 +142,6 @@
<antcall
target="waitForChangedAttributes">
<param
- name="sshline"
- value="david_williams@build.eclipse.org ls -l ${outputFile}" />
- <param
name="originalAttributes"
value="${originalAttributes}" />
</antcall>
@@ -155,23 +176,36 @@
<!--poll file for change in attributes-->
<exec
executable="ssh"
+ outputProperty="polledNFiles">
+ <arg
+ line="david_williams@build.eclipse.org ls -l ${stagingDirectory} | ws -l" />
+ </exec>
+ <echo
+ message="Polled Number of Files: ${polledNFiles}" />
+ <exec
+ executable="ssh"
outputProperty="polledAttributes">
<arg
- line="${sshline}" />
+ line="david_williams@build.eclipse.org ls -l ${outputFile}" />
</exec>
<echo
message="original: ${originalAttributes}" />
<condition
property="attributesChanged">
+ <and>
+ <equals
+ arg1="1"
+ arg2="${polledNFiles}"
+ trim="true" />
<equals
arg1="${originalAttributes}"
arg2="${polledAttributes}"
trim="true" />
+ </and>
</condition>
<echo
message="polled: ${polledAttributes}" />
- <antcall
- target="writeDiffResult" />
+
<sleep
seconds="120" />
<antcall
@@ -181,17 +215,7 @@
value="${originalAttributes}" />
</antcall>
</target>
- <target
- name="writeDiffResult"
- if="attributesChanged">
- <echo
- message="original: ${originalAttributes}"
- file="${buildDirectory}/attribDiff.txt" />
- <echo
- message="new: ${polledAttributes}"
- file="${buildDirectory}/attribDiff.txt"
- append="true" />
- </target>
+
<target
name="waitForChangedAttributes"
unless="attributesChanged">