Skip to content

Commit

Permalink
8284675: "jpackage.exe" creates application launcher without Windows …
Browse files Browse the repository at this point in the history
…Application Manfiest

Reviewed-by: asemenyuk
Backport-of: e7adc283c60c6c8e7bb174b45a2cd68823a9e81e
  • Loading branch information
GoeLin committed Jun 21, 2022
1 parent 4dd34b7 commit e4d1d62
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion make/modules/jdk.jpackage/Lib.gmk
@@ -1,5 +1,5 @@
#
# Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
Expand All @@ -24,6 +24,7 @@
#

include LibCommon.gmk
include LauncherCommon.gmk

################################################################################

Expand Down Expand Up @@ -75,6 +76,8 @@ $(eval $(call SetupJdkExecutable, BUILD_JPACKAGE_APPLAUNCHEREXE, \
LIBS_macosx := $(LIBCXX) -framework Cocoa, \
LIBS_windows := $(LIBCXX), \
LIBS_linux := -ldl, \
MANIFEST := $(JAVA_MANIFEST), \
MANIFEST_VERSION := $(VERSION_NUMBER_FOUR_POSITIONS) \
))

JPACKAGE_TARGETS += $(BUILD_JPACKAGE_APPLAUNCHEREXE)
Expand Down Expand Up @@ -175,6 +178,8 @@ ifeq ($(call isTargetOs, windows), true)
LDFLAGS := $(BUILD_JPACKAGE_APPLAUNCHEREXE_LDFLAGS), \
LIBS := $(BUILD_JPACKAGE_APPLAUNCHEREXE_LIBS), \
LIBS_windows := $(BUILD_JPACKAGE_APPLAUNCHEREXE_LIBS_windows), \
MANIFEST := $(JAVA_MANIFEST), \
MANIFEST_VERSION := $(VERSION_NUMBER_FOUR_POSITIONS) \
))

JPACKAGE_TARGETS += $(BUILD_JPACKAGE_APPLAUNCHERWEXE)
Expand Down

1 comment on commit e4d1d62

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.