--- projects/cms/source/server/Config2.inc 2002/06/07 16:12:47 1.28
+++ projects/cms/source/server/Config2.inc 2003/02/05 22:17:56 1.35
@@ -1,12 +1,13 @@
# Include Config for the server
-# $Id: Config2.inc,v 1.28 2002/06/07 16:12:47 tdb Exp $
+# $Id: Config2.inc,v 1.35 2003/02/05 22:17:56 tdb Exp $
+include $(SOURCEROOT)/Version.inc
+
# Name of our dist
DISTNAME = iscream_server
# Location of the i-scream CVS Repository Root
CVSROOT = :pserver:anonymous@cvs.i-scream.org.uk:/cvs/i-scream
-CVSSERVERMODULE = cms/source/server
# 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`
@@ -14,8 +15,13 @@ CVS = `if test -x /usr/bin/cvs; then echo /usr/bin/cvs
# 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"
+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
@@ -27,12 +33,12 @@ BUILD = $(SOURCEROOT)/$(BUILDDIRNAME)
LIBDIR = $(BUILD)/lib
# Location of the main include
MKINC = $(SOURCEROOT)/Makefile.inc
+# IDL directory
+IDLDIR = $(SOURCEROOT)/idl
+IDLFILE = $(IDLDIR)/iscream.idl
-# cvs build temporary directory name
-CVSBUILDTEMP = cvsbuildtemp
-
# 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
+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
@@ -44,11 +50,17 @@ 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
+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
# CHECK Files (for dependencies)
-IDLCHECK = $(SOURCEROOT)/.doneidl
-BUILDCHECK = $(SOURCEROOT)/.donebuild
+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
@@ -72,13 +84,18 @@ JDTITLE = "i-scream CMS server"
JDHEADER = ""
JDBOTTOM = "Copyright &\#169; 2000-2002 i-scream. All Rights Reserved."
+# 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/"
-# Javadoc Directories
-DOCDIR = $(BUILD)/doc
-DOCTMPDIR = $(BUILD)/doctemp
+# Javadoc API cache
+JDJAPIC = $(APICACHE)/jdk
+JDPBAPIC = $(APICACHE)/pircbot
# ChangeLog file
CHANGELOG = $(BUILD)/ChangeLog
@@ -87,27 +104,24 @@ CHANGELOG = $(BUILD)/ChangeLog
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 \
+ build.xml configure db uk idl COPYING Version.inc \
$(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)
+prefix = /opt/$(DISTNAME)-$(VERSION)
# Install Prefix
-INSTALL = $(prefix)
-VERSION = $(ver)
+INSTALLPREFIX = $(prefix)
DISTDEST = $(dest)
-CVSTAG = $(tag)
# Archive extensions
TAREXT = .tar
TARGZEXT = .tar.gz
ZIPEXT = .zip
+SIGEXT = .asc
# Subdirectory the dist should be in
DISTDIR = $(DISTNAME)-$(VERSION)
@@ -115,4 +129,11 @@ 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)