/hg/icedtea6: Only manipulate rt.jar's contents when LACKS_SUN_A...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Jul 5 09:31:43 PDT 2010
changeset 5c61be3119bb in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=5c61be3119bb
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jul 05 17:31:35 2010 +0100
Only manipulate rt.jar's contents when LACKS_SUN_AWT_TOOLKIT is
defined. Clarify variable names.
2010-07-05 Andrew John Hughes <ahughes at redhat.com>
Revert rt.jar only for ecj tree. Don't do so (or
build rt-class-files) for builds with OpenJDK. Make
variable naming clearer.
* Makefile.am: (BOOT_DIR): Renamed from ICEDTEA_BOOT_DIR.
(RUNTIME): Renamed from ICEDTEA_RT. (ENDORSED_DIR): Renamed
from ICEDTEA_ENDORSED_DIR. (ECJ_BOOT_DIR): Shortcut for
bootstrap/ecj. (ICEDTEA_BOOT_DIR): Shortcut for
bootstrap/icedtea. (rt-class-files): Only build replacement
runtime classes when LACKS_SUN_AWT_TOOLKIT is set.
(clean-rt): Only replace rt.jar when LACKS_SUN_AWT_TOOLKIT
and overwrite in $(ECJ_BOOT_DIR) not $(BOOT_DIR).
diffstat:
2 files changed, 106 insertions(+), 89 deletions(-)
ChangeLog | 16 +++++
Makefile.am | 179 +++++++++++++++++++++++++++++------------------------------
diffs (471 lines):
diff -r 0e8960d7a100 -r 5c61be3119bb ChangeLog
--- a/ChangeLog Mon Jul 05 11:58:04 2010 +0100
+++ b/ChangeLog Mon Jul 05 17:31:35 2010 +0100
@@ -1,3 +1,19 @@ 2010-07-05 Andrew John Hughes <ahughes
+2010-07-05 Andrew John Hughes <ahughes at redhat.com>
+
+ Revert rt.jar only for ecj tree. Don't do
+ so (or build rt-class-files) for builds with
+ OpenJDK. Make variable naming clearer.
+ * Makefile.am:
+ (BOOT_DIR): Renamed from ICEDTEA_BOOT_DIR.
+ (RUNTIME): Renamed from ICEDTEA_RT.
+ (ENDORSED_DIR): Renamed from ICEDTEA_ENDORSED_DIR.
+ (ECJ_BOOT_DIR): Shortcut for bootstrap/ecj.
+ (ICEDTEA_BOOT_DIR): Shortcut for bootstrap/icedtea.
+ (rt-class-files): Only build replacement runtime classes
+ when LACKS_SUN_AWT_TOOLKIT is set.
+ (clean-rt): Only replace rt.jar when LACKS_SUN_AWT_TOOLKIT
+ and overwrite in $(ECJ_BOOT_DIR) not $(BOOT_DIR).
+
2010-07-05 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
diff -r 0e8960d7a100 -r 5c61be3119bb Makefile.am
--- a/Makefile.am Mon Jul 05 11:58:04 2010 +0100
+++ b/Makefile.am Mon Jul 05 17:31:35 2010 +0100
@@ -33,12 +33,11 @@ ECJ_BUILD_OUTPUT_DIR = $(BUILD_OUTPUT_DI
ECJ_BUILD_OUTPUT_DIR = $(BUILD_OUTPUT_DIR)-ecj
ICEDTEA_CLS_DIR = $(BUILD_OUTPUT_DIR)/classes
ICEDTEA_CLS_DIR_ECJ = $(ECJ_BUILD_OUTPUT_DIR)/classes
-ICEDTEA_BOOT_DIR= \
- $(abs_top_builddir)/bootstrap/jdk1.6.0
-ICEDTEA_RT = \
- $(ICEDTEA_BOOT_DIR)/jre/lib/rt.jar
-ICEDTEA_ENDORSED_DIR = \
- $(ICEDTEA_BOOT_DIR)/lib/endorsed
+BOOT_DIR = $(abs_top_builddir)/bootstrap/jdk1.6.0
+RUNTIME = $(BOOT_DIR)/jre/lib/rt.jar
+ENDORSED_DIR = $(BOOT_DIR)/lib/endorsed
+ECJ_BOOT_DIR = $(abs_top_builddir)/bootstrap/ecj
+ICEDTEA_BOOT_DIR = $(abs_top_builddir)/bootstrap/icedtea
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)
@@ -161,7 +160,7 @@ else
else
BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory.stamp
SYSTEM_JDK_DIR = $(SYSTEM_GCJ_DIR)
- ICEDTEA_HOME = $(abs_top_builddir)/bootstrap/icedtea
+ ICEDTEA_HOME = $(ICEDTEA_BOOT_DIR)
INITIAL_BOOTSTRAP_LINK_STAMP = stamps/bootstrap-directory-symlink-ecj.stamp
endif
@@ -381,19 +380,19 @@ PLUGIN_VERSION = $(ICEDTEA_NAME) $(PACKA
PLUGIN_VERSION = $(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)$(ICEDTEA_PKG)
ICEDTEA_ENV = \
- ALT_JDK_IMPORT_PATH="$(ICEDTEA_BOOT_DIR)" \
+ ALT_JDK_IMPORT_PATH="$(BOOT_DIR)" \
ANT="$(ANT)" \
BUILD_NUMBER="$(OPENJDK_VERSION)" \
JDK_UPDATE_VERSION="$(JDK_UPDATE_VERSION)" \
JRE_RELEASE_VERSION="1.6.0_$(COMBINED_VERSION)" \
MILESTONE="fcs" \
LANG="C" \
- PATH="$(abs_top_builddir)/bootstrap/jdk1.6.0/bin:$(OS_PATH):$$PATH" \
- ALT_BOOTDIR="$(ICEDTEA_BOOT_DIR)" \
+ PATH="$(BOOT_DIR)/bin:$(OS_PATH):$$PATH" \
+ ALT_BOOTDIR="$(BOOT_DIR)" \
BUILD_ARCH_DIR="$(BUILD_ARCH_DIR)" \
ICEDTEA_CLS_DIR="$(ICEDTEA_CLS_DIR)" \
- ICEDTEA_ENDORSED_DIR="$(ICEDTEA_ENDORSED_DIR)" \
- ENDORSED="-Djava.endorsed.dirs=$(ICEDTEA_ENDORSED_DIR)" \
+ ICEDTEA_ENDORSED_DIR="$(ENDORSED_DIR)" \
+ ENDORSED="-Djava.endorsed.dirs=$(ENDORSED_DIR)" \
CLASSPATH="" \
LD_LIBRARY_PATH="" \
ZERO_BUILD="$(ICEDTEA_ZERO_BUILD)" \
@@ -465,12 +464,12 @@ endif
# OpenJDK ecj build environment.
ICEDTEA_ENV_ECJ = $(ICEDTEA_ENV) \
ALT_OUTPUTDIR="$(ECJ_BUILD_OUTPUT_DIR)" \
- JAVA_TOOLS_DIR="$(ICEDTEA_BOOT_DIR)/bin" \
- ICEDTEA_RT="$(ICEDTEA_RT)" \
+ JAVA_TOOLS_DIR="$(BOOT_DIR)/bin" \
+ ICEDTEA_RT="$(RUNTIME)" \
ICEDTEA_CLS_DIR="$(ICEDTEA_CLS_DIR_ECJ)" \
- BOOTCLASSPATH_CLS_RT="-bootclasspath $(ICEDTEA_CLS_DIR_ECJ):$(ICEDTEA_RT)" \
+ BOOTCLASSPATH_CLS_RT="-bootclasspath $(ICEDTEA_CLS_DIR_ECJ):$(RUNTIME)" \
BOOTCLASSPATH_CLS="-bootclasspath $(ICEDTEA_CLS_DIR_ECJ)" \
- BOOTCLASSPATH_RT_LIBGCJ="-bootclasspath $(ICEDTEA_RT)" \
+ BOOTCLASSPATH_RT_LIBGCJ="-bootclasspath $(RUNTIME)" \
GENSRCDIR="$(abs_top_builddir)/generated" \
JAR_KNOWS_ATFILE="$(JAR_KNOWS_ATFILE)" \
JAR_KNOWS_J_OPTIONS="$(JAR_KNOWS_J_OPTIONS)" \
@@ -1104,81 +1103,79 @@ clean-native-ecj:
# bootstrap/ecj.
stamps/bootstrap-directory-ecj.stamp: stamps/native-ecj.stamp
- mkdir -p bootstrap/ecj/bin stamps/
- ln -sf $(JAVA) bootstrap/ecj/bin/java
- ln -sf $(JAVAH) bootstrap/ecj/bin/javah
- ln -sf $(RMIC) bootstrap/ecj/bin/rmic
- ln -sf $(JAR) bootstrap/ecj/bin/jar
- ln -sf ../../../javac bootstrap/ecj/bin/javac
- ln -sf ../../../javap bootstrap/ecj/bin/javap
- mkdir -p bootstrap/ecj/lib/endorsed && \
- ln -sf $(XALAN2_JAR) bootstrap/ecj/lib/endorsed/xalan-j2.jar && \
+ mkdir -p $(ECJ_BOOT_DIR)/bin stamps/
+ ln -sf $(JAVA) $(ECJ_BOOT_DIR)/bin/java
+ ln -sf $(JAVAH) $(ECJ_BOOT_DIR)/bin/javah
+ ln -sf $(RMIC) $(ECJ_BOOT_DIR)/bin/rmic
+ ln -sf $(JAR) $(ECJ_BOOT_DIR)/bin/jar
+ ln -sf $(abs_top_builddir)/javac $(ECJ_BOOT_DIR)/bin/javac
+ ln -sf $(abs_top_builddir)/javap $(ECJ_BOOT_DIR)/bin/javap
+ mkdir -p $(ECJ_BOOT_DIR)/lib/endorsed && \
+ ln -sf $(XALAN2_JAR) $(ECJ_BOOT_DIR)/lib/endorsed/xalan-j2.jar && \
ln -sf $(XALAN2_SERIALIZER_JAR) \
- bootstrap/ecj/lib/endorsed/xalan-j2-serializer.jar && \
- ln -sf $(XERCES2_JAR) bootstrap/ecj/lib/endorsed/xerces-j2.jar
- mkdir -p bootstrap/ecj/jre/lib && \
- cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar \
- $(abs_top_builddir)/bootstrap/ecj/jre/lib/rt.jar && \
+ $(ECJ_BOOT_DIR)/lib/endorsed/xalan-j2-serializer.jar && \
+ ln -sf $(XERCES2_JAR) $(ECJ_BOOT_DIR)/lib/endorsed/xerces-j2.jar
+ mkdir -p $(ECJ_BOOT_DIR)/jre/lib && \
+ cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(ECJ_BOOT_DIR)/jre/lib/rt.jar && \
ln -sf $(SYSTEM_JDK_DIR)/jre/lib/$(JRE_ARCH_DIR) \
- bootstrap/ecj/jre/lib/ && \
- if ! test -d bootstrap/ecj/jre/lib/$(INSTALL_ARCH_DIR); \
+ $(ECJ_BOOT_DIR)/jre/lib/ && \
+ if ! test -d $(ECJ_BOOT_DIR)/jre/lib/$(INSTALL_ARCH_DIR); \
then \
ln -sf ./$(JRE_ARCH_DIR) \
- bootstrap/ecj/jre/lib/$(INSTALL_ARCH_DIR); \
+ $(ECJ_BOOT_DIR)/jre/lib/$(INSTALL_ARCH_DIR); \
fi;
- mkdir -p bootstrap/ecj/include && \
+ mkdir -p $(ECJ_BOOT_DIR)/include && \
for i in $(SYSTEM_JDK_DIR)/include/*; do \
test -r $$i | continue; \
i=`basename $$i`; \
- rm -f bootstrap/ecj/include/$$i; \
- ln -s $(SYSTEM_JDK_DIR)/include/$$i bootstrap/ecj/include/$$i; \
+ rm -f $(ECJ_BOOT_DIR)/include/$$i; \
+ ln -s $(SYSTEM_JDK_DIR)/include/$$i $(ECJ_BOOT_DIR)/include/$$i; \
done
# For HotSpot
- mkdir -p $(abs_top_builddir)/bootstrap/ecj/lib && \
- ln -sf $(abs_top_builddir)/bootstrap/ecj/jre/lib/rt.jar \
- $(abs_top_builddir)/bootstrap/ecj/lib/tools.jar
+ mkdir -p $(abs_top_builddir)/$(ECJ_BOOT_DIR)/lib && \
+ ln -sf $(ECJ_BOOT_DIR)/jre/lib/rt.jar $(ECJ_BOOT_DIR)/lib/tools.jar
mkdir -p stamps
touch stamps/bootstrap-directory-ecj.stamp
clean-bootstrap-directory-ecj:
+ rm -rf $(ECJ_BOOT_DIR)
rm -f stamps/bootstrap-directory-ecj.stamp
- rm -rf bootstrap/ecj
# bootstrap/icedtea.
stamps/bootstrap-directory.stamp: stamps/icedtea-against-ecj.stamp
- rm -rf bootstrap/icedtea
+ rm -f $(ICEDTEA_BOOT_DIR)
ln -s \
- $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/ bootstrap/icedtea
- if ! test -d bootstrap/icedtea/include; then \
- ln -sf $(ECJ_BUILD_OUTPUT_DIR)/include bootstrap/icedtea/include; \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/ $(ICEDTEA_BOOT_DIR)
+ if ! test -d $(ICEDTEA_BOOT_DIR)/include; then \
+ ln -sf $(ECJ_BUILD_OUTPUT_DIR)/include $(ICEDTEA_BOOT_DIR)/include; \
fi
mkdir -p stamps
touch stamps/bootstrap-directory.stamp
clean-bootstrap-directory:
+ rm -rf $(ICEDTEA_BOOT_DIR)
rm -f stamps/bootstrap-directory.stamp
- rm -rf bootstrap/icedtea
# bootstrap/jdk1.6.0 to bootstrap/ecj symlink.
stamps/bootstrap-directory-symlink-ecj.stamp: \
stamps/bootstrap-directory-ecj.stamp
- rm -f bootstrap/jdk1.6.0
- ln -sf ecj bootstrap/jdk1.6.0
+ rm -f $(BOOT_DIR)
+ ln -sf $(ECJ_BOOT_DIR) $(BOOT_DIR)
mkdir -p stamps
touch stamps/bootstrap-directory-symlink-ecj.stamp
clean-bootstrap-directory-symlink-ecj:
+ rm -f $(BOOT_DIR)
rm -f stamps/bootstrap-directory-symlink-ecj.stamp
- rm -f bootstrap/jdk1.6.0
# bootstrap/jdk1.6.0 to bootstrap/icedtea symlink.
stamps/bootstrap-directory-symlink.stamp: $(BOOTSTRAP_DIRECTORY_STAMP)
mkdir -p bootstrap
- rm -f bootstrap/jdk1.6.0
- ln -sf $(ICEDTEA_HOME) bootstrap/jdk1.6.0; \
- if ! bootstrap/jdk1.6.0/bin/java -version ; \
+ rm -f $(BOOT_DIR)
+ ln -sf $(ICEDTEA_HOME) $(BOOT_DIR); \
+ if ! $(BOOT_DIR)/bin/java -version ; \
then \
- echo "bootstrap/jdk1.6.0/bin/java" \
+ echo "$(BOOT_DIR)/bin/java" \
"cannot be found or is corrupted." ; \
exit 1; \
fi
@@ -1186,8 +1183,8 @@ stamps/bootstrap-directory-symlink.stamp
touch stamps/bootstrap-directory-symlink.stamp
clean-bootstrap-directory-symlink:
+ rm -f $(BOOT_DIR)
rm -f stamps/bootstrap-directory-symlink.stamp
- rm -f bootstrap/jdk1.6.0
# OpenJDK Targets
# ===============
@@ -1476,9 +1473,9 @@ stamps/liveconnect.stamp: liveconnect-so
stamps/liveconnect.stamp: liveconnect-source-files.txt stamps/netx.stamp
if test "x${LIVECONNECT_DIR}" != x; then \
mkdir -p $(abs_top_builddir)/liveconnect && \
- $(ICEDTEA_BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
+ $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
-d $(abs_top_builddir)/liveconnect \
- -classpath $(abs_top_builddir)/netx.build:$(ICEDTEA_RT) \
+ -classpath $(abs_top_builddir)/netx.build:$(RUNTIME) \
-sourcepath $(SOURCEPATH_DIRS) \
-bootclasspath \'\' \
@liveconnect-source-files.txt ; \
@@ -1490,7 +1487,7 @@ stamps/liveconnect-dist.stamp: stamps/li
if test "x${LIVECONNECT_DIR}" != x; then \
(cd $(abs_top_builddir)/liveconnect ; \
mkdir -p lib ; \
- $(ICEDTEA_BOOT_DIR)/bin/jar cf lib/classes.jar $(LIVECONNECT_DIR) ; \
+ $(BOOT_DIR)/bin/jar cf lib/classes.jar $(LIVECONNECT_DIR) ; \
cp -pPR $(SRC_DIR_LINK) $(LIVECONNECT_SRCS) src; \
find src -type f -exec chmod 640 '{}' ';' -o -type d -exec chmod 750 '{}' ';'; \
cd src ; \
@@ -1514,10 +1511,10 @@ netx-source-files.txt:
stamps/netx.stamp: netx-source-files.txt stamps/rt-class-files.stamp
mkdir -p $(abs_top_builddir)/netx.build
- $(ICEDTEA_BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
+ $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
-d $(abs_top_builddir)/netx.build \
-sourcepath $(NETX_SRCDIR):$(SOURCEPATH_DIRS) \
- -classpath $(ICEDTEA_RT) -bootclasspath \'\' \
+ -classpath $(RUNTIME) -bootclasspath \'\' \
@netx-source-files.txt
cp -r $(NETX_RESOURCE_DIR) $(abs_top_builddir)/netx.build/net/sourceforge/jnlp
mkdir -p stamps
@@ -1526,11 +1523,11 @@ stamps/netx-dist.stamp: stamps/netx.stam
stamps/netx-dist.stamp: stamps/netx.stamp
(cd $(abs_top_builddir)/netx.build ; \
mkdir -p lib ; \
- $(ICEDTEA_BOOT_DIR)/bin/jar cf lib/classes.jar javax/jnlp net ; \
+ $(BOOT_DIR)/bin/jar cf lib/classes.jar javax/jnlp net ; \
cp -pPR $(SRC_DIR_LINK) $(NETX_SRCDIR) src; \
find src -type f -exec chmod 640 '{}' ';' -o -type d -exec chmod 750 '{}' ';'; \
cd src ; \
- $(ICEDTEA_BOOT_DIR)/bin/jar uf $(abs_top_builddir)/netx.build/lib/classes.jar \
+ $(BOOT_DIR)/bin/jar uf $(abs_top_builddir)/netx.build/lib/classes.jar \
`find . -type f -not -name '*.java'` ; \
$(ZIP) -qr $(abs_top_builddir)/netx.build/lib/src.zip javax net )
mkdir -p stamps
@@ -1549,9 +1546,9 @@ stamps/extra-class-files.stamp: $(INITIA
stamps/extra-class-files.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) \
extra-source-files.txt stamps/netx.stamp
mkdir -p extra-lib
- $(ICEDTEA_BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d extra-lib \
+ $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d extra-lib \
-sourcepath extra -cp netx.build \
- -bootclasspath $(ICEDTEA_RT) @extra-source-files.txt
+ -bootclasspath $(RUNTIME) @extra-source-files.txt
cp -r $(NETX_EXTRA_DIR) extra-lib/net/sourceforge/jnlp/about
mkdir -p stamps
touch $@
@@ -1562,7 +1559,7 @@ clean-extra:
rm -f extra-source-files.txt
extra-lib/about.jar: stamps/extra-class-files.stamp
- $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C extra-lib net ;
+ $(BOOT_DIR)/bin/jar cf $@ -C extra-lib net ;
# PulseAudio based mixer
# (pulse-java)
@@ -1571,7 +1568,7 @@ extra-lib/about.jar: stamps/extra-class-
if ENABLE_PULSE_JAVA
$(PULSE_JAVA_NATIVE_BUILDDIR)/%.o: $(PULSE_JAVA_NATIVE_SRCDIR)/%.c stamps/pulse-java-headers.stamp
- $(CC) $(IT_CFLAGS) -fPIC -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include \
+ $(CC) $(IT_CFLAGS) -fPIC -I$(BOOT_DIR)/include/linux -I$(BOOT_DIR)/include \
-I$(PULSE_JAVA_NATIVE_BUILDDIR) -o $@ -c $<
$(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so: $(PULSE_JAVA_NATIVE_OBJECTS)
@@ -1584,15 +1581,15 @@ stamps/pulse-java.stamp: stamps/pulse-ja
stamps/pulse-java-jar.stamp: stamps/pulse-java-class.stamp
mkdir -p $(PULSE_JAVA_CLASS_DIR);
- $(ICEDTEA_BOOT_DIR)/bin/jar cf pulse-java.jar -C $(PULSE_JAVA_CLASS_DIR) .;
+ $(BOOT_DIR)/bin/jar cf pulse-java.jar -C $(PULSE_JAVA_CLASS_DIR) .;
mkdir -p stamps
touch stamps/pulse-java-jar.stamp
stamps/pulse-java-class.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP)
mkdir -p $(PULSE_JAVA_CLASS_DIR)
(cd $(PULSE_JAVA_JAVA_SRCDIR); \
- $(ICEDTEA_BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d $(PULSE_JAVA_CLASS_DIR) \
- -bootclasspath $(ICEDTEA_RT) \
+ $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d $(PULSE_JAVA_CLASS_DIR) \
+ -bootclasspath $(RUNTIME) \
org/classpath/icedtea/pulseaudio/*.java \
)
cp -r $(PULSE_JAVA_JAVA_SRCDIR)/META-INF $(PULSE_JAVA_CLASS_DIR)
@@ -1602,15 +1599,15 @@ stamps/pulse-java-class.stamp: $(INITIAL
stamps/pulse-java-headers.stamp: stamps/pulse-java-class.stamp
mkdir -p $(PULSE_JAVA_NATIVE_BUILDDIR)
- $(ICEDTEA_BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
+ $(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
org.classpath.icedtea.pulseaudio.EventLoop ; \
- $(ICEDTEA_BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
+ $(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
org.classpath.icedtea.pulseaudio.Stream ; \
- $(ICEDTEA_BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
+ $(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
org.classpath.icedtea.pulseaudio.Operation; \
- $(ICEDTEA_BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
+ $(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
org.classpath.icedtea.pulseaudio.PulseAudioSourcePort ; \
- $(ICEDTEA_BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
+ $(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
org.classpath.icedtea.pulseaudio.PulseAudioTargetPort ; \
mkdir -p stamps
touch stamps/pulse-java-headers.stamp
@@ -1635,7 +1632,7 @@ if WITH_RHINO
if WITH_RHINO
mkdir -p $(abs_top_builddir)/rewriter.build && \
(cd $(abs_top_srcdir)/rewriter ; \
- $(ICEDTEA_BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
+ $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
-d $(abs_top_builddir)/rewriter.build $(REWRITER_SRCS) \
)
endif
@@ -1649,8 +1646,8 @@ 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 ; $(ICEDTEA_BOOT_DIR)/bin/jar xf $(RHINO_JAR)) && \
- $(ICEDTEA_BOOT_DIR)/bin/java -cp $(abs_top_builddir)/rewriter.build \
+ (cd rhino/rhino.old ; $(BOOT_DIR)/bin/jar xf $(RHINO_JAR)) && \
+ $(BOOT_DIR)/bin/java -cp $(abs_top_builddir)/rewriter.build \
com.redhat.rewriter.ClassRewriter \
$(abs_top_builddir)/rhino/rhino.old $(abs_top_builddir)/rhino/rhino.new \
org.mozilla sun.org.mozilla && \
@@ -1663,7 +1660,7 @@ if WITH_RHINO
done \
) && \
(cd rhino/rhino.new && \
- $(ICEDTEA_BOOT_DIR)/bin/jar cfm ../rhino.jar META-INF/MANIFEST.MF sun )
+ $(BOOT_DIR)/bin/jar cfm ../rhino.jar META-INF/MANIFEST.MF sun )
endif
mkdir -p stamps
touch stamps/rewrite-rhino.stamp
@@ -1691,7 +1688,7 @@ if !USE_SYSTEM_CACAO
--prefix=$(abs_top_builddir)/cacao/install \
--with-java-runtime-library=openjdk \
--with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \
- --with-java-runtime-library-classes=$(ICEDTEA_RT) \
+ --with-java-runtime-library-classes=$(RUNTIME) \
--enable-jre-layout $(CACAO_CONFIGURE_ARGS); \
$(ARCH_PREFIX) $(MAKE) install
ln -s server $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/client
@@ -1859,11 +1856,11 @@ stamps/plugin-tests.stamp: $(INITIAL_BOO
stamps/plugin-tests.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) $(PLUGIN_TEST_SRCS) \
stamps/plugin.stamp
mkdir -p plugin/tests/LiveConnect
- $(ICEDTEA_BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
+ $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
-d plugin/tests/LiveConnect \
-classpath liveconnect/lib/classes.jar \
$(PLUGIN_TEST_SRCS) ;
- $(ICEDTEA_BOOT_DIR)/bin/jar cf plugin/tests/LiveConnect/PluginTest.jar \
+ $(BOOT_DIR)/bin/jar cf plugin/tests/LiveConnect/PluginTest.jar \
plugin/tests/LiveConnect/*.class ;
cp -pPR $(SRC_DIR_LINK) $(abs_top_srcdir)/plugin/tests/LiveConnect/*.{js,html} \
plugin/tests/LiveConnect ;
@@ -1877,10 +1874,10 @@ stamps/jtreg.stamp: stamps/icedtea-again
stamps/jtreg.stamp: stamps/icedtea-against-icedtea.stamp
rm -rf test/jtreg/classes
mkdir -p test/jtreg/classes
- $(ICEDTEA_BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d test/jtreg/classes \
+ $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d test/jtreg/classes \
-encoding iso-8859-1 `find $(abs_top_srcdir)/test/jtreg/com -name '*.java'`
(cd $(abs_top_srcdir)/test/jtreg; \
- $(ICEDTEA_BOOT_DIR)/bin/jar cfm $(abs_top_builddir)/test/jtreg.jar \
+ $(BOOT_DIR)/bin/jar cfm $(abs_top_builddir)/test/jtreg.jar \
META-INF/MANIFEST.MF \
legal README JavaTest.cmdMgrs.lst JavaTest.toolMgrs.lst \
`find com -type f -a -not -name '*.java'` \
@@ -1895,7 +1892,7 @@ clean-jtreg:
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 \
+ $(BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
-w:test/hotspot/JTwork -r:test/hotspot/JTreport \
-jdk:$(BUILD_OUTPUT_DIR)/j2sdk-image \
$(ICEDTEA_JTREG_OPTIONS) \
@@ -1904,7 +1901,7 @@ check-hotspot: stamps/jtreg.stamp
check-langtools: stamps/jtreg.stamp
mkdir -p test/langtools/JTwork test/langtools/JTreport
- $(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
+ $(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:$(BUILD_OUTPUT_DIR)/j2sdk-image \
@@ -1914,7 +1911,7 @@ check-langtools: stamps/jtreg.stamp
check-jdk: stamps/jtreg.stamp
mkdir -p test/jdk/JTwork test/jdk/JTreport
- $(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
+ $(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:$(BUILD_OUTPUT_DIR)/j2sdk-image \
@@ -1977,11 +1974,13 @@ rt-source-files.txt: $(OPENJDK_ECJ_TREE)
done
stamps/rt-class-files.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) rt-source-files.txt
+if LACKS_SUN_AWT_TOOLKIT
mkdir -p lib/rt
- $(ICEDTEA_BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d lib/rt \
+ $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d lib/rt \
-sourcepath $(SOURCEPATH_DIRS) -bootclasspath \'\' \
-classpath $(SYSTEM_JDK_DIR)/jre/lib/rt.jar \
@rt-source-files.txt ;
+endif
mkdir -p stamps
touch stamps/rt-class-files.stamp
@@ -1990,18 +1989,20 @@ clean-rt:
rm -f stamps/rt-class-files.stamp
rm -f stamps/rt.stamp
rm -f rt-source-files.txt
- if [ -e $(ICEDTEA_BOOT_DIR) ] ; then \
- cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(ICEDTEA_RT) ; \
+if LACKS_SUN_AWT_TOOLKIT
+ if [ -e $(ECJ_BOOT_DIR) ] ; then \
+ cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(ECJ_BOOT_DIR)/jre/lib/rt.jar ; \
fi
+endif
stamps/rt.stamp: stamps/rt-class-files.stamp
mkdir -p stamps
if LACKS_SUN_AWT_TOOLKIT
- $(ICEDTEA_BOOT_DIR)/bin/jar uf $(ICEDTEA_RT) -C lib/rt com -C lib/rt java \
+ $(BOOT_DIR)/bin/jar uf $(RUNTIME) -C lib/rt com -C lib/rt java \
-C lib/rt javax -C lib/rt sun
if ENABLE_NIO2
if [ -e lib/rt/org/classpath ] ; then \
- $(ICEDTEA_BOOT_DIR)/bin/jar uf $(ICEDTEA_RT) -C lib/rt org/classpath ; \
+ $(BOOT_DIR)/bin/jar uf $(RUNTIME) -C lib/rt org/classpath ; \
fi
endif
endif
More information about the distro-pkg-dev
mailing list