--- projects/cms/source/conient/Config2.inc	2003/02/05 19:35:03	1.16
+++ projects/cms/source/conient/Config2.inc	2003/02/06 09:48:19	1.17
@@ -1,87 +1,120 @@
 # Include Config for conient
-# $Id: Config2.inc,v 1.16 2003/02/05 19:35:03 tdb Exp $
+# $Id: Config2.inc,v 1.17 2003/02/06 09:48:19 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_conient
 
-# ****** 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
-CVSMODULE = cms/source/client/conient
-# ****** 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 --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 = $(SOURCEROOT)/build
-# Relative (to BUILD) location of the configuration files
-ETCDIR = $(BUILD)/etc
-# Relative (to BUILD) location of the resources
-RESOURCESDIR = $(BUILD)/resources
+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-conient
-INSTALL = $(prefix)
-
-# cvsbuild temporary directory name
-CVSBUILDTEMP = $(SOURCEROOT)/cvsbuildtemp
-# cvsbuild default revision
-rev = HEAD
-REVISION = $(rev)
-
-## Compiler Information
-JCLIBS = $(LIBDIR)/crimson.jar:$(LIBDIR)/jaxp.jar:$(LIBDIR)/iscream_util.jar
-JCCLASSPATH = $(JCLIBS):$(SOURCEROOT):.
+# Compiler Information
+JCLIBS = $(LIBDIR)/jaxp.jar:$(LIBDIR)/crimson.jar:$(LIBDIR)/iscream_util.jar
+JCCLASSPATH = $(JCLIBS):$(SOURCEROOT):$(BUILD):.
 # 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-conient
-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-conient.jar
+PACKAGE = $(DISTNAME).jar
 # Main-class to be added to the Manifest
 MAINCLASS = uk.org.iscream.cms.conient.Conient
 # Class-path to be added to the Manifest
-CLPATH = lib/crimson.jar lib/jaxp.jar lib/iscream_util.jar
+CLPATH = lib/jaxp.jar lib/crimson.jar lib/iscream_util.jar
 
-
-## CHECK Files (for dependencies)
-BUILDCHECK = $(SOURCEROOT)/.donebuild
+# CHECK Files (for dependencies)
+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
 
-
-## Javadoc package list
+# Javadoc package list
 PKGLIST = uk.org.iscream.cms.conient\
-          uk.org.iscream.cms.conient.datacomponents
+	uk.org.iscream.cms.conient.datacomponents
 
-## Javadoc formatting
-JDTITLE = "i-scream CMS Conient"
+# Javadoc formatting
+JDTITLE = "i-scream CMS conient"
 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
+APICACHE = $(SOURCEROOT)/.api-cache
+
+# Javadoc API linking
 JDJAPI = "http://java.sun.com/j2se/1.3/docs/api/"
-JDSAPI = "http://www.i-scream.org.uk/javadoc/server/"
 
-DOCDIR = doc
+# Javadoc API cache
+JDJAPIC = $(APICACHE)/jdk
+
+# 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 uk COPYING Version.inc \
+           $(BUILDDIRNAME)/README $(BUILDDIRNAME)/etc \
+           $(BUILDDIRNAME)/lib $(BUILDDIRNAME)/run.bat \
+           $(BUILDDIRNAME)/run.sh $(BUILDDIRNAME)/Makefile
+
+# User configurable options - defaults
+dest = $(BUILD)
+prefix = /opt/$(DISTNAME)-$(VERSION)
+
+# 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)