changes to improve signing (accuracy and speed)

releng.wtpbuilder/scripts/build/buildutilities.xml

diff --git a/releng.wtpbuilder/scripts/build/buildutilities.xml b/releng.wtpbuilder/scripts/build/buildutilities.xml
index 3fd171f..b89e8f8 100644
--- a/releng.wtpbuilder/scripts/build/buildutilities.xml
+++ b/releng.wtpbuilder/scripts/build/buildutilities.xml
@@ -77,11 +77,17 @@
         ==================================================================================
         -->
         <!-- add pack.properties file that specifies effort level, and files not to sign -->
+        <antcall 
+           target="updatePackProperties"/>
+        <!-- copy our created, updated one, to the standard name -->
+        <copy
+          file="${buildDirectory}/${buildLabel}/${archiveName}.pack.properties"
+          tofile="${buildDirectory}/${buildLabel}/pack.properties" />
         <exec
-        	  dir="${wtp.builder.home}/scripts/build"
+        	  dir="${buildDirectory}/${buildLabel}"
             executable="zip">
             <arg
-                line="-r ${buildDirectory}/${buildLabel}/${archiveName}  pack.properties" />
+                line="${buildDirectory}/${buildLabel}/${archiveName}  pack.properties" />
         </exec>
 
     	<antcall
@@ -416,7 +422,77 @@
              </and>
         </condition>
     	<echo message="doSign: ${doSign}" />
-    </target>        
+    </target>       
+ 
+	<target
+      name="updatePackProperties">
+      <!-- 
+        copy "standard" one to builddirectory location first.
+        We'll give each a name based on archiveName, so we can have record of it.
+       -->
+      <copy
+          file="${wtp.builder.home}/scripts/build/pack.properties"
+          tofile="${buildDirectory}/${buildLabel}/${archiveName}.pack.properties" />
+    <property
+        name="packproperties"
+        value="${buildDirectory}/${buildLabel}/${archiveName}updatePackProperties.txt" />
+    <delete
+              file="${packproperties}"
+              failonerror="false"
+              quiet="true" />
+    	<apply
+    	            executable="ls"
+    	            output="${packproperties}"
+    	            dir="${buildDirectory}"
+    	            relative="true"
+    	            parallel="true"
+    	            append="true">
+    	            <arg
+    	                value="-d" />
+    	            <fileset
+    	                dir="${buildDirectory}"
+    	                includes="plugins/com.ibm.icu*,plugins/com.ibm.icu.*,plugins/com.jcraft.jsch*" />
+    	        </apply>
+    <!--
+            TODO: we only need this temp copy if we are debugging, just to help verify
+            all is working as expected. Eventually we should tie to the debug flag.
+    -->
+    <copy
+        file="${packproperties}"
+        tofile="${buildDirectory}/tempSave_updatePackProperties.txt" />
+    <replaceregexp
+        flags="gm"
+        file="${packproperties}"
+        match="^.*plugins"
+        replace="eclipse/plugins" />
+    <!--
+            TODO: we only need this temp copy if we are debugging, just to help verify
+            all is working as expected. Eventually we should tie to the debug flag.
+    -->
+    <copy
+        file="${packproperties}"
+        tofile="${buildDirectory}/tempSave_updatePackProperties2.txt" />
+    <replaceregexp
+        flags="g"
+        file="${packproperties}"
+        match="\n([^ ])"
+        replace=",\1" />
+    <loadfile
+        property="pack.properties"
+        srcFile="${packproperties}" />
+    <!--
+        TODO: we should delete this if not "debugging", but will leave for now,
+        as it helps verify all is working as expected.
+        <delete
+        file="${packproperties}"
+        failonerror="false" />
+    -->
+    <replace
+        file="${buildDirectory}/${buildLabel}/${archiveName}.pack.properties"
+        token="@excludejars@"
+        value="${pack.properties}" />		
+  </target>
+
     <target
         name="nodefault">
         <echo