--- projects/cms/source/server/Config2.inc 2003/02/01 19:08:54 1.30
+++ projects/cms/source/server/Config2.inc 2003/02/16 20:35:59 1.40
@@ -1,5 +1,5 @@
# Include Config for the server
-# $Id: Config2.inc,v 1.30 2003/02/01 19:08:54 tdb Exp $
+# $Id: Config2.inc,v 1.40 2003/02/16 20:35:59 tdb Exp $
include $(SOURCEROOT)/Version.inc
@@ -15,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
@@ -33,7 +38,7 @@ IDLDIR = $(SOURCEROOT)/idl
IDLFILE = $(IDLDIR)/iscream.idl
# 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
@@ -41,11 +46,10 @@ JCFLAGS =
# 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
+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)/idl/.doneidl
@@ -55,6 +59,7 @@ JAVADOCCHECK = $(SOURCEROOT)/.donejavadoc
MKDISTCHECK = $(BUILD)/.donemkdist
MKDISTBINCHECK = $(BUILD)/.donemkdistbin
MKDISTFILESCHECK = $(BUILD)/.donemkdistfiles
+MKDISTFILESBINCHECK = $(BUILD)/.donemkdistfilesbin
COMPILECHECK = .donecompile
COPYCHECK = .donecopy
@@ -68,7 +73,6 @@ PKGLIST = uk.org.iscream.cms.server.clientinterface\
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
@@ -76,7 +80,7 @@ PKGLIST = uk.org.iscream.cms.server.clientinterface\
# Javadoc formatting
JDTITLE = "i-scream CMS server"
JDHEADER = ""
-JDBOTTOM = "Copyright &\#169; 2000-2002 i-scream. All Rights Reserved."
+JDBOTTOM = "Copyright &\#169; 2000-2003 i-scream. All Rights Reserved."
# Javadoc Directories
DOCDIR = $(BUILD)/doc
@@ -84,12 +88,14 @@ DOCTMPDIR = $(BUILD)/.doctemp
APICACHE = $(SOURCEROOT)/.api-cache
# Javadoc API linking
-JDJAPI = "http://java.sun.com/j2se/1.3/docs/api/"
+JDJAPI = "http://java.sun.com/j2se/1.4.1/docs/api/"
JDPBAPI = "http://www.jibble.org/javadocs/pircbot/"
+JDUAPI = "http://www.i-scream.org.uk/javadoc/util/"
# Javadoc API cache
JDJAPIC = $(APICACHE)/jdk
JDPBAPIC = $(APICACHE)/pircbot
+JDUAPIC = $(APICACHE)/util
# ChangeLog file
CHANGELOG = $(BUILD)/ChangeLog
@@ -98,24 +104,28 @@ 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
-# **FIXME** putting libs in build/lib, but probably shouldn't...
+ $(BUILDDIRNAME)/run.sh $(BUILDDIRNAME)/Makefile \
+ $(BUILDDIRNAME)/COPYING
+# License file
+LICFILE = COPYING
+
# User configurable options - defaults
dest = $(BUILD)
-prefix = /usr/local/$(DISTNAME)
+prefix = /opt/$(DISTNAME)-$(VERSION)
# Install Prefix
-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)
@@ -123,4 +133,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)