Changeset 16574 for gsdl/trunk/win32.mak

Timestamp:

2008-07-28T23:46:12+12:00 (16 years ago)

Author:

davidb

Message:

Adjustments to Windows makes file for new common-src, build-src and runtime-src file structure

File:

• gsdl/trunk/win32.mak (modified) (4 diffs)

gsdl/trunk/win32.mak

@@ -35 +35 @@
 MDEFINES = /f win32.mak
 
-INDEXERSDIR = indexers
+COMPILEDIRS = common-src build-src runtime-src 
 
-COMPILEDIRS = packages\windows\gdbm\gdbm packages\windows\crypt\crypt \
-        packages\windows\expat\expat src\lib src\colservr src\protocol
+INSTALLDIRS = common-src build-src runtime-src 
 
-INSTALLDIRS = src\hashfile src\gdbmedit\db2txt src\gdbmedit\txt2db src\phind\generate \
-        src\recpt src\oaiservr 
-
-PACKAGEDIRS = 
-
-SQLITE_DIR = packages\sqlite\sqlite-amalgamation-3.5.9
-YAZ_DIR = packages\yaz\yaz-2.1.4\win
 
 MAKECMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)"
+
 !IF $(GSDL_VC4)
 MAKECMD = $(MAKECMD) GSDL_VC4=1
@@ -54 +47 @@
 !IF $(LOCAL_LIBRARY)
 MAKECMD = $(MAKECMD) LOCAL_LIBRARY=1
-INSTALLDIRS = $(INSTALLDIRS) src\w32server
 !ENDIF
 !IF $(DLL)
@@ -64 +56 @@
 !IF $(USE_SQLITE)
 MAKECMD = $(MAKECMD) USE_SQLITE=1
-PACKAGEDIRS = $(PACKAGEDIRS) $(SQLITE_DIR)
 !ENDIF
 !IF $(USE_Z3950)
 MAKECMD = $(MAKECMD) USE_Z3950=1
-INSTALLDIRS = src\z3950 $(INSTALLDIRS) 
-PACKAGEDIRS = $(PACKAGEDIRS) packages\d2m $(YAZ_DIR)
 !ENDIF
 
 MAKECLEANCMD = $(MAKE) $(MDEFINES) clean
 
-all: win32.mak $(INDEXERSDIR) $(PACKAGEDIRS) $(COMPILEDIRS) $(INSTALLDIRS) 
+all: win32.mak $(COMPILEDIRS) $(INSTALLDIRS) 
 
-install: win32.mak $(INDEXERSDIR) $(INSTALLDIRS)
+install: win32.mak $(INSTALLDIRS)
 
 clean:
-    cd packages\windows\crypt\crypt
+    cd common-src
     $(MAKECLEANCMD)
     cd "$(GSDLHOME)"
-    cd packages\windows\gdbm\gdbm
+    cd build-src
     $(MAKECLEANCMD)
     cd "$(GSDLHOME)"
-    cd packages\windows\expat\expat
+    cd runtime-src
     $(MAKECLEANCMD)
-    cd "$(GSDLHOME)"
-    cd src\lib
-    $(MAKECLEANCMD)
-    cd "$(GSDLHOME)"
-    cd src\colservr
-    $(MAKECLEANCMD)
-    cd "$(GSDLHOME)"
-    cd src\protocol
-    $(MAKECLEANCMD)
-    cd "$(GSDLHOME)"
-    cd src\recpt
-    $(MAKECLEANCMD)
-    cd "$(GSDLHOME)"
-    cd src\oaiservr
-    $(MAKECLEANCMD)
-    cd "$(GSDLHOME)"
-    cd src\w32server
-    $(MAKECLEANCMD)
-    cd "$(GSDLHOME)"
-    cd src\phind\generate
-    $(MAKECLEANCMD)
-    cd "$(GSDLHOME)"
-    cd src\hashfile
-    $(MAKECLEANCMD)
-    cd "$(GSDLHOME)"
-    cd src\gdbmedit\txt2db
-    $(MAKECLEANCMD)
-    cd "$(GSDLHOME)"
-    cd src\gdbmedit\db2txt
-    $(MAKECLEANCMD)
-    cd "$(GSDLHOME)"
-    cd indexers
-    call winMake.bat clean
     cd "$(GSDLHOME)"
 
@@ -133 +89 @@
     cd "$(GSDLHOME)"
 
-$(SQLITE_DIR): FORCE
-    cd "$@"
-    $(MAKECMD)
-    $(MAKECMD) install
-    cd "$(GSDLHOME)"
-
-$(YAZ_DIR): FORCE
-    cd "$@"
-    nmake HAVE_ICONV=0 HAVE_LIBXML2=0
-    cd "$(GSDLHOME)"
-
-$(INDEXERSDIR): FORCE
-    cd "$@"
-    call winMake.bat all gs2
-    call winMake.bat install gs2
-    if NOT EXIST "$(GSDLHOME)\bin\windows" mkdir "$(GSDLHOME)\bin\windows"
-    if NOT EXIST "$(GSDLHOME)\bin\java" mkdir "$(GSDLHOME)\bin\java"
-    for %%i in (bin\*.exe) do \
-      copy %%i "$(GSDLHOME)\bin\windows"
-    copy lucene-gs\LuceneWrapper.jar "$(GSDLHOME)\bin\java"
-    cd "$(GSDLHOME)"
-
 FORCE: