X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fyaz.nsi;h=614d6e160aa724a4ffd5f993fcc27c0cc62b6ce3;hb=a54c709b3e2feff5762bfa7dfa8ee653b429d369;hp=27d7c8a940a7b26e3fe76d156255fe7934f23448;hpb=b59881c24b105f2d56b304b1d33c74eecca3ace8;p=yaz-moved-to-github.git

diff --git a/win/yaz.nsi b/win/yaz.nsi
index 27d7c8a..614d6e1 100644
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -1,15 +1,15 @@
-; $Id: yaz.nsi,v 1.1 2002-03-15 19:32:39 adam Exp $
+; $Id: yaz.nsi,v 1.21 2003-04-28 21:02:17 adam Exp $
 
-!define VERSION "1.8.6"
+!define VERSION "2.0.2"
 
 Name "YAZ"
-Caption "Index Data YAZ Setup"
+Caption "Index Data YAZ ${VERSION} Setup"
 OutFile "yaz_${VERSION}.exe"
 
 LicenseText "You must read the following license before installing:"
-LicenseData ..\license.txt
+LicenseData license.txt
 
-ComponentText "This will install the YAZ Toolkit v${VERSION} on your computer:"
+ComponentText "This will install the YAZ Toolkit on your computer:"
 InstType "Full (w/ Source)"
 InstType "Lite (w/o Source)"
 
@@ -30,47 +30,57 @@ Section "" ; (default section)
 	SetOutPath "$INSTDIR"
 	; add files / whatever that need to be installed here.
 	WriteRegStr HKLM "SOFTWARE\Index Data\YAZ" "" "$INSTDIR"
-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\YAZ" "DisplayName" "YAZ (remove only)"
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\YAZ" "DisplayName" "YAZ ${VERSION} (remove only)"
 	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 LICENSE.txt
 	File ..\README
-	SetOutPath $INSTDIR\bin
-	File ..\bin\*.exe
-	File ..\bin\*.dll
+	SetOutPath $INSTDIR
 	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 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
 	SetOutPath $SMPROGRAMS\YAZ
- 	CreateShortCut "$SMPROGRAMS\YAZ\YAZ Program Directory.lnk" \
-                 "$INSTDIR"
  	CreateShortCut "$SMPROGRAMS\YAZ\YAZ Client.lnk" \
                  "$INSTDIR\bin\yaz-client.exe"
- 	CreateShortCut "$SMPROGRAMS\YAZ\YAZ Server.lnk" \
-                 "$INSTDIR\bin\yaz-ztest.exe" -w"$INSTDIR\ztest"
-	WriteINIStr "$SMPROGRAMS\YAZ\YAZ Home page.url" \
-              "InternetShortcut" "URL" "http://www.indexdata.dk/yaz/"
+	SetOutPath $SMPROGRAMS\YAZ\Server
+ 	CreateShortCut "$SMPROGRAMS\YAZ\Server\Server on console on port 9999.lnk" \
+                 "$INSTDIR\bin\yaz-ztest.exe" '-w"$INSTDIR\ztest"'
+  	CreateShortCut "$SMPROGRAMS\YAZ\Server\Install Z39.50 service on port 210.lnk" \
+                  "$INSTDIR\bin\yaz-ztest.exe" '-installa tcp:@:210'
+ 	CreateShortCut "$SMPROGRAMS\YAZ\Server\Remove Z39.50 service.lnk" \
+                 "$INSTDIR\bin\yaz-ztest.exe" '-remove'
 SectionEnd
 
-Section "yaz development"
-	SectionIn 12
+Section "YAZ Development"
+	SectionIn 1 2
 	SetOutPath $INSTDIR\include\yaz
 	File ..\include\yaz\*.h
 	SetOutPath $INSTDIR\lib
 	File ..\lib\*.lib
 SectionEnd
 
-Section "yaz documentation"
-	SectionIn 12
+Section "YAZ Documentation"
+	SectionIn 1 2
 	SetOutPath $INSTDIR
 	File /r ..\doc
 	SetOutPath $SMPROGRAMS\YAZ
@@ -80,33 +90,39 @@ Section "yaz documentation"
                  "$INSTDIR\doc\yaz.pdf"
 SectionEnd
 
-Section "yaz source"
+Section "YAZ Source"
 	SectionIn 1
 	SetOutPath $INSTDIR\util
 	File ..\util\*.c
 	File ..\util\*.tcl
+	File ..\util\*.sgm
+	File ..\util\yaz-comp
 	SetOutPath $INSTDIR\odr
 	File ..\odr\*.c
+	File ..\odr\*.h
 	SetOutPath $INSTDIR\z39.50
 	File ..\z39.50\*.c
 	File ..\z39.50\*.asn
+	File ..\z39.50\*.tcl
 	SetOutPath $INSTDIR\ill
 	File ..\ill\*.c
 	File ..\ill\*.asn
+	File ..\ill\*.tcl
+	SetOutPath $INSTDIR\cql
+	File ..\cql\*.c
+	File ..\cql\*.y
 	SetOutPath $INSTDIR\zutil
 	File ..\zutil\*.c
+	File ..\zutil\*.h
 	SetOutPath $INSTDIR\ccl
 	File ..\ccl\*.c
 	SetOutPath $INSTDIR\zoom
 	File ..\zoom\*.c
-	File ..\zoom\*.h
 	SetOutPath $INSTDIR\comstack
 	File ..\comstack\*.c
 	SetOutPath $INSTDIR\server
 	File ..\server\*.c
 	File ..\server\*.h
-	SetOutPath $INSTDIR\retrieval
-	File ..\retrieval\*.c
 	SetOutPath $INSTDIR\ztest
 	File ..\ztest\*.c
 	SetOutPath $INSTDIR\client
@@ -120,17 +136,19 @@ Section "yaz source"
 SectionEnd
 
 ; begin uninstall settings/section
-UninstallText "This will uninstall YAZ from your system"
+UninstallText "This will uninstall YAZ ${VERSION} from your system"
 
 Section Uninstall
 ; add delete commands to delete whatever files/registry keys/etc you installed here.
 	Delete "$INSTDIR\uninst.exe"
 	DeleteRegKey HKLM "SOFTWARE\Index Data\YAZ"
 	DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\YAZ"
-	RMDir /r "$INSTDIR"
-  	Delete $SMPROGRAMS\YAZ\*.lnk
-  	Delete $SMPROGRAMS\YAZ\*.url
-	RMDir $SMPROGRAMS\YAZ
-SectionEnd ; end of uninstall section
-
+	ExecWait '"$INSTDIR\bin\yaz-ztest" -remove'
+	RMDir /r $SMPROGRAMS\YAZ
+	RMDir /r $INSTDIR
+        IfFileExists $INSTDIR 0 Removed 
+		MessageBox MB_OK|MB_ICONEXCLAMATION \
+                 "Note: $INSTDIR could not be removed."
+Removed:
+SectionEnd
 ; eof