infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-07-30 04:43:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

8370134: Fix minor jpackage issues

Browse Source 
Reviewed-by: almatvee
This commit is contained in:
Alexey Semenyuk 2025-10-18 01:11:19 +00:00
parent 4625199358
commit b0af41d667
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java
View File

@ -125,7 +125,7 @@ public class Arguments {
for (String arg : args) {
argList.add(arg);
}
Log.verbose ("\njpackage argument list: \n" + argList + "\n");
pos = 0;
deployParams = new DeployParams();

2
src/jdk.jpackage/share/classes/jdk/jpackage/internal/FromParams.java
View File

@ -120,7 +120,7 @@ final class FromParams {
final var runtimeBuilderBuilder = new RuntimeBuilderBuilder();
MODULE_PATH.copyInto(params, runtimeBuilderBuilder::modulePath);
runtimeBuilderBuilder.modulePath(MODULE_PATH.fetchFrom(params));
predefinedRuntimeDirectory.ifPresentOrElse(runtimeBuilderBuilder::forRuntime, () -> {
final var startupInfos = launchers.asList().stream()

2
src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExeBundler.java
View File

@ -65,7 +65,7 @@ public class WinExeBundler extends AbstractBundler {
@Override
public boolean validate(Map<String, ? super Object> params)
throws ConfigException {
return msiBundler.validate(params);
return msiBundler.validate(params, WinFromParams.EXE_PACKAGE);
}
@Override

9
src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java
View File

@ -30,6 +30,7 @@ import static jdk.jpackage.internal.model.ConfigException.rethrowConfigException
import java.nio.file.Path;
import java.util.Map;
import jdk.jpackage.internal.model.ConfigException;
import jdk.jpackage.internal.model.Package;
import jdk.jpackage.internal.model.PackagerException;
import jdk.jpackage.internal.model.WinMsiPackage;
import jdk.jpackage.internal.util.Result;
@ -80,11 +81,15 @@ public class WinMsiBundler extends AbstractBundler {
}
@Override
public boolean validate(Map<String, ? super Object> params)
public boolean validate(Map<String, ? super Object> params) throws ConfigException {
return validate(params, WinFromParams.MSI_PACKAGE);
}
boolean validate(Map<String, ? super Object> params, BundlerParamInfo<? extends Package> pkgParam)
throws ConfigException {
try {
// Order is important!
WinFromParams.APPLICATION.fetchFrom(params);
pkgParam.fetchFrom(params);
BuildEnvFromParams.BUILD_ENV.fetchFrom(params);
final var wixToolset = sysEnv.orElseThrow().wixToolset();