Join with Zebra 1.3 branch

diff --git a/win/makefile b/win/makefile
index 85b6c02..64f4195 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # Zebra makefile for MS NMAKE
-# $Id: makefile,v 1.28 2004-08-06 13:35:45 adam Exp $
+# $Id: makefile,v 1.29 2004-08-20 12:37:56 adam Exp $
  
 ###########################################################
 ############### Parameters 
@@ -27,7 +27,7 @@ all: dirs zebralib zserver zindex
 ROOTDIR=..   # The home of zebra
 
 # YAZ include files, libraries, etc.
-YAZDIR=$(ROOTDIR)\..\YAZ-2.0.22
+YAZDIR=$(ROOTDIR)\..\YAZ
 YAZINCL=$(YAZDIR)\include
 YAZLIB=$(YAZDIR)\lib\yaz.lib
 YAZLIBS=$(YAZLIB)
@@ -71,6 +71,18 @@ TMPDIR=$(ROOTDIR)\win\tmp
 TMP=$(TMPDIR)
 TEMP=$(TMPDIR)
 
+# NSIS
+NSIS="c:\program files\nsis\makensis.exe"
+
+dist:
+       nmake DEBUG=1 clean
+       nmake DEBUG=0 clean
+       nmake DEBUG=0
+       $(NSIS) zebra.nsi
+
+nsis:
+       $(NSIS) zebra.nsi
+
 ###########################################################
 ############### Targets - what to make
 ###########################################################
@@ -165,21 +177,17 @@ LINK_LIBS= kernel32.lib user32.lib   gdi32.lib   winspool.lib \
            oleaut32.lib uuid.lib     odbc32.lib  odbccp32.lib \
            wsock32.lib  advapi32.lib $(ICONV_LIB) $(EXPAT_LIB)
 
-COMMON_LNK_OPTIONS= /nologo \
-                    /machine:i386 \
-                                   /incremental:no
-
-#                    /subsystem:windows \
+COMMON_LNK_OPTIONS= /nologo /machine:i386 /incremental:no
 
 DEBUG_LNK_OPTIONS= /debug 
 
-RELEASE_LNK_OPTIONS=  /pdb:none
+RELEASE_LNK_OPTIONS= 
 
-ZEBRALIB_LINK_OPTIONS = -lib 
+ZEBRALIB_LINK_OPTIONS= -lib 
 
-ZSERVER_LINK_OPTIONS = /subsystem:console  
-ZINDEX_LINK_OPTIONS = /subsystem:console  
-APITEST_LINK_OPTIONS = /subsystem:console  
+ZSERVER_LINK_OPTIONS= /subsystem:console  
+ZINDEX_LINK_OPTIONS= /subsystem:console  
+APITEST_LINK_OPTIONS= /subsystem:console  
 
 # Final opt variables
 !if $(DEBUG)
@@ -426,7 +434,6 @@ clean:
        -del $(OBJDIR)\*.obj
        -del $(OBJDIR)\*.sbr
        -del $(BINDIR)\*.exe
-       -del $(BINDIR)\*.dll
        -del $(TMPDIR)\*.
        -del $(LIBDIR)\*.lib
 

diff --git a/win/zebra.nsi b/win/zebra.nsi
index b5d87a6..d2301f2 100644 (file)
--- a/win/zebra.nsi
+++ b/win/zebra.nsi
@@ -1,9 +1,11 @@
-; $Id: zebra.nsi,v 1.21 2004-08-06 09:38:23 adam Exp $
+; $Id: zebra.nsi,v 1.22 2004-08-20 12:36:53 adam Exp $
 
 !define VERSION "1.4.0"
 
 !include "MUI.nsh"
 
+SetCompressor bzip2
+
 Name "Zebra"
 Caption "Index Data Zebra ${VERSION} Setup"
 OutFile "idzebra_${VERSION}.exe"
@@ -67,7 +69,12 @@ Section "Zebra Runtime"
        SectionIn 1 2
        SetOutPath $INSTDIR\bin
        File ..\bin\*.exe
-       File ..\bin\*.dll
+       File ..\bin\iconv.dll
+       File ..\bin\zlib.dll
+       File ..\bin\libxml2.dll
+       File ..\bin\yaz.dll
+       File ..\bin\libexpat.dll
+       File c:\winnt\system32\msvcr71.dll
 SectionEnd
 
 Section "Zebra Development"
@@ -80,8 +87,13 @@ SectionEnd
 
 Section "Zebra Documentation"
        SectionIn 1 2
-       SetOutPath $INSTDIR
-       File /r ..\doc
+       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" \
                  "$INSTDIR\doc\zebra.html"