From a2d7314dba4d009ef214c1edfbc1143b039a327c Mon Sep 17 00:00:00 2001 From: JoshMJ Date: Tue, 9 Apr 2024 17:17:41 -0700 Subject: [PATCH] Added back -sfrag flag and added comments --- wix/Build.OpenJDK_generic.cmd | 4 ++-- wix/SourceDir/CreateSourceFolder.AdoptOpenJDK.ps1 | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/wix/Build.OpenJDK_generic.cmd b/wix/Build.OpenJDK_generic.cmd index f79e7df43..57b93d013 100644 --- 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 index cb60ab490..d1c5accfb 100644 --- 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