--- projects/cms/source/server/Config2.inc	2002/04/15 17:26:17	1.27
+++ projects/cms/source/server/Config2.inc	2003/01/26 14:02:52	1.29
@@ -1,75 +1,63 @@
 # Include Config for the server
-# $Id: Config2.inc,v 1.27 2002/04/15 17:26:17 tdb Exp $
+# $Id: Config2.inc,v 1.29 2003/01/26 14:02:52 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
-
-# ****** These need to be set correctly ******
-# Location of the CVS Repository Root
+# 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 ******
 
 # 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 = $(SOURCEROOT)/build
+BUILDDIRNAME = build
+BUILD = $(SOURCEROOT)/$(BUILDDIRNAME)
 # Relative (to BUILD) location of the libraries
 LIBDIR = $(BUILD)/lib
 # Location of the main include
 MKINC = $(SOURCEROOT)/Makefile.inc
 
-# Install Prefix
-prefix = /usr/local/iscream-server
-INSTALL = $(prefix)
+# cvs build temporary directory name
+CVSBUILDTEMP = .cvsbuildtemp
 
-# cvsbuild temporary directory name
-CVSBUILDTEMP = $(SOURCEROOT)/cvsbuildtemp
-# cvsbuild default revision
-rev = HEAD
-REVISION = $(rev)
-
-## Compiler Information
+# 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
-##### Added $(SOURCEROOT)/idl - this may not be a good thing, but it helps dependencies.
 JCCLASSPATH = $(JCLIBS):$(SOURCEROOT):$(BUILD):$(SOURCEROOT)/idl:.
 # set JCFLAGS to these if you want to optimise and turn off debugging
 #JCFLAGS = -g:none -O
 JCFLAGS =
 
-## Package information
-
-# Name of archives
-ARCNAME = iscream-server
-TAREXT = .tar
-TARGZEXT = .tar.gz
-ZIPEXT = .zip
-
-TARFILE = $(ARCNAME)$(TAREXT)
-TARGZFILE = $(ARCNAME)$(TARGZEXT)
-ZIPFILE = $(ARCNAME)$(ZIPEXT)
-
 # Name of JAR file (will be created in BUILD)
-PACKAGE = iscream-server.jar
-UTILPACKAGE = iscream-util.jar
+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
 
-
-## CHECK Files (for dependencies)
+# CHECK Files (for dependencies)
 IDLCHECK = $(SOURCEROOT)/.doneidl
 BUILDCHECK = $(SOURCEROOT)/.donebuild
+JAVADOCCHECK = $(SOURCEROOT)/.donejavadoc
+SRCCHECK = $(SOURCEROOT)/.donesrc
+MKDISTCHECK = $(BUILD)/.donemkdist
+MKDISTBINCHECK = $(BUILD)/.donemkdistbin
+MKDISTFILESCHECK = $(BUILD)/.donemkdistfiles
 COMPILECHECK = .donecompile
 COPYCHECK = .donecopy
 
-## Javadoc package list
+# Javadoc package list
 PKGLIST = uk.org.iscream.cms.server.clientinterface\
 	uk.org.iscream.cms.server.componentmanager\
 	uk.org.iscream.cms.server.core\
@@ -83,14 +71,58 @@ PKGLIST = uk.org.iscream.cms.server.clientinterface\
 	uk.org.iscream.cms.server.client\
 	uk.org.iscream.cms.server.client.monitors\
 	uk.org.iscream.cms.server.client.alerters
-## Javadoc formatting
+
+# 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
+# Javadoc Directories
+DOCDIR = $(BUILD)/doc
+DOCTMPDIR = $(BUILD)/.doctemp
+APICACHE = $(SOURCEROOT)/.api-cache
+
+# Javadoc API linking
 JDJAPI = "http://java.sun.com/j2se/1.3/docs/api/"
 JDPBAPI = "http://www.jibble.org/javadocs/pircbot/"
 
-DOCDIR = doc
-DOCTMPDIR = doctemp
+# Javadoc API cache
+JDJAPIC = $(APICACHE)/jdk
+JDPBAPIC = $(APICACHE)/pircbot
+
+# 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
+
+# Subdirectory the dist should be in
+DISTDIR = $(DISTNAME)-$(VERSION)
+
+# Name of various distfiles
+TARFILE = $(DISTNAME)-$(VERSION)$(TAREXT)
+TARGZFILE = $(DISTNAME)-$(VERSION)$(TARGZEXT)
+ZIPFILE = $(DISTNAME)-$(VERSION)$(ZIPEXT)