Skip to content

Commit

Permalink
fix(nsis): nsis-web: Windows 7 and above is required when installing …
Browse files Browse the repository at this point in the history
…on Windows 7

Close #2420
  • Loading branch information
develar committed Jul 8, 2019
1 parent 5cb085d commit d451308
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 2 deletions.
6 changes: 6 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ We use [semantic-release](https://github.com/semantic-release/semantic-release),

## Documentation

To avoid google indexing, documentation files located in the branch `docs`. To clone:

```shell script
git clone --single-branch -b docs git@github.com:electron-userland/electron-builder.git docs
```

Documentation files located in the `/docs`.

`/docs` is deployed to Netlify when `next` release is marked as `latest` and available for all users.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"schema": "",
"jsdoc": "ts2jsdoc packages/builder-util-runtime packages/builder-util packages/app-builder-lib packages/electron-builder packages/electron-publish",
"jsdoc2md": "node scripts/jsdoc2md.js",
"/////": " git clone --single-branch -b docs git@github.com:electron-userland/electron-builder.git docs",
"/////": "git clone --single-branch -b docs git@github.com:electron-userland/electron-builder.git docs",
"docs": "tsc -p ./scripts/renderer/tsconfig.json && yarn jsdoc && yarn jsdoc2md",
"deploy-docs": "mkdocs build --clean && netlifyctl deploy --publish-directory site",
"////": "pip3 install mkdocs-material mkdocs pymdown-extensions markdown-include Pygments --upgrade"
Expand Down
6 changes: 5 additions & 1 deletion packages/app-builder-lib/templates/nsis/common.nsh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@ Name "${PRODUCT_NAME}"
!define UNINSTALL_FILENAME "Uninstall ${PRODUCT_FILENAME}.exe"

!macro check64BitAndSetRegView
${IfNot} ${AtLeastWin7}
# https://github.com/electron-userland/electron-builder/issues/2420
${If} ${IsWin2000}
${OrIf} ${IsWinME}
${OrIf} ${IsWinXP}
${OrIf} ${IsWinVista}
MessageBox MB_OK "$(win7Required)"
Quit
${EndIf}
Expand Down

0 comments on commit d451308

Please sign in to comment.