changeset in /hg/icedtea: 2007-11-15 Lillian Angel <langel at red...
Lillian Angel
langel at redhat.com
Wed Nov 14 14:29:35 PST 2007
changeset 9f98682ecbbb in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9f98682ecbbb
description:
2007-11-15 Lillian Angel <langel at redhat.com>
Joshua Sumali <jsumali at redhat.com>
* Makefile.am: Changed j2se to jdk.
(OPENJDK_VERSION): Updated to b23.
(OPENJDK_DATE): Likewise.
(OPENJDK_MD5SUM): Likewise.
(stamps/patch.stamp): Added -l option to PATCH to ignore whitespace.
(stamps/patch-ecj.stamp): Likewise.
(stamps/clean-patch.stamp): Likewise.
(stamps/clean-patch-ecj.stamp): Likewise.
(ICEDTEA_COPY_DIRS): Added javax/net/ssl to list.
* Makefile.in: Regenerated.
* README: Changed instances of j2se to jdk.
* patches/icedtea-ant.patch: Changed instances of j2se to jdk and
updated to b23.
* patches/icedtea-antialias.patch: Likewise.
* patches/icedtea-bytebuffer-compact.patch: Likewise.
* patches/icedtea-bytecodeInterpreter.patch: Likewise.
* patches/icedtea-bytecodeInterpreterWithChecks.patch: Likewise.
* patches/icedtea-certbundle.patch: Likewise.
* patches/icedtea-copy-plugs.patch: Likewise.
* patches/icedtea-core-build.patch: Likewise.
* patches/icedtea-debuginfo.patch: Likewise.
* patches/icedtea-demos.patch: Likewise.
* patches/icedtea-ecj.patch: Likewise.
* patches/icedtea-float-double-trailing-zeros.patch: Likewise.
* patches/icedtea-gcc-suffix.patch: Likewise.
* patches/icedtea-graphics.patch: Likewise.
* patches/icedtea-gtkplaf.patch: Likewise.
* patches/icedtea-javafiles.patch: Likewise.
* patches/icedtea-libraries.patch: Likewise.
* patches/icedtea-license-headers.patch: Likewise.
* patches/icedtea-linker-options.patch: Likewise.
* patches/icedtea-memory-limits.patch: Likewise.
* patches/icedtea-paths.patch: Likewise.
* patches/icedtea-plugin.patch: Likewise.
* patches/icedtea-ports.patch: Likewise.
* patches/icedtea-rmi_amd64.patch: Likewise.
* patches/icedtea-signature-iterator.patch: Likewise.
* patches/icedtea-signed-types.patch: Likewise.
* patches/icedtea-speed.patch: Likewise.
* patches/icedtea-ssl.patch: Likewise.
* patches/icedtea-sunsrc.patch: Likewise.
* patches/icedtea-test-atomic-operations.patch: Likewise.
* patches/icedtea-tools.patch: Likewise.
* patches/icedtea-use-system-tzdata.patch: Likewise.
* patches/icedtea-version.patch: Likewise.
* generated/java/nio/*: Regenerated.
* generated/sun/awt/X11/generator/sizer.32: Regenerated.
* rt/com/sun/image/codec/jpeg/JPEGCodec.java: New stubbed class.
* rt/com/sun/image/codec/jpeg/JPEGEncodeParam.java: Likewise.
* rt/com/sun/image/codec/jpeg/JPEGImageDecoder.java: Likewise.
* rt/com/sun/image/codec/jpeg/JPEGImageEncoder.java: Likewise.
* rt/java/io/PushbackReader.java: Likewise.
* ports/jdk/: Moved ports/j2se here.
* ports/j2se/: Removed.
diffstat:
88 files changed, 34852 insertions(+), 34443 deletions(-)
ChangeLog | 58
Makefile.am | 49
Makefile.in | 51
README | 8
generated/java/nio/DirectByteBuffer.java | 1116
generated/java/nio/DirectByteBufferR.java | 700
generated/java/nio/DirectCharBufferRS.java | 124
generated/java/nio/DirectCharBufferRU.java | 124
generated/java/nio/DirectCharBufferS.java | 316
generated/java/nio/DirectCharBufferU.java | 316
generated/java/nio/DirectDoubleBufferRS.java | 144
generated/java/nio/DirectDoubleBufferRU.java | 144
generated/java/nio/DirectDoubleBufferS.java | 336
generated/java/nio/DirectDoubleBufferU.java | 336
generated/java/nio/DirectFloatBufferRS.java | 144
generated/java/nio/DirectFloatBufferRU.java | 144
generated/java/nio/DirectFloatBufferS.java | 336
generated/java/nio/DirectFloatBufferU.java | 336
generated/java/nio/DirectIntBufferRS.java | 144
generated/java/nio/DirectIntBufferRU.java | 144
generated/java/nio/DirectIntBufferS.java | 336
generated/java/nio/DirectIntBufferU.java | 336
generated/java/nio/DirectLongBufferRS.java | 144
generated/java/nio/DirectLongBufferRU.java | 144
generated/java/nio/DirectLongBufferS.java | 336
generated/java/nio/DirectLongBufferU.java | 336
generated/java/nio/DirectShortBufferRS.java | 144
generated/java/nio/DirectShortBufferRU.java | 144
generated/java/nio/DirectShortBufferS.java | 336
generated/java/nio/DirectShortBufferU.java | 336
generated/java/nio/HeapByteBuffer.java | 462
generated/java/nio/HeapByteBufferR.java | 318
generated/java/nio/HeapCharBuffer.java | 854
generated/java/nio/HeapCharBufferR.java | 754
generated/java/nio/HeapDoubleBuffer.java | 828
generated/java/nio/HeapDoubleBufferR.java | 728
generated/java/nio/HeapFloatBuffer.java | 828
generated/java/nio/HeapFloatBufferR.java | 728
generated/java/nio/HeapIntBuffer.java | 828
generated/java/nio/HeapIntBufferR.java | 728
generated/java/nio/HeapLongBuffer.java | 828
generated/java/nio/HeapLongBufferR.java | 728
generated/java/nio/HeapShortBuffer.java | 828
generated/java/nio/HeapShortBufferR.java | 728
patches/icedtea-ant.patch | 44
patches/icedtea-antialias.patch | 78
patches/icedtea-bytebuffer-compact.patch | 115
patches/icedtea-bytecodeInterpreter.patch | 4
patches/icedtea-bytecodeInterpreterWithChecks.patch | 4
patches/icedtea-certbundle.patch | 23
patches/icedtea-copy-plugs.patch | 28
patches/icedtea-core-build.patch | 14
patches/icedtea-debuginfo.patch | 18
patches/icedtea-demos.patch | 32
patches/icedtea-ecj.patch | 447
patches/icedtea-float-double-trailing-zeros.patch | 59
patches/icedtea-gcc-suffix.patch | 4
patches/icedtea-graphics.patch | 160
patches/icedtea-gtkplaf.patch | 4
patches/icedtea-javafiles.patch | 4
patches/icedtea-libraries.patch |49373 +++++++++----------
patches/icedtea-license-headers.patch | 100
patches/icedtea-linker-options.patch | 18
patches/icedtea-memory-limits.patch | 11
patches/icedtea-paths.patch | 83
patches/icedtea-plugin.patch | 24
patches/icedtea-ports.patch | 46
patches/icedtea-rmi_amd64.patch | 4
patches/icedtea-signature-iterator.patch | 6
patches/icedtea-signed-types.patch | 4
patches/icedtea-speed.patch | 12
patches/icedtea-ssl.patch | 59
patches/icedtea-sunsrc.patch | 6
patches/icedtea-test-atomic-operations.patch | 2
patches/icedtea-tools.patch | 22
patches/icedtea-use-system-tzdata.patch | 85
patches/icedtea-version.patch | 4
ports/j2se/src/solaris/bin/ergo_ppc.c | 58
ports/j2se/src/solaris/bin/ppc/jvm.cfg | 44
ports/j2se/src/solaris/bin/ppc64/jvm.cfg | 44
ports/jdk/src/solaris/bin/ergo_ppc.c | 58
ports/jdk/src/solaris/bin/ppc/jvm.cfg | 44
ports/jdk/src/solaris/bin/ppc64/jvm.cfg | 44
rt/com/sun/image/codec/jpeg/JPEGCodec.java | 60
rt/com/sun/image/codec/jpeg/JPEGEncodeParam.java | 49
rt/com/sun/image/codec/jpeg/JPEGImageDecoder.java | 49
rt/com/sun/image/codec/jpeg/JPEGImageEncoder.java | 56
rt/java/io/PushbackReader.java | 62
diffs (truncated from 74850 to 500 lines):
diff -r 037d94f5c2ea -r 9f98682ecbbb ChangeLog
--- a/ChangeLog Tue Nov 13 16:33:27 2007 -0500
+++ b/ChangeLog Wed Nov 14 17:28:39 2007 -0500
@@ -1,3 +1,61 @@ 2007-11-13 Lillian Angel <langel at redha
+2007-11-15 Lillian Angel <langel at redhat.com>
+ Joshua Sumali <jsumali at redhat.com>
+
+ * Makefile.am: Changed j2se to jdk.
+ (OPENJDK_VERSION): Updated to b23.
+ (OPENJDK_DATE): Likewise.
+ (OPENJDK_MD5SUM): Likewise.
+ (stamps/patch.stamp): Added -l option to PATCH to ignore whitespace.
+ (stamps/patch-ecj.stamp): Likewise.
+ (stamps/clean-patch.stamp): Likewise.
+ (stamps/clean-patch-ecj.stamp): Likewise.
+ (ICEDTEA_COPY_DIRS): Added javax/net/ssl to list.
+ * Makefile.in: Regenerated.
+ * README: Changed instances of j2se to jdk.
+ * patches/icedtea-ant.patch: Changed instances of j2se to jdk and
+ updated to b23.
+ * patches/icedtea-antialias.patch: Likewise.
+ * patches/icedtea-bytebuffer-compact.patch: Likewise.
+ * patches/icedtea-bytecodeInterpreter.patch: Likewise.
+ * patches/icedtea-bytecodeInterpreterWithChecks.patch: Likewise.
+ * patches/icedtea-certbundle.patch: Likewise.
+ * patches/icedtea-copy-plugs.patch: Likewise.
+ * patches/icedtea-core-build.patch: Likewise.
+ * patches/icedtea-debuginfo.patch: Likewise.
+ * patches/icedtea-demos.patch: Likewise.
+ * patches/icedtea-ecj.patch: Likewise.
+ * patches/icedtea-float-double-trailing-zeros.patch: Likewise.
+ * patches/icedtea-gcc-suffix.patch: Likewise.
+ * patches/icedtea-graphics.patch: Likewise.
+ * patches/icedtea-gtkplaf.patch: Likewise.
+ * patches/icedtea-javafiles.patch: Likewise.
+ * patches/icedtea-libraries.patch: Likewise.
+ * patches/icedtea-license-headers.patch: Likewise.
+ * patches/icedtea-linker-options.patch: Likewise.
+ * patches/icedtea-memory-limits.patch: Likewise.
+ * patches/icedtea-paths.patch: Likewise.
+ * patches/icedtea-plugin.patch: Likewise.
+ * patches/icedtea-ports.patch: Likewise.
+ * patches/icedtea-rmi_amd64.patch: Likewise.
+ * patches/icedtea-signature-iterator.patch: Likewise.
+ * patches/icedtea-signed-types.patch: Likewise.
+ * patches/icedtea-speed.patch: Likewise.
+ * patches/icedtea-ssl.patch: Likewise.
+ * patches/icedtea-sunsrc.patch: Likewise.
+ * patches/icedtea-test-atomic-operations.patch: Likewise.
+ * patches/icedtea-tools.patch: Likewise.
+ * patches/icedtea-use-system-tzdata.patch: Likewise.
+ * patches/icedtea-version.patch: Likewise.
+ * generated/java/nio/*: Regenerated.
+ * generated/sun/awt/X11/generator/sizer.32: Regenerated.
+ * rt/com/sun/image/codec/jpeg/JPEGCodec.java: New stubbed class.
+ * rt/com/sun/image/codec/jpeg/JPEGEncodeParam.java: Likewise.
+ * rt/com/sun/image/codec/jpeg/JPEGImageDecoder.java: Likewise.
+ * rt/com/sun/image/codec/jpeg/JPEGImageEncoder.java: Likewise.
+ * rt/java/io/PushbackReader.java: Likewise.
+ * ports/jdk/: Moved ports/j2se here.
+ * ports/j2se/: Removed.
+
2007-11-13 Lillian Angel <langel at redhat.com>
* patches/icedtea-ecj.patch
diff -r 037d94f5c2ea -r 9f98682ecbbb Makefile.am
--- a/Makefile.am Tue Nov 13 16:33:27 2007 -0500
+++ b/Makefile.am Wed Nov 14 17:28:39 2007 -0500
@@ -1,6 +1,6 @@ OPENJDK_VERSION = b22
-OPENJDK_VERSION = b22
-OPENJDK_DATE = 12_oct_2007
-OPENJDK_MD5SUM = 7cf9c2765fb16c36c07f961b2a009cb2
+OPENJDK_VERSION = b23
+OPENJDK_DATE = 30_oct_2007
+OPENJDK_MD5SUM = 7eed137c0321e0b5b75ff2d646ce0d0d
# Top-Level Targets
# =================
@@ -154,7 +154,7 @@ stamps/ports.stamp: stamps/extract.stamp
for target in ports/hotspot/build/*/platform_* \
ports/hotspot/build/*/makefiles/* \
ports/hotspot/src/*/* \
- ports/j2se/src/*/bin/*; do \
+ ports/jdk/src/*/bin/*; do \
link=$$(dirname $$target | sed 's/^ports/openjdk/'); \
ln -sf $$PWD/$$target $$link; \
done
@@ -210,10 +210,10 @@ stamps/patch.stamp: stamps/extract.stamp
for p in $(ICEDTEA_PATCHES) ; \
do \
echo Checking $$p ; \
- if $(PATCH) -p0 --dry-run -s -t -f -F 0 < $$p ; \
+ if $(PATCH) -l -p0 --dry-run -s -t -f -F 0 < $$p ; \
then \
echo Applying $$p ; \
- $(PATCH) -p0 < $$p ; \
+ $(PATCH) -l -p0 < $$p ; \
fi ; \
done
mkdir -p stamps
@@ -224,10 +224,10 @@ clean-patch:
for p in $(ICEDTEA_PATCHES) ; \
do \
echo Checking $$p ; \
- if $(PATCH) -p0 -R --dry-run -s -t -f < $$p ; \
+ if $(PATCH) -l -p0 -R --dry-run -s -t -f < $$p ; \
then \
echo Reverting $$p ; \
- $(PATCH) -p0 -R < $$p ; \
+ $(PATCH) -l -p0 -R < $$p ; \
fi ; \
done
@@ -243,7 +243,6 @@ stamps/extract-ecj.stamp: stamps/downloa
mv tmp-ecj/openjdk openjdk-ecj ; \
rmdir tmp-ecj ; \
chmod -R ug+w openjdk-ecj ; \
- rm -rf openjdk-ecj/jaxws; \
fi
mkdir -p stamps
touch stamps/extract-ecj.stamp
@@ -257,7 +256,7 @@ stamps/ports-ecj.stamp: stamps/extract.s
for target in ports/hotspot/build/*/platform_* \
ports/hotspot/build/*/makefiles/* \
ports/hotspot/src/*/* \
- ports/j2se/src/*/bin/*; do \
+ ports/jdk/src/*/bin/*; do \
link=$$(dirname $$target | sed 's/^ports/openjdk-ecj/'); \
ln -sf $$PWD/$$target $$link; \
done
@@ -271,17 +270,17 @@ stamps/patch-ecj.stamp: stamps/extract-e
for p in $(ICEDTEA_PATCHES) ; \
do \
echo Checking $$p ; \
- if $(PATCH) -p1 -d openjdk-ecj --dry-run -s -t -f -F 0 < $$p ; \
+ if $(PATCH) -l -p1 -d openjdk-ecj --dry-run -s -t -f -F 0 < $$p ; \
then \
echo Applying $$p ; \
- $(PATCH) -p1 -d openjdk-ecj < $$p ; \
+ $(PATCH) -l -p1 -d openjdk-ecj < $$p ; \
fi ; \
done
echo Checking $(ICEDTEA_ECJ_PATCH) ; \
- if $(PATCH) -p0 --dry-run -s -t -f < $(ICEDTEA_ECJ_PATCH) ; \
+ if $(PATCH) -p0 -l --dry-run -s -t -f < $(ICEDTEA_ECJ_PATCH) ; \
then \
echo Applying $(ICEDTEA_ECJ_PATCH) ; \
- $(PATCH) -p0 < $(ICEDTEA_ECJ_PATCH) ; \
+ $(PATCH) -p0 -l < $(ICEDTEA_ECJ_PATCH) ; \
fi
mkdir -p stamps
touch stamps/patch-ecj.stamp
@@ -289,18 +288,18 @@ clean-patch-ecj:
clean-patch-ecj:
rm -f stamps/patch-ecj.stamp
echo Checking $(ICEDTEA_ECJ_PATCH) ; \
- if $(PATCH) -p0 -R --dry-run -s -t -f < $(ICEDTEA_ECJ_PATCH) ; \
+ if $(PATCH) -l -p0 -R --dry-run -s -t -f < $(ICEDTEA_ECJ_PATCH) ; \
then \
echo Reverting $(ICEDTEA_ECJ_PATCH) ; \
- $(PATCH) -p0 -R < $(ICEDTEA_ECJ_PATCH) ; \
+ $(PATCH) -p0 -l -R < $(ICEDTEA_ECJ_PATCH) ; \
fi
for p in $(ICEDTEA_PATCHES) ; \
do \
echo Checking $$p ; \
- if $(PATCH) -p1 -d openjdk-ecj -R --dry-run -s -t -f < $$p ; \
+ if $(PATCH) -p1 -l -d openjdk-ecj -R --dry-run -s -t -f < $$p ; \
then \
echo Reverting $$p ; \
- $(PATCH) -p1 -d openjdk-ecj -R < $$p ; \
+ $(PATCH) -p1 -l -d openjdk-ecj -R < $$p ; \
fi ; \
done
@@ -516,13 +515,14 @@ ICEDTEA_COPY_DIRS = \
com/sun/jmx/snmp/agent \
com/sun/tools/jdi \
java/util \
- java/rmi
+ java/rmi \
+ javax/net/ssl
stamps/copy-source-files.stamp: stamps/extract.stamp stamps/patch.stamp
for copy_dir in $(ICEDTEA_COPY_DIRS) ; \
do \
mkdir -p rt/$$copy_dir ; \
- cp -af openjdk/j2se/src/share/classes/$$copy_dir/*.java \
+ cp -af openjdk/jdk/src/share/classes/$$copy_dir/*.java \
rt/$$copy_dir ; \
done
mkdir -p stamps
@@ -535,8 +535,8 @@ clean-copy:
rm -rf rt/$$copy_dir ; \
done
-SHARE = openjdk/j2se/src/share/classes
-SOLARIS = openjdk/j2se/src/solaris/classes
+SHARE = openjdk/jdk/src/share/classes
+SOLARIS = openjdk/jdk/src/solaris/classes
LANGTOOLS = openjdk/langtools/src/share/classes
JAXP = openjdk/jaxp/src/share/classes
CORBA = openjdk/corba/src/share/classes
@@ -547,10 +547,10 @@ OPENJDK_SOURCEPATH_DIRS = \
# tools.jar class files.
stamps/tools-copy-source-files.stamp: stamps/extract.stamp stamps/patch.stamp
- for copy_dir in `cat tools-copy/tools-j2se-copy-files.txt` ; \
+ for copy_dir in `cat tools-copy/tools-jdk-copy-files.txt` ; \
do \
mkdir -p tools/$$copy_dir ; \
- cp -arf openjdk/j2se/src/share/classes/$$copy_dir/* \
+ cp -arf openjdk/jdk/src/share/classes/$$copy_dir/* \
tools/$$copy_dir ; \
done
@@ -587,7 +587,6 @@ stamps/tools-class-files.stamp: tools-so
$(JAVAC) $(MEMORY_LIMIT) -g -d lib/tools -bootclasspath '' -source 1.6 \
-sourcepath 'rt:tools:$(OPENJDK_SOURCEPATH_DIRS):generated' \
@$<
- rm -rf openjdk/jaxws # Remove jaxws because of invalid license headers in b22.
mkdir -p stamps
touch stamps/tools-class-files.stamp
diff -r 037d94f5c2ea -r 9f98682ecbbb Makefile.in
--- a/Makefile.in Tue Nov 13 16:33:27 2007 -0500
+++ b/Makefile.in Wed Nov 14 17:28:39 2007 -0500
@@ -187,9 +187,9 @@ target_alias = @target_alias@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-OPENJDK_VERSION = b22
-OPENJDK_DATE = 12_oct_2007
-OPENJDK_MD5SUM = 7cf9c2765fb16c36c07f961b2a009cb2
+OPENJDK_VERSION = b23
+OPENJDK_DATE = 30_oct_2007
+OPENJDK_MD5SUM = 7eed137c0321e0b5b75ff2d646ce0d0d
EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
gcjwebplugin.cc patches/icedtea-speed.patch tools-copy
@@ -346,10 +346,11 @@ ICEDTEA_COPY_DIRS = \
com/sun/jmx/snmp/agent \
com/sun/tools/jdi \
java/util \
- java/rmi
-
-SHARE = openjdk/j2se/src/share/classes
-SOLARIS = openjdk/j2se/src/solaris/classes
+ java/rmi \
+ javax/net/ssl
+
+SHARE = openjdk/jdk/src/share/classes
+SOLARIS = openjdk/jdk/src/solaris/classes
LANGTOOLS = openjdk/langtools/src/share/classes
JAXP = openjdk/jaxp/src/share/classes
CORBA = openjdk/corba/src/share/classes
@@ -703,7 +704,7 @@ stamps/ports.stamp: stamps/extract.stamp
for target in ports/hotspot/build/*/platform_* \
ports/hotspot/build/*/makefiles/* \
ports/hotspot/src/*/* \
- ports/j2se/src/*/bin/*; do \
+ ports/jdk/src/*/bin/*; do \
link=$$(dirname $$target | sed 's/^ports/openjdk/'); \
ln -sf $$PWD/$$target $$link; \
done
@@ -714,10 +715,10 @@ stamps/patch.stamp: stamps/extract.stamp
for p in $(ICEDTEA_PATCHES) ; \
do \
echo Checking $$p ; \
- if $(PATCH) -p0 --dry-run -s -t -f -F 0 < $$p ; \
+ if $(PATCH) -l -p0 --dry-run -s -t -f -F 0 < $$p ; \
then \
echo Applying $$p ; \
- $(PATCH) -p0 < $$p ; \
+ $(PATCH) -l -p0 < $$p ; \
fi ; \
done
mkdir -p stamps
@@ -728,10 +729,10 @@ clean-patch:
for p in $(ICEDTEA_PATCHES) ; \
do \
echo Checking $$p ; \
- if $(PATCH) -p0 -R --dry-run -s -t -f < $$p ; \
+ if $(PATCH) -l -p0 -R --dry-run -s -t -f < $$p ; \
then \
echo Reverting $$p ; \
- $(PATCH) -p0 -R < $$p ; \
+ $(PATCH) -l -p0 -R < $$p ; \
fi ; \
done
@@ -747,7 +748,6 @@ stamps/extract-ecj.stamp: stamps/downloa
mv tmp-ecj/openjdk openjdk-ecj ; \
rmdir tmp-ecj ; \
chmod -R ug+w openjdk-ecj ; \
- rm -rf openjdk-ecj/jaxws; \
fi
mkdir -p stamps
touch stamps/extract-ecj.stamp
@@ -761,7 +761,7 @@ stamps/ports-ecj.stamp: stamps/extract.s
for target in ports/hotspot/build/*/platform_* \
ports/hotspot/build/*/makefiles/* \
ports/hotspot/src/*/* \
- ports/j2se/src/*/bin/*; do \
+ ports/jdk/src/*/bin/*; do \
link=$$(dirname $$target | sed 's/^ports/openjdk-ecj/'); \
ln -sf $$PWD/$$target $$link; \
done
@@ -772,17 +772,17 @@ stamps/patch-ecj.stamp: stamps/extract-e
for p in $(ICEDTEA_PATCHES) ; \
do \
echo Checking $$p ; \
- if $(PATCH) -p1 -d openjdk-ecj --dry-run -s -t -f -F 0 < $$p ; \
+ if $(PATCH) -l -p1 -d openjdk-ecj --dry-run -s -t -f -F 0 < $$p ; \
then \
echo Applying $$p ; \
- $(PATCH) -p1 -d openjdk-ecj < $$p ; \
+ $(PATCH) -l -p1 -d openjdk-ecj < $$p ; \
fi ; \
done
echo Checking $(ICEDTEA_ECJ_PATCH) ; \
- if $(PATCH) -p0 --dry-run -s -t -f < $(ICEDTEA_ECJ_PATCH) ; \
+ if $(PATCH) -p0 -l --dry-run -s -t -f < $(ICEDTEA_ECJ_PATCH) ; \
then \
echo Applying $(ICEDTEA_ECJ_PATCH) ; \
- $(PATCH) -p0 < $(ICEDTEA_ECJ_PATCH) ; \
+ $(PATCH) -p0 -l < $(ICEDTEA_ECJ_PATCH) ; \
fi
mkdir -p stamps
touch stamps/patch-ecj.stamp
@@ -790,18 +790,18 @@ clean-patch-ecj:
clean-patch-ecj:
rm -f stamps/patch-ecj.stamp
echo Checking $(ICEDTEA_ECJ_PATCH) ; \
- if $(PATCH) -p0 -R --dry-run -s -t -f < $(ICEDTEA_ECJ_PATCH) ; \
+ if $(PATCH) -l -p0 -R --dry-run -s -t -f < $(ICEDTEA_ECJ_PATCH) ; \
then \
echo Reverting $(ICEDTEA_ECJ_PATCH) ; \
- $(PATCH) -p0 -R < $(ICEDTEA_ECJ_PATCH) ; \
+ $(PATCH) -p0 -l -R < $(ICEDTEA_ECJ_PATCH) ; \
fi
for p in $(ICEDTEA_PATCHES) ; \
do \
echo Checking $$p ; \
- if $(PATCH) -p1 -d openjdk-ecj -R --dry-run -s -t -f < $$p ; \
+ if $(PATCH) -p1 -l -d openjdk-ecj -R --dry-run -s -t -f < $$p ; \
then \
echo Reverting $$p ; \
- $(PATCH) -p1 -d openjdk-ecj -R < $$p ; \
+ $(PATCH) -p1 -l -d openjdk-ecj -R < $$p ; \
fi ; \
done
@@ -985,7 +985,7 @@ stamps/copy-source-files.stamp: stamps/e
for copy_dir in $(ICEDTEA_COPY_DIRS) ; \
do \
mkdir -p rt/$$copy_dir ; \
- cp -af openjdk/j2se/src/share/classes/$$copy_dir/*.java \
+ cp -af openjdk/jdk/src/share/classes/$$copy_dir/*.java \
rt/$$copy_dir ; \
done
mkdir -p stamps
@@ -1000,10 +1000,10 @@ clean-copy:
# tools.jar class files.
stamps/tools-copy-source-files.stamp: stamps/extract.stamp stamps/patch.stamp
- for copy_dir in `cat tools-copy/tools-j2se-copy-files.txt` ; \
+ for copy_dir in `cat tools-copy/tools-jdk-copy-files.txt` ; \
do \
mkdir -p tools/$$copy_dir ; \
- cp -arf openjdk/j2se/src/share/classes/$$copy_dir/* \
+ cp -arf openjdk/jdk/src/share/classes/$$copy_dir/* \
tools/$$copy_dir ; \
done
@@ -1040,7 +1040,6 @@ stamps/tools-class-files.stamp: tools-so
$(JAVAC) $(MEMORY_LIMIT) -g -d lib/tools -bootclasspath '' -source 1.6 \
-sourcepath 'rt:tools:$(OPENJDK_SOURCEPATH_DIRS):generated' \
@$<
- rm -rf openjdk/jaxws # Remove jaxws because of invalid license headers in b22.
mkdir -p stamps
touch stamps/tools-class-files.stamp
diff -r 037d94f5c2ea -r 9f98682ecbbb README
--- a/README Tue Nov 13 16:33:27 2007 -0500
+++ b/README Wed Nov 14 17:28:39 2007 -0500
@@ -71,7 +71,7 @@ Some sources downloaded from openjdk.jav
Some sources downloaded from openjdk.java.net do not display the GPL
license header. Instances are:
- - The files in openjdk/j2se/src/share/classes/javax/xml/stream/ seem to
+ - The files in openjdk/jdk/src/share/classes/javax/xml/stream/ seem to
comprise the BEA-StAX source code
http://ftpna2.bea.com/pub/downloads/jsr173.jar
@@ -81,7 +81,7 @@ license header. Instances are:
that the modifications are owned by Sun.
- We are assuming that these files are owned by Sun:
- openjdk/j2se/src/share/classes/**/resources/*.properties
+ openjdk/jdk/src/share/classes/**/resources/*.properties
gcjwebplugin
@@ -98,8 +98,8 @@ single source file, gcjwebplugin.cc. Th
single source file, gcjwebplugin.cc. The IcedTea adaptation of
gcjwebplugin communicates through named pipes with a modified version
of IcedTea's appletviewer. Two source files,
-openjdk/j2se/src/share/classes/sun/applet/PluginAppletViewer.java,
-openjdk/j2se/src/share/classes/sun/applet/PluginMain.java are added to
+openjdk/jdk/src/share/classes/sun/applet/PluginAppletViewer.java,
+openjdk/jdk/src/share/classes/sun/applet/PluginMain.java are added to
rt.jar and tools.jar to provide gcjwebplugin with an interface into
the appletviewer code. This support code is provided in
patches/icedtea-plugin.patch.
diff -r 037d94f5c2ea -r 9f98682ecbbb generated/java/nio/DirectByteBuffer.java
--- a/generated/java/nio/DirectByteBuffer.java Tue Nov 13 16:33:27 2007 -0500
+++ b/generated/java/nio/DirectByteBuffer.java Wed Nov 14 17:28:39 2007 -0500
@@ -65,29 +65,29 @@ class DirectByteBuffer
private static class Deallocator
- implements Runnable
+ implements Runnable
{
- private static Unsafe unsafe = Unsafe.getUnsafe();
-
- private long address;
- private int capacity;
-
- private Deallocator(long address, int capacity) {
- assert (address != 0);
- this.address = address;
- this.capacity = capacity;
- }
-
- public void run() {
- if (address == 0) {
- // Paranoia
- return;
- }
- unsafe.freeMemory(address);
- address = 0;
- Bits.unreserveMemory(capacity);
- }
+ private static Unsafe unsafe = Unsafe.getUnsafe();
+
+ private long address;
+ private int capacity;
+
+ private Deallocator(long address, int capacity) {
+ assert (address != 0);
+ this.address = address;
+ this.capacity = capacity;
+ }
+
+ public void run() {
+ if (address == 0) {
+ // Paranoia
+ return;
+ }
+ unsafe.freeMemory(address);
+ address = 0;
+ Bits.unreserveMemory(capacity);
+ }
}
@@ -107,26 +107,26 @@ class DirectByteBuffer
// Primary constructor
//
- DirectByteBuffer(int cap) { // package-private
-
- super(-1, 0, cap, cap, false);
- Bits.reserveMemory(cap);
- int ps = Bits.pageSize();
- long base = 0;
- try {
- base = unsafe.allocateMemory(cap + ps);
- } catch (OutOfMemoryError x) {
- Bits.unreserveMemory(cap);
- throw x;
- }
- unsafe.setMemory(base, cap + ps, (byte) 0);
- if (base % ps != 0) {
- // Round up to page boundary
- address = base + ps - (base & (ps - 1));
- } else {
- address = base;
- }
- cleaner = Cleaner.create(this, new Deallocator(base, cap));
+ DirectByteBuffer(int cap) { // package-private
+
+ super(-1, 0, cap, cap, false);
+ Bits.reserveMemory(cap);
+ int ps = Bits.pageSize();
+ long base = 0;
+ try {
More information about the distro-pkg-dev
mailing list