[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r6747 - in gnunet-gtk: . src/plugins/fs
From: |
gnunet |
Subject: |
[GNUnet-SVN] r6747 - in gnunet-gtk: . src/plugins/fs |
Date: |
Thu, 24 Apr 2008 00:02:16 -0600 (MDT) |
Author: grothoff
Date: 2008-04-24 00:02:15 -0600 (Thu, 24 Apr 2008)
New Revision: 6747
Modified:
gnunet-gtk/INSTALL
gnunet-gtk/ltmain.sh
gnunet-gtk/mkinstalldirs
gnunet-gtk/src/plugins/fs/directory.c
gnunet-gtk/src/plugins/fs/download.c
gnunet-gtk/src/plugins/fs/meta.c
gnunet-gtk/src/plugins/fs/search.c
gnunet-gtk/src/plugins/fs/upload.c
Log:
update to latest ECRS/FSUI APIs in HEAD
Modified: gnunet-gtk/INSTALL
===================================================================
--- gnunet-gtk/INSTALL 2008-04-24 05:59:41 UTC (rev 6746)
+++ gnunet-gtk/INSTALL 2008-04-24 06:02:15 UTC (rev 6747)
@@ -1,13 +1,19 @@
-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,
+2006, 2007 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.
+Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@@ -20,9 +26,9 @@
It can also use an optional file (typically called `config.cache'
and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. (Caching is
+the results of its tests to speed up reconfiguring. Caching is
disabled by default to prevent problems with accidental use of stale
-cache files.)
+cache files.
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
@@ -32,20 +38,17 @@
may remove or edit it.
The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
+ `./configure' to configure the package for your system.
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
2. Type `make' to compile the package.
@@ -64,54 +67,55 @@
all sorts of other programs in order to regenerate files that came
with the distribution.
+ 6. Often, you can also type `make uninstall' to remove the installed
+ files again.
+
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
is an example:
- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
*Note Defining Variables::, for more details.
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
+own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.
- If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory. After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
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 +126,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 +141,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 +160,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 +171,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 +182,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 +190,18 @@
./configure CC=/usr/local2/bin/gcc
-will cause the specified gcc to be used as the C compiler (unless it is
+causes the specified `gcc' to be used as the C compiler (unless it is
overridden in the site shell script).
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
+
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/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/ltmain.sh
===================================================================
--- gnunet-gtk/ltmain.sh 2008-04-24 05:59:41 UTC (rev 6746)
+++ gnunet-gtk/ltmain.sh 2008-04-24 06:02:15 UTC (rev 6747)
@@ -43,7 +43,7 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION="1.5.26 Debian 1.5.26-1"
+VERSION="1.5.26 Debian 1.5.26-2"
TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
Modified: gnunet-gtk/mkinstalldirs
===================================================================
--- gnunet-gtk/mkinstalldirs 2008-04-24 05:59:41 UTC (rev 6746)
+++ gnunet-gtk/mkinstalldirs 2008-04-24 06:02:15 UTC (rev 6747)
@@ -1,7 +1,7 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
-scriptversion=2004-02-15.20
+scriptversion=2006-05-11.19
# Original author: Noah Friedman <address@hidden>
# Created: 1993-05-16
@@ -11,8 +11,11 @@
# bugs to <address@hidden> or send patches to
# <address@hidden>.
+nl='
+'
+IFS=" "" $nl"
errstatus=0
-dirmode=""
+dirmode=
usage="\
Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
@@ -27,7 +30,7 @@
case $1 in
-h | --help | --h*) # -h for help
echo "$usage"
- exit 0
+ exit $?
;;
-m) # -m PERM arg
shift
@@ -37,7 +40,7 @@
;;
--version)
echo "$0 $scriptversion"
- exit 0
+ exit $?
;;
--) # stop option processing
shift
@@ -103,13 +106,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 +135,7 @@
else
if test ! -z "$dirmode"; then
echo "chmod $dirmode $pathcomp"
- lasterr=""
+ lasterr=
chmod "$dirmode" "$pathcomp" || lasterr=$?
if test ! -z "$lasterr"; then
@@ -134,7 +145,7 @@
fi
fi
- pathcomp="$pathcomp/"
+ pathcomp=$pathcomp/
done
done
Modified: gnunet-gtk/src/plugins/fs/directory.c
===================================================================
--- gnunet-gtk/src/plugins/fs/directory.c 2008-04-24 05:59:41 UTC (rev
6746)
+++ gnunet-gtk/src/plugins/fs/directory.c 2008-04-24 06:02:15 UTC (rev
6747)
@@ -87,7 +87,6 @@
int fd;
SearchList *list;
struct GNUNET_ECRS_URI *uri;
- const char *kws[2];
GtkNotebook *notebook;
dn = selectFile ();
@@ -119,9 +118,7 @@
GNUNET_free (dn);
return;
}
- kws[0] = dn;
- kws[1] = NULL;
- uri = GNUNET_ECRS_keyword_strings_to_uri (kws);
+ uri = GNUNET_ECRS_keyword_string_to_uri (NULL, dn);
md = NULL;
list = fs_search_started (NULL, uri, 0, 0, NULL, GNUNET_FSUI_COMPLETED);
GNUNET_ECRS_uri_destroy (uri);
Modified: gnunet-gtk/src/plugins/fs/download.c
===================================================================
--- gnunet-gtk/src/plugins/fs/download.c 2008-04-24 05:59:41 UTC (rev
6746)
+++ gnunet-gtk/src/plugins/fs/download.c 2008-04-24 06:02:15 UTC (rev
6747)
@@ -849,8 +849,7 @@
struct FCBC
{
- int (*method) (struct GNUNET_FSUI_Context * ctx,
- struct GNUNET_FSUI_DownloadList * list);
+ int (*method) (struct GNUNET_FSUI_DownloadList * list);
struct GNUNET_FSUI_DownloadList *argument;
};
@@ -858,7 +857,7 @@
fsui_callback (void *cls)
{
struct FCBC *fcbc = cls;
- fcbc->method (ctx, fcbc->argument);
+ fcbc->method (fcbc->argument);
return NULL;
}
Modified: gnunet-gtk/src/plugins/fs/meta.c
===================================================================
--- gnunet-gtk/src/plugins/fs/meta.c 2008-04-24 05:59:41 UTC (rev 6746)
+++ gnunet-gtk/src/plugins/fs/meta.c 2008-04-24 06:02:15 UTC (rev 6747)
@@ -125,7 +125,7 @@
}
static int
-publishKeyword (const char *data, void *cls)
+publishKeyword (const char *data, int is_mandatory, void *cls)
{
GtkListStore *store = cls;
GtkTreeIter iter;
@@ -398,9 +398,7 @@
}
while (gtk_tree_model_iter_next (keymodel, &iter));
}
- keywords[kpos] = NULL;
-
- keywordURI = GNUNET_ECRS_keyword_strings_to_uri ((const char **) keywords);
+ keywordURI = GNUNET_ECRS_keyword_command_line_to_uri (NULL, kpos, (const
char**) keywords);
while (kpos > 0)
GNUNET_free (keywords[--kpos]);
GNUNET_array_grow (keywords, ksize, 0);
Modified: gnunet-gtk/src/plugins/fs/search.c
===================================================================
--- gnunet-gtk/src/plugins/fs/search.c 2008-04-24 05:59:41 UTC (rev 6746)
+++ gnunet-gtk/src/plugins/fs/search.c 2008-04-24 06:02:15 UTC (rev 6747)
@@ -919,8 +919,7 @@
struct FCBC
{
- int (*method) (struct GNUNET_FSUI_Context * ctx,
- struct GNUNET_FSUI_SearchList * list);
+ int (*method) (struct GNUNET_FSUI_SearchList * list);
struct GNUNET_FSUI_SearchList *argument;
};
@@ -928,7 +927,7 @@
fsui_callback (void *cls)
{
struct FCBC *fcbc = cls;
- fcbc->method (ctx, fcbc->argument);
+ fcbc->method (fcbc->argument);
return NULL;
}
Modified: gnunet-gtk/src/plugins/fs/upload.c
===================================================================
--- gnunet-gtk/src/plugins/fs/upload.c 2008-04-24 05:59:41 UTC (rev 6746)
+++ gnunet-gtk/src/plugins/fs/upload.c 2008-04-24 06:02:15 UTC (rev 6747)
@@ -556,8 +556,7 @@
struct FCBC
{
- int (*method) (struct GNUNET_FSUI_Context * ctx,
- struct GNUNET_FSUI_UploadList * list);
+ int (*method) (struct GNUNET_FSUI_UploadList * list);
struct GNUNET_FSUI_UploadList *argument;
};
@@ -565,7 +564,7 @@
fsui_callback (void *cls)
{
struct FCBC *fcbc = cls;
- fcbc->method (ctx, fcbc->argument);
+ fcbc->method (fcbc->argument);
return NULL;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r6747 - in gnunet-gtk: . src/plugins/fs,
gnunet <=