ソースを参照

Update SQLite3 for Mac to fix version mismatch (#90)

* Update SQLite3 for Mac to fix version mismatch
* Added extra logic to make sure the target package folder is clean before construction

Signed-off-by: spham <[email protected]>
Steve Pham 3 年 前
コミット
104131b55f

+ 3 - 2
Scripts/extras/pull_and_build_from_git.py

@@ -847,8 +847,9 @@ class BuildInfo(object):
             delete_folder(self.package_install_root)
 
         # Prepare the target package folder
-        if not self.build_install_folder.is_dir():
-            self.build_install_folder.mkdir(parents=True)
+        if self.build_install_folder.is_dir():
+            shutil.rmtree(str(self.build_install_folder))
+        self.build_install_folder.mkdir(parents=True)
 
         prebuilt_source_path = (self.base_folder.resolve() / self.prebuilt_source).resolve()
         target_base_package_path = self.build_install_folder.resolve()

+ 3 - 1
package-system/sqlite/build_config.json

@@ -2,7 +2,6 @@
    "git_url":"https://github.com/sqlite/sqlite.git",
    "git_tag":"version-3.37.2",
    "package_name":"SQLite",
-   "package_version":"3.37.2-rev1",
    "package_url":"https://www.sqlite.org",
    "package_license":"CUSTOM",
    "package_license_file":"copyright.txt",
@@ -14,6 +13,7 @@
    "Platforms":{
       "Windows":{
          "Windows":{
+            "package_version":"3.37.2-rev1",
             "custom_build_cmd": [
                "build_windows.cmd"
             ],
@@ -24,6 +24,7 @@
       },
       "Darwin":{
          "Mac":{
+            "package_version":"3.37.2-rev2",
             "custom_build_cmd": [
                "./build_unix_like.sh"
             ],
@@ -34,6 +35,7 @@
       },
       "Linux":{
          "Linux":{
+            "package_version":"3.37.2-rev1",
             "custom_build_cmd": [
                "./build_unix_like.sh"
             ],

+ 2 - 2
package_build_list_host_darwin.json

@@ -32,7 +32,7 @@
         "poly2tri-7f0487a-rev1-mac": "package-system/poly2tri/build_package_image.py --platform-name mac",
         "v-hacd-2.3-1a49edf-rev1-mac": "package-system/v-hacd/build_package_image.py --platform-name mac",
         "SPIRVCross-2021.04.29-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/SPIRVCross --platform-name Mac --package-root ../../package-system --clean",
-        "SQLite-3.37.2-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/sqlite --platform-name Mac --package-root ../../package-system --clean",
+        "SQLite-3.37.2-rev2-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/sqlite --platform-name Mac --package-root ../../package-system --clean",
         "squish-ccr-deb557d-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/squish-ccr --platform-name Mac --package-root ../../package-system --clean",
         "astc-encoder-3.2-rev5-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/astc-encoder --platform-name Mac --package-root ../../package-system --clean",
         "DirectXShaderCompilerDxc-1.6.2104-o3de-rev3-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/DirectXShaderCompiler --platform-name Mac --package-root ../../package-system --clean",
@@ -91,7 +91,7 @@
         "astc-encoder-3.2-rev5-mac": "package-system/astc-encoder-mac",
         "DirectXShaderCompilerDxc-1.6.2104-o3de-rev3-mac": "package-system/DirectXShaderCompilerDxc-mac",
         "azslc-1.7.35-rev1-mac": "package-system/azslc-mac",
-        "SQLite-3.37.2-rev1-mac": "package-system/SQLite-mac",
+        "SQLite-3.37.2-rev2-mac": "package-system/SQLite-mac",
         "xxhash-0.7.4-rev1-multiplatform": "package-system/xxhash-multiplatform",
         "qt-5.15.2-rev5-mac": "package-system/qt-mac",
         "zlib-1.2.11-rev5-mac": "package-system/zlib-mac",