Skip to content

Commit d3733c8

Browse files
committed
Merge branch 'master' into devel
2 parents e05dcca + 414fd8c commit d3733c8

File tree

2 files changed

+19
-5
lines changed

2 files changed

+19
-5
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,9 @@ If icons are located in `${assetsDir}` folder, it would not be necessary to use
204204
```bash
205205
${assetsDir}/
206206
├── linux/
207-
   └── ${name}.png # on GNU/Linux it has to be a PNG file
207+
└── ${name}.png # on GNU/Linux it has to be a PNG file
208208
├── mac/
209-
   └── ${name}.icns # on Mac OS X it has to be a ICNS file
209+
└── ${name}.icns # on Mac OS X it has to be a ICNS file
210210
└── windows/
211211
└── ${name}.ico # on Windows it has to be a ICO file
212212
```

docs/windows-tools-guide.md

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,28 @@
22

33
As explained in the [docs](https://github.com/fvarrui/JavaPackager#generated-artifacts), you must install [Inno Setup (iscc)](https://jrsoftware.org/isinfo.php) to generate an EXE installer and [WIX Toolset (candle and light)](https://wixtoolset.org/) to generate a MSI file.
44

5+
## Using Chocolatey
56
You can install both tools in a simple way using [Chocolatey](https://chocolatey.org/) package manager:
67

7-
1. [Install Chocolatey](https://chocolatey.org/install).
8-
8+
1. [Install Chocolatey](https://chocolatey.org/install)
99
2. Run next command on CMD or PowerShell as Administrator to install both tools:
1010

11-
```bash
11+
```
1212
choco install -y innosetup wixtoolset
1313
```
1414

1515
> And both tools will be automatically available in `PATH`.
16+
17+
## Using scoop
18+
You can also use [Scoop](https://github.com/ScoopInstaller/Scoop/wiki) to achieve the same goal. Scoop is a lightweight alternative to Chocolatey that doesn't require admin rights and installs by default to a folder in the user's home directory.
19+
20+
1. [Install Scoop](https://scoop.sh/)
21+
2. Run in CMD or PowerShell (no need to be Administrator):
22+
23+
```
24+
scoop bucket add extras
25+
scoop install inno-setup
26+
scoop install wixtoolset
27+
```
28+
29+
> Both tools will also be available in `PATH`.

0 commit comments

Comments
 (0)