/hg/icedtea7: 8 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Jul 14 21:35:25 UTC 2015
changeset e044e1ce8947 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=e044e1ce8947
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Jul 14 16:51:23 2015 +0100
Actually remove patches/cacao/armhf.patch
changeset 20aca8ea2ff9 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=20aca8ea2ff9
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Jul 14 20:34:03 2015 +0100
PR94: empty install target in Makefile.am
2015-07-14 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR94: empty install target in Makefile.am
* Makefile.am:
(add-tzdata-support): Redefine using BUILD_SDK_DIR.
(clean-add-tzdata-support): Likewise.
(add-tzdata-support-debug): Likewise using BUILD_DEBUG_SDK_DIR.
(clean-add-tzdata-support-debug): Likewise.
(add-tzdata-support-boot): Likewise using BUILD_BOOT_SDK_DIR.
(clean-add-tzdata-support-boot): Likewise.
(install-exec-local): Remove copying of *.so files
from $(BUILD_SDK_DIR)/lib ; none in OpenJDK 7.
(install-data-local): Remove blacklisted.certs and
tzdb.dat which don't exist in OpenJDK 7. Add
jre/lib/zi and fontconfig files. Copy icons as
java-1.7.0.png.
2015-05-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR94: empty install target in Makefile.am
* Makefile.am:
(BUILD_SDK_DIR): Added.
(BUILD_JRE_DIR): Likewise.
(BUILD_JRE_ARCH_DIR): Redefine using BUILD_SDK_DIR.
(BUILD_DEBUG_SDK_DIR): Added.
(BUILD_DEBUG_JRE_DIR): Likewise.
(BUILD_DEBUG_JRE_ARCH_DIR): Redefine using
BUILD_DEBUG_SDK_DIR.
(BUILD_BOOT_SDK_DIR): Added.
(BUILD_BOOT_JRE_DIR): Likewise.
(BUILD_BOOT_JRE_ARCH_DIR): Redefine using
BUILD_BOOT_SDK_DIR.
(DESKTOP_FILES): Likewise.
(EXTRA_DIST): Redefine using DESKTOP_FILES.
(install): Removed.
(bootstrap-directory-stage2): Redefine using
BUILD_BOOT_SDK_DIR.
(icedtea): Redefine using BUILD_SDK_DIR and
BUILD_JRE_DIR.
(add-systemtap): Likewise.
(clean-add-systemtap): Likewise.
(check-crypto): Redefine using BUILD_SDK_DIR.
(add-archive): Likewise.
(icedtea-debug): Likewise using BUILD_DEBUG_SDK_DIR
and BUILD_DEBUG_JRE_DIR.
(add-systemtap-debug): Likewise.
(clean-add-systemtap-debug): Likewise.
(check-crypto-debug): Redefine using BUILD_DEBUG_SDK_DIR.
(add-archive-debug): Likewise.
(icedtea-boot): Redefine using BUILD_BOOT_SDK_DIR.
(add-systemtap-boot): Likewise.
(clean-add-systemtap-boot): Likewise.
(check-crypto-boot): Redefine using BUILD_BOOT_SDK_DIR.
(add-archive-boot): Likewise.
(rebuild): Likewise.
(hotspot): Redefine using BUILD_SDK_DIR and
BUILD_BOOT_SDK_DIR.
(ADD_ZERO_CONFIGURE_ARGS): Redefine using $(BUILD_SDK_DIR).
(check-hotspot): Likewise.
(check-langtools): Likewise.
(check-jdk): Likewise.
(install-exec-local): Added. Installs JDK binaries,
headers, native libraries, tapsets, JAR and IDL files.
(install-data-local): Installs property files, man
pages, images, documentation and other miscellaneous
data files, such as the timezone database.
* NEWS: Updated.
changeset fe2936ab2d22 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=fe2936ab2d22
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Jul 14 20:45:14 2015 +0100
PR2530: PaX mark the installed JDK so it runs on hardened systems
2015-05-20 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2530: PaX mark the installed JDK so it runs
on hardened systems
* Makefile.am:
(install-exec-local): PaX mark installed JDK.
* NEWS: Updated.
changeset 19d189fdd81a in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=19d189fdd81a
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Jul 14 20:53:49 2015 +0100
PR2531: Location of docs directory in install-data-local is incorrect
2015-05-24 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2531: Location of docs directory in
install-data-local is incorrect
* Makefile.am:
(install-data-local): 'docs' directory
is in BUILD_OUTPUT_DIR, not BUILD_IMAGE_DIR.
* NEWS: Updated.
changeset a7ee53fba321 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=a7ee53fba321
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Jul 14 21:58:23 2015 +0100
PR2532: install stage fails where BUILD_ARCH_DIR != INSTALL_ARCH_DIR
2015-06-17 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2532: install stage fails where
BUILD_ARCH_DIR != INSTALL_ARCH_DIR
* Makefile.am:
(install-exec-local): Use INSTALL_ARCH_DIR
rather than BUILD_ARCH_DIR as the two are not
the same on x86 (i386 vs. i586)
(install-data-local): Likewise.
* NEWS: Updated.
changeset d5ae2c250a3f in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=d5ae2c250a3f
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Jul 14 22:02:48 2015 +0100
PR2533: Allow greater control of Javadoc installation directory
2015-06-17 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2533: Allow greater control of Javadoc
installation directory
* Makefile.am:
(install-data-local): Install Javadocs into
$htmldir rather than $docdir/html, so the
user has more control over where they end up.
Copy the contents of docs rather than the
directory itself.
* NEWS: Updated.
changeset 5f024eba68e3 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=5f024eba68e3
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Jul 14 22:06:23 2015 +0100
PR2534: Install TRADEMARK, COPYING and ChangeLog as RPM spec file does
2015-06-17 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2534: Install TRADEMARK, COPYING and ChangeLog
as RPM spec file does
* Makefile.am:
(install-data-local): Install missing files.
* NEWS: Updated.
changeset a3c123889979 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=a3c123889979
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Jul 14 22:35:05 2015 +0100
PR2535: install-data-local needs to check that classes.jsa actually exists
2015-06-17 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2535: install-data-local needs to check that
classes.jsa actually exists
* Makefile.am:
(install-data-local): Remove conditionals around
classes.jsa installation, instead just checking
that the file exists. Create the directory for it
first, as technically install-data-local does not
depend on install-exec-local and so should be
self-sufficient.
* NEWS: Updated.
diffstat:
ChangeLog | 129 +++++++++++++++++
Makefile.am | 343 ++++++++++++++++++++++++++++++++++-----------
NEWS | 7 +
patches/cacao/armhf.patch | 12 -
4 files changed, 392 insertions(+), 99 deletions(-)
diffs (truncated from 792 to 500 lines):
diff -r d5723da37acc -r a3c123889979 ChangeLog
--- a/ChangeLog Tue Jul 14 03:04:04 2015 +0100
+++ b/ChangeLog Tue Jul 14 22:35:05 2015 +0100
@@ -1,3 +1,132 @@
+2015-06-17 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2535: install-data-local needs to check that
+ classes.jsa actually exists
+ * Makefile.am:
+ (install-data-local): Remove conditionals around
+ classes.jsa installation, instead just checking
+ that the file exists. Create the directory for it
+ first, as technically install-data-local does not
+ depend on install-exec-local and so should be
+ self-sufficient.
+ * NEWS: Updated.
+
+2015-06-17 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2534: Install TRADEMARK, COPYING and ChangeLog
+ as RPM spec file does
+ * Makefile.am:
+ (install-data-local): Install missing files.
+ * NEWS: Updated.
+
+2015-06-17 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2533: Allow greater control of Javadoc
+ installation directory
+ * Makefile.am:
+ (install-data-local): Install Javadocs into
+ $htmldir rather than $docdir/html, so the
+ user has more control over where they end up.
+ Copy the contents of docs rather than the
+ directory itself.
+ * NEWS: Updated.
+
+2015-06-17 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2532: install stage fails where
+ BUILD_ARCH_DIR != INSTALL_ARCH_DIR
+ * Makefile.am:
+ (install-exec-local): Use INSTALL_ARCH_DIR
+ rather than BUILD_ARCH_DIR as the two are not
+ the same on x86 (i386 vs. i586)
+ (install-data-local): Likewise.
+ * NEWS: Updated.
+
+2015-05-24 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2531: Location of docs directory in
+ install-data-local is incorrect
+ * Makefile.am:
+ (install-data-local): 'docs' directory
+ is in BUILD_OUTPUT_DIR, not BUILD_IMAGE_DIR.
+ * NEWS: Updated.
+
+2015-05-20 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2530: PaX mark the installed JDK so it runs
+ on hardened systems
+ * Makefile.am:
+ (install-exec-local): PaX mark installed JDK.
+ * NEWS: Updated.
+
+2015-07-14 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR94: empty install target in Makefile.am
+ * Makefile.am:
+ (add-tzdata-support): Redefine using BUILD_SDK_DIR.
+ (clean-add-tzdata-support): Likewise.
+ (add-tzdata-support-debug): Likewise using BUILD_DEBUG_SDK_DIR.
+ (clean-add-tzdata-support-debug): Likewise.
+ (add-tzdata-support-boot): Likewise using BUILD_BOOT_SDK_DIR.
+ (clean-add-tzdata-support-boot): Likewise.
+ (install-exec-local): Remove copying of *.so files
+ from $(BUILD_SDK_DIR)/lib ; none in OpenJDK 7.
+ (install-data-local): Remove blacklisted.certs and
+ tzdb.dat which don't exist in OpenJDK 7. Add
+ jre/lib/zi and fontconfig files. Copy icons as
+ java-1.7.0.png.
+
+2015-05-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR94: empty install target in Makefile.am
+ * Makefile.am:
+ (BUILD_SDK_DIR): Added.
+ (BUILD_JRE_DIR): Likewise.
+ (BUILD_JRE_ARCH_DIR): Redefine using BUILD_SDK_DIR.
+ (BUILD_DEBUG_SDK_DIR): Added.
+ (BUILD_DEBUG_JRE_DIR): Likewise.
+ (BUILD_DEBUG_JRE_ARCH_DIR): Redefine using
+ BUILD_DEBUG_SDK_DIR.
+ (BUILD_BOOT_SDK_DIR): Added.
+ (BUILD_BOOT_JRE_DIR): Likewise.
+ (BUILD_BOOT_JRE_ARCH_DIR): Redefine using
+ BUILD_BOOT_SDK_DIR.
+ (DESKTOP_FILES): Likewise.
+ (EXTRA_DIST): Redefine using DESKTOP_FILES.
+ (install): Removed.
+ (bootstrap-directory-stage2): Redefine using
+ BUILD_BOOT_SDK_DIR.
+ (icedtea): Redefine using BUILD_SDK_DIR and
+ BUILD_JRE_DIR.
+ (add-systemtap): Likewise.
+ (clean-add-systemtap): Likewise.
+ (check-crypto): Redefine using BUILD_SDK_DIR.
+ (add-archive): Likewise.
+ (icedtea-debug): Likewise using BUILD_DEBUG_SDK_DIR
+ and BUILD_DEBUG_JRE_DIR.
+ (add-systemtap-debug): Likewise.
+ (clean-add-systemtap-debug): Likewise.
+ (check-crypto-debug): Redefine using BUILD_DEBUG_SDK_DIR.
+ (add-archive-debug): Likewise.
+ (icedtea-boot): Redefine using BUILD_BOOT_SDK_DIR.
+ (add-systemtap-boot): Likewise.
+ (clean-add-systemtap-boot): Likewise.
+ (check-crypto-boot): Redefine using BUILD_BOOT_SDK_DIR.
+ (add-archive-boot): Likewise.
+ (rebuild): Likewise.
+ (hotspot): Redefine using BUILD_SDK_DIR and
+ BUILD_BOOT_SDK_DIR.
+ (ADD_ZERO_CONFIGURE_ARGS): Redefine using $(BUILD_SDK_DIR).
+ (check-hotspot): Likewise.
+ (check-langtools): Likewise.
+ (check-jdk): Likewise.
+ (install-exec-local): Added. Installs JDK binaries,
+ headers, native libraries, tapsets, JAR and IDL files.
+ (install-data-local): Installs property files, man
+ pages, images, documentation and other miscellaneous
+ data files, such as the timezone database.
+ * NEWS: Updated.
+
2015-07-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2507, G541462: Only apply PaX markings by default
diff -r d5723da37acc -r a3c123889979 Makefile.am
--- a/Makefile.am Tue Jul 14 03:04:04 2015 +0100
+++ b/Makefile.am Tue Jul 14 22:35:05 2015 +0100
@@ -52,9 +52,15 @@
RUNTIME = $(BOOT_DIR)/jre/lib/rt.jar
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)
-BUILD_BOOT_JRE_ARCH_DIR = $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+BUILD_SDK_DIR = $(BUILD_OUTPUT_DIR)/j2sdk-image
+BUILD_JRE_DIR = $(BUILD_OUTPUT_DIR)/j2re-image
+BUILD_JRE_ARCH_DIR = $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)
+BUILD_DEBUG_SDK_DIR = $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image
+BUILD_DEBUG_JRE_DIR = $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image
+BUILD_DEBUG_JRE_ARCH_DIR = $(BUILD_DEBUG_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)
+BUILD_BOOT_SDK_DIR = $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image
+BUILD_BOOT_JRE_DIR = $(BOOT_BUILD_OUTPUT_DIR)/j2re-image
+BUILD_BOOT_JRE_ARCH_DIR = $(BUILD_BOOT_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)
REWRITER_BUILD_DIR = $(abs_top_builddir)/rewriter.build
STAGE1_BOOT_DIR = $(abs_top_builddir)/bootstrap/boot
STAGE2_BOOT_DIR = $(abs_top_builddir)/bootstrap/icedtea
@@ -764,13 +770,15 @@
$(top_srcdir)/test/jtreg/JavaTest.cmdMgrs.lst \
$(top_srcdir)/test/jtreg/excludelist.langtools.jtx
+DESKTOP_FILES = jconsole.desktop policytool.desktop
+
EXTRA_DIST = $(GENERATED_FILES) $(top_srcdir)/patches/*.patch \
$(top_srcdir)/patches/boot/*.patch \
$(top_srcdir)/patches/cacao/*.patch \
$(top_srcdir)/patches/jamvm/*.patch \
tools-copy contrib overlays \
- jconsole.desktop policytool.desktop \
- $(JTREG_SRCS) HACKING autogen.sh \
+ $(JTREG_SRCS) $(DESKTOP_FILES) \
+ HACKING autogen.sh \
tapset/hotspot.stp.in \
tapset/hotspot_jni.stp.in \
tapset/jstack.stp.in \
@@ -822,8 +830,6 @@
rmdir stamps ; \
fi
-install:
-
.PHONY: \
env env-boot snapshot clean-clone clean-patch \
clean-clone-boot clean-patch-boot clean-bootstrap-directory-stage2 \
@@ -1816,7 +1822,7 @@
# bootstrap/stage2.
stamps/bootstrap-directory-stage2.stamp: stamps/icedtea-stage1.stamp
rm -rf $(STAGE2_BOOT_DIR)
- ln -s $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/ $(STAGE2_BOOT_DIR)
+ ln -s $(BUILD_BOOT_SDK_DIR)/ $(STAGE2_BOOT_DIR)
if ! test -d $(STAGE2_BOOT_DIR)/include; then \
ln -sf $(BOOT_BUILD_OUTPUT_DIR)/include $(STAGE2_BOOT_DIR)/include; \
fi
@@ -1868,11 +1874,11 @@
$(ICEDTEA_ENV) \
-C openjdk/ \
$(ICEDTEA_BUILD_TARGET)
- $(abs_top_builddir)/pax-mark-vm $(BUILD_OUTPUT_DIR)/j2sdk-image
- mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
- 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
+ $(abs_top_builddir)/pax-mark-vm $(BUILD_SDK_DIR)
+ mkdir -p $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)
+ mkdir -p $(BUILD_JRE_DIR)/lib/$(INSTALL_ARCH_DIR)
+ mkdir -p $(BUILD_SDK_DIR)/jre/lib/ext
+ mkdir -p $(BUILD_JRE_DIR)/lib/ext
if ZERO_BUILD
printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
endif
@@ -1885,39 +1891,39 @@
if ENABLE_JAMVM
printf -- '-jamvm ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
endif
- @echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
+ @echo "IcedTea is served:" $(BUILD_SDK_DIR)
mkdir -p stamps
touch $@
stamps/add-systemtap.stamp: stamps/icedtea.stamp
if ENABLE_SYSTEMTAP
- mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset ; \
+ mkdir -p $(BUILD_SDK_DIR)/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; \
+ > $(BUILD_SDK_DIR)/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; \
+ > $(BUILD_SDK_DIR)/tapset/hotspot_jni.stp; \
$(SED) -e '/\/client\/libjvm.so/d' \
< $(abs_top_builddir)/tapset/hotspot_gc.stp \
- > $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \
+ > $(BUILD_SDK_DIR)/tapset/hotspot_gc.stp; \
else \
cp $(abs_top_builddir)/tapset/hotspot.stp \
- $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
+ $(BUILD_SDK_DIR)/tapset/hotspot.stp; \
cp $(abs_top_builddir)/tapset/hotspot_jni.stp \
- $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+ $(BUILD_SDK_DIR)/tapset/hotspot_jni.stp; \
cp $(abs_top_builddir)/tapset/hotspot_gc.stp \
- $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \
+ $(BUILD_SDK_DIR)/tapset/hotspot_gc.stp; \
fi; \
cp $(abs_top_builddir)/tapset/jstack.stp \
- $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
+ $(BUILD_SDK_DIR)/tapset/jstack.stp
endif
touch stamps/add-systemtap.stamp
clean-add-systemtap:
- rm -rf $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset
+ rm -rf $(BUILD_SDK_DIR)/tapset
rm -f stamps/add-systemtap.stamp
stamps/add-nss.stamp: stamps/extract-jdk.stamp
@@ -1930,22 +1936,22 @@
stamps/add-tzdata-support.stamp: stamps/icedtea.stamp
if WITH_TZDATA_DIR
- if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib ] ; then \
+ if [ -e $(BUILD_SDK_DIR)/jre/lib ] ; then \
cp -v $(abs_top_builddir)/tz.properties \
- $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib ; \
+ $(BUILD_SDK_DIR)/jre/lib ; \
fi
endif
touch stamps/add-tzdata-support.stamp
clean-add-tzdata-support:
- if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties ] ; then \
- rm -vf $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties ; \
+ if [ -e $(BUILD_SDK_DIR)/jre/lib/tz.properties ] ; then \
+ rm -vf $(BUILD_SDK_DIR)/jre/lib/tz.properties ; \
fi
rm -f stamps/add-tzdata-support.stamp
stamps/check-crypto.stamp: stamps/cryptocheck.stamp stamps/icedtea.stamp
- if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
- $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
+ if [ -e $(BUILD_SDK_DIR)/bin/java ] ; then \
+ $(BUILD_SDK_DIR)/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
fi
mkdir -p stamps
touch $@
@@ -1957,9 +1963,9 @@
if !ENABLE_JAMVM
if !ENABLE_CACAO
if !ZERO_BUILD
- if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
+ if [ -e $(BUILD_SDK_DIR)/bin/java ] ; then \
if test "x$(INSTALL_ARCH_DIR)" != "xppc64" -a "x$(INSTALL_ARCH_DIR)" != "xppc64le" ; then \
- $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump ; \
+ $(BUILD_SDK_DIR)/bin/java -Xshare:dump ; \
fi ; \
fi
endif
@@ -1978,11 +1984,11 @@
$(ICEDTEA_ENV) \
-C openjdk/ \
$(ICEDTEA_DEBUG_BUILD_TARGET)
- $(abs_top_builddir)/pax-mark-vm $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image
- 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
+ $(abs_top_builddir)/pax-mark-vm $(BUILD_DEBUG_SDK_DIR)
+ mkdir -p $(BUILD_DEBUG_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)
+ mkdir -p $(BUILD_DEBUG_JRE_DIR)/lib/$(INSTALL_ARCH_DIR)
+ mkdir -p $(BUILD_DEBUG_SDK_DIR)/jre/lib/ext
+ mkdir -p $(BUILD_DEBUG_JRE_DIR)/lib/ext
if ZERO_BUILD
printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
endif
@@ -1995,8 +2001,7 @@
if ENABLE_JAMVM
printf -- '-jamvm ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
endif
- @echo "IcedTea (debug build) is served:" \
- $(DEBUG_BUILD_OUTPUT_DIR)
+ @echo "IcedTea (debug build) is served:" $(BUILD_DEBUG_SDK_DIR)
mkdir -p stamps
touch $@
@@ -2006,53 +2011,53 @@
stamps/add-systemtap-debug.stamp: stamps/icedtea-debug.stamp
if ENABLE_SYSTEMTAP
- mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset ; \
+ mkdir -p $(BUILD_DEBUG_SDK_DIR)/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; \
+ > $(BUILD_DEBUG_SDK_DIR)/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; \
+ > $(BUILD_DEBUG_SDK_DIR)/tapset/hotspot_jni.stp; \
$(SED) -e '/\/client\/libjvm.so/d' \
< $(abs_top_builddir)/tapset/hotspot_gc.stp \
- > $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \
+ > $(BUILD_DEBUG_SDK_DIR)/tapset/hotspot_gc.stp; \
else \
cp $(abs_top_builddir)/tapset/hotspot.stp \
- $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
+ $(BUILD_DEBUG_SDK_DIR)/tapset/hotspot.stp; \
cp $(abs_top_builddir)/tapset/hotspot_jni.stp \
- $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+ $(BUILD_DEBUG_SDK_DIR)/tapset/hotspot_jni.stp; \
cp $(abs_top_builddir)/tapset/hotspot_gc.stp \
- $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \
+ $(BUILD_DEBUG_SDK_DIR)/tapset/hotspot_gc.stp; \
fi; \
cp $(abs_top_builddir)/tapset/jstack.stp \
- $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
+ $(BUILD_DEBUG_SDK_DIR)/tapset/jstack.stp
endif
touch stamps/add-systemtap-debug.stamp
clean-add-systemtap-debug:
- rm -rf $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset
+ rm -rf $(BUILD_DEBUG_SDK_DIR)/tapset
rm -f stamps/add-systemtap-debug.stamp
stamps/add-tzdata-support-debug.stamp: stamps/icedtea-debug.stamp
if WITH_TZDATA_DIR
- if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib ] ; then \
+ if [ -e $(BUILD_DEBUG_SDK_DIR)/jre/lib ] ; then \
cp -v $(abs_top_builddir)/tz.properties \
- $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib; \
+ $(BUILD_DEBUG_SDK_DIR)/jre/lib; \
fi
endif
touch stamps/add-tzdata-support-debug.stamp
clean-add-tzdata-support-debug:
- if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties ] ; then \
- rm -vf $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties ; \
+ if [ -e $(BUILD_DEBUG_SDK_DIR)/jre/lib/tz.properties ] ; then \
+ rm -vf $(BUILD_DEBUG_SDK_DIR)/jre/lib/tz.properties ; \
fi
rm -f stamps/add-tzdata-support-debug.stamp
stamps/check-crypto-debug.stamp: stamps/cryptocheck.stamp stamps/icedtea-debug.stamp
- if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
- $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
+ if [ -e $(BUILD_DEBUG_SDK_DIR)/bin/java ] ; then \
+ $(BUILD_DEBUG_SDK_DIR)/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
fi
mkdir -p stamps
touch $@
@@ -2064,9 +2069,9 @@
if !ENABLE_JAMVM
if !ENABLE_CACAO
if !ZERO_BUILD
- if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
+ if [ -e $(BUILD_DEBUG_SDK_DIR)/bin/java ] ; then \
if test "x$(INSTALL_ARCH_DIR)" != "xppc64" -a "x$(INSTALL_ARCH_DIR)" != "xppc64le" ; then \
- $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump ; \
+ $(BUILD_DEBUG_SDK_DIR)/bin/java -Xshare:dump ; \
fi ; \
fi
endif
@@ -2108,9 +2113,8 @@
$(ICEDTEA_ENV_BOOT) \
-C openjdk-boot \
$(ICEDTEA_BUILD_TARGET)
- $(abs_top_builddir)/pax-mark-vm $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image
- @echo "Bootstrapped IcedTea is served:" \
- $(BOOT_BUILD_OUTPUT_DIR)
+ $(abs_top_builddir)/pax-mark-vm $(BUILD_BOOT_SDK_DIR)
+ @echo "Bootstrapped IcedTea is served:" $(BUILD_BOOT_SDK_DIR)
mkdir -p stamps
touch $@
@@ -2120,53 +2124,53 @@
stamps/add-systemtap-boot.stamp: stamps/icedtea-boot.stamp
if ENABLE_SYSTEMTAP
- mkdir -p $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset ; \
+ mkdir -p $(BUILD_BOOT_SDK_DIR)/tapset ; \
grep "client IGNORE" $(BUILD_BOOT_JRE_ARCH_DIR)/jvm.cfg; \
if test $$? -eq 0; then \
$(SED) -e '/\/client\/libjvm.so/d' \
< $(abs_top_builddir)/tapset/hotspot.stp \
- > $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
+ > $(BUILD_BOOT_SDK_DIR)/tapset/hotspot.stp; \
$(SED) -e '/\/client\/libjvm.so/d' \
< $(abs_top_builddir)/tapset/hotspot_jni.stp \
- > $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+ > $(BUILD_BOOT_SDK_DIR)/tapset/hotspot_jni.stp; \
$(SED) -e '/\/client\/libjvm.so/d' \
< $(abs_top_builddir)/tapset/hotspot_gc.stp \
- > $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \
+ > $(BUILD_BOOT_SDK_DIR)/tapset/hotspot_gc.stp; \
else \
cp $(abs_top_builddir)/tapset/hotspot.stp \
- $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
+ $(BUILD_BOOT_SDK_DIR)/tapset/hotspot.stp; \
cp $(abs_top_builddir)/tapset/hotspot_jni.stp \
- $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+ $(BUILD_BOOT_SDK_DIR)/tapset/hotspot_jni.stp; \
cp $(abs_top_builddir)/tapset/hotspot_gc.stp \
- $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \
+ $(BUILD_BOOT_SDK_DIR)/tapset/hotspot_gc.stp; \
fi; \
cp $(abs_top_builddir)/tapset/jstack.stp \
- $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
+ $(BUILD_BOOT_SDK_DIR)/tapset/jstack.stp
endif
touch stamps/add-systemtap-boot.stamp
clean-add-systemtap-boot:
- rm -rf $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset
+ rm -rf $(BUILD_BOOT_SDK_DIR)/tapset
rm -f stamps/add-systemtap-boot.stamp
stamps/add-tzdata-support-boot.stamp: stamps/icedtea-boot.stamp
if WITH_TZDATA_DIR
- if [ -e $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib ] ; then \
+ if [ -e $(BUILD_BOOT_SDK_DIR)/jre/lib ] ; then \
cp -v $(abs_top_builddir)/tz.properties \
- $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib; \
+ $(BUILD_BOOT_SDK_DIR)/jre/lib; \
fi
endif
touch stamps/add-tzdata-support-boot.stamp
clean-add-tzdata-support-boot:
- if [ -e $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties ] ; then \
- rm -vf $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties ; \
+ if [ -e $(BUILD_BOOT_SDK_DIR)/jre/lib/tz.properties ] ; then \
+ rm -vf $(BUILD_BOOT_SDK_DIR)/jre/lib/tz.properties ; \
fi
rm -f stamps/add-tzdata-support-boot.stamp
stamps/check-crypto-boot.stamp: stamps/cryptocheck.stamp stamps/icedtea-boot.stamp
- if [ -e $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
- $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
+ if [ -e $(BUILD_BOOT_SDK_DIR)/bin/java ] ; then \
+ $(BUILD_BOOT_SDK_DIR)/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
fi
mkdir -p stamps
touch $@
@@ -2178,9 +2182,9 @@
if !ENABLE_JAMVM
if !ENABLE_CACAO
if !ZERO_BUILD
- if [ -e $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
+ if [ -e $(BUILD_BOOT_SDK_DIR)/bin/java ] ; then \
if test "x$(INSTALL_ARCH_DIR)" != "xppc64" -a "x$(INSTALL_ARCH_DIR)" != "xppc64le" ; then \
- $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump ; \
+ $(BUILD_BOOT_SDK_DIR)/bin/java -Xshare:dump ; \
More information about the distro-pkg-dev
mailing list