gnupos-cvs Mailing List for GnuPOS
Status: Pre-Alpha
Brought to you by:
conrad_c
You can subscribe to this list here.
2003 |
Jan
(35) |
Feb
(14) |
Mar
|
Apr
|
May
|
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
---|
From: <con...@us...> - 2003-06-30 13:54:18
|
Update of /cvsroot/gnupos/gnp-server/src In directory sc8-pr-cvs1:/tmp/cvs-serv30612 Modified Files: main.c Log Message: Few small modifications. Index: main.c =================================================================== RCS file: /cvsroot/gnupos/gnp-server/src/main.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** main.c 21 Feb 2003 12:33:54 -0000 1.4 --- main.c 30 Jun 2003 13:54:13 -0000 1.5 *************** *** 36,56 **** innermain (int argc, char **argv, void *closure) { ! if (gnps_verbose) ! printf("Initialising internal data structures.\n"); gnps_initialise_structures (); ! if(gnps_verbose) ! printf("Initialising communications.\n"); gnps_initialise_comms (); ! if (gnps_verbose) ! printf("Initialising guile functions.\n"); gnps_initialise_guile (); ! if (gnps_verbose) ! printf("Starting event loop.\n"); /* gnp_global_data.ui_event_ptr(); */ --- 36,52 ---- innermain (int argc, char **argv, void *closure) { ! verprintf("Initialising internal data structures.\n"); gnps_initialise_structures (); ! verprintf("Initialising communications.\n"); gnps_initialise_comms (); ! verprintf("Initialising guile functions.\n"); gnps_initialise_guile (); ! verprintf("Starting event loop.\n"); /* gnp_global_data.ui_event_ptr(); */ *************** *** 116,126 **** gnps_init_logging(); ! if(gnps_verbose) ! printf("Reading configuration file\n"); gnps_read_config (); ! if(gnps_verbose) ! printf ("Initialising Guile.\n"); scm_boot_guile (argc, &argv, innermain, NULL); --- 112,120 ---- gnps_init_logging(); ! verprintf("Reading configuration file\n"); gnps_read_config (); ! verprintf ("Initialising Guile.\n"); scm_boot_guile (argc, &argv, innermain, NULL); *************** *** 142,148 **** /* seemed like the best solution at the time. */ ! int i=0; ! struct { int code; --- 136,142 ---- /* seemed like the best solution at the time. */ ! static int i=0; ! static struct { int code; |
From: <con...@us...> - 2003-06-30 13:53:33
|
Update of /cvsroot/gnupos/gnp-server/src In directory sc8-pr-cvs1:/tmp/cvs-serv30464 Modified Files: GNPS_io.c Log Message: Few small modifications. Start work on reading the config file. Index: GNPS_io.c =================================================================== RCS file: /cvsroot/gnupos/gnp-server/src/GNPS_io.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** GNPS_io.c 22 Feb 2003 09:07:27 -0000 1.4 --- GNPS_io.c 30 Jun 2003 13:53:27 -0000 1.5 *************** *** 33,43 **** --- 33,54 ---- FILE *gnps_log_fh; + /* + * Config file functions + */ + void gnps_read_config () { + FILE *gnps_conf_fh; + if(gnps_debug) printf("Entering gnps_read_config()\n"); + if(gnps_global_data.config_file_name==NULL) + gnps_global_data.config_file_name="/var/lib/gnp-server/config.xml"; + verprintf("Opening config file %s", gnps_global_data.config_file_name); + + gnps_conf_fh - fopen(gnps_global_data.config_file_name, "r"); if(gnps_debug) *************** *** 45,48 **** --- 56,63 ---- } + /* + * Log file functions + */ + void gnps_init_logging () *************** *** 120,123 **** --- 135,157 ---- if(gnps_debug) printf("Leaving logprintf()\n"); + } + + void + verprintf(char *template, ...) + { + va_list vp; + + if(gnps_debug) + printf("Entering verprintf()\n"); + + va_start(vp, template); + if(gnps_global_data.verbose_logging) + logprintf(template, vp); + if(gnps_verbose) + printf(template, vp); + va_end(vp); + + if(gnps_debug) + printf("Leaving verprintf()\n"); } |
From: <con...@us...> - 2003-02-22 09:07:30
|
Update of /cvsroot/gnupos/gnp-server In directory sc8-pr-cvs1:/tmp/cvs-serv31989 Added Files: configuration.sxw Log Message: Added the (bare) start of a document for configuration info. Fixed a few minor logging problems. --- NEW FILE: configuration.sxw --- (This appears to be a binary file; contents omitted.) |
From: <con...@us...> - 2003-02-22 09:07:30
|
Update of /cvsroot/gnupos/gnp-server/src In directory sc8-pr-cvs1:/tmp/cvs-serv31989/src Modified Files: GNPS_io.c Log Message: Added the (bare) start of a document for configuration info. Fixed a few minor logging problems. Index: GNPS_io.c =================================================================== RCS file: /cvsroot/gnupos/gnp-server/src/GNPS_io.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GNPS_io.c 21 Feb 2003 12:33:54 -0000 1.3 --- GNPS_io.c 22 Feb 2003 09:07:27 -0000 1.4 *************** *** 39,42 **** --- 39,44 ---- printf("Entering gnps_read_config()\n"); + + if(gnps_debug) printf("Leaving gnps_read_config()\n"); *************** *** 60,67 **** if (gnps_log_fh == NULL) - { - printf("ERROR: Could not open log file. ABORTING.\n"); gnps_exit(GNPS_ERR_LOGOPEN); - } if(gnps_verbose) --- 62,66 ---- *************** *** 71,75 **** if(gnps_global_data.verbose_logging) ! logprintf("- Verbose Logging enabled.\n") if(gnps_debug) --- 70,74 ---- if(gnps_global_data.verbose_logging) ! logprintf("- Verbose Logging enabled."); if(gnps_debug) |
From: <con...@us...> - 2003-02-21 12:33:57
|
Update of /cvsroot/gnupos/gnp-server/src In directory sc8-pr-cvs1:/tmp/cvs-serv18245/src Modified Files: GNPS_io.c main.c Log Message: Tidy up logging stuff - now works properly. Index: GNPS_io.c =================================================================== RCS file: /cvsroot/gnupos/gnp-server/src/GNPS_io.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GNPS_io.c 20 Feb 2003 12:31:27 -0000 1.2 --- GNPS_io.c 21 Feb 2003 12:33:54 -0000 1.3 *************** *** 62,70 **** { printf("ERROR: Could not open log file. ABORTING.\n"); ! exit(-1); } logprintf("GnuPOS Server starting. Version: %s",gnps_global_data.version_str); if(gnps_debug) printf("Leaving gnps_init_logging()\n"); --- 62,76 ---- { printf("ERROR: Could not open log file. ABORTING.\n"); ! gnps_exit(GNPS_ERR_LOGOPEN); } + if(gnps_verbose) + printf("Log File \"%s\" Open.\n",gnps_global_data.log_file_name); + logprintf("GnuPOS Server starting. Version: %s",gnps_global_data.version_str); + if(gnps_global_data.verbose_logging) + logprintf("- Verbose Logging enabled.\n") + if(gnps_debug) printf("Leaving gnps_init_logging()\n"); *************** *** 77,80 **** --- 83,87 ---- struct tm *tm_p; va_list vp; + int i; if(gnps_debug) *************** *** 82,99 **** /* get the time */ ! tt_p = time(tt_p); tm_p = gmtime(&tt_p); ! fprintf(gnps_log_fh,"%02d/%02d/%4d %02d:%02d:%02d UTC - ", ! tm_p->tm_mday, tm_p->tm_mon+1, tm_p->tm_year+1900, tm_p->tm_hour, tm_p->tm_min, tm_p->tm_sec); va_start(vp, template); ! vfprintf(gnps_log_fh, template, vp); va_end(vp); ! fprintf(gnps_log_fh,"\n"); if(gnps_debug) printf("Leaving logprintf()\n"); } --- 89,155 ---- /* get the time */ ! tt_p = time(&tt_p); tm_p = gmtime(&tt_p); ! i = fprintf(gnps_log_fh,"%02d/%02d/%4d %02d:%02d:%02d UTC - ", ! tm_p->tm_mday, (tm_p->tm_mon)+1, (tm_p->tm_year)+1900, tm_p->tm_hour, tm_p->tm_min, tm_p->tm_sec); + if (i < 0) + { + printf("FATAL ERROR: Error writing to log file.\n"); + gnps_exit(GNPS_ERR_LOGWRITE); + } va_start(vp, template); ! ! i = vfprintf(gnps_log_fh, template, vp); ! if (i < 0) ! { ! printf("FATAL ERROR: Error writing to log file.\n"); ! gnps_exit(GNPS_ERR_LOGWRITE); ! } ! va_end(vp); ! i = fprintf(gnps_log_fh,"\n"); ! if (i < 0) ! { ! printf("FATAL ERROR: Error writing to log file.\n"); ! gnps_exit(GNPS_ERR_LOGWRITE); ! } if(gnps_debug) printf("Leaving logprintf()\n"); + } + + void + gnps_log_close_err() + { + /* Close the Log file, with no error checking. Error handling use only! */ + if(gnps_debug) + printf("Entering gnps_log_close_err()\n"); + + if(gnps_log_fh != NULL) + fclose(gnps_log_fh); + + if(gnps_debug) + printf("Leaving gnps_log_close_err()\n"); + } + + void + gnps_log_close() + { + /* Close the log file nicely, including sign-off message in log. */ + + if(gnps_debug) + printf("Entering gnps_log_close()\n"); + + logprintf("GnuPOS exiting normally."); + fclose(gnps_log_fh); + + if(gnps_verbose) + printf("Log file closed.\n"); + + if(gnps_debug) + printf("Leaving gnps_log_close()\n"); } Index: main.c =================================================================== RCS file: /cvsroot/gnupos/gnp-server/src/main.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** main.c 20 Feb 2003 12:31:27 -0000 1.3 --- main.c 21 Feb 2003 12:33:54 -0000 1.4 *************** *** 57,60 **** --- 57,66 ---- printf ("Thank you for using GnuPOS. Have a nice day.\n"); + printf ("Closing down now.\n"); + + /* Insert shut-down calls here. */ + + /* This must be last: log file */ + gnps_log_close(); } *************** *** 123,124 **** --- 129,180 ---- } + void + gnps_exit(int err_code) + { + /* Provide a unified point for exiting. Allows us to close down everything */ + /* that needs closing and generally exit in a relatively nice way. */ + /* If err_code = 0 : There is no error. Exit normally. */ + /* If err_code < 0 : There is an error, flag it as appropriate. */ + /* */ + /* So, why do I use a static table here? Well, its very possible that the */ + /* error we're about to report is actually an out-of-memory error, and we */ + /* don't want our error reporting code to need to allocate memory. This */ + /* seemed like the best solution at the time. */ + + int i=0; + + struct + { + int code; + char *message; + } err_struct[] = + { + GNPS_ERR_UNKNOWN, "Unknown Error. This is bad.", + GNPS_ERR_LOGOPEN, "Cannot open log file.", + GNPS_ERR_LOGWRITE, "Cannot write to log file.", + GNPS_ERR_NOMEMORY, "Out of Memory!", + GNPS_999, "" + }; + + /* INSERT SHUT-DOWN CALLS HERE */ + + /* This call should be last: logfile */ + gnps_log_close_err(); + + while (err_struct[i].code!=999) + { + if(err_code == err_struct[i].code) + { + printf("FATAL ERROR: %s\n",err_struct[i].message); + exit(err_code); + } + else + i++; + } + + /* If we get here, someone is using an undocumented error code! */ + printf("FATAL ERROR!\n"); + printf("But I cannot tell you what it was, because I don't recognise code %d\n", + err_code); + exit(err_code); + } |
From: <con...@us...> - 2003-02-21 12:33:57
|
Update of /cvsroot/gnupos/gnp-server/include In directory sc8-pr-cvs1:/tmp/cvs-serv18245/include Modified Files: GNPS.h Log Message: Tidy up logging stuff - now works properly. Index: GNPS.h =================================================================== RCS file: /cvsroot/gnupos/gnp-server/include/GNPS.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GNPS.h 20 Feb 2003 12:31:26 -0000 1.3 --- GNPS.h 21 Feb 2003 12:33:54 -0000 1.4 *************** *** 28,38 **** --- 28,50 ---- gnps_global_data_struct; + /* defines */ + /* Error codes for gnps_exit() */ + #define GNPS_999 999 + #define GNPS_ERR_UNKNOWN -1 + #define GNPS_ERR_LOGOPEN -2 + #define GNPS_ERR_LOGWRITE -3 + #define GNPS_ERR_NOMEMORY -10 /* Prototypes */ + /* for main.c */ + void gnps_exit(int); + /* for GNPS_io.c */ void gnps_read_config(void); void gnps_init_logging(void); void logprintf(char *, ...); + void gnps_log_close_err(void); + void gnps_log_close(void); |
From: <con...@us...> - 2003-02-20 12:31:32
|
Update of /cvsroot/gnupos/gnp-server/src In directory sc8-pr-cvs1:/tmp/cvs-serv13282/src Modified Files: GNPS_io.c Makefile.am main.c Log Message: Now initialises logging file, and basic logging infrastructure exists. Index: GNPS_io.c =================================================================== RCS file: /cvsroot/gnupos/gnp-server/src/GNPS_io.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** GNPS_io.c 27 Jan 2003 12:22:28 -0000 1.1.1.1 --- GNPS_io.c 20 Feb 2003 12:31:27 -0000 1.2 *************** *** 21,27 **** --- 21,99 ---- /* Copyright (c) 2003 Conrad Canterford. */ + #include <stdio.h> + #include <glib.h> + #include <time.h> + + #include "include/GNPS.h" + + extern gnps_global_data_struct gnps_global_data; + extern int gnps_debug; + extern int gnps_verbose; + + FILE *gnps_log_fh; + void gnps_read_config () { + if(gnps_debug) + printf("Entering gnps_read_config()\n"); + + if(gnps_debug) + printf("Leaving gnps_read_config()\n"); + } + + void + gnps_init_logging () + { + gboolean default_name; + + if(gnps_debug) + printf("Entering gnps_init_logging()\n"); + + if(gnps_global_data.log_file_name == NULL) + { + default_name = TRUE; + gnps_global_data.log_file_name = "/var/log/gnupos"; + } + + gnps_log_fh = fopen(gnps_global_data.log_file_name,"a"); + + if (gnps_log_fh == NULL) + { + printf("ERROR: Could not open log file. ABORTING.\n"); + exit(-1); + } + + logprintf("GnuPOS Server starting. Version: %s",gnps_global_data.version_str); + + if(gnps_debug) + printf("Leaving gnps_init_logging()\n"); + } + + void + logprintf(char *template, ...) + { + time_t tt_p; + struct tm *tm_p; + va_list vp; + + if(gnps_debug) + printf("Entering gnps_logprintf()\n"); + + /* get the time */ + tt_p = time(tt_p); + tm_p = gmtime(&tt_p); + + fprintf(gnps_log_fh,"%02d/%02d/%4d %02d:%02d:%02d UTC - ", + tm_p->tm_mday, tm_p->tm_mon+1, tm_p->tm_year+1900, tm_p->tm_hour, + tm_p->tm_min, tm_p->tm_sec); + + va_start(vp, template); + vfprintf(gnps_log_fh, template, vp); + va_end(vp); + fprintf(gnps_log_fh,"\n"); + + if(gnps_debug) + printf("Leaving logprintf()\n"); } Index: Makefile.am =================================================================== RCS file: /cvsroot/gnupos/gnp-server/src/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.am 9 Feb 2003 12:36:50 -0000 1.2 --- Makefile.am 20 Feb 2003 12:31:27 -0000 1.3 *************** *** 5,9 **** ## Please disable it in the Anjuta project configuration ! INCLUDES = ../include CFLAGS =\ --- 5,11 ---- ## Please disable it in the Anjuta project configuration ! INCLUDES = ../include \ ! -I/usr/include/glib-1.2 \ ! -I/usr/lib/glib/include CFLAGS =\ Index: main.c =================================================================== RCS file: /cvsroot/gnupos/gnp-server/src/main.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** main.c 9 Feb 2003 12:36:50 -0000 1.2 --- main.c 20 Feb 2003 12:31:27 -0000 1.3 *************** *** 80,83 **** --- 80,84 ---- printf("GnuPOS Server\nVersion: %s\n\n\n",VERSION); + gnps_global_data.version_str = VERSION; pc=poptGetContext("GnuPOS Server", argc, argv, options, POPT_CONTEXT_NO_EXEC); *************** *** 103,106 **** --- 104,112 ---- gnps_global_data.verbose_logging = TRUE; } + + if(gnps_verbose) + printf("Starting Logging NOW.\n"); + + gnps_init_logging(); if(gnps_verbose) |
From: <con...@us...> - 2003-02-20 12:31:32
|
Update of /cvsroot/gnupos/gnp-server/include In directory sc8-pr-cvs1:/tmp/cvs-serv13282/include Modified Files: GNPS.h Log Message: Now initialises logging file, and basic logging infrastructure exists. Index: GNPS.h =================================================================== RCS file: /cvsroot/gnupos/gnp-server/include/GNPS.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GNPS.h 9 Feb 2003 12:36:49 -0000 1.2 --- GNPS.h 20 Feb 2003 12:31:26 -0000 1.3 *************** *** 24,27 **** --- 24,38 ---- char *log_file_name; /* Name of the log file */ int verbose_logging; /* Enable verbose logging */ + char *version_str; /* Store the compiled version string */ } gnps_global_data_struct; + + + + /* Prototypes */ + + /* for GNPS_io.c */ + void gnps_read_config(void); + void gnps_init_logging(void); + void logprintf(char *, ...); + |
From: <con...@us...> - 2003-02-09 12:51:02
|
Update of /cvsroot/gnupos/gnp-server/macros In directory sc8-pr-cvs1:/tmp/cvs-serv15640/macros Added Files: aclocal-include.m4 gnome-guile-checks.m4 Log Message: More tidying --- NEW FILE: aclocal-include.m4 --- # aclocal-include.m4 # # This macro adds the name macrodir to the set of directories # that `aclocal' searches for macros. # serial 1 dnl AM_ACLOCAL_INCLUDE(macrodir) AC_DEFUN([AM_ACLOCAL_INCLUDE], [ AM_CONDITIONAL(INSIDE_GNOME_COMMON, test x = y) test -n "$ACLOCAL_FLAGS" && ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" for k in $1 ; do ACLOCAL="$ACLOCAL -I $k" ; done ]) --- NEW FILE: gnome-guile-checks.m4 --- dnl dnl GNOME_CHECK_GUILE (failflag) dnl dnl if failflag is "fail" then GNOME_CHECK_GUILE will abort if guile is not found. dnl AC_DEFUN([GNOME_CHECK_GUILE], [ saved_ldflags="$LDFLAGS" saved_cppflags="$CPPFLAGS" LDFLAGS="$LDFLAGS $GNOME_LIBDIR" AC_CHECK_LIB(qthreads,qt_null,[ QTTHREADS_LIB="-lqthreads" ],[ AC_CHECK_LIB(qt, qt_null, QTTHREADS_LIB="-lqt") ],$LIBS) AC_SUBST(QTTHREADS_LIB) AC_CHECK_LIB(termcap,main,TERMCAP_LIB="-ltermcap") AC_CHECK_LIB(readline,main,READLINE_LIB="-lreadline",,$TERMCAP_LIB) AC_SUBST(TERMCAP_LIB) AC_SUBST(READLINE_LIB) if test "x$cross_compiling" = "xyes" ; then name_build_guile="$target_alias-guile-config" else name_build_guile="guile-config" fi AC_CHECK_PROG(BUILD_GUILE, $name_build_guile, yes, no) if test "x$BUILD_GUILE" = "xyes"; then AC_MSG_CHECKING(whether $name_build_guile works) if test x`$name_build_guile --version >/dev/null 2>&1 || \ echo no` = xno; then BUILD_GUILE=no fi AC_MSG_RESULT($BUILD_GUILE) else if test "x$cross_compiling" = "xyes" ; then name_build_guile="$target_alias-build-guile" else name_build_guile="build-guile" fi AC_CHECK_PROG(BUILD_GUILE, $name_build_guile, yes, no) if test "x$BUILD_GUILE" = "xyes"; then AC_MSG_CHECKING(whether $name_build_guile works) if test x`$name_build_guile --version >/dev/null 2>&1 || \ echo no` = xno; then BUILD_GUILE=no fi AC_MSG_RESULT($BUILD_GUILE) fi fi AC_CHECK_LIB(m, sin) if test "x$BUILD_GUILE" = "xyes"; then AC_MSG_CHECKING(for guile libraries) GUILE_LIBS="`$name_build_guile link`" AC_MSG_RESULT($GUILE_LIBS) AC_MSG_CHECKING(for guile headers) GUILE_INCS="`$name_build_guile compile`" AC_MSG_RESULT($GUILE_INCS) else GUILE_LIBS="$GNOME_LIBDIR" GUILE_INCS="$GNOME_INCLUDEDIR" AC_CHECK_LIB(rx, main, GUILE_LIBS="-lrx $GUILE_LIBS") AC_CHECK_LIB(qt, qt_null, GUILE_LIBS="-lqt $GUILE_LIBS") AC_CHECK_LIB(dl, dlopen, GUILE_LIBS="-ldl $GUILE_LIBS") AC_CHECK_LIB(nsl, t_accept, GUILE_LIBS="$GUILE_LIBS -lnsl") AC_CHECK_LIB(socket, socket, GUILE_LIBS="$GUILE_LIBS -lsocket") GUILE_LIBS="-lguile $GUILE_LIBS $QTTHREADS_LIB $READLINE_LIB $TERMCAP_LIB" fi AC_SUBST(GUILE_LIBS) AC_SUBST(GUILE_INCS) saved_LIBS="$LIBS" LIBS="$LIBS $GUILE_LIBS" CPPFLAGS="$saved_cppflags $GUILE_INCS" AC_MSG_CHECKING(whether guile works) AC_TRY_LINK([ #include <libguile.h> #include <guile/gh.h> ],[ gh_eval_str("(newline)"); scm_boot_guile(0,NULL,NULL,NULL); ],[ ac_cv_guile_found=yes AC_DEFINE(HAVE_GUILE) ],[ ac_cv_guile_found=no ]) AC_MSG_RESULT($ac_cv_guile_found) if test x$ac_cv_guile_found = xno ; then if test x$1 = xfail ; then AC_MSG_ERROR(Can not find Guile on this system) else AC_MSG_WARN(Can not find Guile on this system) fi ac_cv_guile_found=no GUILE_LIBS= GUILE_INCS= fi LIBS="$saved_LIBS" LDFLAGS="$saved_ldflags" CPPFLAGS="$saved_cppflags" AC_SUBST(GUILE_LIBS) AM_CONDITIONAL(GUILE, test x$ac_cv_guile_found = xyes) ]) |
From: <con...@us...> - 2003-02-09 12:51:01
|
Update of /cvsroot/gnupos/gnp-server In directory sc8-pr-cvs1:/tmp/cvs-serv15640 Added Files: acconfig.h Log Message: More tidying |
From: <con...@us...> - 2003-02-09 12:48:21
|
Update of /cvsroot/gnupos/gnp-server/macros In directory sc8-pr-cvs1:/tmp/cvs-serv13768/macros Log Message: Directory /cvsroot/gnupos/gnp-server/macros added to the repository |
From: <con...@us...> - 2003-02-09 12:42:00
|
Update of /cvsroot/gnupos/gnp-server In directory sc8-pr-cvs1:/tmp/cvs-serv10255 Removed Files: .tm_project.cache acconfig.h acinclude.m4 aclocal.m4 stamp-h stamp-h1 Log Message: Remove unneccessary files --- .tm_project.cache DELETED --- --- acconfig.h DELETED --- --- acinclude.m4 DELETED --- --- aclocal.m4 DELETED --- --- stamp-h DELETED --- --- stamp-h1 DELETED --- |
From: <con...@us...> - 2003-02-09 12:36:55
|
Update of /cvsroot/gnupos/gnp-server In directory sc8-pr-cvs1:/tmp/cvs-serv7122 Modified Files: .cvsignore acconfig.h aclocal.m4 config.h.in configure.in Log Message: Updates to make builds work, and fixes to popt stuff (so we don't require gnome). Index: .cvsignore =================================================================== RCS file: /cvsroot/gnupos/gnp-server/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** .cvsignore 27 Jan 2003 12:34:02 -0000 1.3 --- .cvsignore 9 Feb 2003 12:36:49 -0000 1.4 *************** *** 6,7 **** --- 6,11 ---- .deps .libs + *.cache + .tm_project.cache + acconfig.h + aclocal.m4 Index: acconfig.h =================================================================== RCS file: /cvsroot/gnupos/gnp-server/acconfig.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** acconfig.h 27 Jan 2003 12:21:48 -0000 1.1.1.1 --- acconfig.h 9 Feb 2003 12:36:49 -0000 1.2 *************** *** 5,8 **** --- 5,9 ---- #undef HAVE_STPCPY #undef HAVE_LIBSM + #undef HAVE_GUILE #undef PACKAGE_LOCALE_DIR #undef PACKAGE_DOC_DIR Index: aclocal.m4 =================================================================== RCS file: /cvsroot/gnupos/gnp-server/aclocal.m4,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** aclocal.m4 27 Jan 2003 12:22:17 -0000 1.1.1.1 --- aclocal.m4 9 Feb 2003 12:36:49 -0000 1.2 *************** *** 561,564 **** --- 561,581 ---- ]) # _AM_DIRNAME + # aclocal-include.m4 + # + # This macro adds the name macrodir to the set of directories + # that `aclocal' searches for macros. + + # serial 1 + + dnl AM_ACLOCAL_INCLUDE(macrodir) + AC_DEFUN([AM_ACLOCAL_INCLUDE], + [ + AM_CONDITIONAL(INSIDE_GNOME_COMMON, test x = y) + + test -n "$ACLOCAL_FLAGS" && ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" + + for k in $1 ; do ACLOCAL="$ACLOCAL -I $k" ; done + ]) + # isc-posix.m4 serial 1 (gettext-0.10.40) dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. *************** *** 4166,4168 **** --- 4183,4305 ---- # This is just to silence aclocal about the macro not being used ifelse([AC_DISABLE_FAST_INSTALL]) + + dnl + dnl GNOME_CHECK_GUILE (failflag) + dnl + dnl if failflag is "fail" then GNOME_CHECK_GUILE will abort if guile is not found. + dnl + + AC_DEFUN([GNOME_CHECK_GUILE], + [ + saved_ldflags="$LDFLAGS" + saved_cppflags="$CPPFLAGS" + LDFLAGS="$LDFLAGS $GNOME_LIBDIR" + + AC_CHECK_LIB(qthreads,qt_null,[ + QTTHREADS_LIB="-lqthreads" + ],[ + AC_CHECK_LIB(qt, qt_null, QTTHREADS_LIB="-lqt") + ],$LIBS) + AC_SUBST(QTTHREADS_LIB) + + AC_CHECK_LIB(termcap,main,TERMCAP_LIB="-ltermcap") + AC_CHECK_LIB(readline,main,READLINE_LIB="-lreadline",,$TERMCAP_LIB) + + AC_SUBST(TERMCAP_LIB) + AC_SUBST(READLINE_LIB) + + if test "x$cross_compiling" = "xyes" ; then + name_build_guile="$target_alias-guile-config" + else + name_build_guile="guile-config" + fi + + AC_CHECK_PROG(BUILD_GUILE, $name_build_guile, yes, no) + + if test "x$BUILD_GUILE" = "xyes"; then + AC_MSG_CHECKING(whether $name_build_guile works) + if test x`$name_build_guile --version >/dev/null 2>&1 || \ + echo no` = xno; then + BUILD_GUILE=no + fi + AC_MSG_RESULT($BUILD_GUILE) + else + + if test "x$cross_compiling" = "xyes" ; then + name_build_guile="$target_alias-build-guile" + else + name_build_guile="build-guile" + fi + + AC_CHECK_PROG(BUILD_GUILE, $name_build_guile, yes, no) + + if test "x$BUILD_GUILE" = "xyes"; then + AC_MSG_CHECKING(whether $name_build_guile works) + if test x`$name_build_guile --version >/dev/null 2>&1 || \ + echo no` = xno; then + BUILD_GUILE=no + fi + AC_MSG_RESULT($BUILD_GUILE) + fi + fi + + AC_CHECK_LIB(m, sin) + + if test "x$BUILD_GUILE" = "xyes"; then + AC_MSG_CHECKING(for guile libraries) + GUILE_LIBS="`$name_build_guile link`" + AC_MSG_RESULT($GUILE_LIBS) + AC_MSG_CHECKING(for guile headers) + GUILE_INCS="`$name_build_guile compile`" + AC_MSG_RESULT($GUILE_INCS) + else + GUILE_LIBS="$GNOME_LIBDIR" + GUILE_INCS="$GNOME_INCLUDEDIR" + AC_CHECK_LIB(rx, main, GUILE_LIBS="-lrx $GUILE_LIBS") + AC_CHECK_LIB(qt, qt_null, GUILE_LIBS="-lqt $GUILE_LIBS") + AC_CHECK_LIB(dl, dlopen, GUILE_LIBS="-ldl $GUILE_LIBS") + AC_CHECK_LIB(nsl, t_accept, GUILE_LIBS="$GUILE_LIBS -lnsl") + AC_CHECK_LIB(socket, socket, GUILE_LIBS="$GUILE_LIBS -lsocket") + GUILE_LIBS="-lguile $GUILE_LIBS $QTTHREADS_LIB $READLINE_LIB $TERMCAP_LIB" + fi + + AC_SUBST(GUILE_LIBS) + AC_SUBST(GUILE_INCS) + + saved_LIBS="$LIBS" + LIBS="$LIBS $GUILE_LIBS" + CPPFLAGS="$saved_cppflags $GUILE_INCS" + + AC_MSG_CHECKING(whether guile works) + AC_TRY_LINK([ + #include <libguile.h> + #include <guile/gh.h> + ],[ + gh_eval_str("(newline)"); + scm_boot_guile(0,NULL,NULL,NULL); + ],[ + ac_cv_guile_found=yes + AC_DEFINE(HAVE_GUILE) + ],[ + ac_cv_guile_found=no + ]) + AC_MSG_RESULT($ac_cv_guile_found) + + if test x$ac_cv_guile_found = xno ; then + if test x$1 = xfail ; then + AC_MSG_ERROR(Can not find Guile on this system) + else + AC_MSG_WARN(Can not find Guile on this system) + fi + ac_cv_guile_found=no + GUILE_LIBS= GUILE_INCS= + fi + + LIBS="$saved_LIBS" + LDFLAGS="$saved_ldflags" + CPPFLAGS="$saved_cppflags" + + AC_SUBST(GUILE_LIBS) + AM_CONDITIONAL(GUILE, test x$ac_cv_guile_found = xyes) + ]) Index: config.h.in =================================================================== RCS file: /cvsroot/gnupos/gnp-server/config.h.in,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** config.h.in 27 Jan 2003 12:22:17 -0000 1.1.1.1 --- config.h.in 9 Feb 2003 12:36:49 -0000 1.2 *************** *** 10,13 **** --- 10,14 ---- #undef HAVE_STPCPY #undef HAVE_LIBSM + #undef HAVE_GUILE #undef PACKAGE_LOCALE_DIR #undef PACKAGE_DOC_DIR *************** *** 20,23 **** --- 21,27 ---- /* Define if you have the <dlfcn.h> header file. */ #undef HAVE_DLFCN_H + + /* Define if you have the m library (-lm). */ + #undef HAVE_LIBM /* Name of package */ Index: configure.in =================================================================== RCS file: /cvsroot/gnupos/gnp-server/configure.in,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** configure.in 27 Jan 2003 12:21:49 -0000 1.1.1.1 --- configure.in 9 Feb 2003 12:36:49 -0000 1.2 *************** *** 8,11 **** --- 8,13 ---- AM_CONFIG_HEADER(config.h) + AM_ACLOCAL_INCLUDE(macros) + AC_ISC_POSIX AC_PROG_CC *************** *** 18,21 **** --- 20,24 ---- dnl Checks for libraries. + GNOME_CHECK_GUILE |
From: <con...@us...> - 2003-02-09 12:36:54
|
Update of /cvsroot/gnupos/gnp-server/include In directory sc8-pr-cvs1:/tmp/cvs-serv7122/include Modified Files: GNPS.h Log Message: Updates to make builds work, and fixes to popt stuff (so we don't require gnome). Index: GNPS.h =================================================================== RCS file: /cvsroot/gnupos/gnp-server/include/GNPS.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** GNPS.h 27 Jan 2003 12:22:28 -0000 1.1.1.1 --- GNPS.h 9 Feb 2003 12:36:49 -0000 1.2 *************** *** 19,23 **** /* Copyright (c) 2003 Conrad Canterford. */ ! struct { char *config_file_name; /* Name of the configuration file */ --- 19,23 ---- /* Copyright (c) 2003 Conrad Canterford. */ ! typedef struct { char *config_file_name; /* Name of the configuration file */ *************** *** 25,26 **** --- 25,27 ---- int verbose_logging; /* Enable verbose logging */ } + gnps_global_data_struct; |
From: <con...@us...> - 2003-02-09 12:36:54
|
Update of /cvsroot/gnupos/gnp-server/src In directory sc8-pr-cvs1:/tmp/cvs-serv7122/src Modified Files: Makefile.am main.c Log Message: Updates to make builds work, and fixes to popt stuff (so we don't require gnome). Index: Makefile.am =================================================================== RCS file: /cvsroot/gnupos/gnp-server/src/Makefile.am,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Makefile.am 27 Jan 2003 12:22:28 -0000 1.1.1.1 --- Makefile.am 9 Feb 2003 12:36:50 -0000 1.2 *************** *** 5,9 **** ## Please disable it in the Anjuta project configuration ! INCLUDES = CFLAGS =\ --- 5,9 ---- ## Please disable it in the Anjuta project configuration ! INCLUDES = ../include CFLAGS =\ *************** *** 15,23 **** gnp_server_SOURCES = \ ! main.c ! gnp_server_LDFLAGS = gnp_server_LDADD = \ -lcrypt --- 15,27 ---- gnp_server_SOURCES = \ ! main.c \ ! GNPS_comms.c \ ! GNPS_io.c \ ! GNPS_util.c ! gnp_server_LDFLAGS = $(GUILE_LIBS) gnp_server_LDADD = \ + -lpopt \ -lcrypt Index: main.c =================================================================== RCS file: /cvsroot/gnupos/gnp-server/src/main.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** main.c 27 Jan 2003 12:22:28 -0000 1.1.1.1 --- main.c 9 Feb 2003 12:36:50 -0000 1.2 *************** *** 27,35 **** #include <popt.h> ! #include "GNPS.h" ! int gnps_debug; ! int gnps_verbose; ! gnps_global_data_struct gnps_global_data; void --- 27,35 ---- #include <popt.h> ! #include "include/GNPS.h" ! int gnps_debug; ! int gnps_verbose; ! gnps_global_data_struct gnps_global_data; void *************** *** 69,82 **** {"configfile", 'c', POPT_ARG_STRING, &gnps_global_data.config_file_name, 0, "Configuration file to use", NULL}, ! {"debug", '\0', POPT_ARG_NONE, &gnp_debug, 0, "Enable debugging output (Very verbose)", NULL}, {"logfile", 'f', POPT_ARG_STRING, &gnps_global_data.log_file_name, 0, "Log file to use.", NULL}, ! {NULL, 0, 0, NULL, 0, NULL, NULL} }; printf("GnuPOS Server\nVersion: %s\n\n\n",VERSION); ! gnomelib_register_popt_table (options, "GnuPOS Server options"); if(gnps_verbose) --- 69,91 ---- {"configfile", 'c', POPT_ARG_STRING, &gnps_global_data.config_file_name, 0, "Configuration file to use", NULL}, ! {"debug", '\0', POPT_ARG_NONE, &gnps_debug, 0, "Enable debugging output (Very verbose)", NULL}, {"logfile", 'f', POPT_ARG_STRING, &gnps_global_data.log_file_name, 0, "Log file to use.", NULL}, ! POPT_AUTOHELP ! POPT_TABLEEND }; + poptContext pc; + int rc; printf("GnuPOS Server\nVersion: %s\n\n\n",VERSION); ! pc=poptGetContext("GnuPOS Server", argc, argv, options, POPT_CONTEXT_NO_EXEC); ! rc = poptGetNextOpt(pc); ! if(rc != -1) ! { ! printf("ERROR: popt returns error code %d\n",rc); ! exit(-1); ! } if(gnps_verbose) |
From: <con...@us...> - 2003-02-09 11:33:37
|
Update of /cvsroot/gnupos/gnp-server In directory sc8-pr-cvs1:/tmp/cvs-serv8978 Removed Files: libtool Log Message: Remove libtool from CVS --- libtool DELETED --- |
From: <con...@us...> - 2003-01-27 12:38:41
|
Update of /cvsroot/gnupos/gnp-server/src/.deps In directory sc8-pr-cvs1:/tmp/cvs-serv1646 Removed Files: main.P Log Message: --- main.P DELETED --- |
From: <con...@us...> - 2003-01-27 12:34:05
|
Update of /cvsroot/gnupos/gnp-server In directory sc8-pr-cvs1:/tmp/cvs-serv32261 Modified Files: .cvsignore libtool Added Files: autogen.sh Log Message: More fixing-up. --- NEW FILE: autogen.sh --- #!/bin/sh # Run this to generate all the initial makefiles, etc. srcdir=`dirname $0` PKG_NAME="the package." DIE=0 (autoconf --version) < /dev/null > /dev/null 2>&1 || { echo echo "**Error**: You must have \`autoconf' installed to." echo "Download the appropriate package for your distribution," echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" DIE=1 } (grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && { (libtool --version) < /dev/null > /dev/null 2>&1 || { echo echo "**Error**: You must have \`libtool' installed." echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz" echo "(or a newer version if it is available)" DIE=1 } } # grep "^AM_GNU_GETTEXT" $srcdir/configure.in >/dev/null && { # grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \ # (gettext --version) < /dev/null > /dev/null 2>&1 || { # echo # echo "**Error**: You must have \`gettext' installed." # echo "Get ftp://alpha.gnu.org/gnu/gettext-0.10.35.tar.gz" # echo "(or a newer version if it is available)" # DIE=1 # } # } # grep "^AM_GNOME_GETTEXT" $srcdir/configure.in >/dev/null && { # grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \ # (gettext --version) < /dev/null > /dev/null 2>&1 || { # echo # echo "**Error**: You must have \`gettext' installed." # echo "Get ftp://alpha.gnu.org/gnu/gettext-0.10.35.tar.gz" # echo "(or a newer version if it is available)" # DIE=1 # } # } (automake --version) < /dev/null > /dev/null 2>&1 || { echo echo "**Error**: You must have \`automake' installed." echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz" echo "(or a newer version if it is available)" DIE=1 NO_AUTOMAKE=yes } # if no automake, don't bother testing for aclocal test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || { echo echo "**Error**: Missing \`aclocal'. The version of \`automake'" echo "installed doesn't appear recent enough." echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz" echo "(or a newer version if it is available)" DIE=1 } if test "$DIE" -eq 1; then exit 1 fi if test -z "$*"; then echo "**Warning**: I am going to run \`configure' with no arguments." echo "If you wish to pass any to it, please specify them on the" echo \`$0\'" command line." echo fi case $CC in xlc ) am_opt=--include-deps;; esac for coin in `find $srcdir -name configure.in -print` do dr=`dirname $coin` if test -f $dr/NO-AUTO-GEN; then echo skipping $dr -- flagged as no auto-gen else echo processing $dr macrodirs=`sed -n -e 's,AM_ACLOCAL_INCLUDE(\(.*\)),\1,gp' < $coin` ( cd $dr aclocalinclude="$ACLOCAL_FLAGS" for k in $macrodirs; do if test -d $k; then aclocalinclude="$aclocalinclude -I $k" ##else ## echo "**Warning**: No such directory \`$k'. Ignored." fi done if grep "^AM_GNU_GETTEXT" configure.in >/dev/null; then if grep "sed.*POTFILES" configure.in >/dev/null; then : do nothing -- we still have an old unmodified configure.in else echo "Creating $dr/aclocal.m4 ..." test -r $dr/aclocal.m4 || touch $dr/aclocal.m4 echo "Running gettextize... Ignore non-fatal messages." ./setup-gettext echo "Making $dr/aclocal.m4 writable ..." test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4 fi fi if grep "^AM_GNOME_GETTEXT" configure.in >/dev/null; then echo "Creating $dr/aclocal.m4 ..." test -r $dr/aclocal.m4 || touch $dr/aclocal.m4 echo "Running gettextize... Ignore non-fatal messages." ./setup-gettext echo "Making $dr/aclocal.m4 writable ..." test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4 fi if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then echo "Running libtoolize..." libtoolize --force --copy fi echo "Running aclocal $aclocalinclude ..." aclocal $aclocalinclude if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then echo "Running autoheader..." autoheader fi echo "Running automake --gnu $am_opt ..." automake --add-missing --gnu $am_opt echo "Running autoconf ..." autoconf ) fi done #conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c if test x$NOCONFIGURE = x; then echo Running $srcdir/configure $conf_flags "$@" ... $srcdir/configure $conf_flags "$@" \ && echo Now type \`make\' to compile $PKG_NAME else echo Skipping configure process. fi Index: .cvsignore =================================================================== RCS file: /cvsroot/gnupos/gnp-server/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** .cvsignore 27 Jan 2003 12:28:25 -0000 1.2 --- .cvsignore 27 Jan 2003 12:34:02 -0000 1.3 *************** *** 4,5 **** --- 4,7 ---- *.o *.pws + .deps + .libs Index: libtool =================================================================== RCS file: /cvsroot/gnupos/gnp-server/libtool,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** libtool 27 Jan 2003 12:22:27 -0000 1.1.1.1 --- libtool 27 Jan 2003 12:34:02 -0000 1.2 *************** *** 114,118 **** # Additional compiler flags for building library objects. ! pic_flag=" -fPIC" pic_mode=default --- 114,118 ---- # Additional compiler flags for building library objects. ! pic_flag=" -fPIC" pic_mode=default |
From: <con...@us...> - 2003-01-27 12:29:18
|
Update of /cvsroot/gnupos/gnp-server/src In directory sc8-pr-cvs1:/tmp/cvs-serv30657 Added Files: .cvsignore Log Message: Add .cvsignore --- NEW FILE: .cvsignore --- .deps .libs *.o Makefile Makefile.in |
From: <con...@us...> - 2003-01-27 12:28:28
|
Update of /cvsroot/gnupos/gnp-server In directory sc8-pr-cvs1:/tmp/cvs-serv30340 Modified Files: .cvsignore Removed Files: gnp-server.pws Log Message: Fix cvs import stuff-ups Index: .cvsignore =================================================================== RCS file: /cvsroot/gnupos/gnp-server/.cvsignore,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** .cvsignore 27 Jan 2003 12:21:48 -0000 1.1.1.1 --- .cvsignore 27 Jan 2003 12:28:25 -0000 1.2 *************** *** 3,5 **** *~ *.o ! --- 3,5 ---- *~ *.o ! *.pws --- gnp-server.pws DELETED --- |
Update of /cvsroot/gnupos/quick-gui/src In directory sc8-pr-cvs1:/tmp/cvs-serv28443/src Modified Files: Makefile.am callbacks.c callbacks.h interface.c interface.h main.c q-gui-display.c quick-gui.gspl Removed Files: q-gui-initialise.c Log Message: Now compiles and works. 0.5 here we come! Index: Makefile.am =================================================================== RCS file: /cvsroot/gnupos/quick-gui/src/Makefile.am,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -C2 -d -r1.1.1.2 -r1.2 *** Makefile.am 9 Jan 2003 13:35:47 -0000 1.1.1.2 --- Makefile.am 14 Jan 2003 11:53:57 -0000 1.2 *************** *** 5,16 **** $(GNOME_INCLUDEDIR) ! bin_PROGRAMS = quick-gui ! quick_gui_SOURCES = \ main.c \ support.c support.h \ interface.c interface.h \ ! callbacks.c callbacks.h ! quick_gui_LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS) --- 5,19 ---- $(GNOME_INCLUDEDIR) ! lib_LTLIBRARIES = quick-gui.la ! quick_gui_la_SOURCES = \ main.c \ support.c support.h \ interface.c interface.h \ ! callbacks.c callbacks.h \ ! q-gui-display.c \ ! q-gui.h \ ! q-gui-P.h ! quick_gui_la_LIBADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS) Index: callbacks.c =================================================================== RCS file: /cvsroot/gnupos/quick-gui/src/callbacks.c,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -C2 -d -r1.1.1.2 -r1.2 *** callbacks.c 9 Jan 2003 13:35:52 -0000 1.1.1.2 --- callbacks.c 14 Jan 2003 11:53:57 -0000 1.2 *************** *** 8,12 **** --- 8,14 ---- #include "interface.h" #include "support.h" + #include "q-gui.h" + extern qg_global_data_struct qg_global_data; void *************** *** 30,34 **** gpointer user_data) { ! } --- 32,36 ---- gpointer user_data) { ! qg_do_exit(); } *************** *** 66,76 **** - void - qg_pref_menu_activate (GtkMenuItem *menuitem, - gpointer user_data) - { - - } - void --- 68,71 ---- *************** *** 78,82 **** gpointer user_data) { ! } --- 73,82 ---- gpointer user_data) { ! if(qg_global_data.about_dialog == NULL) ! { ! /* create about dialog */ ! qg_global_data.about_dialog = create_about1(); ! } ! gtk_widget_show (qg_global_data.about_dialog); } *************** *** 106,116 **** - void - qg_pref_button_clicked (GtkButton *button, - gpointer user_data) - { - - } - void --- 106,109 ---- *************** *** 118,122 **** gpointer user_data) { ! } --- 111,115 ---- gpointer user_data) { ! qg_do_exit(); } *************** *** 127,131 **** gpointer user_data) { ! return FALSE; } --- 120,124 ---- gpointer user_data) { ! gnp_process_keystroke(event->keyval); return FALSE; } *************** *** 136,140 **** --- 129,135 ---- gpointer user_data) { + qg_global_data.about_dialog = NULL; + return 0; } *************** *** 144,148 **** --- 139,145 ---- gpointer user_data) { + qg_global_data.property_dialog = NULL; + return 0; } *************** *** 161,165 **** gpointer user_data) { ! } --- 158,162 ---- gpointer user_data) { ! qg_topbox_resize(); } *************** *** 170,174 **** gpointer user_data) { ! } --- 167,171 ---- gpointer user_data) { ! qg_topbox_refont(); } *************** *** 179,183 **** gpointer user_data) { ! } --- 176,180 ---- gpointer user_data) { ! qg_rightbox_refont(); } *************** *** 187,191 **** gpointer user_data) { ! } --- 184,188 ---- gpointer user_data) { ! qg_topbox_resize(); } *************** *** 195,199 **** gpointer user_data) { ! } --- 192,196 ---- gpointer user_data) { ! qg_autohist_resize(); } *************** *** 203,207 **** gpointer user_data) { ! } --- 200,204 ---- gpointer user_data) { ! gnp_rightbox_hide(); } *************** *** 212,215 **** --- 209,230 ---- { + } + + + gboolean + on_GnuPOS_Quick_GUI_destroy_event (GtkWidget *widget, + GdkEvent *event, + gpointer user_data) + { + qg_do_exit(); + return FALSE; + } + + + void + setup_prefs (GtkMenuItem *menuitem, + gpointer user_data) + { + qg_setup_property_dialog(); } Index: callbacks.h =================================================================== RCS file: /cvsroot/gnupos/quick-gui/src/callbacks.h,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -C2 -d -r1.1.1.2 -r1.2 *** callbacks.h 9 Jan 2003 13:35:52 -0000 1.1.1.2 --- callbacks.h 14 Jan 2003 11:53:57 -0000 1.2 *************** *** 31,38 **** void - qg_pref_menu_activate (GtkMenuItem *menuitem, - gpointer user_data); - - void qg_about_menu_activate (GtkMenuItem *menuitem, gpointer user_data); --- 31,34 ---- *************** *** 51,58 **** void - qg_pref_button_clicked (GtkButton *button, - gpointer user_data); - - void qg_quit_button_clicked (GtkButton *button, gpointer user_data); --- 47,50 ---- *************** *** 104,106 **** --- 96,107 ---- void qg_history_checkbox_toggled (GtkToggleButton *togglebutton, + gpointer user_data); + + gboolean + on_GnuPOS_Quick_GUI_destroy_event (GtkWidget *widget, + GdkEvent *event, + gpointer user_data); + + void + setup_prefs (GtkMenuItem *menuitem, gpointer user_data); Index: interface.c =================================================================== RCS file: /cvsroot/gnupos/quick-gui/src/interface.c,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -C2 -d -r1.1.1.2 -r1.2 *** interface.c 9 Jan 2003 13:35:51 -0000 1.1.1.2 --- interface.c 14 Jan 2003 11:53:57 -0000 1.2 *************** *** 43,47 **** static GnomeUIInfo settings1_menu_uiinfo[] = { ! GNOMEUIINFO_MENU_PREFERENCES_ITEM (qg_pref_menu_activate, NULL), GNOMEUIINFO_END }; --- 43,47 ---- static GnomeUIInfo settings1_menu_uiinfo[] = { ! GNOMEUIINFO_MENU_PREFERENCES_ITEM (setup_prefs, NULL), GNOMEUIINFO_END }; *************** *** 442,445 **** --- 442,448 ---- gtk_clock_set_format (GTK_CLOCK (clock1), _("%H:%M:%S, %A %D")); + gtk_signal_connect (GTK_OBJECT (GnuPOS_Quick_GUI), "destroy_event", + GTK_SIGNAL_FUNC (on_GnuPOS_Quick_GUI_destroy_event), + NULL); gtk_signal_connect (GTK_OBJECT (button1), "clicked", GTK_SIGNAL_FUNC (qg_open_button_clicked), *************** *** 452,456 **** NULL); gtk_signal_connect (GTK_OBJECT (button3), "clicked", ! GTK_SIGNAL_FUNC (qg_pref_button_clicked), NULL); gtk_signal_connect (GTK_OBJECT (button6), "clicked", --- 455,459 ---- NULL); gtk_signal_connect (GTK_OBJECT (button3), "clicked", ! GTK_SIGNAL_FUNC (setup_prefs), NULL); gtk_signal_connect (GTK_OBJECT (button6), "clicked", *************** *** 543,548 **** GtkWidget *entry1; GtkWidget *label3; - GtkWidget *vbox3; - GtkWidget *label4; propertybox1 = gnome_property_box_new (); --- 546,549 ---- *************** *** 890,909 **** gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 2), label3); - vbox3 = gtk_vbox_new (FALSE, 0); - gtk_widget_set_name (vbox3, "vbox3"); - gtk_widget_ref (vbox3); - gtk_object_set_data_full (GTK_OBJECT (propertybox1), "vbox3", vbox3, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (vbox3); - gtk_container_add (GTK_CONTAINER (notebook1), vbox3); - - label4 = gtk_label_new (_("Gnucash Interface")); - gtk_widget_set_name (label4, "label4"); - gtk_widget_ref (label4); - gtk_object_set_data_full (GTK_OBJECT (propertybox1), "label4", label4, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (label4); - gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 3), label4); - gtk_signal_connect (GTK_OBJECT (propertybox1), "close", GTK_SIGNAL_FUNC (qg_property_dialog_close_cb), --- 891,894 ---- *************** *** 935,966 **** return propertybox1; - } - - GtkWidget* - create_fileselection1 (void) - { - GtkWidget *fileselection1; - GtkWidget *ok_button1; - GtkWidget *cancel_button1; - - fileselection1 = gtk_file_selection_new (_("Select File")); - gtk_widget_set_name (fileselection1, "fileselection1"); - gtk_object_set_data (GTK_OBJECT (fileselection1), "fileselection1", fileselection1); - gtk_container_set_border_width (GTK_CONTAINER (fileselection1), 10); - gtk_file_selection_hide_fileop_buttons (GTK_FILE_SELECTION (fileselection1)); - - ok_button1 = GTK_FILE_SELECTION (fileselection1)->ok_button; - gtk_widget_set_name (ok_button1, "ok_button1"); - gtk_object_set_data (GTK_OBJECT (fileselection1), "ok_button1", ok_button1); - gtk_widget_show (ok_button1); - GTK_WIDGET_SET_FLAGS (ok_button1, GTK_CAN_DEFAULT); - - cancel_button1 = GTK_FILE_SELECTION (fileselection1)->cancel_button; - gtk_widget_set_name (cancel_button1, "cancel_button1"); - gtk_object_set_data (GTK_OBJECT (fileselection1), "cancel_button1", cancel_button1); - gtk_widget_show (cancel_button1); - GTK_WIDGET_SET_FLAGS (cancel_button1, GTK_CAN_DEFAULT); - - return fileselection1; } --- 920,923 ---- Index: interface.h =================================================================== RCS file: /cvsroot/gnupos/quick-gui/src/interface.h,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -C2 -d -r1.1.1.2 -r1.2 *** interface.h 9 Jan 2003 13:35:50 -0000 1.1.1.2 --- interface.h 14 Jan 2003 11:53:57 -0000 1.2 *************** *** 6,8 **** GtkWidget* create_about1 (void); GtkWidget* create_propertybox1 (void); - GtkWidget* create_fileselection1 (void); --- 6,7 ---- Index: main.c =================================================================== RCS file: /cvsroot/gnupos/quick-gui/src/main.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** main.c 13 Jan 2003 11:57:08 -0000 1.2 --- main.c 14 Jan 2003 11:53:57 -0000 1.3 *************** *** 21,24 **** --- 21,27 ---- qg_initialise() { + + printf("Initialising libquick-gui.so\n"); + #ifdef ENABLE_NLS bindtextdomain (PACKAGE, PACKAGE_LOCALE_DIR); *************** *** 26,33 **** #endif ! gnome_init ("quick-gui", VERSION, NULL, NULL); qg_global_data.GnuPOS = create_GnuPOS_Quick_GUI (); gtk_widget_show (qg_global_data.GnuPOS); qg_debug=1; } --- 29,43 ---- #endif ! qg_global_data.about_dialog = NULL; ! qg_global_data.property_dialog = NULL; ! ! gnome_init ("quick-gui", VERSION, 0, NULL); qg_global_data.GnuPOS = create_GnuPOS_Quick_GUI (); gtk_widget_show (qg_global_data.GnuPOS); + /* Do the initialisation stuff */ + qg_initialise_topbox(); + qg_initialise_rightbox(); + qg_debug=1; } *************** *** 36,39 **** --- 46,52 ---- qg_event_loop() { + if(qg_debug) + printf(" Calling gtk_main\n"); + gtk_main (); } Index: q-gui-display.c =================================================================== RCS file: /cvsroot/gnupos/quick-gui/src/q-gui-display.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** q-gui-display.c 13 Jan 2003 11:57:08 -0000 1.2 --- q-gui-display.c 14 Jan 2003 11:53:57 -0000 1.3 *************** *** 2,6 **** /* This contains the interface routines */ /* for the quick-gui user interface for */ ! /* GnuPOS. /* */ /* (c) 2002 Conrad Canterford. */ --- 2,6 ---- /* This contains the interface routines */ /* for the quick-gui user interface for */ ! /* GnuPOS. */ /* */ /* (c) 2002 Conrad Canterford. */ *************** *** 199,203 **** { if(qg_debug) ! printf("In qg_topbox_write_string()\n"); qg_topbox_erase_all(); --- 199,203 ---- { if(qg_debug) ! printf("In qg_topbox_write_string(\"%s\")\n",x); qg_topbox_erase_all(); Index: quick-gui.gspl =================================================================== RCS file: /cvsroot/gnupos/quick-gui/src/quick-gui.gspl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** quick-gui.gspl 13 Jan 2003 11:57:08 -0000 1.1 --- quick-gui.gspl 14 Jan 2003 11:53:57 -0000 1.2 *************** *** 4,8 **** <gnp:definitions> <gnp:library name="quick-gui"> ! <gnp:path>/home/conrad/gnuPOS/quick-gui/libquick_gui.so</gnp:path> <gnp:type>dynamic</gnp:type> <gnp:init-routine>qg_initialise</gnp:init-routine> --- 4,8 ---- <gnp:definitions> <gnp:library name="quick-gui"> ! <gnp:path>/home/conrad/gnuPOS/quick-gui/libquick-gui.so</gnp:path> <gnp:type>dynamic</gnp:type> <gnp:init-routine>qg_initialise</gnp:init-routine> --- q-gui-initialise.c DELETED --- |
From: <con...@us...> - 2003-01-14 11:54:00
|
Update of /cvsroot/gnupos/quick-gui/macros In directory sc8-pr-cvs1:/tmp/cvs-serv28443/macros Modified Files: Makefile Log Message: Now compiles and works. 0.5 here we come! Index: Makefile =================================================================== RCS file: /cvsroot/gnupos/quick-gui/macros/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Makefile 9 Jan 2003 13:36:10 -0000 1.1.1.1 --- Makefile 14 Jan 2003 11:53:57 -0000 1.2 *************** *** 41,45 **** top_builddir = .. ! ACLOCAL = aclocal -I /usr/local/share/aclocal -I macros AUTOCONF = autoconf AUTOMAKE = automake --- 41,45 ---- top_builddir = .. ! ACLOCAL = aclocal -I /usr/local/share/aclocal -I macros -I /usr/local/share/aclocal -I /usr/share/aclocal AUTOCONF = autoconf AUTOMAKE = automake *************** *** 61,74 **** host_triplet = i686-pc-linux-gnu AMTAR = tar AWK = gawk - BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ - CATOBJEXT = @CATOBJEXT@ CC = gcc - DATADIRNAME = @DATADIRNAME@ DEPDIR = .deps EXEEXT = - GENCAT = @GENCAT@ - GLIBC21 = @GLIBC21@ - GMSGFMT = /usr/bin/msgfmt GNOMEGNORBA_LIBS = -rdynamic -lgnorba -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -ldl -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib GNOMEUI_LIBS = -rdynamic -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -ldl -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib --- 61,71 ---- host_triplet = i686-pc-linux-gnu AMTAR = tar + AS = @AS@ AWK = gawk CC = gcc DEPDIR = .deps + DLLTOOL = @DLLTOOL@ + ECHO = echo EXEEXT = GNOMEGNORBA_LIBS = -rdynamic -lgnorba -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -ldl -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib GNOMEUI_LIBS = -rdynamic -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -ldl -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib *************** *** 86,104 **** GTK_CONFIG = /usr/bin/gtk-config GTK_LIBS = -lSM -lICE -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm - HAVE_LIB = @HAVE_LIB@ INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s ! INSTOBJEXT = @INSTOBJEXT@ ! INTLBISON = @INTLBISON@ ! INTLLIBS = ! INTLOBJS = @INTLOBJS@ ! INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LIB = @LIB@ ! LIBICONV = ! LIBINTL = ! LTLIB = @LTLIB@ ! LTLIBICONV = ! LTLIBINTL = MAKEINFO = makeinfo ! MKINSTALLDIRS = ./mkinstalldirs OBJEXT = o ORBIT_CFLAGS = -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/include/orbit-1.0 --- 83,91 ---- GTK_CONFIG = /usr/bin/gtk-config GTK_LIBS = -lSM -lICE -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s ! LIBTOOL = $(SHELL) $(top_builddir)/libtool ! LN_S = ln -s MAKEINFO = makeinfo ! OBJDUMP = @OBJDUMP@ OBJEXT = o ORBIT_CFLAGS = -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/include/orbit-1.0 *************** *** 107,115 **** ORBIT_LIBS = -L/usr/lib -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib -lm PACKAGE = quick-gui - POSUB = po PTHREAD_LIB = -lpthread ! RANLIB = @RANLIB@ ! USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ ! USE_NLS = yes VERSION = 0.1 XPM_LIBS = -lXpm --- 94,100 ---- ORBIT_LIBS = -L/usr/lib -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib -lm PACKAGE = quick-gui PTHREAD_LIB = -lpthread ! RANLIB = ranlib ! STRIP = strip VERSION = 0.1 XPM_LIBS = -lXpm *************** *** 263,266 **** --- 248,252 ---- distclean-am: distclean-generic clean-am + -rm -f libtool distclean: distclean-am |
From: <con...@us...> - 2003-01-14 11:54:00
|
Update of /cvsroot/gnupos/quick-gui/m4 In directory sc8-pr-cvs1:/tmp/cvs-serv28443/m4 Modified Files: Makefile Makefile.in Log Message: Now compiles and works. 0.5 here we come! Index: Makefile =================================================================== RCS file: /cvsroot/gnupos/quick-gui/m4/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Makefile 9 Jan 2003 13:36:19 -0000 1.1.1.1 --- Makefile 14 Jan 2003 11:53:56 -0000 1.2 *************** *** 41,45 **** top_builddir = .. ! ACLOCAL = aclocal -I /usr/local/share/aclocal -I macros AUTOCONF = autoconf AUTOMAKE = automake --- 41,45 ---- top_builddir = .. ! ACLOCAL = aclocal -I /usr/local/share/aclocal -I macros -I /usr/local/share/aclocal -I /usr/share/aclocal AUTOCONF = autoconf AUTOMAKE = automake *************** *** 61,74 **** host_triplet = i686-pc-linux-gnu AMTAR = tar AWK = gawk - BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ - CATOBJEXT = @CATOBJEXT@ CC = gcc - DATADIRNAME = @DATADIRNAME@ DEPDIR = .deps EXEEXT = - GENCAT = @GENCAT@ - GLIBC21 = @GLIBC21@ - GMSGFMT = /usr/bin/msgfmt GNOMEGNORBA_LIBS = -rdynamic -lgnorba -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -ldl -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib GNOMEUI_LIBS = -rdynamic -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -ldl -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib --- 61,71 ---- host_triplet = i686-pc-linux-gnu AMTAR = tar + AS = @AS@ AWK = gawk CC = gcc DEPDIR = .deps + DLLTOOL = @DLLTOOL@ + ECHO = echo EXEEXT = GNOMEGNORBA_LIBS = -rdynamic -lgnorba -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -ldl -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib GNOMEUI_LIBS = -rdynamic -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -ldl -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib *************** *** 86,104 **** GTK_CONFIG = /usr/bin/gtk-config GTK_LIBS = -lSM -lICE -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm - HAVE_LIB = @HAVE_LIB@ INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s ! INSTOBJEXT = @INSTOBJEXT@ ! INTLBISON = @INTLBISON@ ! INTLLIBS = ! INTLOBJS = @INTLOBJS@ ! INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LIB = @LIB@ ! LIBICONV = ! LIBINTL = ! LTLIB = @LTLIB@ ! LTLIBICONV = ! LTLIBINTL = MAKEINFO = makeinfo ! MKINSTALLDIRS = ./mkinstalldirs OBJEXT = o ORBIT_CFLAGS = -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/include/orbit-1.0 --- 83,91 ---- GTK_CONFIG = /usr/bin/gtk-config GTK_LIBS = -lSM -lICE -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s ! LIBTOOL = $(SHELL) $(top_builddir)/libtool ! LN_S = ln -s MAKEINFO = makeinfo ! OBJDUMP = @OBJDUMP@ OBJEXT = o ORBIT_CFLAGS = -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/include/orbit-1.0 *************** *** 107,115 **** ORBIT_LIBS = -L/usr/lib -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib -lm PACKAGE = quick-gui - POSUB = po PTHREAD_LIB = -lpthread ! RANLIB = @RANLIB@ ! USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ ! USE_NLS = yes VERSION = 0.1 XPM_LIBS = -lXpm --- 94,100 ---- ORBIT_LIBS = -L/usr/lib -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib -lm PACKAGE = quick-gui PTHREAD_LIB = -lpthread ! RANLIB = ranlib ! STRIP = strip VERSION = 0.1 XPM_LIBS = -lXpm *************** *** 209,212 **** --- 194,198 ---- distclean-am: distclean-generic clean-am + -rm -f libtool distclean: distclean-am Index: Makefile.in =================================================================== RCS file: /cvsroot/gnupos/quick-gui/m4/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.in 13 Jan 2003 11:57:08 -0000 1.2 --- Makefile.in 14 Jan 2003 11:53:56 -0000 1.3 *************** *** 61,74 **** host_triplet = @host@ AMTAR = @AMTAR@ AWK = @AWK@ - BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ - CATOBJEXT = @CATOBJEXT@ CC = @CC@ - DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ EXEEXT = @EXEEXT@ - GENCAT = @GENCAT@ - GLIBC21 = @GLIBC21@ - GMSGFMT = @GMSGFMT@ GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@ GNOMEUI_LIBS = @GNOMEUI_LIBS@ --- 61,71 ---- host_triplet = @host@ AMTAR = @AMTAR@ + AS = @AS@ AWK = @AWK@ CC = @CC@ DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ + ECHO = @ECHO@ EXEEXT = @EXEEXT@ GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@ GNOMEUI_LIBS = @GNOMEUI_LIBS@ *************** *** 86,104 **** GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ - HAVE_LIB = @HAVE_LIB@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ ! INSTOBJEXT = @INSTOBJEXT@ ! INTLBISON = @INTLBISON@ ! INTLLIBS = @INTLLIBS@ ! INTLOBJS = @INTLOBJS@ ! INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ! LIB = @LIB@ ! LIBICONV = @LIBICONV@ ! LIBINTL = @LIBINTL@ ! LTLIB = @LTLIB@ ! LTLIBICONV = @LTLIBICONV@ ! LTLIBINTL = @LTLIBINTL@ MAKEINFO = @MAKEINFO@ ! MKINSTALLDIRS = @MKINSTALLDIRS@ OBJEXT = @OBJEXT@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ --- 83,91 ---- GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ ! LIBTOOL = @LIBTOOL@ ! LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ ! OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ *************** *** 107,115 **** ORBIT_LIBS = @ORBIT_LIBS@ PACKAGE = @PACKAGE@ - POSUB = @POSUB@ PTHREAD_LIB = @PTHREAD_LIB@ RANLIB = @RANLIB@ ! USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ ! USE_NLS = @USE_NLS@ VERSION = @VERSION@ XPM_LIBS = @XPM_LIBS@ --- 94,100 ---- ORBIT_LIBS = @ORBIT_LIBS@ PACKAGE = @PACKAGE@ PTHREAD_LIB = @PTHREAD_LIB@ RANLIB = @RANLIB@ ! STRIP = @STRIP@ VERSION = @VERSION@ XPM_LIBS = @XPM_LIBS@ *************** *** 209,212 **** --- 194,198 ---- distclean-am: distclean-generic clean-am + -rm -f libtool distclean: distclean-am |
From: <con...@us...> - 2003-01-14 11:54:00
|
Update of /cvsroot/gnupos/quick-gui In directory sc8-pr-cvs1:/tmp/cvs-serv28443 Modified Files: configure.in gnupos-translatable-strings.po Log Message: Now compiles and works. 0.5 here we come! Index: configure.in =================================================================== RCS file: /cvsroot/gnupos/quick-gui/configure.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** configure.in 13 Jan 2003 11:57:08 -0000 1.4 --- configure.in 14 Jan 2003 11:53:56 -0000 1.5 *************** *** 7,10 **** --- 7,11 ---- dnl Pick up the Gnome macros. AM_ACLOCAL_INCLUDE(macros) + AM_ACLOCAL_INCLUDE(/usr/share/aclocal) GNOME_INIT *************** *** 13,16 **** --- 14,18 ---- AM_PROG_CC_STDC AC_HEADER_STDC + AM_PROG_LIBTOOL GNOME_COMPILE_WARNINGS *************** *** 18,23 **** dnl Add the languages which your application supports here. ! ALL_LINGUAS="" ! AM_GNU_GETTEXT(external) dnl Set PACKAGE_LOCALE_DIR in config.h. --- 20,25 ---- dnl Add the languages which your application supports here. ! dnl ALL_LINGUAS="" ! dnl AM_GNU_GETTEXT(external) dnl Set PACKAGE_LOCALE_DIR in config.h. Index: gnupos-translatable-strings.po =================================================================== RCS file: /cvsroot/gnupos/quick-gui/gnupos-translatable-strings.po,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -C2 -d -r1.1.1.2 -r1.2 *** gnupos-translatable-strings.po 9 Jan 2003 13:35:47 -0000 1.1.1.2 --- gnupos-translatable-strings.po 14 Jan 2003 11:53:56 -0000 1.2 *************** *** 51,54 **** gchar *s = N_("Default Keymap"); gchar *s = N_("Keyboard"); - gchar *s = N_("Gnucash Interface"); - gchar *s = N_("Select File"); --- 51,52 ---- |
From: <con...@us...> - 2003-01-14 11:54:00
|
Update of /cvsroot/gnupos/quick-gui/po In directory sc8-pr-cvs1:/tmp/cvs-serv28443/po Modified Files: Makefile.in Log Message: Now compiles and works. 0.5 here we come! Index: Makefile.in =================================================================== RCS file: /cvsroot/gnupos/quick-gui/po/Makefile.in,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Makefile.in 9 Jan 2003 13:36:13 -0000 1.1.1.1 --- Makefile.in 14 Jan 2003 11:53:57 -0000 1.2 *************** *** 27,38 **** INSTALL = /usr/bin/install -c INSTALL_DATA = ${INSTALL} -m 644 ! MKINSTALLDIRS = ./mkinstalldirs mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac` ! GMSGFMT = /usr/bin/msgfmt ! MSGFMT = /usr/bin/msgfmt ! XGETTEXT = /usr/bin/xgettext MSGMERGE = msgmerge ! MSGMERGE_UPDATE = /usr/bin/msgmerge --update MSGINIT = msginit MSGCONV = msgconv --- 27,38 ---- INSTALL = /usr/bin/install -c INSTALL_DATA = ${INSTALL} -m 644 ! MKINSTALLDIRS = @MKINSTALLDIRS@ mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac` ! GMSGFMT = @GMSGFMT@ ! MSGFMT = @MSGFMT@ ! XGETTEXT = @XGETTEXT@ MSGMERGE = msgmerge ! MSGMERGE_UPDATE = @MSGMERGE@ --update MSGINIT = msginit MSGCONV = msgconv *************** *** 73,77 **** ! all: all-yes all-yes: $(CATALOGS) --- 73,77 ---- ! all: all-@USE_NLS@ all-yes: $(CATALOGS) *************** *** 114,118 **** install: install-exec install-data install-exec: ! install-data: install-data-yes if test "$(PACKAGE)" = "gettext"; then \ $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ --- 114,118 ---- install: install-exec install-data install-exec: ! install-data: install-data-@USE_NLS@ if test "$(PACKAGE)" = "gettext"; then \ $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ *************** *** 170,174 **** installdirs: installdirs-exec installdirs-data installdirs-exec: ! installdirs-data: installdirs-data-yes if test "$(PACKAGE)" = "gettext"; then \ $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ --- 170,174 ---- installdirs: installdirs-exec installdirs-data installdirs-exec: ! installdirs-data: installdirs-data-@USE_NLS@ if test "$(PACKAGE)" = "gettext"; then \ $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ *************** *** 215,219 **** uninstall: uninstall-exec uninstall-data uninstall-exec: ! uninstall-data: uninstall-data-yes if test "$(PACKAGE)" = "gettext"; then \ for file in $(DISTFILES.common); do \ --- 215,219 ---- uninstall: uninstall-exec uninstall-data uninstall-exec: ! uninstall-data: uninstall-data-@USE_NLS@ if test "$(PACKAGE)" = "gettext"; then \ for file in $(DISTFILES.common); do \ |