/hg/icedtea6: Use a variable for the debug build output directory.
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri May 28 09:37:15 PDT 2010
changeset b2f88d8bfdc4 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b2f88d8bfdc4
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri May 28 17:37:07 2010 +0100
Use a variable for the debug build output directory.
2010-05-28 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (DEBUG_BUILD_OUTPUT_DIR): New
variable to represent debug build output directory.
(BUILD_DEBUG_JRE_ARCH_DIR): Use DEBUG_BUILD_OUTPUT_DIR.
(icedtea-debug): Replace use of -debug with
DEBUG_BUILD_OUTPUT_DIR.
diffstat:
2 files changed, 42 insertions(+), 31 deletions(-)
ChangeLog | 10 +++++++++
Makefile.am | 63 +++++++++++++++++++++++++++++------------------------------
diffs (151 lines):
diff -r ad4ad518e870 -r b2f88d8bfdc4 ChangeLog
--- a/ChangeLog Mon May 24 19:46:13 2010 +0100
+++ b/ChangeLog Fri May 28 17:37:07 2010 +0100
@@ -1,3 +1,13 @@ 2010-05-24 Andrew John Hughes <ahughes
+2010-05-28 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (DEBUG_BUILD_OUTPUT_DIR): New variable to represent
+ debug build output directory.
+ (BUILD_DEBUG_JRE_ARCH_DIR): Use DEBUG_BUILD_OUTPUT_DIR.
+ (icedtea): Remove errorneous use of -debug.
+ (icedtea-debug): Replace use of -debug with
+ DEBUG_BUILD_OUTPUT_DIR.
+
2010-05-24 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
diff -r ad4ad518e870 -r b2f88d8bfdc4 Makefile.am
--- a/Makefile.am Mon May 24 19:46:13 2010 +0100
+++ b/Makefile.am Fri May 28 17:37:07 2010 +0100
@@ -33,6 +33,7 @@ OPENJDK_HG_URL = http://hg.openjdk.java.
OS_DIR = $(BUILD_OS_DIR)-$(BUILD_ARCH_DIR)
BUILD_OUTPUT_DIR = openjdk/build/$(OS_DIR)
+DEBUG_BUILD_OUTPUT_DIR = $(BUILD_OUTPUT_DIR)-debug
ECJ_BUILD_OUTPUT_DIR = openjdk-ecj/build/$(OS_DIR)
ICEDTEA_BUILD_DIR = \
$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)
@@ -50,7 +51,7 @@ ICEDTEA_CLS_DIR_ECJ = \
$(abs_top_builddir)/$(ECJ_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 = $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+BUILD_DEBUG_JRE_ARCH_DIR = $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
# Source directories
@@ -1320,50 +1321,50 @@ stamps/icedtea-debug.stamp: stamps/boots
$(ICEDTEA_ENV) \
-C openjdk \
$(ICEDTEA_DEBUG_BUILD_TARGET)
- mkdir -p $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
- mkdir -p $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR)
- mkdir -p $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/ext
- mkdir -p $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/ext
+ mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+ 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_PLUGIN
cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \
- $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \
- $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR)
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
endif
if ENABLE_PULSE_JAVA
cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
- $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
- $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR)
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
cp -pPRf pulse-java.jar \
- $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/ext
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
cp -pPRf pulse-java.jar \
- $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/ext
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext
endif
if WITH_VISUALVM
- mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc ; \
- mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/visualvm ; \
+ mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc ; \
+ mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/visualvm ; \
sed "s/APPNAME=\`basename.*\`/APPNAME=visualvm/" \
visualvm/launcher/visualvm >> \
- $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/jvisualvm ; \
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/jvisualvm ; \
chmod a+x $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/jvisualvm ; \
cp visualvm/launcher/visualvm.conf \
- $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc ; \
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc ; \
echo visualvm >> \
- $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc/visualvm.clusters ; \
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc/visualvm.clusters ; \
echo profiler3 >> \
- $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc/visualvm.clusters ; \
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc/visualvm.clusters ; \
cp -r visualvm/build/cluster/* \
- $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/visualvm ; \
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/visualvm ; \
cp -r netbeans/nbbuild/netbeans_visualvm/$(NB_PLATFORM) \
- $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm ; \
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm ; \
cp -r netbeans/nbbuild/netbeans_visualvm/profiler3 \
- $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm
endif
cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \
- $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib ; \
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib ; \
cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \
- $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
if ZERO_BUILD
printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
endif
@@ -1374,32 +1375,32 @@ if WITH_CACAO
printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
endif
if ENABLE_SYSTEMTAP
- mkdir -p $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/tapset ; \
+ 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 \
- > $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/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 \
- > $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/tapset/hotspot_jni.stp; \
+ > $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
else \
cp $(abs_top_builddir)/tapset/hotspot.stp \
- $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/tapset/hotspot.stp; \
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
cp $(abs_top_builddir)/tapset/hotspot_jni.stp \
- $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/tapset/hotspot_jni.stp; \
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
fi; \
cp $(abs_top_builddir)/tapset/jstack.stp \
- $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/tapset/jstack.stp
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
endif
cp $(abs_top_builddir)/nss.cfg \
- $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/security;
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security;
if WITH_TZDATA_DIR
cp $(abs_top_builddir)/tz.properties \
- $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib;
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib;
endif
@echo "IcedTea (debug build) is served:" \
- $(BUILD_OUTPUT_DIR)-debug
+ $(DEBUG_BUILD_OUTPUT_DIR)
mkdir -p stamps
touch stamps/icedtea-debug.stamp
More information about the distro-pkg-dev
mailing list