[JENKINS-8957] JDK installation influences already installed java ins…

…tances
jenkinsci · Sep 18, 2013 · 4f6e649 · 4f6e649
1 parent 63bffae
commit 4f6e649
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/core/src/main/java/hudson/tools/JDKInstaller.java b/core/src/main/java/hudson/tools/JDKInstaller.java
@@ -242,8 +242,13 @@ I tried to locate exactly how InstallShield parses the arguments (and why it use
                         + "\\jdk.exe.install.log\\\"\"");
             } else {
                 // Installed uses Windows Installer (MSI)
-                args.add(jdkBundle, "/s", "REBOOT=ReallySuppress",
-                        "INSTALLDIR=" + expectedLocation,
+                args.add(jdkBundle, "/s");
+
+                // Create a private JRE by omitting "PublicjreFeature"
+                // @see http://docs.oracle.com/javase/7/docs/webnotes/install/windows/jdk-installation-windows.html#jdk-silent-installation
+                args.add("ADDLOCAL=\"ToolsFeature\"");
+
+                args.add("REBOOT=ReallySuppress", "INSTALLDIR=" + expectedLocation,
                         "/L \\\"" + expectedLocation + "\\jdk.exe.install.log\\\"");
             }
             int r = launcher.launch().cmds(args).stdout(out)