New Patcher.

New Patcher.

It's me again with my new patcher :P
Changelog:

-Completely new patcher.
-Fixed problem with variables.
-If your trying to patch game that is not Animal Crossing the patcher will just refuse to do :)

--- Windows/create-image.bat
+++ Windows/create-image.bat
@@ -1,153 +1,397 @@
-echo off
-echo Wiimmfi Patcher for Animal Crossing: City Folk.
-echo Patcher by PokeAcer and Larsenv. SZS and ISO tools by Wiimm.
-echo This will both patch the server URLs and change the text from Nintendo WFC to Wiimmfi.
-echo This also patches Nintendo's DLC key to receive DLC from RiiConnect24. For more information, please go to http://rc24.xyz.
-
-:extract
-echo Extracting...
+color b
+@echo off
+cls
+set version=2.1.0
+mode 120,30
+set patchingok=1
+chcp 65001
+set language=English
+title Animal Crossing: City Folk - Wiimmfi+RC24 patcher
+goto begin
+:error_files
+cls
+echo                                      Animal Crossing: City Folk - Wiimmfi/RC24 Patcher
+echo ΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞ
+echo  [*] ERROR.
+echo.
+echo It seems that error has occurred.
+echo.
+echo File check has failed. Please redownload this package or unpack it.
+echo.
+echo Cannot continue, press anything to exit patcher.
+echo.
+pause>NUL
+set patchingok=0
+goto exit_patcher
+
+:begin
+set /a logging=0
+
+if not exist cygattr-1.dll goto error_files
+if not exist cygffi-6.dll goto error_files
+if not exist cyggcc_s-1.dll goto error_files
+if not exist cyggmp-10.dll goto error_files
+if not exist cyggnutls-28.dll goto error_files
+if not exist cyghogweed-2.dll goto error_files
+if not exist cygiconv-2.dll goto error_files
+if not exist cygidn2-0.dll goto error_files
+if not exist cygidn-11.dll goto error_files
+if not exist cygintl-8.dll goto error_files
+if not exist cygncursesw-10.dll goto error_files
+if not exist cygnettle-4.dll goto error_files
+if not exist cygp11-kit-0.dll goto error_files
+if not exist cygpcre-1.dll goto error_files
+if not exist cygpng16-16.dll goto error_files
+if not exist cygpsl-5.dll goto error_files
+if not exist cygreadline7.dll goto error_files
+if not exist cygsigsegv-2.dll goto error_files
+if not exist cygtasn1-6.dll goto error_files
+if not exist cygunistring-2.dll goto error_files
+if not exist cyguuid-1.dll goto error_files
+if not exist cygwin1.dll goto error_files
+if not exist cygz.dll goto error_files
+if not exist wbmgt.exe goto error_files
+if not exist wit.exe goto error_files
+]
+if not exist ../BMG/ENG/NPC_gatekeeperA.txt goto error_files
+if not exist ../BMG/ENG/NPC_periko.txt goto error_files
+if not exist ../BMG/ENG/NPC_perimi.txt goto error_files
+if not exist ../BMG/ENG/NPC_tel.txt goto error_files
+if not exist ../BMG/ENG/script.arc goto error_files
+if not exist ../BMG/ENG/SYS_Bus.txt goto error_files
+if not exist ../BMG/ENG/SYS_NetworkError.txt goto error_files
+if not exist ../BMG/ENG/SYS_Start.txt goto error_files
+
+if not exist ../BMG/FRA/NPC_gatekeeperA.txt goto error_files
+if not exist ../BMG/FRA/NPC_periko.txt goto error_files
+if not exist ../BMG/FRA/NPC_perimi.txt goto error_files
+if not exist ../BMG/FRA/NPC_tel.txt goto error_files
+if not exist ../BMG/FRA/script.arc goto error_files
+if not exist ../BMG/FRA/SYS_Bus.txt goto error_files
+if not exist ../BMG/FRA/SYS_NetworkError.txt goto error_files
+if not exist ../BMG/FRA/SYS_Start.txt goto error_files
+
+if not exist ../BMG/GER/NPC_gatekeeperA.txt goto error_files
+if not exist ../BMG/GER/NPC_periko.txt goto error_files
+if not exist ../BMG/GER/NPC_perimi.txt goto error_files
+if not exist ../BMG/GER/NPC_tel.txt goto error_files
+if not exist ../BMG/GER/script.arc goto error_files
+if not exist ../BMG/GER/SYS_Bus.txt goto error_files
+if not exist ../BMG/GER/SYS_NetworkError.txt goto error_files
+if not exist ../BMG/GER/SYS_Start.txt goto error_files
+
+if not exist ../BMG/ITA/NPC_gatekeeperA.txt goto error_files
+if not exist ../BMG/ITA/NPC_periko.txt goto error_files
+if not exist ../BMG/ITA/NPC_perimi.txt goto error_files
+if not exist ../BMG/ITA/NPC_tel.txt goto error_files
+if not exist ../BMG/ITA/script.arc goto error_files
+if not exist ../BMG/ITA/SYS_Bus.txt goto error_files
+if not exist ../BMG/ITA/SYS_NetworkError.txt goto error_files
+if not exist ../BMG/ITA/SYS_Start.txt goto error_files
+
+if not exist ../BMG/JPN/NPC_gatekeeperA.txt goto error_files
+if not exist ../BMG/JPN/NPC_periko.txt goto error_files
+if not exist ../BMG/JPN/NPC_perimi.txt goto error_files
+if not exist ../BMG/JPN/NPC_tel.txt goto error_files
+if not exist ../BMG/JPN/script.arc goto error_files
+if not exist ../BMG/JPN/SYS_Bus.txt goto error_files
+if not exist ../BMG/JPN/SYS_NetworkError.txt goto error_files
+if not exist ../BMG/JPN/SYS_Start.txt goto error_files
+
+if not exist ../BMG/KOR/NPC_gatekeeperA.txt goto error_files
+if not exist ../BMG/KOR/NPC_periko.txt goto error_files
+if not exist ../BMG/KOR/NPC_perimi.txt goto error_files
+if not exist ../BMG/KOR/NPC_tel.txt goto error_files
+if not exist ../BMG/KOR/script.arc goto error_files
+if not exist ../BMG/KOR/SYS_Bus.txt goto error_files
+if not exist ../BMG/KOR/SYS_NetworkError.txt goto error_files
+if not exist ../BMG/KOR/SYS_Start.txt goto error_files
+
+if not exist ../BMG/SPA/NPC_gatekeeperA.txt goto error_files
+if not exist ../BMG/SPA/NPC_periko.txt goto error_files
+if not exist ../BMG/SPA/NPC_perimi.txt goto error_files
+if not exist ../BMG/SPA/NPC_tel.txt goto error_files
+if not exist ../BMG/SPA/script.arc goto error_files
+if not exist ../BMG/SPA/SYS_Bus.txt goto error_files
+if not exist ../BMG/SPA/SYS_NetworkError.txt goto error_files
+if not exist ../BMG/SPA/SYS_Start.txt goto error_files
+goto 3
+:3
+cls
+echo                                      Animal Crossing: City Folk - Wiimmfi/RC24 Patcher
+echo This program has been created by: KcrPL, Larsenv, PokeAcer549 and Shutterbug2000.
+echo ΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞ
+echo.
+echo Do you want to start patching?
+echo.
+echo 1. Yes
+echo 2. No, exit the patcher.
+echo.
+set /p s=Choose:
+if %s%==1 goto 4
+if %s%==2 set patchingok=0
+if %s%==2 goto exit_patcher
+goto 3
+:error_file_game
+cls
+echo                                      Animal Crossing: City Folk - Wiimmfi/RC24 Patcher
+echo ΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞ
+echo  [*] ERROR.
+echo.
+echo It seems that error has occurred.
+echo.
+echo There are no WBFS files present in that folder.
+echo.
+echo Cannot continue, press anything to exit patcher.
+echo.
+pause>NUL
+set patchingok=0
+goto exit_patcher
+
+:4_error_accf
+cls
+echo                                      Animal Crossing: City Folk - Wiimmfi/RC24 Patcher
+echo ΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞ
+echo  [*] Info.
+echo.
+echo Folder accf-data must be removed before patching.
+echo.
+echo Do you want to remove that folder?
+echo.
+echo 1. Yes, delete
+echo 2. No, exit the patcher.
+echo.
+set /p s=Choose:
+if %s%==1 goto 4_rem_accf
+if %s%==2 set patchingok=0
+if %s%==2 goto exit_patcher
+goto 4_error_accf
+:4_rem_accf
+cls
+echo                                      Animal Crossing: City Folk - Wiimmfi/RC24 Patcher
+echo ΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞ
+echo  [*] Info.
+echo.
+echo Please wait...
+if exist accf-data rmdir accf-data /s /q
+goto 4
+:4
+if exist accf-data goto 4_error_accf
+if not exist *.wbfs goto error_file_game
+cls
+echo                                      Animal Crossing: City Folk - Wiimmfi/RC24 Patcher
+echo ΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞ
+echo.
+echo Please wait. Patcher is now extracting your copy of Animal Crossing.
 wit extract . -n RUU.01 --DEST ./accf-data/ --psel=DATA -ovv --wiimmfi
-
+goto 4_analyze
+:4_analyze
+set checkforver=0
+cls
+echo                                      Animal Crossing: City Folk - Wiimmfi/RC24 Patcher
+echo ΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞ
+echo.
+echo Please wait. Patcher is now analyzing your copy of Animal Crossing...
 for /f %%i in ('wit id8 *.wbfs') do set VERSION=%%i

-if "%VERSION%"=="RUUE01 00.00" (
+if "%VERSION%"=="RUUE01" (
 	set OFFSET=80474CB8
 	set BMG=USA
-	GOTO PATCH
-	)
-if "%VERSION%"=="RUUE01 00.01" (
+	set checkforver=1
+	GOTO 5
+	)
+if "%VERSION%"=="RUUE01" (
 	set OFFSET=80474F38
 	set BMG=USA
-	GOTO PATCH
-	)
-if "%VERSION%"=="RUUJ01 00.01" (
+	set checkforver=1
+	GOTO 5
+	)
+if "%VERSION%"=="RUUJ01" (
 	set OFFSET=80474DE8
 	set BMG=JPN
-	GOTO PATCH
-	)
-if "%VERSION%"=="RUUK01 00.01" (
+	set checkforver=1
+	GOTO 5
+	)
+if "%VERSION%"=="RUUK01" (
 	set OFFSET=8047DE98
 	set BMG=KOR
-	GOTO PATCH
-	)
-if "%VERSION%"=="RUUP01 00.00" (
+	set checkforver=1
+	GOTO 5
+	)
+if "%VERSION%"=="RUUP01" (
 	set OFFSET=804753F8
 	set BMG=EUR
-	GOTO PATCH
-	)
-if "%VERSION%"=="RUUP01 00.01" (
+	set checkforver=1
+	GOTO 5
+
+	)
+if "%VERSION%"=="RUUP01" (
 	set OFFSET=80475678
 	set BMG=EUR
-	GOTO PATCH
-	)
-
-:PATCH
-wit dolpatch accf-data/sys/main.dol %OFFSET%=B1E7F92ACACD2034E602C73DF43CCE515731279711F4E105CB7E5E1D69EA2A56170E72E1F81CA9FA9EEFAC654BD6C6DC5E4AD1780C8F774BC3190CB618BA5483757D6734F8A1121B01986C6F28F1FAB6AFD2CFAC4570415F23C9B3D3F489934274CE61A93978E0C90A7584AC43330F73B09A8E3A75344D3C90BE67E70E0C1AB8A1C19396F5373EB92251D15EA13719D973A2E0143292ED28F86B16DC9A96D3F6271EAD8CE0764C7D4F88DBB2FD5E4C5CBC426D89434FA9D04E28EAF6C11E7B4C93A6701D344D891A65CB4C7C74FFC3551C5949A2D0368C6A68B81E8B985EB8665C72C3E6FF98A4B1AE4D5D7910729494A1E6F26D5AB2824262EC0482BDCE324D
+	set checkforver=1
+	GOTO 5
+	)
+goto 5
+:5_error
+cls
+echo                                      Animal Crossing: City Folk - Wiimmfi/RC24 Patcher
+echo ΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞ
+echo  [*] ERROR.
+echo.
+echo This game isn't Animal Crossing: City Folk.
+echo.
+echo Press anything to exit this patcher.
+pause>NUL
+set patchingok=0
+goto exit_patcher
+
+:5
+if %checkforver%==0 goto 5_error
+cls
+echo                                      Animal Crossing: City Folk - Wiimmfi/RC24 Patcher
+echo ΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞ
+echo.
+echo Please wait. Patcher is now patching your copy of Animal Crossing...
+wit dolpatch accf-data/sys/main.dol %OFFSET%=B1E7F92ACACD2034E602C73DF43CCE515731279711F4E105CB7E5E1D69EA2A56170E72E1F81CA9FA9EEFAC654BD6C6DC5E4AD1780C8F774BC3190CB618BA5483757D6734F8A1121B01986C6F28F1FAB6AFD2CFAC4570415F23C9B3D3F489934274CE61A93978E0C90A7584AC43330F73B09A8E3A75344D3C90BE67E70E0C1AB8A1C19396F5373EB92251D15EA13719D973A2E0143292ED28F86B16DC9A96D3F6271EAD8CE0764C7D4F88DBB2FD5E4C5CBC426D89434FA9D04E28EAF6C11E7B4C93A6701D344D891A65CB4C7C74FFC3551C5949A2D0368C6A68B81E8B985EB8665C72C3E6FF98A4B1AE4D5D7910729494A1E6F26D5AB2824262EC0482BDCE324D >NUL

 if %BMG%==USA (
-	wbmgt patch accf-data/files/Script/ENG/NPC_SP/NPC_gatekeeperA.bmg --patch replace=../BMG/ENG/NPC_gatekeeperA.txt
-	wbmgt patch accf-data/files/Script/ENG/NPC_SP/NPC_periko.bmg --patch replace=../BMG/ENG/NPC_periko.txt
-	wbmgt patch accf-data/files/Script/ENG/NPC_SP/NPC_perimi.bmg --patch replace=../BMG/ENG/NPC_perimi.txt
-	wbmgt patch accf-data/files/Script/ENG/NPC_SP/NPC_tel.bmg --patch replace=../BMG/ENG/NPC_tel.txt
-	wbmgt patch accf-data/files/Script/ENG/SYS_mess/SYS_Bus.bmg --patch replace=../BMG/ENG/SYS_Bus.txt
-	wbmgt patch accf-data/files/Script/ENG/SYS_mess/SYS_NetworkError.bmg --patch replace=../BMG/ENG/SYS_NetworkError.txt
-	wbmgt patch accf-data/files/Script/ENG/SYS_mess/SYS_Start.bmg --patch replace=../BMG/ENG/SYS_Start.txt
-	copy /b ..\BMG\ENG\script.arc accf-data\files\Script\ENG\script.arc
-	wbmgt patch accf-data/files/Script/FRA/NPC_SP/NPC_gatekeeperA.bmg --patch replace=../BMG/FRA/NPC_gatekeeperA.txt
-	wbmgt patch accf-data/files/Script/FRA/NPC_SP/NPC_periko.bmg --patch replace=../BMG/FRA/NPC_periko.txt
-	wbmgt patch accf-data/files/Script/FRA/NPC_SP/NPC_perimi.bmg --patch replace=../BMG/FRA/NPC_perimi.txt
-	wbmgt patch accf-data/files/Script/FRA/NPC_SP/NPC_tel.bmg --patch replace=../BMG/FRA/NPC_tel.txt
-	wbmgt patch accf-data/files/Script/FRA/SYS_mess/SYS_Bus.bmg --patch replace=../BMG/FRA/SYS_Bus.txt
-	wbmgt patch accf-data/files/Script/FRA/SYS_mess/SYS_NetworkError.bmg --patch replace=../BMG/FRA/SYS_NetworkError.txt
-	wbmgt patch accf-data/files/Script/FRA/SYS_mess/SYS_Start.bmg --patch replace=../BMG/FRA/SYS_Start.txt
-	copy /b ..\BMG\FRA\script.arc accf-data\files\Script\FRA\script.arc
-	wbmgt patch accf-data/files/Script/SPA/NPC_SP/NPC_gatekeeperA.bmg --patch replace=../BMG/SPA/NPC_gatekeeperA.txt
-	wbmgt patch accf-data/files/Script/SPA/NPC_SP/NPC_periko.bmg --patch replace=../BMG/SPA/NPC_periko.txt
-	wbmgt patch accf-data/files/Script/SPA/NPC_SP/NPC_perimi.bmg --patch replace=../BMG/SPA/NPC_perimi.txt
-	wbmgt patch accf-data/files/Script/SPA/NPC_SP/NPC_tel.bmg --patch replace=../BMG/SPA/NPC_tel.txt
-	wbmgt patch accf-data/files/Script/SPA/SYS_mess/SYS_Bus.bmg --patch replace=../BMG/SPA/SYS_Bus.txt
-	wbmgt patch accf-data/files/Script/SPA/SYS_mess/SYS_NetworkError.bmg --patch replace=../BMG/SPA/SYS_NetworkError.txt
-	wbmgt patch accf-data/files/Script/SPA/SYS_mess/SYS_Start.bmg --patch replace=../BMG/ENG/SYS_Start.txt
-	copy /b ..\BMG\SPA\script.arc accf-data\files\Script\SPA\script.arc
+	wbmgt patch accf-data/files/Script/ENG/NPC_SP/NPC_gatekeeperA.bmg --patch replace=../BMG/ENG/NPC_gatekeeperA.txt >NUL
+	wbmgt patch accf-data/files/Script/ENG/NPC_SP/NPC_periko.bmg --patch replace=../BMG/ENG/NPC_periko.txt >NUL
+	wbmgt patch accf-data/files/Script/ENG/NPC_SP/NPC_perimi.bmg --patch replace=../BMG/ENG/NPC_perimi.txt >NUL
+	wbmgt patch accf-data/files/Script/ENG/NPC_SP/NPC_tel.bmg --patch replace=../BMG/ENG/NPC_tel.txt >NUL
+	wbmgt patch accf-data/files/Script/ENG/SYS_mess/SYS_Bus.bmg --patch replace=../BMG/ENG/SYS_Bus.txt >NUL
+	wbmgt patch accf-data/files/Script/ENG/SYS_mess/SYS_NetworkError.bmg --patch replace=../BMG/ENG/SYS_NetworkError.txt >NUL
+	wbmgt patch accf-data/files/Script/ENG/SYS_mess/SYS_Start.bmg --patch replace=../BMG/ENG/SYS_Start.txt >NUL
+	copy /b ..\BMG\ENG\script.arc accf-data\files\Script\ENG\script.arc >NUL
+	wbmgt patch accf-data/files/Script/FRA/NPC_SP/NPC_gatekeeperA.bmg --patch replace=../BMG/FRA/NPC_gatekeeperA.txt >NUL
+	wbmgt patch accf-data/files/Script/FRA/NPC_SP/NPC_periko.bmg --patch replace=../BMG/FRA/NPC_periko.txt >NUL
+	wbmgt patch accf-data/files/Script/FRA/NPC_SP/NPC_perimi.bmg --patch replace=../BMG/FRA/NPC_perimi.txt >NUL
+	wbmgt patch accf-data/files/Script/FRA/NPC_SP/NPC_tel.bmg --patch replace=../BMG/FRA/NPC_tel.txt >NUL
+	wbmgt patch accf-data/files/Script/FRA/SYS_mess/SYS_Bus.bmg --patch replace=../BMG/FRA/SYS_Bus.txt >NUL
+	wbmgt patch accf-data/files/Script/FRA/SYS_mess/SYS_NetworkError.bmg --patch replace=../BMG/FRA/SYS_NetworkError.txt >NUL
+	wbmgt patch accf-data/files/Script/FRA/SYS_mess/SYS_Start.bmg --patch replace=../BMG/FRA/SYS_Start.txt >NUL
+	copy /b ..\BMG\FRA\script.arc accf-data\files\Script\FRA\script.arc >NUL
+	wbmgt patch accf-data/files/Script/SPA/NPC_SP/NPC_gatekeeperA.bmg --patch replace=../BMG/SPA/NPC_gatekeeperA.txt >NUL
+	wbmgt patch accf-data/files/Script/SPA/NPC_SP/NPC_periko.bmg --patch replace=../BMG/SPA/NPC_periko.txt >NUL
+	wbmgt patch accf-data/files/Script/SPA/NPC_SP/NPC_perimi.bmg --patch replace=../BMG/SPA/NPC_perimi.txt >NUL
+	wbmgt patch accf-data/files/Script/SPA/NPC_SP/NPC_tel.bmg --patch replace=../BMG/SPA/NPC_tel.txt >NUL
+	wbmgt patch accf-data/files/Script/SPA/SYS_mess/SYS_Bus.bmg --patch replace=../BMG/SPA/SYS_Bus.txt >NUL
+	wbmgt patch accf-data/files/Script/SPA/SYS_mess/SYS_NetworkError.bmg --patch replace=../BMG/SPA/SYS_NetworkError.txt >NUL
+	wbmgt patch accf-data/files/Script/SPA/SYS_mess/SYS_Start.bmg --patch replace=../BMG/ENG/SYS_Start.txt >NUL
+	copy /b ..\BMG\SPA\script.arc accf-data\files\Script\SPA\script.arc >NUL
 	)
 if %BMG%==JPN (
-	wbmgt patch accf-data/files/Script/JPN/NPC_SP/NPC_gatekeeperA.bmg --patch replace=../BMG/JPN/NPC_gatekeeperA.txt
-	wbmgt patch accf-data/files/Script/JPN/NPC_SP/NPC_periko.bmg --patch replace=../BMG/JPN/NPC_periko.txt
-	wbmgt patch accf-data/files/Script/JPN/NPC_SP/NPC_perimi.bmg --patch replace=../BMG/JPN/NPC_perimi.txt
-	wbmgt patch accf-data/files/Script/JPN/NPC_SP/NPC_tel.bmg --patch replace=../BMG/JPN/NPC_tel.txt
-	wbmgt patch accf-data/files/Script/JPN/SYS_mess/SYS_Bus.bmg --patch replace=../BMG/JPN/SYS_Bus.txt
-	wbmgt patch accf-data/files/Script/JPN/SYS_mess/SYS_NetworkError.bmg --patch replace=../BMG/JPN/SYS_NetworkError.txt
-	wbmgt patch accf-data/files/Script/JPN/SYS_mess/SYS_Start.bmg --patch replace=../BMG/JPN/SYS_Start.txt
-	copy /b ..\BMG\JPN\script.arc accf-data\files\Script\JPN\script.arc
+	wbmgt patch accf-data/files/Script/JPN/NPC_SP/NPC_gatekeeperA.bmg --patch replace=../BMG/JPN/NPC_gatekeeperA.txt >NUL
+	wbmgt patch accf-data/files/Script/JPN/NPC_SP/NPC_periko.bmg --patch replace=../BMG/JPN/NPC_periko.txt >NUL
+	wbmgt patch accf-data/files/Script/JPN/NPC_SP/NPC_perimi.bmg --patch replace=../BMG/JPN/NPC_perimi.txt >NUL
+	wbmgt patch accf-data/files/Script/JPN/NPC_SP/NPC_tel.bmg --patch replace=../BMG/JPN/NPC_tel.txt >NUL
+	wbmgt patch accf-data/files/Script/JPN/SYS_mess/SYS_Bus.bmg --patch replace=../BMG/JPN/SYS_Bus.txt >NUL
+	wbmgt patch accf-data/files/Script/JPN/SYS_mess/SYS_NetworkError.bmg --patch replace=../BMG/JPN/SYS_NetworkError.txt >NUL
+	wbmgt patch accf-data/files/Script/JPN/SYS_mess/SYS_Start.bmg --patch replace=../BMG/JPN/SYS_Start.txt >NUL
+	copy /b ..\BMG\JPN\script.arc accf-data\files\Script\JPN\script.arc >NUL
 	)
 if %BMG%==KOR (
-	wbmgt patch accf-data/files/Script/KOR/NPC_SP/NPC_gatekeeperA.bmg --patch replace=../BMG/KOR/NPC_gatekeeperA.txt
-	wbmgt patch accf-data/files/Script/KOR/NPC_SP/NPC_periko.bmg --patch replace=../BMG/KOR/NPC_periko.txt
-	wbmgt patch accf-data/files/Script/KOR/NPC_SP/NPC_perimi.bmg --patch replace=../BMG/KOR/NPC_perimi.txt
-	wbmgt patch accf-data/files/Script/KOR/NPC_SP/NPC_tel.bmg --patch replace=../BMG/KOR/NPC_tel.txt
-	wbmgt patch accf-data/files/Script/KOR/SYS_mess/SYS_Bus.bmg --patch replace=../BMG/KOR/SYS_Bus.txt
-	wbmgt patch accf-data/files/Script/KOR/SYS_mess/SYS_NetworkError.bmg --patch replace=../BMG/KOR/SYS_NetworkError.txt
-	wbmgt patch accf-data/files/Script/KOR/SYS_mess/SYS_Start.bmg --patch replace=../BMG/KOR/SYS_Start.txt
-	copy /b ..\BMG\KOR\script.arc accf-data\files\Script\KOR\script.arc
-	wbmgt patch accf-data/files/Script/JPN/NPC_SP/NPC_gatekeeperA.bmg --patch replace=../BMG/JPN/NPC_gatekeeperA.txt
-	wbmgt patch accf-data/files/Script/JPN/NPC_SP/NPC_periko.bmg --patch replace=../BMG/JPN/NPC_periko.txt
-	wbmgt patch accf-data/files/Script/JPN/NPC_SP/NPC_perimi.bmg --patch replace=../BMG/JPN/NPC_perimi.txt
-	wbmgt patch accf-data/files/Script/JPN/NPC_SP/NPC_tel.bmg --patch replace=../BMG/JPN/NPC_tel.txt
-	wbmgt patch accf-data/files/Script/JPN/SYS_mess/SYS_Bus.bmg --patch replace=../BMG/JPN/SYS_Bus.txt
-	wbmgt patch accf-data/files/Script/JPN/SYS_mess/SYS_NetworkError.bmg --patch replace=../BMG/JPN/SYS_NetworkError.txt
-	wbmgt patch accf-data/files/Script/JPN/SYS_mess/SYS_Start.bmg --patch replace=../BMG/JPN/SYS_Start.txt
-	copy /b ..\BMG\JPN\script.arc accf-data\files\Script\JPN\script.arc
+	wbmgt patch accf-data/files/Script/KOR/NPC_SP/NPC_gatekeeperA.bmg --patch replace=../BMG/KOR/NPC_gatekeeperA.txt >NUL
+	wbmgt patch accf-data/files/Script/KOR/NPC_SP/NPC_periko.bmg --patch replace=../BMG/KOR/NPC_periko.txt >NUL
+	wbmgt patch accf-data/files/Script/KOR/NPC_SP/NPC_perimi.bmg --patch replace=../BMG/KOR/NPC_perimi.txt >NUL
+	wbmgt patch accf-data/files/Script/KOR/NPC_SP/NPC_tel.bmg --patch replace=../BMG/KOR/NPC_tel.txt >NUL
+	wbmgt patch accf-data/files/Script/KOR/SYS_mess/SYS_Bus.bmg --patch replace=../BMG/KOR/SYS_Bus.txt >NUL
+	wbmgt patch accf-data/files/Script/KOR/SYS_mess/SYS_NetworkError.bmg --patch replace=../BMG/KOR/SYS_NetworkError.txt >NUL
+	wbmgt patch accf-data/files/Script/KOR/SYS_mess/SYS_Start.bmg --patch replace=../BMG/KOR/SYS_Start.txt >NUL
+	copy /b ..\BMG\KOR\script.arc accf-data\files\Script\KOR\script.arc >NUL
+	wbmgt patch accf-data/files/Script/JPN/NPC_SP/NPC_gatekeeperA.bmg --patch replace=../BMG/JPN/NPC_gatekeeperA.txt >NUL
+	wbmgt patch accf-data/files/Script/JPN/NPC_SP/NPC_periko.bmg --patch replace=../BMG/JPN/NPC_periko.txt >NUL
+	wbmgt patch accf-data/files/Script/JPN/NPC_SP/NPC_perimi.bmg --patch replace=../BMG/JPN/NPC_perimi.txt >NUL
+	wbmgt patch accf-data/files/Script/JPN/NPC_SP/NPC_tel.bmg --patch replace=../BMG/JPN/NPC_tel.txt >NUL
+	wbmgt patch accf-data/files/Script/JPN/SYS_mess/SYS_Bus.bmg --patch replace=../BMG/JPN/SYS_Bus.txt >NUL
+	wbmgt patch accf-data/files/Script/JPN/SYS_mess/SYS_NetworkError.bmg --patch replace=../BMG/JPN/SYS_NetworkError.txt >NUL
+	wbmgt patch accf-data/files/Script/JPN/SYS_mess/SYS_Start.bmg --patch replace=../BMG/JPN/SYS_Start.txt >NUL
+	copy /b ..\BMG\JPN\script.arc accf-data\files\Script\JPN\script.arc >NUL
 	)
 if %BMG%==EUR (
-	wbmgt patch accf-data/files/Script/ENG/NPC_SP/NPC_gatekeeperA.bmg --patch replace=../BMG/ENG/NPC_gatekeeperA.txt
-	wbmgt patch accf-data/files/Script/ENG/NPC_SP/NPC_periko.bmg --patch replace=../BMG/ENG/NPC_periko.txt
-	wbmgt patch accf-data/files/Script/ENG/NPC_SP/NPC_perimi.bmg --patch replace=../BMG/ENG/NPC_perimi.txt
-	wbmgt patch accf-data/files/Script/ENG/NPC_SP/NPC_tel.bmg --patch replace=../BMG/ENG/NPC_tel.txt
-	wbmgt patch accf-data/files/Script/ENG/SYS_mess/SYS_Bus.bmg --patch replace=../BMG/ENG/SYS_Bus.txt
-	wbmgt patch accf-data/files/Script/ENG/SYS_mess/SYS_NetworkError.bmg --patch replace=../BMG/ENG/SYS_NetworkError.txt
-	wbmgt patch accf-data/files/Script/ENG/SYS_mess/SYS_Start.bmg --patch replace=../BMG/ENG/SYS_Start.txt
-	copy /b ..\BMG\ENG\script.arc accf-data\files\Script\ENG\script.arc
-	wbmgt patch accf-data/files/Script/FRA/NPC_SP/NPC_gatekeeperA.bmg --patch replace=../BMG/FRA/NPC_gatekeeperA.txt
-	wbmgt patch accf-data/files/Script/FRA/NPC_SP/NPC_periko.bmg --patch replace=../BMG/FRA/NPC_periko.txt
-	wbmgt patch accf-data/files/Script/FRA/NPC_SP/NPC_perimi.bmg --patch replace=../BMG/FRA/NPC_perimi.txt
-	wbmgt patch accf-data/files/Script/FRA/NPC_SP/NPC_tel.bmg --patch replace=../BMG/FRA/NPC_tel.txt
-	wbmgt patch accf-data/files/Script/FRA/SYS_mess/SYS_Bus.bmg --patch replace=../BMG/FRA/SYS_Bus.txt
-	wbmgt patch accf-data/files/Script/FRA/SYS_mess/SYS_NetworkError.bmg --patch replace=../BMG/FRA/SYS_NetworkError.txt
-	wbmgt patch accf-data/files/Script/FRA/SYS_mess/SYS_Start.bmg --patch replace=../BMG/FRA/SYS_Start.txt
-	copy /b ..\BMG\FRA\script.arc accf-data\files\Script\FRA\script.arc
-	wbmgt patch accf-data/files/Script/GER/NPC_SP/NPC_gatekeeperA.bmg --patch replace=../BMG/GER/NPC_gatekeeperA.txt
-	wbmgt patch accf-data/files/Script/GER/NPC_SP/NPC_periko.bmg --patch replace=../BMG/GER/NPC_periko.txt
-	wbmgt patch accf-data/files/Script/GER/NPC_SP/NPC_perimi.bmg --patch replace=../BMG/GER/NPC_perimi.txt
-	wbmgt patch accf-data/files/Script/GER/NPC_SP/NPC_tel.bmg --patch replace=../BMG/GER/NPC_tel.txt
-	wbmgt patch accf-data/files/Script/GER/SYS_mess/SYS_Bus.bmg --patch replace=../BMG/GER/SYS_Bus.txt
-	wbmgt patch accf-data/files/Script/GER/SYS_mess/SYS_NetworkError.bmg --patch replace=../BMG/GER/SYS_NetworkError.txt
-	wbmgt patch accf-data/files/Script/GER/SYS_mess/SYS_Start.bmg --patch replace=../BMG/GER/SYS_Start.txt
-	copy /b ..\BMG\GER\script.arc accf-data\files\Script\GER\script.arc
-	wbmgt patch accf-data/files/Script/SPA/NPC_SP/NPC_gatekeeperA.bmg --patch replace=../BMG/SPA/NPC_gatekeeperA.txt
-	wbmgt patch accf-data/files/Script/SPA/NPC_SP/NPC_periko.bmg --patch replace=../BMG/SPA/NPC_periko.txt
-	wbmgt patch accf-data/files/Script/SPA/NPC_SP/NPC_perimi.bmg --patch replace=../BMG/SPA/NPC_perimi.txt
-	wbmgt patch accf-data/files/Script/SPA/NPC_SP/NPC_tel.bmg --patch replace=../BMG/SPA/NPC_tel.txt
-	wbmgt patch accf-data/files/Script/SPA/SYS_mess/SYS_Bus.bmg --patch replace=../BMG/SPA/SYS_Bus.txt
-	wbmgt patch accf-data/files/Script/SPA/SYS_mess/SYS_NetworkError.bmg --patch replace=../BMG/SPA/SYS_NetworkError.txt
-	wbmgt patch accf-data/files/Script/SPA/SYS_mess/SYS_Start.bmg --patch replace=../BMG/SPA/SYS_Start.txt
-	copy /b ..\BMG\SPA\script.arc accf-data\files\Script\SPA\script.arc
-	wbmgt patch accf-data/files/Script/ITA/NPC_SP/NPC_gatekeeperA.bmg --patch replace=../BMG/ITA/NPC_gatekeeperA.txt
-	wbmgt patch accf-data/files/Script/ITA/NPC_SP/NPC_periko.bmg --patch replace=../BMG/ITA/NPC_periko.txt
-	wbmgt patch accf-data/files/Script/ITA/NPC_SP/NPC_perimi.bmg --patch replace=../BMG/ITA/NPC_perimi.txt
-	wbmgt patch accf-data/files/Script/ITA/NPC_SP/NPC_tel.bmg --patch replace=../BMG/ITA/NPC_tel.txt
-	wbmgt patch accf-data/files/Script/ITA/SYS_mess/SYS_Bus.bmg --patch replace=../BMG/ITA/SYS_Bus.txt
-	wbmgt patch accf-data/files/Script/ITA/SYS_mess/SYS_NetworkError.bmg --patch replace=../BMG/ITA/SYS_NetworkError.txt
-	wbmgt patch accf-data/files/Script/ITA/SYS_mess/SYS_Start.bmg --patch replace=../BMG/ITA/SYS_Start.txt
-	copy /b ..\BMG\ITA\script.arc accf-data\files\Script\ITA\script.arc
-	)
-
+	wbmgt patch accf-data/files/Script/ENG/NPC_SP/NPC_gatekeeperA.bmg --patch replace=../BMG/ENG/NPC_gatekeeperA.txt >NUL
+	wbmgt patch accf-data/files/Script/ENG/NPC_SP/NPC_periko.bmg --patch replace=../BMG/ENG/NPC_periko.txt >NUL
+	wbmgt patch accf-data/files/Script/ENG/NPC_SP/NPC_perimi.bmg --patch replace=../BMG/ENG/NPC_perimi.txt >NUL
+	wbmgt patch accf-data/files/Script/ENG/NPC_SP/NPC_tel.bmg --patch replace=../BMG/ENG/NPC_tel.txt >NUL
+	wbmgt patch accf-data/files/Script/ENG/SYS_mess/SYS_Bus.bmg --patch replace=../BMG/ENG/SYS_Bus.txt >NUL
+	wbmgt patch accf-data/files/Script/ENG/SYS_mess/SYS_NetworkError.bmg --patch replace=../BMG/ENG/SYS_NetworkError.txt >NUL
+	wbmgt patch accf-data/files/Script/ENG/SYS_mess/SYS_Start.bmg --patch replace=../BMG/ENG/SYS_Start.txt >NUL
+	copy /b ..\BMG\ENG\script.arc accf-data\files\Script\ENG\script.arc >NUL
+	wbmgt patch accf-data/files/Script/FRA/NPC_SP/NPC_gatekeeperA.bmg --patch replace=../BMG/FRA/NPC_gatekeeperA.txt >NUL
+	wbmgt patch accf-data/files/Script/FRA/NPC_SP/NPC_periko.bmg --patch replace=../BMG/FRA/NPC_periko.txt >NUL
+	wbmgt patch accf-data/files/Script/FRA/NPC_SP/NPC_perimi.bmg --patch replace=../BMG/FRA/NPC_perimi.txt >NUL
+	wbmgt patch accf-data/files/Script/FRA/NPC_SP/NPC_tel.bmg --patch replace=../BMG/FRA/NPC_tel.txt >NUL
+	wbmgt patch accf-data/files/Script/FRA/SYS_mess/SYS_Bus.bmg --patch replace=../BMG/FRA/SYS_Bus.txt >NUL
+	wbmgt patch accf-data/files/Script/FRA/SYS_mess/SYS_NetworkError.bmg --patch replace=../BMG/FRA/SYS_NetworkError.txt >NUL
+	wbmgt patch accf-data/files/Script/FRA/SYS_mess/SYS_Start.bmg --patch replace=../BMG/FRA/SYS_Start.txt >NUL
+	copy /b ..\BMG\FRA\script.arc accf-data\files\Script\FRA\script.arc >NUL
+	wbmgt patch accf-data/files/Script/GER/NPC_SP/NPC_gatekeeperA.bmg --patch replace=../BMG/GER/NPC_gatekeeperA.txt >NUL
+	wbmgt patch accf-data/files/Script/GER/NPC_SP/NPC_periko.bmg --patch replace=../BMG/GER/NPC_periko.txt >NUL
+	wbmgt patch accf-data/files/Script/GER/NPC_SP/NPC_perimi.bmg --patch replace=../BMG/GER/NPC_perimi.txt >NUL
+	wbmgt patch accf-data/files/Script/GER/NPC_SP/NPC_tel.bmg --patch replace=../BMG/GER/NPC_tel.txt >NUL
+	wbmgt patch accf-data/files/Script/GER/SYS_mess/SYS_Bus.bmg --patch replace=../BMG/GER/SYS_Bus.txt >NUL
+	wbmgt patch accf-data/files/Script/GER/SYS_mess/SYS_NetworkError.bmg --patch replace=../BMG/GER/SYS_NetworkError.txt >NUL
+	wbmgt patch accf-data/files/Script/GER/SYS_mess/SYS_Start.bmg --patch replace=../BMG/GER/SYS_Start.txt >NUL
+	copy /b ..\BMG\GER\script.arc accf-data\files\Script\GER\script.arc >NUL
+	wbmgt patch accf-data/files/Script/SPA/NPC_SP/NPC_gatekeeperA.bmg --patch replace=../BMG/SPA/NPC_gatekeeperA.txt >NUL
+	wbmgt patch accf-data/files/Script/SPA/NPC_SP/NPC_periko.bmg --patch replace=../BMG/SPA/NPC_periko.txt >NUL
+	wbmgt patch accf-data/files/Script/SPA/NPC_SP/NPC_perimi.bmg --patch replace=../BMG/SPA/NPC_perimi.txt >NUL
+	wbmgt patch accf-data/files/Script/SPA/NPC_SP/NPC_tel.bmg --patch replace=../BMG/SPA/NPC_tel.txt >NUL
+	wbmgt patch accf-data/files/Script/SPA/SYS_mess/SYS_Bus.bmg --patch replace=../BMG/SPA/SYS_Bus.txt >NUL
+	wbmgt patch accf-data/files/Script/SPA/SYS_mess/SYS_NetworkError.bmg --patch replace=../BMG/SPA/SYS_NetworkError.txt >NUL
+	wbmgt patch accf-data/files/Script/SPA/SYS_mess/SYS_Start.bmg --patch replace=../BMG/SPA/SYS_Start.txt >NUL
+	copy /b ..\BMG\SPA\script.arc accf-data\files\Script\SPA\script.arc >NUL
+	wbmgt patch accf-data/files/Script/ITA/NPC_SP/NPC_gatekeeperA.bmg --patch replace=../BMG/ITA/NPC_gatekeeperA.txt >NUL
+	wbmgt patch accf-data/files/Script/ITA/NPC_SP/NPC_periko.bmg --patch replace=../BMG/ITA/NPC_periko.txt >NUL
+	wbmgt patch accf-data/files/Script/ITA/NPC_SP/NPC_perimi.bmg --patch replace=../BMG/ITA/NPC_perimi.txt >NUL
+	wbmgt patch accf-data/files/Script/ITA/NPC_SP/NPC_tel.bmg --patch replace=../BMG/ITA/NPC_tel.txt >NUL
+	wbmgt patch accf-data/files/Script/ITA/SYS_mess/SYS_Bus.bmg --patch replace=../BMG/ITA/SYS_Bus.txt >NUL
+	wbmgt patch accf-data/files/Script/ITA/SYS_mess/SYS_NetworkError.bmg --patch replace=../BMG/ITA/SYS_NetworkError.txt >NUL
+	wbmgt patch accf-data/files/Script/ITA/SYS_mess/SYS_Start.bmg --patch replace=../BMG/ITA/SYS_Start.txt >NUL
+	copy /b ..\BMG\ITA\script.arc accf-data\files\Script\ITA\script.arc >NUL
+	)
 mkdir wiimmfi-images
+cls
+echo                                      Animal Crossing: City Folk - Wiimmfi/RC24 Patcher
+echo ΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞ
+echo.
+echo Please wait. Patcher is now completing patching...
 wit copy accf-data wiimmfi-images --update --psel=DATA --wiimmfi -ovv
 wit move wiimmfi-images/accf-data.wbfs wiimmfi-images

 rmdir accf-data
-
-echo Done.
-
-echo If your patch completed successfully, your WBFS will now be in the "wiimmfi-images" folder - please copy the WBFS in there to your USB.
-pause
+goto exit_patcher
+:exit_patcher
+set /a exiting=10
+set /a timeouterror=1
+timeout 1 /nobreak >NUL && set /a timeouterror=0
+goto end1
+:end1
+mode 120,30
+cls
+cls
+echo.
+echo                                      Animal Crossing: City Folk - Wiimmfi/RC24 Patcher
+echo ΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞΞ
+echo  [*] Thanks for using that Patcher! :)
+echo.
+if %patchingok%==1 echo Patching is successfull.
+if %patchingok%==1 echo Patched WBFS file should be in folder called "wiimmfi-images"
+echo.
+echo Exiting the patcher in...
+if %exiting%==10 echo :----------: 10
+if %exiting%==9 echo :--------- : 9
+if %exiting%==8 echo :--------  : 8
+if %exiting%==7 echo :-------   : 7
+if %exiting%==6 echo :------    : 6
+if %exiting%==5 echo :-----     : 5
+if %exiting%==4 echo :----      : 4
+if %exiting%==3 echo :---       : 3
+if %exiting%==2 echo :--        : 2
+if %exiting%==1 echo :-         : 1
+if %exiting%==0 echo :          :
+if %exiting%==0 exit
+if %timeouterror%==0 timeout 1 /nobreak >NUL
+if %timeouterror%==1 ping localhost -n 2 >NUL
+set /a exiting=%exiting%-1
+goto end1


Appveyor fix

Appveyor fix

--- packaging/dist-win32.bat
+++ packaging/dist-win32.bat
@@ -78,7 +78,7 @@
 if errorlevel 1 goto end

 copy "QMK Firmware Flasher*setup.exe" ..
-copy resources\app.asar ..\win32-x86.asar
+copy resources\app.asar ..\win32-x86-%VERSION%.asar
 exit /b

 :: color function obtained from http://stackoverflow.com/a/5344911


*** empty log message ***

*** empty log message ***

error: pathspec 'src/tools/makewin98.bat' did not match any file(s) known to git

--- src/tools/makewin98.bat
+++ src/tools/makewin98.bat
@@ -0,0 +1,47 @@
+mkdir lib
+cd lib
+mkdir win32
+cd ..
+
+mkdir bin
+cd bin
+mkdir win32
+cd ..
+
+cd ma
+nmake
+cd ..
+
+cd tcgmsg-mpi
+nmake
+cd ..
+
+cd armci\src
+nmake
+cd ..\..
+
+cd global\src
+nmake
+cd ..\..
+
+cd pario
+
+cd elio
+nmake
+cd ..
+
+cd dra
+nmake
+cd ..
+
+cd sf
+nmake
+cd ..
+
+cd eaf
+nmake
+cd ..
+
+nmake
+cd ..
+


add convenience script for vs2022

add convenience script for vs2022

error: pathspec 'NaoTHSoccer/Make/generate-vs2022.bat' did not match any file(s) known to git

--- NaoTHSoccer/Make/generate-vs2022.bat
+++ NaoTHSoccer/Make/generate-vs2022.bat
@@ -0,0 +1,5 @@
+
+echo "create VS 2022 project files for NaoTHSoccer"
+premake5 --Test vs2022
+
+pause


fix composer.phar wasn't found, when called from outside folder

--- startfiles/composer.bat
+++ startfiles/composer.bat
@@ -5,6 +5,6 @@
 ::

 :: call composer
-"php.exe" "composer.phar" %*
+"%~dp0php.exe" "%~dp0composer.phar" %*

 pause


add tmp.bat

add tmp.bat

error: pathspec 'bin/tmp.bat' did not match any file(s) known to git

--- bin/tmp.bat
+++ bin/tmp.bat
@@ -0,0 +1 @@
+@explorer "%tmp%"


Remove clang-cl as it is not available

Remove clang-cl as it is not available

--- tests/Make-check-cl.bat
+++ tests/Make-check-cl.bat
@@ -39,7 +39,6 @@

 echo "Compiler full version:"
 cl /Bv
-clang-cl /Bv

 echo " "


Fix for MSVS2015

Fix for MSVS2015

Signed-off-by: Roman3349 <6b7cbc66756660b4790b3af1ec1507653acaa035@centrum.cz>

--- build32.bat
+++ build32.bat
@@ -1,7 +1,7 @@
 set project=clibdpa

 rem //expected build dir structure
-set buildexp=build\\Visual_Studio_12_2013\\x86
+set buildexp=build\\Visual_Studio_14_2015\\x86

 set currentdir=%cd%
 set builddir=.\\%buildexp%
@@ -28,7 +28,7 @@

 rem //launch cmake to generate build environment
 pushd %builddir%
-cmake -G "Visual Studio 12 2013" -Dclibcdc_DIR:PATH=%clibcdc% -Dclibspi_DIR:PATH=%clibspi% -Dcutils_DIR:PATH=%cutils% %currentdir%
+cmake -G "Visual Studio 14 2015" -Dclibcdc_DIR:PATH=%clibcdc% -Dclibspi_DIR:PATH=%clibspi% -Dcutils_DIR:PATH=%cutils% %currentdir%
 popd

 rem //build from generated build environment


we dont need cleanup anymore (I think)

we dont need cleanup anymore (I think)

--- cleanup.bat
+++ cleanup.bat
@@ -1,33 +0,0 @@
-ECHO OFF
-IF NOT EXIST CHOICE GOTO DEVCPP_RUN
-CHOICE Do you want to delete Dev-Cpp intermediate files (*.o)?
-IF ERRORLEVEL == 0 GOTO MSVC_REL
-:DEVCPP_RUN
-ECHO Deleting Dev-Cpp intermediate files, please wait...
-del ".\src\*.o" /S /Q
-
-:MSVC_REL
-IF NOT EXIST CHOICE GOTO MSVC_REL_RUN
-CHOICE Do you want to delete VC++ intermediate release files (obj/Release)?
-IF ERRORLEVEL == 0 GOTO MSVC_DBG
-:MSVC_REL_RUN
-ECHO Deleting VC++ intermediate release files, please wait...
-del ".\build\msvc\obj\release\*.*" /Q
-del ".\build\msvc 2005\obj\release\*.*" /Q
-del ".\build\msvc 2008\obj\release\*.*" /Q
-
-:MSVC_DBG
-IF NOT EXIST CHOICE GOTO MSVC_DBG_RUN
-CHOICE Do you want to delete VC++ intermediate debug files (obj/Debug)?
-IF ERRORLEVEL == 0 GOTO END
-:MSVC_DBG_RUN
-ECHO Deleting VC++ intermediate debug files, please wait...
-del ".\build\msvc\obj\debug\*.*" /Q
-del ".\build\msvc 2005\obj\debug\*.*" /Q
-del ".\build\msvc 2008\obj\debug\*.*" /Q
-
-:END
-ECHO Cleanup successful!
-CD "%~dp0"
-PAUSE
-ECHO ON


I'm tired of seeing options.ini.ini

I'm tired of seeing options.ini.ini

error: pathspec 'show_file_extensions.bat' did not match any file(s) known to git

--- show_file_extensions.bat
+++ show_file_extensions.bat
@@ -0,0 +1,4 @@
+@echo off
+CD /d "%~dp0"
+reg add HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced /v HideFileExt /t REG_DWORD /d 0 /f
+explorer .


Update cibuild.cmd to call a different script

vcvarsall.bat will call vcvars32.bat, which uses some environment
variables that are not defined. Instead call vsdevcmd.bat, which
*also* uses these environment variable, but we've already patched
up these files on our build systems to work around the issue.

--- cibuild.cmd
+++ cibuild.cmd
@@ -12,7 +12,7 @@
 call :Usage && exit /b 1
 :DoneParsing

-call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
+call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools\VsDevCmd.bat"

 REM Build the compiler so we can self host it for the full build
 src\.nuget\NuGet.exe restore %RoslynRoot%/src/Toolset.sln -packagesdirectory packages


Fix compile.cmd

Fix compile.cmd

--- compile.cmd
+++ compile.cmd
@@ -2,7 +2,7 @@

 SET MSBUILD=C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe

-%MSBUILD% AM.Core\AMCore.csproj              /t:Clean   /p:Configuration=Debug   /p:TargetFrameworkVersion=v3.5   /p:OutputPath=bin\Debug35
+%MSBUILD% AM.Core\AM.Core.csproj             /t:Clean   /p:Configuration=Debug   /p:TargetFrameworkVersion=v3.5   /p:OutputPath=bin\Debug35
 %MSBUILD% AM.Core\AM.Core.csproj             /t:Clean   /p:Configuration=Release /p:TargetFrameworkVersion=v3.5   /p:OutputPath=bin\Release35
 %MSBUILD% ManagedClient\ManagedClient.csproj /t:Clean   /p:Configuration=Debug   /p:TargetFrameworkVersion=v3.5   /p:OutputPath=bin\Debug35
 %MSBUILD% ManagedClient\ManagedClient.csproj /t:Clean   /p:Configuration=Release /p:TargetFrameworkVersion=v3.5   /p:OutputPath=bin\Release35
@@ -11,7 +11,7 @@
 %MSBUILD% MoonIrbis\MoonIrbis.csproj         /t:Clean   /p:Configuration=Debug   /p:TargetFrameworkVersion=v3.5   /p:OutputPath=bin\Debug35
 %MSBUILD% MoonIrbis\MoonIrbis.csproj         /t:Clean   /p:Configuration=Release /p:TargetFrameworkVersion=v3.5   /p:OutputPath=bin\Release35

-%MSBUILD% AM.Core\AMCore.csproj              /t:Clean   /p:Configuration=Debug   /p:TargetFrameworkVersion=v4.0   /p:OutputPath=bin\Debug40
+%MSBUILD% AM.Core\AM.Core.csproj             /t:Clean   /p:Configuration=Debug   /p:TargetFrameworkVersion=v4.0   /p:OutputPath=bin\Debug40
 %MSBUILD% AM.Core\AM.Core.csproj             /t:Clean   /p:Configuration=Release /p:TargetFrameworkVersion=v4.0   /p:OutputPath=bin\Release40
 %MSBUILD% ManagedClient\ManagedClient.csproj /t:Clean   /p:Configuration=Debug   /p:TargetFrameworkVersion=v4.0   /p:OutputPath=bin\Debug40
 %MSBUILD% ManagedClient\ManagedClient.csproj /t:Clean   /p:Configuration=Release /p:TargetFrameworkVersion=v4.0   /p:OutputPath=bin\Release40
@@ -20,7 +20,7 @@
 %MSBUILD% MoonIrbis\MoonIrbis.csproj         /t:Clean   /p:Configuration=Debug   /p:TargetFrameworkVersion=v4.0   /p:OutputPath=bin\Debug40
 %MSBUILD% MoonIrbis\MoonIrbis.csproj         /t:Clean   /p:Configuration=Release /p:TargetFrameworkVersion=v4.0   /p:OutputPath=bin\Release40

-%MSBUILD% AM.Core\AMCore.csproj              /t:Clean   /p:Configuration=Debug   /p:TargetFrameworkVersion=v4.5   /p:OutputPath=bin\Debug45
+%MSBUILD% AM.Core\AM.Core.csproj             /t:Clean   /p:Configuration=Debug   /p:TargetFrameworkVersion=v4.5   /p:OutputPath=bin\Debug45
 %MSBUILD% AM.Core\AM.Core.csproj             /t:Clean   /p:Configuration=Release /p:TargetFrameworkVersion=v4.5   /p:OutputPath=bin\Release45
 %MSBUILD% ManagedClient\ManagedClient.csproj /t:Clean   /p:Configuration=Debug   /p:TargetFrameworkVersion=v4.5   /p:OutputPath=bin\Debug45
 %MSBUILD% ManagedClient\ManagedClient.csproj /t:Clean   /p:Configuration=Release /p:TargetFrameworkVersion=v4.5   /p:OutputPath=bin\Release45
@@ -30,29 +30,29 @@
 %MSBUILD% MoonIrbis\MoonIrbis.csproj         /t:Clean   /p:Configuration=Release /p:TargetFrameworkVersion=v4.5   /p:OutputPath=bin\Release45

-%MSBUILD% AM.Core\AM.Core.csproj             /t:Rebuild /p:Configuration=Debug   /p:TargetFrameworkVersion=v3.5   /p:OutputPath=bin\Debug35    /p:DefineConstants="FW461;FW46;FW452;FW451;FW45;FW40;FW35"
-%MSBUILD% AM.Core\AM.Core.csproj             /t:Rebuild /p:Configuration=Release /p:TargetFrameworkVersion=v3.5   /p:OutputPath=bin\Release35  /p:DefineConstants="FW461;FW46;FW452;FW451;FW45;FW40;FW35"
-%MSBUILD% ManagedClient\ManagedClient.csproj /t:Rebuild /p:Configuration=Debug   /p:TargetFrameworkVersion=v3.5   /p:OutputPath=bin\Debug35    /p:DefineConstants="FW461;FW46;FW452;FW451;FW45;FW40;FW35"
-%MSBUILD% ManagedClient\ManagedClient.csproj /t:Rebuild /p:Configuration=Release /p:TargetFrameworkVersion=v3.5   /p:OutputPath=bin\Release35  /p:DefineConstants="FW461;FW46;FW452;FW451;FW45;FW40;FW35"
-%MSBUILD% IrbisUI\IrbisUI.csproj             /t:Rebuild /p:Configuration=Debug   /p:TargetFrameworkVersion=v3.5   /p:OutputPath=bin\Debug35    /p:DefineConstants="FW461;FW46;FW452;FW451;FW45;FW40;FW35"
-%MSBUILD% IrbisUI\IrbisUI.csproj             /t:Rebuild /p:Configuration=Release /p:TargetFrameworkVersion=v3.5   /p:OutputPath=bin\Release35  /p:DefineConstants="FW461;FW46;FW452;FW451;FW45;FW40;FW35"
-%MSBUILD% MoonIrbis\MoonIrbis.csproj         /t:Rebuild /p:Configuration=Debug   /p:TargetFrameworkVersion=v3.5   /p:OutputPath=bin\Debug35    /p:DefineConstants="FW461;FW46;FW452;FW451;FW45;FW40;FW35"
-%MSBUILD% MoonIrbis\MoonIrbis.csproj         /t:Rebuild /p:Configuration=Release /p:TargetFrameworkVersion=v3.5   /p:OutputPath=bin\Release35  /p:DefineConstants="FW461;FW46;FW452;FW451;FW45;FW40;FW35"
+%MSBUILD% AM.Core\AM.Core.csproj             /p:Configuration=Debug   /p:TargetFrameworkVersion=v3.5   /p:OutputPath=bin\Debug35    /p:DefineConstants="FW461;FW46;FW452;FW451;FW45;FW40;FW35"
+%MSBUILD% AM.Core\AM.Core.csproj             /p:Configuration=Release /p:TargetFrameworkVersion=v3.5   /p:OutputPath=bin\Release35  /p:DefineConstants="FW461;FW46;FW452;FW451;FW45;FW40;FW35"
+%MSBUILD% ManagedClient\ManagedClient.csproj /p:Configuration=Debug   /p:TargetFrameworkVersion=v3.5   /p:OutputPath=bin\Debug35    /p:DefineConstants="FW461;FW46;FW452;FW451;FW45;FW40;FW35"
+%MSBUILD% ManagedClient\ManagedClient.csproj /p:Configuration=Release /p:TargetFrameworkVersion=v3.5   /p:OutputPath=bin\Release35  /p:DefineConstants="FW461;FW46;FW452;FW451;FW45;FW40;FW35"
+%MSBUILD% IrbisUI\IrbisUI.csproj             /p:Configuration=Debug   /p:TargetFrameworkVersion=v3.5   /p:OutputPath=bin\Debug35    /p:DefineConstants="FW461;FW46;FW452;FW451;FW45;FW40;FW35"
+%MSBUILD% IrbisUI\IrbisUI.csproj             /p:Configuration=Release /p:TargetFrameworkVersion=v3.5   /p:OutputPath=bin\Release35  /p:DefineConstants="FW461;FW46;FW452;FW451;FW45;FW40;FW35"
+%MSBUILD% MoonIrbis\MoonIrbis.csproj         /p:Configuration=Debug   /p:TargetFrameworkVersion=v3.5   /p:OutputPath=bin\Debug35    /p:DefineConstants="FW461;FW46;FW452;FW451;FW45;FW40;FW35"
+%MSBUILD% MoonIrbis\MoonIrbis.csproj         /p:Configuration=Release /p:TargetFrameworkVersion=v3.5   /p:OutputPath=bin\Release35  /p:DefineConstants="FW461;FW46;FW452;FW451;FW45;FW40;FW35"

-%MSBUILD% AM.Core\AM.Core.csproj             /t:Rebuild /p:Configuration=Debug   /p:TargetFrameworkVersion=v4.0   /p:OutputPath=bin\Debug40    /p:DefineConstants="FW461;FW46;FW452;FW451;FW45;FW40"
-%MSBUILD% AM.Core\AM.Core.csproj             /t:Rebuild /p:Configuration=Release /p:TargetFrameworkVersion=v4.0   /p:OutputPath=bin\Release40  /p:DefineConstants="FW461;FW46;FW452;FW451;FW45;FW40"
-%MSBUILD% ManagedClient\ManagedClient.csproj /t:Rebuild /p:Configuration=Debug   /p:TargetFrameworkVersion=v4.0   /p:OutputPath=bin\Debug40    /p:DefineConstants="FW461;FW46;FW452;FW451;FW45;FW40"
-%MSBUILD% ManagedClient\ManagedClient.csproj /t:Rebuild /p:Configuration=Release /p:TargetFrameworkVersion=v4.0   /p:OutputPath=bin\Release40  /p:DefineConstants="FW461;FW46;FW452;FW451;FW45;FW40"
-%MSBUILD% IrbisUI\IrbisUI.csproj             /t:Rebuild /p:Configuration=Debug   /p:TargetFrameworkVersion=v4.0   /p:OutputPath=bin\Debug40    /p:DefineConstants="FW461;FW46;FW452;FW451;FW45;FW40"
-%MSBUILD% IrbisUI\IrbisUI.csproj             /t:Rebuild /p:Configuration=Release /p:TargetFrameworkVersion=v4.0   /p:OutputPath=bin\Release40  /p:DefineConstants="FW461;FW46;FW452;FW451;FW45;FW40"
-%MSBUILD% MoonIrbis\MoonIrbis.csproj         /t:Rebuild /p:Configuration=Debug   /p:TargetFrameworkVersion=v4.0   /p:OutputPath=bin\Debug40    /p:DefineConstants="FW461;FW46;FW452;FW451;FW45;FW40"
-%MSBUILD% MoonIrbis\MoonIrbis.csproj         /t:Rebuild /p:Configuration=Release /p:TargetFrameworkVersion=v4.0   /p:OutputPath=bin\Release40  /p:DefineConstants="FW461;FW46;FW452;FW451;FW45;FW40"
+%MSBUILD% AM.Core\AM.Core.csproj             /p:Configuration=Debug   /p:TargetFrameworkVersion=v4.0   /p:OutputPath=bin\Debug40    /p:DefineConstants="FW461;FW46;FW452;FW451;FW45;FW40"
+%MSBUILD% AM.Core\AM.Core.csproj             /p:Configuration=Release /p:TargetFrameworkVersion=v4.0   /p:OutputPath=bin\Release40  /p:DefineConstants="FW461;FW46;FW452;FW451;FW45;FW40"
+%MSBUILD% ManagedClient\ManagedClient.csproj /p:Configuration=Debug   /p:TargetFrameworkVersion=v4.0   /p:OutputPath=bin\Debug40    /p:DefineConstants="FW461;FW46;FW452;FW451;FW45;FW40"
+%MSBUILD% ManagedClient\ManagedClient.csproj /p:Configuration=Release /p:TargetFrameworkVersion=v4.0   /p:OutputPath=bin\Release40  /p:DefineConstants="FW461;FW46;FW452;FW451;FW45;FW40"
+%MSBUILD% IrbisUI\IrbisUI.csproj             /p:Configuration=Debug   /p:TargetFrameworkVersion=v4.0   /p:OutputPath=bin\Debug40    /p:DefineConstants="FW461;FW46;FW452;FW451;FW45;FW40"
+%MSBUILD% IrbisUI\IrbisUI.csproj             /p:Configuration=Release /p:TargetFrameworkVersion=v4.0   /p:OutputPath=bin\Release40  /p:DefineConstants="FW461;FW46;FW452;FW451;FW45;FW40"
+%MSBUILD% MoonIrbis\MoonIrbis.csproj         /p:Configuration=Debug   /p:TargetFrameworkVersion=v4.0   /p:OutputPath=bin\Debug40    /p:DefineConstants="FW461;FW46;FW452;FW451;FW45;FW40"
+%MSBUILD% MoonIrbis\MoonIrbis.csproj         /p:Configuration=Release /p:TargetFrameworkVersion=v4.0   /p:OutputPath=bin\Release40  /p:DefineConstants="FW461;FW46;FW452;FW451;FW45;FW40"

-%MSBUILD% AM.Core\AM.Core.csproj             /t:Rebuild /p:Configuration=Debug   /p:TargetFrameworkVersion=v4.5   /p:OutputPath=bin\Debug45    /p:DefineConstants="FW461;FW46;FW452;FW451;FW45"
-%MSBUILD% AM.Core\AM.Core.csproj             /t:Rebuild /p:Configuration=Release /p:TargetFrameworkVersion=v4.5   /p:OutputPath=bin\Release45  /p:DefineConstants="FW461;FW46;FW452;FW451;FW45"
-%MSBUILD% ManagedClient\ManagedClient.csproj /t:Rebuild /p:Configuration=Debug   /p:TargetFrameworkVersion=v4.5   /p:OutputPath=bin\Debug45    /p:DefineConstants="FW461;FW46;FW452;FW451;FW45"
-%MSBUILD% ManagedClient\ManagedClient.csproj /t:Rebuild /p:Configuration=Release /p:TargetFrameworkVersion=v4.5   /p:OutputPath=bin\Release45  /p:DefineConstants="FW461;FW46;FW452;FW451;FW45"
-%MSBUILD% IrbisUI\IrbisUI.csproj             /t:Rebuild /p:Configuration=Debug   /p:TargetFrameworkVersion=v4.5   /p:OutputPath=bin\Debug45    /p:DefineConstants="FW461;FW46;FW452;FW451;FW45"
-%MSBUILD% IrbisUI\IrbisUI.csproj             /t:Rebuild /p:Configuration=Release /p:TargetFrameworkVersion=v4.5   /p:OutputPath=bin\Release45  /p:DefineConstants="FW461;FW46;FW452;FW451;FW45"
-%MSBUILD% MoonIrbis\MoonIrbis.csproj         /t:Rebuild /p:Configuration=Debug   /p:TargetFrameworkVersion=v4.5   /p:OutputPath=bin\Debug45    /p:DefineConstants="FW461;FW46;FW452;FW451;FW45"
-%MSBUILD% MoonIrbis\MoonIrbis.csproj         /t:Rebuild /p:Configuration=Release /p:TargetFrameworkVersion=v4.5   /p:OutputPath=bin\Release45  /p:DefineConstants="FW461;FW46;FW452;FW451;FW45"
+%MSBUILD% AM.Core\AM.Core.csproj             /p:Configuration=Debug   /p:TargetFrameworkVersion=v4.5   /p:OutputPath=bin\Debug45    /p:DefineConstants="FW461;FW46;FW452;FW451;FW45"
+%MSBUILD% AM.Core\AM.Core.csproj             /p:Configuration=Release /p:TargetFrameworkVersion=v4.5   /p:OutputPath=bin\Release45  /p:DefineConstants="FW461;FW46;FW452;FW451;FW45"
+%MSBUILD% ManagedClient\ManagedClient.csproj /p:Configuration=Debug   /p:TargetFrameworkVersion=v4.5   /p:OutputPath=bin\Debug45    /p:DefineConstants="FW461;FW46;FW452;FW451;FW45"
+%MSBUILD% ManagedClient\ManagedClient.csproj /p:Configuration=Release /p:TargetFrameworkVersion=v4.5   /p:OutputPath=bin\Release45  /p:DefineConstants="FW461;FW46;FW452;FW451;FW45"
+%MSBUILD% IrbisUI\IrbisUI.csproj             /p:Configuration=Debug   /p:TargetFrameworkVersion=v4.5   /p:OutputPath=bin\Debug45    /p:DefineConstants="FW461;FW46;FW452;FW451;FW45"
+%MSBUILD% IrbisUI\IrbisUI.csproj             /p:Configuration=Release /p:TargetFrameworkVersion=v4.5   /p:OutputPath=bin\Release45  /p:DefineConstants="FW461;FW46;FW452;FW451;FW45"
+%MSBUILD% MoonIrbis\MoonIrbis.csproj         /p:Configuration=Debug   /p:TargetFrameworkVersion=v4.5   /p:OutputPath=bin\Debug45    /p:DefineConstants="FW461;FW46;FW452;FW451;FW45"
+%MSBUILD% MoonIrbis\MoonIrbis.csproj         /p:Configuration=Release /p:TargetFrameworkVersion=v4.5   /p:OutputPath=bin\Release45  /p:DefineConstants="FW461;FW46;FW452;FW451;FW45"


Delete SlothGo.Bat

Delete SlothGo.Bat

unnecessary file

--- SlothGo.bat
+++ SlothGo.bat
@@ -1,3 +0,0 @@
-@echo off
-cd C:\Users\richardbi\OneDrive - C.R. England\Development\GO\src\SLOTH-GO
-start go run slothgo.go


Fixed type-o with upgradewdb and rename targets for readability.

SVN-Revision: 780

--- software/build/build.cmd
+++ software/build/build.cmd
@@ -8,20 +8,20 @@
 setlocal
 set DEVPROPFILE=C:\SVN-Projects\ncireportwriter-properties\properties\dev-upgrade.properties
 set QAPROPFILE=C:\SVN-Projects\ncireportwriter-properties\properties\qa-upgrade.properties
-if "%1" == "" (
+if "%1" == ""  (
     echo.
     echo Available targets are:
     echo.
-    echo   clean        -- Remove classes directory for clean build
-    echo   all          -- Normal build of application
-    echo   install      -- Builds, installs JBoss and database locally
-    echo   upgradewdb   -- Builds, upgrades JBoss and database locally
-    echo   upgrade      -- Build and upgrade application
-    echo   devwdb       -- Builds, upgrades JBoss and database on DEV
-    echo   dev          -- Builds, upgrades JBoss on DEV
-    echo   qawdb        -- Builds, upgrades JBoss and database on QA
-    echo   qa           -- Builds, upgrades JBoss on QA
-    echo   deploy       -- Redeploy application
+    echo   1. clean                -- Remove classes directory for clean build
+    echo   2. all                  -- Normal build of application
+    echo   3. install              -- Builds, installs JBoss and database locally
+    echo   4. upgrade:wdbinstall   -- Builds, upgrades JBoss and installs database locally
+    echo   5. upgrade              -- Build and upgrade application
+    echo   6. dev:wdbinstall       -- Builds, upgrades JBoss and installs database on DEV
+    echo   7. dev                  -- Builds, upgrades JBoss on DEV
+    echo   8. qa:wdbinstall        -- Builds, upgrades JBoss and install database on QA
+    echo   9. qa                   -- Builds, upgrades JBoss on QA
+    echo  10. deploy               -- Redeploy application locally
     goto DONE
 )
 if "%1" == "usage" (
@@ -44,15 +44,15 @@
     ant deploy:hot
     goto DONE
 )
-if "%1" == "upgradewdb" (
-    ant -Dupgrade.target=upgrade-ncm:with-dbinstall -Denable.install.debug=true -Ddatabase.re-create deploy:local:upgrade
+if "%1" == "upgrade:wdbinstall" (
+    ant -Dupgrade.target=upgrade-ncm:with-dbinstall -Denable.install.debug=true -Ddatabase.re-create=true deploy:local:upgrade
     goto DONE
 )
 if "%1" == "dev" (
     ant -Dproperties.file=%DEVPROPFILE% deploy:remote:upgrade
     goto DONE
 )
-if not "%1" == "devwdb" goto d1
+if not "%1" == "dev:wdbinstall" goto d1
     @rem *** Remember to set database.drop-schema=true in dev-upgrade.properties file ***
     type %DEVPROPFILE% | findstr "database.drop-schema=true" >nul
     if "%errorlevel%" == "0" goto d2
@@ -69,7 +69,7 @@
     ant -Dproperties.file=%QAPROPFILE% deploy:remote:upgrade
     goto DONE
 )
-if not "%1" == "qawdb" goto q1
+if not "%1" == "qa:wdbinstall" goto q1
     @rem *** Remember to set database.drop-schema=true in qa-upgrade.properties file ***
     type %QAPROPFILE% | findstr "database.drop-schema=true" >nul
     if "%errorlevel%" == "0" goto q2


- Updated script to get PeterBochs tool

- Updated script to get PeterBochs tool

--- Tools/peter-bochs/GetPeterBochs.bat
+++ Tools/peter-bochs/GetPeterBochs.bat
@@ -1,9 +1,9 @@
-if exist peter-bochs-debugger20100513.jar goto exit
+if exist peter-bochs-debugger20100901.jar goto exit

 del peter-bochs-debugger*.jar

-..\wget\wget http://peter-bochs.googlecode.com/files/peter-bochs-debugger20100513.jar
+..\wget\wget http://peter-bochs.googlecode.com/files/peter-bochs-debugger20100901.jar

-copy peter-bochs-debugger20100513.jar peter-bochs-debugger.jar
+copy peter-bochs-debugger20100901.jar peter-bochs-debugger.jar

 :exit


Created a Windows batch file to streamline generating project files for MinGW and VS. It generates MinGW and NMake project files, as well as VS project files, and a batch file that will invoke mingw32-make and NMake on the projects when run.

error: pathspec 'src/GenerateProjects.bat' did not match any file(s) known to git

--- src/GenerateProjects.bat
+++ src/GenerateProjects.bat
@@ -0,0 +1,81 @@
+@setlocal
+@echo off
+if -%1-==-- (
+	echo Script requires destination directory
+	exit /b -1
+)
+if not exist CMakeLists.txt (
+	echo Current directory does not contain CMakeLists: %cd%
+	exit /b -1
+)
+if -%2-==-- (
+	echo No build type specified. Defaulting to Debug!
+	set build_mode=Debug
+) else (
+	set build_mode=%2
+)
+call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+::Set the various variables used for project generation
+set src_dir=%cd%
+set dest_dir=%1
+set mingw_dest_suffix=MinGW
+set vs_dest_suffix=VS
+set nmake_dest_suffix=NMake
+set mingw_dest_dir="%dest_dir%\%mingw_dest_suffix%"
+set vs_dest_dir="%dest_dir%\%vs_dest_suffix%"
+set nmake_dest_dir="%dest_dir%\%nmake_dest_suffix%"
+echo Local variables have been set
+::Create the destination directories if they don't exist
+mkdir %mingw_dest_dir%
+mkdir %vs_dest_dir%
+mkdir %nmake_dest_dir%
+echo Destination directories have been created
+::Generate the project files for the gcc and VS targets
+echo Began creating MinGW project files at %mingw_dest_dir%
+pushd %mingw_dest_dir%
+cmake -D CMAKE_BUILD_TYPE=%build_mode% -G "MinGW Makefiles" %src_dir%
+popd
+echo Began creating Visual Studio project files at %vs_dest_dir%
+pushd %vs_dest_dir%
+cmake -G "Visual Studio 14 2015" %src_dir%
+popd
+echo Began creating NMake project files at %nmake_dest_dir%
+pushd %nmake_dest_dir%
+cmake -D CMAKE_BUILD_TYPE=%build_mode% -G "NMake Makefiles" %src_dir%
+popd
+::Generate batch file for invoking the compilers
+echo Generating batch files
+>%dest_dir%\build.bat (
+	@echo @setlocal
+	@echo @echo off
+	@echo set flag_num="%%1"
+	@echo if %%flag_num%%=="" ^(
+	@echo 	echo No flag provided. Defaulting to 0 - Build all.
+	@echo 	echo Specify 1 for clean. Specify 2 for test.
+	@echo 	set build_flag=
+	@echo ^) else ^(
+	@echo 	if %%flag_num%%=="0" ^(
+	@echo 		set build_flag=
+	@echo 	^)
+	@echo 	if %%flag_num%%=="1" ^(
+	@echo 		set build_flag=clean
+	@echo 	^)
+	@echo 	if %%flag_num%%=="2" ^(
+	@echo 		set build_flag=test
+	@echo 	^)
+	@echo ^)
+	@echo set compiler_output_file=compilerOut.txt
+	@echo set compiler_error_file=compilerErr.txt
+	@echo pushd %mingw_dest_suffix%
+	@echo call mingw32-make -j -Oline %%build_flag%% ^>%%compiler_output_file%%
+	@echo popd
+	@echo pushd %nmake_dest_suffix%
+	@echo call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+	@echo call NMake /nologo /x %%compiler_error_file%% %%build_flag%%^>%%compiler_output_file%%
+	@echo popd
+	@echo endlocal
+)
+::End of batch file generation
+echo Batch file generation complete
+endlocal
+pushd %1


vsproject - Set `RUSTC_INSTALL_BINDIR` for `librustc_interface`

--- vsproject/build_librustcdriver_139.cmd
+++ vsproject/build_librustcdriver_139.cmd
@@ -3,5 +3,6 @@

 @mkdir %OUTDIR%\rustc-build
 @set RUST_CHECK=1
+@set RUSTC_INSTALL_BINDIR=bin
 x64\Release\minicargo.exe ..\rustc-%RUSTC_VERSION%-src\src\librustc_driver -L %OUTDIR% --output-dir %OUTDIR%\rustc-build %COMMON_ARGS%
 @if %errorlevel% neq 0 exit /b %errorlevel%


Add implementation of bolt script

Add implementation of bolt script

error: pathspec 'src/bolt.bat' did not match any file(s) known to git

--- src/bolt.bat
+++ src/bolt.bat
@@ -0,0 +1,73 @@
+@echo off
+setlocal enableextensions
+
+goto entry
+
+:usage
+  echo usage: bolt [-h^|--help] [-V^|--version]
+  echo     or bolt MODE [^<args^>]
+  echo.
+  echo modes:
+  echo   init
+  echo   build
+  echo   test
+  echo   help
+  echo.
+  echo For usage/help on a specific module, use:
+  echo   bolt help MODE
+
+  exit /b 0
+
+:fail_usage
+  echo.
+  call :usage
+  exit /b 1
+
+:fail
+  exit /b 1
+
+:version
+  for /F " delims=" %%i in (%base%version) do set v=%%i
+  echo bolt %v%
+  exit /b 0
+
+
+:entry
+
+set base=%~dp0
+
+if "%~1"=="" echo error: must specify mode. && goto fail_usage
+
+set mode=%~1
+shift
+
+if "%mode%"=="init" goto done_mode_validation
+if "%mode%"=="build" goto done_mode_validation
+if "%mode%"=="test" goto done_mode_validation
+if "%mode%"=="help" goto done_mode_validation
+if "%mode%"=="-h" call :usage && exit /b 0
+if "%mode%"=="--help" call :usage && exit /b 0
+if "%mode%"=="-V" call :version && exit /b 0
+if "%mode%"=="--version" call :version && exit /b 0
+
+echo invalid mode [%mode%], must be one of init^|build^|test^|help
+goto fail_usage
+
+:done_mode_validation
+
+if not "%mode%"=="help" goto run_mode
+
+set help_mode=true
+set mode=%~1
+
+if "%mode%"=="init" goto run_mode
+if "%mode%"=="build" goto run_mode
+if "%mode%"=="test" goto run_mode
+
+echo help requires argument: bolt help MODE, where MODE is one of init^|build^|test
+exit /b 2
+
+:run_mode
+
+call %base%bolt-%mode%.subr.bat
+exit /b %errorlevel%


Kokoro (Windows): Switch to python3

Kokoro (Windows): Switch to python3

SPIRV-Tools now requires python3.

Bug: b/135609394
Change-Id: Ib33ddb57b0bdfa87abed94de6dbfb91eadbc31bf

--- tests/kokoro/gcp_windows/continuous.bat
+++ tests/kokoro/gcp_windows/continuous.bat
@@ -2,7 +2,7 @@

 SETLOCAL ENABLEDELAYEDEXPANSION

-SET PATH=%PATH%;C:\python27;C:\Program Files\cmake\bin
+SET PATH=C:\python36;C:\Program Files\cmake\bin;%PATH%
 set SRC=%cd%\git\SwiftShader

 cd %SRC%


Add some more debugging prints in the AppVeyor test script, to investigate an error when running CMake.

--- extras/scripts/postsubmit.bat
+++ extras/scripts/postsubmit.bat
@@ -12,6 +12,10 @@

 mkdir C:\Fruit\build-%CONFIGURATION%
 cd C:\Fruit\build-%CONFIGURATION%
+
+rem TODO: Remove the following 2 commands, they are only for debugging.
+echo Looking for CMake executable:
+dir %CMAKE_PATH%

 echo Running CMake.


More fixes to the Windows CI config.

More fixes to the Windows CI config.

--- extras/scripts/postsubmit.bat
+++ extras/scripts/postsubmit.bat
@@ -18,12 +18,8 @@
   FOR /F "delims=" %%F IN ('where msbuild.exe') DO (SET MSBUILD_PATH=!MSBUILD_PATH!%%~dpF.;)
 )

-rem set NEW_PATH=%NEW_PATH%%CL_PATH%%MSBUILD_PATH%%POWERSHELL_PATH%
-
-rem if not "%MINGW_PATH%" == "" SET NEW_PATH=%NEW_PATH%%MINGW_PATH%;
-
-rem set PATH=%NEW_PATH%
-rem setx PATH "%PATH%"
+if not "%MINGW_PATH%" == "" SET PATH=%PATH%%MINGW_PATH%;
+setx PATH "%PATH%"

 mkdir build-%CONFIGURATION%
 cd build-%CONFIGURATION%


Remove obsolete packaging script

Remove obsolete packaging script

--- scripts/make-package.bat
+++ scripts/make-package.bat
@@ -1,30 +0,0 @@
-@echo off
-
-set /p appleseed_path=Enter Appleseed Package Directory:
-
-set /p output_name=Set Version Number:
-
-set APPLESEED=%appleseed_path%
-
-blenderseed.package.py
-
-set zipcmd="%~dp0\tools\7z\7z.exe"
-
-pushd %~dp0\..\..
-%zipcmd% a -r -x!scripts -xr!.* -x!__pycache__ -x!deploy -x!tests -x!docs -x!README.md blenderseed-%output_name%.zip blenderseed
-popd
-
-move ..\..\blenderseed-%output_name%.zip .
-
-set /p delete_appleseed=Delete Appleseed Files? y/n:
-
-if %delete_appleseed%==y goto :delete_directory
-if %delete_appleseed%==n goto :keep_directory
-
-:delete_directory
-cd ../
-rmdir /S appleseed
-
-:keep_directory
-
-pause


Initial cut at a windows script for building the CI

git-svn-id: d8f3215415546ce936cf3b822120ca56e5ebeaa0@1399409 13f79535-47bb-0310-9956-ffa450edef68

error: pathspec 'ci.bat' did not match any file(s) known to git

--- ci.bat
+++ ci.bat
@@ -0,0 +1,21 @@
+SET SCALA_HOME=F:\hudson\tools\scala-2.9.0.1
+SET JRUBY_OPTS=-J-XX:MaxPermSize=312m -J-Xmx1024M
+SET JAVA_OPTS=-Xmx1024m -XX:MaxPermSize=312m
+
+IF "X%BUILD_RVM%" EQ "X1.9.3" SET RUBY_HOME=F:\hudson\tools\Ruby193-p194
+IF "X%BUILD_RVM%" EQ "X1.9.2" SET RUBY_HOME=F:\hudson\tools\Ruby192-p290
+IF "X%BUILD_RVM%" EQ "X1.8.7" SET RUBY_HOME=F:\hudson\tools\Ruby187-p370
+IF "X%BUILD_RVM%" EQ "Xjruby" SET RUBY_HOME=F:\hudson\tools\jruby-1.6.7
+
+IF "X%BUILD_JVM%" EQ "X1.5" SET JAVA_HOME=F:\hudson\tools\java\jdk1.5.0_22-64
+IF "X%BUILD_JVM%" EQ "X1.6" SET JAVA_HOME=F:\hudson\tools\java\jdk1.6.0_27-64
+IF "X%BUILD_JVM%" EQ "X1.7" SET JAVA_HOME=F:\hudson\tools\java\jdk1.7.0
+
+SET GEM_HOME=.gems
+SET PATH=%PATH%;%JAVA_HOME%\bin;%RUBY_HOME%\bin
+
+gem install bundler
+bundle install --path vendor/bundle
+
+SET BUILD_RAKE_TASK=ci
+rem rake clobber %BUILD_RAKE_TASK% --trace


ビルドスクリプトでx64版のビルドがうまくいっていなかったのを修正

ビルドスクリプトでx64版のビルドがうまくいっていなかったのを修正

--- VisualStudio_Library.bat
+++ VisualStudio_Library.bat
@@ -48,8 +48,6 @@
 set PlatformToolset=!PlatformToolsetArray[%%k]!
 set GeneratorPlatformName=!GeneratorPlatformArray[%%k]!

-set GeneratorPlatform=!GeneratorPlatformName!!GeneratorPlatformSuffix!
-
 if EXIST !PlatformToolset! (
 rmdir /S /Q !PlatformToolset!
 )
@@ -64,6 +62,8 @@

 mkdir !PlatformShortName!
 cd !PlatformShortName!
+
+set GeneratorPlatform=!GeneratorPlatformName!!GeneratorPlatformSuffix!

 echo Compile !PlatformToolset! !PlatformShortName!


Addition of clean command. Really cleans by removing \target.

git-svn-id: 8a910031c78bbe8a754298bb28800c1494820db3@582 0604bb77-1110-461e-859e-28c50bf9b280

--- software/build/build.cmd
+++ software/build/build.cmd
@@ -16,9 +16,17 @@
     ant deploy:hot
     goto DONE
 )
+if "%1" == "clean" (
+    ant clean
+    if exist ..\target\*.* (
+       rmdir /Q /S ..\target
+    )
+    goto DONE
+)
 if "%1" == "dev" (
     ant -Dproperties.file=C:\SVN-Projects\ncit-properties\properties\dev-upgrade.properties deploy:remote:upgrade
     goto DONE
 )
+
 :DONE
 endlocal


Command line utility for developers. Allows easy remote deployments when ANT hill is down.

git-svn-id: 7af4603ee811ab7d38b44ab6bf739118ab0e87f8@138 b145b987-6716-48ef-8e4a-68a7679c2f12

error: pathspec 'software/build/build.cmd' did not match any file(s) known to git

--- software/build/build.cmd
+++ software/build/build.cmd
@@ -0,0 +1,24 @@
+@echo off
+@rem ******************************************
+@rem **** Command file to invoke build.xml ****
+@rem ******************************************
+setlocal
+cls
+if "%1" == "" (
+    ant usage
+    goto DONE
+)
+if "%1" == "upgrade" (
+    ant deploy:local:upgrade
+    goto DONE
+)
+if "%1" == "deploy" (
+    ant deploy:hot
+    goto DONE
+)
+if "%1" == "dev" (
+    ant -Dproperties.file=C:\SVN-Projects\ncim-properties\properties\dev-upgrade.properties deploy:remote:upgrade
+    goto DONE
+)
+:DONE
+endlocal


MINOR: [CI] Fix mamba on AppVeyor

MINOR: [CI] Fix mamba on AppVeyor

Due to https://github.com/mamba-org/mamba/issues/1706, we must make sure we upgrade to the latest mamba version on AppVeyor.

Closes #13263 from pitrou/minor-appveyor-mamba

Authored-by: Antoine Pitrou <9359a4d812173b65a3a0094cd86363e79731a3c2@python.org>
Signed-off-by: Antoine Pitrou <9359a4d812173b65a3a0094cd86363e79731a3c2@python.org>

--- ci/appveyor-cpp-setup.bat
+++ ci/appveyor-cpp-setup.bat
@@ -46,10 +46,10 @@
 @rem
 @rem Install mamba to the base environment
 @rem
-conda install -q -y -c conda-forge mamba || exit /B
+conda install -q -y -c conda-forge mamba python=3.9 || exit /B

 @rem Update for newer CA certificates
-mamba update -q -y --all || exit /B
+mamba update -q -y -c conda-forge --all || exit /B

 @rem
 @rem Create conda environment for Build and Toolchain jobs


Adding SSH test for CI environment.

Adding SSH test for CI environment.

SVN-Revision: 1591

--- software/build/build.cmd
+++ software/build/build.cmd
@@ -31,6 +31,7 @@
     echo   jsp          -- Hot deploy JSP files
     echo   stop         -- Stop war file
     echo   start        -- Start war file
+    echo   cissh        -- Test SSH login in CI
     goto DONE
 )
 if "%1" == "all" (
@@ -84,6 +85,9 @@
     ant -Dproperties.file=%DATAQAPROPFILE% %TAG% %DEBUG% deploy:remote:upgrade
     goto DONE
 )
-
+if "%1" == "cissh" (
+    ssh jboss51a@ncias-c512-v.nci.nih.gov -i C:\NCI-Projects\ncit-properties\properties\ssh-keys\id_dsa_bda echo "Test worked!"
+    goto DONE
+)
 :DONE
 endlocal


Allow spaces in JAVA_HOME

Allow spaces in JAVA_HOME

--- diffxml.cmd
+++ diffxml.cmd
@@ -1,7 +1,7 @@
 @rem Utility script to call diffxml with the given arguments
 @echo off
 IF DEFINED JAVA_HOME (
-%JAVA_HOME%\bin\java.exe -cp "%~dp0\lib\diffxml.jar" org.diffxml.diffxml.DiffXML %*
+"%JAVA_HOME%\bin\java.exe" -cp "%~dp0\lib\diffxml.jar" org.diffxml.diffxml.DiffXML %*
 ) ELSE (
 java -cp "%~dp0\lib\diffxml.jar" org.diffxml.diffxml.DiffXML %*
 )


comment fix

comment fix


CATALINA_HOME fixed

CATALINA_HOME fixed

--- src/binary-dist/stop.bat
+++ src/binary-dist/stop.bat
@@ -1,11 +1,22 @@
 @echo off

 echo "Stop Yanel ..."
+
+rem ----- Ignore system CATALINA_HOME variable
+set ORIGINAL_CATALINA_HOME=%CATALINA_HOME%
+set CATALINA_HOME=apache-tomcat-5.5.20

 :: Check if JAVA_HOME is set or goto end
 if not "%JAVA_HOME%" == "" goto gotJavaHome
 echo You must set JAVA_HOME to point at your Java Development Kit installation
 goto end
+
 :gotJavaHome

-apache-tomcat-5.5.20\bin\shutdown.bat
+%CATALINA_HOME%\bin\shutdown.bat
+
+rem ----- Restore CATALINA_HOME
+set CATALINA_HOME=%ORIGINAL_CATALINA_HOME%
+set ORIGINAL_CATALINA_HOME=
++
++:end


Update buildvccompletew.bat

Update buildvccompletew.bat

--- src/buildvccompletew.bat
+++ src/buildvccompletew.bat
@@ -10,7 +10,7 @@
 ring_vmlists.c ring_vmfuncs.c ring_api.c ring_vmoop.c ring_vmcui.c ^
 ring_vmtrycatch.c ring_vmstrindex.c ring_vmjump.c ring_vmduprange.c ^
 ring_vmperformance.c ring_vmexit.c ring_vmstackvars.c ring_vmstate.c ring_vmmath.c ring_vmfile.c ring_vmos.c ring_vmlistfuncs.c ring_vmrefmeta.c ^
-..\extensions\ringodbc\ring_vmodbc.c ..\extensions\ringmysql\ring_vmmysql.c ..\extensions\ringopenssl\ring_vmopenssl.c ..\extensions\ringcurl\ring_vmcurl.c ring_ext.c ring_vmdll.c ..\extensions\ringsqlite\ring_vmsqlite.c ..\extensions\ringsqlite\sqlite3.c ring_objfile.c -I"..\include" -I"..\libdepwin\libcurl\include" -I"..\libdepwin\openssl\include" -I"..\libdepwin\mysql\include"
+ring_ext.c ring_vmdll.c ring_objfile.c -I"..\include"

 link /DLL /DEBUG /OUT:..\lib\ring.dll /SUBSYSTEM:CONSOLE,"5.01"  ring_string.obj ^
 ring_list.obj ring_item.obj ring_items.obj ring_hashtable.obj ring_state.obj ring_scanner.obj ring_parser.obj ring_hashlib.obj ring_vmgc.obj ^
@@ -18,7 +18,7 @@
 ring_vmlists.obj ring_vmfuncs.obj ring_api.obj ring_vmoop.obj ring_vmcui.obj ^
 ring_vmtrycatch.obj ring_vmstrindex.obj ring_vmjump.obj ring_vmduprange.obj ^
 ring_vmperformance.obj ring_vmexit.obj ring_vmstackvars.obj ring_vmstate.obj ring_vmmath.obj ring_vmfile.obj ring_vmos.obj ring_vmlistfuncs.obj ring_vmrefmeta.obj ^
-ring_vmodbc.obj ring_vmmysql.obj ring_vmopenssl.obj ring_vmcurl.obj ring_ext.obj ring_vmdll.obj ring_vmsqlite.obj sqlite3.obj ring_objfile.obj ..\libdepwin\libcurl\lib\libcurl.lib "..\libdepwin\mysql\lib\libmysql.lib" ..\libdepwin\openssl\lib\libeay32.lib odbc32.lib
+ring_ext.obj ring_vmdll.obj ring_objfile.obj

 copy ..\lib\ring.dll ..\bin\


Update new version of kuduscript where the generator wont generate iisnode.yml file

--- Kudu.Services.Web/updateNodeModules.cmd
+++ Kudu.Services.Web/updateNodeModules.cmd
@@ -10,7 +10,7 @@
 set /a counter+=1
 echo Attempt %counter% out of %attempts%

-cmd /c npm install https://github.com/projectkudu/KuduScript/tarball/3bf82c59679bd6539651cf5751246f34e6fd6a56
+cmd /c npm install https://github.com/projectkudu/KuduScript/tarball/89ed632cfb0154130af7cc555d4644ad33122ab9
 IF %ERRORLEVEL% NEQ 0 goto error

 goto end


Get GPUTracing lab script to listen to more user providers

Now that EventEmitter.exe can emit UIforETW style events it makes
sense for lab scripts to listen for more providers. This adds all
of the Multi-* providers (EventEmitter.exe's odd naming scheme) plus
Microsoft-Windows-Win32k (Windows in focus, etc.) and the
controversial but maybe useful Microsoft-Windows-Kernel-Memory.

Flags are used to control exactly what is recorded, although
figuring out what they mean is yet another dark art.

How much this increases the data rate of the traces depends primarily
on how noisy EventEmitter.exe is.

--- LabScripts/GPUTracing/start_tracing.bat
+++ LabScripts/GPUTracing/start_tracing.bat
@@ -21,7 +21,7 @@
 @set SessionName=usersession
 @set FileName=trace.etl
 @set FileAndCompressFlags="%FileName%" -compress
-@set UserProviders=%DX_Flags%
+@set UserProviders=%DX_Flags%+Microsoft-Windows-Win32k:0xfdffffffefffffff+Multi-MAIN+Multi-FrameRate+Multi-Input+Multi-Worker+Microsoft-Windows-Kernel-Memory:0xE0

 @rem Stop any previous tracing sessions that may have accidentally been left
 @rem running. Otherwise the start command will fail with incredibly cryptic


Simple windows batch file to install ready-made python. Initial version.

error: pathspec 'external/mswin/setup.bat' did not match any file(s) known to git

--- external/mswin/setup.bat
+++ external/mswin/setup.bat
@@ -0,0 +1,18 @@
+REM invoke as:
+REM setup "c:\chris\topographica\"
+
+if "%1"=="" goto end
+
+util\gunzip -c python242_topo.tar.gz > python242_topo.tar
+util\tar xvf python242_topo.tar
+del /F python242_topo.tar
+move /Y python242_topo ..\..\
+
+..\..\python242_topo\python.exe setup.py %1
+
+REM xcopy /E /I /Y topographica.py ..\..\
+
+xcopy /E /I /Y topographica.bat ..\..\
+
+
+:end


win: Updating dependencies to the latest versions

--- vc_build.bat
+++ vc_build.bat
@@ -104,16 +104,16 @@
 SET BOOST_BRANCH_TAG_VERSION=boost-1.57.0
 SET LIBUV_REPOSITORY_URL=https://github.com/libuv/libuv.git
 SET LIBUV_DIRECTORY=libuv
-SET LIBUV_BRANCH_TAG_VERSION=v1.6.0
-SET LIBUV_PACKAGE_VERSION=1.6.0
+SET LIBUV_BRANCH_TAG_VERSION=v1.6.1
+SET LIBUV_PACKAGE_VERSION=1.6.1
 SET GYP_REPOSITORY_URL=https://chromium.googlesource.com/external/gyp.git
 SET LIBSSH2_REPOSITORY_URL=http://git.libssh2.org/libssh2.git
 SET LIBSSH2_DIRECTORY=libssh2
 SET LIBSSH2_BRANCH_TAG_VERSION=libssh2-1.5.0
 SET OPENSSL_REPOSITORY_URL=https://github.com/openssl/openssl.git
 SET OPENSSL_DIRECTORY=openssl
-SET OPENSSL_BRANCH_TAG_VERSION=OpenSSL_1_0_2
-SET "OPENSSL_PACKAGE_VERSION=1.0.2"
+SET OPENSSL_BRANCH_TAG_VERSION=OpenSSL_1_0_2d
+SET OPENSSL_PACKAGE_VERSION=1.0.2d
 SET ZLIB_REPOSITORY_URL=https://github.com/madler/zlib.git
 SET ZLIB_DIRECTORY=zlib
 SET ZLIB_BRANCH_TAG_VERSION=v1.2.8


Add tests for Windows.

Add tests for Windows.

error: pathspec 'recipes/cxxtest/run_test.bat' did not match any file(s) known to git

--- recipes/cxxtest/run_test.bat
+++ recipes/cxxtest/run_test.bat
@@ -0,0 +1,39 @@
+"%CONDA_PREFIX%\Library\bin\cxxtestgen" --version
+"%CONDA_PREFIX%\Library\bin\cxxtestgen" --error-printer -o runner.cpp doc/examples/MyTestSuite1.h
+if not exist runner.cpp exit 1
+
+IF DEFINED VS140COMNTOOLS (
+    "%VS140COMNTOOLS%\vsvars32.bat"
+    cl  /I "%CONDA_PREFIX%/Library/include" runner.cpp
+    runner.exe
+    goto commonexit
+)
+ECHO "Visual Studio 14.0 Not Found..."
+
+IF DEFINED VS120COMNTOOLS (
+    "%VS120COMNTOOLS%\vsvars32.bat"
+    cl  /I "%CONDA_PREFIX%/Library/include" runner.cpp
+    runner.exe
+    goto commonexit
+)
+ECHO "Visual Studio 12.0 Not Found..."
+
+IF DEFINED VS110COMNTOOLS (
+    "%VS110COMNTOOLS%\vsvars32.bat"
+    cl  /I "%CONDA_PREFIX%/Library/include" runner.cpp
+    runner.exe
+    goto commonexit
+)
+ECHO "Visual Studio 11.0 Not Found..."
+
+IF DEFINED VS100COMNTOOLS (
+    "%VS100COMNTOOLS%\vsvars32.bat"
+    cl  /I "%CONDA_PREFIX%/Library/include" runner.cpp
+    runner.exe
+    goto commonexit
+)
+ECHO "Visual Studio 10.0 Not Found..."
+ECHO "WARNING - Could not compile runner.cpp to run tests."
+
+:commonexit
+if errorlevel 1 exit 1


Change install command in windows script

--- recipes/ndcube/bld.bat
+++ recipes/ndcube/bld.bat
@@ -1,4 +1,4 @@
-"%PYTHON%" setup.py install
+"%PYTHON%" setup.py install --offline --no-git --single-version-externally-managed --record record.txt
 if errorlevel 1 exit 1

 :: Add more build steps here, if they are necessary.


Convert line endings from CRLF to LF.

Convert line endings from CRLF to LF.

--- gradlew.bat
+++ gradlew.bat
@@ -1,90 +1,90 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega


Added build scripts to see if CI tests pass.

error: pathspec 'recipes/mlconjug/bld.bat' did not match any file(s) known to git

--- recipes/mlconjug/bld.bat
+++ recipes/mlconjug/bld.bat
@@ -0,0 +1,2 @@
+"%PYTHON%" -m pip install --no-deps --ignore-installed .
+if errorlevel 1 exit 1


Moved version definitions and creation of config-win32.h to release_version.h

--- winbuild.bat
+++ winbuild.bat
@@ -42,16 +42,8 @@
 )
 echo Using Visual Studio Version: %VS_VERSION%

-SET MAJOR_NUM=0
-SET MINOR_NUM=6
-SET REVISION_NUM=1
-SET IS_RC=no
+call release_version.bat

-IF "%IS_RC%"=="yes" (
-SET RELEASE_VERSION=%MAJOR_NUM%.%MINOR_NUM%rc%REVISION_NUM%
-) ELSE (
-SET RELEASE_VERSION=%MAJOR_NUM%.%MINOR_NUM%
-)
 SET WORKDIR=libfreespace
 SET ZIPNAME=libfreespace-%RELEASE_VERSION%-win32

@@ -141,9 +133,6 @@
 echo ///////////////////////////////////////////////////////////////////////////// >> win32\libfreespace.rc
 echo #endif    // not APSTUDIO_INVOKED >> win32\libfreespace.rc

-REM Generate config-win32.h and the line below when the version changes.
-echo #define VERSION "%RELEASE_VERSION%"> config-win32.h
-

 SET WORKDIR=libfreespace
 SET ZIPNAME=libfreespace-%RELEASE_VERSION%-win32


gradlew.bat executable

gradlew.bat executable


Get the right script path

Get the right script path

--- build/GenerateBook.bat
+++ build/GenerateBook.bat
@@ -8,7 +8,7 @@
 Set OpenCCFolder=..\opencc-0.4.2\
 Set SimplifiedText=%BookPath%%S%%BookExt%
 Call %OpenCCFolder%opencc -i %BookPath%%T%%BookExt% -o %SimplifiedText% -c %OpenCCFolder%zht2zhs.ini
-Call python ..\PythonScript\Dujing\Dujing.py %SimplifiedText%
+Call ..\PythonScript\ConvertFile.py %SimplifiedText%
 Set OutputFolder=Output\%1
 Call GenerateBookHelper %T%
 Call GenerateBookHelper %S%


[SPARK-5396] Syntax error in spark scripts on windows.

Modified syntax error in spark-submit2.cmd. Command prompt doesn't have "defined" operator.

Author: Masayoshi TSUZUKI <tsudukim@oss.nttdata.co.jp>

Closes #4428 from tsudukim/feature/SPARK-5396 and squashes the following commits:

ec18465 [Masayoshi TSUZUKI] [SPARK-5396] Syntax error in spark scripts on windows.

--- bin/spark-submit2.cmd
+++ bin/spark-submit2.cmd
@@ -25,7 +25,7 @@
 rem Reset the values of all variables used
 set SPARK_SUBMIT_DEPLOY_MODE=client

-if not defined %SPARK_CONF_DIR% (
+if [%SPARK_CONF_DIR%] == [] (
   set SPARK_CONF_DIR=%SPARK_HOME%\conf
 )
 set SPARK_SUBMIT_PROPERTIES_FILE=%SPARK_CONF_DIR%\spark-defaults.conf


release

release

--- port/build.platform.github-release.cmd
+++ port/build.platform.github-release.cmd
@@ -17,7 +17,7 @@

 echo -^> release %PROJECT% v%VERSION%

-git pull --tags origin master
+git pull --tags origin main
 git rev-parse --quiet "v%VERSION%" 1>NUL 2>NUL
 if not errorlevel 1 goto tagExists
 git tag -a v%VERSION% -m "v%VERSION%"


NET Core tests on Windows (#810)

NET Core tests on Windows (#810)

Update run_tests_dotnetcore.bat to match run_tests_dotnetcore.sh, so both now use dotnet cli to build and test on Windows and Linux respectively

--- run_tests_dotnetcore.bat
+++ run_tests_dotnetcore.bat
@@ -3,19 +3,14 @@

 setlocal

-REM Build the support libraries.
-msbuild SupportLibraries.proj
-
-REM Clean slate after the build.
 set workspace=%~dp0
 set nugetconfig=%workspace%\NuGet.Config
-set nugetcache=%userprofile%\.nuget\packages
-
-REM Delete all Google packages from nuget cache
-forfiles /P %nugetcache% /M Google.* /C "CMD /C rmdir /S /Q @path"

 REM Restore the test projects.
 dotnet restore ^
+  "Src\Support\GoogleApis.Core_dotnetcore" ^
+  "Src\Support\GoogleApis_dotnetcore" ^
+  "Src\Support\GoogleApis.Auth_dotnetcore" ^
   "Src\Support\GoogleApis.Tests_dotnetcore" ^
   "Src\Support\GoogleApis.Auth.Tests_dotnetcore" ^
   --no-cache ^


File was added by mistake: PDI-3176.

File was added by mistake: PDI-3176.

git-svn-id: 51b39fcfd0d3a6ea7caa15377cad4af13b9d2664@13128 5fb7f6ec-07c1-534a-b4ca-9155e429e800

--- bin/Kitchen-original.bat
+++ bin/Kitchen-original.bat
@@ -1,78 +0,0 @@
-@echo off
-setLocal
-
-:: **************************************************
-:: ** Kettle home                                  **
-:: **************************************************
-
-set WorkingDIR=%CD%
-cd  %~dp0
-cd  ..
-set BatchParentDIR=%CD%
-cd  %WorkingDIR%
-
-if "%KETTLE_HOME%"=="" set  KETTLE_HOME=%BatchParentDIR%
-if %KETTLE_HOME:~-1%==\ set KETTLE_HOME=%KETTLE_HOME:~0,-1%
-
-:: **************************************************
-:: ** Libraries used by Kettle:                    **
-:: **************************************************
-
-set CP=.;%KETTLE_HOME%
-
-:: ******************
-::   KETTLE Library
-:: ******************
-
-set CP=%CP%;%KETTLE_HOME%\lib\kettle-core.jar;%KETTLE_HOME%\lib\kettle-db.jar;%KETTLE_HOME%\lib\kettle-engine.jar
-
-:: **********************
-::   External Libraries
-:: **********************
-
-:: libext
-call :AddJarDir "%KETTLE_HOME%\libext"
-
-:: Subdirs of libext
-for %%d in (JDBC webservices commons web pentaho spring mondrian salesforce) do call :AddJarDir "%KETTLE_HOME%\libext\%%d"
-
-goto extlibe
-
-:AddJarDir
-for %%f in ("%~dpnx1\*.jar") do call :AddCP "%%f"
-goto :EOF
-
-:AddCP
-set CP=%CP%;%~dpnx1
-goto :eof
-
-:extlibe
-
-
-:: *****************
-::   SWT Libraries
-:: *****************
-
-set CP=%CP%;%KETTLE_HOME%libswt\runtime.jar
-set CP=%CP%;%KETTLE_HOME%libswt\jface.jar
-set CP=%CP%;%KETTLE_HOME%libswt\win32\swt.jar
-
-:: ******************************************************************
-:: ** Set java runtime options                                     **
-:: ** Change 512m to higher values in case you run out of memory.  **
-:: ******************************************************************
-
-
-set OPT=-Xmx512m -cp "%CP%" "-Djava.library.path=%KETTLE_HOME%libswt\win32" "-DKETTLE_HOME=%KETTLE_HOME%" "-DKETTLE_REPOSITORY=%KETTLE_REPOSITORY%" "-DKETTLE_USER=%KETTLE_USER%" "-DKETTLE_PASSWORD=%KETTLE_PASSWORD%" "-DKETTLE_PLUGIN_PACKAGES=%KETTLE_PLUGIN_PACKAGES%" "-DKETTLE_LOG_SIZE_LIMIT=%KETTLE_LOG_SIZE_LIMIT%"
-
-set CP=
-
-:: ***************
-:: ** Run...    **
-:: ***************
-
-@echo on
-echo %KETTLE_HOME%
-echo %CP%
-echo %OPT%
-java %OPT% org.pentaho.di.kitchen.Kitchen %*


Updating dependencies before build

Updating dependencies before build

--- builder.bat
+++ builder.bat
@@ -1,3 +1,7 @@
+go get github.com/PuerkitoBio/goquery
+go get github.com/fatih/color
+go get github.com/josephspurrier/goversioninfo/cmd/goversioninfo
+go get github.com/go-ini/ini
 cd anirip
 go install
 cd..


Improve build script

Improve build script

--- btcdetector/build.bat
+++ btcdetector/build.bat
@@ -1 +1,2 @@
-mvn clean compile assembly:single+call mvn clean
+call mvn compile assembly:single


remove some line

remove some line

--- nwjs/nwjs-v0.12.3-win-ia32/playGame.bat
+++ nwjs/nwjs-v0.12.3-win-ia32/playGame.bat
@@ -3,7 +3,6 @@

 set ARGS1=%~dp1
 ECHO Current Path : %~dp0
-set FILE=%~dp0nw.exe

 ECHO RUN INDEX FILE : %ARGS1%index.html
 %~dp0nw.exe --url=%ARGS1%index.html


Update stage_3_disinfect.bat

Update stage_3_disinfect.bat

--- resources/stage_3_disinfect/stage_3_disinfect.bat
+++ resources/stage_3_disinfect/stage_3_disinfect.bat
@@ -36,7 +36,7 @@
 :: PREP AND CHECKS ::
 :::::::::::::::::::::
 set STAGE_3_SCRIPT_VERSION=1.2.7
-set STAGE_3_SCRIPT_DATE=2020-01-13
+set STAGE_3_SCRIPT_DATE=2020-01-17

 :: Check for standalone vs. Tron execution and build the environment if running in standalone mode
 if /i "%LOGFILE%"=="" (
@@ -64,15 +64,14 @@

 :: The path in v3 changed from v2, so we only check for a v3 installation and skip installing if it exists. If v2 exists, we
 :: run the v3 installation to get it up-to-date. tl;dr we consider MBAM v2 installation "not installed" for the purposes of Tron
+set EXISTING_MBAM=no
+if exist "%ProgramFiles%\Malwarebytes\Anti-Malware\mbam.exe" (
+	set MBAM="%ProgramFiles%\Malwarebytes\Anti-Malware\mbam.exe"
+	set EXISTING_MBAM=yes
+)

-set EXISTING_MBAM=no
-if exist "%ProgramFiles(x86)%\Malwarebytes\Anti-Malware\" (
+if exist "%ProgramFiles(x86)%\Malwarebytes\Anti-Malware\mbam.exe" (
 	set MBAM="%ProgramFiles(x86)%\Malwarebytes\Anti-Malware\mbam.exe"
-	set EXISTING_MBAM=yes
-)
-
-if exist "%ProgramFiles%\Malwarebytes\Anti-Malware\" (
-	set MBAM="%ProgramFiles%\Malwarebytes\Anti-Malware\mbam.exe"
 	set EXISTING_MBAM=yes
 )

@@ -81,8 +80,6 @@
 	goto mbam_run
 )

-:: Failsafe; make sure %MBAM% is set to the default location for our installation below
-set MBAM="%ProgramFiles(x86)%\Malwarebytes\Anti-Malware\mbam.exe"

 :: Skip MBAM installation if requested, otherwise install it and launch it. In all scenarios, MBAM will still launch
 if /i %SKIP_MBAM_INSTALL%==yes (
@@ -102,7 +99,7 @@
 		if exist "%USERPROFILE%\Public\Desktop\Malwarebytes.lnk" del /f /q "%USERPROFILE%\Public\Desktop\Malwarebytes.lnk"
 		if exist "%USERPROFILE%\Default\Desktop\Malwarebytes.lnk" del /f /q "%USERPROFILE%\Default\Desktop\Malwarebytes.lnk"
 		if exist "%ALLUSERSPROFILE%\Desktop\Malwarebytes.lnk" del /f /q "%ALLUSERSPROFILE%\Desktop\Malwarebytes.lnk"
-
+
 		:: Install our config
 		copy /y stage_3_disinfect\mbam\*.json "%ProgramData%\Malwarebytes\MBAMService\config\" >> "%LOGPATH%\%LOGFILE%" 2>NUL

@@ -111,16 +108,21 @@
 		stage_3_disinfect\mbam\mbam2-rules.exe /sp- /verysilent /suppressmsgboxes /log="%RAW_LOGS%\mbam_rules_install.log" /norestart
 		type "%RAW_LOGS%\mbam_rules_install.log" >> "%LOGPATH%\%LOGFILE%"
 		call functions\log_with_date.bat "    Done."
-	)
+	)
 )

 :mbam_run
-	call functions\log_with_date.bat "   Launching MBAM, click 'scan' in the MBAM window."
-	:: Scan for and launch appropriate architecture version
-	if %DRY_RUN%==no start "" "%MBAM%"
-	call functions\log_with_date.bat "   Done."
+REM Scan for and launch appropriate architecture version
+if %DRY_RUN%==no (
+	if exist ""%MBAM%"" (
+		call functions\log_with_date.bat "   Launching MBAM, click 'scan' in the MBAM window."
+		start "" ""%MBAM%""
+		call functions\log_with_date.bat "   Done."
+	)
+)

 :skip_mbam
+

 :: JOB: Kaspersky Virus Removal Tool (KVRT)
@@ -165,12 +167,12 @@
 		type "%ProgramData%\Sophos\Sophos Virus Removal Tool\logs\SophosVirusRemovalTool.log" >> "%LOGPATH%\%LOGFILE%" 2>&1
 		if exist "%ProgramData%\Sophos\Sophos Virus Removal Tool\logs\SophosVirusRemovalTool.log" del /f /q "%ProgramData%\Sophos\Sophos Virus Removal Tool\logs\SophosVirusRemovalTool.log" >nul 2>&1
 		del /f /q stage_3_disinfect\sophos_virus_remover\config.xml >> "%LOGPATH%\%LOGFILE%" 2>&1
-
-		REM Rarely happens, but occasionally Sophos will terminate and fail to delete the service it loads. Run a delete op against it just in case it didn't get removed.
+
+		REM Rarely happens, but occasionally Sophos will terminate and fail to delete the service it loads. Run a delete op against it just in case it didn't get removed.
 		sc delete SophosVirusRemovalTool >> "%LOGPATH%\%LOGFILE%" 2>NUL
 		%REG% delete HKLM\SYSTEM\CurrentControlSet\Services\SophosVirusRemovalTool /f >> "%LOGPATH%\%LOGFILE%" 2>NUL
-
-
+
+
 	)
 	call functions\log_with_date.bat "   Done."
 )


Both 32 and 64-bit Mingw-w64 are required

--- buildscript/build.cmd
+++ buildscript/build.cmd
@@ -13,8 +13,7 @@
 @if NOT "%ProgramW6432%"=="" set vsenv=%vsenv% (x86)
 @set vsenv15=%vsenv%\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars%minabi%.bat"
 @set vsenv14="%VS140COMNTOOLS%..\..\VC\bin\vcvars%minabi%.bat"
-@set gcc=%mesa%mingw-w64\mingw64\bin
-@if NOT EXIST %gcc% set gcc=%mesa%mingw-w64\mingw32\bin
+@set gcc=%mesa%mingw-w64\%abi%\mingw%minabi%\bin
 @set vsenvloaded=0
 @set dxtnbuilt=0
 @set toolset=14


factor.cmd: Save entire gid id.

factor.cmd: Save entire gid id.

--- build-support/factor.cmd
+++ build-support/factor.cmd
@@ -27,9 +27,11 @@
     ) else goto nocl
 )

-git describe --all --long > git_label.tmp
-set /p git_label= < git_label.tmp
+: Fun syntax
+for /f %%x in ('git describe --all') do set GIT_DESCRIBE=%%x
+for /f %%y in ('git rev-parse HEAD') do call set GIT_ID=%%y

+set git_label=%GIT_DESCRIBE%-%GIT_ID%
 set version=0.98

 if %_bootimage_version%==clean (


typo

typo

git-svn-id: 756506b3b0ea8c31733a8f0a5bb416c7e269da3d@482 28bd50df-7adb-d945-0439-6e466c6a13cc

--- build/make_installer.bat
+++ build/make_installer.bat
@@ -18,7 +18,7 @@
 rem SET "PERL_PATH=H:\progs\thirdparty\Perl"

 rem Check the building environment
-rem IF NOT EXIST "%PERL_PATH%"    CALL :SUBMSG "INFO" "The Perl direcotry wasn't found; the addon won't be built"
+rem IF NOT EXIST "%PERL_PATH%"    CALL :SUBMSG "INFO" "The Perl directory wasn't found; the addon won't be built"
 IF NOT DEFINED VS100COMNTOOLS CALL :SUBMSG "ERROR" "Visual Studio 2010 wasn't found; the installer won't be built"

 rem Check for the help switches


update exit error code on test.bat

update exit error code on test.bat

--- c-robot-control/test.bat
+++ c-robot-control/test.bat
@@ -52,4 +52,4 @@

 :EXIT_FAIL_TESTS
 ECHO Tests failed...Failing Build
-EXIT /B 2+EXIT /B 1


Applied patch from HARMONY-4544
[drlvm][build] msvc build can't find COMPILER_CFG_SCRIPT if ICL is not installed

svn path=/harmony/; revision=560919

--- enhanced/drlvm/trunk/build/build.bat
+++ enhanced/drlvm/trunk/build/build.bat
@@ -33,79 +33,63 @@
 REM
 REM  For the quick start, build needs the following
 REM  variables to be set:
-REM  JAVA_HOME = <Path to 1.4-compatible JRE>
+REM  JAVA_HOME = <Path to 1.5-compatible JRE>
 REM  ANT_HOME = <Path to Apache Ant 1.6.5>
+REM  ANT_OPTS = <proxy-host proxy-port> - set it if you work from firewall
 REM  COMPILER_CFG_SCRIPT = <Whatever script that is configuring environment for C/C++ compiler>
+REM  (not that COMPILER_CFG_SCRIPT is an optional setting)
 REM ================================================

-REM Script for configuring C/C++ compiler, Intel C compiler by default.
+REM ==========================================================================
+REM
+REM Set up COMPILER_CFG_SCRIPT if it is not set externally
+REM
+REM ==========================================================================

-REM Select configuration depending on 64-bitness of Windows
-IF _%PROCESSOR_ARCHITEW6432%_==_AMD64_ GOTO X86_64_CONFIG
-IF _%PROCESSOR_ARCHITECTURE%_==_AMD64_ GOTO X86_64_CONFIG
-IF _%CXX%_ == _msvc_ GOTO MSVC_COMPILER
-GOTO DEFAULT_COMPILER
+REM select configuration depending on 64-bitness of Windows
+REM Note: PROCESSOR_ARCHITEW6432 is set by cygwin
+SET PLATFORM_64BIT_ARG=
+IF _%PROCESSOR_ARCHITEW6432%_==_AMD64_ SET PLATFORM_64BIT_ARG=amd64
+IF _%PROCESSOR_ARCHITECTURE%_==_AMD64_ SET PLATFORM_64BIT_ARG=amd64

-:MSVC_COMPILER
-IF DEFINED COMPILER_CFG_SCRIPT GOTO CHOOSE_ARGS
+REM COMPILER_CFG_SCRIPT may be set externally
+IF DEFINED COMPILER_CFG_SCRIPT GOTO CHECK_COMPILER_CONFIGURATION

-REM Try Platform SDK first
-SET COMPILER_CFG_SCRIPT=C:\Program Files\Microsoft Platform SDK\SetEnv.Cmd
-IF EXIST "%COMPILER_CFG_SCRIPT%" GOTO CHOOSE_ARGS
-
-REM Try Platform SDK at another location
-SET COMPILER_CFG_SCRIPT=C:\Program Files\Microsoft SDK\SetEnv.bat
-IF EXIST "%COMPILER_CFG_SCRIPT%" GOTO CHOOSE_ARGS
-
-REM Then try Mirosoft Visual Studio .NET 2003
-SET COMPILER_CFG_SCRIPT=C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\Tools\vsvars32.bat
-IF EXIST "%COMPILER_CFG_SCRIPT%" GOTO CHOOSE_ARGS
-
-REM Otherwise try Mocrosoft Visual Studio 6
-SET COMPILER_CFG_SCRIPT=C:\Program Files\Microsoft Visual Studio\VC98\Bin\VCVARS32.BAT
-IF EXIST "%COMPILER_CFG_SCRIPT%" GOTO CHOOSE_ARGS
-GOTO NO_CFG_SCRIPT
-
-:CHOOSE_ARGS
-IF "%BUILD_CFG%" == "release" (
-    SET COMPILER_CFG_ARG=/RETAIL
-) ELSE (
-    SET COMPILER_CFG_ARG=/DEBUG
-)
-GOTO RUN_COMPILER_CONFIGURATION
-
-:DEFAULT_COMPILER
-IF NOT DEFINED VS71COMNTOOLS (
-    IF EXIST "C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\Tools" (
-        SET VS71COMNTOOLS=C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\Tools\
-    )
+REM Compiler may be set for 'icl' for Windows x86
+IF _%CXX%_ == _icl_ (
+  IF _%PLATFORM_64BIT_ARG%_==_amd64_ (
+      ECHO error: CXX=icl is not supported on Windows/x86_64
+      GOTO ERROR
+  )
+  SET COMPILER_CFG_SCRIPT=C:\Program Files\Intel\Compiler\C++\9.0\IA32\Bin\iclvars.bat
+  GOTO CHECK_COMPILER_CONFIGURATION
 )

-IF DEFINED COMPILER_CFG_SCRIPT GOTO RUN_COMPILER_CONFIGURATION
-SET COMPILER_CFG_SCRIPT=C:\Program Files\Intel\Compiler\C++\9.0\IA32\Bin\iclvars.bat
-IF EXIST "%COMPILER_CFG_SCRIPT%" GOTO RUN_COMPILER_CONFIGURATION
-GOTO NO_CFG_SCRIPT
+REM Default compiler is MSVC for DRLVM build on Windows
+REM MSVC 2005 must be used for Windows x86_64
+IF _%PLATFORM_64BIT_ARG%_==_amd64_ GOTO MSVC_X86_64

-:X86_64_CONFIG
-SET PLATFORM_64BIT=amd64
+:MSVC_X86
+SET COMPILER_CFG_SCRIPT=C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\Tools\vsvars32.bat
+GOTO CHECK_COMPILER_CONFIGURATION

-IF DEFINED COMPILER_CFG_SCRIPT GOTO RUN_COMPILER_CONFIGURATION
+:MSVC_X86_64
+SET COMPILER_CFG_SCRIPT=C:\Program Files (x86)\Microsoft Visual Studio 8\VC\vcvarsall.bat

-REM Select Microsoft Visual Studio 2005 on Windows x64 edition
-SET COMPILER_CFG_SCRIPT=C:\Program Files (x86)\Microsoft Visual Studio 8\VC\vcvarsall.bat
+:CHECK_COMPILER_CONFIGURATION
 IF EXIST "%COMPILER_CFG_SCRIPT%" GOTO RUN_COMPILER_CONFIGURATION

-:NO_CFG_SCRIPT
-ECHO error: Cannot guess the location of compiler configuration script
-ECHO Please set COMPILER_CFG_SCRIPT and/or CXX
+REM COMPILER_CFG_SCRIPT is not detected or points to unexisting file
+ECHO Error: COMPILER_CFG_SCRIPT is unset or points to non-existing file
+ECHO        A set/detected COMPILER_CFG_SCRIPT value is: %COMPILER_CFG_SCRIPT%
+ECHO Note: you may set COMPILER_CFG_SCRIPT and/or CXX before running build.bat
 GOTO ERROR

 :RUN_COMPILER_CONFIGURATION
 ECHO COMPILER_CFG_SCRIPT="%COMPILER_CFG_SCRIPT%"
-ECHO PLATFORM_64BIT="%PLATFORM_64BIT%"
-ECHO COMPILER_CFG_ARG="%COMPILER_CFG_ARG%"
+ECHO PLATFORM_64BIT_ARG="%PLATFORM_64BIT_ARG%"
 ECHO ON
-CALL "%COMPILER_CFG_SCRIPT%" %PLATFORM_64BIT% %COMPILER_CFG_ARG%
+CALL "%COMPILER_CFG_SCRIPT%" %PLATFORM_64BIT_ARG%
 @ECHO OFF

 IF NOT ERRORLEVEL 0 (
@@ -166,4 +150,3 @@
 EXIT /B 1

 :THEEND
-


Improved post_build script.

Improved post_build script.

--- scripts/post_build.bat
+++ scripts/post_build.bat
@@ -9,30 +9,45 @@
 SET ROOTDIR=%CD%
 POPD

+:STEP1
+ECHO Step 1/4: Copying language files...
 XCOPY /S /Y /F "%PROJECTDIR%\Translations\*" "%TARGETDIR%\freelauncher-langs\"

 IF NOT %CONFIGURATION% == Release (
-	ECHO Detected non-release configuration. Exiting...
-	EXIT 0
+	ECHO Detected non-release configuration.
+	GOTO FINISH
 )

+:STEP2
+ECHO Step 2/4: Cleaning-up TARGETDIR...
 DEL /Q "%TARGETDIR%\*.?db" "%TARGETDIR%\*.xml" "%TARGETDIR%\zip\"

+:STEP3
+SET SKIPPACKED=
 IF NOT EXIST "%ROOTDIR%\reactor.exe" (
-	ECHO .NET Reactor not found. Exiting...
-	EXIT 0
+	ECHO .NET Reactor not found. Skipping to step 4...
+	SET SKIPPACKED=TRUE
+	GOTO STEP4
 )
+ECHO Step 3/4: Merging assemblies...
 SET DLLS=
 FOR %%I IN ("%TARGETDIR%\*.DLL") DO (
 	SET DLLS=!DLLS!/%%I
 )
 "%ROOTDIR%\reactor.exe" -file "%TARGETDIR%\FreeLauncher.exe" -merge 1 -satellite_assemblies "%DLLS:~1%" -targetfile "%TARGETDIR%\FreeLauncher-%2.exe" -q

+:STEP4
 WHERE 7z >nul 2>nul
 IF %ERRORLEVEL% NEQ 0 (
-	ECHO 7z not found being installed. Exiting...
-	EXIT 0
+	ECHO 7z not found being installed.
+	GOTO FINISH
 )
-7z a "%TARGETDIR%\zip\FreeLauncher-%2-packed.zip" "%TARGETDIR%\FreeLauncher-%2.exe" "%TARGETDIR%\freelauncher-langs\" -r
+ECHO Step 4/4: Creating zip archives...
+IF NOT %SKIPPACKED% == TRUE (
+	7z a "%TARGETDIR%\zip\FreeLauncher-%2-packed.zip" "%TARGETDIR%\FreeLauncher-%2.exe" "%TARGETDIR%\freelauncher-langs\" -r
+	7z rn "%TARGETDIR%\zip\FreeLauncher-%2-packed.zip" "FreeLauncher-%2.exe" "FreeLauncher.exe"
+)
 7z a "%TARGETDIR%\zip\FreeLauncher-%2.zip" "%TARGETDIR%\FreeLauncher.exe" "%TARGETDIR%\*.dll" "%TARGETDIR%\freelauncher-langs\" -r
-7z rn "%TARGETDIR%\zip\FreeLauncher-%2-packed.zip" "FreeLauncher-%2.exe" "FreeLauncher.exe"
+
+:FINISH
+ECHO Finishing script...


updated message for sdk pr automation

updated message for sdk pr automation

--- scripts/sdk-update.cmd
+++ scripts/sdk-update.cmd
@@ -1,5 +1,5 @@
 SET VERSION=v19.1.0-test
-SET JSON="{\"title\": \"RELEAse %VERSION%\", \"head\": \"avaDev:%VERSION%\", \"base\": \"master\", \"maintainer_can_modify\": true, \"body\": \"testing automation script\"}"
+SET JSON="{\"title\": \"RELEAse %VERSION%\", \"head\": \"avaDev:%VERSION%\", \"base\": \"master\", \"maintainer_can_modify\": true, \"body\": \"Update for %VERSION%\"}"

 START /WAIT "" "%PROGRAMFILES%\Git\bin\sh.exe" -c "sh git-branch.sh %VERSION%"


fix bug of clear third_party cache every 10 days (#36332)

--- paddle/scripts/paddle_build.bat
+++ paddle/scripts/paddle_build.bat
@@ -138,6 +138,17 @@
     echo %day_now% > %cache_dir%\day.txt
     type %cache_dir%\day.txt
     rmdir %BUILD_DIR% /s/q
+
+    : clear third party cache every once in a while
+    if %day_now% EQU 21 (
+        rmdir %cache_dir%\third_party /s/q
+    )
+    if %day_now% EQU 11 (
+        rmdir %cache_dir%\third_party /s/q
+    )
+    if %day_now% EQU 01 (
+        rmdir %cache_dir%\third_party /s/q
+    )
     goto :mkbuild
 )

@@ -333,24 +344,6 @@
 rem clcache.exe -M 21474836480

 rem ------set third_party cache dir------
-: clear third party cache every once in a while
-for /F %%# in ('wmic os get localdatetime^|findstr 20') do set datetime=%%#
-set day_now=%datetime:~6,2%
-set day_before=-1
-set /p day_before=< %cache_dir%\day.txt
-if %day_now% NEQ %day_before% (
-    echo %day_now% > %cache_dir%\day.txt
-    type %cache_dir%\day.txt
-    if %day_now% EQU 21 (
-        rmdir %cache_dir%\third_party /s/q
-    )
-    if %day_now% EQU 11 (
-        rmdir %cache_dir%\third_party /s/q
-    )
-    if %day_now% EQU 01 (
-        rmdir %cache_dir%\third_party /s/q
-    )
-)

 if "%WITH_TPCACHE%"=="OFF" (
     set THIRD_PARTY_PATH=%work_dir:\=/%/%BUILD_DIR%/third_party


Typo fix in install.bat.

Typo fix in install.bat.

--- install.bat
+++ install.bat
@@ -16,7 +16,7 @@
 goto end

 :pleasesetblenderaddons
-echo.Please set BLENDERADDONS to the folder where blender.exe resides, such as:
+echo.Please set BLENDERADDONS to the folder where the blender addons reside, such as:
 echo.
 echo.  set BLENDERADDONS=C:\Program Files\Blender Foundation\Blender\2.59\scripts\addons
 echo.