Skip to content

Commit

Permalink
8340804: doc/building.md update Xcode instructions to note that full …
Browse files Browse the repository at this point in the history 
…install is required

Reviewed-by: erikj, jwaters
  • Loading branch information
@gdams
gdams committed Sep 24, 2024
1 parent e3d80f1 commit b639661
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 11 deletions.
7 changes: 3 additions & 4 deletions doc/building.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -614,10 +614,9 @@ <h3 id="clang">clang</h3>
<code>--with-toolchain-type=clang</code>.</p>
<h3 id="apple-xcode">Apple Xcode</h3>
<p>The oldest supported version of Xcode is 13.0.</p>
<p>You will need the Xcode command line developer tools to be able to
build the JDK. (Actually, <em>only</em> the command line tools are
needed, not the IDE.) The simplest way to install these is to run:</p>
<pre><code>xcode-select --install</code></pre>
<p>You will need to download Xcode either from the App Store or specific
versions can be easily located via the <a
href="https://xcodereleases.com">Xcode Releases</a> website.</p>
<p>When updating Xcode, it is advisable to keep an older version for
building the JDK. To use a specific version of Xcode you have multiple
options:</p>
Expand Down
10 changes: 3 additions & 7 deletions doc/building.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -422,13 +422,9 @@ To use clang instead of gcc on Linux, use `--with-toolchain-type=clang`.

The oldest supported version of Xcode is 13.0.

You will need the Xcode command line developer tools to be able to build the
JDK. (Actually, *only* the command line tools are needed, not the IDE.) The
simplest way to install these is to run:

```
xcode-select --install
```
You will need to download Xcode either from the App Store or specific versions
can be easily located via the [Xcode Releases](https://xcodereleases.com)
website.

When updating Xcode, it is advisable to keep an older version for building the
JDK. To use a specific version of Xcode you have multiple options:
Expand Down

5 comments on commit b639661

@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

@gdams
Copy link
Member Author

@gdams gdams commented on b639661 Sep 24, 2024

Choose a reason for hiding this comment

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

/backport jdk23u

@openjdk
Copy link

@openjdk openjdk bot commented on b639661 Sep 24, 2024

Choose a reason for hiding this comment

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

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

The commit being backported was authored by George Adams on 24 Sep 2024 and was reviewed by Erik Joelsson and Julian Waters.

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

$ git fetch https://github.com/openjdk-bots/jdk23u.git backport-gdams-b639661e-master:backport-gdams-b639661e-master
$ git checkout backport-gdams-b639661e-master
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk23u.git backport-gdams-b639661e-master

⚠️ @gdams You are not yet a collaborator in my fork openjdk-bots/jdk23u. An invite will be sent out and you need to accept it before you can proceed.

@gdams
Copy link
Member Author

@gdams gdams commented on b639661 Sep 25, 2024

Choose a reason for hiding this comment

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

/backport jdk21u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on b639661 Sep 25, 2024

Choose a reason for hiding this comment

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

@gdams Could not automatically backport b639661e to openjdk/jdk21u-dev due to conflicts in the following files:

  • doc/building.html
  • doc/building.md

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk21u-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/jdk21u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-gdams-b639661e-master

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

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

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

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

Below you can find a suggestion for the pull request body:

Hi all,

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

The commit being backported was authored by George Adams on 24 Sep 2024 and was reviewed by Erik Joelsson and Julian Waters.

Thanks!

Please sign in to comment.