/hg/icedtea6: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Sep 23 03:51:43 PDT 2010
changeset fd61403cdd41 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=fd61403cdd41
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Sep 22 17:56:27 2010 +0100
Move SystemTap support to a separate target.
2010-09-22 Andrew John Hughes <ahughes at redhat.com>
Move SystemTap support to a separate target.
* Makefile.am: (.PHONY): Add clean-add-systemtap and
clean-add-systemtap-debug. (icedtea): Remove systemtap
support. (icedtea-debug): Likewise. (icedtea-
against-icedtea): Depend on add-systemtap. (icedtea-debug-
against-icedtea): Depend on add-systemtap-debug. (add-
plugin): Depend on icedtea.stamp. (add-plugin-debug): Depend
on icedtea-debug.stamp. (add-netx): Depend on icedtea.stamp.
(add-netx-debug): Depend on icedtea-debug.stamp. (add-
systemtap): New target to add SystemTap support to the build.
(add-systemtap-debug): Likewise for debug. (clean-add-
systemtap): Remove SystemTap support from the build. (clean-
add-systemtap-debug): Likewise for debug.
changeset 36fac414f1b4 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=36fac414f1b4
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Sep 23 11:51:33 2010 +0100
Separate PulseAudio addition into separate targets.
2010-09-23 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (.PHONY): Add clean-add-pulseaudio
and clean-add-pulseaudio-debug. (clean-local):
Likewise. (icedtea): Remove pulse-java support and
dependency. (icedtea-debug): Likewise. (icedtea-
against-icedtea): Depend on add-pulseaudio. (icedtea-debug-
against-icedtea): Depend on add-pulseaudio-debug. (add-
systemtap-debug): Dependency should be icedtea-debug. (add-
pulseaudio): New target to add PulseAudio support to the build.
(add-pulseaudio-debug): Likewise for debug. (clean-add-
pulseaudio): Remove PulseAudio support from the build.
(clean-add-pulseaudio-debug): Likewise for debug.
diffstat:
2 files changed, 147 insertions(+), 73 deletions(-)
ChangeLog | 36 +++++++++++
Makefile.am | 184 +++++++++++++++++++++++++++++++++++------------------------
diffs (335 lines):
diff -r 61d5e01c802e -r 36fac414f1b4 ChangeLog
--- a/ChangeLog Wed Sep 22 16:27:14 2010 +0100
+++ b/ChangeLog Thu Sep 23 11:51:33 2010 +0100
@@ -1,3 +1,39 @@ 2010-09-22 Andrew John Hughes <ahughes
+2010-09-23 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (.PHONY): Add clean-add-pulseaudio and
+ clean-add-pulseaudio-debug.
+ (clean-local): Likewise.
+ (icedtea): Remove pulse-java support and dependency.
+ (icedtea-debug): Likewise.
+ (icedtea-against-icedtea): Depend on add-pulseaudio.
+ (icedtea-debug-against-icedtea): Depend on add-pulseaudio-debug.
+ (add-systemtap-debug): Dependency should be icedtea-debug.
+ (add-pulseaudio): New target to add PulseAudio support to the build.
+ (add-pulseaudio-debug): Likewise for debug.
+ (clean-add-pulseaudio): Remove PulseAudio support from the build.
+ (clean-add-pulseaudio-debug): Likewise for debug.
+
+2010-09-22 Andrew John Hughes <ahughes at redhat.com>
+
+ Move SystemTap support to a separate target.
+ * Makefile.am:
+ (.PHONY): Add clean-add-systemtap and
+ clean-add-systemtap-debug.
+ (clean-local): Likewise.
+ (icedtea): Remove systemtap support.
+ (icedtea-debug): Likewise.
+ (icedtea-against-icedtea): Depend on add-systemtap.
+ (icedtea-debug-against-icedtea): Depend on add-systemtap-debug.
+ (add-plugin): Depend on icedtea.stamp.
+ (add-plugin-debug): Depend on icedtea-debug.stamp.
+ (add-netx): Depend on icedtea.stamp.
+ (add-netx-debug): Depend on icedtea-debug.stamp.
+ (add-systemtap): New target to add SystemTap support to the build.
+ (add-systemtap-debug): Likewise for debug.
+ (clean-add-systemtap): Remove SystemTap support from the build.
+ (clean-add-systemtap-debug): Likewise for debug.
+
2010-09-22 Andrew John Hughes <ahughes at redhat.com>
* ports/hotspot/make/linux/makefiles/shark.make,
diff -r 61d5e01c802e -r 36fac414f1b4 Makefile.am
--- a/Makefile.am Wed Sep 22 16:27:14 2010 +0100
+++ b/Makefile.am Thu Sep 23 11:51:33 2010 +0100
@@ -555,7 +555,8 @@ 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-bootstrap-directory-symlink-ecj clean-add-systemtap clean-add-systemtap-debug \
+ clean-add-pulseaudio clean-add-pulseaudio-debug
if [ -e bootstrap ]; then \
rmdir bootstrap ; \
fi
@@ -588,8 +589,8 @@ install:
clean-ports clean-overlay clean-extract-ecj clean-extract clean-extract-openjdk \
clean-replace-hotspot clean-generated clean-download clean-hgforest clean-download-openjdk \
clean-rewriter clean-rewrite-rhino clean-add-netx clean-add-netx-debug \
- clean-add-plugin clean-add-plugin-debug
-
+ clean-add-plugin clean-add-plugin-debug clean-add-systemtap clean-add-systemtap-debug \
+ clean-add-pulseaudio clean-add-pulseaudio-debug
env:
@echo 'unset JAVA_HOME'
@echo 'export $(ICEDTEA_ENV)'
@@ -1247,7 +1248,7 @@ clean-bootstrap-directory-symlink:
# If you change anything here in the icedtea target, please make sure
# you change it in the icedtea-debug target as well.
stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \
- $(OPENJDK_TREE) stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp
+ $(OPENJDK_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk \
@@ -1256,18 +1257,6 @@ stamps/icedtea.stamp: stamps/bootstrap-d
mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext
-if ENABLE_PULSE_JAVA
- cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
- $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
- cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
- $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
- cp -pPRf $(PULSE_JAVA_BUILDDIR)/pulse-java.jar \
- $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
- cp -pPRf $(PULSE_JAVA_BUILDDIR)/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 ZERO_BUILD
printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
endif
@@ -1276,25 +1265,6 @@ endif
endif
if WITH_CACAO
printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
-endif
-if ENABLE_SYSTEMTAP
- mkdir -p $(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 \
- > $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
- sed -e '/\/client\/libjvm.so/d' \
- < $(abs_top_builddir)/tapset/hotspot_jni.stp \
- > $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
- else \
- cp $(abs_top_builddir)/tapset/hotspot.stp \
- $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
- cp $(abs_top_builddir)/tapset/hotspot_jni.stp \
- $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
- fi; \
- cp $(abs_top_builddir)/tapset/jstack.stp \
- $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
endif
cp $(abs_top_builddir)/nss.cfg \
$(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security;
@@ -1311,7 +1281,7 @@ clean-icedtea:
rm -f stamps/icedtea.stamp
stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \
- $(OPENJDK_TREE) stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp
+ $(OPENJDK_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk \
@@ -1320,18 +1290,6 @@ stamps/icedtea-debug.stamp: stamps/boots
mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext
-if ENABLE_PULSE_JAVA
- cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
- $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
- cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
- $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
- cp -pPRf $(PULSE_JAVA_BUILDDIR)/pulse-java.jar \
- $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
- cp -pPRf $(PULSE_JAVA_BUILDDIR)/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 ZERO_BUILD
printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
endif
@@ -1340,25 +1298,6 @@ endif
endif
if WITH_CACAO
printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
-endif
-if ENABLE_SYSTEMTAP
- mkdir -p $(DEBUG_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 \
- > $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
- sed -e '/\/client\/libjvm.so/d' \
- < $(abs_top_builddir)/tapset/hotspot_jni.stp \
- > $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
- else \
- cp $(abs_top_builddir)/tapset/hotspot.stp \
- $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
- cp $(abs_top_builddir)/tapset/hotspot_jni.stp \
- $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
- fi; \
- cp $(abs_top_builddir)/tapset/jstack.stp \
- $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
endif
cp $(abs_top_builddir)/nss.cfg \
$(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security;
@@ -1377,7 +1316,7 @@ clean-icedtea-debug:
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-netx.stamp stamps/add-systemtap.stamp stamps/add-pulseaudio.stamp
mkdir -p stamps
touch stamps/icedtea-against-icedtea.stamp
@@ -1386,7 +1325,8 @@ clean-icedtea-against-icedtea: clean-add
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-plugin-debug.stamp stamps/add-netx-debug.stamp stamps/add-systemtap-debug.stamp \
+ stamps/add-pulseaudio-debug.stamp
mkdir -p stamps
touch stamps/icedtea-debug-against-icedtea.stamp
@@ -1394,7 +1334,7 @@ clean-icedtea-debug-against-icedtea: cle
clean-add-netx-debug
rm -f stamps/icedtea-debug-against-icedtea.stamp
-stamps/add-plugin.stamp: stamps/plugin.stamp
+stamps/add-plugin.stamp: stamps/plugin.stamp stamps/icedtea.stamp
if ENABLE_PLUGIN
cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \
$(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
@@ -1414,7 +1354,7 @@ clean-add-plugin:
rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar
rm -f stamps/add-plugin.stamp
-stamps/add-plugin-debug.stamp: stamps/plugin.stamp
+stamps/add-plugin-debug.stamp: stamps/plugin.stamp stamps/icedtea-debug.stamp
if ENABLE_PLUGIN
cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \
$(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
@@ -1434,7 +1374,7 @@ clean-add-plugin-debug:
rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar
rm -f stamps/add-plugin-debug.stamp
-stamps/add-netx.stamp: stamps/netx-dist.stamp extra-lib/about.jar
+stamps/add-netx.stamp: stamps/netx-dist.stamp extra-lib/about.jar stamps/icedtea.stamp
cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \
$(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar
cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \
@@ -1460,7 +1400,7 @@ clean-add-netx:
rm -f $(BUILD_OUTPUT_DIR)/j2re-image/man/man1/javaws.1
rm -f stamps/add-netx.stamp
-stamps/add-netx-debug.stamp: stamps/netx-dist.stamp extra-lib/about.jar
+stamps/add-netx-debug.stamp: stamps/netx-dist.stamp extra-lib/about.jar stamps/icedtea-debug.stamp
cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \
$(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar
cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \
@@ -1485,6 +1425,104 @@ clean-add-netx-debug:
rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/man/man1/javaws.1
rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/man/man1/javaws.1
rm -f stamps/add-netx-debug.stamp
+
+stamps/add-systemtap.stamp: stamps/icedtea.stamp
+if ENABLE_SYSTEMTAP
+ mkdir -p $(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 \
+ > $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
+ sed -e '/\/client\/libjvm.so/d' \
+ < $(abs_top_builddir)/tapset/hotspot_jni.stp \
+ > $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+ else \
+ cp $(abs_top_builddir)/tapset/hotspot.stp \
+ $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
+ cp $(abs_top_builddir)/tapset/hotspot_jni.stp \
+ $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+ fi
+ cp $(abs_top_builddir)/tapset/jstack.stp \
+ $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
+endif
+ touch stamps/add-systemtap.stamp
+
+clean-add-systemtap:
+ rm -rf $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset
+ rm -f stamps/add-systemtap.stamp
+
+stamps/add-systemtap-debug.stamp: stamps/icedtea-debug.stamp
+if ENABLE_SYSTEMTAP
+ mkdir -p $(DEBUG_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 \
+ > $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
+ sed -e '/\/client\/libjvm.so/d' \
+ < $(abs_top_builddir)/tapset/hotspot_jni.stp \
+ > $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+ else \
+ cp $(abs_top_builddir)/tapset/hotspot.stp \
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
+ cp $(abs_top_builddir)/tapset/hotspot_jni.stp \
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+ fi
+ cp $(abs_top_builddir)/tapset/jstack.stp \
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
+endif
+ touch stamps/add-systemtap-debug.stamp
+
+clean-add-systemtap-debug:
+ rm -rf $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset
+ rm -f stamps/add-systemtap-debug.stamp
+
+stamps/add-pulseaudio.stamp: stamps/icedtea.stamp $(PULSE_JAVA_TARGET)
+if ENABLE_PULSE_JAVA
+ cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
+ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+ cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
+ $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
+ cp -pPRf $(PULSE_JAVA_BUILDDIR)/pulse-java.jar \
+ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
+ cp -pPRf $(PULSE_JAVA_BUILDDIR)/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
+ touch stamps/add-pulseaudio.stamp
+
+# Note: for simplicity, we don't revert the update of src.zip
+clean-add-pulseaudio:
+ rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so
+ rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so
+ rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext/pulse-java.jar
+ rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext/pulse-java.jar
+ rm -f stamps/add-pulseaudio.stamp
+
+stamps/add-pulseaudio-debug.stamp: stamps/icedtea-debug.stamp $(PULSE_JAVA_TARGET)
+if ENABLE_PULSE_JAVA
+ cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+ cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
+ cp -pPRf $(PULSE_JAVA_BUILDDIR)/pulse-java.jar \
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
+ cp -pPRf $(PULSE_JAVA_BUILDDIR)/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
+ touch stamps/add-pulseaudio-debug.stamp
+
+# Note: for simplicity, we don't revert the update of src.zip
+clean-add-pulseaudio-debug:
+ rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so
+ rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so
+ rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext/pulse-java.jar
+ rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext/pulse-java.jar
+ rm -f stamps/add-pulseaudio-debug.stamp
# OpenJDK ecj Targets
# ===================
More information about the distro-pkg-dev
mailing list