Merge branch 'develop'

.gitlab-ci.yml

@@ -25,7 +25,7 @@ variables:
       net use S: /delete
       SLEEP 2
       net use S: $env:NET_SHARE_S /u:$env:NET_USERQ $SDRIVE_PASSWD
-      ROBOCOPY /MIR $env:BASE_PATH S:\LucaM\MachinesDeploy\$env:MACH_NAME\$env:MACH_VERS\ /XD "bin"
+      ROBOCOPY /MIR $env:BASE_PATH S:\LucaM\MachinesDeploy\$env:MACH_NAME\$env:MACH_VERS\ /XD "bin" /XD "$env:MACH_NAME_TEST"
       SLEEP 2
       net use S: /delete
 
@@ -35,8 +35,12 @@ variables:
       net use R: /delete
       SLEEP 2
       net use R: $env:NET_SHARE_R /u:$env:NET_USERQ $ZDRIVE_PASSWD
+      echo "-----------------------"
+      echo "   Copia macchina su R"
+      echo "-----------------------"
       ROBOCOPY /MIR "$env:SRC_PATH" "$env:DEST_MACHINES_PATH_R\$env:MACH_NAME\" /XD "bin"
-      ROBOCOPY "$env:TEST_PATH" "$env:DEST_MACHINES_PATH_R\$env:MACH_NAME_TEST\" /XD "bin"
+      ROBOCOPY "$env:TEST_PATH" "$env:DEST_MACHINES_PATH_R\$env:MACH_NAME_TEST\" /E /XD "bin"
+      ROBOCOPY /MIR "$env:BASE_PATH" "$env:DEST_MACHINES_PATH_R\Deploy\$env:MACH_NAME\$env:MACH_VERS\" /XD "bin" /XD "$env:MACH_NAME_TEST"
       SLEEP 2
       net use R: /delete
 
@@ -46,6 +50,9 @@ variables:
       net use R: /delete
       SLEEP 2
       net use R: $env:NET_SHARE_R /u:$env:NET_USERQ $ZDRIVE_PASSWD
+      echo "-----------------------"
+      echo "   Recupero file non git da R e copia su macchina virtuale"
+      echo "-----------------------"
       ROBOCOPY "$env:LAST_MACHINE_PATH" "$env:SRC_PATH" /E /XF "*.bat" /XF "*.yml" /XF ".gitignore" /XD ".git" /XF "UpdateLog.txt" /XD ".vscode"
       ROBOCOPY "$env:LAST_MACHINE_PATH" "$env:SRC_PATH\bin\$env:MACH_NAME\" /E /XF "*.bat" /XF "*.yml" /XF ".gitignore" /XD ".git" /XF "UpdateLog.txt" /XD ".vscode"
       SLEEP 2
@@ -54,14 +61,19 @@ variables:
 # helper compilazione LUA a 32 e 64 bit
 .LuaCompile: &LuaCompile
   - |
+
      Set-Alias lua54  C:\Tools\Lua32\luac54
-     echo "Copia file preliminare"
+     echo "-----------------------"
+     echo "   Copia file su macchina virtuale"
+     echo "-----------------------"
      ROBOCOPY . "$env:SRC_PATH" /E /XF "*.bat" /XF "*.yml" /XF ".gitignore" /XD ".git" /XF "UpdateLog.txt" /XD ".vscode"
      ROBOCOPY . "$env:TEST_PATH" /E /XF "*.bat" /XF "*.yml" /XF ".gitignore" /XD ".git" /XF "UpdateLog.txt" /XD ".vscode"
      Rename-Item -Path "$env:TEST_PATH\$env:MACH_NAME.mlde" -NewName "$env:MACH_NAME_TEST.mlde"
      Rename-Item -Path "$env:TEST_PATH\$env:MACH_NAME.ini" -NewName "$env:MACH_NAME_TEST.ini"
      ROBOCOPY . "$env:SRC_PATH\bin\$env:MACH_NAME\" /E /XF "*.bat" /XF "*.yml" /XF ".gitignore" /XD ".git" /XF "UpdateLog.txt" /XD ".vscode"
-     echo "Compilazione file *.lua 32/64bit"
+     echo "-----------------------"
+     echo "   Compilazione file *.lua 32/64bit"
+     echo "-----------------------"
      $FileList = Get-ChildItem("Common-*")
      ForEach ($File in $FileList) {
        $FileName = Split-Path $File -leaf
@@ -72,6 +84,9 @@ variables:
 # helper recupero nome macchina
 .machName-fix: &machName-fix
    - |
+      echo "-----------------------"
+      echo "   Recupero nome macchina"
+      echo "-----------------------"
       $fileName = dir *.mlde
       $env:MACH_NAME = $fileName.BaseName
       $env:MACH_NAME_TEST = $env:MACH_NAME + ".TEST"
@@ -79,6 +94,9 @@ variables:
 # helper calcolo versione
 .version-fix: &version-fix
    - |
+      echo "-----------------------"
+      echo "   Calcolo versione"
+      echo "-----------------------"
       $fPath = "$env:MACH_NAME.mlde";
       $vLine = Select-String -path $fPath -Pattern 'PP_VER';
       $comp = $vLine -split "=";
@@ -89,6 +107,9 @@ variables:
 # helper creazione folders 
 .folder-fix: &folder-fix
    - |
+      echo "-----------------------"
+      echo "   Creazione cartelle su macchina virtuale"
+      echo "-----------------------"
       $env:LAST_MACHINE_PATH = "$env:MACHINES_PATH_R\$env:MACH_NAME";
       Write-Output  $env:LAST_MACHINE_PATH;
       $env:SRC_PATH = "$env:TEMP_PATH\$env:MACH_NAME\$env:MACH_VERS\$env:MACH_NAME";
@@ -101,6 +122,7 @@ variables:
 # helper compressione e pulizia folders 
 .ZipClean: &ZipClean
    - |
+      "  Compressione file su macchina virtuale"
       $7zipPath = $env:ProgramFiles+"\7-Zip\7z.exe";
       if (-not (Test-Path -Path $7zipPath -PathType Leaf)) {
           throw "7 zip file '$7zipPath' not found"
@@ -129,7 +151,6 @@ LuaCompile:build:
  only:
    - main
    - master
-   - develop
  tags:
    - win
  before_script:
@@ -140,7 +161,6 @@ LuaCompile:build:
    - *CreateBaseFolder    
    - *LuaCompile
    - *ZipClean
-   - *ReplicaS
    - *ReplicaR
 
 # LuaCompile:test: