First go at 64-bit install using NSIS

Allow to build without documentation (html, css, ent). version.nsi
is still required for NSIS.

diff --git a/win/makefile b/win/makefile
index a7650d1..8ba351d 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -45,14 +45,23 @@ all: dirs generate dll sc_test client ztest yazicu zoomsh utilprog testprog icon
 NSIS="c:\program files\nsis\makensis.exe"
 HHC="c:\program files\html help workshop\hhc.exe"
 
-dist: yaz.nsi
+dist: yaz.win32.nsi yaz.nsi distclean
+       nmake DEBUG=0
+       $(NSIS) yaz.win32.nsi
+
+dist64: yaz.win64.nsi yaz.nsi distclean
+       nmake DEBUG=0 HAVE_LIBXSLT=0 HAVE_LIBXML2=0 HAVE_ICONV=0 HAVE_ICU=0
+       $(NSIS) yaz.win64.nsi
+
+distclean:
        nmake DEBUG=1 clean
        nmake DEBUG=0 clean
-       nmake DEBUG=0
-       $(NSIS) yaz.nsi
 
-nsis: all yaz.nsi
-       $(NSIS) yaz.nsi
+nsis: all yaz32.nsi
+       $(NSIS) yaz.win32.nsi
+
+nsis64: yaz.win64.nsi
+       $(NSIS) yaz.win64.nsi
 
 nsishelp:
        $(NSIS)

diff --git a/win/yaz.nsi b/win/yaz.nsi
index d92440c..4a1c682 100644 (file)
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -18,8 +18,8 @@
 ;!define VS_RUNTIME_MANIFEST "c:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\Microsoft.VC80.CRT.manifest"
 
 ; 4: VS 2008
-!define VS_RUNTIME_DLL      "c:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\msvc*90.dll"
-!define VS_RUNTIME_MANIFEST "c:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest"
+;!define VS_RUNTIME_DLL      "c:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\msvc*90.dll"
+;!define VS_RUNTIME_MANIFEST "c:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest"
 
 
 !include "MUI.nsh"
@@ -104,12 +104,7 @@ Noservice:
        SetOutPath $INSTDIR\bin
        File "${VS_RUNTIME_DLL}"
        File "${VS_RUNTIME_MANIFEST}"
-       File ..\bin\iconv.dll
-       File ..\bin\zlib1.dll
-       File ..\bin\libxml2.dll
-       File ..\bin\libxslt.dll
-       File ..\bin\icu*.dll
-       File ..\bin\yaz*.dll
+       File ..\bin\*.dll
        File ..\bin\*.exe
        SetOutPath $SMPROGRAMS\YAZ
        CreateShortCut "$SMPROGRAMS\YAZ\YAZ Client.lnk" \
@@ -134,12 +129,12 @@ SectionEnd
 Section "YAZ Documentation" YAZ_Documentation
        SectionIn 1 2
        SetOutPath $INSTDIR\doc
-       File /r ..\doc\*.css
-       File /r ..\doc\*.ent
-       File /r ..\doc\*.html
+       File /nonfatal /r ..\doc\*.css
+       File /nonfatal /r ..\doc\*.ent
+       File /nonfatal /r ..\doc\*.html
        File /r ..\doc\*.xml
        File /r ..\doc\*.png
-       File /r ..\doc\*.xsl
+       File /nonfatal /r ..\doc\*.xsl
        SetOutPath $SMPROGRAMS\YAZ
        CreateShortCut "$SMPROGRAMS\YAZ\HTML Documentation.lnk" \
                  "$INSTDIR\doc\index.html"

diff --git a/win/yaz.win32.nsi b/win/yaz.win32.nsi
new file mode 100644 (file)
index 0000000..dfa475c
--- /dev/null
+++ b/win/yaz.win32.nsi
@@ -0,0 +1,6 @@
+; YAZ for Windows 32 bit, VS 2008
+!define VS_RUNTIME_DLL      "c:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\msvc*90.dll"
+!define VS_RUNTIME_MANIFEST "c:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest"
+
+!include yaz.nsi
+

diff --git a/win/yaz.win64.nsi b/win/yaz.win64.nsi
new file mode 100644 (file)
index 0000000..c2be7d4
--- /dev/null
+++ b/win/yaz.win64.nsi
@@ -0,0 +1,6 @@
+; YAZ for Windows 64 bit, VS 2008
+!define VS_RUNTIME_DLL      "c:\Program Files\Microsoft Visual Studio 9.0\VC\redist\amd64\Microsoft.VC90.CRT\msvc*90.dll"
+!define VS_RUNTIME_MANIFEST "c:\Program Files\Microsoft Visual Studio 9.0\VC\redist\amd64\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest"
+
+!include yaz.nsi
+