projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
preparing release 2.0.0
[idzebra-moved-to-github.git]
/
win
/
zebra.nsi
diff --git
a/win/zebra.nsi
b/win/zebra.nsi
index
2e6b190
..
6c0253c
100644
(file)
--- a/
win/zebra.nsi
+++ b/
win/zebra.nsi
@@
-1,7
+1,10
@@
-; $Id: zebra.nsi,v 1.27 2005-08-25 12:53:42 adam Exp $
+; $Id: zebra.nsi,v 1.32 2006-06-26 15:11:44 marc Exp $
-!define VERSION "1.4.0"
-!define VS_RUNTIME_LOCATION "c:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin"
+!define VERSION "2.0.0"
+
+; VS 2005
+!define VS_RUNTIME_DLL "c:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\msvcr80.dll"
+!define VS_RUNTIME_MANIFEST "c:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\Microsoft.VC80.CRT.manifest"
!include "MUI.nsh"
!include "MUI.nsh"
@@
-69,13
+72,17
@@
SectionEnd ; end of default section
Section "Zebra Runtime"
SectionIn 1 2
SetOutPath $INSTDIR\bin
Section "Zebra Runtime"
SectionIn 1 2
SetOutPath $INSTDIR\bin
+ File "${VS_RUNTIME_DLL}"
+ File "${VS_RUNTIME_MANIFEST}"
File ..\bin\*.exe
File ..\bin\*.exe
+ File ..\bin\*.manifest
+ File ..\bin\idzebra.dll
File ..\bin\iconv.dll
File ..\bin\zlib1.dll
File ..\bin\libxml2.dll
File ..\bin\iconv.dll
File ..\bin\zlib1.dll
File ..\bin\libxml2.dll
+ File ..\bin\libxslt.dll
File ..\bin\yaz.dll
File ..\bin\libexpat.dll
File ..\bin\yaz.dll
File ..\bin\libexpat.dll
- File "${VS_RUNTIME_LOCATION}\msvcr71.dll"
SectionEnd
Section "Zebra Development"
SectionEnd
Section "Zebra Development"
@@
-91,17
+98,13
@@
SectionEnd
Section "Zebra Documentation"
SectionIn 1 2
SetOutPath $INSTDIR\doc
Section "Zebra Documentation"
SectionIn 1 2
SetOutPath $INSTDIR\doc
- File ..\doc\*.html
- File ..\doc\*.png
- File ..\doc\*.pdf
- File ..\doc\*.xml
- File ..\doc\*.in
- File ..\doc\*.xsl
+ File /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" \
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"
SectionEnd
Section "Zebra Examples"
@@
-110,7
+113,7
@@
Section "Zebra Examples"
SetOutPath $INSTDIR
File /r ..\test
SetOutPath $INSTDIR
File /r ..\test
- File /r ..\examples
+ File /r /x *.mf /x *.LCK ..\examples
SectionEnd
Section "Zebra Source"
SectionEnd
Section "Zebra Source"