[kaffe] CVS kaffe (guilhem): Various fixes.
Kaffe CVS
cvs-commits at kaffe.org
Fri Jul 23 06:55:21 PDT 2004
PatchSet 5001
Date: 2004/07/23 13:45:13
Author: guilhem
Branch: HEAD
Tag: (none)
Log:
Various fixes.
* po/fr.po: Updated translation.
* WHATSNEW: Added some entries for Kaffe 1.1.5.
* m4/gwqt.m4: Use AC_PATH_PROG instead of AC_CHECK_PROG to discover
the real path of moc and uic.
* configure.ac: Fixed BOEHMGC_SPECIFIC_FLAGS.
* configure: Regenerated.
* developers/boehm-with-kaffe.patch: New file to reflect specific
kaffe changes to the Boehm-Weiser GC.
* kaffe/kaffevm/ksem.c: Added an assertion checking.
* kaffe/kaffevm/boehm-gc/Makefile.am
(libkaffegc_la_SOURCES): Added pthread_stop_world.c.
* kaffe/kaffevm/boehm-gc/Makefile.in: Regenerated.
* libraries/javalib/all.files: Swapped JDesktopPane.java and
JLayeredPane.java.
Members:
ChangeLog:1.2561->1.2562
WHATSNEW:1.34->1.35
configure:1.363->1.364
configure.ac:1.61->1.62
developers/boehm-with-kaffe.patch:INITIAL->1.1
kaffe/kaffevm/ksem.c:1.4->1.5
kaffe/kaffevm/boehm-gc/Makefile.am:1.2->1.3
kaffe/kaffevm/boehm-gc/Makefile.in:1.5->1.6
libraries/javalib/all.files:1.3->1.4
m4/gwqt.m4:1.1->1.2
po/fr.po:1.5->1.6
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2561 kaffe/ChangeLog:1.2562
--- kaffe/ChangeLog:1.2561 Fri Jul 23 01:54:12 2004
+++ kaffe/ChangeLog Fri Jul 23 13:45:13 2004
@@ -1,3 +1,29 @@
+2004-07-23 Guilhem Lavaux <guilhem at kaffe.org>
+
+ * po/fr.po: Updated translation.
+
+ * WHATSNEW: Added some entries for Kaffe 1.1.5.
+
+ * m4/gwqt.m4: Use AC_PATH_PROG instead of AC_CHECK_PROG to discover
+ the real path of moc and uic.
+
+ * configure.ac: Fixed BOEHMGC_SPECIFIC_FLAGS.
+
+ * configure: Regenerated.
+
+ * developers/boehm-with-kaffe.patch: New file to reflect specific
+ kaffe changes to the Boehm-Weiser GC.
+
+ * kaffe/kaffevm/ksem.c: Added an assertion checking.
+
+ * kaffe/kaffevm/boehm-gc/Makefile.am
+ (libkaffegc_la_SOURCES): Added pthread_stop_world.c.
+
+ * kaffe/kaffevm/boehm-gc/Makefile.in: Regenerated.
+
+ * libraries/javalib/all.files: Swapped JDesktopPane.java and
+ JLayeredPane.java.
+
2004-07-23 Jim Huang <jserv at kaffe.org>
* po/kaffe.pot,
@@ -1189,7 +1215,11 @@
libraries/javalib/Makefile.am,
libraries/javalib/Makefile.in,
m4/libtool.m4:
- Regeenrated.
+ Regenerated.
+
+2004-07-21 Guilhem Lavaux <guilhem at kaffe.org>
+
+ * WHATSNEW: Added some news to Kaffe 1.1.5.
2004-07-21 Guilhem Lavaux <guilhem at kaffe.org>
Index: kaffe/WHATSNEW
diff -u kaffe/WHATSNEW:1.34 kaffe/WHATSNEW:1.35
--- kaffe/WHATSNEW:1.34 Sat Jul 10 02:48:04 2004
+++ kaffe/WHATSNEW Fri Jul 23 13:45:15 2004
@@ -16,6 +16,11 @@
* KJC fixes.
* Added GNU EmbbededWindow extension from GNU Classpath.
* gcjwebplugin is known to work with the extension.
+* New experimental Boehm-Weiser garbage collector.
+* DNSJava merged in.
+* Jessie merged in.
+* JZLib merged in.
+* GNU Classpath's implementation of Swing has been merged.
What's New in Kaffe 1.1.3
------------------------------------------------------
Index: kaffe/configure
diff -u kaffe/configure:1.363 kaffe/configure:1.364
--- kaffe/configure:1.363 Thu Jul 22 19:03:18 2004
+++ kaffe/configure Fri Jul 23 13:45:15 2004
@@ -27402,7 +27402,7 @@
BOEHMGC_SPECIFIC_FLAGS="$BOEHMGC_SPECIFIC_FLAGS -DGC_LINUX_THREADS"
fi
if test "$ac_cv_gnu_library_version" -ge "2003"; then
- BOEHMGC_SPECIFIC_FLAGS="$$BOEHMGC_SPECIFIC_FLAGS -DGC_PTHREADS"
+ BOEHMGC_SPECIFIC_FLAGS="$BOEHMGC_SPECIFIC_FLAGS -DGC_PTHREADS"
fi
fi
;;
@@ -52785,29 +52785,34 @@
set dummy moc; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_MOC+set}" = set; then
+if test "${ac_cv_path_MOC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test -n "$MOC"; then
- ac_cv_prog_MOC="$MOC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+ case $MOC in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_MOC="$MOC" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="$PATH:$QTDIR/bin"
+for as_dir in $as_dummy
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_MOC="moc"
+ ac_cv_path_MOC="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+ ;;
+esac
fi
-fi
-MOC=$ac_cv_prog_MOC
+MOC=$ac_cv_path_MOC
+
if test -n "$MOC"; then
echo "$as_me:$LINENO: result: $MOC" >&5
echo "${ECHO_T}$MOC" >&6
@@ -52827,29 +52832,34 @@
set dummy uic; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_UIC+set}" = set; then
+if test "${ac_cv_path_UIC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test -n "$UIC"; then
- ac_cv_prog_UIC="$UIC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+ case $UIC in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_UIC="$UIC" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="$PATH:$QTDIR/bin"
+for as_dir in $as_dummy
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_UIC="uic"
+ ac_cv_path_UIC="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
+ ;;
+esac
fi
-fi
-UIC=$ac_cv_prog_UIC
+UIC=$ac_cv_path_UIC
+
if test -n "$UIC"; then
echo "$as_me:$LINENO: result: $UIC" >&5
echo "${ECHO_T}$UIC" >&6
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.61 kaffe/configure.ac:1.62
--- kaffe/configure.ac:1.61 Thu Jul 22 19:03:28 2004
+++ kaffe/configure.ac Fri Jul 23 13:45:21 2004
@@ -697,7 +697,7 @@
BOEHMGC_SPECIFIC_FLAGS="$BOEHMGC_SPECIFIC_FLAGS -DGC_LINUX_THREADS"
fi
if test "$ac_cv_gnu_library_version" -ge "2003"; then
- BOEHMGC_SPECIFIC_FLAGS="$$BOEHMGC_SPECIFIC_FLAGS -DGC_PTHREADS"
+ BOEHMGC_SPECIFIC_FLAGS="$BOEHMGC_SPECIFIC_FLAGS -DGC_PTHREADS"
fi
fi
;;
===================================================================
Checking out kaffe/developers/boehm-with-kaffe.patch
RCS: /home/cvs/kaffe/kaffe/developers/boehm-with-kaffe.patch,v
VERS: 1.1
***************
--- /dev/null Sun Aug 4 19:57:58 2002
+++ kaffe/developers/boehm-with-kaffe.patch Fri Jul 23 13:55:18 2004
@@ -0,0 +1,33 @@
+--- pthread_stop_world.c.old 2004-07-20 14:40:08.000000000 +0200
++++ pthread_stop_world.c 2004-07-20 14:41:42.000000000 +0200
+@@ -71,6 +71,8 @@
+ # endif
+ #endif
+
++#if 0
++
+ sem_t GC_suspend_ack_sem;
+
+ void GC_suspend_handler(int sig)
+@@ -176,6 +178,7 @@
+ GC_printf1("In GC_restart_handler for 0x%lx\n", pthread_self());
+ #endif
+ }
++#endif
+
+ # ifdef IA64
+ # define IF_IA64(x) x
+@@ -242,6 +245,7 @@
+ }
+ }
+
++#if 0
+ /* There seems to be a very rare thread stopping problem. To help us */
+ /* debug that, we save the ids of the stopping thread. */
+ pthread_t GC_stopping_thread;
+@@ -443,3 +447,5 @@
+ }
+
+ #endif
++
++#endif
Index: kaffe/kaffe/kaffevm/ksem.c
diff -u kaffe/kaffe/kaffevm/ksem.c:1.4 kaffe/kaffe/kaffevm/ksem.c:1.5
--- kaffe/kaffe/kaffevm/ksem.c:1.4 Wed Jul 14 18:57:17 2004
+++ kaffe/kaffe/kaffevm/ksem.c Fri Jul 23 13:45:22 2004
@@ -72,6 +72,7 @@
void
ksemPut(Ksem* sem)
{
+ assert(sem != NULL);
jmutex_lock(&sem->mux);
sem->count = 1;
jcondvar_signal(&sem->cv, &sem->mux);
Index: kaffe/kaffe/kaffevm/boehm-gc/Makefile.am
diff -u kaffe/kaffe/kaffevm/boehm-gc/Makefile.am:1.2 kaffe/kaffe/kaffevm/boehm-gc/Makefile.am:1.3
--- kaffe/kaffe/kaffevm/boehm-gc/Makefile.am:1.2 Wed Jul 21 14:19:47 2004
+++ kaffe/kaffe/kaffevm/boehm-gc/Makefile.am Fri Jul 23 13:45:22 2004
@@ -48,6 +48,7 @@
boehm/solaris_pthreads.c \
boehm/solaris_threads.c \
boehm/pthread_support.c \
+ boehm/pthread_stop_world.c \
boehm/malloc.c \
boehm/mallocx.c \
boehm/mark.c \
Index: kaffe/kaffe/kaffevm/boehm-gc/Makefile.in
diff -u kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.5 kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.6
--- kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.5 Thu Jul 22 19:03:37 2004
+++ kaffe/kaffe/kaffevm/boehm-gc/Makefile.in Fri Jul 23 13:45:22 2004
@@ -82,9 +82,10 @@
checksums.lo dbg_mlc.lo dyn_load.lo finalize.lo gcj_mlc.lo \
headers.lo aix_irix_threads.lo win32_threads.lo \
solaris_pthreads.lo solaris_threads.lo pthread_support.lo \
- malloc.lo mallocx.lo mark.lo mark_rts.lo misc.lo new_hblk.lo \
- obj_map.lo os_dep.lo pcr_interface.lo ptr_chck.lo \
- real_malloc.lo reclaim.lo stubborn.lo typd_mlc.lo mach_dep.lo
+ pthread_stop_world.lo malloc.lo mallocx.lo mark.lo mark_rts.lo \
+ misc.lo new_hblk.lo obj_map.lo os_dep.lo pcr_interface.lo \
+ ptr_chck.lo real_malloc.lo reclaim.lo stubborn.lo typd_mlc.lo \
+ mach_dep.lo
libkaffegc_la_OBJECTS = $(am_libkaffegc_la_OBJECTS)
PROGRAMS = $(noinst_PROGRAMS)
am_if_mach_OBJECTS = if_mach.$(OBJEXT)
@@ -105,6 +106,7 @@
@AMDEP_TRUE@ ./$(DEPDIR)/misc.Plo ./$(DEPDIR)/new_hblk.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/obj_map.Plo ./$(DEPDIR)/os_dep.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/pcr_interface.Plo \
+ at AMDEP_TRUE@ ./$(DEPDIR)/pthread_stop_world.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/pthread_support.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/ptr_chck.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/real_malloc.Plo \
@@ -408,6 +410,7 @@
boehm/solaris_pthreads.c \
boehm/solaris_threads.c \
boehm/pthread_support.c \
+ boehm/pthread_stop_world.c \
boehm/malloc.c \
boehm/mallocx.c \
boehm/mark.c \
@@ -529,6 +532,7 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/obj_map.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/os_dep.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pcr_interface.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pthread_stop_world.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pthread_support.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ptr_chck.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/real_malloc.Plo at am__quote@
@@ -898,6 +902,30 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/pthread_support.Plo' tmpdepfile='$(DEPDIR)/pthread_support.TPlo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pthread_support.lo `test -f 'boehm/pthread_support.c' || echo '$(srcdir)/'`boehm/pthread_support.c
+
+pthread_stop_world.o: boehm/pthread_stop_world.c
+ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pthread_stop_world.o -MD -MP -MF "$(DEPDIR)/pthread_stop_world.Tpo" -c -o pthread_stop_world.o `test -f 'boehm/pthread_stop_world.c' || echo '$(srcdir)/'`boehm/pthread_stop_world.c; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/pthread_stop_world.Tpo" "$(DEPDIR)/pthread_stop_world.Po"; else rm -f "$(DEPDIR)/pthread_stop_world.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='boehm/pthread_stop_world.c' object='pthread_stop_world.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/pthread_stop_world.Po' tmpdepfile='$(DEPDIR)/pthread_stop_world.TPo' @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pthread_stop_world.o `test -f 'boehm/pthread_stop_world.c' || echo '$(srcdir)/'`boehm/pthread_stop_world.c
+
+pthread_stop_world.obj: boehm/pthread_stop_world.c
+ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pthread_stop_world.obj -MD -MP -MF "$(DEPDIR)/pthread_stop_world.Tpo" -c -o pthread_stop_world.obj `if test -f 'boehm/pthread_stop_world.c'; then $(CYGPATH_W) 'boehm/pthread_stop_world.c'; else $(CYGPATH_W) '$(srcdir)/boehm/pthread_stop_world.c'; fi`; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/pthread_stop_world.Tpo" "$(DEPDIR)/pthread_stop_world.Po"; else rm -f "$(DEPDIR)/pthread_stop_world.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='boehm/pthread_stop_world.c' object='pthread_stop_world.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/pthread_stop_world.Po' tmpdepfile='$(DEPDIR)/pthread_stop_world.TPo' @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pthread_stop_world.obj `if test -f 'boehm/pthread_stop_world.c'; then $(CYGPATH_W) 'boehm/pthread_stop_world.c'; else $(CYGPATH_W) '$(srcdir)/boehm/pthread_stop_world.c'; fi`
+
+pthread_stop_world.lo: boehm/pthread_stop_world.c
+ at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pthread_stop_world.lo -MD -MP -MF "$(DEPDIR)/pthread_stop_world.Tpo" -c -o pthread_stop_world.lo `test -f 'boehm/pthread_stop_world.c' || echo '$(srcdir)/'`boehm/pthread_stop_world.c; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/pthread_stop_world.Tpo" "$(DEPDIR)/pthread_stop_world.Plo"; else rm -f "$(DEPDIR)/pthread_stop_world.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='boehm/pthread_stop_world.c' object='pthread_stop_world.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/pthread_stop_world.Plo' tmpdepfile='$(DEPDIR)/pthread_stop_world.TPlo' @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pthread_stop_world.lo `test -f 'boehm/pthread_stop_world.c' || echo '$(srcdir)/'`boehm/pthread_stop_world.c
malloc.o: boehm/malloc.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT malloc.o -MD -MP -MF "$(DEPDIR)/malloc.Tpo" -c -o malloc.o `test -f 'boehm/malloc.c' || echo '$(srcdir)/'`boehm/malloc.c; \
Index: kaffe/libraries/javalib/all.files
diff -u kaffe/libraries/javalib/all.files:1.3 kaffe/libraries/javalib/all.files:1.4
--- kaffe/libraries/javalib/all.files:1.3 Thu Jul 22 19:19:23 2004
+++ kaffe/libraries/javalib/all.files Fri Jul 23 13:45:23 2004
@@ -2486,6 +2486,7 @@
javax/swing/JColorChooser.java
javax/swing/JComboBox.java
javax/swing/JComponent.java
+javax/swing/JLayeredPane.java
javax/swing/JDesktopPane.java
javax/swing/JDialog.java
javax/swing/JEditorPane.java
@@ -2494,7 +2495,6 @@
javax/swing/JFrame.java
javax/swing/JInternalFrame.java
javax/swing/JLabel.java
-javax/swing/JLayeredPane.java
javax/swing/JList.java
javax/swing/JMenuBar.java
javax/swing/JMenuItem.java
Index: kaffe/m4/gwqt.m4
diff -u kaffe/m4/gwqt.m4:1.1 kaffe/m4/gwqt.m4:1.2
--- kaffe/m4/gwqt.m4:1.1 Wed Dec 24 19:07:24 2003
+++ kaffe/m4/gwqt.m4 Fri Jul 23 13:45:24 2004
@@ -35,13 +35,13 @@
AC_MSG_RESULT([$QT_VER ($QT_MAJOR)])
# Check that moc is in path
-AC_CHECK_PROG(MOC, moc, moc)
+AC_PATH_PROG(MOC, moc,,[$PATH:$QTDIR/bin])
if test x$MOC = x ; then
AC_MSG_ERROR([*** moc must be in path])
fi
# uic is the Qt user interface compiler
-AC_CHECK_PROG(UIC, uic, uic)
+AC_PATH_PROG(UIC, uic,,[$PATH:$QTDIR/bin])
#if test x$UIC = x ; then
# AC_MSG_ERROR([*** uic must be in path])
#fi
Index: kaffe/po/fr.po
diff -u kaffe/po/fr.po:1.5 kaffe/po/fr.po:1.6
--- kaffe/po/fr.po:1.5 Thu Jul 8 17:29:53 2004
+++ kaffe/po/fr.po Fri Jul 23 13:45:25 2004
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Kaffe Virtual Machine 1.1.x-cvs\n"
"Report-Msgid-Bugs-To: kaffe at kaffe.org\n"
-"POT-Creation-Date: 2004-07-07 11:49+0200\n"
+"POT-Creation-Date: 2004-07-23 09:41+0800\n"
"PO-Revision-Date: 2004-06-03 22:00+0200\n"
"Last-Translator: Guilhem Lavaux <guilhem.lavaux at free.fr>\n"
"Language-Team: French <kaffe at kaffe.org>\n"
@@ -15,95 +15,95 @@
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: kaffe/kaffe/main.c:399 kaffe/kaffe/main.c:426 kaffe/kaffe/main.c:451
-#: kaffe/kaffe/main.c:473
+#: kaffe/kaffe/main.c:404 kaffe/kaffe/main.c:482 kaffe/kaffe/main.c:527
+#: kaffe/kaffe/main.c:554 kaffe/kaffe/main.c:579 kaffe/kaffe/main.c:601
#, c-format
msgid "Error: out of memory.\n"
msgstr "Erreur: pas assez de mémoire.\n"
-#: kaffe/kaffe/main.c:488
+#: kaffe/kaffe/main.c:616
#, c-format
msgid "Error: No stack size found for -ss option.\n"
msgstr ""
"Erreur: La taille de la pile n'a pas été trouvé après l'argument -ss.\n"
-#: kaffe/kaffe/main.c:496
+#: kaffe/kaffe/main.c:624
#, c-format
msgid "Warning: Attempt to set stack size smaller than %d - ignored.\n"
msgstr ""
"Avertissement: Vous ne pouvez pas spécifer une taille de pile plus petite "
"que %d - valeur ignorée.\n"
-#: kaffe/kaffe/main.c:507
+#: kaffe/kaffe/main.c:635
#, c-format
msgid "Error: No heap size found for -mx option.\n"
msgstr "Erreur: Pas de taille de tas trouvée après l'argument -mx.\n"
-#: kaffe/kaffe/main.c:520
+#: kaffe/kaffe/main.c:648
#, c-format
msgid "Error: No heap size found for -ms option.\n"
msgstr "Erreur: Pas de taille du tas trouvée après l'argument -ms.\n"
-#: kaffe/kaffe/main.c:532
+#: kaffe/kaffe/main.c:660
#, c-format
msgid "Error: No heap size found for -as option.\n"
msgstr "Erreur: Pas de taille de tas trouvée après l'argument -as.\n"
-#: kaffe/kaffe/main.c:588
+#: kaffe/kaffe/main.c:716
#, c-format
msgid "Error: -Xxprof_syms option requires a file name.\n"
msgstr "Erreur: L'argument -Xxprof_syms nécessite un nom de fichier.\n"
-#: kaffe/kaffe/main.c:594
+#: kaffe/kaffe/main.c:722
#, c-format
msgid "Unable to create profiler symbol file %s.\n"
msgstr ""
"Impossible de créer le fichier %s devant contenir les symboles de "
"profilage.\n"
-#: kaffe/kaffe/main.c:603
+#: kaffe/kaffe/main.c:731
#, c-format
msgid "Error: -Xxprof_gmon option requires a file name.\n"
msgstr "Erreur: L'argument -Xxprof_gmon nécessite un nom de fichier.\n"
-#: kaffe/kaffe/main.c:609
+#: kaffe/kaffe/main.c:737
#, c-format
msgid "Unable to create gmon file %s.\n"
msgstr "Impossible de créer le fichier gmon nommé %s.\n"
-#: kaffe/kaffe/main.c:623
+#: kaffe/kaffe/main.c:751
#, c-format
msgid "Error: -Xxdebug_file option requires a file name.\n"
msgstr "Erreur: L'option -Xxdebug_file requiert un nom de fichier.\n"
-#: kaffe/kaffe/main.c:637
+#: kaffe/kaffe/main.c:765
#, c-format
msgid "Error: -Xfeedback option requires a file name.\n"
msgstr "Erreur: L'option -Xfeedback requiert un nom de fichier.\n"
-#: kaffe/kaffe/main.c:655
+#: kaffe/kaffe/main.c:783
#, c-format
msgid "Error: -vmstats option requires a second arg.\n"
msgstr "Erreur: L'option -vmstats requiert un second argument.\\n\n"
-#: kaffe/kaffe/main.c:667
+#: kaffe/kaffe/main.c:795
#, c-format
msgid "Error: -vmdebug option requires a debug flag. Use `list' for a list.\n"
msgstr ""
"Erreur: L'option -vmdebug requiert un paramètre. Utilisez 'list' pour avoir "
"une liste des paramètres.\n"
-#: kaffe/kaffe/main.c:695
+#: kaffe/kaffe/main.c:811
#, c-format
msgid "Error: Unrecognized JVM specific option `%s'.\n"
msgstr "Erreur: L'option '%s' spécifique à la JVM n'est pas connue.\n"
-#: kaffe/kaffe/main.c:710
+#: kaffe/kaffe/main.c:826
#, c-format
msgid "Unknown flag: %s\n"
msgstr "Paramètre inconnu: %s\n"
-#: kaffe/kaffe/main.c:726
+#: kaffe/kaffe/main.c:842
#, c-format
msgid ""
"usage: kaffe [-options] class\n"
@@ -118,12 +118,12 @@
"\t-version\t\t Affiche le numéro de version\n"
"\t-fullversion\t\t Affiche plus d'information sur la version\n"
-#: kaffe/kaffe/main.c:732
+#: kaffe/kaffe/main.c:848
#, c-format
msgid "\t-ia32\t\t\t Execute the ia32 version of Kaffe\n"
msgstr "\t-ia32\t\t\t Exécute la version ia32 de kaffe\n"
-#: kaffe/kaffe/main.c:734
+#: kaffe/kaffe/main.c:850
#, c-format
msgid ""
"\t-ss <size>\t\t Maximum native stack size\n"
@@ -166,12 +166,12 @@
"\t-verbosecall\t\t Affiche des information sur les méthodes appelées\n"
"\t-nodeadlock\t\t Désactive la détection des deadlock\n"
-#: kaffe/kaffe/main.c:754
+#: kaffe/kaffe/main.c:870
#, c-format
msgid "\t-prof\t\t\t Enable profiling of Java methods\n"
msgstr "\t-prof\t\t\t Active le profilage des méthodes Java\n"
-#: kaffe/kaffe/main.c:757
+#: kaffe/kaffe/main.c:873
#, c-format
msgid ""
"\t-Xxprof\t\t\t Enable cross language profiling\n"
@@ -185,19 +185,19 @@
"\t-Xxprof_gmon <fichier>\t Nom de base pour les fichiers gmon [Défaut: "
"xgmon.out]\n"
-#: kaffe/kaffe/main.c:762
+#: kaffe/kaffe/main.c:878
#, c-format
msgid "\t-Xxdebug_file <file>\t Name of the debugging symbols file\n"
msgstr ""
"\t-Xxdebug_file <fichier>\t Fichier pour les symboles de débogages.\n"
-#: kaffe/kaffe/main.c:765
+#: kaffe/kaffe/main.c:881
#, c-format
msgid "\t-Xfeedback <file>\t The file name to write feedback data to\n"
msgstr ""
"\t-Xfeedback <fichier>\t Le fichier devant contenir les données feedback\n"
-#: kaffe/kaffe/main.c:767
+#: kaffe/kaffe/main.c:883
#, c-format
msgid ""
"\t-debug * \t\t Trace method calls\n"
@@ -212,7 +212,7 @@
"\t-oss <taille> *\t\t Taille maximale de la pile\n"
"\t-jar\t\t\t L'exécutable est un JAR\n"
-#: kaffe/kaffe/main.c:773
+#: kaffe/kaffe/main.c:889
#, c-format
msgid ""
"\t-vmdebug <flag{,flag}>\t Internal VM debugging. Set flag=list for a list\n"
@@ -220,14 +220,29 @@
"\t-vmdebug <flag{,flag}>\t Débogage interne de la VM. Utilisez flag=list "
"pour avoir la liste\n"
-#: kaffe/kaffe/main.c:776
+#: kaffe/kaffe/main.c:892
#, c-format
msgid "\t-vmstats <flag{,flag}>\t Print VM statistics. Set flag=all for all\n"
msgstr ""
"\t-vmstats <flag{,flag>\t Affiche des statistiques sur la VM. Utilisez "
"flag=all pour les avoir toutes.\n"
-#: kaffe/kaffe/main.c:778
+#: kaffe/kaffe/main.c:895
+#, c-format
+msgid "\t-Xnative-big-math\t Use GMP for faster, native bignum calculations\n"
+msgstr "\t-Xnative-big-math\t Utiliser GMP pour des calculs BigNum natifs et plus raides.\n"
+
+#: kaffe/kaffe/main.c:897
+#, c-format
+msgid "\t-Xkaffe-xlib-awt\tUse Kaffe's Xlib AWT backend\n"
+msgstr "\t-Xkaffe-xlib-awt\t Utiliser le système graphique Xlib AWT de Kaffe."
+
+#: kaffe/kaffe/main.c:898
+#, c-format
+msgid "\t-Xkaffe-qte-awt\t\tUse Kaffe's Qt2/3/Embedded AWT backend\n"
+msgstr "\t-Xkaffe-qte-awt\t\t Utiliser le système graphique Qt2/3/E AWT de Kaffe."
+
+#: kaffe/kaffe/main.c:900
#, c-format
msgid ""
" * Option currently ignored.\n"
More information about the kaffe
mailing list