Skip to content

Commit f503874

Browse files
Fix bad merge
1 parent a3cdac4 commit f503874

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExeBundler.java

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -24,18 +24,17 @@
2424
*/
2525
package jdk.jpackage.internal;
2626

27-
import jdk.jpackage.internal.model.WinExePackage;
28-
import jdk.jpackage.internal.model.ConfigException;
29-
import jdk.jpackage.internal.model.PackagerException;
27+
import static jdk.jpackage.internal.StandardBundlerParam.ICON;
28+
import static jdk.jpackage.internal.util.function.ThrowingRunnable.toRunnable;
29+
3030
import java.io.IOException;
31-
import java.io.InputStream;
3231
import java.nio.file.Files;
3332
import java.nio.file.Path;
3433
import java.nio.file.StandardCopyOption;
3534
import java.util.Map;
36-
import static jdk.jpackage.internal.util.function.ThrowingRunnable.toRunnable;
37-
import static jdk.jpackage.internal.StandardBundlerParam.ICON;
38-
import jdk.jpackage.internal.resources.ResourceLocator;
35+
import jdk.jpackage.internal.model.ConfigException;
36+
import jdk.jpackage.internal.model.PackagerException;
37+
import jdk.jpackage.internal.model.WinExePackage;
3938

4039
@SuppressWarnings("restricted")
4140
public class WinExeBundler extends AbstractBundler {
@@ -114,9 +113,11 @@ private Path buildEXE(BuildEnv env, WinExePackage pkg, Path msi,
114113

115114
// Copy template msi wrapper next to msi file
116115
final Path exePath = msi.getParent().resolve(pkg.packageFileNameWithSuffix());
117-
try (InputStream is = ResourceLocator.class.getResourceAsStream("msiwrapper.exe")) {
118-
Files.copy(is, exePath);
119-
}
116+
117+
env.createResource("msiwrapper.exe")
118+
.setCategory(I18N.getString("resource.installer-exe"))
119+
.setPublicName("installer.exe")
120+
.saveToFile(exePath);
120121

121122
new ExecutableRebrander(pkg, env::createResource, resourceLock -> {
122123
// Embed msi in msi wrapper exe.

0 commit comments

Comments
 (0)