Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
8295554: Move the "sizecalc.h" to the correct location 
Reviewed-by: erikj, ihse, prr, kizune, aivanov
  • Loading branch information
@mrserb @aivanov-jdk
mrserb authored and aivanov-jdk committed Oct 25, 2022
1 parent 706d1b7 commit 6673cd8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
1 change: 0 additions & 1 deletion make/common/modules/LauncherCommon.gmk
View file
Expand Up @@ -45,7 +45,6 @@ endif

LAUNCHER_SRC := $(TOPDIR)/src/java.base/share/native/launcher
LAUNCHER_CFLAGS += -I$(TOPDIR)/src/java.base/share/native/launcher \
-I$(TOPDIR)/src/java.desktop/share/native/include \
-I$(TOPDIR)/src/java.base/share/native/libjli \
-I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjli \
-I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/native/libjli \
Expand Down
7 changes: 4 additions & 3 deletions make/modules/java.desktop/lib/Awt2dLibraries.gmk
View file
Expand Up @@ -26,6 +26,7 @@
WIN_AWT_LIB := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt/awt.lib

LIBAWT_DEFAULT_HEADER_DIRS := \
common/awt/utility \
libawt/awt/image \
libawt/awt/image/cvutils \
libawt/java2d \
Expand Down Expand Up @@ -377,7 +378,6 @@ ifeq ($(call isTargetOs, windows macosx), false)
common/awt/debug \
common/font \
common/java2d/opengl \
include \
#

LIBAWT_HEADLESS_CFLAGS := $(CUPS_CFLAGS) $(FONTCONFIG_CFLAGS) $(X_CFLAGS) \
Expand Down Expand Up @@ -480,11 +480,11 @@ endif
LIBFONTMANAGER_EXTRA_HEADER_DIRS := \
libharfbuzz \
common/awt \
common/awt/utility \
common/font \
libawt/java2d \
libawt/java2d/pipe \
libawt/java2d/loops \
include \
#

LIBFONTMANAGER_CFLAGS += $(LIBFREETYPE_CFLAGS)
Expand Down Expand Up @@ -569,6 +569,7 @@ ifeq ($(call isTargetOs, windows), true)
LIBJAWT_EXTRA_HEADER_DIRS := \
include \
common/awt/debug \
common/awt/utility \
libawt/awt/image/cvutils \
libawt/java2d \
libawt/java2d/windows \
Expand Down Expand Up @@ -663,7 +664,7 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
common/awt/systemscale \
#

LIBSPLASHSCREEN_HEADER_DIRS += include
LIBSPLASHSCREEN_HEADER_DIRS += common/awt/utility

ifeq ($(USE_EXTERNAL_LIBGIF), false)
LIBSPLASHSCREEN_HEADER_DIRS += libsplashscreen/giflib
Expand Down
0 ...a.desktop/share/native/include/sizecalc.h → ...hare/native/common/awt/utility/sizecalc.h
View file
File renamed without changes.

11 comments on commit 6673cd8

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

Review

Issues

@mrserb
Copy link
Member Author

@mrserb mrserb commented on 6673cd8 Oct 25, 2022

Choose a reason for hiding this comment

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

/backport jdk19u

@openjdk
Copy link

@openjdk openjdk bot commented on 6673cd8 Oct 25, 2022

Choose a reason for hiding this comment

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

@mrserb the backport was successfully created on the branch mrserb-backport-6673cd85 in my personal fork of openjdk/jdk19u. To create a pull request with this backport targeting openjdk/jdk19u: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 6673cd85 from the openjdk/jdk repository.

The commit being backported was authored by Sergey Bylokhov on 25 Oct 2022 and was reviewed by Erik Joelsson, Magnus Ihse Bursie, Phil Race, Alexander Zuev and Alexey Ivanov.

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/jdk19u:

$ git fetch https://github.com/openjdk-bots/jdk19u mrserb-backport-6673cd85:mrserb-backport-6673cd85
$ git checkout mrserb-backport-6673cd85
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk19u mrserb-backport-6673cd85

@mrserb
Copy link
Member Author

@mrserb mrserb commented on 6673cd8 Oct 25, 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 6673cd8 Oct 25, 2022

Choose a reason for hiding this comment

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

@mrserb the backport was successfully created on the branch mrserb-backport-6673cd85 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 6673cd85 from the openjdk/jdk repository.

The commit being backported was authored by Sergey Bylokhov on 25 Oct 2022 and was reviewed by Erik Joelsson, Magnus Ihse Bursie, Phil Race, Alexander Zuev and Alexey Ivanov.

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 mrserb-backport-6673cd85:mrserb-backport-6673cd85
$ git checkout mrserb-backport-6673cd85
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev mrserb-backport-6673cd85

@mrserb
Copy link
Member Author

@mrserb mrserb commented on 6673cd8 Oct 25, 2022

Choose a reason for hiding this comment

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

/backport jdk15u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 6673cd8 Oct 25, 2022

Choose a reason for hiding this comment

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

@mrserb the backport was successfully created on the branch mrserb-backport-6673cd85 in my personal fork of openjdk/jdk15u-dev. To create a pull request with this backport targeting openjdk/jdk15u-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 6673cd85 from the openjdk/jdk repository.

The commit being backported was authored by Sergey Bylokhov on 25 Oct 2022 and was reviewed by Erik Joelsson, Magnus Ihse Bursie, Phil Race, Alexander Zuev and Alexey Ivanov.

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/jdk15u-dev:

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

@mrserb
Copy link
Member Author

@mrserb mrserb commented on 6673cd8 Oct 25, 2022

Choose a reason for hiding this comment

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

/backport jdk13u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 6673cd8 Oct 25, 2022

Choose a reason for hiding this comment

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

@mrserb Could not automatically backport 6673cd85 to openjdk/jdk13u-dev due to conflicts in the following files:

  • make/modules/java.desktop/lib/Awt2dLibraries.gmk

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk13u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk13u-dev master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b mrserb-backport-6673cd85

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk 6673cd857722d117b108590ba7f7c02f8622fc3b

# Backport the commit
$ git cherry-pick --no-commit 6673cd857722d117b108590ba7f7c02f8622fc3b
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 6673cd857722d117b108590ba7f7c02f8622fc3b'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk13u-dev with the title Backport 6673cd857722d117b108590ba7f7c02f8622fc3b.

@mrserb
Copy link
Member Author

@mrserb mrserb commented on 6673cd8 Oct 25, 2022

Choose a reason for hiding this comment

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

/backport jdk11u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 6673cd8 Oct 25, 2022

Choose a reason for hiding this comment

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

@mrserb Could not automatically backport 6673cd85 to openjdk/jdk11u-dev due to conflicts in the following files:

  • make/common/modules/LauncherCommon.gmk
  • make/modules/java.desktop/lib/Awt2dLibraries.gmk

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk11u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk11u-dev master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b mrserb-backport-6673cd85

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk 6673cd857722d117b108590ba7f7c02f8622fc3b

# Backport the commit
$ git cherry-pick --no-commit 6673cd857722d117b108590ba7f7c02f8622fc3b
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 6673cd857722d117b108590ba7f7c02f8622fc3b'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk11u-dev with the title Backport 6673cd857722d117b108590ba7f7c02f8622fc3b.

Please sign in to comment.