Fix lz4 debug (#39)

 * Updates lz4 to properly have a d postfix in debug
 * Disables telemetry on vcpkgbuilder.
 * the pinned commit hash that lz4 was using from vcpkg is actually crashing on windows (a bad build).  Updated to a newer one - same actual version of lz4.
 * Fixes a problem with the Findlz4.cmake script that missed iOS



Signed-off-by: lawsonamzn <[email protected]>

Scripts/builders/vcpkgbuilder.py

@@ -137,12 +137,12 @@ class VcpkgBuilder(object):
     def bootstrap(self):
         if platform.system() == 'Windows':
             subprocess.check_call(
-                ['powershell', '-NoProfile', '-ExecutionPolicy', 'Bypass', 'scripts/bootstrap.ps1',],
+                ['powershell', '-NoProfile', '-ExecutionPolicy', 'Bypass', 'scripts/bootstrap.ps1', '-disableMetrics'],
                 cwd=self.vcpkgDir,
             )
         else:
             subprocess.check_call(
-                [self.vcpkgDir / 'bootstrap-vcpkg.sh'],
+                [self.vcpkgDir / 'bootstrap-vcpkg.sh', '-disableMetrics'],
                 cwd=self.vcpkgDir,
             )
 

package-system/.gitignore

@@ -17,3 +17,4 @@ v-hacd-*
 mikkelsen-*
 azslc-*
 zlib-*
+lz4-*

package-system/lz4/Findlz4.cmake

@@ -15,20 +15,8 @@ endif()
 
 set(${LIB_NAME}_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/${LIB_NAME}/${LIB_NAME}/include)
 set(${LIB_NAME}_LIBS_DIR ${CMAKE_CURRENT_LIST_DIR}/${LIB_NAME}/${LIB_NAME}/lib)
-
-if (${PAL_PLATFORM_NAME} STREQUAL "Windows")
-    set(${LIB_NAME}_LIBRARY_DEBUG   ${${LIB_NAME}_LIBS_DIR}/../debug/lib/lz4d.lib)
-    set(${LIB_NAME}_LIBRARY_RELEASE ${${LIB_NAME}_LIBS_DIR}/lz4.lib)
-elseif(${PAL_PLATFORM_NAME} STREQUAL "Android")
-    set(${LIB_NAME}_LIBRARY_DEBUG   ${${LIB_NAME}_LIBS_DIR}/../debug/lib/liblz4d.a)
-    set(${LIB_NAME}_LIBRARY_RELEASE ${${LIB_NAME}_LIBS_DIR}/liblz4.a)
-elseif (${PAL_PLATFORM_NAME} STREQUAL "Mac")
-    set(${LIB_NAME}_LIBRARY_DEBUG   ${${LIB_NAME}_LIBS_DIR}/../debug/lib/liblz4.a)
-    set(${LIB_NAME}_LIBRARY_RELEASE ${${LIB_NAME}_LIBS_DIR}/liblz4.a)
-elseif (${PAL_PLATFORM_NAME} STREQUAL "Linux")
-    set(${LIB_NAME}_LIBRARY_DEBUG   ${${LIB_NAME}_LIBS_DIR}/../debug/lib/liblz4.a)
-    set(${LIB_NAME}_LIBRARY_RELEASE ${${LIB_NAME}_LIBS_DIR}/liblz4.a)
-endif()
+set(${LIB_NAME}_LIBRARY_DEBUG   ${${LIB_NAME}_LIBS_DIR}/../debug/lib/${CMAKE_STATIC_LIBRARY_PREFIX}lz4d${CMAKE_STATIC_LIBRARY_SUFFIX})
+set(${LIB_NAME}_LIBRARY_RELEASE ${${LIB_NAME}_LIBS_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}lz4${CMAKE_STATIC_LIBRARY_SUFFIX})
 
 set(${LIB_NAME}_LIBRARY
     "$<$<CONFIG:profile>:${${LIB_NAME}_LIBRARY_RELEASE}>"
@@ -42,4 +30,4 @@ target_link_libraries(
     ${TARGET_WITH_NAMESPACE}
     INTERFACE ${${LIB_NAME}_LIBRARY})
 
-set(${LIB_NAME}_FOUND True)
+set(${LIB_NAME}_FOUND True)

package-system/lz4/build_package_image.py

@@ -46,7 +46,7 @@ def main():
             static=True
         )
         
-        builder.cloneVcpkg('751fc199af8d33eb300af5edbd9e3b77c48f0bca')
+        builder.cloneVcpkg('09019cbc9abcb728217c4c99625932defe1b781c')
         builder.bootstrap()
         builder.build()
         
@@ -63,7 +63,7 @@ def main():
         builder.writePackageInfoFile(
             outputDir,
             settings={
-                'PackageName': f'lz4-1.9.3-vcpkg-rev1-{args.platformName}',
+                'PackageName': f'lz4-1.9.3-vcpkg-rev4-{args.platformName}',
                 'URL': 'https://github.com/lz4/lz4',
                 'License': 'BSD-2-Clause',
                 'LicenseFile': 'lz4/LICENSE'

package_build_list_host_darwin.json

@@ -40,8 +40,8 @@
         "mikkelsen-1.0.0.4-ios": "package-system/mikkelsen/build_package_image.py --platform ios",
         "zlib-1.2.11-rev2-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Mac --package-root ../../package-system --clean",
         "zlib-1.2.11-rev2-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name iOS --package-root ../../package-system --clean",
-        "lz4-1.9.3-vcpkg-rev1-mac": "package-system/lz4/build_package_image.py --platform-name mac",
-        "lz4-1.9.3-vcpkg-rev1-ios": "package-system/lz4/build_package_image.py --platform-name ios"
+        "lz4-1.9.3-vcpkg-rev4-mac": "package-system/lz4/build_package_image.py --platform-name mac",
+        "lz4-1.9.3-vcpkg-rev4-ios": "package-system/lz4/build_package_image.py --platform-name ios"
     },
     "build_from_folder": {
         "AWSNativeSDK-1.7.167-rev5-mac": "package-system/AWSNativeSDK-mac",
@@ -85,7 +85,7 @@
         "qt-5.15.2-rev5-mac": "package-system/qt-mac",
         "zlib-1.2.11-rev2-mac": "package-system/zlib-mac",
         "zlib-1.2.11-rev2-ios": "package-system/zlib-ios",
-        "lz4-1.9.3-vcpkg-rev1-mac": "package-system/lz4-mac",
-        "lz4-1.9.3-vcpkg-rev1-ios": "package-system/lz4-ios"
+        "lz4-1.9.3-vcpkg-rev4-mac": "package-system/lz4-mac",
+        "lz4-1.9.3-vcpkg-rev4-ios": "package-system/lz4-ios"
     }
 }

package_build_list_host_linux.json

@@ -28,7 +28,7 @@
         "python-3.7.10-rev2-linux": "package-system/python/build_package_image.py",
         "mikkelsen-1.0.0.4-linux": "package-system/mikkelsen/build_package_image.py",
         "zlib-1.2.11-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Linux --package-root ../../package-system --clean",
-        "lz4-1.9.3-vcpkg-rev1-linux": "package-system/lz4/build_package_image.py --platform-name linux"
+        "lz4-1.9.3-vcpkg-rev4-linux": "package-system/lz4/build_package_image.py --platform-name linux"
     },
     "build_from_folder" : {
         "AWSGameLiftServerSDK-3.4.1-rev1-linux": "package-system/AWSGameLiftServerSDK/linux",
@@ -60,6 +60,6 @@
         "xxhash-0.7.4-rev1-multiplatform": "package-system/xxhash-multiplatform",
         "qt-5.15.2-rev5-linux": "package-system/qt-linux",
         "zlib-1.2.11-rev2-linux": "package-system/zlib-linux",
-        "lz4-1.9.3-vcpkg-rev1-linux": "package-system/lz4-linux"
+        "lz4-1.9.3-vcpkg-rev4-linux": "package-system/lz4-linux"
     }
 }

package_build_list_host_windows.json

@@ -42,8 +42,8 @@
         "mikkelsen-1.0.0.4-android": "package-system/mikkelsen/build_package_image.py --platform android",
         "zlib-1.2.11-rev2-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Windows --package-root ../../package-system --clean",
         "zlib-1.2.11-rev2-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Android --package-root ../../package-system --clean",
-        "lz4-1.9.3-vcpkg-rev1-windows": "package-system/lz4/build_package_image.py --platform-name windows",
-        "lz4-1.9.3-vcpkg-rev1-android": "package-system/lz4/build_package_image.py --platform-name android"
+        "lz4-1.9.3-vcpkg-rev4-windows": "package-system/lz4/build_package_image.py --platform-name windows",
+        "lz4-1.9.3-vcpkg-rev4-android": "package-system/lz4/build_package_image.py --platform-name android"
       },
   "build_from_folder": {
     "AWSGameLiftServerSDK-3.4.1-rev1-windows" : "package-system/AWSGameLiftServerSDK/windows",
@@ -91,7 +91,6 @@
     "mcpp-2.7.2_az.1-rev1-windows": "package-system/mcpp-windows",
     "cityhash-1.1-multiplatform": "package-system/cityhash-multiplatform",
     "civetweb-1.8-rev1-windows": "package-system/civetweb-windows",
-    "lz4-r128-multiplatform": "package-system/lz4-multiplatform",
     "expat-2.1.0-multiplatform": "package-system/expat-multiplatform",
     "poly2tri-7f0487a-rev1-windows": "package-system/poly2tri-windows",
     "openimageio-2.1.16.0-rev2-windows": "package-system/openimageio-windows",
@@ -110,7 +109,7 @@
     "Wwise-2021.1.0.7575-rev1-multiplatform": "package-system/Wwise-multiplatform",
     "zlib-1.2.11-rev2-android": "package-system/zlib-android",
     "zlib-1.2.11-rev2-windows": "package-system/zlib-windows",
-    "lz4-1.9.3-vcpkg-rev1-windows": "package-system/lz4-windows",
-    "lz4-1.9.3-vcpkg-rev1-android": "package-system/lz4-android"
+    "lz4-1.9.3-vcpkg-rev4-windows": "package-system/lz4-windows",
+    "lz4-1.9.3-vcpkg-rev4-android": "package-system/lz4-android"
   }
 }