Explorar el Código

Script updates for poly2tri on Linux aarch64 (ARM64) (#150)

Signed-off-by: Steve Pham <[email protected]>
Steve Pham hace 2 años
padre
commit
1119082c57

+ 15 - 2
package-system/poly2tri/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,11 +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 / 'poly2tri'
     outputDir = packageSystemDir / f'poly2tri-{args.platformName}'
@@ -47,7 +60,7 @@ def main():
             packageName='poly2tri',
             portName='poly2tri',
             vcpkgDir=tempdir,
-            targetPlatform=args.platformName,
+            targetPlatform=vcpkg_platform,
             static=True
         )
         

+ 3 - 11
package_build_list_host_linux-aarch64.json

@@ -4,15 +4,6 @@
     "comment3" : "build_from_folder is package name --> folder containing built image of package",
     "comment4" : "Note:  Build from source occurs before build_from_folder",
     "build_from_source": {
-<<<<<<< HEAD
-	"freetype-2.11.1-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name Linux-aarch64 --clean",
-        "lz4-1.9.3-vcpkg-rev4-linux-aarch64": "package-system/lz4/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": {
-	"freetype-2.11.1-rev1-linux-aarch64": "package-system/freetype/temp/freetype-linux-aarch64",
-        "lz4-1.9.3-vcpkg-rev4-linux-aarch64": "package-system/lz4-linux-aarch64",
-=======
         "AWSGameLiftServerSDK-3.4.2-rev1-linux-aarch64": "package-system/AWSGameLiftServerSDK/build_package_image.py --platform-name linux-aarch64",
         "AwsIotDeviceSdkCpp-1.15.2-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AwsIotDeviceSdkCpp --platform-name Linux-aarch64 --clean",
         "AWSNativeSDK-1.9.50-rev2-linux-openssl-1-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Linux-OpenSSL-1-aarch64 --clean",
@@ -27,6 +18,7 @@
         "OpenEXR-3.1.3-rev4-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/OpenEXR --platform-name Linux-aarch64 --clean",
         "OpenXR-1.0.22-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/OpenXR --platform-name Linux-aarch64 --clean",
         "png-1.6.37-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/libpng --platform-name Linux-aarch64 --clean",
+	"poly2tri-7f0487a-rev1-linux-aarch64": "package-system/poly2tri/build_package_image.py --platform-name linux-aarch64",
         "tiff-4.2.0.15-rev3-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/tiff --platform-name Linux-aarch64 --clean",
         "zlib-1.2.11-rev5-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Linux-aarch64 --clean"
     },
@@ -45,8 +37,8 @@
         "OpenEXR-3.1.3-rev4-linux-aarch64": "package-system/OpenEXR/temp/OpenEXR-linux-aarch64",
         "OpenXR-1.0.22-rev2-linux-aarch64": "package-system/OpenXR/temp/OpenXR-linux-aarch64",
         "png-1.6.37-rev2-linux-aarch64":  "package-system/libpng/temp/png-linux-aarch64",
-        "tiff-4.2.0.15-rev3-linux-aarch64": "package-system/tiff/temp/tiff-linux-aarch64",
->>>>>>> 047cf03a07a0ef0f19e00763d1b17ab0f2907f25
+        "poly2tri-7f0487a-rev1-linux-aarch64": "package-system/poly2tri-linux-aarch64",
+	"tiff-4.2.0.15-rev3-linux-aarch64": "package-system/tiff/temp/tiff-linux-aarch64",
         "zlib-1.2.11-rev5-linux-aarch64": "package-system/zlib/temp/zlib-linux-aarch64"
     }
 }