changeset in /hg/icedtea: 2007-09-16 Christan Thalinger <twist...

[Christian Thalinger]

changeset 4a2b7d77133d in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=4a2b7d77133d
description:
	2007-09-16  Christan Thalinger  <twisti at complang.tuwien.ac.at>

		* Makefile.am (ICEDTEA_PATCHES): Added
		patches/icedtea-cacao-docs-Makefile.patch.
		* Makefile.in: Regenerated.
		* patches/icedtea-cacao-docs-Makefile.patch: New file.

diffstat:

4 files changed, 39 insertions(+)
ChangeLog                                 |    7 ++++++
Makefile.am                               |    1 
Makefile.in                               |    1 
patches/icedtea-cacao-docs-Makefile.patch |   30 +++++++++++++++++++++++++++++

diffs (70 lines):

diff -r 2698d7b2eed8 -r 4a2b7d77133d ChangeLog
--- a/ChangeLog	Thu Sep 13 11:52:25 2007 +0200
+++ b/ChangeLog	Sun Sep 16 18:06:32 2007 +0200
@@ -1,3 +1,10 @@ 2007-09-13  Christan Thalinger  <twisti@
+2007-09-16  Christan Thalinger  <twisti at complang.tuwien.ac.at>
+
+	* Makefile.am (ICEDTEA_PATCHES): Added
+	patches/icedtea-cacao-docs-Makefile.patch.
+	* Makefile.in: Regenerated.
+	* patches/icedtea-cacao-docs-Makefile.patch: New file.
+
 2007-09-13  Christan Thalinger  <twisti at complang.tuwien.ac.at>
 
 	* patches/icedtea-cacao-instrument-Makefile.patch: New file.
diff -r 2698d7b2eed8 -r 4a2b7d77133d Makefile.am
--- a/Makefile.am	Thu Sep 13 11:52:25 2007 +0200
+++ b/Makefile.am	Sun Sep 16 18:06:32 2007 +0200
@@ -186,6 +186,7 @@ ICEDTEA_PATCHES += \
 	patches/icedtea-cacao-Defs-linux-gmk.patch \
 	patches/icedtea-cacao-Platform-gmk.patch \
 	patches/icedtea-cacao-Program-gmk.patch \
+	patches/icedtea-cacao-docs-Makefile.patch \
 	patches/icedtea-cacao-instrument-Makefile.patch \
 	patches/icedtea-cacao-java-c.patch \
 	patches/icedtea-cacao-jvm-cfg.patch
diff -r 2698d7b2eed8 -r 4a2b7d77133d Makefile.in
--- a/Makefile.in	Thu Sep 13 11:52:25 2007 +0200
+++ b/Makefile.in	Sun Sep 16 18:06:32 2007 +0200
@@ -40,6 +40,7 @@ host_triplet = @host@
 @WITH_CACAO_TRUE@	patches/icedtea-cacao-Defs-linux-gmk.patch \
 @WITH_CACAO_TRUE@	patches/icedtea-cacao-Platform-gmk.patch \
 @WITH_CACAO_TRUE@	patches/icedtea-cacao-Program-gmk.patch \
+ at WITH_CACAO_TRUE@	patches/icedtea-cacao-docs-Makefile.patch \
 @WITH_CACAO_TRUE@	patches/icedtea-cacao-instrument-Makefile.patch \
 @WITH_CACAO_TRUE@	patches/icedtea-cacao-java-c.patch \
 @WITH_CACAO_TRUE@	patches/icedtea-cacao-jvm-cfg.patch
diff -r 2698d7b2eed8 -r 4a2b7d77133d patches/icedtea-cacao-docs-Makefile.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-cacao-docs-Makefile.patch	Sun Sep 16 18:06:32 2007 +0200
@@ -0,0 +1,30 @@
+Index: j2se/make/docs/Makefile
+===================================================================
+--- j2se/make/docs/Makefile	(revision 250)
++++ openjdk/j2se/make/docs/Makefile	(working copy)
+@@ -39,16 +39,16 @@ DOCSTMPDIR          = $(TEMPDIR)/doctmp
+ # Set heap memory max (Xmx) and initial value (Xms) depending on architecture.
+ # (Default initial value is 8 -- way too small for the platform APIs)
+ #
+-ifeq ($(ARCH_DATA_MODEL), 32)
+-  ifeq ($(ARCH), sparc)
+-    JAVADOC_VM_MEMORY_FLAGS = -J-Xms64M -J-Xmx512M
+-  else
+-    # Max of 256M is no longer enough.  Increase to 256 + 128
+-    JAVADOC_VM_MEMORY_FLAGS = -J-Xms32M -J-Xmx384M
+-  endif
+-else
++#ifeq ($(ARCH_DATA_MODEL), 32)
++#  ifeq ($(ARCH), sparc)
++#    JAVADOC_VM_MEMORY_FLAGS = -J-Xms64M -J-Xmx512M
++#  else
++#    # Max of 256M is no longer enough.  Increase to 256 + 128
++#    JAVADOC_VM_MEMORY_FLAGS = -J-Xms32M -J-Xmx384M
++#  endif
++#else
+   JAVADOC_VM_MEMORY_FLAGS = -J-Xms128M -J-Xmx1024M
+-endif
++#endif
+ 
+ COMMON_JAVADOCFLAGS =					\
+ 		-source 1.5				\