From 5a99e0ca0cf64240b8d02ec50c0374e19efb6ee4 Mon Sep 17 00:00:00 2001 From: Tim Peters Date: Wed, 1 Aug 2001 06:29:56 +0000 Subject: [PATCH] We always wrote a pair of lines to the Wise install.log telling it to delete the Tools and Lib directories at uninstall time. However, under the old version of Wise, they didn't actually do anything. Under the new version, they work as advertised, and even delete files users added. Got rid of those, and replaced them with similar uninstall cmds that get rid of all .pyc and .pyo files (whether or not the installer created them). This works nicely! It still tears down the directory structure, except for those directories needed to get to any non-.pyc/o file(s) the user may have added. --- PCbuild/python20.wse | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/PCbuild/python20.wse b/PCbuild/python20.wse index e77761ddc6c..04caaffa0b0 100644 --- a/PCbuild/python20.wse +++ b/PCbuild/python20.wse @@ -1189,6 +1189,11 @@ item: Set Variable end item: End Block end +item: Remark +end +item: Remark + Text=Install the license even if they deselect everything . +end item: Install File Source=..\license Destination=%MAINDIR%\LICENSE.txt @@ -1206,6 +1211,20 @@ item: Install File end item: Remark end +item: Remark + Text=These arrange to (recursively!) delete all .pyc and .pyo files at uninstall time. +end +item: Remark + Text=This "does the right thing": any directories left empty at the end are removed. +end +item: Add Text to INSTALL.LOG + Text=File Tree: %MAINDIR%\*.pyc +end +item: Add Text to INSTALL.LOG + Text=File Tree: %MAINDIR%\*.pyo +end +item: Remark +end item: Remark Text=A: interpreter, libraries and Tcl/Tk end @@ -1429,14 +1448,6 @@ end item: Remark Text=Libraries (Lib/) end -item: Remark - Text=Remove entire Lib directory at uninstall time. -end -item: Add Text to INSTALL.LOG - Text=File Tree: %MAINDIR%\Lib\*.* -end -item: Remark -end item: Install File Source=..\lib\*.py Destination=%MAINDIR%\Lib @@ -1608,14 +1619,6 @@ item: If/While Statement Value=C Flags=00001010 end -item: Remark - Text=Delete entire Tools directory at uninstall time. -end -item: Add Text to INSTALL.LOG - Text=File Tree: %MAINDIR%\Tools\*.* -end -item: Remark -end item: Install File Source=..\tools\scripts\*.py Destination=%MAINDIR%\Tools\Scripts