ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/cms/source/server/Config2.inc
(Generate patch)

Comparing projects/cms/source/server/Config2.inc (file contents):
Revision 1.30 by tdb, Sat Feb 1 19:08:54 2003 UTC vs.
Revision 1.40 by tdb, Sun Feb 16 20:35:59 2003 UTC

# Line 15 | Line 15 | CVS = `if test -x /usr/bin/cvs; then echo /usr/bin/cvs
15   # and the same for cvs2cl
16   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`
17   # and flags for cvs2cl
18 < CVS2CLFLAGS = --stdout -r -t -w -S -g "-d $(CVSROOT)" -g "-q"
18 > CVS2CLFLAGS = --stdout --no-wrap -r -t -w -S -g "-d $(CVSROOT)" -g "-q"
19  
20 + # and the same for gpg
21 + 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`
22 + # and flags for gpg
23 + GPGFLAGS = -abs --default-key=0x135D6B0A
24 +
25   # Binary to run for javac and javadoc
26   JAVACBIN = javac
27   JAVADOCBIN = javadoc
# Line 33 | Line 38 | IDLDIR = $(SOURCEROOT)/idl
38   IDLFILE = $(IDLDIR)/iscream.idl
39  
40   # Compiler Information
41 < JCLIBS = $(LIBDIR)/idl.jar:$(LIBDIR)/jacorb.jar:$(LIBDIR)/jaxp.jar:$(LIBDIR)/crimson.jar:$(LIBDIR)/mm.mysql-2.0.11-bin.jar:$(LIBDIR)/pircbot.jar
41 > 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
42   JCCLASSPATH = $(JCLIBS):$(SOURCEROOT):$(BUILD):$(SOURCEROOT)/idl:.
43   # set JCFLAGS to these if you want to optimise and turn off debugging
44   #JCFLAGS = -g:none -O
# Line 41 | Line 46 | JCFLAGS =
46  
47   # Name of JAR file (will be created in BUILD)
48   PACKAGE = $(DISTNAME).jar
44 UTILPACKAGE = iscream_util.jar
49   # Main-class to be added to the Manifest
50   MAINCLASS = uk.org.iscream.cms.server.componentmanager.ComponentManager
51   # Class-path to be added to the Manifest
52 < CLPATH = lib/idl.jar lib/jacorb.jar lib/jaxp.jar lib/mm.mysql-2.0.11-bin.jar lib/crimson.jar lib/pircbot.jar
52 > 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
53  
54   # CHECK Files (for dependencies)
55   IDLCHECK = $(SOURCEROOT)/idl/.doneidl
# Line 55 | Line 59 | JAVADOCCHECK = $(SOURCEROOT)/.donejavadoc
59   MKDISTCHECK = $(BUILD)/.donemkdist
60   MKDISTBINCHECK = $(BUILD)/.donemkdistbin
61   MKDISTFILESCHECK = $(BUILD)/.donemkdistfiles
62 + MKDISTFILESBINCHECK = $(BUILD)/.donemkdistfilesbin
63   COMPILECHECK = .donecompile
64   COPYCHECK = .donecopy
65  
# Line 68 | Line 73 | PKGLIST = uk.org.iscream.cms.server.clientinterface\
73          uk.org.iscream.cms.server.filter.plugins\
74          uk.org.iscream.cms.server.filtermanager\
75          uk.org.iscream.cms.server.rootfilter\
71        uk.org.iscream.cms.server.util\
76          uk.org.iscream.cms.server.client\
77          uk.org.iscream.cms.server.client.monitors\
78          uk.org.iscream.cms.server.client.alerters
# Line 76 | Line 80 | PKGLIST = uk.org.iscream.cms.server.clientinterface\
80   # Javadoc formatting
81   JDTITLE = "i-scream CMS server"
82   JDHEADER = "<img src='http://www.i-scream.org.uk/i-scream_small.gif' width='146' height='38'>"
83 < JDBOTTOM = "<i>Copyright &\#169; 2000-2002 i-scream. All Rights Reserved.</i>"
83 > JDBOTTOM = "<i>Copyright &\#169; 2000-2003 i-scream. All Rights Reserved.</i>"
84  
85   # Javadoc Directories
86   DOCDIR = $(BUILD)/doc
# Line 84 | Line 88 | DOCTMPDIR = $(BUILD)/.doctemp
88   APICACHE = $(SOURCEROOT)/.api-cache
89  
90   # Javadoc API linking
91 < JDJAPI = "http://java.sun.com/j2se/1.3/docs/api/"
91 > JDJAPI = "http://java.sun.com/j2se/1.4.1/docs/api/"
92   JDPBAPI = "http://www.jibble.org/javadocs/pircbot/"
93 + JDUAPI = "http://www.i-scream.org.uk/javadoc/util/"
94  
95   # Javadoc API cache
96   JDJAPIC = $(APICACHE)/jdk
97   JDPBAPIC = $(APICACHE)/pircbot
98 + JDUAPIC = $(APICACHE)/util
99  
100   # ChangeLog file
101   CHANGELOG = $(BUILD)/ChangeLog
# Line 98 | Line 104 | CHANGELOG = $(BUILD)/ChangeLog
104   SRCDIR = $(BUILD)/src
105   # Files to be included in the source code dist
106   SRCFILES = Config2.inc Makefile Makefile.inc README build.config \
107 <           build.xml configure db uk idl COPYING \
107 >           build.xml configure db uk idl COPYING Version.inc \
108             $(BUILDDIRNAME)/README $(BUILDDIRNAME)/etc \
109             $(BUILDDIRNAME)/lib $(BUILDDIRNAME)/run.bat \
110 <           $(BUILDDIRNAME)/run.sh $(BUILDDIRNAME)/Makefile
111 < # **FIXME** putting libs in build/lib, but probably shouldn't...
110 >           $(BUILDDIRNAME)/run.sh $(BUILDDIRNAME)/Makefile \
111 >           $(BUILDDIRNAME)/COPYING
112  
113 + # License file
114 + LICFILE = COPYING
115 +
116   # User configurable options - defaults
117   dest = $(BUILD)
118 < prefix = /usr/local/$(DISTNAME)
118 > prefix = /opt/$(DISTNAME)-$(VERSION)
119  
120   # Install Prefix
121 < INSTALL = $(prefix)
121 > INSTALLPREFIX = $(prefix)
122   DISTDEST = $(dest)
123  
124   # Archive extensions
125   TAREXT = .tar
126   TARGZEXT = .tar.gz
127   ZIPEXT = .zip
128 + SIGEXT = .asc
129  
130   # Subdirectory the dist should be in
131   DISTDIR = $(DISTNAME)-$(VERSION)
# Line 123 | Line 133 | DISTDIR = $(DISTNAME)-$(VERSION)
133   # Name of various distfiles
134   TARFILE = $(DISTNAME)-$(VERSION)$(TAREXT)
135   TARGZFILE = $(DISTNAME)-$(VERSION)$(TARGZEXT)
136 + TARGZFILESIG = $(TARGZFILE)$(SIGEXT)
137   ZIPFILE = $(DISTNAME)-$(VERSION)$(ZIPEXT)
138 + ZIPFILESIG = $(ZIPFILE)$(SIGEXT)
139 + BINTARFILE = $(DISTNAME)-bin-$(VERSION)$(TAREXT)
140 + BINTARGZFILE = $(DISTNAME)-bin-$(VERSION)$(TARGZEXT)
141 + BINTARGZFILESIG = $(BINTARGZFILE)$(SIGEXT)
142 + BINZIPFILE = $(DISTNAME)-bin-$(VERSION)$(ZIPEXT)
143 + BINZIPFILESIG = $(BINZIPFILE)$(SIGEXT)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines