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.
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
feat: allow custom makensis and logging #6024
Merged
Merged
Changes from 6 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
e4d6f16
feat: allowing a custom nsis binary to be specified. This will indire…
mmaietta 4293576
running prettier
mmaietta 0c12609
adding logging macros with nsis option. implements #5119
mmaietta 17f5253
define via null
mmaietta 09be084
updating makensis ref
mmaietta 69942dc
set makensis to 3.0.4.2
mmaietta 77ea2e7
Adding unit tests
mmaietta fc7ce66
Merge branch 'master' into feat/custom-nsis
mmaietta a1ab91d
Create plenty-camels-occur.md
mmaietta 1b578e2
Create old-planes-look.md
mmaietta 8c528b6
Delete plenty-camels-occur.md
mmaietta fdd9b07
Running prettier and adding more docs
mmaietta 85d89f8
Merge commit 'c2dd0666d2a6a4063896cbb9ac7608345dbcedc4' into feat/cus…
mmaietta File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,7 @@ | ||
Function un.onInit | ||
SetOutPath $INSTDIR | ||
${LogSet} on | ||
|
||
!insertmacro check64BitAndSetRegView | ||
|
||
${IfNot} ${Silent} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@develar I tried to update to
3.0.5.0
that is uploaded in electron-builder-binaries, but that throws CI errors:I couldn't easily identify why (
MUI_LANGUAGEEX
is no where in the codebase AFAICT) and3.0.4.2
seems to have the log and max string length compiler flags enabled, so I'm just upgrading to that patch version here.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@develar it happens here AFAICT
LoadLanguageFile "${LangDir}\${NLFID}.nlf"
https://github.com/electron-userland/electron-builder-binaries/blob/ec807af771a341b93d122734a9a1d6d2ae9bf90a/nsis/Contrib/Modern%20UI%202/Localization.nsh#L42
My best guess is that this file is no longer valid for newer versions of makensis:
https://github.com/electron-userland/electron-builder-binaries/blob/master/nsis-lang-fixes/SimpChinese.nlf
Alternatively, we could upgrade to makensis
3.0.6.1
, but I'm struggling to figure out how to compile it for both windows & mac on my hackintosh.