/hg/release/icedtea7-forest-2.4: 46 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Oct 16 07:41:13 PDT 2013
changeset faabf9b83511 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=faabf9b83511
author: asaha
date: Thu Jun 20 21:50:01 2013 -0700
Merge
changeset 9e21dad986e5 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=9e21dad986e5
author: asaha
date: Fri Jun 21 21:56:22 2013 -0700
Merge
changeset e51f24701c60 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=e51f24701c60
author: asaha
date: Fri Jun 28 11:28:49 2013 -0700
Merge
changeset a1761a968ddb in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=a1761a968ddb
author: katleman
date: Tue Jul 02 15:17:09 2013 -0700
Added tag jdk7u45-b01 for changeset e51f24701c60
changeset 07e41ff8674c in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=07e41ff8674c
author: asaha
date: Wed Jul 03 22:30:45 2013 -0700
Merge
changeset 7d3cabf032a0 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=7d3cabf032a0
author: katleman
date: Tue Jul 09 18:22:36 2013 -0700
Added tag jdk7u45-b02 for changeset 07e41ff8674c
changeset 23c983c352a1 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=23c983c352a1
author: asaha
date: Wed Jul 10 21:46:36 2013 -0700
Merge
changeset e79d085b5666 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=e79d085b5666
author: cl
date: Tue Jul 16 05:51:51 2013 -0700
Added tag jdk7u45-b03 for changeset 23c983c352a1
changeset 19e4d8fbd509 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=19e4d8fbd509
author: asaha
date: Wed Jul 17 13:53:30 2013 -0700
Merge
changeset 1018a8ab686d in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=1018a8ab686d
author: asaha
date: Mon Jul 22 22:14:10 2013 -0700
8020032: 7u fastdebug doesn't generate fastdebuginfo file
Reviewed-by: tbell
Contributed-by: tristan.yan at oracle.com
changeset 1a7bcf5b173d in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=1a7bcf5b173d
author: cl
date: Tue Jul 23 08:11:08 2013 -0700
Added tag jdk7u45-b04 for changeset 1018a8ab686d
changeset 807cce4fa46a in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=807cce4fa46a
author: asaha
date: Thu Jul 25 15:38:00 2013 -0700
Merge
changeset 5b1e3cb9af72 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=5b1e3cb9af72
author: asaha
date: Mon Jul 29 11:53:26 2013 -0700
Merge
changeset 22e0ca1fa645 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=22e0ca1fa645
author: asaha
date: Wed Jul 31 23:03:02 2013 -0700
Merge
changeset 065564878326 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=065564878326
author: asaha
date: Fri Aug 02 15:22:27 2013 -0700
Added tag jdk7u45-b05 for changeset 22e0ca1fa645
changeset 9a08e6d6eb84 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=9a08e6d6eb84
author: asaha
date: Fri Aug 02 15:45:15 2013 -0700
Merge
changeset a9e59d09051e in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=a9e59d09051e
author: cl
date: Fri Aug 02 19:02:52 2013 -0700
Added tag jdk7u45-b05 for changeset 807cce4fa46a
changeset cf763e7e864c in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=cf763e7e864c
author: asaha
date: Mon Aug 05 11:50:14 2013 -0700
8022254: Remove incorrect jdk7u45-b05 tag from jdk7u-cpu forest
Reviewed-by: cl
changeset 3e965943d66c in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=3e965943d66c
author: asaha
date: Mon Aug 05 13:43:19 2013 -0700
Merge
changeset 61343f60f25a in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=61343f60f25a
author: asaha
date: Wed Aug 07 12:20:45 2013 -0700
Merge
changeset 9786d336c678 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=9786d336c678
author: cl
date: Thu Aug 08 23:23:05 2013 -0700
Added tag jdk7u45-b06 for changeset 61343f60f25a
changeset 24088aaf3f68 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=24088aaf3f68
author: asaha
date: Mon Aug 12 12:30:21 2013 -0700
Merge
changeset 71e94860715d in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=71e94860715d
author: cl
date: Thu Aug 15 22:16:02 2013 -0700
Added tag jdk7u45-b07 for changeset 24088aaf3f68
changeset 036425509e31 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=036425509e31
author: asaha
date: Mon Aug 19 12:41:23 2013 -0700
Merge
changeset 6cc42e1e36b7 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=6cc42e1e36b7
author: cl
date: Tue Aug 20 10:22:10 2013 -0700
Added tag jdk7u45-b08 for changeset 036425509e31
changeset 247aff49b5cf in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=247aff49b5cf
author: asaha
date: Thu Aug 22 08:38:10 2013 -0700
Merge
changeset b6af2c522a63 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=b6af2c522a63
author: asaha
date: Mon Aug 26 08:08:45 2013 -0700
Merge
changeset 57f404092d1a in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=57f404092d1a
author: cl
date: Tue Aug 27 10:55:55 2013 -0700
Added tag jdk7u45-b09 for changeset b6af2c522a63
changeset 3fedb8c609a0 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=3fedb8c609a0
author: asaha
date: Tue Aug 27 15:13:14 2013 -0700
Merge
changeset 2c473d04bc4b in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=2c473d04bc4b
author: cl
date: Wed Sep 04 11:04:59 2013 -0700
Added tag jdk7u45-b10 for changeset 3fedb8c609a0
changeset 142403d9f116 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=142403d9f116
author: asaha
date: Wed Sep 04 11:58:14 2013 -0700
Merge
changeset a14018a5fa18 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=a14018a5fa18
author: cl
date: Wed Sep 11 11:12:07 2013 -0700
Added tag jdk7u45-b11 for changeset 142403d9f116
changeset 4d38e9adeb81 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=4d38e9adeb81
author: cl
date: Wed Sep 18 02:15:43 2013 -0700
Added tag jdk7u45-b12 for changeset a14018a5fa18
changeset bab0456ba052 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=bab0456ba052
author: cl
date: Mon Sep 23 14:31:17 2013 -0700
Added tag jdk7u45-b13 for changeset 4d38e9adeb81
changeset b4b258464902 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=b4b258464902
author: cl
date: Thu Sep 26 10:37:03 2013 -0700
Added tag jdk7u45-b14 for changeset bab0456ba052
changeset f2479abad143 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=f2479abad143
author: cl
date: Fri Sep 27 11:44:05 2013 -0700
Added tag jdk7u45-b15 for changeset b4b258464902
changeset a2605cf03226 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=a2605cf03226
author: katleman
date: Wed Sep 11 10:59:38 2013 -0700
Added tag jdk7u40-b61 for changeset 6359fa34199c
changeset 8ae9ebf60745 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=8ae9ebf60745
author: katleman
date: Tue Sep 17 13:05:14 2013 -0700
Added tag jdk7u40-b62 for changeset a2605cf03226
changeset c782043adf1d in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=c782043adf1d
author: asaha
date: Thu Sep 19 14:38:06 2013 -0700
Merge
changeset 93c0a4abb398 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=93c0a4abb398
author: asaha
date: Fri Sep 27 13:05:54 2013 -0700
Merge
changeset 6fd67e0287a9 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=6fd67e0287a9
author: cl
date: Thu Oct 03 11:31:38 2013 -0700
Added tag jdk7u45-b16 for changeset f2479abad143
changeset f0cdb08a4624 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=f0cdb08a4624
author: cl
date: Mon Oct 07 21:52:16 2013 -0700
Added tag jdk7u45-b17 for changeset 6fd67e0287a9
changeset 82f1f76c4412 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=82f1f76c4412
author: cl
date: Tue Oct 08 09:06:41 2013 -0700
Added tag jdk7u45-b18 for changeset f0cdb08a4624
changeset 3a86bbf3f75a in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=3a86bbf3f75a
author: cl
date: Tue Oct 08 10:57:33 2013 -0700
Added tag jdk7u45-b30 for changeset 82f1f76c4412
changeset f4373de4b75b in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=f4373de4b75b
author: asaha
date: Tue Oct 08 11:10:00 2013 -0700
Merge
changeset e2f5917da3c1 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=e2f5917da3c1
author: andrew
date: Wed Oct 16 15:17:01 2013 +0100
Merge jdk7u45-b31
diffstat:
.hgtags | 108 +++++++++++++++++++++++
.jcheck/conf | 2 -
Makefile | 22 +++-
THIRD_PARTY_README | 33 ++++++-
make/Defs-internal.gmk | 3 +-
make/deploy-rules.gmk | 32 +------
make/hotspot-rules.gmk | 2 +
make/install-rules.gmk | 20 ++++-
make/jprt.gmk | 6 +-
make/jprt.properties | 16 +-
make/scripts/hgforest.sh | 2 +-
make/scripts/normalizer.pl | 208 +++++++++++++++++++++++++++++++++++++++++++++
make/scripts/webrev.ksh | 66 ++++++++-----
test/Makefile | 12 +-
14 files changed, 443 insertions(+), 89 deletions(-)
diffs (truncated from 951 to 500 lines):
diff -r faa42104c90a -r e2f5917da3c1 .hgtags
--- a/.hgtags Fri Jun 14 18:10:14 2013 -0700
+++ b/.hgtags Wed Oct 16 15:17:01 2013 +0100
@@ -50,6 +50,7 @@
3ac6dcf7823205546fbbc3d4ea59f37358d0b0d4 jdk7-b73
2c88089b6e1c053597418099a14232182c387edc jdk7-b74
d1516b9f23954b29b8e76e6f4efc467c08c78133 jdk7-b75
+f0bfd9bd1a0e674288a8a4d17dcbb9e632b42e6d icedtea7-1.12
c8b63075403d53a208104a8a6ea5072c1cb66aab jdk7-b76
1f17ca8353babb13f4908c1f87d11508232518c8 jdk7-b77
ab4ae8f4514693a9fe17ca2fec0239d8f8450d2c jdk7-b78
@@ -63,6 +64,7 @@
433a60a9c0bf1b26ee7e65cebaa89c541f497aed jdk7-b86
6b1069f53fbc30663ccef49d78c31bb7d6967bde jdk7-b87
82135c848d5fcddb065e98ae77b81077c858f593 jdk7-b88
+195fcceefddce1963bb26ba32920de67806ed2db icedtea7-1.13
7f1ba4459972bf84b8201dc1cc4f62b1fe1c74f4 jdk7-b89
425ba3efabbfe0b188105c10aaf7c3c8fa8d1a38 jdk7-b90
97d8b6c659c29c8493a8b2b72c2796a021a8cf79 jdk7-b91
@@ -111,6 +113,7 @@
ddc2fcb3682ffd27f44354db666128827be7e3c3 jdk7-b134
783bd02b4ab4596059c74b10a1793d7bd2f1c157 jdk7-b135
2fe76e73adaa5133ac559f0b3c2c0707eca04580 jdk7-b136
+d4aea1a51d625f5601c840714c7c94f1de5bc1af icedtea-1.14
7654afc6a29e43cb0a1343ce7f1287bf690d5e5f jdk7-b137
fc47c97bbbd91b1f774d855c48a7e285eb1a351a jdk7-b138
7ed6d0b9aaa12320832a7ddadb88d6d8d0dda4c1 jdk7-b139
@@ -123,6 +126,7 @@
2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146
3ac30b3852876ccad6bd61697b5f9efa91ca7bc6 jdk7u1-b01
d91364304d7c4ecd34caffdba2b840aeb0d10b51 jdk7-b147
+3defd24c2671eb2e7796b5dc45b98954341d73a7 icedtea-2.0-branchpoint
34451dc0580d5c95d97b95a564e6198f36545d68 jdk7u1-b02
bf735d852f79bdbb3373c777eec3ff27e035e7ba jdk7u1-b03
f66a2bada589f4157789e6f66472954d2f1c114e jdk7u1-b04
@@ -141,6 +145,7 @@
b2deaf5bde5ec455a06786e8e2aea2e673be13aa jdk7u2-b12
c95558e566ac3605c480a3d070b1102088dab07f jdk7u2-b13
e30fd289f0019700575593ee4e1635fbc5c9a484 jdk7u2-b21
+a66b58021165f5a43e3974fe5fb9fead29824098 icedtea-2.1-branchpoint
e30fd289f0019700575593ee4e1635fbc5c9a484 jdk7u3-b02
becd013ae6072a6633ba015fc4f5862fca589cee jdk7u3-b03
d64361a28584728aa25dca3781cffbaf4199e088 jdk7u3-b04
@@ -157,6 +162,7 @@
2b07c262a8a9ff78dc908efb9d7b3bb099df9ac4 jdk7u4-b10
1abfee16e8cc7e3950052befa78dbf14a5ca9cfc jdk7u4-b11
e6f915094dccbba16df6ebeb002e6867392eda40 jdk7u4-b12
+e7886f5ad6cc837092386fa513e670d4a770456c icedtea-2.2-branchpoint
9108e3c2f07ffa218641d93893ac9928e95d213a jdk7u4-b13
d9580838fd08872fc0da648ecfc6782704b4aac1 jdk7u4-b14
008753000680a2008175d14b25373356f531aa07 jdk7u4-b15
@@ -191,6 +197,7 @@
528f1589f5f2adf18d5d21384ba668b9aa79841e jdk7u6-b15
7b77364eb09faac4c37ce9dd2c2308ca5525f18f jdk7u6-b16
b7c1b441d131c70278de299b5d1e59dce0755dc5 jdk7u6-b17
+0e7b94bd450d4270d4e9bd6c040c94fa4be714a6 icedtea-2.3-branchpoint
9c41f7b1460b106d18676899d24b6ea07de5a369 jdk7u6-b18
56291720b5e578046bc02761dcad2a575f99fd8e jdk7u6-b19
e79fa743fe5a801db4acc7a7daa68f581423e5d3 jdk7u6-b20
@@ -240,6 +247,31 @@
3b7815df113f8044039739276237b964ee8fa015 jdk7u13-b10
527d3cf769ec073d7348e4c31f97c47c943c96b6 jdk7u13-b30
3b7815df113f8044039739276237b964ee8fa015 jdk7u13-b20
+1ab3edf5061fdde3a6f6510373a92444445af710 jdk7u8-b01
+d7a94c8cbbbfadbd9e2f3e4737eb7deb572dedc9 jdk7u8-b02
+e7c504c99ab60e3b21cdc9460afaa3926d53cff1 jdk7u8-b03
+996e3145029120fd6ef2cacb3d03cb1f20862247 jdk7u8-b04
+891689cc39ff9d67bc4fe43bcb91ecdabda1f9f8 jdk7u8-b05
+f16343fe14acb4118f0a3f78fd735a4a6133c76a jdk7u10-b06
+1fa71ffbbd596086dbade86505d2d7e1c436de76 jdk7u10-b07
+e7014c55a9e55c10fe4f91ca092eb01029c36c75 jdk7u10-b08
+aaf495a24a9bb996b3955e52edff8d93ff62dc5f jdk7u10-b09
+3eddc50eb3574bf4cff4081310fd763e958ed073 jdk7u12-b01
+207c000ac697d052f84cde6e782865b209e60239 jdk7u12-b02
+a3917db5d568d9805b3c46ce67c39c475cf10e0e jdk7u12-b03
+52945b197d7c93d215067034a45e5e9452c67f78 jdk7u12-b04
+eae53fe51e79e04ca28b5790a6ae25d39a06b0ab jdk7u12-b05
+a008905ce525b88e5bdc80fe6ad7570f6f6a19ac jdk7u12-b06
+c3e42860af1cfd997fe1895594f652f0d1e9984e jdk7u12-b07
+1a03ef4794dc8face4de605ae480d4c763e6b494 jdk7u12-b08
+87cf81226f2012e5c21131adac7880f7e4da1133 jdk7u12-b09
+8a10a3c51f1cd88009008cf1b82071797b5f516d icedtea-2.4-branchpoint
+745a15bb6d94765bb5c68048ff146590df9b8441 jdk7u14-b10
+2d8fdaa5bb55b937028e385633ce58de4dcdb69c jdk7u14-b11
+594dbbbb84add4aa310d51af7e298470d8cda458 jdk7u14-b12
+ae5c1b29297dae0375277a0b6428c266d8d77c71 jdk7u14-b13
+bb97ad0c9e5a0566e82b3b4bc43eabe680b89d97 jdk7u14-b14
+b534282bd377e3886b9d0d4760f6fdaa1804bdd3 jdk7u14-b15
0e52db2d9bb8bc789f6c66f2cfb7cd2d3b0b16c6 jdk7u15-b01
0324fca94d073b3aad77658224f17679f25c18b1 jdk7u15-b02
25a9d44cebf2a7ac6dd1748c94e00b242403acb1 jdk7u15-b30
@@ -264,7 +296,9 @@
602ad1a5b09fb9136e8bf1b708e0524fbdb35324 jdk7u21-b10
fa322ca378324750ea049f2e92357e51eca27ae4 jdk7u21-b11
450e8dde919df278fe75ae95e0eb0a6464f5bc41 jdk7u21-b30
+170520883597f90771aca8251a8d089e7566e4bf jdk7u21-b50
170520883597f90771aca8251a8d089e7566e4bf jdk7u21-b12
+da9a0cdf4afcfae3a7c47565e9acfd9170ba5a30 jdk7u21-b31
50bfbd21bf42f6ae4167226ac45cd79e0ab7758c jdk7u25-b03
a94c9aa356bbed13c1e2b4a9a380117ddff1668f jdk7u25-b04
29a789ae14dc09a50eb45d3445075642e77490a2 jdk7u25-b05
@@ -274,10 +308,84 @@
84285f4e0aa2f81b80bc6fbe713d768c0d9a7156 jdk7u25-b09
aae1e27d347b71f65f548c12b918ede98d869b7c jdk7u25-b10
039f12124903cd0b7633a17a26f6ca281f7aaeae jdk7u25-b11
+210f464368dba0fc4f8d239654fa7432ad2ed31f jdk7u14-b16
+f07712232642fc30dcf7c433ff890e7247b5fd0b jdk7u14-b17
+9e2a9a2c5b240daa4e27ff75d030a77827174753 jdk7u14-b18
+d9d4dc020cb37142230f6a20d2a75a677c5cd26f jdk7u14-b19
+d9d4dc020cb37142230f6a20d2a75a677c5cd26f jdk7u14-b19
+b4b7795ef8047e3d2b2ba48a70c08d9184073100 jdk7u14-b19
+f413e7a22c198559af5aca28309356e6d4edd78f jdk7u14-b20
+41686e19d8189a546434a52dd9679e9b6a0a68be jdk7u14-b21
+3e3177719b43f732239d6d51e96d26ee18440960 jdk7u14-b22
+8c6e2197930c79f6beafd83181714cc817b83229 jdk7u40-b23
+5169c92728b54a4b5e9a41071f8bf8701d0fe1fa jdk7u40-b24
+f89fd7e2800c1c35b6c339f54780d5579bb30991 jdk7u40-b25
+4ef57f592525d36487ea6eeb2be84d0e9170b26b jdk7u40-b26
+75167199239375d05b68668023c885c2776fd548 jdk7u40-b27
+ac751f3867ecffca814b25daf5e19d82d83fc755 jdk7u40-b28
+dbe42a627813892d1bb59a4240c24f60ef22930a jdk7u40-b29
2d02518960053d2b1dcb9aabacd709788e92c549 jdk7u25-b12
37c4268341d79b16165bdaf7e1fad489d692bc83 jdk7u25-b13
9de1fc3635def64c19c51f272f09b51d8cf0ca98 jdk7u25-b14
2197dde877124579204c5266fa9d89166760b44f jdk7u25-b15
+eeb29025d52ab4ea9bc4f5afa37c3a4fbcaf0011 jdk7u25-b31
+e571b5c75bd194c1aaad6e8e75b1d40f6208391c jdk7u25-b33
+161e4656fea4720ececade6892247a73a2e31a42 jdk7u25-b34
9846c505054fb91762f3fd9b817d1a9760322029 jdk7u25-b30
12c2f4ce55d074f0be94781d98cbbbcf8299b666 jdk7u25-b16
40fde76d9b89f5acc63f4eeeccdc261d9999bf39 jdk7u25-b32
+210f464368dba0fc4f8d239654fa7432ad2ed31f jdk7u14-b16
+f07712232642fc30dcf7c433ff890e7247b5fd0b jdk7u14-b17
+9e2a9a2c5b240daa4e27ff75d030a77827174753 jdk7u14-b18
+d9d4dc020cb37142230f6a20d2a75a677c5cd26f jdk7u14-b19
+d9d4dc020cb37142230f6a20d2a75a677c5cd26f jdk7u14-b19
+b4b7795ef8047e3d2b2ba48a70c08d9184073100 jdk7u14-b19
+f413e7a22c198559af5aca28309356e6d4edd78f jdk7u14-b20
+30065a72715f046e4a4bdec1c0cc7d65153c9d99 icedtea-2.4.0
+41686e19d8189a546434a52dd9679e9b6a0a68be jdk7u14-b21
+3e3177719b43f732239d6d51e96d26ee18440960 jdk7u14-b22
+8c6e2197930c79f6beafd83181714cc817b83229 jdk7u40-b23
+5169c92728b54a4b5e9a41071f8bf8701d0fe1fa jdk7u40-b24
+f89fd7e2800c1c35b6c339f54780d5579bb30991 jdk7u40-b25
+4ef57f592525d36487ea6eeb2be84d0e9170b26b jdk7u40-b26
+75167199239375d05b68668023c885c2776fd548 jdk7u40-b27
+ac751f3867ecffca814b25daf5e19d82d83fc755 jdk7u40-b28
+dbe42a627813892d1bb59a4240c24f60ef22930a jdk7u40-b29
+1c141e6fde911c4974c87e340eb698754607f422 jdk7u40-b30
+ae86c6974e8ee35ef66121810ea9e748b7e677d9 icedtea-2.4.1
+58a2a470aa3bccd3eb3624e68bca9397c8cc26a2 jdk7u40-b31
+e51f24701c608e57ba7ae69ba28bbc2daab02c4c jdk7u45-b01
+da376fd5e4d68f8a45003a6e175267dc840711cc jdk7u40-b32
+3fdfe7f1b06354e11e8af51b7c653c8a0adb3987 jdk7u40-b33
+a1ae13479e8767329fa20774b5cea5976aaeb37b jdk7u40-b34
+af755d12719e898e3af917e8a56b64ebf83019bc jdk7u40-b35
+59598f7b6a7be5e0470447694c1f5b7d951f6ff1 jdk7u40-b36
+5bfb3aa1655e5364a8c1c17343ff84dad7e13f25 jdk7u40-b37
+7d3e6ccad487d84e764932802cd42d2afebccd7a jdk7u40-b38
+a2ba8e069718677c267b3894df2a719148c15ac8 jdk7u40-b39
+c9157eb582a5deec5bbac671bf628bc45af447d0 jdk7u40-b40
+8773b39be6ac71c06793035b8c72f5c771eb534f jdk7u40-b41
+3af81bfe320c12758234233da6fa27c3c0ffcdc4 jdk7u40-b42
+1d53bd8fd2a62bcf336727ebec377ef7498dd4a6 jdk7u40-b43
+dc1e099cd62d250b4a997ce694b47fe2f50d2905 jdk7u40-b60
+6125b83238df36d96b3f6bf5ca6c740693dd3651 icedtea-2.4.2
+6359fa34199c9619dfec0f41d2eb22a4083ce610 jdk7u40-b61
+a2605cf03226ce2fef7a899ce41521c654300975 jdk7u40-b62
+07e41ff8674c9438cb1124cf78eed8636ed5d4fa jdk7u45-b02
+23c983c352a170d7a5fb7d703081daf1816d257a jdk7u45-b03
+1018a8ab686da6c1be22bec3ab9d01b2dc206333 jdk7u45-b04
+22e0ca1fa645d0518b514159afafe34335699c11 jdk7u45-b05
+61343f60f25a1d0deddc1468b2eb948df5275641 jdk7u45-b06
+24088aaf3f6834e46b486b706fbc6ce1f18814e5 jdk7u45-b07
+036425509e31070700a3956aaca7c33d583b7a5e jdk7u45-b08
+b6af2c522a633de1c7b66204fac7104b410ce23c jdk7u45-b09
+3fedb8c609a0f43bc8084edbecb0435e19dcb9a2 jdk7u45-b10
+142403d9f1167b8559b49627c7199c84623307da jdk7u45-b11
+a14018a5fa18092dcca5084656abb797bdb7b5ff jdk7u45-b12
+4d38e9adeb81df9c24550070df1f358aa9c17477 jdk7u45-b13
+bab0456ba0520f73ee20814ddf7ea0d596e49abd jdk7u45-b14
+b4b2584649027b622c188db7a6c3f9cff0e20130 jdk7u45-b15
+f2479abad143d2d9f33b6c872890ca0c5dd52530 jdk7u45-b16
+6fd67e0287a9893ea1f0090fe127f18a7e235148 jdk7u45-b17
+f0cdb08a4624a623bdd178b04c4bf5a2fa4dc39a jdk7u45-b18
+82f1f76c44124c31cb1151833fc15c13547ab280 jdk7u45-b30
diff -r faa42104c90a -r e2f5917da3c1 .jcheck/conf
--- a/.jcheck/conf Fri Jun 14 18:10:14 2013 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r faa42104c90a -r e2f5917da3c1 Makefile
--- a/Makefile Fri Jun 14 18:10:14 2013 -0700
+++ b/Makefile Wed Oct 16 15:17:01 2013 +0100
@@ -164,16 +164,23 @@
clobber:: deploy-clobber
endif
+ifeq ($(BUILD_INSTALL_BUNDLES), true)
+ generic_build_repo_series:: install-binaries-jdk-debug
+ clobber:: install-binaries-jdk-debug-clobber
+endif
+
generic_build_repo_series::
@$(call StopTimer,$(if $(DEBUG_NAME),$(DEBUG_NAME)_build,all_product_build))
# The debug build, fastdebug or debug. Needs special handling.
-# Note that debug builds do NOT do INSTALL steps, but must be done
-# after the product build and before the INSTALL step of the product build.
+#
+# Note that debug builds do NOT do INSTALL steps aside from the
+# install-binaries-jdk-debug or install-binaries-jdk-debug-clobber targets.
#
# DEBUG_NAME is fastdebug or debug
# ALT_OUTPUTDIR is changed to have -debug or -fastdebug suffix
# The resulting image directory (j2sdk-image) is used by the install makefiles
+# (only if debug files are present when install checks for them)
# to create a debug install bundle jdk-*-debug-** bundle (tar or zip)
# which will install in the debug or fastdebug subdirectory of the
# normal product install area.
@@ -189,7 +196,7 @@
ABS_BOOTDIR_OUTPUTDIR=$(ABS_OUTPUTDIR)/bootjdk
FRESH_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)/$(JDK_IMAGE_DIRNAME)
FRESH_DEBUG_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)/$(REL_JDK_IMAGE_DIR)
-
+
create_fresh_product_bootdir: FRC
$(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \
GENERATE_DOCS=false \
@@ -218,7 +225,7 @@
ifeq ($(DO_BOOT_CYCLE),true)
-
+
# Create the bootdir to use in the build
product_build:: create_fresh_product_bootdir
debug_build:: create_fresh_debug_bootdir
@@ -256,6 +263,8 @@
ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)/$(REL_JDK_OUTPUTDIR) \
DEBUG_NAME=$(DEBUG_NAME) \
GENERATE_DOCS=false \
+ $(if $(findstring true,$(BUILD_INSTALL)),BUILD_INSTALL_BUNDLES=true,) \
+ CREATE_DEBUGINFO_BUNDLES=true \
$(BOOT_CYCLE_DEBUG_SETTINGS) \
generic_build_repo_series
@@ -540,8 +549,8 @@
################################################################
.PHONY: all test test_run test_start test_summary test_clean \
- generic_build_repo_series \
- what clobber insane \
+ generic_build_repo_series \
+ what clobber insane \
dev dev-build dev-sanity dev-clobber \
product_build \
fastdebug_build \
@@ -556,4 +565,3 @@
# Force target
FRC:
-
diff -r faa42104c90a -r e2f5917da3c1 THIRD_PARTY_README
--- a/THIRD_PARTY_README Fri Jun 14 18:10:14 2013 -0700
+++ b/THIRD_PARTY_README Wed Oct 16 15:17:01 2013 +0100
@@ -1912,6 +1912,35 @@
-------------------------------------------------------------------------------
+%% This notice is provided with respect to Sparkle v.1.5,
+which is included with JRE 7 on Mac OS X.
+
+--- begin of LICENSE ---
+
+Copyright (c) 2012 Sparkle.org and Andy Matuschak
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+--- end of LICENSE ---
+
+-------------------------------------------------------------------------------
+
%% Portions licensed from Taligent, Inc.
-------------------------------------------------------------------------------
@@ -3169,12 +3198,12 @@
%% This notice is provided with respect to the following which is
included with JRE 7, JDK 7, and OpenJDK 7, except where noted:
- Apache Derby 10.8.1.2 [included with JDK 7 only]
+ Apache Derby 10.8.3.0 [included with JDK 7 only]
Apache Jakarta BCEL 5.2
Apache Jakarta Regexp 1.4
Apache Santuario XMLSec-Java 1.4.2
Apache Xalan-Java 2.7.1
- Apache Xerces2 Java 2.10.0
+ Apache Xerces2 Java 2.11.0
Apache XML Resolver 1.1
diff -r faa42104c90a -r e2f5917da3c1 make/Defs-internal.gmk
--- a/make/Defs-internal.gmk Fri Jun 14 18:10:14 2013 -0700
+++ b/make/Defs-internal.gmk Wed Oct 16 15:17:01 2013 +0100
@@ -322,7 +322,8 @@
JDK_MICRO_VERSION=$(JDK_MICRO_VERSION) \
PREVIOUS_MAJOR_VERSION=$(PREVIOUS_MAJOR_VERSION) \
PREVIOUS_MINOR_VERSION=$(PREVIOUS_MINOR_VERSION) \
- PREVIOUS_MICRO_VERSION=$(PREVIOUS_MICRO_VERSION)
+ PREVIOUS_MICRO_VERSION=$(PREVIOUS_MICRO_VERSION) \
+ STATIC_CXX=$(STATIC_CXX)
ifdef ARCH_DATA_MODEL
COMMON_BUILD_ARGUMENTS += ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)
diff -r faa42104c90a -r e2f5917da3c1 make/deploy-rules.gmk
--- a/make/deploy-rules.gmk Fri Jun 14 18:10:14 2013 -0700
+++ b/make/deploy-rules.gmk Wed Oct 16 15:17:01 2013 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -42,20 +42,6 @@
endif
DEPLOY_BUILD_TARGETS = sanity deploy
-# Only build 7-Zip LZMA file compression if it is available
-# Enable 7-Zip LZMA file (de)compression for Java Kernel if it is available
-ifeq ($(ARCH_DATA_MODEL), 32)
- ifeq ($(PLATFORM), windows)
- EC_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/lzma ] ; then \
- $(ECHO) true ; \
- else \
- $(ECHO) false ; \
- fi )
- ifeq ($(EC_TMP), true)
- DEPLOY_BUILD_TARGETS += extra-comp-all
- endif
- endif
-endif
ifneq ($(JQS), off)
ifeq ($(ARCH_DATA_MODEL), 32)
@@ -65,22 +51,6 @@
endif
endif
-ifeq ($(ARCH_DATA_MODEL), 32)
- ifeq ($(PLATFORM), windows)
- # Only set up to use UPX compression if it is available
- UP_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/upx ] ; then \
- $(ECHO) true ; \
- else \
- $(ECHO) false ; \
- fi )
- ifeq ($(UP_TMP), true)
- DEPLOY_BUILD_TARGETS += cmd-comp-all
- endif
- endif
-endif
-
-
-
ifndef DEV_ONLY
DEPLOY_BUILD_TARGETS += images
else
diff -r faa42104c90a -r e2f5917da3c1 make/hotspot-rules.gmk
--- a/make/hotspot-rules.gmk Fri Jun 14 18:10:14 2013 -0700
+++ b/make/hotspot-rules.gmk Wed Oct 16 15:17:01 2013 +0100
@@ -105,6 +105,8 @@
HOTSPOT_BUILD_ARGUMENTS += ZIP_DEBUGINFO_FILES="$(ZIP_DEBUGINFO_FILES)"
endif
+-include ${JDK_TOPDIR}/make/closed/common/Defs.gmk
+
hotspot-build::
$(MKDIR) -p $(HOTSPOT_OUTPUTDIR)
$(MKDIR) -p $(HOTSPOT_EXPORT_PATH)
diff -r faa42104c90a -r e2f5917da3c1 make/install-rules.gmk
--- a/make/install-rules.gmk Fri Jun 14 18:10:14 2013 -0700
+++ b/make/install-rules.gmk Wed Oct 16 15:17:01 2013 +0100
@@ -97,6 +97,23 @@
@$(ECHO) $@ installer combo build started: `$(DATE) '+%y-%m-%d %H:%M'`
$(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/ishield/wrapper/wrapper.jreboth ; $(MAKE) all
+
+install-binaries-jdk-debug:
+ifeq ($(BUILD_INSTALL_BUNDLES), true)
+ @$(call MakeStart,install,binaries-jdk-debug)
+ ($(CD) $(INSTALL_TOPDIR)/make/installer/binaries/$(PLATFORM) && \
+ $(MAKE) binaries-jdk-debug $(INSTALL_BUILD_ARGUMENTS))
+ @$(call MakeFinish,install,binaries-jdk-debug)
+endif
+
+install-binaries-jdk-debug-clobber:
+ifeq ($(BUILD_INSTALL_BUNDLES), true)
+ @$(call MakeStart,install,binaries-jdk-debug-clobber)
+ ($(CD) $(INSTALL_TOPDIR)/make/installer/binaries/$(PLATFORM) && \
+ $(MAKE) binaries-jdk-debug-clobber $(INSTALL_BUILD_ARGUMENTS))
+ @$(call MakeFinish,install,binaries-jdk-debug-clobber)
+endif
+
install-clobber:
ifeq ($(BUILD_INSTALL), true)
@$(call MakeStart,install,clobber)
@@ -116,4 +133,5 @@
######################################
.PHONY: install install-build install-clobber install-sanity \
- update-installer update-patchgen installer
+ update-installer update-patchgen installer \
+ install-binaries-jdk-debug install-binaries-jdk-debug-clobber
diff -r faa42104c90a -r e2f5917da3c1 make/jprt.gmk
--- a/make/jprt.gmk Fri Jun 14 18:10:14 2013 -0700
+++ b/make/jprt.gmk Wed Oct 16 15:17:01 2013 +0100
@@ -30,11 +30,9 @@
# To get all the bundles from JPRT, use:
# jprt submit -buildenv HAVE_JPRT_SAVE_BUNDLES=true -control "..." ...
-DEFAULT_BUILD_FLAVOR=product
-
# JPRT will define these when it builds
-JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(DEFAULT_BUILD_FLAVOR)-bundle.zip
-JPRT_ARCHIVE_INSTALL_BUNDLE=$(ABS_OUTPUTDIR)/$(DEFAULT_BUILD_FLAVOR)-install-bundle.zip
+JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(JPRT_BUILD_FLAVOR)-bundle.zip
+JPRT_ARCHIVE_INSTALL_BUNDLE=$(ABS_OUTPUTDIR)/$(JPRT_BUILD_FLAVOR)-install-bundle.zip
ifeq ($(PLATFORM),windows)
ZIPFLAGS=-q
diff -r faa42104c90a -r e2f5917da3c1 make/jprt.properties
--- a/make/jprt.properties Fri Jun 14 18:10:14 2013 -0700
+++ b/make/jprt.properties Wed Oct 16 15:17:01 2013 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -79,20 +79,17 @@
${jprt.my.test.target.set:TESTNAME=jdk_util}, \
${jprt.my.test.target.set:TESTNAME=jdk_io}, \
${jprt.my.test.target.set:TESTNAME=jdk_net}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_nio1}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_nio2}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_nio3}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_nio}, \
${jprt.my.test.target.set:TESTNAME=jdk_security1}, \
${jprt.my.test.target.set:TESTNAME=jdk_security2}, \
${jprt.my.test.target.set:TESTNAME=jdk_security3}, \
${jprt.my.test.target.set:TESTNAME=jdk_rmi}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_management1}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_management2}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_management}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_jmx}, \
${jprt.my.test.target.set:TESTNAME=jdk_text}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_tools1}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_tools2}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_tools}, \
${jprt.my.test.target.set:TESTNAME=jdk_jfr}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_misc}
+ ${jprt.my.test.target.set:TESTNAME=jdk_other}
# All vm test targets (testset=all)
jprt.vm.all.test.targets= \
@@ -107,6 +104,7 @@
${jprt.my.test.target.set:TESTNAME=jdk_beans1} \
${jprt.my.test.target.set:TESTNAME=jdk_beans2}, \
${jprt.my.test.target.set:TESTNAME=jdk_beans3}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_jdi}, \
${jprt.my.test.target.set:TESTNAME=jdk_sound}, \
${jprt.my.test.target.set:TESTNAME=jdk_swing}
diff -r faa42104c90a -r e2f5917da3c1 make/scripts/hgforest.sh
--- a/make/scripts/hgforest.sh Fri Jun 14 18:10:14 2013 -0700
+++ b/make/scripts/hgforest.sh Wed Oct 16 15:17:01 2013 +0100
@@ -58,7 +58,7 @@
fi
done
if [ "${pull_extra_base}" != "" ] ; then
- subrepos_extra="jdk/src/closed jdk/make/closed jdk/test/closed hotspot/src/closed hotspot/test/closed deploy install sponsors pubs"
More information about the distro-pkg-dev
mailing list