From a76b542dfa8b5b18d3667321d7b48c7979115e5c Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 10 May 2022 08:22:23 +0200 Subject: [PATCH] Merge modifiche x compilazione nuove --- .gitignore | 6 ++++++ .gitlab-ci.yml | 20 ++++++++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index fce4515..b1a6dab 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,9 @@ /bin /obj /.vs +/32/*.lua +/32/LuaLibs/*.lua +/32/Images/*.png +/64/*.lua +/64/LuaLibs/*.lua +/64/Images/*.png diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 17f6c47..fe50cf3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,12 +13,20 @@ variables: .LuaCompile32: &LuaCompile32 - | Set-Alias lua53 C:\Tools\Lua32\luac53 - $FileList = Get-ChildItem("*.lua") + echo "Copia file *.ini" + $FileList = Get-ChildItem("*.ini") ForEach ($File in $FileList) { $FileName = Split-Path $File -leaf Copy-Item -Path $FileName -Destination 32\$FileName echo "Copy-Item -Path $FileName -Destination 32\$FileName" } + echo "Compilazione file *.lua 32bit" + $FileList = Get-ChildItem("*.lua") + ForEach ($File in $FileList) { + $FileName = Split-Path $File -leaf + lua53 -o 32\$FileName $FileName + echo "lua53 -o 32\$FileName $FileName" + } $FileList = Get-ChildItem("LuaLibs\*.lua") ForEach ($File in $FileList) { $FileName = Split-Path $File -leaf @@ -30,12 +38,20 @@ variables: .LuaCompile64: &LuaCompile64 - | Set-Alias lua53 C:\Tools\Lua64\luac53 - $FileList = Get-ChildItem("*.lua") + echo "Copia file *.ini" + $FileList = Get-ChildItem("*.ini") ForEach ($File in $FileList) { $FileName = Split-Path $File -leaf Copy-Item -Path $FileName -Destination 64\$FileName echo "Copy-Item -Path $FileName -Destination 64\$FileName" } + echo "Compilazione file *.lua 64bit" + $FileList = Get-ChildItem("*.lua") + ForEach ($File in $FileList) { + $FileName = Split-Path $File -leaf + lua53 -o 64\$FileName $FileName + echo "lua53 -o 64\$FileName $FileName" + } $FileList = Get-ChildItem("LuaLibs\*.lua") ForEach ($File in $FileList) { $FileName = Split-Path $File -leaf