From dd252eb5504322c50103b20e49928cc43dc35340 Mon Sep 17 00:00:00 2001 From: mewmew-i2p <37730144+mewmew-i2p@users.noreply.github.com> Date: Sun, 22 Apr 2018 19:44:26 +0800 Subject: [PATCH 1/8] Update qt-desktop-gui.md --- docs/devs/building/qt-desktop-gui.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/docs/devs/building/qt-desktop-gui.md b/docs/devs/building/qt-desktop-gui.md index 029f3a6..fb07272 100644 --- a/docs/devs/building/qt-desktop-gui.md +++ b/docs/devs/building/qt-desktop-gui.md @@ -23,9 +23,12 @@ TBD ### Without Qt Creator -/c/Qt/Qt5.10.1/5.10.1/mingw53_32/bin/ - -pacman -S mingw-w64-i686-qt-creator mingw-w64-x86_64-qt-creator +Under MSYS2 mingw32, run: + +``` +pacman -Suy git make tar mingw-w64-i686-gcc mingw-w64-i686-boost mingw-w64-i686-libpng mingw-w64-i686-openssl mingw-w64-i686-zlib +pacman -Suy mingw-w64-i686-qt5-static +``` TBD From c4c3a508e48aaae7b0a45ef59706560b7f18094c Mon Sep 17 00:00:00 2001 From: mewmew-i2p <37730144+mewmew-i2p@users.noreply.github.com> Date: Sun, 22 Apr 2018 19:49:27 +0800 Subject: [PATCH 2/8] Update qt-desktop-gui.md --- docs/devs/building/qt-desktop-gui.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/devs/building/qt-desktop-gui.md b/docs/devs/building/qt-desktop-gui.md index fb07272..8ee36b6 100644 --- a/docs/devs/building/qt-desktop-gui.md +++ b/docs/devs/building/qt-desktop-gui.md @@ -23,7 +23,7 @@ TBD ### Without Qt Creator -Under MSYS2 mingw32, run: +All commands should be run under MSYS2 mingw32. ``` pacman -Suy git make tar mingw-w64-i686-gcc mingw-w64-i686-boost mingw-w64-i686-libpng mingw-w64-i686-openssl mingw-w64-i686-zlib From 37f83cef32ec080aba37f54f3904696000bf42e1 Mon Sep 17 00:00:00 2001 From: mewmew-i2p <37730144+mewmew-i2p@users.noreply.github.com> Date: Sun, 22 Apr 2018 19:54:41 +0800 Subject: [PATCH 3/8] Update qt-desktop-gui.md --- docs/devs/building/qt-desktop-gui.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/devs/building/qt-desktop-gui.md b/docs/devs/building/qt-desktop-gui.md index 8ee36b6..36df450 100644 --- a/docs/devs/building/qt-desktop-gui.md +++ b/docs/devs/building/qt-desktop-gui.md @@ -28,6 +28,11 @@ All commands should be run under MSYS2 mingw32. ``` pacman -Suy git make tar mingw-w64-i686-gcc mingw-w64-i686-boost mingw-w64-i686-libpng mingw-w64-i686-openssl mingw-w64-i686-zlib pacman -Suy mingw-w64-i686-qt5-static +mkdir -p /c/dev/ +cd /c/dev/ +git clone https://github.com/PurpleI2P/i2pd.git +cd i2pd +git checkout openssl ``` TBD From 82479f920999be4475dd1de01c63a5d3d206c896 Mon Sep 17 00:00:00 2001 From: mewmew-i2p <37730144+mewmew-i2p@users.noreply.github.com> Date: Sun, 22 Apr 2018 20:24:37 +0800 Subject: [PATCH 4/8] Update qt-desktop-gui.md --- docs/devs/building/qt-desktop-gui.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/devs/building/qt-desktop-gui.md b/docs/devs/building/qt-desktop-gui.md index 36df450..475ae0a 100644 --- a/docs/devs/building/qt-desktop-gui.md +++ b/docs/devs/building/qt-desktop-gui.md @@ -28,13 +28,23 @@ All commands should be run under MSYS2 mingw32. ``` pacman -Suy git make tar mingw-w64-i686-gcc mingw-w64-i686-boost mingw-w64-i686-libpng mingw-w64-i686-openssl mingw-w64-i686-zlib pacman -Suy mingw-w64-i686-qt5-static +pacman -Suy openssl-devel mingw-w64-i686-miniupnpc mkdir -p /c/dev/ cd /c/dev/ git clone https://github.com/PurpleI2P/i2pd.git cd i2pd git checkout openssl +export MINGW='mingw32' +export PATH=/$MINGW/bin:/usr/bin +cd qt/i2pd_qt +qmake +make USE_UPNP=yes ``` +#### Caveats + +It is important to restrict PATH as described above. If you have Strawberry Perl and/or Mercurial installed, it will pick up gcc & openssl from the wrong places. + TBD ## Under Ubuntu From 694da6f91d4266cfd25c42ad4bbec4907d8e69a6 Mon Sep 17 00:00:00 2001 From: mewmew-i2p <37730144+mewmew-i2p@users.noreply.github.com> Date: Sun, 22 Apr 2018 20:32:12 +0800 Subject: [PATCH 5/8] Update qt-desktop-gui.md --- docs/devs/building/qt-desktop-gui.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/devs/building/qt-desktop-gui.md b/docs/devs/building/qt-desktop-gui.md index 475ae0a..129cad2 100644 --- a/docs/devs/building/qt-desktop-gui.md +++ b/docs/devs/building/qt-desktop-gui.md @@ -35,7 +35,7 @@ git clone https://github.com/PurpleI2P/i2pd.git cd i2pd git checkout openssl export MINGW='mingw32' -export PATH=/$MINGW/bin:/usr/bin +export PATH=/$MINGW/bin:/usr/bin:/mingw32/qt5-static/bin cd qt/i2pd_qt qmake make USE_UPNP=yes From bfd09ff7f6df5a88d7a24a22534ca305430f4d2b Mon Sep 17 00:00:00 2001 From: mewmew-i2p <37730144+mewmew-i2p@users.noreply.github.com> Date: Sun, 22 Apr 2018 20:33:57 +0800 Subject: [PATCH 6/8] Update qt-desktop-gui.md --- docs/devs/building/qt-desktop-gui.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/devs/building/qt-desktop-gui.md b/docs/devs/building/qt-desktop-gui.md index 129cad2..26306d2 100644 --- a/docs/devs/building/qt-desktop-gui.md +++ b/docs/devs/building/qt-desktop-gui.md @@ -26,9 +26,9 @@ TBD All commands should be run under MSYS2 mingw32. ``` -pacman -Suy git make tar mingw-w64-i686-gcc mingw-w64-i686-boost mingw-w64-i686-libpng mingw-w64-i686-openssl mingw-w64-i686-zlib -pacman -Suy mingw-w64-i686-qt5-static -pacman -Suy openssl-devel mingw-w64-i686-miniupnpc +pacman -S git make tar mingw-w64-i686-gcc mingw-w64-i686-boost mingw-w64-i686-libpng mingw-w64-i686-openssl mingw-w64-i686-zlib +pacman -S mingw-w64-i686-qt5-static +pacman -S openssl-devel mingw-w64-i686-miniupnpc mkdir -p /c/dev/ cd /c/dev/ git clone https://github.com/PurpleI2P/i2pd.git @@ -45,7 +45,7 @@ make USE_UPNP=yes It is important to restrict PATH as described above. If you have Strawberry Perl and/or Mercurial installed, it will pick up gcc & openssl from the wrong places. -TBD +If you are an Arch Linux user, refrain from updating system with pacman -Syu. Always update runtime separately as described on the home page, otherwise you might end up with DLLs incompatibility problems. ## Under Ubuntu From 323c4c1a20ce38a44ef7ad0b63036c5cb7faddc7 Mon Sep 17 00:00:00 2001 From: mewmew-i2p <37730144+mewmew-i2p@users.noreply.github.com> Date: Tue, 24 Apr 2018 01:47:20 +0800 Subject: [PATCH 7/8] Update qt-desktop-gui.md --- docs/devs/building/qt-desktop-gui.md | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/docs/devs/building/qt-desktop-gui.md b/docs/devs/building/qt-desktop-gui.md index 26306d2..4f04bc7 100644 --- a/docs/devs/building/qt-desktop-gui.md +++ b/docs/devs/building/qt-desktop-gui.md @@ -6,21 +6,6 @@ TBD -* Run Git Bash and then: - -``` -mkdir git -cd git -git clone https://github.com/PurpleI2P/i2pd.git -cd i2pd -git checkout openssl -``` - -* Download [qt-opensource-windows-x86-5.10.1.exe](http://download.qt.io/official_releases/qt/5.10/5.10.1/qt-opensource-windows-x86-5.10.1.exe) -and install - -TBD - ### Without Qt Creator All commands should be run under MSYS2 mingw32. From 842e0630900c90ec55a782273220e6daa42107cd Mon Sep 17 00:00:00 2001 From: mewmew-i2p <37730144+mewmew-i2p@users.noreply.github.com> Date: Tue, 24 Apr 2018 01:48:35 +0800 Subject: [PATCH 8/8] Update qt-desktop-gui.md --- docs/devs/building/qt-desktop-gui.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/devs/building/qt-desktop-gui.md b/docs/devs/building/qt-desktop-gui.md index 4f04bc7..7abaccb 100644 --- a/docs/devs/building/qt-desktop-gui.md +++ b/docs/devs/building/qt-desktop-gui.md @@ -30,7 +30,7 @@ make USE_UPNP=yes It is important to restrict PATH as described above. If you have Strawberry Perl and/or Mercurial installed, it will pick up gcc & openssl from the wrong places. -If you are an Arch Linux user, refrain from updating system with pacman -Syu. Always update runtime separately as described on the home page, otherwise you might end up with DLLs incompatibility problems. +If you are an Arch Linux user, refrain from updating system with `pacman -Syu`. Always update runtime separately as described on the home page, otherwise you might end up with DLLs incompatibility problems. ## Under Ubuntu