infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 03:58:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

8364129: Rename libwixhelper

Browse Source 
Reviewed-by: erikj, almatvee
This commit is contained in:
Alexey Semenyuk 2025-08-08 21:41:44 +00:00
parent cd50d78d44
commit c1c0155604
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
make/modules/jdk.jpackage/Lib.gmk
View File

@ -121,15 +121,15 @@ ifeq ($(call isTargetOs, windows), true)
TARGETS += $(BUILD_LIBJPACKAGE)
##############################################################################
## Build libwixhelper
## Build libmsica
##############################################################################
# Build Wix custom action helper
# Build MSI custom action library
# Output library in resources dir, and symbols in the object dir
$(eval $(call SetupJdkLibrary, BUILD_LIBWIXHELPER, \
NAME := wixhelper, \
$(eval $(call SetupJdkLibrary, BUILD_LIBMSICA, \
NAME := msica, \
OUTPUT_DIR := $(JPACKAGE_OUTPUT_DIR), \
SYMBOLS_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libwixhelper, \
SYMBOLS_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libmsica, \
ONLY_EXPORTED := true, \
OPTIMIZATION := LOW, \
EXTRA_SRC := common, \
@ -139,7 +139,7 @@ ifeq ($(call isTargetOs, windows), true)
LIBS_windows := msi.lib ole32.lib shell32.lib shlwapi.lib user32.lib, \
))
TARGETS += $(BUILD_LIBWIXHELPER)
TARGETS += $(BUILD_LIBMSICA)
##############################################################################
## Build msiwrapper

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

@ -120,7 +120,7 @@ final class WixUiFragmentBuilder extends WixFragmentBuilder {
super.addFilesToConfigRoot();
if (withCustomActionsDll) {
String fname = "wixhelper.dll"; // CA dll
String fname = "msica.dll"; // CA dll
try (InputStream is = ResourceLocator.class.getResourceAsStream(fname)) {
Files.copy(is, getConfigRoot().resolve(fname));
}

2
src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/main.wxs
View File

@ -65,7 +65,7 @@
<CustomAction Id="JpDisallowDowngrade" Error="!(loc.DowngradeErrorMessage)" />
<?endif?>
<Binary Id="JpCaDll" SourceFile="wixhelper.dll"/>
<Binary Id="JpCaDll" SourceFile="msica.dll"/>
<CustomAction Id="JpFindRelatedProducts" BinaryKey="JpCaDll" DllEntry="FindRelatedProductsEx" />

0
src/jdk.jpackage/windows/native/libwixhelper/Version.cpp → src/jdk.jpackage/windows/native/libmsica/Version.cpp
View File

0
src/jdk.jpackage/windows/native/libwixhelper/Version.h → src/jdk.jpackage/windows/native/libmsica/Version.h
View File

0
src/jdk.jpackage/windows/native/libwixhelper/libwixhelper.cpp → src/jdk.jpackage/windows/native/libmsica/libmsica.cpp
View File

6
test/jdk/tools/jpackage/windows/WinLongVersionTest.java
View File

@ -126,12 +126,12 @@ public class WinLongVersionTest {
Action ended 12:08:38: FindRelatedProducts. Return value 1.
...
Action start 12:08:38: JpFindRelatedProducts.
Java [12:08:38.180 libwixhelper.cpp:120 (FindRelatedProductsEx)] TRACE: Entering FindRelatedProductsEx
Java [12:08:38.185 libwixhelper.cpp:85 (`anonymous-namespace'::findInstalledPackages)] TRACE: Found {D88EEA02-56CC-34AD-8216-C2CC244FA898} product
Java [12:08:38.180 libmsica.cpp:120 (FindRelatedProductsEx)] TRACE: Entering FindRelatedProductsEx
Java [12:08:38.185 libmsica.cpp:85 (`anonymous-namespace'::findInstalledPackages)] TRACE: Found {D88EEA02-56CC-34AD-8216-C2CC244FA898} product
Java [12:08:38.187 MsiCA.cpp:61 (msi::CAImpl::removeProperty)] TRACE: Removing MSI property 'JP_UPGRADABLE_FOUND'
Java [12:08:38.187 MsiCA.cpp:61 (msi::CAImpl::removeProperty)] TRACE: Removing MSI property 'MIGRATE'
Java [12:08:38.189 MsiCA.cpp:61 (msi::CAImpl::removeProperty)] TRACE: Removing MSI property 'JP_DOWNGRADABLE_FOUND'
Java [12:08:38.190 libwixhelper.cpp:0 (FindRelatedProductsEx)] TRACE: Exiting FindRelatedProductsEx (entered at libwixhelper.cpp:120)
Java [12:08:38.190 libmsica.cpp:0 (FindRelatedProductsEx)] TRACE: Exiting FindRelatedProductsEx (entered at libmsica.cpp:120)
Action ended 12:08:38: JpFindRelatedProducts. Return value 1.
*/
PackageTest test2 = init.get().addInstallVerifier(cmd -> {