Apple DragNDrop generator needs an intermediate folder for signing (#765

)
HDFGroup · Sep 5, 2024 · 05313b2 · 05313b2
1 parent 4ab4a1a
commit 05313b2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/.github/workflows/clang-format-check.yml b/.github/workflows/clang-format-check.yml
@@ -12,6 +12,7 @@ jobs:
     if: "!contains(github.event.head_commit.message, 'skip-ci')"
     steps:
     - uses: actions/checkout@v4.1.7
+
     - name: Run clang-format style check for C and Java code
       uses: DoozyX/clang-format-lint-action@v0.18.2
       with:

diff --git a/.github/workflows/clang-format-fix.yml b/.github/workflows/clang-format-fix.yml
@@ -23,7 +23,8 @@ jobs:
     permissions:
         contents: write # In order to allow EndBug/add-and-commit to commit changes
     steps:
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+    - uses: actions/checkout@v4.1.7
+
     - name: Fix C and Java formatting issues detected by clang-format
       uses: DoozyX/clang-format-lint-action@v0.18.2
       with:
@@ -33,6 +34,7 @@ jobs:
         inplace: True
         style: file
         exclude: './config ./mfhdf/ncgen/ncgenyy.c ./mfhdf/ncgen/ncgentab.c ./mfhdf/ncgen/ncgentab.h'
+
     - uses: EndBug/add-and-commit@a94899bca583c204427a224a7af87c02f9b325d5 # v9.1.4
       with:
           author_name: github-actions

diff --git a/config/cmake/SignPackageFiles.cmake b/config/cmake/SignPackageFiles.cmake
@@ -8,6 +8,8 @@ elseif (CPACK_GENERATOR MATCHES "WIX" OR CPACK_GENERATOR MATCHES "NSIS")
     set (CPACK_TARGET_FILE_DIRECTORY "${CPACK_TEMPORARY_INSTALL_DIRECTORY}/libraries")
 elseif (CPACK_GENERATOR MATCHES "ZIP")
     set (CPACK_TARGET_FILE_DIRECTORY "${CPACK_TEMPORARY_INSTALL_DIRECTORY}")
+elseif (CPACK_GENERATOR MATCHES "DragNDrop")
+    set (CPACK_TARGET_FILE_DIRECTORY "${CPACK_TEMPORARY_INSTALL_DIRECTORY}/ALL_IN_ONE/${CPACK_PACKAGE_INSTALL_DIRECTORY}")
 else ()
     set (CPACK_TARGET_FILE_DIRECTORY "${CPACK_TEMPORARY_INSTALL_DIRECTORY}/${CPACK_PACKAGE_INSTALL_DIRECTORY}")
 endif ()