Title: [222458] trunk/Tools
- Revision
- 222458
- Author
- [email protected]
- Date
- 2017-09-25 12:55:31 -0700 (Mon, 25 Sep 2017)
Log Message
[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:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (222457 => 222458)
--- trunk/Tools/ChangeLog 2017-09-25 19:47:50 UTC (rev 222457)
+++ trunk/Tools/ChangeLog 2017-09-25 19:55:31 UTC (rev 222458)
@@ -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
Modified: trunk/Tools/EWSTools/start-queue-win.sh (222457 => 222458)
--- trunk/Tools/EWSTools/start-queue-win.sh 2017-09-25 19:47:50 UTC (rev 222457)
+++ trunk/Tools/EWSTools/start-queue-win.sh 2017-09-25 19:55:31 UTC (rev 222458)
@@ -12,8 +12,15 @@
{
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
date
@@ -24,7 +31,7 @@
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
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
