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

Allow UCL sign option for Windows installer #321

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Allow UCL sign option for Windows installer #321

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6930a6f
Allow UCL sign option for Windows installer
AdamBrousseau Jun 28, 2021
8ff96fe
Merge branch 'master' into sign_ucl_orig
gdams Oct 20, 2022
6916401
Merge branch 'master' into sign_ucl_orig
karianna Mar 12, 2023
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
11 changes: 8 additions & 3 deletions wix/Build.OpenJDK_generic.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,9 +330,14 @@ FOR %%A IN (%ARCH%) DO (
for /F %%s IN (serverTimestamp.config) do (
ECHO try !timestampErrors! / sha256 / timestamp server : %%s
REM Always hide password here
@ECHO OFF
"%ProgramFiles(x86)%\Windows Kits\%WIN_SDK_MAJOR_VERSION%\bin\%WIN_SDK_FULL_VERSION%\x64\signtool.exe" sign -f "%SIGNING_CERTIFICATE%" -p "%SIGN_PASSWORD%" -fd sha256 -d "Adoptium" -t %%s "ReleaseDir\!OUTPUT_BASE_FILENAME!.msi"
@ECHO ON
IF "%SIGN_TOOL%" == "ucl" (
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whitespace seems off?

ECHO Using UCL sign tool
ucl sign-code --file "ReleaseDir\!OUTPUT_BASE_FILENAME!.msi" -n WindowsSHA -t %%s --hash SHA256
) ELSE (
@ECHO OFF
"%ProgramFiles(x86)%\Windows Kits\%WIN_SDK_MAJOR_VERSION%\bin\%WIN_SDK_FULL_VERSION%\x64\signtool.exe" sign -f "%SIGNING_CERTIFICATE%" -p "%SIGN_PASSWORD%" -fd sha256 -d "AdoptOpenJDK" -t %%s "ReleaseDir\!OUTPUT_BASE_FILENAME!.msi"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be Adoptium not AdoptOpenJDK?

@ECHO ON
)
IF NOT "%DEBUG%" == "true" @ECHO OFF

REM check the return value of the timestamping operation and retry a max of ten times...
Expand Down