From b45c8c0db3cc399c53e339b5d6a2941f6747abb2 Mon Sep 17 00:00:00 2001
From: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Date: Tue, 28 May 2024 09:46:05 -0500
Subject: [PATCH] Remove old altool option and use resource

---
 build.xml | 43 +++++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/build.xml b/build.xml
index cb328ea8..8bc87cce 100644
--- a/build.xml
+++ b/build.xml
@@ -27,7 +27,6 @@
     <!-- MAC notary: -->
     <property name="notarize.account" value="${env.NOTARY_USER}" />
     <property name="notarize.keychain_key" value="${env.NOTARY_KEY}" />
-    <property name="notarize.altool" value="" />
 
     <!-- Get HDFView, HDF4, HDF5 and HDF-Java version information -->
     <loadfile property="app.version" srcFile="${basedir}/VERSION">
@@ -1789,10 +1788,13 @@
             <arg value="${ant.project.name}-${app.version}.dmg" />
         </exec>
 
-        <antcall target="submit-notary${notarize.altool}" />
+        <echo message="xxxx Notarize dmg xxxx"/>
+        <antcall target="submit-notary" />
 
-        <antcall target="post-notary${notarize.altool}" />
+        <echo message="xxxx Get notary ID xxxx"/>
+        <antcall target="post-notary" />
 
+        <echo message="xxxx Staple notary ID xxxx"/>
         <antcall target="staple-notary" />
 
         <echo message="xxxx Package the mac dmg binary xxxx"/>
@@ -2031,7 +2033,7 @@
             <arg value="--apple-id"/>
             <arg value="${notarize.account}"/>
             <arg value="--team-id"/> 
-	    <arg value="${sign.account}"/>
+            <arg value="${sign.account}"/>
             <arg value="--password"/>
             <arg value="${notarize.keychain_key}"/>
             <arg value="--team-id"/>
@@ -2039,19 +2041,17 @@
             <arg value="${dist.dir}/${ant.project.name}-${app.version}.dmg"/>
         </exec>
         <echo>notarize-app output:${retUUID.txt}</echo>
-        <sequential>
-        <echo message="@{retUUID.txt}" file="retUUID.txt.file" />
-        <loadfile property="retUUID" srcfile="retUUID.txt.file">
+        <loadresource property="retUUID">
+            <concat>${retUUID.txt}</concat>
             <filterchain>
                 <tokenfilter>
-                    <containsregex
-                         pattern="id:\s*([0-9a-fA-F-]+)$"
+                    <replaceregex
+                         pattern="id:\s*([0-9a-fA-F\-]+)$"
                          replace="\1" />
                 </tokenfilter>
                 <striplinebreaks/>
             </filterchain>
-        </loadfile>
-        </sequential>
+        </loadresource>
         <echo>notarize-app:${retUUID}</echo>
     </target>
 
@@ -2062,8 +2062,8 @@
             <arg value="info"/>
             <arg value="--apple-id"/>
             <arg value="${notarize.account}"/>
-	    <arg value="--team-id"/> 
-	    <arg value="${sign.account}"/>
+            <arg value="--team-id"/> 
+            <arg value="${sign.account}"/>
             <arg value="--password"/>
             <arg value="${notarize.keychain_key}"/>
             <arg value="--team-id"/>
@@ -2094,6 +2094,7 @@
             <arg value="${ant.project.name}-${app.version}.dmg"/>
         </exec>
     </target>
+
     <target name="zip-submit-notary" if="sign.enable">
         <exec executable="/usr/bin/xcrun" failonerror="true"
               outputproperty="zipUUID.txt">
@@ -2109,20 +2110,18 @@
             <arg value="${dist.dir}/${ant.project.name}-${app.version}.zip"/>
         </exec>
         <echo>notarize-zip-app:${zipUUID.txt}</echo>
-        <sequential>
-        <echo message="@{zipUUID.txt}" file="zipUUID.txt.file" />
-        <loadfile property="zipUUID" srcfile="zipUUID.txt.file">
+        <loadresource property="zipUUID">
+            <concat>${zipUUID.txt}</concat>
             <filterchain>
                 <tokenfilter>
-                    <containsregex
-                        pattern="id:\s*([0-9a-fA-F-]+)$"
+                    <replaceregex
+                        pattern="id:\s*([0-9a-fA-F\-]+)$"
                          replace="\1" />
                 </tokenfilter>
                 <striplinebreaks/>
             </filterchain>
-        </loadfile>
+        </loadresource>
         <echo>notarize-zip-app:${zipUUID}</echo>
-        </sequential>
     </target>
 
     <!-- Staple the received notarization to the app -->
@@ -2229,9 +2228,9 @@
             <arg value="${ant.project.name}-${app.version}.zip" />
         </exec>
 
-        <antcall target="zip-submit-notary${notarize.altool}" />
+        <antcall target="zip-submit-notary" />
 
-        <antcall target="post-notary${notarize.altool}" />
+        <antcall target="post-notary" />
 
         <antcall target="zip-staple-notary" />