Added back -sfrag flag and added comments

adoptium · Apr 10, 2024 · a2d7314 · a2d7314
1 parent 65dfd3f
commit a2d7314
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/wix/Build.OpenJDK_generic.cmd b/wix/Build.OpenJDK_generic.cmd
@@ -247,7 +247,7 @@ FOR %%A IN (%ARCH%) DO (
 
     ECHO HEAT
     @ECHO ON
-    !WIX_HEAT_PATH! dir "!REPRO_DIR!" -out %WORKDIR%!OUTPUT_BASE_FILENAME!-Files.wxs -gg -scom -sreg -srd -ke -cg "AppFiles" -var var.ProductMajorVersion -var var.ProductMinorVersion -var var.ProductVersionString -var var.MSIProductVersion -var var.ReproDir -dr INSTALLDIR -platform !PLATFORM!
+    !WIX_HEAT_PATH! dir "!REPRO_DIR!" -out %WORKDIR%!OUTPUT_BASE_FILENAME!-Files.wxs -gg -sfrag -scom -sreg -srd -ke -cg "AppFiles" -var var.ProductMajorVersion -var var.ProductMinorVersion -var var.ProductVersionString -var var.MSIProductVersion -var var.ReproDir -dr INSTALLDIR -platform !PLATFORM!
     IF ERRORLEVEL 1 (
         ECHO Failed to generate Windows Installer XML Source files ^(.wxs^)
         GOTO FAILED
@@ -325,7 +325,7 @@ FOR %%A IN (%ARCH%) DO (
         exit /b 1
 
     ) ELSE (
-        ECHO Ignoring signing step : no certificate configured
+        ECHO Ignoring signing step : certificate not configured
     )
 
     :succeeded

diff --git a/wix/SourceDir/CreateSourceFolder.AdoptOpenJDK.ps1 b/wix/SourceDir/CreateSourceFolder.AdoptOpenJDK.ps1
@@ -1,9 +1,11 @@
 <#
 .SYNOPSIS
     This script extracts the contents of a zip file to a directory structure that is expected by the Wix toolset.
+    This script also downloads WixToolset.Heat and puts it in the expected location.
 
 .DESCRIPTION
     The script takes a zip file and extracts its contents to a directory structure that is expected by the Wix toolset.
+    This script also downloads WixToolset.Heat and puts it in the expected location.
     The script also performs some cleanup on the extracted files.
 
 .PARAMETER openjdk_filename_regex