X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=win%2Fzebra.nsi;h=b43e67347f921d3ab8faacd5aab6896a7785835f;hp=76b470e847e245941a398326c966411ffe216214;hb=aae116a2ec79fd3487ac2d50ad2d6110f64145b2;hpb=4c01004f98083cefbe51cfa53676e2e0900db491 diff --git a/win/zebra.nsi b/win/zebra.nsi index 76b470e..b43e673 100644 --- a/win/zebra.nsi +++ b/win/zebra.nsi @@ -1,9 +1,47 @@ -; $Id: zebra.nsi,v 1.14 2003-04-01 07:48:21 adam Exp $ +!include EnvVarUpdate.nsh +!include version.nsi +!include "MUI.nsh" + +!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" +; Microsoft Visual C++ 2015 x64 Minimum Runtime - 14.0.23026 +!define VS_REDIST_KEY "SOFTWARE\Classes\Installer\Products\51E9E3D0A7EDB003691F4BFA219B4688" +!endif + +InstallDir "$PROGRAMFILES64\Zebra" +!else +; 32-bit +!if "${VSVER}" = "12" +!define VS_REDIST_KEY "SOFTWARE\Classes\Installer\Products\21EE4A31AE32173319EEFE3BD6FDFFE3" +!endif +!if "${VSVER}" = "14" +; Microsoft Visual C++ 2015 x86 Minimum Runtime - 14.0.23026 +!define VS_REDIST_KEY "SOFTWARE\Classes\Installer\Products\55E3652ACEB38283D8765E8E9B8E6B57" +!endif -!define VERSION "1.3.10" +InstallDir "$PROGRAMFILES\Zebra" +!endif + +!if "${VSVER}" = "14" +!define VS_REDIST_EXE vc_redist.${VSARCH}.exe +!else +!define VS_REDIST_EXE vcredist_${VSARCH}.exe +!endif + +RequestExecutionLevel admin + +SetCompressor bzip2 Name "Zebra" -Caption "Index Data Yebra ${VERSION} Setup" +Caption "Index Data Zebra ${VERSION} Setup" OutFile "idzebra_${VERSION}.exe" LicenseText "You must read the following license before installing:" @@ -13,19 +51,31 @@ ComponentText "This will install Zebra on your computer:" InstType "Full (w/ Source)" InstType "Lite (w/o Source)" -; Some default compiler settings (uncomment and change at will): -; SetCompress auto ; (can be off or force) -; SetDatablockOptimize on ; (can be off) -; CRCCheck on ; (can be off) -; AutoCloseWindow false ; (can be true for the window go away automatically at end) -; ShowInstDetails hide ; (can be show to have them shown, or nevershow to disable) -; SetDateSave off ; (can be on to have files restored to their orginal date) - -InstallDir "$PROGRAMFILES\Zebra" InstallDirRegKey HKLM "SOFTWARE\Index Data\Zebra" "" -DirShow show ; (make this hide to not let the user change it) -DirText "Select the directory to install Zebra in:" +;-------------------------------- +; Pages + + !insertmacro MUI_PAGE_LICENSE "license.txt" + !insertmacro MUI_PAGE_COMPONENTS + !insertmacro MUI_PAGE_DIRECTORY + !insertmacro MUI_PAGE_INSTFILES + + !insertmacro MUI_UNPAGE_CONFIRM + !insertmacro MUI_UNPAGE_INSTFILES +; Page components +; Page directory +; Page instfiles + +; UninstPage uninstConfirm +; UninstPage instfiles + +;-------------------------------- +;Languages + +!insertmacro MUI_LANGUAGE "English" + +;-------------------------------- Section "" ; (default section) SetOutPath "$INSTDIR" ; add files / whatever that need to be installed here. @@ -51,27 +101,43 @@ SectionEnd ; end of default section Section "Zebra Runtime" SectionIn 1 2 SetOutPath $INSTDIR\bin +!if "${VS_REDIST_FULL}" != "" + File "${VS_REDIST_FULL}" + ReadRegDword $1 HKLM "${VS_REDIST_KEY}" "Version" + ${If} $1 == "" + ExecWait '"$INSTDIR\bin\${VS_REDIST_EXE}" /passive /nostart' + ${endif} + Delete "$INSTDIR\bin\${VS_REDIST_EXE}" +!endif File ..\bin\*.exe - File ..\bin\*.dll + File ..\bin\idzebra.dll + File ..\bin\libxml2.dll + File ..\bin\libxslt.dll + File ..\bin\yaz*.dll + File ..\bin\icu*.dll + File ..\bin\libexpat.dll SectionEnd Section "Zebra Development" SectionIn 1 SetOutPath $INSTDIR\include File ..\include\*.h + SetOutPath $INSTDIR\include\idzebra + File ..\include\idzebra\*.h SetOutPath $INSTDIR\lib File ..\lib\*.lib SectionEnd Section "Zebra Documentation" SectionIn 1 2 - SetOutPath $INSTDIR - File /r ..\doc + SetOutPath $INSTDIR\doc + File /nonfatal /r ..\doc\*.html + File /r ..\doc\*.png + File /r ..\doc\*.xml + File /r ..\doc\*.xsl SetOutPath "$SMPROGRAMS\Index Data\Zebra\" CreateShortCut "$SMPROGRAMS\Index Data\Zebra\HTML Documentation.lnk" \ - "$INSTDIR\doc\zebra.html" - CreateShortCut "$SMPROGRAMS\Index Data\Zebra\PDF Documentaion.lnk" \ - "$INSTDIR\doc\zebra.pdf" + "$INSTDIR\doc\index.html" SectionEnd Section "Zebra Examples" @@ -80,13 +146,16 @@ Section "Zebra Examples" SetOutPath $INSTDIR File /r ..\test -; File /r ..\examples + File /r /x *.mf /x *.LCK ..\examples SectionEnd Section "Zebra Source" SectionIn 1 + SetOutPath $INSTDIR + File ..\IDMETA SetOutPath $INSTDIR\util File ..\util\*.c + File ..\util\*.tcl SetOutPath $INSTDIR\dfa File ..\dfa\*.c File ..\dfa\*.h @@ -95,9 +164,6 @@ Section "Zebra Source" File ..\index\*.h SetOutPath $INSTDIR\isams File ..\isams\*.c - SetOutPath $INSTDIR\isam - File ..\isam\*.c - File ..\isam\*.h SetOutPath $INSTDIR\isamc File ..\isamc\*.c File ..\isamc\*.h @@ -105,11 +171,9 @@ Section "Zebra Source" File ..\isamb\*.c SetOutPath $INSTDIR\data1 File ..\data1\*.c - SetOutPath $INSTDIR\recctrl - File ..\recctrl\*.c - File ..\recctrl\*.h SetOutPath $INSTDIR\dict File ..\dict\*.c + File ..\dict\*.h SetOutPath $INSTDIR\bfile File ..\bfile\*.c File ..\bfile\*.h @@ -124,6 +188,11 @@ Section "Zebra Source" File *.txt SectionEnd +Section "Zebra Path" + SectionIn 1 2 + ${EnvVarUpdate} $0 "PATH" "A" "HKLM" "$INSTDIR\bin" +SectionEnd + ; begin uninstall settings/section UninstallText "This will uninstall Zebra ${VERSION} from your system" @@ -135,7 +204,8 @@ Section Uninstall ExecWait '"$INSTDIR\bin\zebrasrv" -remove' RMDir /r "$SMPROGRAMS\Index Data\Zebra" RMDir /r $INSTDIR - IfFileExists $INSTDIR 0 Removed + ${un.EnvVarUpdate} $0 "PATH" "R" "HKLM" "$INSTDIR\bin" + IfFileExists $INSTDIR 0 Removed MessageBox MB_OK|MB_ICONEXCLAMATION \ "Note: $INSTDIR could not be removed." Removed: