View the DQSD CVS repository here:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/dqsd/

Update of /cvsroot/dqsd/dqsd/src
In directory sc8-pr-cvs1:/tmp/cvs-serv27349/src

Modified Files:
        search.nsi 
Log Message:
* Installer now lives by the following rules: (Kim Gr�sman)
  - localsearches directory is now created by installation unless it already exists
  - Uninstaller leaves local*, mrumenu.txt and history.txt behind
* Fixed install-done popup, to use proper copyright char, and the years 2002-2003

Index: search.nsi
===================================================================
RCS file: /cvsroot/dqsd/dqsd/src/search.nsi,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** search.nsi  20 Jan 2004 19:44:41 -0000      1.70
--- search.nsi  20 Jan 2004 20:31:40 -0000      1.71
***************
*** 11,15 ****
  !Define IE_MINOR_REQUIRED  5
  !Define HOW_TO_TURN_ON_TOOLBAR "Right-click in your taskbar and select$\n$\n    
Toolbar > Add Quick Search...$\n$\nto add the Quick Search Deskbar to your taskbar."
! !Define TITLE_AND_COPYRIGHT "Dave's Quick Search Deskbar$\nCopyright (c) 2002 David 
Bau$\nDistributed under the terms of the$\nGNU General Public License, Version 2"
  !Define DQSD_CLSID "{226b64e8-dc75-4eea-a6c8-abcb4d1d37ff}"
  !Define DQSD_TITLE "Dave's Quick Search Deskbar"
--- 11,15 ----
  !Define IE_MINOR_REQUIRED  5
  !Define HOW_TO_TURN_ON_TOOLBAR "Right-click in your taskbar and select$\n$\n    
Toolbar > Add Quick Search...$\n$\nto add the Quick Search Deskbar to your taskbar."
! !Define TITLE_AND_COPYRIGHT "Dave's Quick Search Deskbar$\nCopyright � 2002-2003 
David Bau$\nDistributed under the terms of the$\nGNU General Public License, Version 2"
  !Define DQSD_CLSID "{226b64e8-dc75-4eea-a6c8-abcb4d1d37ff}"
  !Define DQSD_TITLE "Dave's Quick Search Deskbar"
***************
*** 67,72 ****
  
    ; Old versions to delete
- ;  UnRegDLL $INSTDIR\DQSDTools.dll
- ;  Delete /REBOOTOK $INSTDIR\DQSDTools.dll
    UnRegDLL $INSTDIR\dqsdt253.dll
    Delete /REBOOTOK $INSTDIR\dqsdt253.dll
--- 67,70 ----
***************
*** 119,125 ****
    IfFileExists "$INSTDIR\search.htm" upgradebar
    StrCpy $8 "The Deskbar has been 
installed.$\n$\n${HOW_TO_TURN_ON_TOOLBAR}$\n$\n${TITLE_AND_COPYRIGHT}"
-   upgradebar:
- 
  
    WriteUninstaller "$INSTDIR\uninstall.exe"
  
--- 117,122 ----
    IfFileExists "$INSTDIR\search.htm" upgradebar
    StrCpy $8 "The Deskbar has been 
installed.$\n$\n${HOW_TO_TURN_ON_TOOLBAR}$\n$\n${TITLE_AND_COPYRIGHT}"
  
+   upgradebar:
    WriteUninstaller "$INSTDIR\uninstall.exe"
  
***************
*** 162,167 ****
--- 159,166 ----
    File "..\localsearch_olive.css"
    File "..\localsearch_blue.css"
+   
    SetOutPath "$INSTDIR\searches"
    File "..\searches\*.xml"
+   
    SetOutPath "$INSTDIR\src"
    File "search.ico"
***************
*** 171,174 ****
--- 170,174 ----
    File "scrub.cmd"
    File "dqsd.xml"
+   
    SetOutPath "$INSTDIR\src\DQSDTools"
    File "DQSDTools\DQSDTools.cpp"
***************
*** 207,211 ****
    SetOverwrite on
  
!   ; old source files used to live here
    Delete $INSTDIR\license.txt
    Delete $INSTDIR\search.ico
--- 207,211 ----
    SetOverwrite on
  
!   ; Remove deprecated stuff
    Delete $INSTDIR\license.txt
    Delete $INSTDIR\search.ico
***************
*** 221,225 ****
    Delete $INSTDIR\httpinst.js
  
!   ; old versions of searches to delete; most renamed or consolidated
    Delete $INSTDIR\searches\aim.xml
    Delete $INSTDIR\searches\ask.xml
--- 221,225 ----
    Delete $INSTDIR\httpinst.js
  
!   ; Old versions of searches to delete; most renamed or consolidated
    Delete $INSTDIR\searches\aim.xml
    Delete $INSTDIR\searches\ask.xml
***************
*** 361,378 ****
    Delete /REBOOTOK $INSTDIR\localsearch_olive.css
    Delete /REBOOTOK $INSTDIR\localsearch_blue.css
    RmDir /r $INSTDIR\src
    RmDir /r $INSTDIR\searches
    RmDir /r $INSTDIR\addons
  
!   ; Remove preferences too
!   Delete /REBOOTOK $INSTDIR\preferences.js
! 
!   ; MUST REMOVE UNINSTALLER, too
!   Delete /REBOOTOK $INSTDIR\uninstall.exe
! 
!   ; Delete directory
!   RmDir /r $INSTDIR
  
! SectionEnd
  
! ; eof
\ No newline at end of file
--- 361,375 ----
    Delete /REBOOTOK $INSTDIR\localsearch_olive.css
    Delete /REBOOTOK $INSTDIR\localsearch_blue.css
+   Delete /REBOOTOK $INSTDIR\preferences.js
+   Delete /REBOOTOK $INSTDIR\uninstall.exe
    RmDir /r $INSTDIR\src
    RmDir /r $INSTDIR\searches
    RmDir /r $INSTDIR\addons
  
!   ; Remove localsearches if it's empty (i.e. no /r)
!   RmDir $INSTDIR\localsearches
  
!   ; Remove install directory if it's empty (hardly ever will be)
!   RmDir /REBOOTOK $INSTDIR
  
! SectionEnd
\ No newline at end of file




-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
DQSD-CVS mailing list
https://lists.sourceforge.net/lists/listinfo/dqsd-cvs
DQSD CVS repository:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/dqsd/

Reply via email to