From 34886b048134b852abade14b9e535ac90f00093d Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 9 Dec 2014 13:34:31 +0100 Subject: [PATCH] Update to VS 2013 YAZ-804 Temporarily disable yaz4j for now (should be part of allj rule) --- win/makefile | 17 +++++++++++------ win/yaz.nsi | 10 ++++++++-- win/yaz.win32.nsi | 6 +++--- win/yaz.win64.nsi | 6 +++--- 4 files changed, 25 insertions(+), 14 deletions(-) diff --git a/win/makefile b/win/makefile index a7164c9..d04f932 100644 --- a/win/makefile +++ b/win/makefile @@ -4,7 +4,7 @@ # Parameters DEBUG=0 # 0 for release, 1 for debug -USE_MANIFEST = 1 +USE_MANIFEST = 0 # TCL TCL=tclsh @@ -42,8 +42,10 @@ default: all all: dirs generate dll sc_test client ztest yazicu zoomsh utilprog \ testprog iconv icu libxml2 libxslt yaz_url -NSIS="c:\program files\nsis\makensis.exe" -HHC="c:\program files\html help workshop\hhc.exe" +allj: all + +NSIS="c:\program files (x86)\nsis\makensis.exe" +HHC="c:\program files (x86)\html help workshop\hhc.exe" YAZ4J_DIR="..\..\yaz4j" @@ -51,7 +53,7 @@ YAZPATH="$(MAKEDIR)\.." dist: yaz.win32.nsi yaz.nsi distclean - nmake DEBUG=0 all yaz4j + nmake DEBUG=0 allj $(NSIS) yaz.win32.nsi dist64: yaz.win64.nsi yaz.nsi distclean @@ -59,7 +61,7 @@ dist64: yaz.win64.nsi yaz.nsi distclean $(NSIS) yaz.win64.nsi 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=\icu64\lib64 ICU_INCLUDE=\icu64\include ICU_BIN=\icu64\bin64 YAZ4J_DIR=..\..\..\yaz4j all yaz4j + 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 YAZ4J_DIR=..\..\..\yaz4j allj distclean: @@ -288,14 +290,16 @@ LINK=link.exe !if $(USE_MANIFEST) MT=mt.exe /nologo +MTOPT=/manifest !else MT=echo +MTOPT= !endif LINK_LIBS= kernel32.lib ws2_32.lib advapi32.lib \ $(ICONV_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB) -COMMON_LNK_OPTIONS= /nologo /subsystem:windows /incremental:no /manifest +COMMON_LNK_OPTIONS= /nologo /subsystem:windows /incremental:no $(MTOPT) DEBUG_LNK_OPTIONS= /debug @@ -1026,6 +1030,7 @@ clean: -del $(BINDIR)\*.exe -del $(BINDIR)\*.dll -del $(BINDIR)\*.pdb + -del $(BINDIR)\*.manifest -del $(TMPDIR)\*. -del $(LIBDIR)\*.LIB -del $(OBJDIR)\*.OBJ diff --git a/win/yaz.nsi b/win/yaz.nsi index 2e81a0b..a994b5d 100644 --- a/win/yaz.nsi +++ b/win/yaz.nsi @@ -22,6 +22,10 @@ ;!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" +; 5: VS 2013 +;!define VS_RUNTIME_DLL "c:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x86\Microsoft.VC120.CRT\msvc*.dll" +;!define VS_RUNTIME_MANIFEST "" + !include "MUI.nsh" @@ -103,7 +107,9 @@ Section "YAZ Runtime" YAZ_Runtime Noservice: SetOutPath $INSTDIR\bin File "${VS_RUNTIME_DLL}" +!if "${VS_RUNTIME_MANIFEST}" != "" File "${VS_RUNTIME_MANIFEST}" +!endif File ..\bin\*.dll File ..\bin\*.exe SetOutPath $SMPROGRAMS\YAZ @@ -168,9 +174,9 @@ SectionEnd Section "YAZ4J" YAZ4J SectionIn 1 2 SetOutPath $INSTDIR\bin - File ..\bin\yaz4j.dll + File /nonfatal ..\bin\yaz4j.dll SetOutPath $INSTDIR\java - File ..\java\yaz4j.jar + File /nonfatal ..\java\yaz4j.jar SectionEnd ; begin uninstall settings/section diff --git a/win/yaz.win32.nsi b/win/yaz.win32.nsi index 15c3843..95bad9f 100644 --- a/win/yaz.win32.nsi +++ b/win/yaz.win32.nsi @@ -1,6 +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" +; YAZ for Windows 32 bit, VS 2013 +!define VS_RUNTIME_DLL "c:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x86\Microsoft.VC120.CRT\msvc*.dll" +!define VS_RUNTIME_MANIFEST "" InstallDir "$PROGRAMFILES\YAZ" diff --git a/win/yaz.win64.nsi b/win/yaz.win64.nsi index 63208ba..682eb2c 100644 --- a/win/yaz.win64.nsi +++ b/win/yaz.win64.nsi @@ -1,6 +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" +; YAZ for Windows 64 bit, VS 2013 +!define VS_RUNTIME_DLL "c:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x64\Microsoft.VC120.CRT\msvc*.dll" +!define VS_RUNTIME_MANIFEST "" InstallDir "$PROGRAMFILES64\YAZ" -- 1.7.10.4