Windows full AOT build scripts update.

* Only do clean/rebuild when an assembly changed.
* Add wrappers for different full AOT build configurations.
* Make scripts callable from different working directory.

10 files changed, 143 insertions, 37 deletions

diff --git a/msvc/scripts/tests/build-full-aot-regression-tests-asmonly-llvm.bat b/msvc/scripts/tests/build-full-aot-regression-tests-asmonly-llvm.bat
new file mode 100644
index 00000000000..0110bf4531c
--- /dev/null
+++ b/msvc/scripts/tests/build-full-aot-regression-tests-asmonly-llvm.bat
@@ -0,0 +1,10 @@
+@ECHO OFF
+
+SETLOCAL
+
+SET USE_LLVM=yes
+SET FULL_AOT_MODE=asmonly
+
+CALL %~dp0build-full-aot-regression-tests.bat %*
+
+@ECHO ON
diff --git a/msvc/scripts/tests/build-full-aot-regression-tests-asmonly.bat b/msvc/scripts/tests/build-full-aot-regression-tests-asmonly.bat
new file mode 100644
index 00000000000..4a5558d7f97
--- /dev/null
+++ b/msvc/scripts/tests/build-full-aot-regression-tests-asmonly.bat
@@ -0,0 +1,9 @@
+@ECHO OFF
+
+SETLOCAL
+
+SET FULL_AOT_MODE=asmonly
+
+CALL %~dp0build-full-aot-regression-tests.bat %*
+
+@ECHO ON
diff --git a/msvc/scripts/tests/build-full-aot-regression-tests-dynamic-llvm.bat b/msvc/scripts/tests/build-full-aot-regression-tests-dynamic-llvm.bat
new file mode 100644
index 00000000000..9650d6c940b
--- /dev/null
+++ b/msvc/scripts/tests/build-full-aot-regression-tests-dynamic-llvm.bat
@@ -0,0 +1,10 @@
+@ECHO OFF
+
+SETLOCAL
+
+SET USE_LLVM=yes
+SET FULL_AOT_MODE=dynamic
+
+CALL %~dp0build-full-aot-regression-tests.bat %*
+
+@ECHO ON
diff --git a/msvc/scripts/tests/build-full-aot-regression-tests-dynamic.bat b/msvc/scripts/tests/build-full-aot-regression-tests-dynamic.bat
new file mode 100644
index 00000000000..a59e3494dad
--- /dev/null
+++ b/msvc/scripts/tests/build-full-aot-regression-tests-dynamic.bat
@@ -0,0 +1,9 @@
+@ECHO OFF
+
+SETLOCAL
+
+SET FULL_AOT_MODE=dynamic
+
+CALL %~dp0build-full-aot-regression-tests.bat %*
+
+@ECHO ON
diff --git a/msvc/scripts/tests/build-full-aot-regression-tests-static-llvm.bat b/msvc/scripts/tests/build-full-aot-regression-tests-static-llvm.bat
new file mode 100644
index 00000000000..a765f5f4572
--- /dev/null
+++ b/msvc/scripts/tests/build-full-aot-regression-tests-static-llvm.bat
@@ -0,0 +1,10 @@
+@ECHO OFF
+
+SETLOCAL
+
+SET USE_LLVM=yes
+SET FULL_AOT_MODE=static
+
+CALL %~dp0build-full-aot-regression-tests.bat %*
+
+@ECHO ON
diff --git a/msvc/scripts/tests/build-full-aot-regression-tests-static.bat b/msvc/scripts/tests/build-full-aot-regression-tests-static.bat
new file mode 100644
index 00000000000..82a326903f2
--- /dev/null
+++ b/msvc/scripts/tests/build-full-aot-regression-tests-static.bat
@@ -0,0 +1,9 @@
+@ECHO OFF
+
+SETLOCAL
+
+SET FULL_AOT_MODE=static
+
+CALL %~dp0build-full-aot-regression-tests.bat %*
+
+@ECHO ON
diff --git a/msvc/scripts/tests/build-full-aot-regression-tests.bat b/msvc/scripts/tests/build-full-aot-regression-tests.bat
index 68772b56381..c24526a3211 100644
--- a/msvc/scripts/tests/build-full-aot-regression-tests.bat
+++ b/msvc/scripts/tests/build-full-aot-regression-tests.bat
@@ -13,13 +13,13 @@ IF NOT "" == "%BUILD_TARGET%" (
 	SET BUILD_TARGET=%BUILD_TARGET:"=%
 )
 
-CALL setup-env.bat
+CALL %~dp0setup-env.bat
 IF NOT ERRORLEVEL == 0 (
 	ECHO Failed to setup mono paths.
 	GOTO ON_ERROR
 )
 
-CALL setup-toolchain.bat
+CALL %~dp0setup-toolchain.bat
 IF NOT ERRORLEVEL == 0 (
 	ECHO Failed to setup toolchain.
 	GOTO ON_ERROR
@@ -130,26 +130,32 @@ IF "" == "%FULLAOT_LIBS%" (
 )
 
 FOR %%a IN (%FULLAOT_LIBS%) DO (
-
-	del "%FULLAOT_DIR%\%%a.dll" >nul 2>&1
-	ECHO Deleting "%FULLAOT_DIR%\%%a.dll".
-	del "%FULLAOT_DIR%\%%a.dll.lib" >nul 2>&1
-	ECHO Deleting "%FULLAOT_DIR%\%%a.dll.lib".
-	del "%FULLAOT_DIR%\%%a.dll.exp" >nul 2>&1
-	ECHO Deleting "%FULLAOT_DIR%\%%a.dll.exp".
-	del "%FULLAOT_DIR%\%%a.dll.pdb" >nul 2>&1
-	ECHO Deleting "%FULLAOT_DIR%\%%a.dll.pdb".
-	del "%FULLAOT_DIR%\%%a.obj" >nul 2>&1
-	ECHO Deleting "%FULLAOT_DIR%\%%a.obj".
-
 	IF EXIST %MONO_WINAOT_BCL_PATH%\%%a (
-		ECHO Copying %MONO_WINAOT_BCL_PATH%\%%a %FULLAOT_DIR%\%%a.
-		copy %MONO_WINAOT_BCL_PATH%\%%a %FULLAOT_DIR%\%%a >nul 2>&1
+		IF NOT "" == "%CLEAN%" (
+			CALL :DELETE_FULLAOT_LIB %FULLAOT_DIR% %%a
+		) ELSE (
+			fc.exe /B %MONO_WINAOT_BCL_PATH%\%%a %FULLAOT_DIR%\%%a >nul 2>&1 && (
+				ECHO %FULLAOT_DIR%\%%a already up to date.
+			) || (
+				CALL :DELETE_FULLAOT_LIB %FULLAOT_DIR% %%a
+				ECHO Copying %MONO_WINAOT_BCL_PATH%\%%a %FULLAOT_DIR%\%%a.
+				copy %MONO_WINAOT_BCL_PATH%\%%a %FULLAOT_DIR%\%%a >nul 2>&1
+			)
+		)
 	) ELSE (
-		SET FOUND_TEST_TARGET_PATH=
-		CALL :INNER_COPY_LOOP FOUND_TEST_TARGET_PATH %%a
-		ECHO Copying !FOUND_TEST_TARGET_PATH! %FULLAOT_DIR%\%%a.
-		copy !FOUND_TEST_TARGET_PATH! %FULLAOT_DIR%\%%a >nul 2>&1
+		IF NOT "" == "%CLEAN%" (
+			CALL :DELETE_FULLAOT_LIB %FULLAOT_DIR% %%a
+		) ELSE (
+			SET FOUND_TEST_TARGET_PATH=
+			CALL :INNER_COPY_LOOP FOUND_TEST_TARGET_PATH %%a
+			fc.exe /B !FOUND_TEST_TARGET_PATH! %FULLAOT_DIR%\%%a >nul 2>&1 && (
+				ECHO %FULLAOT_DIR%\%%a already up to date.
+			) || (
+				CALL :DELETE_FULLAOT_LIB %FULLAOT_DIR% %%a
+				ECHO Copying !FOUND_TEST_TARGET_PATH! %FULLAOT_DIR%\%%a.
+				copy !FOUND_TEST_TARGET_PATH! %FULLAOT_DIR%\%%a >nul 2>&1
+			)
+		)
 	)
 )
 
@@ -170,29 +176,72 @@ IF EXIST %MONO_RUNTIME_TEST_PATH%\%2 (
 :RETURN_INNER_COPY_LOOP
 GOTO :EOF
 
+:DELETE_FULLAOT_LIB
+
+ECHO Deleting "%1\%2.dll".
+del "%1\%2.dll" >nul 2>&1
+ECHO Deleting "%1\%2.dll.lib".
+del "%1\%2.dll.lib" >nul 2>&1
+ECHO Deleting "%1\%2.dll.exp".
+del "%1\%2.dll.exp" >nul 2>&1
+ECHO Deleting "%1\%2.dll.pdb".
+del "%1\%2.dll.pdb" >nul 2>&1
+ECHO Deleting "%1\%2.obj".
+del "%1\%2.obj" >nul 2>&1
+ECHO Deleting "%1\%2.s".
+del "%1\%2.s" >nul 2>&1
+ECHO Deleting "%1\%2-llvm.s".
+del "%1\%2.s.bc" >nul 2>&1
+ECHO Deleting "%1\%2-llvm.s.bc".
+del "%1\%2.s.opt.bc" >nul 2>&1
+ECHO Deleting "%1\%2-llvm.s.opt.bc".
+del "%1\%2-llvm.s" >nul 2>&1
+ECHO Deleting "%1\%2-llvm.obj".
+del "%1\%2-llvm.obj" >nul 2>&1
+
+GOTO :EOF
+
 :BUILD
 
 SET FULLAOT_TEMP_DIR=%FULLAOT_DIR%\%%a-build
-REM SET USE_LLVM=llvm
 
-SET MONO_FULL_AOT_COMPILE_ARGS_TEMPLATE=--aot=full,temp-path=%FULLAOT_TEMP_DIR%,print-skipped,%USE_LLVM%,outfile=%FULLAOT_DIR%\%%a.dll
-REM SET MONO_FULL_AOT_COMPILE_ARGS_TEMPLATE=--aot=full,temp-path=%FULLAOT_TEMP_DIR%,print-skipped,static,%USE_LLVM%,outfile=%FULLAOT_DIR%\%%a.obj,llvm-outfile=%FULLAOT_DIR%\%%a-llvm.obj
-REM SET MONO_FULL_AOT_COMPILE_ARGS_TEMPLATE=--aot=full,temp-path=%FULLAOT_TEMP_DIR%,print-skipped,asmonly,%USE_LLVM%,outfile=%FULLAOT_DIR%\%%a.s,llvm-outfile=%FULLAOT_DIR%\%%a-llvm.s
+IF "" == "%FULL_AOT_MODE%" (
+	SET FULL_AOT_MODE=dynamic
+)
+
+IF /i "yes" == "%USE_LLVM%" (
+	SET LLVM_ARG=llvm
+)
+
+IF /i "static" == "%FULL_AOT_MODE%" (
+	SET MONO_FULL_AOT_COMPILE_ARGS_TEMPLATE=--aot=full,temp-path=%FULLAOT_TEMP_DIR%,print-skipped,static,%LLVM_ARG%,outfile=%FULLAOT_DIR%\%%a.obj,llvm-outfile=%FULLAOT_DIR%\%%a-llvm.obj
+)
+
+IF /i "asmonly"  == "%FULL_AOT_MODE%" (
+	SET MONO_FULL_AOT_COMPILE_ARGS_TEMPLATE=--aot=full,temp-path=%FULLAOT_TEMP_DIR%,print-skipped,asmonly,%LLVM_ARG%,outfile=%FULLAOT_DIR%\%%a.s,llvm-outfile=%FULLAOT_DIR%\%%a-llvm.s
+)
+
+IF /i "dynamic"  == "%FULL_AOT_MODE%" (
+	SET MONO_FULL_AOT_COMPILE_ARGS_TEMPLATE=--aot=full,temp-path=%FULLAOT_TEMP_DIR%,print-skipped,%LLVM_ARG%,outfile=%FULLAOT_DIR%\%%a.dll
+)
 
 IF "" == "%CLEAN%" (
 
 	FOR %%a IN (%FULLAOT_LIBS%) DO (
 
-		mkdir %FULLAOT_TEMP_DIR% >nul 2>&1
+		IF NOT EXIST %FULLAOT_DIR%\%%a.obj (
+
+			mkdir %FULLAOT_TEMP_DIR% >nul 2>&1
 
-		ECHO %MONO_AOT_COMPILER_EXECUTABLE% %MONO_FULL_AOT_COMPILE_ARGS_TEMPLATE% %FULLAOT_DIR%\%%a.
-		%MONO_AOT_COMPILER_EXECUTABLE% %MONO_FULL_AOT_COMPILE_ARGS_TEMPLATE% %FULLAOT_DIR%\%%a
+			ECHO %MONO_AOT_COMPILER_EXECUTABLE% %MONO_FULL_AOT_COMPILE_ARGS_TEMPLATE% %FULLAOT_DIR%\%%a.
+			%MONO_AOT_COMPILER_EXECUTABLE% %MONO_FULL_AOT_COMPILE_ARGS_TEMPLATE% %FULLAOT_DIR%\%%a
 
-		rmdir /S /Q %FULLAOT_TEMP_DIR%
+			rmdir /S /Q %FULLAOT_TEMP_DIR%
 
-		IF NOT ERRORLEVEL == 0 (
-			ECHO "Failed Full AOT compile of %FULLAOT_DIR%\%%a".
-			GOTO ON_ERROR
+			IF NOT ERRORLEVEL == 0 (
+				ECHO "Failed Full AOT compile of %FULLAOT_DIR%\%%a".
+				GOTO ON_ERROR
+			)
 		)
 	)
 )
diff --git a/msvc/scripts/tests/run-full-aot-regression-tests.bat b/msvc/scripts/tests/run-full-aot-regression-tests.bat
index 572cd288580..0f65e75e366 100644
--- a/msvc/scripts/tests/run-full-aot-regression-tests.bat
+++ b/msvc/scripts/tests/run-full-aot-regression-tests.bat
@@ -4,13 +4,13 @@ SETLOCAL
 SET TEMP_PATH=%PATH%
 SET MONO_RESULT=1
 
-CALL setup-env.bat
+CALL %~dp0setup-env.bat
 IF NOT ERRORLEVEL == 0 (
 	ECHO Failed to setup mono paths.
 	GOTO ON_ERROR
 )
 
-CALL setup-toolchain.bat
+CALL %~dp0setup-toolchain.bat
 IF NOT ERRORLEVEL == 0 (
 	ECHO Failed to setup toolchain.
 	GOTO ON_ERROR
diff --git a/msvc/scripts/tests/run-jit-regression.bat b/msvc/scripts/tests/run-jit-regression.bat
index da1aad17089..3031eee6519 100644
--- a/msvc/scripts/tests/run-jit-regression.bat
+++ b/msvc/scripts/tests/run-jit-regression.bat
@@ -5,13 +5,13 @@ SETLOCAL ENABLEDELAYEDEXPANSION
 SET TEMP_PATH=%PATH%
 SET MONO_RESULT=1
 
-CALL setup-env.bat
+CALL %~dp0setup-env.bat
 IF NOT ERRORLEVEL == 0 (
 	ECHO Failed to setup mono paths.
 	GOTO ON_ERROR
 )
 
-CALL setup-toolchain.bat
+CALL %~dp0setup-toolchain.bat
 IF NOT ERRORLEVEL == 0 (
 	ECHO Failed to setup toolchain.
 	GOTO ON_ERROR
diff --git a/msvc/scripts/tests/run-jit.bat b/msvc/scripts/tests/run-jit.bat
index 9422508e8aa..895d96c5da7 100644
--- a/msvc/scripts/tests/run-jit.bat
+++ b/msvc/scripts/tests/run-jit.bat
@@ -4,13 +4,13 @@ SETLOCAL
 SET TEMP_PATH=%PATH%
 SET MONO_RESULT=1
 
-CALL setup-env.bat
+CALL %~dp0setup-env.bat
 IF NOT ERRORLEVEL == 0 (
 	ECHO Failed to setup mono paths.
 	GOTO ON_ERROR
 )
 
-CALL setup-toolchain.bat
+CALL %~dp0setup-toolchain.bat
 IF NOT ERRORLEVEL == 0 (
 	ECHO Failed to setup toolchain.
 	GOTO ON_ERROR