Changeset 20873

Timestamp:

2009-11-02T12:55:47+13:00 (14 years ago)

Author:

kjdon

Message:

updated makefiles to include the src/java/org/nzdl/gsdl folder

Location:

gsdl/trunk/build-src

Files:

• Makefile.in (modified) (2 diffs)
• win32.mak (modified) (4 diffs)

gsdl/trunk/build-src/Makefile.in

@@ -48 +48 @@
 
 # all directories should be compiled
-COMPILEDIRS = packages src/hashfile src/phind/generate 
+COMPILEDIRS = packages src/hashfile src/phind/generate src/java/org/nzdl/gsdl
 # a subset of the directories get installed
-INSTALLDIRS = packages src/hashfile src/phind/generate
+INSTALLDIRS = packages src/hashfile src/phind/generate 
 
 MODULEDIRS = @MODULEDIRS@
@@ -66 +66 @@
       (cd $$idir && $(MAKE) install) || exit 1; \
     done
+    cp src/java/org/nzdl/gsdl/ApplyXSLT.jar ../bin/java/
 
 distclean: clean

gsdl/trunk/build-src/win32.mak

@@ -35 +35 @@
 MDEFINES = /f win32.mak
 
-INSTALLDIRS = src\hashfile src\phind\generate
-
+INSTALLDIRS = src\hashfile src\phind\generate 
+JAVADIR = src\java\org\nzdl\gsdl
 
 MAKECMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)"
@@ -55 +55 @@
 MAKECLEANCMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)" clean
 
-all: win32.mak $(INSTALLDIRS) 
+all: win32.mak $(INSTALLDIRS) $(JAVADIR)
 
 install: win32.mak $(INSTALLDIRS)
@@ -66 +66 @@
     cd src\hashfile
     $(MAKECLEANCMD)
+    cd "$(BUILDHOME)"
+    cd src\java\org\nzdl\gsdl
+    call winMake.bat clean
     cd "$(GSDLHOME)"
 
@@ -75 +78 @@
     cd "$(GSDLHOME)"
 
+$(JAVADIR): FORCE
+    cd "$(BUILDHOME)"
+    cd "$@"
+    call winMake.bat all 
+    if NOT EXIST "$(GSDLHOME)\bin\java" mkdir "$(GSDLHOME)\bin\java"
+    if EXIST "$(JAVADIR)\ApplyXSLT.jar" copy "$(JAVADIR)\ApplyXSLT.jar" "$(GSDLHOME)\bin\java"
+    @if NOT EXIST "$(JAVADIR)\ApplyXSLT.jar" echo Warning: Failed to find $(JAVADIR)\ApplyXSLT.jar.  Greenstone will not be able to use XSLT files during building
+    
+             
+
 FORCE: