--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources.properties Tue Sep 10 14:57:03 2019 -0400
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources.properties Wed Sep 11 13:26:36 2019 -0400
@@ -40,16 +40,16 @@
resource.menu-icon=menu icon
resource.rpm-spec-file=RPM spec file
-error.parameters-null=Parameters map is null.
-error.parameters-null.advice=Pass in a non-null parameters map.
-error.tool-not-found=Can not find {0}.
-error.tool-not-found.advice=Please install required packages.
-error.no-content-types-for-file-association=No MIME types were specified for File Association number {0}.
+error.parameters-null=Parameters map is null
+error.parameters-null.advice=Pass in a non-null parameters map
+error.tool-not-found=Can not find {0}
+error.tool-not-found.advice=Please install required packages
+error.no-content-types-for-file-association=No MIME types were specified for File Association number {0}
error.too-many-content-types-for-file-association=More than one MIME types was specified for File Association number {0}.
error.invalid-value-for-package-name=Invalid value "{0}" for the bundle name.
error.invalid-value-for-package-name.advice=Set the "linux-bundle-name" option to a valid Debian package name. Note that the package names must consist only of lower case letters (a-z), digits (0-9), plus (+) and minus (-) signs, and periods (.). They must be at least two characters long and must start with an alphanumeric character.
-error.cannot-find-rpmbuild=Can not find rpmbuild {0} or newer.
-error.cannot-find-rpmbuild.advice=\ Install packages needed to build RPM, version {0} or newer.
+error.cannot-find-rpmbuild=Can not find rpmbuild {0} or newer
+error.cannot-find-rpmbuild.advice=\ Install packages needed to build RPM, version {0} or newer
message.icon-not-png=The specified icon "{0}" is not a PNG file and will not be used. The default icon will be used in it's place.
message.test-for-tool=Test for [{0}]. Result: {1}
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_ja.properties Tue Sep 10 14:57:03 2019 -0400
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_ja.properties Wed Sep 11 13:26:36 2019 -0400
@@ -40,16 +40,16 @@
resource.menu-icon=menu icon
resource.rpm-spec-file=RPM spec file
-error.parameters-null=Parameters map is null.
-error.parameters-null.advice=Pass in a non-null parameters map.
-error.tool-not-found=Can not find {0}.
-error.tool-not-found.advice=Please install required packages.
-error.no-content-types-for-file-association=No MIME types were specified for File Association number {0}.
+error.parameters-null=Parameters map is null
+error.parameters-null.advice=Pass in a non-null parameters map
+error.tool-not-found=Can not find {0}
+error.tool-not-found.advice=Please install required packages
+error.no-content-types-for-file-association=No MIME types were specified for File Association number {0}
error.too-many-content-types-for-file-association=More than one MIME types was specified for File Association number {0}.
error.invalid-value-for-package-name=Invalid value "{0}" for the bundle name.
error.invalid-value-for-package-name.advice=Set the "linux-bundle-name" option to a valid Debian package name. Note that the package names must consist only of lower case letters (a-z), digits (0-9), plus (+) and minus (-) signs, and periods (.). They must be at least two characters long and must start with an alphanumeric character.
-error.cannot-find-rpmbuild=Can not find rpmbuild {0} or newer.
-error.cannot-find-rpmbuild.advice=\ Install packages needed to build RPM, version {0} or newer.
+error.cannot-find-rpmbuild=Can not find rpmbuild {0} or newer
+error.cannot-find-rpmbuild.advice=\ Install packages needed to build RPM, version {0} or newer
message.icon-not-png=The specified icon "{0}" is not a PNG file and will not be used. The default icon will be used in it's place.
message.test-for-tool=Test for [{0}]. Result: {1}
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_zh_CN.properties Tue Sep 10 14:57:03 2019 -0400
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_zh_CN.properties Wed Sep 11 13:26:36 2019 -0400
@@ -40,16 +40,16 @@
resource.menu-icon=menu icon
resource.rpm-spec-file=RPM spec file
-error.parameters-null=Parameters map is null.
-error.parameters-null.advice=Pass in a non-null parameters map.
-error.tool-not-found=Can not find {0}.
-error.tool-not-found.advice=Please install required packages.
-error.no-content-types-for-file-association=No MIME types were specified for File Association number {0}.
+error.parameters-null=Parameters map is null
+error.parameters-null.advice=Pass in a non-null parameters map
+error.tool-not-found=Can not find {0}
+error.tool-not-found.advice=Please install required packages
+error.no-content-types-for-file-association=No MIME types were specified for File Association number {0}
error.too-many-content-types-for-file-association=More than one MIME types was specified for File Association number {0}.
error.invalid-value-for-package-name=Invalid value "{0}" for the bundle name.
error.invalid-value-for-package-name.advice=Set the "linux-bundle-name" option to a valid Debian package name. Note that the package names must consist only of lower case letters (a-z), digits (0-9), plus (+) and minus (-) signs, and periods (.). They must be at least two characters long and must start with an alphanumeric character.
-error.cannot-find-rpmbuild=Can not find rpmbuild {0} or newer.
-error.cannot-find-rpmbuild.advice=\ Install packages needed to build RPM, version {0} or newer.
+error.cannot-find-rpmbuild=Can not find rpmbuild {0} or newer
+error.cannot-find-rpmbuild.advice=\ Install packages needed to build RPM, version {0} or newer
message.icon-not-png=The specified icon "{0}" is not a PNG file and will not be used. The default icon will be used in it's place.
message.test-for-tool=Test for [{0}]. Result: {1}
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties Tue Sep 10 14:57:03 2019 -0400
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties Wed Sep 11 13:26:36 2019 -0400
@@ -26,22 +26,22 @@
app.bundler.name=Mac Application Image
store.bundler.name=Mac App Store Ready Bundler
-dmg.bundler.name=DMG Package Bundler
-pkg.bundler.name=PKG Package Bundler
+dmg.bundler.name=Mac DMG Package
+pkg.bundler.name=Mac PKG Package
-error.invalid-cfbundle-version=Invalid CFBundleVersion: [{0}].
+error.invalid-cfbundle-version=Invalid CFBundleVersion: [{0}]
error.invalid-cfbundle-version.advice=Set a compatible 'appVersion' or set a 'mac.CFBundleVersion'. Valid versions are one to three integers separated by dots.
-error.explicit-sign-no-cert=Signature explicitly requested but no signing certificate specified.
+error.explicit-sign-no-cert=Signature explicitly requested but no signing certificate specified
error.explicit-sign-no-cert.advice=Either specify a valid cert in 'mac.signing-key-developer-id-app' or unset 'signBundle' or set 'signBundle' to false.
-error.parameters-null=Parameters map is null.
+error.parameters-null=Parameters map is null
error.parameters-null.advice=Pass in a non-null parameters map.
-error.must-sign-app-store=Mac App Store apps must be signed, and signing has been disabled by bundler configuration.
-error.must-sign-app-store.advice=Either unset 'signBundle' or set 'signBundle' to true.
+error.must-sign-app-store=Mac App Store apps must be signed, and signing has been disabled by bundler configuration
+error.must-sign-app-store.advice=Either unset 'signBundle' or set 'signBundle' to true
error.no-app-signing-key=No Mac App Store App Signing Key
error.no-app-signing-key.advice=Install your app signing keys into your Mac Keychain using XCode.
error.no-pkg-signing-key=No Mac App Store Installer Signing Key
error.no-pkg-signing-key.advice=Install your app signing keys into your Mac Keychain using XCode.
-error.certificate.expired=Error: Certificate expired {0}.
+error.certificate.expired=Error: Certificate expired {0}
resource.bundle-config-file=Bundle config file
resource.app-info-plist=Application Info.plist
@@ -69,7 +69,7 @@
message.creating-association-with-null-extension=Creating association with null extension.
message.ignoring.symlink=Warning: codesign is skipping the symlink {0}.
message.keychain.error=Error: unable to get keychain list.
-message.building-bundle=Building Mac App Store Bundle for {0}.
+message.building-bundle=Building Mac App Store Package for {0}.
message.app-image-dir-does-not-exist=Specified application image directory {0}: {1} does not exists.
message.app-image-dir-does-not-exist.advice=Confirm that the value for {0} exists.
message.app-image-requires-app-name=When using an external app image you must specify the app name.
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_ja.properties Tue Sep 10 14:57:03 2019 -0400
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_ja.properties Wed Sep 11 13:26:36 2019 -0400
@@ -26,22 +26,22 @@
app.bundler.name=Mac Application Image
store.bundler.name=Mac App Store Ready Bundler
-dmg.bundler.name=DMG Package Bundler
-pkg.bundler.name=PKG Package Bundler
+dmg.bundler.name=Mac DMG Package
+pkg.bundler.name=Mac PKG Package
-error.invalid-cfbundle-version=Invalid CFBundleVersion: [{0}].
+error.invalid-cfbundle-version=Invalid CFBundleVersion: [{0}]
error.invalid-cfbundle-version.advice=Set a compatible 'appVersion' or set a 'mac.CFBundleVersion'. Valid versions are one to three integers separated by dots.
-error.explicit-sign-no-cert=Signature explicitly requested but no signing certificate specified.
+error.explicit-sign-no-cert=Signature explicitly requested but no signing certificate specified
error.explicit-sign-no-cert.advice=Either specify a valid cert in 'mac.signing-key-developer-id-app' or unset 'signBundle' or set 'signBundle' to false.
-error.parameters-null=Parameters map is null.
+error.parameters-null=Parameters map is null
error.parameters-null.advice=Pass in a non-null parameters map.
-error.must-sign-app-store=Mac App Store apps must be signed, and signing has been disabled by bundler configuration.
-error.must-sign-app-store.advice=Either unset 'signBundle' or set 'signBundle' to true.
+error.must-sign-app-store=Mac App Store apps must be signed, and signing has been disabled by bundler configuration
+error.must-sign-app-store.advice=Either unset 'signBundle' or set 'signBundle' to true
error.no-app-signing-key=No Mac App Store App Signing Key
error.no-app-signing-key.advice=Install your app signing keys into your Mac Keychain using XCode.
error.no-pkg-signing-key=No Mac App Store Installer Signing Key
error.no-pkg-signing-key.advice=Install your app signing keys into your Mac Keychain using XCode.
-error.certificate.expired=Error: Certificate expired {0}.
+error.certificate.expired=Error: Certificate expired {0}
resource.bundle-config-file=Bundle config file
resource.app-info-plist=Application Info.plist
@@ -69,7 +69,7 @@
message.creating-association-with-null-extension=Creating association with null extension.
message.ignoring.symlink=Warning: codesign is skipping the symlink {0}.
message.keychain.error=Error: unable to get keychain list.
-message.building-bundle=Building Mac App Store Bundle for {0}.
+message.building-bundle=Building Mac App Store Package for {0}.
message.app-image-dir-does-not-exist=Specified application image directory {0}: {1} does not exists.
message.app-image-dir-does-not-exist.advice=Confirm that the value for {0} exists.
message.app-image-requires-app-name=When using an external app image you must specify the app name.
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_zh_CN.properties Tue Sep 10 14:57:03 2019 -0400
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_zh_CN.properties Wed Sep 11 13:26:36 2019 -0400
@@ -26,22 +26,22 @@
app.bundler.name=Mac Application Image
store.bundler.name=Mac App Store Ready Bundler
-dmg.bundler.name=DMG Package Bundler
-pkg.bundler.name=PKG Package Bundler
+dmg.bundler.name=Mac DMG Package
+pkg.bundler.name=Mac PKG Package
-error.invalid-cfbundle-version=Invalid CFBundleVersion: [{0}].
+error.invalid-cfbundle-version=Invalid CFBundleVersion: [{0}]
error.invalid-cfbundle-version.advice=Set a compatible 'appVersion' or set a 'mac.CFBundleVersion'. Valid versions are one to three integers separated by dots.
-error.explicit-sign-no-cert=Signature explicitly requested but no signing certificate specified.
+error.explicit-sign-no-cert=Signature explicitly requested but no signing certificate specified
error.explicit-sign-no-cert.advice=Either specify a valid cert in 'mac.signing-key-developer-id-app' or unset 'signBundle' or set 'signBundle' to false.
-error.parameters-null=Parameters map is null.
+error.parameters-null=Parameters map is null
error.parameters-null.advice=Pass in a non-null parameters map.
-error.must-sign-app-store=Mac App Store apps must be signed, and signing has been disabled by bundler configuration.
-error.must-sign-app-store.advice=Either unset 'signBundle' or set 'signBundle' to true.
+error.must-sign-app-store=Mac App Store apps must be signed, and signing has been disabled by bundler configuration
+error.must-sign-app-store.advice=Either unset 'signBundle' or set 'signBundle' to true
error.no-app-signing-key=No Mac App Store App Signing Key
error.no-app-signing-key.advice=Install your app signing keys into your Mac Keychain using XCode.
error.no-pkg-signing-key=No Mac App Store Installer Signing Key
error.no-pkg-signing-key.advice=Install your app signing keys into your Mac Keychain using XCode.
-error.certificate.expired=Error: Certificate expired {0}.
+error.certificate.expired=Error: Certificate expired {0}
resource.bundle-config-file=Bundle config file
resource.app-info-plist=Application Info.plist
@@ -69,7 +69,7 @@
message.creating-association-with-null-extension=Creating association with null extension.
message.ignoring.symlink=Warning: codesign is skipping the symlink {0}.
message.keychain.error=Error: unable to get keychain list.
-message.building-bundle=Building Mac App Store Bundle for {0}.
+message.building-bundle=Building Mac App Store Package for {0}.
message.app-image-dir-does-not-exist=Specified application image directory {0}: {1} does not exists.
message.app-image-dir-does-not-exist.advice=Confirm that the value for {0} exists.
message.app-image-requires-app-name=When using an external app image you must specify the app name.
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java Tue Sep 10 14:57:03 2019 -0400
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java Wed Sep 11 13:26:36 2019 -0400
@@ -234,10 +234,10 @@
new AddLauncherArguments(name, filename));
}),
- TEMP_ROOT ("temp-root", OptionCategories.PROPERTY, () -> {
+ TEMP_ROOT ("temp", OptionCategories.PROPERTY, () -> {
context().buildRoot = popArg();
context().userProvidedBuildRoot = true;
- setOptionValue("temp-root", context().buildRoot);
+ setOptionValue("temp", context().buildRoot);
}),
INSTALL_DIR ("install-dir", OptionCategories.PROPERTY),
@@ -265,15 +265,15 @@
setOptionValue("mac-sign", true);
}),
- MAC_BUNDLE_NAME ("mac-bundle-name", OptionCategories.PLATFORM_MAC),
+ MAC_BUNDLE_NAME ("mac-package-name", OptionCategories.PLATFORM_MAC),
- MAC_BUNDLE_IDENTIFIER("mac-bundle-identifier",
+ MAC_BUNDLE_IDENTIFIER("mac-package-identifier",
OptionCategories.PLATFORM_MAC),
MAC_APP_STORE_CATEGORY ("mac-app-store-category",
OptionCategories.PLATFORM_MAC),
- MAC_BUNDLE_SIGNING_PREFIX ("mac-bundle-signing-prefix",
+ MAC_BUNDLE_SIGNING_PREFIX ("mac-package-signing-prefix",
OptionCategories.PLATFORM_MAC),
MAC_SIGNING_KEY_NAME ("mac-signing-key-user-name",
@@ -313,7 +313,7 @@
setOptionValue("win-console", true);
}),
- LINUX_BUNDLE_NAME ("linux-bundle-name",
+ LINUX_BUNDLE_NAME ("linux-package-name",
OptionCategories.PLATFORM_LINUX),
LINUX_DEB_MAINTAINER ("linux-deb-maintainer",
@@ -601,9 +601,9 @@
boolean bundleCreated = false;
- // the temp-root needs to be fetched from the params early,
+ // the temp dir needs to be fetched from the params early,
// to prevent each copy of the params (such as may be used for
- // additional launchers) from generating a separate temp-root when
+ // additional launchers) from generating a separate temp dir when
// the default is used (the default is a new temp directory)
// The bundler.cleanup() below would not otherwise be able to
// clean these extra (and unneeded) temp directories.
@@ -649,7 +649,7 @@
(new File(buildRoot)).getAbsolutePath()));
} else {
// always clean up the temporary directory created
- // when --temp-root option not used.
+ // when --temp option not used.
bundler.cleanup(localParams);
}
}
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/DeployParams.java Tue Sep 10 14:57:03 2019 -0400
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/DeployParams.java Wed Sep 11 13:26:36 2019 -0400
@@ -255,7 +255,7 @@
}
}
- // Validate temp-root
+ // Validate temp dir
String root = (String)bundlerArguments.get(
Arguments.CLIOptions.TEMP_ROOT.getId());
if (root != null) {
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties Tue Sep 10 14:57:03 2019 -0400
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties Wed Sep 11 13:26:36 2019 -0400
@@ -71,10 +71,10 @@
\ --output -o <output path>\n\
\ Path where generated output file is placed\n\
\ (absolute path or relative to the current directory)\n\
-\ --temp-root <file path>\n\
+\ --temp <file path>\n\
\ Path of a new or empty directory used to create temporary files\n\
\ (absolute path or relative to the current directory)\n\
-\ If specified, the temp-root will not be removed upon the task\n\
+\ If specified, the temp dir will not be removed upon the task\n\
\ completion and must be removed manually\n\
\ If not specified, a temporary directory will be created and\n\
\ removed upon the task completion.\n\
@@ -112,7 +112,7 @@
\n\
\Options for creating the application image:\n\
\ --icon <icon file path>\n\
-\ Path of the icon of the application bundle\n\
+\ Path of the icon of the application package\n\
\ (absolute path or relative to the current directory)\n\
\ --input -i <input path>\n\
\ Path of the input directory that contains the files to be packaged\n\
@@ -215,23 +215,23 @@
\Relative sub-path under the default installation location\n\
MSG_Help_mac_launcher=\
-\ --mac-bundle-identifier <ID string>\n\
+\ --mac-package-identifier <ID string>\n\
\ An identifier that uniquely identifies the application for macOS\n\
\ Defaults to the value of --identifier option.\n\
\ May only use alphanumeric (A-Z,a-z,0-9), hyphen (-),\n\
\ and period (.) characters.\n\
-\ --mac-bundle-name <name string>\n\
+\ --mac-package-name <name string>\n\
\ Name of the application as it appears in the Menu Bar\n\
\ This can be different from the application name.\n\
\ This name must be less than 16 characters long and be suitable for\n\
\ displaying in the menu bar and the application Info window.\n\
\ Defaults to the application name.\n\
-\ --mac-bundle-signing-prefix <prefix string>\n\
-\ When signing the application bundle, this value is prefixed to all\n\
-\ components that need to be signed that don't have\n\
-\ an existing bundle identifier.\n\
+\ --mac-package-signing-prefix <prefix string>\n\
+\ When signing the application package, this value is prefixed\n\
+\ to all components that need to be signed that don't have\n\
+\ an existing package identifier.\n\
\ --mac-sign\n\
-\ Request that the bundle be signed\n\
+\ Request that the package be signed\n\
\ --mac-signing-keychain <file path>\n\
\ Path of the keychain to search for the signing identity\n\
\ (absolute path or relative to the current directory).\n\
@@ -241,10 +241,10 @@
\ For example "Developer ID Application: "\n\
MSG_Help_linux_install=\
-\ --linux-bundle-name <bundle name>\n\
-\ Name for Linux bundle, defaults to the application name\n\
+\ --linux-package-name <package name>\n\
+\ Name for Linux package, defaults to the application name\n\
\ --linux-deb-maintainer <email address>\n\
-\ Maintainer for .deb bundle\n\
+\ Maintainer for .deb package\n\
\ --linux-deb-copyright-file <file path>\n\
\ Path to custom copyright file for Debian packaging\n\
\ (absolute path or relative to the current directory)\n\
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties Tue Sep 10 14:57:03 2019 -0400
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties Wed Sep 11 13:26:36 2019 -0400
@@ -71,10 +71,10 @@
\ --output -o <output path>\n\
\ Path where generated output file is placed\n\
\ (absolute path or relative to the current directory)\n\
-\ --temp-root <file path>\n\
+\ --temp <file path>\n\
\ Path of a new or empty directory used to create temporary files\n\
\ (absolute path or relative to the current directory)\n\
-\ If specified, the temp-root will not be removed upon the task\n\
+\ If specified, the temp dir will not be removed upon the task\n\
\ completion and must be removed manually\n\
\ If not specified, a temporary directory will be created and\n\
\ removed upon the task completion.\n\
@@ -112,7 +112,7 @@
\n\
\Options for creating the application image:\n\
\ --icon <icon file path>\n\
-\ Path of the icon of the application bundle\n\
+\ Path of the icon of the application package\n\
\ (absolute path or relative to the current directory)\n\
\ --input -i <input path>\n\
\ Path of the input directory that contains the files to be packaged\n\
@@ -215,23 +215,23 @@
\Relative sub-path under the default installation location\n\
MSG_Help_mac_launcher=\
-\ --mac-bundle-identifier <ID string>\n\
+\ --mac-package-identifier <ID string>\n\
\ An identifier that uniquely identifies the application for macOS\n\
\ Defaults to the value of --identifier option.\n\
\ May only use alphanumeric (A-Z,a-z,0-9), hyphen (-),\n\
\ and period (.) characters.\n\
-\ --mac-bundle-name <name string>\n\
+\ --mac-package-name <name string>\n\
\ Name of the application as it appears in the Menu Bar\n\
\ This can be different from the application name.\n\
\ This name must be less than 16 characters long and be suitable for\n\
\ displaying in the menu bar and the application Info window.\n\
\ Defaults to the application name.\n\
-\ --mac-bundle-signing-prefix <prefix string>\n\
-\ When signing the application bundle, this value is prefixed to all\n\
-\ components that need to be signed that don't have\n\
-\ an existing bundle identifier.\n\
+\ --mac-package-signing-prefix <prefix string>\n\
+\ When signing the application package, this value is prefixed\n\
+\ to all components that need to be signed that don't have\n\
+\ an existing package identifier.\n\
\ --mac-sign\n\
-\ Request that the bundle be signed\n\
+\ Request that the package be signed\n\
\ --mac-signing-keychain <file path>\n\
\ Path of the keychain to search for the signing identity\n\
\ (absolute path or relative to the current directory).\n\
@@ -241,10 +241,10 @@
\ For example "Developer ID Application: "\n\
MSG_Help_linux_install=\
-\ --linux-bundle-name <bundle name>\n\
-\ Name for Linux bundle, defaults to the application name\n\
+\ --linux-package-name <package name>\n\
+\ Name for Linux package, defaults to the application name\n\
\ --linux-deb-maintainer <email address>\n\
-\ Maintainer for .deb bundle\n\
+\ Maintainer for .deb package\n\
\ --linux-deb-copyright-file <file path>\n\
\ Path to custom copyright file for Debian packaging\n\
\ (absolute path or relative to the current directory)\n\
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties Tue Sep 10 14:57:03 2019 -0400
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties Wed Sep 11 13:26:36 2019 -0400
@@ -71,10 +71,10 @@
\ --output -o <output path>\n\
\ Path where generated output file is placed\n\
\ (absolute path or relative to the current directory)\n\
-\ --temp-root <file path>\n\
+\ --temp <file path>\n\
\ Path of a new or empty directory used to create temporary files\n\
\ (absolute path or relative to the current directory)\n\
-\ If specified, the temp-root will not be removed upon the task\n\
+\ If specified, the temp dir will not be removed upon the task\n\
\ completion and must be removed manually\n\
\ If not specified, a temporary directory will be created and\n\
\ removed upon the task completion.\n\
@@ -112,7 +112,7 @@
\n\
\Options for creating the application image:\n\
\ --icon <icon file path>\n\
-\ Path of the icon of the application bundle\n\
+\ Path of the icon of the application package\n\
\ (absolute path or relative to the current directory)\n\
\ --input -i <input path>\n\
\ Path of the input directory that contains the files to be packaged\n\
@@ -215,23 +215,23 @@
\Relative sub-path under the default installation location\n\
MSG_Help_mac_launcher=\
-\ --mac-bundle-identifier <ID string>\n\
+\ --mac-package-identifier <ID string>\n\
\ An identifier that uniquely identifies the application for macOS\n\
\ Defaults to the value of --identifier option.\n\
\ May only use alphanumeric (A-Z,a-z,0-9), hyphen (-),\n\
\ and period (.) characters.\n\
-\ --mac-bundle-name <name string>\n\
+\ --mac-package-name <name string>\n\
\ Name of the application as it appears in the Menu Bar\n\
\ This can be different from the application name.\n\
\ This name must be less than 16 characters long and be suitable for\n\
\ displaying in the menu bar and the application Info window.\n\
\ Defaults to the application name.\n\
-\ --mac-bundle-signing-prefix <prefix string>\n\
-\ When signing the application bundle, this value is prefixed to all\n\
-\ components that need to be signed that don't have\n\
-\ an existing bundle identifier.\n\
+\ --mac-package-signing-prefix <prefix string>\n\
+\ When signing the application package, this value is prefixed\n\
+\ to all components that need to be signed that don't have\n\
+\ an existing package identifier.\n\
\ --mac-sign\n\
-\ Request that the bundle be signed\n\
+\ Request that the package be signed\n\
\ --mac-signing-keychain <file path>\n\
\ Path of the keychain to search for the signing identity\n\
\ (absolute path or relative to the current directory).\n\
@@ -241,10 +241,10 @@
\ For example "Developer ID Application: "\n\
MSG_Help_linux_install=\
-\ --linux-bundle-name <bundle name>\n\
-\ Name for Linux bundle, defaults to the application name\n\
+\ --linux-package-name <package name>\n\
+\ Name for Linux package, defaults to the application name\n\
\ --linux-deb-maintainer <email address>\n\
-\ Maintainer for .deb bundle\n\
+\ Maintainer for .deb package\n\
\ --linux-deb-copyright-file <file path>\n\
\ Path to custom copyright file for Debian packaging\n\
\ (absolute path or relative to the current directory)\n\
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources.properties Tue Sep 10 14:57:03 2019 -0400
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources.properties Wed Sep 11 13:26:36 2019 -0400
@@ -32,53 +32,53 @@
message.no-default-resource=no default package resource {0} {1} (add {2} to the resource-dir to customize).
message.using-custom-resource-from-file=Using custom package resource {0} (loaded from file {1}).
message.using-custom-resource=Using custom package resource {0} (loaded from {1}).
-message.creating-app-bundle=Creating app bundle: {0} in {1}.
-message.app-image-dir-does-not-exist=Specified application image directory {0}: {1} does not exists.
-message.app-image-dir-does-not-exist.advice=Confirm that the value for {0} exists.
-message.runtime-image-dir-does-not-exist=Specified runtime image directory {0}: {1} does not exists.
-message.runtime-image-dir-does-not-exist.advice=Confirm that the value for {0} exists.
-message.debug-working-directory=Kept working directory for debug: {0}.
-message.bundle-created=Succeeded in building {0} bundle.
+message.creating-app-bundle=Creating app package: {0} in {1}
+message.app-image-dir-does-not-exist=Specified application image directory {0}: {1} does not exists
+message.app-image-dir-does-not-exist.advice=Confirm that the value for {0} exists
+message.runtime-image-dir-does-not-exist=Specified runtime image directory {0}: {1} does not exists
+message.runtime-image-dir-does-not-exist.advice=Confirm that the value for {0} exists
+message.debug-working-directory=Kept working directory for debug: {0}
+message.bundle-created=Succeeded in building {0} package
-error.cannot-create-output-dir=Output directory {0} cannot be created.
-error.cannot-write-to-output-dir=Output directory {0} is not writable.
-error.root-exists=Error: Application output directory {0} already exists.
-error.no-main-class-with-main-jar=A main class was not specified nor was one found in the jar {0}.
-error.no-main-class-with-main-jar.advice=Specify a main class or ensure that the jar {0} specifies one in the manifest.
-error.no-main-class=A main class was not specified nor was one found in the supplied application resources.
-error.no-main-class.advice=Please specify a application class or ensure that the appResources has a jar containing one in the manifest.
-error.main-jar-does-not-exist=The configured main jar does not exist {0} in the input directory.
-error.main-jar-does-not-exist.advice=The main jar must be specified relative to the input directory (not an absolute path), and must exist within that directory.
+error.cannot-create-output-dir=Output directory {0} cannot be created
+error.cannot-write-to-output-dir=Output directory {0} is not writable
+error.root-exists=Error: Application output directory {0} already exists
+error.no-main-class-with-main-jar=A main class was not specified nor was one found in the jar {0}
+error.no-main-class-with-main-jar.advice=Specify a main class or ensure that the jar {0} specifies one in the manifest
+error.no-main-class=A main class was not specified nor was one found in the supplied application resources
+error.no-main-class.advice=Please specify a application class or ensure that the appResources has a jar containing one in the manifest
+error.main-jar-does-not-exist=The configured main jar does not exist {0} in the input directory
+error.main-jar-does-not-exist.advice=The main jar must be specified relative to the input directory (not an absolute path), and must exist within that directory
-warning.module.does.not.exist=Module [{0}] does not exist.
-warning.no.jdk.modules.found=Warning: No JDK Modules found.
+warning.module.does.not.exist=Module [{0}] does not exist
+warning.no.jdk.modules.found=Warning: No JDK Modules found
-MSG_BundlerFailed=Error: Bundler "{1}" ({0}) failed to produce a bundle.
-MSG_BundlerConfigException=Bundler {0} skipped because of a configuration problem: {1}. \n\
+MSG_BundlerFailed=Error: Bundler "{1}" ({0}) failed to produce a package
+MSG_BundlerConfigException=Bundler {0} skipped because of a configuration problem: {1} \n\
Advice to fix: {2}
-MSG_BundlerConfigExceptionNoAdvice=Bundler {0} skipped because of a configuration problem: {1}.
-MSG_BundlerRuntimeException=Bundler {0} failed because of {1}.
-MSG_BundlerFailed=Error: Bundler "{1}" ({0}) failed to produce a bundle.
+MSG_BundlerConfigExceptionNoAdvice=Bundler {0} skipped because of a configuration problem: {1}
+MSG_BundlerRuntimeException=Bundler {0} failed because of {1}
+MSG_BundlerFailed=Error: Bundler "{1}" ({0}) failed to produce a package
-ERR_NoMainClass=Error: Main application class is missing.
-ERR_UnsupportedOption=Error: Option [{0}] is not valid on this platform.
-ERR_InvalidTypeOption=Error: Option [{0}] is not valid with package-type [{1}].
-ERR_NoInstallerEntryPoint=Error: Option [{0}] is not valid without --module or --main-jar entry point option.
+ERR_NoMainClass=Error: Main application class is missing
+ERR_UnsupportedOption=Error: Option [{0}] is not valid on this platform
+ERR_InvalidTypeOption=Error: Option [{0}] is not valid with package-type [{1}]
+ERR_NoInstallerEntryPoint=Error: Option [{0}] is not valid without --module or --main-jar entry point option
-ERR_MissingArgument=Error: Missing argument: {0}.
-ERR_MissingAppResources=Error: No application jars found.
-ERR_AppImageNotExist=Error: App image directory "{0}" does not exist.
-ERR_NoAddLauncherName=Error: --add-launcher option requires a name and a file path (--add-launcher <name>=<file path>).
-ERR_NoUniqueName=Error: --add-launcher <name>=<file path> requires a unique name.
-ERR_NoJreInstallerName=Error: Jre Installers require a name parameter.
-ERR_InvalidAppName=Error: Invalid Application name: {0}.
-ERR_InvalidSLName=Error: Invalid Add Launcher name: {0}.
-ERR_LicenseFileNotExit=Error: Specified license file does not exist.
-ERR_BuildRootInvalid=Error: temp-root ({0}) must be non-existant directory.
-ERR_InvalidOption=Error: Invalid Option: [{0}].
-ERR_InvalidInstallerType=Error: Invalid or unsupported package type: [{0}].
-ERR_BothMainJarAndModule=Error: Cannot have both --main-jar and --module Options.
-ERR_NoEntryPoint=Error: creating application image requires --main-jar or --module Option.
-ERR_InputNotDirectory=Error: Input directory specified is not a directory: {0}.
-ERR_CannotReadInputDir=Error: No permission to read from input directory: {0}.
-ERR_CannotParseOptions=Error: Processing @filename option: {0}.
+ERR_MissingArgument=Error: Missing argument: {0}
+ERR_MissingAppResources=Error: No application jars found
+ERR_AppImageNotExist=Error: App image directory "{0}" does not exist
+ERR_NoAddLauncherName=Error: --add-launcher option requires a name and a file path (--add-launcher <name>=<file path>)
+ERR_NoUniqueName=Error: --add-launcher <name>=<file path> requires a unique name
+ERR_NoJreInstallerName=Error: Jre Installers require a name parameter
+ERR_InvalidAppName=Error: Invalid Application name: {0}
+ERR_InvalidSLName=Error: Invalid Add Launcher name: {0}
+ERR_LicenseFileNotExit=Error: Specified license file does not exist
+ERR_BuildRootInvalid=Error: temp ({0}) must be non-existant or empty directory
+ERR_InvalidOption=Error: Invalid Option: [{0}]
+ERR_InvalidInstallerType=Error: Invalid or unsupported package type: [{0}]
+ERR_BothMainJarAndModule=Error: Cannot have both --main-jar and --module Options
+ERR_NoEntryPoint=Error: creating application image requires --main-jar or --module Option
+ERR_InputNotDirectory=Error: Input directory specified is not a directory: {0}
+ERR_CannotReadInputDir=Error: No permission to read from input directory: {0}
+ERR_CannotParseOptions=Error: Processing @filename option: {0}
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_ja.properties Tue Sep 10 14:57:03 2019 -0400
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_ja.properties Wed Sep 11 13:26:36 2019 -0400
@@ -32,53 +32,53 @@
message.no-default-resource=no default package resource {0} {1} (add {2} to the resource-dir to customize).
message.using-custom-resource-from-file=Using custom package resource {0} (loaded from file {1}).
message.using-custom-resource=Using custom package resource {0} (loaded from {1}).
-message.creating-app-bundle=Creating app bundle: {0} in {1}.
-message.app-image-dir-does-not-exist=Specified application image directory {0}: {1} does not exists.
-message.app-image-dir-does-not-exist.advice=Confirm that the value for {0} exists.
-message.runtime-image-dir-does-not-exist=Specified runtime image directory {0}: {1} does not exists.
-message.runtime-image-dir-does-not-exist.advice=Confirm that the value for {0} exists.
-message.debug-working-directory=Kept working directory for debug: {0}.
-message.bundle-created=Succeeded in building {0} bundle.
+message.creating-app-bundle=Creating app package: {0} in {1}
+message.app-image-dir-does-not-exist=Specified application image directory {0}: {1} does not exists
+message.app-image-dir-does-not-exist.advice=Confirm that the value for {0} exists
+message.runtime-image-dir-does-not-exist=Specified runtime image directory {0}: {1} does not exists
+message.runtime-image-dir-does-not-exist.advice=Confirm that the value for {0} exists
+message.debug-working-directory=Kept working directory for debug: {0}
+message.bundle-created=Succeeded in building {0} package
-error.cannot-create-output-dir=Output directory {0} cannot be created.
-error.cannot-write-to-output-dir=Output directory {0} is not writable.
-error.root-exists=Error: Application output directory {0} already exists.
-error.no-main-class-with-main-jar=A main class was not specified nor was one found in the jar {0}.
-error.no-main-class-with-main-jar.advice=Specify a main class or ensure that the jar {0} specifies one in the manifest.
-error.no-main-class=A main class was not specified nor was one found in the supplied application resources.
-error.no-main-class.advice=Please specify a application class or ensure that the appResources has a jar containing one in the manifest.
-error.main-jar-does-not-exist=The configured main jar does not exist {0} in the input directory.
-error.main-jar-does-not-exist.advice=The main jar must be specified relative to the input directory (not an absolute path), and must exist within that directory.
+error.cannot-create-output-dir=Output directory {0} cannot be created
+error.cannot-write-to-output-dir=Output directory {0} is not writable
+error.root-exists=Error: Application output directory {0} already exists
+error.no-main-class-with-main-jar=A main class was not specified nor was one found in the jar {0}
+error.no-main-class-with-main-jar.advice=Specify a main class or ensure that the jar {0} specifies one in the manifest
+error.no-main-class=A main class was not specified nor was one found in the supplied application resources
+error.no-main-class.advice=Please specify a application class or ensure that the appResources has a jar containing one in the manifest
+error.main-jar-does-not-exist=The configured main jar does not exist {0} in the input directory
+error.main-jar-does-not-exist.advice=The main jar must be specified relative to the input directory (not an absolute path), and must exist within that directory
-warning.module.does.not.exist=Module [{0}] does not exist.
-warning.no.jdk.modules.found=Warning: No JDK Modules found.
+warning.module.does.not.exist=Module [{0}] does not exist
+warning.no.jdk.modules.found=Warning: No JDK Modules found
-MSG_BundlerFailed=Error: Bundler "{1}" ({0}) failed to produce a bundle.
-MSG_BundlerConfigException=Bundler {0} skipped because of a configuration problem: {1}. \n\
+MSG_BundlerFailed=Error: Bundler "{1}" ({0}) failed to produce a package
+MSG_BundlerConfigException=Bundler {0} skipped because of a configuration problem: {1} \n\
Advice to fix: {2}
-MSG_BundlerConfigExceptionNoAdvice=Bundler {0} skipped because of a configuration problem: {1}.
-MSG_BundlerRuntimeException=Bundler {0} failed because of {1}.
-MSG_BundlerFailed=Error: Bundler "{1}" ({0}) failed to produce a bundle.
+MSG_BundlerConfigExceptionNoAdvice=Bundler {0} skipped because of a configuration problem: {1}
+MSG_BundlerRuntimeException=Bundler {0} failed because of {1}
+MSG_BundlerFailed=Error: Bundler "{1}" ({0}) failed to produce a package
-ERR_NoMainClass=Error: Main application class is missing.
-ERR_UnsupportedOption=Error: Option [{0}] is not valid on this platform.
-ERR_InvalidTypeOption=Error: Option [{0}] is not valid with package-type [{1}].
-ERR_NoInstallerEntryPoint=Error: Option [{0}] is not valid without --module or --main-jar entry point option.
+ERR_NoMainClass=Error: Main application class is missing
+ERR_UnsupportedOption=Error: Option [{0}] is not valid on this platform
+ERR_InvalidTypeOption=Error: Option [{0}] is not valid with package-type [{1}]
+ERR_NoInstallerEntryPoint=Error: Option [{0}] is not valid without --module or --main-jar entry point option
-ERR_MissingArgument=Error: Missing argument: {0}.
-ERR_MissingAppResources=Error: No application jars found.
-ERR_AppImageNotExist=Error: App image directory "{0}" does not exist.
-ERR_NoAddLauncherName=Error: --add-launcher option requires a name and a file path (--add-launcher <name>=<file path>).
-ERR_NoUniqueName=Error: --add-launcher <name>=<file path> requires a unique name.
-ERR_NoJreInstallerName=Error: Jre Installers require a name parameter.
-ERR_InvalidAppName=Error: Invalid Application name: {0}.
-ERR_InvalidSLName=Error: Invalid Add Launcher name: {0}.
-ERR_LicenseFileNotExit=Error: Specified license file does not exist.
-ERR_BuildRootInvalid=Error: temp-root ({0}) must be non-existant directory.
-ERR_InvalidOption=Error: Invalid Option: [{0}].
-ERR_InvalidInstallerType=Error: Invalid or unsupported package type: [{0}].
-ERR_BothMainJarAndModule=Error: Cannot have both --main-jar and --module Options.
-ERR_NoEntryPoint=Error: creating application image requires --main-jar or --module Option.
-ERR_InputNotDirectory=Error: Input directory specified is not a directory: {0}.
-ERR_CannotReadInputDir=Error: No permission to read from input directory: {0}.
-ERR_CannotParseOptions=Error: Processing @filename option: {0}.
+ERR_MissingArgument=Error: Missing argument: {0}
+ERR_MissingAppResources=Error: No application jars found
+ERR_AppImageNotExist=Error: App image directory "{0}" does not exist
+ERR_NoAddLauncherName=Error: --add-launcher option requires a name and a file path (--add-launcher <name>=<file path>)
+ERR_NoUniqueName=Error: --add-launcher <name>=<file path> requires a unique name
+ERR_NoJreInstallerName=Error: Jre Installers require a name parameter
+ERR_InvalidAppName=Error: Invalid Application name: {0}
+ERR_InvalidSLName=Error: Invalid Add Launcher name: {0}
+ERR_LicenseFileNotExit=Error: Specified license file does not exist
+ERR_BuildRootInvalid=Error: temp ({0}) must be non-existant or empty directory
+ERR_InvalidOption=Error: Invalid Option: [{0}]
+ERR_InvalidInstallerType=Error: Invalid or unsupported package type: [{0}]
+ERR_BothMainJarAndModule=Error: Cannot have both --main-jar and --module Options
+ERR_NoEntryPoint=Error: creating application image requires --main-jar or --module Option
+ERR_InputNotDirectory=Error: Input directory specified is not a directory: {0}
+ERR_CannotReadInputDir=Error: No permission to read from input directory: {0}
+ERR_CannotParseOptions=Error: Processing @filename option: {0}
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_zh_CN.properties Tue Sep 10 14:57:03 2019 -0400
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_zh_CN.properties Wed Sep 11 13:26:36 2019 -0400
@@ -32,53 +32,53 @@
message.no-default-resource=no default package resource {0} {1} (add {2} to the resource-dir to customize).
message.using-custom-resource-from-file=Using custom package resource {0} (loaded from file {1}).
message.using-custom-resource=Using custom package resource {0} (loaded from {1}).
-message.creating-app-bundle=Creating app bundle: {0} in {1}.
-message.app-image-dir-does-not-exist=Specified application image directory {0}: {1} does not exists.
-message.app-image-dir-does-not-exist.advice=Confirm that the value for {0} exists.
-message.runtime-image-dir-does-not-exist=Specified runtime image directory {0}: {1} does not exists.
-message.runtime-image-dir-does-not-exist.advice=Confirm that the value for {0} exists.
-message.debug-working-directory=Kept working directory for debug: {0}.
-message.bundle-created=Succeeded in building {0} bundle.
+message.creating-app-bundle=Creating app package: {0} in {1}
+message.app-image-dir-does-not-exist=Specified application image directory {0}: {1} does not exists
+message.app-image-dir-does-not-exist.advice=Confirm that the value for {0} exists
+message.runtime-image-dir-does-not-exist=Specified runtime image directory {0}: {1} does not exists
+message.runtime-image-dir-does-not-exist.advice=Confirm that the value for {0} exists
+message.debug-working-directory=Kept working directory for debug: {0}
+message.bundle-created=Succeeded in building {0} package
-error.cannot-create-output-dir=Output directory {0} cannot be created.
-error.cannot-write-to-output-dir=Output directory {0} is not writable.
-error.root-exists=Error: Application output directory {0} already exists.
-error.no-main-class-with-main-jar=A main class was not specified nor was one found in the jar {0}.
-error.no-main-class-with-main-jar.advice=Specify a main class or ensure that the jar {0} specifies one in the manifest.
-error.no-main-class=A main class was not specified nor was one found in the supplied application resources.
-error.no-main-class.advice=Please specify a application class or ensure that the appResources has a jar containing one in the manifest.
-error.main-jar-does-not-exist=The configured main jar does not exist {0} in the input directory.
-error.main-jar-does-not-exist.advice=The main jar must be specified relative to the input directory (not an absolute path), and must exist within that directory.
+error.cannot-create-output-dir=Output directory {0} cannot be created
+error.cannot-write-to-output-dir=Output directory {0} is not writable
+error.root-exists=Error: Application output directory {0} already exists
+error.no-main-class-with-main-jar=A main class was not specified nor was one found in the jar {0}
+error.no-main-class-with-main-jar.advice=Specify a main class or ensure that the jar {0} specifies one in the manifest
+error.no-main-class=A main class was not specified nor was one found in the supplied application resources
+error.no-main-class.advice=Please specify a application class or ensure that the appResources has a jar containing one in the manifest
+error.main-jar-does-not-exist=The configured main jar does not exist {0} in the input directory
+error.main-jar-does-not-exist.advice=The main jar must be specified relative to the input directory (not an absolute path), and must exist within that directory
-warning.module.does.not.exist=Module [{0}] does not exist.
-warning.no.jdk.modules.found=Warning: No JDK Modules found.
+warning.module.does.not.exist=Module [{0}] does not exist
+warning.no.jdk.modules.found=Warning: No JDK Modules found
-MSG_BundlerFailed=Error: Bundler "{1}" ({0}) failed to produce a bundle.
-MSG_BundlerConfigException=Bundler {0} skipped because of a configuration problem: {1}. \n\
+MSG_BundlerFailed=Error: Bundler "{1}" ({0}) failed to produce a package
+MSG_BundlerConfigException=Bundler {0} skipped because of a configuration problem: {1} \n\
Advice to fix: {2}
-MSG_BundlerConfigExceptionNoAdvice=Bundler {0} skipped because of a configuration problem: {1}.
-MSG_BundlerRuntimeException=Bundler {0} failed because of {1}.
-MSG_BundlerFailed=Error: Bundler "{1}" ({0}) failed to produce a bundle.
+MSG_BundlerConfigExceptionNoAdvice=Bundler {0} skipped because of a configuration problem: {1}
+MSG_BundlerRuntimeException=Bundler {0} failed because of {1}
+MSG_BundlerFailed=Error: Bundler "{1}" ({0}) failed to produce a package
-ERR_NoMainClass=Error: Main application class is missing.
-ERR_UnsupportedOption=Error: Option [{0}] is not valid on this platform.
-ERR_InvalidTypeOption=Error: Option [{0}] is not valid with package-type [{1}].
-ERR_NoInstallerEntryPoint=Error: Option [{0}] is not valid without --module or --main-jar entry point option.
+ERR_NoMainClass=Error: Main application class is missing
+ERR_UnsupportedOption=Error: Option [{0}] is not valid on this platform
+ERR_InvalidTypeOption=Error: Option [{0}] is not valid with package-type [{1}]
+ERR_NoInstallerEntryPoint=Error: Option [{0}] is not valid without --module or --main-jar entry point option
-ERR_MissingArgument=Error: Missing argument: {0}.
-ERR_MissingAppResources=Error: No application jars found.
-ERR_AppImageNotExist=Error: App image directory "{0}" does not exist.
-ERR_NoAddLauncherName=Error: --add-launcher option requires a name and a file path (--add-launcher <name>=<file path>).
-ERR_NoUniqueName=Error: --add-launcher <name>=<file path> requires a unique name.
-ERR_NoJreInstallerName=Error: Jre Installers require a name parameter.
-ERR_InvalidAppName=Error: Invalid Application name: {0}.
-ERR_InvalidSLName=Error: Invalid Add Launcher name: {0}.
-ERR_LicenseFileNotExit=Error: Specified license file does not exist.
-ERR_BuildRootInvalid=Error: temp-root ({0}) must be non-existant directory.
-ERR_InvalidOption=Error: Invalid Option: [{0}].
-ERR_InvalidInstallerType=Error: Invalid or unsupported package type: [{0}].
-ERR_BothMainJarAndModule=Error: Cannot have both --main-jar and --module Options.
-ERR_NoEntryPoint=Error: creating application image requires --main-jar or --module Option.
-ERR_InputNotDirectory=Error: Input directory specified is not a directory: {0}.
-ERR_CannotReadInputDir=Error: No permission to read from input directory: {0}.
-ERR_CannotParseOptions=Error: Processing @filename option: {0}.
+ERR_MissingArgument=Error: Missing argument: {0}
+ERR_MissingAppResources=Error: No application jars found
+ERR_AppImageNotExist=Error: App image directory "{0}" does not exist
+ERR_NoAddLauncherName=Error: --add-launcher option requires a name and a file path (--add-launcher <name>=<file path>)
+ERR_NoUniqueName=Error: --add-launcher <name>=<file path> requires a unique name
+ERR_NoJreInstallerName=Error: Jre Installers require a name parameter
+ERR_InvalidAppName=Error: Invalid Application name: {0}
+ERR_InvalidSLName=Error: Invalid Add Launcher name: {0}
+ERR_LicenseFileNotExit=Error: Specified license file does not exist
+ERR_BuildRootInvalid=Error: temp ({0}) must be non-existant or empty directory
+ERR_InvalidOption=Error: Invalid Option: [{0}]
+ERR_InvalidInstallerType=Error: Invalid or unsupported package type: [{0}]
+ERR_BothMainJarAndModule=Error: Cannot have both --main-jar and --module Options
+ERR_NoEntryPoint=Error: creating application image requires --main-jar or --module Option
+ERR_InputNotDirectory=Error: Input directory specified is not a directory: {0}
+ERR_CannotReadInputDir=Error: No permission to read from input directory: {0}
+ERR_CannotParseOptions=Error: Processing @filename option: {0}
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources.properties Tue Sep 10 14:57:03 2019 -0400
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources.properties Wed Sep 11 13:26:36 2019 -0400
@@ -25,8 +25,8 @@
#
app.bundler.name=Windows Application Image
-exe.bundler.name=EXE Installer Bundler
-msi.bundler.name=MSI Installer Bundler
+exe.bundler.name=EXE Installer Package
+msi.bundler.name=MSI Installer Package
param.menu-group.default=Unknown
@@ -35,24 +35,24 @@
resource.post-install-script=script to run after application image is populated
resource.wxl-file-name=MsiInstallerStrings_en.wxl
-error.parameters-null=Parameters map is null.
-error.parameters-null.advice=Pass in a non-null parameters map.
-error.no-windows-resources=This copy of the JDK does not support Windows.
-error.no-windows-resources.advice=Please use the Oracle JDK for Windows.
-error.cannot-find-launcher=Cannot find cfg file in predefined app image directory {0}.
-error.copyright-is-too-long=The copyright string is too long for InnoSetup.
+error.parameters-null=Parameters map is null
+error.parameters-null.advice=Pass in a non-null parameters map
+error.no-windows-resources=This copy of the JDK does not support Windows
+error.no-windows-resources.advice=Please use the Oracle JDK for Windows
+error.cannot-find-launcher=Cannot find cfg file in predefined app image directory {0}
+error.copyright-is-too-long=The copyright string is too long for InnoSetup
error.copyright-is-too-long.advice=Provide a copyright string shorter than 100 characters.
-error.no-wix-tools=Can not find WiX tools (light.exe, candle.exe).
+error.no-wix-tools=Can not find WiX tools (light.exe, candle.exe)
error.no-wix-tools.advice=Download WiX 3.0 or later from http://wix.sf.net and add it to the PATH.
-error.version-string-wrong-format=Version string is not compatible with MSI rules [{0}].
+error.version-string-wrong-format=Version string is not compatible with MSI rules [{0}]
error.version-string-wrong-format.advice=Set the bundler argument "{0}" according to these rules: http://msdn.microsoft.com/en-us/library/aa370859%28v\=VS.85%29.aspx .
-error.version-string-major-out-of-range=Major version must be in the range [0, 255].
-error.version-string-build-out-of-range=Build part of version must be in the range [0, 65535].
-error.version-string-minor-out-of-range=Minor version must be in the range [0, 255].
-error.version-string-part-not-number=Failed to convert version component to int.
-error.cannot-walk-directory=Can not walk [{0}] - it is not a valid directory.
-error.version-swap=Failed to update version information for {0}.
-error.version-compare=Error: Failed to compare version {0} with {1}.
+error.version-string-major-out-of-range=Major version must be in the range [0, 255]
+error.version-string-build-out-of-range=Build part of version must be in the range [0, 65535]
+error.version-string-minor-out-of-range=Minor version must be in the range [0, 255]
+error.version-string-part-not-number=Failed to convert version component to int
+error.cannot-walk-directory=Can not walk [{0}] - it is not a valid directory
+error.version-swap=Failed to update version information for {0}
+error.version-compare=Error: Failed to compare version {0} with {1.
message.result-dir=Result application bundle: {0}.
message.icon-not-ico=The specified icon "{0}" is not an ICO file and will not be used. The default icon will be used in it's place.
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_ja.properties Tue Sep 10 14:57:03 2019 -0400
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_ja.properties Wed Sep 11 13:26:36 2019 -0400
@@ -25,8 +25,8 @@
#
app.bundler.name=Windows Application Image
-exe.bundler.name=EXE Installer Bundler
-msi.bundler.name=MSI Installer Bundler
+exe.bundler.name=EXE Installer Package
+msi.bundler.name=MSI Installer Package
param.menu-group.default=Unknown
@@ -35,24 +35,24 @@
resource.post-install-script=script to run after application image is populated
resource.wxl-file-name=MsiInstallerStrings_en.wxl
-error.parameters-null=Parameters map is null.
-error.parameters-null.advice=Pass in a non-null parameters map.
-error.no-windows-resources=This copy of the JDK does not support Windows.
-error.no-windows-resources.advice=Please use the Oracle JDK for Windows.
-error.cannot-find-launcher=Cannot find cfg file in predefined app image directory {0}.
-error.copyright-is-too-long=The copyright string is too long for InnoSetup.
+error.parameters-null=Parameters map is null
+error.parameters-null.advice=Pass in a non-null parameters map
+error.no-windows-resources=This copy of the JDK does not support Windows
+error.no-windows-resources.advice=Please use the Oracle JDK for Windows
+error.cannot-find-launcher=Cannot find cfg file in predefined app image directory {0}
+error.copyright-is-too-long=The copyright string is too long for InnoSetup
error.copyright-is-too-long.advice=Provide a copyright string shorter than 100 characters.
-error.no-wix-tools=Can not find WiX tools (light.exe, candle.exe).
+error.no-wix-tools=Can not find WiX tools (light.exe, candle.exe)
error.no-wix-tools.advice=Download WiX 3.0 or later from http://wix.sf.net and add it to the PATH.
-error.version-string-wrong-format=Version string is not compatible with MSI rules [{0}].
+error.version-string-wrong-format=Version string is not compatible with MSI rules [{0}]
error.version-string-wrong-format.advice=Set the bundler argument "{0}" according to these rules: http://msdn.microsoft.com/en-us/library/aa370859%28v\=VS.85%29.aspx .
-error.version-string-major-out-of-range=Major version must be in the range [0, 255].
-error.version-string-build-out-of-range=Build part of version must be in the range [0, 65535].
-error.version-string-minor-out-of-range=Minor version must be in the range [0, 255].
-error.version-string-part-not-number=Failed to convert version component to int.
-error.cannot-walk-directory=Can not walk [{0}] - it is not a valid directory.
-error.version-swap=Failed to update version information for {0}.
-error.version-compare=Error: Failed to compare version {0} with {1}.
+error.version-string-major-out-of-range=Major version must be in the range [0, 255]
+error.version-string-build-out-of-range=Build part of version must be in the range [0, 65535]
+error.version-string-minor-out-of-range=Minor version must be in the range [0, 255]
+error.version-string-part-not-number=Failed to convert version component to int
+error.cannot-walk-directory=Can not walk [{0}] - it is not a valid directory
+error.version-swap=Failed to update version information for {0}
+error.version-compare=Error: Failed to compare version {0} with {1.
message.result-dir=Result application bundle: {0}.
message.icon-not-ico=The specified icon "{0}" is not an ICO file and will not be used. The default icon will be used in it's place.
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_zh_CN.properties Tue Sep 10 14:57:03 2019 -0400
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_zh_CN.properties Wed Sep 11 13:26:36 2019 -0400
@@ -25,8 +25,8 @@
#
app.bundler.name=Windows Application Image
-exe.bundler.name=EXE Installer Bundler
-msi.bundler.name=MSI Installer Bundler
+exe.bundler.name=EXE Installer Package
+msi.bundler.name=MSI Installer Package
param.menu-group.default=Unknown
@@ -35,24 +35,24 @@
resource.post-install-script=script to run after application image is populated
resource.wxl-file-name=MsiInstallerStrings_en.wxl
-error.parameters-null=Parameters map is null.
-error.parameters-null.advice=Pass in a non-null parameters map.
-error.no-windows-resources=This copy of the JDK does not support Windows.
-error.no-windows-resources.advice=Please use the Oracle JDK for Windows.
-error.cannot-find-launcher=Cannot find cfg file in predefined app image directory {0}.
-error.copyright-is-too-long=The copyright string is too long for InnoSetup.
+error.parameters-null=Parameters map is null
+error.parameters-null.advice=Pass in a non-null parameters map
+error.no-windows-resources=This copy of the JDK does not support Windows
+error.no-windows-resources.advice=Please use the Oracle JDK for Windows
+error.cannot-find-launcher=Cannot find cfg file in predefined app image directory {0}
+error.copyright-is-too-long=The copyright string is too long for InnoSetup
error.copyright-is-too-long.advice=Provide a copyright string shorter than 100 characters.
-error.no-wix-tools=Can not find WiX tools (light.exe, candle.exe).
+error.no-wix-tools=Can not find WiX tools (light.exe, candle.exe)
error.no-wix-tools.advice=Download WiX 3.0 or later from http://wix.sf.net and add it to the PATH.
-error.version-string-wrong-format=Version string is not compatible with MSI rules [{0}].
+error.version-string-wrong-format=Version string is not compatible with MSI rules [{0}]
error.version-string-wrong-format.advice=Set the bundler argument "{0}" according to these rules: http://msdn.microsoft.com/en-us/library/aa370859%28v\=VS.85%29.aspx .
-error.version-string-major-out-of-range=Major version must be in the range [0, 255].
-error.version-string-build-out-of-range=Build part of version must be in the range [0, 65535].
-error.version-string-minor-out-of-range=Minor version must be in the range [0, 255].
-error.version-string-part-not-number=Failed to convert version component to int.
-error.cannot-walk-directory=Can not walk [{0}] - it is not a valid directory.
-error.version-swap=Failed to update version information for {0}.
-error.version-compare=Error: Failed to compare version {0} with {1}.
+error.version-string-major-out-of-range=Major version must be in the range [0, 255]
+error.version-string-build-out-of-range=Build part of version must be in the range [0, 65535]
+error.version-string-minor-out-of-range=Minor version must be in the range [0, 255]
+error.version-string-part-not-number=Failed to convert version component to int
+error.cannot-walk-directory=Can not walk [{0}] - it is not a valid directory
+error.version-swap=Failed to update version information for {0}
+error.version-compare=Error: Failed to compare version {0} with {1.
message.result-dir=Result application bundle: {0}.
message.icon-not-ico=The specified icon "{0}" is not an ICO file and will not be used. The default icon will be used in it's place.
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/HelloApp.java Tue Sep 10 14:57:03 2019 -0400
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/HelloApp.java Wed Sep 11 13:26:36 2019 -0400
@@ -49,7 +49,6 @@
cmd.addArguments("--main-class", mainClass);
}
});
-
if (PackageType.WINDOWS.contains(cmd.packageType())) {
cmd.addArguments("--win-console");
}
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java Tue Sep 10 14:57:03 2019 -0400
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java Wed Sep 11 13:26:36 2019 -0400
@@ -133,8 +133,7 @@
public PackageType packageType() {
return getArgumentValue("--package-type",
() -> PackageType.DEFAULT,
- (v) -> ("app-image".equals(v)) ? PackageType.IMAGE :
- PACKAGE_TYPES.get(v));
+ (v) -> PACKAGE_TYPES.get(v));
}
public Path outputDir() {
@@ -173,8 +172,8 @@
public static JPackageCommand helloAppImage() {
JPackageCommand cmd = new JPackageCommand();
cmd.setDefaultInputOutput().setDefaultAppName();
+ PackageType.IMAGE.applyTo(cmd);
HelloApp.addTo(cmd);
- (PackageType.IMAGE).applyTo(cmd);
return cmd;
}
@@ -359,7 +358,7 @@
@Override
public Map<String, PackageType> get() {
Map<String, PackageType> reply = new HashMap<>();
- for (PackageType type : PackageType.NATIVE) {
+ for (PackageType type : PackageType.values()) {
reply.put(type.getName(), type);
}
return reply;
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LinuxHelper.java Tue Sep 10 14:57:03 2019 -0400
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LinuxHelper.java Wed Sep 11 13:26:36 2019 -0400
@@ -34,7 +34,7 @@
public static String getPackageName(JPackageCommand cmd) {
cmd.verifyIsOfType(PackageType.LINUX);
- return cmd.getArgumentValue("--linux-bundle-name",
+ return cmd.getArgumentValue("--linux-package-name",
() -> cmd.name().toLowerCase());
}
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacHelper.java Tue Sep 10 14:57:03 2019 -0400
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacHelper.java Wed Sep 11 13:26:36 2019 -0400
@@ -40,7 +40,7 @@
}
private static String getPackageName(JPackageCommand cmd) {
- return cmd.getArgumentValue("--mac-bundle-name",
+ return cmd.getArgumentValue("--mac-package-name",
() -> cmd.name().toLowerCase());
}
}
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageType.java Tue Sep 10 14:57:03 2019 -0400
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageType.java Wed Sep 11 13:26:36 2019 -0400
@@ -24,8 +24,11 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
import java.util.Optional;
import java.util.Set;
+import java.util.function.Supplier;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -43,11 +46,10 @@
Test.isLinux() ? "jdk.jpackage.internal.LinuxRpmBundler" : null),
MAC_DMG(".dmg", Test.isOSX() ? "jdk.jpackage.internal.MacDmgBundler" : null),
MAC_PKG(".pkg", Test.isOSX() ? "jdk.jpackage.internal.MacPkgBundler" : null),
- DEFAULT(null, null),
+ IMAGE("app-image", null, null);
- IMAGE(null, null);
-
- PackageType(String bundleSuffix, String bundlerClass) {
+ PackageType(String packageName, String bundleSuffix, String bundlerClass) {
+ name = packageName;
suffix = bundleSuffix;
if (bundlerClass != null && !Inner.DISABLED_PACKAGERS.contains(getName())) {
supported = isBundlerSupported(bundlerClass);
@@ -59,6 +61,10 @@
Test.trace(String.format("Bundler %s supported", getName()));
}
}
+
+ PackageType(String bundleSuffix, String bundlerClass) {
+ this(bundleSuffix.substring(1), bundleSuffix, bundlerClass);
+ }
void applyTo(JPackageCommand cmd) {
cmd.addArguments("--package-type", getName());
@@ -73,10 +79,7 @@
}
String getName() {
- if (suffix == null) {
- return "app-image";
- }
- return suffix.substring(1);
+ return name;
}
static PackageType fromSuffix(String packageFilename) {
@@ -105,6 +108,7 @@
}
}
+ private String name;
private final String suffix;
private final boolean supported;
@@ -114,9 +118,25 @@
public final static Set<PackageType> NATIVE = Stream.concat(
Stream.concat(LINUX.stream(), WINDOWS.stream()),
MAC.stream()).collect(Collectors.toUnmodifiableSet());
-
+
+ public final static PackageType DEFAULT = ((Supplier<PackageType>) () -> {
+ if (Test.isLinux()) {
+ return LINUX.stream().filter(v -> v.isSupported()).findFirst().orElseThrow();
+ }
+
+ if (Test.isWindows()) {
+ return WIN_EXE;
+ }
+
+ if (Test.isOSX()) {
+ return MAC_DMG;
+ }
+
+ throw new IllegalStateException("Unknwon platform");
+ }).get();
+
private final static class Inner {
-
+
private final static Set<String> DISABLED_PACKAGERS = Stream.of(
Optional.ofNullable(
System.getProperty("jpackage.test.disabledPackagers")).orElse(
--- a/test/jdk/tools/jpackage/linux/BundleNameTest.java Tue Sep 10 14:57:03 2019 -0400
+++ b/test/jdk/tools/jpackage/linux/BundleNameTest.java Wed Sep 11 13:26:36 2019 -0400
@@ -26,7 +26,7 @@
/**
- * Test --linux-bundle-name parameter. Output of the test should be
+ * Test --linux-package-name parameter. Output of the test should be
* quickbrownfox2_1.0-1_amd64.deb or quickbrownfox2-1.0-1.amd64.rpm package
* bundle. The output package should provide the same functionality as the
* default package.
@@ -41,7 +41,7 @@
/*
* @test
- * @summary jpackage with --linux-bundle-name
+ * @summary jpackage with --linux-package-name
* @library ../helpers
* @requires (os.family == "linux")
* @modules jdk.jpackage/jdk.jpackage.internal
@@ -56,7 +56,7 @@
.forTypes(PackageType.LINUX)
.configureHelloApp()
.addInitializer(cmd -> {
- cmd.addArguments("--linux-bundle-name", PACKAGE_NAME);
+ cmd.addArguments("--linux-package-name", PACKAGE_NAME);
})
.forTypes(PackageType.LINUX_DEB)
.addBundlePropertyVerifier("Package", PACKAGE_NAME)
--- a/test/jdk/tools/jpackage/macosx/BundleIdentifierTest.java Tue Sep 10 14:57:03 2019 -0400
+++ b/test/jdk/tools/jpackage/macosx/BundleIdentifierTest.java Wed Sep 11 13:26:36 2019 -0400
@@ -44,7 +44,7 @@
private static final String OUTPUT = "output";
private static final String app = JPackagePath.getApp();
private static final String appOutput = JPackagePath.getAppOutputFile();
- private static final String MAC_BUNDLE_IDENTIFIER = "TestBundleIdentifier";
+ private static final String MAC_PACKAGE_IDENTIFIER = "TestBundleIdentifier";
private static final String APP_NAME = "test";
private static final String MAIN_CLASS = "Hello";
@@ -64,7 +64,7 @@
"--name", APP_NAME,
"--main-jar", "hello.jar",
"--main-class", MAIN_CLASS,
- "--mac-bundle-identifier", MAC_BUNDLE_IDENTIFIER
+ "--mac-package-identifier", MAC_PACKAGE_IDENTIFIER
};
private static void validateResult(String[] result) throws Exception {
@@ -151,8 +151,8 @@
JPackageHelper.deleteOutputFolder(OUTPUT);
testCreateAppImageToolProvider(CMD_1, MAIN_CLASS, false);
JPackageHelper.deleteOutputFolder(OUTPUT);
- testCreateAppImage(CMD_2, MAC_BUNDLE_IDENTIFIER, true);
+ testCreateAppImage(CMD_2, MAC_PACKAGE_IDENTIFIER, true);
JPackageHelper.deleteOutputFolder(OUTPUT);
- testCreateAppImageToolProvider(CMD_2, MAC_BUNDLE_IDENTIFIER, true);
+ testCreateAppImageToolProvider(CMD_2, MAC_PACKAGE_IDENTIFIER, true);
}
}
--- a/test/jdk/tools/jpackage/macosx/BundleNameTest.java Tue Sep 10 14:57:03 2019 -0400
+++ b/test/jdk/tools/jpackage/macosx/BundleNameTest.java Wed Sep 11 13:26:36 2019 -0400
@@ -63,7 +63,7 @@
"--name", APP_NAME,
"--main-jar", "hello.jar",
"--main-class", "Hello",
- "--mac-bundle-name", MAC_BUNDLE_NAME
+ "--mac-package-name", MAC_BUNDLE_NAME
};
private static void validateResult(String[] result) throws Exception {
--- a/test/jdk/tools/jpackage/macosx/base/OptionsBase.java Tue Sep 10 14:57:03 2019 -0400
+++ b/test/jdk/tools/jpackage/macosx/base/OptionsBase.java Wed Sep 11 13:26:36 2019 -0400
@@ -155,8 +155,8 @@
"--name", TEST_NAME,
"--main-jar", "hello.jar",
"--main-class", "Hello",
- "--mac-bundle-name", TEST_BUNDLE_NAME,
- "--mac-bundle-identifier", TEST_BUNDLE_IDENTIFIER,
+ "--mac-package-name", TEST_BUNDLE_NAME,
+ "--mac-package-identifier", TEST_BUNDLE_IDENTIFIER,
"--mac-app-store-category", TEST_CATECORY
};
}
--- a/test/jdk/tools/jpackage/share/HelpTest.java Tue Sep 10 14:57:03 2019 -0400
+++ b/test/jdk/tools/jpackage/share/HelpTest.java Wed Sep 11 13:26:36 2019 -0400
@@ -36,9 +36,9 @@
private static final String WINDOWS_HELP =
"--win-dir-chooser";
private static final String OSX_HELP =
- "--mac-bundle-identifier";
+ "--mac-package-identifier";
private static final String LINUX_HELP =
- "--linux-bundle-name";
+ "--linux-package-name";
private static void validate(String output1, String output2)
throws Exception {
--- a/test/jdk/tools/jpackage/share/TempRootTest.java Tue Sep 10 14:57:03 2019 -0400
+++ b/test/jdk/tools/jpackage/share/TempRootTest.java Wed Sep 11 13:26:36 2019 -0400
@@ -26,7 +26,7 @@
/*
* @test
* @requires (os.family == "windows")
- * @summary jpackage create image to test --temp-root
+ * @summary jpackage create image to test --temp
* @library ../helpers
* @build JPackageHelper
* @build JPackagePath
@@ -55,7 +55,7 @@
"--name", "test",
"--main-jar", "hello.jar",
"--main-class", "Hello",
- "--temp-root", "TBD"};
+ "--temp", "TBD"};
private static void validate(boolean retain) throws Exception {
File br = new File(buildRoot);