/hg/release/icedtea7-forest-2.4/corba: 21 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Aug 21 06:25:51 PDT 2013
changeset fab3339a833d in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=fab3339a833d
author: katleman
date: Wed Jul 17 11:09:13 2013 -0700
Added tag jdk7u40-b34 for changeset ddd543ddf330
changeset 061560751a50 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=061560751a50
author: katleman
date: Wed Jul 24 14:44:50 2013 -0700
Added tag jdk7u40-b35 for changeset fab3339a833d
changeset c0231d18f496 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=c0231d18f496
author: asaha
date: Thu Apr 11 10:30:31 2013 -0700
Merge
changeset 0512c60bbff6 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=0512c60bbff6
author: katleman
date: Wed May 01 14:51:40 2013 -0700
Added tag jdk7u21-b31 for changeset c0231d18f496
changeset e1b39a63a6c3 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=e1b39a63a6c3
author: asaha
date: Thu Jun 06 13:14:04 2013 -0700
Merge
changeset eca82267e36c in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=eca82267e36c
author: katleman
date: Tue May 28 10:36:22 2013 -0700
Added tag jdk7u21-b50 for changeset fa2a377ce52d
changeset ddff7b2f69fa in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=ddff7b2f69fa
author: asaha
date: Thu Jun 06 20:18:27 2013 -0700
Merge
changeset 9e2247c5d4b8 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=9e2247c5d4b8
author: katleman
date: Tue Jun 11 17:48:55 2013 -0700
Added tag jdk7u25-b31 for changeset ddff7b2f69fa
changeset 1e888b6e1fb6 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=1e888b6e1fb6
author: katleman
date: Tue Jun 18 11:14:50 2013 -0700
Added tag jdk7u25-b33 for changeset 9e2247c5d4b8
changeset 2d046d428608 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=2d046d428608
author: asaha
date: Tue Jul 16 15:03:56 2013 -0700
Merge
changeset ab49640a802e in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=ab49640a802e
author: katleman
date: Thu Jul 18 20:46:16 2013 -0700
Added tag jdk7u25-b34 for changeset 1e888b6e1fb6
changeset 9d6dfd600c51 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=9d6dfd600c51
author: asaha
date: Fri Jul 19 22:17:58 2013 -0700
Merge
changeset 692651f89f35 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=692651f89f35
author: asaha
date: Tue Jul 23 20:38:34 2013 -0700
Merge
changeset 9e13de8fda1e in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=9e13de8fda1e
author: asaha
date: Wed Jul 24 18:51:17 2013 -0700
Merge
changeset 3eaff5b0cd97 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=3eaff5b0cd97
author: jeff
date: Thu Jul 25 12:29:53 2013 -0700
8014850: Third Party License Readme updates for 7u40
Reviewed-by: lana, tbell
changeset cd3871b15169 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=cd3871b15169
author: lana
date: Thu Jul 25 14:09:57 2013 -0700
Merge
changeset dc9a63376b39 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=dc9a63376b39
author: cl
date: Wed Jul 31 21:26:55 2013 -0700
Added tag jdk7u40-b36 for changeset cd3871b15169
changeset 8391dff270bb in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=8391dff270bb
author: asaha
date: Fri Aug 02 13:10:12 2013 -0700
Added tag jdk7u40-b37 for changeset dc9a63376b39
changeset d7c73fd53c84 in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=d7c73fd53c84
author: asaha
date: Wed Aug 07 12:09:01 2013 -0700
Added tag jdk7u40-b38 for changeset 8391dff270bb
changeset a91b57bf60bd in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=a91b57bf60bd
author: katleman
date: Mon Aug 12 12:07:29 2013 -0700
Added tag jdk7u40-b39 for changeset d7c73fd53c84
changeset edc7119d7a2a in /hg/release/icedtea7-forest-2.4/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba?cmd=changeset;node=edc7119d7a2a
author: andrew
date: Wed Aug 21 14:21:19 2013 +0100
Merge jdk7u40-b40
diffstat:
.hgtags | 21 +++++++++++++++++++++
.jcheck/conf | 2 --
THIRD_PARTY_README | 33 +++++++++++++++++++++++++++++++--
make/Makefile | 2 +-
make/common/shared/Platform.gmk | 9 +++++++++
5 files changed, 62 insertions(+), 5 deletions(-)
diffs (214 lines):
diff -r ddd543ddf330 -r edc7119d7a2a .hgtags
--- a/.hgtags Wed Jul 10 13:48:45 2013 -0700
+++ b/.hgtags Wed Aug 21 14:21:19 2013 +0100
@@ -50,6 +50,7 @@
b751c528c55560cf2adeaeef24b39ca1f4d1cbf7 jdk7-b73
5d0cf59a3203b9f57aceebc33ae656b884987955 jdk7-b74
0fb137085952c8e47878e240d1cb40f14de463c4 jdk7-b75
+d728db3889da23d9f74e45154b9261a43b4acd8d icedtea7-1.12
937144222e2219939101b0129d26a872a7956b13 jdk7-b76
6881f0383f623394b5ec73f27a5f329ff55d0467 jdk7-b77
a7f7276b48cd74d8eb1baa83fbf3d1ef4a2603c8 jdk7-b78
@@ -63,6 +64,7 @@
6253e28826d16cf1aecc39ce04c8de1f6bf2df5f jdk7-b86
09a41111a401d327f65e453384d976a10154d9ea jdk7-b87
39e14d2da687c7e592142137517aaf689544820f jdk7-b88
+e805b4155d76f76d40ffae36a74546f79218c539 icedtea7-1.13
bb4424c5e778b842c064a8b1aa902b35f4397654 jdk7-b89
56ce07b0eb47b93a98a72adef0f21e602c460623 jdk7-b90
bcd2fc089227559ac5be927923609fac29f067fa jdk7-b91
@@ -111,6 +113,7 @@
918003855fa0dba5acf4bf1fe36526d2fc4c1ba8 jdk7-b134
e0b72ae5dc5e824b342801c8d1d336a55eb54e2c jdk7-b135
48ef0c712e7cbf272f47f9224db92a3c6a9e2612 jdk7-b136
+b62418551e20fa19fbf57c49d4378b7096809e60 icedtea-1.14
a66c01d8bf895261715955df0b95545c000ed6a8 jdk7-b137
78d8cf04697e9df54f7f11e195b7da29b8e345a2 jdk7-b138
60b074ec6fcf5cdf9efce22fdfb02326ed8fa2d3 jdk7-b139
@@ -123,6 +126,7 @@
770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146
36f0efbc66ef8ace3cca8aa8d0c88f3334080f8a jdk7u1-b01
73323cb3396260d93e0ab731fd2d431096ceed0f jdk7-b147
+d034cc90ecc266d78b87d1429c426669431fcc1f icedtea-2.0-branchpoint
9515a2d034b4727c11aeea36354a549fbc469c4f jdk7u1-b02
dd71cb354c573c1addcda269a7dd9144bfce9587 jdk7u1-b03
eaee830124aa453627591d8f9eccb39d7e040876 jdk7u1-b04
@@ -141,6 +145,7 @@
56b02f8ef70391a67c9fa71157a8faafbdff4b74 jdk7u2-b12
456ff1f14b14ef8cfe47cef95c8094f8443fa092 jdk7u2-b13
62b846b0c3259cae732e75df50a1b180a2541178 jdk7u2-b21
+ecb9fc90dea4720f5c1ba1354364ed610f463e41 icedtea-2.1-branchpoint
1b648adeeefa9b1fb022459e8e4f590b736c0fdd jdk7u3-b02
730fa05af5a9d10a3a7a1626d248b96d09f8069f jdk7u3-b03
7f7a9b1addb4925f4f6e17f6eb5cce986c3b626d jdk7u3-b04
@@ -157,6 +162,7 @@
23777178e7eb61859be3f7240561aa1034ff9221 jdk7u4-b10
bdc37f3c09b6008667aff77432bb6d31cbae945e jdk7u4-b11
fddc26b35a31884d64315cf7c296570245e9c481 jdk7u4-b12
+9ffa2340e018131c900e9cc12c9f3a10698aa191 icedtea-2.2-branchpoint
f7119745898016a98cddab3e69efb41c5a5aaf78 jdk7u4-b13
6a262c36caebb43972cbae5032cff632ce31d2cc jdk7u4-b14
d9bf21b76f093abfe451880d5db29e4932b1e72e jdk7u4-b15
@@ -191,6 +197,7 @@
8da4015f405b0fa267cca4780d20cd012d0a9cb4 jdk7u6-b15
7674c7ed99a53a8dcf654ab8a6963199ef562a08 jdk7u6-b16
e4a676826cb3fe2f84e19105a027c15c097f98f1 jdk7u6-b17
+68c35d6e9548bc7be9c3ce73774c6d53b0d72d3b icedtea-2.3-branchpoint
b3d767dbd67f518168c561e078be5e860bc60cfc jdk7u6-b18
5c046510b9308bf514f078d48fcf0112a376ad41 jdk7u6-b19
f0c51b691d34b4a06c1e22c7960be71e0d0ee84e jdk7u6-b20
@@ -258,6 +265,7 @@
7969d5f219248de033c296ef75fff7aae7545bbd jdk7u12-b07
6f4d4c7a254d4aca3a7f2caabb75e6559a290393 jdk7u12-b08
c8c261b2220c5b966c07784682057a915defb0da jdk7u12-b09
+efbe4cef7fe2d46a197c39eb7a94e127e0bb4c5d icedtea-2.4-branchpoint
3877f9ae971eefbfbbcb16f2ff79c72ac10ac4bd jdk7u14-b10
3bd891cd98773cf841ad65f52f25e3e6fa185cef jdk7u14-b11
fbb83600db33de6211fc58ba2a2bbb6b356aa9c2 jdk7u14-b12
@@ -288,7 +296,9 @@
b2adfd931a2504948d4fee780e4175122be10484 jdk7u21-b10
61e2e2d9cfcea20132b50d8fb7ead66a8a373db7 jdk7u21-b11
3c774492beaaff241c654add2c4e683b9ff002f2 jdk7u21-b30
+fa2a377ce52dfa88fca858d735d78b53f2b5b754 jdk7u21-b50
fa2a377ce52dfa88fca858d735d78b53f2b5b754 jdk7u21-b12
+c0231d18f496dd0bc133e128f6b667a4d8f569a5 jdk7u21-b31
3d0f2d5b1866860f7089b51cca8ca0ca41c04d9c jdk7u25-b01
cdbafc5080eeb8ea3fec9fe7d071e0bf96635581 jdk7u25-b02
2057de7ee6b17ab3335ec6cd5730f88f4cfe9502 jdk7u25-b03
@@ -304,6 +314,9 @@
eca480919c71072a31f62a61cb3aad30677007e3 jdk7u25-b13
577c4dd1a6e9bc1bb2c2e5d5ecbab8eacb4121af jdk7u25-b14
4fde7ac2ecf4b170022ebbf8a961e6dbb229ccab jdk7u25-b15
+ddff7b2f69faaa8883e3986447daeab289f25e03 jdk7u25-b31
+9e2247c5d4b82798d393daf4e50cbadcaf0dc844 jdk7u25-b33
+1e888b6e1fb63cff9ea120bc7b0667578d82823b jdk7u25-b34
f4bec833a24b20f5ae770d0650350fc8950c9dc0 jdk7u25-b30
65d0e39500d56c6ea1fd52abbd1bef7966c3e87f jdk7u25-b16
d77153cbe030f91f432fae7c356cf6b5aab12a12 jdk7u25-b32
@@ -314,6 +327,7 @@
bfbaab73969d4d978d0280d6ad51bac8c47dbaf8 jdk7u14-b19
a921b45a1f9086a7d598a76f920639050386f996 jdk7u14-b19
54320e5d9da60df24f0e2c57c011809911dc06e1 jdk7u14-b20
+47084105fe834aa1c6f2ee2bbea01deaa05059dd icedtea-2.4.0
fb590ca4de9aaf1f6bca945be040dffc55b5e8d2 jdk7u14-b21
e5d89aa2c1a11dba841a646858dda9ea18dc8f57 jdk7u14-b22
d85df1552f877a1cc51f43bc07a42a0c48f18e0b jdk7u40-b23
@@ -324,6 +338,13 @@
c8b9201f88f4ce417df7a40efcb7fef656d94512 jdk7u40-b28
1ad0a5a3f7b1e9d95670d733d7e70714050ba6bf jdk7u40-b29
651dcadbd9774165e017f8b7d1bde7d7d280ae1d jdk7u40-b30
+23ae4e0e0cce13779c531a704bf95fda1764882b icedtea-2.4.1
3d2b811b8a798ff3b619f8330b08f551f7fdfd80 jdk7u40-b31
c5f85903c49aa716ee3cb93361dd60a3e88d866d jdk7u40-b32
1b7fbfdc31b859097d6a365ad0ba0e8ef92b4063 jdk7u40-b33
+ddd543ddf33017a15623cdf6908ae4ef2958e24e jdk7u40-b34
+fab3339a833da9631ead479621edcf6df2df457d jdk7u40-b35
+cd3871b1516988ea4a3099d6e1886abe2e74e771 jdk7u40-b36
+dc9a63376b39223bfb612d9e8efd275023de6399 jdk7u40-b37
+8391dff270bbf75dc434e53ed68993ab833475e8 jdk7u40-b38
+d7c73fd53c84cbb4333559cf788e554a2ef9326c jdk7u40-b39
diff -r ddd543ddf330 -r edc7119d7a2a .jcheck/conf
--- a/.jcheck/conf Wed Jul 10 13:48:45 2013 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r ddd543ddf330 -r edc7119d7a2a THIRD_PARTY_README
--- a/THIRD_PARTY_README Wed Jul 10 13:48:45 2013 -0700
+++ b/THIRD_PARTY_README Wed Aug 21 14:21:19 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 ddd543ddf330 -r edc7119d7a2a make/Makefile
--- a/make/Makefile Wed Jul 10 13:48:45 2013 -0700
+++ b/make/Makefile Wed Aug 21 14:21:19 2013 +0100
@@ -150,7 +150,7 @@
#----- bin.zip
-BIN_ZIP_FILES = $(BUILD_DIR/lib/orb.idl $(BUILD_DIR)/lib/ir.idl
+BIN_ZIP_FILES = $(BUILD_DIR)/lib/orb.idl $(BUILD_DIR)/lib/ir.idl
BIN_ZIP = $(LIB_DIR)/bin.zip
$(BIN_ZIP): $(BIN_ZIP_FILES)
diff -r ddd543ddf330 -r edc7119d7a2a make/common/shared/Platform.gmk
--- a/make/common/shared/Platform.gmk Wed Jul 10 13:48:45 2013 -0700
+++ b/make/common/shared/Platform.gmk Wed Aug 21 14:21:19 2013 +0100
@@ -153,6 +153,9 @@
OS_VERSION := $(shell uname -r)
# Arch and OS name/version
mach := $(shell uname -m)
+ ifneq (,$(wildcard /usr/bin/dpkg-architecture))
+ mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/')
+ endif
archExpr = case "$(mach)" in \
i[3-9]86) \
echo i586 \
@@ -169,6 +172,9 @@
arm*) \
echo arm \
;; \
+ sh*) \
+ echo sh \
+ ;; \
*) \
echo $(mach) \
;; \
@@ -196,6 +202,9 @@
else
ARCH_DATA_MODEL=64
endif
+ ifeq ($(ARCH), sh)
+ ARCH_DATA_MODEL=32
+ endif
endif
endif
More information about the distro-pkg-dev
mailing list