Fixing test

.gitignore

@@ -1,3 +1,21 @@
 _*
 .DS_Store
 
+build/
+libs/
+obj/
+*.swp
+win-x86/
+win-x64/
+win-arm64/
+win-arm/
+ios_build/ios
+ios_build/tvos
+ios_build/watchos
+osx-64
+osx-arm64
+osx
+src/*.o
+.vscode/*
+ios_build/build_maccatalyst/*
+ios_build/maccatalyst/*

CMakeLists.txt

@@ -3,26 +3,39 @@
 # Redistribution and use of this file is allowed according to the terms of the MIT license.
 # For details see the COPYRIGHT file distributed with LuaDist.
 # Please note that the package source code is licensed under its own license.
-
 # Changed by Vinicius Jarina (viniciusjarina@gmail.com)
+cmake_minimum_required(VERSION 3.5)
 
-PROJECT ( lua CXX )
-CMAKE_MINIMUM_REQUIRED ( VERSION 2.6 )
+PROJECT ( lua C )
 
 IF (CMAKE_SIZEOF_VOID_P EQUAL 8)
 	SET (LIB_SUFFIX "64" CACHE STRING "Suffix of the directory name, e.g. 64 for lib64")
 ELSE (CMAKE_SIZEOF_VOID_P EQUAL 8)
 	SET (LIB_SUFFIX "" CACHE STRING "Suffix of the directory name, e.g. 64 for lib64")
 ENDIF (CMAKE_SIZEOF_VOID_P EQUAL 8)
 
+SET (CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+
+# $ORIGIN support in rpath.
+IF (UNIX AND NOT APPLE)
+    SET (USE_RPATH_ORIGIN TRUE)
+    SET (CMAKE_INSTALL_RPATH "\$ORIGIN/../lib${LIB_SUFFIX}")
+  ENDIF ()
+
+IF (APPLE)
+  SET(SKIP_BUILD_RPATH, TRUE)
+  SET(CMAKE_MACOSX_RPATH 1)
+  ADD_DEFINITIONS (-DLUA_USE_MACOSX)
+  LIST ( APPEND LIBS readline )
+ENDIF ()
 
 SET(CMAKE_DEBUG_POSTFIX "d")
 SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}" CACHE STRING "Library build output directory")
 SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}")
 SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin${LIB_SUFFIX}")
 SET(EXECUTABLE_OUTPUT_PATH         "${CMAKE_BINARY_DIR}/bin${LIB_SUFFIX}")
 
-SET (LIB_LUA_VER "52" CACHE STRING "Suffix of version (for library name) e.g lua52")
+SET (LIB_LUA_VER "54" CACHE STRING "Suffix of version (for library name) e.g lua54")
 
 #
 # Include dir COPY
@@ -51,14 +64,27 @@ ENDIF ()
 IF ( LUA_USE_POSIX )
   # On POSIX Lua links to standard math library "m"
   LIST ( APPEND LIBS m )
+  ADD_DEFINITIONS (-DLUA_USE_POSIX)
 ENDIF ()
 
-IF ( LUA_USE_DLOPEN )
+IF ( LUA_USE_DLOPEN AND NOT APPLE)
   # Link to dynamic linker library "dl"
   LIST ( APPEND LIBS dl )
+  ADD_DEFINITIONS(-DLUA_USE_DLOPEN)
 ENDIF ()
 
 IF ( LUA_WIN )
+  # Use static linked runtime for DLL to avoid issues with people without the vcredist installed
+  IF (MSVC)
+    SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
+    SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT /guard:cf")
+    SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE} /MT")
+    SET(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_DEBUG} /MT")
+	SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd")
+    SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MT /guard:cf")
+    SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELEASE} /MT")
+    SET(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_DEBUG} /MT")
+  ENDIF()
   # Add extra rc files to the windows build
   IF ( MSVC OR MINGW )
     SET ( LUA_DLL_RC src/lua_dll.rc )
@@ -71,42 +97,42 @@ ENDIF ()
 # Sources and headers
 INCLUDE_DIRECTORIES ( include )
 SET (   SRC_LIB 
-		src/lapi.cpp 
-		src/lcode.cpp
-		src/lctype.cpp
-		src/ldebug.cpp 
-		src/ldo.cpp 
-		src/ldump.cpp 
-		src/lfunc.cpp 
-		src/lgc.cpp 
-		src/llex.cpp 
-		src/lmem.cpp 
-		src/lobject.cpp 
-		src/lopcodes.cpp 
-		src/lparser.cpp 
-		src/lstate.cpp 
-		src/lstring.cpp 
-		src/ltable.cpp 
-		src/ltm.cpp 
-		src/lundump.cpp 
-		src/lvm.cpp 
-		src/lzio.cpp 
-		src/lauxlib.cpp 
-		src/lbaselib.cpp 
-		src/ldblib.cpp 
-		src/liolib.cpp 
-		src/lmathlib.cpp 
-		src/loslib.cpp 
-		src/ltablib.cpp 
-		src/lstrlib.cpp 
-		src/linit.cpp 
-		src/lbitlib.cpp
-		src/lcorolib.cpp
-		src/loadlib.cpp
+		src/lapi.c
+		src/lauxlib.c
+		src/lbaselib.c
+		src/lcode.c
+		src/lcorolib.c
+		src/lctype.c
+		src/ldblib.c
+		src/ldebug.c
+		src/ldo.c
+		src/ldump.c
+		src/lfunc.c
+		src/lgc.c
+		src/linit.c
+		src/liolib.c
+		src/llex.c
+		src/lmathlib.c
+		src/lmem.c
+		src/loadlib.c
+		src/lobject.c
+		src/lopcodes.c
+		src/loslib.c
+		src/lparser.c
+		src/lstate.c
+		src/lstring.c
+		src/lstrlib.c
+		src/ltable.c
+		src/ltablib.c
+		src/ltm.c
+		src/lundump.c
+		src/lutf8lib.c
+		src/lvm.c
+		src/lzio.c
 		)
 
-SET ( SRC_LUA  src/lua.cpp )
-SET ( SRC_LUAC src/luac.cpp )
+SET ( SRC_LUA  src/lua.c )
+SET ( SRC_LUAC src/luac.c )
 
 ## BUILD
 # Create dynamic library (dll, so)
@@ -157,7 +183,7 @@ SET_TARGET_PROPERTIES(  liblua_static PROPERTIES ARCHIVE_OUTPUT_DIRECTORY_DEBUG
 SET_TARGET_PROPERTIES(  liblua_static PROPERTIES LIBRARY_OUTPUT_DIRECTORY_DEBUG ${PROJECT_BINARY_DIR}/lib${LIB_SUFFIX} )
 
 ADD_EXECUTABLE ( lua ${SRC_LUA} ${LUA_RC})
-TARGET_LINK_LIBRARIES ( lua liblua )
+TARGET_LINK_LIBRARIES ( lua liblua ${LIBS})
 
 SET_TARGET_PROPERTIES ( lua PROPERTIES DEBUG_POSTFIX d)
 
@@ -180,7 +206,7 @@ SET_TARGET_PROPERTIES ( luac PROPERTIES RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL
 
 ENABLE_TESTING()
 
-SET(TEST_PARAM -e_U=true)
+SET(TEST_PARAM -e _U=true)
 
 ADD_TEST(NAME test_all 
          WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/test 

Makefile

@@ -4,7 +4,7 @@
 # == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT =======================
 
 # Your platform. See PLATS for possible values.
-PLAT= none
+PLAT= guess
 
 # Where to install. The installation starts in the src and doc directories,
 # so take care if INSTALL_TOP is not an absolute path. See the local target.
@@ -36,7 +36,7 @@ RM= rm -f
 # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE =======
 
 # Convenience platforms targets.
-PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
+PLATS= guess aix bsd c89 freebsd generic ios linux linux-readline macosx mingw posix solaris
 
 # What to install.
 TO_BIN= lua luac
@@ -45,17 +45,14 @@ TO_LIB= liblua.a
 TO_MAN= lua.1 luac.1
 
 # Lua version and release.
-V= 5.2
-R= $V.1
+V= 5.4
+R= $V.7
 
 # Targets start here.
 all:	$(PLAT)
 
-$(PLATS) clean:
-	cd src && $(MAKE) $@
-
-test:	dummy
-	src/lua -v
+$(PLATS) help test clean:
+	@cd src && $(MAKE) $@
 
 install: dummy
 	cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
@@ -73,15 +70,10 @@ uninstall:
 local:
 	$(MAKE) install INSTALL_TOP=../install
 
-none:
-	@echo "Please do 'make PLATFORM' where PLATFORM is one of these:"
-	@echo "   $(PLATS)"
-	@echo "See doc/readme.html for complete instructions."
-
-# make may get confused with test/ and install/
+# make may get confused with install/ if it does not support .PHONY.
 dummy:
 
-# echo config parameters
+# Echo config parameters.
 echo:
 	@cd src && $(MAKE) -s echo
 	@echo "PLAT= $(PLAT)"
@@ -101,14 +93,14 @@ echo:
 	@echo "INSTALL_EXEC= $(INSTALL_EXEC)"
 	@echo "INSTALL_DATA= $(INSTALL_DATA)"
 
-# echo pkg-config data
+# Echo pkg-config data.
 pc:
 	@echo "version=$R"
 	@echo "prefix=$(INSTALL_TOP)"
 	@echo "libdir=$(INSTALL_LIB)"
 	@echo "includedir=$(INSTALL_INC)"
 
-# list targets that do not create files (but not all makes understand .PHONY)
-.PHONY: all $(PLATS) clean test install local none dummy echo pecho lecho
+# Targets that do not create files (not all makes understand .PHONY).
+.PHONY: all $(PLATS) help test clean install uninstall local dummy echo pc
 
 # (end of Makefile)

README.md

@@ -1,7 +1,6 @@
+This is Lua 5.4.7, released on 13 Jun 2024.
 
-This is Lua 5.2.1, released on 08 Jun 2012.
+[![Build Status](https://dev.azure.com/codefoco/NuGets/_apis/build/status/lua?branchName=main)](https://dev.azure.com/codefoco/NuGets/_build/latest?definitionId=66&branchName=main)
 
-[![Build Status](https://secure.travis-ci.org/viniciusjarina/lua.png?branch=master)](http://travis-ci.org/viniciusjarina/lua)
 For installation instructions, license details, and
 further information about Lua, see doc/readme.html.
-

android_build/jni/Android.mk

@@ -0,0 +1,14 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_C_INCLUDES += ../include 
+LOCAL_MODULE    := lua54
+LOCAL_CFLAGS := -DLUA_USE_POSIX -DLUA_USE_C89 -DLUA_USE_LONGLONG -I../include
+LOCAL_SRC_FILES :=  \
+ ../../src/lapi.c ../../src/lauxlib.c ../../src/lbaselib.c ../../src/lcode.c ../../src/lcorolib.c ../../src/lctype.c \
+ ../../src/ldblib.c ../../src/ldebug.c ../../src/ldo.c ../../src/ldump.c ../../src/lfunc.c ../../src/lgc.c ../../src/linit.c ../../src/liolib.c \
+ ../../src/llex.c ../../src/lmathlib.c ../../src/lmem.c ../../src/loadlib.c ../../src/lobject.c \
+ ../../src/lopcodes.c ../../src/loslib.c ../../src/lparser.c ../../src/lstate.c ../../src/lstring.c ../../src/lstrlib.c ../../src/ltable.c \
+ ../../src/ltablib.c ../../src/ltm.c ../../src/lundump.c ../../src/lutf8lib.c ../../src/lvm.c ../../src/lzio.c \
+ ../../src/android_strpcpy.c
+
+include $(BUILD_SHARED_LIBRARY)

android_build/jni/Application.mk

@@ -0,0 +1,5 @@
+APP_MODULES := lua54
+APP_PLATFORM := android-16
+APP_OPTIM   := release
+APP_ABI := armeabi-v7a arm64-v8a x86 x86_64
+NDK_TOOLCHAIN_VERSION := clang

azure-pipelines.yml

@@ -0,0 +1,18 @@
+trigger:
+- main
+
+pool:
+  vmImage: ubuntu-latest
+
+steps:
+- script: |
+    mkdir _build &&
+    cd _build &&
+    cmake .. &&
+    cmake --build . --config Release
+  displayName: 'Build'
+
+- script: |
+    ctest -V -C Release
+  displayName: 'Test'
+  workingDirectory: _build