Merge pull request #754 from micahflee/update-deps

Update deps
This commit is contained in:
Miguel Jacq 2018-09-19 09:52:57 +10:00 committed by GitHub
commit 88e186ba35
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 28 additions and 441 deletions

View file

@ -1,16 +1,15 @@
language: python
# sudo: required
dist: trusty
dist: bionic
python:
- "3.4"
- "3.5"
- "3.6"
- "3.6-dev"
- "3.7-dev"
- "nightly"
# command to install dependencies
install:
- pip install Flask==0.12 stem==1.5.4 pytest-cov coveralls flake8 pycrypto pynacl cryptography pysha3
- pip install -r install/requirements.txt
- pip install pytest-cov coveralls flake8
before_script:
# stop the build if there are Python syntax errors or undefined names
- flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics

View file

@ -40,16 +40,16 @@ If you find that these instructions don't work for your Linux distribution or ve
Install Xcode from the Mac App Store. Once it's installed, run it for the first time to set it up. Also, run this to make sure command line tools are installed: `xcode-select --install`. And finally, open Xcode, go to Preferences > Locations, and make sure under Command Line Tools you select an installed version from the dropdown. (This is required for installing Qt5.)
Download and install Python 3.6.4 from https://www.python.org/downloads/release/python-364/. I downloaded `python-3.6.4-macosx10.6.pkg`.
Download and install Python 3.7.0 from https://www.python.org/downloads/release/python-370/. I downloaded `python-3.7.0-macosx10.9.pkg`.
You may also need to run the command `/Applications/Python\ 3.6/Install\ Certificates.command` to update Python 3.6's internal certificate store. Otherwise, you may find that fetching the Tor Browser .dmg file fails later due to a certificate validation error.
You may also need to run the command `/Applications/Python\ 3.7/Install\ Certificates.command` to update Python 3.6's internal certificate store. Otherwise, you may find that fetching the Tor Browser .dmg file fails later due to a certificate validation error.
Download and install Qt5 from https://www.qt.io/download-open-source/. I downloaded `qt-unified-mac-x64-3.0.2-online.dmg`. There's no need to login to a Qt account during installation. Make sure you install the latest Qt 5.x. I installed Qt 5.10.0 -- all you need is to check `Qt > Qt 5.10.0 > macOS`.
Download and install Qt5 from https://www.qt.io/download-open-source/. I downloaded `qt-unified-mac-x64-3.0.5-online.dmg`. There's no need to login to a Qt account during installation. When you select components, install the `macOS` component from Qt 5.11.1 (or whatever the latest Qt version is).
Now install some python dependencies with pip (note, there's issues building a .app if you install this in a virtualenv):
```sh
sudo pip3 install -r install/requirements.txt
pip3 install -r install/requirements.txt
```
You can run both the CLI and GUI versions of OnionShare without building an bundle:
@ -79,17 +79,15 @@ Now you should have `dist/OnionShare.pkg`.
### Setting up your dev environment
Download Python 3.6.4, 32-bit (x86) from https://www.python.org/downloads/release/python-364/. I downloaded `python-3.6.4.exe`. When installing it, make sure to check the "Add Python 3.6 to PATH" checkbox on the first page of the installer.
Download Python 3.7.0, 32-bit (x86) from https://www.python.org/downloads/release/python-370/. I downloaded `python-3.7.0.exe`. When installing it, make sure to check the "Add Python 3.7 to PATH" checkbox on the first page of the installer.
Open a command prompt, cd to the onionshare folder, and install dependencies with pip:
```cmd
pip3 install -r install\requirements-windows.txt
pip install -r install\requirements.txt
```
Download and install pywin32 (build 221, x86, for python 3.6) from https://sourceforge.net/projects/pywin32/files/pywin32/Build%20221/. I downloaded `pywin32-221.win32-py3.6.exe`.
Download and install Qt5 from https://www.qt.io/download-open-source/. I downloaded `qt-unified-windows-x86-3.0.4-online.exe`. There's no need to login to a Qt account during installation. Make sure you install the latest Qt 5.x. I installed Qt 5.11.0. You only need to install the `MSVC 2015 32-bit` component, as well as all of the the `Qt` components, for that that version.
Download and install Qt5 from https://www.qt.io/download-open-source/. I downloaded `qt-unified-windows-x86-3.0.5-online.exe`. There's no need to login to a Qt account during installation. When you can select components, install the `MSVC 2015 32-bit` component from Qt 5.11.1 (or whatever the latest Qt version is).
After that you can try both the CLI and the GUI version of OnionShare:

View file

@ -35,14 +35,14 @@ import subprocess
import requests
def main():
dmg_url = 'https://archive.torproject.org/tor-package-archive/torbrowser/7.5.5/TorBrowser-7.5.5-osx64_en-US.dmg'
dmg_filename = 'TorBrowser-7.5.5-osx64_en-US.dmg'
expected_dmg_sha256 = '2b445e4237cdd9be0e71e65f76db5d36f0d6c37532982d642803b57e388e4636'
dmg_url = 'https://archive.torproject.org/tor-package-archive/torbrowser/8.0/TorBrowser-8.0-osx64_en-US.dmg'
dmg_filename = 'TorBrowser-8.0-osx64_en-US.dmg'
expected_dmg_sha256 = '15603ae7b3a1942863c98acc92f509e4409db48fe22c9acae6b15c9cb9bf3088'
# Build paths
root_path = os.path.dirname(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))))
working_path = os.path.join(root_path, 'build', 'tor')
dmg_tor_path = os.path.join('/Volumes', 'Tor Browser', 'TorBrowser.app', 'Contents')
dmg_tor_path = os.path.join('/Volumes', 'Tor Browser', 'Tor Browser.app', 'Contents')
dmg_path = os.path.join(working_path, dmg_filename)
dist_path = os.path.join(root_path, 'dist', 'OnionShare.app', 'Contents')
@ -88,7 +88,7 @@ def main():
shutil.copyfile(os.path.join(dmg_tor_path, 'Resources', 'TorBrowser', 'Tor', 'geoip6'), os.path.join(dist_path, 'Resources', 'Tor', 'geoip6'))
os.chmod(os.path.join(dist_path, 'Resources', 'Tor', 'tor'), 0o755)
shutil.copyfile(os.path.join(dmg_tor_path, 'MacOS', 'Tor', 'tor.real'), os.path.join(dist_path, 'MacOS', 'Tor', 'tor.real'))
shutil.copyfile(os.path.join(dmg_tor_path, 'MacOS', 'Tor', 'libevent-2.0.5.dylib'), os.path.join(dist_path, 'MacOS', 'Tor', 'libevent-2.0.5.dylib'))
shutil.copyfile(os.path.join(dmg_tor_path, 'MacOS', 'Tor', 'libevent-2.1.6.dylib'), os.path.join(dist_path, 'MacOS', 'Tor', 'libevent-2.1.6.dylib'))
os.chmod(os.path.join(dist_path, 'MacOS', 'Tor', 'tor.real'), 0o755)
# obfs4proxy binary
shutil.copyfile(os.path.join(dmg_tor_path, 'MacOS', 'Tor', 'PluggableTransports', 'obfs4proxy'), os.path.join(dist_path, 'Resources', 'Tor', 'obfs4proxy'))

View file

@ -33,9 +33,9 @@ import subprocess
import requests
def main():
exe_url = 'https://archive.torproject.org/tor-package-archive/torbrowser/7.5.5/torbrowser-install-7.5.5_en-US.exe'
exe_filename = 'torbrowser-install-7.5.5_en-US.exe'
expected_exe_sha256 = '992f9a6658001c3419ed3695a908eef4fb7feb1cd549389bdacbadb7f8cb08a7'
exe_url = 'https://archive.torproject.org/tor-package-archive/torbrowser/8.0/torbrowser-install-8.0_en-US.exe'
exe_filename = 'torbrowser-install-8.0_en-US.exe'
expected_exe_sha256 = '0682b44eff5877dfc2fe2fdd5b46e678d47adad86d564e7cb6654c5f60eb1ed2'
# Build paths
root_path = os.path.dirname(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))))
working_path = os.path.join(os.path.join(root_path, 'build'), 'tor')

View file

@ -59,203 +59,7 @@ FunctionEnd
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}\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.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\licenses"
File "${BINPATH}\licenses\license-obfs4.txt"
File "${BINPATH}\licenses\license-onionshare.txt"
File "${BINPATH}\licenses\license-tor.txt"
File "${BINPATH}\licenses\readme.txt"
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\torrc_template"
File "${BINPATH}\share\torrc_template-windows"
File "${BINPATH}\share\torrc_template-obfs4"
File "${BINPATH}\share\torrc_template-meek_lite_azure"
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\download_completed.png"
File "${BINPATH}\share\images\download_completed_none.png"
File "${BINPATH}\share\images\download_in_progress.png"
File "${BINPATH}\share\images\download_in_progress_none.png"
File "${BINPATH}\share\images\download_window_gray.png"
File "${BINPATH}\share\images\download_window_green.png"
File "${BINPATH}\share\images\favicon.ico"
File "${BINPATH}\share\images\file_delete.png"
File "${BINPATH}\share\images\info.png"
File "${BINPATH}\share\images\logo.png"
File "${BINPATH}\share\images\logo_transparent.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\web_file.png"
File "${BINPATH}\share\images\web_folder.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\obfs4proxy.exe"
File "${BINPATH}\tor\Tor\ssleay32.dll"
File "${BINPATH}\tor\Tor\tor.exe"
File "${BINPATH}\tor\Tor\zlib1.dll"
File /a /r "${BINPATH}\"
# uninstaller
!ifndef INNER
@ -299,201 +103,7 @@ FunctionEnd
Delete "$SMPROGRAMS\${APPNAME}.lnk"
# 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\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\licenses\license-obfs4.txt"
Delete "$INSTDIR\licenses\license-onionshare.txt"
Delete "$INSTDIR\licenses\license-tor.txt"
Delete "$INSTDIR\licenses\readme.txt"
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\download_completed.png"
Delete "$INSTDIR\share\images\download_completed_none.png"
Delete "$INSTDIR\share\images\download_in_progress.png"
Delete "$INSTDIR\share\images\download_in_progress_none.png"
Delete "$INSTDIR\share\images\download_window_gray.png"
Delete "$INSTDIR\share\images\download_window_green.png"
Delete "$INSTDIR\share\images\favicon.ico"
Delete "$INSTDIR\share\images\file_delete.png"
Delete "$INSTDIR\share\images\info.png"
Delete "$INSTDIR\share\images\logo.png"
Delete "$INSTDIR\share\images\logo_transparent.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\web_file.png"
Delete "$INSTDIR\share\images\web_folder.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\share\torrc_template"
Delete "$INSTDIR\share\torrc_template-windows"
Delete "$INSTDIR\share\torrc_template-obfs4"
Delete "$INSTDIR\share\torrc_template-meek_lite_azure"
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\obfs4proxy.exe"
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\tests\data"
rmDir "$INSTDIR\lib2to3\tests"
rmDir "$INSTDIR\lib2to3"
rmDir "$INSTDIR\licenses"
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"
RMDir /r $INSTDIR
# remove uninstaller information from the registry
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}"

View file

@ -1,26 +0,0 @@
altgraph==0.16.1
certifi==2018.8.24
chardet==3.0.4
click==6.7
Flask==1.0.2
future==0.16.0
idna==2.7
itsdangerous==0.24
Jinja2==2.10
macholib==1.11
MarkupSafe==1.0
packaging==17.1
pefile==2018.8.8
PyInstaller==3.4
pyparsing==2.2.0
pypiwin32==223
PyQt5==5.11.2
PySocks==1.6.8
python-dateutil==2.7.3
pywin32==223
requests==2.19.1
sip==4.19.8
six==1.11.0
stem==1.6.0
urllib3==1.23
Werkzeug==0.14.1

View file

@ -1,7 +1,10 @@
altgraph==0.16.1
asn1crypto==0.24.0
certifi==2018.8.24
cffi==1.11.5
chardet==3.0.4
click==6.7
cryptography==2.3.1
Flask==1.0.2
future==0.16.0
idna==2.7
@ -10,12 +13,15 @@ Jinja2==2.10
macholib==1.11
MarkupSafe==1.0
pefile==2018.8.8
pycparser==2.18
pycryptodome==3.6.6
PyInstaller==3.4
PyNaCl==1.2.1
PyQt5==5.11.2
PyQt5-sip==4.19.12
PySocks==1.6.8
requests==2.19.1
sip==4.19.8
six==1.11.0
stem==1.6.0
urllib3==1.23
Werkzeug==0.14.1

View file

@ -1 +1 @@
1.3.1
2.0.dev