[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r3821 - GNUnet GNUnet/contrib GNUnet/src/applications/fs/fs
|
From: |
grothoff |
|
Subject: |
[GNUnet-SVN] r3821 - GNUnet GNUnet/contrib GNUnet/src/applications/fs/fsui GNUnet/src/applications/rpc GNUnet/src/include GNUnet/src/util/loggers gnunet-gtk gnunet-gtk/po |
|
Date: |
Mon, 27 Nov 2006 09:39:15 -0800 (PST) |
Author: grothoff
Date: 2006-11-27 09:39:05 -0800 (Mon, 27 Nov 2006)
New Revision: 3821
Modified:
GNUnet/ChangeLog
GNUnet/contrib/config-client.scm
GNUnet/src/applications/fs/fsui/Makefile.am
GNUnet/src/applications/fs/fsui/download.c
GNUnet/src/applications/fs/fsui/search.c
GNUnet/src/applications/fs/fsui/unindex.c
GNUnet/src/applications/fs/fsui/upload.c
GNUnet/src/applications/rpc/parameters.c
GNUnet/src/include/gnunet_util_error_loggers.h
GNUnet/src/util/loggers/memory.c
GNUnet/todo
gnunet-gtk/INSTALL
gnunet-gtk/configure.ac
gnunet-gtk/ltmain.sh
gnunet-gtk/mkinstalldirs
gnunet-gtk/po/Makefile.in
Log:
stuf
Modified: GNUnet/ChangeLog
===================================================================
--- GNUnet/ChangeLog 2006-11-26 00:32:13 UTC (rev 3820)
+++ GNUnet/ChangeLog 2006-11-27 17:39:05 UTC (rev 3821)
@@ -1,3 +1,7 @@
+Mon Nov 27 08:51:46 MST 2006
+ Added conversion of ECRS error messages to FSUI
+ error event messages.
+
Sun Nov 19 00:20:14 MST 2006
Improved error handling. gnunetd now can communicate
text error messages to clients (not just error codes).
Modified: GNUnet/contrib/config-client.scm
===================================================================
--- GNUnet/contrib/config-client.scm 2006-11-26 00:32:13 UTC (rev 3820)
+++ GNUnet/contrib/config-client.scm 2006-11-27 17:39:05 UTC (rev 3821)
@@ -290,6 +290,7 @@
(meta builder)
(logging builder)
(general builder)
+ (fs builder)
)
#t
#f
Modified: GNUnet/src/applications/fs/fsui/Makefile.am
===================================================================
--- GNUnet/src/applications/fs/fsui/Makefile.am 2006-11-26 00:32:13 UTC (rev
3820)
+++ GNUnet/src/applications/fs/fsui/Makefile.am 2006-11-27 17:39:05 UTC (rev
3821)
@@ -19,6 +19,7 @@
$(top_builddir)/src/applications/fs/namespace/libgnunetnamespace.la \
$(top_builddir)/src/applications/fs/uritrack/libgnuneturitrack.la \
$(top_builddir)/src/util/cron/libgnunetutil_cron.la \
+ $(top_builddir)/src/util/loggers/libgnunetutil_logging.la \
$(top_builddir)/src/util/libgnunetutil.la
EXTRA_DIST = \
Modified: GNUnet/src/applications/fs/fsui/download.c
===================================================================
--- GNUnet/src/applications/fs/fsui/download.c 2006-11-26 00:32:13 UTC (rev
3820)
+++ GNUnet/src/applications/fs/fsui/download.c 2006-11-27 17:39:05 UTC (rev
3821)
@@ -26,6 +26,7 @@
*/
#include "platform.h"
+#include "gnunet_util_error_loggers.h"
#include "gnunet_ecrs_lib.h"
#include "gnunet_uritrack_lib.h"
#include "gnunet_fsui_lib.h"
@@ -216,6 +217,8 @@
int ret;
FSUI_Event event;
struct GE_Context * ectx;
+ struct GE_Memory * mem;
+ struct GE_Context * ee;
dl->startTime = get_time() - dl->runTime;
ectx = dl->ctx->ectx;
@@ -227,7 +230,10 @@
#endif
GE_ASSERT(ectx, dl->ctx != NULL);
GE_ASSERT(ectx, dl->filename != NULL);
- ret = ECRS_downloadFile(dl->ctx->ectx,
+ mem = GE_memory_create(2);
+ ee = GE_create_context_memory(GE_USER | GE_ADMIN | GE_ERROR | GE_WARNING |
GE_FATAL | GE_BULK | GE_IMMEDIATE,
+ mem);
+ ret = ECRS_downloadFile(ee,
dl->ctx->cfg,
dl->fi.uri,
dl->filename,
@@ -251,6 +257,8 @@
dl->ctx->ecb(dl->ctx->ecbClosure,
&event);
} else if (dl->state == FSUI_ACTIVE) {
+ const char * error;
+
/* ECRS error */
dl->state = FSUI_ERROR;
event.type = FSUI_download_error;
@@ -260,7 +268,11 @@
event.data.DownloadError.dc.pcctx = dl->parent->cctx;
event.data.DownloadError.dc.spos = dl->search;
event.data.DownloadError.dc.sctx = dl->search == NULL ? NULL :
dl->search->cctx;
- event.data.DownloadError.message = _("ECRS download failed (see logs)");
+ error = GE_memory_get(mem, 0);
+ if (error == NULL)
+ error = _("Download failed (no reason given)");
+ event.data.DownloadError.message = error;
+
dl->ctx->ecb(dl->ctx->ecbClosure,
&event);
} else if (dl->state == FSUI_ABORTED) { /* aborted */
@@ -341,6 +353,8 @@
ret == OK ? "COMPLETED" : "ABORTED");
#endif
dl->runTime = get_time() - dl->startTime;
+ GE_free_context(ee);
+ GE_memory_free(mem);
return NULL;
}
Modified: GNUnet/src/applications/fs/fsui/search.c
===================================================================
--- GNUnet/src/applications/fs/fsui/search.c 2006-11-26 00:32:13 UTC (rev
3820)
+++ GNUnet/src/applications/fs/fsui/search.c 2006-11-27 17:39:05 UTC (rev
3821)
@@ -27,6 +27,7 @@
*/
#include "platform.h"
+#include "gnunet_util_error_loggers.h"
#include "gnunet_directories.h"
#include "gnunet_protocols.h"
#include "gnunet_fsui_lib.h"
@@ -247,8 +248,13 @@
FSUI_SearchList * pos = cls;
FSUI_Event event;
int ret;
+ struct GE_Memory * mem;
+ struct GE_Context * ee;
- ret = ECRS_search(pos->ctx->ectx,
+ mem = GE_memory_create(2);
+ ee = GE_create_context_memory(GE_USER | GE_ADMIN | GE_ERROR | GE_WARNING |
GE_FATAL | GE_BULK | GE_IMMEDIATE,
+ mem);
+ ret = ECRS_search(ee,
pos->ctx->cfg,
pos->uri,
pos->anonymityLevel,
@@ -258,11 +264,16 @@
&testTerminate,
pos);
if (ret != OK) {
+ const char * error;
+
pos->state = FSUI_ERROR;
event.type = FSUI_search_error;
event.data.SearchError.sc.pos = pos;
event.data.SearchError.sc.cctx = pos->cctx;
- event.data.SearchError.message = _("Error running search (consult logs).");
+ error = GE_memory_get(mem, 0);
+ if (error == NULL)
+ error = _("Error running search (no reason given).");
+ event.data.SearchError.message = error;
pos->ctx->ecb(pos->ctx->ecbClosure,
&event);
} else if (pos->state == FSUI_ABORTED) {
@@ -282,6 +293,8 @@
GE_ASSERT(NULL, pos->state == FSUI_PENDING);
/* must be suspending */
}
+ GE_free_context(ee);
+ GE_memory_free(mem);
return NULL;
}
Modified: GNUnet/src/applications/fs/fsui/unindex.c
===================================================================
--- GNUnet/src/applications/fs/fsui/unindex.c 2006-11-26 00:32:13 UTC (rev
3820)
+++ GNUnet/src/applications/fs/fsui/unindex.c 2006-11-27 17:39:05 UTC (rev
3821)
@@ -26,6 +26,7 @@
*/
#include "platform.h"
+#include "gnunet_util_error_loggers.h"
#include "gnunet_ecrs_lib.h"
#include "gnunet_fsui_lib.h"
#include "fsui.h"
@@ -67,6 +68,8 @@
FSUI_Event event;
int ret;
unsigned long long size;
+ struct GE_Memory * mem;
+ struct GE_Context * ee;
if (OK != disk_file_size(utc->ctx->ectx,
utc->filename,
@@ -75,7 +78,10 @@
GE_BREAK(utc->ctx->ectx, 0);
size = 0;
}
- ret = ECRS_unindexFile(utc->ctx->ectx,
+ mem = GE_memory_create(2);
+ ee = GE_create_context_memory(GE_USER | GE_ADMIN | GE_ERROR | GE_WARNING |
GE_FATAL | GE_BULK | GE_IMMEDIATE,
+ mem);
+ ret = ECRS_unindexFile(ee,
utc->ctx->cfg,
utc->filename,
&progressCallback,
@@ -92,11 +98,16 @@
utc->ctx->ecb(utc->ctx->ecbClosure,
&event);
} else if (utc->state == FSUI_ACTIVE) {
+ const char * error;
+
utc->state = FSUI_ERROR;
event.type = FSUI_unindex_error;
event.data.UnindexError.uc.pos = utc;
event.data.UnindexError.uc.cctx = utc->cctx;
- event.data.UnindexError.message = _("Unindex failed.");
+ error = GE_memory_get(mem, 0);
+ if (error == NULL)
+ error = _("Unindexing failed (no reason given)");
+ event.data.UnindexError.message = error;
utc->ctx->ecb(utc->ctx->ecbClosure,
&event);
} else if (utc->state == FSUI_ABORTED) {
@@ -116,6 +127,8 @@
"FSUI unindexThread exits in state %u.\n",
utc->state);
#endif
+ GE_free_context(ee);
+ GE_memory_free(mem);
return NULL;
}
Modified: GNUnet/src/applications/fs/fsui/upload.c
===================================================================
--- GNUnet/src/applications/fs/fsui/upload.c 2006-11-26 00:32:13 UTC (rev
3820)
+++ GNUnet/src/applications/fs/fsui/upload.c 2006-11-27 17:39:05 UTC (rev
3821)
@@ -26,6 +26,7 @@
*/
#include "platform.h"
+#include "gnunet_util_error_loggers.h"
#include "gnunet_ecrs_lib.h"
#include "gnunet_uritrack_lib.h"
#include "gnunet_fsui_lib.h"
@@ -72,7 +73,8 @@
static char *
createDirectoryHelper(struct GE_Context * ectx,
struct FSUI_UploadList * children,
- struct ECRS_MetaData * meta) {
+ struct ECRS_MetaData * meta,
+ char ** error) {
ECRS_FileInfo * fis;
unsigned int count;
unsigned int size;
@@ -82,6 +84,8 @@
char * tempName;
struct FSUI_UploadList * pos;
int handle;
+ struct GE_Memory * mem;
+ struct GE_Context * ee;
fis = NULL;
size = 0;
@@ -110,7 +114,10 @@
pos = pos->next;
}
GE_BREAK(ectx, count == size);
- ret = ECRS_createDirectory(ectx,
+ mem = GE_memory_create(2);
+ ee = GE_create_context_memory(GE_USER | GE_ADMIN | GE_ERROR | GE_WARNING |
GE_FATAL | GE_BULK | GE_IMMEDIATE,
+ mem);
+ ret = ECRS_createDirectory(ee,
&data,
&len,
size,
@@ -119,30 +126,41 @@
GROW(fis,
size,
0);
- if (ret != OK)
+ if (ret != OK) {
+ *error = STRDUP(GE_memory_get(mem, 0));
+ GE_free_context(ee);
+ GE_memory_free(mem);
return NULL;
+ }
+ GE_memory_reset(mem);
tempName = STRDUP("/tmp/gnunet-upload-dir.XXXXXX");
handle = mkstemp(tempName);
if (handle == -1) {
- GE_LOG_STRERROR_FILE(ectx,
+ GE_LOG_STRERROR_FILE(ee,
GE_ERROR | GE_USER | GE_BULK,
tempName,
"mkstemp");
FREE(tempName);
FREE(data);
+ *error = STRDUP(GE_memory_get(mem, 0));
+ GE_free_context(ee);
+ GE_memory_free(mem);
return NULL;
}
if (len != WRITE(handle,
data,
len)) {
- GE_LOG_STRERROR_FILE(ectx,
+ GE_LOG_STRERROR_FILE(ee,
GE_ERROR | GE_USER | GE_BULK,
tempName,
"write");
- FREE(tempName);
- FREE(data);
+ *error = STRDUP(GE_memory_get(mem, 0));
+ GE_free_context(ee);
+ GE_memory_free(mem);
return NULL;
}
+ GE_free_context(ee);
+ GE_memory_free(mem);
CLOSE(handle);
FREE(data);
return tempName;
@@ -202,6 +220,9 @@
char * pfn;
struct ECRS_URI * uri;
size_t tpos;
+ char * error;
+ struct GE_Memory * mem;
+ struct GE_Context * ee;
ectx = utc->shared->ctx->ectx;
GE_ASSERT(ectx, utc->filename != NULL);
@@ -214,19 +235,27 @@
if (utc->state != FSUI_ACTIVE)
return NULL; /* aborted or suspended */
if (utc->child != NULL) {
+ error = NULL;
filename = createDirectoryHelper(ectx,
utc->child,
- utc->meta);
+ utc->meta,
+ &error);
if (filename == NULL) {
+ if (error == NULL)
+ error = STRDUP(_("Failed to create temporary directory."));
signalError(utc,
- _("Failed to create temporary directory."));
+ error);
+ FREE(error);
return NULL;
}
} else {
filename = STRDUP(utc->filename);
}
utc->start_time = get_time();
- ret = ECRS_uploadFile(utc->shared->ctx->ectx,
+ mem = GE_memory_create(2);
+ ee = GE_create_context_memory(GE_USER | GE_ADMIN | GE_ERROR | GE_WARNING |
GE_FATAL | GE_BULK | GE_IMMEDIATE,
+ mem);
+ ret = ECRS_uploadFile(ee,
utc->shared->ctx->cfg,
filename,
utc->shared->doIndex == YES ? (utc->child == NULL ? YES
: NO) : NO,
@@ -241,7 +270,7 @@
if (ret != OK) {
if (utc->state == FSUI_ACTIVE) {
signalError(utc,
- _("Upload failed (consult logs)."));
+ GE_memory_get(mem, 0));
} else if (utc->state == FSUI_ABORTED) {
event.type = FSUI_upload_aborted;
event.data.UploadAborted.uc.pos = utc;
@@ -257,6 +286,8 @@
if (utc->child != NULL)
UNLINK(filename);
FREE(filename);
+ GE_free_context(ee);
+ GE_memory_free(mem);
return NULL;
}
utc->state = FSUI_COMPLETED;
Modified: GNUnet/src/applications/rpc/parameters.c
===================================================================
--- GNUnet/src/applications/rpc/parameters.c 2006-11-26 00:32:13 UTC (rev
3820)
+++ GNUnet/src/applications/rpc/parameters.c 2006-11-27 17:39:05 UTC (rev
3821)
@@ -85,6 +85,7 @@
if (target == NULL)
return;
pos = 0;
+ dataLength = 0;
for (i = 0; i < RPC_paramCount(param); i++) {
paramName = RPC_paramName(param, i);
paramValue = NULL;
@@ -159,6 +160,7 @@
if (param == NULL)
return 0;
pos = 0;
+ dataLength = 0;
for (i = 0; i < RPC_paramCount(param); i++) {
paramName = RPC_paramName(param, i);
paramValue = NULL;
Modified: GNUnet/src/include/gnunet_util_error_loggers.h
===================================================================
--- GNUnet/src/include/gnunet_util_error_loggers.h 2006-11-26 00:32:13 UTC
(rev 3820)
+++ GNUnet/src/include/gnunet_util_error_loggers.h 2006-11-27 17:39:05 UTC
(rev 3821)
@@ -117,19 +117,28 @@
* will be set to a corresponding warning)
*/
struct GE_Memory *
-GE_create_memory(unsigned int maxSize);
+GE_memory_create(unsigned int maxSize);
/**
* For all messages stored in the memory, call the handler.
* Also clears the memory.
*/
-void GE_poll_memory(struct GE_Memory * memory,
+void GE_memory_poll(struct GE_Memory * memory,
GE_LogHandler handler,
void * ctx);
-void GE_free_memory(struct GE_Memory * memory);
+void GE_memory_reset(struct GE_Memory * memory);
+/**
+ * Get a particular log message from the store.
+ */
+const char *
+GE_memory_get(struct GE_Memory * memory,
+ unsigned int index);
+void GE_memory_free(struct GE_Memory * memory);
+
+
#if 0 /* keep Emacsens' auto-indent happy */
{
#endif
Modified: GNUnet/src/util/loggers/memory.c
===================================================================
--- GNUnet/src/util/loggers/memory.c 2006-11-26 00:32:13 UTC (rev 3820)
+++ GNUnet/src/util/loggers/memory.c 2006-11-27 17:39:05 UTC (rev 3821)
@@ -89,7 +89,7 @@
&memorylogger,
memory,
NULL,
- NULL);
+ NULL);
}
/**
@@ -104,7 +104,7 @@
* will be set to a corresponding warning)
*/
struct GE_Memory *
-GE_create_memory(unsigned int maxSize) {
+GE_memory_create(unsigned int maxSize) {
GE_Memory * ret;
ret = MALLOC(sizeof(GE_Memory));
@@ -117,10 +117,21 @@
}
/**
+ * Get a particular log message from the store.
+ */
+const char *
+GE_memory_get(struct GE_Memory * memory,
+ unsigned int index) {
+ if (index > memory->pos)
+ return NULL;
+ return memory->messages[index].msg;
+}
+
+/**
* For all messages stored in the memory, call the handler.
* Also clears the memory.
*/
-void GE_poll_memory(struct GE_Memory * memory,
+void GE_memory_poll(struct GE_Memory * memory,
GE_LogHandler handler,
void * ctx) {
int i;
@@ -138,9 +149,23 @@
MUTEX_UNLOCK(memory->lock);
}
-void GE_free_memory(struct GE_Memory * memory) {
+void GE_memory_reset(struct GE_Memory * memory) {
int i;
+ MUTEX_LOCK(memory->lock);
+ for (i=memory->pos-1;i>=0;i--) {
+ FREE(memory->messages[i].date);
+ FREE(memory->messages[i].msg);
+ }
+ GROW(memory->messages,
+ memory->size,
+ 0);
+ MUTEX_UNLOCK(memory->lock);
+}
+
+void GE_memory_free(struct GE_Memory * memory) {
+ int i;
+
MUTEX_DESTROY(memory->lock);
for (i=memory->pos-1;i>=0;i--) {
FREE(memory->messages[i].date);
Modified: GNUnet/todo
===================================================================
--- GNUnet/todo 2006-11-26 00:32:13 UTC (rev 3820)
+++ GNUnet/todo 2006-11-27 17:39:05 UTC (rev 3821)
@@ -14,8 +14,6 @@
0.7.1 [12'06] (aka "stabilization")
- finish util refactoring:
- * extractors option for FS (missing in client config!) [RCpre1, CG]
- * fs/fsui: capture ectx errors and convert to event error msgs! [RCpre1, CG]
* gnunet-setup ncurses wizard [RCpre2]
- more testcases: [RCpre3]
* ecrs_core
Modified: gnunet-gtk/INSTALL
===================================================================
--- gnunet-gtk/INSTALL 2006-11-26 00:32:13 UTC (rev 3820)
+++ gnunet-gtk/INSTALL 2006-11-27 17:39:05 UTC (rev 3821)
@@ -1,13 +1,16 @@
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
-Foundation, Inc.
+Installation Instructions
+*************************
- This file is free documentation; the Free Software Foundation gives
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
+Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
Basic Installation
==================
- These are generic installation instructions.
+These are generic installation instructions.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@@ -67,9 +70,9 @@
Compilers and Options
=====================
- Some systems require unusual options for compilation or linking that
-the `configure' script does not know about. Run `./configure --help'
-for details on some of the pertinent environment variables.
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about. Run `./configure --help' for
+details on some of the pertinent environment variables.
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
@@ -82,7 +85,7 @@
Compiling For Multiple Architectures
====================================
- You can compile the package for more than one kind of computer at the
+You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
own directory. To do this, you must use a version of `make' that
supports the `VPATH' variable, such as GNU `make'. `cd' to the
@@ -99,19 +102,19 @@
Installation Names
==================
- By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc. You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
+options like `--bindir=DIR' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
you can set and what kinds of files go in them.
@@ -122,7 +125,7 @@
Optional Features
=================
- Some packages pay attention to `--enable-FEATURE' options to
+Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
@@ -137,11 +140,11 @@
Specifying the System Type
==========================
- There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on. Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
@@ -156,7 +159,7 @@
need to know the machine type.
If you are _building_ compiler tools for cross-compiling, you should
-use the `--target=TYPE' option to select the type of system they will
+use the option `--target=TYPE' to select the type of system they will
produce code for.
If you want to _use_ a cross compiler, that generates code for a
@@ -167,9 +170,9 @@
Sharing Defaults
================
- If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
@@ -178,7 +181,7 @@
Defining Variables
==================
- Variables not defined in a site shell script can be set in the
+Variables not defined in a site shell script can be set in the
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
@@ -186,14 +189,18 @@
./configure CC=/usr/local2/bin/gcc
-will cause the specified gcc to be used as the C compiler (unless it is
-overridden in the site shell script).
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script). Here is a another example:
+ /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
+configuration-related scripts to be executed by `/bin/bash'.
+
`configure' Invocation
======================
- `configure' recognizes the following options to control how it
-operates.
+`configure' recognizes the following options to control how it operates.
`--help'
`-h'
Modified: gnunet-gtk/configure.ac
===================================================================
--- gnunet-gtk/configure.ac 2006-11-26 00:32:13 UTC (rev 3820)
+++ gnunet-gtk/configure.ac 2006-11-27 17:39:05 UTC (rev 3821)
@@ -20,8 +20,8 @@
# Process this file with autoconf to produce a configure script.
#
AC_PREREQ(2.57)
-AC_INIT([gnunet-gtk],[0.7.1-pre0],address@hidden)
-AM_INIT_AUTOMAKE([gnunet-gtk], [0.7.1-pre0])
+AC_INIT([gnunet-gtk],[0.7.1pre0],address@hidden)
+AM_INIT_AUTOMAKE([gnunet-gtk], [0.7.1pre0])
AM_CONFIG_HEADER(config.h)
AH_TOP([#define _GNU_SOURCE 1])
Modified: gnunet-gtk/ltmain.sh
===================================================================
--- gnunet-gtk/ltmain.sh 2006-11-26 00:32:13 UTC (rev 3820)
+++ gnunet-gtk/ltmain.sh 2006-11-27 17:39:05 UTC (rev 3821)
@@ -43,7 +43,7 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION="1.5.22 Debian 1.5.22-4"
+VERSION=1.5.22
TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
# See if we are running on zsh, and set the options which allow our
@@ -2082,10 +2082,7 @@
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
- link)
- libs="$deplibs %DEPLIBS%"
- test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
- ;;
+ link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
esac
fi
if test "$pass" = dlopen; then
@@ -3204,11 +3201,6 @@
age="$number_minor"
revision="$number_minor"
;;
- *)
- $echo "$modename: unknown library version type \`$version_type'"
1>&2
- $echo "Fatal configuration error. See the $PACKAGE docs for more
information." 1>&2
- exit $EXIT_FAILURE
- ;;
esac
;;
no)
Modified: gnunet-gtk/mkinstalldirs
===================================================================
--- gnunet-gtk/mkinstalldirs 2006-11-26 00:32:13 UTC (rev 3820)
+++ gnunet-gtk/mkinstalldirs 2006-11-27 17:39:05 UTC (rev 3821)
@@ -1,7 +1,7 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
-scriptversion=2004-02-15.20
+scriptversion=2005-06-29.22
# Original author: Noah Friedman <address@hidden>
# Created: 1993-05-16
@@ -12,7 +12,7 @@
# <address@hidden>.
errstatus=0
-dirmode=""
+dirmode=
usage="\
Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
@@ -27,7 +27,7 @@
case $1 in
-h | --help | --h*) # -h for help
echo "$usage"
- exit 0
+ exit $?
;;
-m) # -m PERM arg
shift
@@ -37,7 +37,7 @@
;;
--version)
echo "$0 $scriptversion"
- exit 0
+ exit $?
;;
--) # stop option processing
shift
@@ -103,13 +103,21 @@
for file
do
- set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+ case $file in
+ /*) pathcomp=/ ;;
+ *) pathcomp= ;;
+ esac
+ oIFS=$IFS
+ IFS=/
+ set fnord $file
shift
+ IFS=$oIFS
- pathcomp=
for d
do
- pathcomp="$pathcomp$d"
+ test "x$d" = x && continue
+
+ pathcomp=$pathcomp$d
case $pathcomp in
-*) pathcomp=./$pathcomp ;;
esac
@@ -124,7 +132,7 @@
else
if test ! -z "$dirmode"; then
echo "chmod $dirmode $pathcomp"
- lasterr=""
+ lasterr=
chmod "$dirmode" "$pathcomp" || lasterr=$?
if test ! -z "$lasterr"; then
@@ -134,7 +142,7 @@
fi
fi
- pathcomp="$pathcomp/"
+ pathcomp=$pathcomp/
done
done
Modified: gnunet-gtk/po/Makefile.in
===================================================================
--- gnunet-gtk/po/Makefile.in 2006-11-26 00:32:13 UTC (rev 3820)
+++ gnunet-gtk/po/Makefile.in 2006-11-27 17:39:05 UTC (rev 3821)
@@ -11,7 +11,7 @@
# Origin: gettext-0.13
PACKAGE = gnunet-gtk
-VERSION = 0.7.1-pre0
+VERSION = 0.7.1pre0
SHELL = /bin/sh
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r3821 - GNUnet GNUnet/contrib GNUnet/src/applications/fs/fsui GNUnet/src/applications/rpc GNUnet/src/include GNUnet/src/util/loggers gnunet-gtk gnunet-gtk/po,
grothoff <=