X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fyaz.nsi;h=2b357f0e15642015618bb7980f5c8e1b64c9f681;hb=ac5f8ad9508f5b3ada38117b0da7ae23c650ab1e;hp=3969c73a78d8be717f6cc0a697180a421c1a945f;hpb=2b381dfe4c8f63130ce32e1117adf9e6be5cfa3b;p=yaz-moved-to-github.git

diff --git a/win/yaz.nsi b/win/yaz.nsi
index 3969c73..2b357f0 100644
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -1,6 +1,6 @@
-; $Id: yaz.nsi,v 1.4 2002-03-16 17:37:40 adam Exp $
+; $Id: yaz.nsi,v 1.10 2002-08-17 07:56:59 adam Exp $
 
-!define VERSION "1.8.6"
+!define VERSION "1.8.9"
 
 Name "YAZ"
 Caption "Index Data YAZ ${VERSION} Setup"
@@ -39,6 +39,8 @@ Section "" ; (default section)
                  "$INSTDIR"
 	WriteINIStr "$SMPROGRAMS\YAZ\YAZ Home page.url" \
               "InternetShortcut" "URL" "http://www.indexdata.dk/yaz/"
+	CreateShortCut "$SMPROGRAMS\YAZ\Uninstall YAZ.lnk" \
+		"$INSTDIR\uninst.exe"
 	SetOutPath $INSTDIR
 	File LICENSE.txt
 	File ..\README
@@ -51,7 +53,10 @@ Section "" ; (default section)
 SectionEnd ; end of default section
 
 Section "YAZ Runtime"
-	SectionIn 12
+	SectionIn 1 2
+	IfFileExists "$INSTDIR\bin\yaz-ztest.exe" 0 Noservice
+	ExecWait '"$INSTDIR\bin\yaz-ztest.exe" -remove'
+Noservice:
 	SetOutPath $INSTDIR\bin
 	File ..\bin\*.exe
 	File ..\bin\*.dll
@@ -68,7 +73,7 @@ Section "YAZ Runtime"
 SectionEnd
 
 Section "YAZ Development"
-	SectionIn 12
+	SectionIn 1 2
 	SetOutPath $INSTDIR\include\yaz
 	File ..\include\yaz\*.h
 	SetOutPath $INSTDIR\lib
@@ -76,7 +81,7 @@ Section "YAZ Development"
 SectionEnd
 
 Section "YAZ Documentation"
-	SectionIn 12
+	SectionIn 1 2
 	SetOutPath $INSTDIR
 	File /r ..\doc
 	SetOutPath $SMPROGRAMS\YAZ
@@ -93,6 +98,7 @@ Section "YAZ Source"
 	File ..\util\*.tcl
 	SetOutPath $INSTDIR\odr
 	File ..\odr\*.c
+	File ..\odr\*.h
 	SetOutPath $INSTDIR\z39.50
 	File ..\z39.50\*.c
 	File ..\z39.50\*.asn
@@ -133,8 +139,12 @@ Section Uninstall
 	Delete "$INSTDIR\uninst.exe"
 	DeleteRegKey HKLM "SOFTWARE\Index Data\YAZ"
 	DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\YAZ"
-	RMDir /r "$INSTDIR"
+	ExecWait '"$INSTDIR\bin\yaz-ztest" -remove'
 	RMDir /r $SMPROGRAMS\YAZ
-SectionEnd ; end of uninstall section
-
+	RMDir /r $INSTDIR
+        IfFileExists $INSTDIR 0 Removed 
+		MessageBox MB_OK|MB_ICONEXCLAMATION \
+                 "Note: $INSTDIR could not be removed."
+Removed:
+SectionEnd
 ; eof