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.42 by tdb, Mon May 5 22:04:55 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 63 | Line 68 | PKGLIST = uk.org.iscream.cms.server.clientinterface\
68          uk.org.iscream.cms.server.componentmanager\
69          uk.org.iscream.cms.server.core\
70          uk.org.iscream.cms.server.core.loggers\
66        uk.org.iscream.cms.server.dbinterface\
71          uk.org.iscream.cms.server.filter\
72          uk.org.iscream.cms.server.filter.plugins\
73          uk.org.iscream.cms.server.filtermanager\
74          uk.org.iscream.cms.server.rootfilter\
71        uk.org.iscream.cms.server.util\
75          uk.org.iscream.cms.server.client\
76          uk.org.iscream.cms.server.client.monitors\
77          uk.org.iscream.cms.server.client.alerters
# Line 76 | Line 79 | PKGLIST = uk.org.iscream.cms.server.clientinterface\
79   # Javadoc formatting
80   JDTITLE = "i-scream CMS server"
81   JDHEADER = "<img src='http://www.i-scream.org.uk/i-scream_small.gif' width='146' height='38'>"
82 < JDBOTTOM = "<i>Copyright &\#169; 2000-2002 i-scream. All Rights Reserved.</i>"
82 > JDBOTTOM = "<i>Copyright &\#169; 2000-2003 i-scream. All Rights Reserved.</i>"
83  
84   # Javadoc Directories
85   DOCDIR = $(BUILD)/doc
# Line 84 | Line 87 | DOCTMPDIR = $(BUILD)/.doctemp
87   APICACHE = $(SOURCEROOT)/.api-cache
88  
89   # Javadoc API linking
90 < JDJAPI = "http://java.sun.com/j2se/1.3/docs/api/"
90 > JDJAPI = "http://java.sun.com/j2se/1.4.1/docs/api/"
91   JDPBAPI = "http://www.jibble.org/javadocs/pircbot/"
92 + JDUAPI = "http://www.i-scream.org.uk/javadoc/util/"
93  
94   # Javadoc API cache
95   JDJAPIC = $(APICACHE)/jdk
96   JDPBAPIC = $(APICACHE)/pircbot
97 + JDUAPIC = $(APICACHE)/util
98  
99   # ChangeLog file
100   CHANGELOG = $(BUILD)/ChangeLog
# Line 98 | Line 103 | CHANGELOG = $(BUILD)/ChangeLog
103   SRCDIR = $(BUILD)/src
104   # Files to be included in the source code dist
105   SRCFILES = Config2.inc Makefile Makefile.inc README build.config \
106 <           build.xml configure db uk idl COPYING \
106 >           build.xml configure db uk idl COPYING Version.inc \
107             $(BUILDDIRNAME)/README $(BUILDDIRNAME)/etc \
108             $(BUILDDIRNAME)/lib $(BUILDDIRNAME)/run.bat \
109 <           $(BUILDDIRNAME)/run.sh $(BUILDDIRNAME)/Makefile
110 < # **FIXME** putting libs in build/lib, but probably shouldn't...
109 >           $(BUILDDIRNAME)/run.sh $(BUILDDIRNAME)/Makefile \
110 >           $(BUILDDIRNAME)/$(JACPROP)
111  
112 + # License file
113 + LICFILE = COPYING
114 +
115 + # Jacorb properties file
116 + JACPROP = jacorb.properties
117 +
118   # User configurable options - defaults
119   dest = $(BUILD)
120 < prefix = /usr/local/$(DISTNAME)
120 > prefix = /opt/$(DISTNAME)-$(VERSION)
121  
122   # Install Prefix
123 < INSTALL = $(prefix)
123 > INSTALLPREFIX = $(prefix)
124   DISTDEST = $(dest)
125  
126   # Archive extensions
127   TAREXT = .tar
128   TARGZEXT = .tar.gz
129   ZIPEXT = .zip
130 + SIGEXT = .asc
131  
132   # Subdirectory the dist should be in
133   DISTDIR = $(DISTNAME)-$(VERSION)
# Line 123 | Line 135 | DISTDIR = $(DISTNAME)-$(VERSION)
135   # Name of various distfiles
136   TARFILE = $(DISTNAME)-$(VERSION)$(TAREXT)
137   TARGZFILE = $(DISTNAME)-$(VERSION)$(TARGZEXT)
138 + TARGZFILESIG = $(TARGZFILE)$(SIGEXT)
139   ZIPFILE = $(DISTNAME)-$(VERSION)$(ZIPEXT)
140 + ZIPFILESIG = $(ZIPFILE)$(SIGEXT)
141 + BINTARFILE = $(DISTNAME)-bin-$(VERSION)$(TAREXT)
142 + BINTARGZFILE = $(DISTNAME)-bin-$(VERSION)$(TARGZEXT)
143 + BINTARGZFILESIG = $(BINTARGZFILE)$(SIGEXT)
144 + BINZIPFILE = $(DISTNAME)-bin-$(VERSION)$(ZIPEXT)
145 + BINZIPFILESIG = $(BINZIPFILE)$(SIGEXT)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines