Vanilla Development Mailing List Archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
CVS update: Vanilla
Date: Friday July 16, 1999 @ 8:31
Author: cameron
Update of /home/netrek/cvsroot/Vanilla
In directory cvs.castle.real-time.com:/var/tmp/cvs-serv12682
Modified Files:
ChangeLog Makefile PROJECTS patches
Removed Files:
manifest
Log Message:
Late night Quozl changes ...
- make a netrekd replacement for newstartd,
- adjust RPM build for use of netrekd,
- remove manifest,
- rework primary Makefile,
- drop bzip2 for gzip.
Details in ChangeLog ... which I reckon is too big for here.
****************************************
Index: Vanilla/ChangeLog
diff -u Vanilla/ChangeLog:1.26 Vanilla/ChangeLog:1.27
--- Vanilla/ChangeLog:1.26 Fri Jul 16 03:20:11 1999
+++ Vanilla/ChangeLog Fri Jul 16 08:31:11 1999
@@ -1,3 +1,39 @@
+Fri Jul 16 23:21:00 1999 James Cameron <quozl@us.netrek.org>
+
+ * Makefile (install): add minor hint for installers on how to
+ start the server.
+
+ * rpm/netrek.init: changed to use netrekd symbolic link
+
+ * newstartd/newstartd.c (main): chdir to server directory, check
+ access to files, then fork to background, directing all future
+ output to the LogFile, line buffered, and announce successful
+ start on original stderr. Add ability to stop the listener from
+ the command line. If we were to also try to set effective uid to
+ games then things would be easier.
+
+ * rpm/Vanilla.spec (%clean): add -r to rm to fix build failure.
+
+ * rpm/Vanilla.spec (%install): add symbolic link in
+ /usr/bin/netrekd (it should be /usr/sbin/netrekd since it is a
+ daemon, but it won't work this way because user games does not
+ have /usr/sbin in path).
+
+ * rpm/Vanilla.spec: return to gzip.
+
+ * rpm/cvs2rpm: return to gzip, check writeability of
+ /usr/src/redhat earlier, fix minor typo.
+
+ * patches: reworked due to dependency on manifest.
+
+ * Makefile: add revision header, change warning to installers,
+ change all "make" to "$(MAKE)", minor spacing changes, remove
+ binary distribution targets, remove manifest references, remove
+ startd references, and since xsg and pledit are now included in
+ distribution, remove them from being conditionally tested.
+
+ * manifest: removed in favour of CVS.
+
Fri Jul 16 02:12:14 1999 Bob Tanner <tanner@real-time.com>
* rpm/cvs2rpm (export): Changed to grab the latest snapshot of the
@@ -447,4 +483,4 @@
update_sys_defaults in updateMessages to a more appropriate
location - updateClient in socket.c.
- $Id: ChangeLog,v 1.26 1999/07/16 08:20:11 tanner Exp $
+ $Id: ChangeLog,v 1.27 1999/07/16 13:31:11 cameron Exp $
Index: Vanilla/Makefile
diff -u Vanilla/Makefile:1.12 Vanilla/Makefile:1.13
--- Vanilla/Makefile:1.12 Mon Jul 12 10:01:14 1999
+++ Vanilla/Makefile Fri Jul 16 08:31:11 1999
@@ -1,13 +1,11 @@
+# $Id: Makefile,v 1.13 1999/07/16 13:31:11 cameron Exp $
#
-# Only change CONFIG to the right .mk file.
+# Installers, you should not need to edit this file.
+# Everything should be setup in the configuration script.
#
CONFIG = system.mk
-#
-# Do Not Edit below here. Everything should be setup in the config
-#
-
include $(CONFIG)
DEP_INCS = cflags.h ntserv/data.c ntserv/data.h ntserv/defs.h \
@@ -16,26 +14,22 @@
all: $(PMAKE) server utils startup rsa_utils do_xsg do_pledit do_robots
depend: system.mk
- cd ntserv; make depend
- cd robots; make depend
- cd newstartd; make depend
- cd tools; make depend
- cd pledit; make depend
- cd keycomp; make depend
- cd sequencer; make depend
+ cd ntserv; $(MAKE) depend
+ cd robots; $(MAKE) depend
+ cd newstartd; $(MAKE) depend
+ cd tools; $(MAKE) depend
+ cd pledit; $(MAKE) depend
+ cd keycomp; $(MAKE) depend
+ cd sequencer; $(MAKE) depend
+ cd xsg; $(MAKE) depend
+ cd pledit; $(MAKE) depend
-@if [ -f res-rsa/Makefile ]; then \
- (cd res-rsa; make depend) \
- fi
- -@if [ -f xsg/Makefile ]; then \
- cd xsg; echo " cd xsg; make depend"; make depend; \
+ (cd res-rsa; $(MAKE) depend) \
fi
- -@if [ -f pledit/Makefile ]; then \
- cd pledit; echo " cd pledit; make depend"; make depend; \
- fi
null:
touch null
- make depend
+ $(MAKE) depend
system.mk: system.mk.in config.h.in configure
./configure -v
@@ -51,9 +45,7 @@
cd robots; $(MAKE)
do_xsg: $(DEP_INCS)
- -@if [ -d xsg ]; then \
- cd xsg; echo " cd xsg; $(MAKE)"; $(MAKE); \
- fi
+ cd xsg; $(MAKE);
do_pledit: $(DEP_INCS)
cd pledit; $(MAKE)
@@ -73,89 +65,72 @@
startup: $(DEP_INCS)
cd newstartd; $(MAKE)
-# cd ntstart; $(MAKE)
cflags.h: Makefile $(CONFIG)
- cd ntserv; make cflags
+ cd ntserv; $(MAKE) cflags
lint:
- cd ntserv; make lint
- cd robots; make lint
- cd keycomp; make lint
- cd tools; make lint
+ cd ntserv; $(MAKE) lint
+ cd robots; $(MAKE) lint
+ cd keycomp; $(MAKE) lint
+ cd tools; $(MAKE) lint
clean:
- cd ntserv; make clean
- cd robots; make clean
- cd newstartd; make clean
- cd tools; make clean
- cd pledit; make clean
- cd sequencer; make clean
+ cd ntserv; $(MAKE) clean
+ cd robots; $(MAKE) clean
+ cd newstartd; $(MAKE) clean
+ cd tools; $(MAKE) clean
+ cd pledit; $(MAKE) clean
+ cd sequencer; $(MAKE) clean
+ cd keycomp; $(MAKE) clean
+ cd xsg; $(MAKE) clean
-@if [ -f res-rsa/Makefile ]; then \
- cd res-rsa; echo " cd res-rsa; make clean"; make clean; \
+ cd res-rsa; echo " cd res-rsa; make clean"; $(MAKE) clean; \
fi
- cd keycomp; make clean
- -@if [ -f xsg/Makefile ]; then \
- cd xsg; echo " cd xsg; make clean"; make clean; \
- fi
rm -f make.out name.o name cflags.h *~ #*#
reallyclean:
- cd ntserv; make reallyclean
- cd robots; make reallyclean
- cd newstartd; make reallyclean
- cd tools; make reallyclean
- cd pledit; make reallyclean
- cd sequencer; make reallyclean
+ cd ntserv; $(MAKE) reallyclean
+ cd robots; $(MAKE) reallyclean
+ cd newstartd; $(MAKE) reallyclean
+ cd tools; $(MAKE) reallyclean
+ cd pledit; $(MAKE) reallyclean
+ cd sequencer; $(MAKE) reallyclean
+ cd keycomp; $(MAKE) reallyclean
+ cd xsg; $(MAKE) reallyclean
-@if [ -f res-rsa/Makefile ]; then \
cd res-rsa; echo " cd res-rsa; make reallyclean"; \
- make reallyclean; \
- fi
- cd keycomp; make reallyclean
- -@if [ -f xsg/Makefile ]; then \
- cd xsg; echo " cd xsg; make reallyclean"; make reallyclean; \
+ $(MAKE) reallyclean; \
fi
rm -f make.out cflags.h tools/trekon *~ #*#
installbin: all
- cd ntserv; make install
- cd robots; make install
- cd newstartd; make install
- -@if [ -f res-rsa/Makefile ]; then \
- cd res-rsa; echo " cd res-rsa; make install"; make install; \
- fi
- cd tools; make install
- cd keycomp; make install
- cd pledit; make install
- cd sequencer; make install
- -@if [ -f xsg/Makefile ]; then \
- cd xsg; echo " cd xsg; make install"; make install; \
- fi
-
+ cd ntserv; $(MAKE) install
+ cd robots; $(MAKE) install
+ cd newstartd; $(MAKE) install
+ -@if [ -f res-rsa/Makefile ]; then \
+ cd res-rsa; echo " cd res-rsa; make install"; $(MAKE) install; \
+ fi
+ cd tools; $(MAKE) install
+ cd keycomp; $(MAKE) install
+ cd pledit; $(MAKE) install
+ cd sequencer; $(MAKE) install
+ cd xsg; $(MAKE) install
install: installbin
- cd docs; make install
- cd tools; make installtrekon
+ cd docs; $(MAKE) install
+ cd tools; $(MAKE) installtrekon
-cd tools; ./convert
+ @echo
+ @echo "Vanilla Netrek Server installation is completed."
+ @echo "To start your Netrek server, type $(LIBDIR)/netrekd"
+ @echo "Then start a Netrek client with '-h localhost'"
name: name.c version.h patchlevel.h
$(CC) $(CFLAGS) -DMVERS -o name name.c
-patches: name rmdependencies
- cd $(PATCHDIR)/Vanilla; make name
- @echo Making Vanilla`name`\-`$(PATCHDIR)/Vanilla/name`.diffs
- -rm -f Vanilla`name`\-`$(PATCHDIR)/Vanilla/name`.diffs
- -for f in `cat manifest` ; do \
- if [ ! -L ../$${f} ] ; then \
- if [ ! -f $(PATCHDIR)/$${f} ] ; then \
- touch $(PATCHDIR)/$${f} ; \
- fi ; \
- diff -c $(PATCHDIR)/$${f} ../$${f} >> Vanilla`name`\-`$(PATCHDIR)/Vanilla/name`.diffs ;\
- fi ; \
- done ;
-
solarispatches: name rmdependencies
- cd $(PATCHDIR)/Server; make name
+ cd $(PATCHDIR)/Server; $(MAKE) name
cd $(SOURCE)
./patches
@@ -171,48 +146,16 @@
cd ntserv; /bin/make BINDIR="$(BINDIR)"BINDIR="$(BINDIR)"-P10 CC="$(CC)" EXTRALIBS="$(EXTRALIBS)" \
EXTRACFLAGS="$(EXTRACFLAGS)" XTREKDIR="$(XTREKDIR)" parallel
-#archive is for yourself so you get absolutely everything including RCS files
-archive: reallyclean name
- rmdependencies
- tar cvf - . | compress - > Server`name`.archive.tar.Z
-
-# a distribution of code. xsg is not included in distribution
-# -cd ntserv; rm reserved.c; ln -s reserved.c.shipped reserved.c
-# ^^^^^^^^ intelligent people will use links so let's not make life hard
-
-dist: name rmdependencies
- cd ..; tar cvf - `cat Vanilla/manifest` | gzip - > Vanilla-`Vanilla/name`.tar.gz
-
-distxsg: name
- cd ..; tar cvf - `cat Server/manifest.xsg` | gzip - > xsg2.1-`Server/name`.tar.gz
-
-distrsa: name
- cd ..; tar cvf - `cat Server/manifest.rsa` | gzip - > res-rsa`Server/name`.tar.gz
- cd ..; crypt $(KEY) < res-rsa`Server/name`.tar.gz > res-rsa`Server/name`.tar.gz.crypt
- cd ..; rm res-rsa`Server/name`.tar.gz
-
-# a distribution of the bare necessities
-# maybe inefficient but it works
-bindist: install
- cd docs; make bindist
-
-binclean:
- cd docs; make binclean
-
rmdependencies:
- cd ntserv; make rmdependencies
- cd robots; make rmdependencies
-# cd ntstart; make rmdependencies
- cd newstartd; make rmdependencies
- cd tools; make rmdependencies
- cd pledit; make rmdependencies
- cd keycomp; make rmdependencies
- cd sequencer; make rmdependencies
+ cd ntserv; $(MAKE) rmdependencies
+ cd robots; $(MAKE) rmdependencies
+ cd newstartd; $(MAKE) rmdependencies
+ cd tools; $(MAKE) rmdependencies
+ cd pledit; $(MAKE) rmdependencies
+ cd keycomp; $(MAKE) rmdependencies
+ cd sequencer; $(MAKE) rmdependencies
+ cd xsg; $(MAKE) rmdependencies
-@if [ -f res-rsa/Makefile ]; then \
cd res-rsa; echo " cd res-rsa; make rmdependencies"; \
- make rmdependencies; \
- fi
- -@if [ -f xsg/Makefile ]; then \
- cd xsg; echo " cd xsg; make rmdependencies"; \
- make rmdependencies; \
+ $(MAKE) rmdependencies; \
fi
Index: Vanilla/PROJECTS
diff -u Vanilla/PROJECTS:1.54 Vanilla/PROJECTS:1.55
--- Vanilla/PROJECTS:1.54 Tue Jul 13 22:14:04 1999
+++ Vanilla/PROJECTS Fri Jul 16 08:31:12 1999
@@ -1,6 +1,6 @@
PROJECTS ... list of things to do or fix, and hints for developers.
-# $Id: PROJECTS,v 1.54 1999/07/14 03:14:04 cameron Exp $
+# $Id: PROJECTS,v 1.55 1999/07/16 13:31:12 cameron Exp $
Small things
@@ -37,6 +37,9 @@
- starbase etemp bug, still shows up, engine cooling rate reduced,
warp 2 gives stable etemp, under those conditions it should drop
slowly at warp 2,
+
+ - "make rmdependencies" breaks because res-rsa does not have such a
+ target. Should it?
Bigger things
Index: Vanilla/patches
diff -u Vanilla/patches:1.1.1.1 Vanilla/patches:1.2
--- Vanilla/patches:1.1.1.1 Wed Nov 11 20:44:50 1998
+++ Vanilla/patches Fri Jul 16 08:31:12 1999
@@ -1,57 +1,23 @@
-#!/bin/ksh
-
-PATCHDIR=`echo $PATCHDIR`
-if [ -z $PATCHDIR ]; then
- echo "Please set the env var PATCHDIR. See docs/README for details."
+#!/bin/sh
+#
+# $Id: patches,v 1.2 1999/07/16 13:31:12 cameron Exp $
+#
+# For package users to generate patches for delivery back to the
+# maintenance team.
+#
+# Requires a parameter that points to a directory that contains the
+# unpacked distribution source tree from Vanilla-*.tar.gz
+#
+
+if [ -z $1 ]; then
+ echo "Usage: patches original-source-path"
exit 1
fi
-if [ ! -x name ]; then
- echo "I cannot execute name, thus I cannot get the release level."
- echo "Try setting env var PATCHDIR and SOURCE and type make solaris."
- echo "If this does not work look at docs/README for details."
- exit 1
-fi
+make clean
+make rmdependencies
+echo "Generating patches.diffs"
+diff -u -r -N . $1 > patches.diffs
-SRC_RELEASE=`name`
-
-if [ $? -ne 0 ]; then
- echo "WOAH! name failed! Cannot continue."
- exit 1
-fi
-
-if [ ! -x $PATCHDIR/Server/name ]; then
- echo "I cannot execute $PATCHDIR/Server/name, thus I cannot get the"
- echo "release level."
- echo ""
- echo "Try setting env var PATCHDIR and SOURCE and type make solaris."
- echo "If this does not work look at docs/README for details."
- exit 1
-fi
+echo "Written patches.diffs"
-PATCH_RELEASE=`$PATCHDIR/Server/name`
-
-if [ $? -ne 0 ]; then
- echo "WOAH! $PATCHDIR/Server/name failed! Cannot continue."
- exit 1
-fi
-
-PATCH=$SRC_RELEASE\-$PATCH_RELEASE
-
-echo ""
-echo "Making Server$PATCH.diffs"
-rm -f Server$PATCH.diffs
-
-if [ ! -r manifest ]; then
- echo "I cannot find the manifest file. Are you sure you are in the"
- echo "SOURCE directory?"
- exit 1
-fi
-for f in `cat manifest` ; do
- if [ ! -L ../$f ] ; then
- if [ ! -f $PATCHDIR/$f ] ; then
- touch $PATCHDIR/$f
- fi
- diff -c $PATCHDIR/$f ../$f >> Server$PATCH.diffs
- fi
-done