[GNUnet-SVN] r1657 - in GNUnet: contrib doc/man src/util

[grothoff]

Author: grothoff
Date: 2005-08-13 20:16:40 -0700 (Sat, 13 Aug 2005)
New Revision: 1657

Removed:
   GNUnet/src/util/generate
Modified:
   GNUnet/contrib/Makefile.am
   GNUnet/doc/man/gnunet.conf.5
   GNUnet/doc/man/gnunetd.conf.5
   GNUnet/src/util/Makefile.am
   GNUnet/src/util/configuration.c
Log:
removing auto-config generation

Modified: GNUnet/contrib/Makefile.am
===================================================================
--- GNUnet/contrib/Makefile.am  2005-08-14 02:20:34 UTC (rev 1656)
+++ GNUnet/contrib/Makefile.am  2005-08-14 03:16:40 UTC (rev 1657)
@@ -9,8 +9,6 @@
 
 EXTRA_DIST = \
  gnunet-download-manager.scm \
- gnunet.user \
- gnunet.root \
  autoinstall \
  initgnunet \
  visualize_stats.sh \

Modified: GNUnet/doc/man/gnunet.conf.5
===================================================================
--- GNUnet/doc/man/gnunet.conf.5        2005-08-14 02:20:34 UTC (rev 1656)
+++ GNUnet/doc/man/gnunet.conf.5        2005-08-14 03:16:40 UTC (rev 1657)
@@ -7,7 +7,7 @@
 .PP
 GNUnet uses two configuation files, one for user interfaces (gnunet.conf) and 
one for the server (gnunetd) and associated administrative tools.  This man 
page describes the configuration file for the clients.
 .PP
-~/.gnunet/gnunet.conf is the default location for the configuration file used 
by the gnunet clients (such as gnunet\-gtk, gnunet\-insert, gnunet\-search, 
etc.).  When any of the clients is started for the first time by a user, a 
default configuration file will be written to ~/.gnunet/gnunet.conf (if that 
file does not yet exist).  The defaults should work immediately for most users.
+~/.gnunet/gnunet.conf is the default location for the configuration file used 
by the gnunet clients (such as gnunet\-gtk, gnunet\-insert, gnunet\-search, 
etc.).   Use gnunet\-setup to create the configuration.  The defaults should 
work fine for most users.
 .TP
 The configuration file is used to allow users to customize GNUnet according to 
their needs.  The user configuration allows the specification of personal 
options, such as the nickname in the chat. 
 .TP

Modified: GNUnet/doc/man/gnunetd.conf.5
===================================================================
--- GNUnet/doc/man/gnunetd.conf.5       2005-08-14 02:20:34 UTC (rev 1656)
+++ GNUnet/doc/man/gnunetd.conf.5       2005-08-14 03:16:40 UTC (rev 1657)
@@ -7,7 +7,7 @@
 .PP
 GNUnet uses two configuation files, one for user interfaces (gnunet.conf) and 
one for the server (gnunetd) and associated administrative tools.  This man 
page describes the configuration file for the server.
 .PP
-/etc/gnunetd.conf is the default location for the configuration file used by 
gnunetd, the GNUnet daemon.  It contains the network and resource configuration 
for the peer.  If gnunetd has sufficient permissions when started the first 
time, it will generate a default configuration file at that location.  
Alternatively, gnunetd will also try to create a default configuration at 
/var/lib/GNUnet/gnunetd.conf or ~/.gnunet/gnunetd.conf.  The locations are 
tested in this order.  Binary distributions are encouraged to install an 
appropriate configuration file in /etc/gnunetd.conf.
+/etc/gnunetd.conf is the default location for the configuration file used by 
gnunetd, the GNUnet daemon.  It contains the network and resource configuration 
for the peer.  You should use gnunet\-setup to create the configuration at 
either /var/lib/GNUnet/gnunetd.conf or ~/.gnunet/gnunetd.conf.  The locations 
are used by gnunetd in this order.  Binary distributions are encouraged to 
install an appropriate configuration file in /etc/gnunetd.conf.
 .TP
 The basic structure of the configuration file is the following.  The file is 
split into sections.  Every section begins with [SECTIONNAME] and contains a 
number of options of the form OPTION=VALUE.  Empty lines and lines beginning 
with a # are treated as comments.  Some options are optional, in particular 
certain sections are not used at all unless the corresponding service module is 
loaded (e.g. you do not have to configure the SMTP transport unless you decide 
to use it).
 .SH FILES

Modified: GNUnet/src/util/Makefile.am
===================================================================
--- GNUnet/src/util/Makefile.am 2005-08-14 02:20:34 UTC (rev 1656)
+++ GNUnet/src/util/Makefile.am 2005-08-14 03:16:40 UTC (rev 1657)
@@ -32,7 +32,7 @@
 libgnunetutil_la_LIBADD = $(GCLIBADD) $(CYGLIBADD) $(WINLIBADD)
 SUBDIRS = $(WINSUBDIRS) $(CYGSUBDIRS) .
 
-EXTRA_DIST = generate \
+EXTRA_DIST = \
   testconfig.conf \
   check.conf
 
@@ -40,20 +40,6 @@
  -export-dynamic $(LIBLTDL) $(LIBGCRYPT_LIBS) $(SOLFLAGS) $(WINFLAGS) $(LIBS) 
-lgmp $(DLFLAG) \
  -version-info 1:0:0
 
-generate_gnunetd_conf.c: generate
-       ./generate $(top_srcdir)/contrib/gnunet.root generate_gnunetd_conf > 
generate_gnunetd_conf.c
-generate_gnunet_conf.c: generate
-       ./generate $(top_srcdir)/contrib/gnunet.user generate_gnunet_conf > 
generate_gnunet_conf.c
-
-CLEANFILES = \
-  generate_gnunetd_conf.c \
-  generate_gnunet_conf.c
-
-BUILT_SOURCES = \
-  generate_gnunetd_conf.c \
-  generate_gnunet_conf.c
-
-
 libgnunetutil_la_SOURCES = \
  bloomfilter.c \
  checksum.c \
@@ -62,8 +48,6 @@
  daemon.c \
  dso.c \
  getopt.c \
- generate_gnunetd_conf.c \
- generate_gnunet_conf.c \
  hashing.c \
  hostkey_gcrypt.c \
  initialize.c \

Modified: GNUnet/src/util/configuration.c
===================================================================
--- GNUnet/src/util/configuration.c     2005-08-14 02:20:34 UTC (rev 1656)
+++ GNUnet/src/util/configuration.c     2005-08-14 03:16:40 UTC (rev 1657)
@@ -422,9 +422,6 @@
   return fnExpand;
 }
 
-void generate_gnunetd_conf(FILE * f);
-void generate_gnunet_conf(FILE * f);
-
 /**
  * @brief Read a specific configuration file. The previous configuration
  *        will NOT be discarded if this method is invoked twice.
@@ -496,7 +493,6 @@
   }
   FREENONNULL(eName);
   if (0 == assertIsFile(expCfgName)) {
-    FILE * f;
     char * c;
     int p;
 
@@ -510,24 +506,13 @@
     FREE(c);
     /* try generating a configuration file */
     LOG(LOG_WARNING,
-       _("Configuration file '%s' not found. "
-         "I will try to create the default configuration file at that 
location.\n"),
+       _("Configuration file '%s' not found.  Run gnunet-setup!"),
        expCfgName);
-    f = FOPEN(expCfgName,
-             "a+");
-    if (f != NULL) {
-      if (testConfigurationString("GNUNETD",
-                                 "_MAGIC_",
-                                 "YES")) {
-       generate_gnunetd_conf(f);
-      } else {
-       generate_gnunet_conf(f);
-      }        
-      fclose(f);
-    }
+    errexit(_("Configuration file '%s' not found.  Run gnunet-setup!"),
+           expCfgName);
   }
   if (0 == assertIsFile(expCfgName))
-    errexit(_("Cannot open configuration file '%s'\n"),
+    errexit(_("Cannot open configuration file '%s'.\n"),
            expCfgName);
   FREENONNULL(cfgName);
 

Deleted: GNUnet/src/util/generate
===================================================================
--- GNUnet/src/util/generate    2005-08-14 02:20:34 UTC (rev 1656)
+++ GNUnet/src/util/generate    2005-08-14 03:16:40 UTC (rev 1657)
@@ -1,12 +0,0 @@
-#!/bin/sh
-# Convert an ASCII file into C code that outputs
-# that ASCII file (converts " to \" and puts
-# fprintf and a function around the file).
-echo "#include <stdio.h>"
-echo "#include <unistd.h>"
-echo "void " $2 "(FILE * f) {"
-cat $1 | grep -v "GNUNETD_HOME =" | sed \
-        -e "s/\"/\\\\\"/g" \
-       -e "s/^/ fprintf(f, \"%s\\\\n\",\"/" \
-        -e "s/$/\");/"
-echo "}";