changeset in /hg/icedtea: 2007-11-07 Lillian Angel <langel at red...

[Lillian Angel]

changeset 2a1d80a4c7b4 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=2a1d80a4c7b4
description:
	2007-11-07  Lillian Angel  <langel at redhat.com>

	        * Makefile.am: Removed docs patch.
	        * Makefile.in: Regenerate.
	        * patches/icedtea-docs.patch: Removed. Causing out of memory errors
	        because jaxws is not built.

diffstat:

3 files changed, 44 deletions(-)
Makefile.am                |    1 -
Makefile.in                |    1 -
patches/icedtea-docs.patch |   42 ------------------------------------------

diffs (68 lines):

diff -r f9a0a601f0dc -r 2a1d80a4c7b4 Makefile.am
--- a/Makefile.am	Wed Nov 07 17:29:12 2007 -0500
+++ b/Makefile.am	Thu Nov 08 10:45:26 2007 -0500
@@ -186,7 +186,6 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-javafiles.patch \
 	patches/icedtea-bytecodeInterpreterWithChecks.patch \
 	patches/icedtea-corba.patch \
-	patches/icedtea-docs.patch \
 	$(FAST_BUILD_PATCH) \
 	$(DISTRIBUTION_PATCHES)
 
diff -r f9a0a601f0dc -r 2a1d80a4c7b4 Makefile.in
--- a/Makefile.in	Wed Nov 07 17:29:12 2007 -0500
+++ b/Makefile.in	Thu Nov 08 10:45:26 2007 -0500
@@ -305,7 +305,6 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-javafiles.patch \
 	patches/icedtea-bytecodeInterpreterWithChecks.patch \
 	patches/icedtea-corba.patch \
-	patches/icedtea-docs.patch \
 	$(FAST_BUILD_PATCH) \
 	$(DISTRIBUTION_PATCHES)
 
diff -r f9a0a601f0dc -r 2a1d80a4c7b4 patches/icedtea-docs.patch
--- a/patches/icedtea-docs.patch	Wed Nov 07 17:29:12 2007 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
---- ../openjdk/control/make/j2se-rules.gmk	2007-10-12 03:45:09.000000000 -0400
-+++ openjdk/control/make/j2se-rules.gmk	2007-11-07 17:05:36.000000000 -0500
-@@ -36,37 +36,9 @@
-   IMAGES_TARGET = images
- endif
- 
--# No DOCS build when JDK_UPDATE_VERSION set
--ifdef JDK_UPDATE_VERSION
--  DOCS_TARGET =
--else
--  DOCS_TARGET = docs
--endif
--
--# NO_DOCS may be set in conjunction with DEV_ONLY
--ifdef NO_DOCS
--  DOCS_TARGET =
--endif
-+DOCS_TARGET = docs
- 
--# If langtools not being built, full jdk javadoc is not possible
--ifneq ($(BUILD_LANGTOOLS), true)
--  DOCS_TARGET =
--endif
--ifneq ($(BUILD_CORBA), true)
--  DOCS_TARGET =
--endif
--ifneq ($(BUILD_JAXP), true)
--  DOCS_TARGET =
--endif
--ifneq ($(BUILD_JAXWS), true)
--  DOCS_TARGET =
--endif
--
--ifndef DEV_ONLY
--  J2SE_BUILD_TARGETS = sanity all $(DOCS_TARGET) images
--else
--  J2SE_BUILD_TARGETS = sanity all $(IMAGES_TARGET)
--endif
-+J2SE_BUILD_TARGETS = sanity all $(DOCS_TARGET) images
- 
- J2SE_CLOBBER_TARGETS = clobber
-