diff --git a/development/Win32/packaging/installer/include/filelist.nsh b/development/Win32/packaging/installer/include/filelist.nsh index 294448ef2e..828b1e25b0 100644 --- a/development/Win32/packaging/installer/include/filelist.nsh +++ b/development/Win32/packaging/installer/include/filelist.nsh @@ -266,6 +266,14 @@ Lists of files to include in the installer !macroend +!macro FileListPythonLibLogging COMMAND DIRECTORY + + ${FILE}__init__.py" + ${FILE}config.py" + ${FILE}handlers.py" + +!macroend + !macro FileListMetaFile2EPS COMMAND DIRECTORY ${FILE}metafile2eps.exe" diff --git a/development/Win32/packaging/installer/setup/install.nsh b/development/Win32/packaging/installer/setup/install.nsh index 2618f4106c..3bf5205327 100644 --- a/development/Win32/packaging/installer/setup/install.nsh +++ b/development/Win32/packaging/installer/setup/install.nsh @@ -50,6 +50,8 @@ Section -ProgramFiles SecProgramFiles !insertmacro FileListPythonLib File "${FILES_PYTHON}\Lib\" SetOutPath "$INSTDIR\python\Lib\encodings" !insertmacro FileListPythonLibEncodings File "${FILES_PYTHON}\Lib\encodings\" + SetOutPath "$INSTDIR\python\Lib\logging" + !insertmacro FileListPythonLibLogging File "${FILES_PYTHON}\Lib\logging\" # Compile all Pyton files to byte-code # The user using the scripts may not have write access diff --git a/development/Win32/packaging/installer/setup/uninstall.nsh b/development/Win32/packaging/installer/setup/uninstall.nsh index 9ea06a0de8..76e2707bf7 100644 --- a/development/Win32/packaging/installer/setup/uninstall.nsh +++ b/development/Win32/packaging/installer/setup/uninstall.nsh @@ -30,6 +30,9 @@ Section "un.Program Files" un.SecProgramFiles !insertmacro FileListPythonLibEncodings Delete "$INSTDIR\python\Lib\encodings\" Delete "$INSTDIR\python\Lib\encodings\*.pyc" RMDir "$INSTDIR\python\Lib\encodings" + !insertmacro FileListPythonLibLogging Delete "$INSTDIR\python\Lib\logging\" + Delete "$INSTDIR\python\Lib\logging\*.pyc" + RMDir "$INSTDIR\python\Lib\logging" !insertmacro FileListPythonLib Delete "$INSTDIR\python\Lib\" Delete "$INSTDIR\python\Lib\*.pyc" RMDir "$INSTDIR\python\Lib"