phantom/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-01-25 10:42:58 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions

resolve conflicts

Browse source
This commit is contained in:
Miguel Jacq 2018-01-17 12:50:11 +11:00
commit 7237b65a32
No known key found for this signature in database
GPG key ID: EEA4341C6D97A0B6
7 changed files with 514 additions and 461 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
BUILD.md
View file

@ -30,13 +30,15 @@ Create a .rpm on Fedora-like distros: `./install/build_rpm.sh`
For ArchLinux: There is a PKBUILD available [here](https://aur.archlinux.org/packages/onionshare/) that can be used to install OnionShare. For ArchLinux: There is a PKBUILD available [here](https://aur.archlinux.org/packages/onionshare/) that can be used to install OnionShare.
If you find that these instructions don't work for your Linux distribution or version, consult the [Linux Distribution Support wiki guide](https://github.com/micahflee/onionshare/wiki/Linux-Distribution-Support), which might contain extra instructions.
## Mac OS X ## Mac OS X
Install Xcode from the Mac App Store. Once it's installed, run it for the first time to set it up. 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.5.2 from https://www.python.org/downloads/release/python-352/ (note that a pyinstaller bug prevents you from using Python 3.6). I downloaded `python-3.5.2-macosx10.6.pkg`. 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 Qt 5.7.1 for macOS offline installer from https://www.qt.io/download-open-source/. I downloaded `qt-opensource-mac-x64-clang-5.7.1.dmg`. (You can skip making an account in the installer.) 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`.
Now install some python dependencies with pip (note, there's issues building a .app if you install this in a virtualenv): Now install some python dependencies with pip (note, there's issues building a .app if you install this in a virtualenv):
@ -71,7 +73,7 @@ Now you should have `dist/OnionShare.pkg`.
### Setting up your dev environment ### Setting up your dev environment
Download the latest Python 3.5.2, 32-bit (x86) from https://www.python.org/downloads/release/python-352/ (note that there's a pyinstaller/pywin32 bug that prevents 3.6.x from working). I downloaded `python-3.5.2.exe`. When installing it, make sure to check the "Add Python 3.5 to PATH" checkbox on the first page of the installer. 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.
Open a command prompt, cd to the onionshare folder, and install dependencies with pip: Open a command prompt, cd to the onionshare folder, and install dependencies with pip:
@ -79,7 +81,9 @@ Open a command prompt, cd to the onionshare folder, and install dependencies wit
pip3 install -r install\requirements-windows.txt pip3 install -r install\requirements-windows.txt
``` ```
Download and install Qt5 from https://www.qt.io/download-open-source/. I downloaded `qt-unified-windows-x86-2.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.7. 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.2-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.10.0.
After that you can try both the CLI and the GUI version of OnionShare: After that you can try both the CLI and the GUI version of OnionShare:
@ -102,32 +106,30 @@ Add the following directories to the path:
* `C:\Program Files (x86)\Windows Kits\10\bin\x86` * `C:\Program Files (x86)\Windows Kits\10\bin\x86`
* `C:\Program Files (x86)\Windows Kits\10\Redist\ucrt\DLLs\x86` * `C:\Program Files (x86)\Windows Kits\10\Redist\ucrt\DLLs\x86`
* `C:\Users\user\AppData\Local\Programs\Python\Python35-32\Lib\site-packages\PyQt5\Qt\bin` * `C:\Users\user\AppData\Local\Programs\Python\Python36-32\Lib\site-packages\PyQt5\Qt\bin`
* `C:\Program Files (x86)\7-Zip` * `C:\Program Files (x86)\7-Zip`
If you want to build the installer: If you want to build the installer:
* Go to http://nsis.sourceforge.net/Download and download the latest NSIS. I downloaded `nsis-3.01-setup.exe`. * Go to http://nsis.sourceforge.net/Download and download the latest NSIS. I downloaded `nsis-3.02.1-setup.exe`.
* Add `C:\Program Files (x86)\NSIS` to the path. * Add `C:\Program Files (x86)\NSIS` to the path.
If you want to sign binaries with Authenticode: If you want to sign binaries with Authenticode:
* You'll need a code signing certificate. I roughly followed [this guide](http://blog.assarbad.net/20110513/startssl-code-signing-certificate/) to make one using my StartSSL account. * You'll need a code signing certificate. I got an open source code signing certificate from [Certum](https://www.certum.eu/certum/cert,offer_en_open_source_cs.xml).
* Once you get a code signing key and certificate and covert it to a pfx file, import it into your certificate store. * Once you get a code signing key and certificate and covert it to a pfx file, import it into your certificate store.
### To make a .exe: ### To make a .exe:
For PyInstaller to work, you might need to edit `Scripts\pyinstaller-script.py` in your Python 3.5 folder, to work around [this bug](https://stackoverflow.com/questions/31808180/installing-pyinstaller-via-pip-leads-to-failed-to-create-process) in pip.
* Open a command prompt, cd into the onionshare directory, and type: `pyinstaller install\pyinstaller.spec`. `onionshare-gui.exe` and all of their supporting files will get created inside the `dist` folder. * Open a command prompt, cd into the onionshare directory, and type: `pyinstaller install\pyinstaller.spec`. `onionshare-gui.exe` and all of their supporting files will get created inside the `dist` folder.
### To build the installer: ### To build the installer:
Note that you must have a codesigning certificate installed in order to use the `install\build_exe.bat` script, because it codesigns `onionshare-gui.exe`, `uninstall.exe`, and `OnionShare_Setup.exe`. Note that you must have a codesigning certificate installed in order to use the `install\build_exe.bat` script, because it codesigns `onionshare-gui.exe`, `uninstall.exe`, and `onionshare-setup.exe`.
Open a command prompt, cd to the onionshare directory, and type: `install\build_exe.bat` Open a command prompt, cd to the onionshare directory, and type: `install\build_exe.bat`
This will prompt you to codesign three binaries and execute one unsigned binary. When you're done clicking through everything you will have `dist\OnionShare_Setup.exe`. This will prompt you to codesign three binaries and execute one unsigned binary. When you're done clicking through everything you will have `dist\onionshare-setup.exe`.
## Tests ## Tests

6
install/build_exe.bat
View file

@ -10,8 +10,8 @@ python install\get-tor-windows.py
REM sign onionshare-gui.exe REM sign onionshare-gui.exe
signtool.exe sign /v /d "OnionShare" /a /tr http://timestamp.globalsign.com/scripts/timstamp.dll /fd sha256 dist\onionshare\onionshare-gui.exe signtool.exe sign /v /d "OnionShare" /a /tr http://timestamp.globalsign.com/scripts/timstamp.dll /fd sha256 dist\onionshare\onionshare-gui.exe
REM build an installer, dist\OnionShare_Setup.exe REM build an installer, dist\onionshare-setup.exe
makensis.exe install\onionshare.nsi makensis.exe install\onionshare.nsi
REM sign OnionShare_Setup.exe REM sign onionshare-setup.exe
signtool.exe sign /v /d "OnionShare" /a /tr http://timestamp.globalsign.com/scripts/timstamp.dll /fd sha256 dist\OnionShare_Setup.exe signtool.exe sign /v /d "OnionShare" /a /tr http://timestamp.globalsign.com/scripts/timstamp.dll /fd sha256 dist\onionshare-setup.exe

28
install/check_lacked_trans.py
View file

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python3
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
@ -36,7 +36,9 @@ def arg_parser():
p.add_argument('-d', default='.', help='onionshare directory', p.add_argument('-d', default='.', help='onionshare directory',
metavar='ONIONSHARE_DIR', dest='onionshare_dir') metavar='ONIONSHARE_DIR', dest='onionshare_dir')
p.add_argument('--show-all-keys', action='store_true', p.add_argument('--show-all-keys', action='store_true',
help='show translation key in source and exit') help='show translation key in source and exit'),
p.add_argument('-l', default='all', help='language code (default: all)',
metavar='LANG_CODE', dest='lang_code')
return p return p
@ -54,7 +56,8 @@ def main():
src = files_in(dir, 'onionshare') + files_in(dir, 'onionshare_gui') src = files_in(dir, 'onionshare') + files_in(dir, 'onionshare_gui')
pysrc = [p for p in src if p.endswith('.py')] pysrc = [p for p in src if p.endswith('.py')]
htmlsrc = [p for p in src if p.endswith('.html')]
lang_code = args.lang_code
translate_keys = set() translate_keys = set()
# load translate key from python source # load translate key from python source
@ -67,20 +70,15 @@ def main():
key = arg.split(',')[0].strip('''"' ''') key = arg.split(',')[0].strip('''"' ''')
translate_keys.add(key) translate_keys.add(key)
# load translate key from html source
for line in fileinput.input(htmlsrc, openhook=fileinput.hook_encoded('utf-8')):
# search `{{strings.translate_key}}`
m = re.search(r'{{.*strings\.([-a-zA-Z0-9_]+).*}}', line)
if m:
key = m.group(1)
translate_keys.add(key)
if args.show_all_keys: if args.show_all_keys:
for k in sorted(translate_keys): for k in sorted(translate_keys):
print k print(k)
sys.exit() sys.exit()
locale_files = [f for f in files_in(dir, 'locale') if f.endswith('.json')] if lang_code == 'all':
locale_files = [f for f in files_in(dir, 'share/locale') if f.endswith('.json')]
else:
locale_files = [f for f in files_in(dir, 'share/locale') if f.endswith('%s.json' % lang_code)]
for locale_file in locale_files: for locale_file in locale_files:
with codecs.open(locale_file, 'r', encoding='utf-8') as f: with codecs.open(locale_file, 'r', encoding='utf-8') as f:
trans = json.load(f) trans = json.load(f)
@ -92,10 +90,10 @@ def main():
locale, ext = os.path.splitext(os.path.basename(locale_file)) locale, ext = os.path.splitext(os.path.basename(locale_file))
for k in sorted(disused): for k in sorted(disused):
print locale, 'disused', k print(locale, 'disused', k)
for k in sorted(lacked): for k in sorted(lacked):
print locale, 'lacked', k print(locale, 'lacked', k)
if __name__ == '__main__': if __name__ == '__main__':

209
install/onionshare.nsi
View file

@ -42,7 +42,7 @@ ${EndIf}
!system "signtool.exe sign /v /d $\"Uninstall OnionShare$\" /a /tr http://timestamp.globalsign.com/scripts/timstamp.dll /fd sha256 $%TEMP%\uninstall.exe" = 0 !system "signtool.exe sign /v /d $\"Uninstall OnionShare$\" /a /tr http://timestamp.globalsign.com/scripts/timstamp.dll /fd sha256 $%TEMP%\uninstall.exe" = 0
# all done, now we can build the real installer # all done, now we can build the real installer
OutFile "..\dist\OnionShare_Setup.exe" OutFile "..\dist\onionshare-setup.exe"
SetCompressor /FINAL /SOLID lzma SetCompressor /FINAL /SOLID lzma
!endif !endif
@ -99,8 +99,8 @@ Section "install"
File "${BINPATH}\api-ms-win-crt-time-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}\api-ms-win-crt-utility-l1-1-0.dll"
File "${BINPATH}\base_library.zip" File "${BINPATH}\base_library.zip"
File "${BINPATH}\mfc140u.dll"
File "${BINPATH}\MSVCP140.dll" File "${BINPATH}\MSVCP140.dll"
File "${BINPATH}\MSVCR100.dll"
File "${BINPATH}\onionshare-gui.exe" File "${BINPATH}\onionshare-gui.exe"
File "${BINPATH}\onionshare-gui.exe.manifest" File "${BINPATH}\onionshare-gui.exe.manifest"
File "${BINPATH}\pyexpat.pyd" File "${BINPATH}\pyexpat.pyd"
@ -110,8 +110,9 @@ Section "install"
File "${BINPATH}\PyQt5.QtPrintSupport.pyd" File "${BINPATH}\PyQt5.QtPrintSupport.pyd"
File "${BINPATH}\PyQt5.QtWidgets.pyd" File "${BINPATH}\PyQt5.QtWidgets.pyd"
File "${BINPATH}\python3.dll" File "${BINPATH}\python3.dll"
File "${BINPATH}\python35.dll" File "${BINPATH}\python36.dll"
File "${BINPATH}\pywintypes35.dll" File "${BINPATH}\pythoncom36.dll"
File "${BINPATH}\pywintypes36.dll"
File "${BINPATH}\Qt5Core.dll" File "${BINPATH}\Qt5Core.dll"
File "${BINPATH}\Qt5Gui.dll" File "${BINPATH}\Qt5Gui.dll"
File "${BINPATH}\Qt5PrintSupport.dll" File "${BINPATH}\Qt5PrintSupport.dll"
@ -122,31 +123,76 @@ Section "install"
File "${BINPATH}\ucrtbase.dll" File "${BINPATH}\ucrtbase.dll"
File "${BINPATH}\unicodedata.pyd" File "${BINPATH}\unicodedata.pyd"
File "${BINPATH}\VCRUNTIME140.dll" 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}\win32wnet.pyd"
File "${BINPATH}\_asyncio.pyd"
File "${BINPATH}\_bz2.pyd" File "${BINPATH}\_bz2.pyd"
File "${BINPATH}\_ctypes.pyd" File "${BINPATH}\_ctypes.pyd"
File "${BINPATH}\_decimal.pyd" File "${BINPATH}\_decimal.pyd"
File "${BINPATH}\_hashlib.pyd" File "${BINPATH}\_hashlib.pyd"
File "${BINPATH}\_lzma.pyd" File "${BINPATH}\_lzma.pyd"
File "${BINPATH}\_multiprocessing.pyd" File "${BINPATH}\_multiprocessing.pyd"
File "${BINPATH}\_overlapped.pyd"
File "${BINPATH}\_socket.pyd" File "${BINPATH}\_socket.pyd"
File "${BINPATH}\_ssl.pyd" File "${BINPATH}\_ssl.pyd"
File "${BINPATH}\_win32sysloader.pyd"
SetOutPath "$INSTDIR\Include" SetOutPath "$INSTDIR\Include"
File "${BINPATH}\Include\pyconfig.h" File "${BINPATH}\Include\pyconfig.h"
SetOutPath "$INSTDIR\lib2to3" SetOutPath "$INSTDIR\lib2to3"
File "${BINPATH}\lib2to3\Grammar.txt" File "${BINPATH}\lib2to3\Grammar.txt"
File "${BINPATH}\lib2to3\Grammar3.5.2.final.0.pickle" 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\PatternGrammar.txt"
File "${BINPATH}\lib2to3\PatternGrammar3.5.2.final.0.pickle" 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" SetOutPath "$INSTDIR\share"
File "${BINPATH}\share\license.txt" File "${BINPATH}\share\license.txt"
File "${BINPATH}\share\torrc_template"
File "${BINPATH}\share\torrc_template-windows"
File "${BINPATH}\share\version.txt" File "${BINPATH}\share\version.txt"
File "${BINPATH}\share\wordlist.txt" File "${BINPATH}\share\wordlist.txt"
File "${BINPATH}\share\torrc_template-windows"
File "${BINPATH}\share\torrc_template-obfs4"
SetOutPath "$INSTDIR\share\html" SetOutPath "$INSTDIR\share\html"
File "${BINPATH}\share\html\404.html" File "${BINPATH}\share\html\404.html"
@ -156,10 +202,12 @@ Section "install"
SetOutPath "$INSTDIR\share\images" SetOutPath "$INSTDIR\share\images"
File "${BINPATH}\share\images\drop_files.png" File "${BINPATH}\share\images\drop_files.png"
File "${BINPATH}\share\images\logo.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_started.png"
File "${BINPATH}\share\images\server_stopped.png" File "${BINPATH}\share\images\server_stopped.png"
File "${BINPATH}\share\images\server_working.png" File "${BINPATH}\share\images\server_working.png"
File "${BINPATH}\share\images\settings.png" File "${BINPATH}\share\images\settings.png"
File "${BINPATH}\share\images\settings_inactive.png"
SetOutPath "$INSTDIR\share\locale" SetOutPath "$INSTDIR\share\locale"
File "${BINPATH}\share\locale\cs.json" File "${BINPATH}\share\locale\cs.json"
@ -176,37 +224,15 @@ Section "install"
File "${BINPATH}\share\locale\ru.json" File "${BINPATH}\share\locale\ru.json"
File "${BINPATH}\share\locale\tr.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" SetOutPath "$INSTDIR\tor\Data\Tor"
File "${BINPATH}\tor\Data\Tor\geoip" File "${BINPATH}\tor\Data\Tor\geoip"
File "${BINPATH}\tor\Data\Tor\geoip6" File "${BINPATH}\tor\Data\Tor\geoip6"
SetOutPath "$INSTDIR\tor\Tor" SetOutPath "$INSTDIR\tor\Tor"
File "${BINPATH}\tor\Tor\libeay32.dll" 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_core-2-0-5.dll"
File "${BINPATH}\tor\Tor\libevent_extra-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\libgcc_s_sjlj-1.dll"
File "${BINPATH}\tor\Tor\libssp-0.dll" File "${BINPATH}\tor\Tor\libssp-0.dll"
File "${BINPATH}\tor\Tor\obfs4proxy.exe" File "${BINPATH}\tor\Tor\obfs4proxy.exe"
@ -296,57 +322,71 @@ FunctionEnd
Delete "$INSTDIR\api-ms-win-crt-time-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\api-ms-win-crt-utility-l1-1-0.dll"
Delete "$INSTDIR\base_library.zip" 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\MSVCP140.dll"
Delete "$INSTDIR\MSVCR100.dll"
Delete "$INSTDIR\onionshare-gui.exe" Delete "$INSTDIR\onionshare-gui.exe"
Delete "$INSTDIR\onionshare-gui.exe.manifest" Delete "$INSTDIR\onionshare-gui.exe.manifest"
Delete "$INSTDIR\pyexpat.pyd" 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.Qt.pyd"
Delete "$INSTDIR\PyQt5.QtCore.pyd" Delete "$INSTDIR\PyQt5.QtCore.pyd"
Delete "$INSTDIR\PyQt5.QtGui.pyd" Delete "$INSTDIR\PyQt5.QtGui.pyd"
Delete "$INSTDIR\PyQt5.QtPrintSupport.pyd" Delete "$INSTDIR\PyQt5.QtPrintSupport.pyd"
Delete "$INSTDIR\PyQt5.QtWidgets.pyd" Delete "$INSTDIR\PyQt5.QtWidgets.pyd"
Delete "$INSTDIR\python3.dll" Delete "$INSTDIR\python3.dll"
Delete "$INSTDIR\python35.dll" Delete "$INSTDIR\python36.dll"
Delete "$INSTDIR\pywintypes35.dll" Delete "$INSTDIR\pythoncom36.dll"
Delete "$INSTDIR\pywintypes36.dll"
Delete "$INSTDIR\Qt5Core.dll" Delete "$INSTDIR\Qt5Core.dll"
Delete "$INSTDIR\Qt5Gui.dll" Delete "$INSTDIR\Qt5Gui.dll"
Delete "$INSTDIR\Qt5PrintSupport.dll" Delete "$INSTDIR\Qt5PrintSupport.dll"
Delete "$INSTDIR\Qt5Svg.dll" Delete "$INSTDIR\Qt5Svg.dll"
Delete "$INSTDIR\Qt5Widgets.dll" Delete "$INSTDIR\Qt5Widgets.dll"
Delete "$INSTDIR\select.pyd" 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\torrc_template-obfs4"
Delete "$INSTDIR\share\html\404.html" Delete "$INSTDIR\share\html\404.html"
Delete "$INSTDIR\share\html\denied.html" Delete "$INSTDIR\share\html\denied.html"
Delete "$INSTDIR\share\html\index.html" Delete "$INSTDIR\share\html\index.html"
Delete "$INSTDIR\share\images\drop_files.png" Delete "$INSTDIR\share\images\drop_files.png"
Delete "$INSTDIR\share\images\logo.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_started.png"
Delete "$INSTDIR\share\images\server_stopped.png" Delete "$INSTDIR\share\images\server_stopped.png"
Delete "$INSTDIR\share\images\server_working.png" Delete "$INSTDIR\share\images\server_working.png"
Delete "$INSTDIR\share\images\settings.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\cs.json"
Delete "$INSTDIR\share\locale\de.json" Delete "$INSTDIR\share\locale\de.json"
Delete "$INSTDIR\share\locale\en.json" Delete "$INSTDIR\share\locale\en.json"
@ -360,46 +400,61 @@ FunctionEnd
Delete "$INSTDIR\share\locale\pt.json" Delete "$INSTDIR\share\locale\pt.json"
Delete "$INSTDIR\share\locale\ru.json" Delete "$INSTDIR\share\locale\ru.json"
Delete "$INSTDIR\share\locale\tr.json" Delete "$INSTDIR\share\locale\tr.json"
Delete "$INSTDIR\qt5_plugins\iconengines\qsvgicon.dll" Delete "$INSTDIR\share\torrc_template"
Delete "$INSTDIR\qt5_plugins\imageformats\qgif.dll" Delete "$INSTDIR\share\torrc_template-windows"
Delete "$INSTDIR\qt5_plugins\imageformats\qicns.dll" Delete "$INSTDIR\share\version.txt"
Delete "$INSTDIR\qt5_plugins\imageformats\qico.dll" Delete "$INSTDIR\share\wordlist.txt"
Delete "$INSTDIR\qt5_plugins\imageformats\qjpeg.dll" Delete "$INSTDIR\sip.pyd"
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\geoip"
Delete "$INSTDIR\tor\Data\Tor\geoip6" Delete "$INSTDIR\tor\Data\Tor\geoip6"
Delete "$INSTDIR\tor\Tor\libeay32.dll" 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_core-2-0-5.dll"
Delete "$INSTDIR\tor\Tor\libevent_extra-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\libgcc_s_sjlj-1.dll"
Delete "$INSTDIR\tor\Tor\libssp-0.dll" Delete "$INSTDIR\tor\Tor\libssp-0.dll"
Delete "$INSTDIR\tor\Tor\ssleay32.dll" Delete "$INSTDIR\tor\Tor\ssleay32.dll"
Delete "$INSTDIR\tor\Tor\tor.exe" Delete "$INSTDIR\tor\Tor\tor.exe"
Delete "$INSTDIR\tor\Tor\zlib1.dll" 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\onionshare.ico"
Delete "$INSTDIR\uninstall.exe" Delete "$INSTDIR\uninstall.exe"
rmDir "$INSTDIR\Include" rmDir "$INSTDIR\Include"
rmDir "$INSTDIR\lib2to3\tests\data"
rmDir "$INSTDIR\lib2to3\tests"
rmDir "$INSTDIR\lib2to3" 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\html"
rmDir "$INSTDIR\share\images" rmDir "$INSTDIR\share\images"
rmDir "$INSTDIR\share\locale" rmDir "$INSTDIR\share\locale"
rmDir "$INSTDIR\share" 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\Tor"
rmDir "$INSTDIR\tor\Data" rmDir "$INSTDIR\tor\Data"
rmDir "$INSTDIR\tor\Tor" rmDir "$INSTDIR\tor\Tor"

1
install/pyinstaller.spec
View file

@ -23,7 +23,6 @@ a = Analysis(
hiddenimports=[], hiddenimports=[],
hookspath=[], hookspath=[],
runtime_hooks=[], runtime_hooks=[],
excludes=['jinja2.asyncsupport'],
win_no_prefer_redirects=False, win_no_prefer_redirects=False,
win_private_assemblies=False, win_private_assemblies=False,
cipher=None) cipher=None)

19
install/requirements-windows.txt
View file

@ -1,14 +1,13 @@
click==6.7 click==6.7
Flask==0.12 Flask==0.12.2
future==0.16.0 future==0.16.0
itsdangerous==0.24 itsdangerous==0.24
Jinja2==2.9.5 Jinja2==2.10
MarkupSafe==0.23 MarkupSafe==1.0
pefile==2016.3.28 pefile==2017.11.5
PyInstaller==3.2.1 PyInstaller==3.3.1
pypiwin32==219 PyQt5==5.9.2
PyQt5==5.8
PySocks==1.6.7 PySocks==1.6.7
sip==4.19.1 sip==4.19.6
stem==1.5.4 stem==1.6.0
Werkzeug==0.11.15 Werkzeug==0.14.1

16
install/requirements.txt
View file

@ -1,11 +1,11 @@
click==6.7 click==6.7
Flask==0.12 Flask==0.12.2
itsdangerous==0.24 itsdangerous==0.24
Jinja2==2.9.5 Jinja2==2.10
MarkupSafe==0.23 MarkupSafe==1.0
PyInstaller==3.2.1 PyInstaller==3.3.1
PyQt5==5.7.1 PyQt5==5.9.2
PySocks==1.6.7 PySocks==1.6.7
sip==4.19 sip==4.19.6
stem==1.5.4 stem==1.6.0
Werkzeug==0.11.15 Werkzeug==0.14.1