/hg/icedtea: 5 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri May 22 05:02:28 UTC 2015
changeset 5cf5cff4b686 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=5cf5cff4b686
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Mon Jan 14 18:54:27 2013 +0000
PR2363: Remove EC source code prior to build and make all removals verbose.
2013-01-14 Andrew John Hughes <gnu_andrew at member.fsf.org>
* fsg.sh:
Remove source code for the EC provider which
isn't built. Make the removals verbose so
they appear in logs as with
remove-intree-libraries.sh.
changeset fe86c35d05b0 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=fe86c35d05b0
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Mon May 18 03:40:22 2015 +0100
PR94: empty install target in Makefile.am
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.
(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.
(icedtea-debug): Likewise using BUILD_DEBUG_SDK_DIR
and BUILD_DEBUG_JRE_DIR.
(check-crypto): Redefine using BUILD_SDK_DIR.
(add-archive): Likewise.
(clean-add-archive): Likewise.
(check-crypto-debug): Redefine using BUILD_DEBUG_SDK_DIR.
(add-archive-debug): Likewise.
(clean-add-archive-debug): Likewise.
(icedtea-boot): Redefine using BUILD_BOOT_SDK_DIR.
(rebuild): Likewise.
(hotspot): Redefine using BUILD_SDK_DIR and
BUILD_BOOT_SDK_DIR.
(check-crypto-boot): Redefine using BUILD_BOOT_SDK_DIR.
(add-archive-boot): Likewise.
(clean-add-archive-boot): Likewise.
(icedtea-stage1): 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 1b3c4b985949 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1b3c4b985949
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri May 22 05:55:33 2015 +0100
PR2369: SunEC provider is partially installed
2015-05-20 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2369: SunEC provider is partially installed
* TestCryptoLevel.java: Moved to...
* Makefile.am:
(ECC_CHECK_BUILD_DIR): Added.
(CRYPTO_CHECK_SRCS): Update TestCryptoLevel.java
path.
(ECC_CHECK_SRCS): Added.
(ICEDTEA_PATCHES): Re-add updated disable-intree-ec.patch
(EXTRA_DIST): Add ECC_CHECK_SRCS.
(check-local): Add check-ecc.stamp.
(clean-tests): Add clean-check-ecc.
(clean-local): Add clean-ecccheck.
(.PHONY). ADd clean-ecccheck and clean-check-ecc.
(ecccheck): Build ECC check test.
(clean-ecccheck): Cleanup ECC check test.
(check-ecc): Run ECC check test.
(clean-check-ecc): Cleanup run of ECC check test.
* NEWS: Updated.
* fsg.sh: Don't remove SunEC.java and SunECEntries.java,
which are still needed by the PKCS11 provider in 8.
* patches/disable-intree-ec.patch:
Regenerated.
* patches/nss-config.patch: Likewise.
* patches/nss-not-enabled-config.patch: Likewise.
* test/standalone/TestCryptoLevel.java: ...here.
* test/standalone/TestEllipticCurveCryptoSupport.java:
Add check for elliptic curve cryptography support.
* test/standalone/agpl-3.0.txt:
Add back AGPL 3 license as this is used by TestCryptoLevel
and the new TestEllipticCurveCryptoSupport tests.
changeset 85e4e1594c99 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=85e4e1594c99
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri May 22 06:00:33 2015 +0100
PR2377: PaX mark the installed JDK so it runs on hardened systems
2015-05-20 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2377: PaX mark the installed JDK so it runs
on hardened systems
* Makefile.am:
(install-exec-local): PaX mark installed JDK.
* NEWS: Updated.
changeset 10e7f91158ff in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=10e7f91158ff
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri May 22 06:02:08 2015 +0100
Added tag icedtea-3.0.0pre03 for changeset 85e4e1594c99
diffstat:
.hgtags | 1 +
ChangeLog | 97 ++
Makefile.am | 364 ++++++++--
NEWS | 4 +
TestCryptoLevel.java | 78 --
fsg.sh | 37 +-
patches/disable-intree-ec.patch | 10 +-
patches/nss-config.patch | 8 +-
patches/nss-not-enabled-config.patch | 6 +-
test/standalone/TestCryptoLevel.java | 78 ++
test/standalone/TestEllipticCurveCryptoSupport.java | 190 +++++
test/standalone/agpl-3.0.txt | 661 ++++++++++++++++++++
12 files changed, 1348 insertions(+), 186 deletions(-)
diffs (truncated from 1957 to 500 lines):
diff -r d0e74323b634 -r 10e7f91158ff .hgtags
--- a/.hgtags Fri May 15 02:57:48 2015 +0100
+++ b/.hgtags Fri May 22 06:02:08 2015 +0100
@@ -30,3 +30,4 @@
d96a0228b79286eea28af85707fd8ccc42cbed84 icedtea-1.12
13b9a6c006730355f1441c69649775e7cebd8aa0 icedtea-1.13
1b47f8cc8c754841c63dfcddc41a11f1b012bddd icedtea-1.14
+85e4e1594c999ff8fda13bcbb79fa8f63299c833 icedtea-3.0.0pre03
diff -r d0e74323b634 -r 10e7f91158ff ChangeLog
--- a/ChangeLog Fri May 15 02:57:48 2015 +0100
+++ b/ChangeLog Fri May 22 06:02:08 2015 +0100
@@ -1,3 +1,100 @@
+2015-05-20 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2377: PaX mark the installed JDK so it runs
+ on hardened systems
+ * Makefile.am:
+ (install-exec-local): PaX mark installed JDK.
+ * NEWS: Updated.
+
+2015-05-20 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2369: SunEC provider is partially installed
+ * TestCryptoLevel.java: Moved to...
+ * Makefile.am:
+ (ECC_CHECK_BUILD_DIR): Added.
+ (CRYPTO_CHECK_SRCS): Update TestCryptoLevel.java
+ path.
+ (ECC_CHECK_SRCS): Added.
+ (ICEDTEA_PATCHES): Re-add updated disable-intree-ec.patch
+ (EXTRA_DIST): Add ECC_CHECK_SRCS.
+ (check-local): Add check-ecc.stamp.
+ (clean-tests): Add clean-check-ecc.
+ (clean-local): Add clean-ecccheck.
+ (.PHONY). ADd clean-ecccheck and clean-check-ecc.
+ (ecccheck): Build ECC check test.
+ (clean-ecccheck): Cleanup ECC check test.
+ (check-ecc): Run ECC check test.
+ (clean-check-ecc): Cleanup run of ECC check test.
+ * NEWS: Updated.
+ * fsg.sh: Don't remove SunEC.java and SunECEntries.java,
+ which are still needed by the PKCS11 provider in 8.
+ * patches/disable-intree-ec.patch:
+ Regenerated.
+ * patches/nss-config.patch: Likewise.
+ * patches/nss-not-enabled-config.patch: Likewise.
+ * test/standalone/TestCryptoLevel.java: ...here.
+ * test/standalone/TestEllipticCurveCryptoSupport.java:
+ Add check for elliptic curve cryptography support.
+ * test/standalone/agpl-3.0.txt:
+ Add back AGPL 3 license as this is used by TestCryptoLevel
+ and the new TestEllipticCurveCryptoSupport tests.
+
+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.
+ (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.
+ (icedtea-debug): Likewise using BUILD_DEBUG_SDK_DIR
+ and BUILD_DEBUG_JRE_DIR.
+ (check-crypto): Redefine using BUILD_SDK_DIR.
+ (add-archive): Likewise.
+ (clean-add-archive): Likewise.
+ (check-crypto-debug): Redefine using BUILD_DEBUG_SDK_DIR.
+ (add-archive-debug): Likewise.
+ (clean-add-archive-debug): Likewise.
+ (icedtea-boot): Redefine using BUILD_BOOT_SDK_DIR.
+ (rebuild): Likewise.
+ (hotspot): Redefine using BUILD_SDK_DIR and
+ BUILD_BOOT_SDK_DIR.
+ (check-crypto-boot): Redefine using BUILD_BOOT_SDK_DIR.
+ (add-archive-boot): Likewise.
+ (clean-add-archive-boot): Likewise.
+ (icedtea-stage1): 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.
+
+2013-01-14 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2363: Remove EC source code prior to build
+ * NEWS: Updated.
+ * fsg.sh:
+ Remove source code for the EC provider which
+ isn't built. Make the removals verbose so
+ they appear in logs as with
+ remove-intree-libraries.sh.
+
2015-05-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR1977: Support using the system installation of Zlib
diff -r d0e74323b634 -r 10e7f91158ff Makefile.am
--- a/Makefile.am Fri May 15 02:57:48 2015 +0100
+++ b/Makefile.am Fri May 22 06:02:08 2015 +0100
@@ -55,14 +55,21 @@
CLS_DIR_BOOT = $(BOOT_BUILD_OUTPUT_DIR)/classes
SERVER_DIR = hotspot/dist/jre/lib/$(INSTALL_ARCH_DIR)/server
BUILD_IMAGE_DIR = $(BUILD_OUTPUT_DIR)/images
-BUILD_JRE_ARCH_DIR = $(BUILD_IMAGE_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+BUILD_SDK_DIR = $(BUILD_IMAGE_DIR)/j2sdk-image
+BUILD_JRE_DIR = $(BUILD_IMAGE_DIR)/j2re-image
+BUILD_JRE_ARCH_DIR = $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)
BUILD_DEBUG_IMAGE_DIR = $(DEBUG_BUILD_OUTPUT_DIR)/images
-BUILD_DEBUG_JRE_ARCH_DIR = $(BUILD_DEBUG_IMAGE_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+BUILD_DEBUG_SDK_DIR = $(BUILD_DEBUG_IMAGE_DIR)/j2sdk-image
+BUILD_DEBUG_JRE_DIR = $(BUILD_DEBUG_IMAGE_DIR)/j2re-image
+BUILD_DEBUG_JRE_ARCH_DIR = $(BUILD_DEBUG_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)
BUILD_BOOT_IMAGE_DIR = $(BOOT_BUILD_OUTPUT_DIR)/images
+BUILD_BOOT_SDK_DIR = $(BUILD_BOOT_IMAGE_DIR)/j2sdk-image
+BUILD_BOOT_JRE_DIR = $(BUILD_BOOT_IMAGE_DIR)/j2re-image
STAGE1_BOOT_DIR = $(abs_top_builddir)/bootstrap/boot
STAGE2_BOOT_DIR = $(abs_top_builddir)/bootstrap/icedtea
JAMVM_IMPORT_PATH = $(abs_top_builddir)/jamvm/install/hotspot
CRYPTO_CHECK_BUILD_DIR = $(abs_top_builddir)/cryptocheck.build
+ECC_CHECK_BUILD_DIR = $(abs_top_builddir)/ecccheck.build
# Source directories
@@ -208,14 +215,17 @@
# Sources list
-CRYPTO_CHECK_SRCS = $(top_srcdir)/TestCryptoLevel.java
+CRYPTO_CHECK_SRCS = $(top_srcdir)/test/standalone/TestCryptoLevel.java
+
+ECC_CHECK_SRCS = $(top_srcdir)/test/standalone/TestEllipticCurveCryptoSupport.java
# Patch list
ICEDTEA_PATCHES = \
patches/memory-limits.patch \
patches/override-redirect-metacity.patch \
- patches/rh1022017.patch
+ patches/rh1022017.patch \
+ patches/disable-intree-ec.patch
# Conditional patches
@@ -540,12 +550,13 @@
$(top_srcdir)/pulseaudio/unittests/org/classpath/icedtea/pulseaudio/*.java \
$(top_srcdir)/pulseaudio/COPYING
+DESKTOP_FILES = jconsole.desktop policytool.desktop
+
EXTRA_DIST = $(top_srcdir)/patches/*.patch \
$(top_srcdir)/patches/cacao/*.patch \
$(top_srcdir)/patches/jamvm/*.patch \
tools-copy contrib overlays \
- jconsole.desktop policytool.desktop \
- $(JTREG_SRCS) \
+ $(JTREG_SRCS) $(DESKTOP_FILES) \
HACKING $(PULSEAUDIO_SRCS) fsg.sh \
hotspot.map autogen.sh \
tapset/hotspot.stp.in \
@@ -553,16 +564,17 @@
scripts/jni_create_stap.c \
scripts/jni_desc \
THANKYOU test/tapset \
- $(CRYPTO_CHECK_SRCS)
+ $(CRYPTO_CHECK_SRCS) \
+ $(ECC_CHECK_SRCS)
# Top-Level Targets
# =================
all-local: icedtea-stage2
-check-local: jtregcheck check-tapset
+check-local: jtregcheck check-tapset stamps/check-ecc.stamp
-clean-tests: clean-jtreg clean-tapset-report clean-jtreg-reports
+clean-tests: clean-jtreg clean-tapset-report clean-jtreg-reports clean-check-ecc
if [ $(abs_top_srcdir) != $(abs_top_builddir) ] ; then \
if [ -e test ] ; then \
rmdir test ; \
@@ -575,7 +587,7 @@
clean-bootstrap-directory-symlink-stage1 clean-bootstrap-directory-symlink-stage2 \
clean-extract clean-native-ecj clean-icedtea-stage2 \
clean-icedtea-debug-stage2 clean-icedtea-stage1 clean-add-zero clean-add-zero-debug \
- clean-add-cacao clean-add-cacao-debug clean-cryptocheck
+ clean-add-cacao clean-add-cacao-debug clean-cryptocheck clean-ecccheck
if [ -e bootstrap ]; then \
rmdir bootstrap ; \
fi
@@ -593,8 +605,6 @@
rmdir stamps ; \
fi
-install:
-
.PHONY: \
env env-boot snapshot clean-clone clean-patch \
clean-clone-boot clean-patch-boot clean-bootstrap-directory-stage2 \
@@ -608,7 +618,7 @@
clean-download-nashorn clean-extract-nashorn clean-download-hotspot \
clean-check-crypto clean-check-crypto-debug clean-check-crypto-boot \
clean-add-archive clean-add-archive-debug clean-add-archive-boot clean-cryptocheck \
- clean-tests clean-tapset-report
+ clean-tests clean-tapset-report clean-ecccheck clean-check-ecc
env:
@echo 'unset JAVA_HOME'
@@ -1468,7 +1478,7 @@
# bootstrap/stage2.
stamps/bootstrap-directory-stage2.stamp: stamps/icedtea-stage1.stamp
rm -rf $(STAGE2_BOOT_DIR)
- ln -s $(BUILD_BOOT_IMAGE_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
@@ -1527,22 +1537,20 @@
$(ICEDTEA_ENV) \
-C $(BUILD_OUTPUT_DIR) \
$(ICEDTEA_BUILD_TARGET)
- $(abs_top_builddir)/pax-mark-vm $(BUILD_IMAGE_DIR)/j2sdk-image
- mkdir -p $(BUILD_IMAGE_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
- mkdir -p $(BUILD_IMAGE_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
- mkdir -p $(BUILD_IMAGE_DIR)/j2sdk-image/jre/lib/ext
- mkdir -p $(BUILD_IMAGE_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 ENABLE_PULSE_JAVA
cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
- $(BUILD_IMAGE_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+ $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)
cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
- $(BUILD_IMAGE_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
- cp -pPRf pulse-java.jar \
- $(BUILD_IMAGE_DIR)/j2sdk-image/jre/lib/ext
- cp -pPRf pulse-java.jar \
- $(BUILD_IMAGE_DIR)/j2re-image/lib/ext
+ $(BUILD_JRE_DIR)/lib/$(INSTALL_ARCH_DIR)
+ cp -pPRf pulse-java.jar $(BUILD_SDK_DIR)/jre/lib/ext
+ cp -pPRf pulse-java.jar $(BUILD_JRE_DIR)/lib/ext
(cd $(PULSE_JAVA_JAVA_SRCDIR) && \
- $(ZIP) -qur $(BUILD_IMAGE_DIR)/j2sdk-image/src.zip org )
+ $(ZIP) -qur $(BUILD_SDK_DIR)/src.zip org )
endif
if ZERO_BUILD
printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
@@ -1554,30 +1562,30 @@
printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
endif
if ENABLE_SYSTEMTAP
- mkdir -p $(BUILD_IMAGE_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_IMAGE_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_IMAGE_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+ > $(BUILD_SDK_DIR)/tapset/hotspot_jni.stp; \
else \
cp $(abs_top_builddir)/tapset/hotspot.stp \
- $(BUILD_IMAGE_DIR)/j2sdk-image/tapset/hotspot.stp; \
+ $(BUILD_SDK_DIR)/tapset/hotspot.stp; \
cp $(abs_top_builddir)/tapset/hotspot_jni.stp \
- $(BUILD_IMAGE_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+ $(BUILD_SDK_DIR)/tapset/hotspot_jni.stp; \
fi; \
cp $(abs_top_builddir)/tapset/jstack.stp \
- $(BUILD_IMAGE_DIR)/j2sdk-image/tapset/jstack.stp
+ $(BUILD_SDK_DIR)/tapset/jstack.stp
endif
cp $(abs_top_builddir)/nss.cfg \
- $(BUILD_IMAGE_DIR)/j2sdk-image/jre/lib/security;
+ $(BUILD_SDK_DIR)/jre/lib/security;
if ENABLE_JAMVM
printf -- '-jamvm ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
endif
- @echo "IcedTea is served:" $(BUILD_IMAGE_DIR)/j2sdk-image
+ @echo "IcedTea is served:" $(BUILD_SDK_DIR)
mkdir -p stamps
touch $@
@@ -1596,22 +1604,22 @@
$(ICEDTEA_ENV) \
-C $(DEBUG_BUILD_OUTPUT_DIR) \
$(ICEDTEA_BUILD_TARGET)
- $(abs_top_builddir)/pax-mark-vm $(BUILD_DEBUG_IMAGE_DIR)/j2sdk-image
- mkdir -p $(BUILD_DEBUG_IMAGE_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
- mkdir -p $(BUILD_DEBUG_IMAGE_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
- mkdir -p $(BUILD_DEBUG_IMAGE_DIR)/j2sdk-image/jre/lib/ext
- mkdir -p $(BUILD_DEBUG_IMAGE_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 ENABLE_PULSE_JAVA
cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
- $(BUILD_DEBUG_IMAGE_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+ $(BUILD_DEBUG_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)
cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
- $(BUILD_DEBUG_IMAGE_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
+ $(BUILD_DEBUG_JRE_DIR)/lib/$(INSTALL_ARCH_DIR)
cp -pPRf pulse-java.jar \
- $(BUILD_DEBUG_IMAGE_DIR)/j2sdk-image/jre/lib/ext
+ $(BUILD_DEBUG_SDK_DIR)/jre/lib/ext
cp -pPRf pulse-java.jar \
- $(BUILD_DEBUG_IMAGE_DIR)/j2re-image/lib/ext
+ $(BUILD_DEBUG_JRE_DIR)/lib/ext
(cd $(PULSE_JAVA_JAVA_SRCDIR) && \
- $(ZIP) -qur $(BUILD_DEBUG_IMAGE_DIR)/j2sdk-image/src.zip org )
+ $(ZIP) -qur $(BUILD_DEBUG_SDK_DIR)/src.zip org )
endif
if ZERO_BUILD
printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
@@ -1623,30 +1631,30 @@
printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
endif
if ENABLE_SYSTEMTAP
- mkdir -p $(BUILD_DEBUG_IMAGE_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 \
- > $(BUILD_DEBUG_IMAGE_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 \
- > $(BUILD_DEBUG_IMAGE_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+ > $(BUILD_DEBUG_SDK_DIR)/tapset/hotspot_jni.stp; \
else \
cp $(abs_top_builddir)/tapset/hotspot.stp \
- $(BUILD_DEBUG_IMAGE_DIR)/j2sdk-image/tapset/hotspot.stp; \
+ $(BUILD_DEBUG_SDK_DIR)/tapset/hotspot.stp; \
cp $(abs_top_builddir)/tapset/hotspot_jni.stp \
- $(BUILD_DEBUG_IMAGE_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+ $(BUILD_DEBUG_SDK_DIR)/tapset/hotspot_jni.stp; \
fi; \
cp $(abs_top_builddir)/tapset/jstack.stp \
- $(BUILD_DEBUG_IMAGE_DIR)/j2sdk-image/tapset/jstack.stp
+ $(BUILD_DEBUG_SDK_DIR)/tapset/jstack.stp
endif
cp $(abs_top_builddir)/nss.cfg \
- $(BUILD_DEBUG_IMAGE_DIR)/j2sdk-image/jre/lib/security;
+ $(BUILD_DEBUG_SDK_DIR)/jre/lib/security;
if ENABLE_JAMVM
printf -- '-jamvm ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
endif
- @echo "IcedTea (debug build) is served:" $(BUILD_DEBUG_IMAGE_DIR)/j2sdk-image
+ @echo "IcedTea (debug build) is served:" $(BUILD_DEBUG_SDK_DIR)
mkdir -p stamps
touch $@
@@ -1660,8 +1668,8 @@
rm -f stamps/icedtea-debug.stamp
stamps/check-crypto.stamp: stamps/cryptocheck.stamp stamps/icedtea.stamp
- if [ -e $(BUILD_IMAGE_DIR)/j2sdk-image/bin/java ] ; then \
- $(BUILD_IMAGE_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 $@
@@ -1673,8 +1681,8 @@
if !ENABLE_JAMVM
if !ENABLE_CACAO
if !ZERO_BUILD
- if [ -e $(BUILD_IMAGE_DIR)/j2sdk-image/bin/java ] ; then \
- $(BUILD_IMAGE_DIR)/j2sdk-image/bin/java -Xshare:dump ; \
+ if [ -e $(BUILD_SDK_DIR)/bin/java ] ; then \
+ $(BUILD_SDK_DIR)/bin/java -Xshare:dump ; \
fi
endif
endif
@@ -1682,12 +1690,12 @@
touch stamps/add-archive.stamp
clean-add-archive:
- rm -vf $(BUILD_IMAGE_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/*/*.jsa
+ rm -vf $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/*/*.jsa
rm -f stamps/add-archive.stamp
stamps/check-crypto-debug.stamp: stamps/cryptocheck.stamp stamps/icedtea-debug.stamp
- if [ -e $(BUILD_DEBUG_IMAGE_DIR)/j2sdk-image/bin/java ] ; then \
- $(BUILD_DEBUG_IMAGE_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 $@
@@ -1699,8 +1707,8 @@
if !ENABLE_JAMVM
if !ENABLE_CACAO
if !ZERO_BUILD
- if [ -e $(BUILD_DEBUG_IMAGE_DIR)/j2sdk-image/bin/java ] ; then \
- $(BUILD_DEBUG_IMAGE_DIR)/j2sdk-image/bin/java -Xshare:dump ; \
+ if [ -e $(BUILD_DEBUG_SDK_DIR)/bin/java ] ; then \
+ $(BUILD_DEBUG_SDK_DIR)/bin/java -Xshare:dump ; \
fi
endif
endif
@@ -1708,7 +1716,7 @@
touch stamps/add-archive-debug.stamp
clean-add-archive-debug:
- rm -vf $(BUILD_DEBUG_IMAGE_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/*/*.jsa
+ rm -vf $(BUILD_DEBUG_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/*/*.jsa
rm -f stamps/add-archive-debug.stamp
stamps/icedtea-stage2.stamp: stamps/icedtea.stamp stamps/add-cacao.stamp \
@@ -1746,8 +1754,8 @@
$(ICEDTEA_ENV_BOOT) \
-C $(BOOT_BUILD_OUTPUT_DIR) \
images
- $(abs_top_builddir)/pax-mark-vm $(BUILD_BOOT_IMAGE_DIR)/j2sdk-image
- @echo "Bootstrapped IcedTea is served:" $(BUILD_BOOT_IMAGE_DIR)/j2sdk-image
+ $(abs_top_builddir)/pax-mark-vm $(BUILD_BOOT_SDK_DIR)
+ @echo "Bootstrapped IcedTea is served:" $(BUILD_BOOT_SDK_DIR)
mkdir -p stamps
touch $@
@@ -1758,12 +1766,12 @@
rm -f stamps/icedtea-boot.stamp
rm -f stamps/icedtea-stage1.stamp
$(ARCH_PREFIX) $(MAKE) icedtea-stage1
- @echo "bootstrap-poured IcedTea is served (again):" $(BUILD_BOOT_IMAGE_DIR)/j2sdk-image
+ @echo "bootstrap-poured IcedTea is served (again):" $(BUILD_BOOT_SDK_DIR)
else
rm -f stamps/icedtea.stamp
rm -f stamps/icedtea-stage2.stamp
$(ARCH_PREFIX) $(MAKE) icedtea-stage2
- @echo "IcedTea is served (again):" $(BUILD_IMAGE_DIR)/j2sdk-image
+ @echo "IcedTea is served (again):" $(BUILD_SDK_DIR)
endif
hotspot:
@@ -1772,19 +1780,19 @@
rm -f stamps/icedtea-stage1.stamp
$(ARCH_PREFIX) $(MAKE) ICEDTEA_BUILD_TARGET=hotspot icedtea-stage1
mkdir -p \
- $(BUILD_BOOT_IMAGE_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server
+ $(BUILD_BOOT_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/server
cp $(BOOT_BUILD_OUTPUT_DIR)/$(SERVER_DIR)/libjvm.so \
- $(BUILD_BOOT_IMAGE_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server
- @echo "HotSpot is served:" $(BUILD_BOOT_IMAGE_DIR)/j2sdk-image
+ $(BUILD_BOOT_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/server
+ @echo "HotSpot is served:" $(BUILD_BOOT_SDK_DIR)
else
rm -f stamps/icedtea.stamp
rm -f stamps/icedtea-stage2.stamp
$(ARCH_PREFIX) $(MAKE) ICEDTEA_BUILD_TARGET=hotspot icedtea-stage2
mkdir -p \
- $(BUILD_IMAGE_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server
+ $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/server
cp $(BOOT_BUILD_OUTPUT_DIR)/$(SERVER_DIR)/libjvm.so \
- $(BUILD_IMAGE_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server
- @echo "HotSpot is served:" $(BUILD_IMAGE_DIR)/j2sdk-image
+ $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/server
+ @echo "HotSpot is served:" $(BUILD_SDK_DIR)
endif
clean-icedtea-boot:
@@ -1793,8 +1801,8 @@
rm -f stamps/icedtea-boot.stamp
stamps/check-crypto-boot.stamp: stamps/cryptocheck.stamp stamps/icedtea-boot.stamp
- if [ -e $(BUILD_BOOT_IMAGE_DIR)/j2sdk-image/bin/java ] ; then \
- $(BUILD_BOOT_IMAGE_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 $@
@@ -1806,8 +1814,8 @@
if !ENABLE_JAMVM
if !ENABLE_CACAO
More information about the distro-pkg-dev
mailing list