From b67dca0621a5077f3eabf432cfe3ae230dee3523 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Mon, 19 Aug 2024 17:50:49 -0500
Subject: [PATCH] Correct package path for signtool

---
 .github/workflows/ant-app.yml | 2 +-
 .github/workflows/ant.yml     | 2 +-
 build.xml                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ant-app.yml b/.github/workflows/ant-app.yml
index 5cf2f0d6..4e205fd4 100644
--- a/.github/workflows/ant-app.yml
+++ b/.github/workflows/ant-app.yml
@@ -255,7 +255,7 @@ jobs:
         AZURE_ENDPOINT: ${{ secrets.AZURE_ENDPOINT }}
         AZURE_CODE_SIGNING_NAME: ${{ secrets.AZURE_CODE_SIGNING_NAME }}
         AZURE_CERT_PROFILE_NAME: ${{ secrets.AZURE_CERT_PROFILE_NAME }}
-        SIGNTOOLDIR: C:/Program Files (x86)/Windows Kits/10/bin/10.0.22621.3233/x64
+        SIGNTOOLDIR: ${{ github.workspace }}/Microsoft.Windows.SDK.BuildTools/bin/10.0.22621.0/x64
       run: |
         ant -noinput -buildfile build.xml binaryAppPackage
       shell: bash
diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml
index ff2a9b58..186fc19f 100644
--- a/.github/workflows/ant.yml
+++ b/.github/workflows/ant.yml
@@ -255,7 +255,7 @@ jobs:
         AZURE_ENDPOINT: ${{ secrets.AZURE_ENDPOINT }}
         AZURE_CODE_SIGNING_NAME: ${{ secrets.AZURE_CODE_SIGNING_NAME }}
         AZURE_CERT_PROFILE_NAME: ${{ secrets.AZURE_CERT_PROFILE_NAME }}
-        SIGNTOOLDIR: C:/Program Files (x86)/Windows Kits/10/bin/10.0.22621.3233/x64
+        SIGNTOOLDIR: ${{ github.workspace }}/Microsoft.Windows.SDK.BuildTools/bin/10.0.22621.0/x64
       run: |
         ant -noinput -buildfile build.xml binaryPackage
       shell: bash
diff --git a/build.xml b/build.xml
index 57e06586..37ed1654 100644
--- a/build.xml
+++ b/build.xml
@@ -1486,7 +1486,7 @@
         <attrib file="${basedir}\${dist.dir}\${ant.project.name}-${app.version}.msi" readonly="false" />
         <echo message="xxxx Sign the windows binary xxxx"/>
         <!-- Sign the generated exe -->
-        <exec executable="${env.SIGNTOOLDIR}\signtool.exe" failifexecutionfails="false">
+        <exec executable="${env.SIGNTOOLDIR}/signtool.exe" failifexecutionfails="false">
             <arg value="sign" />
             <arg value="/v" />
             <arg value="/debug" />