changeset in /hg/icedtea: 2007-12-10 Lillian Angel <langel at red...
Lillian Angel
langel at redhat.com
Wed Jan 16 07:09:37 PST 2008
changeset 116796f289a5 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=116796f289a5
description:
2007-12-10 Lillian Angel <langel at redhat.com>
* INSTALL: Updated important targets section.
* Makefile.am (dist-openjdk): Changed to create zip, not tarball.
* Makefile.in: Regenerate.
* configure.ac: Added check for zip and unzip tools
* configure: Regenerate.
diffstat:
6 files changed, 166 insertions(+), 45 deletions(-)
ChangeLog | 8 ++
INSTALL | 2
Makefile.am | 6 -
Makefile.in | 9 +-
configure | 183 ++++++++++++++++++++++++++++++++++++++++++++++------------
configure.ac | 3
diffs (358 lines):
diff -r 56290b79c75d -r 116796f289a5 ChangeLog
--- a/ChangeLog Mon Dec 10 16:21:15 2007 -0500
+++ b/ChangeLog Mon Dec 10 21:13:50 2007 -0500
@@ -1,3 +1,11 @@ 2007-12-10 Lillian Angel <langel at redha
+2007-12-10 Lillian Angel <langel at redhat.com>
+
+ * INSTALL: Updated important targets section.
+ * Makefile.am (dist-openjdk): Changed to create zip, not tarball.
+ * Makefile.in: Regenerate.
+ * configure.ac: Added check for zip and unzip tools
+ * configure: Regenerate.
+
2007-12-10 Lillian Angel <langel at redhat.com>
* INSTALL: Added note about new target dist-openjdk.
diff -r 56290b79c75d -r 116796f289a5 INSTALL
--- a/INSTALL Mon Dec 10 16:21:15 2007 -0500
+++ b/INSTALL Mon Dec 10 21:13:50 2007 -0500
@@ -69,4 +69,4 @@ Important Targets
Important Targets
-----------------
-- 'make dist-openjdk' creates a tarball of the openjdk sources for the current release.
+- 'make dist-openjdk' creates a zip of the openjdk sources for the current release.
diff -r 56290b79c75d -r 116796f289a5 Makefile.am
--- a/Makefile.am Mon Dec 10 16:21:15 2007 -0500
+++ b/Makefile.am Mon Dec 10 21:13:50 2007 -0500
@@ -118,9 +118,9 @@ snapshot: dist
# Creates archive of openjdk.
dist-openjdk:
hg fclone -r jdk7-$(OPENJDK_VERSION) $(OPENJDK_URL) openjdk-dist/openjdk
- find -name \\.hg* | xargs rm -rf
- cd openjdk-dist && $(TAR) czf openjdk-$(OPENJDK_VERSION).tar.gz openjdk/
- mv openjdk-dist/openjdk-$(OPENJDK_VERSION).tar.gz .
+ find -name \\.hg* | xargs rm -rf
+ cd openjdk-dist && $(ZIP) -r openjdk-$(OPENJDK_VERSION) openjdk/
+ mv openjdk-dist/openjdk-$(OPENJDK_VERSION).zip .
rm -rf openjdk-dist
# OpenJDK Source Preparation Targets
diff -r 56290b79c75d -r 116796f289a5 Makefile.in
--- a/Makefile.in Mon Dec 10 16:21:15 2007 -0500
+++ b/Makefile.in Mon Dec 10 21:13:50 2007 -0500
@@ -145,11 +145,12 @@ SYSTEM_ANT_DIR = @SYSTEM_ANT_DIR@
SYSTEM_ANT_DIR = @SYSTEM_ANT_DIR@
SYSTEM_GCJ_DIR = @SYSTEM_GCJ_DIR@
SYSTEM_ICEDTEA_DIR = @SYSTEM_ICEDTEA_DIR@
-TAR = @TAR@
+UNZIP = @UNZIP@
VERSION = @VERSION@
XALAN2_JAR = @XALAN2_JAR@
XALAN2_SERIALIZER_JAR = @XALAN2_SERIALIZER_JAR@
XERCES2_JAR = @XERCES2_JAR@
+ZIP = @ZIP@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -614,9 +615,9 @@ snapshot: dist
# Creates archive of openjdk.
dist-openjdk:
hg fclone -r jdk7-$(OPENJDK_VERSION) $(OPENJDK_URL) openjdk-dist/openjdk
- find -name \\.hg* | xargs rm -rf
- cd openjdk-dist && $(TAR) czf openjdk-$(OPENJDK_VERSION).tar.gz openjdk/
- mv openjdk-dist/openjdk-$(OPENJDK_VERSION).tar.gz .
+ find -name \\.hg* | xargs rm -rf
+ cd openjdk-dist && $(ZIP) -r openjdk-$(OPENJDK_VERSION) openjdk/
+ mv openjdk-dist/openjdk-$(OPENJDK_VERSION).zip .
rm -rf openjdk-dist
stamps/clone.stamp:
diff -r 56290b79c75d -r 116796f289a5 configure
--- a/configure Mon Dec 10 16:21:15 2007 -0500
+++ b/configure Mon Dec 10 21:13:50 2007 -0500
@@ -706,7 +706,8 @@ am__fastdepCXX_FALSE
am__fastdepCXX_FALSE
FIND
PATCH
-TAR
+ZIP
+UNZIP
CHMOD
GAWK
SYSTEM_GCJ_DIR
@@ -4265,16 +4266,16 @@ echo "$as_me: error: patch program not f
if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}tar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}tar; ac_word=$2
+ # Extract the first word of "${ac_tool_prefix}zip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}zip; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_TAR+set}" = set; then
+if test "${ac_cv_path_ZIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- case $TAR in
+ case $ZIP in
[\\/]* | ?:[\\/]*)
- ac_cv_path_TAR="$TAR" # Let the user override the test with a path.
+ ac_cv_path_ZIP="$ZIP" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -4284,7 +4285,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_TAR="$as_dir/$ac_word$ac_exec_ext"
+ ac_cv_path_ZIP="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -4295,10 +4296,10 @@ IFS=$as_save_IFS
;;
esac
fi
-TAR=$ac_cv_path_TAR
-if test -n "$TAR"; then
- { echo "$as_me:$LINENO: result: $TAR" >&5
-echo "${ECHO_T}$TAR" >&6; }
+ZIP=$ac_cv_path_ZIP
+if test -n "$ZIP"; then
+ { echo "$as_me:$LINENO: result: $ZIP" >&5
+echo "${ECHO_T}$ZIP" >&6; }
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
@@ -4306,18 +4307,18 @@ fi
fi
-if test -z "$ac_cv_path_TAR"; then
- ac_pt_TAR=$TAR
- # Extract the first word of "tar", so it can be a program name with args.
-set dummy tar; ac_word=$2
+if test -z "$ac_cv_path_ZIP"; then
+ ac_pt_ZIP=$ZIP
+ # Extract the first word of "zip", so it can be a program name with args.
+set dummy zip; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_ac_pt_TAR+set}" = set; then
+if test "${ac_cv_path_ac_pt_ZIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- case $ac_pt_TAR in
+ case $ac_pt_ZIP in
[\\/]* | ?:[\\/]*)
- ac_cv_path_ac_pt_TAR="$ac_pt_TAR" # Let the user override the test with a path.
+ ac_cv_path_ac_pt_ZIP="$ac_pt_ZIP" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -4327,7 +4328,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_ac_pt_TAR="$as_dir/$ac_word$ac_exec_ext"
+ ac_cv_path_ac_pt_ZIP="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -4338,17 +4339,17 @@ IFS=$as_save_IFS
;;
esac
fi
-ac_pt_TAR=$ac_cv_path_ac_pt_TAR
-if test -n "$ac_pt_TAR"; then
- { echo "$as_me:$LINENO: result: $ac_pt_TAR" >&5
-echo "${ECHO_T}$ac_pt_TAR" >&6; }
+ac_pt_ZIP=$ac_cv_path_ac_pt_ZIP
+if test -n "$ac_pt_ZIP"; then
+ { echo "$as_me:$LINENO: result: $ac_pt_ZIP" >&5
+echo "${ECHO_T}$ac_pt_ZIP" >&6; }
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
fi
- if test "x$ac_pt_TAR" = x; then
- TAR=""
+ if test "x$ac_pt_ZIP" = x; then
+ ZIP=""
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4360,15 +4361,124 @@ configuration is useful to you, please w
configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
esac
- TAR=$ac_pt_TAR
- fi
-else
- TAR="$ac_cv_path_TAR"
-fi
-
- if test x"$TAR" = x ; then
- { { echo "$as_me:$LINENO: error: tar program not found in PATH" >&5
-echo "$as_me: error: tar program not found in PATH" >&2;}
+ ZIP=$ac_pt_ZIP
+ fi
+else
+ ZIP="$ac_cv_path_ZIP"
+fi
+
+ if test x"$ZIP" = x ; then
+ { { echo "$as_me:$LINENO: error: zip program not found in PATH" >&5
+echo "$as_me: error: zip program not found in PATH" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}unzip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}unzip; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_UNZIP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $UNZIP in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_UNZIP="$UNZIP" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_UNZIP="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+UNZIP=$ac_cv_path_UNZIP
+if test -n "$UNZIP"; then
+ { echo "$as_me:$LINENO: result: $UNZIP" >&5
+echo "${ECHO_T}$UNZIP" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_UNZIP"; then
+ ac_pt_UNZIP=$UNZIP
+ # Extract the first word of "unzip", so it can be a program name with args.
+set dummy unzip; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_ac_pt_UNZIP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $ac_pt_UNZIP in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_UNZIP="$ac_pt_UNZIP" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_ac_pt_UNZIP="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+ac_pt_UNZIP=$ac_cv_path_ac_pt_UNZIP
+if test -n "$ac_pt_UNZIP"; then
+ { echo "$as_me:$LINENO: result: $ac_pt_UNZIP" >&5
+echo "${ECHO_T}$ac_pt_UNZIP" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+ if test "x$ac_pt_UNZIP" = x; then
+ UNZIP=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ UNZIP=$ac_pt_UNZIP
+ fi
+else
+ UNZIP="$ac_cv_path_UNZIP"
+fi
+
+ if test x"$UNZIP" = x ; then
+ { { echo "$as_me:$LINENO: error: unzip program not found in PATH" >&5
+echo "$as_me: error: unzip program not found in PATH" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -10463,12 +10573,12 @@ am__fastdepCXX_FALSE!$am__fastdepCXX_FAL
am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
FIND!$FIND$ac_delim
PATCH!$PATCH$ac_delim
-TAR!$TAR$ac_delim
+ZIP!$ZIP$ac_delim
+UNZIP!$UNZIP$ac_delim
CHMOD!$CHMOD$ac_delim
GAWK!$GAWK$ac_delim
SYSTEM_GCJ_DIR!$SYSTEM_GCJ_DIR$ac_delim
SYSTEM_ICEDTEA_DIR!$SYSTEM_ICEDTEA_DIR$ac_delim
-SYSTEM_ANT_DIR!$SYSTEM_ANT_DIR$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -10510,6 +10620,7 @@ ac_delim='%!_!# '
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+SYSTEM_ANT_DIR!$SYSTEM_ANT_DIR$ac_delim
WITH_ICEDTEA_TRUE!$WITH_ICEDTEA_TRUE$ac_delim
WITH_ICEDTEA_FALSE!$WITH_ICEDTEA_FALSE$ac_delim
BUILD_ARCH_DIR!$BUILD_ARCH_DIR$ac_delim
diff -r 56290b79c75d -r 116796f289a5 configure.ac
--- a/configure.ac Mon Dec 10 16:21:15 2007 -0500
+++ b/configure.ac Mon Dec 10 21:13:50 2007 -0500
@@ -11,7 +11,8 @@ AC_PROG_CXX
FIND_TOOL([FIND], [find])
FIND_TOOL([PATCH], [patch])
-FIND_TOOL([TAR], [tar])
+FIND_TOOL([ZIP], [zip])
+FIND_TOOL([UNZIP], [unzip])
FIND_TOOL([CHMOD], [chmod])
dnl OpenJDK's README-builds.html lists gawk as a build dependency so we
dnl check for it explicitly rather than using AC_PROG_AWK.
More information about the distro-pkg-dev
mailing list