Changeset 22140

Show
Ignore:
Timestamp:
20.05.2010 20:22:36 (9 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).

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/build-src/win32.mak

    r20878 r22140  
    3333DLLDEBUG = 0 
    3434 
     35# tar file is "$(XLHTML_DIR)-gs.tar.gz 
     36XLHTML_DIR = packages\xlhtml\xlhtml-0.5 
     37 
    3538MDEFINES = /f win32.mak 
    3639 
     
    5558MAKECLEANCMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)" clean 
    5659 
    57 all: win32.mak $(INSTALLDIRS) $(JAVADIR) 
     60all: win32.mak xlppt $(INSTALLDIRS) $(JAVADIR) 
    5861 
    59 install: win32.mak $(INSTALLDIRS) 
     62install: win32.mak xlppt $(INSTALLDIRS) 
     63 
     64# Independent target for compiling xlhtml and ppthtml 
     65xlppt: 
     66    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 
     67    @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. ****** 
     68    @IF NOT EXIST $(XLHTML_DIR) exit /b 1 
     69    cd "$(XLHTML_DIR)" 
     70    $(MAKECMD) 
     71    $(MAKECMD) install 
     72    cd "$(BUILDHOME)" 
    6073 
    6174clean: 
     
    6780    $(MAKECLEANCMD) 
    6881    cd "$(BUILDHOME)" 
     82    cd "$(XLHTML_DIR)" 
     83    $(MAKECLEANCMD) 
     84    cd "$(BUILDHOME) 
    6985    cd src\java\org\nzdl\gsdl 
    7086    call winMake.bat clean