edksetup.bat: Fixed corrupts CYGWIN_HOME
The .BAT file checks for existance of the directory c:\cygwin and,
if it exists, always resets CYGWIN_HOME to that path.
That means that if CYGWIN_HOME is set to say c:\cygwin64, it gets corrupted.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>
Reviewed-by Yingke Liu <yingke.d.liu@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15254 6f19259b-4bc3-4df7-8a09-765794883524
diff --git a/edksetup.bat b/edksetup.bat
index 6e526cd..ba775ce 100755
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -110,6 +110,13 @@
goto end
:check_cygwin
+if defined CYGWIN_HOME (
+ if not exist "%CYGWIN_HOME%" (
+ @echo.
+ @echo !!! WARNING !!! CYGWIN_HOME not found, gcc build may not be used !!!
+ @echo.
+ )
+) else (
if exist c:\cygwin (
set CYGWIN_HOME=c:\cygwin
) else (
@@ -117,9 +124,10 @@
@echo !!! WARNING !!! No CYGWIN_HOME set, gcc build may not be used !!!
@echo.
)
+)
-if NOT "%1"=="" goto Usage
-goto end
+:cygwin_done
+if "%1"=="" goto end
:Usage
@echo.
@@ -129,8 +137,8 @@
@echo Reconfig Reinstall target.txt, tools_def.txt and build_rule.txt.
@echo.
@echo Note that target.template, tools_def.template and build_rules.template
- @echo will be only copied to target.txt, tools_def.txt and build_rule.txt
- @echo respectively if they do not exist. Using option [Reconfig] to force the copy.
+ @echo will only be copied to target.txt, tools_def.txt and build_rule.txt
+ @echo respectively if they do not exist. Use option [Reconfig] to force the copy.
@echo.
goto end