Parcourir la source

Script updates for v-hacd-2.3 on Linux aarch64 (ARM64) (#155)

Signed-off-by: Steve Pham <[email protected]>
Steve Pham il y a 2 ans
Parent
commit
e722261cbf

+ 16 - 2
package-system/v-hacd/build_package_image.py

@@ -10,6 +10,7 @@
 from pathlib import Path
 from tempfile import TemporaryDirectory
 import argparse
+import os
 import shutil
 
 import sys
@@ -22,10 +23,23 @@ def main():
     parser.add_argument(
         '--platform-name',
         dest='platformName',
-        choices=['windows', 'mac', 'linux'],
+        choices=['windows', 'mac', 'linux', 'linux-aarch64'],
         default=VcpkgBuilder.defaultPackagePlatformName(),
     )
     args = parser.parse_args()
+    vcpkg_platform_map = {
+        'windows': 'windows',
+        'android': 'android',
+        'mac': 'mac',
+        'ios': 'ios',
+        'linux': 'linux',
+        'linux-aarch64': 'linux'
+    }
+
+    vcpkg_platform = vcpkg_platform_map[args.platformName]
+
+    if args.platformName == 'linux-aarch64':
+        os.environ['VCPKG_FORCE_SYSTEM_BINARIES'] = '1'
 
     packageSystemDir = Path(__file__).resolve().parents[1]
     packageSourceDir = packageSystemDir / 'v-hacd'
@@ -42,7 +56,7 @@ def main():
             packageName='v-hacd',
             portName='v-hacd',
             vcpkgDir=tempdir,
-            targetPlatform=args.platformName,
+            targetPlatform=vcpkg_platform,
             static=True
         )
         

+ 2 - 0
package_build_list_host_linux-aarch64.json

@@ -31,6 +31,7 @@
         "qt-5.15.2-rev8-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Linux-aarch64 --clean",
         "SPIRVCross-2021.04.29-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/SPIRVCross --platform-name Linux-aarch64 --clean",
         "tiff-4.2.0.15-rev3-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/tiff --platform-name Linux-aarch64 --clean",
+        "v-hacd-2.3-1a49edf-rev1-linux-aarch64": "package-system/v-hacd/build_package_image.py --platform-name linux-aarch64",
         "zlib-1.2.11-rev5-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Linux-aarch64 --clean"
     },
     "build_from_folder": {
@@ -61,6 +62,7 @@
         "qt-5.15.2-rev8-linux-aarch64": "package-system/Qt/temp/qt-linux-aarch64",
         "SPIRVCross-2021.04.29-rev1-linux-aarch64": "package-system/SPIRVCross/temp/SPIRVCross-linux-aarch64",
         "tiff-4.2.0.15-rev3-linux-aarch64": "package-system/tiff/temp/tiff-linux-aarch64",
+        "v-hacd-2.3-1a49edf-rev1-linux-aarch64": "package-system/v-hacd-linux-aarch64",
         "zlib-1.2.11-rev5-linux-aarch64": "package-system/zlib/temp/zlib-linux-aarch64"
     }
 }