Bläddra i källkod

Changed final output package path to have platform suffix

Signed-off-by: Chris Galvan <[email protected]>
Chris Galvan 3 år sedan
förälder
incheckning
87b2f84026

+ 3 - 1
package-system/openimageio-opencolorio/build_openimageio.py

@@ -119,7 +119,6 @@ boost_install_path = temp_folder_path / 'boost_install'
 oiio_install_path = temp_folder_path / 'oiio_install'
 libjpegturbo_install_path = temp_folder_path / 'libjpegturbo_install'
 test_script_folder = script_folder / 'test'
-final_package_image_root = temp_folder_path / 'package'
 
 sys.path.insert(1, str(general_scripts_path.absolute().resolve()) )
 
@@ -193,6 +192,9 @@ else:
     lib_suffix = '.a'
     lib_prefix = 'lib'
 
+# Determine our final package output path now since we
+# use the platform as a suffix
+final_package_image_root = temp_folder_path / f'package-{args.platform}'
 
 print(f"OpenImageIO / OpenColorIO Build Script")
 print(f"Script folder : {script_folder.relative_to(repo_root_path)}")

+ 1 - 1
package_build_list_host_darwin.json

@@ -74,7 +74,7 @@
         "OpenSSL-1.1.1o-rev1-mac": "package-system/OpenSSL/temp/OpenSSL-mac",
         "OpenSSL-1.1.1o-rev1-ios": "package-system/OpenSSL/temp/OpenSSL-ios",
         "OpenEXR-3.1.3-rev4-mac": "package-system/OpenEXR/temp/OpenEXR-mac",
-        "openimageio-opencolorio-2.3.12.0-mac": "package-system/openimageio-opencolorio-mac",
+        "openimageio-opencolorio-2.3.12.0-mac": "package-system/openimageio-opencolorio/temp/package-darwin",
         "tiff-4.2.0.15-rev3-mac": "package-system/tiff-mac",
         "tiff-4.2.0.15-rev3-ios": "package-system/tiff-ios",
         "python-3.7.12-rev3-darwin": "package-system/python/darwin_x64/package",

+ 1 - 1
package_build_list_host_linux.json

@@ -56,7 +56,7 @@
         "pyside2-5.15.2-rev2-linux": "package-system/pyside2-linux",
         "OpenEXR-3.1.3-rev4-linux": "package-system/OpenEXR/temp/OpenEXR-linux",
         "OpenXR-1.0.22-rev2-linux": "package-system/OpenXR-linux",
-        "openimageio-opencolorio-2.3.12.0-linux": "package-system/openimageio-opencolorio-linux",
+        "openimageio-opencolorio-2.3.12.0-linux": "package-system/openimageio-opencolorio/temp/package-linux",
         "SPIRVCross-2021.04.29-rev1-linux": "package-system/SPIRVCross-linux",
         "squish-ccr-deb557d-rev1-linux": "package-system/squish-ccr-linux",
         "astc-encoder-3.2-rev2-linux": "package-system/astc-encoder-linux",

+ 1 - 2
package_build_list_host_windows.json

@@ -100,8 +100,7 @@
     "NvCloth-v1.1.6-4-gd243404-pr58-rev1-windows": "package-system/NvCloth-windows",
     "NvCloth-v1.1.6-4-gd243404-pr58-rev1-android": "package-system/NvCloth-android",
     "OpenEXR-3.1.3-rev4-windows": "package-system/OpenEXR/temp/OpenEXR-windows",
-    "openimageio-2.1.16.0-rev2-windows": "package-system/openimageio-windows",
-    "openimageio-opencolorio-2.3.12.0-windows": "package-system/openimageio-opencolorio-windows",
+    "openimageio-opencolorio-2.3.12.0-windows": "package-system/openimageio-opencolorio/temp/package-windows",
     "OpenMesh-8.1-rev3-windows": "package-system/OpenMesh-windows",
     "OpenSSL-1.1.1o-rev2-android": "package-system/OpenSSL/temp/OpenSSL-android",
     "OpenSSL-1.1.1o-rev1-windows": "package-system/OpenSSL/temp/OpenSSL-windows",