Changeset 1000 for trunk/gsdl/src


Ignore:
Timestamp:
2000-03-02T11:23:47+13:00 (24 years ago)
Author:
sjboddie
Message:

tidied up windows installation

Location:
trunk/gsdl/src
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/gsdl/src/colservr/win32.mak

    r743 r1000  
    2525###########################################################################
    2626
     27GSDLHOME = d:\home\dl\gsdl
     28STLPATH = d:\home\dl\stl\stlport
    2729
    2830AR = lib
    2931CC = cl
    3032CPPFLAGS =
    31 DEFS = -DNZDL -DQUIET -D__WIN32__ -D_LITTLE_ENDIAN -DGSDL_NAMESPACE_BROKEN \
     33LDFLAGS =
     34DEFS = -DNZDL -DQUIET -D__WIN32__ -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H \
    3235       -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H -D__STL_NO_NEW_IOSTREAMS \
    3336       -DGSDLSERVER
    34 INCLUDES = -I../.. -I../../lib -I../recpt -I../../packages/mg \
    35        -I../../packages/mg/lib -I../../packages/mg/src/text \
    36        -I..\..\packages\wingdbm -If:\STLport-3.2\stlport
     37INCLUDES = -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)
    3741
    38 LDFLAGS =
    39 LIBS = ..\..\packages\wingdbm\gdbm.lib
     42LIBS = $(GSDLHOME)\packages\wingdbm\gdbm.lib
    4043
    4144COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) $(INCLUDES)

  • trunk/gsdl/src/db2txt/win32.mak

    r744 r1000  
    11###########################################################################
    22#
    3 # win32.mak -- Makefile for file db2txt
    4 # Copyright (C) 1999 DigiLib Systems Ltd, All rights reserved
     3# win32 makefile -- db2txt
     4# A component of the Greenstone digital library software
     5# from the New Zealand Digital Library Project at the
     6# University of Waikato, New Zealand.
     7#
     8# Copyright (C) 1999  The New Zealand Digital Library Project
     9#
     10#
     11# This program is free software; you can redistribute it and/or modify
     12# it under the terms of the GNU General Public License as published by
     13# the Free Software Foundation; either version 2 of the License, or
     14# (at your option) any later version.
     15#
     16# This program is distributed in the hope that it will be useful,
     17# but WITHOUT ANY WARRANTY; without even the implied warranty of
     18# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     19# GNU General Public License for more details.
     20#
     21# You should have received a copy of the GNU General Public License
     22# along with this program; if not, write to the Free Software
     23# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
    524#
    625###########################################################################
    726
     27GSDLHOME = d:\home\dl\gsdl
     28STLPATH = d:\home\dl\stl\stlport
    829
    9 PACKAGE = db2txt
    10 VERSION =
    11  
    1230AR = lib
    1331CC = cl
    14 #CFLAGS = -g -O
    1532CPPFLAGS =
    16 DEFS = -DQUIET -DHAVE_CONFIG_H -D__WIN32__ -D_LITTLE_ENDIAN -D__STL_NO_NEW_IOSTREAMS \
    17 -DGSDL_NAMESPACE_BROKEN -DSHORT_SUFFIX
    18 INCLUDES = -I. -I..\..\lib -I..\..\packages\mg-1.3d\lib \
    19        -If:\STLport-3.2\stlport -I..\..\packages\wingdbm
    20 LIBS = ..\..\packages\mg-1.3d\lib\unitool.obj ..\..\lib\gsdllib.lib \
    21        ..\..\lib\gsdlunicode.obj ..\..\packages\wingdbm\gdbm.lib
    22 GSDLOS = windows
     33LDFLAGS =
     34DEFS = -DQUIET -DHAVE_CONFIG_H -D__WIN32__ -D__STL_NO_NEW_IOSTREAMS \
     35       -DGSDL_NAMESPACE_BROKEN -DSHORT_SUFFIX -DGSDL_USE_IOS_H
     36INCLUDES = -I$(GSDLHOME)\src\db2txt -I$(GSDLHOME)\lib -I$(GSDLHOME)\packages\mg\lib \
     37       -I$(STLPATH) -I$(GSDLHOME)\packages\wingdbm
     38LIBS = $(GSDLHOME)\packages\mg\lib\unitool.obj $(GSDLHOME)\lib\gsdllib.lib \
     39       $(GSDLHOME)\packages\wingdbm\gdbm.lib
    2340
    2441COMPILE = $(CC) -c -GX $(DEFS) $(INCLUDES)
    … …  
    3350o = .obj
    3451e = .exe
    35  
     52
    3653HEADERS =
    3754
    … …  
    4158
    4259EXEC = db2txt$e
    43  
     60
    4461all : $(EXEC)
    4562
    4663install: $(EXEC)
    47     copy $(EXEC) ../../bin/$(GSDLOS)/$(EXEC)
     64    if NOT EXIST $(GSDLHOME)\bin\windows mkdir $(GSDLHOME)\bin\windows
     65    copy $(EXEC) $(GSDLHOME)\bin\windows\$(EXEC)
    4866
    4967clean:
    … …  
    5169    del $(EXEC)
    5270
    53 DB2TXT_OBJS = db2txt$o
    54 
    55 db2txt$e: $(DB2TXT_OBJS) $(LIBS)
    56       $(LINK) $(DB2TXT_OBJS) $(LIBS)
     71db2txt$e: $(OBJECTS) $(LIBS)
     72      $(LINK) $(OBJECTS) $(LIBS)

  • trunk/gsdl/src/hashfile/win32.mak

    r744 r1000  
    11###########################################################################
    22#
    3 # win32.mak -- Makefile for file hashfile
    4 # Copyright (C) 1999 DigiLib Systems Ltd, All rights reserved
     3# win32 makefile -- hashfile
     4# A component of the Greenstone digital library software
     5# from the New Zealand Digital Library Project at the
     6# University of Waikato, New Zealand.
     7#
     8# Copyright (C) 1999  The New Zealand Digital Library Project
     9#
     10#
     11# This program is free software; you can redistribute it and/or modify
     12# it under the terms of the GNU General Public License as published by
     13# the Free Software Foundation; either version 2 of the License, or
     14# (at your option) any later version.
     15#
     16# This program is distributed in the hope that it will be useful,
     17# but WITHOUT ANY WARRANTY; without even the implied warranty of
     18# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     19# GNU General Public License for more details.
     20#
     21# You should have received a copy of the GNU General Public License
     22# along with this program; if not, write to the Free Software
     23# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
    524#
    625###########################################################################
     26 
     27GSDLHOME = d:\home\dl\gsdl
     28STLPATH = d:\home\dl\stl\stlport
    729
    8 
    9 PACKAGE = hashfile
    10 VERSION =
    11  
    1230AR = lib
    1331CC = cl
    14 #CFLAGS = -g -O
    1532CPPFLAGS =
    16 DEFS = -DQUIET -DHAVE_CONFIG_H -D__WIN32__ -D_LITTLE_ENDIAN -D__STL_NO_NEW_IOSTREAMS \
    17        -DGSDL_NAMESPACE_BROKEN -DSHORT_SUFFIX
    18 INCLUDES = -I. -I..\..\lib -If:\STLport-3.2\stlport
    19 LIBS = ..\..\lib\gsdllib.lib
    20 GSDLOS = windows
     33DEFS = -DQUIET -DHAVE_CONFIG_H -D__WIN32__ -D__STL_NO_NEW_IOSTREAMS \
     34       -DGSDL_NAMESPACE_BROKEN -DSHORT_SUFFIX -DGSDL_USE_IOS_H
     35INCLUDES = -I$(GSDLHOME)\src\hashfile -I$(GSDLHOME)\lib -I$(STLPATH)
     36LIBS = $(GSDLHOME)\lib\gsdllib.lib
    2137
    2238COMPILE = $(CC) -c -GX $(DEFS) $(INCLUDES)
    … …  
    4359
    4460install: $(EXEC)
    45     copy $(EXEC) ../../bin/$(GSDLOS)/$(EXEC)
     61    if NOT EXIST $(GSDLHOME)\bin\windows mkdir $(GSDLHOME)\bin\windows
     62    copy $(EXEC) $(GSDLHOME)\bin\windows\$(EXEC)
    4663
    4764clean:

  • trunk/gsdl/src/recpt/buildaction.cpp

    r984 r1000  
    2424 *********************************************************************/
    2525
     26#ifndef __WIN32__
    2627#include <unistd.h>
     28#endif
    2729
    2830#include "OIDtools.h"

  • trunk/gsdl/src/recpt/delhistoryaction.cpp

    r962 r1000  
    2626 *********************************************************************/
    2727
    28 
    29 
    3028#include "delhistoryaction.h"
    31 //#include "querytools.h"
    32 //#include "formattools.h"
    3329#include "cgiutils.h"
    34 //#include "OIDtools.h"
    35 //#include "infodbclass.h"
    36 //#include "fileutil.h"
    3730#include "text_t.h"
    3831#include "historydb.h"
    39 
    4032
    4133delhistoryaction::delhistoryaction () {
    … …  
    9385
    9486bool delhistoryaction::check_cgiargs (cgiargsinfoclass & /*argsinfo*/, cgiargsclass & /*args*/,
    95                  ostream &/*logout*/) {
     87                      ostream &/*logout*/) {
    9688  //dont check anything yet
    9789  return true;
    … …  
    9991
    10092void delhistoryaction::get_cgihead_info (cgiargsclass &/*args*/, recptprotolistclass * /*protos*/,
    101                     response_t &response, text_t &response_data,
    102                     ostream &/*logout*/) {
     93                    response_t &response, text_t &response_data,
     94                    ostream &/*logout*/) {
    10395  response = content;
    10496  response_data = "text/html";
    … …  
    10698
    10799void delhistoryaction::define_internal_macros (displayclass &/*disp*/, cgiargsclass &/*args*/,
    108                       recptprotolistclass */*protos*/,
    109                       ostream &/*logout*/) {
     100                           recptprotolistclass * /*protos*/,
     101                           ostream &/*logout*/) {
    110102
    111103  // define_internal_macros sets the following macros:

  • trunk/gsdl/src/recpt/historydb.h

    r963 r1000  
    3333#include "text_t.h"
    3434#include "recptproto.h"
    35 #include <map.h>
    3635
    3736struct HistRecord {

  • trunk/gsdl/src/recpt/userdb.cpp

    r997 r1000  
    2828/*
    2929   $Log$
     30   Revision 1.6  2000/03/01 22:23:09  sjboddie
     31   tidied up windows installation
     32
    3033   Revision 1.5  2000/02/29 21:53:09  sjboddie
    3134   tidied up crypt includes
    … …  
    5457
    5558// include crypt
     59#if defined(__WIN32__)
     60#include "crypt.h"
     61#else
    5662#if defined(HAVE_CRYPT_H)
    5763#include <crypt.h>
    5864#else
    5965#include <unistd.h>
     66#endif
    6067#endif
    6168

  • trunk/gsdl/src/recpt/win32.mak

    r743 r1000  
    2525###########################################################################
    2626
     27GSDLHOME = d:\home\dl\gsdl
     28STLPATH = d:\home\dl\stl\stlport
     29
    2730AR = lib
    2831CC = cl
    2932CPPFLAGS =
    30 DEFS = -DNZDL -DQUIET -D__WIN32__ -D_LITTLE_ENDIAN -DGSDL_NAMESPACE_BROKEN \
     33LDFLAGS =
     34DEFS = -DNZDL -DQUIET -D__WIN32__ -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H \
    3135       -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H -D__STL_NO_NEW_IOSTREAMS \
    3236       -DGSDLSERVER -DGSDLUSAGELOG 
    33 INCLUDES = -I..\..\lib -I. -I..\colservr -I..\..\packages\mg \
    34        -I..\..\packages\mg\lib -I..\..\packages\mg\src\text \
    35        -I..\..\packages\wingdbm -If:\STLport-3.2\stlport \
    36        -If:\cw32crypt
     37INCLUDES = -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
    3741
    38 LDFLAGS =
    39 LIBS = ..\..\packages\wingdbm\gdbm.lib f:\cw32crypt\crypt.lib
     42LIBS = $(GSDLHOME)\packages\wingdbm\gdbm.lib $(GSDLHOME)\packages\wincrypt\crypt.lib
    4043
    4144COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
    … …  
    5154    $(COMPILE) $<
    5255
     56
    5357COMMONHEADERS = receptionist.h cgiwrapper.h cgiargs.h action.h browserclass.h \
    5458                converter.h recptconfig.h cgiutils.h OIDtools.h browsetools.h htmlgen.h \
    … …  
    5963                userdb.h usersaction.h vlistbrowserclass.h hlistbrowserclass.h \
    6064        datelistbrowserclass.h invbrowserclass.h pagedbrowserclass.h \
    61         htmlbrowserclass.h
     65        htmlbrowserclass.h delhistoryaction.h historydb.h
    6266
    6367RECEPTHEADERS =
    … …  
    7579        tipaction.cpp authenaction.cpp infodbclass.cpp userdb.cpp usersaction.cpp \
    7680        vlistbrowserclass.cpp hlistbrowserclass.cpp datelistbrowserclass.cpp \
    77         invbrowserclass.cpp pagedbrowserclass.cpp htmlbrowserclass.cpp
     81        invbrowserclass.cpp pagedbrowserclass.cpp htmlbrowserclass.cpp \
     82        delhistoryaction.cpp historydb.cpp
    7883
    7984
    … …  
    9398                infodbclass.obj userdb.obj usersaction.obj vlistbrowserclass.obj \
    9499        hlistbrowserclass.obj datelistbrowserclass.obj invbrowserclass.obj \
    95         pagedbrowserclass.obj htmlbrowserclass.obj
     100        pagedbrowserclass.obj htmlbrowserclass.obj delhistoryaction.obj \
     101        historydb.obj
    96102
    97103RECPTOBJECTS = recptmain.obj
    … …  
    102108
    103109
    104 COLSERVROBJECTS = ..\colservr\mgq.obj \
    105                   ..\colservr\mgsearch.obj \
    106                   ..\colservr\querycache.obj \
    107                   ..\colservr\queryinfo.obj \
    108                   ..\colservr\collectserver.obj \
    109                   ..\colservr\colservrconfig.obj \
    110                   ..\colservr\maptools.obj \
    111                   ..\colservr\filter.obj \
    112                   ..\colservr\source.obj \
    113                   ..\colservr\browsefilter.obj \
    114                   ..\colservr\queryfilter.obj \
    115                   ..\colservr\mggdbmsource.obj \
    116                   ..\colservr\phrasesearch.obj \
    117                   ..\colservr\phrasequeryfilter.obj
     110COLSERVROBJECTS = $(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
    118124
    119125EXEC = recpt.exe library.exe
    … …  
    127133
    128134install:
    129     copy library.exe f:\apache\cgi-bin\library.exe
     135    copy library.exe $(GSDLHOME)\cgi-bin\library.exe
    130136
    131137# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
    132138
    133139RECPT_OBJS = $(COMMONOBJECTS) $(RECPTOBJECTS) \
    134     ..\..\lib\gsdllib.lib  \
    135     ..\..\packages\mg\src\text\libtextin.lib \
    136     ..\..\packages\mg\lib\libmg.lib
     140    $(GSDLHOME)\lib\gsdllib.lib  \
     141    $(GSDLHOME)\packages\mg\src\text\libtextin.lib \
     142    $(GSDLHOME)\packages\mg\lib\libmg.lib
    137143
    138144recpt.exe: $(RECPT_OBJS)
    … …  
    142148
    143149LIBRARY_OBJS = $(COMMONOBJECTS) $(LIBRARYOBJECTS) $(COLSERVROBJECTS) \
    144     ..\..\lib\gsdllib.lib \
    145     ..\..\packages\mg\src\text\libtextin.lib \
    146     ..\..\packages\mg\lib\libmg.lib
     150    $(GSDLHOME)\lib\gsdllib.lib \
     151    $(GSDLHOME)\packages\mg\src\text\libtextin.lib \
     152    $(GSDLHOME)\packages\mg\lib\libmg.lib
    147153
    148154library.exe: $(LIBRARY_OBJS)

  • trunk/gsdl/src/txt2db/win32.mak

    r903 r1000  
    11###########################################################################
    22#
    3 # win32.mak -- Makefile for file txt2db
    4 # Copyright (C) 1999 DigiLib Systems Ltd, All rights reserved
     3# win32 makefile -- txt2db
     4# A component of the Greenstone digital library software
     5# from the New Zealand Digital Library Project at the
     6# University of Waikato, New Zealand.
     7#
     8# Copyright (C) 1999  The New Zealand Digital Library Project
     9#
     10#
     11# This program is free software; you can redistribute it and/or modify
     12# it under the terms of the GNU General Public License as published by
     13# the Free Software Foundation; either version 2 of the License, or
     14# (at your option) any later version.
     15#
     16# This program is distributed in the hope that it will be useful,
     17# but WITHOUT ANY WARRANTY; without even the implied warranty of
     18# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     19# GNU General Public License for more details.
     20#
     21# You should have received a copy of the GNU General Public License
     22# along with this program; if not, write to the Free Software
     23# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
    524#
    625###########################################################################
    726
     27GSDLHOME = d:\home\dl\gsdl
     28STLPATH = d:\home\dl\stl\stlport
    829
    9 PACKAGE = txt2db
    10 VERSION =
    11  
    1230AR = lib
    1331CC = cl
    14 #CFLAGS = -g -O
    1532CPPFLAGS =
    16 DEFS = -DQUIET -DHAVE_CONFIG_H -D__WIN32__ -D_LITTLE_ENDIAN -D__STL_NO_NEW_IOSTREAMS \
    17 -DGSDL_NAMESPACE_BROKEN -DSHORT_SUFFIX
    18 INCLUDES = -I. -I..\..\lib -I..\..\packages\mg\lib \
    19        -Id:\home\dl\stl\stlport -I..\..\packages\wingdbm
    20 LIBS = ..\..\packages\mg\lib\unitool.obj ..\..\lib\gsdllib.lib \
    21        ..\..\lib\gsdlunicode.obj ..\..\packages\wingdbm\gdbm.lib
    22 GSDLOS = windows
     33LDFLAGS =
     34DEFS = -DQUIET -DHAVE_CONFIG_H -D__WIN32__ -D__STL_NO_NEW_IOSTREAMS \
     35       -DGSDL_NAMESPACE_BROKEN -DSHORT_SUFFIX -DGSDL_USE_IOS_H
     36INCLUDES = -I$(GSDLHOME)\src\txt2db -I$(GSDLHOME)\lib -I$(GSDLHOME)\packages\mg\lib \
     37       -I$(STLPATH) -I$(GSDLHOME)\packages\wingdbm
     38LIBS = $(GSDLHOME)\packages\mg\lib\unitool.obj $(GSDLHOME)\lib\gsdllib.lib \
     39       $(GSDLHOME)\packages\wingdbm\gdbm.lib
    2340
    2441COMPILE = $(CC) -c -GX $(DEFS) $(INCLUDES)
    … …  
    3855SOURCES = txt2db.cpp
    3956
    40 OBJECTS = txt2db.obj
     57OBJECTS = txt2db$o
    4158
    4259EXEC = txt2db$e
    … …  
    4562
    4663install: $(EXEC)
    47     copy -s $(EXEC) ../../bin/$(GSDLOS)/$(EXEC)
     64    if NOT EXIST $(GSDLHOME)\bin\windows mkdir $(GSDLHOME)\bin\windows
     65    copy $(EXEC) $(GSDLHOME)\bin\windows\$(EXEC)
    4866
    4967clean:
    … …  
    5169    del $(EXEC)
    5270
    53 TXT2DB_OBJS = txt2db$o
    54 
    55 txt2db$e: $(TXT2DB_OBJS) $(LIBS)
    56       $(LINK) $(TXT2DB_OBJS) $(LIBS)
     71txt2db$e: $(OBJECTS) $(LIBS)
     72      $(LINK) $(OBJECTS) $(LIBS)
Note: See TracChangeset for help on using the changeset viewer.