Changeset 3379

Timestamp:

2002-08-21T13:29:27+12:00 (22 years ago)

Author:

kjdon

Message:

changed serlvet install method

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/Makefile (modified) (3 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/Makefile

@@ -15 +15 @@
 
 #the base dir where to put servlet classes
-JAVASERVLETCLASSDIR=$(GSDL3HOME)/web/WEB-INF/classes
+JAVASERVLETCLASSDIR=$(GSDL3HOME)/web/WEB-INF/classes/org/greenstone/gsdl3
 
 #name/location of java compiler
@@ -24 +24 @@
 JAVACOPTIONS= -deprecation -g -O
 
-#extra java libraries
-#CLASSPATH=$(JAVACLASSDIR):$(JAVALIBDIR)/xercesImpl.jar:$(JAVALIBDIR)/xmlParserAPIs.jar:$(JAVALIBDIR)/xindice.jar:$(JAVALIBDIR)/soap.jar:$(CLASSPATH)
-
-SOAPCLASSPATH=$(CLASSPATH):$(JAVALIBDIR)/mail.jar:$(JAVALIBDIR)/activation.jar
-
-#specify main classes + any dynamically loaded ones - ie Services
-# this doesn't recompile properly
-#CLASSES = Library1.class Library2.class SOAPServer.class service/MGPPService.class service/MGGDBMService.class service/PhindService.class
-
-#this way is too slow
-CLASSES=Library1.class Library2.class SOAPServer.class service/MGPPService.class service/MGGDBMService.class service/PhindService.class service/ServiceModule.class comms/Communicator.class comms/SOAPCommunicator.class collection/Collection.class util/GSPath.class util/GSFile.class util/XMLTransformer.class util/XMLConverter.class core/ModuleInterface.class core/MessageRouter.class
-PACKAGES=org.greenstone.gsdl3.core org.greenstone.gsdl3.service  org.greenstone.gsdl3.util org.greenstone.gsdl3.collection org.greenstone.gsdl3.comms
-
-#make a .class from a .java
-%.class: %.java
-    $(JAVAC) -d $(JAVACLASSDIR) -sourcepath $(JAVASRCDIR) -classpath $(CLASSPATH) $(JAVACOPTIONS) $<
-
-
-# this is almost always faster, but can give confusing output- says stuart
-#
-#   $(JAVAC) $(JAVACOPTIONS) -classpath $(CLASSPATH) *.java
-
-#too slow to compile one by one
-#all: $(CLASSES) 
 all: compile 
 
 setup:
     mkdir -p $(JAVACLASSDIR)
+    mkdir -p $(JAVASERVLETCLASSDIR)
     mkdir -p docs
 
 compile: setup
     #$(JAVAC) -d $(JAVACLASSDIR) -sourcepath $(JAVASRCDIR) -classpath $(CLASSPATH) $(JAVACOPTIONS) *.java */*.java
-    $(JAVAC) -d $(JAVACLASSDIR) -sourcepath $(JAVASRCDIR)  $(JAVACOPTIONS) Library1.java Library2.java SOAPServer.java */*.java
+    $(JAVAC) -d $(JAVACLASSDIR) -sourcepath $(JAVASRCDIR)  $(JAVACOPTIONS) *.java */*.java
     jar cf gsdl3.jar -C $(JAVACLASSDIR) org
-    $(JAVAC) -d $(JAVASERVLETCLASSDIR) -sourcepath $(JAVASRCDIR)  $(JAVACOPTIONS) LibraryServlet.java
+
 
 javadocs: compile
@@ -81 +58 @@
 install:
     cp gsdl3.jar $(JAVALIBDIR)/
-
+    cp $(JAVACLASSDIR)/org/greenstone/gsdl3/LibraryServlet.class $(JAVASERVLETCLASSDIR)/