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
Bundle with Visual Studio 8 CRT by default
[idzebra-moved-to-github.git]
/
win
/
zebra.nsi
diff --git
a/win/zebra.nsi
b/win/zebra.nsi
index
d2301f2
..
eb231ba
100644
(file)
--- a/
win/zebra.nsi
+++ b/
win/zebra.nsi
@@
-1,7
+1,14
@@
-; $Id: zebra.nsi,v 1.22 2004-08-20 12:36:53 adam Exp $
+; $Id: zebra.nsi,v 1.29 2006-06-07 11:20:03 adam Exp $
!define VERSION "1.4.0"
!define VERSION "1.4.0"
+; Microsoft runtime CRT
+; VS 2003
+; !define VS_RUNTIME "c:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin\msvcr71.dll"
+
+; VS 2005
+!define VS_RUNTIME "c:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\msvcr80.dll"
+
!include "MUI.nsh"
SetCompressor bzip2
!include "MUI.nsh"
SetCompressor bzip2
@@
-70,17
+77,19
@@
Section "Zebra Runtime"
SetOutPath $INSTDIR\bin
File ..\bin\*.exe
File ..\bin\iconv.dll
SetOutPath $INSTDIR\bin
File ..\bin\*.exe
File ..\bin\iconv.dll
- File ..\bin\zlib.dll
+ File ..\bin\zlib1.dll
File ..\bin\libxml2.dll
File ..\bin\yaz.dll
File ..\bin\libexpat.dll
File ..\bin\libxml2.dll
File ..\bin\yaz.dll
File ..\bin\libexpat.dll
- File c:\winnt\system32\msvcr71.dll
+ File "${VS_RUNTIME}"
SectionEnd
Section "Zebra Development"
SectionIn 1
SetOutPath $INSTDIR\include
File ..\include\*.h
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
SetOutPath $INSTDIR\lib
File ..\lib\*.lib
SectionEnd
@@
-90,15
+99,12
@@
Section "Zebra Documentation"
SetOutPath $INSTDIR\doc
File ..\doc\*.html
File ..\doc\*.png
SetOutPath $INSTDIR\doc
File ..\doc\*.html
File ..\doc\*.png
- File ..\doc\*.pdf
File ..\doc\*.xml
File ..\doc\*.in
File ..\doc\*.xsl
SetOutPath "$SMPROGRAMS\Index Data\Zebra\"
CreateShortCut "$SMPROGRAMS\Index Data\Zebra\HTML Documentation.lnk" \
File ..\doc\*.xml
File ..\doc\*.in
File ..\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"
SectionEnd
Section "Zebra Examples"
@@
-122,9
+128,6
@@
Section "Zebra Source"
File ..\index\*.h
SetOutPath $INSTDIR\isams
File ..\isams\*.c
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
SetOutPath $INSTDIR\isamc
File ..\isamc\*.c
File ..\isamc\*.h
@@
-137,6
+140,7
@@
Section "Zebra Source"
File ..\recctrl\*.h
SetOutPath $INSTDIR\dict
File ..\dict\*.c
File ..\recctrl\*.h
SetOutPath $INSTDIR\dict
File ..\dict\*.c
+ File ..\dict\*.h
SetOutPath $INSTDIR\bfile
File ..\bfile\*.c
File ..\bfile\*.h
SetOutPath $INSTDIR\bfile
File ..\bfile\*.c
File ..\bfile\*.h