/hg/icedtea6-hg: 4 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Jun 14 13:08:10 PDT 2010
changeset 9a43545ed562 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=9a43545ed562
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jun 14 18:35:47 2010 +0100
Check that cp supports --reflink and use only if it does.
2010-06-14 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (REFLINK): Set to --reflink=auto if
CP_SUPPORTS_REFLINK is defined. (extract-openjdk.stamp):
Replace --reflink=auto with $(REFLINK).
(generated.stamp): Likewise. (liveconnect-dist.stamp):
Likewise. (netx-dist.stamp): Likewise. (plugin-
tests.stamp): Likewise.
* acinclude.m4: (IT_CP_SUPPORTS_REFLINK): New macro to check
for a cp new enough to have --reflink.
* configure.ac: Invoke IT_CP_SUPPORTS_REFLINK.
changeset edee5dc4edad in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=edee5dc4edad
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jun 14 16:27:40 2010 +0100
Hard link external OpenJDK source directories if possible, and check
that ${OPENJDK_SRC_DIR}/README exists.
2010-06-14 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (REFLINK): Remove unneeded quotation.
(OPENJDK_SRC_DIR_LINK): Use reflink only if hard linking is
not possible.
* acinclude.m4: (IT_CP_SUPPORTS_REFLINK): Define once only.
(WITH_OPENJDK_SRC_DIR): Define once only. Check that
directory is valid (to the extent this is discernable by the
README being present) and whether hardlinking is possible,
defining OPENJDK_SRC_DIR_HARDLINKABLE if it is.
changeset 152d9e45c454 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=152d9e45c454
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jun 14 18:39:11 2010 +0100
Hardlink to files in the source directory from the build directory,
if possible.
2010-06-14 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (SRC_DIR_LINK): Use reflink only if
hard linking is not possible. (liveconnect-
dist.stamp): Replace $(REFLINK) with $(SRC_DIR_LINK).
(netx-dist.stamp): Likewise. (plugin-tests.stamp): Likewise.
* acinclude.m4: (IT_CAN_HARDLINK_TO_SOURCE_TREE): Check if
hardlinking to files in the source directory from the build
directory is possible.
* configure.ac: Invoke IT_CAN_HARDLINK_TO_SOURCE_TREE.
changeset aa48b7afc30b in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=aa48b7afc30b
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jun 14 18:44:51 2010 +0100
Support using the build directory in a relative path.
2010-06-14 Andrew John Hughes <ahughes at redhat.com>
Make available BUILD_DIR for where a relative path
needs to be built. (BUILD_DIR): Set to openjdk.build.
(BUILD_OUTPUT_DIR): Use BUILD_DIR. (ECJ_BUILD_OUTPUT_DIR):
Extend BUILD_OUTPUT_DIR with '-ecj'.
diffstat:
4 files changed, 142 insertions(+), 18 deletions(-)
ChangeLog | 56 +++++++++++++++++++++++++++++++++++++++++++++++++
Makefile.am | 37 ++++++++++++++++++++++++---------
acinclude.m4 | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
configure.ac | 2 +
diffs (264 lines):
diff -r 609c64d51922 -r aa48b7afc30b ChangeLog
--- a/ChangeLog Mon Jun 14 00:21:47 2010 +0100
+++ b/ChangeLog Mon Jun 14 18:44:51 2010 +0100
@@ -1,3 +1,59 @@ 2010-06-13 Andrew John Hughes <ahughes@
+2010-06-14 Andrew John Hughes <ahughes at redhat.com>
+
+ Make available BUILD_DIR for where a relative
+ path needs to be built.
+ (BUILD_DIR): Set to openjdk.build.
+ (BUILD_OUTPUT_DIR): Use BUILD_DIR.
+ (ECJ_BUILD_OUTPUT_DIR): Extend BUILD_OUTPUT_DIR with '-ecj'.
+
+2010-06-14 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (SRC_DIR_LINK): Use reflink only if hard
+ linking is not possible.
+ (liveconnect-dist.stamp): Replace $(REFLINK) with
+ $(SRC_DIR_LINK).
+ (netx-dist.stamp): Likewise.
+ (plugin-tests.stamp): Likewise.
+ * acinclude.m4:
+ (IT_CAN_HARDLINK_TO_SOURCE_TREE): Check if hardlinking
+ to files in the source directory from the build directory
+ is possible.
+ * configure.ac:
+ Invoke IT_CAN_HARDLINK_TO_SOURCE_TREE.
+
+2010-06-14 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (REFLINK): Remove unneeded quotation.
+ (OPENJDK_SRC_DIR_LINK): Use reflink only
+ if hard linking is not possible.
+ (extract-openjdk.stamp): Replace $(REFLINK)
+ with $(OPENJDK_SRC_DIR_LINK).
+ * acinclude.m4:
+ (IT_CP_SUPPORTS_REFLINK): Define once only.
+ (WITH_OPENJDK_SRC_DIR): Define once only.
+ Check that directory is valid (to the extent
+ this is discernable by the README being present)
+ and whether hardlinking is possible, defining
+ OPENJDK_SRC_DIR_HARDLINKABLE if it is.
+
+2010-06-14 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (REFLINK): Set to --reflink=auto if
+ CP_SUPPORTS_REFLINK is defined.
+ (extract-openjdk.stamp): Replace --reflink=auto
+ with $(REFLINK).
+ (liveconnect-dist.stamp): Likewise.
+ (netx-dist.stamp): Likewise.
+ (plugin-tests.stamp): Likewise.
+ * acinclude.m4:
+ (IT_CP_SUPPORTS_REFLINK): New macro to check
+ for a cp new enough to have --reflink.
+ * configure.ac:
+ Invoke IT_CP_SUPPORTS_REFLINK.
+
2010-06-13 Andrew John Hughes <ahughes at redhat.com>
* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/DefaultSelectorProvider.java:
diff -r 609c64d51922 -r aa48b7afc30b Makefile.am
--- a/Makefile.am Mon Jun 14 00:21:47 2010 +0100
+++ b/Makefile.am Mon Jun 14 18:44:51 2010 +0100
@@ -32,9 +32,10 @@ OPENJDK_HG_URL = http://hg.openjdk.java.
# Build directories
-BUILD_OUTPUT_DIR = $(abs_top_builddir)/openjdk.build
+BUILD_DIR = openjdk.build
+BUILD_OUTPUT_DIR = $(abs_top_builddir)/$(BUILD_DIR)
DEBUG_BUILD_OUTPUT_DIR = $(BUILD_OUTPUT_DIR)-debug
-ECJ_BUILD_OUTPUT_DIR = $(abs_top_builddir)/openjdk-ecj.build
+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= \
@@ -196,6 +197,22 @@ else
SYSTEM_JDK_DIR = $(SYSTEM_GCJ_DIR)
ICEDTEA_HOME = $(abs_top_builddir)/bootstrap/icedtea
INITIAL_BOOTSTRAP_LINK_STAMP = stamps/bootstrap-directory-symlink-ecj.stamp
+endif
+
+if CP_SUPPORTS_REFLINK
+ REFLINK = --reflink=auto
+endif
+
+if OPENJDK_SRC_DIR_HARDLINKABLE
+ OPENJDK_SRC_DIR_LINK = -l
+else
+ OPENJDK_SRC_DIR_LINK = $(REFLINK)
+endif
+
+if SRC_DIR_HARDLINKABLE
+ SRC_DIR_LINK = -l
+else
+ SRC_DIR_LINK = $(REFLINK)
endif
# Target to ensure a patched OpenJDK tree containing Zero & Shark
@@ -804,7 +821,7 @@ clean-extract:
stamps/extract-openjdk.stamp: stamps/download.stamp
if OPENJDK_SRC_DIR_FOUND
- cp -pPR --reflink=auto $(OPENJDK_SRC_DIR) openjdk
+ cp -pPR $(OPENJDK_SRC_DIR_LINK) $(OPENJDK_SRC_DIR) openjdk
else
set -e ; \
if ! test -d openjdk ; \
@@ -1537,7 +1554,7 @@ stamps/liveconnect-dist.stamp: stamps/li
(cd $(abs_top_builddir)/liveconnect ; \
mkdir -p lib ; \
$(ICEDTEA_BOOT_DIR)/bin/jar cf lib/classes.jar $(LIVECONNECT_DIR) ; \
- cp -pPR --reflink=auto $(LIVECONNECT_SRCS) src; \
+ cp -pPR $(SRC_DIR_LINK) $(LIVECONNECT_SRCS) src; \
find src -type f -exec chmod 640 '{}' ';' -o -type d -exec chmod 750 '{}' ';'; \
cd src ; \
$(ZIP) -qr $(abs_top_builddir)/liveconnect/lib/src.zip $(LIVECONNECT_DIR) ) ; \
@@ -1573,7 +1590,7 @@ stamps/netx-dist.stamp: stamps/netx.stam
(cd $(abs_top_builddir)/netx.build ; \
mkdir -p lib ; \
$(ICEDTEA_BOOT_DIR)/bin/jar cf lib/classes.jar javax/jnlp net ; \
- cp -pPR --reflink=auto $(NETX_SRCDIR) src; \
+ 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 \
@@ -1863,12 +1880,12 @@ if ADD_ZERO_BUILD
if ZERO_BUILD
mkdir -p $(BUILD_JRE_ARCH_DIR)/shark
- cp -a zerovm/$(BUILD_OUTPUT_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \
+ cp -a zerovm/$(BUILD_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \
$(BUILD_JRE_ARCH_DIR)/shark/
printf -- '-shark KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
else
mkdir -p $(BUILD_JRE_ARCH_DIR)/zero
- cp -a zerovm/$(BUILD_OUTPUT_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \
+ cp -a zerovm/$(BUILD_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \
$(BUILD_JRE_ARCH_DIR)/zero/
printf -- '-zero KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
endif
@@ -1893,12 +1910,12 @@ if ADD_ZERO_BUILD
if ZERO_BUILD
mkdir -p $(BUILD_DEBUG_JRE_ARCH_DIR)/shark
- cp -a zerovm/$(BUILD_OUTPUT_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \
+ cp -a zerovm/$(BUILD_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \
$(BUILD_DEBUG_JRE_ARCH_DIR)/shark/
printf -- '-shark KNOWN\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
else
mkdir -p $(BUILD_DEBUG_JRE_ARCH_DIR)/zero
- cp -a zerovm/$(BUILD_OUTPUT_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \
+ cp -a zerovm/$(BUILD_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \
$(BUILD_DEBUG_JRE_ARCH_DIR)/zero/
printf -- '-zero KNOWN\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
endif
@@ -1924,7 +1941,7 @@ stamps/plugin-tests.stamp: $(INITIAL_BOO
$(PLUGIN_TEST_SRCS) ;
$(ICEDTEA_BOOT_DIR)/bin/jar cf plugin/tests/LiveConnect/PluginTest.jar \
plugin/tests/LiveConnect/*.class ;
- cp -pPR --reflink=auto $(abs_top_srcdir)/plugin/tests/LiveConnect/*.{js,html} \
+ cp -pPR $(SRC_DIR_LINK) $(abs_top_srcdir)/plugin/tests/LiveConnect/*.{js,html} \
plugin/tests/LiveConnect ;
echo "Done. Now launch \"firefox file://`pwd`/index.html\"" ;
mkdir -p stamps
diff -r 609c64d51922 -r aa48b7afc30b acinclude.m4
--- a/acinclude.m4 Mon Jun 14 00:21:47 2010 +0100
+++ b/acinclude.m4 Mon Jun 14 18:44:51 2010 +0100
@@ -245,23 +245,72 @@ AC_DEFUN([FIND_JAVA],
AC_SUBST(JAVA)
])
-AC_DEFUN([WITH_OPENJDK_SRC_DIR],
+AC_DEFUN_ONCE([IT_CP_SUPPORTS_REFLINK],
[
- AC_MSG_CHECKING(for an OpenJDK source directory)
+ AC_CACHE_CHECK([if cp supports --reflink], it_cv_reflink, [
+ touch tmp.$$
+ if cp --reflink=auto tmp.$$ tmp2.$$ >&AS_MESSAGE_LOG_FD 2>&1; then
+ it_cv_reflink=yes;
+ else
+ it_cv_reflink=no;
+ fi
+ rm -f tmp.$$ tmp2.$$
+ ])
+ AM_CONDITIONAL([CP_SUPPORTS_REFLINK], test x"${it_cv_reflink}" = "xyes")
+])
+
+AC_DEFUN_ONCE([WITH_OPENJDK_SRC_DIR],
+[
+ DEFAULT_SRC_DIR=${abs_top_builddir}/openjdk
+ AC_MSG_CHECKING([for an OpenJDK source directory])
AC_ARG_WITH([openjdk-src-dir],
[AS_HELP_STRING(--with-openjdk-src-dir,specify the location of the openjdk sources)],
[
OPENJDK_SRC_DIR=${withval}
- AC_MSG_RESULT(${withval})
- conditional_with_openjdk_sources=true
+ with_external_src_dir=true
],
[
- conditional_with_openjdk_sources=false
- OPENJDK_SRC_DIR=`pwd`/openjdk
- AC_MSG_RESULT(${OPENJDK_SRC_DIR})
+ OPENJDK_SRC_DIR=${DEFAULT_SRC_DIR}
+ with_external_src_dir=false
])
+ AC_MSG_RESULT(${OPENJDK_SRC_DIR})
AC_SUBST(OPENJDK_SRC_DIR)
- AM_CONDITIONAL(OPENJDK_SRC_DIR_FOUND, test "x${conditional_with_openjdk_sources}" = xtrue)
+ if test "x${with_external_src_dir}" = "xtrue"; then
+ AC_MSG_CHECKING([if ${OPENJDK_SRC_DIR}/README exists])
+ if test -f ${OPENJDK_SRC_DIR}/README; then
+ openjdk_src_dir_valid=yes;
+ else
+ openjdk_src_dir_valid="no, resetting to ${DEFAULT_SRC_DIR}";
+ OPENJDK_SRC_DIR=${DEFAULT_SRC_DIR}
+ with_external_src_dir=false
+ fi
+ AC_MSG_RESULT(${openjdk_src_dir_valid})
+ if test "x${openjdk_src_dir_valid}" = "xyes"; then
+ AC_MSG_CHECKING([if we can hard link rather than copy the OpenJDK source directory])
+ if cp -l ${OPENJDK_SRC_DIR}/README tmp.$$ >&AS_MESSAGE_LOG_FD 2>&1; then
+ openjdk_src_dir_hardlinkable=yes;
+ else
+ openjdk_src_dir_hardlinkable=no;
+ fi
+ AC_MSG_RESULT(${openjdk_src_dir_hardlinkable})
+ rm -f tmp.$$
+ fi
+ fi
+ AM_CONDITIONAL(OPENJDK_SRC_DIR_FOUND, test "x${with_external_src_dir}" = "xtrue")
+ AM_CONDITIONAL(OPENJDK_SRC_DIR_HARDLINKABLE, test "x${openjdk_src_dir_hardlinkable}" = "xyes")
+])
+
+AC_DEFUN_ONCE([IT_CAN_HARDLINK_TO_SOURCE_TREE],
+[
+ AC_CACHE_CHECK([if we can hard link rather than copy from ${abs_top_srcdir}], it_cv_hardlink_src, [
+ if cp -l ${abs_top_srcdir}/README tmp.$$ >&AS_MESSAGE_LOG_FD 2>&1; then
+ it_cv_hardlink_src=yes;
+ else
+ it_cv_hardlink_src=no;
+ fi
+ rm -f tmp.$$
+ ])
+ AM_CONDITIONAL([SRC_DIR_HARDLINKABLE], test x"${it_cv_hardlink_src}" = "xyes")
])
AC_DEFUN([FIND_ECJ_JAR],
diff -r 609c64d51922 -r aa48b7afc30b configure.ac
--- a/configure.ac Mon Jun 14 00:21:47 2010 +0100
+++ b/configure.ac Mon Jun 14 18:44:51 2010 +0100
@@ -50,6 +50,8 @@ AC_CHECK_GCC_VERSION
AC_CHECK_GCC_VERSION
AC_CHECK_FOR_OPENJDK
IT_CHECK_NUMBER_OF_PARALLEL_JOBS
+IT_CP_SUPPORTS_REFLINK
+IT_CAN_HARDLINK_TO_SOURCE_TREE
AC_MSG_CHECKING([for a NetBeans installation])
AC_ARG_WITH([netbeans-home],
More information about the distro-pkg-dev
mailing list