Skip to content

Conversation

@jonathan-gibbons
Copy link
Contributor

@jonathan-gibbons jonathan-gibbons commented Oct 24, 2024

Please review an update to the main documentation page for the apidiff tool. The updates are primarily clarifications and examples, intended to reduce some of the recent confusion about using the tool. As well as clarification and examples throughout the page, two more full examples are given at the end. These examples have been tested with scripts. They are meant to be indicative of what one might use to create a diff report for a CSR submission.

The generated HTML for the page can be seen here: https://cr.openjdk.org/~jjg/7903876/doc/apidiff.html

For the record, the scripts used to test the examples are as follows:

*** play/apidiff-examples/apidiff-1.sh
#!/bin/bash

JAVA_HOME=$HOME/OpenJDK/jdk/jdk.ref/build/macosx-aarch64-server-release/images/jdk
APIDIFF_HOME=$HOME/OpenJDK/difftools/apidiff.ref/build/images/apidiff

PATH=$JAVA_HOME/bin:$APIDIFF_HOME/bin:$PATH
apidiff \
    --api jdk24 --jdk-build build/baseline \
    --api 8330183 --jdk-build build/macosx-aarch64-server-release  \
    --include java.compiler/** \
    --output-directory build/apidiff

*** play/apidiff-examples/apidiff-2.sh
#!/bin/bash

JAVA_HOME=$HOME/OpenJDK/jdk/jdk.ref/build/macosx-aarch64-server-release/images/jdk
APIDIFF_HOME=$HOME/OpenJDK/difftools/apidiff.ref/build/images/apidiff

PATH=$JAVA_HOME/bin:$APIDIFF_HOME/bin:$PATH
apidiff \
    --api jdk24 --jdk-build build/baseline --label "The baseline for the changes"\
    --api 8330183 --jdk-build build/macosx-aarch64-server-release --label "Add SourceVersion.RELEASE_24" \
    --include java.compiler/** \
    --output-directory build/apidiff \
    --compare-api-descriptions true \
    --jdk-docs docs \
    --info-text top="This proposal is not yet final" \
    --title "Diffs for JDK-8330183 CSR" \
    --description "Generated by $USER at $(date -u)"

Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/apidiff.git pull/28/head:pull/28
$ git checkout pull/28

Update a local copy of the PR:
$ git checkout pull/28
$ git pull https://git.openjdk.org/apidiff.git pull/28/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 28

View PR using the GUI difftool:
$ git pr show -t 28

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/apidiff/pull/28.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 24, 2024

👋 Welcome back jjg! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Oct 24, 2024

@jonathan-gibbons This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

7903876: Improve the man page, with (more) examples

Reviewed-by: iris

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot changed the title CODETOOLS-7903876: Improve the man page, with (more) examples 7903876: Improve the man page, with (more) examples Oct 24, 2024
@openjdk openjdk bot added the rfr Pull request is ready for review label Oct 24, 2024
@mlbridge
Copy link

mlbridge bot commented Oct 24, 2024

Webrevs

Copy link
Member

@irisclark irisclark left a comment

Choose a reason for hiding this comment

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

Great man page expansion! I like the additional examples (particularly the one for CSRs). I'm sure there are several other common cases which could use examples.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Oct 27, 2024
@jonathan-gibbons
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Oct 29, 2024

Going to push as commit 1dbbcb5.

@openjdk openjdk bot added the integrated Pull request has been integrated label Oct 29, 2024
@openjdk openjdk bot closed this Oct 29, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Oct 29, 2024
@openjdk
Copy link

openjdk bot commented Oct 29, 2024

@jonathan-gibbons Pushed as commit 1dbbcb5.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@jonathan-gibbons jonathan-gibbons deleted the 7903876.update-man-page branch October 29, 2024 20:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants