--- old/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractImageBundler.java 2019-11-18 21:46:08.892225300 -0500 +++ /dev/null 2019-11-18 21:46:10.000000000 -0500 @@ -1,144 +0,0 @@ -/* - * Copyright (c) 2015, 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.text.MessageFormat; -import java.util.Map; -import java.util.ResourceBundle; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.io.File; -import java.io.IOException; - -import static jdk.jpackage.internal.StandardBundlerParam.*; - -/** - * AbstractImageBundler - * - * This is the base class for each of the Application Image Bundlers. - * - * It contains methods and parameters common to all Image Bundlers. - * - * Application Image Bundlers are created in "create-app-image" mode, - * or as an intermeadiate step in "create-installer" mode. - * - * The concrete implementations are in the platform specific Bundlers. - */ -public abstract class AbstractImageBundler extends AbstractBundler { - - private final static String JAVA_VERSION_SPEC = - "java version \"((\\d+).(\\d+).(\\d+).(\\d+))(-(.*))?(\\+[^\"]*)?\""; - - private static final ResourceBundle I18N = ResourceBundle.getBundle( - "jdk.jpackage.internal.resources.MainResources"); - - public void imageBundleValidation(Map p) - throws ConfigException { - StandardBundlerParam.validateMainClassInfoFromAppResources(p); - - } - - public static void extractFlagsFromVersion( - Map params, String versionOutput) { - Pattern bitArchPattern = Pattern.compile("(\\d*)[- ]?[bB]it"); - Matcher matcher = bitArchPattern.matcher(versionOutput); - if (matcher.find()) { - params.put(".runtime.bit-arch", matcher.group(1)); - } else { - // presume 32 bit on no match - params.put(".runtime.bit-arch", "32"); - } - - Pattern oldVersionMatcher = Pattern.compile( - "java version \"((\\d+.(\\d+).\\d+)(_(\\d+)))?(-(.*))?\""); - matcher = oldVersionMatcher.matcher(versionOutput); - if (matcher.find()) { - params.put(".runtime.version", matcher.group(1)); - params.put(".runtime.version.release", matcher.group(2)); - params.put(".runtime.version.major", matcher.group(3)); - params.put(".runtime.version.update", matcher.group(5)); - params.put(".runtime.version.minor", matcher.group(5)); - params.put(".runtime.version.security", matcher.group(5)); - params.put(".runtime.version.patch", "0"); - params.put(".runtime.version.modifiers", matcher.group(7)); - } else { - Pattern newVersionMatcher = Pattern.compile(JAVA_VERSION_SPEC); - matcher = newVersionMatcher.matcher(versionOutput); - if (matcher.find()) { - params.put(".runtime.version", matcher.group(1)); - params.put(".runtime.version.release", matcher.group(1)); - params.put(".runtime.version.major", matcher.group(2)); - params.put(".runtime.version.update", matcher.group(3)); - params.put(".runtime.version.minor", matcher.group(3)); - params.put(".runtime.version.security", matcher.group(4)); - params.put(".runtime.version.patch", matcher.group(5)); - params.put(".runtime.version.modifiers", matcher.group(7)); - } else { - params.put(".runtime.version", ""); - params.put(".runtime.version.release", ""); - params.put(".runtime.version.major", ""); - params.put(".runtime.version.update", ""); - params.put(".runtime.version.minor", ""); - params.put(".runtime.version.security", ""); - params.put(".runtime.version.patch", ""); - params.put(".runtime.version.modifiers", ""); - } - } - } - - protected File createRoot(Map p, - File outputDirectory, boolean dependentTask, String name) - throws PackagerException { - if (!outputDirectory.isDirectory() && !outputDirectory.mkdirs()) { - throw new RuntimeException(MessageFormat.format( - I18N.getString("error.cannot-create-output-dir"), - outputDirectory.getAbsolutePath())); - } - if (!outputDirectory.canWrite()) { - throw new RuntimeException(MessageFormat.format( - I18N.getString("error.cannot-write-to-output-dir"), - outputDirectory.getAbsolutePath())); - } - if (!dependentTask) { - Log.verbose(MessageFormat.format( - I18N.getString("message.creating-app-bundle"), - name, outputDirectory.getAbsolutePath())); - } - - // Create directory structure - File rootDirectory = new File(outputDirectory, name); - - if (rootDirectory.exists()) { - throw new PackagerException("error.root-exists", - rootDirectory.getAbsolutePath()); - } - - rootDirectory.mkdirs(); - - return rootDirectory; - } - -}