From bugzilla-daemon at icedtea.classpath.org Mon Dec 3 10:28:54 2007 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 03 Dec 2007 18:28:54 +0000 Subject: [Bug 84] New: jar c0mf@ causes error "Illegal option: @" Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=84 Summary: jar c0mf@ causes error "Illegal option: @" Product: IcedTea Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: jarkko.lietolahti at jab.fi Included file java/util/Hashtable$EmptyEnumerator.class missing, skipping. /bin/mv /home/jarkko/Desktop/23/jarkko/src/icedtea/openjdk-ecj/control/build/linux-amd64/tmp/reorder/file_list.temp /home/jarkko/Desktop/23/jarkko/src/icedtea/openjdk-ecj/control/build/linux-amd64/tmp/reorder/file_list /bin/cat /home/jarkko/Desktop/23/jarkko/src/icedtea/openjdk-ecj/control/build/linux-amd64/tmp/reorder/file_list | /bin/grep "^sun" | /bin/grep "class" | /bin/grep -v '\$' \ > /home/jarkko/Desktop/23/jarkko/src/icedtea/openjdk-ecj/control/build/linux-amd64/tmp/sun_classes_list sed 's/\.class/\.java/' < /home/jarkko/Desktop/23/jarkko/src/icedtea/openjdk-ecj/control/build/linux-amd64/tmp/sun_classes_list \ > /home/jarkko/Desktop/23/jarkko/src/icedtea/openjdk-ecj/control/build/linux-amd64/tmp/sun_sources_list /bin/mkdir -p /home/jarkko/Desktop/23/jarkko/src/icedtea/openjdk-ecj/control/build/linux-amd64/tmp/jarfilelists /home/jarkko/Desktop/23/jarkko/src/icedtea/bootstrap/jdk1.6.0/bin/java -Xmx896m -Xms128m -XX:PermSize=32m -XX:MaxPermSize=160m -jar /home/jarkko/Desktop/23/jarkko/src/icedtea/openjdk-ecj/control/build/linux-amd64/btjars/jarsplit.jar \ /home/jarkko/Desktop/23/jarkko/src/icedtea/openjdk-ecj/control/build/linux-amd64/tmp/reorder/file_list \ -o /home/jarkko/Desktop/23/jarkko/src/icedtea/openjdk-ecj/control/build/linux-amd64/tmp/jarfilelists/rt_jar_list /home/jarkko/Desktop/23/jarkko/src/icedtea/openjdk-ecj/control/build/linux-amd64/tmp/jarfilelists/resources_jar_list /bin/mkdir -p /home/jarkko/Desktop/23/jarkko/src/icedtea/openjdk-ecj/control/build/linux-amd64/tmp rm -f /home/jarkko/Desktop/23/jarkko/src/icedtea/openjdk-ecj/control/build/linux-amd64/tmp/rt-orig.jar (cd /home/jarkko/Desktop/23/jarkko/src/icedtea/openjdk-ecj/control/build/linux-amd64/classes && /bin/cat /home/jarkko/Desktop/23/jarkko/src/icedtea/openjdk-ecj/control/build/linux-amd64/tmp/jarfilelists/rt_jar_list | \ /home/jarkko/Desktop/23/jarkko/src/icedtea/bootstrap/jdk1.6.0/bin/jar c0mf@ /home/jarkko/Desktop/23/jarkko/src/icedtea/openjdk-ecj/control/build/linux-amd64/tmp/manifest.tmp /home/jarkko/Desktop/23/jarkko/src/icedtea/openjdk-ecj/control/build/linux-amd64/tmp/rt-orig.jar \ -J-Xmx896m -J-Xms128m -J-XX:PermSize=32m -J-XX:MaxPermSize=160m) Illegal option: @ Usage: jar {ctxui}[vfm0Me] [jar-file] [manifest-file] [entry-point] [-C dir] files ... Options: -c create new archive -t list table of contents for archive -x extract named (or all) files from archive -u update existing archive -v generate verbose output on standard output -f specify archive file name -m include manifest information from specified manifest file -e specify application entry point for stand-alone application bundled into an executable jar file -0 store only; use no ZIP compression -M do not create a manifest file for the entries -i generate index information for the specified jar files -C change to the specified directory and include the following file If any file is a directory then it is processed recursively. The manifest file name, the archive file name and the entry point name are specified in the same order as the 'm', 'f' and 'e' flags. Example 1: to archive two class files into an archive called classes.jar: jar cvf classes.jar Foo.class Bar.class Example 2: use an existing manifest file 'mymanifest' and archive all the files in the foo/ directory into 'classes.jar': jar cvfm classes.jar mymanifest -C foo/ . make[2]: *** [/home/jarkko/Desktop/23/jarkko/src/icedtea/openjdk-ecj/control/build/linux-amd64/tmp/rt-orig.jar] Error 1 make[2]: Leaving directory `/home/jarkko/Desktop/23/jarkko/src/icedtea/openjdk-ecj/jdk/make' make[1]: *** [jdk-build] Virhe 2 make[1]: Poistutaan hakemistosta "/home/jarkko/Desktop/23/jarkko/src/icedtea/openjdk-ecj/control/make" make: *** [stamps/icedtea-ecj.stamp] Virhe 2 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Mon Dec 3 10:31:28 2007 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 03 Dec 2007 18:31:28 +0000 Subject: [Bug 84] jar c0mf@ causes error "Illegal option: @" Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=84 ------- Comment #1 from langel at redhat.com 2007-12-03 18:31 ------- need more info: readlink -f /usr/bin/jar ? -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Mon Dec 3 10:48:22 2007 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 03 Dec 2007 18:48:22 +0000 Subject: [Bug 84] jar c0mf@ causes error "Illegal option: @" Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=84 ------- Comment #2 from jsumali at redhat.com 2007-12-03 18:48 ------- Which jar program are you using? If my guess is correct, then you might be using gjar -- from what I remember, it currently doesn't support the '@' option to take in a list of files. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From gnu_andrew at member.fsf.org Mon Dec 3 13:45:40 2007 From: gnu_andrew at member.fsf.org (gnu_andrew at member.fsf.org) Date: Mon, 03 Dec 2007 21:45:40 +0000 Subject: changeset in /hg/icepick: Updated compiler testing to just use j... Message-ID: changeset 1fa24a069129 in /hg/icepick details: http://icedtea.classpath.org/hg/icepick?cmd=changeset;node=1fa24a069129 description: Updated compiler testing to just use javac. diffstat: 4 files changed, 68 insertions(+), 437 deletions(-) ChangeLog | 10 + Makefile.am | 10 - configure.ac | 32 --- m4/acinclude.m4 | 453 ++++++------------------------------------------------- diffs (truncated from 602 to 500 lines): diff -r dc6721b486c7 -r 1fa24a069129 ChangeLog --- a/ChangeLog Mon Dec 03 21:07:30 2007 +0000 +++ b/ChangeLog Mon Dec 03 21:38:42 2007 +0000 @@ -1,3 +1,13 @@ 2007-12-03 Andrew John Hughes + + * Makefile.am: + Just use JAVAC and fail when there is no compiler. + * configure.ac: + Remove unneeded macros. + * m4/acinclude.m4: + Likewise, and bring in updated javac test from + GNU Classpath. + 2007-12-03 Andrew John Hughes * AUTHORS: diff -r dc6721b486c7 -r 1fa24a069129 Makefile.am --- a/Makefile.am Mon Dec 03 21:07:30 2007 +0000 +++ b/Makefile.am Mon Dec 03 21:38:42 2007 +0000 @@ -11,14 +11,10 @@ FULL_VERSION = $(RELEASE)-$(USER_RELEASE FULL_VERSION = $(RELEASE)-$(USER_RELEASE_SUFFIX)-$(BUILD_NUMBER) # Setup the compiler -if FOUND_ECJ -JCOMPILER = $(ECJ) -1.5 -encoding UTF-8 -warn:-deprecation,serial,typeHiding,unchecked,unused,varargsCast -bootclasspath $(PATH_TO_GLIBJ_ZIP) -classpath .:$(USER_CLASSLIB) +if FOUND_JAVAC +JCOMPILER = $(JAVAC) $(JAVAC_OPTS) -classpath .:$(USER_CLASSLIB) else -if FOUND_JAVAC -JCOMPILER = $(JAVAC) -encoding UTF-8 -bootclasspath $(PATH_TO_GLIBJ_ZIP) -classpath .:$(GLIBJ_CLASSPATH) -else -error dunno how to setup the JCOMPILER and compile -endif +JCOMPILER = echo "No compiler found" 1>&2; exit 1 endif bin_SCRIPTS = tools/apt tools/javac tools/javah tools/javadoc diff -r dc6721b486c7 -r 1fa24a069129 configure.ac --- a/configure.ac Mon Dec 03 21:07:30 2007 +0000 +++ b/configure.ac Mon Dec 03 21:38:42 2007 +0000 @@ -6,7 +6,7 @@ dnl define([AC_CACHE_LOAD], )dnl dnl define([AC_CACHE_LOAD], )dnl dnl define([AC_CACHE_SAVE], )dnl -AC_INIT([IcePick],[0.01],[classpath at gnu.org],[icepick]) +AC_INIT([IcePick],[0.01],[distro-pkg-dev at openjdk.java.net],[icepick]) AC_CONFIG_SRCDIR(tools/javadoc.in) AC_CANONICAL_TARGET @@ -19,12 +19,12 @@ dnl Sets the VM name for use in tool wra dnl Sets the VM name for use in tool wrapper scripts dnl ----------------------------------------------------------- AC_ARG_WITH([vm], - [AS_HELP_STRING(--with-vm,sets the VM binary name [default='${prefix}/bin/java'])], + [AS_HELP_STRING(--with-vm,sets the VM binary name [default='java'])], [ VM_BINARY=${withval} ], [ - VM_BINARY='${prefix}/bin/java' + VM_BINARY='java' ]) AC_SUBST(VM_BINARY) @@ -60,32 +60,6 @@ dnl ------------------------------------ dnl ----------------------------------------------------------- AM_MAINTAINER_MODE -dnl ----------------------------------------------------------------------- -dnl Support for using a prebuilt class library -dnl ----------------------------------------------------------------------- -AC_ARG_WITH([glibj_zip], - AS_HELP_STRING([--with-glibj-zip=ABS.PATH], - [use prebuilt glibj.zip class library])) - -case "$with_glibj_zip" in -"") - use_glibj_zip=false - ;; -"no" ) - use_glibj_zip=false - ;; -"yes") - AC_MSG_ERROR([Please suply an absolute path to a prebuilt glibj.zip]) - ;; -*) - use_glibj_zip=true - PATH_TO_GLIBJ_ZIP=$with_glibj_zip - ;; -esac; - -AM_CONDITIONAL(USE_PREBUILT_GLIBJ_ZIP, test x$use_glibj_zip = xtrue) -AC_SUBST(PATH_TO_GLIBJ_ZIP) - dnl ----------------------------------------------------------- dnl output files dnl ----------------------------------------------------------- diff -r dc6721b486c7 -r 1fa24a069129 m4/acinclude.m4 --- a/m4/acinclude.m4 Mon Dec 03 21:07:30 2007 +0000 +++ b/m4/acinclude.m4 Mon Dec 03 21:38:42 2007 +0000 @@ -5,222 +5,94 @@ AC_DEFUN([CLASSPATH_FIND_JAVAC], [ user_specified_javac= -dnl CLASSPATH_WITH_GCJ -dnl CLASSPATH_WITH_JIKES -dnl CLASSPATH_WITH_KJC - CLASSPATH_WITH_ECJ CLASSPATH_WITH_JAVAC if test "x${user_specified_javac}" = x; then -dnl AM_CONDITIONAL(FOUND_GCJ, test "x${GCJ}" != x) -dnl AM_CONDITIONAL(FOUND_JIKES, test "x${JIKES}" != x) - AM_CONDITIONAL(FOUND_ECJ, test "x${ECJ}" != x) AM_CONDITIONAL(FOUND_JAVAC, test "x${JAVAC}" != x) else -dnl AM_CONDITIONAL(FOUND_GCJ, test "x${user_specified_javac}" = xgcj) -dnl AM_CONDITIONAL(FOUND_JIKES, test "x${user_specified_javac}" = xjikes) - AM_CONDITIONAL(FOUND_ECJ, test "x${user_specified_javac}" = xecj) - AM_CONDITIONAL(FOUND_JAVAC, test "x${user_specified_javac}" = xjavac) + AM_CONDITIONAL(FOUND_JAVAC, test "x${user_specified_javac}" = xjavac && test "x${JAVAC}" != x) fi -dnl AM_CONDITIONAL(FOUND_KJC, test "x${user_specified_javac}" = xkjc) -dnl if test "x${GCJ}" = x && test "x${JIKES}" = x && test "x${user_specified_javac}" != xkjc; then - if test "x${ECJ}" = x && test "x${JAVAC}" = x && test "x${user_specified_javac}" != xecj; then - AC_MSG_ERROR([cannot find javac, try --with-ecj]) + if test "x${JAVAC}" = x && test "x${user_specified_javac}" != xjavac; then + AC_MSG_ERROR([cannot find javac, try --with-javac]) fi ]) dnl ----------------------------------------------------------- -AC_DEFUN([CLASSPATH_WITH_GCJ], +AC_DEFUN([CLASSPATH_WITH_JAVAC], [ - AC_ARG_WITH([gcj], - [AS_HELP_STRING(--with-gcj,bytecode compilation with gcj)], + AC_ARG_WITH([javac], + [AS_HELP_STRING(--with-javac,bytecode compilation with javac)], [ if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then - CLASSPATH_CHECK_GCJ(${withval}) + CLASSPATH_CHECK_JAVAC(${withval}) else if test "x${withval}" != xno; then - CLASSPATH_CHECK_GCJ + CLASSPATH_CHECK_JAVAC fi fi - user_specified_javac=gcj + user_specified_javac=javac ], - [ - CLASSPATH_CHECK_GCJ + [ + CLASSPATH_CHECK_JAVAC ]) - AC_SUBST(GCJ) + AC_SUBST(JAVAC) + AC_SUBST(JAVAC_OPTS) ]) dnl ----------------------------------------------------------- -AC_DEFUN([CLASSPATH_CHECK_GCJ], +AC_DEFUN([CLASSPATH_CHECK_JAVAC], [ if test "x$1" != x; then - if test -f "$1"; then - GCJ="$1" - else - AC_PATH_PROG(GCJ, "$1") - fi + JAVAC="$1" else - AC_PATH_PROG(GCJ, "gcj") - fi - dnl Test the given GCJ, but use it as C (!) compiler to check version - if test "x$GCJ" != x; then - AC_MSG_CHECKING([gcj version 4.0]) - AC_LANG_PUSH([C]) - AC_LANG_CONFTEST( - [[#if __GNUC__ <= 3 - #error GCJ 4.0.0 or higher is required - #endif - ]]) - $GCJ -E conftest.c > /dev/null - gcj_4_result=$? - if test "x$gcj_4_result" = "x0"; then - AC_MSG_RESULT([4.0 or higher found]) - else - AC_MSG_WARN([4.0 or higher required]) - fi - AC_LANG_POP - fi -]) - -dnl ----------------------------------------------------------- -AC_DEFUN([CLASSPATH_WITH_JIKES], -[ - AC_ARG_WITH([jikes], - [AS_HELP_STRING(--with-jikes,bytecode compilation with jikes)], - [ - if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then - CLASSPATH_CHECK_JIKES(${withval}) - else - if test "x${withval}" != xno; then - CLASSPATH_CHECK_JIKES - fi - fi - user_specified_javac=jikes - ], - [ - CLASSPATH_CHECK_JIKES - ]) - AC_SUBST(JIKES) -]) - -dnl ----------------------------------------------------------- -AC_DEFUN([CLASSPATH_CHECK_JIKES], -[ - if test "x$1" != x; then - if test -f "$1"; then - JIKES="$1" - else - AC_PATH_PROG(JIKES, "$1") - fi + AC_PATH_PROG(JAVAC, "javac") + fi + dnl Test the given javac + AC_MSG_CHECKING([if javac is 1.5-capable]) + cat > conftest.java << EOF +public class conftest { +public static void main(String[] args) { +java.util.List l = new java.util.ArrayList(); +System.out.println(l); +}} +EOF + $JAVAC -sourcepath '' conftest.java + javac_result=$? + if test "x$javac_result" = "x0"; then + AC_MSG_RESULT([yes]) else - AC_PATH_PROG(JIKES, "jikes") + AC_MSG_WARN([1.5 capable javac required]) fi - if test "x$JIKES" != "x"; then - dnl Require at least version 1.19 - AC_MSG_CHECKING(jikes version) - JIKES_VERSION=`$JIKES --version | awk '/^Jikes Compiler/' | cut -d ' ' -f 5` - JIKES_VERSION_MAJOR=`echo "$JIKES_VERSION" | cut -d '.' -f 1` - JIKES_VERSION_MINOR=`echo "$JIKES_VERSION" | cut -d '.' -f 2` - if expr "$JIKES_VERSION_MAJOR" = 1 > /dev/null; then - if expr "$JIKES_VERSION_MINOR" \< 19 > /dev/null; then - JIKES="" - fi - fi - if test "x$JIKES" != "x"; then - AC_MSG_RESULT($JIKES_VERSION) - else - AC_MSG_WARN($JIKES_VERSION: jikes 1.19 or higher required) - fi - - JIKESENCODING= - if test -n "`$JIKES --help 2>&1 | grep encoding`"; then - JIKESENCODING='-encoding UTF-8' - fi - AC_SUBST(JIKESENCODING) - - JIKESWARNINGS="+Pno-switchcheck" - if test "x$JIKES_VERSION_MAJOR" = x"1" ; then - if ! test "x$JIKES_VERSION_MINOR" = x"19"; then - JIKESWARNINGS="$JIKESWARNINGS +Pno-shadow" - fi - fi - AC_SUBST(JIKESWARNINGS) - + AC_MSG_CHECKING([whether javac supports -J]) + $JAVAC -J-Xmx512M -sourcepath '' conftest.java + javac_result=$? + if test "x$javac_result" = "x0"; then + AC_MSG_RESULT([yes]) + JAVAC_OPTS="-J-Xmx512M" + else + AC_MSG_RESULT([javac doesn't support -J]) fi ]) -dnl ----------------------------------------------------------- -AC_DEFUN([CLASSPATH_WITH_KJC], +dnl Allow langtools directory to be specified +AC_DEFUN([WITH_LANGTOOLS_SRC_DIR], [ - AC_ARG_WITH([kjc], - [AS_HELP_STRING(--with-kjc,bytecode compilation with kjc)], + AC_MSG_CHECKING(langtools sources) + AC_ARG_WITH([langtools-src-dir], + [AS_HELP_STRING(--with-langtools-src-dir,specify the location of the openjdk langtools sources)], [ - if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then - CLASSPATH_CHECK_KJC(${withval}) - else - if test "x${withval}" != xno; then - CLASSPATH_CHECK_KJC - fi - fi - user_specified_javac=kjc + LANGTOOLS_SRC_DIR=${withval} + AC_MSG_RESULT(${withval}) + conditional_with_langtools_sources=true ], [ - CLASSPATH_CHECK_KJC + conditional_with_langtools_sources=false + LANGTOOLS_SRC_DIR=`pwd`/langtools + AC_MSG_RESULT(${OPENJDK_SRC_DIR}) ]) - AC_SUBST(KJC) -]) - -dnl ----------------------------------------------------------- -AC_DEFUN([CLASSPATH_CHECK_KJC], -[ - if test "x$1" != x; then - if test -f "$1"; then - KJC="$1" - else - AC_PATH_PROG(KJC, "$1") - fi - else - AC_PATH_PROG(KJC, "kJC") - fi -]) - -dnl ----------------------------------------------------------- -AC_DEFUN([CLASSPATH_WITH_JAVAH], -[ - AC_ARG_WITH([javah], - [AS_HELP_STRING(--with-javah,specify path or name of a javah-like program)], - [ - if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then - CLASSPATH_CHECK_JAVAH(${withval}) - else - CLASSPATH_CHECK_JAVAH - fi - ], - [ - CLASSPATH_CHECK_JAVAH - ]) - AC_SUBST(USER_JAVAH) -]) - -dnl ----------------------------------------------------------- -dnl Checking for a javah like program -dnl ----------------------------------------------------------- -AC_DEFUN([CLASSPATH_CHECK_JAVAH], -[ - if test "x$1" != x; then - if test -f "$1"; then - USER_JAVAH="$1" - else - AC_PATH_PROG(USER_JAVAH, "$1") - fi - else - AC_PATH_PROGS([USER_JAVAH],[gjavah gcjh-wrapper-4.1 gcjh-4.1 gcjh javah]) - fi - - if test "x${USER_JAVAH}" = x; then - AC_MSG_ERROR([can not find javah]) - fi + AC_SUBST(LANGTOOLS_SRC_DIR) + AM_CONDITIONAL(GNU_CLASSLIB_FOUND, test "x${conditional_with_langtools_sources}" = xtrue) ]) dnl ----------------------------------------------------------- @@ -250,225 +122,4 @@ AC_DEFUN([CLASSPATH_WITH_CLASSLIB], [ conditional_with_classlib=false ]) AM_CONDITIONAL(USER_SPECIFIED_CLASSLIB, test "x${conditional_with_classlib}" = xtrue) - AC_ARG_WITH([vm-classes], - [AS_HELP_STRING(--with-vm-classes,specify path to VM override source files)], [vm_classes="$with_vm_classes"], - [vm_classes='${top_srcdir}/vm/reference']) - AC_SUBST(vm_classes) ]) - -dnl ----------------------------------------------------------- -dnl CLASSPATH_WITH_GLIBJ - specify what to install -dnl ----------------------------------------------------------- -AC_DEFUN([CLASSPATH_WITH_GLIBJ], -[ - AC_PATH_PROG(ZIP, zip) - AC_ARG_WITH([fastjar], - [AS_HELP_STRING([--with-fastjar=PATH], [define to use a fastjar style tool])], - [ - AC_MSG_CHECKING([for user supplied fastjar]) - FASTJAR=${withval} - AC_MSG_RESULT([${FASTJAR}]) - ], - [AC_PATH_PROG(FASTJAR, fastjar)]) -dnl We disable ZIP by default if we find fastjar. - if test x"${FASTJAR}" != x; then - ZIP="" - fi - - AC_ARG_WITH([glibj], - [AS_HELP_STRING([--with-glibj],[define what to install (zip|flat|both|none|build) [default=zip]])], - [ - if test "x${withval}" = xyes || test "x${withval}" = xzip; then - install_class_files=no - build_class_files=yes - use_zip=yes - elif test "x${withval}" = xboth; then - install_class_files=yes - build_class_files=yes - use_zip=yes - elif test "x${withval}" = xflat; then - install_class_files=yes - build_class_files=yes - use_zip=no - elif test "x${withval}" = xno || test "x${withval}" = xnone; then - install_class_files=no - build_class_files=no - use_zip=no - elif test "x${withval}" = xbuild; then - install_class_files=no - build_class_files=yes - use_zip=no - else - AC_MSG_ERROR([unknown value given to --with-glibj]) - fi - ], - [ - install_class_files=no - use_zip=yes - ]) - AM_CONDITIONAL(INSTALL_GLIBJ_ZIP, test "x${use_zip}" = xyes) - AM_CONDITIONAL(INSTALL_CLASS_FILES, test "x${install_class_files}" = xyes) - AM_CONDITIONAL(BUILD_CLASS_FILES, test "x${build_class_files}" = xyes) - - AC_ARG_ENABLE([examples], - [AS_HELP_STRING(--enable-examples,enable build of the examples [default=yes])], - [case "${enableval}" in - yes) EXAMPLESDIR="examples" ;; - no) EXAMPLESDIR="" ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-examples) ;; - esac], - [EXAMPLESDIR="examples"]) - if test "x${use_zip}" = xno && test "x${install_class_files}" = xno; then - EXAMPLESDIR="" - fi - AC_SUBST(EXAMPLESDIR) -]) - -dnl ----------------------------------------------------------- -dnl Enable generation of API documentation, with gjdoc if it -dnl has been compiled to an executable (or a suitable script -dnl is in your PATH) or using the argument as gjdoc executable. -dnl ----------------------------------------------------------- -AC_DEFUN([CLASSPATH_WITH_GJDOC], -[ - AC_ARG_WITH([gjdoc], - AS_HELP_STRING([--with-gjdoc], - [generate documentation using gjdoc (default is NO)]), - [if test "x${withval}" = xno; then - WITH_GJDOC=no; - elif test "x${withval}" = xyes -o "x{withval}" = x; then - WITH_GJDOC=yes; - AC_PATH_PROG(GJDOC, gjdoc, "no") - if test "x${GJDOC}" = xno; then - AC_MSG_ERROR("gjdoc executable not found"); - fi - else - WITH_GJDOC=yes - GJDOC="${withval}" - AC_CHECK_FILE(${GJDOC}, AC_SUBST(GJDOC), - AC_MSG_ERROR("Cannot use ${withval} as gjdoc executable since it doesn't exist")) - fi], - [WITH_GJDOC=no]) - - AM_CONDITIONAL(CREATE_API_DOCS, test "x${WITH_GJDOC}" = xyes) -]) - -dnl ----------------------------------------------------------- -dnl Enable regeneration of parsers using jay -dnl http://www.informatik.uni-osnabrueck.de/alumni/bernd/jay/ -dnl ----------------------------------------------------------- -AC_DEFUN([REGEN_WITH_JAY], -[ - AC_ARG_WITH([jay], - [AS_HELP_STRING(--with-jay,Regenerate the parsers with jay must be given the path to the jay executable)], - [ - if test -d "${withval}"; then - JAY_DIR_PATH="${withval}" - AC_PATH_PROG(JAY, jay, "no", ${JAY_DIR_PATH}) - if test "x${JAY}" = xno; then - AC_MSG_ERROR("jay executable not found"); - fi - else - JAY_DIR_PATH=`dirname "${withval}"` From gnu_andrew at member.fsf.org Mon Dec 3 13:45:39 2007 From: gnu_andrew at member.fsf.org (gnu_andrew at member.fsf.org) Date: Mon, 03 Dec 2007 21:45:39 +0000 Subject: changeset in /hg/icepick: 2007-12-03 Andrew John Hughes changeset 23c4c196778a in /hg/icepick details: http://icedtea.classpath.org/hg/icepick?cmd=changeset;node=23c4c196778a description: 2007-12-03 Andrew John Hughes * THANKS: Add thankyous. * tools/apt.in, * tools/javac.in, * tools/javadoc.in, * tools/javah.in: Correct copyright headers. diffstat: 6 files changed, 42 insertions(+), 93 deletions(-) ChangeLog | 10 ++++++++++ THANKS | 8 ++++++++ tools/apt.in | 29 ++++++----------------------- tools/javac.in | 29 ++++++----------------------- tools/javadoc.in | 29 ++++++----------------------- tools/javah.in | 30 ++++++------------------------ diffs (238 lines): diff -r b04bfca58e58 -r 23c4c196778a ChangeLog --- a/ChangeLog Thu Nov 29 16:46:44 2007 +0000 +++ b/ChangeLog Mon Dec 03 20:44:39 2007 +0000 @@ -1,3 +1,13 @@ 2007-11-29 Andrew John Hughes + + * THANKS: + Add thankyous. + * tools/apt.in, + * tools/javac.in, + * tools/javadoc.in, + * tools/javah.in: + Correct copyright headers. + 2007-11-29 Andrew John Hughes * tools/library.c: diff -r b04bfca58e58 -r 23c4c196778a THANKS --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/THANKS Mon Dec 03 20:44:39 2007 +0000 @@ -0,0 +1,8 @@ +My deepest thanks to all those who have contributed to the following projects: + +* GNU Classpath +* OpenJDK +* IcedTea +* The numerous VMs which support GNU Classpath, including JamVM, CACAO, JikesRVM, Kaffe and gcj + +Without your work, this wouldn't be possible. diff -r b04bfca58e58 -r 23c4c196778a tools/apt.in --- a/tools/apt.in Thu Nov 29 16:46:44 2007 +0000 +++ b/tools/apt.in Mon Dec 03 20:44:39 2007 +0000 @@ -1,42 +1,25 @@ #!/bin/sh -## Copyright (C) 2006 Free Software Foundation, Inc. +## Copyright (C) 2007 Andrew John Hughes ## -## This file is a part of GNU Classpath. +## This file is a part of IcePick. ## -## GNU Classpath is free software; you can redistribute it and/or modify +## IcePick is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or (at ## your option) any later version. ## -## GNU Classpath is distributed in the hope that it will be useful, but +## IcePick is distributed in the hope that it will be useful, but ## WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ## General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with GNU Classpath; if not, write to the Free Software +## along with IcePick; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 ## USA. ## -## Linking this library statically or dynamically with other modules is -## making a combined work based on this library. Thus, the terms and -## conditions of the GNU General Public License cover the whole -## combination. -## -## As a special exception, the copyright holders of this library give you -## permission to link this library with independent modules to produce an -## executable, regardless of the license terms of these independent -## modules, and to copy and distribute the resulting executable under -## terms of your choice, provided that you also meet, for each linked -## independent module, the terms and conditions of the license of that -## module. An independent module is a module which is not derived from -## or based on this library. If you modify this library, you may extend -## this exception to your version of the library, but you are not -## obligated to do so. If you do not wish to do so, delete this -## exception statement from your version. -## -## A simple shell script to launch the GNU Classpath appletviewer tool. +## A simple shell script to launch the APT tool. ## prefix=@prefix@ diff -r b04bfca58e58 -r 23c4c196778a tools/javac.in --- a/tools/javac.in Thu Nov 29 16:46:44 2007 +0000 +++ b/tools/javac.in Mon Dec 03 20:44:39 2007 +0000 @@ -1,42 +1,25 @@ #!/bin/sh -## Copyright (C) 2006 Free Software Foundation, Inc. +## Copyright (C) 2007 Andrew John Hughes ## -## This file is a part of GNU Classpath. +## This file is a part of IcePick. ## -## GNU Classpath is free software; you can redistribute it and/or modify +## IcePick is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or (at ## your option) any later version. ## -## GNU Classpath is distributed in the hope that it will be useful, but +## IcePick is distributed in the hope that it will be useful, but ## WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ## General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with GNU Classpath; if not, write to the Free Software +## along with IcePick; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 ## USA. ## -## Linking this library statically or dynamically with other modules is -## making a combined work based on this library. Thus, the terms and -## conditions of the GNU General Public License cover the whole -## combination. -## -## As a special exception, the copyright holders of this library give you -## permission to link this library with independent modules to produce an -## executable, regardless of the license terms of these independent -## modules, and to copy and distribute the resulting executable under -## terms of your choice, provided that you also meet, for each linked -## independent module, the terms and conditions of the license of that -## module. An independent module is a module which is not derived from -## or based on this library. If you modify this library, you may extend -## this exception to your version of the library, but you are not -## obligated to do so. If you do not wish to do so, delete this -## exception statement from your version. -## -## A simple shell script to launch the GNU Classpath appletviewer tool. +## A simple shell script to launch the javac tool. ## prefix=@prefix@ diff -r b04bfca58e58 -r 23c4c196778a tools/javadoc.in --- a/tools/javadoc.in Thu Nov 29 16:46:44 2007 +0000 +++ b/tools/javadoc.in Mon Dec 03 20:44:39 2007 +0000 @@ -1,42 +1,25 @@ #!/bin/sh -## Copyright (C) 2006 Free Software Foundation, Inc. +## Copyright (C) 2007 Andrew John Hughes ## -## This file is a part of GNU Classpath. +## This file is a part of IcePick. ## -## GNU Classpath is free software; you can redistribute it and/or modify +## IcePick is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or (at ## your option) any later version. ## -## GNU Classpath is distributed in the hope that it will be useful, but +## IcePick is distributed in the hope that it will be useful, but ## WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ## General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with GNU Classpath; if not, write to the Free Software +## along with IcePick; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 ## USA. ## -## Linking this library statically or dynamically with other modules is -## making a combined work based on this library. Thus, the terms and -## conditions of the GNU General Public License cover the whole -## combination. -## -## As a special exception, the copyright holders of this library give you -## permission to link this library with independent modules to produce an -## executable, regardless of the license terms of these independent -## modules, and to copy and distribute the resulting executable under -## terms of your choice, provided that you also meet, for each linked -## independent module, the terms and conditions of the license of that -## module. An independent module is a module which is not derived from -## or based on this library. If you modify this library, you may extend -## this exception to your version of the library, but you are not -## obligated to do so. If you do not wish to do so, delete this -## exception statement from your version. -## -## A simple shell script to launch the GNU Classpath appletviewer tool. +## A simple shell script to launch the javadoc tool. ## prefix=@prefix@ diff -r b04bfca58e58 -r 23c4c196778a tools/javah.in --- a/tools/javah.in Thu Nov 29 16:46:44 2007 +0000 +++ b/tools/javah.in Mon Dec 03 20:44:39 2007 +0000 @@ -1,43 +1,25 @@ #!/bin/sh -## Copyright (C) 2006 Free Software Foundation, Inc. +## Copyright (C) 2007 Andrew John Hughes ## -## This file is a part of GNU Classpath. +## This file is a part of IcePick. ## -## GNU Classpath is free software; you can redistribute it and/or modify +## IcePick is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or (at ## your option) any later version. ## -## GNU Classpath is distributed in the hope that it will be useful, but +## IcePick is distributed in the hope that it will be useful, but ## WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ## General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with GNU Classpath; if not, write to the Free Software +## along with IcePick; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 ## USA. ## -## Linking this library statically or dynamically with other modules is -## making a combined work based on this library. Thus, the terms and -## conditions of the GNU General Public License cover the whole -## combination. -## -## As a special exception, the copyright holders of this library give you -## permission to link this library with independent modules to produce an -## executable, regardless of the license terms of these independent -## modules, and to copy and distribute the resulting executable under -## terms of your choice, provided that you also meet, for each linked -## independent module, the terms and conditions of the license of that -## module. An independent module is a module which is not derived from -## or based on this library. If you modify this library, you may extend -## this exception to your version of the library, but you are not -## obligated to do so. If you do not wish to do so, delete this -## exception statement from your version. -## -## A simple shell script to launch the GNU Classpath appletviewer tool. -## +## A simple shell script to launch the javah tool. prefix=@prefix@ datarootdir=@datarootdir@ From gnu_andrew at member.fsf.org Mon Dec 3 13:45:40 2007 From: gnu_andrew at member.fsf.org (gnu_andrew at member.fsf.org) Date: Mon, 03 Dec 2007 21:45:40 +0000 Subject: changeset in /hg/icepick: Add javap support. Message-ID: changeset dc6721b486c7 in /hg/icepick details: http://icedtea.classpath.org/hg/icepick?cmd=changeset;node=dc6721b486c7 description: Add javap support. diffstat: 5 files changed, 44 insertions(+), 2 deletions(-) AUTHORS | 2 +- ChangeLog | 10 ++++++++++ Makefile.am | 3 ++- configure.ac | 2 ++ tools/javap.in | 29 +++++++++++++++++++++++++++++ diffs (89 lines): diff -r 23c4c196778a -r dc6721b486c7 AUTHORS --- a/AUTHORS Mon Dec 03 20:44:39 2007 +0000 +++ b/AUTHORS Mon Dec 03 21:07:30 2007 +0000 @@ -1,5 +1,5 @@ The following have made major contributi The following have made major contributions to the IcePick -project. See also the THANKYOU file, which lists people who have +project. See also the THANKS file, which lists people who have caught bugs or submitted minor patches. If your name does not appear on either list, but should, let us know. Please keep this list in alphabetic order. diff -r 23c4c196778a -r dc6721b486c7 ChangeLog --- a/ChangeLog Mon Dec 03 20:44:39 2007 +0000 +++ b/ChangeLog Mon Dec 03 21:07:30 2007 +0000 @@ -1,3 +1,13 @@ 2007-12-03 Andrew John Hughes + + * AUTHORS: + Corrected reference to THANKS. + * configure.ac: + Create javap wrapper script. + * Makefile.am: + Compile javap. + * tools/javap.in: New file. + 2007-12-03 Andrew John Hughes * THANKS: diff -r 23c4c196778a -r dc6721b486c7 Makefile.am --- a/Makefile.am Mon Dec 03 20:44:39 2007 +0000 +++ b/Makefile.am Mon Dec 03 21:07:30 2007 +0000 @@ -73,7 +73,8 @@ TOOLS_JAVA_FILES = $(OPENJDK_CLASSES)/co $(OPENJDK_CLASSES)/com/sun/tools/doclets/internal/toolkit/taglets/*.java \ $(OPENJDK_CLASSES)/com/sun/tools/doclets/internal/toolkit/util/*.java \ $(OPENJDK_CLASSES)/com/sun/tools/doclets/internal/toolkit/util/links/*.java \ - $(OPENJDK_CLASSES)/com/sun/tools/doclets/standard/*.java + $(OPENJDK_CLASSES)/com/sun/tools/doclets/standard/*.java \ + $(OPENJDK_CLASSES)/sun/tools/javap/*.java # The zip files with classes we want to produce. TOOLS_ZIP = tools.jar diff -r 23c4c196778a -r dc6721b486c7 configure.ac --- a/configure.ac Mon Dec 03 20:44:39 2007 +0000 +++ b/configure.ac Mon Dec 03 21:07:30 2007 +0000 @@ -93,10 +93,12 @@ tools/apt tools/apt tools/javac tools/javah +tools/javap tools/javadoc]) AC_CONFIG_COMMANDS([apt],[chmod 755 tools/apt]) AC_CONFIG_COMMANDS([javac],[chmod 755 tools/javac]) AC_CONFIG_COMMANDS([javah],[chmod 755 tools/javah]) +AC_CONFIG_COMMANDS([javap],[chmod 755 tools/javap]) AC_CONFIG_COMMANDS([javadoc],[chmod 755 tools/javadoc]) AC_OUTPUT diff -r 23c4c196778a -r dc6721b486c7 tools/javap.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/javap.in Mon Dec 03 21:07:30 2007 +0000 @@ -0,0 +1,29 @@ +#!/bin/sh + +## Copyright (C) 2007 Andrew John Hughes +## +## This file is a part of IcePick. +## +## IcePick is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 2 of the License, or (at +## your option) any later version. +## +## IcePick is distributed in the hope that it will be useful, but +## WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with IcePick; if not, write to the Free Software +## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 +## USA. +## +## A simple shell script to launch the javap tool. + +prefix=@prefix@ +datarootdir=@datarootdir@ +tools_dir=${prefix}/lib +tools_cp=${tools_dir}/tools.jar + +exec @VM_BINARY@ -Xbootclasspath/p:"${tools_cp}" sun.tools.javap.Main "$@" From gnu_andrew at member.fsf.org Mon Dec 3 13:54:33 2007 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Mon, 3 Dec 2007 21:54:33 +0000 Subject: Announcing IcePick, a build framework for compiling the langtools Message-ID: <200712032154.44078.gnu_andrew@member.fsf.org> The aim of the IcePick project is to allow the language tools (javac, javadoc, javah, javap, apt) from the OpenJDK project to be built separately using any 1.5 compliant Java compiler. This is primarily motivated by a desire to allow these tools to be used with virtual machines that make use of the GNU Classpath library rather than simply as part of the larger IcedTea or OpenJDK distribution with the HotSpot or CACAO virtual machines. The advantages of using this toolset as opposed to existing tools distributed with Classpath-based solutions are: * A 1.5 capable Javadoc generator (gjdoc still needs support for the new constructs) * Provision of the apt tool for which there is no other Free software solution. This tool is needed to build the JikesRVM. * More heavily tested implementations of javac, javah and javap than those provided by ecj and the GNU Classpath tools Unlike IcedTea, IcePick's only dependency is a 1.5 capable compiler which can be provided by ecj, a gcj which uses ecj or an existing copy of javac. Because the OpenJDK class libraries and HotSpot are not being built, their requisite dependencies (see BuildRequirements are no longer needed. As a result, IcePick is buildable on a wider range of systems including those not yet supported by IcedTea. This includes those architectures other than x86, x86_64, ppc and ppc64 (the latter two having experimental support on IcedTea thanks to Gary Benson) and systems which can't meet the arduous build requirements of IcedTea/OpenJDK. It also provides a solution for users who want the OpenJDK toolset but don't want to build the entire distribution. It's still fairly untested so please try and give it a whirl and let me know of any problems. Details of how to check it out and build are on the IcedTea wiki: http://icedtea.classpath.org/wiki/IcePick Bugs: http://icedtea.classpath.org/bugzilla/ Thanks, -- Andrew :-) Help end the Java Trap! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20071203/f4e9eb91/attachment.bin From bugzilla-daemon at icedtea.classpath.org Mon Dec 3 16:13:53 2007 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 04 Dec 2007 00:13:53 +0000 Subject: [Bug 76] gcjwebplugin AppletViewer HTML parsing: incorrect value for width/height attribute "100%" Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=76 ------- Comment #1 from jarkko.lietolahti at jab.fi 2007-12-04 00:13 ------- If one looks at the code from sun.applet.AppletViewerPanel.getWidth(AppletViewerPanel.java:134) it looks like this: Which suggest that the browser(? or something else other than the appletviewer) has to modify the and replace 100% with the current value of "100%". E.g. becomes (on the browser) which is what the appletviewer receives. So this seems to be some kind of integration problem. /** * Get the width. */ public int getWidth() { String w = getParameter("width"); if (w != null) { return Integer.valueOf(w).intValue(); } return 0; } -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Mon Dec 3 16:23:44 2007 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 04 Dec 2007 00:23:44 +0000 Subject: [Bug 76] gcjwebplugin AppletViewer HTML parsing: incorrect value for width/height attribute "100%" Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=76 ------- Comment #2 from jarkko.lietolahti at jab.fi 2007-12-04 00:23 ------- In gcjwebplugin.cc there's a code block that could be suitable for doing the transformation from 100% --> real value. It seems to have all the required information present. gcjwebplugin.cc // The last plugin window width sent to us by the browser. guint32 window_width; // The last plugin window height sent to us by the browser. guint32 window_height; // Build up the applet tag string that we'll send to the applet // viewer. static gchar* plugin_create_applet_tag (int16 argc, char* argn[], char* argv[]) { ... else if (!g_ascii_strcasecmp (argn[i], "width")) { gchar* width = g_strdup_printf ("WIDTH=\"%s\" ", argv[i]); applet_tag = g_strconcat (applet_tag, width, NULL); g_free (width); width = NULL; } Just check if argv[i] ends in % and do little calculation and voila. And same thing for the height. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Mon Dec 3 18:45:55 2007 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 04 Dec 2007 02:45:55 +0000 Subject: [Bug 85] New: java.lang.NoClassDefFoundError: sun/plugin/javascript/JSContext Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=85 Summary: java.lang.NoClassDefFoundError: sun/plugin/javascript/JSContext Product: IcedTea Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: jarkko.lietolahti at jab.fi PIPE: plugin read: status error: java.lang.NoClassDefFoundError: sun/plugin/javascript/JSContext. GCJ PLUGIN: thread 0x6194b0: plugin_in_pipe_callback return PIPE: appletviewer wrote: status error: java.lang.NoClassDefFoundError: sun/plugin/javascript/JSContext. java.lang.NoClassDefFoundError: sun/plugin/javascript/JSContext at netscape.javascript.JSObject.getWindow(Unknown Source) at procountor.applet.B.C(Unknown Source) at procountor.applet.I.(Unknown Source) at procountor.applet.PApplet.start(Unknown Source) at sun.applet.AppletPanel.run(AppletPanel.java:475) at java.lang.Thread.run(Thread.java:674) Caused by: java.lang.ClassNotFoundException: sun.plugin.javascript.JSContext at sun.applet.AppletClassLoader.findClass(AppletClassLoader.java:201) at java.lang.ClassLoader.loadClass(ClassLoader.java:323) at sun.applet.AppletClassLoader.loadClass(AppletClassLoader.java:145) at java.lang.ClassLoader.loadClass(ClassLoader.java:268) at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:336) ... 6 more Caused by: java.io.IOException: open HTTP connection failed. at sun.applet.AppletClassLoader.getBytes(AppletClassLoader.java:304) at sun.applet.AppletClassLoader.access$100(AppletClassLoader.java:62) at sun.applet.AppletClassLoader$1.run(AppletClassLoader.java:191) at java.security.AccessController.doPrivileged(Native Method) at sun.applet.AppletClassLoader.findClass(AppletClassLoader.java:188) ... 10 more -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Mon Dec 3 18:53:18 2007 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 04 Dec 2007 02:53:18 +0000 Subject: [Bug 84] jar c0mf@ causes error "Illegal option: @" Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=84 ------- Comment #3 from jarkko.lietolahti at jab.fi 2007-12-04 02:53 ------- The problem was related to the version/vendor of the jar program used during early parts of the building. jarkko at azkaban:~$ readlink -f /usr/bin/jar /usr/bin/fastjar Actually it was gjar that supports the @ and Sun's (or somebody else's doesn't). fastjar --help Usage: fastjar {ctxuV}[vfm0ME@] [jar-file] [manifest-file] [-C dir] files ... I changed jar to something else (maybe it's from Sun's JDK bin/jar) and the build finished. Now after initial succesful build it's using some other jar to everything seems to work during rebuild (not from clean source). -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Mon Dec 3 18:56:19 2007 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 04 Dec 2007 02:56:19 +0000 Subject: [Bug 84] jar c0mf@ causes error "Illegal option: @" Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=84 ------- Comment #4 from jarkko.lietolahti at jab.fi 2007-12-04 02:56 ------- No, actually the current ./openjdk/control/build/linux-amd64/bin/jar or /home/jarkko/Desktop/23/jarkko/src/icedtea/bootstrap/jdk1.6.0/bin/jar doesn't support the @ parameter. I need to find out which jar was working ok. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Mon Dec 3 19:51:27 2007 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 04 Dec 2007 03:51:27 +0000 Subject: [Bug 85] java.lang.NoClassDefFoundError: sun/plugin/javascript/JSContext Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=85 ------- Comment #1 from langel at redhat.com 2007-12-04 03:51 ------- javascript is still encumbered. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From gbenson at redhat.com Tue Dec 4 01:24:56 2007 From: gbenson at redhat.com (Gary Benson) Date: Tue, 04 Dec 2007 09:24:56 +0000 Subject: changeset in /hg/icedtea: 2007-12-04 Gary Benson changeset 97b0531d1956 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=97b0531d1956 description: 2007-12-04 Gary Benson * patches/icedtea-c1-unimplemented.patch: New file. * Makefile.am (ICEDTEA_PATCHES): Add the above. * Makefile.in: Regenerate. * ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp (is_simm, is_simm16): New methods. * ports/hotspot/src/cpu/ppc/vm/c1_CodeStubs_ppc.cpp (RangeCheckStub::RangeCheckStub): Implement. (NewInstanceStub::NewInstanceStub): Likewise. (NewInstanceStub::emit_code): Re-stub. * ports/hotspot/src/cpu/ppc/vm/c1_Defs_ppc.hpp (pd_nof_cpu_regs_frame_map): Set. (pd_nof_fpu_regs_frame_map): Likewise. (pd_nof_caller_save_cpu_regs_frame_map): Likewise. (pd_nof_caller_save_fpu_regs_frame_map): Likewise. (pd_nof_cpu_regs_linearscan): Likewise. (pd_nof_fpu_regs_linearscan): Likewise. (pd_first_cpu_reg): Likewise. (pd_last_cpu_reg): Likewise. (pd_last_fpu_reg): Likewise. * ports/hotspot/src/cpu/ppc/vm/c1_FrameMap_ppc.hpp (gpr_opr, gpr_oop_opr, fpr_opr): New fields. (as_long_opr): New method. * ports/hotspot/src/cpu/ppc/vm/c1_FrameMap_ppc.cpp (FrameMap::init): Partially implement. (FrameMap::map_to_opr): Likewise. (FrameMap::validate_frame): Likewise. * ports/hotspot/src/cpu/ppc/vm/c1_LIRAssembler_ppc.hpp (emit_unimplemented): New method. * ports/hotspot/src/cpu/ppc/vm/c1_LIRAssembler_ppc.cpp (receiverOpr): Partially implement. (initial_frame_size_in_bytes): Implement. (check_icache): Re-stub. (emit_exception_handler): Likewise. (emit_deopt_handler): Likewise. (align_call): Implement. (call): Re-stub. (const2mem): Likewise. (const2reg): Likewise. (reg2reg): Likewise. (reg2mem): Likewise. (return_op): Likewise. (emit_static_call_stub): Likewise. (shift_op): Likewise. (emit_alloc_obj): Likewise. (peephole): Implement. (emit_unimplemented): New method. * ports/hotspot/src/cpu/ppc/vm/c1_LIRGenerator_ppc.cpp (load_byte_item): Implement. (load_nonconstant): Likewise. (result_register_for): Partially implement. (can_store_as_constant): Implement. (can_inline_as_constant): Likewise. (generate_address): Implement. (emit_array_address): Partially implement. (cmp_reg_mem): Re-stub. (strength_reduce_multiply): Implement. (do_ArithmeticOp_Int): New method. (do_ArithmeticOp): Partially implement. (do_NewInstance): Likewise. (do_BlockBegin): Re-stub. (do_If): Likewise. * ports/hotspot/src/cpu/ppc/vm/c1_LinearScan_ppc.cpp (is_processed_reg_num): Partially implement. (num_physical_regs): Likewise. (requires_adjacent_regs): Implement. (pd_add_temps): Likewise. (pd_init_regs_for_alloc): Partially implement. * ports/hotspot/src/cpu/ppc/vm/c1_MacroAssembler_ppc.hpp (pd_init): Implement. * ports/hotspot/src/cpu/ppc/vm/c1_MacroAssembler_ppc.cpp (verified_entry): Re-stub. (build_frame): Likewise. * ports/hotspot/src/cpu/ppc/vm/c1_Runtime1_ppc.cpp (generate_code_for): Re-stub. * ports/hotspot/src/cpu/ppc/vm/nativeInst_ppc.hpp (NativeJump::check_verified_entry_alignment): Implement. (NativeJump::patch_verified_entry): Likewise. * ports/hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp (out_preserve_stack_slots): Partially implement. * ports/hotspot/src/cpu/ppc/vm/vmreg_ppc.cpp (is_Register): New method. (is_FloatRegister): Likewise. (as_Register): Implement. (as_FloatRegister): Likewise. * ports/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp (non_memory_address_word): Implement. diffstat: 20 files changed, 1337 insertions(+), 554 deletions(-) ChangeLog | 90 ++ Makefile.am | 1 Makefile.in | 1 patches/icedtea-c1-unimplemented.patch | 136 +++ ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp | 12 ports/hotspot/src/cpu/ppc/vm/c1_CodeStubs_ppc.cpp | 18 ports/hotspot/src/cpu/ppc/vm/c1_Defs_ppc.hpp | 18 ports/hotspot/src/cpu/ppc/vm/c1_FrameMap_ppc.cpp | 61 + ports/hotspot/src/cpu/ppc/vm/c1_FrameMap_ppc.hpp | 8 ports/hotspot/src/cpu/ppc/vm/c1_LIRAssembler_ppc.cpp | 578 ++++++------- ports/hotspot/src/cpu/ppc/vm/c1_LIRAssembler_ppc.hpp | 2 ports/hotspot/src/cpu/ppc/vm/c1_LIRGenerator_ppc.cpp | 692 ++++++++++------ ports/hotspot/src/cpu/ppc/vm/c1_LinearScan_ppc.cpp | 25 ports/hotspot/src/cpu/ppc/vm/c1_MacroAssembler_ppc.cpp | 4 ports/hotspot/src/cpu/ppc/vm/c1_MacroAssembler_ppc.hpp | 2 ports/hotspot/src/cpu/ppc/vm/c1_Runtime1_ppc.cpp | 199 ++++ ports/hotspot/src/cpu/ppc/vm/nativeInst_ppc.hpp | 8 ports/hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp | 6 ports/hotspot/src/cpu/ppc/vm/vmreg_ppc.cpp | 25 ports/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp | 5 diffs (truncated from 2182 to 500 lines): diff -r 62c402e6e198 -r 97b0531d1956 ChangeLog --- a/ChangeLog Fri Nov 30 11:25:24 2007 -0500 +++ b/ChangeLog Tue Dec 04 04:24:44 2007 -0500 @@ -1,3 +1,93 @@ 2007-11-30 Gary Benson + + * patches/icedtea-c1-unimplemented.patch: New file. + * Makefile.am (ICEDTEA_PATCHES): Add the above. + * Makefile.in: Regenerate. + + * ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp + (is_simm, is_simm16): New methods. + * ports/hotspot/src/cpu/ppc/vm/c1_CodeStubs_ppc.cpp + (RangeCheckStub::RangeCheckStub): Implement. + (NewInstanceStub::NewInstanceStub): Likewise. + (NewInstanceStub::emit_code): Re-stub. + * ports/hotspot/src/cpu/ppc/vm/c1_Defs_ppc.hpp + (pd_nof_cpu_regs_frame_map): Set. + (pd_nof_fpu_regs_frame_map): Likewise. + (pd_nof_caller_save_cpu_regs_frame_map): Likewise. + (pd_nof_caller_save_fpu_regs_frame_map): Likewise. + (pd_nof_cpu_regs_linearscan): Likewise. + (pd_nof_fpu_regs_linearscan): Likewise. + (pd_first_cpu_reg): Likewise. + (pd_last_cpu_reg): Likewise. + (pd_last_fpu_reg): Likewise. + * ports/hotspot/src/cpu/ppc/vm/c1_FrameMap_ppc.hpp + (gpr_opr, gpr_oop_opr, fpr_opr): New fields. + (as_long_opr): New method. + * ports/hotspot/src/cpu/ppc/vm/c1_FrameMap_ppc.cpp + (FrameMap::init): Partially implement. + (FrameMap::map_to_opr): Likewise. + (FrameMap::validate_frame): Likewise. + * ports/hotspot/src/cpu/ppc/vm/c1_LIRAssembler_ppc.hpp + (emit_unimplemented): New method. + * ports/hotspot/src/cpu/ppc/vm/c1_LIRAssembler_ppc.cpp + (receiverOpr): Partially implement. + (initial_frame_size_in_bytes): Implement. + (check_icache): Re-stub. + (emit_exception_handler): Likewise. + (emit_deopt_handler): Likewise. + (align_call): Implement. + (call): Re-stub. + (const2mem): Likewise. + (const2reg): Likewise. + (reg2reg): Likewise. + (reg2mem): Likewise. + (return_op): Likewise. + (emit_static_call_stub): Likewise. + (shift_op): Likewise. + (emit_alloc_obj): Likewise. + (peephole): Implement. + (emit_unimplemented): New method. + * ports/hotspot/src/cpu/ppc/vm/c1_LIRGenerator_ppc.cpp + (load_byte_item): Implement. + (load_nonconstant): Likewise. + (result_register_for): Partially implement. + (can_store_as_constant): Implement. + (can_inline_as_constant): Likewise. + (generate_address): Implement. + (emit_array_address): Partially implement. + (cmp_reg_mem): Re-stub. + (strength_reduce_multiply): Implement. + (do_ArithmeticOp_Int): New method. + (do_ArithmeticOp): Partially implement. + (do_NewInstance): Likewise. + (do_BlockBegin): Re-stub. + (do_If): Likewise. + * ports/hotspot/src/cpu/ppc/vm/c1_LinearScan_ppc.cpp + (is_processed_reg_num): Partially implement. + (num_physical_regs): Likewise. + (requires_adjacent_regs): Implement. + (pd_add_temps): Likewise. + (pd_init_regs_for_alloc): Partially implement. + * ports/hotspot/src/cpu/ppc/vm/c1_MacroAssembler_ppc.hpp + (pd_init): Implement. + * ports/hotspot/src/cpu/ppc/vm/c1_MacroAssembler_ppc.cpp + (verified_entry): Re-stub. + (build_frame): Likewise. + * ports/hotspot/src/cpu/ppc/vm/c1_Runtime1_ppc.cpp + (generate_code_for): Re-stub. + * ports/hotspot/src/cpu/ppc/vm/nativeInst_ppc.hpp + (NativeJump::check_verified_entry_alignment): Implement. + (NativeJump::patch_verified_entry): Likewise. + * ports/hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp + (out_preserve_stack_slots): Partially implement. + * ports/hotspot/src/cpu/ppc/vm/vmreg_ppc.cpp + (is_Register): New method. + (is_FloatRegister): Likewise. + (as_Register): Implement. + (as_FloatRegister): Likewise. + * ports/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp + (non_memory_address_word): Implement. + 2007-11-30 Gary Benson * ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp diff -r 62c402e6e198 -r 97b0531d1956 Makefile.am --- a/Makefile.am Fri Nov 30 11:25:24 2007 -0500 +++ b/Makefile.am Tue Dec 04 04:24:44 2007 -0500 @@ -204,6 +204,7 @@ ICEDTEA_PATCHES = \ patches/icedtea-linker-options.patch \ patches/icedtea-ports.patch \ patches/icedtea-lcms-leak.patch \ + patches/icedtea-c1-unimplemented.patch \ $(FAST_BUILD_PATCH) \ $(DISTRIBUTION_PATCHES) diff -r 62c402e6e198 -r 97b0531d1956 Makefile.in --- a/Makefile.in Fri Nov 30 11:25:24 2007 -0500 +++ b/Makefile.in Tue Dec 04 04:24:44 2007 -0500 @@ -312,6 +312,7 @@ ICEDTEA_PATCHES = \ patches/icedtea-linker-options.patch \ patches/icedtea-ports.patch \ patches/icedtea-lcms-leak.patch \ + patches/icedtea-c1-unimplemented.patch \ $(FAST_BUILD_PATCH) \ $(DISTRIBUTION_PATCHES) diff -r 62c402e6e198 -r 97b0531d1956 patches/icedtea-c1-unimplemented.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-c1-unimplemented.patch Tue Dec 04 04:24:44 2007 -0500 @@ -0,0 +1,136 @@ +--- openjdk-ecj/hotspot/src/share/vm/c1/c1_LIR.hpp 2007-12-03 09:55:25.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/c1/c1_LIR.hpp 2007-12-03 09:30:13.000000000 +0000 +@@ -656,6 +656,9 @@ + class LIR_OpTypeCheck; + class LIR_OpCompareAndSwap; + class LIR_OpProfileCall; ++#ifdef PPC ++class LIR_OpUnimplemented; ++#endif + + + // LIR operation codes +@@ -764,6 +767,11 @@ + , begin_opMDOProfile + , lir_profile_call + , end_opMDOProfile ++#ifdef PPC ++ , begin_opUnimplemented ++ , lir_unimplemented ++ , end_opUnimplemented ++#endif + }; + + +@@ -898,6 +906,9 @@ + virtual LIR_OpTypeCheck* as_OpTypeCheck() { return NULL; } + virtual LIR_OpCompareAndSwap* as_OpCompareAndSwap() { return NULL; } + virtual LIR_OpProfileCall* as_OpProfileCall() { return NULL; } ++#ifdef PPC ++ virtual LIR_OpUnimplemented* as_OpUnimplemented() { return NULL; } ++#endif + + virtual void verify() const {} + }; +@@ -1579,6 +1590,24 @@ + virtual void print_instr(outputStream* out) const PRODUCT_RETURN; + }; + ++#ifdef PPC ++// LIR_OpUnimplemented ++class LIR_OpUnimplemented : public LIR_Op { ++ private: ++ const char* _file; ++ const int _line; ++ ++ public: ++ LIR_OpUnimplemented(const char* file, int line) ++ : LIR_Op(lir_unimplemented, LIR_OprFact::illegalOpr, NULL), ++ _file(file), ++ _line(line) {} ++ ++ virtual void emit_code(LIR_Assembler* masm); ++ virtual LIR_OpUnimplemented* as_OpUnimplemented() { return this; } ++ virtual void print_instr(outputStream* out) const PRODUCT_RETURN; ++}; ++#endif + + class LIR_InsertionBuffer; + +@@ -1837,6 +1866,14 @@ + + // methodDataOop profiling + void profile_call(ciMethod* method, int bci, LIR_Opr mdo, LIR_Opr recv, LIR_Opr t1, ciKlass* cha_klass) { append(new LIR_OpProfileCall(lir_profile_call, method, bci, mdo, recv, t1, cha_klass)); } ++ ++ // stubbing ++#ifdef PPC ++ void unimplemented(const char* file, int line) ++ { ++ append(new LIR_OpUnimplemented(file, line)); ++ } ++#endif + }; + + void print_LIR(BlockList* blocks); +--- openjdk-ecj/hotspot/src/share/vm/c1/c1_LIR.cpp 2007-12-03 09:55:25.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/c1/c1_LIR.cpp 2007-12-03 09:50:04.000000000 +0000 +@@ -861,6 +861,16 @@ + break; + } + ++#ifdef PPC ++// LIR_OpUnimplemented: ++ case lir_unimplemented: { ++ assert(op->as_OpUnimplemented() != NULL, "must be"); ++ assert(op->_info == NULL, "info not used by this instruction"); ++ assert(op->_result->is_illegal(), "not used"); ++ break; ++ } ++#endif ++ + default: + ShouldNotReachHere(); + } +@@ -1003,6 +1013,12 @@ + masm->emit_profile_call(this); + } + ++#ifdef PPC ++void LIR_OpUnimplemented::emit_code(LIR_Assembler* masm) { ++ masm->emit_unimplemented(_file, _line); ++} ++#endif ++ + + // LIR_List + LIR_List::LIR_List(Compilation* compilation, BlockBegin* block) +@@ -1617,6 +1633,10 @@ + case lir_cas_int: s = "cas_int"; break; + // LIR_OpProfileCall + case lir_profile_call: s = "profile_call"; break; ++#ifdef PPC ++ // LIR_OpUnimplemented ++ case lir_unimplemented: s = "unimplemented"; break; ++#endif + + case lir_none: ShouldNotReachHere();break; + default: s = "illegal_op"; break; +@@ -1869,6 +1889,18 @@ + tmp1()->print(out); out->print(" "); + } + ++#ifdef PPC ++// LIR_OpUnimplemented ++void LIR_OpUnimplemented::print_instr(outputStream* out) const { ++ char sep = os::file_separator()[0]; ++ const char *file = strrchr(_file, sep); ++ if (file) ++ file++; ++ else ++ file = _file; ++ out->print("[%s:%d]", file, _line); ++} ++#endif // PPC + + #endif // PRODUCT + diff -r 62c402e6e198 -r 97b0531d1956 ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp --- a/ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp Fri Nov 30 11:25:24 2007 -0500 +++ b/ports/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp Tue Dec 04 04:24:44 2007 -0500 @@ -65,6 +65,18 @@ class Assembler : public AbstractAssembl class Assembler : public AbstractAssembler { public: Assembler(CodeBuffer* code) : AbstractAssembler(code) {} + + private: + static bool is_simm(int x, int nbits) + { + return -(1 << nbits - 1) <= x && x < (1 << nbits - 1); + } + + public: + static bool is_simm16(int x) + { + return is_simm(x, 16); + } private: // Instruction emitters for the various forms. diff -r 62c402e6e198 -r 97b0531d1956 ports/hotspot/src/cpu/ppc/vm/c1_CodeStubs_ppc.cpp --- a/ports/hotspot/src/cpu/ppc/vm/c1_CodeStubs_ppc.cpp Fri Nov 30 11:25:24 2007 -0500 +++ b/ports/hotspot/src/cpu/ppc/vm/c1_CodeStubs_ppc.cpp Tue Dec 04 04:24:44 2007 -0500 @@ -26,10 +26,14 @@ #include "incls/_precompiled.incl" #include "incls/_c1_CodeStubs_ppc.cpp.incl" +#define __ ce->masm()-> + RangeCheckStub::RangeCheckStub(CodeEmitInfo* info, LIR_Opr index, bool throw_index_out_of_bounds_exception) + : _throw_index_out_of_bounds_exception(throw_index_out_of_bounds_exception), + _index(index) { - Unimplemented(); + _info = new CodeEmitInfo(info); } void RangeCheckStub::emit_code(LIR_Assembler* ce) @@ -46,12 +50,20 @@ NewInstanceStub::NewInstanceStub(LIR_Opr ciInstanceKlass* klass, CodeEmitInfo* info, Runtime1::StubID stub_id) { - Unimplemented(); + _result = result; + _klass = klass; + _klass_reg = klass_reg; + _info = new CodeEmitInfo(info); + assert(stub_id == Runtime1::new_instance_id || + stub_id == Runtime1::fast_new_instance_id || + stub_id == Runtime1::fast_new_instance_init_check_id, + "need new_instance id"); + _stub_id = stub_id; } void NewInstanceStub::emit_code(LIR_Assembler* ce) { - Unimplemented(); + __ unimplemented (__FILE__, __LINE__); } MonitorEnterStub::MonitorEnterStub(LIR_Opr obj_reg, LIR_Opr lock_reg, diff -r 62c402e6e198 -r 97b0531d1956 ports/hotspot/src/cpu/ppc/vm/c1_Defs_ppc.hpp --- a/ports/hotspot/src/cpu/ppc/vm/c1_Defs_ppc.hpp Fri Nov 30 11:25:24 2007 -0500 +++ b/ports/hotspot/src/cpu/ppc/vm/c1_Defs_ppc.hpp Tue Dec 04 04:24:44 2007 -0500 @@ -40,27 +40,27 @@ enum { enum { #ifdef XXX_EVIL_EVIL_EVIL // numbers of registers used during code emission - pd_nof_cpu_regs_frame_map = 0, - pd_nof_fpu_regs_frame_map = 0, + pd_nof_cpu_regs_frame_map = 32, + pd_nof_fpu_regs_frame_map = 32, // numbers of registers killed by calls - pd_nof_caller_save_cpu_regs_frame_map = 1, - pd_nof_caller_save_fpu_regs_frame_map = 1, + pd_nof_caller_save_cpu_regs_frame_map = 11, + pd_nof_caller_save_fpu_regs_frame_map = 14, // numbers of registers visible to register allocator pd_nof_cpu_regs_reg_alloc = 0, pd_nof_fpu_regs_reg_alloc = 0, // numbers of registers visible to linear scan - pd_nof_cpu_regs_linearscan = 0, - pd_nof_fpu_regs_linearscan = 0, + pd_nof_cpu_regs_linearscan = 32, + pd_nof_fpu_regs_linearscan = 32, pd_nof_xmm_regs_linearscan = 0, // specifics - pd_first_cpu_reg = 0, - pd_last_cpu_reg = 0, + pd_first_cpu_reg = 3, // skip r0, r1 and r2 + pd_last_cpu_reg = 30, // skip Rthread pd_first_fpu_reg = 0, - pd_last_fpu_reg = 0, + pd_last_fpu_reg = 31, #endif }; diff -r 62c402e6e198 -r 97b0531d1956 ports/hotspot/src/cpu/ppc/vm/c1_FrameMap_ppc.cpp --- a/ports/hotspot/src/cpu/ppc/vm/c1_FrameMap_ppc.cpp Fri Nov 30 11:25:24 2007 -0500 +++ b/ports/hotspot/src/cpu/ppc/vm/c1_FrameMap_ppc.cpp Tue Dec 04 04:24:44 2007 -0500 @@ -26,22 +26,69 @@ #include "incls/_precompiled.incl" #include "incls/_c1_FrameMap_ppc.cpp.incl" -void FrameMap::init() +LIR_Opr FrameMap::map_to_opr(BasicType type, VMRegPair* reg, bool) { - Unimplemented(); + LIR_Opr opr = LIR_OprFact::illegalOpr; + VMReg r_1 = reg->first(); + VMReg r_2 = reg->second(); + if (r_1->is_stack()) { + Unimplemented(); + } + else if (r_1->is_Register()) { + Register reg = r_1->as_Register(); + if (r_2->is_Register()) { + Register reg2 = r_2->as_Register(); + opr = as_long_opr(reg2, reg); + } else if (type == T_OBJECT) { + opr = as_oop_opr(reg); + } else { + opr = as_opr(reg); + } + } + else if (r_1->is_FloatRegister()) { + Unimplemented(); + } + else { + ShouldNotReachHere(); + } + return opr; } -LIR_Opr FrameMap::map_to_opr(BasicType type, VMRegPair* reg, bool) -{ - Unimplemented(); -} +LIR_Opr FrameMap::gpr_opr[]; +LIR_Opr FrameMap::gpr_oop_opr[]; +LIR_Opr FrameMap::fpr_opr[]; LIR_Opr FrameMap::_caller_save_cpu_regs[] = { 0, }; LIR_Opr FrameMap::_caller_save_fpu_regs[] = { 0, }; +void FrameMap::init() +{ + if (_init_done) + return; + + for (int i = 0; i < nof_cpu_regs; i++) { + map_register(i, as_Register(i)); + gpr_opr[i] = LIR_OprFact::single_cpu(i); + gpr_oop_opr[i] = LIR_OprFact::single_cpu_oop(i); + } + + for (int i = 0, j = 0; j < nof_caller_save_cpu_regs; i++) { + if (i != 1 && i != 2) + _caller_save_cpu_regs[j++] = LIR_OprFact::single_cpu(i); + } + + for (int i = 0; i < nof_caller_save_fpu_regs; i++) { + _caller_save_fpu_regs[i] = LIR_OprFact::single_fpu(i); + } + + _init_done = true; +} + bool FrameMap::validate_frame() { - Unimplemented(); +#ifdef XXX_EVIL_EVIL_EVIL + return true; +#endif } VMReg FrameMap::fpu_regname(int n) diff -r 62c402e6e198 -r 97b0531d1956 ports/hotspot/src/cpu/ppc/vm/c1_FrameMap_ppc.hpp --- a/ports/hotspot/src/cpu/ppc/vm/c1_FrameMap_ppc.hpp Fri Nov 30 11:25:24 2007 -0500 +++ b/ports/hotspot/src/cpu/ppc/vm/c1_FrameMap_ppc.hpp Tue Dec 04 04:24:44 2007 -0500 @@ -31,6 +31,14 @@ #endif }; + static LIR_Opr gpr_opr[nof_cpu_regs]; + static LIR_Opr gpr_oop_opr[nof_cpu_regs]; + static LIR_Opr fpr_opr[nof_fpu_regs]; + + static LIR_Opr as_long_opr(Register r, Register r2) { + return LIR_OprFact::double_cpu(cpu_reg2rnr(r), cpu_reg2rnr(r2)); + } + static VMReg fpu_regname(int n); static bool is_caller_save_register(LIR_Opr reg); diff -r 62c402e6e198 -r 97b0531d1956 ports/hotspot/src/cpu/ppc/vm/c1_LIRAssembler_ppc.cpp --- a/ports/hotspot/src/cpu/ppc/vm/c1_LIRAssembler_ppc.cpp Fri Nov 30 11:25:24 2007 -0500 +++ b/ports/hotspot/src/cpu/ppc/vm/c1_LIRAssembler_ppc.cpp Tue Dec 04 04:24:44 2007 -0500 @@ -26,73 +26,309 @@ #include "incls/_precompiled.incl" #include "incls/_c1_LIRAssembler_ppc.cpp.incl" +#define __ _masm-> + +LIR_Opr LIR_Assembler::receiverOpr() +{ +#ifdef XXX_EVIL_EVIL_EVIL + return FrameMap::gpr_oop_opr[3]; +#endif +} + +LIR_Opr LIR_Assembler::osrBufferPointer() +{ + Unimplemented(); +} + +int LIR_Assembler::initial_frame_size_in_bytes() +{ + return in_bytes(frame_map()->framesize_in_bytes()); +} + +int LIR_Assembler::check_icache() +{ + __ unimplemented (__FILE__, __LINE__); +} + +void LIR_Assembler::osr_entry() +{ + Unimplemented(); +} + +void LIR_Assembler::emit_exception_handler() +{ + compilation()->offsets()->set_value(CodeOffsets::Exceptions, code_offset()); From bugzilla-daemon at icedtea.classpath.org Tue Dec 4 09:29:38 2007 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 04 Dec 2007 17:29:38 +0000 Subject: [Bug 76] gcjwebplugin AppletViewer HTML parsing: incorrect value for width/height attribute "100%" Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=76 langel at redhat.com changed: What |Removed |Added ---------------------------------------------------------------------------- AssignedTo|unassigned at icedtea.classpath|langel at redhat.com |.org | -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Tue Dec 4 11:36:30 2007 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 04 Dec 2007 19:36:30 +0000 Subject: [Bug 84] jar c0mf@ causes error "Illegal option: @" Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=84 ------- Comment #5 from psj at familyjenner.co.uk 2007-12-04 19:36 ------- FWIW there is a thread here: http://developer.classpath.org/pipermail/classpath-patches/2007-July/005551.html about missing @ support in gjar breaking very old builds of OpenJDK and a partial patch to add @ support that I believe was never applied to Classpath. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Tue Dec 4 16:38:19 2007 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 05 Dec 2007 00:38:19 +0000 Subject: [Bug 85] java.lang.NoClassDefFoundError: sun/plugin/javascript/JSContext Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=85 ------- Comment #2 from jarkko.lietolahti at jab.fi 2007-12-05 00:38 ------- Ok, thaks for the info. Is there any way to get scripting work? I tried copying plugin.jar from Sun's JDK to lib/ext to test it, but it didn't work (nothing happened, no error message ). -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From fitzsim at redhat.com Wed Dec 5 08:02:42 2007 From: fitzsim at redhat.com (Thomas Fitzsimmons) Date: Wed, 05 Dec 2007 16:02:42 +0000 Subject: changeset in /hg/icedtea: 2007-12-05 Thomas Fitzsimmons changeset 05d27d2749e5 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=05d27d2749e5 description: 2007-12-05 Thomas Fitzsimmons * Makefile.am (EXTRA_DIST): Add ports directory. * Makefile.in: Regenerate. diffstat: 3 files changed, 7 insertions(+), 2 deletions(-) ChangeLog | 5 +++++ Makefile.am | 2 +- Makefile.in | 2 +- diffs (36 lines): diff -r 97b0531d1956 -r 05d27d2749e5 ChangeLog --- a/ChangeLog Tue Dec 04 04:24:44 2007 -0500 +++ b/ChangeLog Wed Dec 05 11:02:24 2007 -0500 @@ -1,3 +1,8 @@ 2007-12-04 Gary Benson + + * Makefile.am (EXTRA_DIST): Add ports directory. + * Makefile.in: Regenerate. + 2007-12-04 Gary Benson * patches/icedtea-c1-unimplemented.patch: New file. diff -r 97b0531d1956 -r 05d27d2749e5 Makefile.am --- a/Makefile.am Tue Dec 04 04:24:44 2007 -0500 +++ b/Makefile.am Wed Dec 05 11:02:24 2007 -0500 @@ -29,7 +29,7 @@ install: clean-copy clean-rt clean-gcjwebplugin EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \ - gcjwebplugin.cc patches/icedtea-speed.patch tools-copy contrib + gcjwebplugin.cc patches/icedtea-speed.patch tools-copy contrib ports # OpenJDK build environment. LINUX_DIR = linux-$(BUILD_ARCH_DIR) diff -r 97b0531d1956 -r 05d27d2749e5 Makefile.in --- a/Makefile.in Tue Dec 04 04:24:44 2007 -0500 +++ b/Makefile.in Wed Dec 05 11:02:24 2007 -0500 @@ -191,7 +191,7 @@ OPENJDK_DATE = 30_oct_2007 OPENJDK_DATE = 30_oct_2007 OPENJDK_MD5SUM = 7eed137c0321e0b5b75ff2d646ce0d0d EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \ - gcjwebplugin.cc patches/icedtea-speed.patch tools-copy contrib + gcjwebplugin.cc patches/icedtea-speed.patch tools-copy contrib ports # OpenJDK build environment. From bugzilla-daemon at icedtea.classpath.org Fri Dec 7 06:52:11 2007 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 07 Dec 2007 14:52:11 +0000 Subject: [Bug 86] New: audioclip.stop seems not to do anything Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=86 Summary: audioclip.stop seems not to do anything Product: IcedTea Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: plugwash at p10link.net I have a test applet (which I will attatch in a minuite) that plays a sound using audioclip, does a short sleep then stops it. on sun java 6 this works as expected, I hear a very short peice of the start of the sound file. on icedtea the entire sound file plays. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Fri Dec 7 06:52:47 2007 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 07 Dec 2007 14:52:47 +0000 Subject: [Bug 86] audioclip.stop seems not to do anything Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=86 ------- Comment #1 from plugwash at p10link.net 2007-12-07 14:52 ------- Created an attachment (id=38) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=38&action=view) html file for test applet -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Fri Dec 7 06:53:06 2007 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 07 Dec 2007 14:53:06 +0000 Subject: [Bug 86] audioclip.stop seems not to do anything Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=86 ------- Comment #2 from plugwash at p10link.net 2007-12-07 14:53 ------- Created an attachment (id=39) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=39&action=view) source code for test applet -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Fri Dec 7 08:12:52 2007 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 07 Dec 2007 16:12:52 +0000 Subject: [Bug 86] audioclip.stop seems not to do anything Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=86 ------- Comment #3 from jsumali at redhat.com 2007-12-07 16:12 ------- (In reply to comment #0) > I have a test applet (which I will attatch in a minuite) that plays a sound > using audioclip, does a short sleep then stops it. > > on sun java 6 this works as expected, I hear a very short peice of the start of > the sound file. > > on icedtea the entire sound file plays. > I've tested the applet using gcjwebplugin and icedtea b23, and my sound file does only play a short piece -- not the whole thing. What does readlink -f `which java` and java -version give you? -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From psj at familyjenner.co.uk Fri Dec 7 11:19:01 2007 From: psj at familyjenner.co.uk (Paul Jenner) Date: Fri, 07 Dec 2007 19:19:01 +0000 Subject: some replacements for encumbered binary plugs no longer required? Message-ID: <1197055141.3568.12.camel@localhost.localdomain> Hi all. It looks like some of the replacements for encumbered binary plugs in IcedTea are no longer required - as plugs have either been opened or replaced in OpenJDK. As a quick first pass: 1) Ductus renderer: Looks like it was replaced in OpenJDK here: http://mail.openjdk.java.net/pipermail/graphics-rasterizer-dev/2007-October/000049.html Allowing removal of: libdcpr.so (from Makefile.am) rt/sun/dc rt/sun/dc/pr rt/sun/dc/pr/PRException.java rt/sun/dc/pr/PathDasher.java rt/sun/dc/pr/Rasterizer.java rt/sun/dc/pr/PathStroker.java rt/sun/dc/path rt/sun/dc/path/PathException.java rt/sun/dc/path/PathConsumer.java rt/sun/dc/path/FastPathProducer.java 2) Encumbered sound: Looks like it was partially opened here: http://mail.openjdk.java.net/pipermail/sound-dev/2007-September/000037.html Allowing removal of: libjsoundalsa.so (from Makefile.am) libjsound.so (from Makefile.am) (only libjsoundhs.so looks to be needed from the referenced e-mail) 3) Lib2k font library: Looks like it was replaced in OpenJDK here: http://mail.openjdk.java.net/pipermail/2d-dev/2007-August/000037.html Allowing removal of: libt2k.so (from Makefile.am) 4) unused gnu. imports: It looks like: rt/gnu/java/io rt/gnu/java/io/Base64InputStream.java was left over from the merge of GNU crypto and is no longer used. I intended to try a build with these removed to confirm they really weren't required but hit a problem with ecj build (org.xml.sax.helpers not found) so thought I would mail for comment in the meantime. Is there any intention to review and keep the replacement plugs as small as possible - or is it simply not worth the effort of removal now as this is a temporary solution anyway and does not really hurt to leave a few unnecessary ones around? Thanks, Paul -- Paul Jenner From langel at redhat.com Fri Dec 7 11:21:50 2007 From: langel at redhat.com (Lillian Angel) Date: Fri, 07 Dec 2007 14:21:50 -0500 Subject: some replacements for encumbered binary plugs no longer required? In-Reply-To: <1197055141.3568.12.camel@localhost.localdomain> References: <1197055141.3568.12.camel@localhost.localdomain> Message-ID: <47599D4E.1020003@redhat.com> Paul Jenner wrote: > Hi all. > > It looks like some of the replacements for encumbered binary plugs in > IcedTea are no longer required - as plugs have either been opened or > replaced in OpenJDK. > > As a quick first pass: > > 1) Ductus renderer: > > Looks like it was replaced in OpenJDK here: > http://mail.openjdk.java.net/pipermail/graphics-rasterizer-dev/2007-October/000049.html > > Allowing removal of: > > libdcpr.so (from Makefile.am) > > rt/sun/dc > rt/sun/dc/pr > rt/sun/dc/pr/PRException.java > rt/sun/dc/pr/PathDasher.java > rt/sun/dc/pr/Rasterizer.java > rt/sun/dc/pr/PathStroker.java > rt/sun/dc/path > rt/sun/dc/path/PathException.java > rt/sun/dc/path/PathConsumer.java > rt/sun/dc/path/FastPathProducer.java > > 2) Encumbered sound: > > Looks like it was partially opened here: > http://mail.openjdk.java.net/pipermail/sound-dev/2007-September/000037.html > > Allowing removal of: > > libjsoundalsa.so (from Makefile.am) > libjsound.so (from Makefile.am) > > (only libjsoundhs.so looks to be needed from the referenced e-mail) > > 3) Lib2k font library: > > Looks like it was replaced in OpenJDK here: > http://mail.openjdk.java.net/pipermail/2d-dev/2007-August/000037.html > > Allowing removal of: > > libt2k.so (from Makefile.am) > > 4) unused gnu. imports: > > It looks like: > > rt/gnu/java/io > rt/gnu/java/io/Base64InputStream.java > > was left over from the merge of GNU crypto and is no longer used. > > I intended to try a build with these removed to confirm they really > weren't required but hit a problem with ecj build (org.xml.sax.helpers > not found) so thought I would mail for comment in the meantime. > > Is there any intention to review and keep the replacement plugs as small > as possible - or is it simply not worth the effort of removal now as > this is a temporary solution anyway and does not really hurt to leave a > few unnecessary ones around? They will be removed. It doesn't hurt to keep them around, but they are not necessary. Thanks for pointing this out, Lillian From langel at redhat.com Fri Dec 7 11:34:02 2007 From: langel at redhat.com (Lillian Angel) Date: Fri, 07 Dec 2007 14:34:02 -0500 Subject: some replacements for encumbered binary plugs no longer required? In-Reply-To: <47599D4E.1020003@redhat.com> References: <1197055141.3568.12.camel@localhost.localdomain> <47599D4E.1020003@redhat.com> Message-ID: <4759A02A.90503@redhat.com> Hi, Lillian Angel wrote: > > > Paul Jenner wrote: >> Hi all. >> >> It looks like some of the replacements for encumbered binary plugs in >> IcedTea are no longer required - as plugs have either been opened or >> replaced in OpenJDK. >> >> As a quick first pass: >> >> 1) Ductus renderer: >> >> Looks like it was replaced in OpenJDK here: >> http://mail.openjdk.java.net/pipermail/graphics-rasterizer-dev/2007-October/000049.html >> >> >> Allowing removal of: >> >> libdcpr.so (from Makefile.am) >> >> rt/sun/dc >> rt/sun/dc/pr >> rt/sun/dc/pr/PRException.java >> rt/sun/dc/pr/PathDasher.java >> rt/sun/dc/pr/Rasterizer.java >> rt/sun/dc/pr/PathStroker.java >> rt/sun/dc/path >> rt/sun/dc/path/PathException.java >> rt/sun/dc/path/PathConsumer.java >> rt/sun/dc/path/FastPathProducer.java These don't exist in the b23/b24 bundle. Possibly b25 or later? >> >> 2) Encumbered sound: >> >> Looks like it was partially opened here: >> http://mail.openjdk.java.net/pipermail/sound-dev/2007-September/000037.html >> >> >> Allowing removal of: >> >> libjsoundalsa.so (from Makefile.am) >> libjsound.so (from Makefile.am) >> >> (only libjsoundhs.so looks to be needed from the referenced e-mail) I think you are correct here. >> >> 3) Lib2k font library: >> >> Looks like it was replaced in OpenJDK here: >> http://mail.openjdk.java.net/pipermail/2d-dev/2007-August/000037.html >> >> Allowing removal of: >> >> libt2k.so (from Makefile.am) Right. >> >> 4) unused gnu. imports: >> >> It looks like: >> >> rt/gnu/java/io >> rt/gnu/java/io/Base64InputStream.java >> >> was left over from the merge of GNU crypto and is no longer used. Oops. >> >> I intended to try a build with these removed to confirm they really >> weren't required but hit a problem with ecj build (org.xml.sax.helpers >> not found) so thought I would mail for comment in the meantime. >> >> Is there any intention to review and keep the replacement plugs as small >> as possible - or is it simply not worth the effort of removal now as >> this is a temporary solution anyway and does not really hurt to leave a >> few unnecessary ones around? > > They will be removed. It doesn't hurt to keep them around, but they are > not necessary. Lillian From bugzilla-daemon at icedtea.classpath.org Fri Dec 7 11:40:34 2007 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 07 Dec 2007 19:40:34 +0000 Subject: [Bug 86] audioclip.stop seems not to do anything Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=86 plugwash at p10link.net changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |INVALID ------- Comment #4 from plugwash at p10link.net 2007-12-07 19:40 ------- close this bug, it seems the differences I detected with this particular sample code were simply due to different ammounts of stuff being in cache. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From psj at familyjenner.co.uk Fri Dec 7 11:45:44 2007 From: psj at familyjenner.co.uk (Paul Jenner) Date: Fri, 07 Dec 2007 19:45:44 +0000 Subject: some replacements for encumbered binary plugs no longer required? In-Reply-To: <4759A02A.90503@redhat.com> References: <1197055141.3568.12.camel@localhost.localdomain> <47599D4E.1020003@redhat.com> <4759A02A.90503@redhat.com> Message-ID: <1197056744.3568.22.camel@localhost.localdomain> Hi Lillian. On Fri, 2007-12-07 at 14:34 -0500, Lillian Angel wrote: > >> 1) Ductus renderer: > >> > >> Looks like it was replaced in OpenJDK here: > >> http://mail.openjdk.java.net/pipermail/graphics-rasterizer-dev/2007-October/000049.html > >> > >> > >> Allowing removal of: > >> > >> libdcpr.so (from Makefile.am) > >> > >> rt/sun/dc > >> rt/sun/dc/pr > >> rt/sun/dc/pr/PRException.java > >> rt/sun/dc/pr/PathDasher.java > >> rt/sun/dc/pr/Rasterizer.java > >> rt/sun/dc/pr/PathStroker.java > >> rt/sun/dc/path > >> rt/sun/dc/path/PathException.java > >> rt/sun/dc/path/PathConsumer.java > >> rt/sun/dc/path/FastPathProducer.java > > These don't exist in the b23/b24 bundle. Possibly b25 or later? I think they were replaced rather than opened. So they don't exist in the OpenJDK bundles because they are no longer used. A quick grep for import sun.dc does show up a reference though - so I am probably completely wrong :-) I was going to try a build with them removed to confirm. Thanks, Paul -- Paul Jenner From langel at redhat.com Fri Dec 7 12:45:21 2007 From: langel at redhat.com (Lillian Angel) Date: Fri, 07 Dec 2007 20:45:21 +0000 Subject: changeset in /hg/icedtea: 2007-12-07 Lillian Angel changeset 312fb1b75e61 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=312fb1b75e61 description: 2007-12-07 Lillian Angel * Makefile.am: Removed libjsoundalso.so, libjsound.so,libt2k.so. * Makefile.in: Regenerate. * rt/gnu/java/io/Base64InputStream.java: Removed, not used. diffstat: 4 files changed, 8 insertions(+), 228 deletions(-) ChangeLog | 6 Makefile.am | 5 Makefile.in | 5 rt/gnu/java/io/Base64InputStream.java | 220 --------------------------------- diffs (269 lines): diff -r 05d27d2749e5 -r 312fb1b75e61 ChangeLog --- a/ChangeLog Wed Dec 05 11:02:24 2007 -0500 +++ b/ChangeLog Fri Dec 07 15:44:09 2007 -0500 @@ -1,3 +1,9 @@ 2007-12-05 Thomas Fitzsimmons + + * Makefile.am: Removed libjsoundalso.so, libjsound.so,libt2k.so. + * Makefile.in: Regenerate. + * rt/gnu/java/io/Base64InputStream.java: Removed, not used. + 2007-12-05 Thomas Fitzsimmons * Makefile.am (EXTRA_DIST): Add ports directory. diff -r 05d27d2749e5 -r 312fb1b75e61 Makefile.am --- a/Makefile.am Wed Dec 05 11:02:24 2007 -0500 +++ b/Makefile.am Fri Dec 07 15:44:09 2007 -0500 @@ -500,10 +500,7 @@ clean-tools-jar: clean-tools-jar clean-t # Shared objects. SHARED_OBJECT_FILES = \ bootstrap/jdk1.7.0/jre/lib/$(INSTALL_ARCH_DIR)/libdcpr.so \ - bootstrap/jdk1.7.0/jre/lib/$(INSTALL_ARCH_DIR)/libjsoundalsa.so \ - bootstrap/jdk1.7.0/jre/lib/$(INSTALL_ARCH_DIR)/libjsound.so \ - bootstrap/jdk1.7.0/jre/lib/$(INSTALL_ARCH_DIR)/libjsoundhs.so \ - bootstrap/jdk1.7.0/jre/lib/$(INSTALL_ARCH_DIR)/libt2k.so + bootstrap/jdk1.7.0/jre/lib/$(INSTALL_ARCH_DIR)/libjsoundhs.so $(SHARED_OBJECT_FILES): mkdir -p bootstrap/jdk1.7.0/jre/lib/$(INSTALL_ARCH_DIR) diff -r 05d27d2749e5 -r 312fb1b75e61 Makefile.in --- a/Makefile.in Wed Dec 05 11:02:24 2007 -0500 +++ b/Makefile.in Fri Dec 07 15:44:09 2007 -0500 @@ -332,10 +332,7 @@ ICEDTEA_ECJ_PATCH = patches/icedtea-ecj. # Shared objects. SHARED_OBJECT_FILES = \ bootstrap/jdk1.7.0/jre/lib/$(INSTALL_ARCH_DIR)/libdcpr.so \ - bootstrap/jdk1.7.0/jre/lib/$(INSTALL_ARCH_DIR)/libjsoundalsa.so \ - bootstrap/jdk1.7.0/jre/lib/$(INSTALL_ARCH_DIR)/libjsound.so \ - bootstrap/jdk1.7.0/jre/lib/$(INSTALL_ARCH_DIR)/libjsoundhs.so \ - bootstrap/jdk1.7.0/jre/lib/$(INSTALL_ARCH_DIR)/libt2k.so + bootstrap/jdk1.7.0/jre/lib/$(INSTALL_ARCH_DIR)/libjsoundhs.so # Sources copied from OpenJDK. diff -r 05d27d2749e5 -r 312fb1b75e61 generated/sun/awt/X11/generator/sizer.32 Binary file generated/sun/awt/X11/generator/sizer.32 has changed diff -r 05d27d2749e5 -r 312fb1b75e61 rt/gnu/java/io/Base64InputStream.java --- a/rt/gnu/java/io/Base64InputStream.java Wed Dec 05 11:02:24 2007 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,220 +0,0 @@ -/* Base64InputStream.java -- base-64 input stream. - Copyright (C) 2003, 2004 Free Software Foundation, Inc. - -This file is part of GNU Classpath. - -GNU Classpath is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU Classpath is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Classpath; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301 USA. - -Linking this library statically or dynamically with other modules is -making a combined work based on this library. Thus, the terms and -conditions of the GNU General Public License cover the whole -combination. - -As a special exception, the copyright holders of this library give you -permission to link this library with independent modules to produce an -executable, regardless of the license terms of these independent -modules, and to copy and distribute the resulting executable under -terms of your choice, provided that you also meet, for each linked -independent module, the terms and conditions of the license of that -module. An independent module is a module which is not derived from -or based on this library. If you modify this library, you may extend -this exception to your version of the library, but you are not -obligated to do so. If you do not wish to do so, delete this -exception statement from your version. */ - - -package gnu.java.io; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.FilterInputStream; -import java.io.IOException; -import java.io.InputStream; - -/** - * A filter input stream that decodes data encoded in the Base-64 - * encoding scheme. - * - * @author Casey Marshall (rsdio at metastatic.org) - */ -public class Base64InputStream extends FilterInputStream -{ - - // Constants and fields. - // ------------------------------------------------------------------------ - - /** Base-64 digits. */ - private static final String BASE_64 = - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; - - /** Base-64 padding character. */ - private static final char BASE_64_PAD = '='; - - /** Decoding state. */ - private int state; - - /** Intermediate decoded value. */ - private int temp; - - /** EOF flag. */ - private boolean eof; - - private final byte[] one = new byte[1]; - - // Constructors. - // ------------------------------------------------------------------------ - - /** - * Create a new Base-64 input stream. The input bytes must be the - * ASCII characters A-Z, a-z, 0-9, + and /, with optional whitespace, - * and will be decoded into a byte stream. - * - * @param in The source of Base-64 input. - */ - public Base64InputStream(InputStream in) - { - super(in); - state = 0; - temp = 0; - eof = false; - } - - // Class method. - // ------------------------------------------------------------------------ - - /** - * Decode a single Base-64 string to a byte array. - * - * @param base64 The Base-64 encoded data. - * @return The decoded bytes. - * @throws IOException If the given data do not compose a valid Base-64 - * sequence. - */ - public static byte[] decode(String base64) throws IOException - { - Base64InputStream in = - new Base64InputStream(new ByteArrayInputStream(base64.getBytes())); - ByteArrayOutputStream out = - new ByteArrayOutputStream((int) (base64.length() / 0.666)); - byte[] buf = new byte[1024]; - int len; - while ((len = in.read(buf)) != -1) - out.write(buf, 0, len); - return out.toByteArray(); - } - - // Instance methods. - // ------------------------------------------------------------------------ - - public int available() - { - return 0; - } - - public int read() throws IOException - { - if (read(one) == 1) - return one[0]; - return -1; - } - - public int read(byte[] buf, int off, int len) throws IOException - { - if (eof) - return -1; - int count = 0; - while (count < len) - { - int i; - while (Character.isWhitespace((char) (i = in.read()))) - ; - - int pos = BASE_64.indexOf((char) i); - if (pos >= 0) - { - switch (state) - { - case 0: - temp = pos << 2; - state = 1; - break; - case 1: - buf[count++] = (byte) (temp | (pos >>> 4)); - temp = (pos & 0x0F) << 4; - state = 2; - break; - case 2: - buf[count++] = (byte) (temp | (pos >>> 2)); - temp = (pos & 0x03) << 6; - state = 3; - break; - case 3: - buf[count++] = (byte) (temp | pos); - state = 0; - break; - } - } - else if (i == BASE_64_PAD) - { - switch (state) - { - case 0: - case 1: - throw new IOException("malformed Base-64 input"); - case 2: - while (Character.isWhitespace((char) (i = in.read()))) - ; - if (i != BASE_64_PAD) - throw new IOException("malformed Base-64 input"); - case 3: - while (Character.isWhitespace((char) (i = in.read()))) - ; - } - eof = true; - break; - } - else // First non-Base-64 character, consider it end-of-stream. - { - if (state != 0) - throw new IOException("malformed Base-64 input"); - eof = true; - break; - } - } - return count; - } - - public boolean markSupported() - { - return false; - } - - public void mark(int markLimit) { } - - public void reset() throws IOException - { - throw new IOException("reset not supported"); - } - - public long skip(long n) throws IOException - { - long skipped; - for (skipped = 0; skipped < n; skipped++) - if (read() == -1) - break; - return skipped; - } -} From bugzilla-daemon at icedtea.classpath.org Mon Dec 10 05:16:37 2007 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 10 Dec 2007 13:16:37 +0000 Subject: [Bug 87] New: Icedtea 1.7.0 and SwingWorker problem Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=87 Summary: Icedtea 1.7.0 and SwingWorker problem Product: IcedTea Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: mjrz.net at gmail.com I am trying to run the basic swing worker example from java trail. What is happening is the doInBackground method completes but the done() method never gets called. My system is running: Fedora 8 x86_64 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Mon Dec 10 06:19:32 2007 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 10 Dec 2007 14:19:32 +0000 Subject: [Bug 87] Icedtea 1.7.0 and SwingWorker problem Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=87 ------- Comment #1 from jsumali at redhat.com 2007-12-10 14:19 ------- Do you have a specific link to the swing worker example? -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Mon Dec 10 06:48:03 2007 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 10 Dec 2007 14:48:03 +0000 Subject: [Bug 87] Icedtea 1.7.0 and SwingWorker problem Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=87 mjrz.net at gmail.com changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |mjrz.net at gmail.com ------- Comment #2 from mjrz.net at gmail.com 2007-12-10 14:48 ------- (In reply to comment #1) > Do you have a specific link to the swing worker example? > http://java.sun.com/docs/books/tutorial/uiswing/examples/components/ProgressBarDemoProject/src/components/ProgressBarDemo.java -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From langel at redhat.com Mon Dec 10 07:43:24 2007 From: langel at redhat.com (Lillian Angel) Date: Mon, 10 Dec 2007 10:43:24 -0500 Subject: IcedTea b24 update Message-ID: <475D5E9C.2000500@redhat.com> Hi, I will be updating IcedTea to b24 sometime today. Since the OpenJDK is now attainable through mercurial, you will need Mercurial 0.9.5 installed, as well as the forest extension (http://mail.openjdk.java.net/pipermail/build-dev/2007-October/000342.html). Cheers, Lillian From langel at redhat.com Mon Dec 10 08:25:00 2007 From: langel at redhat.com (Lillian Angel) Date: Mon, 10 Dec 2007 16:25:00 +0000 Subject: changeset in /hg/icedtea: 2007-12-10 Lillian Angel changeset 3697dfe80c91 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3697dfe80c91 description: 2007-12-10 Lillian Angel * INSTALL: Updated requirements. * Makefile.am: Update to b24- use hg to clone/update openjdk. * Makefile.in: Regenerate. * acinclude.m4: Removed unneeded option (--with-openjdk-src-zip). * configure.ac: Likewise. * configure: Regenerate. * generated/*: Regenerated all files for b24. * patches/icedtea-core-build.patch: Updated for b24. * patches/icedtea-ecj.patch: Likewise. diffstat: 148 files changed, 3572 insertions(+), 3297 deletions(-) ChangeLog | 12 INSTALL | 1 Makefile.am | 140 +-- Makefile.in | 130 +-- acinclude.m4 | 17 configure | 171 ++-- configure.ac | 2 generated/com/sun/corba/se/impl/logging/ActivationSystemException.java | 2 generated/com/sun/corba/se/impl/logging/IORSystemException.java | 2 generated/com/sun/corba/se/impl/logging/InterceptorsSystemException.java | 2 generated/com/sun/corba/se/impl/logging/LogStrings.properties | 30 generated/com/sun/corba/se/impl/logging/NamingSystemException.java | 2 generated/com/sun/corba/se/impl/logging/OMGSystemException.java | 2 generated/com/sun/corba/se/impl/logging/ORBUtilSystemException.java | 2 generated/com/sun/corba/se/impl/logging/POASystemException.java | 2 generated/com/sun/corba/se/impl/logging/UtilSystemException.java | 2 generated/com/sun/java/swing/plaf/gtk/resources/gtk.java | 2 generated/com/sun/java/swing/plaf/gtk/resources/gtk_de.java | 2 generated/com/sun/java/swing/plaf/gtk/resources/gtk_es.java | 2 generated/com/sun/java/swing/plaf/gtk/resources/gtk_fr.java | 2 generated/com/sun/java/swing/plaf/gtk/resources/gtk_it.java | 2 generated/com/sun/java/swing/plaf/gtk/resources/gtk_ja.java | 2 generated/com/sun/java/swing/plaf/gtk/resources/gtk_ko.java | 2 generated/com/sun/java/swing/plaf/gtk/resources/gtk_sv.java | 2 generated/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.java | 2 generated/com/sun/java/swing/plaf/gtk/resources/gtk_zh_HK.java | 2 generated/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.java | 2 generated/com/sun/java/swing/plaf/motif/resources/motif.java | 1 generated/com/sun/java/swing/plaf/motif/resources/motif_de.java | 1 generated/com/sun/java/swing/plaf/motif/resources/motif_es.java | 1 generated/com/sun/java/swing/plaf/motif/resources/motif_fr.java | 1 generated/com/sun/java/swing/plaf/motif/resources/motif_it.java | 1 generated/com/sun/java/swing/plaf/motif/resources/motif_ja.java | 1 generated/com/sun/java/swing/plaf/motif/resources/motif_ko.java | 1 generated/com/sun/java/swing/plaf/motif/resources/motif_sv.java | 1 generated/com/sun/java/swing/plaf/motif/resources/motif_zh_CN.java | 1 generated/com/sun/java/swing/plaf/motif/resources/motif_zh_HK.java | 1 generated/com/sun/java/swing/plaf/motif/resources/motif_zh_TW.java | 1 generated/com/sun/java/swing/plaf/windows/resources/windows.java | 3 generated/com/sun/java/swing/plaf/windows/resources/windows_de.java | 3 generated/com/sun/java/swing/plaf/windows/resources/windows_es.java | 3 generated/com/sun/java/swing/plaf/windows/resources/windows_fr.java | 3 generated/com/sun/java/swing/plaf/windows/resources/windows_it.java | 3 generated/com/sun/java/swing/plaf/windows/resources/windows_ja.java | 3 generated/com/sun/java/swing/plaf/windows/resources/windows_ko.java | 3 generated/com/sun/java/swing/plaf/windows/resources/windows_sv.java | 3 generated/com/sun/java/swing/plaf/windows/resources/windows_zh_CN.java | 3 generated/com/sun/java/swing/plaf/windows/resources/windows_zh_HK.java | 3 generated/com/sun/java/swing/plaf/windows/resources/windows_zh_TW.java | 3 generated/com/sun/swing/internal/plaf/basic/resources/basic.java | 5 generated/com/sun/swing/internal/plaf/basic/resources/basic_de.java | 5 generated/com/sun/swing/internal/plaf/basic/resources/basic_es.java | 5 generated/com/sun/swing/internal/plaf/basic/resources/basic_fr.java | 5 generated/com/sun/swing/internal/plaf/basic/resources/basic_it.java | 5 generated/com/sun/swing/internal/plaf/basic/resources/basic_ja.java | 5 generated/com/sun/swing/internal/plaf/basic/resources/basic_ko.java | 5 generated/com/sun/swing/internal/plaf/basic/resources/basic_sv.java | 5 generated/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.java | 5 generated/com/sun/swing/internal/plaf/basic/resources/basic_zh_HK.java | 5 generated/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.java | 5 generated/com/sun/swing/internal/plaf/metal/resources/metal.java | 1 generated/com/sun/swing/internal/plaf/metal/resources/metal_de.java | 1 generated/com/sun/swing/internal/plaf/metal/resources/metal_es.java | 1 generated/com/sun/swing/internal/plaf/metal/resources/metal_fr.java | 1 generated/com/sun/swing/internal/plaf/metal/resources/metal_it.java | 1 generated/com/sun/swing/internal/plaf/metal/resources/metal_ja.java | 1 generated/com/sun/swing/internal/plaf/metal/resources/metal_ko.java | 1 generated/com/sun/swing/internal/plaf/metal/resources/metal_sv.java | 1 generated/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.java | 1 generated/com/sun/swing/internal/plaf/metal/resources/metal_zh_HK.java | 1 generated/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.java | 1 generated/com/sun/swing/internal/plaf/synth/resources/synth.java | 1 generated/com/sun/swing/internal/plaf/synth/resources/synth_de.java | 1 generated/com/sun/swing/internal/plaf/synth/resources/synth_es.java | 1 generated/com/sun/swing/internal/plaf/synth/resources/synth_fr.java | 1 generated/com/sun/swing/internal/plaf/synth/resources/synth_it.java | 1 generated/com/sun/swing/internal/plaf/synth/resources/synth_ja.java | 1 generated/com/sun/swing/internal/plaf/synth/resources/synth_ko.java | 1 generated/com/sun/swing/internal/plaf/synth/resources/synth_sv.java | 1 generated/com/sun/swing/internal/plaf/synth/resources/synth_zh_CN.java | 1 generated/com/sun/swing/internal/plaf/synth/resources/synth_zh_HK.java | 1 generated/com/sun/swing/internal/plaf/synth/resources/synth_zh_TW.java | 1 generated/java/nio/BufferOverflowException.java | 6 generated/java/nio/BufferUnderflowException.java | 6 generated/java/nio/ByteBuffer.java | 255 +++--- generated/java/nio/ByteBufferAsCharBufferB.java | 170 ++-- generated/java/nio/ByteBufferAsCharBufferL.java | 170 ++-- generated/java/nio/ByteBufferAsCharBufferRB.java | 124 +-- generated/java/nio/ByteBufferAsCharBufferRL.java | 124 +-- generated/java/nio/ByteBufferAsDoubleBufferB.java | 120 +- generated/java/nio/ByteBufferAsDoubleBufferL.java | 120 +- generated/java/nio/ByteBufferAsDoubleBufferRB.java | 74 - generated/java/nio/ByteBufferAsDoubleBufferRL.java | 74 - generated/java/nio/ByteBufferAsFloatBufferB.java | 120 +- generated/java/nio/ByteBufferAsFloatBufferL.java | 120 +- generated/java/nio/ByteBufferAsFloatBufferRB.java | 74 - generated/java/nio/ByteBufferAsFloatBufferRL.java | 74 - generated/java/nio/ByteBufferAsIntBufferB.java | 120 +- generated/java/nio/ByteBufferAsIntBufferL.java | 120 +- generated/java/nio/ByteBufferAsIntBufferRB.java | 74 - generated/java/nio/ByteBufferAsIntBufferRL.java | 74 - generated/java/nio/ByteBufferAsLongBufferB.java | 120 +- generated/java/nio/ByteBufferAsLongBufferL.java | 120 +- generated/java/nio/ByteBufferAsLongBufferRB.java | 74 - generated/java/nio/ByteBufferAsLongBufferRL.java | 74 - generated/java/nio/ByteBufferAsShortBufferB.java | 120 +- generated/java/nio/ByteBufferAsShortBufferL.java | 120 +- generated/java/nio/ByteBufferAsShortBufferRB.java | 74 - generated/java/nio/ByteBufferAsShortBufferRL.java | 74 - generated/java/nio/CharBuffer.java | 293 +++---- generated/java/nio/DoubleBuffer.java | 411 +++++----- generated/java/nio/FloatBuffer.java | 411 +++++----- generated/java/nio/IntBuffer.java | 411 +++++----- generated/java/nio/InvalidMarkException.java | 6 generated/java/nio/LongBuffer.java | 411 +++++----- generated/java/nio/ReadOnlyBufferException.java | 6 generated/java/nio/ShortBuffer.java | 411 +++++----- generated/java/nio/channels/AlreadyConnectedException.java | 6 generated/java/nio/channels/AsynchronousCloseException.java | 6 generated/java/nio/channels/CancelledKeyException.java | 6 generated/java/nio/channels/ClosedByInterruptException.java | 6 generated/java/nio/channels/ClosedChannelException.java | 6 generated/java/nio/channels/ClosedSelectorException.java | 6 generated/java/nio/channels/ConnectionPendingException.java | 6 generated/java/nio/channels/FileLockInterruptionException.java | 6 generated/java/nio/channels/IllegalBlockingModeException.java | 6 generated/java/nio/channels/IllegalSelectorException.java | 6 generated/java/nio/channels/NoConnectionPendingException.java | 6 generated/java/nio/channels/NonReadableChannelException.java | 6 generated/java/nio/channels/NonWritableChannelException.java | 6 generated/java/nio/channels/NotYetBoundException.java | 6 generated/java/nio/channels/NotYetConnectedException.java | 6 generated/java/nio/channels/OverlappingFileLockException.java | 6 generated/java/nio/channels/UnresolvedAddressException.java | 6 generated/java/nio/channels/UnsupportedAddressTypeException.java | 6 generated/java/nio/charset/CharacterCodingException.java | 6 generated/java/nio/charset/CharsetDecoder.java | 329 +++----- generated/java/nio/charset/CharsetEncoder.java | 409 ++++----- generated/java/nio/charset/IllegalCharsetNameException.java | 6 generated/java/nio/charset/UnsupportedCharsetException.java | 6 generated/sun/management/resources/agent.java | 6 generated/sun/misc/Version.java | 84 +- generated/sun/nio/ch/AlreadyBoundException.java | 6 generated/sun/tools/jconsole/Version.java | 6 generated/sun/util/CoreResourceBundleControl.java | 32 generated/sun/util/LocaleDataMetaInfo.java | 48 - patches/icedtea-core-build.patch | 2 patches/icedtea-ecj.patch | 4 diffs (truncated from 12825 to 500 lines): diff -r 312fb1b75e61 -r 3697dfe80c91 ChangeLog --- a/ChangeLog Fri Dec 07 15:44:09 2007 -0500 +++ b/ChangeLog Mon Dec 10 11:23:44 2007 -0500 @@ -1,3 +1,15 @@ 2007-12-07 Lillian Angel + + * INSTALL: Updated requirements. + * Makefile.am: Update to b24- use hg to clone/update openjdk. + * Makefile.in: Regenerate. + * acinclude.m4: Removed unneeded option (--with-openjdk-src-zip). + * configure.ac: Likewise. + * configure: Regenerate. + * generated/*: Regenerated all files for b24. + * patches/icedtea-core-build.patch: Updated for b24. + * patches/icedtea-ecj.patch: Likewise. + 2007-12-07 Lillian Angel * Makefile.am: Removed libjsoundalso.so, libjsound.so,libt2k.so. diff -r 312fb1b75e61 -r 3697dfe80c91 INSTALL --- a/INSTALL Fri Dec 07 15:44:09 2007 -0500 +++ b/INSTALL Mon Dec 10 11:23:44 2007 -0500 @@ -30,6 +30,7 @@ libpng-devel libpng-devel libjpeg-devel zlib-devel +mercurial 0.9.5 + forest extension See ./configure --help if you need to override defaults. diff -r 312fb1b75e61 -r 3697dfe80c91 Makefile.am --- a/Makefile.am Fri Dec 07 15:44:09 2007 -0500 +++ b/Makefile.am Mon Dec 10 11:23:44 2007 -0500 @@ -1,6 +1,4 @@ OPENJDK_VERSION = b23 -OPENJDK_VERSION = b23 -OPENJDK_DATE = 30_oct_2007 -OPENJDK_MD5SUM = 7eed137c0321e0b5b75ff2d646ce0d0d +OPENJDK_VERSION = b24 # Top-Level Targets # ================= @@ -20,8 +18,8 @@ install: install: .PHONY: \ - env env-ecj snapshot clean-download clean-extract clean-patch \ - clean-extract-ecj clean-patch-ecj clean-bootstrap-directory \ + env env-ecj snapshot clean-clone clean-clone clean-patch \ + clean-clone-ecj clean-patch-ecj clean-bootstrap-directory \ clean-bootstrap-directory-symlink clean-bootstrap-directory-ecj \ clean-bootstrap-directory-symlink-ecj icedtea icedtea-debug \ clean-icedtea icedtea-against-icedtea clean-icedtea-ecj clean-plugs \ @@ -33,7 +31,7 @@ EXTRA_DIST = rt generated $(ICEDTEA_PATC # OpenJDK build environment. LINUX_DIR = linux-$(BUILD_ARCH_DIR) -BUILD_OUTPUT_DIR = openjdk/control/build/$(LINUX_DIR) +BUILD_OUTPUT_DIR = openjdk/build/$(LINUX_DIR) ICEDTEA_BUILD_DIR = \ $(abs_top_srcdir)/$(BUILD_OUTPUT_DIR) ICEDTEA_RT = \ @@ -68,9 +66,9 @@ env: # OpenJDK ecj build environment. ICEDTEA_BUILD_DIR_ECJ = \ - $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/ + $(abs_top_srcdir)/openjdk-ecj/build/$(LINUX_DIR)/ ICEDTEA_CLS_DIR_ECJ = \ - $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes + $(abs_top_srcdir)/openjdk-ecj/build/$(LINUX_DIR)/classes ICEDTEA_ENV_ECJ = \ "ALT_JDK_IMPORT_PATH=$(abs_top_srcdir)/bootstrap/jdk1.6.0/" \ "ANT_HOME=$(SYSTEM_ANT_DIR)" \ @@ -109,48 +107,30 @@ snapshot: dist # ================================== # Download OpenJDK sources. -OPENJDK_URL = http://download.java.net/openjdk/jdk7/promoted/$(OPENJDK_VERSION)/ -OPENJDK_SRC_ZIP_BASE = openjdk-7-ea-src-$(OPENJDK_VERSION)-$(OPENJDK_DATE).zip - -if USE_ALT_OPENJDK_SRC_ZIP - OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP) -else - OPENJDK_SRC_ZIP = $(OPENJDK_SRC_ZIP_BASE) -endif - -stamps/download.stamp: - if ! echo "$(OPENJDK_MD5SUM) $(OPENJDK_SRC_ZIP)" \ - | $(MD5SUM) --check ; \ - then \ - if [ $(OPENJDK_SRC_ZIP) ] ; \ - then \ - mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \ - fi ; \ - $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP_BASE) -O $(OPENJDK_SRC_ZIP); \ - fi - mkdir -p stamps - touch stamps/download.stamp - -clean-download: - rm -f stamps/download.stamp - rm -f $(OPENJDK_SRC_ZIP) - -# Extract OpenJDK sources. -stamps/extract.stamp: stamps/download.stamp +OPENJDK_URL = http://hg.openjdk.java.net/jdk7/jdk7 + +stamps/clone.stamp: if ! test -d openjdk ; \ then \ - $(UNZIP) -q $(OPENJDK_SRC_ZIP) ; \ - chmod -R ug+w openjdk ; \ - fi - mkdir -p stamps - touch stamps/extract.stamp - -clean-extract: - rm -f stamps/extract.stamp + hg fclone $(OPENJDK_URL) openjdk; \ + fi + touch stamps/clone.stamp + +clean-clone: + rm -f stamps/clone.stamp rm -rf openjdk +update: + if test -d openjdk ; \ + then \ + cd openjdk; \ + hg fpull; \ + hg fupdate; \ + cd ..; \ + fi + # Link ports sources into tree -stamps/ports.stamp: stamps/extract.stamp +stamps/ports.stamp: stamps/clone.stamp for target in ports/hotspot/build/*/platform_* \ ports/hotspot/build/*/makefiles/* \ ports/hotspot/src/*/* \ @@ -208,7 +188,7 @@ ICEDTEA_PATCHES = \ $(FAST_BUILD_PATCH) \ $(DISTRIBUTION_PATCHES) -stamps/patch.stamp: stamps/extract.stamp +stamps/patch.stamp: stamps/clone.stamp update for p in $(ICEDTEA_PATCHES) ; \ do \ echo Checking $$p ; \ @@ -237,24 +217,20 @@ clean-patch: # ====================================== # Extract OpenJDK sources for ecj. -stamps/extract-ecj.stamp: stamps/download.stamp +stamps/clone-ecj.stamp: stamps/clone.stamp if ! test -d openjdk-ecj ; \ then \ - mkdir tmp-ecj ; \ - $(UNZIP) -q -d tmp-ecj $(OPENJDK_SRC_ZIP) ; \ - mv tmp-ecj/openjdk openjdk-ecj ; \ - rmdir tmp-ecj ; \ - chmod -R ug+w openjdk-ecj ; \ - fi - mkdir -p stamps - touch stamps/extract-ecj.stamp - -clean-extract-ecj: - rm -f stamps/extract-ecj.stamp + hg fclone $(OPENJDK_URL) openjdk-ecj ; \ + fi + mkdir -p stamps + touch stamps/clone-ecj.stamp + +clean-clone-ecj: + rm -f stamps/clone-ecj.stamp rm -rf openjdk-ecj # Link ports sources into tree -stamps/ports-ecj.stamp: stamps/extract.stamp +stamps/ports-ecj.stamp: stamps/clone-ecj.stamp for target in ports/hotspot/build/*/platform_* \ ports/hotspot/build/*/makefiles/* \ ports/hotspot/src/*/* \ @@ -268,7 +244,7 @@ stamps/ports-ecj.stamp: stamps/extract.s # Patch OpenJDK for plug replacements and ecj. ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch -stamps/patch-ecj.stamp: stamps/extract-ecj.stamp +stamps/patch-ecj.stamp: stamps/clone-ecj.stamp for p in $(ICEDTEA_PATCHES) ; \ do \ echo Checking $$p ; \ @@ -311,7 +287,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_srcdir)/openjdk-ecj/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 @@ -416,23 +392,23 @@ endif # If you change anything here in the icedtea target, please make sure # you change it in the icedtea-debug target as well. -icedtea: stamps/tools.stamp stamps/plugs.stamp stamps/extract.stamp \ +icedtea: update stamps/tools.stamp stamps/plugs.stamp \ stamps/ports.stamp stamps/patch.stamp gcjwebplugin.so $(MAKE) \ $(ICEDTEA_ENV) \ - -C openjdk/control/make + -C openjdk/ cp -af gcjwebplugin.so \ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) cp -af gcjwebplugin.so \ $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) @echo "IcedTea is served:" $(BUILD_OUTPUT_DIR) -icedtea-debug: stamps/bootstrap-directory-symlink.stamp \ - stamps/tools.stamp stamps/plugs.stamp stamps/extract.stamp \ +icedtea-debug: update stamps/bootstrap-directory-symlink.stamp \ + stamps/tools.stamp stamps/plugs.stamp \ stamps/ports.stamp stamps/patch.stamp gcjwebplugin.so $(MAKE) \ $(ICEDTEA_ENV) \ - -C openjdk/control/make \ + -C openjdk/ \ debug_build cp -af gcjwebplugin.so \ $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) @@ -441,10 +417,10 @@ icedtea-debug: stamps/bootstrap-directo @echo "IcedTea (debug build) is served:" \ $(BUILD_OUTPUT_DIR)-debug -clean-icedtea: stamps/extract.stamp +clean-icedtea: stamps/clone.stamp $(MAKE) \ $(ICEDTEA_ENV) \ - -C openjdk/control/make clobber + -C openjdk/ clobber icedtea-against-icedtea: \ stamps/bootstrap-directory-symlink.stamp \ @@ -454,20 +430,20 @@ icedtea-against-icedtea: \ # =================== stamps/icedtea-ecj.stamp: stamps/tools.stamp stamps/plugs.stamp \ - stamps/extract-ecj.stamp stamps/ports-ecj.stamp stamps/patch-ecj.stamp + stamps/ports-ecj.stamp stamps/patch-ecj.stamp $(MAKE) \ $(ICEDTEA_ENV_ECJ) \ - -C openjdk-ecj/control/make + -C openjdk-ecj/ @echo "ecj-poured IcedTea is served:" \ - openjdk-ecj/control/build/$(LINUX_DIR) + openjdk-ecj/build/$(LINUX_DIR) mkdir -p stamps touch stamps/icedtea-ecj.stamp -clean-icedtea-ecj: stamps/extract-ecj.stamp +clean-icedtea-ecj: stamps/clone-ecj.stamp rm -f stamps/icedtea-ecj.stamp $(MAKE) \ $(ICEDTEA_ENV_ECJ) \ - -C openjdk-ecj/control/make clobber + -C openjdk-ecj/ clobber stamps/icedtea-against-ecj.stamp: \ stamps/bootstrap-directory-symlink-ecj.stamp \ @@ -527,7 +503,7 @@ ICEDTEA_COPY_DIRS = \ java/rmi \ javax/net/ssl -stamps/copy-source-files.stamp: stamps/extract.stamp stamps/patch.stamp +stamps/copy-source-files.stamp: stamps/patch.stamp for copy_dir in $(ICEDTEA_COPY_DIRS) ; \ do \ mkdir -p rt/$$copy_dir ; \ @@ -555,7 +531,7 @@ OPENJDK_SOURCEPATH_DIRS = \ $(SHARE):$(SOLARIS):$(LANGTOOLS):$(JAXP):$(CORBA):$(JAXWS) # tools.jar class files. -stamps/tools-copy-source-files.stamp: stamps/extract.stamp stamps/patch.stamp +stamps/tools-copy-source-files.stamp: stamps/patch.stamp for copy_dir in `cat tools-copy/tools-jdk-copy-files.txt` ; \ do \ mkdir -p tools/$$copy_dir ; \ @@ -587,7 +563,7 @@ stamps/tools-copy-source-files.stamp: st mkdir -p stamps touch stamps/tools-copy-source-files.stamp -tools-source-files.txt: stamps/extract.stamp \ +tools-source-files.txt: stamps/clone.stamp \ stamps/tools-copy-source-files.stamp find tools -name '*.java' | sort > $@ mkdir -p lib/tools @@ -619,7 +595,7 @@ bootstrap/jdk1.7.0/jre/lib/tools.jar: st fi # rt-closed.jar class files. -rt-source-files.txt: stamps/extract.stamp stamps/copy-source-files.stamp +rt-source-files.txt: stamps/clone.stamp stamps/copy-source-files.stamp find rt -name '*.java' | sort > $@ stamps/rt-class-files.stamp: rt-source-files.txt @@ -669,11 +645,11 @@ bootstrap-directory-symlink: stamps/boot copy-source-files: stamps/copy-source-files.stamp -download: stamps/download.stamp - -extract-ecj: stamps/extract-ecj.stamp - -extract: stamps/extract.stamp +clone: stamps/clone.stamp + +clone-ecj: stamps/clone-ecj.stamp + +clone: stamps/clone.stamp icedtea-against-ecj: stamps/icedtea-against-ecj.stamp diff -r 312fb1b75e61 -r 3697dfe80c91 Makefile.in --- a/Makefile.in Fri Dec 07 15:44:09 2007 -0500 +++ b/Makefile.in Mon Dec 10 11:23:44 2007 -0500 @@ -59,7 +59,6 @@ distuninstallcheck_listfiles = find . -t distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ -ALT_OPENJDK_SRC_ZIP = @ALT_OPENJDK_SRC_ZIP@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -110,6 +109,7 @@ LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MD5SUM = @MD5SUM@ +MERCURIAL = @MERCURIAL@ MKDIR_P = @MKDIR_P@ MOZILLA_CFLAGS = @MOZILLA_CFLAGS@ MOZILLA_LIBS = @MOZILLA_LIBS@ @@ -187,16 +187,14 @@ target_alias = @target_alias@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -OPENJDK_VERSION = b23 -OPENJDK_DATE = 30_oct_2007 -OPENJDK_MD5SUM = 7eed137c0321e0b5b75ff2d646ce0d0d +OPENJDK_VERSION = b24 EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \ gcjwebplugin.cc patches/icedtea-speed.patch tools-copy contrib ports # OpenJDK build environment. LINUX_DIR = linux-$(BUILD_ARCH_DIR) -BUILD_OUTPUT_DIR = openjdk/control/build/$(LINUX_DIR) +BUILD_OUTPUT_DIR = openjdk/build/$(LINUX_DIR) ICEDTEA_BUILD_DIR = \ $(abs_top_srcdir)/$(BUILD_OUTPUT_DIR) @@ -232,10 +230,10 @@ ICEDTEA_ENV = \ # OpenJDK ecj build environment. ICEDTEA_BUILD_DIR_ECJ = \ - $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/ + $(abs_top_srcdir)/openjdk-ecj/build/$(LINUX_DIR)/ ICEDTEA_CLS_DIR_ECJ = \ - $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes + $(abs_top_srcdir)/openjdk-ecj/build/$(LINUX_DIR)/classes ICEDTEA_ENV_ECJ = \ "ALT_JDK_IMPORT_PATH=$(abs_top_srcdir)/bootstrap/jdk1.6.0/" \ @@ -268,10 +266,7 @@ ICEDTEA_ENV_ECJ = \ # ================================== # Download OpenJDK sources. -OPENJDK_URL = http://download.java.net/openjdk/jdk7/promoted/$(OPENJDK_VERSION)/ -OPENJDK_SRC_ZIP_BASE = openjdk-7-ea-src-$(OPENJDK_VERSION)-$(OPENJDK_DATE).zip - at USE_ALT_OPENJDK_SRC_ZIP_FALSE@OPENJDK_SRC_ZIP = $(OPENJDK_SRC_ZIP_BASE) - at USE_ALT_OPENJDK_SRC_ZIP_TRUE@OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP) +OPENJDK_URL = http://hg.openjdk.java.net/jdk7/jdk7 @FAST_BUILD_FALSE at FAST_BUILD_PATCH = # Patch OpenJDK sources for plug replacements. @@ -647,8 +642,8 @@ install: install: .PHONY: \ - env env-ecj snapshot clean-download clean-extract clean-patch \ - clean-extract-ecj clean-patch-ecj clean-bootstrap-directory \ + env env-ecj snapshot clean-clone clean-clone clean-patch \ + clean-clone-ecj clean-patch-ecj clean-bootstrap-directory \ clean-bootstrap-directory-symlink clean-bootstrap-directory-ecj \ clean-bootstrap-directory-symlink-ecj icedtea icedtea-debug \ clean-icedtea icedtea-against-icedtea clean-icedtea-ecj clean-plugs \ @@ -667,39 +662,28 @@ snapshot: dist snapshot: dist mv $(DIST_ARCHIVES) $(distdir)-`hg tip --template '{node}'`.tar.gz -stamps/download.stamp: - if ! echo "$(OPENJDK_MD5SUM) $(OPENJDK_SRC_ZIP)" \ - | $(MD5SUM) --check ; \ - then \ - if [ $(OPENJDK_SRC_ZIP) ] ; \ - then \ - mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \ - fi ; \ - $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP_BASE) -O $(OPENJDK_SRC_ZIP); \ - fi - mkdir -p stamps - touch stamps/download.stamp - -clean-download: - rm -f stamps/download.stamp - rm -f $(OPENJDK_SRC_ZIP) - -# Extract OpenJDK sources. -stamps/extract.stamp: stamps/download.stamp +stamps/clone.stamp: if ! test -d openjdk ; \ then \ - $(UNZIP) -q $(OPENJDK_SRC_ZIP) ; \ - chmod -R ug+w openjdk ; \ + hg fclone $(OPENJDK_URL) openjdk; \ fi - mkdir -p stamps - touch stamps/extract.stamp - -clean-extract: - rm -f stamps/extract.stamp + touch stamps/clone.stamp + +clean-