X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fyaz.nsi;h=4b7460f337adbaacc1277343354ea80750f6ffef;hb=3fef09b4aaeb051928abf940049d138e5d73e20d;hp=e59e56f21546fc53695524f9e092fd85c41d2056;hpb=d476a8f3c038ba61a22c56415d68bc3ab22102c6;p=yaz-moved-to-github.git

diff --git a/win/yaz.nsi b/win/yaz.nsi
index e59e56f..4b7460f 100644
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -1,6 +1,6 @@
-; $Id: yaz.nsi,v 1.3 2002-03-16 12:48:47 adam Exp $
+; $Id: yaz.nsi,v 1.6 2002-03-25 15:12:25 adam Exp $
 
-!define VERSION "1.8.6"
+!define VERSION "1.8.7"
 
 Name "YAZ"
 Caption "Index Data YAZ ${VERSION} Setup"
@@ -34,25 +34,33 @@ Section "" ; (default section)
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\YAZ" "UninstallString" '"$INSTDIR\uninst.exe"'
 	; write out uninstaller
 	WriteUninstaller "$INSTDIR\uninst.exe"
-SectionEnd ; end of default section
-
-Section "yaz core (required)"
-	SectionIn 12
+	SetOutPath $SMPROGRAMS\YAZ
+ 	CreateShortCut "$SMPROGRAMS\YAZ\YAZ Program Directory.lnk" \
+                 "$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
-	SetOutPath $INSTDIR\bin
-	File ..\bin\*.exe
-	File ..\bin\*.dll
+	SetOutPath $INSTDIR
+	File /r ..\tab
 	SetOutPath $INSTDIR\ztest
 	File ..\ztest\dummy-records
 	File ..\ztest\dummy-grs
 	File ..\ztest\dummy-words
-	SetOutPath $INSTDIR
-	File /r ..\tab
+SectionEnd ; end of default section
+
+Section "YAZ Runtime"
+	SectionIn 12
+	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
 	SetOutPath $SMPROGRAMS\YAZ
- 	CreateShortCut "$SMPROGRAMS\YAZ\YAZ Program Directory.lnk" \
-                 "$INSTDIR"
  	CreateShortCut "$SMPROGRAMS\YAZ\YAZ Client.lnk" \
                  "$INSTDIR\bin\yaz-client.exe"
 	SetOutPath $SMPROGRAMS\YAZ\Server
@@ -62,11 +70,9 @@ Section "yaz core (required)"
                   "$INSTDIR\bin\yaz-ztest.exe" '-installa tcp:@:210'
  	CreateShortCut "$SMPROGRAMS\YAZ\Server\Remove Z39.50 service.lnk" \
                  "$INSTDIR\bin\yaz-ztest.exe" '-remove'
-	WriteINIStr "$SMPROGRAMS\YAZ\YAZ Home page.url" \
-              "InternetShortcut" "URL" "http://www.indexdata.dk/yaz/"
 SectionEnd
 
-Section "yaz development"
+Section "YAZ Development"
 	SectionIn 12
 	SetOutPath $INSTDIR\include\yaz
 	File ..\include\yaz\*.h
@@ -74,7 +80,7 @@ Section "yaz development"
 	File ..\lib\*.lib
 SectionEnd
 
-Section "yaz documentation"
+Section "YAZ Documentation"
 	SectionIn 12
 	SetOutPath $INSTDIR
 	File /r ..\doc
@@ -85,7 +91,7 @@ Section "yaz documentation"
                  "$INSTDIR\doc\yaz.pdf"
 SectionEnd
 
-Section "yaz source"
+Section "YAZ Source"
 	SectionIn 1
 	SetOutPath $INSTDIR\util
 	File ..\util\*.c
@@ -132,8 +138,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