8212625: Remove --echo-mode and related code
Submitten-by: almatvee
Reviewed-by: herrick
--- a/src/jdk.packager/linux/classes/jdk/packager/internal/linux/LinuxDebBundler.java Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/linux/classes/jdk/packager/internal/linux/LinuxDebBundler.java Thu Oct 18 21:04:15 2018 -0400
@@ -322,7 +322,7 @@
throw new ConfigException(
MessageFormat.format(I18N.getString(msgKey), i),
I18N.getString(msgKey + ".advise"));
-
+
} else if (mimes.size() > 1) {
String msgKey =
"error.too-many-content-types-for-file-association";
@@ -347,7 +347,7 @@
}
}
- private boolean prepareProto(Map<String, ? super Object> p)
+ private boolean prepareProto(Map<String, ? super Object> p)
throws IOException {
File appImage = StandardBundlerParam.getPredefinedAppImage(p);
File appDir = null;
@@ -406,9 +406,6 @@
return null;
} finally {
try {
- if (ECHO_MODE.fetchFrom(p)) {
- saveConfigFiles(p);
- }
if (imageDir != null &&
PREDEFINED_APP_IMAGE.fetchFrom(p) == null &&
(PREDEFINED_RUNTIME_IMAGE.fetchFrom(p) == null ||
@@ -447,72 +444,6 @@
}
- protected void saveConfigFiles(Map<String, ? super Object> params) {
- try {
- File configRoot = CONFIG_ROOT.fetchFrom(params);
- File rootDir = LinuxAppBundler.getRootDir(
- APP_IMAGE_ROOT.fetchFrom(params), params);
-
- if (getConfig_ControlFile(params).exists()) {
- IOUtils.copyFile(getConfig_ControlFile(params),
- new File(configRoot,
- getConfig_ControlFile(params).getName()));
- }
- if (getConfig_CopyrightFile(params).exists()) {
- IOUtils.copyFile(getConfig_CopyrightFile(params),
- new File(configRoot,
- getConfig_CopyrightFile(params).getName()));
- }
- if (getConfig_PreinstallFile(params).exists()) {
- IOUtils.copyFile(getConfig_PreinstallFile(params),
- new File(configRoot,
- getConfig_PreinstallFile(params).getName()));
- }
- if (getConfig_PrermFile(params).exists()) {
- IOUtils.copyFile(getConfig_PrermFile(params),
- new File(configRoot,
- getConfig_PrermFile(params).getName()));
- }
- if (getConfig_PostinstallFile(params).exists()) {
- IOUtils.copyFile(getConfig_PostinstallFile(params),
- new File(configRoot,
- getConfig_PostinstallFile(params).getName()));
- }
- if (getConfig_PostrmFile(params).exists()) {
- IOUtils.copyFile(getConfig_PostrmFile(params),
- new File(configRoot,
- getConfig_PostrmFile(params).getName()));
- }
- if (getConfig_DesktopShortcutFile(rootDir, params).exists()) {
- IOUtils.copyFile(getConfig_DesktopShortcutFile(rootDir, params),
- new File(configRoot,
- getConfig_DesktopShortcutFile(rootDir,
- params).getName()));
- }
- for (Map<String, ? super Object> secondaryLauncher :
- SECONDARY_LAUNCHERS.fetchFrom(params)) {
- if (getConfig_DesktopShortcutFile(rootDir,
- secondaryLauncher).exists()) {
- IOUtils.copyFile(
- getConfig_DesktopShortcutFile(rootDir,
- secondaryLauncher),
- new File(configRoot, getConfig_DesktopShortcutFile(
- rootDir, secondaryLauncher).getName()));
- }
- }
- if (getConfig_IconFile(rootDir, params).exists()) {
- IOUtils.copyFile(getConfig_IconFile(rootDir, params),
- new File(configRoot,
- getConfig_IconFile(rootDir, params).getName()));
- }
- Log.info(MessageFormat.format(
- I18N.getString("message.config-save-location"),
- configRoot.getAbsolutePath()));
- } catch (IOException ioe) {
- ioe.printStackTrace();
- }
- }
-
private String getArch() {
String arch = System.getProperty("os.arch");
if ("i386".equals(arch))
@@ -546,7 +477,7 @@
Map<String, String> data = createReplacementData(params);
File rootDir = LinuxAppBundler.getRootDir(APP_IMAGE_ROOT.fetchFrom(
params), params);
-
+
File iconTarget = getConfig_IconFile(rootDir, params);
File icon = ICON_PNG.fetchFrom(params);
if (!Arguments.CREATE_JRE_INSTALLER.fetchFrom(params)) {
@@ -783,7 +714,7 @@
data.put("DESKTOP_MIMES", desktopMimes.toString());
}
}
-
+
if (!Arguments.CREATE_JRE_INSTALLER.fetchFrom(params)) {
//prepare desktop shortcut
Writer w = new BufferedWriter(new FileWriter(
@@ -910,7 +841,7 @@
deps.isEmpty() ? "" : "Depends: " + deps);
data.put("CREATE_JRE_INSTALLER",
Arguments.CREATE_JRE_INSTALLER.fetchFrom(params).toString());
-
+
return data;
}
@@ -971,7 +902,7 @@
FULL_PACKAGE_NAME.fetchFrom(params),
outFile.getAbsolutePath());
pb = pb.directory(DEB_IMAGE_DIR.fetchFrom(params).getParentFile());
- IOUtils.exec(pb, ECHO_MODE.fetchFrom(params));
+ IOUtils.exec(pb, false);
Log.info(MessageFormat.format(I18N.getString(
"message.output-to-location"), outFile.getAbsolutePath()));
@@ -1026,8 +957,8 @@
File outputParentDir) {
return bundle(params, outputParentDir);
}
-
- @Override
+
+ @Override
public boolean supported() {
return (Platform.getPlatform() == Platform.LINUX);
}
--- a/src/jdk.packager/linux/classes/jdk/packager/internal/linux/LinuxRpmBundler.java Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/linux/classes/jdk/packager/internal/linux/LinuxRpmBundler.java Thu Oct 18 21:04:15 2018 -0400
@@ -52,7 +52,7 @@
private static final ResourceBundle I18N = ResourceBundle.getBundle(
"jdk.packager.internal.resources.linux.LinuxRpmBundler");
- public static final BundlerParamInfo<LinuxAppBundler> APP_BUNDLER =
+ public static final BundlerParamInfo<LinuxAppBundler> APP_BUNDLER =
new StandardBundlerParam<>(
I18N.getString("param.app-bundler.name"),
I18N.getString("param.app-bundler.description"),
@@ -175,7 +175,7 @@
try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
PrintStream ps = new PrintStream(baos)) {
ProcessBuilder pb = new ProcessBuilder(toolName, "--version");
- IOUtils.exec(pb, Log.isDebug(), false, ps);
+ IOUtils.exec(pb, Log.isDebug(), false, ps);
//not interested in the above's output
String content = new String(baos.toByteArray());
Pattern pattern = Pattern.compile(" (\\d+\\.\\d+)");
@@ -274,7 +274,7 @@
}
}
- private boolean prepareProto(Map<String, ? super Object> p)
+ private boolean prepareProto(Map<String, ? super Object> p)
throws IOException {
File appImage = StandardBundlerParam.getPredefinedAppImage(p);
File appDir = null;
@@ -318,9 +318,6 @@
return null;
} finally {
try {
- if (ECHO_MODE.fetchFrom(p)) {
- saveConfigFiles(p);
- }
if (imageDir != null &&
PREDEFINED_APP_IMAGE.fetchFrom(p) == null &&
(PREDEFINED_RUNTIME_IMAGE.fetchFrom(p) == null ||
@@ -358,36 +355,6 @@
}
}
- protected void saveConfigFiles(Map<String, ? super Object> params) {
- try {
- File configRoot = CONFIG_ROOT.fetchFrom(params);
- File rootDir = LinuxAppBundler.getRootDir(
- RPM_IMAGE_DIR.fetchFrom(params), params);
-
- if (getConfig_SpecFile(params).exists()) {
- IOUtils.copyFile(getConfig_SpecFile(params),
- new File(configRoot,
- getConfig_SpecFile(params).getName()));
- }
- if (getConfig_DesktopShortcutFile(rootDir, params).exists()) {
- IOUtils.copyFile(getConfig_DesktopShortcutFile(rootDir, params),
- new File(configRoot, getConfig_DesktopShortcutFile(
- rootDir, params).getName()));
- }
- if (getConfig_IconFile(rootDir, params).exists()) {
- IOUtils.copyFile(getConfig_IconFile(rootDir, params),
- new File(configRoot,
- getConfig_IconFile(rootDir, params).getName()));
- }
-
- Log.info(MessageFormat.format(
- I18N.getString("message.config-save-location"),
- configRoot.getAbsolutePath()));
- } catch (IOException ioe) {
- ioe.printStackTrace();
- }
- }
-
private String getLicenseFileString(Map<String, ? super Object> params) {
StringBuilder sb = new StringBuilder();
for (String f: LICENSE_FILE.fetchFrom(params)) {
@@ -744,7 +711,7 @@
"--define", "%_topdir " + broot.getAbsolutePath()
);
pb = pb.directory(RPM_IMAGE_DIR.fetchFrom(params));
- IOUtils.exec(pb, ECHO_MODE.fetchFrom(params));
+ IOUtils.exec(pb, false);
if (!Log.isDebug()) {
IOUtils.deleteRecursive(broot);
--- a/src/jdk.packager/linux/classes/jdk/packager/internal/resources/linux/LinuxDebBundler.properties Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/linux/classes/jdk/packager/internal/resources/linux/LinuxDebBundler.properties Thu Oct 18 21:04:15 2018 -0400
@@ -102,7 +102,6 @@
message.test-for-tool=Test for [{0}]. Result\: {1}
message.debug-working-directory=Kept working directory for debug\: {0}
-message.config-save-location=Config files are saved to {0}. Use them to customize package.
message.outputting-to-location=Generating DEB for installer to\: {0}
message.output-to-location=Package (.deb) saved to\: {0}
message.debs-like-licenses=Debian packages should specify a license. The absence of a license will cause some linux distributions to complain about the quality of the application.
--- a/src/jdk.packager/linux/classes/jdk/packager/internal/resources/linux/LinuxDebBundler_ja.properties Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/linux/classes/jdk/packager/internal/resources/linux/LinuxDebBundler_ja.properties Thu Oct 18 21:04:15 2018 -0400
@@ -102,7 +102,6 @@
message.test-for-tool=[{0}]\u306E\u30C6\u30B9\u30C8\u3002\u7D50\u679C: {1}
message.debug-working-directory=\u30C7\u30D0\u30C3\u30B0\u306E\u4F5C\u696D\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304C\u4FDD\u6301\u3055\u308C\u307E\u3057\u305F: {0}
-message.config-save-location=\u69CB\u6210\u30D5\u30A1\u30A4\u30EB\u304C{0}\u306B\u4FDD\u5B58\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA\u3059\u308B\u306B\u306F\u3053\u308C\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
message.outputting-to-location=\u30A4\u30F3\u30B9\u30C8\u30FC\u30E9\u306EDEB\u3092\u6B21\u306B\u751F\u6210\u3057\u3066\u3044\u307E\u3059: {0}
message.output-to-location=\u30D1\u30C3\u30B1\u30FC\u30B8(.deb)\u306F\u6B21\u306B\u4FDD\u5B58\u3055\u308C\u307E\u3057\u305F: {0}
message.debs-like-licenses=Debian\u30D1\u30C3\u30B1\u30FC\u30B8\u3067\u306F\u30E9\u30A4\u30BB\u30F3\u30B9\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\u30E9\u30A4\u30BB\u30F3\u30B9\u304C\u306A\u3044\u5834\u5408\u3001\u4E00\u90E8\u306ELinux\u30C7\u30A3\u30B9\u30C8\u30EA\u30D3\u30E5\u30FC\u30B7\u30E7\u30F3\u3067\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u54C1\u8CEA\u306B\u554F\u984C\u304C\u767A\u751F\u3059\u308B\u5834\u5408\u304C\u3042\u308A\u307E\u3059\u3002
--- a/src/jdk.packager/linux/classes/jdk/packager/internal/resources/linux/LinuxDebBundler_zh_CN.properties Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/linux/classes/jdk/packager/internal/resources/linux/LinuxDebBundler_zh_CN.properties Thu Oct 18 21:04:15 2018 -0400
@@ -102,7 +102,6 @@
message.test-for-tool=[{0}] \u7684\u6D4B\u8BD5\u3002\u7ED3\u679C: {1}
message.debug-working-directory=\u7528\u4E8E\u8C03\u8BD5\u7684\u5DF2\u4FDD\u7559\u5DE5\u4F5C\u76EE\u5F55: {0}
-message.config-save-location=\u914D\u7F6E\u6587\u4EF6\u5DF2\u4FDD\u5B58\u5230{0}\u3002\u4F7F\u7528\u8FD9\u4E9B\u914D\u7F6E\u6587\u4EF6\u53EF\u5B9A\u5236\u7A0B\u5E8F\u5305\u3002
message.outputting-to-location=\u6B63\u5728\u4E3A\u5B89\u88C5\u7A0B\u5E8F\u751F\u6210 DEB, \u4F4D\u7F6E: {0}
message.output-to-location=\u7A0B\u5E8F\u5305 (.deb) \u5DF2\u4FDD\u5B58\u5230: {0}
message.debs-like-licenses=Debian \u7A0B\u5E8F\u5305\u5E94\u6307\u5B9A\u8BB8\u53EF\u8BC1\u3002\u7F3A\u5C11\u8BB8\u53EF\u8BC1\u5C06\u5BFC\u81F4\u67D0\u4E9B Linux \u5206\u53D1\u6295\u8BC9\u5E94\u7528\u7A0B\u5E8F\u8D28\u91CF\u3002
--- a/src/jdk.packager/linux/classes/jdk/packager/internal/resources/linux/LinuxRpmBundler.properties Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/linux/classes/jdk/packager/internal/resources/linux/LinuxRpmBundler.properties Thu Oct 18 21:04:15 2018 -0400
@@ -78,7 +78,6 @@
message.test-for-tool=Test for [{0}]. Result\: {1}
message.one-shortcut-required=At least one type of shortcut is required. Enabling menu shortcut.
message.debug-working-directory=Kept working directory for debug\: {0}
-message.config-save-location=Config files are saved to {0}. Use them to customize package.
message.outputting-bundle-location=Generating RPM for installer to\: {0}
message.output-bundle-location=Package (.rpm) saved to\: {0}
message.creating-association-with-null-extension=Creating association with null extension.
--- a/src/jdk.packager/linux/classes/jdk/packager/internal/resources/linux/LinuxRpmBundler_ja.properties Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/linux/classes/jdk/packager/internal/resources/linux/LinuxRpmBundler_ja.properties Thu Oct 18 21:04:15 2018 -0400
@@ -74,7 +74,6 @@
message.test-for-tool=[{0}]\u306E\u30C6\u30B9\u30C8\u3002\u7D50\u679C: {1}
message.one-shortcut-required=\u5C11\u306A\u304F\u3068\u30821\u3064\u306E\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u30FB\u30BF\u30A4\u30D7\u304C\u5FC5\u8981\u3067\u3059\u3002\u30E1\u30CB\u30E5\u30FC\u30FB\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u3092\u6709\u52B9\u5316\u3057\u3066\u3044\u307E\u3059\u3002
message.debug-working-directory=\u30C7\u30D0\u30C3\u30B0\u306E\u4F5C\u696D\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304C\u4FDD\u6301\u3055\u308C\u307E\u3057\u305F: {0}
-message.config-save-location=\u69CB\u6210\u30D5\u30A1\u30A4\u30EB\u304C{0}\u306B\u4FDD\u5B58\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA\u3059\u308B\u306B\u306F\u3053\u308C\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
message.outputting-bundle-location=\u30A4\u30F3\u30B9\u30C8\u30FC\u30E9\u306ERPM\u3092\u6B21\u306B\u751F\u6210\u3057\u3066\u3044\u307E\u3059: {0}
message.output-bundle-location=\u30D1\u30C3\u30B1\u30FC\u30B8(.rpm)\u306F\u6B21\u306B\u4FDD\u5B58\u3055\u308C\u307E\u3057\u305F: {0}
message.creating-association-with-null-extension=null\u62E1\u5F35\u5B50\u3068\u306E\u95A2\u9023\u4ED8\u3051\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059\u3002
--- a/src/jdk.packager/linux/classes/jdk/packager/internal/resources/linux/LinuxRpmBundler_zh_CN.properties Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/linux/classes/jdk/packager/internal/resources/linux/LinuxRpmBundler_zh_CN.properties Thu Oct 18 21:04:15 2018 -0400
@@ -74,7 +74,6 @@
message.test-for-tool=[{0}] \u7684\u6D4B\u8BD5\u3002\u7ED3\u679C: {1}
message.one-shortcut-required=\u81F3\u5C11\u9700\u8981\u4E00\u79CD\u7C7B\u578B\u7684\u5FEB\u6377\u65B9\u5F0F\u3002\u6B63\u5728\u542F\u7528\u83DC\u5355\u5FEB\u6377\u65B9\u5F0F\u3002
message.debug-working-directory=\u7528\u4E8E\u8C03\u8BD5\u7684\u5DF2\u4FDD\u7559\u5DE5\u4F5C\u76EE\u5F55: {0}
-message.config-save-location=\u914D\u7F6E\u6587\u4EF6\u5DF2\u4FDD\u5B58\u5230{0}\u3002\u4F7F\u7528\u8FD9\u4E9B\u914D\u7F6E\u6587\u4EF6\u53EF\u5B9A\u5236\u7A0B\u5E8F\u5305\u3002
message.outputting-bundle-location=\u6B63\u5728\u4E3A\u5B89\u88C5\u7A0B\u5E8F\u751F\u6210 RPM, \u4F4D\u7F6E: {0}
message.output-bundle-location=\u7A0B\u5E8F\u5305 (.rpm) \u5DF2\u4FDD\u5B58\u5230: {0}
message.creating-association-with-null-extension=\u6B63\u5728\u4F7F\u7528\u7A7A\u6269\u5C55\u540D\u521B\u5EFA\u5173\u8054\u3002
--- a/src/jdk.packager/macosx/classes/jdk/packager/internal/builders/mac/MacAppImageBuilder.java Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/macosx/classes/jdk/packager/internal/builders/mac/MacAppImageBuilder.java Thu Oct 18 21:04:15 2018 -0400
@@ -189,7 +189,7 @@
return f;
},
(s, p) -> new File(s));
-
+
public static final StandardBundlerParam<Boolean> SIGN_BUNDLE =
new StandardBundlerParam<>(
I18N.getString("param.sign-bundle.name"),
@@ -788,7 +788,7 @@
args.add(keyChain);
ProcessBuilder pb = new ProcessBuilder(args);
- IOUtils.exec(pb, ECHO_MODE.fetchFrom(params));
+ IOUtils.exec(pb, false);
}
public static void restoreKeychainList(Map<String, ? super Object> params)
@@ -812,7 +812,7 @@
args.addAll(keyChains);
ProcessBuilder pb = new ProcessBuilder(args);
- IOUtils.exec(pb, ECHO_MODE.fetchFrom(params));
+ IOUtils.exec(pb, false);
}
public static void signAppBundle(
@@ -887,7 +887,7 @@
f.setWritable(true, true);
ProcessBuilder pb = new ProcessBuilder(args);
- IOUtils.exec(pb, ECHO_MODE.fetchFrom(params));
+ IOUtils.exec(pb, false);
Files.setPosixFilePermissions(p, oldPermissions);
} catch (IOException ioe) {
@@ -919,7 +919,7 @@
}
args.add(path.toString());
ProcessBuilder pb = new ProcessBuilder(args);
- IOUtils.exec(pb, ECHO_MODE.fetchFrom(params));
+ IOUtils.exec(pb, false);
args = new ArrayList<>();
args.addAll(Arrays.asList("codesign",
@@ -934,7 +934,7 @@
args.add(path.toString()
+ "/Contents/_CodeSignature/CodeResources");
pb = new ProcessBuilder(args);
- IOUtils.exec(pb, ECHO_MODE.fetchFrom(params));
+ IOUtils.exec(pb, false);
} catch (IOException e) {
toThrow.set(e);
}
@@ -978,7 +978,7 @@
ProcessBuilder pb =
new ProcessBuilder(args.toArray(new String[args.size()]));
- IOUtils.exec(pb, ECHO_MODE.fetchFrom(params));
+ IOUtils.exec(pb, false);
}
}
--- a/src/jdk.packager/macosx/classes/jdk/packager/internal/mac/MacAppBundler.java Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/macosx/classes/jdk/packager/internal/mac/MacAppBundler.java Thu Oct 18 21:04:15 2018 -0400
@@ -443,9 +443,7 @@
}
public void cleanupConfigFiles(Map<String, ? super Object> params) {
- //Since building the app can be bypassed, make sure configRoot was set
- if (CONFIG_ROOT.fetchFrom(params) != null
- && !StandardBundlerParam.ECHO_MODE.fetchFrom(params)) {
+ if (CONFIG_ROOT.fetchFrom(params) != null) {
getConfig_Icon(params).delete();
getConfig_InfoPlist(params).delete();
}
@@ -510,7 +508,7 @@
return doBundle(params, outputParentDir, false);
}
- @Override
+ @Override
public boolean supported() {
return Platform.getPlatform() == Platform.MAC;
}
--- a/src/jdk.packager/macosx/classes/jdk/packager/internal/mac/MacAppStoreBundler.java Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/macosx/classes/jdk/packager/internal/mac/MacAppStoreBundler.java Thu Oct 18 21:04:15 2018 -0400
@@ -217,7 +217,7 @@
pb = new ProcessBuilder(buildOptions);
- IOUtils.exec(pb, ECHO_MODE.fetchFrom(p));
+ IOUtils.exec(pb, false);
return finalPKG;
} catch (Exception ex) {
Log.info("App Store Ready Bundle failed : " + ex.getMessage());
@@ -237,14 +237,9 @@
"mesasge.intermediate-bundle-location"),
appImageDir.getAbsolutePath()));
}
- if (!StandardBundlerParam.ECHO_MODE.fetchFrom(p)) {
- //cleanup
- cleanupConfigFiles(p);
- } else {
- Log.info(MessageFormat.format(I18N.getString(
- "message.config-save-location"),
- CONFIG_ROOT.fetchFrom(p).getAbsolutePath()));
- }
+
+ //cleanup
+ cleanupConfigFiles(p);
} catch (IOException ex) {
//noinspection ReturnInsideFinallyBlock
Log.debug(ex.getMessage());
@@ -254,16 +249,14 @@
}
protected void cleanupConfigFiles(Map<String, ? super Object> params) {
- if(!StandardBundlerParam.ECHO_MODE.fetchFrom(params)) {
- if (getConfig_Entitlements(params) != null) {
- getConfig_Entitlements(params).delete();
- }
- if (getConfig_Inherit_Entitlements(params) != null) {
- getConfig_Inherit_Entitlements(params).delete();
- }
- if (PREDEFINED_APP_IMAGE.fetchFrom(params) == null) {
- APP_BUNDLER.fetchFrom(params).cleanupConfigFiles(params);
- }
+ if (getConfig_Entitlements(params) != null) {
+ getConfig_Entitlements(params).delete();
+ }
+ if (getConfig_Inherit_Entitlements(params) != null) {
+ getConfig_Inherit_Entitlements(params).delete();
+ }
+ if (PREDEFINED_APP_IMAGE.fetchFrom(params) == null) {
+ APP_BUNDLER.fetchFrom(params).cleanupConfigFiles(params);
}
}
@@ -423,10 +416,10 @@
File outputParentDir) {
return bundle(params, outputParentDir);
}
-
- @Override
+
+ @Override
public boolean supported() {
- return !Arguments.isJreInstaller() &&
+ return !Arguments.isJreInstaller() &&
Platform.getPlatform() == Platform.MAC;
}
}
--- a/src/jdk.packager/macosx/classes/jdk/packager/internal/mac/MacDmgBundler.java Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/macosx/classes/jdk/packager/internal/mac/MacDmgBundler.java Thu Oct 18 21:04:15 2018 -0400
@@ -88,8 +88,7 @@
Log.info(MessageFormat.format(
I18N.getString("message.running-script"),
configScript.getAbsolutePath()));
- IOUtils.run("bash", configScript,
- ECHO_MODE.fetchFrom(params));
+ IOUtils.run("bash", configScript, false);
}
return buildDMG(params, outdir);
@@ -111,14 +110,9 @@
"message.intermediate-image-location"),
appImageDir.getAbsolutePath()));
}
- if (!ECHO_MODE.fetchFrom(params)) {
- //cleanup
- cleanupConfigFiles(params);
- } else {
- Log.info(MessageFormat.format(I18N.getString(
- "message.config-save-location"),
- CONFIG_ROOT.fetchFrom(params).getAbsolutePath()));
- }
+
+ //cleanup
+ cleanupConfigFiles(params);
} catch (IOException ex) {
Log.debug(ex);
//noinspection ReturnInsideFinallyBlock
@@ -129,24 +123,22 @@
//remove
protected void cleanupConfigFiles(Map<String, ? super Object> params) {
- if(!StandardBundlerParam.ECHO_MODE.fetchFrom(params)) {
- if (getConfig_VolumeBackground(params) != null) {
- getConfig_VolumeBackground(params).delete();
- }
- if (getConfig_VolumeIcon(params) != null) {
- getConfig_VolumeIcon(params).delete();
- }
- if (getConfig_VolumeScript(params) != null) {
- getConfig_VolumeScript(params).delete();
- }
- if (getConfig_Script(params) != null) {
- getConfig_Script(params).delete();
- }
- if (getConfig_LicenseFile(params) != null) {
- getConfig_LicenseFile(params).delete();
- }
- APP_BUNDLER.fetchFrom(params).cleanupConfigFiles(params);
+ if (getConfig_VolumeBackground(params) != null) {
+ getConfig_VolumeBackground(params).delete();
+ }
+ if (getConfig_VolumeIcon(params) != null) {
+ getConfig_VolumeIcon(params).delete();
}
+ if (getConfig_VolumeScript(params) != null) {
+ getConfig_VolumeScript(params).delete();
+ }
+ if (getConfig_Script(params) != null) {
+ getConfig_Script(params).delete();
+ }
+ if (getConfig_LicenseFile(params) != null) {
+ getConfig_LicenseFile(params).delete();
+ }
+ APP_BUNDLER.fetchFrom(params).cleanupConfigFiles(params);
}
private static final String hdiutil = "/usr/bin/hdiutil";
@@ -373,7 +365,7 @@
"-ov", protoDMG.getAbsolutePath(),
"-fs", "HFS+",
"-format", "UDRW");
- IOUtils.exec(pb, ECHO_MODE.fetchFrom(p));
+ IOUtils.exec(pb, false);
// mount temp image
pb = new ProcessBuilder(
@@ -382,7 +374,7 @@
protoDMG.getAbsolutePath(),
hdiUtilVerbosityFlag,
"-mountroot", imagesRoot.getAbsolutePath());
- IOUtils.exec(pb, ECHO_MODE.fetchFrom(p));
+ IOUtils.exec(pb, false);
File mountedRoot =
new File(imagesRoot.getAbsolutePath(), APP_NAME.fetchFrom(p));
@@ -394,7 +386,7 @@
pb = new ProcessBuilder("osascript",
getConfig_VolumeScript(p).getAbsolutePath());
- IOUtils.exec(pb, ECHO_MODE.fetchFrom(p));
+ IOUtils.exec(pb, false);
// Indicate that we want a custom icon
// NB: attributes of the root directory are ignored
@@ -414,14 +406,14 @@
setFileUtility,
"-c", "icnC",
volumeIconFile.getAbsolutePath());
- IOUtils.exec(pb, ECHO_MODE.fetchFrom(p));
+ IOUtils.exec(pb, false);
volumeIconFile.setReadOnly();
pb = new ProcessBuilder(
setFileUtility,
"-a", "C",
mountedRoot.getAbsolutePath());
- IOUtils.exec(pb, ECHO_MODE.fetchFrom(p));
+ IOUtils.exec(pb, false);
} catch (IOException ex) {
Log.info(ex.getMessage());
Log.verbose(
@@ -438,7 +430,7 @@
"detach",
hdiUtilVerbosityFlag,
mountedRoot.getAbsolutePath());
- IOUtils.exec(pb, ECHO_MODE.fetchFrom(p));
+ IOUtils.exec(pb, false);
// Compress it to a new image
pb = new ProcessBuilder(
@@ -448,7 +440,7 @@
hdiUtilVerbosityFlag,
"-format", "UDZO",
"-o", finalDMG.getAbsolutePath());
- IOUtils.exec(pb, ECHO_MODE.fetchFrom(p));
+ IOUtils.exec(pb, false);
//add license if needed
if (getConfig_LicenseFile(p).exists()) {
@@ -458,7 +450,7 @@
"unflatten",
finalDMG.getAbsolutePath()
);
- IOUtils.exec(pb, ECHO_MODE.fetchFrom(p));
+ IOUtils.exec(pb, false);
//add license
pb = new ProcessBuilder(
@@ -468,7 +460,7 @@
"-xml",
getConfig_LicenseFile(p).getAbsolutePath()
);
- IOUtils.exec(pb, ECHO_MODE.fetchFrom(p));
+ IOUtils.exec(pb, false);
//hdiutil flatten your_image_file.dmg
pb = new ProcessBuilder(
@@ -476,7 +468,7 @@
"flatten",
finalDMG.getAbsolutePath()
);
- IOUtils.exec(pb, ECHO_MODE.fetchFrom(p));
+ IOUtils.exec(pb, false);
}
@@ -576,8 +568,8 @@
Map<String, ? super Object> params, File outputParentDir) {
return bundle(params, outputParentDir);
}
-
- @Override
+
+ @Override
public boolean supported() {
return Platform.getPlatform() == Platform.MAC;
}
--- a/src/jdk.packager/macosx/classes/jdk/packager/internal/mac/MacPkgBundler.java Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/macosx/classes/jdk/packager/internal/mac/MacPkgBundler.java Thu Oct 18 21:04:15 2018 -0400
@@ -133,7 +133,7 @@
return result;
},
(s, p) -> s);
-
+
public static final BundlerParamInfo<String> MAC_INSTALL_DIR =
new StandardBundlerParam<>(
I18N.getString("param.mac-install-dir.name"),
@@ -186,8 +186,7 @@
Log.info(MessageFormat.format(I18N.getString(
"message.running-script"),
configScript.getAbsolutePath()));
- IOUtils.run("bash", configScript,
- ECHO_MODE.fetchFrom(params));
+ IOUtils.run("bash", configScript, false);
}
return createPKG(params, outdir, appImageDir);
@@ -198,10 +197,10 @@
return null;
} finally {
try {
- if (appImageDir != null &&
+ if (appImageDir != null &&
PREDEFINED_APP_IMAGE.fetchFrom(params) == null &&
(PREDEFINED_RUNTIME_IMAGE.fetchFrom(params) == null ||
- !Arguments.CREATE_JRE_INSTALLER.fetchFrom(params)) &&
+ !Arguments.CREATE_JRE_INSTALLER.fetchFrom(params)) &&
!Log.isDebug()) {
IOUtils.deleteRecursive(appImageDir);
} else if (appImageDir != null) {
@@ -209,14 +208,9 @@
"message.intermediate-image-location"),
appImageDir.getAbsolutePath()));
}
- if (!ECHO_MODE.fetchFrom(params)) {
- // cleanup
- cleanupConfigFiles(params);
- } else {
- Log.info(MessageFormat.format(
- I18N.getString("message.config-save-location"),
- CONFIG_ROOT.fetchFrom(params).getAbsolutePath()));
- }
+
+ // cleanup
+ cleanupConfigFiles(params);
} catch (IOException ex) {
Log.debug(ex);
// noinspection ReturnInsideFinallyBlock
@@ -236,13 +230,11 @@
}
private void cleanupPackagesFiles(Map<String, ? super Object> params) {
- if(!StandardBundlerParam.ECHO_MODE.fetchFrom(params)) {
- if (getPackages_AppPackage(params) != null) {
- getPackages_AppPackage(params).delete();
- }
- if (getPackages_DaemonPackage(params) != null) {
- getPackages_DaemonPackage(params).delete();
- }
+ if (getPackages_AppPackage(params) != null) {
+ getPackages_AppPackage(params).delete();
+ }
+ if (getPackages_DaemonPackage(params) != null) {
+ getPackages_DaemonPackage(params).delete();
}
}
@@ -265,25 +257,12 @@
return new File(SCRIPTS_DIR.fetchFrom(params), "postinstall");
}
- private void cleanupPackageScripts(Map<String, ? super Object> params) {
- if(!StandardBundlerParam.ECHO_MODE.fetchFrom(params)) {
- if (getScripts_PreinstallFile(params) != null) {
- getScripts_PreinstallFile(params).delete();
- }
- if (getScripts_PostinstallFile(params) != null) {
- getScripts_PostinstallFile(params).delete();
- }
+ private void cleanupConfigFiles(Map<String, ? super Object> params) {
+ if (getConfig_DistributionXMLFile(params) != null) {
+ getConfig_DistributionXMLFile(params).delete();
}
- }
-
- private void cleanupConfigFiles(Map<String, ? super Object> params) {
- if(!StandardBundlerParam.ECHO_MODE.fetchFrom(params)) {
- if (getConfig_DistributionXMLFile(params) != null) {
- getConfig_DistributionXMLFile(params).delete();
- }
- if (getConfig_BackgroundImage(params) != null) {
- getConfig_BackgroundImage(params).delete();
- }
+ if (getConfig_BackgroundImage(params) != null) {
+ getConfig_BackgroundImage(params).delete();
}
}
@@ -295,7 +274,7 @@
return IDENTIFIER.fetchFrom(params) + ".daemon";
}
- private void preparePackageScripts(Map<String, ? super Object> params)
+ private void preparePackageScripts(Map<String, ? super Object> params)
throws IOException {
Log.verbose(I18N.getString("message.preparing-scripts"));
@@ -452,7 +431,7 @@
"--install-location",
MAC_INSTALL_DIR.fetchFrom(params),
appPKG.getAbsolutePath());
- IOUtils.exec(pb, ECHO_MODE.fetchFrom(params));
+ IOUtils.exec(pb, false);
// build final package
File finalPKG = new File(outdir, INSTALLER_NAME.fetchFrom(params)
@@ -499,17 +478,15 @@
commandLine.add(finalPKG.getAbsolutePath());
pb = new ProcessBuilder(commandLine);
- IOUtils.exec(pb, ECHO_MODE.fetchFrom(params));
+ IOUtils.exec(pb, false);
return finalPKG;
} catch (Exception ignored) {
Log.verbose(ignored);
return null;
} finally {
- if (!ECHO_MODE.fetchFrom(params)) {
- cleanupPackagesFiles(params);
- cleanupConfigFiles(params);
- }
+ cleanupPackagesFiles(params);
+ cleanupConfigFiles(params);
}
}
@@ -617,8 +594,8 @@
Map<String, ? super Object> params, File outputParentDir) {
return bundle(params, outputParentDir);
}
-
- @Override
+
+ @Override
public boolean supported() {
return Platform.getPlatform() == Platform.MAC;
}
--- a/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/builders/mac/MacAppImageBuilder.properties Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/builders/mac/MacAppImageBuilder.properties Thu Oct 18 21:04:15 2018 -0400
@@ -60,7 +60,6 @@
resource.app-info-plist=Application Info.plist
resource.runtime-info-plist=Java Runtime Info.plist
-message.config-save-location=Config files are saved to {0}. Use them to customize package.
message.bundle-name-too-long-warning={0} is set to ''{1}'', which is longer than 16 characters. For a better Mac experience consider shortening it.
message.null-classpath=Null app resources?
message.preparing-info-plist=Preparing Info.plist\: {0}
--- a/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/builders/mac/MacAppImageBuilder_ja.properties Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/builders/mac/MacAppImageBuilder_ja.properties Thu Oct 18 21:04:15 2018 -0400
@@ -57,7 +57,6 @@
resource.app-info-plist=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306EInfo.plist
resource.runtime-info-plist=Java\u30E9\u30F3\u30BF\u30A4\u30E0\u306EInfo.plist
-message.config-save-location=\u69CB\u6210\u30D5\u30A1\u30A4\u30EB\u304C{0}\u306B\u4FDD\u5B58\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA\u3059\u308B\u306B\u306F\u3053\u308C\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
message.bundle-name-too-long-warning={0}\u304C16\u6587\u5B57\u3092\u8D85\u3048\u308B''{1}''\u306B\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002Mac\u3067\u306E\u64CD\u4F5C\u6027\u3092\u3088\u308A\u826F\u304F\u3059\u308B\u305F\u3081\u306B\u77ED\u304F\u3059\u308B\u3053\u3068\u3092\u691C\u8A0E\u3057\u3066\u304F\u3060\u3055\u3044\u3002
message.null-classpath=Null\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30EA\u30BD\u30FC\u30B9\u3067\u3059\u304B\u3002
message.preparing-info-plist=Info.plist\u3092\u6E96\u5099\u3057\u3066\u3044\u307E\u3059: {0}
--- a/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/builders/mac/MacAppImageBuilder_zh_CN.properties Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/builders/mac/MacAppImageBuilder_zh_CN.properties Thu Oct 18 21:04:15 2018 -0400
@@ -57,7 +57,6 @@
resource.app-info-plist=\u5E94\u7528\u7A0B\u5E8F Info.plist
resource.runtime-info-plist=Java \u8FD0\u884C\u65F6 Info.plist
-message.config-save-location=\u914D\u7F6E\u6587\u4EF6\u5DF2\u4FDD\u5B58\u5230 {0}\u3002\u4F7F\u7528\u8FD9\u4E9B\u914D\u7F6E\u6587\u4EF6\u53EF\u5B9A\u5236\u7A0B\u5E8F\u5305\u3002
message.bundle-name-too-long-warning={0}\u5DF2\u8BBE\u7F6E\u4E3A ''{1}'', \u5176\u957F\u5EA6\u8D85\u8FC7\u4E86 16 \u4E2A\u5B57\u7B26\u3002\u4E3A\u4E86\u83B7\u5F97\u66F4\u597D\u7684 Mac \u4F53\u9A8C, \u8BF7\u8003\u8651\u5C06\u5176\u7F29\u77ED\u3002
message.null-classpath=\u662F\u5426\u4E3A\u7A7A\u5E94\u7528\u7A0B\u5E8F\u8D44\u6E90?
message.preparing-info-plist=\u6B63\u5728\u51C6\u5907 Info.plist: {0}
--- a/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacAppBundler.properties Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacAppBundler.properties Thu Oct 18 21:04:15 2018 -0400
@@ -72,7 +72,6 @@
error.cannot-detect-runtime-in-directory.advice=Point the runtime directory to one of the JDK/JRE root, the Contents/Home directory of that root, or the Contents/Home/jre directory of the JDK.
resource.bundle-config-file=Bundle config file
-message.config-save-location=Config files are saved to {0}. Use them to customize package.
message.bundle-name-too-long-warning={0} is set to ''{1}'', which is longer than 16 characters. For a better Mac experience consider shortening it.
message.no-mac-jre-support=Currently Macs require a JDK to package
message.creating-app-bundle=Creating app bundle\: {0}
--- a/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacAppBundler_ja.properties Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacAppBundler_ja.properties Thu Oct 18 21:04:15 2018 -0400
@@ -46,7 +46,6 @@
error.cannot-detect-runtime-in-directory.advice=\u30E9\u30A4\u30BF\u30A4\u30E0\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u3001JDK/JRE\u30EB\u30FC\u30C8\u3001\u305D\u306E\u30EB\u30FC\u30C8\u306E\u30B3\u30F3\u30C6\u30F3\u30C4/\u30DB\u30FC\u30E0\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3001\u307E\u305F\u306FJDK\u306E\u30B3\u30F3\u30C6\u30F3\u30C4/\u30DB\u30FC\u30E0/jre\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u3044\u305A\u308C\u304B\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002
resource.bundle-config-file=\u30D0\u30F3\u30C9\u30EB\u69CB\u6210\u30D5\u30A1\u30A4\u30EB
-message.config-save-location=\u69CB\u6210\u30D5\u30A1\u30A4\u30EB\u304C{0}\u306B\u4FDD\u5B58\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA\u3059\u308B\u306B\u306F\u3053\u308C\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
message.bundle-name-too-long-warning={0}\u304C16\u6587\u5B57\u3092\u8D85\u3048\u308B''{1}''\u306B\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002Mac\u3067\u306E\u64CD\u4F5C\u6027\u3092\u3088\u308A\u826F\u304F\u3059\u308B\u305F\u3081\u306B\u77ED\u304F\u3059\u308B\u3053\u3068\u3092\u691C\u8A0E\u3057\u3066\u304F\u3060\u3055\u3044\u3002
message.no-mac-jre-support=\u73FE\u5728\u3001Mac\u3067\u306FJDK\u3092\u30D1\u30C3\u30B1\u30FC\u30B8\u5316\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
message.creating-app-bundle=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30F3\u30C9\u30EB\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059: {0}
--- a/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacAppBundler_zh_CN.properties Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacAppBundler_zh_CN.properties Thu Oct 18 21:04:15 2018 -0400
@@ -72,7 +72,6 @@
error.cannot-detect-runtime-in-directory.advice=\u5C06\u8FD0\u884C\u65F6\u76EE\u5F55\u6307\u5411\u4EE5\u4E0B\u76EE\u5F55\u4E4B\u4E00: JDK/JRE \u6839\u76EE\u5F55, \u8BE5\u6839\u76EE\u5F55\u7684 Contents/Home \u76EE\u5F55\u6216 JDK \u7684 Contents/Home/jre \u76EE\u5F55\u3002
resource.bundle-config-file=\u5305\u914D\u7F6E\u6587\u4EF6
-message.config-save-location=\u914D\u7F6E\u6587\u4EF6\u5DF2\u4FDD\u5B58\u5230 {0}\u3002\u4F7F\u7528\u8FD9\u4E9B\u914D\u7F6E\u6587\u4EF6\u53EF\u5B9A\u5236\u7A0B\u5E8F\u5305\u3002
message.bundle-name-too-long-warning={0}\u5DF2\u8BBE\u7F6E\u4E3A ''{1}'', \u5176\u957F\u5EA6\u8D85\u8FC7\u4E86 16 \u4E2A\u5B57\u7B26\u3002\u4E3A\u4E86\u83B7\u5F97\u66F4\u597D\u7684 Mac \u4F53\u9A8C, \u8BF7\u8003\u8651\u5C06\u5176\u7F29\u77ED\u3002
message.no-mac-jre-support=Mac \u5F53\u524D\u9700\u8981 JDK \u4EE5\u4FBF\u6253\u5305
message.creating-app-bundle=\u6B63\u5728\u521B\u5EFA\u5E94\u7528\u7A0B\u5E8F\u5305: {0}
--- a/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacAppStoreBundler.properties Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacAppStoreBundler.properties Thu Oct 18 21:04:15 2018 -0400
@@ -57,6 +57,5 @@
error.certificate.expired=Error: Certificate expired {0}.
-message.config-save-location=Config files are saved to {0}. Use them to customize package.
message.building-bundle=Building Mac App Store Bundle for {0}
mesasge.intermediate-bundle-location=Intermediate application bundle image\: {0}
--- a/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacAppStoreBundler_ja.properties Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacAppStoreBundler_ja.properties Thu Oct 18 21:04:15 2018 -0400
@@ -57,6 +57,5 @@
error.certificate.expired=\u30A8\u30E9\u30FC: \u8A3C\u660E\u66F8\u306F{0}\u306B\u671F\u9650\u304C\u5207\u308C\u307E\u3057\u305F\u3002
-message.config-save-location=\u69CB\u6210\u30D5\u30A1\u30A4\u30EB\u304C{0}\u306B\u4FDD\u5B58\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA\u3059\u308B\u306B\u306F\u3053\u308C\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
message.building-bundle={0}\u306EMac App Store\u30D0\u30F3\u30C9\u30EB\u306E\u4F5C\u6210
mesasge.intermediate-bundle-location=\u4E2D\u9593\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30F3\u30C9\u30EB\u30FB\u30A4\u30E1\u30FC\u30B8: {0}
--- a/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacAppStoreBundler_zh_CN.properties Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacAppStoreBundler_zh_CN.properties Thu Oct 18 21:04:15 2018 -0400
@@ -57,6 +57,5 @@
error.certificate.expired=\u9519\u8BEF: \u8BC1\u4E66\u5DF2\u5931\u6548 {0}\u3002
-message.config-save-location=\u914D\u7F6E\u6587\u4EF6\u5DF2\u4FDD\u5B58\u5230 {0}\u3002\u4F7F\u7528\u8FD9\u4E9B\u914D\u7F6E\u6587\u4EF6\u53EF\u5B9A\u5236\u7A0B\u5E8F\u5305\u3002
message.building-bundle=\u6B63\u5728\u4E3A {0} \u6784\u5EFA Mac App Store \u5305
mesasge.intermediate-bundle-location=\u4E34\u65F6\u5E94\u7528\u7A0B\u5E8F\u5305\u6620\u50CF: {0}
--- a/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacDmgBundler.properties Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacDmgBundler.properties Thu Oct 18 21:04:15 2018 -0400
@@ -54,7 +54,6 @@
message.building-dmg=Building DMG package for {0}
message.running-script=Running shell script on application image [{0}]
message.intermediate-image-location=[DEBUG] Intermediate application bundle image\: {0}
-message.config-save-location=Config files are saved to {0}. Use them to customize package.
message.preparing-dmg-setup=Preparing dmg setup\: {0}
message.creating-dmg-file=Creating DMG file\: {0}
message.dmg-cannot-be-overwritten=Dmg file exists ({0} and can not be removed.
--- a/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacDmgBundler_ja.properties Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacDmgBundler_ja.properties Thu Oct 18 21:04:15 2018 -0400
@@ -54,7 +54,6 @@
message.building-dmg={0}\u306EDMG\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059
message.running-script=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8[{0}]\u3067\u30B7\u30A7\u30EB\u30FB\u30B9\u30AF\u30EA\u30D7\u30C8\u3092\u5B9F\u884C\u3057\u3066\u3044\u307E\u3059
message.intermediate-image-location=[\u30C7\u30D0\u30C3\u30B0]\u4E2D\u9593\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30F3\u30C9\u30EB\u30FB\u30A4\u30E1\u30FC\u30B8: {0}
-message.config-save-location=\u69CB\u6210\u30D5\u30A1\u30A4\u30EB\u304C{0}\u306B\u4FDD\u5B58\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA\u3059\u308B\u306B\u306F\u3053\u308C\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
message.preparing-dmg-setup=dmg\u306E\u8A2D\u5B9A\u3092\u6E96\u5099\u3057\u3066\u3044\u307E\u3059: {0}
message.creating-dmg-file=DMG\u30D5\u30A1\u30A4\u30EB\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059: {0}
message.dmg-cannot-be-overwritten=Dmg\u30D5\u30A1\u30A4\u30EB\u306F\u5B58\u5728\u3057({0}\u3001\u524A\u9664\u3067\u304D\u307E\u305B\u3093\u3002
--- a/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacDmgBundler_zh_CN.properties Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacDmgBundler_zh_CN.properties Thu Oct 18 21:04:15 2018 -0400
@@ -54,7 +54,6 @@
message.building-dmg=\u6B63\u5728\u4E3A {0} \u6784\u5EFA DMG \u7A0B\u5E8F\u5305
message.running-script=\u6B63\u5728\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF [{0}] \u4E0A\u8FD0\u884C shell \u811A\u672C
message.intermediate-image-location=[\u8C03\u8BD5] \u4E34\u65F6\u5E94\u7528\u7A0B\u5E8F\u5305\u6620\u50CF: {0}
-message.config-save-location=\u914D\u7F6E\u6587\u4EF6\u5DF2\u4FDD\u5B58\u5230 {0}\u3002\u4F7F\u7528\u8FD9\u4E9B\u914D\u7F6E\u6587\u4EF6\u53EF\u5B9A\u5236\u7A0B\u5E8F\u5305\u3002
message.preparing-dmg-setup=\u6B63\u5728\u51C6\u5907 dmg \u8BBE\u7F6E: {0}
message.creating-dmg-file=\u6B63\u5728\u521B\u5EFA DMG \u6587\u4EF6: {0}
message.dmg-cannot-be-overwritten=Dmg \u6587\u4EF6\u5DF2\u5B58\u5728 ({0}) \u4E14\u65E0\u6CD5\u5220\u9664\u3002
--- a/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacPkgBundler.properties Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacPkgBundler.properties Thu Oct 18 21:04:15 2018 -0400
@@ -60,6 +60,5 @@
message.running-script=Running shell script on application image [{0}]
message.preparing-scripts=Preparing package scripts
message.preparing-distribution-dist=Preparing distribution.dist\: {0}
-message.config-save-location=Config files are saved to {0}. Use them to customize package.
message.intermediate-image-location=[DEBUG] Intermediate application bundle image\: {0}
message.signing.pkg=Warning: For signing PKG, you might need to set "Always Trust" for your certificate using "Keychain Access" tool.
--- a/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacPkgBundler_ja.properties Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacPkgBundler_ja.properties Thu Oct 18 21:04:15 2018 -0400
@@ -57,5 +57,4 @@
message.running-script=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30A4\u30E1\u30FC\u30B8[{0}]\u3067\u30B7\u30A7\u30EB\u30FB\u30B9\u30AF\u30EA\u30D7\u30C8\u3092\u5B9F\u884C\u3057\u3066\u3044\u307E\u3059
message.preparing-scripts=\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30B9\u30AF\u30EA\u30D7\u30C8\u3092\u6E96\u5099\u3057\u3066\u3044\u307E\u3059
message.preparing-distribution-dist=distribution.dist\u3092\u6E96\u5099\u3057\u3066\u3044\u307E\u3059: {0}
-message.config-save-location=\u69CB\u6210\u30D5\u30A1\u30A4\u30EB\u304C{0}\u306B\u4FDD\u5B58\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA\u3059\u308B\u306B\u306F\u3053\u308C\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
message.intermediate-image-location=[\u30C7\u30D0\u30C3\u30B0]\u4E2D\u9593\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30F3\u30C9\u30EB\u30FB\u30A4\u30E1\u30FC\u30B8: {0}
--- a/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacPkgBundler_zh_CN.properties Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/macosx/classes/jdk/packager/internal/resources/mac/MacPkgBundler_zh_CN.properties Thu Oct 18 21:04:15 2018 -0400
@@ -57,5 +57,4 @@
message.running-script=\u6B63\u5728\u5E94\u7528\u7A0B\u5E8F\u6620\u50CF [{0}] \u4E0A\u8FD0\u884C shell \u811A\u672C
message.preparing-scripts=\u6B63\u5728\u51C6\u5907\u7A0B\u5E8F\u5305\u811A\u672C
message.preparing-distribution-dist=\u6B63\u5728\u51C6\u5907 distribution.dist: {0}
-message.config-save-location=\u914D\u7F6E\u6587\u4EF6\u5DF2\u4FDD\u5B58\u5230 {0}\u3002\u4F7F\u7528\u8FD9\u4E9B\u914D\u7F6E\u6587\u4EF6\u53EF\u5B9A\u5236\u7A0B\u5E8F\u5305\u3002
message.intermediate-image-location=[\u8C03\u8BD5] \u4E34\u65F6\u5E94\u7528\u7A0B\u5E8F\u5305\u6620\u50CF: {0}
--- a/src/jdk.packager/share/classes/jdk/packager/internal/AbstractBundler.java Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/AbstractBundler.java Thu Oct 18 21:04:15 2018 -0400
@@ -73,7 +73,7 @@
} else {
if (verbose) {
Log.info(MessageFormat.format(I18N.getString(
- "message.using-default-resource"),
+ "message.using-default-resource"),
category == null ? "" : "[" + category + "] ",
publicName));
}
@@ -176,13 +176,11 @@
@Override
public void cleanup(Map<String, ? super Object> params) {
- if (!StandardBundlerParam.ECHO_MODE.fetchFrom(params)) {
- try {
- IOUtils.deleteRecursive(
- StandardBundlerParam.BUILD_ROOT.fetchFrom(params));
- } catch (IOException e) {
- Log.debug(e.getMessage());
- }
+ try {
+ IOUtils.deleteRecursive(
+ StandardBundlerParam.BUILD_ROOT.fetchFrom(params));
+ } catch (IOException e) {
+ Log.debug(e.getMessage());
}
}
}
--- a/src/jdk.packager/share/classes/jdk/packager/internal/Arguments.java Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/Arguments.java Thu Oct 18 21:04:15 2018 -0400
@@ -119,7 +119,6 @@
private String mainJarPath = null;
- private static boolean echo = false;
private static boolean jreInstaller = false;
private List<jdk.packager.internal.Bundler> platformBundlers = null;
@@ -295,11 +294,6 @@
INSTALL_DIR ("install-dir", OptionCategories.PROPERTY),
- ECHO_MODE ("echo-mode", OptionCategories.PROPERTY, () -> {
- echo = true;
- setOptionValue("echo-mode", true);
- }),
-
PREDEFINED_APP_IMAGE ("app-image", OptionCategories.PROPERTY, ()-> {
setOptionValue("app-image", popArg());
context().hasAppImage = true;
@@ -861,10 +855,6 @@
return null;
}
- public static boolean echoMode() {
- return echo;
- }
-
public static boolean isJreInstaller() {
return jreInstaller;
}
--- a/src/jdk.packager/share/classes/jdk/packager/internal/IOUtils.java Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/IOUtils.java Thu Oct 18 21:04:15 2018 -0400
@@ -190,8 +190,7 @@
boolean testForPresenseOnly, PrintStream consumer)
throws IOException {
pb.redirectErrorStream(true);
- String prefix = Arguments.echoMode() ? "\nECHO-MODE: " : "";
- Log.verbose(prefix + "Running "
+ Log.verbose("Running "
+ Arrays.toString(pb.command().toArray(new String[0]))
+ (pb.directory() != null ? (" in " + pb.directory()) : ""));
Process p = pb.start();
@@ -219,10 +218,6 @@
}
} catch (InterruptedException ex) {
}
-
- if (Arguments.echoMode()) {
- Log.verbose("\n");
- }
}
@SuppressWarnings("unchecked")
--- a/src/jdk.packager/share/classes/jdk/packager/internal/JLinkBundlerHelper.java Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/JLinkBundlerHelper.java Thu Oct 18 21:04:15 2018 -0400
@@ -287,23 +287,12 @@
Set<String> platformModules =
RedistributableModules.getRedistributableModules(
modulePath, imageBuilder.getPlatformSpecificModulesFile());
- addModules.addAll(platformModules);
+ addModules.addAll(platformModules);
}
Log.info(MessageFormat.format(
I18N.getString("message.modules"), addModules.toString()));
- if (StandardBundlerParam.ECHO_MODE.fetchFrom(params)) {
- Log.info("\nECHO-MODE: Running jlink [ ");
- Log.info("--output = " + outputDir.toString());
- Log.info("--module-path = " + modulePath.toString());
- Log.info("--add-modules = " + addModules.toString());
- Log.info("--limit-modules = " + limitModules.toString());
- Log.info("--exclude-files = " + excludeFileList);
- Log.info("--strip-native-commands = " + stripNativeCommands);
- Log.info(" ]\n" + outputDir.toString());
- }
-
AppRuntimeImageBuilder appRuntimeBuilder = new AppRuntimeImageBuilder();
appRuntimeBuilder.setOutputDir(outputDir);
appRuntimeBuilder.setModulePath(modulePath);
@@ -338,22 +327,12 @@
Set<String> platformModules =
RedistributableModules.getRedistributableModules(
modulePath, imageBuilder.getPlatformSpecificModulesFile());
- addModules.addAll(platformModules);
+ addModules.addAll(platformModules);
}
Log.info(MessageFormat.format(
I18N.getString("message.modules"), addModules.toString()));
- if (StandardBundlerParam.ECHO_MODE.fetchFrom(params)) {
- Log.info("\nECHO-MODE: Running jlink [ ");
- Log.info("--output = " + outputDir.toString());
- Log.info("--module-path = " + modulePath.toString());
- Log.info("--add-modules = " + addModules.toString());
- Log.info("--limit-modules = " + limitModules.toString());
- Log.info("--strip-native-commands = " + stripNativeCommands);
- Log.info(" ]\n" + outputDir.toString());
- }
-
AppRuntimeImageBuilder appRuntimeBuilder = new AppRuntimeImageBuilder();
appRuntimeBuilder.setOutputDir(outputDir);
appRuntimeBuilder.setModulePath(modulePath);
--- a/src/jdk.packager/share/classes/jdk/packager/internal/Log.java Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/Log.java Thu Oct 18 21:04:15 2018 -0400
@@ -96,9 +96,9 @@
}
public void verbose(String msg) {
- if (out != null && (Log.debug || verbose || Arguments.echoMode())) {
+ if (out != null && (Log.debug || verbose)) {
out.println(msg);
- } else if (Log.debug || verbose || Arguments.echoMode()) {
+ } else if (Log.debug || verbose) {
System.out.println(msg);
}
}
--- a/src/jdk.packager/share/classes/jdk/packager/internal/StandardBundlerParam.java Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/StandardBundlerParam.java Thu Oct 18 21:04:15 2018 -0400
@@ -146,7 +146,7 @@
(s, p) -> getMainJar(s, p)
);
- // TODO: test CLASSPATH jar manifest Attributet
+ // TODO: test CLASSPATH jar manifest Attributet
public static final StandardBundlerParam<String> CLASSPATH =
new StandardBundlerParam<>(
I18N.getString("param.classpath.name"),
@@ -170,7 +170,7 @@
params -> {
if (Arguments.CREATE_JRE_INSTALLER.fetchFrom(params)) {
return null;
- }
+ }
extractMainClassInfoFromAppResources(params);
String s = (String) params.get(
BundleParams.PARAM_APPLICATION_CLASS);
@@ -615,16 +615,6 @@
(s, p) -> Boolean.valueOf(s)
);
- public static final BundlerParamInfo<Boolean> ECHO_MODE =
- new StandardBundlerParam<> (
- I18N.getString("param.echo-mode.name"),
- I18N.getString("param.echo-mode.description"),
- Arguments.CLIOptions.ECHO_MODE.getId(),
- Boolean.class,
- params -> Boolean.FALSE,
- (s, p) -> Boolean.valueOf(s)
- );
-
public static File getPredefinedAppImage(Map<String, ? super Object> p) {
File applicationImage = null;
if (PREDEFINED_APP_IMAGE.fetchFrom(p) != null) {
--- a/src/jdk.packager/share/classes/jdk/packager/internal/ValidOptions.java Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/ValidOptions.java Thu Oct 18 21:04:15 2018 -0400
@@ -63,7 +63,6 @@
add(CLIOptions.CREATE_IMAGE, CLIOptions.JVM_ARGS);
add(CLIOptions.CREATE_IMAGE, CLIOptions.SECONDARY_LAUNCHER);
add(CLIOptions.CREATE_IMAGE, CLIOptions.BUILD_ROOT);
- add(CLIOptions.CREATE_IMAGE, CLIOptions.ECHO_MODE);
add(CLIOptions.CREATE_IMAGE, CLIOptions.PREDEFINED_RUNTIME_IMAGE);
add(CLIOptions.CREATE_IMAGE, CLIOptions.MAIN_JAR);
add(CLIOptions.CREATE_IMAGE, CLIOptions.MODULE);
@@ -143,7 +142,6 @@
add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.VERSION);
add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.BUILD_ROOT);
add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.INSTALL_DIR);
- add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.ECHO_MODE);
add(CLIOptions.CREATE_JRE_INSTALLER,
CLIOptions.PREDEFINED_RUNTIME_IMAGE);
add(CLIOptions.CREATE_JRE_INSTALLER, CLIOptions.ADD_MODULES);
--- a/src/jdk.packager/share/classes/jdk/packager/internal/resources/CLIHelp.properties Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/resources/CLIHelp.properties Thu Oct 18 21:04:15 2018 -0400
@@ -111,9 +111,6 @@
\ --install-dir <file path>\n\
\ Installation directory of the application. Ignored on Windows, use\n\
\ --win-dir-chooser to provide an ability to choose an installation directory.\n\
-\ --echo-mode\n\
-\ Outputs (without executing) native packaging commands so that users\n\
-\ can use this as a starting point for addressing more complex needs.\n\
\ --license-file <file name>\n\
\ The license file, relative to the base directory.\n\
\ --copyright <copyright string>\n\
--- a/src/jdk.packager/share/classes/jdk/packager/internal/resources/CLIHelpi_ja.properties Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/resources/CLIHelpi_ja.properties Thu Oct 18 21:04:15 2018 -0400
@@ -111,9 +111,6 @@
\ --install-dir <file path>\n\
\ Installation directory of the application. Ignored on Windows, use\n\
\ --win-dir-chooser to provide an ability to choose an installation directory.\n\
-\ --echo-mode\n\
-\ Outputs (without executing) native packaging commands so that users\n\
-\ can use this as a starting point for addressing more complex needs.\n\
\ --license-file <file name>\n\
\ The license file, relative to the base directory.\n\
\ --copyright <copyright string>\n\
--- a/src/jdk.packager/share/classes/jdk/packager/internal/resources/CLIHelpi_zh_CN.properties Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/resources/CLIHelpi_zh_CN.properties Thu Oct 18 21:04:15 2018 -0400
@@ -111,9 +111,6 @@
\ --install-dir <file path>\n\
\ Installation directory of the application. Ignored on Windows, use\n\
\ --win-dir-chooser to provide an ability to choose an installation directory.\n\
-\ --echo-mode\n\
-\ Outputs (without executing) native packaging commands so that users\n\
-\ can use this as a starting point for addressing more complex needs.\n\
\ --license-file <file name>\n\
\ The license file, relative to the base directory.\n\
\ --copyright <copyright string>\n\
--- a/src/jdk.packager/share/classes/jdk/packager/internal/resources/StandardBundlerParam.properties Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/share/classes/jdk/packager/internal/resources/StandardBundlerParam.properties Thu Oct 18 21:04:15 2018 -0400
@@ -152,9 +152,6 @@
param.install-dir.name=Installation Directory
param.install-dir.description=Installation directory of the application.
-param.echo-mode.name=Echo Mode
-param.echo-mode.description=Outputs (without executing) native packaging commands so that users can use this as a starting point for addressing more complex needs.
-
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
--- a/src/jdk.packager/windows/classes/jdk/packager/internal/builders/windows/WindowsAppImageBuilder.java Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/windows/classes/jdk/packager/internal/builders/windows/WindowsAppImageBuilder.java Thu Oct 18 21:04:15 2018 -0400
@@ -252,10 +252,8 @@
}
protected void cleanupConfigFiles(Map<String, ? super Object> params) {
- if (!StandardBundlerParam.ECHO_MODE.fetchFrom(params)) {
- getConfig_AppIcon(params).delete();
- getConfig_ExecutableProperties(params).delete();
- }
+ getConfig_AppIcon(params).delete();
+ getConfig_ExecutableProperties(params).delete();
}
@Override
@@ -303,14 +301,7 @@
Log.info("Exception: "+ex);
Log.debug(ex);
} finally {
-
- if (ECHO_MODE.fetchFrom(params)) {
- Log.info(MessageFormat.format(I18N.getString(
- "message.config-save-location"),
- getConfigRoot(params).getAbsolutePath()));
- } else {
- cleanupConfigFiles(params);
- }
+ cleanupConfigFiles(params);
}
}
@@ -457,7 +448,7 @@
"--icon-swap",
iconTarget.getAbsolutePath(),
launcher.getAbsolutePath());
- IOUtils.exec(pb, ECHO_MODE.fetchFrom(p));
+ IOUtils.exec(pb, false);
}
File executableProperties = getConfig_ExecutableProperties(p);
@@ -468,7 +459,7 @@
"--version-swap",
executableProperties.getAbsolutePath(),
launcher.getAbsolutePath());
- IOUtils.exec(pb, ECHO_MODE.fetchFrom(p));
+ IOUtils.exec(pb, false);
}
}
finally {
--- a/src/jdk.packager/windows/classes/jdk/packager/internal/resources/builders/windows/WindowsAppImageBuilder.properties Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/windows/classes/jdk/packager/internal/resources/builders/windows/WindowsAppImageBuilder.properties Thu Oct 18 21:04:15 2018 -0400
@@ -39,7 +39,6 @@
error.cannot-create-output-dir=Output directory {0} cannot be created.
error.cannot-write-to-output-dir=Output directory {0} is not writable.
-message.config-save-location=Config files are saved to {0}. Use them to customize package.
message.potential.windows.defender.issue=Warning: Windows Defender may prevent the Java Packager from functioning. If there is an issue, it can be addressed by either disabling realtime monitoring, or adding an exclusion for the directory "{0}".
resource.executable-properties-template=Template for creating executable properties file.
--- a/src/jdk.packager/windows/classes/jdk/packager/internal/resources/builders/windows/WindowsAppImageBuilder_ja.properties Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/windows/classes/jdk/packager/internal/resources/builders/windows/WindowsAppImageBuilder_ja.properties Thu Oct 18 21:04:15 2018 -0400
@@ -39,7 +39,6 @@
error.cannot-create-output-dir=\u51FA\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{0}\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3002
error.cannot-write-to-output-dir=\u51FA\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{0}\u306F\u66F8\u8FBC\u307F\u4E0D\u53EF\u3067\u3059\u3002
-message.config-save-location=\u69CB\u6210\u30D5\u30A1\u30A4\u30EB\u304C{0}\u306B\u4FDD\u5B58\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA\u3059\u308B\u306B\u306F\u3053\u308C\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
message.potential.windows.defender.issue=\u8B66\u544A: Windows Defender\u304C\u539F\u56E0\u3067Java\u30D1\u30C3\u30B1\u30FC\u30B8\u30E3\u304C\u6A5F\u80FD\u3057\u306A\u3044\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002\u554F\u984C\u304C\u767A\u751F\u3057\u305F\u5834\u5408\u306F\u3001\u30EA\u30A2\u30EB\u30BF\u30A4\u30E0\u30FB\u30E2\u30CB\u30BF\u30EA\u30F3\u30B0\u3092\u7121\u52B9\u306B\u3059\u308B\u304B\u3001\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA"{0}"\u306E\u9664\u5916\u3092\u8FFD\u52A0\u3059\u308B\u3053\u3068\u306B\u3088\u308A\u3001\u554F\u984C\u306B\u5BFE\u51E6\u3067\u304D\u307E\u3059\u3002
resource.executable-properties-template=\u5B9F\u884C\u53EF\u80FD\u306A\u30D7\u30ED\u30D1\u30C6\u30A3\u30FB\u30D5\u30A1\u30A4\u30EB\u4F5C\u6210\u7528\u306E\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u3002
--- a/src/jdk.packager/windows/classes/jdk/packager/internal/resources/builders/windows/WindowsAppImageBuilder_zh_CN.properties Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/windows/classes/jdk/packager/internal/resources/builders/windows/WindowsAppImageBuilder_zh_CN.properties Thu Oct 18 21:04:15 2018 -0400
@@ -39,7 +39,6 @@
error.cannot-create-output-dir=\u65E0\u6CD5\u521B\u5EFA\u8F93\u51FA\u76EE\u5F55 {0}\u3002
error.cannot-write-to-output-dir=\u8F93\u51FA\u76EE\u5F55 {0} \u4E0D\u53EF\u5199\u3002
-message.config-save-location=\u914D\u7F6E\u6587\u4EF6\u5DF2\u4FDD\u5B58\u5230 {0}\u3002\u4F7F\u7528\u8FD9\u4E9B\u914D\u7F6E\u6587\u4EF6\u53EF\u5B9A\u5236\u7A0B\u5E8F\u5305\u3002
message.potential.windows.defender.issue=\u8B66\u544A: Windows Defender \u53EF\u80FD\u4F1A\u963B\u6B62 Java \u6253\u5305\u7A0B\u5E8F\u6B63\u5E38\u5DE5\u4F5C\u3002\u5982\u679C\u5B58\u5728\u95EE\u9898, \u53EF\u4EE5\u901A\u8FC7\u7981\u7528\u5B9E\u65F6\u76D1\u89C6\u6216\u8005\u4E3A\u76EE\u5F55 "{0}" \u6DFB\u52A0\u6392\u9664\u9879\u8FDB\u884C\u89E3\u51B3\u3002
resource.executable-properties-template=\u7528\u4E8E\u521B\u5EFA\u53EF\u6267\u884C\u5C5E\u6027\u6587\u4EF6\u7684\u6A21\u677F\u3002
--- a/src/jdk.packager/windows/classes/jdk/packager/internal/resources/windows/WinAppBundler.properties Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/windows/classes/jdk/packager/internal/resources/windows/WinAppBundler.properties Thu Oct 18 21:04:15 2018 -0400
@@ -53,6 +53,5 @@
message.creating-app-bundle=Creating app bundle\: {0} in {1}
message.result-dir=Result application bundle\: {0}
-message.config-save-location=Config files are saved to {0}. Use them to customize package.
message.disable-bit-architecture-check=Disabled check for bit architecture mismatch.
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.packager/windows/classes/jdk/packager/internal/resources/windows/WinAppBundler_ja.properties Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/windows/classes/jdk/packager/internal/resources/windows/WinAppBundler_ja.properties Thu Oct 18 21:04:15 2018 -0400
@@ -53,6 +53,5 @@
message.creating-app-bundle=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30F3\u30C9\u30EB\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059: {1}\u5185\u306E{0}
message.result-dir=\u7D50\u679C\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30F3\u30C9\u30EB: {0}
-message.config-save-location=\u69CB\u6210\u30D5\u30A1\u30A4\u30EB\u304C{0}\u306B\u4FDD\u5B58\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA\u3059\u308B\u306B\u306F\u3053\u308C\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
message.disable-bit-architecture-check=\u30D3\u30C3\u30C8\u30FB\u30A2\u30FC\u30AD\u30C6\u30AF\u30C1\u30E3\u306E\u4E0D\u4E00\u81F4\u30C1\u30A7\u30C3\u30AF\u304C\u7121\u52B9\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3002
message.icon-not-ico=\u6307\u5B9A\u3057\u305F\u30A2\u30A4\u30B3\u30F3"{0}"\u306FICO\u30D5\u30A1\u30A4\u30EB\u3067\u306F\u306A\u304F\u3001\u4F7F\u7528\u3055\u308C\u307E\u305B\u3093\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30A2\u30A4\u30B3\u30F3\u304C\u305D\u306E\u4F4D\u7F6E\u306B\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002
--- a/src/jdk.packager/windows/classes/jdk/packager/internal/resources/windows/WinAppBundler_zh_CN.properties Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/windows/classes/jdk/packager/internal/resources/windows/WinAppBundler_zh_CN.properties Thu Oct 18 21:04:15 2018 -0400
@@ -53,6 +53,5 @@
message.creating-app-bundle=\u6B63\u5728 {1} \u4E2D\u521B\u5EFA\u5E94\u7528\u7A0B\u5E8F\u5305 {0}
message.result-dir=\u751F\u6210\u7684\u5E94\u7528\u7A0B\u5E8F\u5305: {0}
-message.config-save-location=\u914D\u7F6E\u6587\u4EF6\u5DF2\u4FDD\u5B58\u5230 {0}\u3002\u4F7F\u7528\u8FD9\u4E9B\u914D\u7F6E\u6587\u4EF6\u53EF\u5B9A\u5236\u7A0B\u5E8F\u5305\u3002
message.disable-bit-architecture-check=\u5DF2\u7981\u7528\u4F4D\u4F53\u7CFB\u7ED3\u6784\u4E0D\u5339\u914D\u68C0\u67E5\u3002
message.icon-not-ico=\u6307\u5B9A\u7684\u56FE\u6807 "{0}" \u4E0D\u662F ICO \u6587\u4EF6, \u4E0D\u4F1A\u4F7F\u7528\u3002\u5C06\u4F7F\u7528\u9ED8\u8BA4\u56FE\u6807\u4EE3\u66FF\u3002
--- a/src/jdk.packager/windows/classes/jdk/packager/internal/resources/windows/WinExeBundler.properties Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/windows/classes/jdk/packager/internal/resources/windows/WinExeBundler.properties Thu Oct 18 21:04:15 2018 -0400
@@ -81,7 +81,6 @@
message.tool-wrong-version=Detected [{0}] version {1} but version {2} is required.
message.debug-working-directory=Kept working directory for debug\: {0}
-message.config-save-location=\ Config files are saved to {0}. Use them to customize package.
message.outputting-to-location=Generating EXE for installer to\: {0}
message.output-location=Installer (.exe) saved to\: {0}
message.tool-version=\ Detected [{0}] version [{1}]
@@ -99,7 +98,6 @@
message.use-wix36-features=WiX 3.6 detected. Enabling advanced cleanup action.
message.version-string-too-many-components=Version sting may have up to 3 components - major.minor.build .
message.debug-working-directory=Kept working directory for debug\: {0}
-message.config-save-location=Config files are saved to {0}. Use them to customize package.
message.one-shortcut-required=At least one type of shortcut is required. Enabling menu shortcut.
message.creating-association-with-null-extension=Creating association with null extension.
message.truncating.id=Truncating Application ID to 126 chars for Inno Setup.
--- a/src/jdk.packager/windows/classes/jdk/packager/internal/resources/windows/WinExeBundler_ja.properties Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/windows/classes/jdk/packager/internal/resources/windows/WinExeBundler_ja.properties Thu Oct 18 21:04:15 2018 -0400
@@ -79,27 +79,12 @@
error.cannot-create-output-dir=Output directory {0} cannot be created.
error.cannot-write-to-output-dir=Output directory {0} is not writable.
-message.tool-wrong-version=Detected [{0}] version {1} but version {2} is required.
-message.debug-working-directory=Kept working directory for debug\: {0}
-message.config-save-location=\ Config files are saved to {0}. Use them to customize package.
-message.outputting-to-location=Generating EXE for installer to\: {0}
-message.output-location=Installer (.exe) saved to\: {0}
-message.tool-version=\ Detected [{0}] version [{1}]
-message.one-shortcut-required=At least one type of shortcut is required. Enabling menu shortcut.
-message.running-wsh-script=Running WSH script on application image [{0}]
-message.iscc-file-string=\ InnoSetup compiler set to {0}
-message.creating-association-with-null-extension=Creating association with null extension.
-message.potential.windows.defender.issue=Warning: Windows Defender may prevent the Java Packager from functioning. If there is an issue, it can be addressed by either disabling realtime monitoring, or adding an exclusion for the directory "{0}".
-
-
-
message.tool-version=Detected [{0}] version [{1}]
message.running-wsh-script=Running WSH script on application image [{0}]
message.wrong-tool-version=Detected [{0}] version {1} but version {2} is required.
message.use-wix36-features=WiX 3.6 detected. Enabling advanced cleanup action.
message.version-string-too-many-components=Version sting may have up to 3 components - major.minor.build .
message.debug-working-directory=Kept working directory for debug\: {0}
-message.config-save-location=Config files are saved to {0}. Use them to customize package.
message.one-shortcut-required=At least one type of shortcut is required. Enabling menu shortcut.
message.creating-association-with-null-extension=Creating association with null extension.
message.truncating.id=Truncating Application ID to 126 chars for Inno Setup.
--- a/src/jdk.packager/windows/classes/jdk/packager/internal/resources/windows/WinExeBundler_zh_CN.properties Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/windows/classes/jdk/packager/internal/resources/windows/WinExeBundler_zh_CN.properties Thu Oct 18 21:04:15 2018 -0400
@@ -81,7 +81,6 @@
message.tool-wrong-version=Detected [{0}] version {1} but version {2} is required.
message.debug-working-directory=Kept working directory for debug\: {0}
-message.config-save-location=\ Config files are saved to {0}. Use them to customize package.
message.outputting-to-location=Generating EXE for installer to\: {0}
message.output-location=Installer (.exe) saved to\: {0}
message.tool-version=\ Detected [{0}] version [{1}]
@@ -90,16 +89,3 @@
message.iscc-file-string=\ InnoSetup compiler set to {0}
message.creating-association-with-null-extension=Creating association with null extension.
message.potential.windows.defender.issue=Warning: Windows Defender may prevent the Java Packager from functioning. If there is an issue, it can be addressed by either disabling realtime monitoring, or adding an exclusion for the directory "{0}".
-
-
-
-message.tool-version=Detected [{0}] version [{1}]
-message.running-wsh-script=Running WSH script on application image [{0}]
-message.wrong-tool-version=Detected [{0}] version {1} but version {2} is required.
-message.use-wix36-features=WiX 3.6 detected. Enabling advanced cleanup action.
-message.version-string-too-many-components=Version sting may have up to 3 components - major.minor.build .
-message.debug-working-directory=Kept working directory for debug\: {0}
-message.config-save-location=Config files are saved to {0}. Use them to customize package.
-message.one-shortcut-required=At least one type of shortcut is required. Enabling menu shortcut.
-message.creating-association-with-null-extension=Creating association with null extension.
-message.truncating.id=Truncating Application ID to 126 chars for Inno Setup.
--- a/src/jdk.packager/windows/classes/jdk/packager/internal/resources/windows/WinMsiBundler.properties Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/windows/classes/jdk/packager/internal/resources/windows/WinMsiBundler.properties Thu Oct 18 21:04:15 2018 -0400
@@ -91,7 +91,6 @@
message.use-wix36-features=WiX 3.6 detected. Enabling advanced cleanup action.
message.version-string-too-many-components=Version sting may have up to 3 components - major.minor.build .
message.debug-working-directory=Kept working directory for debug\: {0}
-message.config-save-location=Config files are saved to {0}. Use them to customize package.
message.generated-product-guid=Generated product GUID\: {0}
message.preparing-msi-config=Preparing MSI config\: {0}
message.generating-msi=Generating MSI\: {0}
--- a/src/jdk.packager/windows/classes/jdk/packager/internal/resources/windows/WinMsiBundler_ja.properties Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/windows/classes/jdk/packager/internal/resources/windows/WinMsiBundler_ja.properties Thu Oct 18 21:04:15 2018 -0400
@@ -82,7 +82,6 @@
message.use-wix36-features=WiX 3.6\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002\u62E1\u5F35\u30AF\u30EA\u30FC\u30F3\u30A2\u30C3\u30D7\u30FB\u30A2\u30AF\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u5316\u3057\u3066\u3044\u307E\u3059\u3002
message.version-string-too-many-components=\u30D0\u30FC\u30B8\u30E7\u30F3\u6587\u5B57\u5217\u306B\u306F\u3001\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30923\u3064(\u30E1\u30B8\u30E3\u30FC.\u30DE\u30A4\u30CA\u30FC.\u30D3\u30EB\u30C9)\u307E\u3067\u542B\u3081\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002
message.debug-working-directory=\u30C7\u30D0\u30C3\u30B0\u306E\u4F5C\u696D\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304C\u4FDD\u6301\u3055\u308C\u307E\u3057\u305F: {0}
-message.config-save-location=\u69CB\u6210\u30D5\u30A1\u30A4\u30EB\u304C{0}\u306B\u4FDD\u5B58\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA\u3059\u308B\u306B\u306F\u3053\u308C\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
message.generated-product-guid=\u88FD\u54C1GUID\u3092\u751F\u6210\u3057\u307E\u3057\u305F: {0}
message.preparing-msi-config=MSI\u69CB\u6210\u3092\u6E96\u5099\u3057\u3066\u3044\u307E\u3059: {0}
message.generating-msi=MSI\u3092\u751F\u6210\u3057\u3066\u3044\u307E\u3059: {0}
--- a/src/jdk.packager/windows/classes/jdk/packager/internal/resources/windows/WinMsiBundler_zh_CN.properties Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/windows/classes/jdk/packager/internal/resources/windows/WinMsiBundler_zh_CN.properties Thu Oct 18 21:04:15 2018 -0400
@@ -82,7 +82,6 @@
message.use-wix36-features=\u68C0\u6D4B\u5230 WiX 3.6\u3002\u6B63\u5728\u542F\u7528\u9AD8\u7EA7\u6E05\u9664\u64CD\u4F5C\u3002
message.version-string-too-many-components=\u7248\u672C\u5B57\u7B26\u4E32\u6700\u591A\u53EF\u4EE5\u5177\u6709 3 \u4E2A\u7EC4\u6210\u90E8\u5206 - major.minor.build\u3002
message.debug-working-directory=\u7528\u4E8E\u8C03\u8BD5\u7684\u5DF2\u4FDD\u7559\u5DE5\u4F5C\u76EE\u5F55: {0}
-message.config-save-location=\u914D\u7F6E\u6587\u4EF6\u5DF2\u4FDD\u5B58\u5230 {0}\u3002\u4F7F\u7528\u8FD9\u4E9B\u914D\u7F6E\u6587\u4EF6\u53EF\u5B9A\u5236\u7A0B\u5E8F\u5305\u3002
message.generated-product-guid=\u5DF2\u751F\u6210\u4EA7\u54C1 GUID: {0}
message.preparing-msi-config=\u6B63\u5728\u51C6\u5907 MSI \u914D\u7F6E: {0}
message.generating-msi=\u6B63\u5728\u751F\u6210 MSI: {0}
--- a/src/jdk.packager/windows/classes/jdk/packager/internal/windows/WinExeBundler.java Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/windows/classes/jdk/packager/internal/windows/WinExeBundler.java Thu Oct 18 21:04:15 2018 -0400
@@ -509,32 +509,6 @@
APP_NAME.fetchFrom(p) + "-post-image.wsf");
}
- protected void saveConfigFiles(Map<String, ? super Object> p) {
- try {
- File configRoot = CONFIG_ROOT.fetchFrom(p);
- if (getConfig_ExeProjectFile(p).exists()) {
- IOUtils.copyFile(getConfig_ExeProjectFile(p),
- new File(configRoot,
- getConfig_ExeProjectFile(p).getName()));
- }
- if (getConfig_Script(p).exists()) {
- IOUtils.copyFile(getConfig_Script(p),
- new File(configRoot,
- getConfig_Script(p).getName()));
- }
- if (getConfig_SmallInnoSetupIcon(p).exists()) {
- IOUtils.copyFile(getConfig_SmallInnoSetupIcon(p),
- new File(configRoot,
- getConfig_SmallInnoSetupIcon(p).getName()));
- }
- Log.info(MessageFormat.format(
- getString("message.config-save-location"),
- configRoot.getAbsolutePath()));
- } catch (IOException ioe) {
- ioe.printStackTrace();
- }
- }
-
private String getAppIdentifier(Map<String, ? super Object> p) {
String nm = IDENTIFIER.fetchFrom(p);
--- a/src/jdk.packager/windows/classes/jdk/packager/internal/windows/WinMsiBundler.java Thu Oct 18 18:04:05 2018 -0400
+++ b/src/jdk.packager/windows/classes/jdk/packager/internal/windows/WinMsiBundler.java Thu Oct 18 21:04:15 2018 -0400
@@ -110,7 +110,7 @@
params -> true, // MSIs default to system wide
// valueOf(null) is false,
// and we actually do want null
- (s, p) -> (s == null || "null".equalsIgnoreCase(s))? null
+ (s, p) -> (s == null || "null".equalsIgnoreCase(s))? null
: Boolean.valueOf(s)
);
@@ -185,7 +185,7 @@
return null;
},
null);
-
+
public static final StandardBundlerParam<Boolean> MENU_HINT =
new WindowsBundlerParam<>(
I18N.getString("param.menu-shortcut-hint.name"),
@@ -582,7 +582,7 @@
I18N.getString("message.running-wsh-script"),
configScript.getAbsolutePath()));
IOUtils.run("wscript",
- configScript, ECHO_MODE.fetchFrom(p));
+ configScript, false);
}
return buildMSI(p, outdir);
}
@@ -595,7 +595,7 @@
if (imageDir != null &&
PREDEFINED_APP_IMAGE.fetchFrom(p) == null &&
(PREDEFINED_RUNTIME_IMAGE.fetchFrom(p) == null ||
- !Arguments.CREATE_JRE_INSTALLER.fetchFrom(p)) &&
+ !Arguments.CREATE_JRE_INSTALLER.fetchFrom(p)) &&
!Log.isDebug()) {
IOUtils.deleteRecursive(imageDir);
} else if (imageDir != null) {
@@ -603,13 +603,8 @@
I18N.getString("message.debug-working-directory"),
imageDir.getAbsolutePath()));
}
- if (ECHO_MODE.fetchFrom(p)) {
- Log.info(MessageFormat.format(
- I18N.getString("message.config-save-location"),
- CONFIG_ROOT.fetchFrom(p).getAbsolutePath()));
- } else {
- cleanupConfigFiles(p);
- }
+
+ cleanupConfigFiles(p);
} catch (IOException ex) {
// noinspection ReturnInsideFinallyBlock
Log.debug(ex.getMessage());
@@ -619,13 +614,11 @@
}
protected void cleanupConfigFiles(Map<String, ? super Object> params) {
- if(!StandardBundlerParam.ECHO_MODE.fetchFrom(params)) {
- if (getConfig_ProjectFile(params) != null) {
- getConfig_ProjectFile(params).delete();
- }
- if (getConfig_Script(params) != null) {
- getConfig_Script(params).delete();
- }
+ if (getConfig_ProjectFile(params) != null) {
+ getConfig_ProjectFile(params).delete();
+ }
+ if (getConfig_Script(params) != null) {
+ getConfig_Script(params).delete();
}
}
@@ -1159,7 +1152,7 @@
"-ext", "WixUtilExtension",
"-out", candleOut.getAbsolutePath());
pb = pb.directory(WIN_APP_IMAGE.fetchFrom(params));
- IOUtils.exec(pb, ECHO_MODE.fetchFrom(params));
+ IOUtils.exec(pb, false);
Log.verbose(MessageFormat.format(I18N.getString(
"message.generating-msi"), msiOut.getAbsolutePath()));
@@ -1191,7 +1184,7 @@
pb = new ProcessBuilder(commandLine);
pb = pb.directory(WIN_APP_IMAGE.fetchFrom(params));
- IOUtils.exec(pb, ECHO_MODE.fetchFrom(params));
+ IOUtils.exec(pb, false);
candleOut.delete();
IOUtils.deleteRecursive(tmpDir);