Thu, 07 May 2009 10:32:58 -0700
Merge
1.1 --- a/.hgtags Wed May 06 18:04:08 2009 +0100 1.2 +++ b/.hgtags Thu May 07 10:32:58 2009 -0700 1.3 @@ -30,3 +30,5 @@ 1.4 dbdeb4a7581b2a8699644b91cae6793cb01953f7 jdk7-b53 1.5 197a7f881937d406a01214aa9ded49c073f7d380 jdk7-b54 1.6 7394a8694cedea574c7dbd38de87f4cbe0e27b8a jdk7-b55 1.7 +825f23a4f262eb06cfc94406140f3bfecb17ffe8 jdk7-b56 1.8 +4030cc469205bbd517ca629fb170afb81760bbc5 jdk7-b57
2.1 --- a/make/jprt.properties Wed May 06 18:04:08 2009 +0100 2.2 +++ b/make/jprt.properties Thu May 07 10:32:58 2009 -0700 2.3 @@ -32,13 +32,13 @@ 2.4 solaris_sparcv9_5.10,\ 2.5 solaris_i586_5.10,\ 2.6 solaris_x64_5.10,\ 2.7 -linux_i586,\ 2.8 -linux_x64,\ 2.9 +linux_i586_2.6,\ 2.10 +linux_x64_2.6,\ 2.11 windows_i586,\ 2.12 windows_x64 2.13 2.14 # The different build flavors we want 2.15 -jprt.build.flavors=product 2.16 +jprt.build.flavors=product,fastdebug 2.17 2.18 # Explicitly designate what the 32bit match is for the 64bit build 2.19 jprt.solaris_sparcv9.build.platform.match32=solaris_sparc_5.10