Skip to content

Commit 1420f52

Browse files
fvarruifvarrui
committed
Merge branch 'devel'
2 parents 78ac598 + 39c044f commit 1420f52

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+814
-391
lines changed

‎README.md

Lines changed: 118 additions & 114 deletions
Large diffs are not rendered by default.

‎build.gradle

Lines changed: 40 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ dependencies {
5555
implementation 'org.vafer:jdeb:1.9'
5656
implementation 'net.jsign:jsign-core:3.1'
5757
implementation 'org.redline-rpm:redline:1.2.10'
58-
58+
5959
testImplementation 'junit:junit:4.12'
6060

6161
compileOnly 'org.apache.maven.plugin-tools:maven-plugin-annotations:3.6.0'
@@ -70,7 +70,7 @@ dependencies {
7070
}
7171

7272
group = 'io.github.fvarrui'
73-
version = '1.6.2'
73+
version = '1.6.3'
7474
description = 'Hybrid Maven/Gradle plugin to package Java applications as native Windows, Mac OS X or GNU/Linux executables and create installers for them'
7575

7676
sourceCompatibility = JavaVersion.VERSION_1_8
@@ -150,6 +150,9 @@ publishToMavenLocal.dependsOn(build)
150150

151151
if (project.hasProperty('release')) {
152152

153+
apply plugin: 'signing'
154+
apply plugin: 'maven'
155+
153156
task javadocJar(type: Jar) {
154157
classifier = 'javadoc'
155158
from javadoc
@@ -164,51 +167,46 @@ if (project.hasProperty('release')) {
164167
archives javadocJar, sourcesJar
165168
}
166169

167-
allprojects {
168-
apply plugin: 'signing'
169-
apply plugin: 'maven'
170-
171-
// Signature of artifacts
172-
signing {
173-
sign configurations.archives
174-
}
170+
// Signature of artifacts
171+
signing {
172+
sign configurations.archives
173+
}
175174

176-
// OSSRH publication
177-
uploadArchives {
178-
repositories {
179-
mavenDeployer {
180-
// POM signature
181-
beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
182-
// Target repository
183-
repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
184-
authentication(userName: ossrhUser, password: ossrhPassword)
185-
}
186-
pom.project {
187-
name project.name
188-
description project.description
189-
packaging = 'maven-plugin'
175+
// OSSRH publication
176+
uploadArchives {
177+
repositories {
178+
mavenDeployer {
179+
// POM signature
180+
beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
181+
// Target repository
182+
repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
183+
authentication(userName: ossrhUser, password: ossrhPassword)
184+
}
185+
pom.project {
186+
name project.name
187+
description project.description
188+
packaging = 'maven-plugin'
189+
url 'https://github.com/fvarrui/JavaPackager'
190+
191+
scm {
192+
connection 'scm:git:git://github.com/fvarrui/JavaPackager.git'
193+
developerConnection 'scm:git:[email protected]:fvarrui/fvarrui.git'
190194
url 'https://github.com/fvarrui/JavaPackager'
195+
}
191196

192-
scm {
193-
connection 'scm:git:git://github.com/fvarrui/JavaPackager.git'
194-
developerConnection 'scm:git:[email protected]:fvarrui/fvarrui.git'
195-
url 'https://github.com/fvarrui/JavaPackager'
196-
}
197-
198-
licenses {
199-
license {
200-
name 'GPL-v3.0'
201-
url 'http://www.gnu.org/licenses/gpl-3.0.txt'
202-
distribution 'repo'
203-
}
197+
licenses {
198+
license {
199+
name 'GPL-v3.0'
200+
url 'http://www.gnu.org/licenses/gpl-3.0.txt'
201+
distribution 'repo'
204202
}
203+
}
205204

206-
developers {
207-
developer {
208-
id = 'fvarrui'
209-
name = 'Francisco Vargas Ruiz'
210-
url = 'https://github.com/fvarrui'
211-
}
205+
developers {
206+
developer {
207+
id = 'fvarrui'
208+
name = 'Francisco Vargas Ruiz'
209+
url = 'https://github.com/fvarrui'
212210
}
213211
}
214212
}

‎docs/macosx-specific-properties.md

Lines changed: 57 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -3,46 +3,60 @@
33
```xml
44
<macConfig>
55

6-
<!-- general properties -->
7-
<appId>app unique identifier</appId>
8-
<icnsFile>path/to/icon.icns</icnsFile>
9-
<generateDmg>true|false</generateDmg>
10-
<generatePkg>true|false</generatePkg>
11-
<relocateJar>true|false</relocateJar>
12-
13-
<!-- signing properties -->
14-
<developerId>singning identity</developerId>
15-
<entitlements>path/to/entitlements.plist</entitlements>
16-
<codesignApp>true|false</codesignApp>
17-
18-
<!-- properties used in DMG disk image generation -->
19-
<backgroundImage>path/to/png</backgroundImage>
20-
<windowX>x</windowX>
21-
<windowY>y</windowY>
22-
<windowWidth>width</windowWidth>
23-
<windowHeight>height</windowHeight>
24-
<iconSize>size</iconSize>
25-
<textSize>size</textSize>
26-
<iconX>x</iconX>
27-
<iconY>y</iconY>
28-
<appsLinkIconX>x</appsLinkIconX>
29-
<appsLinkIconY>y</appsLinkIconY>
30-
<volumeIcon>path/to/icns</volumeIcon>
31-
<volumeName>${name}</volumeName>
32-
6+
<!-- general properties -->
7+
<appId>app unique identifier</appId>
8+
<icnsFile>path/to/icon.icns</icnsFile>
9+
<generateDmg>true|false</generateDmg>
10+
<generatePkg>true|false</generatePkg>
11+
<relocateJar>true|false</relocateJar>
12+
13+
<!-- signing properties -->
14+
<developerId>singning identity</developerId>
15+
<entitlements>path/to/entitlements.plist</entitlements>
16+
<codesignApp>true|false</codesignApp>
17+
18+
<!-- properties used for DMG disk image generation -->
19+
<backgroundImage>path/to/png</backgroundImage>
20+
<windowX>x</windowX>
21+
<windowY>y</windowY>
22+
<windowWidth>width</windowWidth>
23+
<windowHeight>height</windowHeight>
24+
<iconSize>size</iconSize>
25+
<textSize>size</textSize>
26+
<iconX>x</iconX>
27+
<iconY>y</iconY>
28+
<appsLinkIconX>x</appsLinkIconX>
29+
<appsLinkIconY>y</appsLinkIconY>
30+
<volumeIcon>path/to/icns</volumeIcon>
31+
<volumeName>${name}</volumeName>
32+
33+
<!-- properties used for Info.plist file generation -->
34+
<infoPlist>
35+
<bundlePackageType>BNDL|APPL|FMWK</bundlePackageType>
36+
<additionalEntries>
37+
<![CDATA[
38+
<key>ThisIsABoolean</key>
39+
<true/>
40+
<key>ThisIsAString</key>
41+
<string>value</string>
42+
[...]
43+
]]>
44+
</addtionalEntries>
45+
</infoPlist>
46+
3347
</macConfig>
3448
```
3549

36-
| Property | Mandatory | Default value | Description |
37-
| -------------- | --------- | -------------- | ------------------------------------------------------------ |
38-
| `icnsFile` | :x: | `null` | Icon file. |
39-
| `generateDmg` | :x: | `true` | Enables DMG disk image file generation. |
40-
| `generatePkg` | :x: | `true` | Enables installation package generation. |
50+
| Property | Mandatory | Default value | Description |
51+
| -------------- | --------- | -------------- | -------------------------------------------------------------------------------------------------------------------------------- |
52+
| `icnsFile` | :x: | `null` | Icon file. |
53+
| `generateDmg` | :x: | `true` | Enables DMG disk image file generation. |
54+
| `generatePkg` | :x: | `true` | Enables installation package generation. |
4155
| `relocateJar` | :x: | `true` | If `true`, Jar files are located in `Contents/Resources/Java` folder, otherwise they are located in `Contents/Resources` folder. |
42-
| `appId` | :x: | `${mainClass}` | App unique identifier. |
43-
| `developerId` | :x: | `null` | Signing identity. |
44-
| `entitlements` | :x: | `null` | Path to [entitlements](https://developer.apple.com/documentation/bundleresources/entitlements) file. |
45-
| `codesignApp` | :x: | `true` | If it is set to `false`, generated app will not be codesigned. |
56+
| `appId` | :x: | `${mainClass}` | App unique identifier. |
57+
| `developerId` | :x: | `null` | Signing identity. |
58+
| `entitlements` | :x: | `null` | Path to [entitlements](https://developer.apple.com/documentation/bundleresources/entitlements) file. |
59+
| `codesignApp` | :x: | `true` | If it is set to `false`, generated app will not be codesigned. |
4660

4761
## DMG generation properties
4862

@@ -63,3 +77,10 @@
6377
| `volumeName` | :x: | `${displayName}` | Volume name *(:warning: whitespaces are removed)*. |
6478

6579
![DMG properties explained](dmg-properties-explained.png)
80+
81+
## Info.plist generation properties
82+
83+
| Property | Mandatory | Default value | Description |
84+
| ------------------- | --------- | ------------- | ------------------------------------------------------------------------------------------------------------------------------------------------- |
85+
| `bundlePackageType` | :x: | BNDL | [Bundle package type](https://developer.apple.com/documentation/bundleresources/information_property_list/cfbundlepackagetype): BNDL, APPL, FMWK. |
86+
| `additionalEntries` | :x: | `""` | String with `Info.plist`additional entries. |

0 commit comments

Comments
 (0)