From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 26 Jun 2015 19:30:42 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz
X-Git-Tag: v5.14.3~2
X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=2327be4f0be093a2f87e2b2ac91288b81883070b;hp=7c4d6e0fc700107e781c668ebd4ba0ac79f843b3

Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz
---

diff --git a/doc/book.xml b/doc/book.xml
index 840703d..fe638f3 100644
--- a/doc/book.xml
+++ b/doc/book.xml
@@ -2575,6 +2575,37 @@
     The <parameter>type</parameter> specifies the actual extended service
     package type to be sent.
    </para>
+   <table frame="top" id="zoom.extendedservices.type">
+    <title>Extended Service Type</title>
+    <tgroup cols="2">
+     <colspec colwidth="3*" colname="value"></colspec>
+     <colspec colwidth="7*" colname="description"></colspec>
+     <thead>
+      <row>
+       <entry>Type</entry>
+       <entry>Description</entry>
+      </row>
+     </thead>
+     <tbody>
+      <row>
+       <entry>itemorder</entry><entry>Item Order</entry>
+      </row>
+      <row>
+       <entry>update</entry><entry>Record Update</entry>
+      </row>
+      <row>
+       <entry>create</entry><entry>Database Create</entry>
+      </row>
+      <row>
+       <entry>drop</entry><entry>Database Drop</entry>
+      </row>
+      <row>
+       <entry>commit</entry><entry>Commit Operation</entry>
+      </row>
+     </tbody>
+    </tgroup>
+   </table>
+
    <table frame="top" id="zoom.extendedservices.options">
     <title>Extended Service Common Options</title>
     <tgroup cols="3">
@@ -2632,7 +2663,8 @@
    <sect2 id="zoom.item.order">
     <title>Item Order</title>
     <para>
-     For Item Order, type must be set to <literal>itemorder</literal> in
+     For Item Order, <literal>type</literal> must be set to
+     <literal>itemorder</literal> in
      <function>ZOOM_package_send</function>.
     </para>
 
@@ -2783,7 +2815,8 @@
    <sect2 id="zoom.record.update">
     <title>Record Update</title>
     <para>
-     For Record Update, type must be set to <literal>update</literal> in
+     For Record Update, <literal>type</literal> must be set to
+     <literal>update</literal> in
      <function>ZOOM_package_send</function>.
     </para>
     <table frame="top" id="zoom.record.update.options">
@@ -2889,7 +2922,8 @@
 
    <sect2 id="zoom.database.create"><title>Database Create</title>
     <para>
-     For Database Create, type must be set to <literal>create</literal> in
+     For Database Create, <literal>type</literal> must be set to
+     <literal>create</literal> in
      <function>ZOOM_package_send</function>.
     </para>
 
@@ -2919,7 +2953,8 @@
    <sect2 id="zoom.database.drop">
     <title>Database Drop</title>
     <para>
-     For Database Drop, type must be set to <literal>drop</literal> in
+     For Database Drop, <literal>type</literal> must be set to
+     <literal>drop</literal> in
      <function>ZOOM_package_send</function>.
     </para>
     <table frame="top" id="zoom.database.drop.options">
@@ -2948,7 +2983,8 @@
    <sect2 id="zoom.commit">
     <title>Commit Operation</title>
     <para>
-     For Commit, type must be set to <literal>commit</literal> in
+     For Commit, <literal>type</literal> must be set to
+     <literal>commit</literal> in
      <function>ZOOM_package_send</function>.
     </para>
    </sect2>
diff --git a/win/makefile b/win/makefile
index 9e80ca9..f773d03 100644
--- a/win/makefile
+++ b/win/makefile
@@ -53,13 +53,13 @@ YAZ4J_DIR="..\..\yaz4j"
 YAZPATH="$(MAKEDIR)\.."
 
 
-dist: yaz.win32.nsi yaz.nsi version.nsi distclean
+dist: yaz.nsi version.nsi distclean
 	nmake DEBUG=0 allj
-	$(NSIS) yaz.win32.nsi
+	nmake nsis
 
-dist64: yaz.win64.nsi yaz.nsi version.nsi distclean
+dist64: yaz.nsi version.nsi distclean
 	nmake make64
-	$(NSIS) yaz.win64.nsi
+	nmake nsis64
 
 make64:
 	nmake DEBUG=0 HAVE_LIBXSLT=1 HAVE_LIBXML2=1 HAVE_ICONV=0 HAVE_ICU=1 LIBXML2_DIR=c:\libxml2-2.9.2.win64 LIBXSLT_DIR=c:\libxslt-1.1.28.win64 ICU_LIB=\icu\lib64 ICU_INCLUDE=\icu\include ICU_BIN=\icu\bin64 allj
@@ -69,11 +69,11 @@ distclean:
 	nmake DEBUG=1 clean
 	nmake DEBUG=0 clean
 
-nsis: all yaz.win32.nsi version.nsi
-	$(NSIS) yaz.win32.nsi
+nsis: version.nsi
+	$(NSIS) /DVSARCH=x86 /DVSVER=12 yaz.nsi
 
-nsis64: yaz.win64.nsi version.nsi
-	$(NSIS) yaz.win64.nsi
+nsis64: version.nsi
+	$(NSIS) /DVSARCH=x64 /DVSVER=12 yaz.nsi
 
 nsishelp:
 	$(NSIS)
diff --git a/win/yaz.nsi b/win/yaz.nsi
index 5a9f62f..a01dcdd 100644
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -7,6 +7,32 @@
 
 !include "MUI.nsh"
 
+!define VS_REDIST_EXE vcredist_${VSARCH}.exe
+!define VS_REDIST_FULL "c:\Program Files (x86)\Microsoft Visual Studio ${VSVER}.0\VC\redist\1033\${VS_REDIST_EXE}"
+
+; For example can be found with regedit:
+;  Microsoft Visual C++ 2013 x86 Minimum Runtime
+!if "${VSARCH}" = "x64"
+; 64-bit
+!if "${VSVER}" = "12"
+!define VS_REDIST_KEY "SOFTWARE\Classes\Installer\Products\6E8D947A316B3EB3F8F540C548BE2AB9"
+!endif
+!if "${VSVER}" = "14"
+!endif
+
+InstallDir "$PROGRAMFILES64\YAZ"
+!else
+; 32-bit
+!if "${VSVER}" = "12"
+!define VS_REDIST_KEY "SOFTWARE\Classes\Installer\Products\21EE4A31AE32173319EEFE3BD6FDFFE3"
+!endif
+!if "${VSVER}" = "14"
+!endif
+
+InstallDir "$PROGRAMFILES\YAZ"
+!endif
+
+
 SetCompressor bzip2
 
 Name "YAZ"
diff --git a/win/yaz.win32.nsi b/win/yaz.win32.nsi
deleted file mode 100644
index c0a6c00..0000000
--- a/win/yaz.win32.nsi
+++ /dev/null
@@ -1,9 +0,0 @@
-; YAZ for Windows 32 bit, VS 2015
-!define VS_REDIST_EXE "vcredist_x86.exe"
-!define VS_REDIST_FULL "c:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\1033\${VS_REDIST_EXE}"
-!define VS_REDIST_KEY "SOFTWARE\Classes\Installer\Products\21EE4A31AE32173319EEFE3BD6FDFFE3"
-
-InstallDir "$PROGRAMFILES\YAZ"
-
-!include yaz.nsi
-
diff --git a/win/yaz.win64.nsi b/win/yaz.win64.nsi
deleted file mode 100644
index 1f0c33d..0000000
--- a/win/yaz.win64.nsi
+++ /dev/null
@@ -1,10 +0,0 @@
-; YAZ for Windows 64 bit, VS 2015
-!define VS_REDIST_EXE "vcredist_x64.exe"
-!define VS_REDIST_FULL "c:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\1033\${VS_REDIST_EXE}"
-!define VS_REDIST_KEY "SOFTWARE\Classes\Installer\Products\75B815F0A80081D379E08346B5DB5B6E"
-
-InstallDir "$PROGRAMFILES64\YAZ"
-
-!include yaz.nsi
-
-
diff --git a/yaz.spec b/yaz.spec
index ae214f8..61e863c 100644
--- a/yaz.spec
+++ b/yaz.spec
@@ -4,7 +4,7 @@
 #
 # spec file for YAZ
 
-%define idmetaversion %(. ./IDMETA; echo $VERSION|tr -d '\n')
+%define idmetaversion %(. ./IDMETA; echo $VERSION)
 Name: yaz
 Summary: Z39.50 Programs
 Version: %{idmetaversion}