progress

jasp-stats · Jan 10, 2024 · ad77e1b · ad77e1b
1 parent 15a85c3
commit ad77e1b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/QMLComponents/utilities/dynamicruntimeinfo.h b/QMLComponents/utilities/dynamicruntimeinfo.h
@@ -1,6 +1,14 @@
 #ifndef DYNRUNTIMEINFO_H
 #define DYNRUNTIMEINFO_H
 
+/*! 
+ *  Simple class that parses Runtime information from staticRuntimeInfo.json located in the install folder
+ *  and dynamicRuntimeInfo.json located in a user directory defined by Appdirs. 
+ *  staticRuntimeInfo.json containts information on install type. 
+ * 	dynamicRuntimeInfo.json is used to log various information regarding the initialization of the environment. e.g. at first run
+ * 	This class is used to query runtime information and to determine if there has been proper initialization for this JASP version.
+*/
+
 #include <cstdint>
 #include <string>
 #include <map>

diff --git a/Tools/CMake/JASP.cmake b/Tools/CMake/JASP.cmake
@@ -61,7 +61,7 @@ set(MSIX_NIGHTLY_PUBLISHER
     CACHE STRING "Publisher set for nightly msix package")
 
 set(MSIX_SIGN_CERT_PATH
-  "..\\JASPSelfSign.pfx"
+  "D:\\JASPSelfSign.pfx"
   CACHE STRING "Path to selfsign cert for Nightlies")
 
 set(MSIX_SIGN_CERT_PASSWORD

diff --git a/Tools/windows/msix/AppxManifest-nightly.xml.in b/Tools/windows/msix/AppxManifest-nightly.xml.in
@@ -7,7 +7,7 @@
   xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3"
   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities">
 
-<Identity Name="45842JASP.JASP"
+<Identity Name="JASP.SIDELOAD.NIGHTLY"
         Version="@JASP_VERSION_MAJOR@.@JASP_VERSION_MINOR@.@JASP_VERSION_PATCH@@JASP_VERSION_MSIX_PATCH_POSTFIX@.@JASP_VERSION_TWEAK@"
         Publisher="@MSIX_NIGHTLY_PUBLISHER@"
     ProcessorArchitecture="x64"/>

diff --git a/Tools/windows/msix/AppxManifest-sideload.xml.in b/Tools/windows/msix/AppxManifest-sideload.xml.in
@@ -7,7 +7,7 @@
   xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3"
   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities">
 
-<Identity Name="45842JASP.JASP"
+<Identity Name="JASP.SIDELOAD"
         Version="@JASP_VERSION_MAJOR@.@JASP_VERSION_MINOR@.@JASP_VERSION_PATCH@@JASP_VERSION_MSIX_PATCH_POSTFIX@.@JASP_VERSION_TWEAK@"
         Publisher="@MSIX_SIDELOAD_PUBLISHER@"
     ProcessorArchitecture="x64"/>

diff --git a/Tools/windows/msix/msix.cmd.in b/Tools/windows/msix/msix.cmd.in
@@ -29,7 +29,7 @@ makepri.exe new /o /pr . /cf .\priconfig.xml
 cd "@JASP_BINARY_DIR_NATIVE@"
 MakeAppx pack /o /d .\Install\ /p "@JASP_BINARY_DIR_NATIVE@\JASP\JASP-Store-@JASP_VERSION_MAJOR@.@JASP_VERSION_MINOR@.@JASP_VERSION_PATCH@@JASP_VERSION_MSIX_PATCH_POSTFIX@.@JASP_VERSION_TWEAK@.msix"
 
-rem Store Pack MSIX
+rem Sideload Pack MSIX
 cd "@JASP_INSTALL_DIR_NATIVE@"
 cp -f @JASP_BINARY_DIR_NATIVE@\AppxManifest-sideload.xml .\AppxManifest.xml
 makepri.exe createconfig /o /cf priconfig.xml /dq en-US