[Commits] (bear) rpm uninstall now removes the cacert.pem, chandler.log and randpool.dat

commits at osafoundation.org commits at osafoundation.org
Mon Feb 7 16:58:42 PST 2005


Commit by: bear
Modified files:
internal/installers/rpm/chandler.spec 1.2 1.3
internal/installers/win/chandler.nsi 1.3 1.4

Log message:
rpm uninstall now removes the cacert.pem, chandler.log and randpool.dat
temporary files
win32 install source updated for new distrib files and also fixes 
Bug 2233 Bug 2273 Bug 2274 and Bug 2275


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/internal/installers/rpm/chandler.spec.diff?r1=text&tr1=1.2&r2=text&tr2=1.3
http://cvs.osafoundation.org/index.cgi/internal/installers/win/chandler.nsi.diff?r1=text&tr1=1.3&r2=text&tr2=1.4

Index: internal/installers/rpm/chandler.spec
diff -u internal/installers/rpm/chandler.spec:1.2 internal/installers/rpm/chandler.spec:1.3
--- internal/installers/rpm/chandler.spec:1.2	Tue Dec  7 16:37:56 2004
+++ internal/installers/rpm/chandler.spec	Mon Feb  7 16:58:41 2005
@@ -1,7 +1,7 @@
-Summary: Test Chandler
-Name: Chandler
 Version: 0.4
 Release: 1
+Summary: Test Chandler
+Name: Chandler
 License: GPLv2
 Group: Office
 Vendor: Open Source Applications Foundation
@@ -9,11 +9,25 @@
 BuildRoot: %{_builddir}/%{name}
 Source0: chandler.tar.gz
 Prefix: /usr/local
+AutoReqProv: no
 %description
 Test Chandler RPM build
 %install
 cd $RPM_BUILD_ROOT
 tar zxvf %{SOURCE0}
-%clean
+#%post
+#if [ "$1" = 1 ];
+#then
+# add post-install script here
+#fi
+%preun
+if [ "$1" = 0 ];
+then
+find $RPM_INSTALL_PREFIX/Chandler -type f -name '*.pyc' -exec rm -f {} \;
+fi
+#note that the __repository__ directory and any lock file are not removed
+rm -f $RPM_INSTALL_PREFIX/Chandler/randpool.dat
+rm -f $RPM_INSTALL_PREFIX/Chandler/cacert.pem
+rm -f $RPM_INSTALL_PREFIX/Chandler/chandler.log
 %files
 /usr/local/Chandler

Index: internal/installers/win/chandler.nsi
diff -u internal/installers/win/chandler.nsi:1.3 internal/installers/win/chandler.nsi:1.4
--- internal/installers/win/chandler.nsi:1.3	Tue Jan 11 21:36:20 2005
+++ internal/installers/win/chandler.nsi	Mon Feb  7 16:58:41 2005
@@ -1,17 +1,10 @@
-  ;
-  ; Chandler Win32 setup script
-  ;
-  ; $Revision: 1.3 $
-  ; $Date: 2005/01/12 05:36:20 $
-  ; Copyright (c) 2004 Open Source Applications Founation
-  ; http://osafoundation.org/Chandler_0.1_license_terms.htm
-  ;
+; Script generated by the HM NIS Edit Script Wizard.
 
 !define PRODUCT_NAME "Chandler"
 !define PRODUCT_VERSION "0.4+"
 !define PRODUCT_PUBLISHER "Open Source Application Foundation"
-!define PRODUCT_WEB_SITE "http://www.osafoundation.org"
-!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\chandlerDebug.exe"
+!define PRODUCT_WEB_SITE "http://osafoundation.org"
+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\chandler.exe"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"
 
@@ -34,7 +27,7 @@
 !insertmacro MUI_PAGE_DIRECTORY
 !insertmacro MUI_PAGE_INSTFILES
 
-!define MUI_FINISHPAGE_RUN "$INSTDIR\chandlerDebug.exe"
+!define MUI_FINISHPAGE_RUN "$INSTDIR\chandler.exe"
 !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\README.win.txt"
 !insertmacro MUI_PAGE_FINISH
 
@@ -54,8 +47,14 @@
 OutFile "Setup.exe"
 InstallDir "$PROGRAMFILES\Chandler"
 InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
-ShowInstDetails nevershow
-ShowUnInstDetails nevershow
+ShowInstDetails hide
+ShowUnInstDetails hide
+
+  ; show the language selection dialog before any UI pages are displayed
+
+Function .onInit
+  ;!insertmacro MUI_LANGDLL_DISPLAY
+FunctionEnd
 
 Section "MainSection" SEC01
   SetOutPath "$INSTDIR"
@@ -67,15 +66,15 @@
     
   File /r "Chandler\application"
   File /r "Chandler\crypto"
-  File /r "Chandler\debug"
+  File /r "Chandler\release"
   File /r "Chandler\locale"
   File /r "Chandler\parcels"
   File /r "Chandler\repository"
   File /r "Chandler\tools"
 
   CreateDirectory "$SMPROGRAMS\Chandler"
-  CreateShortCut "$SMPROGRAMS\Chandler\Chandler.lnk" "$INSTDIR\chandlerDebug.exe"
-  CreateShortCut "$DESKTOP\Chandler.lnk" "$INSTDIR\chandlerDebug.exe"
+  CreateShortCut "$SMPROGRAMS\Chandler\Chandler.lnk" "$INSTDIR\chandler.exe"
+  CreateShortCut "$DESKTOP\Chandler.lnk" "$INSTDIR\chandler.exe"
 SectionEnd
 
   ; create the uninstall shortcut - done here so that it will only
@@ -89,10 +88,10 @@
   
 Section -Post
   WriteUninstaller "$INSTDIR\uninst.exe"
-  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\chandlerDebug.exe"
+  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\chandler.exe"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\chandlerDebug.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\chandler.exe"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
@@ -118,28 +117,19 @@
   Delete "$DESKTOP\Chandler.lnk"
   Delete "$SMPROGRAMS\Chandler\Chandler.lnk"
 
-    ; currently commented out to prevent testing blow-outs ;)
-  ;Delete "$INSTDIR\*.*"
-  Delete "$INSTDIR\Chandler.py"
-  Delete "$INSTDIR\ChangeLog.txt"
-  Delete "$INSTDIR\HISTORY.txt"
-  Delete "$INSTDIR\LICENSE.txt"
-  Delete "$INSTDIR\setup.py"
-  Delete "$INSTDIR\version.py"
+  Delete "$INSTDIR\*.*"
 
   RMDir "$SMPROGRAMS\Chandler"
 
   RMDir /r "$INSTDIR\application"
   RMDir /r "$INSTDIR\crypto"
-  RMDir /r "$INSTDIR\debug"
+  RMDir /r "$INSTDIR\release"
   RMDir /r "$INSTDIR\locale"
   RMDir /r "$INSTDIR\parcels"
   RMDir /r "$INSTDIR\repository"
   RMDir /r "$INSTDIR\tools"
-  RMDir /r "$INSTDIR\__repository__"
 
-    ; currently commented out to prevent testing blow-outs ;)
-  ;RMDir "$INSTDIR"
+  RMDir "$INSTDIR"
 
   DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
   DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"



More information about the Commits mailing list