--- projects/cms/source/server/Makefile	2000/12/14 19:54:29	1.10
+++ projects/cms/source/server/Makefile	2002/02/09 17:04:33	1.24
@@ -1,20 +1,20 @@
 # Makefile for server
-# $Id: Makefile,v 1.10 2000/12/14 19:54:29 tdb Exp $
+# $Id: Makefile,v 1.24 2002/02/09 17:04:33 tdb Exp $
 
 include Config.inc
 
 all : build
 
-idl :
+genidl :
 	cd idl && $(MAKE) idl
 
-buildidl : idl
+buildidl : genidl
 	cd idl && $(MAKE) build
 
-code : buildidl
-	cd uk/ac/ukc/iscream && $(MAKE) all
+code : genidl
+	cd uk/org/iscream/cms/server && $(MAKE) all
 
-build : code
+build : buildidl code
 	cd build && $(MAKE) package
 
 run : build
@@ -23,9 +23,10 @@ run : build
 clean :
 	cd idl && $(MAKE) clean
 	cd build && $(MAKE) clean
-	cd uk/ac/ukc/iscream && $(MAKE) clean
+	cd uk/org/iscream/cms/server && $(MAKE) clean
 	rm -Rf $(BUILDCHECK) $(IDLCHECK)
 	rm -Rf $(CVSBUILDTEMP)
+	rm -Rf $(DOCDIR) $(DOCTMPDIR)
 
 distclean : clean
 	cd $(BUILD) && rm -f $(CLPATH)
@@ -44,14 +45,37 @@ install : build
 	mkdir -p $(INSTALL)/etc
 	cp $(BUILD)/etc/default.properties $(INSTALL)/etc
 	cp $(BUILD)/etc/*.conf $(INSTALL)/etc
+	@echo "  copying scripts to $(INSTALL)"
+	cp $(BUILD)/run.sh $(INSTALL)
+	cp $(BUILD)/run.bat $(INSTALL)
 	@echo "Completed install to $(INSTALL)"
 	@echo "-------------------------------------------------------"
 
 cvsbuild :
-	cvs -d $(CVSROOT) export -r $(REVISION) -d $(CVSBUILDTEMP) $(CVSSERVERMODULE)
+	$(CVS) -d $(CVSROOT) export -r $(REVISION) -d $(CVSBUILDTEMP) $(CVSSERVERMODULE)
 	cd $(CVSBUILDTEMP) && ./configure
+	cd $(CVSBUILDTEMP) && $(MAKE) buildutil
 	cd $(CVSBUILDTEMP) && $(MAKE) build
 	cp $(CVSBUILDTEMP)/build/$(TARGZFILE) $(BUILD)/$(ARCNAME)-$(REVISION)$(TARGZEXT)
 	cp $(CVSBUILDTEMP)/build/$(ZIPFILE) $(BUILD)/$(ARCNAME)-$(REVISION)$(ZIPEXT)
+	cp $(CVSBUILDTEMP)/build/$(UTILPACKAGE) $(BUILD)
+
+javadoc : genidl
+	if test ! -d "$(DOCDIR)"; then mkdir $(DOCDIR); fi
+	if test ! -d "$(DOCTMPDIR)"; then mkdir $(DOCTMPDIR); fi
+	cp -R $(SOURCEROOT)/uk $(SOURCEROOT)/$(DOCTMPDIR)
+	cp -R $(SOURCEROOT)/idl/uk $(SOURCEROOT)/$(DOCTMPDIR)
+	javadoc -d $(SOURCEROOT)/$(DOCDIR) -sourcepath $(SOURCEROOT)/$(DOCTMPDIR) -classpath $(JCCLASSPATH) -windowtitle $(JDTITLE) -author -version -private -use -header $(JDHEADER) -bottom $(JDBOTTOM) -link $(JDJAPI) -link $(JDPBAPI) $(PKGLIST)
+	rm -Rf doctemp
+
+buildutil : clean
+	cd uk/org/iscream/cms/server/util && $(MAKE) all
+	cd build && $(MAKE) packageutil
+
+createtable :
+	cd db && $(MAKE) create
+
+droptable :
+	cd db && $(MAKE) drop
 
 include $(MKINC)