Build arm64 installer

Signed-off-by: Vitalii Koshura <[email protected]>
BOINC · Dec 4, 2024 · 2b2b8aa · 2b2b8aa
1 parent ff7810b
commit 2b2b8aa
Show file tree

Hide file tree

Showing 26 changed files with 151 additions and 126 deletions.
diff --git a/3rdParty/vcpkg_ports/configs/msbuild/ARM64/vcpkg.json b/3rdParty/vcpkg_ports/configs/msbuild/ARM64/vcpkg.json
diff --git a/3rdParty/vcpkg_ports/configs/msbuild/installer/vcpkg.json b/3rdParty/vcpkg_ports/configs/msbuild/installer/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "boinc-msbuild",
+  "dependencies":
+  [
+    "nlohmann-json"
+  ]
+}
diff --git a/3rdParty/vcpkg_ports/configs/msbuild/vcpkg.json b/3rdParty/vcpkg_ports/configs/msbuild/vcpkg.json
@@ -0,0 +1,26 @@
+{
+  "name": "boinc-msbuild",
+  "dependencies":
+  [
+    {
+      "name": "curl",
+      "features": ["schannel"],
+      "default-features": false
+    },
+    {
+      "name": "openssl",
+      "features": ["ssl3", "weak-ssl-ciphers"],
+      "default-features": false
+    },
+    "rappture",
+    {
+      "name": "wxwidgets",
+      "features": ["webview"],
+      "default-features": false
+    },
+    "gtest",
+    "ftgl",
+    "opencl",
+    "nlohmann-json"
+  ]
+}
diff --git a/3rdParty/vcpkg_ports/configs/msbuild/x64/vcpkg.json b/3rdParty/vcpkg_ports/configs/msbuild/x64/vcpkg.json
diff --git a/installer/Binary.cpp b/installer/Binary.cpp
@@ -20,21 +20,10 @@
 #include "JsonHelper.h"
 
 Binary::Binary(const nlohmann::json& json,
-    const std::filesystem::path& root_path) {
+    const std::filesystem::path& root_path, const std::string& platform,
+    const std::string& configuration) {
     const std::string configuration_template = "%%CONFIGURATION%%";
-    const std::string configuration =
-#ifdef _DEBUG
-        "Debug";
-#else
-        "Release";
-#endif
     const std::string platform_template = "%%PLATFORM%%";
-    const std::string platform =
-#ifdef _ARM64_
-        "ARM64";
-#else
-        "x64";
-#endif
 
     JsonHelper::get(json, "Name", name);
     JsonHelper::handle(json, "Path", [&](std::string p) {

diff --git a/installer/Binary.h b/installer/Binary.h
@@ -24,7 +24,8 @@
 class Binary : public Record {
 public:
     explicit Binary(const nlohmann::json& json,
-        const std::filesystem::path& root_path);
+        const std::filesystem::path& root_path, const std::string& platform,
+        const std::string& configuration);
     ~Binary() = default;
     MSIHANDLE getRecord() const override;
 private:

diff --git a/installer/BinaryTable.cpp b/installer/BinaryTable.cpp
@@ -18,11 +18,12 @@
 #include "BinaryTable.h"
 
 BinaryTable::BinaryTable(const nlohmann::json& json,
-    const std::filesystem::path& path) {
+    const std::filesystem::path& path, const std::string& platform,
+    const std::string& configuration) {
     std::cout << "Loading BinaryTable..." << std::endl;
 
     for (const auto& element : json) {
-        binaries.emplace_back(element, path);
+        binaries.emplace_back(element, path, platform, configuration);
     }
 }
 

diff --git a/installer/BinaryTable.h b/installer/BinaryTable.h
@@ -25,7 +25,8 @@
 class BinaryTable : public Generator<Binary> {
 public:
     explicit BinaryTable(const nlohmann::json& json,
-        const std::filesystem::path& path);
+        const std::filesystem::path& path, const std::string& platform,
+        const std::string& configuration);
     ~BinaryTable() = default;
     bool generate(MSIHANDLE hDatabase) override;
 private:

diff --git a/installer/DirectoryTable.cpp b/installer/DirectoryTable.cpp
@@ -30,8 +30,10 @@
 DirectoryTable::DirectoryTable(const nlohmann::json& json,
     const std::filesystem::path& root_path,
     const std::filesystem::path& output_path,
-    const InstallerStrings& installerStrings) :
-    root_path (root_path), output_path(output_path) {
+    const InstallerStrings& installerStrings, const std::string& platform,
+    const std::string& configuration) :
+    root_path(root_path), output_path(output_path), platform(platform),
+    configuration(configuration) {
     std::cout << "Loading DirectoryTable..." << std::endl;
     for (const auto& directory : json) {
         directories.emplace_back(directory, "", installerStrings);
@@ -51,7 +53,8 @@ bool DirectoryTable::generate(MSIHANDLE hDatabase) {
         std::cerr << "Failed to generate CreateFolderTable" << std::endl;
         return false;
     }
-    if (!FileTable(directories, root_path, output_path).generate(hDatabase)) {
+    if (!FileTable(directories, root_path,
+        output_path, platform, configuration).generate(hDatabase)) {
         std::cerr << "Failed to generate FileTable" << std::endl;
         return false;
     }

diff --git a/installer/DirectoryTable.h b/installer/DirectoryTable.h
@@ -25,11 +25,14 @@ class DirectoryTable : public Generator<Directory> {
     explicit DirectoryTable(const nlohmann::json& json,
         const std::filesystem::path& root_path,
         const std::filesystem::path& output_path,
-        const InstallerStrings& installerStrings);
+        const InstallerStrings& installerStrings, const std::string& platform,
+        const std::string& configuration);
     ~DirectoryTable() = default;
     bool generate(MSIHANDLE hDatabase) override;
 private:
     std::vector<Directory> directories{};
     std::filesystem::path root_path{};
     std::filesystem::path output_path{};
+    std::string platform{};
+    std::string configuration{};
 };
diff --git a/installer/FileTable.cpp b/installer/FileTable.cpp
@@ -105,19 +105,7 @@ size_t FileTable::GetFileSize(const std::string& filePath) {
 std::filesystem::path FileTable::GetAbsolutePath(
     const std::filesystem::path& filePath) {
     const std::string configuration_template = "%%CONFIGURATION%%";
-    const std::string configuration =
-#ifdef _DEBUG
-        "Debug";
-#else
-        "Release";
-#endif
     const std::string platform_template = "%%PLATFORM%%";
-    const std::string platform =
-#ifdef _ARM64_
-        "ARM64";
-#else
-        "x64";
-#endif
 
     auto p = filePath.string();
     auto index = p.find(configuration_template);
@@ -133,8 +121,10 @@ std::filesystem::path FileTable::GetAbsolutePath(
 
 FileTable::FileTable(const std::vector<Directory>& directories,
     const std::filesystem::path& root_path,
-    const std::filesystem::path& output_path) : root_path(root_path),
-    output_path(output_path) {
+    const std::filesystem::path& output_path, const std::string& platform,
+    const std::string& configuration) : root_path(root_path),
+    output_path(output_path), platform(platform),
+    configuration(configuration) {
     int sequence = 0;
     for (const auto& directory : directories) {
         for (const auto& component : directory.getComponents()) {

diff --git a/installer/FileTable.h b/installer/FileTable.h
@@ -25,7 +25,8 @@ class FileTable : public Generator<File> {
 public:
     explicit FileTable(const std::vector<Directory>& directories,
         const std::filesystem::path& root_path,
-        const std::filesystem::path& output_path);
+        const std::filesystem::path& output_path, const std::string& platform,
+        const std::string& configuration);
     ~FileTable() = default;
     bool generate(MSIHANDLE hDatabase) override;
 private:
@@ -37,4 +38,6 @@ class FileTable : public Generator<File> {
     std::vector<File> files{};
     std::filesystem::path root_path{};
     std::filesystem::path output_path{};
+    std::string platform{};
+    std::string configuration{};
 };
diff --git a/installer/Icon.cpp b/installer/Icon.cpp
@@ -20,21 +20,10 @@
 #include "JsonHelper.h"
 
 Icon::Icon(const nlohmann::json& json,
-    const std::filesystem::path& root_path) {
+    const std::filesystem::path& root_path, const std::string& platform,
+    const std::string& configuration) {
     const std::string configuration_template = "%%CONFIGURATION%%";
-    const std::string configuration =
-#ifdef _DEBUG
-        "Debug";
-#else
-        "Release";
-#endif
     const std::string platform_template = "%%PLATFORM%%";
-    const std::string platform =
-#ifdef _ARM64_
-        "ARM64";
-#else
-        "x64";
-#endif
 
     JsonHelper::get(json, "Name", name);
     JsonHelper::handle(json, "Path", [&](std::string p) {

diff --git a/installer/Icon.h b/installer/Icon.h
@@ -23,7 +23,8 @@
 class Icon : public Record {
 public:
     explicit Icon(const nlohmann::json& json,
-        const std::filesystem::path& root_path);
+        const std::filesystem::path& root_path, const std::string& platform,
+        const std::string& configuration);
     ~Icon() = default;
     MSIHANDLE getRecord() const override;
 private:

diff --git a/installer/IconTable.cpp b/installer/IconTable.cpp
@@ -18,11 +18,12 @@
 #include "IconTable.h"
 
 IconTable::IconTable(const nlohmann::json& json,
-    const std::filesystem::path& path) {
+    const std::filesystem::path& path, const std::string& platform,
+    const std::string& configuration) {
     std::cout << "Loading IconTable..." << std::endl;
 
     for (const auto& item : json) {
-        values.emplace_back(item, path);
+        values.emplace_back(item, path, platform, configuration);
     }
 }
 

diff --git a/installer/IconTable.h b/installer/IconTable.h
@@ -23,7 +23,8 @@
 class IconTable : public Generator<Icon> {
 public:
     explicit IconTable(const nlohmann::json& json,
-        const std::filesystem::path& path);
+        const std::filesystem::path& path, const std::string& platform,
+        const std::string& configuration);
     ~IconTable() = default;
     bool generate(MSIHANDLE hDatabase) override;
 private:

diff --git a/installer/Installer.cpp b/installer/Installer.cpp
@@ -44,8 +44,10 @@
 
 #include "Installer.h"
 
-Installer::Installer(const std::filesystem::path& output_path) :
-    output_path(output_path) {
+Installer::Installer(const std::filesystem::path& output_path,
+    const std::string& platform, const std::string& configuration) :
+    output_path(output_path), platform(platform),
+    configuration(configuration) {
 }
 
 bool Installer::load(const std::filesystem::path& json) {
@@ -76,8 +78,8 @@ bool Installer::load_from_json(const nlohmann::json& json,
 {
     try {
         if (JsonHelper::exists(json, "Summary")) {
-            tables["Summary"] =std::make_shared<SummaryInformationTable>(
-                json["Summary"], installer_strings);
+            tables["Summary"] = std::make_shared<SummaryInformationTable>(
+                json["Summary"], installer_strings, platform);
         }
         if (JsonHelper::exists(json, "ActionText")) {
             tables["ActionText"] = std::make_shared<ActionTextTable>(
@@ -99,7 +101,7 @@ bool Installer::load_from_json(const nlohmann::json& json,
         }
         if (JsonHelper::exists(json, "Binary")) {
             tables["Binary"] = std::make_shared<BinaryTable>(
-                json["Binary"], path);
+                json["Binary"], path, platform, configuration);
         }
         if (JsonHelper::exists(json, "Checkbox")) {
             tables["Checkbox"] = std::make_shared<CheckboxTable>(
@@ -115,7 +117,8 @@ bool Installer::load_from_json(const nlohmann::json& json,
         }
         if (JsonHelper::exists(json, "Directory")) {
             tables["Directory"] = std::make_shared<DirectoryTable>(
-                json["Directory"], path, output_path, installer_strings);
+                json["Directory"], path, output_path, installer_strings,
+                platform, configuration);
         }
         if (JsonHelper::exists(json, "Error")) {
             tables["Error"] = std::make_shared<ErrorTable>(json["Error"],
@@ -126,7 +129,7 @@ bool Installer::load_from_json(const nlohmann::json& json,
                 installer_strings);
         }
         if (JsonHelper::exists(json, "Icon")) {
-            tables["Icon"] = std::make_shared<IconTable>(json["Icon"], path);
+            tables["Icon"] = std::make_shared<IconTable>(json["Icon"], path, platform, configuration);
         }
         if (JsonHelper::exists(json, "InstallExecuteSequence")) {
             tables["InstallExecuteSequence"] =

diff --git a/installer/Installer.h b/installer/Installer.h
@@ -27,7 +27,7 @@
 
 class Installer {
 public:
-    explicit Installer(const std::filesystem::path& output_path);
+    explicit Installer(const std::filesystem::path& output_path, const std::string& platform, const std::string& configuration);
     ~Installer() = default;
     bool load(const std::filesystem::path& json);
     bool create_msi(const std::filesystem::path& msi);
@@ -39,4 +39,6 @@ class Installer {
     std::map<std::string, std::shared_ptr<GeneratorTable>> tables{};
     InstallerStrings installer_strings;
     std::filesystem::path output_path{};
+    std::string platform;
+    std::string configuration;
 };
diff --git a/installer/SummaryInformationTable.cpp b/installer/SummaryInformationTable.cpp
@@ -24,7 +24,7 @@
 #include "SummaryInformationTable.h"
 
 SummaryInformationTable::SummaryInformationTable(const nlohmann::json& json,
-    const InstallerStrings& installerStrings)
+    const InstallerStrings& installerStrings, const std::string& platform)
 {
     std::cout << "Loading SummaryInformationTable..." << std::endl;
 
@@ -42,7 +42,15 @@ SummaryInformationTable::SummaryInformationTable(const nlohmann::json& json,
     summary[5] = JsonHelper::get<std::string>(json, "keywords");
     summary[6] =
         JsonHelper::get<std::string>(json, "comments", installerStrings);
-    summary[7] = JsonHelper::get<std::string>(json, "template");
+
+    auto tmplt = JsonHelper::get<std::string>(json, "template");
+    const std::string platform_template = "%%PLATFORM%%";
+    const auto index = tmplt.find(platform_template);
+    if (index != std::string::npos) {
+        tmplt.replace(index, platform_template.size(), platform == "ARM64" ? "Arm64" : platform);
+    }
+
+    summary[7] = tmplt;
     summary[8] = JsonHelper::get<std::string>(json, "lastauthor");
     summary[9] = GuidHelper::generate_guid();
     summary[11] = fileTime;

diff --git a/installer/SummaryInformationTable.h b/installer/SummaryInformationTable.h
@@ -26,7 +26,7 @@
 class SummaryInformationTable : public Generator<std::any> {
 public:
     explicit SummaryInformationTable(const nlohmann::json& json,
-        const InstallerStrings& installerStrings);
+        const InstallerStrings& installerStrings, const std::string& platform);
     ~SummaryInformationTable() = default;
     bool generate(MSIHANDLE hDatabase) override;
 private: