fix ZIP issue and fix some windows build thing (#5649)

jasp-stats · Sep 30, 2024 · 4850e73 · 4850e73
1 parent 02c5165
commit 4850e73
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/Tools/CMake/Programs.cmake b/Tools/CMake/Programs.cmake
@@ -166,12 +166,11 @@ if(WIN32)
     )
   endif()
 
-  set(WIX_PATH
-      "C:/Program Files (x86)/WiX Toolset v3.11/bin"
-      CACHE
-        PATH
-        "Path to your WIX installation, e.g., C:\\Program Files (x86)\\WiX Toolset v3.11\\bin"
-  )
+  if(DEFINED ENV{WIX})
+    set(WIX_PATH "$ENV{WIX}/bin" CACHE PATH "Path to your WIX installation, e.g., C:\\Program Files (x86)\\WiX Toolset v3.11\\bin")
+  else()
+    set(WIX_PATH "C:/Program Files (x86)/WiX Toolset v3.11/bin" CACHE PATH "Path to your WIX installation, e.g., C:\\Program Files (x86)\\WiX Toolset v3.11\\bin")
+  endif()
 
   find_program(
     HEAT_EXECUTABLE

diff --git a/Tools/windows/zip/ZIP.cmd.in b/Tools/windows/zip/ZIP.cmd.in
@@ -12,6 +12,13 @@ setlocal EnableDelayedExpansion
 rem ---------------------- Packing -------------------------------
 
 echo Making zip-version of installer
+where /q zip
+IF ERRORLEVEL 1 (
 powershell Compress-Archive -Update "@JASP_INSTALL_DIR_NATIVE@\*" "@JASP_BINARY_DIR_NATIVE@\JASP\JASP.zip"
-
+) ELSE (
+pushd .
+cd /d "@JASP_INSTALL_DIR_NATIVE@\*" 
+zip -9 -q -r "@JASP_BINARY_DIR_NATIVE@\JASP\JASP.zip" . 
+popd
+)
 endlocal