From 3b703e575c88bd31b38f5af81c29aeed757ff11b Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 22 Apr 2005 14:51:11 +0000
Subject: [PATCH] WIN32 updates for Diagnostics from CSV files.

---
 src/csvtodiag.tcl |    3 ++-
 win/makefile      |   11 ++++++++++-
 win/yaz.nsi       |    5 +++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/csvtodiag.tcl b/src/csvtodiag.tcl
index e5d6a3f..0066a3f 100644
--- a/src/csvtodiag.tcl
+++ b/src/csvtodiag.tcl
@@ -2,7 +2,7 @@
 # Copyright (c) Index Data 1996-2005
 # See the file LICENSE for details.
 #
-# $Id: csvtodiag.tcl,v 1.1 2005-04-22 08:27:58 adam Exp $
+# $Id: csvtodiag.tcl,v 1.2 2005-04-22 14:51:11 adam Exp $
 #
 # Converts a CSV file with diagnostics to C+H file for easy
 # maintenance
@@ -21,6 +21,7 @@ proc csvtodiag {ifiles name alias} {
     puts $cfile $preamble
     puts $cfile "
 #include \"diag-entry.h\"
+\#include \"[lindex $ifiles 2]\"
 struct yaz_diag_entry yaz_diag_${name}_tab\[\] = \{
 "
     puts $hfile $preamble
diff --git a/win/makefile b/win/makefile
index 71ed117..d69f4fe 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,6 +1,6 @@
 # Copyright (C) 1994-2005, Index Data ApS
 # All rights reserved.
-# $Id: makefile,v 1.93 2005-04-18 08:04:36 adam Exp $
+# $Id: makefile,v 1.94 2005-04-22 14:51:11 adam Exp $
 #
 # Programmed by
 #  Heikki Levanto & Adam Dickmeiss
@@ -360,6 +360,7 @@ YAZ_UTIL_OBJS= \
 YAZ_ZUTIL_OBJS= \
    $(OBJDIR)\diagbib1.obj \
    $(OBJDIR)\diagsrw.obj \
+   $(OBJDIR)\diag-entry.obj \
    $(OBJDIR)\zget.obj \
    $(OBJDIR)\logrpn.obj \
    $(OBJDIR)\pquery.obj \
@@ -640,6 +641,14 @@ $(SRCDIR)\marc8.c: $(SRCDIR)\codetables.xml $(SRCDIR)\charconv.tcl
 	@cd $(SRCDIR)
 	$(TCL) charconv.tcl -p marc8 codetables.xml -o marc8.c
 
+$(SRCDIR)\diagbib1.c: $(SRCDIR)\bib1.csv
+	@cd $(SRCDIR)
+	$(TCL) csvtobib1.tcl
+
+$(SRCDIR)\diagsrw.c: $(SRCDIR)\srw.csv
+	@cd $(SRCDIR)
+	$(TCL) csvtosrw.tcl
+
 !endif
 
 !if $(HAVE_BISON)
diff --git a/win/yaz.nsi b/win/yaz.nsi
index 060c7f2..f85f3ac 100644
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -1,6 +1,6 @@
-; $Id: yaz.nsi,v 1.65 2005-03-16 21:30:23 adam Exp $
+; $Id: yaz.nsi,v 1.66 2005-04-22 14:51:11 adam Exp $
 
-!define VERSION "2.1.2"
+!define VERSION "2.1.3"
 
 !include "MUI.nsh"
 
@@ -137,6 +137,7 @@ Section "YAZ Source" YAZ_Source
 	File ..\src\*.h
 	File ..\src\*.y
 	File ..\src\*.tcl
+	File ..\src\*.csv
 	File ..\src\*.asn
 	File ..\src\codetables.xml
 	SetOutPath $INSTDIR\zoom
-- 
1.7.10.4