Explorar el Código

Update lua to 5.4.4 (fixes #7267) (#88)

Signed-off-by: lawsonamzn <[email protected]>
Nicholas Lawson hace 3 años
padre
commit
b9359d9b81

+ 5 - 1
SPDX-Licenses.csv

@@ -21,7 +21,11 @@ ilmbase-2.3.0-rev4-multiplatform,https://github.com/AcademySoftwareFoundation/op
 ISPCTexComp-36b80aa-rev1-windows,https://github.com/GameTechDev/ISPCTextureCompressor,MIT,license.txt
 ISPCTexComp-36b80aa-rev1-windows,https://github.com/GameTechDev/ISPCTextureCompressor,MIT,license.txt
 libpng-1.6.37-rev1-windows,http://www.libpng.org/,libpng-2.0,libpng/LICENSE
 libpng-1.6.37-rev1-windows,http://www.libpng.org/,libpng-2.0,libpng/LICENSE
 libsamplerate-0.2.1-rev2-windows,http://libsndfile.github.io/libsamplerate/,BSD-2-Clause,libsamplerate/COPYING
 libsamplerate-0.2.1-rev2-windows,http://libsndfile.github.io/libsamplerate/,BSD-2-Clause,libsamplerate/COPYING
-Lua-5.3.5-rev5-windows,https://github.com/lua/lua,MIT,Lua/LICENSE.txt
+Lua-5.4.4-rev1-windows,https://github.com/lua/lua,MIT,Lua/LICENSE.txt
+Lua-5.4.4-rev1-ios,https://github.com/lua/lua,MIT,Lua/LICENSE.txt
+Lua-5.4.4-rev1-mac,https://github.com/lua/lua,MIT,Lua/LICENSE.txt
+Lua-5.4.4-rev1-linux,https://github.com/lua/lua,MIT,Lua/LICENSE.txt
+Lua-5.4.4-rev1-ios,https://github.com/lua/lua,MIT,Lua/LICENSE.txt
 lz4-1.9.3-vcpkg-rev4-windows,https://github.com/lz4/lz4,BSD-2-Clause,lz4/LICENSE
 lz4-1.9.3-vcpkg-rev4-windows,https://github.com/lz4/lz4,BSD-2-Clause,lz4/LICENSE
 mcpp-2.7.2_az.2-rev1-windows,https://sourceforge.net/projects/mcpp/files/mcpp/V.2.7.2,custom,mcpp/LICENSE
 mcpp-2.7.2_az.2-rev1-windows,https://sourceforge.net/projects/mcpp/files/mcpp/V.2.7.2,custom,mcpp/LICENSE
 md5-2.0-multiplatform,https://www.fourmilab.ch/md5/,Public domain,md5/rfc1321.txt
 md5-2.0-multiplatform,https://www.fourmilab.ch/md5/,Public domain,md5/rfc1321.txt

+ 25 - 1
SPDX-Licenses.json

@@ -132,7 +132,31 @@
         "LicenseFile": "libsamplerate/COPYING"
         "LicenseFile": "libsamplerate/COPYING"
     },
     },
     {
     {
-        "PackageName": "Lua-5.3.5-rev5-windows",
+        "PackageName": "Lua-5.4.4-rev1-windows",
+        "URL": "https://github.com/lua/lua",
+        "License": "MIT",
+        "LicenseFile": "Lua/LICENSE.txt"
+    },
+    {
+        "PackageName": "Lua-5.4.4-rev1-linux",
+        "URL": "https://github.com/lua/lua",
+        "License": "MIT",
+        "LicenseFile": "Lua/LICENSE.txt"
+    },
+    {
+        "PackageName": "Lua-5.4.4-rev1-android",
+        "URL": "https://github.com/lua/lua",
+        "License": "MIT",
+        "LicenseFile": "Lua/LICENSE.txt"
+    },
+    {
+        "PackageName": "Lua-5.4.4-rev1-ios",
+        "URL": "https://github.com/lua/lua",
+        "License": "MIT",
+        "LicenseFile": "Lua/LICENSE.txt"
+    },
+    {
+        "PackageName": "Lua-5.4.4-rev1-mac",
         "URL": "https://github.com/lua/lua",
         "URL": "https://github.com/lua/lua",
         "License": "MIT",
         "License": "MIT",
         "LicenseFile": "Lua/LICENSE.txt"
         "LicenseFile": "Lua/LICENSE.txt"

+ 2 - 1
Scripts/extras/pull_and_build_from_git.py

@@ -237,6 +237,7 @@ class PackageInfo(object):
         self.cmake_src_subfolder = _get_value("cmake_src_subfolder", required=False)
         self.cmake_src_subfolder = _get_value("cmake_src_subfolder", required=False)
         self.cmake_generate_args_common = _get_value("cmake_generate_args_common", required=False)
         self.cmake_generate_args_common = _get_value("cmake_generate_args_common", required=False)
         self.cmake_build_args_common = _get_value("cmake_build_args_common", required=False)
         self.cmake_build_args_common = _get_value("cmake_build_args_common", required=False)
+        self.build_configs = _get_value("build_configs", required=False, default=['Debug', 'Release'])
         if self.cmake_find_template and self.cmake_find_source:
         if self.cmake_find_template and self.cmake_find_source:
             raise BuildError("Bad build config file. 'cmake_find_template' and 'cmake_find_source' cannot both be set in the configuration.")            
             raise BuildError("Bad build config file. 'cmake_find_template' and 'cmake_find_source' cannot both be set in the configuration.")            
         if not self.cmake_find_template and not self.cmake_find_source:
         if not self.cmake_find_template and not self.cmake_find_source:
@@ -399,7 +400,7 @@ class BuildInfo(object):
         self.clean_build = clean_build
         self.clean_build = clean_build
         self.cmake_find_template = cmake_find_template
         self.cmake_find_template = cmake_find_template
         self.cmake_find_source = cmake_find_source
         self.cmake_find_source = cmake_find_source
-        self.build_configs = platform_config.get('build_configs', ['Debug', 'Release'])
+        self.build_configs = platform_config.get('build_configs', package_info.build_configs)
         self.prebuilt_source = prebuilt_source
         self.prebuilt_source = prebuilt_source
         self.prebuilt_args = prebuilt_args
         self.prebuilt_args = prebuilt_args
         self.skip_git = skip_git
         self.skip_git = skip_git

+ 10 - 86
package-system/Lua/CMakeLists.txt

@@ -6,97 +6,21 @@
 #
 #
 #
 #
 
 
-# CMake definition for Lua 5.3.5
-
 cmake_minimum_required(VERSION 3.17)
 cmake_minimum_required(VERSION 3.17)
 
 
-PROJECT ( lua )
-
-# Headers
-SET(HDR_LIBLUA
-    lapi.h
-    lauxlib.h
-    lcode.h
-    lctype.h
-    ldebug.h
-    ldo.h
-    lfunc.h
-    lgc.h
-    llex.h
-    llimits.h
-    lmem.h
-    lobject.h
-    lopcodes.h
-    lparser.h
-    lprefix.h
-    lstate.h
-    lstring.h
-    ltable.h
-    ltests.h
-    ltm.h
-    lua.h
-    luaconf.h
-    lualib.h
-    lundump.h
-    lvm.h
-    lzio.h
-)
-
-# Build Libraries
-SET(SRC_LIBLUA
-    lapi.c
-    lauxlib.c
-    lbaselib.c
-    lbitlib.c
-    lcode.c
-    lcorolib.c
-    lctype.c
-    ldblib.c
-    ldebug.c
-    ldo.c
-    ldump.c
-    lfunc.c
-    lgc.c
-    linit.c
-    liolib.c
-    llex.c
-    lmathlib.c
-    lmem.c
-    loadlib.c
-    lobject.c
-    lopcodes.c
-    loslib.c
-    lparser.c
-    lstate.c
-    lstring.c
-    lstrlib.c
-    ltable.c
-    ltablib.c
-    ltests.c
-    ltm.c
-    lundump.c
-    lutf8lib.c
-    lvm.c
-    lzio.c
-)
-
-LIST(APPEND SRC_LIBLUA ${HDR_LIBLUA})
+project(lua C)
 
 
-#Library
-ADD_LIBRARY ( lualib STATIC ${SRC_LIBLUA} )
+file(GLOB_RECURSE HDR_LIBLUA *.h)
 
 
-TARGET_LINK_LIBRARIES (lualib)
+ADD_LIBRARY ( lualib STATIC onelua.c )
 
 
-target_include_directories( lualib PUBLIC include/ )
+# setting MAKE_LIB will make it create the static library.
+# you can alternatively not define it and it will by default make the interpreter executable.
+target_compile_definitions( lualib PRIVATE 
+            MAKE_LIB)
 
 
 set_target_properties(lualib
 set_target_properties(lualib
     PROPERTIES
     PROPERTIES
-        ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/lib/debug/"
-        ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/lib/release/"
-        LIBRARY_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/lib/debug/"
-        LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/lib/release/"
-        RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/bin/debug/"
-        RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/bin/release/"
         PUBLIC_HEADER "${HDR_LIBLUA}"
         PUBLIC_HEADER "${HDR_LIBLUA}"
 )
 )
 
 
@@ -106,9 +30,9 @@ install(TARGETS lualib
         PUBLIC_HEADER
         PUBLIC_HEADER
             DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/Lua
             DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/Lua
         LIBRARY
         LIBRARY
-            DESTINATION ${CMAKE_INSTALL_LIBDIR}/$<$<CONFIG:Debug>:debug>$<$<CONFIG:Release>:release>
+            DESTINATION ${CMAKE_INSTALL_LIBDIR}/release
         RUNTIME
         RUNTIME
-            DESTINATION ${CMAKE_INSTALL_BINDIR}/$<$<CONFIG:Debug>:debug>$<$<CONFIG:Release>:release>
+            DESTINATION ${CMAKE_INSTALL_BINDIR}/release
         ARCHIVE
         ARCHIVE
-            DESTINATION ${CMAKE_INSTALL_LIBDIR}/$<$<CONFIG:Debug>:debug>$<$<CONFIG:Release>:release>
+            DESTINATION ${CMAKE_INSTALL_LIBDIR}/release
 )
 )

+ 18 - 30
package-system/Lua/build_config.json

@@ -1,83 +1,71 @@
 {
 {
    "git_url":"https://github.com/lua/lua.git",
    "git_url":"https://github.com/lua/lua.git",
-   "git_tag":"v5.3.5",
+   "git_tag":"v5.4.4",
    "package_name":"Lua",
    "package_name":"Lua",
-   "package_version":"5.3.5-rev7",
+   "package_version":"5.4.4-rev1",
    "package_url":"https://github.com/lua/lua",
    "package_url":"https://github.com/lua/lua",
    "package_license":"MIT",
    "package_license":"MIT",
    "package_license_file":"LICENSE.txt",
    "package_license_file":"LICENSE.txt",
    "cmake_find_source":"FindLua.cmake",
    "cmake_find_source":"FindLua.cmake",
    "cmake_find_target":"FindLua.cmake",
    "cmake_find_target":"FindLua.cmake",
-   "patch_file":"lua_5.3.5_amzn.patch",
+   "patch_file":"lua_5.4.4_o3de.patch",
    "additional_src_files":[
    "additional_src_files":[
       "CMakeLists.txt",
       "CMakeLists.txt",
       "LICENSE.txt"
       "LICENSE.txt"
    ],
    ],
+   "cmake_build_args_common": [
+      "--parallel"
+   ],
+  "build_configs":[
+      "Release"
+   ],
    "Platforms":{
    "Platforms":{
       "Windows":{
       "Windows":{
          "Windows":{
          "Windows":{
-            "build_configs":[
-               "Release"
-            ],
             "cmake_generate_args":[
             "cmake_generate_args":[
                "-G",
                "-G",
-               "\"Visual Studio 15 Win64\"",
+               "\"Visual Studio 16 2019\"",
                "-DCMAKE_C_FLAGS=\"-D_CRT_SECURE_NO_WARNINGS\""
                "-DCMAKE_C_FLAGS=\"-D_CRT_SECURE_NO_WARNINGS\""
             ]
             ]
          },
          },
          "Android":{
          "Android":{
-            "build_configs":[
-               "Release"
-            ],
             "cmake_generate_args":[
             "cmake_generate_args":[
                "-G",
                "-G",
                "Ninja",
                "Ninja",
-               "-DCMAKE_TOOLCHAIN_FILE=%LY_ANDROID_NDK_ROOT%\\build\\cmake\\android.toolchain.cmake",
-               "-DANDROID_ABI=arm64-v8a",
-               "-DCMAKE_C_FLAGS=\"-fPIC -O2 -Wall -Wextra -DLUA_COMPAT_5_2\"",
+               "-DCMAKE_TOOLCHAIN_FILE=../../../../Scripts/cmake/Platform/Android/Toolchain_android.cmake",
+               "-DCMAKE_C_FLAGS=\"-fPIC -O2 -Wall -Wextra\"",
                "-DCMAKE_BUILD_TYPE=Release"
                "-DCMAKE_BUILD_TYPE=Release"
             ]
             ]
          }
          }
       },
       },
       "Darwin":{
       "Darwin":{
          "Mac":{
          "Mac":{
-            "build_configs":[
-               "Release"
-            ],
             "cmake_generate_args":[
             "cmake_generate_args":[
                "-G",
                "-G",
                "Xcode",
                "Xcode",
-               "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.12",
-               "-DCMAKE_OSX_ARCHITECTURES=x86_64",
-               "-DCMAKE_C_FLAGS=\"-fPIC -O2 -Wall -Wextra -DLUA_COMPAT_5_2 -DLUA_USE_MACOSX\""
+               "-DCMAKE_TOOLCHAIN_FILE=../../../../Scripts/cmake/Platform/Mac/Toolchain_mac.cmake",
+               "-DCMAKE_C_FLAGS=\"-fPIC -O2 -Wall -Wextra -DLUA_USE_MACOSX\""
             ]
             ]
          },
          },
          "iOS":{
          "iOS":{
-            "build_configs":[
-               "Release"
-            ],
             "custom_cmake_install":true,
             "custom_cmake_install":true,
             "cmake_generate_args":[
             "cmake_generate_args":[
                "-G",
                "-G",
                "Xcode",
                "Xcode",
-               "-DCMAKE_SYSTEM_NAME=iOS",
-               "-DCMAKE_OSX_ARCHITECTURES=arm64",
                "-DCMAKE_THREAD_LIBS_INIT=-pthread",
                "-DCMAKE_THREAD_LIBS_INIT=-pthread",
-               "-DCMAKE_OSX_DEPLOYMENT_TARGET=13.0",
-               "-DCMAKE_C_FLAGS=\"-fPIC -O2 -Wall -Wextra -DLUA_COMPAT_5_2\""
+               "-DCMAKE_C_FLAGS=\"-fPIC -O2 -Wall -Wextra\"",
+               "-DCMAKE_MACOSX_BUNDLE=OFF",
+               "-DCMAKE_TOOLCHAIN_FILE=../../../../Scripts/cmake/Platform/iOS/Toolchain_ios.cmake"
             ]
             ]
          }
          }
       },
       },
       "Linux":{
       "Linux":{
          "Linux":{
          "Linux":{
-            "build_configs":[
-               "Release"
-            ],
             "cmake_generate_args":[
             "cmake_generate_args":[
                "-G",
                "-G",
                "Unix\\ Makefiles",
                "Unix\\ Makefiles",
                "-DCMAKE_C_COMPILER=gcc",
                "-DCMAKE_C_COMPILER=gcc",
-               "-DCMAKE_C_FLAGS=\"-fPIC -O2 -Wall -Wextra -DLUA_COMPAT_5_2 -DLUA_USE_LINUX\"",
+               "-DCMAKE_C_FLAGS=\"-fPIC -O2 -Wall -Wextra -DLUA_USE_LINUX\"",
                "-DCMAKE_BUILD_TYPE=Release"
                "-DCMAKE_BUILD_TYPE=Release"
             ]
             ]
          }
          }

+ 21 - 22
package-system/Lua/lua_5.3.5_amzn.patch → package-system/Lua/lua_5.4.4_o3de.patch

@@ -1,8 +1,8 @@
-Only in src-amzn\: LICENSE
-diff -ru src\/loadlib.c src-amzn\/loadlib.c
---- src\/loadlib.c	2017-04-19 10:20:42.000000000 -0700
-+++ src-amzn\/loadlib.c	2021-04-16 14:18:21.187929700 -0700
-@@ -184,12 +184,14 @@
+diff --git a/loadlib.c b/loadlib.c
+index 6f9fa373..e50fbcb8 100644
+--- a/loadlib.c
++++ b/loadlib.c
+@@ -193,11 +193,13 @@ static void setprogdir (lua_State *L) {
  
  
  static void pusherror (lua_State *L) {
  static void pusherror (lua_State *L) {
    int error = GetLastError();
    int error = GetLastError();
@@ -12,45 +12,45 @@ diff -ru src\/loadlib.c src-amzn\/loadlib.c
        NULL, error, 0, buffer, sizeof(buffer)/sizeof(char), NULL))
        NULL, error, 0, buffer, sizeof(buffer)/sizeof(char), NULL))
      lua_pushstring(L, buffer);
      lua_pushstring(L, buffer);
    else
    else
--    lua_pushfstring(L, "system error %d\n", error);
 +#endif
 +#endif
-+  lua_pushfstring(L, "system error %d\n", error);
+     lua_pushfstring(L, "system error %d\n", error);
  }
  }
  
  
- static void lsys_unloadlib (void *lib) {
-diff -ru src\/loslib.c src-amzn\/loslib.c
---- src\/loslib.c	2017-04-19 10:29:57.000000000 -0700
-+++ src-amzn\/loslib.c	2021-04-16 15:43:26.939098900 -0700
-@@ -21,6 +21,10 @@
+diff --git a/loslib.c b/loslib.c
+index 3e20d622..cbca1c5a 100644
+--- a/loslib.c
++++ b/loslib.c
+@@ -21,6 +21,9 @@
  #include "lauxlib.h"
  #include "lauxlib.h"
  #include "lualib.h"
  #include "lualib.h"
  
  
 +#if defined(__APPLE__)
 +#if defined(__APPLE__)
 +#include <TargetConditionals.h>
 +#include <TargetConditionals.h>
 +#endif
 +#endif
-+
  
  
  /*
  /*
  ** {==================================================================
  ** {==================================================================
-@@ -139,8 +143,13 @@
+@@ -140,10 +143,15 @@
  
  
  
  
  static int os_execute (lua_State *L) {
  static int os_execute (lua_State *L) {
-+#if defined(TARGET_OS_IPHONE)
++  #if defined(TARGET_OS_IPHONE)
 +    const char* cmd = NULL;
 +    const char* cmd = NULL;
 +    int stat = -1;
 +    int stat = -1;
 +#else
 +#else
    const char *cmd = luaL_optstring(L, 1, NULL);
    const char *cmd = luaL_optstring(L, 1, NULL);
-   int stat = system(cmd);
+   int stat;
+   errno = 0;
+   stat = system(cmd);
 +#endif
 +#endif
    if (cmd != NULL)
    if (cmd != NULL)
      return luaL_execresult(L, stat);
      return luaL_execresult(L, stat);
    else {
    else {
-@@ -157,20 +166,29 @@
+@@ -160,20 +168,29 @@ static int os_remove (lua_State *L) {
  
  
  
  
  static int os_rename (lua_State *L) {
  static int os_rename (lua_State *L) {
-+#if !defined(APPLE) && !defined(ANDROID)
++#if !defined(TARGET_OS_IPHONE) && !defined(ANDROID)
    const char *fromname = luaL_checkstring(L, 1);
    const char *fromname = luaL_checkstring(L, 1);
    const char *toname = luaL_checkstring(L, 2);
    const char *toname = luaL_checkstring(L, 2);
    return luaL_fileresult(L, rename(fromname, toname) == 0, NULL);
    return luaL_fileresult(L, rename(fromname, toname) == 0, NULL);
@@ -62,18 +62,17 @@ diff -ru src\/loslib.c src-amzn\/loslib.c
  
  
  
  
  static int os_tmpname (lua_State *L) {
  static int os_tmpname (lua_State *L) {
-+#if !defined(APPLE) && !defined(ANDROID)
++#if !defined(TARGET_OS_IPHONE) && !defined(ANDROID)
    char buff[LUA_TMPNAMBUFSIZE];
    char buff[LUA_TMPNAMBUFSIZE];
    int err;
    int err;
    lua_tmpnam(buff, err);
    lua_tmpnam(buff, err);
-   if (err)
+   if (l_unlikely(err))
 +#endif
 +#endif
      return luaL_error(L, "unable to generate a unique filename");
      return luaL_error(L, "unable to generate a unique filename");
-+#if !defined(APPLE) && !defined(ANDROID)
++#if !defined(TARGET_OS_IPHONE) && !defined(ANDROID)
    lua_pushstring(L, buff);
    lua_pushstring(L, buff);
    return 1;
    return 1;
 +#endif
 +#endif
  }
  }
  
  
  
  
-Only in src\: Makefile

+ 4 - 4
package_build_list_host_darwin.json

@@ -7,8 +7,8 @@
         "assimp-5.0.1-rev12-mac":  "Scripts/extras/pull_and_build_from_git.py ../../package-system/assimp --platform-name Mac --package-root ../../package-system --clean",
         "assimp-5.0.1-rev12-mac":  "Scripts/extras/pull_and_build_from_git.py ../../package-system/assimp --platform-name Mac --package-root ../../package-system --clean",
         "AWSNativeSDK-1.9.50-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Mac --package-root ../../package-system --clean",
         "AWSNativeSDK-1.9.50-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Mac --package-root ../../package-system --clean",
         "AWSNativeSDK-1.9.50-rev1-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name iOS --package-root ../../package-system --clean",
         "AWSNativeSDK-1.9.50-rev1-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name iOS --package-root ../../package-system --clean",
-        "Lua-5.3.5-rev7-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name Mac --package-root ../../package-system --clean",
-        "Lua-5.3.5-rev7-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name iOS --package-root ../../package-system --clean",
+        "Lua-5.4.4-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name Mac --package-root ../../package-system/Lua/temp --clean",
+        "Lua-5.4.4-rev1-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name iOS --package-root ../../package-system/Lua/temp --clean",
         "AwsIotDeviceSdkCpp-1.15.2-rev2-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AwsIotDeviceSdkCpp --platform-name Mac --package-root ../../package-system --clean",
         "AwsIotDeviceSdkCpp-1.15.2-rev2-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AwsIotDeviceSdkCpp --platform-name Mac --package-root ../../package-system --clean",
         "freetype-2.10.4.16-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name Mac --package-root ../../package-system --clean",
         "freetype-2.10.4.16-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name Mac --package-root ../../package-system --clean",
         "freetype-2.10.4.16-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name iOS --package-root ../../package-system --clean",
         "freetype-2.10.4.16-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name iOS --package-root ../../package-system --clean",
@@ -55,9 +55,9 @@
         "assimp-5.0.1-rev12-mac": "package-system/assimp-mac",
         "assimp-5.0.1-rev12-mac": "package-system/assimp-mac",
         "AWSNativeSDK-1.9.50-rev1-mac": "package-system/AWSNativeSDK-mac",
         "AWSNativeSDK-1.9.50-rev1-mac": "package-system/AWSNativeSDK-mac",
         "AWSNativeSDK-1.9.50-rev1-ios": "package-system/AWSNativeSDK-ios",
         "AWSNativeSDK-1.9.50-rev1-ios": "package-system/AWSNativeSDK-ios",
-        "Lua-5.3.5-rev7-mac": "package-system/Lua-mac",
-        "Lua-5.3.5-rev7-ios": "package-system/Lua-ios",
         "AwsIotDeviceSdkCpp-1.15.2-rev2-mac": "package-system/AwsIotDeviceSdkCpp-mac",
         "AwsIotDeviceSdkCpp-1.15.2-rev2-mac": "package-system/AwsIotDeviceSdkCpp-mac",
+        "Lua-5.4.4-rev1-mac": "package-system/Lua/temp/Lua-mac",
+        "Lua-5.4.4-rev1-ios": "package-system/Lua/temp/Lua-ios",
         "freetype-2.10.4.16-mac": "package-system/freetype-mac",
         "freetype-2.10.4.16-mac": "package-system/freetype-mac",
         "freetype-2.10.4.16-ios": "package-system/freetype-ios",
         "freetype-2.10.4.16-ios": "package-system/freetype-ios",
         "googlebenchmark-1.5.0-rev2-ios": "package-system/googlebenchmark-ios",
         "googlebenchmark-1.5.0-rev2-ios": "package-system/googlebenchmark-ios",

+ 2 - 2
package_build_list_host_linux.json

@@ -6,7 +6,7 @@
     "build_from_source": {
     "build_from_source": {
         "assimp-5.0.1-rev12-linux":  "Scripts/extras/pull_and_build_from_git.py ../../package-system/assimp --platform-name Linux --package-root ../../package-system --clean",
         "assimp-5.0.1-rev12-linux":  "Scripts/extras/pull_and_build_from_git.py ../../package-system/assimp --platform-name Linux --package-root ../../package-system --clean",
         "AWSNativeSDK-1.9.50-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Linux --package-root ../../package-system --clean",
         "AWSNativeSDK-1.9.50-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Linux --package-root ../../package-system --clean",
-        "Lua-5.3.5-rev7-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name Linux --package-root ../../package-system --clean",
+        "Lua-5.4.4-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name Linux --package-root ../../package-system/Lua/temp --clean",
         "AwsIotDeviceSdkCpp-1.15.2-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AwsIotDeviceSdkCpp --platform-name Linux --package-root ../../package-system --clean",
         "AwsIotDeviceSdkCpp-1.15.2-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AwsIotDeviceSdkCpp --platform-name Linux --package-root ../../package-system --clean",
         "freetype-2.10.4.16-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name Linux --package-root ../../package-system --clean",
         "freetype-2.10.4.16-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name Linux --package-root ../../package-system --clean",
         "googlebenchmark-1.5.0-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/googlebenchmark --platform-name Linux --package-root ../../package-system --clean",
         "googlebenchmark-1.5.0-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/googlebenchmark --platform-name Linux --package-root ../../package-system --clean",
@@ -41,7 +41,7 @@
         "assimp-5.0.1-rev12-linux": "package-system/assimp-linux",
         "assimp-5.0.1-rev12-linux": "package-system/assimp-linux",
         "AWSGameLiftServerSDK-3.4.1-rev1-linux": "package-system/AWSGameLiftServerSDK/linux",
         "AWSGameLiftServerSDK-3.4.1-rev1-linux": "package-system/AWSGameLiftServerSDK/linux",
         "AWSNativeSDK-1.9.50-rev1-linux": "package-system/AWSNativeSDK-linux",
         "AWSNativeSDK-1.9.50-rev1-linux": "package-system/AWSNativeSDK-linux",
-        "Lua-5.3.5-rev7-linux": "package-system/Lua-linux",
+        "Lua-5.4.4-rev1-linux": "package-system/Lua/temp/Lua-linux",
         "AwsIotDeviceSdkCpp-1.15.2-rev1-linux": "package-system/AwsIotDeviceSdkCpp-linux",
         "AwsIotDeviceSdkCpp-1.15.2-rev1-linux": "package-system/AwsIotDeviceSdkCpp-linux",
         "freetype-2.10.4.16-linux": "package-system/freetype-linux",
         "freetype-2.10.4.16-linux": "package-system/freetype-linux",
         "googlebenchmark-1.5.0-rev2-linux": "package-system/googlebenchmark-linux",
         "googlebenchmark-1.5.0-rev2-linux": "package-system/googlebenchmark-linux",

+ 4 - 4
package_build_list_host_windows.json

@@ -9,8 +9,8 @@
         "AWSNativeSDK-1.9.50-rev1-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Android --package-root ../../package-system --clean",
         "AWSNativeSDK-1.9.50-rev1-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Android --package-root ../../package-system --clean",
         "Blast-v1.1.7_rc2-9-geb169fe-rev2-windows": "package-system/Blast/build_package_image.py --platform-name windows",
         "Blast-v1.1.7_rc2-9-geb169fe-rev2-windows": "package-system/Blast/build_package_image.py --platform-name windows",
         "Crashpad-0.8.0-rev1-windows": "package-system/Crashpad/build_package_image.py",
         "Crashpad-0.8.0-rev1-windows": "package-system/Crashpad/build_package_image.py",
-        "Lua-5.3.5-rev7-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name Windows --package-root ../../package-system --clean",
-        "Lua-5.3.5-rev7-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name Android --package-root ../../package-system --clean",
+        "Lua-5.4.4-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name Windows --package-root ../../package-system/Lua/temp --clean",
+        "Lua-5.4.4-rev1-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name Android --package-root ../../package-system/Lua/temp --clean",
         "AwsIotDeviceSdkCpp-1.15.2-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AwsIotDeviceSdkCpp --build-path c:/Temp/awsiot --platform-name Windows --package-root ../../package-system --clean",
         "AwsIotDeviceSdkCpp-1.15.2-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AwsIotDeviceSdkCpp --build-path c:/Temp/awsiot --platform-name Windows --package-root ../../package-system --clean",
         "freetype-2.10.4.16-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name Windows --package-root ../../package-system --clean",
         "freetype-2.10.4.16-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name Windows --package-root ../../package-system --clean",
         "freetype-2.10.4.16-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name Android --package-root ../../package-system --clean",
         "freetype-2.10.4.16-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name Android --package-root ../../package-system --clean",
@@ -59,8 +59,8 @@
     "AWSNativeSDK-1.9.50-rev1-android": "package-system/AWSNativeSDK-android",
     "AWSNativeSDK-1.9.50-rev1-android": "package-system/AWSNativeSDK-android",
     "Blast-v1.1.7_rc2-9-geb169fe-rev1-windows": "package-system/Blast-windows",
     "Blast-v1.1.7_rc2-9-geb169fe-rev1-windows": "package-system/Blast-windows",
     "Crashpad-0.8.0-rev1-windows": "package-system/Crashpad-windows",
     "Crashpad-0.8.0-rev1-windows": "package-system/Crashpad-windows",
-    "Lua-5.3.5-rev7-windows": "package-system/Lua-windows",
-    "Lua-5.3.5-rev7-android": "package-system/Lua-android",
+    "Lua-5.4.4-rev1-windows": "package-system/Lua/temp/Lua-windows",
+    "Lua-5.4.4-rev1-android": "package-system/Lua/temp/Lua-android",
     "AwsIotDeviceSdkCpp-1.15.2-rev1-windows": "package-system/AwsIotDeviceSdkCpp-windows",
     "AwsIotDeviceSdkCpp-1.15.2-rev1-windows": "package-system/AwsIotDeviceSdkCpp-windows",
     "etc2comp-9cd0f9cae0-rev1-windows": "package-system/etc2comp-windows",
     "etc2comp-9cd0f9cae0-rev1-windows": "package-system/etc2comp-windows",
     "freetype-2.10.4.9-windows": "package-system/FreeType2-windows",
     "freetype-2.10.4.9-windows": "package-system/FreeType2-windows",