Changeset 2338
- Timestamp:
- 2001-04-25T22:29:11+12:00 (23 years ago)
- Location:
- trunk/gsdl
- Files:
-
- 3 added
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gsdl/lib/win32.mak
r1748 r2338 26 26 27 27 GSDLHOME = .. 28 STLPATH = f:\stlport 28 USE_STLPORT = 0 29 LOCAL_LIBRARY = 0 30 STLPATH = "$(GSDLHOME)\packages\windows\stlport\stlport" 29 31 30 32 AR = lib 31 33 CC = cl 32 34 CPPFLAGS = 33 # note that if compiling with a newer version of VC++ than 4.2 we'll 34 # use the built in STL and so the following definitions should not 35 # be defined - this setup is for use with VC++ 4.2 and STLPort 36 # GSDL_NAMESPACE_BROKEN 37 # GSDL_USE_IOS_H 38 # __STL_NO_NEW_IOSTREAMS 39 DEFS = -DQUIET -D__WIN32__ -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H \ 40 -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H -D__STL_NO_NEW_IOSTREAMS 41 INCLUDES = -I$(GSDLHOME)\packages\mg\lib -I$(STLPATH) 35 36 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN \ 37 -DSHORT_SUFFIX 38 INCLUDES = -I"$(GSDLHOME)" -I"$(GSDLHOME)\packages\mg\lib" 39 !IF $(USE_STLPORT) 40 DEFS = $(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS 41 INCLUDES = $(INCLUDES) -I$(STLPATH) 42 !ENDIF 43 !IF $(LOCAL_LIBRARY) 44 DEFS = $(DEFS) -DGSDL_LOCAL_LIBRARY 45 !ENDIF 42 46 43 47 COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) $(INCLUDES) … … 52 56 $(COMPILE) $< 53 57 54 HEADERS = \ 55 cfgread.h fileutil.h gsdlunicode.h text_t.h \ 56 display.h gsdlconf.h gsdltimes.h gsdltools.h 58 HEADERS = cfgread.h fileutil.h gsdlunicode.h text_t.h display.h gsdlconf.h \ 59 gsdltimes.h gsdltools.h cnfgable.h cnfgator.h 57 60 58 SOURCES = \ 59 cfgread.cpp fileutil.cpp text_t.cpp \ 60 display.cpp gsdlunicode.cpp gsdltimes.cpp gsdltools.cpp 61 SOURCES = cfgread.cpp fileutil.cpp gsdlunicode.cpp text_t.cpp display.cpp \ 62 gsdltimes.cpp gsdltools.cpp cnfgable.cpp cnfgator.cpp 61 63 62 OBJECTS = \ 63 cfgread.obj fileutil.obj text_t.obj \ 64 display.obj gsdlunicode.obj gsdltimes.obj gsdltools.obj 64 OBJECTS = cfgread.obj fileutil.obj gsdlunicode.obj text_t.obj display.obj \ 65 gsdltimes.obj gsdltools.obj cnfgable.obj cnfgator.obj 65 66 66 67 all: gsdllib.lib … … 70 71 $(AR) /out:gsdllib.lib $(OBJECTS) 71 72 73 # we want gsdltools to always be compiled in case the status of 74 # GSDL_LOCAL_LIBRARY has changed 75 gsdltools.obj: FORCE 76 72 77 clean: 73 78 del *.obj … … 75 80 76 81 install: 82 83 FORCE: -
trunk/gsdl/packages/mg/lib/WIN32.MAK
r1747 r2338 31 31 CPPFLAGS = 32 32 33 DEFS = -DQUIET -DHAVE_CONFIG_H -D__WIN32__ -D_LITTLE_ENDIAN 34 INCLUDES = -I$(GSDLHOME)\packages\mg\lib -I$(GSDLHOME)\packages\mg \ 35 -I$(GSDLHOME) 33 DEFS = -DQUIET -DHAVE_CONFIG_H -D__WIN32__ -D_LITTLE_ENDIAN -DPARADOCNUM \ 34 -DSHORT_SUFFIX 35 INCLUDES = -I"$(GSDLHOME)\packages\mg\lib" -I"$(GSDLHOME)\packages\mg" \ 36 -I"$(GSDLHOME)" 36 37 37 38 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) … … 85 86 $(AR) /out:libmg.lib $(OBJECTS) 86 87 87 $(OBJECTS): $(GSDLHOME)\win32cfg.h88 $(OBJECTS): "$(GSDLHOME)\win32cfg.h" 88 89 89 90 install: -
trunk/gsdl/packages/mg/src/text/WIN32.MAK
r1748 r2338 31 31 DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H \ 32 32 -D__WIN32__ -D_LITTLE_ENDIAN 33 INCLUDES = -I $(GSDLHOME)\packages\mg\src\text -I$(GSDLHOME)\packages\mg\34 -I $(GSDLHOME)\packages\mg\lib -I$(GSDLHOME)33 INCLUDES = -I"$(GSDLHOME)\packages\mg\src\text" -I"$(GSDLHOME)\packages\mg" \ 34 -I"$(GSDLHOME)\packages\mg\lib" -I"$(GSDLHOME)" 35 35 LDFLAGS = 36 36 37 LIBS = $(GSDLHOME)\packages\mg\lib\libmg.lib37 LIBS = "$(GSDLHOME)\packages\mg\lib\libmg.lib" 38 38 39 39 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) … … 201 201 202 202 install: 203 if NOT EXIST $(GSDLHOME)\bin\windows mkdir $(GSDLHOME)\bin\windows203 if NOT EXIST "$(GSDLHOME)\bin\windows" mkdir "$(GSDLHOME)\bin\windows" 204 204 for %%i in ($(EXEC)) do \ 205 copy %%i $(GSDLHOME)\bin\windows205 copy %%i "$(GSDLHOME)\bin\windows" 206 206 207 207 LIB_OBJS = \ -
trunk/gsdl/packages/windows/crypt/README.TXT
r1745 r2338 1 1 This directory contains a win32 port of the crypt library (see the enclosed 2 2 README files for details). To compile with Microsoft Visual C++ unzip 3 crypt.zip and run nmakein the top level directory.3 crypt.zip and run "nmake /f win32.mak" in the top level directory. 4 4 5 5 Link crypt.lib with your project when compiling Greenstone. -
trunk/gsdl/packages/windows/gdbm/README.TXT
r1745 r2338 1 1 This directory contains a win32 port of gdbm. To compile with Microsoft 2 Visual C++ unzip gdbm.zip and run nmake in the top level directory. 2 Visual C++ unzip gdbm.zip and run "nmake /f win32.mak" in the top level 3 directory. 3 4 4 5 Link gdbm.lib with your project when compiling Greenstone. -
trunk/gsdl/src/colservr/win32.mak
r1154 r2338 25 25 ########################################################################### 26 26 27 GSDLHOME = c:\gsdl 28 STLPATH = c:\stlport 27 GSDLHOME = ..\.. 28 USE_STLPORT = 0 29 STLPATH = "$(GSDLHOME)\packages\windows\stlport\stlport" 29 30 30 31 AR = lib … … 32 33 CPPFLAGS = 33 34 LDFLAGS = 34 DEFS = -DNZDL -DQUIET -D__WIN32__ -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H \ 35 -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H -D__STL_NO_NEW_IOSTREAMS \ 36 -DGSDLSERVER 37 INCLUDES = -I$(GSDLHOME)\src\colservr -I$(GSDLHOME)\lib -I$(GSDLHOME)\src\recpt \ 38 -I$(GSDLHOME)\packages\mg -I$(GSDLHOME)\packages\mg\lib \ 39 -I$(GSDLHOME)\packages\mg\src\text -I$(GSDLHOME)\packages\wingdbm \ 40 -I$(STLPATH) 35 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX 36 INCLUDES = -I"$(GSDLHOME)" -I"$(GSDLHOME)\lib" -I"$(GSDLHOME)\src\colservr" \ 37 -I"$(GSDLHOME)\src\recpt" -I"$(GSDLHOME)\packages\mg" \ 38 -I"$(GSDLHOME)\packages\mg\lib" -I"$(GSDLHOME)\packages\mg\src\text" \ 39 -I"$(GSDLHOME)\packages\windows\gdbm\gdbm" 40 !IF $(USE_STLPORT) 41 DEFS=$(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS 42 INCLUDES = $(INCLUDES) -I$(STLPATH) 43 !ENDIF 41 44 42 LIBS = $(GSDLHOME)\packages\wingdbm\gdbm.lib45 LIBS = 43 46 44 47 COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) $(INCLUDES) … … 54 57 $(COMPILE) $< 55 58 56 HEADERS = mgq.h mgsearch.h querycache.h queryinfo.h collectserver.h \59 HEADERS = mgq.h search.h mgsearch.h querycache.h queryinfo.h collectserver.h \ 57 60 colservrconfig.h maptools.h filter.h source.h browsefilter.h \ 58 queryfilter.h mggdbmsource.h phrasesearch.h phrasequeryfilter.h 61 queryfilter.h mgqueryfilter.h mggdbmsource.h phrasesearch.h \ 62 phrasequeryfilter.h collectset.h 59 63 60 SOURCES = mgq.c mgsearch.cpp querycache.cpp queryinfo.cpp collectserver.cpp \ 61 colservrconfig.cpp maptools.cpp filter.cpp source.cpp \ 62 browsefilter.cpp queryfilter.cpp mggdbmsource.cpp phrasesearch.cpp \ 63 phrasequeryfilter.cpp 64 SOURCES = mgq.c search.cpp mgsearch.cpp querycache.cpp queryinfo.cpp \ 65 collectserver.cpp colservrconfig.cpp maptools.cpp filter.cpp \ 66 source.cpp browsefilter.cpp queryfilter.cpp mgqueryfilter.cpp \ 67 mggdbmsource.cpp phrasesearch.cpp phrasequeryfilter.cpp \ 68 collectset.cpp 64 69 65 OBJECTS = mgq.obj mgsearch.obj querycache.obj queryinfo.obj collectserver.obj \ 66 colservrconfig.obj maptools.obj filter.obj source.obj browsefilter.obj \ 67 queryfilter.obj mggdbmsource.obj phrasesearch.obj phrasequeryfilter.obj 70 OBJECTS = mgq.obj search.obj mgsearch.obj querycache.obj queryinfo.obj \ 71 collectserver.obj colservrconfig.obj maptools.obj filter.obj \ 72 source.obj browsefilter.obj queryfilter.obj mgqueryfilter.obj \ 73 mggdbmsource.obj phrasesearch.obj phrasequeryfilter.obj \ 74 collectset.obj 68 75 69 all : $(OBJECTS) 76 all : gsdlcolservr.lib 77 78 gsdlcolservr.lib : $(OBJECTS) 79 if EXIST gsdlcolservr.lib del gsdlcolservr.lib 80 $(AR) /out:gsdlcolservr.lib $(OBJECTS) 70 81 71 82 clean: 72 83 del *.obj 84 del gsdlcolservr.lib 73 85 74 86 install: -
trunk/gsdl/src/db2txt/win32.mak
r1748 r2338 26 26 27 27 GSDLHOME = ..\.. 28 STLPATH = f:\stlport 28 USE_STLPORT = 0 29 STLPATH = "$(GSDLHOME)\packages\windows\stlport\stlport" 29 30 30 31 AR = lib … … 32 33 CPPFLAGS = 33 34 LDFLAGS = 34 DEFS = -DQUIET -DHAVE_CONFIG_H -D__WIN32__ -D__STL_NO_NEW_IOSTREAMS \ 35 -DGSDL_NAMESPACE_BROKEN -DSHORT_SUFFIX -DGSDL_USE_IOS_H 36 INCLUDES = -I$(GSDLHOME)\src\db2txt -I$(GSDLHOME)\lib -I$(GSDLHOME)\packages\mg\lib \ 37 -I$(STLPATH) -I$(GSDLHOME)\packages\wingdbm 38 LIBS = $(GSDLHOME)\packages\mg\lib\unitool.obj $(GSDLHOME)\lib\gsdllib.lib \ 39 $(GSDLHOME)\packages\wingdbm\gdbm.lib 35 36 DEFS = -D__WIN32__ -DHAVE_CONFIG_H 37 INCLUDES = -I"$(GSDLHOME)\src\db2txt" -I"$(GSDLHOME)\lib" -I"$(GSDLHOME)\packages\mg\lib" \ 38 -I"$(GSDLHOME)\packages\windows\gdbm\gdbm" 39 !IF $(USE_STLPORT) 40 DEFS=$(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS 41 INCLUDES = $(INCLUDES) -I$(STLPATH) 42 !ENDIF 43 44 LIBS = "$(GSDLHOME)\packages\mg\lib\unitool.obj" "$(GSDLHOME)\lib\gsdllib.lib" \ 45 "$(GSDLHOME)\packages\windows\gdbm\gdbm\gdbm.lib" 40 46 41 47 COMPILE = $(CC) -c -GX $(DEFS) $(INCLUDES) … … 62 68 63 69 install: $(EXEC) 64 if NOT EXIST $(GSDLHOME)\bin\windows mkdir $(GSDLHOME)\bin\windows65 copy $(EXEC) $(GSDLHOME)\bin\windows\$(EXEC)70 if NOT EXIST "$(GSDLHOME)\bin\windows" mkdir "$(GSDLHOME)\bin\windows" 71 copy $(EXEC) "$(GSDLHOME)\bin\windows" 66 72 67 73 clean: 68 del * .$o74 del *$o 69 75 del $(EXEC) 70 76 -
trunk/gsdl/src/hashfile/win32.mak
r1748 r2338 26 26 27 27 GSDLHOME = ..\.. 28 STLPATH = f:\stlport29 28 30 29 AR = lib 31 30 CC = cl 32 31 CPPFLAGS = 33 DEFS = -DQUIET -DHAVE_CONFIG_H -D__WIN32__ -D__STL_NO_NEW_IOSTREAMS \ 34 -DGSDL_NAMESPACE_BROKEN -DSHORT_SUFFIX -DGSDL_USE_IOS_H 35 INCLUDES = -I$(GSDLHOME)\src\hashfile -I$(GSDLHOME)\lib -I$(STLPATH) 36 LIBS = $(GSDLHOME)\lib\gsdllib.lib 32 DEFS = -DHAVE_CONFIG_H -D__WIN32__ 33 INCLUDES = -I"$(GSDLHOME)\src\hashfile" 34 LIBS = 37 35 38 36 COMPILE = $(CC) -c -GX $(DEFS) $(INCLUDES) … … 59 57 60 58 install: $(EXEC) 61 if NOT EXIST $(GSDLHOME)\bin\windows mkdir $(GSDLHOME)\bin\windows62 copy $(EXEC) $(GSDLHOME)\bin\windows\$(EXEC)59 if NOT EXIST "$(GSDLHOME)\bin\windows" mkdir "$(GSDLHOME)\bin\windows" 60 copy $(EXEC) "$(GSDLHOME)\bin\windows" 63 61 64 62 clean: 65 del * .$o63 del *$o 66 64 del $(EXEC) 67 65 -
trunk/gsdl/src/recpt/win32.mak
r1154 r2338 25 25 ########################################################################### 26 26 27 GSDLHOME = c:\gsdl 28 STLPATH = c:\stlport 27 GSDLHOME = ..\.. 28 USE_STLPORT = 0 29 LOCAL_LIBRARY = 0 30 STLPATH = "$(GSDLHOME)\packages\windows\stlport\stlport" 29 31 30 32 AR = lib … … 32 34 CPPFLAGS = 33 35 LDFLAGS = 34 DEFS = -DNZDL -DQUIET -D__WIN32__ -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H \ 35 -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H -D__STL_NO_NEW_IOSTREAMS \ 36 -DGSDLSERVER -DGSDLUSAGELOG 37 INCLUDES = -I$(GSDLHOME)\src\recpt -I$(GSDLHOME)\lib -I$(GSDLHOME)\src\colservr \ 38 -I$(GSDLHOME)\packages\mg -I$(GSDLHOME)\packages\mg\lib \ 39 -I$(GSDLHOME)\packages\mg\src\text -I$(GSDLHOME)\packages\wingdbm \ 40 -I$(STLPATH) -I$(GSDLHOME)\packages\wincrypt 36 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX 37 INCLUDES = -I"$(GSDLHOME)\src\recpt" -I"$(GSDLHOME)\lib" -I"$(GSDLHOME)\src\colservr" \ 38 -I"$(GSDLHOME)\packages\mg" -I"$(GSDLHOME)\packages\mg\lib" \ 39 -I"$(GSDLHOME)\packages\mg\src\text" -I"$(GSDLHOME)\packages\windows\gdbm\gdbm" \ 40 -I"$(GSDLHOME)\packages\windows\crypt\crypt" 41 !IF $(USE_STLPORT) 42 DEFS = $(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS 43 INCLUDES = $(INCLUDES) -I$(STLPATH) 44 !ENDIF 45 !IF $(LOCAL_LIBRARY) 46 DEFS = $(DEFS) -DGSDL_LOCAL_LIBRARY 47 !ENDIF 41 48 42 LIBS = $(GSDLHOME)\packages\wingdbm\gdbm.lib $(GSDLHOME)\packages\wincrypt\crypt.lib 49 LIBS = "$(GSDLHOME)\packages\windows\gdbm\gdbm\gdbm.lib" \ 50 "$(GSDLHOME)\packages\windows\crypt\crypt\crypt.lib" \ 51 "$(GSDLHOME)\src\colservr\gsdlcolservr.lib" \ 52 "$(GSDLHOME)\lib\gsdllib.lib" \ 53 "$(GSDLHOME)\packages\mg\src\text\libtextin.lib" \ 54 "$(GSDLHOME)\packages\mg\lib\libmg.lib" 55 43 56 44 57 COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) $(INCLUDES) … … 55 68 56 69 57 COMMONHEADERS = receptionist.h cgi wrapper.h cgiargs.h action.h browserclass.h \70 COMMONHEADERS = receptionist.h cgiargs.h action.h browserclass.h \ 58 71 converter.h recptconfig.h cgiutils.h OIDtools.h browsetools.h htmlgen.h \ 59 statusaction.h pageaction.h comtypes.h recptproto.h \ 60 pingaction.h queryaction.h documentaction.h \ 61 extlinkaction.h buildaction.h htmlutils.h \ 72 statusaction.h pageaction.h comtypes.h recptproto.h pingaction.h \ 73 queryaction.h documentaction.h extlinkaction.h htmlutils.h \ 62 74 querytools.h formattools.h tipaction.h authenaction.h infodbclass.h \ 63 75 userdb.h usersaction.h vlistbrowserclass.h hlistbrowserclass.h \ 64 76 datelistbrowserclass.h invbrowserclass.h pagedbrowserclass.h \ 65 htmlbrowserclass.h delhistoryaction.h historydb.h 77 htmlbrowserclass.h historydb.h phindbrowserclass.h collectoraction.h \ 78 nullprtoto.h 66 79 67 RECEPTHEADERS = 80 CGIHEADERS = cgiwrapper.h 68 81 69 LIBRARYHEADERS = nullproto.h 70 71 HEADERS = $(COMMONHEADERS) $(RECPTHEADERS) $(LIBRARYHEADERS) 82 HEADERS = $(COMMONHEADERS) $(CGIHEADERS) 72 83 73 84 74 COMMONSOURCES = receptionist.cpp cgi wrapper.cpp cgiargs.cpp action.cpp browserclass.cpp \85 COMMONSOURCES = receptionist.cpp cgiargs.cpp action.cpp browserclass.cpp \ 75 86 converter.cpp recptconfig.cpp cgiutils.cpp OIDtools.cpp browsetools.cpp \ 76 87 htmlgen.cpp statusaction.cpp pageaction.cpp comtypes.cpp \ 77 88 recptproto.cpp pingaction.cpp queryaction.cpp documentaction.cpp \ 78 extlinkaction.cpp buildaction.cpphtmlutils.cpp querytools.cpp formattools.cpp \89 extlinkaction.cpp htmlutils.cpp querytools.cpp formattools.cpp \ 79 90 tipaction.cpp authenaction.cpp infodbclass.cpp userdb.cpp usersaction.cpp \ 80 91 vlistbrowserclass.cpp hlistbrowserclass.cpp datelistbrowserclass.cpp \ 81 92 invbrowserclass.cpp pagedbrowserclass.cpp htmlbrowserclass.cpp \ 82 delhistoryaction.cpp historydb.cpp 93 historydb.cpp phindbrowserclass.cpp collectoraction.cpp nullproto.cpp 94 95 CGISOURCES = librarymain.cpp cgiwrapper.cpp 96 97 SOURCES = $(COMMONSOURCES) $(CGISOURCES) 83 98 84 99 85 RECPTSOURCES = recptmain.cpp 100 COMMONOBJECTS = receptionist.obj cgiargs.obj action.obj browserclass.obj \ 101 converter.obj recptconfig.obj cgiutils.obj OIDtools.obj browsetools.obj \ 102 htmlgen.obj statusaction.obj pageaction.obj comtypes.obj recptproto.obj \ 103 pingaction.obj queryaction.obj documentaction.obj extlinkaction.obj \ 104 htmlutils.obj querytools.obj formattools.obj tipaction.obj \ 105 authenaction.obj infodbclass.obj userdb.obj usersaction.obj \ 106 vlistbrowserclass.obj hlistbrowserclass.obj datelistbrowserclass.obj \ 107 invbrowserclass.obj pagedbrowserclass.obj htmlbrowserclass.obj \ 108 historydb.obj phindbrowserclass.obj collectoraction.obj nullproto.obj 86 109 87 LIBRARYSOURCES = nullproto.cpp librarymain.cpp 110 CGIOBJECTS = librarymain.obj cgiwrapper.obj 88 111 89 SOURCES = $(COMMONSOURCES) $(RECPTSOURCES) $(LIBRARYSOURCES)112 OBJECTS = $(COMMONOBJECTS) $(CGIOBJECTS) 90 113 114 EXEC = library.exe 91 115 92 COMMONOBJECTS = receptionist.obj cgiwrapper.obj cgiargs.obj action.obj browserclass.obj \ 93 converter.obj recptconfig.obj cgiutils.obj OIDtools.obj browsetools.obj \ 94 htmlgen.obj statusaction.obj pageaction.obj comtypes.obj \ 95 recptproto.obj pingaction.obj queryaction.obj documentaction.obj \ 96 extlinkaction.obj buildaction.obj htmlutils.obj querytools.obj \ 97 formattools.obj tipaction.obj authenaction.obj \ 98 infodbclass.obj userdb.obj usersaction.obj vlistbrowserclass.obj \ 99 hlistbrowserclass.obj datelistbrowserclass.obj invbrowserclass.obj \ 100 pagedbrowserclass.obj htmlbrowserclass.obj delhistoryaction.obj \ 101 historydb.obj 116 !IF $(LOCAL_LIBRARY) 117 all: gsdlrecpt.lib 118 !ELSE 119 all: $(EXEC) 120 !ENDIF 102 121 103 RECPTOBJECTS = recptmain.obj 104 105 LIBRARYOBJECTS = nullproto.obj librarymain.obj 106 107 OBJECTS = $(COMMONOBJECTS) $(RECPTOBJECTS) $(LIBRARYOBJECTS) 108 109 110 COLSERVROBJECTS = $(GSDLHOME)\src\colservr\mgq.obj \ 111 $(GSDLHOME)\src\colservr\mgsearch.obj \ 112 $(GSDLHOME)\src\colservr\querycache.obj \ 113 $(GSDLHOME)\src\colservr\queryinfo.obj \ 114 $(GSDLHOME)\src\colservr\collectserver.obj \ 115 $(GSDLHOME)\src\colservr\colservrconfig.obj \ 116 $(GSDLHOME)\src\colservr\maptools.obj \ 117 $(GSDLHOME)\src\colservr\filter.obj \ 118 $(GSDLHOME)\src\colservr\source.obj \ 119 $(GSDLHOME)\src\colservr\browsefilter.obj \ 120 $(GSDLHOME)\src\colservr\queryfilter.obj \ 121 $(GSDLHOME)\src\colservr\mggdbmsource.obj \ 122 $(GSDLHOME)\src\colservr\phrasesearch.obj \ 123 $(GSDLHOME)\src\colservr\phrasequeryfilter.obj 124 125 EXEC = recpt.exe library.exe 126 127 all: $(EXEC) 122 gsdlrecpt.lib : $(COMMONOBJECTS) 123 if EXIST gsdlrecpt.lib del gsdlrecpt.lib 124 $(AR) /out:gsdlrecpt.lib $(COMMONOBJECTS) 128 125 129 126 clean: 130 127 del *.obj 131 del recpt.exe132 128 del library.exe 133 129 130 !IF $(LOCAL_LIBRARY) 134 131 install: 135 copy library.exe $(GSDLHOME)\cgi-bin\library.exe 132 !ELSE 133 install: 134 copy library.exe "$(GSDLHOME)\cgi-bin" 135 !ENDIF 136 136 137 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # 137 library.exe: $(OBJECTS) 138 $(LINK) $(OBJECTS) $(LIBS) 138 139 139 RECPT_OBJS = $(COMMONOBJECTS) $(RECPTOBJECTS) \ 140 $(GSDLHOME)\lib\gsdllib.lib \ 141 $(GSDLHOME)\packages\mg\src\text\libtextin.lib \ 142 $(GSDLHOME)\packages\mg\lib\libmg.lib 140 # we want statusaction to always be compiled in case the status of 141 # GSDL_LOCAL_LIBRARY has changed 142 statusaction.obj: FORCE 143 143 144 recpt.exe: $(RECPT_OBJS) 145 $(LINK) $(RECPT_OBJS) $(LIBS) 146 147 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # 148 149 LIBRARY_OBJS = $(COMMONOBJECTS) $(LIBRARYOBJECTS) $(COLSERVROBJECTS) \ 150 $(GSDLHOME)\lib\gsdllib.lib \ 151 $(GSDLHOME)\packages\mg\src\text\libtextin.lib \ 152 $(GSDLHOME)\packages\mg\lib\libmg.lib 153 154 library.exe: $(LIBRARY_OBJS) 155 $(LINK) $(LIBRARY_OBJS) $(LIBS) 144 FORCE: -
trunk/gsdl/src/txt2db/win32.mak
r1748 r2338 26 26 27 27 GSDLHOME = ..\.. 28 STLPATH = f:\stlport 28 USE_STLPORT = 0 29 STLPATH = "$(GSDLHOME)\packages\windows\stlport\stlport" 29 30 30 31 AR = lib … … 32 33 CPPFLAGS = 33 34 LDFLAGS = 34 DEFS = -DQUIET -DHAVE_CONFIG_H -D__WIN32__ -D__STL_NO_NEW_IOSTREAMS \ 35 -DGSDL_NAMESPACE_BROKEN -DSHORT_SUFFIX -DGSDL_USE_IOS_H 36 INCLUDES = -I$(GSDLHOME)\src\txt2db -I$(GSDLHOME)\lib -I$(GSDLHOME)\packages\mg\lib \ 37 -I$(STLPATH) -I$(GSDLHOME)\packages\wingdbm 38 LIBS = $(GSDLHOME)\packages\mg\lib\unitool.obj $(GSDLHOME)\lib\gsdllib.lib \ 39 $(GSDLHOME)\packages\wingdbm\gdbm.lib 35 36 DEFS = -D__WIN32__ -DHAVE_CONFIG_H 37 INCLUDES = -I"$(GSDLHOME)\src\txt2db" -I"$(GSDLHOME)\lib" -I"$(GSDLHOME)\packages\mg\lib" \ 38 -I"$(GSDLHOME)\packages\windows\gdbm\gdbm" 39 !IF $(USE_STLPORT) 40 DEFS=$(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS 41 INCLUDES = $(INCLUDES) -I$(STLPATH) 42 !ENDIF 43 44 LIBS = "$(GSDLHOME)\packages\mg\lib\unitool.obj" "$(GSDLHOME)\lib\gsdllib.lib" \ 45 "$(GSDLHOME)\packages\windows\gdbm\gdbm\gdbm.lib" 40 46 41 47 COMPILE = $(CC) -c -GX $(DEFS) $(INCLUDES) … … 62 68 63 69 install: $(EXEC) 64 if NOT EXIST $(GSDLHOME)\bin\windows mkdir $(GSDLHOME)\bin\windows65 copy $(EXEC) $(GSDLHOME)\bin\windows\$(EXEC)70 if NOT EXIST "$(GSDLHOME)\bin\windows" mkdir "$(GSDLHOME)\bin\windows" 71 copy $(EXEC) "$(GSDLHOME)\bin\windows" 66 72 67 73 clean: -
trunk/gsdl/src/w32server/httpsend.cpp
r2286 r2338 25 25 * 26 26 *********************************************************************/ 27 28 #include "text_t.h" 27 29 28 30 #include <windows.h> -
trunk/gsdl/src/w32server/win32.mak
r1237 r2338 25 25 ########################################################################### 26 26 27 GSDLHOME = d:\home\dl\gsdl 28 STLPATH = d:\home\dl\stl\stlport 27 GSDLHOME = ..\.. 28 USE_STLPORT = 0 29 STLPATH = "$(GSDLHOME)\packages\windows\stlport\stlport" 29 30 30 31 AR = lib … … 33 34 CPPFLAGS = 34 35 LDFLAGS = 35 DEFS = -DNZDL -DQUIET -D__WIN32__ -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H \ 36 -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H -D__STL_NO_NEW_IOSTREAMS \ 37 -DGSDLSERVER -DGSDLUSAGELOG 38 INCLUDES = -I$(GSDLHOME)\src\w32server -I$(GSDLHOME)\src\recpt -I$(GSDLHOME)\lib \ 39 -I$(GSDLHOME)\src\colservr -I$(GSDLHOME)\packages\mg \ 40 -I$(GSDLHOME)\packages\mg\lib -I$(GSDLHOME)\packages\mg\src\text \ 41 -I$(GSDLHOME)\packages\wingdbm -I$(STLPATH) -I$(GSDLHOME)\packages\wincrypt 36 DEFS = -DHAVE_CONFIG_H -D_LITTLE_ENDIAN -DPARADOCNUM -D__WIN32__ \ 37 -DSHORT_SUFFIX 38 INCLUDES = -I"$(GSDLHOME)\src\w32server" -I"$(GSDLHOME)\src\recpt" -I"$(GSDLHOME)\lib" \ 39 -I"$(GSDLHOME)\src\colservr" -I"$(GSDLHOME)\packages\mg" \ 40 -I"$(GSDLHOME)\packages\mg\lib" -I"$(GSDLHOME)\packages\mg\src\text" 41 !IF $(USE_STLPORT) 42 DEFS = $(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS 43 INCLUDES = $(INCLUDES) -I$(STLPATH) 44 !ENDIF 42 45 43 LIBS = $(GSDLHOME)\packages\wingdbm\gdbm.lib $(GSDLHOME)\packages\wincrypt\crypt.lib \ 44 $(GSDLHOME)\lib\gsdllib.lib $(GSDLHOME)\packages\mg\src\text\libtextin.lib \ 45 $(GSDLHOME)\packages\mg\lib\libmg.lib \ 46 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib \ 47 shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 48 46 LIBS = "$(GSDLHOME)\lib\gsdllib.lib" \ 47 "$(GSDLHOME)\packages\mg\src\text\libtextin.lib" \ 48 "$(GSDLHOME)\packages\mg\lib\libmg.lib" \ 49 "$(GSDLHOME)\src\colservr\gsdlcolservr.lib" \ 50 "$(GSDLHOME)\src\recpt\gsdlrecpt.lib" \ 51 "$(GSDLHOME)\packages\windows\gdbm\gdbm\gdbm.lib" \ 52 "$(GSDLHOME)\packages\windows\crypt\crypt\crypt.lib" \ 53 kernel32.lib user32.lib gdi32.lib winspool.lib \ 54 comdlg32.lib advapi32.lib shell32.lib ole32.lib \ 55 oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 49 56 50 57 COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) $(INCLUDES) … … 72 79 wincgiutils.obj server.res 73 80 74 #RECPTOBJECTS = $(GSDLHOME)\src\recpt\receptionist.obj \75 # $(GSDLHOME)\src\recpt\cgiargs.obj \76 # $(GSDLHOME)\src\recpt\action.obj \77 # $(GSDLHOME)\src\recpt\browserclass.obj \78 # $(GSDLHOME)\src\recpt\converter.obj \79 # $(GSDLHOME)\src\recpt\recptconfig.obj \80 # $(GSDLHOME)\src\recpt\cgiutils.obj \81 # $(GSDLHOME)\src\recpt\OIDtools.obj \82 # $(GSDLHOME)\src\recpt\browsetools.obj \83 # $(GSDLHOME)\src\recpt\htmlgen.obj \84 # $(GSDLHOME)\src\recpt\statusaction.obj \85 # $(GSDLHOME)\src\recpt\pageaction.obj \86 # $(GSDLHOME)\src\recpt\comtypes.obj \87 # $(GSDLHOME)\src\recpt\recptproto.obj \88 # $(GSDLHOME)\src\recpt\pingaction.obj \89 # $(GSDLHOME)\src\recpt\queryaction.obj \90 # $(GSDLHOME)\src\recpt\documentaction.obj \91 # $(GSDLHOME)\src\recpt\extlinkaction.obj \92 # $(GSDLHOME)\src\recpt\buildaction.obj \93 # $(GSDLHOME)\src\recpt\htmlutils.obj \94 # $(GSDLHOME)\src\recpt\querytools.obj \95 # $(GSDLHOME)\src\recpt\formattools.obj \96 # $(GSDLHOME)\src\recpt\tipaction.obj \97 # $(GSDLHOME)\src\recpt\authenaction.obj \98 # $(GSDLHOME)\src\recpt\infodbclass.obj \99 # $(GSDLHOME)\src\recpt\userdb.obj \100 # $(GSDLHOME)\src\recpt\usersaction.obj \101 # $(GSDLHOME)\src\recpt\vlistbrowserclass.obj \102 # $(GSDLHOME)\src\recpt\hlistbrowserclass.obj \103 # $(GSDLHOME)\src\recpt\datelistbrowserclass.obj \104 # $(GSDLHOME)\src\recpt\invbrowserclass.obj \105 # $(GSDLHOME)\src\recpt\pagedbrowserclass.obj \106 # $(GSDLHOME)\src\recpt\htmlbrowserclass.obj \107 # $(GSDLHOME)\src\recpt\delhistoryaction.obj \108 # $(GSDLHOME)\src\recpt\historydb.obj109 110 #LIBRARYOBJECTS = $(GSDLHOME)\src\recpt\nullproto.obj111 112 #COLSERVROBJECTS = $(GSDLHOME)\src\colservr\mgq.obj \113 # $(GSDLHOME)\src\colservr\mgsearch.obj \114 # $(GSDLHOME)\src\colservr\querycache.obj \115 # $(GSDLHOME)\src\colservr\queryinfo.obj \116 # $(GSDLHOME)\src\colservr\collectserver.obj \117 # $(GSDLHOME)\src\colservr\colservrconfig.obj \118 # $(GSDLHOME)\src\colservr\maptools.obj \119 # $(GSDLHOME)\src\colservr\filter.obj \120 # $(GSDLHOME)\src\colservr\source.obj \121 # $(GSDLHOME)\src\colservr\browsefilter.obj \122 # $(GSDLHOME)\src\colservr\queryfilter.obj \123 # $(GSDLHOME)\src\colservr\mggdbmsource.obj \124 # $(GSDLHOME)\src\colservr\phrasesearch.obj \125 # $(GSDLHOME)\src\colservr\phrasequeryfilter.obj126 127 RECPTOBJECTS = ..\recpt\receptionist.obj \128 ..\recpt\cgiargs.obj \129 ..\recpt\action.obj \130 ..\recpt\browserclass.obj \131 ..\recpt\converter.obj \132 ..\recpt\recptconfig.obj \133 ..\recpt\cgiutils.obj \134 ..\recpt\OIDtools.obj \135 ..\recpt\browsetools.obj \136 ..\recpt\htmlgen.obj \137 ..\recpt\statusaction.obj \138 ..\recpt\pageaction.obj \139 ..\recpt\comtypes.obj \140 ..\recpt\recptproto.obj \141 ..\recpt\pingaction.obj \142 ..\recpt\queryaction.obj \143 ..\recpt\documentaction.obj \144 ..\recpt\extlinkaction.obj \145 ..\recpt\buildaction.obj \146 ..\recpt\htmlutils.obj \147 ..\recpt\querytools.obj \148 ..\recpt\formattools.obj \149 ..\recpt\tipaction.obj \150 ..\recpt\authenaction.obj \151 ..\recpt\infodbclass.obj \152 ..\recpt\userdb.obj \153 ..\recpt\usersaction.obj \154 ..\recpt\vlistbrowserclass.obj \155 ..\recpt\hlistbrowserclass.obj \156 ..\recpt\datelistbrowserclass.obj \157 ..\recpt\invbrowserclass.obj \158 ..\recpt\pagedbrowserclass.obj \159 ..\recpt\htmlbrowserclass.obj \160 ..\recpt\delhistoryaction.obj \161 ..\recpt\historydb.obj162 163 LIBRARYOBJECTS = ..\recpt\nullproto.obj164 165 COLSERVROBJECTS = ..\colservr\mgq.obj \166 ..\colservr\mgsearch.obj \167 ..\colservr\querycache.obj \168 ..\colservr\queryinfo.obj \169 ..\colservr\collectserver.obj \170 ..\colservr\colservrconfig.obj \171 ..\colservr\maptools.obj \172 ..\colservr\filter.obj \173 ..\colservr\source.obj \174 ..\colservr\browsefilter.obj \175 ..\colservr\queryfilter.obj \176 ..\colservr\mggdbmsource.obj \177 ..\colservr\phrasesearch.obj \178 ..\colservr\phrasequeryfilter.obj179 180 81 EXEC = server.exe 181 82 … … 187 88 188 89 install: 189 copy $(EXEC) $(GSDLHOME)\$(EXEC)90 copy $(EXEC) "$(GSDLHOME)" 190 91 191 LIBRARY_OBJS = $(OBJECTS) $(RECPTOBJECTS) $(LIBRARYOBJECTS) $(COLSERVROBJECTS) 192 server.exe: $(LIBRARY_OBJS) 193 $(LINK) $(LIBRARY_OBJS) $(LIBS) 92 server.exe: $(OBJECTS) 93 $(LINK) $(OBJECTS) $(LIBS) 194 94 195 95 196 SOURCE = $(GSDLHOME)\src\w32server\newgsdl.bmp197 SOURCE = $(GSDLHOME)\src\w32server\resource.h198 SOURCE = $(GSDLHOME)\src\w32server\server.ico199 SOURCE = $(GSDLHOME)\src\w32server\gsdlcol.bmp200 SOURCE = $(GSDLHOME)\src\w32server\server.rc96 SOURCE = "$(GSDLHOME)\src\w32server\newgsdl.bmp" 97 SOURCE = "$(GSDLHOME)\src\w32server\resource.h" 98 SOURCE = "$(GSDLHOME)\src\w32server\server.ico" 99 SOURCE = "$(GSDLHOME)\src\w32server\gsdlcol.bmp" 100 SOURCE = "$(GSDLHOME)\src\w32server\server.rc" 201 101 DEP_RSC_SERVE=\ 202 102 "$(GSDLHOME)\src\w32server\gsdlcol.bmp"\ 203 103 "$(GSDLHOME)\src\w32server\newgsdl.bmp"\ 204 "$(GSDLHOME)\src\w32server\server.ico" \104 "$(GSDLHOME)\src\w32server\server.ico" 205 105 206 106 server.res : $(SOURCE) $(DEP_RSC_SERVE) "$(GSDLHOME)\src\w32server" -
trunk/gsdl/src/w32server/wincgiutils.cpp
r2286 r2338 26 26 *********************************************************************/ 27 27 28 #include "text_t.h" 28 29 #include <windows.h> 29 30 #include <string.h> -
trunk/gsdl/win32.mak
r1012 r2338 25 25 ########################################################################### 26 26 27 GSDLHOME = d:\home\dl\gsdl28 29 27 AR = lib 30 28 CC = cl 31 29 CPPFLAGS = 32 30 33 MAKE = nmake 34 MDEFINES = /nologo /c /s /f win32.mak 31 GSDLHOME = $(MAKEDIR) 32 USE_STLPORT = 0 33 LOCAL_LIBRARY = 0 34 MDEFINES = /nologo /S /c /f win32.mak 35 35 COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) $(INCLUDES) 36 36 … … 39 39 OBJECTS = 40 40 41 ALLFILES = $(OBJECTS) 41 OTHERDIRS = packages\windows\gdbm\gdbm packages\windows\crypt\crypt \ 42 packages\mg\lib lib src\colservr 42 43 43 DIRS = packages\wingdbm packages\mg\lib packages\mg\src\text lib\44 src\colservr src\recpt src\w32server src\txt2db src\db2txt src\hashfile 44 INSTALLDIRS = packages\mg\src\text src\txt2db src\db2txt \ 45 src\hashfile src\recpt 45 46 46 INSTALLDIRS = src\recpt src\w32server src\txt2db src\db2txt src\hashfile packages\mg\src\text 47 MAKECMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)" 48 !IF $(USE_STLPORT) 49 MAKECMD = $(MAKECMD) USE_STLPORT=1 50 !ENDIF 51 !IF $(LOCAL_LIBRARY) 52 MAKECMD = $(MAKECMD) LOCAL_LIBRARY=1 53 INSTALLDIRS = $(INSTALLDIRS) src\w32server 54 !ENDIF 47 55 48 all: 49 for %%o in ($(DIRS)) do \ 50 (cd %%o && $(MAKE) $(MDEFINES) $@ && cd $(GSDLHOME)) || exit 1 56 all: win32.mak $(OTHERDIRS) $(INSTALLDIRS) 51 57 52 install: 53 for %%i in ($(INSTALLDIRS)) do \ 54 (cd %%i && $(MAKE) $(MDEFINES) install && cd $(GSDLHOME)) || exit 1 55 clean: 56 for %%s in ($(DIRS)) do \ 57 (cd %%s && $(MAKE) $(MDEFINES) clean && cd $(GSDLHOME)) || exit 1 58 install: win32.mak $(INSTALLDIRS) 59 60 $(OTHERDIRS): FORCE 61 cd "$@" 62 $(MAKECMD) 63 cd "$(GSDLHOME)" 64 65 $(INSTALLDIRS): FORCE 66 cd "$@" 67 $(MAKECMD) 68 $(MAKECMD) install 69 cd "$(GSDLHOME)" 70 71 FORCE:
Note:
See TracChangeset
for help on using the changeset viewer.