From 4d640ad2c7256e7571fbeb0a051473f4924d5456 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Fri, 10 Sep 1999 10:02:29 +0000 Subject: [PATCH] Added MS NMAKE files - removed project files. --- irtcl.dsp | 133 ----------------------------------- irtcl.dsw | 29 -------- irtdb.tcl | 24 +++---- win/makefile | 219 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 231 insertions(+), 174 deletions(-) delete mode 100644 irtcl.dsp delete mode 100644 irtcl.dsw create mode 100644 win/makefile diff --git a/irtcl.dsp b/irtcl.dsp deleted file mode 100644 index e547a89..0000000 --- a/irtcl.dsp +++ /dev/null @@ -1,133 +0,0 @@ -# Microsoft Developer Studio Project File - Name="irtcl" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=irtcl - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "irtcl.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "irtcl.mak" CFG="irtcl - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "irtcl - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "irtcl - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "irtcl - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\yaz\include" /I "..\tcl\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D IR_TCL_VERSION=\"1.3\" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 -# ADD BASE RSC /l 0x406 /d "NDEBUG" -# ADD RSC /l 0x406 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib yaz.lib tcl80vc.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"..\yaz\release" /libpath:"..\tcl\lib" -# Begin Special Build Tool -OutDir=.\Release -ProjDir=. -TargetName=irtcl -SOURCE=$(InputPath) -PostBuild_Cmds=copy $(OutDir)\$(TargetName).dll $(ProjDir)\..\bin -# End Special Build Tool - -!ELSEIF "$(CFG)" == "irtcl - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\yaz\include" /I "..\tcl\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D IR_TCL_VERSION=\"1.3\" /FR /FD /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 -# ADD BASE RSC /l 0x406 /d "_DEBUG" -# ADD RSC /l 0x406 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib yaz.lib tcl80vc.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"..\yaz\debug" /libpath:"..\tcl\lib" -# Begin Special Build Tool -OutDir=.\Debug -ProjDir=. -TargetName=irtcl -SOURCE=$(InputPath) -PostBuild_Cmds=copy $(OutDir)\$(TargetName).dll $(ProjDir)\..\bin -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "irtcl - Win32 Release" -# Name "irtcl - Win32 Debug" -# Begin Source File - -SOURCE=.\explain.c -# End Source File -# Begin Source File - -SOURCE=.\grs.c -# End Source File -# Begin Source File - -SOURCE=".\ir-tcl.c" -# End Source File -# Begin Source File - -SOURCE=.\marc.c -# End Source File -# Begin Source File - -SOURCE=.\mem.c -# End Source File -# Begin Source File - -SOURCE=.\queue.c -# End Source File -# Begin Source File - -SOURCE=.\select.c -# End Source File -# End Target -# End Project diff --git a/irtcl.dsw b/irtcl.dsw deleted file mode 100644 index d1c7f37..0000000 --- a/irtcl.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 5.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "irtcl"=.\irtcl.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/irtdb.tcl b/irtdb.tcl index a7fd700..0b049a9 100644 --- a/irtdb.tcl +++ b/irtdb.tcl @@ -52,7 +52,7 @@ set {profile(Bell Laboratories Library Network,timeDefine)} 878567355 set {profile(Bell Laboratories Library Network,timeLastExplain)} 891519770 set {profile(Bell Laboratories Library Network,timeLastInit)} 891519770 set {profile(Bell Laboratories Library Network,welcomeMessage)} {Salutations - this is Lucent Technologies experimental Z39.50 server. No guarentees, but free and unlimited access!} -set {profile(Bell Laboratories Library Network,windowNumber)} 17 +set {profile(Bell Laboratories Library Network,windowNumber)} 16 set {profile(Bibliothèque Nationale du Québec,authentication)} {} set {profile(Bibliothèque Nationale du Québec,comstack)} tcpip set {profile(Bibliothèque Nationale du Québec,databases)} IRIS @@ -79,7 +79,7 @@ set {profile(Biblioth set {profile(Bibliothèque Nationale du Québec,timeLastExplain)} {} set {profile(Bibliothèque Nationale du Québec,timeLastInit)} 887288466 set {profile(Bibliothèque Nationale du Québec,welcomeMessage)} {} -set {profile(Bibliothèque Nationale du Québec,windowNumber)} 8 +set {profile(Bibliothèque Nationale du Québec,windowNumber)} 17 set {profile(British Library,authentication)} {} set {profile(British Library,comstack)} tcpip set {profile(British Library,databases)} {EXPLAIN MAR SRI} @@ -194,7 +194,7 @@ set profile(LOC,timeDefine) 878567355 set profile(LOC,timeLastExplain) {} set profile(LOC,timeLastInit) 918732361 set profile(LOC,welcomeMessage) {} -set profile(LOC,windowNumber) 12 +set profile(LOC,windowNumber) 11 set {profile(OCLC FirstSearch,authentication)} {} set {profile(OCLC FirstSearch,comstack)} tcpip set {profile(OCLC FirstSearch,databases)} {AGRICOLA MEDLINE} @@ -225,7 +225,7 @@ set {profile(OCLC FirstSearch,timeDefine)} {} set {profile(OCLC FirstSearch,timeLastExplain)} {} set {profile(OCLC FirstSearch,timeLastInit)} 886167890 set {profile(OCLC FirstSearch,welcomeMessage)} {} -set {profile(OCLC FirstSearch,windowNumber)} 16 +set {profile(OCLC FirstSearch,windowNumber)} 15 set profile(Penn,authentication) {} set profile(Penn,comstack) tcpip set profile(Penn,databases) CATALOG @@ -285,7 +285,7 @@ set profile(Stein,timeDefine) {} set profile(Stein,timeLastExplain) 893857722 set profile(Stein,timeLastInit) 897482265 set profile(Stein,welcomeMessage) {Welcome to the Z39.50 target of Steiermaerkische Landesbibliothek, Graz, Austria.} -set profile(Stein,windowNumber) 13 +set profile(Stein,windowNumber) 12 set profile(arcatarget,authentication) {} set profile(arcatarget,comstack) tcpip set profile(arcatarget,databases) {IEI-books IR-Explain-1} @@ -316,7 +316,7 @@ set profile(arcatarget,timeDefine) 878567355 set profile(arcatarget,timeLastExplain) 887289477 set profile(arcatarget,timeLastInit) 887289477 set profile(arcatarget,welcomeMessage) {buon lavoro} -set profile(arcatarget,windowNumber) 9 +set profile(arcatarget,windowNumber) 8 set profile(author,authentication) {} set profile(author,comstack) tcpip set profile(author,databases) {spain portugal france england belgium} @@ -369,8 +369,8 @@ set profile(bagel.indexdata.dk,recentNews) {} set profile(bagel.indexdata.dk,smallSetUpperBound) 0 set profile(bagel.indexdata.dk,targetInfoName) Zebra set profile(bagel.indexdata.dk,timeDefine) {} -set profile(bagel.indexdata.dk,timeLastExplain) 897483464 -set profile(bagel.indexdata.dk,timeLastInit) 897483464 +set profile(bagel.indexdata.dk,timeLastExplain) 936957709 +set profile(bagel.indexdata.dk,timeLastInit) 936957709 set profile(bagel.indexdata.dk,welcomeMessage) {} set profile(bagel.indexdata.dk,windowNumber) 4 set profile(bagel9999,authentication) {} @@ -400,7 +400,7 @@ set profile(bagel9999,timeDefine) {} set profile(bagel9999,timeLastExplain) {} set profile(bagel9999,timeLastInit) 891524781 set profile(bagel9999,welcomeMessage) {} -set profile(bagel9999,windowNumber) 10 +set profile(bagel9999,windowNumber) 9 set profile(dranet,authentication) {} set profile(dranet,comstack) tcpip set profile(dranet,databases) drewdb @@ -485,7 +485,7 @@ set profile(madison,timeDefine) 878567355 set profile(madison,timeLastExplain) {} set profile(madison,timeLastInit) 887289602 set profile(madison,welcomeMessage) {} -set profile(madison,windowNumber) 11 +set profile(madison,windowNumber) 10 set profile(pica,authentication) {} set profile(pica,comstack) tcpip set profile(pica,databases) {IR-Explain-1 NCC-IBL OLC} @@ -541,7 +541,7 @@ set profile(zno,timeDefine) {} set profile(zno,timeLastExplain) {} set profile(zno,timeLastInit) 891593773 set profile(zno,welcomeMessage) {} -set profile(zno,windowNumber) 14 +set profile(zno,windowNumber) 13 set profile(ztest9999,authentication) {} set profile(ztest9999,comstack) tcpip set profile(ztest9999,databases) {Default IR-Explain-1} @@ -570,7 +570,7 @@ set profile(ztest9999,timeDefine) 878567355 set profile(ztest9999,timeLastExplain) 897392133 set profile(ztest9999,timeLastInit) 897392253 set profile(ztest9999,welcomeMessage) {} -set profile(ztest9999,windowNumber) 15 +set profile(ztest9999,windowNumber) 14 set queryTypes {Simple phrase} set queryButtons {{{I 3} {I 0} {I 0}} {{I 0} {I 1} {I 0}}} set queryInfo {{{Title {1=4}} {Author {1=1}} {Subject {1=21}} {Any {1=1016}} {Query 1=1016 2=102} {Title-rank 1=4 2=102} {Date/time 1=1012} {Title-regular 1=4 2=3 4=2 5=102} {Ranked 1=1016 2=102 3=3 4=1 6=1}} {{Title 1=4 4=1 6=2} {Author 1=1003 4=1 6=2} {ISBN 1=7} {ISSN 1=8} {Year 1=30 4=4 6=2} {Any {}}}} diff --git a/win/makefile b/win/makefile new file mode 100644 index 0000000..b5e0a1d --- /dev/null +++ b/win/makefile @@ -0,0 +1,219 @@ +# IRTCL makefile for MS NMAKE +# $Id: makefile,v 1.1 1999-09-10 10:02:29 adam Exp $ +# +# Log at the end of the file +VERSION=1.3 + +########################################################### +############### Parameters +########################################################### + +DEBUG=0 # 0 for release, 1 for debug + +default: all + +all: dirs irtcl + +########################################################### +############### Directories +########################################################### +# The current directory is supposed to be something like +# ..../IRTCL/Win, everything is relative to that +ROOTDIR=.. # The home of IRTCL + +# TCL include files, libraries, etc. +TCLINCL="c:\program files\tcl\include" +TCLLIB="c:\program files\tcl\lib\tcl82.lib" + +# YAZ include files, libraries, etc. +YAZDIR=$(ROOTDIR)\..\YAZ +YAZLIB=$(YAZDIR)\lib\yaz.lib +YAZINCL=$(YAZDIR)\include + +# IRTCL Include files, libraries, programs, etc. +INCLDIR=$(ROOTDIR) # our includes +LIBDIR=$(ROOTDIR)\lib # We produce .lib, .exp etc there +BINDIR=$(ROOTDIR)\bin # We produce exes and dlls there +WINDIR=$(ROOTDIR)\win # all these Win make things +OBJDIR=$(WINDIR)\obj # where we store intermediate files +UNIXDIR=$(ROOTDIR)\unix # corresponding unix things +SRCDIR=$(ROOTDIR) # for the case we move them under src + +# Force temp files in a local temp, easier to clean +# when nmake crashes and leaves a lot of rubbish behind +TMPDIR=$(ROOTDIR)\win\tmp +TMP=$(TMPDIR) +TEMP=$(TMPDIR) + +########################################################### +############### Targets - what to make +########################################################### + +IRTCLDLL=$(BINDIR)\irtcl.dll +irtcl : $(IRTCLDLL) + +########################################################### +############### Compiler and linker options +########################################################### + + +### C and CPP compiler (the same thing) +# Note: $(CPP) has already been defined in the environment +# (if you set things up right!) + +COMMON_C_OPTIONS= \ + /nologo /W3 /GX /FD /c \ + /D "WIN32" /D "IR_TCL_VERSION=\"$(VERSION)\"" \ + /FR"$(OBJDIR)\\" \ + /Fo"$(OBJDIR)\\" \ + /Fd"$(OBJDIR)\\" + +COMMON_C_INCLUDES= \ + /I$(SRCDIR) \ + /I$(YAZINCL) \ + /I$(TCLINCL) \ + +DEBUG_C_OPTIONS= \ + /D "_DEBUG" \ + /MDd /Od /YX /Zi /Gm + +RELEASE_C_OPTIONS= \ + /D "NDEBUG" \ + /MD /O2 + +# /W3 = warning level +# /GX = Enable exception handling +# /FD = Generate file dependencies (what ever they are) +# /c = compile without linking +# /FR = Generate browse info (.sbr file that gets combined into .bsc) +# /Fo = object file name (or at least path) +# /Fd = debug database name (or path) +# /MD = Runtime library: Multithread DLL +# /MDd = Runtime library: Multithread DLL (debug) +# /Od = Disable optimising (debug) +# /O2 = Optimize for speed +# /YX = Automatic use of precomipled headers +# /Gm = Minimal rebuild (some cpp class stuff) +# /Zi = Program database for debuggers +# /ZI = Pgm database with special "edit&continue" stuff - not available in C5 + + +### Linker options +LINK=link.exe + +LINK_LIBS= kernel32.lib user32.lib gdi32.lib winspool.lib \ + comdlg32.lib advapi32.lib shell32.lib ole32.lib \ + oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \ + wsock32.lib advapi32.lib + +COMMON_LNK_OPTIONS= \ + /nologo \ + /machine:i386 \ + /incremental:no + +DEBUG_LNK_OPTIONS= /debug + +RELEASE_LNK_OPTIONS= /pdb:none + +IRTCL_LINK_OPTIONS = /dll + +# Final opt variables +!if $(DEBUG) +COPT= $(COMMON_C_OPTIONS) $(DEBUG_C_OPTIONS) $(COMMON_C_INCLUDES) +MTLOPT= $(COMMON_MTL_OPTIONS) $(DEBUG_MTL_OPTIONS) +RCOPT= $(COMMON_RC_OPTIONS) $(DEBUG_RC_OPTIONS) +LNKOPT= $(COMMON_LNK_OPTIONS) $(DEBUG_LNK_OPTIONS) $(LNK_LIBS) + +!else +COPT= $(COMMON_C_OPTIONS) $(RELEASE_C_OPTIONS) $(COMMON_C_INCLUDES) +MTLOPT= $(COMMON_MTL_OPTIONS) $(RELEASE_MTL_OPTIONS) +RCOPT= $(COMMON_RC_OPTIONS) $(RELEASE_RC_OPTIONS) +LNKOPT= $(COMMON_LNK_OPTIONS) $(RELEASE_LNK_OPTIONS) $(LNK_LIBS) +!endif + +########################################################### +############### Source and object modules +########################################################### + +# Note: Ordinary source files are not specified here at +# all, make finds them in suitable dirs. The object modules +# need to be specified, though + +IRTCL_OBJS = \ + $(OBJDIR)\ir-tcl.obj \ + $(OBJDIR)\grs.obj \ + $(OBJDIR)\explain.obj \ + $(OBJDIR)\marc.obj \ + $(OBJDIR)\mem.obj \ + $(OBJDIR)\queue.obj \ + $(OBJDIR)\select.obj + +ALL_OBJS=$(IRTCL_OBJS) + +########################################################### +############### Compiling +########################################################### + +# Note: This defines where to look for the necessary +# source files. Funny way of doing it, but it works. + +{$(SRCDIR)}.cpp{$(OBJDIR)}.obj: + @$(CPP) $(COPT) $< + +{$(SRCDIR)}.c{$(OBJDIR)}.obj: + @$(CPP) $(COPT) $< + +########################################################### +############### Linking +########################################################### + +$(IRTCLDLL) : "$(BINDIR)" $(IRTCL_OBJS) + @echo Linking irtcl DLL $(IRTCLDLL) + $(LINK) $(IRTCL_LINK_OPTIONS) @<< + /nologo + $(IRTCL_OBJS) + /out:$(IRTCLDLL) + $(YAZLIB) + $(TCLLIB) +<< + + +########################################################### +############### Special operations +########################################################### + + +############## clean +clean: + del $(OBJDIR)\*.obj + del $(OBJDIR)\*.sbr + del $(TMPDIR)\*. + del $(IRTCLDLL) + +# Because DOS del will only accept one file name to delete, +# the _H_ files work only on sets that have just one file. +# Z3950_H_FILES had to be spelled out. One more point for MS! + +########### check directories and create if needed +dirs: $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR) + +$(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR): + if not exist "$@/$(NUL)" mkdir "$@" + +########################################################### +############### Explicit dependencies +########################################################### + +$(ALL_OBJS): makefile + +# force recompilation of everything, if makefile changed + +########################################################### +############### Log +########################################################### +# +# $Log: makefile,v $ +# Revision 1.1 1999-09-10 10:02:29 adam +# Added MS NMAKE files - removed project files. +# + -- 1.7.10.4