summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Lee <micah@micahflee.com>2019-01-25 14:27:40 -0800
committerGitHub <noreply@github.com>2019-01-25 14:27:40 -0800
commit921e4e40b85e46acb5a78aa552ee077c1e8716e0 (patch)
treef42b91765b45b928f86b812ba8f6305eb5fca0e4
parenta00309b54fc885e898542d8225cf9ccb75dec629 (diff)
parent612f3d530b136a7062dade04c5c6ffa1217c703c (diff)
downloadonionshare-921e4e40b85e46acb5a78aa552ee077c1e8716e0.tar.gz
onionshare-921e4e40b85e46acb5a78aa552ee077c1e8716e0.zip
Merge pull request #880 from micahflee/release_2.0.dev3v2.0.dev3
Release 2.0.dev3
-rw-r--r--BUILD.md16
-rw-r--r--install/onionshare.nsi2
-rw-r--r--share/version.txt2
3 files changed, 10 insertions, 10 deletions
diff --git a/BUILD.md b/BUILD.md
index 6073d1a9..e3d6a760 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -46,11 +46,11 @@ 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.7.0 from https://www.python.org/downloads/release/python-370/. I downloaded `python-3.7.0-macosx10.9.pkg`.
+Download and install Python 3.7.2 from https://www.python.org/downloads/release/python-372/. I downloaded `python-3.7.2-macosx10.9.pkg`.
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.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).
+Install Qt 5.11.3 from https://www.qt.io/download-open-source/. I downloaded `qt-unified-mac-x64-3.0.6-online.dmg`. In the installer, you can skip making an account, and all you need is `Qt` > `Qt 5.11.3` > `macOS`.
Now install some python dependencies with pip (note, there's issues building a .app if you install this in a virtualenv):
@@ -85,7 +85,7 @@ Now you should have `dist/OnionShare.pkg`.
### Setting up your dev environment
-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.
+Download Python 3.7.2, 32-bit (x86) from https://www.python.org/downloads/release/python-372/. I downloaded `python-3.7.2.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:
@@ -93,7 +93,7 @@ Open a command prompt, cd to the onionshare folder, and install dependencies wit
pip install -r install\requirements.txt
```
-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).
+Install the Qt 5.11.3 from https://www.qt.io/download-open-source/. I downloaded `qt-unified-windows-x86-3.0.6-online.exe`. In the installer, you can skip making an account, and all you need `Qt` > `Qt 5.11.3` > `MSVC 2015 32-bit`.
After that you can try both the CLI and the GUI version of OnionShare:
@@ -114,14 +114,14 @@ Download and install the standalone [Windows 10 SDK](https://dev.windows.com/en-
Add the following directories to the path:
-* `C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x86`
-* `C:\Program Files (x86)\Windows Kits\10\Redist\ucrt\DLLs\x86`
-* `C:\Users\user\AppData\Local\Programs\Python\Python36-32\Lib\site-packages\PyQt5\Qt\bin`
+* `C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x86`
+* `C:\Program Files (x86)\Windows Kits\10\Redist\10.0.17763.0\ucrt\DLLs\x86`
+* `C:\Users\user\AppData\Local\Programs\Python\Python37-32\Lib\site-packages\PyQt5\Qt\bin`
* `C:\Program Files (x86)\7-Zip`
If you want to build the installer:
-* Go to http://nsis.sourceforge.net/Download and download the latest NSIS. I downloaded `nsis-3.03-setup.exe`.
+* Go to http://nsis.sourceforge.net/Download and download the latest NSIS. I downloaded `nsis-3.04-setup.exe`.
* Add `C:\Program Files (x86)\NSIS` to the path.
If you want to sign binaries with Authenticode:
diff --git a/install/onionshare.nsi b/install/onionshare.nsi
index 3a4c6c2a..d29e10a5 100644
--- a/install/onionshare.nsi
+++ b/install/onionshare.nsi
@@ -6,7 +6,7 @@
!define INSTALLSIZE 115186
!define VERSIONMAJOR 2
!define VERSIONMINOR 0
-!define VERSIONSTRING "2.0"
+!define VERSIONSTRING "2.0.dev3"
RequestExecutionLevel admin
diff --git a/share/version.txt b/share/version.txt
index 8be5e08a..c0099a45 100644
--- a/share/version.txt
+++ b/share/version.txt
@@ -1 +1 @@
-2.0.dev2
+2.0.dev3