changeset in /hg/icedtea: Allow out-of-tree builds and fix ecj p...
gnu_andrew at member.fsf.org
gnu_andrew at member.fsf.org
Thu May 29 14:13:52 PDT 2008
changeset 5699fc17853f in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=5699fc17853f
description:
Allow out-of-tree builds and fix ecj patch for b26.
diffstat:
4 files changed, 1600 insertions(+), 911 deletions(-)
ChangeLog | 8
Makefile.am | 51
Makefile.in | 49
patches/icedtea-ecj.patch | 2403 ++++++++++++++++++++++++++++-----------------
diffs (truncated from 2826 to 500 lines):
diff -r d128eb8455f3 -r 5699fc17853f ChangeLog
--- a/ChangeLog Sun May 25 20:41:45 2008 +0100
+++ b/ChangeLog Mon May 26 01:46:08 2008 +0100
@@ -1,3 +1,11 @@ 2008-05-25 Andrew John Hughes <gnu_and
+2008-05-25 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * Makefile.am:
+ Fix paths to allow out-of-dir build.
+ * Makefile.in: Regenerated.
+ * patches/openjdk-ecj.patch:
+ Regenerated for b26.
+
2008-05-25 Andrew John Hughes <gnu_andrew at member.fsf.org>
* generated/java/lang/UNIXProcess.java:
diff -r d128eb8455f3 -r 5699fc17853f Makefile.am
--- a/Makefile.am Sun May 25 20:41:45 2008 +0100
+++ b/Makefile.am Mon May 26 01:46:08 2008 +0100
@@ -48,13 +48,13 @@ LINUX_DIR = linux-$(BUILD_ARCH_DIR)
LINUX_DIR = linux-$(BUILD_ARCH_DIR)
BUILD_OUTPUT_DIR = openjdk/control/build/$(LINUX_DIR)
ICEDTEA_BUILD_DIR = \
- $(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)
+ $(abs_top_builddir)/$(BUILD_OUTPUT_DIR)
ICEDTEA_RT = \
- $(abs_top_srcdir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
+ $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
ICEDTEA_CLS_DIR = \
- $(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)/classes
+ $(abs_top_builddir)/$(BUILD_OUTPUT_DIR)/classes
ICEDTEA_BOOT_DIR= \
- $(abs_top_srcdir)/bootstrap/jdk1.6.0
+ $(abs_top_builddir)/bootstrap/jdk1.6.0
ICEDTEA_ENDORSED_DIR = \
$(ICEDTEA_BOOT_DIR)/lib/endorsed
if CORE_BUILD
@@ -76,7 +76,7 @@ ICEDTEA_ENV = \
"LANG=C" \
"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
- "ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
+ "ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" \
"ICEDTEA_RT=$(ICEDTEA_RT)" \
"ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR)" \
@@ -121,9 +121,9 @@ env:
# OpenJDK ecj build environment.
ICEDTEA_BUILD_DIR_ECJ = \
- $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/
+ $(abs_top_builddir)/openjdk-ecj/control/build/$(LINUX_DIR)/
ICEDTEA_CLS_DIR_ECJ = \
- $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
+ $(abs_top_builddir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
ICEDTEA_ENV_ECJ = \
"ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
"ANT_HOME=$(SYSTEM_ANT_DIR)" \
@@ -133,7 +133,7 @@ ICEDTEA_ENV_ECJ = \
"LANG=C" \
"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
- "ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
+ "ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" \
"LIBGCJ_JAR=$(LIBGCJ_JAR)" \
"ICEDTEA_RT=$(ICEDTEA_RT)" \
@@ -450,7 +450,7 @@ stamps/ports-ecj.stamp: stamps/clone-ecj
touch stamps/ports-ecj.stamp
# Patch OpenJDK for plug replacements and ecj.
-ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
+ICEDTEA_ECJ_PATCH = $(abs_top_srcdir)/patches/icedtea-ecj.patch
stamps/patch-ecj.stamp: stamps/clone-ecj.stamp
echo Checking $(ICEDTEA_ECJ_PATCH) ; \
@@ -481,7 +481,7 @@ clean-patch-ecj:
# bootstrap/icedtea.
stamps/bootstrap-directory.stamp: stamps/icedtea-against-ecj.stamp
rm -rf bootstrap/icedtea
- ln -s $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/j2sdk-image/ bootstrap/icedtea
+ ln -s $(abs_top_builddir)/openjdk-ecj/control/build/$(LINUX_DIR)/j2sdk-image/ bootstrap/icedtea
if ! test -d bootstrap/icedtea/include; then \
ln -sf $(ICEDTEA_BUILD_DIR_ECJ)/include bootstrap/icedtea/include; \
fi
@@ -560,8 +560,8 @@ stamps/bootstrap-directory-ecj.stamp:
if test -f bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
then \
mkdir -p bootstrap/ecj/lib ; \
- ln -sf $(abs_top_srcdir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
- $(abs_top_srcdir)/bootstrap/ecj/lib/tools.jar; \
+ ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
+ $(abs_top_builddir)/bootstrap/ecj/lib/tools.jar; \
fi
if test -f bootstrap/jdk1.7.0/jre/lib/rt-closed.jar ; \
then \
@@ -626,10 +626,10 @@ icedtea: stamps/bootstrap-directory-syml
cp -pPRf gcjwebplugin.so \
$(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) ; \
fi
- cp rt/net/sourceforge/jnlp/resources/about.jnlp \
+ cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/about.jnlp \
extra-lib/about.jar \
$(BUILD_OUTPUT_DIR)/j2re-image/lib
- cp rt/net/sourceforge/jnlp/resources/about.jnlp \
+ cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/about.jnlp \
extra-lib/about.jar \
$(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
@@ -649,10 +649,10 @@ icedtea-debug: stamps/bootstrap-director
cp -pPRf gcjwebplugin.so \
$(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR) ; \
fi
- cp rt/net/sourceforge/jnlp/resources/default.jnlp \
+ cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/default.jnlp \
extra-lib/about.jar \
$(BUILD_OUTPUT_DIR)-debug/j2re-image/lib
- cp rt/net/sourceforge/jnlp/resources/default.jnlp \
+ cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/default.jnlp \
extra-lib/about.jar \
$(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib
@echo "IcedTea (debug build) is served:" \
@@ -780,8 +780,9 @@ clean-copy:
done
stamps/generated.stamp:
+ mkdir -p generated/java/lang
cp $(SOLARIS)/java/lang/UNIXProcess.java.$(BUILD_OS) \
- $(abs_top_srcdir)/generated/java/lang/UNIXProcess.java ;
+ generated/java/lang/UNIXProcess.java ;
touch stamps/generated.stamp
SHARE = openjdk/jdk/src/share/classes
@@ -833,12 +834,12 @@ stamps/hotspot-tools-class-files.stamp:
if ! test -f stamps/icedtea-ecj.stamp ; \
then \
$(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools -bootclasspath '' -source 1.6 \
- -sourcepath 'rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
+ -sourcepath 'rt:generated:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
@$< ; \
else \
$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
-bootclasspath '' -source 1.6 \
- -sourcepath 'rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
+ -sourcepath 'rt:generated:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
@$< ; \
fi
mkdir -p stamps
@@ -869,25 +870,25 @@ bootstrap/jdk1.7.0/jre/lib/tools.jar: st
ln -sf $(abs_top_srcdir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
$(abs_top_srcdir)/bootstrap/ecj/lib/tools.jar; \
fi
-
+
# rt-closed.jar class files.
rt-source-files.txt: stamps/clone.stamp stamps/copy-source-files.stamp
- find rt -name '*.java' | sort > $@
+ find $(abs_top_srcdir)/rt rt -name '*.java' | sort > $@
stamps/rt-class-files.stamp: rt-source-files.txt stamps/generated.stamp
mkdir -p lib/rt
if ! test -f stamps/icedtea-ecj.stamp ; \
then \
$(JAVAC) $(MEMORY_LIMIT) -g -d lib/rt -bootclasspath '' -source 1.6 \
- -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated \
+ -sourcepath 'generated:rt:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
@$< ; \
else \
$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \
-bootclasspath '' -source 1.6 \
- -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated \
+ -sourcepath 'generated:rt:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
@$< ; \
fi
- cp -r rt/net/sourceforge/jnlp/resources \
+ cp -r $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources \
lib/rt/net/sourceforge/jnlp/
mkdir -p stamps
touch stamps/rt-class-files.stamp
@@ -931,7 +932,7 @@ stamps/extra-class-files.stamp: extra-so
-sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
@extra-source-files.txt ; \
fi
- cp -r extra/net/sourceforge/jnlp/about/resources \
+ cp -r $(abs_top_srcdir)/extra/net/sourceforge/jnlp/about/resources \
extra-lib/net/sourceforge/jnlp/about
mkdir -p stamps
touch $@
diff -r d128eb8455f3 -r 5699fc17853f Makefile.in
--- a/Makefile.in Sun May 25 20:41:45 2008 +0100
+++ b/Makefile.in Mon May 26 01:46:08 2008 +0100
@@ -265,16 +265,16 @@ LINUX_DIR = linux-$(BUILD_ARCH_DIR)
LINUX_DIR = linux-$(BUILD_ARCH_DIR)
BUILD_OUTPUT_DIR = openjdk/control/build/$(LINUX_DIR)
ICEDTEA_BUILD_DIR = \
- $(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)
+ $(abs_top_builddir)/$(BUILD_OUTPUT_DIR)
ICEDTEA_RT = \
- $(abs_top_srcdir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
+ $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
ICEDTEA_CLS_DIR = \
- $(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)/classes
+ $(abs_top_builddir)/$(BUILD_OUTPUT_DIR)/classes
ICEDTEA_BOOT_DIR = \
- $(abs_top_srcdir)/bootstrap/jdk1.6.0
+ $(abs_top_builddir)/bootstrap/jdk1.6.0
ICEDTEA_ENDORSED_DIR = \
$(ICEDTEA_BOOT_DIR)/lib/endorsed
@@ -289,7 +289,7 @@ ICEDTEA_ENV = "ALT_JDK_IMPORT_PATH=$(ICE
"HOTSPOT_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" "LANG=C" \
"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
- "ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
+ "ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" "ICEDTEA_RT=$(ICEDTEA_RT)" \
"ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR)" \
"ICEDTEA_CLS_DIR=$(ICEDTEA_CLS_DIR)" \
@@ -312,10 +312,10 @@ ICEDTEA_ENV = "ALT_JDK_IMPORT_PATH=$(ICE
# OpenJDK ecj build environment.
ICEDTEA_BUILD_DIR_ECJ = \
- $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/
+ $(abs_top_builddir)/openjdk-ecj/control/build/$(LINUX_DIR)/
ICEDTEA_CLS_DIR_ECJ = \
- $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
+ $(abs_top_builddir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
"ANT_HOME=$(SYSTEM_ANT_DIR)" "BUILD_NUMBER=$(OPENJDK_VERSION)" \
@@ -323,7 +323,7 @@ ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$
"HOTSPOT_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" "LANG=C" \
"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
- "ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
+ "ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" "LIBGCJ_JAR=$(LIBGCJ_JAR)" \
"ICEDTEA_RT=$(ICEDTEA_RT)" \
"ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR_ECJ)" \
@@ -421,7 +421,7 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
$(GCC_PATCH) $(DISTRIBUTION_PATCHES) $(am__append_7)
# Patch OpenJDK for plug replacements and ecj.
-ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
+ICEDTEA_ECJ_PATCH = $(abs_top_srcdir)/patches/icedtea-ecj.patch
@WITH_ICEDTEA_FALSE@@WITH_OPENJDK_FALSE at BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory.stamp
@WITH_ICEDTEA_TRUE@@WITH_OPENJDK_FALSE at BOOTSTRAP_DIRECTORY_STAMP =
@WITH_OPENJDK_TRUE at BOOTSTRAP_DIRECTORY_STAMP =
@@ -985,7 +985,7 @@ clean-patch-ecj:
# bootstrap/icedtea.
stamps/bootstrap-directory.stamp: stamps/icedtea-against-ecj.stamp
rm -rf bootstrap/icedtea
- ln -s $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/j2sdk-image/ bootstrap/icedtea
+ ln -s $(abs_top_builddir)/openjdk-ecj/control/build/$(LINUX_DIR)/j2sdk-image/ bootstrap/icedtea
if ! test -d bootstrap/icedtea/include; then \
ln -sf $(ICEDTEA_BUILD_DIR_ECJ)/include bootstrap/icedtea/include; \
fi
@@ -1051,8 +1051,8 @@ stamps/bootstrap-directory-ecj.stamp:
if test -f bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
then \
mkdir -p bootstrap/ecj/lib ; \
- ln -sf $(abs_top_srcdir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
- $(abs_top_srcdir)/bootstrap/ecj/lib/tools.jar; \
+ ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
+ $(abs_top_builddir)/bootstrap/ecj/lib/tools.jar; \
fi
if test -f bootstrap/jdk1.7.0/jre/lib/rt-closed.jar ; \
then \
@@ -1095,10 +1095,10 @@ icedtea: stamps/bootstrap-directory-syml
cp -pPRf gcjwebplugin.so \
$(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) ; \
fi
- cp rt/net/sourceforge/jnlp/resources/about.jnlp \
+ cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/about.jnlp \
extra-lib/about.jar \
$(BUILD_OUTPUT_DIR)/j2re-image/lib
- cp rt/net/sourceforge/jnlp/resources/about.jnlp \
+ cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/about.jnlp \
extra-lib/about.jar \
$(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
@@ -1118,10 +1118,10 @@ icedtea-debug: stamps/bootstrap-director
cp -pPRf gcjwebplugin.so \
$(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR) ; \
fi
- cp rt/net/sourceforge/jnlp/resources/default.jnlp \
+ cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/default.jnlp \
extra-lib/about.jar \
$(BUILD_OUTPUT_DIR)-debug/j2re-image/lib
- cp rt/net/sourceforge/jnlp/resources/default.jnlp \
+ cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/default.jnlp \
extra-lib/about.jar \
$(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib
@echo "IcedTea (debug build) is served:" \
@@ -1229,8 +1229,9 @@ clean-copy:
done
stamps/generated.stamp:
+ mkdir -p generated/java/lang
cp $(SOLARIS)/java/lang/UNIXProcess.java.$(BUILD_OS) \
- $(abs_top_srcdir)/generated/java/lang/UNIXProcess.java ;
+ generated/java/lang/UNIXProcess.java ;
touch stamps/generated.stamp
# tools.jar class files.
@@ -1272,12 +1273,12 @@ stamps/hotspot-tools-class-files.stamp:
if ! test -f stamps/icedtea-ecj.stamp ; \
then \
$(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools -bootclasspath '' -source 1.6 \
- -sourcepath 'rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
+ -sourcepath 'rt:generated:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
@$< ; \
else \
$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
-bootclasspath '' -source 1.6 \
- -sourcepath 'rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
+ -sourcepath 'rt:generated:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
@$< ; \
fi
mkdir -p stamps
@@ -1311,22 +1312,22 @@ bootstrap/jdk1.7.0/jre/lib/tools.jar: st
# rt-closed.jar class files.
rt-source-files.txt: stamps/clone.stamp stamps/copy-source-files.stamp
- find rt -name '*.java' | sort > $@
+ find $(abs_top_srcdir)/rt rt -name '*.java' | sort > $@
stamps/rt-class-files.stamp: rt-source-files.txt stamps/generated.stamp
mkdir -p lib/rt
if ! test -f stamps/icedtea-ecj.stamp ; \
then \
$(JAVAC) $(MEMORY_LIMIT) -g -d lib/rt -bootclasspath '' -source 1.6 \
- -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated \
+ -sourcepath 'generated:rt:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
@$< ; \
else \
$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \
-bootclasspath '' -source 1.6 \
- -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated \
+ -sourcepath 'generated:rt:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
@$< ; \
fi
- cp -r rt/net/sourceforge/jnlp/resources \
+ cp -r $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources \
lib/rt/net/sourceforge/jnlp/
mkdir -p stamps
touch stamps/rt-class-files.stamp
@@ -1370,7 +1371,7 @@ stamps/extra-class-files.stamp: extra-so
-sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
@extra-source-files.txt ; \
fi
- cp -r extra/net/sourceforge/jnlp/about/resources \
+ cp -r $(abs_top_srcdir)/extra/net/sourceforge/jnlp/about/resources \
extra-lib/net/sourceforge/jnlp/about
mkdir -p stamps
touch $@
diff -r d128eb8455f3 -r 5699fc17853f patches/icedtea-ecj.patch
--- a/patches/icedtea-ecj.patch Sun May 25 20:41:45 2008 +0100
+++ b/patches/icedtea-ecj.patch Mon May 26 01:46:08 2008 +0100
@@ -1,236 +1,298 @@
---- openjdk.old/hotspot/build/linux/Makefile 2007-10-12 03:46:24.000000000 -0400
-+++ openjdk-ecj/hotspot/build/linux/Makefile 2007-10-19 10:27:52.000000000 -0400
-@@ -244,28 +244,24 @@
-
- $(TARGETS_C2): $(SUBDIRS_C2)
- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
-- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma
- ifdef INSTALL
- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install
- endif
-
- $(TARGETS_TIERED): $(SUBDIRS_TIERED)
- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS)
-- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma
- ifdef INSTALL
- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install
- endif
-
- $(TARGETS_C1): $(SUBDIRS_C1)
- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS)
-- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma
- ifdef INSTALL
- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install
- endif
-
- $(TARGETS_CORE): $(SUBDIRS_CORE)
- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS)
-- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma
- ifdef INSTALL
- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
- endif
---- openjdk.old/jdk/make/common/BuildToolJar.gmk 2007-10-12 03:54:05.000000000 -0400
-+++ openjdk-ecj/jdk/make/common/BuildToolJar.gmk 2007-10-19 10:51:47.000000000 -0400
-@@ -43,7 +43,8 @@
- @$(prep-target)
- @$(MKDIR) -p $(BUILDTOOLCLASSDIR)
- $(BOOT_JAVAC_CMD) -d $(BUILDTOOLCLASSDIR) \
-- -sourcepath $(BUILDTOOL_SOURCE_ROOT) $(BUILDTOOL_MAIN_SOURCE_FILE)
-+ -sourcepath $(BUILDTOOL_SOURCE_ROOT) -classpath $(ICEDTEA_RT) \
-+ $(BUILDTOOL_MAIN_SOURCE_FILE)
- $(BOOT_JAR_CMD) cfm $@ $(BUILDTOOL_MANIFEST_FILE) \
- -C $(BUILDTOOLCLASSDIR) $(PKGDIR) \
- $(JAR_JFLAGS) || $(RM) $@
---- iopenjdk.old/jdk/make/Makefile 2007-10-12 03:54:03.000000000 -0400
-+++ openjdk-ecj/jdk/make/Makefile 2007-10-19 13:10:02.000000000 -0400
-@@ -239,7 +239,7 @@
-
- all build:: sanity-all post-sanity-all
-
--SUBDIRS = tools java javax org sun sunw com jpda mkdemo mksample launchers
-+SUBDIRS = tools java javax org sun sunw com jpda mksample launchers
- all build::
+diff -Nru openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile openjdk-ecj/corba/make/com/sun/corba/se/Makefile
+--- openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile 2008-05-26 01:29:37.000000000 +0100
++++ openjdk-ecj/corba/make/com/sun/corba/se/Makefile 2008-05-26 01:35:35.000000000 +0100
+@@ -42,7 +42,7 @@
+ # the rmic iiop backend needs some classes that are part of the impl/util
+ # package. These classes use log wrappers, so they must be built after
+ # pept and before rmi.
+-SUBDIRS = sources pept corespi core spi impl rmi
++SUBDIRS = org pept corespi core spi impl rmi
+ all build clean clobber::
$(SUBDIRS-loop)
---- openjdk.old/corba/make/org/omg/sources/Makefile 2007-10-12 03:49:14.000000000 -0400
-+++ openjdk-ecj/corba/make/org/omg/sources/Makefile 2007-10-30 11:57:03.000000000 -0400
-@@ -93,8 +93,6 @@
- POAHELHOLFILES = $(POA_GENERATED_HELP_HOL_java:%=$(GENSRCDIR)/%)
-
- $(POAGENERATEDFILES):: $(POA.IDL)
-- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableServer" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -corba 3.0 -fall -pkgPrefix PortableServer org.omg $(POA.IDL)
-- $(RM) -r $(POAHELHOLFILES)
-
- poa.compile: $(POAGENERATEDFILES)
-
-@@ -110,10 +108,6 @@
-
- # Generating and deleting unused files to reduce images size
- $(DYNANYFILES): $(DYNAMIC_ANY.IDL)
-- $(IDLJ) -td "$(GENSRCDIR)" $(DYNANY_IDLJ_FLAGS) $(DYNAMIC_ANY.IDL)
-- $(RM) $(DYNANY_DIR)/*POA*
-- $(RM) $(DYNANY_DIR)/*Holder*
-- $(RM) $(DYNANYDELETEFILES)
-
- dynany.compile: $(DYNANYFILES)
-
-@@ -125,12 +119,6 @@
- TR_IDLJ_FLAGS =-i "$(SRC_DIR)/org/omg/PortableInterceptor" -i "$(SRC_DIR)/org/omg/PortableServer" -i "$(SRC_DIR)/org/omg/CosTransactions"
-
- $(TRGENERATEDFILES):: $(COSTRANSACTIONS.IDL) $(COSTSINTEROP.IDL)
-- $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg -pkgPrefix CosTransactions org.omg $(COSTRANSACTIONS.IDL)
-- $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg -pkgPrefix CosTSInteroperation org.omg $(COSTSINTEROP.IDL)
--# $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL)
--# $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fallTIE -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL)
--# $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL)
--# $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fallTIE -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL)
-
- tr.compile: $(TRGENERATEDFILES)
-
-@@ -144,7 +132,6 @@
- # _NamingContextImplBase.java and _BindingIteratorImplBase.java files
- # to GENSRC directory. Note that these two classes are deprecated.
- $(NSGENERATEDFILES): $(NAMESERVICE.IDL)
-- $(IDLJ) -td "$(GENSRCDIR)" -i $(NAMESERVICEDIR) -fall -pkgPrefix CosNaming org.omg $(NAMESERVICE.IDL)
-
- ns.compile: $(NSGENERATEDFILES)
-
-@@ -156,8 +143,6 @@
- IOPDELETEFILES = $(IOP_TO_DELETE_FILES:%=$(GENSRCDIR)/%)
-
- $(IOPGENERATEDFILES):: $(IOP.IDL)
-- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -corba 3.0 -D CORBA3 -pkgPrefix IOP org.omg $(IOP.IDL)
-- $(RM) -r $(IOPDELETEFILES)
-
- iop.compile: $(IOPGENERATEDFILES)
-
-@@ -169,8 +154,6 @@
- CORBAXDUPLICATEFILES = $(CORBA_DUPLICATE_java:%=$(GENSRCDIR)/%)
-
- $(CORBAXGENERATEDFILES):: $(CORBAX.IDL)
-- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -corba 3.0 $(CORBAX.IDL)
-- $(RM) $(CORBAXDUPLICATEFILES)
-
- corbax.compile: $(CORBAXGENERATEDFILES)
-
-@@ -181,7 +164,6 @@
- MESSAGINGGENERATEDFILES = $(Messaging_java:%=$(GENSRCDIR)/%)
-
- $(MESSAGINGGENERATEDFILES):: $(MESSAGING.IDL)
-- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -corba 3.0 -pkgPrefix Messaging org.omg $(MESSAGING.IDL)
-
- messaging.compile: $(MESSAGINGGENERATEDFILES)
-
-@@ -195,8 +177,6 @@
- PIHELHOLFILES = $(PI_GENERATED_HELP_HOL_java:%=$(GENSRCDIR)/%)
-
- $(PIGENERATEDFILES):: $(INTERCEPTORS.IDL)
More information about the distro-pkg-dev
mailing list