Implement version check

psiberx · Dec 24, 2022 · 3a9c82d · 3a9c82d
1 parent 9f0cac7
commit 3a9c82d
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 6 deletions.
diff --git a/src/App/Facade.cpp b/src/App/Facade.cpp
@@ -8,6 +8,12 @@ void App::Facade::Reload()
     Core::Resolve<ExtensionService>()->Configure();
 }
 
+bool App::Facade::Require(Red::CString& aVersion)
+{
+    const auto requirement = semver::from_string_noexcept(aVersion.c_str());
+    return requirement.has_value() ? Project::Version >= requirement.value() : false;
+}
+
 Red::CString App::Facade::GetVersion()
 {
     return Project::Version.to_string().c_str();
@@ -22,5 +28,6 @@ void App::Facade::OnRegister(Descriptor* aType)
 void App::Facade::OnDescribe(Descriptor* aType)
 {
     aType->AddFunction<&Reload>("Reload");
+    aType->AddFunction<&Require>("Require");
     aType->AddFunction<&GetVersion>("Version");
 }
diff --git a/src/App/Facade.hpp b/src/App/Facade.hpp
@@ -10,6 +10,7 @@ class Facade : public Red::Rtti::Class<Facade>
 {
 public:
     static void Reload();
+    static bool Require(Red::CString& aVersion);
     static Red::CString GetVersion();
 
 private:

diff --git a/src/App/Project.hpp b/src/App/Project.hpp
@@ -12,5 +12,5 @@ constexpr auto Author = "psiberx";
 constexpr auto NameW = L"ArchiveXL";
 constexpr auto AuthorW = L"psiberx";
 
-constexpr auto Version = semver::from_string_noexcept("1.3.2").value();
+constexpr auto Version = semver::from_string_noexcept("1.3.4").value();
 }
diff --git a/src/App/Version.rc b/src/App/Version.rc
@@ -1,9 +1,9 @@
-#define VER_PRODUCTVERSION     1,3,2,0
-#define VER_FILEVERSION        1,3,2,2212160642
+#define VER_PRODUCTVERSION     1,3,4,0
+#define VER_FILEVERSION        1,3,4,2212241000
 
 #define VER_PRODUCTNAME_STR    "ArchiveXL\0"
-#define VER_PRODUCTVERSION_STR "1.3.2\0"
-#define VER_FILEVERSION_STR    "1.3.2.2212160642\0"
+#define VER_PRODUCTVERSION_STR "1.3.4\0"
+#define VER_FILEVERSION_STR    "1.3.4.2212241000\0"
 
 1 VERSIONINFO
 FILEVERSION     VER_FILEVERSION

diff --git a/support/redscript/ArchiveXL.reds b/support/redscript/ArchiveXL.reds
@@ -0,0 +1,5 @@
+
+public abstract native class ArchiveXL {
+    public static native func Require(version: String) -> Bool
+    public static native func Version() -> String
+}
diff --git a/tools/dist/install-asi.ps1 b/tools/dist/install-asi.ps1
@@ -3,6 +3,7 @@ param ($GameDir, $ReleaseBin, $ProjectName = "ArchiveXL")
 $StageDir = "build/package"
 
 & $($PSScriptRoot + "\steps\compose-plugin-asi.ps1") -StageDir ${StageDir} -ProjectName ${ProjectName} -ReleaseBin ${ReleaseBin}
+& $($PSScriptRoot + "\steps\compose-redscripts.ps1") -StageDir ${StageDir} -ProjectName ${ProjectName}
 & $($PSScriptRoot + "\steps\install-from-stage.ps1") -StageDir ${StageDir} -GameDir ${GameDir}
 
 Remove-Item -Recurse ${StageDir}
diff --git a/tools/dist/install-red4ext.ps1 b/tools/dist/install-red4ext.ps1
@@ -3,6 +3,7 @@ param ($GameDir, $ReleaseBin, $ProjectName = "ArchiveXL")
 $StageDir = "build/package"
 
 & $($PSScriptRoot + "\steps\compose-plugin-red4ext.ps1") -StageDir ${StageDir} -ProjectName ${ProjectName} -ReleaseBin ${ReleaseBin}
+& $($PSScriptRoot + "\steps\compose-redscripts.ps1") -StageDir ${StageDir} -ProjectName ${ProjectName}
 & $($PSScriptRoot + "\steps\install-from-stage.ps1") -StageDir ${StageDir} -GameDir ${GameDir}
 
 Remove-Item -Recurse ${StageDir}
diff --git a/tools/dist/package-asi.ps1 b/tools/dist/package-asi.ps1
@@ -4,6 +4,7 @@ $StageDir = "build/package"
 $DistDir = "build/dist"
 
 & $($PSScriptRoot + "\steps\compose-plugin-asi.ps1") -StageDir ${StageDir} -ProjectName ${ProjectName} -ReleaseBin ${ReleaseBin}
+& $($PSScriptRoot + "\steps\compose-redscripts.ps1") -StageDir ${StageDir} -ProjectName ${ProjectName}
 & $($PSScriptRoot + "\steps\create-zip-from-stage.ps1") -StageDir ${StageDir} -ProjectName ${ProjectName} -DistDir ${DistDir} -Suffix "-asi"
 
 Remove-Item -Recurse ${StageDir}
diff --git a/tools/dist/package-red4ext.ps1 b/tools/dist/package-red4ext.ps1
@@ -4,6 +4,7 @@ $StageDir = "build/package"
 $DistDir = "build/dist"
 
 & $($PSScriptRoot + "\steps\compose-plugin-red4ext.ps1") -StageDir ${StageDir} -ProjectName ${ProjectName} -ReleaseBin ${ReleaseBin}
+& $($PSScriptRoot + "\steps\compose-redscripts.ps1") -StageDir ${StageDir} -ProjectName ${ProjectName}
 & $($PSScriptRoot + "\steps\create-zip-from-stage.ps1") -StageDir ${StageDir} -ProjectName ${ProjectName} -DistDir ${DistDir}
 
 Remove-Item -Recurse ${StageDir}
diff --git a/tools/dist/steps/compose-redscripts.ps1 b/tools/dist/steps/compose-redscripts.ps1
@@ -0,0 +1,6 @@
+param ($StageDir, $ProjectName)
+
+$ScriptsDir = "${StageDir}/r6/scripts/${ProjectName}"
+
+New-Item -ItemType directory -Force -Path ${ScriptsDir} | Out-Null
+Get-Content "support/redscript/*.reds" | Out-File -Encoding ascii "${ScriptsDir}/${ProjectName}.reds"
diff --git a/xmake.lua b/xmake.lua
@@ -1,7 +1,7 @@
 set_xmakever("2.5.9")
 
 set_project("ArchiveXL")
-set_version("1.3.2", {build = "%y%m%d%H%M"})
+set_version("1.3.4", {build = "%y%m%d%H%M"})
 
 set_arch("x64")
 set_languages("cxx20", "cxx2a")