# | Line 17 | Line 17 | CVS2CL = `if test -x /usr/bin/cvs2cl; then echo /usr/b | |
---|---|---|
17 | # and flags for cvs2cl | |
18 | CVS2CLFLAGS = --stdout -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 45 | Line 50 | UTILPACKAGE = iscream_util.jar | |
50 | # Main-class to be added to the Manifest | |
51 | MAINCLASS = uk.org.iscream.cms.server.componentmanager.ComponentManager | |
52 | # Class-path to be added to the Manifest | |
53 | < | CLPATH = lib/idl.jar lib/jacorb.jar lib/jaxp.jar lib/mm.mysql-2.0.11-bin.jar lib/crimson.jar lib/pircbot.jar |
53 | > | 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 |
54 | ||
55 | # CHECK Files (for dependencies) | |
56 | IDLCHECK = $(SOURCEROOT)/idl/.doneidl | |
# | Line 55 | Line 60 | JAVADOCCHECK = $(SOURCEROOT)/.donejavadoc | |
60 | MKDISTCHECK = $(BUILD)/.donemkdist | |
61 | MKDISTBINCHECK = $(BUILD)/.donemkdistbin | |
62 | MKDISTFILESCHECK = $(BUILD)/.donemkdistfiles | |
63 | + | MKDISTFILESBINCHECK = $(BUILD)/.donemkdistfilesbin |
64 | COMPILECHECK = .donecompile | |
65 | COPYCHECK = .donecopy | |
66 | ||
# | 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 | |
105 | – | # **FIXME** putting libs in build/lib, but probably shouldn't... |
111 | ||
112 | # User configurable options - defaults | |
113 | dest = $(BUILD) | |
114 | < | prefix = /usr/local/$(DISTNAME) |
114 | > | prefix = /opt/$(DISTNAME)-$(VERSION) |
115 | ||
116 | # Install Prefix | |
117 | < | INSTALL = $(prefix) |
117 | > | INSTALLPREFIX = $(prefix) |
118 | DISTDEST = $(dest) | |
119 | ||
120 | # Archive extensions | |
121 | TAREXT = .tar | |
122 | TARGZEXT = .tar.gz | |
123 | ZIPEXT = .zip | |
124 | + | SIGEXT = .asc |
125 | ||
126 | # Subdirectory the dist should be in | |
127 | DISTDIR = $(DISTNAME)-$(VERSION) | |
# | Line 123 | Line 129 | DISTDIR = $(DISTNAME)-$(VERSION) | |
129 | # Name of various distfiles | |
130 | TARFILE = $(DISTNAME)-$(VERSION)$(TAREXT) | |
131 | TARGZFILE = $(DISTNAME)-$(VERSION)$(TARGZEXT) | |
132 | + | TARGZFILESIG = $(TARGZFILE)$(SIGEXT) |
133 | ZIPFILE = $(DISTNAME)-$(VERSION)$(ZIPEXT) | |
134 | + | ZIPFILESIG = $(ZIPFILE)$(SIGEXT) |
135 | + | BINTARFILE = $(DISTNAME)-bin-$(VERSION)$(TAREXT) |
136 | + | BINTARGZFILE = $(DISTNAME)-bin-$(VERSION)$(TARGZEXT) |
137 | + | BINTARGZFILESIG = $(BINTARGZFILE)$(SIGEXT) |
138 | + | BINZIPFILE = $(DISTNAME)-bin-$(VERSION)$(ZIPEXT) |
139 | + | BINZIPFILESIG = $(BINZIPFILE)$(SIGEXT) |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |