Merge pull request #4222 from alexanderkyte/fix_mismatch_com_disabled

[mono.git] / msvc / winsetup.bat

diff --git a/msvc/winsetup.bat b/msvc/winsetup.bat
index a05395ca491b2fa58eabf042b27bd7116a848737..e6afb26d8ff37979b08de265bda5f08c04d6ce23 100755 (executable)
--- a/msvc/winsetup.bat
+++ b/msvc/winsetup.bat
@@ -12,29 +12,19 @@ SET VERSION_H=..\mono\mini\version.h
 
 ECHO Setting up Mono configuration headers...
 
-IF EXIST %CONFIG_H% (
-       IF NOT EXIST %CYG_CONFIG_H% (
-               ECHO copy %CONFIG_H% %CYG_CONFIG_H%
-               copy %CONFIG_H% %CYG_CONFIG_H%
-       )
-)
-
-IF EXIST %EGLIB_CONFIG_H% (
-       IF NOT EXIST %EGLIB_CYG_CONFIG_H% (
-               ECHO copy %EGLIB_CONFIG_H% %EGLIB_CYG_CONFIG_H%
-               copy %EGLIB_CONFIG_H% %EGLIB_CYG_CONFIG_H%
-       )
-)
+REM Backup existing config.h into cygconfig.h if its not already replaced.
+%windir%\system32\WindowsPowerShell\v1.0\powershell.exe -executionpolicy bypass -NonInteractive -File backup-config-files.ps1 %CONFIG_H% %CYG_CONFIG_H% 2>&1
+%windir%\system32\WindowsPowerShell\v1.0\powershell.exe -executionpolicy bypass -NonInteractive -File backup-config-files.ps1 %EGLIB_CONFIG_H% %EGLIB_CYG_CONFIG_H% 2>&1
 
-%windir%\system32\WindowsPowerShell\v1.0\powershell.exe -executionpolicy bypass -NonInteractive -File compare-config-files.ps1 %WIN_CONFIG_H% %CONFIG_H% %CONFIGURE_AC% >$null 2>&1
+%windir%\system32\WindowsPowerShell\v1.0\powershell.exe -executionpolicy bypass -NonInteractive -File compare-config-files.ps1 %WIN_CONFIG_H% %CONFIG_H% %CONFIGURE_AC% 2>&1
 
 IF NOT %ERRORLEVEL% == 0 (
        ECHO copy %WIN_CONFIG_H% %CONFIG_H%
        copy %WIN_CONFIG_H% %CONFIG_H%
-       %windir%\system32\WindowsPowerShell\v1.0\powershell.exe -NonInteractive -Command "(Get-Content %CONFIG_H%) -replace '#MONO_VERSION#', (Select-String -path %CONFIGURE_AC% -pattern 'AC_INIT\(mono, \[(.*)\]').Matches[0].Groups[1].Value | Set-Content %CONFIG_H%" >$null 2>&1
+       %windir%\system32\WindowsPowerShell\v1.0\powershell.exe -NonInteractive -Command "(Get-Content %CONFIG_H%) -replace '#MONO_VERSION#', (Select-String -path %CONFIGURE_AC% -pattern 'AC_INIT\(mono, \[(.*)\]').Matches[0].Groups[1].Value | Set-Content %CONFIG_H%" 2>&1
 )
 
-%windir%\system32\WindowsPowerShell\v1.0\powershell.exe -executionpolicy bypass -NonInteractive -File compare-config-files.ps1 %EGLIB_WIN_CONFIG_H% %EGLIB_CONFIG_H% >$null 2>&1
+%windir%\system32\WindowsPowerShell\v1.0\powershell.exe -executionpolicy bypass -NonInteractive -File compare-config-files.ps1 %EGLIB_WIN_CONFIG_H% %EGLIB_CONFIG_H% 2>&1
 
 IF NOT %ERRORLEVEL% == 0 (
        ECHO copy %EGLIB_WIN_CONFIG_H% %EGLIB_CONFIG_H%
@@ -42,7 +32,7 @@ IF NOT %ERRORLEVEL% == 0 (
 )
 
 SET VERSION_CONTENT="#define FULL_VERSION \"Visual Studio built mono\""
-%windir%\system32\WindowsPowerShell\v1.0\powershell.exe -executionpolicy bypass -NonInteractive -File compare-config-content.ps1 %VERSION_CONTENT% %VERSION_H%
+%windir%\system32\WindowsPowerShell\v1.0\powershell.exe -executionpolicy bypass -NonInteractive -File compare-config-content.ps1 %VERSION_CONTENT% %VERSION_H%  2>&1
 
 
 IF NOT %ERRORLEVEL% == 0 (