/hg/icedtea6-hg: 6 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Sep 29 12:43:16 PDT 2010
changeset f6995ca0f34d in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=f6995ca0f34d
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Sep 24 00:14:30 2010 +0100
Add bug ID to awt_window_size patch to reflect upstreaming.
2010-09-23 Andrew John Hughes <ahughes at redhat.com>
* patches/icedtea-awt-window-size.patch: Moved to...
* Makefile.am: Fix path of above patch.
* patches/openjdk/6721088-awt_window_size.patch, ...here to
reflect upstreaming.
changeset ebedc637de4d in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=ebedc637de4d
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Sep 24 00:18:08 2010 +0100
Move add-x and add-x-debug cleaning targets to clean-icedtea-
against-icedtea and clean-icedtea-debug-against-icedtea
respectively.
2010-09-24 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (clean-local): Remove add-x and
add-x-debug clean targets. (clean-icedtea-against-icedtea):
Add clean-add-x targets. (clean-icedtea-debug-against-
icedtea): Add clean-add-x-debug targets.
changeset b5f9559a47bf in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=b5f9559a47bf
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Sep 24 00:19:50 2010 +0100
Remove old tarballs before trying to remove the drops directory.
2010-09-24 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (distclean-local): Remove any old
tarballs before trying to remove the drops directory.
changeset 5c0d756b4bb6 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=5c0d756b4bb6
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Sep 24 15:25:51 2010 +0100
Support additional targets for the ecj build.
2010-09-24 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (.PHONY): Add new clean targets.
(icedtea-against-icedtea): Don't depend on bootstrap-
directory-symlink, icedtea already does. (clean-icedtea-
against-icedtea): Remove superfluous space. (icedtea-debug-
against-icedtea): Likewise. (icedtea-ecj): Fix formatting.
(icedtea-against-ecj): Add new add-x-ecj targets. (clean-
icedtea-against-ecj): Add new clean-add-x-ecj targets. (add-
plugin-ecj): Add plugin support to the ecj build. (clean-
plugin-ecj): Remove plugin support from the ecj build. (add-
netx-ecj): Add NetX support to the ecj build. (clean-netx-
ecj): Remove NetX support from the ecj build. (add-
systemtap-ecj): Add SystemTap support to the ecj build.
(clean-add-systemtap-ecj): Remove SystemTap support from the ecj
build. (add-pulseaudio-ecj): New target to add PulseAudio
support to the ecj build. (clean-add-pulseaudio-ecj): Remove
PulseAudio support from the ecj build. (add-nss-ecj): New
target to add NSS support to the ecj build. (clean-add-nss-
ecj): Remove NSS support from the ecj build. (add-tzdata-
support-ecj): New target to add alternate timezone data support to
the ecj build. (clean-add-tzdata-support-ecj): Remove
alternate timezone data support from the ecj build.
changeset 98ada0ecdf29 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=98ada0ecdf29
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Sep 29 20:37:24 2010 +0100
Depend on correct icedtea-x prerequisite for add-tzdata-support-x.
2010-09-29 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (add-tzdata-support-debug): Depend on
icedtea-debug, not icedtea. (add-tzdata-support-ecj): Depend
on icedtea-ecj, not icedtea.
changeset 48bb2e5953e4 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=48bb2e5953e4
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Sep 29 20:42:58 2010 +0100
Merge
diffstat:
13 files changed, 252 insertions(+), 2365 deletions(-)
ChangeLog | 102 +
Makefile.am | 185 ++
patches/icedtea-awt-window-size.patch | 67
patches/icedtea-jtreg-jrunscript.patch | 12
patches/openjdk/4356282-opentype.patch | 227 ---
patches/openjdk/6438179-systray_check.patch | 92 -
patches/openjdk/6678385-window_movement_crasher.patch | 1241 -----------------
patches/openjdk/6795060-icu_crash.patch | 95 -
patches/openjdk/6951319-sparc_build_fixes.patch | 24
patches/openjdk/6954424-opentype_javadoc.patch | 23
patches/openjdk/6961732-negative_leading.patch | 45
patches/openjdk/6969395-net_bugs.patch | 461 ------
patches/openjdk/6985992-test_6933784.patch | 43
diffs (truncated from 2863 to 500 lines):
diff -r 65ab89d428ac -r 48bb2e5953e4 ChangeLog
--- a/ChangeLog Thu Sep 23 14:40:49 2010 +0100
+++ b/ChangeLog Wed Sep 29 20:42:58 2010 +0100
@@ -1,3 +1,62 @@ 2010-09-23 Andrew John Hughes <ahughes
+2010-09-29 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (add-tzdata-support-debug): Depend on icedtea-debug, not icedtea.
+ (add-tzdata-support-ecj): Depend on icedtea-ecj, not icedtea.
+
+2010-09-24 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (.PHONY): Add new clean targets.
+ (icedtea-against-icedtea): Don't depend on
+ bootstrap-directory-symlink, icedtea already does.
+ (clean-icedtea-against-icedtea): Remove superfluous space.
+ (icedtea-debug-against-icedtea): Likewise.
+ (icedtea-ecj): Fix formatting.
+ (icedtea-against-ecj): Add new add-x-ecj targets.
+ (clean-icedtea-against-ecj): Add new clean-add-x-ecj targets.
+ (add-plugin-ecj): Add plugin support to the ecj build.
+ (clean-plugin-ecj): Remove plugin support from the ecj build.
+ (add-netx-ecj): Add NetX support to the ecj build.
+ (clean-netx-ecj): Remove NetX support from the ecj build.
+ (add-systemtap-ecj): Add SystemTap support to the ecj build.
+ (clean-add-systemtap-ecj): Remove SystemTap support from the ecj build.
+ (add-pulseaudio-ecj): New target to add PulseAudio support to the ecj build.
+ (clean-add-pulseaudio-ecj): Remove PulseAudio support from the ecj build.
+ (add-nss-ecj): New target to add NSS support to the ecj build.
+ (clean-add-nss-ecj): Remove NSS support from the ecj build.
+ (add-tzdata-support-ecj): New target to add alternate timezone data support to the ecj build.
+ (clean-add-tzdata-support-ecj): Remove alternate timezone data support from the ecj build.
+
+2010-09-24 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (distclean-local): Remove any old tarballs
+ before trying to remove the drops directory.
+
+2010-09-24 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (clean-local): Remove add-x and add-x-debug clean targets.
+ (clean-icedtea-against-icedtea): Add clean-add-x targets.
+ (clean-icedtea-debug-against-icedtea): Add clean-add-x-debug targets.
+
+2010-09-23 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/icedtea-awt-window-size.patch:
+ Moved to...
+ * Makefile.am: Fix path of above patch.
+ * patches/openjdk/6721088-awt_window_size.patch,
+ ...here to reflect upstreaming.
+
+2010-09-23 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/icedtea-awt-window-size.patch,
+ * patches/openjdk/6969395-net_bugs.patch,
+ * patches/openjdk/6985992-test_6933784.patch:
+ Dropped; upstreamed.
+ * Makefile.am: Remove above patches.
+
2010-09-23 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
@@ -337,6 +396,15 @@ 2010-09-07 Andrew John Hughes <ahughes
* patches/openjdk/6969395-net_bugs.patch:
Fix networking tests.
+2010-09-05 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/openjdk/6438179-systray_check.patch:
+ Dropped, applied upstream.
+ * Makefile.am: Drop above patch and those brought
+ back by merge. Update JAXP tarball.
+ * patches/openjdk/6951319-sparc_build_fixes.patch:
+ Remove upstreamed parts.
+
2010-09-03 Pavel Tisnovsky <ptisnovs at redhat.com>
* Makefile.am: Fixed indentation, changes spaces to tab.
@@ -386,7 +454,7 @@ 2010-08-27 Deepak Bhole <dbhole at redhat.
2010-08-26 Pavel Tisnovsky <ptisnovs at redhat.com>
- * Makefile.am:
+ * Makefile.am: Add patch.
* patches/opengl-jni-fix.patch:
Fixed missing JNI link to native function
OGLContext.getOGLIdString() which causes
@@ -473,6 +541,22 @@ 2010-08-13 Andrew John Hughes <ahughes
an Oracle-based JDK or not.
* configure.ac:
Remove check for sun.awt.Toolkit.
+
+2010-08-12 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/openjdk/4356282-opentype.patch,
+ * patches/openjdk/6795060-icu_crash.patch,
+ * patches/openjdk/6954424-opentype_javadoc.patch:
+ Dropped, applied upstream.
+ * Makefile.am:
+ Remove above patches.
+
+2010-08-12 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/openjdk/6678385-window_movement_crasher.patch:
+ Dropped, applied upstream.
+ * Makefile.am:
+ Remove above patch.
2010-08-09 Omair Majid <omajid at redhat.com>
@@ -514,7 +598,7 @@ 2010-08-09 Deepak Bhole <dbhole at redhat.
* Makefile.am:
(icedtea):Add update-bootclasspath.patch.
dependencies and copying. Add icedtea-update-bootclasspath.patch.
- * patches/update-bootclasspath.patch: New patch. Adds netx,
+ * patches/update-bootclasspath.patch: New patch. Adds netx,
rhino and plugin jars to the bootclasspath.
2010-08-09 Andrew John Hughes <ahughes at redhat.com>
@@ -826,6 +910,12 @@ 2010-07-28 Matthias Klose <doko at ubuntu
2010-07-28 Matthias Klose <doko at ubuntu.com>
* NEWS: Add 1.8.1 entry.
+
+2010-07-26 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/icedtea-jtreg-jrunscript.patch:
+ Regenerate after 50002bfcff96 from dcubed being
+ added to OpenJDK6.
2010-07-26 Andrew John Hughes <ahughes at redhat.com>
@@ -1275,6 +1365,12 @@ 2010-07-08 Andrew John Hughes <ahughes
just delete the stamp.
(clean-extract-openjdk): Likewise for clean-patch and
clean-patch-fsg.
+
+2010-07-07 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/openjdk/6961732.patch:
+ Dropped, applied upstream.
+ * Makefile.am: Remove above patch.
2010-07-06 Andrew John Hughes <ahughes at redhat.com>
@@ -9568,7 +9664,7 @@ 2009-04-07 Omair Majid <omajid at redhat.
2009-04-06 Omair Majid <omajid at redhat.com>
- * patches/icedtea-jtreg-jrunscript.patch: New patch. Replaces
+ * patches/icedtea-jtreg-jrunscript.patch: New patch. Replaces
jrunscriptTest.sh with a java version that isnt picky about int vs double
changes.
* Makefile.am (ICEDTEA_PATCHES): Apply the above.
diff -r 65ab89d428ac -r 48bb2e5953e4 Makefile.am
--- a/Makefile.am Thu Sep 23 14:40:49 2010 +0100
+++ b/Makefile.am Wed Sep 29 20:42:58 2010 +0100
@@ -17,9 +17,9 @@ JAF_DROP_URL = https://jax-ws.dev.java.n
JAF_DROP_URL = https://jax-ws.dev.java.net/files/documents/4202/150725
JAF_DROP_ZIP = jdk6-jaf-b20.zip
JAF_DROP_SHA256SUM = 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012
-JAXP_DROP_URL = https://jaxp.dev.java.net/files/documents/913/150648
-JAXP_DROP_ZIP = jdk6-jaxp-b20.zip
-JAXP_DROP_SHA256SUM = d097627d4059d488c5a09d4e33cec275a193d4d8bc0fea8ef4f1337170904156
+JAXP_DROP_URL = https://jaxp.dev.java.net/files/documents/913/152561
+JAXP_DROP_ZIP = jaxp-1_4_4.zip
+JAXP_DROP_SHA256SUM = 10b203bec5b7d3dd8f515a9e098f80abc316faf977bcc220b56efe3dc6e9e5e9
OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk6/jdk6
@@ -247,7 +247,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-sparc-ptracefix.patch \
patches/icedtea-sparc-trapsfix.patch \
patches/icedtea-demo-swingapplet.patch \
- patches/icedtea-awt-window-size.patch \
patches/icedtea-jtreg-6592792.patch \
patches/icedtea-s390-noinline.patch \
patches/icedtea-jtreg-dnd.patch \
@@ -269,8 +268,6 @@ ICEDTEA_PATCHES = \
patches/extensions/netx-umask.patch \
patches/icedtea-jtreg-httpTest.patch \
patches/arm.patch \
- patches/openjdk/6678385-window_movement_crasher.patch \
- patches/openjdk/6961732-negative_leading.patch \
patches/debug-dir.patch \
patches/no-sync.patch \
patches/icedtea-override-redirect-metacity.patch \
@@ -280,19 +277,13 @@ ICEDTEA_PATCHES = \
patches/fonts-rhel.patch \
patches/fonts-gentoo.patch \
patches/ipv4-mapped-ipv6-addresses.patch \
- patches/openjdk/6795060-icu_crash.patch \
- patches/openjdk/4356282-opentype.patch \
- patches/openjdk/6954424-opentype_javadoc.patch \
- patches/openjdk/6438179-systray_check.patch \
patches/icedtea-too-many-args.patch \
patches/icedtea-jtreg-OpenGLContextInit.patch \
- patches/openjdk/6969395-net_bugs.patch \
patches/openjdk/6510892-httpserver_test.patch \
patches/openjdk/6638712-wildcard_types.patch \
patches/openjdk/6650759-missing_inference.patch \
patches/numa_on_early_glibc.patch \
- patches/icedtea-shark-build.patch \
- patches/openjdk/6985992-test_6933784.patch
+ patches/icedtea-shark-build.patch
if !WITH_ALT_HSBUILD
ICEDTEA_PATCHES += \
@@ -555,9 +546,7 @@ clean-local: clean-jtreg clean-jtreg-rep
clean-icedtea-against-ecj clean-extract-ecj clean-generated clean-replace-hotspot \
clean-rewriter clean-rewrite-rhino clean-extra clean-rt clean-bootstrap-directory \
clean-bootstrap-directory-ecj clean-bootstrap-directory-symlink \
- clean-bootstrap-directory-symlink-ecj clean-add-systemtap clean-add-systemtap-debug \
- clean-add-pulseaudio clean-add-pulseaudio-debug clean-add-nss clean-add-nss-debug \
- clean-add-tzdata-support clean-add-tzdata-support-debug
+ clean-bootstrap-directory-symlink-ecj
if [ -e bootstrap ]; then \
rmdir bootstrap ; \
fi
@@ -592,7 +581,9 @@ install:
clean-rewriter clean-rewrite-rhino clean-add-netx clean-add-netx-debug \
clean-add-plugin clean-add-plugin-debug clean-add-systemtap clean-add-systemtap-debug \
clean-add-pulseaudio clean-add-pulseaudio-debug clean-add-nss clean-add-nss-debug \
- clean-add-tzdata-support clean-add-tzdata-support-debug
+ clean-add-tzdata-support clean-add-tzdata-support-debug clean-add-plugin-ecj \
+ clean-add-netx-ecj clean-add-systemtap-ecj clean-add-pulseaudio-ecj clean-add-nss-ecj \
+ clean-add-tzdata-support-ecj
env:
@echo 'unset JAVA_HOME'
@@ -746,6 +737,7 @@ clean-drops: clean-download-jaxp-drop cl
clean-drops: clean-download-jaxp-drop clean-download-jaf-drop \
clean-download-jaxws-drop
if [ -e drops ] ; then \
+ rm -f drops/*.old ; \
rmdir drops ; \
fi
rm -f stamps/download-drops.stamp
@@ -1305,25 +1297,26 @@ clean-icedtea-debug:
rm -rf $(DEBUG_BUILD_OUTPUT_DIR)
rm -f stamps/icedtea-debug.stamp
-stamps/icedtea-against-icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \
- stamps/icedtea.stamp stamps/add-cacao.stamp stamps/add-zero.stamp stamps/add-plugin.stamp \
- stamps/add-netx.stamp stamps/add-systemtap.stamp stamps/add-pulseaudio.stamp stamps/add-nss.stamp \
- stamps/add-tzdata-support.stamp
+stamps/icedtea-against-icedtea.stamp: stamps/icedtea.stamp stamps/add-cacao.stamp stamps/add-zero.stamp \
+ stamps/add-plugin.stamp stamps/add-netx.stamp stamps/add-systemtap.stamp stamps/add-pulseaudio.stamp \
+ stamps/add-nss.stamp stamps/add-tzdata-support.stamp
mkdir -p stamps
touch stamps/icedtea-against-icedtea.stamp
-clean-icedtea-against-icedtea: clean-add-zero clean-add-cacao clean-add-plugin clean-add-netx
+clean-icedtea-against-icedtea: clean-add-zero clean-add-cacao clean-add-plugin clean-add-netx \
+ clean-add-systemtap clean-add-pulseaudio clean-add-nss clean-add-tzdata-support
rm -f stamps/icedtea-against-icedtea.stamp
-stamps/icedtea-debug-against-icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \
- stamps/icedtea-debug.stamp stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp \
- stamps/add-plugin-debug.stamp stamps/add-netx-debug.stamp stamps/add-systemtap-debug.stamp \
- stamps/add-pulseaudio-debug.stamp stamps/add-nss-debug.stamp stamps/add/tzdata-support-debug.stamp
+stamps/icedtea-debug-against-icedtea.stamp: stamps/icedtea-debug.stamp stamps/add-cacao-debug.stamp \
+ stamps/add-zero-debug.stamp stamps/add-plugin-debug.stamp stamps/add-netx-debug.stamp \
+ stamps/add-systemtap-debug.stamp stamps/add-pulseaudio-debug.stamp stamps/add-nss-debug.stamp \
+ stamps/add/tzdata-support-debug.stamp
mkdir -p stamps
touch stamps/icedtea-debug-against-icedtea.stamp
clean-icedtea-debug-against-icedtea: clean-add-zero-debug clean-add-cacao-debug clean-add-plugin-debug \
- clean-add-netx-debug
+ clean-add-netx-debug clean-add-systemtap-debug clean-add-pulseaudio-debug clean-add-nss-debug \
+ clean-add-tzdata-support-debug
rm -f stamps/icedtea-debug-against-icedtea.stamp
stamps/add-plugin.stamp: stamps/plugin.stamp stamps/icedtea.stamp
@@ -1545,7 +1538,7 @@ clean-add-tzdata-support:
rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties
rm -f stamps/add-tzdata-support.stamp
-stamps/add-tzdata-support-debug.stamp: stamps/icedtea.stamp
+stamps/add-tzdata-support-debug.stamp: stamps/icedtea-debug.stamp
if WITH_TZDATA_DIR
cp $(abs_top_builddir)/tz.properties \
$(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib;
@@ -1560,7 +1553,7 @@ clean-add-tzdata-support-debug:
# ===================
stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \
- $(OPENJDK_ECJ_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp
+ $(OPENJDK_ECJ_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV_ECJ) \
-C openjdk-ecj/ \
@@ -1573,6 +1566,131 @@ clean-icedtea-ecj:
clean-icedtea-ecj:
rm -rf $(ECJ_BUILD_OUTPUT_DIR)
rm -f stamps/icedtea-ecj.stamp
+
+stamps/icedtea-against-ecj.stamp: stamps/icedtea-ecj.stamp stamps/add-plugin-ecj.stamp \
+ stamps/add-netx-ecj.stamp stamps/add-systemtap-ecj.stamp stamps/add-pulseaudio-ecj.stamp \
+ stamps/add-nss-ecj.stamp stamps/add-tzdata-support-ecj.stamp
+ mkdir -p stamps
+ touch stamps/icedtea-against-ecj.stamp
+
+clean-icedtea-against-ecj: clean-add-plugin-ecj clean-add-netx-ecj clean-add-systemtap-ecj \
+ clean-add-pulseaudio-ecj clean-add-nss-ecj clean-add-tzdata-support-ecj
+ rm -f stamps/icedtea-against-ecj.stamp
+
+stamps/add-plugin-ecj.stamp: stamps/plugin.stamp stamps/icedtea-ecj.stamp
+if ENABLE_PLUGIN
+ cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+ cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
+ cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar
+ cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar
+endif
+ touch stamps/add-plugin-ecj.stamp
+
+clean-add-plugin-ecj:
+ rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so
+ rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so
+ rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar
+ rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar
+ rm -f stamps/add-plugin-ecj.stamp
+
+stamps/add-netx-ecj.stamp: stamps/netx-dist.stamp extra-lib/about.jar stamps/icedtea-ecj.stamp
+ cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar
+ cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar
+ cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
+ cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib
+ cp $(NETX_SRCDIR)/javaws.1 \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/man/man1
+ cp $(NETX_SRCDIR)/javaws.1 \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/man/man1
+ touch stamps/add-netx-ecj.stamp
+
+clean-add-netx-ecj:
+ rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar
+ rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar
+ rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jnlp
+ rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jar
+ rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/about.jnlp
+ rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/about.jar
+ rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/man/man1/javaws.1
+ rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/man/man1/javaws.1
+ rm -f stamps/add-netx-ecj.stamp
+
+stamps/add-systemtap-ecj.stamp: stamps/icedtea-ecj.stamp
+if ENABLE_SYSTEMTAP
+ mkdir -p $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/tapset
+ grep "client IGNORE" $(BUILD_JRE_ARCH_DIR)/jvm.cfg; \
+ if test $$? -eq 0; then \
+ sed -e '/\/client\/libjvm.so/d' \
+ < $(abs_top_builddir)/tapset/hotspot.stp \
+ > $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
+ sed -e '/\/client\/libjvm.so/d' \
+ < $(abs_top_builddir)/tapset/hotspot_jni.stp \
+ > $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+ else \
+ cp $(abs_top_builddir)/tapset/hotspot.stp \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
+ cp $(abs_top_builddir)/tapset/hotspot_jni.stp \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+ fi
+ cp $(abs_top_builddir)/tapset/jstack.stp \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
+endif
+ touch stamps/add-systemtap-ecj.stamp
+
+clean-add-systemtap-ecj:
+ rm -rf $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/tapset
+ rm -f stamps/add-systemtap-ecj.stamp
+
+stamps/add-pulseaudio-ecj.stamp: stamps/icedtea-ecj.stamp $(PULSE_JAVA_TARGET)
+if ENABLE_PULSE_JAVA
+ cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+ cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
+ cp -pPRf $(PULSE_JAVA_BUILDDIR)/pulse-java.jar \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
+ cp -pPRf $(PULSE_JAVA_BUILDDIR)/pulse-java.jar \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/ext
+ (cd $(PULSE_JAVA_JAVA_SRCDIR) && \
+ $(ZIP) -qur $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
+endif
+ touch stamps/add-pulseaudio-ecj.stamp
+
+# Note: for simplicity, we don't revert the update of src.zip
+clean-add-pulseaudio-ecj:
+ rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so
+ rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so
+ rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext/pulse-java.jar
+ rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/ext/pulse-java.jar
+ rm -f stamps/add-pulseaudio-ecj.stamp
+
+stamps/add-nss-ecj.stamp: stamps/icedtea-ecj.stamp
+ cp $(abs_top_builddir)/nss.cfg \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security;
+ touch stamps/add-nss-ecj.stamp
+
+clean-add-nss-ecj:
+ rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/nss.cfg
+ rm -f stamps/add-nss-ecj.stamp
+
+stamps/add-tzdata-support-ecj.stamp: stamps/icedtea-ecj.stamp
+if WITH_TZDATA_DIR
+ cp $(abs_top_builddir)/tz.properties \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib;
+endif
+ touch stamps/add-tzdata-support-ecj.stamp
+
+clean-add-tzdata-support-ecj:
+ rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties
+ rm -f stamps/add-tzdata-support-ecj.stamp
# Rebuild targets
@@ -1607,15 +1725,6 @@ else
$(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server
@echo "Hotspot is served:" $(BUILD_OUTPUT_DIR)/j2sdk-image
endif
-
-stamps/icedtea-against-ecj.stamp: \
- stamps/bootstrap-directory-symlink-ecj.stamp \
- stamps/icedtea-ecj.stamp
- mkdir -p stamps
- touch stamps/icedtea-against-ecj.stamp
-
-clean-icedtea-against-ecj:
- rm -f stamps/icedtea-against-ecj.stamp
# Plugin
diff -r 65ab89d428ac -r 48bb2e5953e4 patches/icedtea-awt-window-size.patch
--- a/patches/icedtea-awt-window-size.patch Thu Sep 23 14:40:49 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
---- openjdk/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java.orig 2009-01-08 16:53:54.000000000 -0500
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java 2009-01-08 16:54:08.000000000 -0500
-@@ -478,7 +478,10 @@
- // do nothing but accept it.
- Rectangle reqBounds = newDimensions.getBounds();
- Rectangle newBounds = constrainBounds(reqBounds.x, reqBounds.y, reqBounds.width, reqBounds.height);
-- newDimensions = new WindowDimensions(newBounds, newDimensions.getInsets(), newDimensions.isClientSizeSet());
-+ Insets insets = newDimensions.getInsets();
-+ Rectangle clientBounds = new Rectangle(newBounds.x, newBounds.y, newBounds.width - insets.left - insets.right,
-+ newBounds.height - insets.top - insets.bottom);
-+ newDimensions = new WindowDimensions(newDimensions.isClientSizeSet() ? clientBounds : newBounds , insets, newDimensions.isClientSizeSet());
- }
- XToolkit.awtLock();
- try {
---- /dev/null 2009-01-09 04:32:08.413012246 -0500
-+++ openjdk/jdk/test/java/awt/Frame/FrameSize/TestFrameSize.java 2009-01-09 11:30:54.000000000 -0500
-@@ -0,0 +1,50 @@
-+/*
-+ @test
-+ @bug 6721088
-+ @summary X11 Window sizes should be what we set them to
-+ @author Omair Majid <omajid at redhat.com>
-+ @run main TestFrameSize
-+ */
-+
-+import java.awt.Dimension;
-+import java.awt.Frame;
-+
-+/**
-+ * TestFrameSize.java
-+ *
-+ * Summary: test that X11 Awt windows are drawn with correct sizes
-+ *
-+ * Test fails if size of window is wrong
-+ */
-+
-+public class TestFrameSize {
-+
-+ static Dimension desiredDimensions = new Dimension(200, 200);
-+ static int ERROR_MARGIN = 15;
-+ static Frame mainWindow;
-+
-+ public static void drawGui() {
-+ mainWindow = new Frame("");
-+ mainWindow.setPreferredSize(desiredDimensions);
-+ mainWindow.pack();
-+ // mainWindow.setVisible(true);
-+
-+ Dimension actualDimensions = mainWindow.getSize();
-+ // System.out.println(desiredDimensions);
-+ // System.out.println(actualDimensions);
More information about the distro-pkg-dev
mailing list