Skip to content

Commit

Permalink
Merge pull request #139 from Tencent/merge_8u402
Browse files Browse the repository at this point in the history
Merge from OpenJDK 8u402-ga
  • Loading branch information
shiyuexw authored Jan 23, 2024
2 parents c03e84d + 6a3f156 commit 6143d0d
Show file tree
Hide file tree
Showing 684 changed files with 4,251 additions and 4,804 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/submit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ jobs:
run: >
if cat test-results/testoutput/*/exitcode.txt | grep -q -v '^0$'
|| ! cat test-results/testoutput/*/Stats.txt | grep -q 'fail=0' ; then
cat test-results/testoutput/*/JTreport/text/newfailures.txt ;
cat test-results/testoutput/*/JTreport/text/{newfailures,other_errors}.txt ;
exit 1 ;
fi
Expand Down Expand Up @@ -638,7 +638,7 @@ jobs:
run: >
if cat test-results/testoutput/*/exitcode.txt | grep -q -v '^0$'
|| ! cat test-results/testoutput/*/Stats.txt | grep -q 'fail=0' ; then
cat test-results/testoutput/*/JTreport/text/newfailures.txt ;
cat test-results/testoutput/*/JTreport/text/{newfailures,other_errors}.txt ;
exit 1 ;
fi
Expand Down Expand Up @@ -1143,6 +1143,7 @@ jobs:
run: >
if ((Get-ChildItem -Path test-results\testoutput\*\exitcode.txt -Recurse | Select-String -Pattern '^0$' -NotMatch ).Count -gt 0) {
Get-Content -Path test-results\testoutput\*\JTreport\text\newfailures.txt ;
Get-Content -Path test-results\testoutput\*\JTreport\text\other_errors.txt ;
exit 1
}
Expand Down Expand Up @@ -1299,6 +1300,7 @@ jobs:
run: >
if ((Get-ChildItem -Path test-results\testoutput\*\exitcode.txt -Recurse | Select-String -Pattern '^0$' -NotMatch ).Count -gt 0) {
Get-Content -Path test-results\testoutput\*\JTreport\text\newfailures.txt ;
Get-Content -Path test-results\testoutput\*\JTreport\text\other_errors.txt ;
exit 1
}
Expand Down Expand Up @@ -1529,7 +1531,7 @@ jobs:
run: >
if cat test-results/testoutput/*/exitcode.txt | grep -q -v '^0$'
|| ! cat test-results/testoutput/*/Stats.txt | grep -q 'fail=0' ; then
cat test-results/testoutput/*/JTreport/text/newfailures.txt ;
cat test-results/testoutput/*/JTreport/text/{newfailures,other_errors}.txt ;
exit 1 ;
fi
Expand Down
2 changes: 1 addition & 1 deletion .jcheck/conf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[general]
project=jdk8u
jbs=JDK
version=openjdk8u392
version=openjdk8u402

[checks]
error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace
Expand Down
44 changes: 7 additions & 37 deletions README
Original file line number Diff line number Diff line change
@@ -1,40 +1,10 @@
README:
This file should be located at the top of the OpenJDK Mercurial root
repository. A full OpenJDK repository set (forest) should also include
the following 6 nested repositories:
"jdk", "hotspot", "langtools", "corba", "jaxws" and "jaxp".
Welcome to OpenJDK!
===================

The root repository can be obtained with something like:
hg clone http://hg.openjdk.java.net/jdk8/jdk8 openjdk8

You can run the get_source.sh script located in the root repository to get
the other needed repositories:
cd openjdk8 && sh ./get_source.sh
For information about building OpenJDK, including how to fully retrieve all
source code, please see either of these:

People unfamiliar with Mercurial should read the first few chapters of
the Mercurial book: http://hgbook.red-bean.com/read/
* doc/building.html (html version)
* doc/building.md (markdown version)

See http://openjdk.java.net/ for more information about OpenJDK.

Simple Build Instructions:

0. Get the necessary system software/packages installed on your system, see
http://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html

1. If you don't have a jdk7u7 or newer jdk, download and install it from
http://java.sun.com/javase/downloads/index.jsp
Add the /bin directory of this installation to your PATH environment
variable.

2. Configure the build:
bash ./configure

3. Build the OpenJDK:
make all
The resulting JDK image should be found in build/*/images/j2sdk-image

where make is GNU make 3.81 or newer, /usr/bin/make on Linux usually
is 3.81 or newer. Note that on Solaris, GNU make is called "gmake".

Complete details are available in the file:
http://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html
See http://openjdk.java.net/ for more information about OpenJDK.
Loading

0 comments on commit 6143d0d

Please sign in to comment.