Skip to content
Permalink
Browse files
8275872: Sync J2DBench run and analyze Makefile targets with build.xml
Reviewed-by: ihse, andrew
  • Loading branch information
Jiří Vaněk authored and magicus committed Oct 26, 2021
1 parent 19f76c2 commit f1f5e2690cb93c07eb8be96a4cbfbf140e8a15e0
Showing with 3 additions and 3 deletions.
  1. +3 −3 src/demo/share/java2d/J2DBench/Makefile
@@ -1,5 +1,5 @@
#
# Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -80,10 +80,10 @@ SCM_DIRs = .hg .svn CVS RCS SCCS Codemgr_wsdata deleted_files
all: mkdirs J2DBench.jar J2DAnalyzer.jar

run: mkdirs J2DBench.jar
java -jar J2DBench.jar
java -jar $(DIST)/J2DBench.jar

analyze: mkdirs J2DAnalyzer.jar
java -jar J2DAnalyzer.jar
java -jar $(DIST)/J2DAnalyzer.jar

J2DBench.jar: \
$(J2DBENCH_CLASSES) $(J2DBENCH_RESOURCES) \

5 comments on commit f1f5e26

@openjdk-notifier
Copy link

@openjdk-notifier openjdk-notifier bot commented on f1f5e26 Oct 26, 2021

Choose a reason for hiding this comment

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

@gnu-andrew
Copy link
Member

@gnu-andrew gnu-andrew commented on f1f5e26 Nov 6, 2021

Choose a reason for hiding this comment

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

/backport jdk17u

@openjdk
Copy link

@openjdk openjdk bot commented on f1f5e26 Nov 6, 2021

Choose a reason for hiding this comment

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

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

The commit being backported was authored by Jiří Vaněk on 26 Oct 2021 and was reviewed by Magnus Ihse Bursie and Andrew John Hughes.

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:

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

@gnu-andrew
Copy link
Member

@gnu-andrew gnu-andrew commented on f1f5e26 Nov 10, 2021

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 f1f5e26 Nov 10, 2021

Choose a reason for hiding this comment

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

@gnu-andrew Could not automatically backport f1f5e269 to openjdk/jdk11u-dev due to conflicts in the following files:

  • src/demo/share/java2d/J2DBench/Makefile

To manually resolve these conflicts run the following commands in your personal fork of openjdk/jdk11u-dev:

$ git checkout -b gnu-andrew-backport-f1f5e269
$ git fetch --no-tags https://git.openjdk.java.net/jdk f1f5e2690cb93c07eb8be96a4cbfbf140e8a15e0
$ git cherry-pick --no-commit f1f5e2690cb93c07eb8be96a4cbfbf140e8a15e0
$ # Resolve conflicts
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport f1f5e2690cb93c07eb8be96a4cbfbf140e8a15e0'

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

Please sign in to comment.