Skip to content

Commit a967a45

Browse files
EasyG0ing1EasyG0ing1
committed
Renamed Mac OS X to proper MacOS
1 parent edd95e5 commit a967a45

13 files changed

+36
-37
lines changed

‎README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[![Maven Central](http://img.shields.io/maven-central/v/io.github.fvarrui/javapackager)](https://search.maven.org/artifact/io.github.fvarrui/javapackager)
44
[![GPL-3.0](https://img.shields.io/badge/license-GPL--3.0-%250778B9.svg)](https://www.gnu.org/licenses/gpl-3.0.html)
55

6-
JavaPackager is a hybrid plugin for **Maven** and **Gradle** which provides an easy way to package Java applications in native Windows, Mac OS X or GNU/Linux executables, and generate installers for them.
6+
JavaPackager is a hybrid plugin for **Maven** and **Gradle** which provides an easy way to package Java applications in native Windows, MacOS or GNU/Linux executables, and generate installers for them.
77

88
> SNAPSHOT version is not released to Maven Central, so you have to [install it manually](#how-to-build-and-install-the-plugin).
99
@@ -132,8 +132,8 @@ By default it will generate next artifacts in `${outputDirectory} ` folder:
132132
| `${name}_${version}.exe` | Setup file. | Windows | [Inno Setup](http://www.jrsoftware.org/isinfo.php) |
133133
| `${name}_${version}.msi` | MSI installer file. | Windows | [WiX Toolset](https://wixtoolset.org/) |
134134
| `${name}_${version}.msm` | MSI merge module file. | Windows | [WiX Toolset](https://wixtoolset.org/) |
135-
| `${name}_${version}.dmg` | Disk image file (uses **hdiutil**). | Mac OS | |
136-
| `${name}_${version}.pkg` | PKG installer file (uses **pkgbuild**). | Mac OS | |
135+
| `${name}_${version}.dmg` | Disk image file (uses **hdiutil**). | MacOS | |
136+
| `${name}_${version}.pkg` | PKG installer file (uses **pkgbuild**). | MacOS | |
137137
| `${name}-${version}-${platform}.zip` | Zipball containing generated directory `${name}`. | All | |
138138
| `${name}-${version}-${platform}.tar.gz` | Compressed tarball containing generated directory `${name}`. | All | |
139139
| `assets` | Directory with all intermediate files generated by JavaPackager. | All | |
@@ -157,7 +157,7 @@ By default it will generate next artifacts in `${outputDirectory} ` folder:
157157
| `customizedJre` | :x: | `true` | Generates a customized JRE, including only identified or specified modules. Otherwise, all modules will be included. |
158158
| `description` | :x: | `${project.description}` or `${displayName}` | Project description. |
159159
| `displayName` | :x: | `${project.name}` or `${name}` | App name to show. |
160-
| `envPath` | :x: | | Defines PATH environment variable in GNU/Linux and Mac OS X startup scripts. |
160+
| `envPath` | :x: | | Defines PATH environment variable in GNU/Linux and MacOS startup scripts. |
161161
| `extra` | :x: | | Map with extra properties to be used in customized Velocity templates, accesible through `$info.extra` variable. |
162162
| `fileAssociations` | :x: | [`FileAssociation[]`](https://github.com/fvarrui/JavaPackager/blob/master/src/main/java/io/github/fvarrui/javapackager/model/FileAssociation.java) | Associate file extensions or MIME types to the app. |
163163
| `forceInstaller` | :x: | `false` | If `true`, skips operating system check when generating installers. |
@@ -180,7 +180,7 @@ By default it will generate next artifacts in `${outputDirectory} ` folder:
180180
| `runnableJar` | :x: | | Defines your own JAR file to be bundled. If it's ommited, the plugin packages your code in a runnable JAR and bundle it with the app. |
181181
| `scripts` | :x: | | Specify bootstrap script. **Pre and post-install scripts comming soon!** |
182182
| `url` | :x: | | App website URL. |
183-
| `useResourcesAsWorkingDir` | :x: | `true` | Uses app resources folder as default working directory (always `true` on Mac OS). |
183+
| `useResourcesAsWorkingDir` | :x: | `true` | Uses app resources folder as default working directory (always `true` on MacOS). |
184184
| `version` | :x: | `${project.version}` | App version. |
185185
| `vmArgs` | :x: | `[]` | VM arguments. |
186186

@@ -191,7 +191,7 @@ By default it will generate next artifacts in `${outputDirectory} ` folder:
191191
| Property | Mandatory | Description |
192192
| ------------- | --------- | ------------------------------------------------------------------- |
193193
| `linuxConfig` | :x: | [GNU/Linux specific properties](docs/linux-specific-properties.md). |
194-
| `macConfig` | :x: | [Mac OS X specific properties](docs/macosx-specific-properties.md). |
194+
| `macConfig` | :x: | [MacOS specific properties](docs/macosx-specific-properties.md). |
195195
| `winConfig` | :x: | [Windows specific properties](docs/windows-specific-properties.md). |
196196

197197
> :warning: Be careful when using the `platform` property if your project uses platform dependent libraries, so the libraries of the current platform will be copied, not those required for the target platform. You can solve this problem using `classifiers`.
@@ -216,7 +216,7 @@ ${assetsDir}/
216216
├── linux/
217217
│ └── ${name}.png # on GNU/Linux it has to be a PNG file
218218
├── mac/
219-
│ └── ${name}.icns # on Mac OS X it has to be a ICNS file
219+
│ └── ${name}.icns # on MacOS it has to be a ICNS file
220220
└── windows/
221221
└── ${name}.ico # on Windows it has to be a ICO file
222222
```
@@ -239,7 +239,7 @@ ${assetsDir}/
239239
| ├── mime.xml.vtl # MIME.XML template
240240
│ └── startup.sh.vtl # Startup script template
241241
├── mac/
242-
| ├── assembly.xml.vtl # maven-assembly-plugin template to generate ZIP/TGZ bundles for Mac OS X
242+
| ├── assembly.xml.vtl # maven-assembly-plugin template to generate ZIP/TGZ bundles for MacOS
243243
| ├── customize-dmg.applescript.vtl # DMG customization Applescript template
244244
| ├── Info.plist.vtl # Info.plist template
245245
│ └── startup.vtl # Startup script template
@@ -262,7 +262,7 @@ You can use [default templates](https://github.com/fvarrui/JavaPackager/tree/mas
262262

263263
When you build your app, all configuration details are hardcoded into the executable and cannot be changed without recreating it or hacking with a resource editor. JavaPackager introduces a feature that allows to pass additional JVM options at runtime from an `.l4j.ini` file (like [Launch4j](http://launch4j.sourceforge.net/docs.html) does, but available for all platforms in the same way). So, you can specify these options in the packager's configuration (packaging time), in INI file (runtime) or in both.
264264

265-
The INI file's name must correspond to `${name}.l4j.ini` and it has to be located next to the executable on Windows and GNU/Linux, and in `Resources` folder on Mac OS X.
265+
The INI file's name must correspond to `${name}.l4j.ini` and it has to be located next to the executable on Windows and GNU/Linux, and in `Resources` folder on MacOS.
266266

267267
The options should be separated with spaces or new lines:
268268

‎build.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ gradlePlugin {
2929
pluginBundle {
3030
website = 'http://github.com/fvarrui/JavaPackager'
3131
vcsUrl = 'http://github.com/fvarrui/JavaPackager.git'
32-
description = 'Packages Java applications as native Windows, Mac OS X or GNU/Linux executables and creates installers for them'
32+
description = 'Packages Java applications as native Windows, MacOS or GNU/Linux executables and creates installers for them'
3333
tags = ['java', 'packager', 'gradle-plugin', 'maven-plugin', 'native', 'installer', 'debian-packages', 'rpm-packages', 'dmg', 'maven', 'gradle', 'distribution', 'javapackager', 'linux-executables', 'deb', 'rpm', 'native-windows', 'java-applications', 'pkg', 'msi']
3434
plugins {
3535
javaPackagerPlugin {
@@ -71,7 +71,7 @@ dependencies {
7171

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

7676
sourceCompatibility = JavaVersion.VERSION_1_8
7777
targetCompatibility = JavaVersion.VERSION_1_8
@@ -238,4 +238,3 @@ task updateUniversalJavaApplicationStub(type : Download) {
238238
dest file('src/main/resources/mac')
239239
overwrite true
240240
}
241-

‎docs/gradle/plugin-configuration-samples.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ task packageMyApp(dependsOn: [ 'packageMyAppForLinux', 'packageMyAppForMac', 'pa
120120
E.g. on Windows, running `packageMyApp` task will generate next artifacts:
121121

122122
* `${name}_${version}-linux.tar.gz` with the GNU/Linux application including a customized JRE.
123-
* `${name}_${version}-mac.tar.gz` with the Mac OS X application including a customized JRE.
123+
* `${name}_${version}-mac.tar.gz` with the MacOS application including a customized JRE.
124124
* `${name}_${version}-windows.zip` with the Windows application including a customized JRE.
125125

126-
As last sample is running on Windows, it's not necessary to specify a JDK when bundling for Windows (it uses current JDK by default). Otherwise, if running on GNU/Linux or Mac OS X, you have to specify a JDK for Windows.
126+
As last sample is running on Windows, it's not necessary to specify a JDK when bundling for Windows (it uses current JDK by default). Otherwise, if running on GNU/Linux or MacOS, you have to specify a JDK for Windows.

‎docs/macosx-specific-properties.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Mac OS X specific properties
1+
# MacOS specific properties
22

33
```xml
44
<macConfig>
@@ -64,7 +64,7 @@
6464
| `developerId` | :x: | | Signing identity. |
6565
| `entitlements` | :x: | | Path to [entitlements](https://developer.apple.com/documentation/bundleresources/entitlements) file. |
6666
| `codesignApp` | :x: | `true` | If it is set to `false`, generated app will not be codesigned. |
67-
| `hardenedCodesign` | :x: | `true` | If it is set to `true`, enable [hardened runtime](https://developer.apple.com/documentation/security/hardened_runtime) if Mac OS version >= 10.13.6. |
67+
| `hardenedCodesign` | :x: | `true` | If it is set to `true`, enable [hardened runtime](https://developer.apple.com/documentation/security/hardened_runtime) if MacOS version >= 10.13.6. |
6868
| `macStartup` | :x: | `SCRIPT` | App startup type, using a `SCRIPT` or a binary (compiled version of the script: `UNIVERSAL`, `X86_64` or `ARM64`). |
6969

7070
## DMG generation properties

‎docs/maven/plugin-configuration-samples.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ E.g. on Windows, last configuration will generate next artifacts:
221221
E.g. on Windows, last configuration will generate next artifacts:
222222

223223
* `${name}_${version}-linux.tar.gz` with the GNU/Linux application including a customized JRE.
224-
* `${name}_${version}-mac.tar.gz` with the Mac OS X application including a customized JRE.
224+
* `${name}_${version}-mac.tar.gz` with the MacOS application including a customized JRE.
225225
* `${name}_${version}-windows.zip` with the Windows application including a customized JRE.
226226

227-
As last sample is running on Windows, it's not necessary to specify a JDK when bundling for Windows (it uses current JDK by default). Otherwise, if running on GNU/Linux or Mac OS X, you have to specify a JDK for Windows.
227+
As last sample is running on Windows, it's not necessary to specify a JDK when bundling for Windows (it uses current JDK by default). Otherwise, if running on GNU/Linux or MacOS, you have to specify a JDK for Windows.

‎src/main/java/io/github/fvarrui/javapackager/gradle/AbstractPackageTask.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public List<File> getOutputFiles() {
2828
public AbstractPackageTask() {
2929
super();
3030
setGroup(PackagePlugin.GROUP_NAME);
31-
setDescription("Packages the application as a native Windows, Mac OS X or GNU/Linux executable and creates an installer");
31+
setDescription("Packages the application as a native Windows, MacOS or GNU/Linux executable and creates an installer");
3232
getOutputs().upToDateWhen(o -> false);
3333
}
3434

‎src/main/java/io/github/fvarrui/javapackager/maven/PackageMojo.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ public class PackageMojo extends AbstractMojo {
194194
private Platform platform;
195195

196196
/**
197-
* Defines PATH environment variable in GNU/Linux and Mac OS X startup scripts.
197+
* Defines PATH environment variable in GNU/Linux and MacOS startup scripts.
198198
*/
199199
@Parameter(property = "envPath", required = false)
200200
private String envPath;
@@ -232,7 +232,7 @@ public class PackageMojo extends AbstractMojo {
232232
private LinuxConfig linuxConfig;
233233

234234
/**
235-
* Mac OS X specific config
235+
* MacOS specific config
236236
*/
237237
@Parameter(property = "macConfig", required = false)
238238
private MacConfig macConfig;

‎src/main/java/io/github/fvarrui/javapackager/model/MacConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import io.github.fvarrui.javapackager.packagers.Packager;
99

1010
/**
11-
* JavaPackager Mac OS specific configuration
11+
* JavaPackager MacOS specific configuration
1212
*/
1313
public class MacConfig implements Serializable {
1414
private static final long serialVersionUID = -2268944961932941577L;
@@ -252,7 +252,7 @@ public String toString() {
252252
}
253253

254254
/**
255-
* Tests Mac OS X specific config and set defaults if not specified
255+
* Tests MacOS specific config and set defaults if not specified
256256
*
257257
* @param packager Packager
258258
*/

‎src/main/java/io/github/fvarrui/javapackager/packagers/BundleJre.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,13 +145,13 @@ protected File doApply(Packager packager) throws Exception {
145145

146146
}
147147

148-
// removes jre/legal folder as it causes problems when codesigning from Mac OS
148+
// removes jre/legal folder as it causes problems when codesigning from MacOS
149149
File legalFolder = new File(destinationFolder, "legal");
150150
if (legalFolder.exists()) {
151151
FileUtils.removeFolder(legalFolder);
152152
}
153153

154-
// removes jre/man folder as it causes problems when codesigning from Mac OS
154+
// removes jre/man folder as it causes problems when codesigning from MacOS
155155
File manFolder = new File(destinationFolder, "man");
156156
if (manFolder.exists()) {
157157
FileUtils.removeFolder(manFolder);

‎src/main/java/io/github/fvarrui/javapackager/packagers/MacPackager.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import io.github.fvarrui.javapackager.utils.XMLUtils;
1919

2020
/**
21-
* Packager for Mac OS X
21+
* Packager for MacOS
2222
*/
2323
public class MacPackager extends Packager {
2424

@@ -37,12 +37,12 @@ public void doInit() throws Exception {
3737

3838
this.macConfig.setDefaults(this);
3939

40-
// FIX useResourcesAsWorkingDir=false doesn't work fine on Mac OS (option
40+
// FIX useResourcesAsWorkingDir=false doesn't work fine on MacOS (option
4141
// disabled)
4242
if (!this.isUseResourcesAsWorkingDir()) {
4343
this.useResourcesAsWorkingDir = true;
4444
Logger.warn(
45-
"'useResourcesAsWorkingDir' property disabled on Mac OS (useResourcesAsWorkingDir is always true)");
45+
"'useResourcesAsWorkingDir' property disabled on MacOS (useResourcesAsWorkingDir is always true)");
4646
}
4747

4848
}
@@ -162,9 +162,9 @@ private void codesign(String developerId, File entitlements, File appFile) throw
162162
List<String> flags = new ArrayList<>();
163163
if (macConfig.isHardenedCodesign()) {
164164
if (VersionUtils.compareVersions("10.13.6", SystemUtils.OS_VERSION) >= 0) {
165-
flags.add("runtime"); // enable hardened runtime if Mac OS version >= 10.13.6
165+
flags.add("runtime"); // enable hardened runtime if MacOS version >= 10.13.6
166166
} else {
167-
Logger.warn("Mac OS version detected: " + SystemUtils.OS_VERSION + " ... hardened runtime disabled!");
167+
Logger.warn("MacOS version detected: " + SystemUtils.OS_VERSION + " ... hardened runtime disabled!");
168168
}
169169
}
170170

0 commit comments

Comments
 (0)