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.

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 13 commits into from Aug 9, 2021

Conversation

@mmaietta
Copy link
Collaborator

@mmaietta mmaietta commented Jul 4, 2021

Enables providing your own makensis binary via URL and adds a debugLogging config flag for enabling LogText macro within NSIS installers. Currently logs to the default directory (install path?)

Contributions incorporate @shaluyadav13's PR #6024 (Thank you!)

Implements #5119

@mmaietta mmaietta linked an issue that may be closed by this pull request Jul 4, 2021
}
}
// noinspection SpellCheckingInspection
return getBinFromUrl("nsis", "3.0.4.2", "o+YZsXHp8LNihhuk7JsCDhdIgx0MKKK+1b3sGD+4zX5djZULe4/4QMcAsfQ+0r+a8FnwBt7BVBHkIkJHjKQ0sg==")
Copy link
Collaborator Author

@mmaietta mmaietta Jul 4, 2021

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:

    Command line defined: "UNINSTALLER_OUT_FILE=C:\Users\RUNNER~1\AppData\Local\Temp\et-d8d6360ca6c99632f01b203b451e295c\t-oEMxqx\test-project-0\dist\__uninstaller-nsis-TestApp.exe"
    Processing config: C:\Users\runneradmin\AppData\Local\electron-builder\Cache\nsis\nsis-3.0.5.0\nsisconf.nsh
    Processing script file: "<stdin>" (ACP)

    Error output:
    Bad text encoding
    Error in macro MUI_LANGUAGEEX on macroline 13
    Error in macro MUI_LANGUAGE on macroline 4
    Error in macro addLangs on macroline 5
    Error in script "<stdin>" on line 112 -- aborting creation process

I couldn't easily identify why (MUI_LANGUAGEEX is no where in the codebase AFAICT) and 3.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.

Loading

Copy link
Collaborator Author

@mmaietta mmaietta Jul 5, 2021

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.

Loading

@changeset-bot
Copy link

@changeset-bot changeset-bot bot commented Jul 28, 2021

🦋 Changeset detected

Latest commit: 85d89f8

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 8 packages
Name Type
app-builder-lib Minor
dmg-builder Minor
electron-builder-squirrel-windows Minor
electron-builder Minor
electron-forge-maker-appimage Minor
electron-forge-maker-nsis-web Minor
electron-forge-maker-nsis Minor
electron-forge-maker-snap Minor

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

Loading

@mmaietta mmaietta marked this pull request as ready for review Aug 1, 2021
@mmaietta mmaietta requested a review from develar Aug 1, 2021
@mmaietta mmaietta merged commit a99a7c8 into electron-userland:master Aug 9, 2021
7 checks passed
Loading
@mmaietta mmaietta deleted the feat/custom-nsis branch Aug 9, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

1 participant