From ce86a9184927a815689cb1b8f910e54359285aee Mon Sep 17 00:00:00 2001 From: mavriq-dev <1278955+mavriq-dev@users.noreply.github.com> Date: Sun, 19 Nov 2023 00:29:24 -0500 Subject: [PATCH 01/13] Update main.yml --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1465278..b072e33 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -131,6 +131,7 @@ jobs: - name: Build run: | cd luasocket + perl -0777 -i.original -pe 's/LUAV\>=5\.3/LUAV>=5.4/' lua.props msbuild socket.vcxproj /p:Configuration=Release /p:Platform=x64 /property:AdditionalDependencies=lua53.lib /property:WindowsTargetPlatformVersion=10.0.19041.0 - name: Collect files From 321c84cb988bb815f73cf728052825da0af93569 Mon Sep 17 00:00:00 2001 From: mavriq-dev <1278955+mavriq-dev@users.noreply.github.com> Date: Sun, 19 Nov 2023 00:38:36 -0500 Subject: [PATCH 02/13] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b072e33..8726fa8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -131,7 +131,7 @@ jobs: - name: Build run: | cd luasocket - perl -0777 -i.original -pe 's/LUAV\>=5\.3/LUAV>=5.4/' lua.props + sed -e -e 's/LUAV\>=5\.3/LUAV>=5.4/g' lua.props msbuild socket.vcxproj /p:Configuration=Release /p:Platform=x64 /property:AdditionalDependencies=lua53.lib /property:WindowsTargetPlatformVersion=10.0.19041.0 - name: Collect files From 893af2feaa6f19080f64500e12ef1f963a2408dd Mon Sep 17 00:00:00 2001 From: mavriq-dev <1278955+mavriq-dev@users.noreply.github.com> Date: Sun, 19 Nov 2023 00:40:11 -0500 Subject: [PATCH 03/13] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8726fa8..900bd53 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -131,7 +131,7 @@ jobs: - name: Build run: | cd luasocket - sed -e -e 's/LUAV\>=5\.3/LUAV>=5.4/g' lua.props + sed -i -e 's/LUAV\>=5\.3/LUAV>=5.4/g' lua.props msbuild socket.vcxproj /p:Configuration=Release /p:Platform=x64 /property:AdditionalDependencies=lua53.lib /property:WindowsTargetPlatformVersion=10.0.19041.0 - name: Collect files From 65b6d0ec1d8fcaea7da85201214262636ffc2cf1 Mon Sep 17 00:00:00 2001 From: mavriq-dev <1278955+mavriq-dev@users.noreply.github.com> Date: Sun, 19 Nov 2023 09:51:25 -0500 Subject: [PATCH 04/13] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 900bd53..0f72fce 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -108,7 +108,7 @@ jobs: build_windows: - runs-on: windows-2022 + runs-on: self-hosted steps: From b71a9a553ab107f8577374fcd3c8391ea42dbc31 Mon Sep 17 00:00:00 2001 From: mavriq-dev <1278955+mavriq-dev@users.noreply.github.com> Date: Sun, 19 Nov 2023 10:04:40 -0500 Subject: [PATCH 05/13] Update main.yml --- .github/workflows/main.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0f72fce..58e68ce 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -111,6 +111,19 @@ jobs: runs-on: self-hosted steps: + - uses: ilammy/msvc-dev-cmd@v1 + - name: Build lua static + run: | + curl -sSL -o lua.tar.gz https://www.lua.org/ftp/lua-5.4.6.tar.gz + tar -xvf lua.tar.gz + cd lua-5.4.6/src/ + cl /MD /O2 /c /DLUA_BUILD_AS_DLL *.c + ren lua.obj lua.o + #ren luac.obj luac.o + #link /DLL /IMPLIB:lua5.4.6.lib /OUT:lua5.4.6.dll *.obj + #link /OUT:lua.exe lua.o lua5.4.6.lib + lib /OUT:lua54.lib *.obj + #link /OUT:luac.exe luac.o lua54.lib - name: Build luasockets run: | @@ -118,6 +131,7 @@ jobs: 7z.exe x lua.zip -olua git clone https://github.com/lunarmodules/luasocket --depth 1 cd luasocket/ + sed -i -e 's/LUAV\>=5\.3/LUAV>=5.4/g' lua.props cp ../lua/lua53.lib . cd src/ cp ../../lua/include/lua.h . @@ -131,7 +145,7 @@ jobs: - name: Build run: | cd luasocket - sed -i -e 's/LUAV\>=5\.3/LUAV>=5.4/g' lua.props + msbuild socket.vcxproj /p:Configuration=Release /p:Platform=x64 /property:AdditionalDependencies=lua53.lib /property:WindowsTargetPlatformVersion=10.0.19041.0 - name: Collect files From 7498761715baf5b3c3aa007b889d6f8f6439c8a2 Mon Sep 17 00:00:00 2001 From: mavriq-dev <1278955+mavriq-dev@users.noreply.github.com> Date: Sun, 19 Nov 2023 10:05:21 -0500 Subject: [PATCH 06/13] Update main.yml --- .github/workflows/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 58e68ce..8eb25c7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -131,7 +131,6 @@ jobs: 7z.exe x lua.zip -olua git clone https://github.com/lunarmodules/luasocket --depth 1 cd luasocket/ - sed -i -e 's/LUAV\>=5\.3/LUAV>=5.4/g' lua.props cp ../lua/lua53.lib . cd src/ cp ../../lua/include/lua.h . @@ -145,7 +144,7 @@ jobs: - name: Build run: | cd luasocket - + sed -i -e 's/LUAV\>=5\.3/LUAV>=5.4/g' lua.props msbuild socket.vcxproj /p:Configuration=Release /p:Platform=x64 /property:AdditionalDependencies=lua53.lib /property:WindowsTargetPlatformVersion=10.0.19041.0 - name: Collect files From 6d02a2dcbdd8d8178f863dc856f3d55a49d2ae82 Mon Sep 17 00:00:00 2001 From: mavriq-dev <1278955+mavriq-dev@users.noreply.github.com> Date: Sun, 19 Nov 2023 10:06:48 -0500 Subject: [PATCH 07/13] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8eb25c7..7c65e71 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -108,7 +108,7 @@ jobs: build_windows: - runs-on: self-hosted + runs-on: windows-2022 steps: - uses: ilammy/msvc-dev-cmd@v1 From 1d23e17ad273d1535f0f1aa2905468b228ddebd6 Mon Sep 17 00:00:00 2001 From: mavriq-dev <1278955+mavriq-dev@users.noreply.github.com> Date: Sun, 19 Nov 2023 10:08:55 -0500 Subject: [PATCH 08/13] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7c65e71..0bfdf0e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -145,7 +145,7 @@ jobs: run: | cd luasocket sed -i -e 's/LUAV\>=5\.3/LUAV>=5.4/g' lua.props - msbuild socket.vcxproj /p:Configuration=Release /p:Platform=x64 /property:AdditionalDependencies=lua53.lib /property:WindowsTargetPlatformVersion=10.0.19041.0 + msbuild socket.vcxproj /p:Configuration=Release /p:Platform=x64 /property:AdditionalDependencies=lua54.lib /property:WindowsTargetPlatformVersion=10.0.19041.0 - name: Collect files run: | From a13e5bd629b84e4c1d2483dfc9f8494d95982371 Mon Sep 17 00:00:00 2001 From: mavriq-dev <1278955+mavriq-dev@users.noreply.github.com> Date: Sun, 19 Nov 2023 10:19:10 -0500 Subject: [PATCH 09/13] Update main.yml --- .github/workflows/main.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0bfdf0e..d8ae1f4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -127,15 +127,14 @@ jobs: - name: Build luasockets run: | - curl -sSL -o lua.zip https://sourceforge.net/projects/luabinaries/files/5.3.6/Windows%20Libraries/Static/lua-5.3.6_Win64_vc16_lib.zip - 7z.exe x lua.zip -olua git clone https://github.com/lunarmodules/luasocket --depth 1 cd luasocket/ - cp ../lua/lua53.lib . + sed -i -e 's/LUAV\>=5\.3/LUAV>=5.4/g' lua.props + cp ../lua-5.4.6/src/lua54.lib . cd src/ - cp ../../lua/include/lua.h . - cp ../../lua/include/luaconf.h . - cp ../../lua/include/lauxlib.h . + cp ../../lua-5.4.6/src/lua.h . + cp ../../lua-5.4.6/src/luaconf.h . + cp ../../lua-5.4.6/src/lauxlib.h . cd .. - name: Setup MSBuild path @@ -144,7 +143,6 @@ jobs: - name: Build run: | cd luasocket - sed -i -e 's/LUAV\>=5\.3/LUAV>=5.4/g' lua.props msbuild socket.vcxproj /p:Configuration=Release /p:Platform=x64 /property:AdditionalDependencies=lua54.lib /property:WindowsTargetPlatformVersion=10.0.19041.0 - name: Collect files From 5745baa8c2f1295130159fe0607883949fc3f558 Mon Sep 17 00:00:00 2001 From: mavriq-dev <1278955+mavriq-dev@users.noreply.github.com> Date: Sun, 19 Nov 2023 10:25:25 -0500 Subject: [PATCH 10/13] Update main.yml --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d8ae1f4..f225226 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -130,6 +130,7 @@ jobs: git clone https://github.com/lunarmodules/luasocket --depth 1 cd luasocket/ sed -i -e 's/LUAV\>=5\.3/LUAV>=5.4/g' lua.props + Get-Content -Path .\lua.props cp ../lua-5.4.6/src/lua54.lib . cd src/ cp ../../lua-5.4.6/src/lua.h . From 50da76d87e2226a3e81e8e0be22ec9ed14971bc0 Mon Sep 17 00:00:00 2001 From: mavriq-dev <1278955+mavriq-dev@users.noreply.github.com> Date: Sun, 19 Nov 2023 10:36:22 -0500 Subject: [PATCH 11/13] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f225226..d2ed383 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -129,7 +129,7 @@ jobs: run: | git clone https://github.com/lunarmodules/luasocket --depth 1 cd luasocket/ - sed -i -e 's/LUAV\>=5\.3/LUAV>=5.4/g' lua.props + sed -i -e 's/LUAV>=5\.3/LUAV>=5.4/g' lua.props Get-Content -Path .\lua.props cp ../lua-5.4.6/src/lua54.lib . cd src/ From 27277edd3fc73cc45485c21bc6d93455ecf97307 Mon Sep 17 00:00:00 2001 From: mavriq-dev <1278955+mavriq-dev@users.noreply.github.com> Date: Sun, 19 Nov 2023 10:42:46 -0500 Subject: [PATCH 12/13] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d2ed383..992f8df 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -129,7 +129,7 @@ jobs: run: | git clone https://github.com/lunarmodules/luasocket --depth 1 cd luasocket/ - sed -i -e 's/LUAV>=5\.3/LUAV>=5.4/g' lua.props + sed -i -e 's/LUAV>5\.3/LUAV>5.4/' lua.props Get-Content -Path .\lua.props cp ../lua-5.4.6/src/lua54.lib . cd src/ From e98f59cb864bd1af36d52610c296e71e0d60cfcc Mon Sep 17 00:00:00 2001 From: mavriq-dev <1278955+mavriq-dev@users.noreply.github.com> Date: Sun, 19 Nov 2023 10:54:41 -0500 Subject: [PATCH 13/13] Update main.yml --- .github/workflows/main.yml | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 992f8df..8564873 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,9 +12,9 @@ jobs: steps: - name: Build Lua Lib run: | - wget https://www.lua.org/ftp/lua-5.3.6.tar.gz - tar -xvf lua-5.3.6.tar.gz - cd lua-5.3.6/src/ + wget https://www.lua.org/ftp/lua-5.4.6.tar.gz + tar -xvf lua-5.4.6.tar.gz + cd lua-5.4.6/src/ sed -i '/MYCFLAGS=/ !b; s/$/ -fPIC/' Makefile sed -i '/MYLDFLAGS=/ !b; s/$/ -fPIC/' Makefile make linux @@ -24,11 +24,11 @@ jobs: run: | git clone https://github.com/lunarmodules/luasocket --depth 1 cd luasocket/src/ - cp ../../lua-5.3.6/src/liblua.a . - cp ../../lua-5.3.6/src/lua.h . - cp ../../lua-5.3.6/src/luaconf.h . - cp ../../lua-5.3.6/src/lauxlib.h . - perl -0777 -i.original -pe 's/LUAV\?=5\.1/LUAV?=5.3/' makefile + cp ../../lua-5.4.6/src/liblua.a . + cp ../../lua-5.4.6/src/lua.h . + cp ../../lua-5.4.6/src/luaconf.h . + cp ../../lua-5.4.6/src/lauxlib.h . + perl -0777 -i.original -pe 's/LUAV\?=5\.1/LUAV?=5.4/' makefile perl -0777 -i.original -pe 's/CFLAGS_linux=\$\(LUAINC:%=-I%\) \$\(DEF\) -Wall -Wshadow -Wextra.*\\\n.*-Wimplicit -O2 -ggdb3 -fpic/CFLAGS_linux=\$\(LUAINC:%=-I%\) \$\(DEF\) -Wall -Wshadow -Wextra \\\n\t-Wimplicit -O2 -fPIC/' makefile perl -0777 -i.original -pe 's/LDFLAGS_linux=-O -shared -fpic -o/LDFLAGS_linux=-O -Wl,-Bstatic -L. -llua -Wl,-Bdynamic -shared -fPIC -o/' makefile perl -0777 -i.original -pe 's/SOCKET_SO=socket-\$\(SOCKET_V\)\.\$\(SO\)/SOCKET_SO=core\.\$\(SO\) /' makefile @@ -55,9 +55,9 @@ jobs: steps: - name: Build Lua Lib run: | - wget https://www.lua.org/ftp/lua-5.3.6.tar.gz - tar -xvf lua-5.3.6.tar.gz - cd lua-5.3.6/src/ + wget https://www.lua.org/ftp/lua-5.4.6.tar.gz + tar -xvf lua-5.4.6.tar.gz + cd lua-5.4.6/src/ perl -0777 -i.original -pe 's/MYCFLAGS=/MYCFLAGS= -mmacosx-version-min=10.9 -arch arm64 -arch x86_64/' makefile perl -0777 -i.original -pe 's/MYLDFLAGS=/MYLDFLAGS= -mmacosx-version-min=10.9 -arch arm64 -arch x86_64/' makefile make macosx @@ -68,12 +68,12 @@ jobs: git clone https://github.com/lunarmodules/luasocket --depth 1 cd luasocket/src/ - cp ../../lua-5.3.6/src/liblua.a . - cp ../../lua-5.3.6/src/lua.h . - cp ../../lua-5.3.6/src/luaconf.h . - cp ../../lua-5.3.6/src/lauxlib.h . + cp ../../lua-5.4.6/src/liblua.a . + cp ../../lua-5.4.6/src/lua.h . + cp ../../lua-5.4.6/src/luaconf.h . + cp ../../lua-5.4.6/src/lauxlib.h . - perl -0777 -i.original -pe 's/LUAV\?=5\.1/LUAV?=5.3/' makefile + perl -0777 -i.original -pe 's/LUAV\?=5\.1/LUAV?=5.4/' makefile perl -0777 -i.original -pe 's/CFLAGS_macosx=\$\(LUAINC:%=-I%\) \$\(DEF\) -Wall -O2 -fno-common.*/CFLAGS_macosx=\$\(LUAINC:%=-I%\) \$\(DEF\) -Wall -Wshadow -Wextra -mmacosx-version-min=10.9 -arch arm64 -arch x86_64/' makefile perl -0777 -i.original -pe 's/LDFLAGS_macosx= -bundle -undefined dynamic_lookup -o.*/LDFLAGS_macosx= -mmacosx-version-min=10.9 -arch arm64 -arch x86_64 -L. -llua -bundle -o /' makefile perl -0777 -i.original -pe 's/SOCKET_SO=socket-\$\(SOCKET_V\)\.\$\(SO\)/SOCKET_SO=core\.\$\(SO\) /' makefile @@ -125,12 +125,11 @@ jobs: lib /OUT:lua54.lib *.obj #link /OUT:luac.exe luac.o lua54.lib - - name: Build luasockets + - name: Clone luasockets run: | git clone https://github.com/lunarmodules/luasocket --depth 1 cd luasocket/ sed -i -e 's/LUAV>5\.3/LUAV>5.4/' lua.props - Get-Content -Path .\lua.props cp ../lua-5.4.6/src/lua54.lib . cd src/ cp ../../lua-5.4.6/src/lua.h . @@ -141,7 +140,7 @@ jobs: - name: Setup MSBuild path uses: microsoft/setup-msbuild@v1.1 - - name: Build + - name: Build luasockets run: | cd luasocket msbuild socket.vcxproj /p:Configuration=Release /p:Platform=x64 /property:AdditionalDependencies=lua54.lib /property:WindowsTargetPlatformVersion=10.0.19041.0