Mercurial > hg > release > icedtea7-2.4
changeset 2594:788a1e4afb82
Update to u10 b07.
2012-09-19 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.am,
(OPENJDK_VERSION): Bump to b07.
(JDK_UPDATE_VERSION): Bump to u10.
(CORBA_CHANGESET): Update to IcedTea7 forest head.
(JAXP_CHANGESET): Likewise.
(JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise.
(LANGTOOLS_CHANGESET): Likewise.
(OPENJDK_CHANGESET): Likewise.
(CORBA_SHA256SUM): Likewise.
(JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise.
(JDK_SHA256SUM): Likewise.
(LANGTOOLS_SHA256SUM): Likewise.
(OPENJDK_SHA256SUM): Likewise.
* hotspot.map: Update default to head of IcedTea7
forest HotSpot.
* patches/boot/ecj-diamond.patch:
Add additional cases in sun.launcher.LauncherHelper.
* patches/boot/ecj-trywithresources.patch:
Add new case in sun.launcher.LauncherHelper.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Wed, 19 Sep 2012 05:17:00 +0100 |
| parents | b7036fcc4727 |
| children | b374a4e01497 |
| files | ChangeLog Makefile.am hotspot.map patches/boot/ecj-diamond.patch patches/boot/ecj-trywithresources.patch |
| diffstat | 5 files changed, 82 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Sep 03 14:06:01 2012 +0100 +++ b/ChangeLog Wed Sep 19 05:17:00 2012 +0100 @@ -1,3 +1,27 @@ +2012-09-19 Andrew John Hughes <gnu_andrew@member.fsf.org> + + * Makefile.am, + (OPENJDK_VERSION): Bump to b07. + (JDK_UPDATE_VERSION): Bump to u10. + (CORBA_CHANGESET): Update to IcedTea7 forest head. + (JAXP_CHANGESET): Likewise. + (JAXWS_CHANGESET): Likewise. + (JDK_CHANGESET): Likewise. + (LANGTOOLS_CHANGESET): Likewise. + (OPENJDK_CHANGESET): Likewise. + (CORBA_SHA256SUM): Likewise. + (JAXP_SHA256SUM): Likewise. + (JAXWS_SHA256SUM): Likewise. + (JDK_SHA256SUM): Likewise. + (LANGTOOLS_SHA256SUM): Likewise. + (OPENJDK_SHA256SUM): Likewise. + * hotspot.map: Update default to head of IcedTea7 + forest HotSpot. + * patches/boot/ecj-diamond.patch: + Add additional cases in sun.launcher.LauncherHelper. + * patches/boot/ecj-trywithresources.patch: + Add new case in sun.launcher.LauncherHelper. + 2012-09-03 Andrew John Hughes <gnu_andrew@member.fsf.org> * NEWS: Add new releases: 2.1.2, 2.2.2,
--- a/Makefile.am Mon Sep 03 14:06:01 2012 +0100 +++ b/Makefile.am Wed Sep 19 05:17:00 2012 +0100 @@ -1,22 +1,22 @@ # Dependencies -OPENJDK_VERSION = b04 -JDK_UPDATE_VERSION = 08 +OPENJDK_VERSION = b07 +JDK_UPDATE_VERSION = 10 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION) -CORBA_CHANGESET = 0145833b7e10 -JAXP_CHANGESET = 6de64995ea6e -JAXWS_CHANGESET = 1a01efb4cd05 -JDK_CHANGESET = 5a2688a73184 -LANGTOOLS_CHANGESET = 3ce5864ed9da -OPENJDK_CHANGESET = d2607b1bfb20 +CORBA_CHANGESET = 460b8758b9e4 +JAXP_CHANGESET = 5022489661f3 +JAXWS_CHANGESET = cf12218e2d86 +JDK_CHANGESET = 7458205a24cb +LANGTOOLS_CHANGESET = b6aa87579acb +OPENJDK_CHANGESET = d6cfb4b87935 -CORBA_SHA256SUM = fcf6f60b89b1dd3d98c9fffdb226dad3f6503ab0829c43807a30e94d22800795 -JAXP_SHA256SUM = 3e64af781e9f17aae31cf8e94483d6f8a03a4c587c76c69c4b8009fa5d6118a2 -JAXWS_SHA256SUM = d388525b19f5a0eefc70dc77bceb2e6697061a47372697769e5a5e2ee8ec35cc -JDK_SHA256SUM = 84637b747bfc0e5bf1dd4c47322c2bbc3ac81483f361553fb9c29d1446fd070a -LANGTOOLS_SHA256SUM = 6c68a410c723c09a902659a28ee953a760b5c9d89947fcacee545a008e9d8918 -OPENJDK_SHA256SUM = 237d4d7c35d66536604e54781d1c927c7e75809a24b918640b3d10d92fec4e2c +CORBA_SHA256SUM = a9f997e9b8b530a8155505bbb0ef83a2aac5cdea120f87196172f1402f98018c +JAXP_SHA256SUM = efc733f72384008e3bb095420964b671eeecba02e7003bb50355e835f2495bf3 +JAXWS_SHA256SUM = 3aae6d0d757c460b4d9a5cbebf722fc81192d1dcebd25d4c709fe6b03c12d48d +JDK_SHA256SUM = 9602aaa77634a7750afc63f65334ae26efc2b38ef822552e77cef456d681cb97 +LANGTOOLS_SHA256SUM = 166a06f7a56b5ae0eeb51d07b634e95e1c9c541875ea7ec3e529b72172cf875b +OPENJDK_SHA256SUM = 237b638ca0a210524ae719c96d18909ab951830081078f842ce3afa5fd20b39d CACAO_VERSION = a567bcb7f589 CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9
--- a/hotspot.map Mon Sep 03 14:06:01 2012 +0100 +++ b/hotspot.map Wed Sep 19 05:17:00 2012 +0100 @@ -1,3 +1,3 @@ # version url changeset sha256sum -default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot 2aad7a18d716 b0328803af53973a5a465ded4a7d8cb4d3862be783604b54e79828cbff5ae548 +default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot 08596d5d7dda c88abf4d9ab315e48a790ae184201efcd9b659c292b27570e3e606db585f2073 zero http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot b41a43560dc8 25d13a4be1c343b620d2a85a47b8b654abaee3541968d205128ca69cf46fc17c
--- a/patches/boot/ecj-diamond.patch Mon Sep 03 14:06:01 2012 +0100 +++ b/patches/boot/ecj-diamond.patch Wed Sep 19 05:17:00 2012 +0100 @@ -3694,6 +3694,24 @@ for (Locale l : tlocales) { sortedSet.add(l.toString()); } +@@ -532,7 +532,7 @@ + } + + static String[] expandArgs(String[] argArray) { +- List<StdArg> aList = new ArrayList<>(); ++ List<StdArg> aList = new ArrayList<StdArg>(); + for (String x : argArray) { + aList.add(new StdArg(x)); + } +@@ -540,7 +540,7 @@ + } + + static String[] expandArgs(List<StdArg> argList) { +- ArrayList<String> out = new ArrayList<>(); ++ ArrayList<String> out = new ArrayList<String>(); + if (trace) { + System.err.println("Incoming arguments:"); + } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java openjdk-boot/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java --- openjdk-boot.orig/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java 2012-08-29 13:24:58.000000000 +0100 +++ openjdk-boot/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java 2012-08-29 13:51:21.645694645 +0100
--- a/patches/boot/ecj-trywithresources.patch Mon Sep 03 14:06:01 2012 +0100 +++ b/patches/boot/ecj-trywithresources.patch Wed Sep 19 05:17:00 2012 +0100 @@ -1056,3 +1056,28 @@ } catch (IOException x) { } return result; +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2012-09-19 03:56:50.376373385 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2012-09-19 04:02:15.841559851 +0100 +@@ -555,8 +555,9 @@ + if (parent == null) { + parent = new File("."); + } +- try (DirectoryStream<Path> dstream = +- Files.newDirectoryStream(parent.toPath(), glob)) { ++ DirectoryStream<Path> dstream = null; ++ try { ++ dstream = Files.newDirectoryStream(parent.toPath(), glob); + int entries = 0; + for (Path p : dstream) { + out.add(p.normalize().toString()); +@@ -571,6 +572,9 @@ + System.err.println("Warning: passing argument as-is " + a); + System.err.print(e); + } ++ } finally { ++ if (dstream != null) ++ try { dstream.close(); } catch (IOException e) {} + } + } else { + out.add(a.arg);