Mercurial > hg > release > icedtea6-1.10
changeset 2444:9ea6e67710b1
PR586: Add missing sources to src.zip.
2011-02-22 Andrew John Hughes <ahughes@redhat.com>
PR586: Classes missing from src.zip
* Makefile.am: Add new patch.
* patches/pr586-include_all_srcs.patch:
Don't filter sources to include.
* NEWS: Updated.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Tue, 22 Feb 2011 15:57:42 +0000 |
| parents | 39b3029b88d9 |
| children | e1a5ab4cf428 |
| files | ChangeLog Makefile.am NEWS patches/pr586-include_all_srcs.patch |
| diffstat | 4 files changed, 49 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Feb 22 14:05:19 2011 +0000 +++ b/ChangeLog Tue Feb 22 15:57:42 2011 +0000 @@ -1,3 +1,11 @@ +2011-02-22 Andrew John Hughes <ahughes@redhat.com> + + PR586: Classes missing from src.zip + * Makefile.am: Add new patch. + * patches/pr586-include_all_srcs.patch: + Don't filter sources to include. + * NEWS: Updated. + 2011-02-22 Andrew John Hughes <ahughes@redhat.com> PR635: zero fails to build on icedtea6 trunk 20110217 with hs20
--- a/Makefile.am Tue Feb 22 14:05:19 2011 +0000 +++ b/Makefile.am Tue Feb 22 15:57:42 2011 +0000 @@ -325,7 +325,8 @@ patches/openjdk/6728834-blurred-lcd-aa-text.patch \ patches/openjdk/6749060-bad-lcd-aa-non-opaque-dest.patch \ patches/openjdk/6896068-sg2d.patch \ - patches/pr633-no_javaws_man_page.patch + patches/pr633-no_javaws_man_page.patch \ + patches/pr586-include_all_srcs.patch if !WITH_ALT_HSBUILD ICEDTEA_PATCHES += \
--- a/NEWS Tue Feb 22 14:05:19 2011 +0000 +++ b/NEWS Tue Feb 22 15:57:42 2011 +0000 @@ -10,12 +10,12 @@ New in release 1.10 (2011-XX-XX): -* Added out-of-the-box JamVM support using --enable-jamvm * NetX and the plugin moved to the IcedTea-Web project with a separate release cycle. * Shark provided upstream rather than as part of IcedTea. * The option --with-openjdk becomes --with-jdk-home and --disable-bootstrap * Support for building with HotSpot 20 from its stable tree +* Added out-of-the-box JamVM support using --enable-jamvm * Import of OpenJDK6 b21 including upgrade to HotSpot 19 - S6961870: More rebranding fixes for templates/gpl-*-header files - S6976186: Shark build system changes @@ -433,6 +433,7 @@ - PR103: Usage of native2ascii during bootstrap - PR633: IcedTea installs javaws manpages on x86 even with --disable-webstart - PR635: zero fails to build on icedtea6 trunk 20110217 with hs20 + - PR586: Sources missing from src.zip * Cleanup - Patches are no longer prefixed with 'icedtea-'. - All m4 macros are now prefixed with 'IT_' to denote their origin correctly.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/pr586-include_all_srcs.patch Tue Feb 22 15:57:42 2011 +0000 @@ -0,0 +1,37 @@ +diff -Nru openjdk.orig/jdk/make/common/Release.gmk openjdk/jdk/make/common/Release.gmk +--- openjdk.orig/jdk/make/common/Release.gmk 2011-02-22 14:08:16.200485180 +0000 ++++ openjdk/jdk/make/common/Release.gmk 2011-02-22 14:11:03.695409585 +0000 +@@ -975,13 +975,9 @@ + for d in $(SOURCE_DIRS); do \ + $(RM) $(ABS_TEMPDIR)/src-files.list; \ + ($(CD) $$d && \ +- for sd in $(SOURCES) ; do \ +- if [ -d $$sd ] ; then \ +- $(FIND) $$sd $(SOURCE_FILES_filter) \ +- -name '*.java' -print \ +- >> $(ABS_TEMPDIR)/src-files.list ; \ +- fi; \ +- done ; \ ++ $(FIND) . $(SOURCE_FILES_filter) \ ++ -name '*.java' -print \ ++ >> $(ABS_TEMPDIR)/src-files.list ; \ + ) ; \ + if [ -f $(ABS_TEMPDIR)/src-files.list ] ; then \ + ($(CD) $$d && $(TAR) cf - -T $(ABS_TEMPDIR)/src-files.list ) \ +@@ -994,13 +990,9 @@ + for d in $(SOURCE_DIRS); do \ + $(RM) $(ABS_TEMPDIR)/src-files.list; \ + ($(CD) $$d && \ +- for sd in $(SOURCES) ; do \ +- if [ -d $$sd ] ; then \ +- $(FIND) $$sd $(SOURCE_FILES_filter) \ +- -name '*.java' -print \ +- >> $(ABS_TEMPDIR)/src-files.list ; \ +- fi; \ +- done ; \ ++ $(FIND) . $(SOURCE_FILES_filter) \ ++ -name '*.java' -print \ ++ >> $(ABS_TEMPDIR)/src-files.list ; \ + ) ; \ + if [ -f $(ABS_TEMPDIR)/src-files.list ] ; then \ + ($(CD) $$d && $(TAR) cf - `$(CAT) $(ABS_TEMPDIR)/src-files.list`) \