Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added ability to change output msi filename #857

Merged
merged 2 commits into from
Apr 19, 2024
Merged

Added ability to change output msi filename #857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fafc5bd
Added ability to change output filename
jmjaffe37 Apr 16, 2024
a632736
Updated comments and README.md
jmjaffe37 Apr 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion wix/Build.OpenJDK_generic.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ REM JVM=hotspot|openj9|dragonwell or both JVM=hotspot openj9
REM PRODUCT_CATEGORY=jre|jdk (only one at a time)
REM SKIP_MSI_VALIDATION=true (Add -sval option to light.exe to skip MSI/MSM validation and skip smoke.exe )
REM UPGRADE_CODE_SEED=thisIsAPrivateSecretSeed ( optional ) for upgradable MSI (If none, new PRODUCT_UPGRADE_CODE is generate for each run)
REM OUTPUT_BASE_FILENAME=customFileName (optional) for setting file names that are not based on the default naming convention

SETLOCAL ENABLEEXTENSIONS
SET ERR=0
Expand Down Expand Up @@ -148,7 +149,7 @@ FOR %%A IN (%ARCH%) DO (
:CONTINUE
ECHO Source dir used : !REPRO_DIR!

SET OUTPUT_BASE_FILENAME=!PRODUCT_SKU!!PRODUCT_MAJOR_VERSION!-!PRODUCT_CATEGORY!_!FOLDER_PLATFORM!_windows_!PACKAGE_TYPE!-!PRODUCT_FULL_VERSION!
IF NOT DEFINED OUTPUT_BASE_FILENAME SET OUTPUT_BASE_FILENAME=!PRODUCT_SKU!!PRODUCT_MAJOR_VERSION!-!PRODUCT_CATEGORY!_!FOLDER_PLATFORM!_windows_!PACKAGE_TYPE!-!PRODUCT_FULL_VERSION!
REM find all *.wxi.template,*.wxl.template,*.wxs.template files and replace text with configurations
FOR /f %%i IN ('dir /s /b *.wxi.template, *.Base.*.wxl.template *.!JVM!.*.wxl.template,*.wxs.template') DO (
SET INPUT_FILE=%%~ni
Expand Down
2 changes: 2 additions & 0 deletions wix/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ call powershell.exe ./CreateSourceFolder.AdoptOpenJDK.ps1 ^
set VENDOR_BRANDING_LOGO=$(var.SetupResourcesDir)\logo.ico
set VENDOR_BRANDING_BANNER=$(var.SetupResourcesDir)\wix-banner.png
set VENDOR_BRANDING_DIALOG=$(var.SetupResourcesDir)\wix-dialog.png
set OUTPUT_BASE_FILENAME=%PRODUCT_SKU%%PRODUCT_MAJOR_VERSION%-%PRODUCT_CATEGORY%_%FOLDER_PLATFORM%_windows_%PACKAGE_TYPE%-%PRODUCT_F
ULL_VERSION%
```

`Build.OpenJDK_generic.cmd` statically depend on this SDK version (edit if needed):
Expand Down
Loading