X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=win%2Fyaz.nsi;h=a994b5d0f21c019d9134279e9f7dafab7be09ced;hp=e34f7e2d370b5feb99f9fd478fa2da6d72da4360;hb=bb84694ae5b1951689fe049bef536e5a73deb208;hpb=c239fa0fd573149e2d916b6c844aca8161ec2b45

diff --git a/win/yaz.nsi b/win/yaz.nsi
index e34f7e2..a994b5d 100644
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -1,5 +1,6 @@
 ; This file is part of the YAZ toolkit.
-; Copyright (C) 1995-2011 Index Data
+; Copyright (C) Index Data
+; See the file LICENSE for details.
 
 !include version.nsi
 
@@ -21,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"
 
@@ -102,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
@@ -164,6 +171,14 @@ Section "YAZ Source" YAZ_Source
 	File *.rc
 SectionEnd
 
+Section "YAZ4J" YAZ4J
+	SectionIn 1 2
+	SetOutPath $INSTDIR\bin
+	File /nonfatal ..\bin\yaz4j.dll
+	SetOutPath $INSTDIR\java
+	File /nonfatal ..\java\yaz4j.jar
+SectionEnd
+
 ; begin uninstall settings/section
 UninstallText "This will uninstall YAZ ${VERSION} from your system"
 
@@ -189,6 +204,7 @@ LangString DESC_YAZ_Runtime ${LANG_ENGLISH} "YAZ runtime files needed in order f
 LangString DESC_YAZ_Development ${LANG_ENGLISH} "Header files and import libraries required for developing software using YAZ."
 LangString DESC_YAZ_Documentation ${LANG_ENGLISH} "YAZ Users' guide and reference in HTML. Describes both YAZ applications and the API."
 LangString DESC_YAZ_Source ${LANG_ENGLISH} "Source code of YAZ. Required if you need to rebuild YAZ (for debugging purposes)."
+LangString DESC_YAZ4J ${LANG_ENGLISH} "Java wrapper for the ZOOM API of YAZ."
 
 ;Assign language strings to sections
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
@@ -196,6 +212,7 @@ LangString DESC_YAZ_Source ${LANG_ENGLISH} "Source code of YAZ. Required if you
 !insertmacro MUI_DESCRIPTION_TEXT ${YAZ_Development} $(DESC_YAZ_Development)
 !insertmacro MUI_DESCRIPTION_TEXT ${YAZ_Documentation} $(DESC_YAZ_Documentation)
 !insertmacro MUI_DESCRIPTION_TEXT ${YAZ_Source} $(DESC_YAZ_Source)
+!insertmacro MUI_DESCRIPTION_TEXT ${YAZ4J} $(DESC_YAZ4J)
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
 ; eof