Updating Windows build deps, and recreating the nsis installer script for new files

1 files changed, 347 insertions, 290 deletions

diff --git a/install/onionshare.nsi b/install/onionshare.nsi
index fcb8a137..f12c6190 100644
--- a/install/onionshare.nsi
+++ b/install/onionshare.nsi
@@ -60,157 +60,184 @@ Section "install"
     SetOutPath "$INSTDIR"

     File "onionshare.ico"

     File "${BINPATH}\api-ms-win-core-console-l1-1-0.dll"

-    File "${BINPATH}\api-ms-win-core-datetime-l1-1-0.dll"

-    File "${BINPATH}\api-ms-win-core-debug-l1-1-0.dll"

-    File "${BINPATH}\api-ms-win-core-errorhandling-l1-1-0.dll"

-    File "${BINPATH}\api-ms-win-core-file-l1-1-0.dll"

-    File "${BINPATH}\api-ms-win-core-file-l1-2-0.dll"

-    File "${BINPATH}\api-ms-win-core-file-l2-1-0.dll"

-    File "${BINPATH}\api-ms-win-core-handle-l1-1-0.dll"

-    File "${BINPATH}\api-ms-win-core-heap-l1-1-0.dll"

-    File "${BINPATH}\api-ms-win-core-interlocked-l1-1-0.dll"

-    File "${BINPATH}\api-ms-win-core-libraryloader-l1-1-0.dll"

-    File "${BINPATH}\api-ms-win-core-localization-l1-2-0.dll"

-    File "${BINPATH}\api-ms-win-core-memory-l1-1-0.dll"

-    File "${BINPATH}\api-ms-win-core-namedpipe-l1-1-0.dll"

-    File "${BINPATH}\api-ms-win-core-processenvironment-l1-1-0.dll"

-    File "${BINPATH}\api-ms-win-core-processthreads-l1-1-0.dll"

-    File "${BINPATH}\api-ms-win-core-processthreads-l1-1-1.dll"

-    File "${BINPATH}\api-ms-win-core-profile-l1-1-0.dll"

-    File "${BINPATH}\api-ms-win-core-rtlsupport-l1-1-0.dll"

-    File "${BINPATH}\api-ms-win-core-string-l1-1-0.dll"

-    File "${BINPATH}\api-ms-win-core-synch-l1-1-0.dll"

-    File "${BINPATH}\api-ms-win-core-synch-l1-2-0.dll"

-    File "${BINPATH}\api-ms-win-core-sysinfo-l1-1-0.dll"

-    File "${BINPATH}\api-ms-win-core-timezone-l1-1-0.dll"

-    File "${BINPATH}\api-ms-win-core-util-l1-1-0.dll"

-    File "${BINPATH}\api-ms-win-crt-conio-l1-1-0.dll"

-    File "${BINPATH}\api-ms-win-crt-convert-l1-1-0.dll"

-    File "${BINPATH}\api-ms-win-crt-environment-l1-1-0.dll"

-    File "${BINPATH}\api-ms-win-crt-filesystem-l1-1-0.dll"

-    File "${BINPATH}\api-ms-win-crt-heap-l1-1-0.dll"

-    File "${BINPATH}\api-ms-win-crt-locale-l1-1-0.dll"

-    File "${BINPATH}\api-ms-win-crt-math-l1-1-0.dll"

-    File "${BINPATH}\api-ms-win-crt-multibyte-l1-1-0.dll"

-    File "${BINPATH}\api-ms-win-crt-process-l1-1-0.dll"

-    File "${BINPATH}\api-ms-win-crt-runtime-l1-1-0.dll"

-    File "${BINPATH}\api-ms-win-crt-stdio-l1-1-0.dll"

-    File "${BINPATH}\api-ms-win-crt-string-l1-1-0.dll"

-    File "${BINPATH}\api-ms-win-crt-time-l1-1-0.dll"

-    File "${BINPATH}\api-ms-win-crt-utility-l1-1-0.dll"

-    File "${BINPATH}\base_library.zip"

-    File "${BINPATH}\MSVCP140.dll"

-    File "${BINPATH}\MSVCR100.dll"

-    File "${BINPATH}\onionshare-gui.exe"

-    File "${BINPATH}\onionshare-gui.exe.manifest"

-    File "${BINPATH}\pyexpat.pyd"

-    File "${BINPATH}\PyQt5.Qt.pyd"

-    File "${BINPATH}\PyQt5.QtCore.pyd"

-    File "${BINPATH}\PyQt5.QtGui.pyd"

-    File "${BINPATH}\PyQt5.QtPrintSupport.pyd"

-    File "${BINPATH}\PyQt5.QtWidgets.pyd"

-    File "${BINPATH}\python3.dll"

-    File "${BINPATH}\python35.dll"

-    File "${BINPATH}\pywintypes35.dll"

-    File "${BINPATH}\Qt5Core.dll"

-    File "${BINPATH}\Qt5Gui.dll"

-    File "${BINPATH}\Qt5PrintSupport.dll"

-    File "${BINPATH}\Qt5Svg.dll"

-    File "${BINPATH}\Qt5Widgets.dll"

-    File "${BINPATH}\select.pyd"

-    File "${BINPATH}\sip.pyd"

-    File "${BINPATH}\ucrtbase.dll"

-    File "${BINPATH}\unicodedata.pyd"

-    File "${BINPATH}\VCRUNTIME140.dll"

-    File "${BINPATH}\win32wnet.pyd"

-    File "${BINPATH}\_bz2.pyd"

-    File "${BINPATH}\_ctypes.pyd"

-    File "${BINPATH}\_decimal.pyd"

-    File "${BINPATH}\_hashlib.pyd"

-    File "${BINPATH}\_lzma.pyd"

-    File "${BINPATH}\_multiprocessing.pyd"

-    File "${BINPATH}\_socket.pyd"

-    File "${BINPATH}\_ssl.pyd"

+	File "${BINPATH}\api-ms-win-core-datetime-l1-1-0.dll"

+	File "${BINPATH}\api-ms-win-core-debug-l1-1-0.dll"

+	File "${BINPATH}\api-ms-win-core-errorhandling-l1-1-0.dll"

+	File "${BINPATH}\api-ms-win-core-file-l1-1-0.dll"

+	File "${BINPATH}\api-ms-win-core-file-l1-2-0.dll"

+	File "${BINPATH}\api-ms-win-core-file-l2-1-0.dll"

+	File "${BINPATH}\api-ms-win-core-handle-l1-1-0.dll"

+	File "${BINPATH}\api-ms-win-core-heap-l1-1-0.dll"

+	File "${BINPATH}\api-ms-win-core-interlocked-l1-1-0.dll"

+	File "${BINPATH}\api-ms-win-core-libraryloader-l1-1-0.dll"

+	File "${BINPATH}\api-ms-win-core-localization-l1-2-0.dll"

+	File "${BINPATH}\api-ms-win-core-memory-l1-1-0.dll"

+	File "${BINPATH}\api-ms-win-core-namedpipe-l1-1-0.dll"

+	File "${BINPATH}\api-ms-win-core-processenvironment-l1-1-0.dll"

+	File "${BINPATH}\api-ms-win-core-processthreads-l1-1-0.dll"

+	File "${BINPATH}\api-ms-win-core-processthreads-l1-1-1.dll"

+	File "${BINPATH}\api-ms-win-core-profile-l1-1-0.dll"

+	File "${BINPATH}\api-ms-win-core-rtlsupport-l1-1-0.dll"

+	File "${BINPATH}\api-ms-win-core-string-l1-1-0.dll"

+	File "${BINPATH}\api-ms-win-core-synch-l1-1-0.dll"

+	File "${BINPATH}\api-ms-win-core-synch-l1-2-0.dll"

+	File "${BINPATH}\api-ms-win-core-sysinfo-l1-1-0.dll"

+	File "${BINPATH}\api-ms-win-core-timezone-l1-1-0.dll"

+	File "${BINPATH}\api-ms-win-core-util-l1-1-0.dll"

+	File "${BINPATH}\api-ms-win-crt-conio-l1-1-0.dll"

+	File "${BINPATH}\api-ms-win-crt-convert-l1-1-0.dll"

+	File "${BINPATH}\api-ms-win-crt-environment-l1-1-0.dll"

+	File "${BINPATH}\api-ms-win-crt-filesystem-l1-1-0.dll"

+	File "${BINPATH}\api-ms-win-crt-heap-l1-1-0.dll"

+	File "${BINPATH}\api-ms-win-crt-locale-l1-1-0.dll"

+	File "${BINPATH}\api-ms-win-crt-math-l1-1-0.dll"

+	File "${BINPATH}\api-ms-win-crt-multibyte-l1-1-0.dll"

+	File "${BINPATH}\api-ms-win-crt-process-l1-1-0.dll"

+	File "${BINPATH}\api-ms-win-crt-runtime-l1-1-0.dll"

+	File "${BINPATH}\api-ms-win-crt-stdio-l1-1-0.dll"

+	File "${BINPATH}\api-ms-win-crt-string-l1-1-0.dll"

+	File "${BINPATH}\api-ms-win-crt-time-l1-1-0.dll"

+	File "${BINPATH}\api-ms-win-crt-utility-l1-1-0.dll"

+	File "${BINPATH}\base_library.zip"

+	File "${BINPATH}\mfc140u.dll"

+	File "${BINPATH}\MSVCP140.dll"

+	File "${BINPATH}\onionshare-gui.exe"

+	File "${BINPATH}\onionshare-gui.exe.manifest"

+	File "${BINPATH}\pyexpat.pyd"

+	File "${BINPATH}\PyQt5.Qt.pyd"

+	File "${BINPATH}\PyQt5.QtCore.pyd"

+	File "${BINPATH}\PyQt5.QtGui.pyd"

+	File "${BINPATH}\PyQt5.QtPrintSupport.pyd"

+	File "${BINPATH}\PyQt5.QtWidgets.pyd"

+	File "${BINPATH}\python3.dll"

+	File "${BINPATH}\python36.dll"

+	File "${BINPATH}\pythoncom36.dll"

+	File "${BINPATH}\pywintypes36.dll"

+	File "${BINPATH}\Qt5Core.dll"

+	File "${BINPATH}\Qt5Gui.dll"

+	File "${BINPATH}\Qt5PrintSupport.dll"

+	File "${BINPATH}\Qt5Svg.dll"

+	File "${BINPATH}\Qt5Widgets.dll"

+	File "${BINPATH}\select.pyd"

+	File "${BINPATH}\sip.pyd"

+	File "${BINPATH}\ucrtbase.dll"

+	File "${BINPATH}\unicodedata.pyd"

+	File "${BINPATH}\VCRUNTIME140.dll"

+	File "${BINPATH}\win32api.pyd"

+	File "${BINPATH}\win32com.shell.shell.pyd"

+	File "${BINPATH}\win32trace.pyd"

+	File "${BINPATH}\win32ui.pyd"

+	File "${BINPATH}\win32wnet.pyd"

+	File "${BINPATH}\_asyncio.pyd"

+	File "${BINPATH}\_bz2.pyd"

+	File "${BINPATH}\_ctypes.pyd"

+	File "${BINPATH}\_decimal.pyd"

+	File "${BINPATH}\_hashlib.pyd"

+	File "${BINPATH}\_lzma.pyd"

+	File "${BINPATH}\_multiprocessing.pyd"

+	File "${BINPATH}\_overlapped.pyd"

+	File "${BINPATH}\_socket.pyd"

+	File "${BINPATH}\_ssl.pyd"

+	File "${BINPATH}\_win32sysloader.pyd"

 

     SetOutPath "$INSTDIR\Include"

-    File "${BINPATH}\Include\pyconfig.h"

-

-    SetOutPath "$INSTDIR\lib2to3"

-    File "${BINPATH}\lib2to3\Grammar.txt"

-    File "${BINPATH}\lib2to3\Grammar3.5.2.final.0.pickle"

-    File "${BINPATH}\lib2to3\PatternGrammar.txt"

-    File "${BINPATH}\lib2to3\PatternGrammar3.5.2.final.0.pickle"

-

-    SetOutPath "$INSTDIR\share"

-    File "${BINPATH}\share\license.txt"

-    File "${BINPATH}\share\version.txt"

-    File "${BINPATH}\share\wordlist.txt"

-    File "${BINPATH}\share\torrc_template-windows"

-

-    SetOutPath "$INSTDIR\share\html"

-    File "${BINPATH}\share\html\404.html"

-    File "${BINPATH}\share\html\denied.html"

-    File "${BINPATH}\share\html\index.html"

-

-    SetOutPath "$INSTDIR\share\images"

-    File "${BINPATH}\share\images\drop_files.png"

-    File "${BINPATH}\share\images\logo.png"

-    File "${BINPATH}\share\images\server_started.png"

-    File "${BINPATH}\share\images\server_stopped.png"

-    File "${BINPATH}\share\images\server_working.png"

-    File "${BINPATH}\share\images\settings.png"

-

-    SetOutPath "$INSTDIR\share\locale"

-    File "${BINPATH}\share\locale\cs.json"

-    File "${BINPATH}\share\locale\de.json"

-    File "${BINPATH}\share\locale\en.json"

-    File "${BINPATH}\share\locale\eo.json"

-    File "${BINPATH}\share\locale\es.json"

-    File "${BINPATH}\share\locale\fi.json"

-    File "${BINPATH}\share\locale\fr.json"

-    File "${BINPATH}\share\locale\it.json"

-    File "${BINPATH}\share\locale\nl.json"

-    File "${BINPATH}\share\locale\no.json"

-    File "${BINPATH}\share\locale\pt.json"

-    File "${BINPATH}\share\locale\ru.json"

-    File "${BINPATH}\share\locale\tr.json"

-

-    SetOutPath "$INSTDIR\qt5_plugins\iconengines"

-    File "${BINPATH}\qt5_plugins\iconengines\qsvgicon.dll"

-

-    SetOutPath "$INSTDIR\qt5_plugins\imageformats"

-    File "${BINPATH}\qt5_plugins\imageformats\qgif.dll"

-    File "${BINPATH}\qt5_plugins\imageformats\qicns.dll"

-    File "${BINPATH}\qt5_plugins\imageformats\qico.dll"

-    File "${BINPATH}\qt5_plugins\imageformats\qjpeg.dll"

-    File "${BINPATH}\qt5_plugins\imageformats\qsvg.dll"

-    File "${BINPATH}\qt5_plugins\imageformats\qtga.dll"

-    File "${BINPATH}\qt5_plugins\imageformats\qtiff.dll"

-    File "${BINPATH}\qt5_plugins\imageformats\qwbmp.dll"

-    File "${BINPATH}\qt5_plugins\imageformats\qwebp.dll"

-

-    SetOutPath "$INSTDIR\qt5_plugins\platforms"

-    File "${BINPATH}\qt5_plugins\platforms\qminimal.dll"

-    File "${BINPATH}\qt5_plugins\platforms\qoffscreen.dll"

-    File "${BINPATH}\qt5_plugins\platforms\qwindows.dll"

-

-    SetOutPath "$INSTDIR\qt5_plugins\printsupport"

-    File "${BINPATH}\qt5_plugins\printsupport\windowsprintersupport.dll"

-

-    SetOutPath "$INSTDIR\tor\Data\Tor"

-    File "${BINPATH}\tor\Data\Tor\geoip"

-    File "${BINPATH}\tor\Data\Tor\geoip6"

-

-    SetOutPath "$INSTDIR\tor\Tor"

-    File "${BINPATH}\tor\Tor\libeay32.dll"

-    File "${BINPATH}\tor\Tor\libevent_core-2-0-5.dll"

-    File "${BINPATH}\tor\Tor\libevent_extra-2-0-5.dll"

-    File "${BINPATH}\tor\Tor\libevent-2-0-5.dll"

-    File "${BINPATH}\tor\Tor\libgcc_s_sjlj-1.dll"

-    File "${BINPATH}\tor\Tor\libssp-0.dll"

-    File "${BINPATH}\tor\Tor\ssleay32.dll"

-    File "${BINPATH}\tor\Tor\tor.exe"

-    File "${BINPATH}\tor\Tor\zlib1.dll"

+	File "${BINPATH}\Include\pyconfig.h"

+

+	SetOutPath "$INSTDIR\lib2to3"

+	File "${BINPATH}\lib2to3\Grammar.txt"

+	File "${BINPATH}\lib2to3\Grammar3.6.2.candidate.2.pickle"

+	File "${BINPATH}\lib2to3\Grammar3.6.2.final.0.pickle"

+	File "${BINPATH}\lib2to3\Grammar3.6.3.candidate.1.pickle"

+	File "${BINPATH}\lib2to3\Grammar3.6.3.final.0.pickle"

+	File "${BINPATH}\lib2to3\Grammar3.6.4.candidate.1.pickle"

+	File "${BINPATH}\lib2to3\Grammar3.6.4.final.0.pickle"

+	File "${BINPATH}\lib2to3\PatternGrammar.txt"

+	File "${BINPATH}\lib2to3\PatternGrammar3.6.2.candidate.2.pickle"

+	File "${BINPATH}\lib2to3\PatternGrammar3.6.2.final.0.pickle"

+	File "${BINPATH}\lib2to3\PatternGrammar3.6.3.candidate.1.pickle"

+	File "${BINPATH}\lib2to3\PatternGrammar3.6.3.final.0.pickle"

+	File "${BINPATH}\lib2to3\PatternGrammar3.6.4.candidate.1.pickle"

+	File "${BINPATH}\lib2to3\PatternGrammar3.6.4.final.0.pickle"

+

+	SetOutPath "$INSTDIR\lib2to3\tests\data"

+	File "${BINPATH}\lib2to3\tests\data\README"

+

+	SetOutPath "$INSTDIR\PyQt5\Qt\bin"

+	File "${BINPATH}\PyQt5\Qt\bin\qt.conf"

+

+	SetOutPath "$INSTDIR\PyQt5\Qt\plugins\iconengines"

+	File "${BINPATH}\PyQt5\Qt\plugins\iconengines\qsvgicon.dll"

+

+	SetOutPath "$INSTDIR\PyQt5\Qt\plugins\imageformats"

+	File "${BINPATH}\PyQt5\Qt\plugins\imageformats\qgif.dll"

+	File "${BINPATH}\PyQt5\Qt\plugins\imageformats\qicns.dll"

+	File "${BINPATH}\PyQt5\Qt\plugins\imageformats\qico.dll"

+	File "${BINPATH}\PyQt5\Qt\plugins\imageformats\qjpeg.dll"

+	File "${BINPATH}\PyQt5\Qt\plugins\imageformats\qsvg.dll"

+	File "${BINPATH}\PyQt5\Qt\plugins\imageformats\qtga.dll"

+	File "${BINPATH}\PyQt5\Qt\plugins\imageformats\qtiff.dll"

+	File "${BINPATH}\PyQt5\Qt\plugins\imageformats\qwbmp.dll"

+	File "${BINPATH}\PyQt5\Qt\plugins\imageformats\qwebp.dll"

+

+	SetOutPath "$INSTDIR\PyQt5\Qt\plugins\platforms"

+	File "${BINPATH}\PyQt5\Qt\plugins\platforms\qminimal.dll"

+	File "${BINPATH}\PyQt5\Qt\plugins\platforms\qoffscreen.dll"

+	File "${BINPATH}\PyQt5\Qt\plugins\platforms\qwindows.dll"

+

+	SetOutPath "$INSTDIR\PyQt5\Qt\plugins\printsupport"

+	File "${BINPATH}\PyQt5\Qt\plugins\printsupport\windowsprintersupport.dll"

+

+	SetOutPath "$INSTDIR\share"

+	File "${BINPATH}\share\license.txt"

+	File "${BINPATH}\share\torrc_template"

+	File "${BINPATH}\share\torrc_template-windows"

+	File "${BINPATH}\share\version.txt"

+	File "${BINPATH}\share\wordlist.txt"

+

+	SetOutPath "$INSTDIR\share\html"

+	File "${BINPATH}\share\html\404.html"

+	File "${BINPATH}\share\html\denied.html"

+	File "${BINPATH}\share\html\index.html"

+

+	SetOutPath "$INSTDIR\share\images"

+	File "${BINPATH}\share\images\drop_files.png"

+	File "${BINPATH}\share\images\logo.png"

+	File "${BINPATH}\share\images\logo_grayscale.png"

+	File "${BINPATH}\share\images\server_started.png"

+	File "${BINPATH}\share\images\server_stopped.png"

+	File "${BINPATH}\share\images\server_working.png"

+	File "${BINPATH}\share\images\settings.png"

+	File "${BINPATH}\share\images\settings_inactive.png"

+

+	SetOutPath "$INSTDIR\share\locale"

+	File "${BINPATH}\share\locale\cs.json"

+	File "${BINPATH}\share\locale\de.json"

+	File "${BINPATH}\share\locale\en.json"

+	File "${BINPATH}\share\locale\eo.json"

+	File "${BINPATH}\share\locale\es.json"

+	File "${BINPATH}\share\locale\fi.json"

+	File "${BINPATH}\share\locale\fr.json"

+	File "${BINPATH}\share\locale\it.json"

+	File "${BINPATH}\share\locale\nl.json"

+	File "${BINPATH}\share\locale\no.json"

+	File "${BINPATH}\share\locale\pt.json"

+	File "${BINPATH}\share\locale\ru.json"

+	File "${BINPATH}\share\locale\tr.json"

+

+	SetOutPath "$INSTDIR\tor\Data\Tor"

+	File "${BINPATH}\tor\Data\Tor\geoip"

+	File "${BINPATH}\tor\Data\Tor\geoip6"

+

+	SetOutPath "$INSTDIR\tor\Tor"

+	File "${BINPATH}\tor\Tor\libeay32.dll"

+	File "${BINPATH}\tor\Tor\libevent-2-0-5.dll"

+	File "${BINPATH}\tor\Tor\libevent_core-2-0-5.dll"

+	File "${BINPATH}\tor\Tor\libevent_extra-2-0-5.dll"

+	File "${BINPATH}\tor\Tor\libgcc_s_sjlj-1.dll"

+	File "${BINPATH}\tor\Tor\libssp-0.dll"

+	File "${BINPATH}\tor\Tor\ssleay32.dll"

+	File "${BINPATH}\tor\Tor\tor.exe"

+	File "${BINPATH}\tor\Tor\zlib1.dll"

 

     # uninstaller

     !ifndef INNER

@@ -255,152 +282,182 @@ FunctionEnd
 

         # remove files

         Delete "$INSTDIR\api-ms-win-core-console-l1-1-0.dll"

-        Delete "$INSTDIR\api-ms-win-core-datetime-l1-1-0.dll"

-        Delete "$INSTDIR\api-ms-win-core-debug-l1-1-0.dll"

-        Delete "$INSTDIR\api-ms-win-core-errorhandling-l1-1-0.dll"

-        Delete "$INSTDIR\api-ms-win-core-file-l1-1-0.dll"

-        Delete "$INSTDIR\api-ms-win-core-file-l1-2-0.dll"

-        Delete "$INSTDIR\api-ms-win-core-file-l2-1-0.dll"

-        Delete "$INSTDIR\api-ms-win-core-handle-l1-1-0.dll"

-        Delete "$INSTDIR\api-ms-win-core-heap-l1-1-0.dll"

-        Delete "$INSTDIR\api-ms-win-core-interlocked-l1-1-0.dll"

-        Delete "$INSTDIR\api-ms-win-core-libraryloader-l1-1-0.dll"

-        Delete "$INSTDIR\api-ms-win-core-localization-l1-2-0.dll"

-        Delete "$INSTDIR\api-ms-win-core-memory-l1-1-0.dll"

-        Delete "$INSTDIR\api-ms-win-core-namedpipe-l1-1-0.dll"

-        Delete "$INSTDIR\api-ms-win-core-processenvironment-l1-1-0.dll"

-        Delete "$INSTDIR\api-ms-win-core-processthreads-l1-1-0.dll"

-        Delete "$INSTDIR\api-ms-win-core-processthreads-l1-1-1.dll"

-        Delete "$INSTDIR\api-ms-win-core-profile-l1-1-0.dll"

-        Delete "$INSTDIR\api-ms-win-core-rtlsupport-l1-1-0.dll"

-        Delete "$INSTDIR\api-ms-win-core-string-l1-1-0.dll"

-        Delete "$INSTDIR\api-ms-win-core-synch-l1-1-0.dll"

-        Delete "$INSTDIR\api-ms-win-core-synch-l1-2-0.dll"

-        Delete "$INSTDIR\api-ms-win-core-sysinfo-l1-1-0.dll"

-        Delete "$INSTDIR\api-ms-win-core-timezone-l1-1-0.dll"

-        Delete "$INSTDIR\api-ms-win-core-util-l1-1-0.dll"

-        Delete "$INSTDIR\api-ms-win-crt-conio-l1-1-0.dll"

-        Delete "$INSTDIR\api-ms-win-crt-convert-l1-1-0.dll"

-        Delete "$INSTDIR\api-ms-win-crt-environment-l1-1-0.dll"

-        Delete "$INSTDIR\api-ms-win-crt-filesystem-l1-1-0.dll"

-        Delete "$INSTDIR\api-ms-win-crt-heap-l1-1-0.dll"

-        Delete "$INSTDIR\api-ms-win-crt-locale-l1-1-0.dll"

-        Delete "$INSTDIR\api-ms-win-crt-math-l1-1-0.dll"

-        Delete "$INSTDIR\api-ms-win-crt-multibyte-l1-1-0.dll"

-        Delete "$INSTDIR\api-ms-win-crt-process-l1-1-0.dll"

-        Delete "$INSTDIR\api-ms-win-crt-runtime-l1-1-0.dll"

-        Delete "$INSTDIR\api-ms-win-crt-stdio-l1-1-0.dll"

-        Delete "$INSTDIR\api-ms-win-crt-string-l1-1-0.dll"

-        Delete "$INSTDIR\api-ms-win-crt-time-l1-1-0.dll"

-        Delete "$INSTDIR\api-ms-win-crt-utility-l1-1-0.dll"

-        Delete "$INSTDIR\base_library.zip"

-        Delete "$INSTDIR\MSVCP140.dll"

-        Delete "$INSTDIR\MSVCR100.dll"

-        Delete "$INSTDIR\onionshare-gui.exe"

-        Delete "$INSTDIR\onionshare-gui.exe.manifest"

-        Delete "$INSTDIR\pyexpat.pyd"

-        Delete "$INSTDIR\PyQt5.Qt.pyd"

-        Delete "$INSTDIR\PyQt5.QtCore.pyd"

-        Delete "$INSTDIR\PyQt5.QtGui.pyd"

-        Delete "$INSTDIR\PyQt5.QtPrintSupport.pyd"

-        Delete "$INSTDIR\PyQt5.QtWidgets.pyd"

-        Delete "$INSTDIR\python3.dll"

-        Delete "$INSTDIR\python35.dll"

-        Delete "$INSTDIR\pywintypes35.dll"

-        Delete "$INSTDIR\Qt5Core.dll"

-        Delete "$INSTDIR\Qt5Gui.dll"

-        Delete "$INSTDIR\Qt5PrintSupport.dll"

-        Delete "$INSTDIR\Qt5Svg.dll"

-        Delete "$INSTDIR\Qt5Widgets.dll"

-        Delete "$INSTDIR\select.pyd"

-        Delete "$INSTDIR\sip.pyd"

-        Delete "$INSTDIR\ucrtbase.dll"

-        Delete "$INSTDIR\unicodedata.pyd"

-        Delete "$INSTDIR\VCRUNTIME140.dll"

-        Delete "$INSTDIR\win32wnet.pyd"

-        Delete "$INSTDIR\_bz2.pyd"

-        Delete "$INSTDIR\_ctypes.pyd"

-        Delete "$INSTDIR\_decimal.pyd"

-        Delete "$INSTDIR\_hashlib.pyd"

-        Delete "$INSTDIR\_lzma.pyd"

-        Delete "$INSTDIR\_multiprocessing.pyd"

-        Delete "$INSTDIR\_socket.pyd"

-        Delete "$INSTDIR\_ssl.pyd"

-        Delete "$INSTDIR\Include\pyconfig.h"

-        Delete "$INSTDIR\lib2to3\Grammar.txt"

-        Delete "$INSTDIR\lib2to3\Grammar3.5.2.final.0.pickle"

-        Delete "$INSTDIR\lib2to3\PatternGrammar.txt"

-        Delete "$INSTDIR\lib2to3\PatternGrammar3.5.2.final.0.pickle"

-        Delete "$INSTDIR\share\license.txt"

-        Delete "$INSTDIR\share\version.txt"

-        Delete "$INSTDIR\share\wordlist.txt"

-        Delete "$INSTDIR\share\torrc_template-windows"

-        Delete "$INSTDIR\share\html\404.html"

-        Delete "$INSTDIR\share\html\denied.html"

-        Delete "$INSTDIR\share\html\index.html"

-        Delete "$INSTDIR\share\images\drop_files.png"

-        Delete "$INSTDIR\share\images\logo.png"

-        Delete "$INSTDIR\share\images\server_started.png"

-        Delete "$INSTDIR\share\images\server_stopped.png"

-        Delete "$INSTDIR\share\images\server_working.png"

-        Delete "$INSTDIR\share\images\settings.png"

-        Delete "$INSTDIR\share\locale\cs.json"

-        Delete "$INSTDIR\share\locale\de.json"

-        Delete "$INSTDIR\share\locale\en.json"

-        Delete "$INSTDIR\share\locale\eo.json"

-        Delete "$INSTDIR\share\locale\es.json"

-        Delete "$INSTDIR\share\locale\fi.json"

-        Delete "$INSTDIR\share\locale\fr.json"

-        Delete "$INSTDIR\share\locale\it.json"

-        Delete "$INSTDIR\share\locale\nl.json"

-        Delete "$INSTDIR\share\locale\no.json"

-        Delete "$INSTDIR\share\locale\pt.json"

-        Delete "$INSTDIR\share\locale\ru.json"

-        Delete "$INSTDIR\share\locale\tr.json"

-        Delete "$INSTDIR\qt5_plugins\iconengines\qsvgicon.dll"

-        Delete "$INSTDIR\qt5_plugins\imageformats\qgif.dll"

-        Delete "$INSTDIR\qt5_plugins\imageformats\qicns.dll"

-        Delete "$INSTDIR\qt5_plugins\imageformats\qico.dll"

-        Delete "$INSTDIR\qt5_plugins\imageformats\qjpeg.dll"

-        Delete "$INSTDIR\qt5_plugins\imageformats\qsvg.dll"

-        Delete "$INSTDIR\qt5_plugins\imageformats\qtga.dll"

-        Delete "$INSTDIR\qt5_plugins\imageformats\qtiff.dll"

-        Delete "$INSTDIR\qt5_plugins\imageformats\qwbmp.dll"

-        Delete "$INSTDIR\qt5_plugins\imageformats\qwebp.dll"

-        Delete "$INSTDIR\qt5_plugins\platforms\qminimal.dll"

-        Delete "$INSTDIR\qt5_plugins\platforms\qoffscreen.dll"

-        Delete "$INSTDIR\qt5_plugins\platforms\qwindows.dll"

-        Delete "$INSTDIR\qt5_plugins\printsupport\windowsprintersupport.dll"

-        Delete "$INSTDIR\tor\Data\Tor\geoip"

-        Delete "$INSTDIR\tor\Data\Tor\geoip6"

-        Delete "$INSTDIR\tor\Tor\libeay32.dll"

-        Delete "$INSTDIR\tor\Tor\libevent_core-2-0-5.dll"

-        Delete "$INSTDIR\tor\Tor\libevent_extra-2-0-5.dll"

-        Delete "$INSTDIR\tor\Tor\libevent-2-0-5.dll"

-        Delete "$INSTDIR\tor\Tor\libgcc_s_sjlj-1.dll"

-        Delete "$INSTDIR\tor\Tor\libssp-0.dll"

-        Delete "$INSTDIR\tor\Tor\ssleay32.dll"

-        Delete "$INSTDIR\tor\Tor\tor.exe"

-        Delete "$INSTDIR\tor\Tor\zlib1.dll"

+		Delete "$INSTDIR\api-ms-win-core-datetime-l1-1-0.dll"

+		Delete "$INSTDIR\api-ms-win-core-debug-l1-1-0.dll"

+		Delete "$INSTDIR\api-ms-win-core-errorhandling-l1-1-0.dll"

+		Delete "$INSTDIR\api-ms-win-core-file-l1-1-0.dll"

+		Delete "$INSTDIR\api-ms-win-core-file-l1-2-0.dll"

+		Delete "$INSTDIR\api-ms-win-core-file-l2-1-0.dll"

+		Delete "$INSTDIR\api-ms-win-core-handle-l1-1-0.dll"

+		Delete "$INSTDIR\api-ms-win-core-heap-l1-1-0.dll"

+		Delete "$INSTDIR\api-ms-win-core-interlocked-l1-1-0.dll"

+		Delete "$INSTDIR\api-ms-win-core-libraryloader-l1-1-0.dll"

+		Delete "$INSTDIR\api-ms-win-core-localization-l1-2-0.dll"

+		Delete "$INSTDIR\api-ms-win-core-memory-l1-1-0.dll"

+		Delete "$INSTDIR\api-ms-win-core-namedpipe-l1-1-0.dll"

+		Delete "$INSTDIR\api-ms-win-core-processenvironment-l1-1-0.dll"

+		Delete "$INSTDIR\api-ms-win-core-processthreads-l1-1-0.dll"

+		Delete "$INSTDIR\api-ms-win-core-processthreads-l1-1-1.dll"

+		Delete "$INSTDIR\api-ms-win-core-profile-l1-1-0.dll"

+		Delete "$INSTDIR\api-ms-win-core-rtlsupport-l1-1-0.dll"

+		Delete "$INSTDIR\api-ms-win-core-string-l1-1-0.dll"

+		Delete "$INSTDIR\api-ms-win-core-synch-l1-1-0.dll"

+		Delete "$INSTDIR\api-ms-win-core-synch-l1-2-0.dll"

+		Delete "$INSTDIR\api-ms-win-core-sysinfo-l1-1-0.dll"

+		Delete "$INSTDIR\api-ms-win-core-timezone-l1-1-0.dll"

+		Delete "$INSTDIR\api-ms-win-core-util-l1-1-0.dll"

+		Delete "$INSTDIR\api-ms-win-crt-conio-l1-1-0.dll"

+		Delete "$INSTDIR\api-ms-win-crt-convert-l1-1-0.dll"

+		Delete "$INSTDIR\api-ms-win-crt-environment-l1-1-0.dll"

+		Delete "$INSTDIR\api-ms-win-crt-filesystem-l1-1-0.dll"

+		Delete "$INSTDIR\api-ms-win-crt-heap-l1-1-0.dll"

+		Delete "$INSTDIR\api-ms-win-crt-locale-l1-1-0.dll"

+		Delete "$INSTDIR\api-ms-win-crt-math-l1-1-0.dll"

+		Delete "$INSTDIR\api-ms-win-crt-multibyte-l1-1-0.dll"

+		Delete "$INSTDIR\api-ms-win-crt-process-l1-1-0.dll"

+		Delete "$INSTDIR\api-ms-win-crt-runtime-l1-1-0.dll"

+		Delete "$INSTDIR\api-ms-win-crt-stdio-l1-1-0.dll"

+		Delete "$INSTDIR\api-ms-win-crt-string-l1-1-0.dll"

+		Delete "$INSTDIR\api-ms-win-crt-time-l1-1-0.dll"

+		Delete "$INSTDIR\api-ms-win-crt-utility-l1-1-0.dll"

+		Delete "$INSTDIR\base_library.zip"

+		Delete "$INSTDIR\Include\pyconfig.h"

+		Delete "$INSTDIR\lib2to3\Grammar.txt"

+		Delete "$INSTDIR\lib2to3\Grammar3.6.2.candidate.2.pickle"

+		Delete "$INSTDIR\lib2to3\Grammar3.6.2.final.0.pickle"

+		Delete "$INSTDIR\lib2to3\Grammar3.6.3.candidate.1.pickle"

+		Delete "$INSTDIR\lib2to3\Grammar3.6.3.final.0.pickle"

+		Delete "$INSTDIR\lib2to3\Grammar3.6.4.candidate.1.pickle"

+		Delete "$INSTDIR\lib2to3\Grammar3.6.4.final.0.pickle"

+		Delete "$INSTDIR\lib2to3\PatternGrammar.txt"

+		Delete "$INSTDIR\lib2to3\PatternGrammar3.6.2.candidate.2.pickle"

+		Delete "$INSTDIR\lib2to3\PatternGrammar3.6.2.final.0.pickle"

+		Delete "$INSTDIR\lib2to3\PatternGrammar3.6.3.candidate.1.pickle"

+		Delete "$INSTDIR\lib2to3\PatternGrammar3.6.3.final.0.pickle"

+		Delete "$INSTDIR\lib2to3\PatternGrammar3.6.4.candidate.1.pickle"

+		Delete "$INSTDIR\lib2to3\PatternGrammar3.6.4.final.0.pickle"

+		Delete "$INSTDIR\lib2to3\tests"

+		Delete "$INSTDIR\lib2to3\tests\data"

+		Delete "$INSTDIR\lib2to3\tests\data\README"

+		Delete "$INSTDIR\mfc140u.dll"

+		Delete "$INSTDIR\MSVCP140.dll"

+		Delete "$INSTDIR\onionshare-gui.exe"

+		Delete "$INSTDIR\onionshare-gui.exe.manifest"

+		Delete "$INSTDIR\pyexpat.pyd"

+		Delete "$INSTDIR\PyQt5\Qt\bin\qt.conf"

+		Delete "$INSTDIR\PyQt5\Qt\plugins\iconengines\qsvgicon.dll"

+		Delete "$INSTDIR\PyQt5\Qt\plugins\imageformats\qgif.dll"

+		Delete "$INSTDIR\PyQt5\Qt\plugins\imageformats\qicns.dll"

+		Delete "$INSTDIR\PyQt5\Qt\plugins\imageformats\qico.dll"

+		Delete "$INSTDIR\PyQt5\Qt\plugins\imageformats\qjpeg.dll"

+		Delete "$INSTDIR\PyQt5\Qt\plugins\imageformats\qsvg.dll"

+		Delete "$INSTDIR\PyQt5\Qt\plugins\imageformats\qtga.dll"

+		Delete "$INSTDIR\PyQt5\Qt\plugins\imageformats\qtiff.dll"

+		Delete "$INSTDIR\PyQt5\Qt\plugins\imageformats\qwbmp.dll"

+		Delete "$INSTDIR\PyQt5\Qt\plugins\imageformats\qwebp.dll"

+		Delete "$INSTDIR\PyQt5\Qt\plugins\platforms\qminimal.dll"

+		Delete "$INSTDIR\PyQt5\Qt\plugins\platforms\qoffscreen.dll"

+		Delete "$INSTDIR\PyQt5\Qt\plugins\platforms\qwindows.dll"

+		Delete "$INSTDIR\PyQt5\Qt\plugins\printsupport\windowsprintersupport.dll"

+		Delete "$INSTDIR\PyQt5.Qt.pyd"

+		Delete "$INSTDIR\PyQt5.QtCore.pyd"

+		Delete "$INSTDIR\PyQt5.QtGui.pyd"

+		Delete "$INSTDIR\PyQt5.QtPrintSupport.pyd"

+		Delete "$INSTDIR\PyQt5.QtWidgets.pyd"

+		Delete "$INSTDIR\python3.dll"

+		Delete "$INSTDIR\python36.dll"

+		Delete "$INSTDIR\pythoncom36.dll"

+		Delete "$INSTDIR\pywintypes36.dll"

+		Delete "$INSTDIR\Qt5Core.dll"

+		Delete "$INSTDIR\Qt5Gui.dll"

+		Delete "$INSTDIR\Qt5PrintSupport.dll"

+		Delete "$INSTDIR\Qt5Svg.dll"

+		Delete "$INSTDIR\Qt5Widgets.dll"

+		Delete "$INSTDIR\select.pyd"

+		Delete "$INSTDIR\share\html\404.html"

+		Delete "$INSTDIR\share\html\denied.html"

+		Delete "$INSTDIR\share\html\index.html"

+		Delete "$INSTDIR\share\images\drop_files.png"

+		Delete "$INSTDIR\share\images\logo.png"

+		Delete "$INSTDIR\share\images\logo_grayscale.png"

+		Delete "$INSTDIR\share\images\server_started.png"

+		Delete "$INSTDIR\share\images\server_stopped.png"

+		Delete "$INSTDIR\share\images\server_working.png"

+		Delete "$INSTDIR\share\images\settings.png"

+		Delete "$INSTDIR\share\images\settings_inactive.png"

+		Delete "$INSTDIR\share\license.txt"

+		Delete "$INSTDIR\share\locale\cs.json"

+		Delete "$INSTDIR\share\locale\de.json"

+		Delete "$INSTDIR\share\locale\en.json"

+		Delete "$INSTDIR\share\locale\eo.json"

+		Delete "$INSTDIR\share\locale\es.json"

+		Delete "$INSTDIR\share\locale\fi.json"

+		Delete "$INSTDIR\share\locale\fr.json"

+		Delete "$INSTDIR\share\locale\it.json"

+		Delete "$INSTDIR\share\locale\nl.json"

+		Delete "$INSTDIR\share\locale\no.json"

+		Delete "$INSTDIR\share\locale\pt.json"

+		Delete "$INSTDIR\share\locale\ru.json"

+		Delete "$INSTDIR\share\locale\tr.json"

+		Delete "$INSTDIR\share\torrc_template"

+		Delete "$INSTDIR\share\torrc_template-windows"

+		Delete "$INSTDIR\share\version.txt"

+		Delete "$INSTDIR\share\wordlist.txt"

+		Delete "$INSTDIR\sip.pyd"

+		Delete "$INSTDIR\tor\Data\Tor\geoip"

+		Delete "$INSTDIR\tor\Data\Tor\geoip6"

+		Delete "$INSTDIR\tor\Tor\libeay32.dll"

+		Delete "$INSTDIR\tor\Tor\libevent-2-0-5.dll"

+		Delete "$INSTDIR\tor\Tor\libevent_core-2-0-5.dll"

+		Delete "$INSTDIR\tor\Tor\libevent_extra-2-0-5.dll"

+		Delete "$INSTDIR\tor\Tor\libgcc_s_sjlj-1.dll"

+		Delete "$INSTDIR\tor\Tor\libssp-0.dll"

+		Delete "$INSTDIR\tor\Tor\ssleay32.dll"

+		Delete "$INSTDIR\tor\Tor\tor.exe"

+		Delete "$INSTDIR\tor\Tor\zlib1.dll"

+		Delete "$INSTDIR\ucrtbase.dll"

+		Delete "$INSTDIR\unicodedata.pyd"

+		Delete "$INSTDIR\VCRUNTIME140.dll"

+		Delete "$INSTDIR\win32api.pyd"

+		Delete "$INSTDIR\win32com.shell.shell.pyd"

+		Delete "$INSTDIR\win32trace.pyd"

+		Delete "$INSTDIR\win32ui.pyd"

+		Delete "$INSTDIR\win32wnet.pyd"

+		Delete "$INSTDIR\_asyncio.pyd"

+		Delete "$INSTDIR\_bz2.pyd"

+		Delete "$INSTDIR\_ctypes.pyd"

+		Delete "$INSTDIR\_decimal.pyd"

+		Delete "$INSTDIR\_hashlib.pyd"

+		Delete "$INSTDIR\_lzma.pyd"

+		Delete "$INSTDIR\_multiprocessing.pyd"

+		Delete "$INSTDIR\_overlapped.pyd"

+		Delete "$INSTDIR\_socket.pyd"

+		Delete "$INSTDIR\_ssl.pyd"

+		Delete "$INSTDIR\_win32sysloader.pyd"

 

         Delete "$INSTDIR\onionshare.ico"

         Delete "$INSTDIR\uninstall.exe"

 

         rmDir "$INSTDIR\Include"

-        rmDir "$INSTDIR\lib2to3"

-        rmDir "$INSTDIR\share\html"

-        rmDir "$INSTDIR\share\images"

-        rmDir "$INSTDIR\share\locale"

-        rmDir "$INSTDIR\share"

-        rmDir "$INSTDIR\qt5_plugins\iconengines"

-        rmDir "$INSTDIR\qt5_plugins\imageformats"

-        rmDir "$INSTDIR\qt5_plugins\platforms"

-        rmDir "$INSTDIR\qt5_plugins\printsupport"

-        rmDir "$INSTDIR\qt5_plugins"

-        rmDir "$INSTDIR\tor\Data\Tor"

-        rmDir "$INSTDIR\tor\Data"

-        rmDir "$INSTDIR\tor\Tor"

-        rmDir "$INSTDIR\tor"

+		rmDir "$INSTDIR\lib2to3\tests\data"

+		rmDir "$INSTDIR\lib2to3\tests"

+		rmDir "$INSTDIR\lib2to3"

+		rmDir "$INSTDIR\PyQt5\Qt\bin"

+		rmDir "$INSTDIR\PyQt5\Qt\plugins\iconengines"

+		rmDir "$INSTDIR\PyQt5\Qt\plugins\imageformats"

+		rmDir "$INSTDIR\PyQt5\Qt\plugins\platforms"

+		rmDir "$INSTDIR\PyQt5\Qt\plugins\printsupport"

+		rmDir "$INSTDIR\PyQt5\Qt\plugins"

+		rmDir "$INSTDIR\PyQt5\Qt"

+		rmDir "$INSTDIR\PyQt5"

+		rmDir "$INSTDIR\share\html"

+		rmDir "$INSTDIR\share\images"

+		rmDir "$INSTDIR\share\locale"

+		rmDir "$INSTDIR\share"

+		rmDir "$INSTDIR\tor\Data\Tor"

+		rmDir "$INSTDIR\tor\Data"

+		rmDir "$INSTDIR\tor\Tor"

+		rmDir "$INSTDIR\tor"

         rmDir "$INSTDIR"

 

         # remove uninstaller information from the registry