Prepare for release of 1.1.0.

Signed-off-by: Bradley Smith <brad@brad-smith.co.uk>

7 files changed, 42 insertions, 98 deletions

diff --git a/AUTHORS b/AUTHORS
index 5fe2015..5ecc083 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,3 @@
-
 Authors of GNU Robots
 =====================
 
diff --git a/ChangeLog b/ChangeLog
index a6031aa..6c9ba35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-05-14  Bradley Smith <brad@brad-smith.co.uk>
+
+	* configure.ac:
+		Increment version to 1.1.0 in preperation for release.
+	* NEWS: 
+		Add NEWS section for 1.1.0 release.
+	* README:
+		Update inline with 1.1.0 version.
+	* src/main.c:
+		Improve usage.
+
 2008-05-05  Bradley Smith <brad@brad-smith.co.uk>
 
 	* lib/* include/userinterface.h src/userinterface src/main.c
diff --git a/NEWS b/NEWS
index 688f4f0..1e5830e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,12 @@
 RELEASE HISTORY FOR GNU ROBOTS:
 _____________________________________________________________________
 
+1.1.0 Bug fix release.
+
+      Imporve GUI, including proper handling of X events.
+      Scrap plugable UI's in preperation for GTK GUI.
+      General clean up.
+
 1.0D  Added some extra documentation (but not much) and the early
       beginning of code clean-up.
 
diff --git a/README b/README
index 5304fbb..252c19a 100644
--- a/README
+++ b/README
@@ -24,12 +24,7 @@ Installing GNU Robots
     To specify an unusual location for GNU Guile, you can use the
     `--with-guile=' option, like this:
 
-    ./configure --with-guile=/home/jhall
-
-    To specify an unusual location for curses, you can use the
-    `--with-curses=' option, like this:
-
-    ./configure --with-curses=/hub/local
+    ./configure --with-guile=/home/user
 
 (2) Look at the generated `Makefile', and check that everything is
     okay.  Then type:
@@ -51,56 +46,31 @@ Notes
 * generator; it would write a Scheme program that you could then load
 * into GNU Robots.  Writing this in GTK+ would seem like a good idea.
 *
-* If anyone would like to help write this programming interface for
-* GNU Robots, please contact me!  You may reach me at <jhall1@isd.net>
-
-
-There are three ways to run GNU Robots:
+* This will hopefully be in the next release!
 
-1. X Windows ("xrobots")
-2. text mode, using curses ("robots")
-3. text mode, log file output ("robots_logfile")
 
-I use the robots_logfile when I am hosting a GNU Robots competition,
-because it is not really interesting for me to see how the many robots
-are individually interacting with their environments. I am only
-interested in the outcome.
-
-I use the xrobots program when I am running my own GNU Robot game,
-because there I *am* interested in what my robot is doing.
+To run GNU Robots, run "gnurobots"
 
 --
 
-The "robots" program is a curses-based version of the game, using an
-ASCII approximation of the game elements.  Your robot will appear as a
-"v" when it points South, "^" when it points North, and "<" and ">"
-for West and East.  Empty spaces are shown as " ", walls as "#",
-baddies as "@", and food and prizes as "+" and "$".
-
-You'll note that this is the same notation used in the GNU Robots map
-files.  The initial location of the robot is not shown in the map
-file, but is always at 1,1 facing East (the upper-left corner is
-always 0,0).
-
 The sample map that is provided as "maps/small.map" is just a single
 room, with prizes all along the four walls.  The sample robot program
 "scheme/simple.scm" knows how to pick up all these prizes and then
 quit.  Other map files can be found in the maps/ directory, and other
 robot programs are in the scheme/ directory.
 
-The usage for robots, xrobots, robots_logfile is as follows:
+The usage for gnurobots is as follows:
 
-  robots [OPTION]... [FILE]
+  gnurobots [OPTION]... [FILE]
 
 Options are:
 
-  -f, --map-file=FILE    Load map file
-  -s, --shields=N        Set initial shields to N
-  -e, --energy=N         Set initial energy to N
-  -V, --version          Output version information and exit
-  -h, --help             Display this help and exit
+    -f, --map-file=FILE    Load map file
+    -s, --shields=N        Set initial shields to N
+    -e, --energy=N         Set initial energy to N
+    -V, --version          Output version information and exit
+    -h, --help             Display this help and exit
 
-Even though it's not shown, the `-f' option to load a map file is
-required by GNU Robots.  Otherwise, the game will not be able to open
-a map for your robot to explore!
+    Note: FILE refers to a scheme file and ./bin/gnurobots enters into
+          interactive mode if it is not specified.
 
diff --git a/TODO b/TODO
index b28374b..d03b7c0 100644
--- a/TODO
+++ b/TODO
@@ -7,14 +7,14 @@ _____________________________________________________________________
 THINGS TO DO:
 _____________________________________________________________________
 
-* src/sign.c needs to go.
+* Add GTK GUI.
 
-* Improve the graphics, to make everything look better.  I think I
-  need a graphic designer to help me do this.  GTK+ would be nice.
+* Add graphical map designer.
 
-* In version 2.0, more creatures will get added.  The things called
+* Better graphics?
+
+* In version 2.0, more creatures will get added. The things called
   "baddie" and "food" and "prize" will be generic descriptors.  For
   example, "food" will be a generic name for "cookie" or "donut", so
   that (robot-feel 'cookie) will fail if the thing is a donut, but
   (robot-feel 'food) will still work.
-
diff --git a/configure.ac b/configure.ac
index 0cc4ab0..732d8dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([GNU Robots], [1.0.90], [brad@brad-smith.co.uk], [gnurobots])
+AC_INIT([GNU Robots], [1.1.0], [brad@brad-smith.co.uk], [gnurobots])
 AC_PREREQ([2.59])
 AM_CONFIG_HEADER([config.h])
 AC_CONFIG_AUX_DIR([build])
@@ -65,39 +65,6 @@ fi
 
 AM_CONDITIONAL(USE_X11, test "$use_x11" = "yes")
 
-dnl Check for curses, add to CURSES_LIBS, and CURSES_CFLAGS.
-dnl At this time, only ncurses is supported.
-dnl We should check for SYSV curses too.
-AC_CHECK_HEADERS(ncurses.h,
-   use_curses="yes",
-   AC_MSG_WARN("Can't find ncurses. Curses plugin shall not be compiled.")
-   use_curses="no")
-
-dnl we dont need other checks if the headers are not found
-if test "$use_curses" = "yes"
-then
-
-dnl allow user to specify directory where to find ncurses
-if test -n "$with_ncurses"
-then
-  ncurses_cflags="-I$with_ncurses/include"
-  ncurses_libs="-L$with_ncurses/lib"
-fi
-
-AC_CHECK_LIB(ncurses, initscr,
-  CURSES_LIBS="$ncurses_libs -lncurses"
-  CURSES_CFLAGS="$ncurses_cflags"
-  use_curses="yes",
-  AC_MSG_WARN("Can't find ncurses. Curses plugin shall not be compiled.")
-  use_curses="no")
-
-AC_SUBST(CURSES_LIBS)
-AC_SUBST(CURSES_CFLAGS)
-
-fi
-
-AM_CONDITIONAL(USE_CURSES, test "$use_curses" = "yes")
-
 dnl Check for math library
 AC_CHECK_LIB(m, pow)
 
@@ -122,18 +89,10 @@ if test "x$HAVE_GLIB2" = "xno"; then
   AC_MSG_ERROR([GNU Robots requires GLib2 to compile.])
 fi
 
-AC_CHECK_FUNC(tgetent,
-	[READLINE_EXTRA=],
-	[AC_CHECK_LIB(curses, tgetent,
-		[READLINE_EXTRA=-lcurses],
-		[AC_CHECK_LIB(ncurses, tgetent,
-			[READLINE_EXTRA=-lncurses],
-			[AC_CHECK_LIB(termcap, tgetent,
-				[READLINE_EXTRA=-ltermcap],
-				[AC_MSG_WARN(No Termcap or Curses library found)])
-			])
-		])
-	])
+for termlib in ncurses curses termcap terminfo termlib ; do
+	AC_CHECK_LIB(${termlib}, tgoto,
+		[READLINE_EXTRA="-l${termlib}"; break])
+done
 
 AC_CHECK_LIB(readline,readline,[READLINE_LIBS=-lreadline],
 	AC_MSG_ERROR([
diff --git a/src/main.c b/src/main.c
index 7048583..313329c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -450,8 +450,7 @@ exit_nicely ()
  * void usage(const gchar *argv0)                                       *
  *                                                                      *
  * A function that prints the usage of GNU Robots to the user. Assume   *
- * text mode for this function. We have not initialized X Windows or    *
- * curses yet.                                                          *
+ * text mode for this function. We have not initialized X Windows yet.  *
  ************************************************************************/
 void
 usage (const gchar *argv0)
@@ -465,14 +464,14 @@ usage (const gchar *argv0)
 
   g_printf ("Usage: %s [OPTION]... [FILE]\n\n", argv0);
   g_printf
-    ("  -f, --map-file=FILE    Load map file (this option is required)\n");
+    ("  -f, --map-file=FILE    Load map file\n");
   g_printf ("  -s, --shields=N        Set initial shields to N\n");
   g_printf ("  -e, --energy=N         Set initial energy to N\n");
   g_printf ("  -V, --version          Output version information and exit\n");
   g_printf ("  -h, --help             Display this help and exit\n");
   g_printf ("\nNote: FILE refers to a scheme file and %s enters into \n",
         argv0);
-  g_printf ("      an interactive mode if it is not specified.\n");
+  g_printf ("      interactive mode if it is not specified.\n");
 
   g_printf ("\nReport bugs to <%s>.\n", PACKAGE_BUGREPORT);
 }