more instrructions

stmoon · Aug 13, 2022 · c2382f8 · c2382f8
1 parent 62a2d24
commit c2382f8
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 157 deletions.
diff --git 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
@@ -2,7 +2,8 @@
  protobuf/3.21.1
  mosquitto/2.0.14
  zeromq/4.3.4
+ zstd/1.5.2
 
  [generators]
  CMakeDeps
- CMakeToolchain
+ CMakeToolchain
diff --git a/docs/appimage.md b/docs/appimage.md
diff --git a/docs/compile_with_vcpkg.md b/docs/compile_with_vcpkg.md
diff --git a/installer/config.xml b/installer/config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Installer>
   <Name>PlotJuggler</Name>
-  <Version>3.5.0</Version>
+  <Version>3.6.0</Version>
   <Title>PlotJuggler installer</Title>
   <Publisher>Davide Faconti</Publisher>
   <StartMenuDir>PlotJuggler</StartMenuDir>

diff --git a/installer/io.plotjuggler.application/meta/package.xml b/installer/io.plotjuggler.application/meta/package.xml
@@ -2,8 +2,8 @@
 <Package>
     <DisplayName>PlotJuggler Main App</DisplayName>
     <Description>Install PlotJuggler with basic plugins.</Description>
-    <Version>3.5.0</Version>
-    <ReleaseDate>2022-07-12</ReleaseDate>
+    <Version>3.6.0</Version>
+    <ReleaseDate>2022-08-13</ReleaseDate>
     <Licenses>
         <License name="MPL-2.0" file="license_mpl.txt" />
         <License name="LGPL" file="license_lgpl.txt" />

diff --git a/win32build.bat b/win32build.bat