ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/cms/source/corbaservices/Config2.inc
Revision: 1.16
Committed: Fri Feb 21 13:45:47 2003 UTC (21 years, 3 months ago) by tdb
Branch: MAIN
Changes since 1.15: +5 -2 lines
Log Message:
Main change is making the use of jacorb.properties transparent to the end
user - something which should have been done with CorbaServices a long time
ago :-) Now a base jacorb.properties is included in the jar files, because
it's searched by the jacorb loading stuff. The only value outside of the
jar file is the naming service location, which can now be found in the
default.properties files.

The server and corbaservices assume that the naming services is running on
localhost on port 8052, which is ok for most normal things. If it's on a
different host the default.properties just needs fixing.

Also added a default.properties style thing to the corbaservices, and fixed
some bugs in the command line argument parsing.

Finally, fixed a bug with the make src target of all the Makefiles.

File Contents

# User Rev Content
1 tdb 1.1 # Include Config for corbaservices
2 tdb 1.16 # $Id: Config2.inc,v 1.15 2003/02/16 20:35:56 tdb Exp $
3 tdb 1.1
4 tdb 1.12 include $(SOURCEROOT)/Version.inc
5 tdb 1.1
6 tdb 1.12 # Name of our dist
7     DISTNAME = iscream_corbaservices
8 tdb 1.1
9 tdb 1.12 # Location of the i-scream CVS Repository Root
10 tdb 1.11 CVSROOT = :pserver:anonymous@cvs.i-scream.org.uk:/cvs/i-scream
11 tdb 1.3
12     # This will attempt to locate cvs, and return the path.
13     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`
14 tdb 1.1
15 tdb 1.12 # 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 --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
28    
29 tdb 1.1 # Location of the build directory
30 tdb 1.12 BUILDDIRNAME = build
31     BUILD = $(SOURCEROOT)/$(BUILDDIRNAME)
32 tdb 1.1 # Relative (to BUILD) location of the libraries
33     LIBDIR = $(BUILD)/lib
34     # Location of the main include
35     MKINC = $(SOURCEROOT)/Makefile.inc
36    
37 tdb 1.12 # Compiler Information
38 tdb 1.1 JCLIBS = $(LIBDIR)/jacorb.jar
39 tdb 1.12 JCCLASSPATH = $(JCLIBS):$(SOURCEROOT):$(BUILD):.
40 tdb 1.7 # set JCFLAGS to these if you want to optimise and turn off debugging
41     #JCFLAGS = -g:none -O
42     JCFLAGS =
43 tdb 1.1
44     # Name of JAR file (will be created in BUILD)
45 tdb 1.12 PACKAGE = $(DISTNAME).jar
46 tdb 1.1 # Main-class to be added to the Manifest
47 tdb 1.6 MAINCLASS = uk.org.iscream.cms.corbaservices.CorbaServices
48 tdb 1.1 # Class-path to be added to the Manifest
49     CLPATH = lib/jacorb.jar
50    
51 tdb 1.12 # CHECK Files (for dependencies)
52     MCOMPILECHECK = $(SOURCEROOT)/$(COMPILECHECK)
53     SRCCHECK = $(SOURCEROOT)/.donesrc
54     JAVADOCCHECK = $(SOURCEROOT)/.donejavadoc
55     MKDISTCHECK = $(BUILD)/.donemkdist
56     MKDISTBINCHECK = $(BUILD)/.donemkdistbin
57     MKDISTFILESCHECK = $(BUILD)/.donemkdistfiles
58     MKDISTFILESBINCHECK = $(BUILD)/.donemkdistfilesbin
59 tdb 1.1 COMPILECHECK = .donecompile
60     COPYCHECK = .donecopy
61    
62 tdb 1.12 # Javadoc package list
63 tdb 1.6 PKGLIST = uk.org.iscream.cms.corbaservices
64 tdb 1.5
65 tdb 1.12 # Javadoc formatting
66     JDTITLE = "i-scream CMS CORBA services"
67 tdb 1.5 JDHEADER = "<img src='http://www.i-scream.org.uk/i-scream_small.gif' width='146' height='38'>"
68 tdb 1.14 JDBOTTOM = "<i>Copyright &\#169; 2000-2003 i-scream. All Rights Reserved.</i>"
69 tdb 1.10
70 tdb 1.12 # Javadoc Directories
71     DOCDIR = $(BUILD)/doc
72     APICACHE = $(SOURCEROOT)/.api-cache
73    
74     # Javadoc API linking
75 tdb 1.14 JDJAPI = "http://java.sun.com/j2se/1.4.1/docs/api/"
76 tdb 1.1
77 tdb 1.12 # Javadoc API cache
78     JDJAPIC = $(APICACHE)/jdk
79    
80     # ChangeLog file
81     CHANGELOG = $(BUILD)/ChangeLog
82    
83     # Directory to put the source code in
84     SRCDIR = $(BUILD)/src
85     # Files to be included in the source code dist
86     SRCFILES = Config2.inc Makefile Makefile.inc build.config \
87     build.xml configure uk COPYING Version.inc \
88     $(BUILDDIRNAME)/etc $(BUILDDIRNAME)/web \
89     $(BUILDDIRNAME)/lib $(BUILDDIRNAME)/run.bat \
90 tdb 1.13 $(BUILDDIRNAME)/run.sh $(BUILDDIRNAME)/Makefile \
91 tdb 1.16 $(BUILDDIRNAME)/$(JACPROP)
92 tdb 1.15
93     # License file
94     LICFILE = COPYING
95 tdb 1.16
96     # Jacorb properties file
97     JACPROP = jacorb.properties
98 tdb 1.12
99     # User configurable options - defaults
100     dest = $(BUILD)
101 tdb 1.13 prefix = /opt/$(DISTNAME)-$(VERSION)
102 tdb 1.12
103     # Install Prefix
104 tdb 1.13 INSTALLPREFIX = $(prefix)
105 tdb 1.12 DISTDEST = $(dest)
106    
107     # Archive extensions
108     TAREXT = .tar
109     TARGZEXT = .tar.gz
110     ZIPEXT = .zip
111     SIGEXT = .asc
112    
113     # Subdirectory the dist should be in
114     DISTDIR = $(DISTNAME)-$(VERSION)
115    
116     # Name of various distfiles
117     TARFILE = $(DISTNAME)-$(VERSION)$(TAREXT)
118     TARGZFILE = $(DISTNAME)-$(VERSION)$(TARGZEXT)
119     TARGZFILESIG = $(TARGZFILE)$(SIGEXT)
120     ZIPFILE = $(DISTNAME)-$(VERSION)$(ZIPEXT)
121     ZIPFILESIG = $(ZIPFILE)$(SIGEXT)
122     BINTARFILE = $(DISTNAME)-bin-$(VERSION)$(TAREXT)
123     BINTARGZFILE = $(DISTNAME)-bin-$(VERSION)$(TARGZEXT)
124     BINTARGZFILESIG = $(BINTARGZFILE)$(SIGEXT)
125     BINZIPFILE = $(DISTNAME)-bin-$(VERSION)$(ZIPEXT)
126     BINZIPFILESIG = $(BINZIPFILE)$(SIGEXT)