diff options
| author | lateralusX <lateralusx.github@gmail.com> | 2016-12-28 18:50:54 +0300 |
|---|---|---|
| committer | lateralusX <lateralusx.github@gmail.com> | 2016-12-28 18:50:54 +0300 |
| commit | 23b8b5d387d3be6c2a24dc8ffcdb3f7c20350eb6 (patch) | |
| tree | c9761ba18e3efccf0e89d7a0496a2d9e960e8811 /msvc/winsetup.bat | |
| parent | f997a6e0de836c3ec9f8a34bca2dc31b1760e5be (diff) | |
Fix build_init vcxproj to correctly detect changes in config.h.
build_init project doesn't detect changes done in config.h. This is needed in order
for build_init to replace config.h with winconfig.h and backup cygconfig.h. This is
normally an issue if you do a reconfigure and build using make and then msbuild. The msbuild
will then fail, since config.h is still the cygwin version. Solution is to do a rebuild all
that will trigger build_init. This fix will make sure that build_init gets invoked if there has been a change to config.h.
There was also a very old issue with the first copy of config.h -> cygconfig.h. This is only done
if there is no cygconfig.h in the directory. This means that the cygconfig.h will not be update until
deleted and a new build_init has been invoked. This fix will make sure cygconfig.h is always updated
if config.h is the cygwin generated version (not already replaced with winconfig.h).
Diffstat (limited to 'msvc/winsetup.bat')
| -rwxr-xr-x | msvc/winsetup.bat | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/msvc/winsetup.bat b/msvc/winsetup.bat index f25016fd5f5..e6afb26d8ff 100755 --- a/msvc/winsetup.bat +++ b/msvc/winsetup.bat @@ -12,19 +12,9 @@ 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% 2>&1 |