/hg/icedtea: 4 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Jun 11 05:57:19 PDT 2010
changeset 85ec20ad5e63 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=85ec20ad5e63
author: Xerxes R?nby <xerxes at zafena.se>
date: Fri Jun 11 13:08:48 2010 +0100
Use full path to jar application to avoid relying on the one on the
path.
2010-06-01 Xerxes R?nby <xerxes at zafena.se>
* Makefile.am: (rewrite-rhino.stamp): Use full path
to jar application to avoid relying on the one on
the path.
changeset 3f0dad02b228 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3f0dad02b228
author: Jon VanAlten <jon.vanalten at redhat.com>
date: Fri Jun 04 14:20:15 2010 -0400
PR icedtea/438: Fix bug in PulseAudio backend
http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=438
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Pulse
AudioLine.java: (isControlSupported): Correctly determine if
control-type is supported.
* Makefile.am (stamps/icedtea.stamp): Add PulseAudio sources
to src.zip
changeset 57b31ab89534 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=57b31ab89534
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Jun 11 13:26:35 2010 +0100
Make BOOT_BUILD_OUTPUT_DIR absolute and drop unneeded
ICEDTEA_BUILD_DIR{,_BOOT}.
2010-06-07 Andrew John Hughes <ahughes at redhat.com>
Make BOOT_BUILD_OUTPUT_DIR absolute and dispense
with ICEDTEA_BUILD_DIR and ICEDTEA_BUILD_DIR_ECJ.
* Makefile.am: (ICEDTEA_BUILD_DIR): Dropped.
(ECJ_BUILD_OUTPUT_DIR): Make absolute.
(ICEDTEA_CLS_DIR_BOOT): Make relative to ECJ_BUILD_OUTPUT_DIR.
(ICEDTEA_BUILD_DIR_BOOT): Dropped. (bootstrap-
directory.stamp): Use BOOT_BUILD_OUTPUT_DIR rather than
ICEDTEA_BUILD_DIR_BOOT. Remove unneeded
$(abs_top_builddir). (icedtea-debug.stamp): Add pulse java
src.zip update. (ADD_ZERO_EXTRA_BUILD_ENV): Replace
ICEDTEA_BUILD_DIR with BUILD_OUTPUT_DIR. (check-
hotspot): Replace unneeded use of pwd. (check-jdk):
Likewise. (check-langtools): Likewise.
changeset c3af7166afc4 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c3af7166afc4
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Jun 11 13:56:52 2010 +0100
Use build directories outside the source tree and make lightweight
copies of external source trees where possible.
2010-04-26 Andrew John Hughes <ahughes at redhat.com>
Use build directories outside the source tree and
use lightweight copies for external source trees where
possible.
* Makefile.am: (OS_DIR): Removed. (BUILD_DIR): Set to
openjdk.build. (BUILD_OUTPUT_DIR): Use BUILD_DIR.
(BOOT_BUILD_OUTPUT_DIR): Extend BUILD_OUTPUT_DIR with '-boot'.
(ICEDTEA_ENV): Set output directory. (ICEDTEA_ENV_BOOT):
Likewise. (clean-icedtea): Simplify by just removing
BUILD_OUTPUT_DIR. (clean-icedtea-boot): Likewise, but
BOOT_BUILD_OUTPUT_DIR is removed. (extract-openjdk.stamp):
Use lightweight copies where possible. (generated.stamp):
Likewise. (liveconnect-dist.stamp): Likewise. (netx-
dist.stamp): Likewise. (plugin-tests.stamp): Likewise.
diffstat:
3 files changed, 99 insertions(+), 56 deletions(-)
ChangeLog | 55 +++++
Makefile.am | 96 ++++------
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java | 4
diffs (326 lines):
diff -r d7d97061baf3 -r c3af7166afc4 ChangeLog
--- a/ChangeLog Thu May 20 12:40:31 2010 +0100
+++ b/ChangeLog Fri Jun 11 13:56:52 2010 +0100
@@ -1,3 +1,58 @@ 2010-05-20 Gary Benson <gbenson at redhat
+2010-04-26 Andrew John Hughes <ahughes at redhat.com>
+
+ Use build directories outside the source
+ tree and use lightweight copies for external
+ source trees where possible.
+ * Makefile.am:
+ (OS_DIR): Removed.
+ (BUILD_DIR): Set to openjdk.build.
+ (BUILD_OUTPUT_DIR): Use BUILD_DIR.
+ (BOOT_BUILD_OUTPUT_DIR): Extend BUILD_OUTPUT_DIR with '-boot'.
+ (ICEDTEA_ENV): Set output directory.
+ (ICEDTEA_ENV_BOOT): Likewise.
+ (clean-icedtea): Simplify by just removing BUILD_OUTPUT_DIR.
+ (clean-icedtea-boot): Likewise, but BOOT_BUILD_OUTPUT_DIR is removed.
+ (extract-openjdk.stamp): Use lightweight copies where possible.
+ (generated.stamp): Likewise.
+ (liveconnect-dist.stamp): Likewise.
+ (netx-dist.stamp): Likewise.
+ (plugin-tests.stamp): Likewise.
+
+2010-06-07 Andrew John Hughes <ahughes at redhat.com>
+
+ Make BOOT_BUILD_OUTPUT_DIR absolute and dispense
+ with ICEDTEA_BUILD_DIR and ICEDTEA_BUILD_DIR_ECJ.
+ * Makefile.am:
+ (ICEDTEA_BUILD_DIR): Dropped.
+ (ECJ_BUILD_OUTPUT_DIR): Make absolute.
+ (ICEDTEA_CLS_DIR_BOOT): Make relative to ECJ_BUILD_OUTPUT_DIR.
+ (ICEDTEA_BUILD_DIR_BOOT): Dropped.
+ (bootstrap-directory.stamp): Use BOOT_BUILD_OUTPUT_DIR
+ rather than ICEDTEA_BUILD_DIR_BOOT. Remove unneeded
+ $(abs_top_builddir).
+ (icedtea-debug.stamp): Add pulse java src.zip update.
+ (ADD_ZERO_EXTRA_BUILD_ENV): Replace ICEDTEA_BUILD_DIR
+ with BUILD_OUTPUT_DIR.
+ (check-hotspot): Replace unneeded use of pwd.
+ (check-jdk): Likewise.
+ (check-langtools): Likewise.
+
+2010-06-04 Jon VanAlten <jon.vanalten at redhat.com>
+
+ PR icedtea/438
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java:
+ (isControlSupported): Correctly determine if control-type is
+ supported.
+ * Makefile.am
+ (stamps/icedtea.stamp): Add PulseAudio sources to src.zip
+
+2010-06-01 Xerxes RÃ¥nby <xerxes at zafena.se>
+
+ * Makefile.am:
+ (rewrite-rhino.stamp): Use full path to
+ jar application to avoid relying on the one
+ on the path.
+
2010-05-20 Gary Benson <gbenson at redhat.com>
PR icedtea/494
diff -r d7d97061baf3 -r c3af7166afc4 Makefile.am
--- a/Makefile.am Thu May 20 12:40:31 2010 +0100
+++ b/Makefile.am Fri Jun 11 13:56:52 2010 +0100
@@ -59,28 +59,17 @@ HOTSPOT_URL = $(ICEDTEA_HG_URL)/hotspot
# Build directories
-OS_DIR = $(BUILD_OS_DIR)-$(BUILD_ARCH_DIR)
-BUILD_OUTPUT_DIR = $(abs_top_builddir)/openjdk/build/$(OS_DIR)
+BUILD_DIR = openjdk.build
+BUILD_OUTPUT_DIR = $(abs_top_builddir)/$(BUILD_DIR)
DEBUG_BUILD_OUTPUT_DIR = $(BUILD_OUTPUT_DIR)-debug
-BOOT_BUILD_OUTPUT_DIR = openjdk-boot/build/$(OS_DIR)
-ICEDTEA_BUILD_DIR = \
- $(abs_top_builddir)/$(BUILD_OUTPUT_DIR)
-ICEDTEA_BOOT_DIR= \
- $(abs_top_builddir)/bootstrap/jdk1.6.0
-ICEDTEA_RT = \
- $(ICEDTEA_BOOT_DIR)/jre/lib/rt.jar
-NETX_CLASSES = \
- $(abs_top_builddir)/netx.build
-NETX_JAR = \
- $(NETX_CLASSES)/lib/classes.jar
-NETX_SRC = \
- $(NETX_CLASSES)/lib/src.zip
-ICEDTEA_ENDORSED_DIR = \
- $(ICEDTEA_BOOT_DIR)/lib/endorsed
-ICEDTEA_BUILD_DIR_BOOT = \
- $(abs_top_builddir)/$(BOOT_BUILD_OUTPUT_DIR)/
-ICEDTEA_CLS_DIR_BOOT = \
- $(abs_top_builddir)/$(BOOT_BUILD_OUTPUT_DIR)/classes
+BOOT_BUILD_OUTPUT_DIR = $(BUILD_OUTPUT_DIR)-boot
+ICEDTEA_BOOT_DIR= $(abs_top_builddir)/bootstrap/jdk1.6.0
+ICEDTEA_RT = $(ICEDTEA_BOOT_DIR)/jre/lib/rt.jar
+NETX_CLASSES = $(abs_top_builddir)/netx.build
+NETX_JAR = $(NETX_CLASSES)/lib/classes.jar
+NETX_SRC = $(NETX_CLASSES)/lib/src.zip
+ICEDTEA_ENDORSED_DIR = $(ICEDTEA_BOOT_DIR)/lib/endorsed
+ICEDTEA_CLS_DIR_BOOT = $(BOOT_BUILD_OUTPUT_DIR)/classes
SERVER_DIR = hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server
BUILD_JRE_ARCH_DIR = $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
BUILD_DEBUG_JRE_ARCH_DIR = $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
@@ -521,7 +510,8 @@ ICEDTEA_ENV = \
DEBUG_CLASSFILES="true" \
DEBUG_BINARIES="true" \
DISABLE_INTREE_EC="true" \
- ALT_DROPS_DIR="$(abs_top_builddir)/drops"
+ ALT_DROPS_DIR="$(abs_top_builddir)/drops" \
+ ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)"
if WITH_CACAO
ICEDTEA_ENV += \
@@ -564,7 +554,8 @@ ICEDTEA_ENV_BOOT = $(ICEDTEA_ENV) \
JAR_KNOWS_J_OPTIONS="$(JAR_KNOWS_J_OPTIONS)" \
JAR_ACCEPTS_STDIN_LIST="$(JAR_ACCEPTS_STDIN_LIST)" \
DISABLE_NIMBUS="true" \
- NO_DOCS="true"
+ NO_DOCS="true" \
+ ALT_OUTPUTDIR="$(BOOT_BUILD_OUTPUT_DIR)"
# Source files
@@ -1182,7 +1173,7 @@ clean-extract: clean-extract-openjdk cle
stamps/extract-openjdk.stamp: stamps/download-openjdk.stamp
if OPENJDK_SRC_DIR_FOUND
- cp -a $(OPENJDK_SRC_DIR) openjdk
+ cp -pPR --reflink=auto $(OPENJDK_SRC_DIR) openjdk
else
set -e ; \
if ! test -d openjdk ; then \
@@ -1427,7 +1418,7 @@ stamps/generated.stamp: stamps/ports.sta
stamps/generated.stamp: stamps/ports.stamp
set -e ; \
if [ ! -e $(abs_top_builddir)/generated ]; then \
- cp -a $(abs_top_srcdir)/generated $(abs_top_builddir); \
+ cp -pPR --reflink=auto $(abs_top_srcdir)/generated $(abs_top_builddir); \
find $(abs_top_builddir)/generated -type f -exec chmod 640 '{}' ';' \
-o -type d -exec chmod 750 '{}' ';'; \
fi
@@ -1741,11 +1732,9 @@ clean-bootstrap-directory-stage1:
# bootstrap/stage2.
stamps/bootstrap-directory-stage2.stamp: stamps/icedtea-stage1.stamp
rm -rf bootstrap/icedtea
- ln -s \
- $(abs_top_builddir)/$(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/ \
- bootstrap/icedtea
+ ln -s $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/ bootstrap/icedtea
if ! test -d bootstrap/icedtea/include; then \
- ln -sf $(ICEDTEA_BUILD_DIR_BOOT)/include bootstrap/icedtea/include; \
+ ln -sf $(BOOT_BUILD_OUTPUT_DIR)/include bootstrap/icedtea/include; \
fi
mkdir -p stamps
touch $@
@@ -1815,6 +1804,8 @@ if ENABLE_PULSE_JAVA
$(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
cp -pPRf pulse-java.jar \
$(BUILD_OUTPUT_DIR)/j2re-image/lib/ext
+ (cd $(PULSE_JAVA_JAVA_SRCDIR) && \
+ $(ZIP) -qur $(BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
endif
if JNLP_ABOUT_NEEDED
cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \
@@ -1887,6 +1878,8 @@ if ENABLE_PULSE_JAVA
$(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
cp -pPRf pulse-java.jar \
$(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext
+ (cd $(PULSE_JAVA_JAVA_SRCDIR) && \
+ $(ZIP) -qur $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
endif
if JNLP_ABOUT_NEEDED
cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \
@@ -1934,11 +1927,7 @@ endif
touch $@
clean-icedtea:
- if [ -e $(abs_top_builddir)/openjdk ]; then \
- $(ARCH_PREFIX) $(MAKE) \
- $(ICEDTEA_ENV) \
- -C openjdk clobber ; \
- fi
+ rm -rf $(BUILD_OUTPUT_DIR)
rm -f stamps/icedtea.stamp stamps/icedtea-debug.stamp
stamps/icedtea-stage2.stamp: stamps/icedtea.stamp stamps/add-cacao.stamp \
@@ -1994,12 +1983,8 @@ else
@echo "HotSpot is served:" $(BUILD_OUTPUT_DIR)/j2sdk-image
endif
-clean-icedtea-boot:
- if [ -e $(abs_top_builddir)/openjdk-boot ]; then \
- $(ARCH_PREFIX) $(MAKE) \
- $(ICEDTEA_ENV_BOOT) \
- -C openjdk-boot clobber ; \
- fi
+clean-icedtea-boot:
+ rm -rf $(BOOT_BUILD_OUTPUT_DIR)
rm -f stamps/icedtea-boot.stamp
stamps/icedtea-stage1.stamp: stamps/icedtea-boot.stamp
@@ -2085,7 +2070,7 @@ stamps/liveconnect-dist.stamp: stamps/li
(cd $(LIVECONNECT_CLASSES) ; \
mkdir -p lib ; \
$(ICEDTEA_BOOT_DIR)/bin/jar cf $(LIVECONNECT_JAR) $(LIVECONNECT_DIR) ; \
- cp -a $(PLUGIN_SRCDIR)/java src; \
+ cp -pPR --reflink=auto $(PLUGIN_SRCDIR)/java src; \
find src -type f -exec chmod 640 '{}' ';' -o -type d -exec chmod 750 '{}' ';'; \
cd src ; \
$(ZIP) -qr $(LIVECONNECT_SRC) ${LIVECONNECT_DIR} ) ; \
@@ -2122,7 +2107,7 @@ stamps/netx-dist.stamp: stamps/netx.stam
(cd $(NETX_CLASSES) ; \
mkdir -p lib ; \
$(ICEDTEA_BOOT_DIR)/bin/jar cf $(NETX_JAR) javax/jnlp net ; \
- cp -a $(NETX_SRCDIR) src; \
+ cp -pPR --reflink=auto $(NETX_SRCDIR) src; \
find src -type f -exec chmod 640 '{}' ';' -o -type d -exec chmod 750 '{}' ';'; \
cd src ; \
$(ICEDTEA_BOOT_DIR)/bin/jar uf $(NETX_JAR) \
@@ -2237,7 +2222,7 @@ stamps/rewrite-rhino.stamp: stamps/rewri
stamps/rewrite-rhino.stamp: stamps/rewriter.stamp $(RHINO_JAR)
if WITH_RHINO
mkdir -p rhino/rhino.{old,new} && \
- (cd rhino/rhino.old && jar xf $(RHINO_JAR)) && \
+ (cd rhino/rhino.old && $(ICEDTEA_BOOT_DIR)/bin/jar xf $(RHINO_JAR)) && \
$(ICEDTEA_BOOT_DIR)/bin/java -cp $(abs_top_builddir)/rewriter \
com.redhat.rewriter.ClassRewriter \
$(abs_top_builddir)/rhino/rhino.old $(abs_top_builddir)/rhino/rhino.new \
@@ -2413,10 +2398,10 @@ ADD_ZERO_CONFIGURE_ARGS += \
$(if $(findstring --with-$(i)-src-zip=, $(CONFIGURE_ARGS)),, --with-$(i)-src-zip=$(abs_top_builddir)/$(i).tar.gz))
ADD_ZERO_EXTRA_BUILD_ENV = \
- BUILD_LANGTOOLS=false ALT_LANGTOOLS_DIST=$(ICEDTEA_BUILD_DIR)/langtools/dist \
- BUILD_JAXP=false ALT_JAXP_DIST=$(ICEDTEA_BUILD_DIR)/jaxp/dist \
- BUILD_JAXWS=false ALT_JAXWS_DIST=$(ICEDTEA_BUILD_DIR)/jaxws/dist \
- BUILD_CORBA=false ALT_CORBA_DIST=$(ICEDTEA_BUILD_DIR)/corba/dist \
+ BUILD_LANGTOOLS=false ALT_LANGTOOLS_DIST=$(BUILD_OUTPUT_DIR)/langtools/dist \
+ BUILD_JAXP=false ALT_JAXP_DIST=$(BUILD_OUTPUT_DIR)/jaxp/dist \
+ BUILD_JAXWS=false ALT_JAXWS_DIST=$(BUILD_OUTPUT_DIR)/jaxws/dist \
+ BUILD_CORBA=false ALT_CORBA_DIST=$(BUILD_OUTPUT_DIR)/corba/dist \
BUILD_JDK=false \
DISTRIBUTION_PATCHES='$(foreach p,$(DISTRIBUTION_PATCHES),$(if $(findstring cacao,$(p)),,$(p)))'
@@ -2434,13 +2419,13 @@ if ADD_ZERO_BUILD
if ZERO_BUILD
mkdir -p $(BUILD_JRE_ARCH_DIR)/shark
- cp -a zerovm/openjdk/build/$(OS_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \
+ cp -a zerovm/$(BUILD_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \
$(BUILD_JRE_ARCH_DIR)/shark/
printf -- '-shark KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
printf -- '-zero ERROR\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
else
mkdir -p $(BUILD_JRE_ARCH_DIR)/zero
- cp -a zerovm/openjdk/build/$(OS_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \
+ cp -a zerovm/$(BUILD_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \
$(BUILD_JRE_ARCH_DIR)/zero/
printf -- '-zero KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
printf -- '-shark ERROR\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
@@ -2474,12 +2459,12 @@ if ADD_ZERO_BUILD
if ZERO_BUILD
mkdir -p $(BUILD_DEBUG_JRE_ARCH_DIR)/shark
- cp -a zerovm/openjdk/build/$(OS_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \
+ cp -a zerovm/$(BUILD_OUTPUT_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \
$(BUILD_DEBUG_JRE_ARCH_DIR)/shark/
printf -- '-shark KNOWN\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
else
mkdir -p $(BUILD_DEBUG_JRE_ARCH_DIR)/zero
- cp -a zerovm/openjdk/build/$(OS_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \
+ cp -a zerovm/$(BUILD_OUTPUT_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \
$(BUILD_DEBUG_JRE_ARCH_DIR)/zero/
printf -- '-zero KNOWN\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
endif
@@ -2507,7 +2492,8 @@ stamps/plugin-tests.stamp: $(PLUGIN_TEST
-classpath $(LIVECONNECT_JAR) $(PLUGIN_TEST_SRCS) ;
$(ICEDTEA_BOOT_DIR)/bin/jar cf plugin/tests/LiveConnect/PluginTest.jar \
plugin/tests/LiveConnect/*.class ;
- cp -a $(abs_top_srcdir)/plugin/tests/LiveConnect/*.{js,html} plugin/tests/LiveConnect ;
+ cp -pPR --reflink-auto $(abs_top_srcdir)/plugin/tests/LiveConnect/*.{js,html} \
+ plugin/tests/LiveConnect ;
echo "Done. Now launch \"firefox file://`pwd`/index.html\"" ; \
mkdir -p stamps
touch stamps/plugin-tests.stamp
@@ -2538,7 +2524,7 @@ check-hotspot: stamps/jtreg.stamp
mkdir -p test/hotspot/JTwork test/hotspot/JTreport
$(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
-w:test/hotspot/JTwork -r:test/hotspot/JTreport \
- -jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \
+ -jdk:$(BUILD_OUTPUT_DIR)/j2sdk-image \
$(ICEDTEA_JTREG_OPTIONS) \
`pwd`/openjdk/hotspot/test \
| tee test/$@.log
@@ -2548,7 +2534,7 @@ check-langtools: stamps/jtreg.stamp
$(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
-w:test/langtools/JTwork -r:test/langtools/JTreport \
$${ICEDTEA_JTREG_OTHERVM:--samevm} \
- -jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \
+ -jdk:$(BUILD_OUTPUT_DIR)/j2sdk-image \
$(ICEDTEA_JTREG_OPTIONS) \
-exclude:$(abs_top_srcdir)/test/jtreg/excludelist.langtools.jtx \
`pwd`/openjdk/langtools/test \
@@ -2562,7 +2548,7 @@ endif
$(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
-w:test/jdk/JTwork -r:test/jdk/JTreport \
$${ICEDTEA_JTREG_OTHERVM:--samevm} \
- -jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \
+ -jdk:$(BUILD_OUTPUT_DIR)/j2sdk-image \
$(ICEDTEA_JTREG_OPTIONS) $(CACAO_EXCLUDE) \
-exclude:$(abs_top_srcdir)/test/jtreg/excludelist.jdk.jtx \
`pwd`/openjdk/jdk/test \
diff -r d7d97061baf3 -r c3af7166afc4 pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java Thu May 20 12:40:31 2010 +0100
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java Fri Jun 11 13:56:52 2010 +0100
@@ -102,7 +102,9 @@ abstract class PulseAudioLine implements
@Override
public boolean isControlSupported(Type control) {
for (Control myControl : controls) {
- if (myControl.getType().getClass() == control.getClass()) {
+ //Control.Type's known descendants keep a set of
+ //static Types.
+ if (myControl.getType().equals(control)) {
return true;
}
}
More information about the distro-pkg-dev
mailing list