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 6e526cdd03c6c12b4cd85177a23358bcd527b1d6..ba775ce2da09019c6c53424106ca7485d30fb94c 100755 (executable)
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -110,6 +110,13 @@ goto check_cygwin
   goto end\r
 \r
 :check_cygwin\r
+if defined CYGWIN_HOME (\r
+  if not exist "%CYGWIN_HOME%" (\r
+    @echo.\r
+    @echo !!! WARNING !!! CYGWIN_HOME not found, gcc build may not be used !!!\r
+    @echo.\r
+  )\r
+) else (\r
   if exist c:\cygwin (\r
     set CYGWIN_HOME=c:\cygwin\r
   ) else (\r
@@ -117,9 +124,10 @@ goto check_cygwin
     @echo !!! WARNING !!! No CYGWIN_HOME set, gcc build may not be used !!!\r
     @echo.\r
   )\r
+)\r
 \r
-if NOT "%1"=="" goto Usage\r
-goto end\r
+:cygwin_done\r
+if "%1"=="" goto end\r
 \r
 :Usage\r
   @echo.\r
@@ -129,8 +137,8 @@ goto end
   @echo         Reconfig       Reinstall target.txt, tools_def.txt and build_rule.txt.\r
   @echo.\r
   @echo  Note that target.template, tools_def.template and build_rules.template\r
-  @echo  will be only copied to target.txt, tools_def.txt and build_rule.txt\r
-  @echo  respectively if they do not exist. Using option [Reconfig] to force the copy. \r
+  @echo  will only be copied to target.txt, tools_def.txt and build_rule.txt\r
+  @echo  respectively if they do not exist. Use option [Reconfig] to force the copy.\r
   @echo.\r
   goto end\r
 \r