From 3ee667935c4cac82445ecd05c8ae421888dfd40f Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 18 May 2001 11:42:03 +0000
Subject: [PATCH] YAZ Build date for WIN32.

---
 include/yaz/yaz-version.h |   14 ++++++++++++--
 win/makefile              |   17 ++++++++++++++---
 win/yaz.rc                |    8 ++++----
 zutil/zget.c              |   11 ++++++++++-
 4 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/include/yaz/yaz-version.h b/include/yaz/yaz-version.h
index e33da44..f6378b6 100644
--- a/include/yaz/yaz-version.h
+++ b/include/yaz/yaz-version.h
@@ -2,7 +2,10 @@
  * Current software version.
  *
  * $Log: yaz-version.h,v $
- * Revision 1.4  2001-05-16 07:37:39  adam
+ * Revision 1.5  2001-05-18 11:42:03  adam
+ * YAZ Build date for WIN32.
+ *
+ * Revision 1.4  2001/05/16 07:37:39  adam
  * Added script cvs-date.tcl that determines last CVS change for YAZ by
  * using output of 'cvs log'. The script generates include/yaz/yaz-date.h
  * which defines YAZ_DATE - format YYYYMMDD.
@@ -93,9 +96,16 @@
  *
  */
 #ifndef YAZ_VERSION
+
 #define YAZ_VERSION "1.7"
-#ifndef WIN32
 #include <yaz/yaz-date.h>
+
+#ifdef WIN32
+#ifdef NDEBUG
+#define YAZ_OS "WIN32 Release"
+#else
+#define YAZ_OS "WIN32 Debug"
 #endif
 #endif
 
+#endif
\ No newline at end of file
diff --git a/win/makefile b/win/makefile
index ae75286..5865e1c 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # makefile.mak - makefile for MS NMAKE 
-# $Id: makefile,v 1.22 2001-03-09 14:58:20 adam Exp $
+# $Id: makefile,v 1.23 2001-05-18 11:42:03 adam Exp $
 #
 # Programmed by
 #  HL: Heikki Levanto, Index Data
@@ -31,7 +31,7 @@ NEW_Z3950=1  # 0= use old asn files
 
 default: all
 
-all: dirs proto_h dll client ztest 
+all: dirs yaz_date_h proto_h dll client ztest 
 
 generate: generated_files
 
@@ -78,12 +78,14 @@ IMPLIB=$(LIBDIR)\Yaz.lib
 CLIENT=$(BINDIR)\yaz-client.exe
 ZTEST=$(BINDIR)\yaz-ztest.exe
 PROTOH=$(INCLDIR)\yaz\proto.h
+YAZ_DATE_H=$(INCLDIR)\yaz\yaz-date.h
 
 # shortcut names defined here
 dll : $(DLL) 
 client: $(CLIENT)
 ztest: $(ZTEST)
 proto_h: $(PROTOH)
+yaz_date_h: $(YAZ_DATE_H)
 
 ###########################################################
 ############### Compiler and linker options 
@@ -96,6 +98,7 @@ proto_h: $(PROTOH)
 
 COMMON_C_OPTIONS=          \
   /nologo /W3 /GX /FD /c   \
+  /D "YAZ_MODULE_ill=1"    \
   /D "WIN32" /D "_WINDOWS" \
   /D "CCL2RPN=1"           \
   /FR"$(OBJDIR)\\"         \
@@ -526,6 +529,11 @@ generated_files: \
 
 !if $(HAVE_TCL)
 
+$(YAZ_DATE_H):
+	@cd ..
+	$(TCL) util\cvs-date.tcl include\yaz\yaz-date.h
+	@cd win
+
 $(Z3950V3_FILES): $(Z3950DIR)\z3950v3.asn
 	@cd $(Z3950DIR)
 	$(TCL) $(TCLOPT) -d z.tcl z3950v3.asn
@@ -698,7 +706,10 @@ $(PROTOH): $(GENERATED_C_FILES) $(GENERATED_H_FILES)
 ###########################################################
 #
 # $Log: makefile,v $
-# Revision 1.22  2001-03-09 14:58:20  adam
+# Revision 1.23  2001-05-18 11:42:03  adam
+# YAZ Build date for WIN32.
+#
+# Revision 1.22  2001/03/09 14:58:20  adam
 # Updated version resource.
 #
 # Revision 1.21  2001/02/28 16:56:33  adam
diff --git a/win/yaz.rc b/win/yaz.rc
index a83a5a6..ca901c7 100644
--- a/win/yaz.rc
+++ b/win/yaz.rc
@@ -54,8 +54,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,7,0,5
- PRODUCTVERSION 1,7,0,5
+ FILEVERSION 1,7,0,6
+ PRODUCTVERSION 1,7,0,6
  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", "1, 7, 0, 5\0"
+            VALUE "FileVersion", "1, 7, 0, 6\0"
             VALUE "InternalName", "YAZ\0"
             VALUE "LegalCopyright", "Copyright © 1996-2001 Index Data\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "yaz.rc\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "Index Data YAZ Toolkit\0"
-            VALUE "ProductVersion", "1, 7, 0, 5\0"
+            VALUE "ProductVersion", "1, 7, 0, 6\0"
             VALUE "SpecialBuild", "\0"
         END
     END
diff --git a/zutil/zget.c b/zutil/zget.c
index 1ee79fc..30418fa 100644
--- a/zutil/zget.c
+++ b/zutil/zget.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zget.c,v $
- * Revision 1.8  2001-05-17 14:16:15  adam
+ * Revision 1.9  2001-05-18 11:42:03  adam
+ * YAZ Build date for WIN32.
+ *
+ * Revision 1.8  2001/05/17 14:16:15  adam
  * Added EXTERNAL handling for item update0 (1.0).
  *
  * Revision 1.7  2001/05/16 07:22:56  adam
@@ -105,6 +108,9 @@ Z_InitRequest *zget_InitRequest(ODR o)
 #ifdef YAZ_DATE_STR
     " (" YAZ_DATE_STR ")"
 #endif
+#ifdef YAZ_OS
+    " " YAZ_OS
+#endif
 	;
     r->userInformationField = 0;
     r->otherInfo = 0;
@@ -129,6 +135,9 @@ Z_InitResponse *zget_InitResponse(ODR o)
 #ifdef YAZ_DATE_STR
     " (" YAZ_DATE_STR ")"
 #endif
+#ifdef YAZ_OS
+    " " YAZ_OS
+#endif
 	;
     r->userInformationField = 0;
     r->otherInfo = 0;
-- 
1.7.10.4