Mercurial > hg > release > icedtea7-forest-2.4
changeset 772:e214096589de
Merge jdk7u40-b29
| author | andrew |
|---|---|
| date | Mon, 01 Jul 2013 09:06:18 -0500 |
| parents | 9c74cb4a3ae8 (current diff) 1c141e6fde91 (diff) |
| children | ae86c6974e8e |
| files | .hgtags make/hotspot-rules.gmk |
| diffstat | 2 files changed, 21 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Jun 07 19:48:34 2013 +0100 +++ b/.hgtags Mon Jul 01 09:06:18 2013 -0500 @@ -283,6 +283,7 @@ 8e49ff2feda30801d7826ca1778eb7b901a7089c jdk7u17-b02 933d424580f967ed11eda2bbfd690f985a72df6e jdk7u17-b30 790582955edb617b41abbc73cf82544dbf8c1d97 jdk7u17-b31 +941539a9f6441f053e8e7f31064944b2fc08879f jdk7u17-b32 527d3cf769ec073d7348e4c31f97c47c943c96b6 jdk7u21-b01 bc264b362dc7b4f2bda34e1a5b87a4f0c2bd4d82 jdk7u21-b02 20603c659295a40c7f16259cb08c91475092efed jdk7u21-b03 @@ -296,6 +297,15 @@ fa322ca378324750ea049f2e92357e51eca27ae4 jdk7u21-b11 450e8dde919df278fe75ae95e0eb0a6464f5bc41 jdk7u21-b30 170520883597f90771aca8251a8d089e7566e4bf jdk7u21-b12 +50bfbd21bf42f6ae4167226ac45cd79e0ab7758c jdk7u25-b03 +a94c9aa356bbed13c1e2b4a9a380117ddff1668f jdk7u25-b04 +29a789ae14dc09a50eb45d3445075642e77490a2 jdk7u25-b05 +8a7c657b7536006633b5e961d93e2173712a64fa jdk7u25-b06 +d45374e7c7eeb4e01d9f239e71e8a8aff453d55a jdk7u25-b07 +b01002577912b89306e88a9973b6f3bc049a2a69 jdk7u25-b08 +84285f4e0aa2f81b80bc6fbe713d768c0d9a7156 jdk7u25-b09 +aae1e27d347b71f65f548c12b918ede98d869b7c jdk7u25-b10 +039f12124903cd0b7633a17a26f6ca281f7aaeae jdk7u25-b11 210f464368dba0fc4f8d239654fa7432ad2ed31f jdk7u14-b16 f07712232642fc30dcf7c433ff890e7247b5fd0b jdk7u14-b17 9e2a9a2c5b240daa4e27ff75d030a77827174753 jdk7u14-b18 @@ -304,3 +314,12 @@ 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
--- a/make/hotspot-rules.gmk Fri Jun 07 19:48:34 2013 +0100 +++ b/make/hotspot-rules.gmk Mon Jul 01 09:06:18 2013 -0500 @@ -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)