From c2382f8c9149499cb4dac8c698acfdb1b2a0e65f Mon Sep 17 00:00:00 2001 From: Davide Faconti Date: Sat, 13 Aug 2022 21:41:42 +0200 Subject: [PATCH] more instrructions --- COMPILE.md | 19 +++++- conanfile.txt | 3 +- docs/appimage.md | 26 -------- docs/compile_with_vcpkg.md | 63 ------------------- installer/config.xml | 2 +- .../meta/package.xml | 4 +- win32build.bat | 63 ------------------- 7 files changed, 23 insertions(+), 157 deletions(-) delete mode 100644 docs/appimage.md delete mode 100644 docs/compile_with_vcpkg.md delete mode 100644 win32build.bat diff --git a/COMPILE.md b/COMPILE.md index fef983fc4..47e4008ea 100644 --- a/COMPILE.md +++ b/COMPILE.md @@ -108,7 +108,7 @@ cmake -G "Visual Studio 16" ^ -DCMAKE_TOOLCHAIN_FILE=%CMAKE_TOOLCHAIN% ^ -DCMAKE_INSTALL_PREFIX=%cd%/install ^ -DCMAKE_POLICY_DEFAULT_CMP0091=NEW - -D + cmake --build build/PlotJuggler --config Release --parallel --target install ``` @@ -127,3 +127,20 @@ cmake -G "Visual Studio 16" ^ cmake --build build/PlotJuggler --config Release --parallel --target install ``` + +## Create a Windows installer + +Change the **Qt** and **QtInstallerFramework** version as needed. + +``` +xcopy src\PlotJuggler\installer installer\ /Y /S /f /z +xcopy install\bin\*.* installer\io.plotjuggler.application\data /Y /S /f /z + +C:\Qt\5.15.2\msvc2019_64\bin\windeployqt.exe --release ^ + installer\io.plotjuggler.application\data\plotjuggler.exe + +C:\Qt\Tools\QtInstallerFramework\4.1\bin\binarycreator.exe ^ + --offline-only -c installer\config.xml -p installer ^ + PlotJuggler-Windows-installer.exe + +``` diff --git a/conanfile.txt b/conanfile.txt index 9c34fb4a9..df83c5e87 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -2,7 +2,8 @@ protobuf/3.21.1 mosquitto/2.0.14 zeromq/4.3.4 + zstd/1.5.2 [generators] CMakeDeps - CMakeToolchain \ No newline at end of file + CMakeToolchain diff --git a/docs/appimage.md b/docs/appimage.md deleted file mode 100644 index d678c83c2..000000000 --- a/docs/appimage.md +++ /dev/null @@ -1,26 +0,0 @@ - -git clone https://github.com/facontidavide/PlotJuggler.git - -mkdir build - -cd build - -cmake ../PlotJuggler/ -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../install - -make -j8 - -make install - -cd .. - -wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage - -wget https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage - -chmod +x linuxdeploy*.AppImage - -cd PlotJuggler;export VERSION=$(git describe --abbrev=0 --tags);cd -;echo $VERSION - -cp -v install/bin/* AppDir/usr/bin - -./linuxdeploy-x86_64.AppImage --appdir=AppDir -d ./PlotJuggler/PlotJuggler.desktop -i ./PlotJuggler/plotjuggler.png --plugin qt --output appimage diff --git a/docs/compile_with_vcpkg.md b/docs/compile_with_vcpkg.md deleted file mode 100644 index 4d6119934..000000000 --- a/docs/compile_with_vcpkg.md +++ /dev/null @@ -1,63 +0,0 @@ -# Install dependenices with vcpkg - -Follow the instructions [here](https://vcpkg.io/en/getting-started.html). -We will assume that both **PlotJuggler** and **vcpkg** are cloned in a directory called `C:\dev`. - - - git clone https://github.com/Microsoft/vcpkg.git - .\vcpkg\bootstrap-vcpkg.bat - -Now, add the folder `C:\dev\vcpkg` to your **PATH**, preferably globally. - -If you want to compile with **mingw** set the following variables: - - set VCPKG_DEFAULT_TRIPLET=x64-mingw-dynamic - set VCPKG_DEFAULT_HOST_TRIPLET=x64-mingw-dynamic - -Otherwise, if you want to use the MSVC compiler: - - set VCPKG_DEFAULT_TRIPLET=x64-windows - set VCPKG_DEFAULT_HOST_TRIPLET=x64-windows - -You can now install the dependencies required by PlotJuggler - - vcpkg install protobuf zeromq mosquitto - -# Install Qt - -Qt5 dependencies in vcpkg are broken at the time of writing. -Download Qt5 from the official web and insatll it in the folder `C:\Qt`. - -More informations here: https://github.com/facontidavide/PlotJuggler/discussions/518 - -# Compile from command line Qt Creator - -If you are familiar with Qt Creator, you should follow the usual steps. - -Note that `C:\dev\vcpkg` must be in your **PATH** to work correctly. - -For more information: https://www.qt.io/blog/qt-creator-cmake-package-manager-auto-setup - -# Compile from command line with cmake - -Assuming that: - -- **PlotJuggler** is in the folder `C:\dev\PlotJuggler` -- **vcpkg**** is in the folder `C:\dev\vcpkg` - -Move to folder `C:\dev` and type: - - cmake -B build_pj -S PlotJuggler -DCMAKE_TOOLCHAIN_FILE=C:/dev/vcpkg/scripts/buildsystems/vcpkg.cmake - -And compile in Release mode with: - - cmake --build build_pj --config Release - -# Final app deployment - -Move to the folder where `plotjuggler.exe` is located (should be `C:\dev\build_pj\bin\release`) and use `windeployqt.exe` to copy the needed -Qt libraries. - -For instance, if you have Qt 5.12.2 installed and compiled witg MSVC 2019. - - C:\Qt\5.15.2\msvc2019_64\bin\windeployqt.exe plotjuggler.exe diff --git a/installer/config.xml b/installer/config.xml index c0eeb91d9..4a8ad7d5c 100644 --- a/installer/config.xml +++ b/installer/config.xml @@ -1,7 +1,7 @@ PlotJuggler - 3.5.0 + 3.6.0 PlotJuggler installer Davide Faconti PlotJuggler diff --git a/installer/io.plotjuggler.application/meta/package.xml b/installer/io.plotjuggler.application/meta/package.xml index f45c92a56..9e3a3be88 100644 --- a/installer/io.plotjuggler.application/meta/package.xml +++ b/installer/io.plotjuggler.application/meta/package.xml @@ -2,8 +2,8 @@ PlotJuggler Main App Install PlotJuggler with basic plugins. - 3.5.0 - 2022-07-12 + 3.6.0 + 2022-08-13 diff --git a/win32build.bat b/win32build.bat deleted file mode 100644 index 20b89bc68..000000000 --- a/win32build.bat +++ /dev/null @@ -1,63 +0,0 @@ -@echo off -cd %~dp0 -SET MINGW_PATH=C:/Qt/Tools/mingw730_64/bin -SET CMAKE_PATH=C:/Qt/Tools/CMake_64/bin -SET CMAKE_PREFIX_PATH=C:/Qt/5.12.10/mingw73_64 -SET PATH=%MINGW_PATH%;%CMAKE_PATH%;%PATH% -SET CMAKE_C_COMPILER=%MINGW_PATH%/gcc.exe -SET CMAKE_CXX_COMPILER=%MINGW_PATH%/g++.exe - -CLS -:MENU -CLS - -ECHO == PLOTJUGGLER BUILDER FOR WINDOWS == -ECHO ------------------------------------- -ECHO 1. COMPILE -ECHO 2. CREATE INSTALLER -ECHO 3. CLEAR BULD FOLDER -ECHO ------------------------------------- -ECHO ==========PRESS 'Q' TO QUIT========== -ECHO. - -SET INPUT= -SET /P INPUT=Please select a number: - -IF /I '%INPUT%'=='1' GOTO Selection1 -IF /I '%INPUT%'=='2' GOTO Selection2 -IF /I '%INPUT%'=='3' GOTO Selection3 -IF /I '%INPUT%'=='Q' GOTO Quit - -CLS -GOTO MENU - -:Selection1 -mkdir build -cd build -cmake -S ".." -G "MinGW Makefiles" -make -j -l 8 -PAUSE -GOTO MENU - -:Selection2 -RMDIR /S /Q %~dp0\installer\io.plotjuggler.application\data -%CMAKE_PREFIX_PATH%\bin\windeployqt.exe --release --dir %~dp0\installer\io.plotjuggler.application\data %~dp0\build\bin\PlotJuggler.exe -xcopy %~dp0\build\bin\*.* %~dp0\installer\io.plotjuggler.application\data /Y /S /f /z -C:\Qt\Tools\QtInstallerFramework\4.0\bin\binarycreator.exe --offline-only -c %~dp0\installer\config.xml -p %~dp0\installer %~dp0\PlotJugglerInstaller.exe -PAUSE -GOTO MENU - -:Selection3 -RMDIR /S /Q build -PAUSE -GOTO MENU - -:Quit -CLS - -ECHO ==============THANKYOU=============== -ECHO ------------------------------------- -ECHO ======PRESS ANY KEY TO CONTINUE====== - -PAUSE>NUL -EXIT