From 2db3196d26530afae6df05f58358a597e4369be5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Blin?= Date: Tue, 20 Apr 2021 17:02:19 -0400 Subject: [PATCH] misc: update instructions Change-Id: Ib157716ced18a19f4220ec570e03896bfee76610 --- INSTALL.md | 219 +++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 189 +-------------------------------------------- 2 files changed, 221 insertions(+), 187 deletions(-) create mode 100644 INSTALL.md diff --git a/INSTALL.md b/INSTALL.md new file mode 100644 index 00000000..a59c2f96 --- /dev/null +++ b/INSTALL.md @@ -0,0 +1,219 @@ + +# Build instructions + +There is basically two ways to build `client-qt`: ++ Use `build.py` script which will build all Jami (daemon/client lib/client-qt) ++ Build only this client. + +## GNU/Linux + +### With build.py + +```bash +git clone https://review.jami.net/ring-project +``` + +Jami installer uses **python3**. If it's not installed, please install it: + +```bash +cd ring-project/ +./build.py --init +``` + +Then you will need to install dependencies: + ++ For GNU/Linux + +```bash +./build.py --dependencies --qt # needs sudo +``` + +Then, you can build daemon, lrc and client-qt with: + +```bash +./build.py --install --qt +``` + +And you will have the daemon in `daemon/bin/dring` and the client in `client-qt/build-local/jami-qt`. You also can run it with + +If you use a Qt version that is not wide-system installed you need to specify its path after the `--qt` flag, i. e., `./build.py --install --qt /home//Qt/5.15.0/gcc_64 + + +```bash +./build.py --run --qt +``` + +Notes: ++ `--global-install` to install client-qt globally under /usr/local ++ `--prefix` to change the destination of the install. + +## Build only the client + +In order to use the Qt Client it is necessary to have the Qt version 5.14 or higher. If your system does not have it you can install it [from sources or download the binary installer](https://www.qt.io/download). + +## Dependencies, Debian based + +``` +sudo apt-get install cmake make doxygen g++ gettext libnotify-dev pandoc nasm libqrencode-dev \ + libnotify-dev libnm-dev \ + qtbase5-dev libqt5sql5-sqlite \ # Qt > 5.14!!!! + qtmultimedia5-dev libqt5svg5-dev qtwebengine5-dev qtdeclarative5-dev \ + qtquickcontrols2-5-dev qml-module-qtquick2 qml-module-qtquick-controls \ + qml-module-qtquick-controls2 qml-module-qtquick-dialogs \ + qml-module-qtquick-layouts qml-module-qtquick-privatewidgets \ + qml-module-qtquick-shapes qml-module-qtquick-window2 \ + qml-module-qtquick-templates2 qml-module-qt-labs-platform \ + qml-module-qtwebengine qml-module-qtwebchannel +``` + +## Dependencies, Fedora + +``` +sudo dnf install qt5-qtsvg-devel qt5-qtwebengine-devel qt5-qtmultimedia-devel qt5-qtdeclarative-devel qt5-qtquickcontrols2-devel qt5-qtquickcontrols qrencode-devel NetworkManager-libnm-devel +``` + +## Build only this repository + +```bash +# In this repository +mkdir build +cd build +cmake .. +make -j +``` + +cmake can take several options: ++ Variables `QT5_VER` and `QT5_PATH` are used to specify version and path for a custom installation of Qt. ++ If lrc library is installed in a custom directory you can set its path with the variable LRC. Additionally you can specify built library location with `LRC` (otherwise it will seach inside LRC with the suffixes `/lib`, `/build` and `/build-local`). + +e.g. + +``` +cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/home/amarok/Projects/jami/install/lrc -DLRC=/home/user/install-lrc +``` + +After the build has finished, you are finally ready to launch jami-qt in your build directory. + +If you want to install it to the path provided by `CMAKE_INSTALL_PREFIX` you can run: + +```bash +make install +``` + +## Building On Native Windows + +Only 64-bit MSVC build can be compiled. + +> Note: command ```./make-ring.py --init``` is not required on the Windows build
+ +**Setup Before Building:** +- Download [Qt (Open Source)](https://www.qt.io/download-open-source?hsCtaTracking=9f6a2170-a938-42df-a8e2-a9f0b1d6cdce%7C6cb0de4f-9bb5-4778-ab02-bfb62735f3e5)
+ + | | Prebuild | Module | + |---|---|---| + | Components: | msvc2017_64 | Qt WebEngine | + +- Download [Visual Studio](https://visualstudio.microsoft.com/) (version >= 2015)
+- Install Qt Vs Tools under extensions, and configure msvc2017_64 path under Qt Options
+ + | | Qt Version | SDK | Toolset | + |---|---|---|---| + | Minimum requirement: | 5.9.4 | 10.0.16299.0 | V141 | + +- Install [Python3](https://www.python.org/downloads/) for Windows + +**Start Building** +- Using Command Prompt +```sh + git clone https://review.jami.net/ring-project + cd ring-project/ + git submodule update --init daemon lrc client-windows + git submodule update --recursive --remote daemon lrc client-windows +``` +- Using **Elevated Command Prompt** +```sh + python make-ring.py --dependencies +``` + +> Note: +> 1. This command will install **chocolatey** which may require you to restart the Command Prompt to be able to use it. +> 2. This command will install **msys2 (64 bit)** by using chocolatey command which may cause issues below:
+> a. Choco may require you to restart the Command Prompt after finishing installing msys2.
+> b. Only if you have already installed msys2 (64 bit) under the default installation folder, we will use the existing one. +> 3. This command will install **strawberry perl** by using chocolatey command which may fail if you have already installed it. +> 4. This command will install **cmake** by using chocolatey command which will not add cmake into PATH (environment variable).
+> +> The issue 1, 2(a), 3 can be solved by restarting the Command Prompt under Administrator right and re-run the command.
+> The issue 3 can be solved by uninstalling your current strawberry perl and re-run the command.
+> The issue 4 can be solved by adding the location of the cmake.exe into PATH.
+ +- Using a new **Non-Elevated Command Prompt** +```sh + python make-ring.py --install +``` +- Then you should be able to use the Visual Studio Solution file in client-windows folder **(Configuration = Release, Platform = x64)** + +> Note:
+> To control the toolset and the sdk version that are used by msbuild, you can use ```--toolset``` and ```--sdk``` options
+> To control which Qt version should be used (qmake, windeployqt), uou can use ```--qtver``` option
+> By default: ```toolset=v141```, ```sdk=10.0.16299.0```, ```qtver=5.9.4```
+> For example: +```sh + python make-ring.py --install --toolset v142 --sdk 10.0.18362.0 --qtver 5.14.0 +``` + +### Build Module individually + +- Jami-qt also support building each module (daemon, lrc, jami-qt) seperately + +**Daemon** + +- Make sure that dependencies is built by make-ring.py +- On MSVC folder (ring-project\daemon\MSVC): +```sh + cmake -DCMAKE_CONFIGURATION_TYPES="ReleaseLib_win32" -DCMAKE_VS_PLATFORM_NAME="x64" -G "Visual Studio 16 2019" -A x64 -T '$(DefaultPlatformToolset)' .. + python winmake.py -b daemon +``` +- This will generate a ```.lib``` file in the path of ring-project\daemon\MSVC\x64\ReleaseLib_win32\bin + +> Note: each dependencies contrib for daemon can also be updated individually
+> For example: +```bash + python winmake.py -b opendht +``` + +**Lrc** + +- Make sure that daemon is built first + +```bash + cd lrc + python make-lrc.py -gb +``` + +**Jami-qt** + +- Make sure that daemon, lrc are built first + +```bash + cd client-windows + python make-client.py -d + python make-client.py -b + powershell -ExecutionPolicy Unrestricted -File copy-runtime-files.ps1 +``` + +**Note** +- For all python scripts, both ```--toolset``` and ```--sdk``` options are available. +- For more available options, run scripts with ```-h``` option. +- ```--qtver``` option is available on ```make-lrc.py``` and ```make-client.py```. + +## Packaging On Native Windows + +- To be able to generate a msi package, first download and install [Wixtoolset](https://wixtoolset.org/releases/). +- In Visual Studio, download WiX Toolset Visual Studio Extension. +- Build client-windows project first, then the JamiInstaller project, msi package should be stored in ring-project\client-windows\JamiInstaller\bin\Release + +#### Debugging + +Compile the client with `BUILD=Debug` and compile LibRingClient with +`-DCMAKE_BUILD_TYPE=Debug` \ No newline at end of file diff --git a/README.md b/README.md index c6d040d4..d8d6c27b 100644 --- a/README.md +++ b/README.md @@ -32,194 +32,9 @@ For more information about the jami project, see the following: + Coding style is managed by the clang-format, if you want to contribute, please use the pre-commit hook automatically installed with `./make-ring.py --init` + We use gerrit for our review. Please read https://git.jami.net/savoirfairelinux/ring-project/wikis/tutorials/Working-with-gerrit if you want to submit patches. -# Build instructions +## Build -Note: This project is quite new, and still need some work for the build integration. - -## Dependencies - -This client is only the graphical part, you will need to also build the daemon and LRC (the library containing the logic for desktop clients). Because of this, the recommended way is to clone our [meta-repository](https://review.jami.net/admin/repos/ring-project) containing all submodules needed. - -In order to use the Qt Client it is necessary to have the Qt version 5.14 or higher. If your system does not have it you can install it [from sources or download the binary installer](https://www.qt.io/download). - -## Build all projects - -```bash -git clone https://review.jami.net/ring-project -``` - -Jami installer uses **python3**. If it's not installed, please install it: - -```bash -cd ring-project/ -./make-ring.py --init -``` - -Then you will need to install dependencies: - -+ For GNU/Linux - -```bash -./make-ring.py --dependencies --qt # needs sudo -``` - -Then, you can build daemon, lrc and client-qt with: - -```bash -./make-ring.py --install --qt -``` - -And you will have the daemon in `daemon/bin/dring` and the client in `client-qt/build-local/jami-qt`. You also can run it with - -If you use a Qt version that is not wide-system installed you need to specify its path after the `--qt` flag, i. e., `./make-ring.py --install --qt /home//Qt/5.15.0/gcc_64 - - -```bash -./make-ring.py --run --qt -``` - -## Build only the client - -```bash -cd client-qt -mkdir build -cd build -cmake .. -DQT5_VER=5.15.0 -DQT5_PATH=/home//Qt/5.15.0/gcc_64 -DLRC= -DCMAKE_INSTALL_PREFIX= -make -j -``` - -Variables `QT5_VER` and `QT5_PATH` are used to specify version and path for a custom installation of Qt. - -If lrc library is installed in a custom directory you can set its path with the variable LRC. Additionally you can specify built library location with `LRCLIB` (otherwise it will seach inside LRC with the suffixes `/lib`, `/build` and `/build-local`). - -After the build has finished, you are finally ready to launch jami-qt in your build directory. - -If you want to install it to the path provided by `CMAKE_INSTALL_PREFIX` you can run: - -```bash -make install -``` - - -If you want more details, or separately build other projects you can check [this page](https://git.jami.net/savoirfairelinux/ring-project/wikis/technical/Build-instructions). - -## Building On Native Windows - -Only 64-bit MSVC build can be compiled. - -> Note: command ```./make-ring.py --init``` is not required on the Windows build
- -**Setup Before Building:** -- Download [Qt (Open Source)](https://www.qt.io/download-open-source?hsCtaTracking=9f6a2170-a938-42df-a8e2-a9f0b1d6cdce%7C6cb0de4f-9bb5-4778-ab02-bfb62735f3e5)
- - | | Prebuild | Module | - |---|---|---| - | Components: | msvc2017_64 | Qt WebEngine | - -- Download [Visual Studio](https://visualstudio.microsoft.com/) (version >= 2015)
-- Install Qt Vs Tools under extensions, and configure msvc2017_64 path under Qt Options
- - | | Qt Version | SDK | Toolset | - |---|---|---|---| - | Minimum requirement: | 5.9.4 | 10.0.16299.0 | V141 | - -- Install [Python3](https://www.python.org/downloads/) for Windows - -**Start Building** -- Using Command Prompt -```sh - git clone https://review.jami.net/ring-project - cd ring-project/ - git submodule update --init daemon lrc client-windows - git submodule update --recursive --remote daemon lrc client-windows -``` -- Using **Elevated Command Prompt** -```sh - python make-ring.py --dependencies -``` - -> Note: -> 1. This command will install **chocolatey** which may require you to restart the Command Prompt to be able to use it. -> 2. This command will install **msys2 (64 bit)** by using chocolatey command which may cause issues below:
-> a. Choco may require you to restart the Command Prompt after finishing installing msys2.
-> b. Only if you have already installed msys2 (64 bit) under the default installation folder, we will use the existing one. -> 3. This command will install **strawberry perl** by using chocolatey command which may fail if you have already installed it. -> 4. This command will install **cmake** by using chocolatey command which will not add cmake into PATH (environment variable).
-> -> The issue 1, 2(a), 3 can be solved by restarting the Command Prompt under Administrator right and re-run the command.
-> The issue 3 can be solved by uninstalling your current strawberry perl and re-run the command.
-> The issue 4 can be solved by adding the location of the cmake.exe into PATH.
- -- Using a new **Non-Elevated Command Prompt** -```sh - python make-ring.py --install -``` -- Then you should be able to use the Visual Studio Solution file in client-windows folder **(Configuration = Release, Platform = x64)** - -> Note:
-> To control the toolset and the sdk version that are used by msbuild, you can use ```--toolset``` and ```--sdk``` options
-> To control which Qt version should be used (qmake, windeployqt), uou can use ```--qtver``` option
-> By default: ```toolset=v141```, ```sdk=10.0.16299.0```, ```qtver=5.9.4```
-> For example: -```sh - python make-ring.py --install --toolset v142 --sdk 10.0.18362.0 --qtver 5.14.0 -``` - -### Build Module individually - -- Jami-qt also support building each module (daemon, lrc, jami-qt) seperately - -**Daemon** - -- Make sure that dependencies is built by make-ring.py -- On MSVC folder (ring-project\daemon\MSVC): -```sh - cmake -DCMAKE_CONFIGURATION_TYPES="ReleaseLib_win32" -DCMAKE_VS_PLATFORM_NAME="x64" -G "Visual Studio 16 2019" -A x64 -T '$(DefaultPlatformToolset)' .. - python winmake.py -b daemon -``` -- This will generate a ```.lib``` file in the path of ring-project\daemon\MSVC\x64\ReleaseLib_win32\bin - -> Note: each dependencies contrib for daemon can also be updated individually
-> For example: -```bash - python winmake.py -b opendht -``` - -**Lrc** - -- Make sure that daemon is built first - -```bash - cd lrc - python make-lrc.py -gb -``` - -**Jami-qt** - -- Make sure that daemon, lrc are built first - -```bash - cd client-windows - python make-client.py -d - python make-client.py -b - powershell -ExecutionPolicy Unrestricted -File copy-runtime-files.ps1 -``` - -**Note** -- For all python scripts, both ```--toolset``` and ```--sdk``` options are available. -- For more available options, run scripts with ```-h``` option. -- ```--qtver``` option is available on ```make-lrc.py``` and ```make-client.py```. - -## Packaging On Native Windows - -- To be able to generate a msi package, first download and install [Wixtoolset](https://wixtoolset.org/releases/). -- In Visual Studio, download WiX Toolset Visual Studio Extension. -- Build client-windows project first, then the JamiInstaller project, msi package should be stored in ring-project\client-windows\JamiInstaller\bin\Release - -#### Debugging - -Compile the client with `BUILD=Debug` and compile LibRingClient with -`-DCMAKE_BUILD_TYPE=Debug` +cf [INSTALL.md](/INSTALL.md) # License