Changeset 16577
- Timestamp:
- 2008-07-29T12:05:44+12:00 (16 years ago)
- Location:
- gsdl/trunk
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
gsdl/trunk/build-src/win32.mak
r16575 r16577 34 34 MDEFINES = /f win32.mak 35 35 36 37 COMPILEDIRS = src\hashfile src\phind\generate38 39 36 INSTALLDIRS = src\hashfile src\phind\generate 40 41 42 PACKAGEDIRS =43 37 44 38 … … 57 51 MAKECLEANCMD = $(MAKE) $(MDEFINES) clean 58 52 59 all: win32.mak $( PACKAGEDIRS) $(COMPILEDIRS) $(INSTALLDIRS)53 all: win32.mak $(INSTALLDIRS) 60 54 61 55 install: win32.mak $(INSTALLDIRS) 62 56 63 57 clean: 58 cd "$(BUILDHOME)" 64 59 cd src\phind\generate 65 60 $(MAKECLEANCMD) 66 cd "$( GSDLHOME)"61 cd "$(BUILDHOME)" 67 62 cd src\hashfile 68 63 $(MAKECLEANCMD) 69 64 cd "$(GSDLHOME)" 70 65 71 $(COMPILEDIRS): FORCE72 cd "$@"73 $(MAKECMD)74 cd "$(GSDLHOME)"75 76 66 $(INSTALLDIRS): FORCE 67 cd "$(BUILDHOME)" 77 68 cd "$@" 78 69 $(MAKECMD) -
gsdl/trunk/common-src/src/lib/gsdlconf.h
r15913 r16577 37 37 38 38 #if defined(__WIN32__) && !defined(__CYGWIN__) 39 #include "../../ win32cfg.h"39 #include "../../../win32cfg.h" 40 40 #else 41 #include "../../ config.h"41 #include "../../../config.h" 42 42 #endif 43 43 -
gsdl/trunk/common-src/src/lib/win32.mak
r15910 r16577 25 25 ########################################################################### 26 26 27 GSDL_DIR = ..\.. 28 INDEXERS_DIR = $(GSDL_DIR)\ indexers29 PACKAGES_DIR = $(GSDL_DIR)\ packages27 GSDL_DIR = ..\..\.. 28 INDEXERS_DIR = $(GSDL_DIR)\common-src\indexers 29 PACKAGES_DIR = $(GSDL_DIR)\common-src\packages 30 30 31 31 -
gsdl/trunk/common-src/win32.mak
r16576 r16577 68 68 69 69 clean: 70 cd "$(COMMONHOME)" 70 71 cd packages\windows\crypt\crypt 71 72 $(MAKECLEANCMD) … … 91 92 92 93 $(COMPILEDIRS): FORCE 94 cd "$(COMMONHOME)" 93 95 cd "$@" 94 96 $(MAKECMD) … … 96 98 97 99 $(INSTALLDIRS): FORCE 100 cd "$(COMMONHOME)" 98 101 cd "$@" 99 102 $(MAKECMD) … … 102 105 103 106 $(SQLITE_DIR): FORCE 107 cd "$(COMMONHOME)" 104 108 cd "$@" 105 109 $(MAKECMD) … … 108 112 109 113 $(INDEXERSDIR): FORCE 114 cd "$(COMMONHOME)" 110 115 cd "$@" 111 116 call winMake.bat all gs2 … … 115 120 for %%i in (bin\*.exe) do \ 116 121 copy %%i "$(GSDLHOME)\bin\windows" 117 copy lucene-gs\LuceneWrapper.jar "$(GSDLHOME)\bin\java" 122 if EXIST "lucene-gs\LuceneWrapper.jar" copy "lucene-gs\LuceneWrapper.jar" "$(GSDLHOME)\bin\java" 123 if NOT EXIST "lucene-gs\LuceneWrapper.jar" echo Warning: Failed to find lucene-gs\LuceneWrapper.jar. Greenstone will not be able to use Lucene for indexing 118 124 cd "$(GSDLHOME)" 119 125 -
gsdl/trunk/runtime-src/src/colservr/win32.mak
r16574 r16577 54 54 !IF $(USE_SQLITE) 55 55 SQLITE_DEFINES = -DUSE_SQLITE 56 SQLITE_INCLUDES = -I"$( PACKAGES_DIR)\sqlite\include"56 SQLITE_INCLUDES = -I"$(COMMON_DIR)\packages\sqlite\include" 57 57 !ELSE 58 58 SQLITE_DEFINES = … … 69 69 -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mg\src\text" \ 70 70 -I"$(INDEXERS_DIR)\mgpp\lib" -I"$(INDEXERS_DIR)\mgpp\text" \ 71 -I"$( PACKAGES_DIR)\windows\expat\expat" -I"$(PACKAGES_DIR)\windows\gdbm\gdbm" $(SQLITE_INCLUDES)71 -I"$(COMMON_DIR)\packages\windows\expat\expat" -I"$(COMMON_DIR)\packages\windows\gdbm\gdbm" $(SQLITE_INCLUDES) 72 72 73 73 !IF $(GSDL_VC4) 74 74 DEFS=$(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS 75 INCLUDES = $(INCLUDES) -I"$( PACKAGES_DIR)\windows\stlport\stlport"75 INCLUDES = $(INCLUDES) -I"$(COMMON_DIR)\packages\windows\stlport\stlport" 76 76 !ENDIF 77 77 -
gsdl/trunk/runtime-src/src/oaiservr/win32.mak
r16574 r16577 30 30 31 31 INDEXERS_DIR = $(COMMON_DIR)\indexers 32 COMMON_PACKAGES = $(COMMON_DIR)\packages 33 32 34 PACKAGES_DIR = $(RUNTIME_DIR)\packages 33 35 COLSERVR_DIR = $(RUNTIME_DIR)\src\colservr … … 65 67 66 68 !IF $(USE_SQLITE) 67 SQLITE_LIBS = "$( PACKAGES_DIR)\sqlite\lib\sqlite3.lib"69 SQLITE_LIBS = "$(COMMON_PACKAGES)\sqlite\lib\sqlite3.lib" 68 70 !ELSE 69 71 SQLITE_LIBS = … … 76 78 -DGSDL_NOCACHE 77 79 INCLUDES = -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \ 78 -I"$(INDEXERS_DIR)\mgpp\text" -I"$( PACKAGES_DIR)\windows\crypt\crypt" \79 -I"$( PACKAGES_DIR)\windows\expat\expat" -I"$(PACKAGES_DIR)\windows\gdbm\gdbm"80 -I"$(INDEXERS_DIR)\mgpp\text" -I"$(COMMON_PACKAGES)\windows\crypt\crypt" \ 81 -I"$(COMMON_PACKAGES)\windows\expat\expat" -I"$(COMMON_PACKAGES)\windows\gdbm\gdbm" 80 82 LDFLAGS = 81 LIBS = "$( PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \82 "$( PACKAGES_DIR)\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) $(SQLITE_LIBS)83 LIBS = "$(COMMON_PACKAGES)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES)\windows\expat\expat\libexpat.lib" \ 84 "$(COMMON_PACKAGES)\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) 83 85 84 86 !IF $(GSDL_VC4) 85 87 DEFS = $(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS 86 INCLUDES = $(INCLUDES) -I"$( PACKAGES_DIR)\windows\stlport\stlport"88 INCLUDES = $(INCLUDES) -I"$(COMMON_PACKAGES)\windows\stlport\stlport" 87 89 !ENDIF 88 90 !IF $(LOCAL_LIBRARY) -
gsdl/trunk/runtime-src/src/protocol/win32.mak
r16574 r16577 30 30 31 31 INDEXERS_DIR = $(COMMON_DIR)\indexers 32 PACKAGES_DIR = $(RUNTIME_DIR)\packages 32 COMMON_PACKAGES = $(COMMON_DIR)\packages 33 33 34 COLSERVR_DIR = $(RUNTIME_DIR)\src\colservr 34 35 … … 59 60 # Do NOT add the "recpt" directory here: the protocol should be independent of the receptionist! 60 61 INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(INDEXERS_DIR)\mgpp\text" \ 61 -I"$( PACKAGES_DIR)\windows\gdbm\gdbm"62 -I"$(COMMON_PACKAGES)\windows\gdbm\gdbm" 62 63 63 64 !IF $(GSDL_VC4) 64 65 DEFS=$(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS 65 INCLUDES = $(INCLUDES) -I"$( PACKAGES_DIR)\windows\stlport\stlport"66 INCLUDES = $(INCLUDES) -I"$(COMMON_PACKAGES)\windows\stlport\stlport" 66 67 !ENDIF 67 68 -
gsdl/trunk/runtime-src/src/recpt/win32.mak
r16574 r16577 30 30 31 31 INDEXERS_DIR = $(COMMON_DIR)\indexers 32 COMMON_PACKAGES = $(COMMON_DIR)\packages 33 34 32 35 PACKAGES_DIR = $(RUNTIME_DIR)\packages 33 36 COLSERVR_DIR = $(RUNTIME_DIR)\src\colservr … … 66 69 67 70 !IF $(USE_SQLITE) 68 SQLITE_LIBS = "$( PACKAGES_DIR)\sqlite\lib\sqlite3.lib"71 SQLITE_LIBS = "$(COMMON_PACKAGES)\sqlite\lib\sqlite3.lib" 69 72 !ELSE 70 73 SQLITE_LIBS = … … 74 77 Z3950_DEFS = -DUSE_Z3950 75 78 Z3950_INCLUDES = -I$(Z3950_DIR) 76 Z3950_LIBS = $(Z3950_DIR)\gsdlz3950.lib $( PACKAGES_DIR)\yaz\yaz-2.1.4\lib\yaz.lib79 Z3950_LIBS = $(Z3950_DIR)\gsdlz3950.lib $(COMMON_PACKAGES)\yaz\yaz-2.1.4\lib\yaz.lib 77 80 !ELSE 78 81 Z3950_DEFS = … … 88 91 INCLUDES = -I. -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \ 89 92 -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mgpp\text" \ 90 -I"$( PACKAGES_DIR)\windows\crypt\crypt" -I"$(PACKAGES_DIR)\windows\expat\expat" \91 -I"$( PACKAGES_DIR)\windows\gdbm\gdbm" $(Z3950_INCLUDES)93 -I"$(COMMON_PACKAGES)\windows\crypt\crypt" -I"$(COMMON_PACKAGES)\windows\expat\expat" \ 94 -I"$(COMMON_PACKAGES)\windows\gdbm\gdbm" $(Z3950_INCLUDES) 92 95 LDFLAGS = 93 LIBS = "$( PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \94 "$( PACKAGES_DIR)\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) $(Z3950_LIBS)96 LIBS = "$(COMMON_PACKAGES)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES)\windows\expat\expat\libexpat.lib" \ 97 "$(COMMON_PACKAGES)\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) $(Z3950_LIBS) 95 98 96 99 !IF $(GSDL_VC4) 97 100 DEFS = $(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS 98 INCLUDES = $(INCLUDES) -I"$( PACKAGES_DIR)\windows\stlport\stlport"101 INCLUDES = $(INCLUDES) -I"$(COMMON_PACKAGES)\windows\stlport\stlport" 99 102 !ENDIF 100 103 !IF $(LOCAL_LIBRARY) -
gsdl/trunk/runtime-src/src/w32server/win32.mak
r16574 r16577 30 30 31 31 INDEXERS_DIR = $(COMMON_DIR)\indexers 32 COMMON_PACKAGES = $(COMMON_DIR)\packages 33 32 34 PACKAGES_DIR = $(RUNTIME_DIR)\packages 33 35 COLSERVR_DIR = $(RUNTIME_DIR)\src\colservr 34 PROTOCOL_DIR = $(RUNTIME_DIR)\ protocol36 PROTOCOL_DIR = $(RUNTIME_DIR)\src\protocol 35 37 RECPT_DIR = $(RUNTIME_DIR)\src\recpt 36 38 … … 54 56 55 57 !IF $(USE_SQLITE) 56 SQLITE_LIBS = "$( PACKAGES_DIR)\sqlite\lib\sqlite3.lib"58 SQLITE_LIBS = "$(COMMON_PACKAGES)\sqlite\lib\sqlite3.lib" 57 59 !ELSE 58 60 SQLITE_LIBS = … … 65 67 INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \ 66 68 -I"$(COLSERVR_DIR)" -I"$(INDEXERS_DIR)\mg" \ 67 -I"$( PACKAGES_DIR)\windows\gdbm\gdbm" \69 -I"$(COMMON_PACKAGES)\windows\gdbm\gdbm" \ 68 70 -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mg\src\text" \ 69 71 -I"$(INDEXERS_DIR)\mgpp\lib" -I"$(INDEXERS_DIR)\mgpp\text" 70 72 LDFLAGS = 71 LIBS = "$( PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \72 "$( PACKAGES_DIR)\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) $(SQLITE_LIBS)73 LIBS = "$(COMMON_PACKAGES)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES)\windows\expat\expat\libexpat.lib" \ 74 "$(COMMON_PACKAGES)\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) 73 75 RSC = rc 74 76 WINLIBS = kernel32.lib user32.lib gdi32.lib winspool.lib \ … … 80 82 !IF $(GSDL_VC4) 81 83 DEFS = $(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS 82 INCLUDES = $(INCLUDES) -I"$( PACKAGES_DIR)\windows\stlport\stlport"84 INCLUDES = $(INCLUDES) -I"$(COMMON_PACKAGES)\windows\stlport\stlport" 83 85 !ENDIF 84 86 -
gsdl/trunk/runtime-src/win32.mak
r16575 r16577 1 1 ########################################################################### 2 2 # 3 # win32 makefile -- gsdl 3 # win32 makefile -- gsdl runtime code 4 4 # A component of the Greenstone digital library software 5 5 # from the New Zealand Digital Library Project at the … … 25 25 ########################################################################### 26 26 27 GSDLHOME = $(MAKEDIR) 27 GSDLHOME = $(GSDLHOME) 28 RUNTIMEHOME = $(MAKEDIR) 29 28 30 GSDL_VC4 = 0 29 31 LOCAL_LIBRARY = 0 … … 35 37 MDEFINES = /f win32.mak 36 38 37 INDEXERSDIR = indexers 39 COMPILEDIRS = src\colservr src\protocol 38 40 39 COMPILEDIRS = packages\windows\gdbm\gdbm packages\windows\crypt\crypt \ 40 packages\windows\expat\expat src\lib src\colservr src\protocol 41 42 INSTALLDIRS = src\hashfile src\gdbmedit\db2txt src\gdbmedit\txt2db src\phind\generate \ 43 src\recpt src\oaiservr 41 INSTALLDIRS = src\recpt src\oaiservr 44 42 45 43 PACKAGEDIRS = … … 74 72 MAKECLEANCMD = $(MAKE) $(MDEFINES) clean 75 73 76 all: win32.mak $( INDEXERSDIR) $(PACKAGEDIRS) $(COMPILEDIRS) $(INSTALLDIRS)74 all: win32.mak $(PACKAGEDIRS) $(COMPILEDIRS) $(INSTALLDIRS) 77 75 78 install: win32.mak $(IN DEXERSDIR) $(INSTALLDIRS)76 install: win32.mak $(INSTALLDIRS) 79 77 80 78 clean: 81 cd packages\windows\crypt\crypt 82 $(MAKECLEANCMD) 83 cd "$(GSDLHOME)" 84 cd packages\windows\gdbm\gdbm 85 $(MAKECLEANCMD) 86 cd "$(GSDLHOME)" 87 cd packages\windows\expat\expat 88 $(MAKECLEANCMD) 89 cd "$(GSDLHOME)" 90 cd src\lib 91 $(MAKECLEANCMD) 92 cd "$(GSDLHOME)" 79 cd "$(RUNTIMEHOME)" 93 80 cd src\colservr 94 81 $(MAKECLEANCMD) 95 cd "$( GSDLHOME)"82 cd "$(RUNTIMEHOME)" 96 83 cd src\protocol 97 84 $(MAKECLEANCMD) 98 cd "$( GSDLHOME)"85 cd "$(RUNTIMEHOME)" 99 86 cd src\recpt 100 87 $(MAKECLEANCMD) 101 cd "$( GSDLHOME)"88 cd "$(RUNTIMEHOME)" 102 89 cd src\oaiservr 103 90 $(MAKECLEANCMD) 104 cd "$( GSDLHOME)"91 cd "$(RUNTIMEHOME)" 105 92 cd src\w32server 106 93 $(MAKECLEANCMD) 107 94 cd "$(GSDLHOME)" 108 cd src\phind\generate109 $(MAKECLEANCMD)110 cd "$(GSDLHOME)"111 cd src\hashfile112 $(MAKECLEANCMD)113 cd "$(GSDLHOME)"114 cd src\gdbmedit\txt2db115 $(MAKECLEANCMD)116 cd "$(GSDLHOME)"117 cd src\gdbmedit\db2txt118 $(MAKECLEANCMD)119 cd "$(GSDLHOME)"120 cd indexers121 call winMake.bat clean122 cd "$(GSDLHOME)"123 95 124 96 $(COMPILEDIRS): FORCE 97 cd "$(RUNTIMEHOME)" 125 98 cd "$@" 126 99 $(MAKECMD) … … 128 101 129 102 $(INSTALLDIRS): FORCE 103 cd "$(RUNTIMEHOME)" 130 104 cd "$@" 131 105 $(MAKECMD) … … 144 118 cd "$(GSDLHOME)" 145 119 146 $(INDEXERSDIR): FORCE147 cd "$@"148 call winMake.bat all gs2149 call winMake.bat install gs2150 if NOT EXIST "$(GSDLHOME)\bin\windows" mkdir "$(GSDLHOME)\bin\windows"151 if NOT EXIST "$(GSDLHOME)\bin\java" mkdir "$(GSDLHOME)\bin\java"152 for %%i in (bin\*.exe) do \153 copy %%i "$(GSDLHOME)\bin\windows"154 copy lucene-gs\LuceneWrapper.jar "$(GSDLHOME)\bin\java"155 cd "$(GSDLHOME)"156 157 120 FORCE: 158 121 -
gsdl/trunk/win32.mak
r16574 r16577 35 35 MDEFINES = /f win32.mak 36 36 37 COMPILEDIRS = common-src build-src runtime-src38 39 37 INSTALLDIRS = common-src build-src runtime-src 40 38 … … 63 61 MAKECLEANCMD = $(MAKE) $(MDEFINES) clean 64 62 65 all: win32.mak $( COMPILEDIRS) $(INSTALLDIRS)63 all: win32.mak $(INSTALLDIRS) 66 64 67 65 install: win32.mak $(INSTALLDIRS) … … 78 76 cd "$(GSDLHOME)" 79 77 80 $(COMPILEDIRS): FORCE81 cd "$@"82 $(MAKECMD)83 cd "$(GSDLHOME)"84 85 78 $(INSTALLDIRS): FORCE 86 79 cd "$@"
Note:
See TracChangeset
for help on using the changeset viewer.