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: erikj
  • Loading branch information
Alexey Semenyuk committed May 5, 2022
1 parent 9644a31 commit e7adc28
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

3 comments on commit e7adc28

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

@GoeLin
Copy link
Member

@GoeLin GoeLin commented on e7adc28 Jun 15, 2022

Choose a reason for hiding this comment

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

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on e7adc28 Jun 15, 2022

Choose a reason for hiding this comment

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

@GoeLin the backport was successfully created on the branch GoeLin-backport-e7adc283 in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit e7adc283 from the openjdk/jdk repository.

The commit being backported was authored by Alexey Semenyuk on 5 May 2022 and was reviewed by Erik Joelsson.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev GoeLin-backport-e7adc283:GoeLin-backport-e7adc283
$ git checkout GoeLin-backport-e7adc283
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev GoeLin-backport-e7adc283

Please sign in to comment.