--- projects/cms/source/server/Config2.inc	2001/01/22 18:31:34	1.6
+++ projects/cms/source/server/Config2.inc	2003/02/05 22:27:24	1.36
@@ -1,74 +1,137 @@
 # Include Config for the server
-# $Id: Config2.inc,v 1.6 2001/01/22 18:31:34 tdb Exp $
+# $Id: Config2.inc,v 1.36 2003/02/05 22:27:24 tdb Exp $
 
-##
-## Only the first section needs changing here, the rest are just
-## information for use throughout the build scripts
-##
+include $(SOURCEROOT)/Version.inc
 
-## File and Path Locations
+# Name of our dist
+DISTNAME = iscream_server
 
-# ****** These need to be set correctly ******
-# Location of the CVS Repository Root
-CVSROOT = /usr/local/proj/co600_10/cvs
-CVSSERVERMODULE = source/server
-# ****** These need to be set correctly ******
+# Location of the i-scream CVS Repository Root
+CVSROOT = :pserver:anonymous@cvs.i-scream.org.uk:/cvs/i-scream
 
+# This will attempt to locate cvs, and return the path.
+CVS = `if test -x /usr/bin/cvs; then echo /usr/bin/cvs; else if test -x /usr/local/bin/cvs; then echo /usr/local/bin/cvs; else echo cvs; fi fi`
+
+# and the same for cvs2cl
+CVS2CL = `if test -x /usr/bin/cvs2cl; then echo /usr/bin/cvs2cl; else if test -x /usr/local/bin/cvs2cl; then echo /usr/local/bin/cvs2cl; else echo cvs2cl; fi fi`
+# and flags for cvs2cl
+CVS2CLFLAGS = --stdout --no-wrap -r -t -w -S -g "-d $(CVSROOT)" -g "-q"
+
+# and the same for gpg
+GPG = `if test -x /usr/bin/gpg; then echo /usr/bin/gpg; else if test -x /usr/local/bin/gpg; then echo /usr/local/bin/gpg; else echo gpg; fi fi`
+# and flags for gpg
+GPGFLAGS = -abs --default-key=0x135D6B0A
+
+# Binary to run for javac and javadoc
+JAVACBIN = javac
+JAVADOCBIN = javadoc
+
 # Location of the build directory
-BUILD = $(SERVERROOT)/build
+BUILDDIRNAME = build
+BUILD = $(SOURCEROOT)/$(BUILDDIRNAME)
 # Relative (to BUILD) location of the libraries
 LIBDIR = $(BUILD)/lib
 # Location of the main include
-MKINC = $(SERVERROOT)/Makefile.inc
+MKINC = $(SOURCEROOT)/Makefile.inc
+# IDL directory
+IDLDIR = $(SOURCEROOT)/idl
+IDLFILE = $(IDLDIR)/iscream.idl
 
-# Install Prefix
-prefix = /usr/local/iscream-server
-INSTALL = $(prefix)
+# Compiler Information
+JCLIBS = $(LIBDIR)/idl.jar:$(LIBDIR)/jacorb.jar:$(LIBDIR)/jaxp.jar:$(LIBDIR)/crimson.jar:$(LIBDIR)/mm.mysql-2.0.11-bin.jar:$(LIBDIR)/pircbot.jar:$(LIBDIR)/iscream_util.jar
+JCCLASSPATH = $(JCLIBS):$(SOURCEROOT):$(BUILD):$(SOURCEROOT)/idl:.
+# set JCFLAGS to these if you want to optimise and turn off debugging
+#JCFLAGS = -g:none -O
+JCFLAGS =
 
-# cvsbuild temporary directory name
-CVSBUILDTEMP = $(SERVERROOT)/cvsbuildtemp
-# cvsbuild default revision
-rev = HEAD
-REVISION = $(rev)
+# Name of JAR file (will be created in BUILD)
+PACKAGE = $(DISTNAME).jar
+# Main-class to be added to the Manifest
+MAINCLASS = uk.org.iscream.cms.server.componentmanager.ComponentManager
+# Class-path to be added to the Manifest
+CLPATH = lib/idl.jar lib/jacorb.jar lib/jaxp.jar lib/mm.mysql-2.0.11-bin.jar lib/crimson.jar lib/pircbot.jar lib/iscream_util.jar
 
-## Compiler Information
-JCLIBS = $(LIBDIR)/idl.jar:$(LIBDIR)/jacorb.jar:$(LIBDIR)/jaxp.jar:$(LIBDIR)/parser.jar:$(LIBDIR)/mysql.jar
-##### Added $(SERVERROOT)/idl - this may not be a good thing, but it helps dependencies.
-JCCLASSPATH = $(JCLIBS):$(SERVERROOT):$(BUILD):$(SERVERROOT)/idl:.
+# CHECK Files (for dependencies)
+IDLCHECK = $(SOURCEROOT)/idl/.doneidl
+MCOMPILECHECK = $(SOURCEROOT)/$(COMPILECHECK)
+SRCCHECK = $(SOURCEROOT)/.donesrc
+JAVADOCCHECK = $(SOURCEROOT)/.donejavadoc
+MKDISTCHECK = $(BUILD)/.donemkdist
+MKDISTBINCHECK = $(BUILD)/.donemkdistbin
+MKDISTFILESCHECK = $(BUILD)/.donemkdistfiles
+MKDISTFILESBINCHECK = $(BUILD)/.donemkdistfilesbin
+COMPILECHECK = .donecompile
+COPYCHECK = .donecopy
 
-## Package information
+# Javadoc package list
+PKGLIST = uk.org.iscream.cms.server.clientinterface\
+	uk.org.iscream.cms.server.componentmanager\
+	uk.org.iscream.cms.server.core\
+	uk.org.iscream.cms.server.core.loggers\
+	uk.org.iscream.cms.server.dbinterface\
+	uk.org.iscream.cms.server.filter\
+	uk.org.iscream.cms.server.filter.plugins\
+	uk.org.iscream.cms.server.filtermanager\
+	uk.org.iscream.cms.server.rootfilter\
+	uk.org.iscream.cms.server.client\
+	uk.org.iscream.cms.server.client.monitors\
+	uk.org.iscream.cms.server.client.alerters
 
-# Name of archives
-ARCNAME = iscream
-TAREXT = .tar
-TARGZEXT = .tar.gz
-ZIPEXT = .zip
+# Javadoc formatting
+JDTITLE = "i-scream CMS server"
+JDHEADER = "<img src='http://www.i-scream.org.uk/i-scream_small.gif' width='146' height='38'>"
+JDBOTTOM = "<i>Copyright &\#169; 2000-2002 i-scream. All Rights Reserved.</i>"
 
-TARFILE = $(ARCNAME)$(TAREXT)
-TARGZFILE = $(ARCNAME)$(TARGZEXT)
-ZIPFILE = $(ARCNAME)$(ZIPEXT)
+# Javadoc Directories
+DOCDIR = $(BUILD)/doc
+DOCTMPDIR = $(BUILD)/.doctemp
+APICACHE = $(SOURCEROOT)/.api-cache
 
-# Name of JAR file (will be created in BUILD)
-PACKAGE = iscream.jar
-UTILPACKAGE = iscream-util.jar
-# Main-class to be added to the Manifest
-MAINCLASS = uk.ac.ukc.iscream.componentmanager.ComponentManager
-# Class-path to be added to the Manifest
-CLPATH = lib/idl.jar lib/jacorb.jar lib/jaxp.jar lib/parser.jar lib/mysql.jar
+# Javadoc API linking
+JDJAPI = "http://java.sun.com/j2se/1.3/docs/api/"
+JDPBAPI = "http://www.jibble.org/javadocs/pircbot/"
 
+# Javadoc API cache
+JDJAPIC = $(APICACHE)/jdk
+JDPBAPIC = $(APICACHE)/pircbot
 
-## CHECK Files (for dependencies)
-IDLCHECK = $(SERVERROOT)/.doneidl
-BUILDCHECK = $(SERVERROOT)/.donebuild
-COMPILECHECK = .donecompile
+# ChangeLog file
+CHANGELOG = $(BUILD)/ChangeLog
 
+# Directory to put the source code in
+SRCDIR = $(BUILD)/src
+# Files to be included in the source code dist
+SRCFILES = Config2.inc Makefile Makefile.inc README build.config \
+           build.xml configure db uk idl COPYING Version.inc \
+           $(BUILDDIRNAME)/README $(BUILDDIRNAME)/etc \
+           $(BUILDDIRNAME)/lib $(BUILDDIRNAME)/run.bat \
+           $(BUILDDIRNAME)/run.sh $(BUILDDIRNAME)/Makefile
 
-## Javadoc package list
-PKGLIST = uk.ac.ukc.iscream.clientinterface uk.ac.ukc.iscream.componentmanager\
-	uk.ac.ukc.iscream.core uk.ac.ukc.iscream.core.loggers\
-	uk.ac.ukc.iscream.dbinterface uk.ac.ukc.iscream.filter\
-	uk.ac.ukc.iscream.filter.plugins uk.ac.ukc.iscream.filtermanager\
-	uk.ac.ukc.iscream.rootfilter uk.ac.ukc.iscream.util
+# User configurable options - defaults
+dest = $(BUILD)
+prefix = /opt/$(DISTNAME)-$(VERSION)
 
-DOCDIR = doc
-DOCTMPDIR = doctemp
+# Install Prefix
+INSTALLPREFIX = $(prefix)
+DISTDEST = $(dest)
+
+# Archive extensions
+TAREXT = .tar
+TARGZEXT = .tar.gz
+ZIPEXT = .zip
+SIGEXT = .asc
+
+# Subdirectory the dist should be in
+DISTDIR = $(DISTNAME)-$(VERSION)
+
+# Name of various distfiles
+TARFILE = $(DISTNAME)-$(VERSION)$(TAREXT)
+TARGZFILE = $(DISTNAME)-$(VERSION)$(TARGZEXT)
+TARGZFILESIG = $(TARGZFILE)$(SIGEXT)
+ZIPFILE = $(DISTNAME)-$(VERSION)$(ZIPEXT)
+ZIPFILESIG = $(ZIPFILE)$(SIGEXT)
+BINTARFILE = $(DISTNAME)-bin-$(VERSION)$(TAREXT)
+BINTARGZFILE = $(DISTNAME)-bin-$(VERSION)$(TARGZEXT)
+BINTARGZFILESIG = $(BINTARGZFILE)$(SIGEXT)
+BINZIPFILE = $(DISTNAME)-bin-$(VERSION)$(ZIPEXT)
+BINZIPFILESIG = $(BINZIPFILE)$(SIGEXT)