Rework the mac/windows signing tasks (#318)

HDFGroup · Aug 20, 2024 · 40bafac · 40bafac
1 parent 1adad6e
commit 40bafac
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/build.xml b/build.xml
@@ -1365,17 +1365,14 @@
         <condition property="isXMac" else="false">
             <and>
                 <equals arg1="${isMac}" arg2="true" />
-                <not>
-                    <equals arg1="${sign_state}" arg2="true" />
-                </not>
                 <equals arg1="${XPackage}" arg2="true" />
             </and>
         </condition>
         <echo if:set="isXMac">isXMac=${isXMac}</echo>
 
         <condition property="isSignXMac" else="false">
             <and>
-                <equals arg1="${isMac}" arg2="true" />
+                <equals arg1="${isXMac}" arg2="true" />
                 <equals arg1="${sign_state}" arg2="true" />
                 <equals arg1="${XPackage}" arg2="true" />
             </and>
@@ -1418,6 +1415,15 @@
         </condition>
         <echo if:set="isXWindows">isXWindows=${isXWindows}</echo>
 
+        <condition property="isSignXWindows" else="false">
+            <and>
+                <equals arg1="${isWindows}" arg2="true" />
+                <equals arg1="${sign_state}" arg2="true" />
+                <equals arg1="${XPackage}" arg2="true" />
+            </and>
+        </condition>
+        <echo if:set="isSignXWindows">isSignXWindows=${isSignXWindows}</echo>
+
         <condition property="isAppMac" else="false">
             <and>
                 <equals arg1="${isMac}" arg2="true" />
@@ -1546,7 +1552,7 @@
         <chmod perm="u+w" file="${dist.dir}/${ant.project.name}-${app.version}-${uname.os}-${machine.arch}.tar.gz" />
     </target>
 
-    <target name="binaryPackXMac" depends="createJXPackageMac, createMacREADME" if="${isXMac}">
+    <target name="binaryPackXMac" depends="binaryPackSignXMac, createJXPackageMac, createMacREADME" if="${isXMac}">
         <echo message="xxxx Package the mac dmg binary xxxx"/>
         <!-- Copy over license file -->
         <copy tofile="${dist.dir}/COPYING.txt">