--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppBundler.java Wed Nov 06 07:20:07 2019 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,298 +0,0 @@
-/*
- * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.jpackage.internal;
-
-import java.io.File;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.text.MessageFormat;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-import java.util.ResourceBundle;
-
-import static jdk.jpackage.internal.StandardBundlerParam.*;
-import static jdk.jpackage.internal.MacBaseInstallerBundler.*;
-
-public class MacAppBundler extends AbstractImageBundler {
-
- private static final ResourceBundle I18N = ResourceBundle.getBundle(
- "jdk.jpackage.internal.resources.MacResources");
-
- private static final String TEMPLATE_BUNDLE_ICON = "java.icns";
-
- public static final BundlerParamInfo<String> MAC_CF_BUNDLE_NAME =
- new StandardBundlerParam<>(
- Arguments.CLIOptions.MAC_BUNDLE_NAME.getId(),
- String.class,
- params -> null,
- (s, p) -> s);
-
- public static final BundlerParamInfo<String> MAC_CF_BUNDLE_VERSION =
- new StandardBundlerParam<>(
- "mac.CFBundleVersion",
- String.class,
- p -> {
- String s = VERSION.fetchFrom(p);
- if (validCFBundleVersion(s)) {
- return s;
- } else {
- return "100";
- }
- },
- (s, p) -> s);
-
- public static final BundlerParamInfo<String> DEFAULT_ICNS_ICON =
- new StandardBundlerParam<>(
- ".mac.default.icns",
- String.class,
- params -> TEMPLATE_BUNDLE_ICON,
- (s, p) -> s);
-
- public static final BundlerParamInfo<String> DEVELOPER_ID_APP_SIGNING_KEY =
- new StandardBundlerParam<>(
- "mac.signing-key-developer-id-app",
- String.class,
- params -> {
- String result = MacBaseInstallerBundler.findKey(
- "Developer ID Application: "
- + SIGNING_KEY_USER.fetchFrom(params),
- SIGNING_KEYCHAIN.fetchFrom(params),
- VERBOSE.fetchFrom(params));
- if (result != null) {
- MacCertificate certificate = new MacCertificate(result);
-
- if (!certificate.isValid()) {
- Log.error(MessageFormat.format(I18N.getString(
- "error.certificate.expired"), result));
- }
- }
-
- return result;
- },
- (s, p) -> s);
-
- public static final BundlerParamInfo<String> BUNDLE_ID_SIGNING_PREFIX =
- new StandardBundlerParam<>(
- Arguments.CLIOptions.MAC_BUNDLE_SIGNING_PREFIX.getId(),
- String.class,
- params -> IDENTIFIER.fetchFrom(params) + ".",
- (s, p) -> s);
-
- public static final BundlerParamInfo<File> ICON_ICNS =
- new StandardBundlerParam<>(
- "icon.icns",
- File.class,
- params -> {
- File f = ICON.fetchFrom(params);
- if (f != null && !f.getName().toLowerCase().endsWith(".icns")) {
- Log.error(MessageFormat.format(
- I18N.getString("message.icon-not-icns"), f));
- return null;
- }
- return f;
- },
- (s, p) -> new File(s));
-
- public static boolean validCFBundleVersion(String v) {
- // CFBundleVersion (String - iOS, OS X) specifies the build version
- // number of the bundle, which identifies an iteration (released or
- // unreleased) of the bundle. The build version number should be a
- // string comprised of three non-negative, period-separated integers
- // with the first integer being greater than zero. The string should
- // only contain numeric (0-9) and period (.) characters. Leading zeros
- // are truncated from each integer and will be ignored (that is,
- // 1.02.3 is equivalent to 1.2.3). This key is not localizable.
-
- if (v == null) {
- return false;
- }
-
- String p[] = v.split("\\.");
- if (p.length > 3 || p.length < 1) {
- Log.verbose(I18N.getString(
- "message.version-string-too-many-components"));
- return false;
- }
-
- try {
- BigInteger n = new BigInteger(p[0]);
- if (BigInteger.ONE.compareTo(n) > 0) {
- Log.verbose(I18N.getString(
- "message.version-string-first-number-not-zero"));
- return false;
- }
- if (p.length > 1) {
- n = new BigInteger(p[1]);
- if (BigInteger.ZERO.compareTo(n) > 0) {
- Log.verbose(I18N.getString(
- "message.version-string-no-negative-numbers"));
- return false;
- }
- }
- if (p.length > 2) {
- n = new BigInteger(p[2]);
- if (BigInteger.ZERO.compareTo(n) > 0) {
- Log.verbose(I18N.getString(
- "message.version-string-no-negative-numbers"));
- return false;
- }
- }
- } catch (NumberFormatException ne) {
- Log.verbose(I18N.getString("message.version-string-numbers-only"));
- Log.verbose(ne);
- return false;
- }
-
- return true;
- }
-
- @Override
- public boolean validate(Map<String, ? super Object> params)
- throws ConfigException {
- try {
- return doValidate(params);
- } catch (RuntimeException re) {
- if (re.getCause() instanceof ConfigException) {
- throw (ConfigException) re.getCause();
- } else {
- throw new ConfigException(re);
- }
- }
- }
-
- private boolean doValidate(Map<String, ? super Object> params)
- throws ConfigException {
-
- imageBundleValidation(params);
-
- if (StandardBundlerParam.getPredefinedAppImage(params) != null) {
- return true;
- }
-
- // validate short version
- if (!validCFBundleVersion(MAC_CF_BUNDLE_VERSION.fetchFrom(params))) {
- throw new ConfigException(
- I18N.getString("error.invalid-cfbundle-version"),
- I18N.getString("error.invalid-cfbundle-version.advice"));
- }
-
- // reject explicitly set sign to true and no valid signature key
- if (Optional.ofNullable(MacAppImageBuilder.
- SIGN_BUNDLE.fetchFrom(params)).orElse(Boolean.FALSE)) {
- String signingIdentity =
- DEVELOPER_ID_APP_SIGNING_KEY.fetchFrom(params);
- if (signingIdentity == null) {
- throw new ConfigException(
- I18N.getString("error.explicit-sign-no-cert"),
- I18N.getString("error.explicit-sign-no-cert.advice"));
- }
-
- // Signing will not work without Xcode with command line developer tools
- try {
- ProcessBuilder pb = new ProcessBuilder("xcrun", "--help");
- Process p = pb.start();
- int code = p.waitFor();
- if (code != 0) {
- throw new ConfigException(
- I18N.getString("error.no.xcode.signing"),
- I18N.getString("error.no.xcode.signing.advice"));
- }
- } catch (IOException | InterruptedException ex) {
- throw new ConfigException(ex);
- }
- }
-
- return true;
- }
-
- File doBundle(Map<String, ? super Object> params, File outputDirectory,
- boolean dependentTask) throws PackagerException {
- if (StandardBundlerParam.isRuntimeInstaller(params)) {
- return PREDEFINED_RUNTIME_IMAGE.fetchFrom(params);
- } else {
- return doAppBundle(params, outputDirectory, dependentTask);
- }
- }
-
- File doAppBundle(Map<String, ? super Object> params, File outputDirectory,
- boolean dependentTask) throws PackagerException {
- try {
- File rootDirectory = createRoot(params, outputDirectory,
- dependentTask, APP_NAME.fetchFrom(params) + ".app");
- AbstractAppImageBuilder appBuilder =
- new MacAppImageBuilder(params, outputDirectory.toPath());
- if (PREDEFINED_RUNTIME_IMAGE.fetchFrom(params) == null ) {
- JLinkBundlerHelper.execute(params, appBuilder);
- } else {
- StandardBundlerParam.copyPredefinedRuntimeImage(
- params, appBuilder);
- }
- return rootDirectory;
- } catch (PackagerException pe) {
- throw pe;
- } catch (Exception ex) {
- Log.verbose(ex);
- throw new PackagerException(ex);
- }
- }
-
- /////////////////////////////////////////////////////////////////////////
- // Implement Bundler
- /////////////////////////////////////////////////////////////////////////
-
- @Override
- public String getName() {
- return I18N.getString("app.bundler.name");
- }
-
- @Override
- public String getID() {
- return "mac.app";
- }
-
- @Override
- public String getBundleType() {
- return "IMAGE";
- }
-
- @Override
- public File execute(Map<String, ? super Object> params,
- File outputParentDir) throws PackagerException {
- return doBundle(params, outputParentDir, false);
- }
-
- @Override
- public boolean supported(boolean runtimeInstaller) {
- return true;
- }
-
- @Override
- public boolean isDefault() {
- return false;
- }
-
-}