[Win] Cygwin 64-bit EWS process cannot find Visual Studio installation.

https://bugs.webkit.org/show_bug.cgi?id=177244

Reviewed by Alex Christensen.

The 64-bit EWS shell process should try to find Visual Studio in the 32-bit program files folder.

* EWSTools/start-queue-win.sh:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@222458 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Author: [email protected]

Tools/ChangeLog

@@ -1,3 +1,14 @@
+2017-09-25  Per Arne Vollan  <[email protected]>
+
+        [Win] Cygwin 64-bit EWS process cannot find Visual Studio installation.
+        https://bugs.webkit.org/show_bug.cgi?id=177244
+
+        Reviewed by Alex Christensen.
+
+        The 64-bit EWS shell process should try to find Visual Studio in the 32-bit program files folder.
+
+        * EWSTools/start-queue-win.sh:
+
 2017-09-25  Alex Christensen  <[email protected]>
 
         Add WKContentRuleList notify action type

Tools/EWSTools/start-queue-win.sh

@@ -12,7 +12,14 @@ function start_ews()
 {
     trap 'error_handler ${LINENO} $?' ERR
 
-    "$PROGRAMFILES/Microsoft Visual Studio 14.0/VC/vcvarsall.bat"
+    if [[ $PROGRAMFILES =~ "(x86)" ]]
+    then
+        PROGRAMFILES_X86=$PROGRAMFILES
+    else
+        PROGRAMFILES_X86="$PROGRAMFILES (x86)"
+    fi
+
+    "$PROGRAMFILES_X86/Microsoft Visual Studio 14.0/VC/vcvarsall.bat"
 
     while :
     do
@@ -24,7 +31,7 @@ function start_ews()
         find ~/win-ews-logs -mtime +7 -exec rm -f {} \;
         echo "TASK: Starting up"
         cd ~/WebKit
-        export VSINSTALLDIR="$PROGRAMFILES\Microsoft Visual Studio 14.0"
+        export VSINSTALLDIR="$PROGRAMFILES_X86\Microsoft Visual Studio 14.0"
         echo "TASK: Cleaning WebKitBuild"
         rm -rf WebKitBuild
         date