[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Eliot-dev] eliot INSTALL configure.in dic/Makefile.am dic/... [cppdic]
|
From: |
eliot-dev |
|
Subject: |
[Eliot-dev] eliot INSTALL configure.in dic/Makefile.am dic/... [cppdic] |
|
Date: |
Thu, 29 Nov 2007 19:09:57 +0000 |
CVSROOT: /cvsroot/eliot
Module name: eliot
Branch: cppdic
Changes by: Olivier Teulière <ipkiss> 07/11/29 19:09:57
Modified files:
. : INSTALL configure.in
dic : Makefile.am compdic.cpp dic_internals.h
header.cpp
game : Makefile.am
po : POTFILES.in eliot.pot fr.po
utils : Makefile.am
Log message:
Build system fixes and improvements:
- make distcheck is now working
- added iconv detection
- used ICONV_CONST to work-around different iconv() prototypes on
Linux and Windows
- fixed Boost stuff
- updated po files
- a few other cosmetic changes
Also updated the INSTALL file
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/eliot/INSTALL?cvsroot=eliot&only_with_tag=cppdic&r1=1.8.6.1&r2=1.8.6.2
http://cvs.savannah.gnu.org/viewcvs/eliot/configure.in?cvsroot=eliot&only_with_tag=cppdic&r1=1.19.2.3&r2=1.19.2.4
http://cvs.savannah.gnu.org/viewcvs/eliot/dic/Makefile.am?cvsroot=eliot&only_with_tag=cppdic&r1=1.14.4.6&r2=1.14.4.7
http://cvs.savannah.gnu.org/viewcvs/eliot/dic/compdic.cpp?cvsroot=eliot&only_with_tag=cppdic&r1=1.1.2.9&r2=1.1.2.10
http://cvs.savannah.gnu.org/viewcvs/eliot/dic/dic_internals.h?cvsroot=eliot&only_with_tag=cppdic&r1=1.7.2.4&r2=1.7.2.5
http://cvs.savannah.gnu.org/viewcvs/eliot/dic/header.cpp?cvsroot=eliot&only_with_tag=cppdic&r1=1.1.2.9&r2=1.1.2.10
http://cvs.savannah.gnu.org/viewcvs/eliot/game/Makefile.am?cvsroot=eliot&only_with_tag=cppdic&r1=1.13.2.2&r2=1.13.2.3
http://cvs.savannah.gnu.org/viewcvs/eliot/po/POTFILES.in?cvsroot=eliot&only_with_tag=cppdic&r1=1.3&r2=1.3.2.1
http://cvs.savannah.gnu.org/viewcvs/eliot/po/eliot.pot?cvsroot=eliot&only_with_tag=cppdic&r1=1.6&r2=1.6.6.1
http://cvs.savannah.gnu.org/viewcvs/eliot/po/fr.po?cvsroot=eliot&only_with_tag=cppdic&r1=1.6&r2=1.6.6.1
http://cvs.savannah.gnu.org/viewcvs/eliot/utils/Makefile.am?cvsroot=eliot&only_with_tag=cppdic&r1=1.9&r2=1.9.4.1
Patches:
Index: INSTALL
===================================================================
RCS file: /cvsroot/eliot/eliot/INSTALL,v
retrieving revision 1.8.6.1
retrieving revision 1.8.6.2
diff -u -b -r1.8.6.1 -r1.8.6.2
--- INSTALL 11 Nov 2007 19:56:57 -0000 1.8.6.1
+++ INSTALL 29 Nov 2007 19:09:56 -0000 1.8.6.2
@@ -1,6 +1,7 @@
+
Installation sous Linux (Un*x) (bien/facile)
------------------------------
-* Pour installer à partir de l'archive CVS :
+* Pour installer à partir de l'archive CVS :
./bootstrap
@@ -8,16 +9,16 @@
make
make install
-* Pour installer à partir de l'archive tar.gz
+* Pour installer à partir de l'archive tar.gz
./configure
make
make install
-il existe en fait 3 versions d'eliot, une en mode texte, une avec une
-interface curses et une avec wxwidgets. Les modes peuvent être
-sélectionnés à l'aide de la commande configure lors de la compilation
+Il existe en fait 3 versions d'eliot, une en mode texte, une avec une
+interface curses et une avec wxwidgets. Les modes peuvent être
+sélectionnés à l'aide de la commande configure lors de la compilation
du programme.
./configure --enable-text --enable-ncurses --enable-wxwidgets
@@ -27,39 +28,50 @@
Installation pour Windows (moins bien/facile)
-------------------------
-Il y a 2 principales façons de procéder :
+Il y a 2 principales façons de procéder :
* directement depuis Windows, en utilisant Cygwin (http://www.cygwin.com/).
* depuis GNU/Linux, en utilisant le cross-compilateur Mingw32.
-Dans les 2 cas, les étapes sont les mêmes :
-* installation de l'environnement de compilation (cette étape n'est pas
- décrite ici, car elle ne rentre pas dans le cadre de ce document)
+Dans les 2 cas, les étapes sont les mêmes :
+* installation de l'environnement de compilation (cette étape n'est pas
+ décrite ici, car elle ne rentre pas dans le cadre de ce document)
+
+* compilation et installation des dépendances (même remarque):
+
+ - wxWidgets (http://www.wxwidgets.org/), version 2.4.2 ou ultérieure, avec
+ support de l'unicode
-* compilation et installation de wxWindows (http://www.wxwidgets.org/),
- version 2.4.2 ou ultérieure (même remarque)
+ - libiconv (http://www.gnu.org/software/libiconv/), de préférence
compilée
+ en mode statique (--disable-shared --enable-static)
+
+ - boost (http://www.boost.org/). Eliot n'utilise pas de librairie de Boost
+ (uniquement des headers), donc il n'y a pas vraiment besoin de compiler
* compilation d'Eliot :
- - si vous utilisez l'archive CVS, il faut générer le script 'configure'
+ - si vous utilisez l'archive CVS, il faut générer le script 'configure'
(aussi bien sous Cygwin que sous GNU/Linux) :
./bootstrap
- avec Cygwin, configurer avec la ligne de commande suivante :
+ CPPFLAGS=-I/path/to/installs/include
LDFLAGS=-L/path/to/installs/lib
CC="gcc -mno-cygwin" CXX="g++ -mno-cygwin" \
- ./configure --with-wx-config=/path/to/wx-config
- en prenant soin d'indiquer le chemin correct vers le fichier
- 'wx-config' de l'installation de wxWindows.
+ ./configure --with-wx-config=/path/to/wx-config \
+ --with-boost=/path/to/boost/installs
+ en prenant soin de remplacer les différents chemins par les bonnes
valeurs.
Ensuite, un simple 'make' suffit pour terminer la compilation,
- éventuellement suivi de 'make install'.
+ éventuellement suivi de 'make install'.
- pour la cross-compilation depuis GNU/Linux, configurer avec la ligne
de commande suivante :
+ CPPFLAGS=-I/path/to/installs/include
LDFLAGS=-L/path/to/installs/lib
+ CC="gcc -mno-cygwin" CXX="g++ -mno-cygwin" \
CC=i586-mingw32msvc-gcc CXX=i586-mingw32msvc-g++ \
./configure --host=i586-mingw32msvc --build=i386-linux \
- --with-wx-config=/path/to/wx-config
- en prenant soin d'indiquer le chemin correct vers le fichier
- 'wx-config' de l'installation de wxWindows.
+ --with-wx-config=/path/to/wx-config \
+ --with-boost=/path/to/installs
+ en prenant soin de remplacer les différents chemins par les bonnes
valeurs.
Ensuite, un simple 'make' suffit pour terminer la compilation,
- éventuellement suivi de 'make install'.
+ éventuellement suivi de 'make install'.
Index: configure.in
===================================================================
RCS file: /cvsroot/eliot/eliot/configure.in,v
retrieving revision 1.19.2.3
retrieving revision 1.19.2.4
diff -u -b -r1.19.2.3 -r1.19.2.4
--- configure.in 27 Nov 2007 18:01:04 -0000 1.19.2.3
+++ configure.in 29 Nov 2007 19:09:56 -0000 1.19.2.4
@@ -23,6 +23,7 @@
AC_MSG_ERROR([Could not find the 'bison' program on your system])
fi
+dnl Better than AC_PROG_LEX
AM_PROG_LEX
if test "$LEX" != "flex" ; then
AC_MSG_ERROR([Could not find the 'flex' program on your system])
@@ -56,15 +57,17 @@
dnl Debug mode
AC_ARG_ENABLE([debug],AC_HELP_STRING([--enable-debug],[debug mode (default
disabled)]))
if test "${enable_debug}" = "yes"; then
- CFLAGS+=" -g -DDEBUG"
- CXXFLAGS+=" -g -DDEBUG"
+ CPPFLAGS+=" -DDEBUG"
+ CFLAGS+=" -g"
+ CXXFLAGS+=" -g"
fi
dnl Profile mode
AC_ARG_ENABLE([profile],AC_HELP_STRING([--enable-profile],[profile mode
(default disabled)]))
if test "${enable_profile}" = "yes"; then
- CFLAGS+=" -pg -DPROFILE"
- CXXFLAGS+=" -pg -DPROFILE"
+ CPPFLAGS+=" -DPROFILE"
+ CFLAGS+=" -pg"
+ CXXFLAGS+=" -pg"
LDFLAGS+=" -pg"
fi
@@ -150,6 +153,12 @@
AM_GNU_GETTEXT_VERSION(0.11.5)
AM_GNU_GETTEXT
+dnl Iconv
+dnl This test depends on AM_GNU_GETTEXT executed before
+AS_IF([test "$am_cv_func_iconv" != "yes"],
+ [AC_MSG_ERROR([libiconv is needed for Eliot to work properly])])
+
+
dnl Information about who built eliot (useful for the dictionary)
AC_DEFINE_UNQUOTED(ELIOT_COMPILE_BY, "`whoami`", [user who ran configure])
AC_DEFINE_UNQUOTED(ELIOT_COMPILE_HOST, "`hostname`", [host which ran
configure])
Index: dic/Makefile.am
===================================================================
RCS file: /cvsroot/eliot/eliot/dic/Makefile.am,v
retrieving revision 1.14.4.6
retrieving revision 1.14.4.7
diff -u -b -r1.14.4.6 -r1.14.4.7
--- dic/Makefile.am 27 Nov 2007 18:01:04 -0000 1.14.4.6
+++ dic/Makefile.am 29 Nov 2007 19:09:56 -0000 1.14.4.7
@@ -18,14 +18,15 @@
noinst_LIBRARIES = libdic.a
-INCLUDES = -I$(top_srcdir)
+INCLUDES = -I$(top_srcdir) $(INCICONV)
+LIBS = $(LIBICONV)
-libdic_a_CFLAGS=$(DEBUGFLAGS)
-libdic_a_YFLAGS=
+libdic_a_CFLAGS=
+libdic_a_YFLAGS=-d
libdic_a_LFLAGS=
libdic_a_SOURCES = \
- ery.ypp \
erl.lpp \
+ ery.ypp \
dic_exception.cpp dic_exception.h \
header.cpp header.h \
dic_internals.h \
@@ -42,13 +43,20 @@
libdic_a-ery.cpp \
libdic_a-ery.h
-nodist_libdic_a_SOURCES= \
- libdic_a-erl.cpp \
- libdic_a-erl.h \
- libdic_a-ery.cpp \
- libdic_a-ery.h
+# This hook triggers on 'make dist' (and 'make distcheck')
+# XXX: In fact, the recommended behaviour is:
+# - list only libdic_a-ery.h in BUILT_SOURCES,
+# - do not die with an error in configure.in if flex or bison is not found
+# - do not have any dist-hook trigger
+# The result is that the generated files are kept in the tarball generated
with make dist,
+# with still an error message for developers when the ypp or lpp file has been
modified
+# and bison or flex is not found.
+# The problem is that, even though Automake is aware of the header generated
by bison,
+# it seems to have problems with the one generated by flex...
+dist-hook:
+ -for file in $(BUILT_SOURCES) ; do rm -f $(distdir)/$$file ; done
-CLEANFILES=er.cpp \
+CLEANFILES= \
libdic_a-erl.cpp \
libdic_a-erl.h \
libdic_a-ery.cpp \
@@ -63,7 +71,8 @@
regexp
compdic_SOURCES=compdic.cpp \
- hashtable.h hashtable.cpp
+ hashtable.h hashtable.cpp hashtable.i
address@hidden@
compdic_LDADD=libdic.a
listdic_SOURCES=listdic.cpp
Index: dic/compdic.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/dic/Attic/compdic.cpp,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -b -r1.1.2.9 -r1.1.2.10
--- dic/compdic.cpp 27 Nov 2007 18:01:04 -0000 1.1.2.9
+++ dic/compdic.cpp 29 Nov 2007 19:09:56 -0000 1.1.2.10
@@ -40,6 +40,7 @@
#include <stdlib.h>
#include <stdio.h>
+#include "config.h"
#include "hashtable.h"
#include "encoding.h"
#include "header.h"
@@ -79,7 +80,7 @@
size_t inChars = ioDicSize;
size_t outChars = sizeof(wchar_t) * ioDicSize;
- char *in = &buffer.front();
+ ICONV_CONST char *in = &buffer.front();
char *out = (char*)wide_buf;
size_t res = iconv(handle, &in, &inChars, &out, &outChars);
iconv_close(handle);
@@ -143,7 +144,7 @@
throw DicException("readLetters: Error in iconv_open");
size_t inChars = tokens[0].size();
size_t outChars = sizeof(wchar_t) * MAX_SIZE;
- char *in = buff;
+ ICONV_CONST char *in = buff;
char *out = (char*)letter;
size_t res = iconv(handle, &in, &inChars, &out, &outChars);
iconv_close(handle);
Index: dic/dic_internals.h
===================================================================
RCS file: /cvsroot/eliot/eliot/dic/dic_internals.h,v
retrieving revision 1.7.2.4
retrieving revision 1.7.2.5
diff -u -b -r1.7.2.4 -r1.7.2.5
--- dic/dic_internals.h 20 Nov 2007 12:54:03 -0000 1.7.2.4
+++ dic/dic_internals.h 29 Nov 2007 19:09:56 -0000 1.7.2.5
@@ -31,12 +31,6 @@
#include "config.h"
/**
- * bit masking for ascii characters \n
- * ('a' & CHAR) == ('A' & CHAR) == 1
- */
-#define DIC_CHAR_MASK 0x1F
-
-/**
* structure of a compressed dictionary \n
* \n
* ---------------- \n
@@ -50,17 +44,6 @@
* ----------------
*/
-#if defined(WORDS_BIGENDIAN)
-struct __attribute__ ((packed)) Dawg_edge
-{
- uint32_t
- chr : 5,
- fill: 1,
- last: 1,
- term: 1,
- ptr : 24;
-};
-#else
struct __attribute__ ((packed)) Dawg_edge
{
public:
@@ -75,7 +58,6 @@
return memcmp(this, &iOther, sizeof(*this)) == 0;
}
};
-#endif
#endif /* _DIC_INTERNALS_H */
Index: dic/header.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/dic/Attic/header.cpp,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -b -r1.1.2.9 -r1.1.2.10
--- dic/header.cpp 27 Nov 2007 18:38:29 -0000 1.1.2.9
+++ dic/header.cpp 29 Nov 2007 19:09:56 -0000 1.1.2.10
@@ -411,7 +411,9 @@
wchar_t outbuf[iBufSize];
size_t inChars = iBufSize;
size_t outChars = sizeof(wchar_t) * iBufSize;
- char *in = const_cast<char *>(iBuffer);
+ // Use the ICONV_CONST trick because the declaration of iconv()
+ // differs depending on the implementations...
+ ICONV_CONST char *in = const_cast<ICONV_CONST char*>(iBuffer);
char *out = (char*)outbuf;
size_t res = iconv(handle, &in, &inChars, &out, &outChars);
iconv_close(handle);
@@ -435,7 +437,11 @@
size_t length = iString.size();
size_t inChars = sizeof(wchar_t) * length;
size_t outChars = iBufSize;
- char *in = (char*)&iString[0];
+ // Use the ICONV_CONST trick because the declaration of iconv()
+ // differs depending on the implementations...
+ // FIXME: bonus ugliness for doing 2 casts at once, and accessing string
+ // internals...
+ ICONV_CONST char *in = (ICONV_CONST char*)(&iString[0]);
char *out = oBuffer;
size_t res = iconv(handle, &in, &inChars, &out, &outChars);
iconv_close(handle);
Index: game/Makefile.am
===================================================================
RCS file: /cvsroot/eliot/eliot/game/Makefile.am,v
retrieving revision 1.13.2.2
retrieving revision 1.13.2.3
diff -u -b -r1.13.2.2 -r1.13.2.3
--- game/Makefile.am 27 Nov 2007 18:01:05 -0000 1.13.2.2
+++ game/Makefile.am 29 Nov 2007 19:09:56 -0000 1.13.2.3
@@ -41,5 +41,6 @@
round.cpp round.h \
training.cpp training.h \
turn.cpp turn.h \
- history.cpp history.h
+ history.cpp history.h \
+ debug.h
Index: po/POTFILES.in
===================================================================
RCS file: /cvsroot/eliot/eliot/po/POTFILES.in,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -b -r1.3 -r1.3.2.1
--- po/POTFILES.in 1 Jan 2006 19:34:31 -0000 1.3
+++ po/POTFILES.in 29 Nov 2007 19:09:57 -0000 1.3.2.1
@@ -1,16 +1,18 @@
-./dic/automaton.c
+./dic/automaton.cpp
./dic/automaton.h
-./dic/compdic.c
-./dic/dic.c
+./dic/compdic.cpp
+./dic/dic.cpp
./dic/dic.h
./dic/dic_internals.h
-./dic/dic_search.c
+./dic/dic_search.cpp
./dic/dic_search.h
-./dic/hashtable.c
+./dic/hashtable.cpp
./dic/hashtable.h
-./dic/listdic.c
-./dic/regexp.c
+./dic/listdic.cpp
+./dic/regexp.cpp
./dic/regexp.h
+./dic/tile.cpp
+./dic/tile.h
./game/bag.cpp
./game/bag.h
./game/board.cpp
@@ -39,8 +41,6 @@
./game/results.h
./game/round.cpp
./game/round.h
-./game/tile.cpp
-./game/tile.h
./game/training.cpp
./game/training.h
./utils/eliottxt.cpp
@@ -48,24 +48,24 @@
./utils/game_io.cpp
./utils/ncurses.cpp
./utils/ncurses.h
-./wxwin/auxframes.h
-./wxwin/auxframes.cc
-./wxwin/confdimdlg.h
-./wxwin/confdimdlg.cc
-./wxwin/configdb.h
-./wxwin/configdb.cc
-./wxwin/confsearch.h
-./wxwin/confsearch.cc
-./wxwin/ewx.h
-./wxwin/gfxboard.h
-./wxwin/gfxboard.cc
-./wxwin/gfxresult.h
-./wxwin/gfxresult.cc
-./wxwin/main.cc
-./wxwin/mainframe.h
-./wxwin/mainframe.cc
-./wxwin/printout.h
-./wxwin/printout.cc
-./wxwin/searchpanel.h
-./wxwin/searchpanel.cc
-./config.h
+#./wxwin/auxframes.h
+#./wxwin/auxframes.cc
+#./wxwin/confdimdlg.h
+#./wxwin/confdimdlg.cc
+#./wxwin/configdb.h
+#./wxwin/configdb.cc
+#./wxwin/confsearch.h
+#./wxwin/confsearch.cc
+#./wxwin/ewx.h
+#./wxwin/gfxboard.h
+#./wxwin/gfxboard.cc
+#./wxwin/gfxresult.h
+#./wxwin/gfxresult.cc
+#./wxwin/main.cc
+#./wxwin/mainframe.h
+#./wxwin/mainframe.cc
+#./wxwin/printout.h
+#./wxwin/printout.cc
+#./wxwin/searchpanel.h
+#./wxwin/searchpanel.cc
+#./config.h
Index: po/eliot.pot
===================================================================
RCS file: /cvsroot/eliot/eliot/po/eliot.pot,v
retrieving revision 1.6
retrieving revision 1.6.6.1
diff -u -b -r1.6 -r1.6.6.1
--- po/eliot.pot 2 Apr 2005 22:04:59 -0000 1.6
+++ po/eliot.pot 29 Nov 2007 19:09:57 -0000 1.6.6.1
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-04-03 00:04+0200\n"
+"POT-Creation-Date: 2007-11-28 20:02+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -16,137 +16,137 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: utils/ncurses.cpp:184
+#: utils/ncurses.cpp:187
msgid " Scores "
msgstr ""
-#: utils/ncurses.cpp:190
+#: utils/ncurses.cpp:193
#, c-format
msgid "Player %d: %d"
msgstr ""
-#: utils/ncurses.cpp:198
+#: utils/ncurses.cpp:201
msgid " Racks "
msgstr ""
-#: utils/ncurses.cpp:204
+#: utils/ncurses.cpp:208
#, c-format
msgid "Player %d: %s"
msgstr ""
-#: utils/ncurses.cpp:215 utils/ncurses.cpp:218
+#: utils/ncurses.cpp:219 utils/ncurses.cpp:222
msgid "Search complete"
msgstr ""
-#: utils/ncurses.cpp:229
+#: utils/ncurses.cpp:233
msgid " Search results "
msgstr ""
-#: utils/ncurses.cpp:258
+#: utils/ncurses.cpp:264
msgid " History of the game "
msgstr ""
-#: utils/ncurses.cpp:265
+#: utils/ncurses.cpp:271
msgid " N | RACK | SOLUTION | REF | PTS | P | BONUS"
msgstr ""
-#: utils/ncurses.cpp:296
+#: utils/ncurses.cpp:303
msgid " Help "
msgstr ""
-#: utils/ncurses.cpp:301
+#: utils/ncurses.cpp:308
msgid "[Global]"
msgstr ""
-#: utils/ncurses.cpp:302
+#: utils/ncurses.cpp:309
msgid " h, H, ? Show/hide help box"
msgstr ""
-#: utils/ncurses.cpp:303
+#: utils/ncurses.cpp:310
msgid " y, Y Show/hide history of the game"
msgstr ""
-#: utils/ncurses.cpp:304
+#: utils/ncurses.cpp:311
msgid " e, E Show/hide dots on empty squares of the board"
msgstr ""
-#: utils/ncurses.cpp:305
+#: utils/ncurses.cpp:312
msgid " d, D Check the existence of a word in the dictionary"
msgstr ""
-#: utils/ncurses.cpp:306
+#: utils/ncurses.cpp:313
msgid " j, J Play a word"
msgstr ""
-#: utils/ncurses.cpp:307
+#: utils/ncurses.cpp:314
msgid " s, S Save the game"
msgstr ""
-#: utils/ncurses.cpp:308
+#: utils/ncurses.cpp:315
msgid " l, L Load a game"
msgstr ""
-#: utils/ncurses.cpp:309
+#: utils/ncurses.cpp:316
msgid " q, Q Quit"
msgstr ""
-#: utils/ncurses.cpp:312
+#: utils/ncurses.cpp:319
msgid "[Training mode]"
msgstr ""
-#: utils/ncurses.cpp:313
+#: utils/ncurses.cpp:320
msgid " * Take a random rack"
msgstr ""
-#: utils/ncurses.cpp:314
+#: utils/ncurses.cpp:321
msgid " + Complete the current rack randomly"
msgstr ""
-#: utils/ncurses.cpp:315
+#: utils/ncurses.cpp:322
msgid " t, T Set the rack manually"
msgstr ""
-#: utils/ncurses.cpp:316
+#: utils/ncurses.cpp:323
msgid " c, C Compute all the possible words"
msgstr ""
-#: utils/ncurses.cpp:317
+#: utils/ncurses.cpp:324
msgid " r, R Show/hide search results"
msgstr ""
-#: utils/ncurses.cpp:320
+#: utils/ncurses.cpp:327
msgid "[Duplicate mode]"
msgstr ""
-#: utils/ncurses.cpp:321
+#: utils/ncurses.cpp:328
msgid " n, N Switch to the next human player"
msgstr ""
-#: utils/ncurses.cpp:324
+#: utils/ncurses.cpp:331
msgid "[Free game mode]"
msgstr ""
-#: utils/ncurses.cpp:325
+#: utils/ncurses.cpp:332
msgid " p, P Pass your turn (with or without changing letters)"
msgstr ""
-#: utils/ncurses.cpp:328
+#: utils/ncurses.cpp:335
msgid "[Miscellaneous]"
msgstr ""
-#: utils/ncurses.cpp:329
+#: utils/ncurses.cpp:336
msgid " <up>, <down> Navigate in a box line by line"
msgstr ""
-#: utils/ncurses.cpp:330
+#: utils/ncurses.cpp:337
msgid " <pgup>, <pgdown> Navigate in a box page by page"
msgstr ""
-#: utils/ncurses.cpp:331
+#: utils/ncurses.cpp:338
msgid " Ctrl-l Refresh the screen"
msgstr ""
-#: utils/ncurses.cpp:339
+#: utils/ncurses.cpp:346
msgid " Play a word "
msgstr ""
@@ -154,109 +154,109 @@
#. "Coordinates:". For example:
#. Pl. word :
#. Coordinates:
-#: utils/ncurses.cpp:340 utils/ncurses.cpp:348
+#: utils/ncurses.cpp:347 utils/ncurses.cpp:355
msgid "Played word:"
msgstr ""
-#: utils/ncurses.cpp:341 utils/ncurses.cpp:349
+#: utils/ncurses.cpp:348 utils/ncurses.cpp:356
msgid "Coordinates:"
msgstr ""
-#: utils/ncurses.cpp:363
+#: utils/ncurses.cpp:370
msgid "Incorrect or misplaced word"
msgstr ""
-#: utils/ncurses.cpp:373
+#: utils/ncurses.cpp:380
msgid " Dictionary "
msgstr ""
-#: utils/ncurses.cpp:374
+#: utils/ncurses.cpp:381
msgid "Enter the word to check:"
msgstr ""
-#: utils/ncurses.cpp:383
+#: utils/ncurses.cpp:390
#, c-format
msgid "The word '%s' exists"
msgstr ""
-#: utils/ncurses.cpp:385
+#: utils/ncurses.cpp:392
#, c-format
msgid "The word '%s' does not exist"
msgstr ""
-#: utils/ncurses.cpp:395
+#: utils/ncurses.cpp:402
msgid " Save the game "
msgstr ""
-#: utils/ncurses.cpp:396 utils/ncurses.cpp:425
+#: utils/ncurses.cpp:403 utils/ncurses.cpp:432
msgid "Enter the file name:"
msgstr ""
-#: utils/ncurses.cpp:406
+#: utils/ncurses.cpp:413
#, c-format
msgid "Cannot open file %s for writing"
msgstr ""
-#: utils/ncurses.cpp:413
+#: utils/ncurses.cpp:420
#, c-format
msgid "Game saved in %s"
msgstr ""
-#: utils/ncurses.cpp:424
+#: utils/ncurses.cpp:431
msgid " Load a game "
msgstr ""
-#: utils/ncurses.cpp:435
+#: utils/ncurses.cpp:442
#, c-format
msgid "Cannot open file %s for reading"
msgstr ""
-#: utils/ncurses.cpp:443
+#: utils/ncurses.cpp:450
#, c-format
msgid "Invalid saved game"
msgstr ""
-#: utils/ncurses.cpp:447
+#: utils/ncurses.cpp:454
#, c-format
msgid "Game loaded"
msgstr ""
-#: utils/ncurses.cpp:462
+#: utils/ncurses.cpp:469
msgid " Pass your turn "
msgstr ""
-#: utils/ncurses.cpp:463
+#: utils/ncurses.cpp:470
msgid "Enter the letters to change:"
msgstr ""
-#: utils/ncurses.cpp:472
+#: utils/ncurses.cpp:479
msgid "Cannot pass the turn"
msgstr ""
-#: utils/ncurses.cpp:482
+#: utils/ncurses.cpp:489
msgid " Set rack "
msgstr ""
-#: utils/ncurses.cpp:483
+#: utils/ncurses.cpp:490
msgid "Enter the new letters:"
msgstr ""
-#: utils/ncurses.cpp:798
+#: utils/ncurses.cpp:805
msgid "Training mode"
msgstr ""
-#: utils/ncurses.cpp:800
+#: utils/ncurses.cpp:807
msgid "Free game mode"
msgstr ""
-#: utils/ncurses.cpp:802
+#: utils/ncurses.cpp:809
msgid "Duplicate mode"
msgstr ""
-#: utils/ncurses.cpp:805
+#: utils/ncurses.cpp:812
msgid "Joker game"
msgstr ""
-#: utils/ncurses.cpp:806
+#: utils/ncurses.cpp:813
msgid "[h for help]"
msgstr ""
Index: po/fr.po
===================================================================
RCS file: /cvsroot/eliot/eliot/po/fr.po,v
retrieving revision 1.6
retrieving revision 1.6.6.1
diff -u -b -r1.6 -r1.6.6.1
--- po/fr.po 2 Apr 2005 22:04:59 -0000 1.6
+++ po/fr.po 29 Nov 2007 19:09:57 -0000 1.6.6.1
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: eliot 1.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-04-03 00:04+0200\n"
+"POT-Creation-Date: 2007-11-28 20:02+0100\n"
"PO-Revision-Date: 2005-02-06 20:03+0100\n"
"Last-Translator: Olivier Teuliere <address@hidden>\n"
"Language-Team: French <address@hidden>\n"
@@ -17,140 +17,140 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: utils/ncurses.cpp:184
+#: utils/ncurses.cpp:187
msgid " Scores "
msgstr " Scores "
-#: utils/ncurses.cpp:190
+#: utils/ncurses.cpp:193
#, c-format
msgid "Player %d: %d"
msgstr "Joueur %d : %d"
-#: utils/ncurses.cpp:198
+#: utils/ncurses.cpp:201
msgid " Racks "
msgstr " Tirages "
-#: utils/ncurses.cpp:204
+#: utils/ncurses.cpp:208
#, c-format
msgid "Player %d: %s"
msgstr "Joueur %d : %s"
-#: utils/ncurses.cpp:215 utils/ncurses.cpp:218
+#: utils/ncurses.cpp:219 utils/ncurses.cpp:222
msgid "Search complete"
msgstr "Recherche terminée"
-#: utils/ncurses.cpp:229
+#: utils/ncurses.cpp:233
msgid " Search results "
msgstr " Résultats de la recherche "
-#: utils/ncurses.cpp:258
+#: utils/ncurses.cpp:264
msgid " History of the game "
msgstr " Historique de la partie "
-#: utils/ncurses.cpp:265
+#: utils/ncurses.cpp:271
msgid " N | RACK | SOLUTION | REF | PTS | P | BONUS"
msgstr " N | TIRAGE | SOLUTION | REF | PTS | J | BONUS"
-#: utils/ncurses.cpp:296
+#: utils/ncurses.cpp:303
msgid " Help "
msgstr " Aide "
-#: utils/ncurses.cpp:301
+#: utils/ncurses.cpp:308
msgid "[Global]"
msgstr "[Général]"
-#: utils/ncurses.cpp:302
+#: utils/ncurses.cpp:309
msgid " h, H, ? Show/hide help box"
msgstr " h, H, ? Afficher/cacher la boîte d'aide"
-#: utils/ncurses.cpp:303
+#: utils/ncurses.cpp:310
msgid " y, Y Show/hide history of the game"
msgstr " y, Y Afficher/cacher l'historique de la partie"
-#: utils/ncurses.cpp:304
+#: utils/ncurses.cpp:311
msgid " e, E Show/hide dots on empty squares of the board"
msgstr ""
" e, E Afficher/cacher les points sur les cases vides du "
"plateau de jeu"
-#: utils/ncurses.cpp:305
+#: utils/ncurses.cpp:312
msgid " d, D Check the existence of a word in the dictionary"
msgstr " d, D Vérifier l'existence d'un mot dans le dictionnaire"
-#: utils/ncurses.cpp:306
+#: utils/ncurses.cpp:313
msgid " j, J Play a word"
msgstr " j, J Jouer un mot"
-#: utils/ncurses.cpp:307
+#: utils/ncurses.cpp:314
msgid " s, S Save the game"
msgstr " s, S Sauver la partie"
-#: utils/ncurses.cpp:308
+#: utils/ncurses.cpp:315
msgid " l, L Load a game"
msgstr " l, L Charger une partie"
-#: utils/ncurses.cpp:309
+#: utils/ncurses.cpp:316
msgid " q, Q Quit"
msgstr " q, Q Quitter"
-#: utils/ncurses.cpp:312
+#: utils/ncurses.cpp:319
msgid "[Training mode]"
msgstr "[Mode entraînement]"
-#: utils/ncurses.cpp:313
+#: utils/ncurses.cpp:320
msgid " * Take a random rack"
msgstr " * Tirage aléatoire"
-#: utils/ncurses.cpp:314
+#: utils/ncurses.cpp:321
msgid " + Complete the current rack randomly"
msgstr " + Compléter le tirage courant de manière aléatoire"
-#: utils/ncurses.cpp:315
+#: utils/ncurses.cpp:322
msgid " t, T Set the rack manually"
msgstr " t, T Entrer le tirage manuellement"
-#: utils/ncurses.cpp:316
+#: utils/ncurses.cpp:323
msgid " c, C Compute all the possible words"
msgstr " c, C Calculer tous les mots possibles"
-#: utils/ncurses.cpp:317
+#: utils/ncurses.cpp:324
msgid " r, R Show/hide search results"
msgstr " r, R Afficher/cacher les résultats de la recherche"
-#: utils/ncurses.cpp:320
+#: utils/ncurses.cpp:327
msgid "[Duplicate mode]"
msgstr "[Mode duplicate]"
-#: utils/ncurses.cpp:321
+#: utils/ncurses.cpp:328
msgid " n, N Switch to the next human player"
msgstr " n, N Passer au joueur humain suivant"
-#: utils/ncurses.cpp:324
+#: utils/ncurses.cpp:331
msgid "[Free game mode]"
msgstr "[Mode partie libre]"
-#: utils/ncurses.cpp:325
+#: utils/ncurses.cpp:332
msgid " p, P Pass your turn (with or without changing letters)"
msgstr ""
" p, P Passer son tour (en changeant ou pas certaines lettres)"
-#: utils/ncurses.cpp:328
+#: utils/ncurses.cpp:335
msgid "[Miscellaneous]"
msgstr "[Divers]"
-#: utils/ncurses.cpp:329
+#: utils/ncurses.cpp:336
msgid " <up>, <down> Navigate in a box line by line"
msgstr " <haut>, <bas> Naviguer dans une boîte ligne par ligne"
-#: utils/ncurses.cpp:330
+#: utils/ncurses.cpp:337
msgid " <pgup>, <pgdown> Navigate in a box page by page"
msgstr " <pgup>, <pgdown> Naviguer dans une boîte page par page"
-#: utils/ncurses.cpp:331
+#: utils/ncurses.cpp:338
msgid " Ctrl-l Refresh the screen"
msgstr " Ctrl-l Rafraîchir l'écran"
-#: utils/ncurses.cpp:339
+#: utils/ncurses.cpp:346
msgid " Play a word "
msgstr " Jouer un mot "
@@ -158,110 +158,110 @@
#. "Coordinates:". For example:
#. Pl. word :
#. Coordinates:
-#: utils/ncurses.cpp:340 utils/ncurses.cpp:348
+#: utils/ncurses.cpp:347 utils/ncurses.cpp:355
msgid "Played word:"
msgstr "Mot joué :"
-#: utils/ncurses.cpp:341 utils/ncurses.cpp:349
+#: utils/ncurses.cpp:348 utils/ncurses.cpp:356
msgid "Coordinates:"
msgstr "Coordonnées :"
-#: utils/ncurses.cpp:363
+#: utils/ncurses.cpp:370
msgid "Incorrect or misplaced word"
msgstr "Mot incorrect ou mal placé"
-#: utils/ncurses.cpp:373
+#: utils/ncurses.cpp:380
msgid " Dictionary "
msgstr " Dictionnaire "
-#: utils/ncurses.cpp:374
+#: utils/ncurses.cpp:381
msgid "Enter the word to check:"
msgstr "Entrer le mot à vérifier:"
-#: utils/ncurses.cpp:383
+#: utils/ncurses.cpp:390
#, c-format
msgid "The word '%s' exists"
msgstr "Le mot '%s' existe"
-#: utils/ncurses.cpp:385
+#: utils/ncurses.cpp:392
#, c-format
msgid "The word '%s' does not exist"
msgstr "Le mot '%s' n'existe pas"
-#: utils/ncurses.cpp:395
+#: utils/ncurses.cpp:402
msgid " Save the game "
msgstr " Sauver la partie "
-#: utils/ncurses.cpp:396 utils/ncurses.cpp:425
+#: utils/ncurses.cpp:403 utils/ncurses.cpp:432
msgid "Enter the file name:"
msgstr "Entrer le nom du fichier :"
-#: utils/ncurses.cpp:406
+#: utils/ncurses.cpp:413
#, c-format
msgid "Cannot open file %s for writing"
msgstr "Impossible d'ouvrir le fichier %s en écriture"
-#: utils/ncurses.cpp:413
+#: utils/ncurses.cpp:420
#, c-format
msgid "Game saved in %s"
msgstr "Partie sauvée dans %s"
-#: utils/ncurses.cpp:424
+#: utils/ncurses.cpp:431
msgid " Load a game "
msgstr " Charger une partie "
-#: utils/ncurses.cpp:435
+#: utils/ncurses.cpp:442
#, c-format
msgid "Cannot open file %s for reading"
msgstr "Impossible d'ouvrir le fichier %s en lecture"
-#: utils/ncurses.cpp:443
+#: utils/ncurses.cpp:450
#, c-format
msgid "Invalid saved game"
msgstr "Partie sauvée invalide"
-#: utils/ncurses.cpp:447
+#: utils/ncurses.cpp:454
#, c-format
msgid "Game loaded"
msgstr "Partie chargée"
-#: utils/ncurses.cpp:462
+#: utils/ncurses.cpp:469
msgid " Pass your turn "
msgstr " Passer son tour "
-#: utils/ncurses.cpp:463
+#: utils/ncurses.cpp:470
msgid "Enter the letters to change:"
msgstr "Entrer les lettres à changer:"
-#: utils/ncurses.cpp:472
+#: utils/ncurses.cpp:479
msgid "Cannot pass the turn"
msgstr "Impossible de passer le tour"
-#: utils/ncurses.cpp:482
+#: utils/ncurses.cpp:489
msgid " Set rack "
msgstr " Choix du tirage "
-#: utils/ncurses.cpp:483
+#: utils/ncurses.cpp:490
msgid "Enter the new letters:"
msgstr "Entrer les nouvelles lettres:"
-#: utils/ncurses.cpp:798
+#: utils/ncurses.cpp:805
msgid "Training mode"
msgstr "Mode entraînement"
-#: utils/ncurses.cpp:800
+#: utils/ncurses.cpp:807
msgid "Free game mode"
msgstr "Mode partie libre"
-#: utils/ncurses.cpp:802
+#: utils/ncurses.cpp:809
msgid "Duplicate mode"
msgstr "Mode duplicate"
-#: utils/ncurses.cpp:805
+#: utils/ncurses.cpp:812
msgid "Joker game"
msgstr "Partie joker"
-#: utils/ncurses.cpp:806
+#: utils/ncurses.cpp:813
msgid "[h for help]"
msgstr "[h pour l'aide]"
Index: utils/Makefile.am
===================================================================
RCS file: /cvsroot/eliot/eliot/utils/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.9.4.1
diff -u -b -r1.9 -r1.9.4.1
--- utils/Makefile.am 4 Nov 2005 20:00:06 -0000 1.9
+++ utils/Makefile.am 29 Nov 2007 19:09:57 -0000 1.9.4.1
@@ -19,17 +19,18 @@
top_srcdir = @top_srcdir@
INCLUDES = -I$(top_srcdir)/dic -I$(top_srcdir)/game -I$(top_srcdir)/intl
+
noinst_PROGRAMS =
if BUILD_TEXT
noinst_PROGRAMS += eliottxt
eliottxt_SOURCES = game_io.h game_io.cpp eliottxt.cpp
-eliottxt_LDADD = ../game/libgame.a ../dic/libdic.a -lreadline
+eliottxt_LDADD = $(top_builddir)/game/libgame.a $(top_builddir)/dic/libdic.a
-lreadline
endif
if BUILD_NCURSES
noinst_PROGRAMS += eliotcurses
-eliotcurses_SOURCES = ncurses.cpp
+eliotcurses_SOURCES = ncurses.cpp ncurses.h
eliotcurses_LDADD = ../game/libgame.a ../dic/libdic.a -lncurses @LIBINTL@
endif
- [Eliot-dev] eliot INSTALL configure.in dic/Makefile.am dic/... [cppdic],
eliot-dev <=