diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fb32767..8442875 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,49 +2,36 @@ variables: VERS_MAIN: '1.0' APP_NAME: 'BeamWall' NEW_REL: '' - NET_SHARE_R: '\\10.74.82.201\EgwTech' + NET_SHARE_X: '\\10.74.82.201\EgwTech' NET_SHARE_Z: '\\10.74.82.201\Artifacts' NET_USERQ: 'steamw\egalware' #Note compilazione LUA: -# lua53 -o 32\$FileName -s $FileName: -o = output, -s = NON include i debug symbols +# lua54 -o bin\$FileName -s $FileName: -o = output, -s = NON include i debug symbols -# helper compilazione LUA a 32 bit -.LuaCompile32: &LuaCompile32 +# helper compilazione LUA a 32 e 64 bit +.LuaCompile: &LuaCompile - | - Set-Alias lua53 C:\Tools\Lua32\luac53 + Set-Alias lua54 C:\Tools\Lua32\luac54 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" + Copy-Item -Path $FileName -Destination bin\$FileName + echo "Copy-Item -Path $FileName -Destination bin\$FileName" } - echo "Compilazione file *.lua 32bit" + echo "Compilazione file *.lua 32/64bit" $FileList = Get-ChildItem("*.lua") ForEach ($File in $FileList) { $FileName = Split-Path $File -leaf - lua53 -o 32\$FileName $FileName - echo "lua53 -o 32\$FileName $FileName" + lua54 -o bin\$FileName $FileName + echo "lua54 -o bin\$FileName $FileName" } - -# helper compilazione LUA a 64 bit -.LuaCompile64: &LuaCompile64 - - | - Set-Alias lua53 C:\Tools\Lua64\luac53 - echo "Copia file *.ini" - $FileList = Get-ChildItem("*.ini") + $FileList = Get-ChildItem("LuaLibs\*.lua") 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 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" + lua54 -o bin\LuaLibs\$FileName LuaLibs\$FileName + echo "lua54 -o bin\LuaLibs\$FileName LuaLibs\$FileName" } # Copy-Item -Path $FileName -Destination 64\$FileName @@ -52,33 +39,32 @@ variables: # helper copia SORGENTI verso cartella di rete R:\ dei SORGENTI .CodeReplicaR: &CodeReplicaR - | - net use R: /delete - net use R: $env:NET_SHARE_R /u:$env:NET_USERQ $ZDRIVE_PASSWD - ROBOCOPY . R:\EgtData\$env:APP_NAME /MIR /XF .git* /XD .git + net use X: /delete SLEEP 2 - net use R: /delete + net use X: $env:NET_SHARE_X /u:$env:NET_USERQ $ZDRIVE_PASSWD + ROBOCOPY . X:\EgtData\$env:APP_NAME /MIR /XF .git* /XD .git + SLEEP 2 + net use X: /delete # helper copia script verso cartella di rete R:\ delle cartelle 32 e 64 .ReplicaR: &ReplicaR - | - net use R: /delete - net use R: $env:NET_SHARE_R /u:$env:NET_USERQ $ZDRIVE_PASSWD - ROBOCOPY /MIR 32 R:\EgtData\$env:APP_NAME\32 - ROBOCOPY /MIR 64 R:\EgtData\$env:APP_NAME\64 - ROBOCOPY /MIR Images R:\EgtData\$env:APP_NAME\32\Images - ROBOCOPY /MIR Images R:\EgtData\$env:APP_NAME\64\Images + net use X: /delete SLEEP 2 - net use R: /delete + net use X: $env:NET_SHARE_X /u:$env:NET_USERQ $ZDRIVE_PASSWD + ROBOCOPY /MIR bin X:\EgtData\$env:APP_NAME\bin + ROBOCOPY /MIR Images X:\EgtData\$env:APP_NAME\bin\Images + SLEEP 2 + net use X: /delete # helper copia script verso cartella di rete R:\ delle cartelle 32 e 64 .ReplicaZ: &ReplicaZ - | net use Z: /delete + SLEEP 2 net use Z: $env:NET_SHARE_Z /u:$env:NET_USERQ $ZDRIVE_PASSWD - ROBOCOPY /MIR 32 Z:\EgtData\$env:APP_NAME\32 - ROBOCOPY /MIR 64 Z:\EgtData\$env:APP_NAME\64 - ROBOCOPY /MIR Images Z:\EgtData\$env:APP_NAME\32\Images - ROBOCOPY /MIR Images Z:\EgtData\$env:APP_NAME\64\Images + ROBOCOPY /MIR bin Z:\EgtData\$env:APP_NAME\bin + ROBOCOPY /MIR Images Z:\EgtData\$env:APP_NAME\bin\Images SLEEP 2 net use Z: /delete @@ -93,8 +79,7 @@ LuaCompile:build: tags: - win script: - - *LuaCompile32 - - *LuaCompile64 + - *LuaCompile - *CodeReplicaR - *ReplicaR - *ReplicaZ