Consistent use of 'advent' to avoid collision with BSD Games.

Manual page added.

diff --git a/.gitignore b/.gitignore
index aa818f61a7530d9e709bf807701f4a95f798be50..babef263261cf211207991568d961827c8135a6d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-adventure
+advent
 *.o
 adventure.data

diff --git a/Makefile b/Makefile
index 9aa8f61f554e100369b6828b3399372916c0fb95..ca6e670287417852c4e6c6688cdf7d45684ff6e1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,13 @@
-# Makefile for the pen-source release of adventure 2.4
+# Makefile for the open-source release of adventure 2.5
 
 OBJS=main.o init.o actions1.o actions2.o score.o misc.o datime.o
+SOURCES=$(OBJS:.o=.c) COPYING NEWS README adventure.asc
 
 .c.o:
        gcc -O $(DBX) -c $<
 
-adventure:     $(OBJS)
-       gcc -O $(DBX) -o adventure $(OBJS)
+advent:        $(OBJS)
+       gcc -O $(DBX) -o advent $(OBJS)
 
 main.o:                misc.h funcs.h
 
@@ -21,4 +22,22 @@ score.o:     misc.h main.h share.h
 misc.o:                misc.h main.h
 
 clean:
-       rm -f *.o adventure
+       rm -f *.o advent advent.html advent.6
+
+# Requires asciidoc and xsltproc/docbook stylesheets.
+.asc.6:
+       a2x --doctype manpage --format manpage $<
+.asc.html:
+       a2x --doctype manpage --format xhtml -D . $<
+       rm -f docbook-xsl.css
+
+advent-$(VERS).tar.gz: $(SOURCES) advent.6
+       tar --transform='s:^:advent-$(VERS)/:' --show-transformed-names -cvzf advent-$(VERS).tar.gz $(SOURCES) advent.6
+
+dist: advent-$(VERS).tar.gz
+
+release: advent-$(VERS).tar.gz advent.html
+       shipper version=$(VERS) | sh -e -x
+
+refresh: advent.html
+       shipper -N -w version=$(VERS) | sh -e -x

diff --git a/NEWS b/NEWS
new file mode 100644 (file)
index 0000000..5688644
--- /dev/null
+++ b/NEWS
@@ -0,0 +1,4 @@
+= OpenAdventure project news =
+
+Repository head::
+  Forward port of Crowther & Woods's 430-point Adventure 2.5.

diff --git a/README b/README
index c73e6b072b0883edecc1547fcdaf14e143a723ba..222746beb73d46b5b03f0f345c5cc129d4d7ea05 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-= README for Open Adventure =
+= README for Open Advent =
 
 This code is a forward-port of the Crowther/Woods Adventure 2.5 from
 1995, last version in the main line of Colossal Cave Adventure
@@ -8,6 +8,9 @@ permission and encouragement to this release.
 The file history.txt contains a more detailed history of this game
 and its ancestors.
 
-This project is called "Open Adventure" because it's not at all clear
+This project is called "Open Advent" because it's not at all clear
 to number Adventure past 2.5 without misleading or causing collisions
-or both.  See the history file for discussion.
+or both.  See the history file for discussion.  The original 6-character
+name on the PDP-10 has been reverted to in order to avoid a collision
+with the BSD games pport of the anecestral 196 version.
+

diff --git a/advent.txt b/advent.txt
new file mode 100644 (file)
index 0000000..81558b1
--- /dev/null
+++ b/advent.txt
@@ -0,0 +1,33 @@
+= advent(6) =
+:doctype: manpage
+
+== NAME ==
+advent - Colossal Cave Adventure
+
+== SYNOPSIS ==
+*advent* 
+
+== DESCRIPTION ==
+The original Colossal Cave Adventure from 1976 was the origin of all
+text adventures, dungeon-crawl games, and computer-hosted roleplaying
+games.
+
+This is the last version released by Crowther & Woods, its original
+authors, in 1995.  It has been known as "adventure 2.5" and "430-point
+adventure".
+
+This game is released as open source with the permission and encouragement of
+the authors.
+
+== DISAMBIGUATION ==
+There is an 'adventure' in the BSD games package that is a C
+port of the 1976 ancestor of this game.  To avoid a name collision,
+this game builds as 'advent', reflecting the fact that the PDP-10
+on which it originally ran limited filenames to 6 characters.
+
+== REPORTING BUGS ==
+Report bugs to Eric S. Raymond <esr@thyrsus.com>.  The project page is
+at http://catb.org/~esr/open-advent
+
+== SEE ALSO ==
+wumpus(6), adventure(6), zork(6), rogue(6), nethack(6).

diff --git a/history.txt b/history.txt
index e392f528d3e7b3e65221bd83628853e698f45029..3a38faca089beac75d5b3bed1d6e6dd596827a02 100644 (file)
--- a/history.txt
+++ b/history.txt
@@ -8,7 +8,7 @@ of hacker folklore.
 The very first version was released by Crowther in 1976, in FORTRAN on
 the PDP-10 at Bolt, Beranek, and Newman. (Crowther was at the time
 writing what we could now call firmware for the earliest ARPANET
-routers) It was a maze game based on the Colossal Cave complex in
+routers.) It was a maze game based on the Colossal Cave complex in
 Kentucy, lacking the D&D-like elements now associated with the game.
 
 Adventure as we now know it, the ancestor of all later versions, was
@@ -66,12 +66,13 @@ he replied on 15 May giving both permission and encouragement.
 
 == Nomenclature ==
 
-This project is called "Open Adventure" because it's not at all clear
+This project is called "Open Advent" because it's not at all clear
 to number Adventure past 2.5 without misleading or causing
 collisions. Various of the non-mainline versions have claimed to be
 versions 3, 4, 5, 6, 7 and for all I know higher than that.  It seems
 best just to start a new numbering series while acknowledging the
-links back.
+links back.  I have reverted to "Advent" to avoid a name collision
+with the BSD Games version.
 
 == Sources ==