Skip to content

7903837: apidiff: build.sh issues on Windows #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Conversation

jonathan-gibbons
Copy link
Contributor

@jonathan-gibbons jonathan-gibbons commented Sep 25, 2024

Please review some build.sh and Makefile changes to address issues building on Windows.

The primary Windows issue was missing use of mixed_path when passing some filenames into make.
There is some additional cleanup (for all platforms) to normalize the DEPS_DIR and add missing items to the sanity and check_build_vars targets.

This has been tested on macOS. Can someone with access to a Windows machine test it on Windows, please?


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/12/head:pull/12
$ git checkout pull/12

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 12

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 25, 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 Sep 25, 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:

7903837: apidiff: build.sh issues on Windows

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 13 new commits pushed to the master branch:

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this 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-7903837: apidiff: build.sh issues on Windows 7903837: apidiff: build.sh issues on Windows Sep 25, 2024
@openjdk openjdk bot added the rfr Pull request is ready for review label Sep 25, 2024
@mlbridge
Copy link

mlbridge bot commented Sep 25, 2024

Webrevs

@sormuras
Copy link
Member

This has been tested on macOS. Can someone with access to a Windows machine test it on Windows, please?

On it. An empty classpath element results in a :: sequence, which seems to make MSYS2/Cygwin fail the build.

Copy link
Member

@sormuras sormuras left a comment

Choose a reason for hiding this comment

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

$(BUILDTESTDIR)/JUnitTests/classes:$(APIDIFF_IMAGEDIR)/lib/apidiff.jar:$(JAVADIFFUTILS_JAR):$(DAISYDIFF_JAR):$(HTMLCLEANER_JAR)
also needs some extra care to not pass an empty $(DAISYDIFF_JAR) element.

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

jonathan-gibbons commented Oct 1, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Oct 1, 2024

Going to push as commit ac5e9e7.
Since your change was applied there have been 15 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Oct 1, 2024

@jonathan-gibbons Pushed as commit ac5e9e7.

💡 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 apidiff.7903837.windows-build branch October 1, 2024 18:35
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.

3 participants