Changeset 1000 for trunk/gsdl/src/recpt

Timestamp:

2000-03-02T11:23:47+13:00 (24 years ago)

Author:

sjboddie

Message:

tidied up windows installation

Location:

trunk/gsdl/src/recpt

Files:

• buildaction.cpp (modified) (1 diff)
• delhistoryaction.cpp (modified) (4 diffs)
• historydb.h (modified) (1 diff)
• userdb.cpp (modified) (2 diffs)
• win32.mak (modified) (8 diffs)

trunk/gsdl/src/recpt/buildaction.cpp

@@ -24 +24 @@
  *********************************************************************/
 
+#ifndef __WIN32__
 #include <unistd.h>
+#endif
 
 #include "OIDtools.h"

trunk/gsdl/src/recpt/delhistoryaction.cpp

@@ -26 +26 @@
  *********************************************************************/
 
-
-
 #include "delhistoryaction.h"
-//#include "querytools.h"
-//#include "formattools.h"
 #include "cgiutils.h"
-//#include "OIDtools.h"
-//#include "infodbclass.h"
-//#include "fileutil.h"
 #include "text_t.h"
 #include "historydb.h"
-
 
 delhistoryaction::delhistoryaction () {
@@ -93 +85 @@
 
 bool delhistoryaction::check_cgiargs (cgiargsinfoclass & /*argsinfo*/, cgiargsclass & /*args*/, 
-                 ostream &/*logout*/) {
+                      ostream &/*logout*/) {
   //dont check anything yet
   return true;
@@ -99 +91 @@
 
 void delhistoryaction::get_cgihead_info (cgiargsclass &/*args*/, recptprotolistclass * /*protos*/,
-                    response_t &response, text_t &response_data, 
-                    ostream &/*logout*/) {
+                     response_t &response, text_t &response_data, 
+                     ostream &/*logout*/) {
   response = content;
   response_data = "text/html";
@@ -106 +98 @@
 
 void delhistoryaction::define_internal_macros (displayclass &/*disp*/, cgiargsclass &/*args*/, 
-                      recptprotolistclass */*protos*/, 
-                      ostream &/*logout*/) {
+                           recptprotolistclass * /*protos*/, 
+                           ostream &/*logout*/) {
 
   // define_internal_macros sets the following macros:

trunk/gsdl/src/recpt/historydb.h

@@ -33 +33 @@
 #include "text_t.h"
 #include "recptproto.h"
-#include <map.h>
 
 struct HistRecord {

trunk/gsdl/src/recpt/userdb.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.6  2000/03/01 22:23:09  sjboddie
+   tidied up windows installation
+
    Revision 1.5  2000/02/29 21:53:09  sjboddie
    tidied up crypt includes
@@ -54 +57 @@
 
 // include crypt
+#if defined(__WIN32__)
+#include "crypt.h"
+#else
 #if defined(HAVE_CRYPT_H)
 #include <crypt.h>
 #else 
 #include <unistd.h>
+#endif
 #endif
 

trunk/gsdl/src/recpt/win32.mak

@@ -25 +25 @@
 ###########################################################################
 
+GSDLHOME = d:\home\dl\gsdl
+STLPATH = d:\home\dl\stl\stlport
+
 AR = lib
 CC = cl
 CPPFLAGS =
-DEFS = -DNZDL -DQUIET -D__WIN32__ -D_LITTLE_ENDIAN -DGSDL_NAMESPACE_BROKEN \
+LDFLAGS =
+DEFS = -DNZDL -DQUIET -D__WIN32__ -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H \
        -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H -D__STL_NO_NEW_IOSTREAMS \
        -DGSDLSERVER -DGSDLUSAGELOG  
-INCLUDES = -I..\..\lib -I. -I..\colservr -I..\..\packages\mg \
-       -I..\..\packages\mg\lib -I..\..\packages\mg\src\text \
-       -I..\..\packages\wingdbm -If:\STLport-3.2\stlport \
-       -If:\cw32crypt
+INCLUDES = -I$(GSDLHOME)\src\recpt -I$(GSDLHOME)\lib -I$(GSDLHOME)\src\colservr \
+       -I$(GSDLHOME)\packages\mg -I$(GSDLHOME)\packages\mg\lib \
+       -I$(GSDLHOME)\packages\mg\src\text -I$(GSDLHOME)\packages\wingdbm \
+       -I$(STLPATH) -I$(GSDLHOME)\packages\wincrypt
 
-LDFLAGS =
-LIBS = ..\..\packages\wingdbm\gdbm.lib f:\cw32crypt\crypt.lib
+LIBS = $(GSDLHOME)\packages\wingdbm\gdbm.lib $(GSDLHOME)\packages\wincrypt\crypt.lib
 
 COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
@@ -51 +54 @@
     $(COMPILE) $< 
 
+
 COMMONHEADERS = receptionist.h cgiwrapper.h cgiargs.h action.h browserclass.h \
                 converter.h recptconfig.h cgiutils.h OIDtools.h browsetools.h htmlgen.h \
@@ -59 +63 @@
                 userdb.h usersaction.h vlistbrowserclass.h hlistbrowserclass.h \
         datelistbrowserclass.h invbrowserclass.h pagedbrowserclass.h \
-        htmlbrowserclass.h
+        htmlbrowserclass.h delhistoryaction.h historydb.h
 
 RECEPTHEADERS = 
@@ -75 +79 @@
         tipaction.cpp authenaction.cpp infodbclass.cpp userdb.cpp usersaction.cpp \
         vlistbrowserclass.cpp hlistbrowserclass.cpp datelistbrowserclass.cpp \
-        invbrowserclass.cpp pagedbrowserclass.cpp htmlbrowserclass.cpp
+        invbrowserclass.cpp pagedbrowserclass.cpp htmlbrowserclass.cpp \
+        delhistoryaction.cpp historydb.cpp
 
 
@@ -93 +98 @@
                 infodbclass.obj userdb.obj usersaction.obj vlistbrowserclass.obj \
         hlistbrowserclass.obj datelistbrowserclass.obj invbrowserclass.obj \
-        pagedbrowserclass.obj htmlbrowserclass.obj
+        pagedbrowserclass.obj htmlbrowserclass.obj delhistoryaction.obj \
+        historydb.obj
 
 RECPTOBJECTS = recptmain.obj
@@ -102 +108 @@
 
 
-COLSERVROBJECTS = ..\colservr\mgq.obj \
-                  ..\colservr\mgsearch.obj \
-                  ..\colservr\querycache.obj \
-                  ..\colservr\queryinfo.obj \
-                  ..\colservr\collectserver.obj \
-                  ..\colservr\colservrconfig.obj \
-                  ..\colservr\maptools.obj \
-                  ..\colservr\filter.obj \
-                  ..\colservr\source.obj \
-                  ..\colservr\browsefilter.obj \
-                  ..\colservr\queryfilter.obj \
-                  ..\colservr\mggdbmsource.obj \
-                  ..\colservr\phrasesearch.obj \
-                  ..\colservr\phrasequeryfilter.obj
+COLSERVROBJECTS = $(GSDLHOME)\src\colservr\mgq.obj \
+                  $(GSDLHOME)\src\colservr\mgsearch.obj \
+                  $(GSDLHOME)\src\colservr\querycache.obj \
+                  $(GSDLHOME)\src\colservr\queryinfo.obj \
+                  $(GSDLHOME)\src\colservr\collectserver.obj \
+                  $(GSDLHOME)\src\colservr\colservrconfig.obj \
+                  $(GSDLHOME)\src\colservr\maptools.obj \
+                  $(GSDLHOME)\src\colservr\filter.obj \
+                  $(GSDLHOME)\src\colservr\source.obj \
+                  $(GSDLHOME)\src\colservr\browsefilter.obj \
+                  $(GSDLHOME)\src\colservr\queryfilter.obj \
+                  $(GSDLHOME)\src\colservr\mggdbmsource.obj \
+                  $(GSDLHOME)\src\colservr\phrasesearch.obj \
+                  $(GSDLHOME)\src\colservr\phrasequeryfilter.obj
 
 EXEC = recpt.exe library.exe
@@ -127 +133 @@
 
 install:
-    copy library.exe f:\apache\cgi-bin\library.exe
+    copy library.exe $(GSDLHOME)\cgi-bin\library.exe
 
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 
 RECPT_OBJS = $(COMMONOBJECTS) $(RECPTOBJECTS) \
-    ..\..\lib\gsdllib.lib  \
-    ..\..\packages\mg\src\text\libtextin.lib \
-    ..\..\packages\mg\lib\libmg.lib
+    $(GSDLHOME)\lib\gsdllib.lib  \
+    $(GSDLHOME)\packages\mg\src\text\libtextin.lib \
+    $(GSDLHOME)\packages\mg\lib\libmg.lib
 
 recpt.exe: $(RECPT_OBJS)
@@ -142 +148 @@
 
 LIBRARY_OBJS = $(COMMONOBJECTS) $(LIBRARYOBJECTS) $(COLSERVROBJECTS) \
-    ..\..\lib\gsdllib.lib \
-    ..\..\packages\mg\src\text\libtextin.lib \
-    ..\..\packages\mg\lib\libmg.lib
+    $(GSDLHOME)\lib\gsdllib.lib \
+    $(GSDLHOME)\packages\mg\src\text\libtextin.lib \
+    $(GSDLHOME)\packages\mg\lib\libmg.lib
 
 library.exe: $(LIBRARY_OBJS)