--- projects/cms/source/server/Config2.inc	2000/12/13 18:10:34	1.1.2.9
+++ projects/cms/source/server/Config2.inc	2002/06/07 16:12:47	1.28
@@ -1,61 +1,118 @@
 # Include Config for the server
-# $Id: Config2.inc,v 1.1.2.9 2000/12/13 18:10:34 tdb Exp $
+# $Id: Config2.inc,v 1.28 2002/06/07 16:12:47 tdb Exp $
 
-##
-## Only the first section needs changing here, the rest are just
-## information for use throughout the build scripts
-##
+# Name of our dist
+DISTNAME = iscream_server
 
-## File and Path Locations
+# Location of the i-scream CVS Repository Root
+CVSROOT = :pserver:anonymous@cvs.i-scream.org.uk:/cvs/i-scream
+CVSSERVERMODULE = cms/source/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 ******
+# 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 -r -t -w -S -g "-d $(CVSROOT)" -g "-q"
+
+# 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
 
-# Install Prefix
-prefix = /usr/local/proj/co600_10/iscream-server
-INSTALL = $(prefix)
+# cvs build temporary directory name
+CVSBUILDTEMP = cvsbuildtemp
 
-# cvsbuild temporary directory name
-CVSBUILDTEMP = $(SERVERROOT)/cvsbuildtemp
-# cvsbuild default revision
-rev = HEAD
-REVISION = $(rev)
+# 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
+JCCLASSPATH = $(JCLIBS):$(SOURCEROOT):$(BUILD):$(SOURCEROOT)/idl:.
+# set JCFLAGS to these if you want to optimise and turn off debugging
+#JCFLAGS = -g:none -O
+JCFLAGS =
 
-## Compiler Information
-JCLIBS = $(LIBDIR)/idl.jar:$(LIBDIR)/jacorb.jar:$(LIBDIR)/jaxp.jar:$(LIBDIR)/parser.jar
-JCCLASSPATH = $(JCLIBS):$(SERVERROOT):$(BUILD):.
+# Name of JAR file (will be created in BUILD)
+PACKAGE = $(DISTNAME).jar
+UTILPACKAGE = iscream_util.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
 
-## Package information
+# CHECK Files (for dependencies)
+IDLCHECK = $(SOURCEROOT)/.doneidl
+BUILDCHECK = $(SOURCEROOT)/.donebuild
+COMPILECHECK = .donecompile
+COPYCHECK = .donecopy
 
-# Name of archives
-ARCNAME = iscream
+# 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.util\
+	uk.org.iscream.cms.server.client\
+	uk.org.iscream.cms.server.client.monitors\
+	uk.org.iscream.cms.server.client.alerters
+
+# 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>"
+
+# Javadoc API linking
+JDJAPI = "http://java.sun.com/j2se/1.3/docs/api/"
+JDPBAPI = "http://www.jibble.org/javadocs/pircbot/"
+
+# Javadoc Directories
+DOCDIR = $(BUILD)/doc
+DOCTMPDIR = $(BUILD)/doctemp
+
+# 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 \
+           $(BUILDDIRNAME)/README $(BUILDDIRNAME)/etc \
+           $(BUILDDIRNAME)/lib $(BUILDDIRNAME)/run.bat \
+           $(BUILDDIRNAME)/run.sh $(BUILDDIRNAME)/Makefile
+
+# User configurable options - defaults
+tag = HEAD
+ver = HEAD
+dest = $(BUILD)
+prefix = /usr/local/$(DISTNAME)
+
+# Install Prefix
+INSTALL = $(prefix)
+VERSION = $(ver)
+DISTDEST = $(dest)
+CVSTAG = $(tag)
+
+# Archive extensions
 TAREXT = .tar
 TARGZEXT = .tar.gz
 ZIPEXT = .zip
 
-TARFILE = $(ARCNAME)$(TAREXT)
-TARGZFILE = $(ARCNAME)$(TARGZEXT)
-ZIPFILE = $(ARCNAME)$(ZIPEXT)
+# Subdirectory the dist should be in
+DISTDIR = $(DISTNAME)-$(VERSION)
 
-# Name of JAR file (will be created in BUILD)
-PACKAGE = iscream.jar
-# Main-class to be added to the Manifest
-MAINCLASS = uk.ac.ukc.iscream.core.Core
-# Class-path to be added to the Manifest
-CLPATH = $(LIBDIR)/idl.jar $(LIBDIR)/jacorb.jar $(LIBDIR)/jaxp.jar $(LIBDIR)/parser.jar
-
-
-## CHECK Files (for dependencies)
-IDLCHECK = $(SERVERROOT)/.doneidl
-BUILDCHECK = $(SERVERROOT)/.donebuild
-COMPILECHECK = .donecompile
+# Name of various distfiles
+TARFILE = $(DISTNAME)-$(VERSION)$(TAREXT)
+TARGZFILE = $(DISTNAME)-$(VERSION)$(TARGZEXT)
+ZIPFILE = $(DISTNAME)-$(VERSION)$(ZIPEXT)