On Mar 3, 2012, at 4:53 PM, Stephen Bannasch wrote:
I cloned the forest
<http://hg.openjdk.java.net/jdk8/tl/>http://hg.openjdk.java.net/jdk8/tl/ into
sources
No, we moved to
<http://hg.openjdk.java.net/hsx/hotspot-comp>http://hg.openjdk.java.net/hsx/hotspot-comp
a while ago. See:
<http://hg.openjdk.java.net/mlvm/mlvm/file/tip/README.txt>http://hg.openjdk.java.net/mlvm/mlvm/file/tip/README.txt
Regarding step 3: Add Michael's patches to jdk. (Crucial!)
For the time being you have already added this patch to the mlvm patch set as:
'macosx-7113349.patch' right?
Yes. When the final version of those changes gets down into
hsx/hotspot-comp/jdk, I'll deletethat patch.
I've set the guards to: "buildable testable"
I added a .rvmrc file in the main dir to make sure the Ruby 1.8.7 is selected
(needed to build jobjc).
I'm getting an unknown revision error trying to patch hotspot:
*** running: hg update -r
+ (cd sources/.; hg update -r $(sh $davinci/patches/make/current-release.sh))
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ (cd sources/hotspot; hg update -r $(sh
$davinci/patches/make/current-release.sh))
abort: unknown revision 'b279f99d7143'!
Were you basing this on the jdk8/tl forest?
No, and revision b279f99d7143 has not arrived there yet.
OK, using jdk8/tl (wrong forest) I obviously didn't get the patches applied correctly to hotspot but the build completed and
works well enough to respond with it's version number:
$ ./build/macosx-amd64/j2sdk-bundle/1.8.0.jdk/Contents/Home/bin/java -version
openjdk version "1.8.0-internal"
OpenJDK Runtime Environment (build
1.8.0-internal-stephen_2012_03_03_19_47-b00)
OpenJDK 64-Bit Server VM (build 23.0-b16, mixed mode)
Also the jdk/test/java/lang/invoke/ tests passed
Trying with the hsx/hotspot-comp forest I don't get nearly as far:
rm -rf sources
hg fclone http://hg.openjdk.java.net/hsx/hotspot-comp sources
. update.sh
The script update.sh is here: https://gist.github.com/243072
Basically the errors start when I run: hg qselect --pop $guards.
The guards are: "buildable testable"
*** integrating mlvm patchsets into hsx/hotspot-comp sources ...
*** creating symbolic links to the patch directories from the corresponding
.hg directories of the full source
+ ln -s ../../patches/forest-root sources/.hg/patches
+ ln -s ../../../patches/hotspot sources/hotspot/.hg/patches
+ ln -s ../../../patches/jdk sources/jdk/.hg/patches
+ ln -s ../../../patches/langtools sources/langtools/.hg/patches
58084162 -rw-r--r-- 1 stephen staff 1544 Mar 3 18:58
patches/hotspot/series
58084162 -rw-r--r-- 1 stephen staff 1544 Mar 3 18:58
sources/hotspot/.hg/patches/series
*** running: hg qselect --pop $guards
+ (cd sources/.; hg qselect --pop buildable testable $(sh
$davinci/patches/make/current-release.sh))
+ (cd sources/hotspot; hg qselect --pop buildable testable $(sh
$davinci/patches/make/current-release.sh))
+ (cd sources/jdk; hg qselect --pop buildable testable $(sh
$davinci/patches/make/current-release.sh))
popping guarded patches
abort: trying to pop unknown node dc52dc36561c
*** Exit status 255.
+ (cd sources/langtools; hg qselect --pop buildable testable $(sh
$davinci/patches/make/current-release.sh))
*** running: hg qselect; hg qunapplied
+ (cd sources/.; hg qselect; hg qunapplied)
1533dfab9903
buildable
testable
+ (cd sources/hotspot; hg qselect; hg qunapplied)
b279f99d7143
buildable
testable
+ (cd sources/jdk; hg qselect; hg qunapplied)
4196fc971f65
buildable
testable
+ (cd sources/langtools; hg qselect; hg qunapplied)
buildable
fba3cbee0fa3
testable
*** running: hg update -r
+ (cd sources/.; hg update -r $(sh $davinci/patches/make/current-release.sh))
mq status file refers to unknown node 0da2c51b425f
mq status file refers to unknown node 0da2c51b425f
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ (cd sources/hotspot; hg update -r $(sh
$davinci/patches/make/current-release.sh))
mq status file refers to unknown node 48b11adbaf14
mq status file refers to unknown node 48b11adbaf14
46 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ (cd sources/jdk; hg update -r $(sh
$davinci/patches/make/current-release.sh))
mq status file refers to unknown node dc52dc36561c
mq status file refers to unknown node 6c9b2016b057
176 files updated, 0 files merged, 41 files removed, 0 files unresolved
+ (cd sources/langtools; hg update -r $(sh
$davinci/patches/make/current-release.sh))
mq status file refers to unknown node 1e1dd638fcf8
mq status file refers to unknown node 1e1dd638fcf8
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
*** running: hg qpush -a
+ (cd sources/.; hg qpush -a)
mq status file refers to unknown node 0da2c51b425f
(working directory not at a head)
all patches are currently applied
+ (cd sources/hotspot; hg qpush -a)
mq status file refers to unknown node 48b11adbaf14
(working directory not at a head)
abort: working directory revision is not qtip
*** Exit status 255.
+ (cd sources/jdk; hg qpush -a)
mq status file refers to unknown node 6c9b2016b057
(working directory not at a head)
abort: working directory revision is not qtip
*** Exit status 255.
+ (cd sources/langtools; hg qpush -a)
mq status file refers to unknown node 1e1dd638fcf8
abort: working directory revision is not qtip
*** Exit status 255.
*** cleaning previous build products ...
*** building davinci (mlvm) ...
*** executing sets into the environment ...
*** preview sets in command line ...
*** running make ...
jdk/make/common/shared/Defs.gmk:181: "WARNING: Value of ARCH cannot be empty, will
use ''"
jdk/make/common/shared/Defs.gmk:181: "WARNING: Value of PLATFORM cannot be empty,
will use ''"
jdk/make/common/shared/Defs.gmk:380: jdk/make/common/shared/Defs-.gmk: No
such file or directory
jdk/make/common/shared/Defs.gmk:546: *** "ERROR: Trouble with the absolute path
for OUTPUTDIR './build/-'". Stop.
_______________________________________________
mlvm-dev mailing list
mlvm-dev@openjdk.java.net
http://mail.openjdk.java.net/mailman/listinfo/mlvm-dev
