# | Line 14 | Line 14 | CVSROOT = /usr/local/proj/co600_10/cvs | |
---|---|---|
14 | CVSSERVERMODULE = source/server | |
15 | # ****** These need to be set correctly ****** | |
16 | ||
17 | + | # This will attempt to locate cvs, and return the path. |
18 | + | 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` |
19 | + | |
20 | # Location of the build directory | |
21 | < | BUILD = $(SERVERROOT)/build |
21 | > | BUILD = $(SOURCEROOT)/build |
22 | # Relative (to BUILD) location of the libraries | |
23 | LIBDIR = $(BUILD)/lib | |
24 | # Location of the main include | |
25 | < | MKINC = $(SERVERROOT)/Makefile.inc |
25 | > | MKINC = $(SOURCEROOT)/Makefile.inc |
26 | ||
27 | # Install Prefix | |
28 | prefix = /usr/local/iscream-server | |
29 | INSTALL = $(prefix) | |
30 | ||
31 | # cvsbuild temporary directory name | |
32 | < | CVSBUILDTEMP = $(SERVERROOT)/cvsbuildtemp |
32 | > | CVSBUILDTEMP = $(SOURCEROOT)/cvsbuildtemp |
33 | # cvsbuild default revision | |
34 | rev = HEAD | |
35 | REVISION = $(rev) | |
36 | ||
37 | ## Compiler Information | |
38 | < | JCLIBS = $(LIBDIR)/idl.jar:$(LIBDIR)/jacorb.jar:$(LIBDIR)/jaxp.jar:$(LIBDIR)/parser.jar |
39 | < | JCCLASSPATH = $(JCLIBS):$(SERVERROOT):$(BUILD):. |
38 | > | JCLIBS = $(LIBDIR)/idl.jar:$(LIBDIR)/jacorb.jar:$(LIBDIR)/jaxp.jar:$(LIBDIR)/crimson.jar:$(LIBDIR)/mm.mysql-2.0.4-bin.jar |
39 | > | ##### Added $(SOURCEROOT)/idl - this may not be a good thing, but it helps dependencies. |
40 | > | JCCLASSPATH = $(JCLIBS):$(SOURCEROOT):$(BUILD):$(SOURCEROOT)/idl:. |
41 | > | # set JCFLAGS to these if you want to optimise and turn off debugging |
42 | > | #JCFLAGS = -g:none -O |
43 | > | JCFLAGS = |
44 | ||
45 | ## Package information | |
46 | ||
47 | # Name of archives | |
48 | < | ARCNAME = iscream |
48 | > | ARCNAME = iscream-server |
49 | TAREXT = .tar | |
50 | TARGZEXT = .tar.gz | |
51 | ZIPEXT = .zip | |
# | Line 48 | Line 55 | TARGZFILE = $(ARCNAME)$(TARGZEXT) | |
55 | ZIPFILE = $(ARCNAME)$(ZIPEXT) | |
56 | ||
57 | # Name of JAR file (will be created in BUILD) | |
58 | < | PACKAGE = iscream.jar |
58 | > | PACKAGE = iscream-server.jar |
59 | > | UTILPACKAGE = iscream-util.jar |
60 | # Main-class to be added to the Manifest | |
61 | MAINCLASS = uk.ac.ukc.iscream.componentmanager.ComponentManager | |
62 | # Class-path to be added to the Manifest | |
63 | < | CLPATH = lib/idl.jar lib/jacorb.jar lib/jaxp.jar lib/parser.jar |
63 | > | CLPATH = lib/idl.jar lib/jacorb.jar lib/jaxp.jar lib/mm.mysql-2.0.4-bin.jar lib/crimson.jar |
64 | ||
65 | ||
66 | ## CHECK Files (for dependencies) | |
67 | < | IDLCHECK = $(SERVERROOT)/.doneidl |
68 | < | BUILDCHECK = $(SERVERROOT)/.donebuild |
67 | > | IDLCHECK = $(SOURCEROOT)/.doneidl |
68 | > | BUILDCHECK = $(SOURCEROOT)/.donebuild |
69 | COMPILECHECK = .donecompile | |
70 | + | COPYCHECK = .donecopy |
71 | ||
63 | – | |
72 | ## Javadoc package list | |
73 | PKGLIST = uk.ac.ukc.iscream.clientinterface uk.ac.ukc.iscream.componentmanager\ | |
74 | uk.ac.ukc.iscream.core uk.ac.ukc.iscream.core.loggers\ | |
75 | uk.ac.ukc.iscream.dbinterface uk.ac.ukc.iscream.filter\ | |
76 | uk.ac.ukc.iscream.filter.plugins uk.ac.ukc.iscream.filtermanager\ | |
77 | < | uk.ac.ukc.iscream.rootfilter uk.ac.ukc.iscream.util |
77 | > | uk.ac.ukc.iscream.rootfilter uk.ac.ukc.iscream.util\ |
78 | > | uk.ac.ukc.iscream.client uk.ac.ukc.iscream.client.monitors\ |
79 | > | uk.ac.ukc.iscream.client.alerters |
80 | ||
81 | DOCDIR = doc | |
82 | DOCTMPDIR = doctemp |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |