/hg/release/icedtea7-forest-2.4: 28 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Apr 16 18:41:25 UTC 2014
changeset a831c212ee26 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=a831c212ee26
author: katleman
date: Fri Dec 20 18:52:49 2013 -0800
Added tag jdk7u51-b31 for changeset 626e76f127a4
changeset 162bb2b05002 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=162bb2b05002
author: katleman
date: Thu Dec 26 13:04:49 2013 -0800
Added tag jdk7u51-b30 for changeset d2eeac0235ed
changeset b5ea303f23a5 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=b5ea303f23a5
author: asaha
date: Tue Dec 31 08:51:46 2013 -0800
Merge
changeset 15bc13cd7f5d in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=15bc13cd7f5d
author: asaha
date: Mon Dec 16 12:12:16 2013 -0800
Added tag jdk7u55-b00 for changeset df53ec7eb789
changeset c3d30d2cb568 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=c3d30d2cb568
author: asaha
date: Mon Dec 16 14:53:10 2013 -0800
Added tag jdk7u55-b01 for changeset 15bc13cd7f5d
changeset b0410dc4b96d in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=b0410dc4b96d
author: asaha
date: Mon Dec 16 18:47:39 2013 -0800
Merge
changeset 994ef5c95d58 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=994ef5c95d58
author: asaha
date: Fri Dec 20 11:45:31 2013 -0800
Merge
changeset bb37b9e70364 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=bb37b9e70364
author: asaha
date: Fri Dec 20 14:12:35 2013 -0800
Merge
changeset b829c5947c6c in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=b829c5947c6c
author: asaha
date: Fri Dec 20 21:28:51 2013 -0800
Merge
changeset 2b423d0ecded in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=2b423d0ecded
author: katleman
date: Tue Dec 24 14:45:42 2013 -0800
Added tag jdk7u55-b02 for changeset b829c5947c6c
changeset a72b902cdd39 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=a72b902cdd39
author: asaha
date: Thu Dec 26 15:48:45 2013 -0800
Merge
changeset 62a645cfaadf in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=62a645cfaadf
author: katleman
date: Mon Jan 06 13:56:47 2014 -0800
Added tag jdk7u55-b03 for changeset a72b902cdd39
changeset 15188023cffd in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=15188023cffd
author: katleman
date: Wed Jan 08 13:23:48 2014 -0800
Added tag jdk7u45-b35 for changeset d0d5badd77ab
changeset 472d67871307 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=472d67871307
author: asaha
date: Wed Jan 08 14:10:51 2014 -0800
Merge
changeset 6a8ee3807562 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=6a8ee3807562
author: asaha
date: Thu Jan 09 07:54:58 2014 -0800
Merge
changeset 92ac508efb9e in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=92ac508efb9e
author: katleman
date: Mon Jan 13 16:14:27 2014 -0800
Added tag jdk7u55-b04 for changeset 6a8ee3807562
changeset 6c7cd2146f69 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=6c7cd2146f69
author: katleman
date: Wed Jan 22 10:06:18 2014 -0800
Added tag jdk7u55-b05 for changeset 92ac508efb9e
changeset 5cad0f56c685 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=5cad0f56c685
author: katleman
date: Tue Jan 28 11:49:14 2014 -0800
Added tag jdk7u55-b06 for changeset 6c7cd2146f69
changeset f617c33f98e1 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=f617c33f98e1
author: katleman
date: Tue Feb 04 13:11:34 2014 -0800
Added tag jdk7u55-b07 for changeset 5cad0f56c685
changeset 1f02b1889f70 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=1f02b1889f70
author: katleman
date: Tue Feb 11 13:10:59 2014 -0800
Added tag jdk7u55-b08 for changeset f617c33f98e1
changeset 736c951b19b9 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=736c951b19b9
author: katleman
date: Tue Feb 18 12:41:07 2014 -0800
Added tag jdk7u55-b09 for changeset 1f02b1889f70
changeset 2a55bbab15f6 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=2a55bbab15f6
author: katleman
date: Tue Feb 18 13:35:58 2014 -0800
Added tag jdk7u55-b09 for changeset 736c951b19b9
changeset f4ace62029de in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=f4ace62029de
author: katleman
date: Tue Feb 25 12:19:22 2014 -0800
Added tag jdk7u55-b10 for changeset 2a55bbab15f6
changeset de268da51b54 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=de268da51b54
author: katleman
date: Tue Mar 04 12:01:27 2014 -0800
Added tag jdk7u55-b11 for changeset f4ace62029de
changeset d972a2d9e4f3 in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=d972a2d9e4f3
author: katleman
date: Tue Mar 11 12:59:14 2014 -0700
Added tag jdk7u55-b12 for changeset de268da51b54
changeset 0820b4707cfa in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=0820b4707cfa
author: katleman
date: Tue Mar 18 12:07:30 2014 -0700
Added tag jdk7u55-b13 for changeset d972a2d9e4f3
changeset 997ab3897d6e in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=997ab3897d6e
author: katleman
date: Thu Mar 27 11:22:57 2014 -0700
Added tag jdk7u55-b30 for changeset 0820b4707cfa
changeset f0fab6df83bb in /hg/release/icedtea7-forest-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4?cmd=changeset;node=f0fab6df83bb
author: andrew
date: Wed Apr 16 19:41:03 2014 +0100
Merge jdk7u55-b14
diffstat:
.hgtags | 37 +++++++++
.jcheck/conf | 2 -
common/bin/hgforest.sh | 190 +++++++++++++++++++++++++++++++++++++++++++++++
get_source.sh | 4 +-
make/Defs-internal.gmk | 15 +++-
make/scripts/hgforest.sh | 144 -----------------------------------
6 files changed, 243 insertions(+), 149 deletions(-)
diffs (truncated from 525 to 500 lines):
diff -r 626e76f127a4 -r f0fab6df83bb .hgtags
--- a/.hgtags Thu Dec 19 09:31:19 2013 -0800
+++ b/.hgtags Wed Apr 16 19:41:03 2014 +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
@@ -258,6 +265,7 @@
c3e42860af1cfd997fe1895594f652f0d1e9984e jdk7u12-b07
1a03ef4794dc8face4de605ae480d4c763e6b494 jdk7u12-b08
87cf81226f2012e5c21131adac7880f7e4da1133 jdk7u12-b09
+8a10a3c51f1cd88009008cf1b82071797b5f516d icedtea-2.4-branchpoint
745a15bb6d94765bb5c68048ff146590df9b8441 jdk7u14-b10
2d8fdaa5bb55b937028e385633ce58de4dcdb69c jdk7u14-b11
594dbbbb84add4aa310d51af7e298470d8cda458 jdk7u14-b12
@@ -333,6 +341,7 @@
d9d4dc020cb37142230f6a20d2a75a677c5cd26f jdk7u14-b19
b4b7795ef8047e3d2b2ba48a70c08d9184073100 jdk7u14-b19
f413e7a22c198559af5aca28309356e6d4edd78f jdk7u14-b20
+30065a72715f046e4a4bdec1c0cc7d65153c9d99 icedtea-2.4.0
41686e19d8189a546434a52dd9679e9b6a0a68be jdk7u14-b21
3e3177719b43f732239d6d51e96d26ee18440960 jdk7u14-b22
8c6e2197930c79f6beafd83181714cc817b83229 jdk7u40-b23
@@ -343,6 +352,8 @@
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
@@ -357,6 +368,7 @@
3af81bfe320c12758234233da6fa27c3c0ffcdc4 jdk7u40-b42
1d53bd8fd2a62bcf336727ebec377ef7498dd4a6 jdk7u40-b43
dc1e099cd62d250b4a997ce694b47fe2f50d2905 jdk7u40-b60
+6125b83238df36d96b3f6bf5ca6c740693dd3651 icedtea-2.4.2
6359fa34199c9619dfec0f41d2eb22a4083ce610 jdk7u40-b61
a2605cf03226ce2fef7a899ce41521c654300975 jdk7u40-b62
07e41ff8674c9438cb1124cf78eed8636ed5d4fa jdk7u45-b02
@@ -377,9 +389,12 @@
6fd67e0287a9893ea1f0090fe127f18a7e235148 jdk7u45-b17
f0cdb08a4624a623bdd178b04c4bf5a2fa4dc39a jdk7u45-b18
82f1f76c44124c31cb1151833fc15c13547ab280 jdk7u45-b30
+e2f5917da3c1b13bf8291d7864afba14ac35736a icedtea-2.4.3
+63b832c8ec92696277208631a6e71db4b33348e9 icedtea-2.4.4
f4373de4b75ba8d7f7a5d9c1f77e7884d9064b7e jdk7u45-b31
b73c006b5d81528dfb4104a79b994b56675bf75d jdk7u45-b33
05742477836cb30235328181c8e6cae5d4bb06fd jdk7u45-b34
+d0d5badd77abce0469830466ff7b910d3621d847 jdk7u45-b35
f2479abad143d2d9f33b6c872890ca0c5dd52530 jdk7u51-b00
c5822e1d1baa9625ee4e54b8e83a9bf529c883fc jdk7u51-b01
f750621fb31b8f6462b803b47bbf84f05cd5174a jdk7u51-b02
@@ -394,3 +409,25 @@
573c4cfca7dda548463bb84330bddfd07fe1183f jdk7u51-b11
df53ec7eb789e7dec375a685dce1fa5cf63618b4 jdk7u51-b12
6c778574d87336a2e55156544af92ce2de799696 jdk7u51-b13
+410eb7fef869645524ebb08293da1ba6215e5ce9 icedtea-2.4.5
+b028e58c1b77759531652b7ec81764f3c05ec96c icedtea-2.4.6pre01
+b028e58c1b77759531652b7ec81764f3c05ec96c icedtea-2.4.6
+13970e76b784af6454d9a01cf530a28305fa255f icedtea-2.4.7
+d2eeac0235eda77d0a6c72c7235a6e96bc9ad4fb jdk7u51-b30
+626e76f127a44ba0118a545d37410f80000db8fb jdk7u51-b31
+df53ec7eb789e7dec375a685dce1fa5cf63618b4 jdk7u55-b00
+15bc13cd7f5d0bb06ab59935e25944fa7cb15bc8 jdk7u55-b01
+b829c5947c6cd473f42cadfe2c61399fb67c2da6 jdk7u55-b02
+a72b902cdd39d9f2f2d353d5ad629e543cbc01ae jdk7u55-b03
+6a8ee38075621564dd276e8ed7be576d637acf79 jdk7u55-b04
+92ac508efb9e00d88b04a2bd79ab8a55f450a048 jdk7u55-b05
+6c7cd2146f69cf0823765b3cf84c338c1dc7157c jdk7u55-b06
+5cad0f56c685a0673944dbc5632ea9ae7b9340c7 jdk7u55-b07
+f617c33f98e1941875457c5c227198c52917942e jdk7u55-b08
+1f02b1889f7098c1e6fdd271ef74c62a2e346b28 jdk7u55-b09
+736c951b19b9562830f61d5ebbad78775f200e94 jdk7u55-b09
+2a55bbab15f6c866281003dcf48708a9d8c145e9 jdk7u55-b10
+f4ace62029de00d2497058c3c0e1d26e019cde30 jdk7u55-b11
+de268da51b54a4f36bcc1a9af60faea285e94330 jdk7u55-b12
+d972a2d9e4f3f864d26c33ccfdacd8269e0f29a8 jdk7u55-b13
+0820b4707cfa75f8211b88b0daa67bba8475f498 jdk7u55-b30
diff -r 626e76f127a4 -r f0fab6df83bb .jcheck/conf
--- a/.jcheck/conf Thu Dec 19 09:31:19 2013 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r 626e76f127a4 -r f0fab6df83bb common/bin/hgforest.sh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/common/bin/hgforest.sh Wed Apr 16 19:41:03 2014 +0100
@@ -0,0 +1,190 @@
+#!/bin/sh
+
+#
+# Copyright (c) 2009, 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# Shell script for a fast parallel forest command
+command="$1"
+pull_extra_base="$2"
+
+if [ "" = "$command" ] ; then
+ echo No command to hg supplied!
+ exit 1
+fi
+
+# Clean out the temporary directory that stores the pid files.
+tmp=/tmp/forest.$$
+rm -f -r ${tmp}
+mkdir -p ${tmp}
+
+safe_interrupt () {
+ if [ -d ${tmp} ]; then
+ if [ "`ls ${tmp}/*.pid`" != "" ]; then
+ echo "Waiting for processes ( `cat ${tmp}/*.pid | tr '\n' ' '`) to terminate nicely!"
+ sleep 1
+ # Pipe stderr to dev/null to silence kill, that complains when trying to kill
+ # a subprocess that has already exited.
+ kill -TERM `cat ${tmp}/*.pid | tr '\n' ' '` 2> /dev/null
+ wait
+ echo Interrupt complete!
+ fi
+ fi
+ rm -f -r ${tmp}
+ exit 1
+}
+
+nice_exit () {
+ if [ -d ${tmp} ]; then
+ if [ "`ls ${tmp}`" != "" ]; then
+ wait
+ fi
+ fi
+ rm -f -r ${tmp}
+}
+
+trap 'safe_interrupt' INT QUIT
+trap 'nice_exit' EXIT
+
+# Only look in specific locations for possible forests (avoids long searches)
+pull_default=""
+repos=""
+repos_extra=""
+if [ "${command}" = "clone" -o "${command}" = "fclone" ] ; then
+ subrepos="corba jaxp jaxws langtools jdk hotspot"
+ if [ -f .hg/hgrc ] ; then
+ pull_default=`hg paths default`
+ if [ "${pull_default}" = "" ] ; then
+ echo "ERROR: Need initial clone with 'hg paths default' defined"
+ exit 1
+ fi
+ fi
+ if [ "${pull_default}" = "" ] ; then
+ echo "ERROR: Need initial repository to use this script"
+ exit 1
+ fi
+ for i in ${subrepos} ; do
+ if [ ! -f ${i}/.hg/hgrc ] ; then
+ repos="${repos} ${i}"
+ fi
+ done
+ if [ "${pull_extra_base}" != "" ] ; then
+ subrepos_extra="jdk/src/closed jdk/make/closed jdk/test/closed hotspot/make/closed hotspot/src/closed hotspot/test/closed deploy install sponsors pubs"
+ pull_default_tail=`echo ${pull_default} | sed -e 's@^.*://[^/]*/\(.*\)@\1@'`
+ pull_extra="${pull_extra_base}/${pull_default_tail}"
+ for i in ${subrepos_extra} ; do
+ if [ ! -f ${i}/.hg/hgrc ] ; then
+ repos_extra="${repos_extra} ${i}"
+ fi
+ done
+ fi
+ at_a_time=2
+ # Any repos to deal with?
+ if [ "${repos}" = "" -a "${repos_extra}" = "" ] ; then
+ exit
+ fi
+else
+ hgdirs=`ls -d ./.hg ./*/.hg ./*/*/.hg ./*/*/*/.hg ./*/*/*/*/.hg 2>/dev/null`
+ # Derive repository names from the .hg directory locations
+ for i in ${hgdirs} ; do
+ repos="${repos} `echo ${i} | sed -e 's@/.hg$@@'`"
+ done
+ for i in ${repos} ; do
+ if [ -h ${i}/.hg/store/lock -o -f ${i}/.hg/store/lock ] ; then
+ locked="${i} ${locked}"
+ fi
+ done
+ at_a_time=8
+ # Any repos to deal with?
+ if [ "${repos}" = "" ] ; then
+ echo "No repositories to process."
+ exit
+ fi
+ if [ "${locked}" != "" ] ; then
+ echo "These repositories are locked: ${locked}"
+ exit
+ fi
+fi
+
+# Echo out what repositories we do a command on.
+echo "# Repositories: ${repos} ${repos_extra}"
+echo
+
+# Run the supplied command on all repos in parallel.
+n=0
+for i in ${repos} ${repos_extra} ; do
+ n=`expr ${n} '+' 1`
+ repopidfile=`echo ${i} | sed -e 's at ./@@' -e 's@/@_ at g'`
+ reponame=`echo ${i} | sed -e :a -e 's/^.\{1,20\}$/ &/;ta'`
+ pull_base="${pull_default}"
+ for j in $repos_extra ; do
+ if [ "$i" = "$j" ] ; then
+ pull_base="${pull_extra}"
+ fi
+ done
+ (
+ (
+ if [ "${command}" = "clone" -o "${command}" = "fclone" ] ; then
+ pull_newrepo="${pull_base}/${i}"
+ # pull_newrepo="`echo ${pull_base}/${i} | sed -e 's@\([^:]/\)//*@\1 at g'`"
+ echo hg clone ${pull_newrepo} ${i}
+ path="`dirname ${i}`"
+ if [ "${path}" != "." ] ; then
+ times=0
+ while [ ! -d "${path}" ] ## nested repo, ensure containing dir exists
+ do
+ times=`expr ${times} '+' 1`
+ if [ `expr ${times} '%' 10` -eq 0 ] ; then
+ echo ${path} still not created, waiting...
+ fi
+ sleep 5
+ done
+ fi
+ (PYTHONUNBUFFERED=true hg clone ${pull_newrepo} ${i}; echo "$?" > ${tmp}/${repopidfile}.pid.rc )&
+ else
+ echo "cd ${i} && hg $*"
+ cd ${i} && (PYTHONUNBUFFERED=true hg "$@"; echo "$?" > ${tmp}/${repopidfile}.pid.rc )&
+ fi
+ echo $! > ${tmp}/${repopidfile}.pid
+ ) 2>&1 | sed -e "s@^@${reponame}: @") &
+
+ if [ `expr ${n} '%' ${at_a_time}` -eq 0 ] ; then
+ sleep 2
+ echo Waiting 5 secs before spawning next background command.
+ sleep 3
+ fi
+done
+# Wait for all hg commands to complete
+wait
+
+# Terminate with exit 0 only if all subprocesses were successful
+ec=0
+if [ -d ${tmp} ]; then
+ for rc in ${tmp}/*.pid.rc ; do
+ exit_code=`cat ${rc} | tr -d ' \n\r'`
+ if [ "${exit_code}" != "0" ] ; then
+ echo "WARNING: ${rc} exited abnormally."
+ ec=1
+ fi
+ done
+fi
+exit ${ec}
diff -r 626e76f127a4 -r f0fab6df83bb get_source.sh
--- a/get_source.sh Thu Dec 19 09:31:19 2013 -0800
+++ b/get_source.sh Wed Apr 16 19:41:03 2014 +0100
@@ -26,8 +26,8 @@
#
# Get clones of all nested repositories
-sh ./make/scripts/hgforest.sh clone $*
+sh ./common/bin/hgforest.sh clone "$@" || exit 1
# Update all existing repositories to the latest sources
-sh ./make/scripts/hgforest.sh pull -u
+sh ./common/bin/hgforest.sh pull -u
diff -r 626e76f127a4 -r f0fab6df83bb make/Defs-internal.gmk
--- a/make/Defs-internal.gmk Thu Dec 19 09:31:19 2013 -0800
+++ b/make/Defs-internal.gmk Wed Apr 16 19:41:03 2014 +0100
@@ -303,6 +303,16 @@
ABS_JAXWS_DIST = $(JAXWS_OUTPUTDIR)/dist
endif
+# Command to PaX mark the VM
+ifndef PAX_COMMAND
+ PAX_COMMAND = /usr/sbin/paxmark.sh
+endif
+ifeq ($(ARCH), i586)
+ PAX_COMMAND_ARGS="-msp"
+else
+ PAX_COMMAND_ARGS="-m"
+endif
+
# Common make arguments (supplied to all component builds)
COMMON_BUILD_ARGUMENTS = \
JDK_TOPDIR=$(ABS_JDK_TOPDIR) \
@@ -322,7 +332,10 @@
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) \
+ PAX_COMMAND=$(PAX_COMMAND) \
+ PAX_COMMAND_ARGS=$(PAX_COMMAND_ARGS)
ifdef ARCH_DATA_MODEL
COMMON_BUILD_ARGUMENTS += ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)
diff -r 626e76f127a4 -r f0fab6df83bb make/scripts/hgforest.sh
--- a/make/scripts/hgforest.sh Thu Dec 19 09:31:19 2013 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,144 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright (c) 2009, 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Shell script for a fast parallel forest command
-command="$1"
-pull_extra_base="$2"
-
-tmp=/tmp/forest.$$
-rm -f -r ${tmp}
-mkdir -p ${tmp}
-
-# Remove tmp area on A. B. Normal termination
-trap 'rm -f -r ${tmp}' KILL
-trap 'rm -f -r ${tmp}' EXIT
-
-# Only look in specific locations for possible forests (avoids long searches)
-pull_default=""
-repos=""
-repos_extra=""
-if [ "${command}" = "clone" -o "${command}" = "fclone" ] ; then
- subrepos="corba jaxp jaxws langtools jdk hotspot"
- if [ -f .hg/hgrc ] ; then
- pull_default=`hg paths default`
- if [ "${pull_default}" = "" ] ; then
- echo "ERROR: Need initial clone with 'hg paths default' defined"
- exit 1
- fi
- fi
- if [ "${pull_default}" = "" ] ; then
- echo "ERROR: Need initial repository to use this script"
- exit 1
- fi
- for i in ${subrepos} ; do
- if [ ! -f ${i}/.hg/hgrc ] ; then
- repos="${repos} ${i}"
- fi
- done
- if [ "${pull_extra_base}" != "" ] ; then
- subrepos_extra="jdk/src/closed jdk/make/closed jdk/test/closed hotspot/make/closed hotspot/src/closed hotspot/test/closed deploy install sponsors pubs"
- pull_default_tail=`echo ${pull_default} | sed -e 's@^.*://[^/]*/\(.*\)@\1@'`
- pull_extra="${pull_extra_base}/${pull_default_tail}"
- for i in ${subrepos_extra} ; do
- if [ ! -f ${i}/.hg/hgrc ] ; then
- repos_extra="${repos_extra} ${i}"
- fi
- done
- fi
- at_a_time=2
- # Any repos to deal with?
- if [ "${repos}" = "" -a "${repos_extra}" = "" ] ; then
- echo "No repositories to clone."
- exit
- fi
-else
- hgdirs=`ls -d ./.hg ./*/.hg ./*/*/.hg ./*/*/*/.hg ./*/*/*/*/.hg 2>/dev/null`
- # Derive repository names from the .hg directory locations
- for i in ${hgdirs} ; do
- repos="${repos} `echo ${i} | sed -e 's@/.hg$@@'`"
- done
- at_a_time=8
- # Any repos to deal with?
- if [ "${repos}" = "" ] ; then
- echo "No repositories to process."
- exit
- fi
-fi
-
-# Echo out what repositories we will clone
-echo "# Repos: ${repos} ${repos_extra}"
-
-# Run the supplied command on all repos in parallel, save output until end
-n=0
-for i in ${repos} ; do
- echo "Starting on ${i}"
- n=`expr ${n} '+' 1`
- (
- (
- if [ "${command}" = "clone" -o "${command}" = "fclone" ] ; then
- pull_newrepo="`echo ${pull_default}/${i} | sed -e 's@\([^:]/\)//*@\1 at g'`"
- cline="hg clone ${pull_newrepo} ${i}"
- echo "# ${cline}"
- ( eval "${cline}" )
- else
- cline="hg $*"
- echo "# cd ${i} && ${cline}"
- ( cd ${i} && eval "${cline}" )
- fi
- echo "# exit code $?"
- ) > ${tmp}/repo.${n} 2>&1 ; cat ${tmp}/repo.${n} ) &
- if [ `expr ${n} '%' ${at_a_time}` -eq 0 ] ; then
- sleep 5
- fi
-done
-# Wait for all hg commands to complete
-wait
-
-if [ "${repos_extra}" != "" ] ; then
More information about the distro-pkg-dev
mailing list