Use yazdebug.{dll,lib} for debug version of YAZ to allow both debug/release

version of YAZ to be in use. Debug libraries are now part of WIn32 install.

diff --git a/win/makefile b/win/makefile
index 6807d1a..001364e 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -1,6 +1,6 @@
 # Copyright (C) 1994-2004, Index Data
 # All rights reserved.
-# $Id: makefile,v 1.80 2004-08-13 08:40:19 adam Exp $
+# $Id: makefile,v 1.81 2004-08-18 09:01:13 adam Exp $
 #
 # Programmed by
 #  HL: Heikki Levanto, Index Data
@@ -39,9 +39,13 @@ default: all
 
 all: dirs generate dll client ztest zoomsh utilprog iconv libxml2
 
-NSIS="c:\program files\nsis\makensis-bz2.exe"
+NSIS="c:\program files\nsis\makensis.exe"
 
-nsis: all
+nsis: 
+       nmake DEBUG=1 clean
+       nmake DEBUG=0 clean
+       nmake DEBUG=1
+       nmake DEBUG=0
        $(NSIS) yaz.nsi
 
 nsishelp:
@@ -60,9 +64,15 @@ INCLDIR=$(ROOTDIR)\include  # 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
 SRCDIR=$(ROOTDIR)\src       # for the case we move them under src
 
+# where we store intermediate files
+!if $(DEBUG)
+OBJDIR=$(WINDIR)\dobj
+!else
+OBJDIR=$(WINDIR)\obj
+!endif
+
 CLIENTDIR=$(ROOTDIR)\CLIENT
 ZTESTDIR=$(ROOTDIR)\ZTEST
 ZOOMDIR=$(ROOTDIR)\ZOOM
@@ -75,8 +85,13 @@ TMP=$(TMPDIR)
 ############### Targets - what to make
 ###########################################################
 
+!if $(DEBUG)
+DLL=$(BINDIR)\yazdebug.dll
+IMPLIB=$(LIBDIR)\yazdebug.lib
+!else
 DLL=$(BINDIR)\yaz.dll
 IMPLIB=$(LIBDIR)\yaz.lib
+!endif
 
 CLIENT=$(BINDIR)\yaz-client.exe
 ZOOMSH=$(BINDIR)\zoomsh.exe
@@ -668,7 +683,7 @@ $(DLL) $(IMPLIB): "$(BINDIR)" $(DLL_OBJS) $(YAZ_RES)
                $(DLL_OBJS)
                $(YAZ_RES)
                /out:$(DLL) 
-               /implib:"$(LIBDIR)\yaz.lib"
+               /implib:"$(IMPLIB)"
                /map:"$(LIBDIR)\yaz.map"  
 <<
 

diff --git a/win/yaz.nsi b/win/yaz.nsi
index c14f63d..11bb789 100644 (file)
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -1,9 +1,11 @@
-; $Id: yaz.nsi,v 1.51 2004-08-11 09:05:56 adam Exp $
+; $Id: yaz.nsi,v 1.52 2004-08-18 09:01:13 adam Exp $
 
 !define VERSION "2.0.23"
 
 !include "MUI.nsh"
 
+SetCompressor bzip2
+
 Name "YAZ"
 Caption "Index Data YAZ ${VERSION} Setup"
 OutFile "yaz_${VERSION}.exe"
@@ -81,8 +83,11 @@ Section "YAZ Runtime" YAZ_Runtime
        ExecWait '"$INSTDIR\bin\yaz-ztest.exe" -remove'
 Noservice:
        SetOutPath $INSTDIR\bin
+       File ..\bin\iconv.dll
+       File ..\bin\zlib.dll
+       File ..\bin\libxml2.dll
+       File ..\bin\yaz.dll
        File ..\bin\*.exe
-       File ..\bin\*.dll
        SetOutPath $SMPROGRAMS\YAZ
        CreateShortCut "$SMPROGRAMS\YAZ\YAZ Client.lnk" \
                  "$INSTDIR\bin\yaz-client.exe"
@@ -101,6 +106,8 @@ Section "YAZ Development" YAZ_Development
        File ..\include\yaz\*.h
        SetOutPath $INSTDIR\lib
        File ..\lib\*.lib
+       SetOutPath $INSTDIR\bin
+       File ..\bin\yazdebug.dll
 SectionEnd
 
 Section "YAZ Documentation" YAZ_Documentation

diff --git a/win/yaz.rc b/win/yaz.rc
index cc3a7c4..75eb204 100644 (file)
--- a/win/yaz.rc
+++ b/win/yaz.rc
@@ -54,8 +54,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,23,3
- PRODUCTVERSION 2,0,23,3
+ FILEVERSION 2,0,23,4
+ PRODUCTVERSION 2,0,23,4
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -73,14 +73,14 @@ BEGIN
             VALUE "Comments", "Z39.50 C Library\0"
             VALUE "CompanyName", "Index Data\0"
             VALUE "FileDescription", "YAZ Toolkit\0"
-            VALUE "FileVersion", "2, 0, 23, 3\0"
+            VALUE "FileVersion", "2, 0, 23, 4\0"
             VALUE "InternalName", "YAZ\0"
             VALUE "LegalCopyright", "Copyright © 1995-2004 Index Data\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "yaz.rc\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "Index Data YAZ Toolkit\0"
-            VALUE "ProductVersion", "2, 0, 23, 3\0"
+            VALUE "ProductVersion", "2, 0, 23, 4\0"
             VALUE "SpecialBuild", "\0"
         END
     END