Changeset 22140

Timestamp:

2010-05-20T20:22:36+12:00 (14 years ago)

Author:

ak19

Message:

Modified win32.mak file to add the xlppt compile target to extract and compile xlhtml and ppthtml. Added to clean target to clean the xlhtml folder (contains ppthtlm).

File:

• main/trunk/greenstone2/build-src/win32.mak (modified) (3 diffs)

main/trunk/greenstone2/build-src/win32.mak

@@ -33 +33 @@
 DLLDEBUG = 0
 
+# tar file is "$(XLHTML_DIR)-gs.tar.gz
+XLHTML_DIR = packages\xlhtml\xlhtml-0.5
+
 MDEFINES = /f win32.mak
 
@@ -55 +58 @@
 MAKECLEANCMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)" clean
 
-all: win32.mak $(INSTALLDIRS) $(JAVADIR)
+all: win32.mak xlppt $(INSTALLDIRS) $(JAVADIR)
 
-install: win32.mak $(INSTALLDIRS)
+install: win32.mak xlppt $(INSTALLDIRS)
+
+# Independent target for compiling xlhtml and ppthtml
+xlppt:
+    IF NOT EXIST $(XLHTML_DIR) IF EXIST "$(GSDLHOME)\bin\windows\gunzip.exe" IF EXIST "$(GSDLHOME)\bin\windows\tar.exe" "$(GSDLHOME)\bin\windows\gunzip.exe" -cd "$(XLHTML_DIR)-gs.tar.gz" | "$(GSDLHOME)\bin\windows\tar.exe" xv --directory=./packages/xlhtml
+    @IF NOT EXIST $(XLHTML_DIR) echo ****** Couldn't extract archive $(XLHTML_DIR).tar.gz. Extract it manually, or check that gunzip.exe and tar.exe exist in GSDLHOME\bin\windows. ******
+    @IF NOT EXIST $(XLHTML_DIR) exit /b 1
+    cd "$(XLHTML_DIR)"
+    $(MAKECMD)
+    $(MAKECMD) install
+    cd "$(BUILDHOME)"
 
 clean:
@@ -67 +80 @@
     $(MAKECLEANCMD)
     cd "$(BUILDHOME)"
+    cd "$(XLHTML_DIR)"
+    $(MAKECLEANCMD)
+    cd "$(BUILDHOME)
     cd src\java\org\nzdl\gsdl
     call winMake.bat clean