<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[162557] branches/safari-537.75-branch/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/162557">162557</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-01-22 14:37:26 -0800 (Wed, 22 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/157882">r157882</a>
2013-10-23 Alex Christensen <achristensen@webkit.org>
Explicitly build Win32 or x64 configuration on Windows.
https://bugs.webkit.org/show_bug.cgi?id=123206
Reviewed by Brent Fulgham.
* Scripts/webkitdirs.pm:
(jscPath):
(determineConfigurationForVisualStudio):
(determinePassedConfiguration):
Add |Win32 to the end of 32-bit Visual Studio build configurations.
(safariPath):
* Scripts/build-webkit:
* Scripts/old-run-webkit-tests:
* Scripts/run-api-tests:
(testToolPath):
* Scripts/run-javascriptcore-tests:
(testapiPath):
* Scripts/run-regexp-tests:
(testapiPath):
* Scripts/sunspider-compare-results:
(pathToBuiltJSC):
Use configuration instead of configurationForVisualStudio, which are now always different.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53775branchToolsChangeLog">branches/safari-537.75-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari53775branchToolsScriptsbuildwebkit">branches/safari-537.75-branch/Tools/Scripts/build-webkit</a></li>
<li><a href="#branchessafari53775branchToolsScriptsoldrunwebkittests">branches/safari-537.75-branch/Tools/Scripts/old-run-webkit-tests</a></li>
<li><a href="#branchessafari53775branchToolsScriptsrunapitests">branches/safari-537.75-branch/Tools/Scripts/run-api-tests</a></li>
<li><a href="#branchessafari53775branchToolsScriptsrunjavascriptcoretests">branches/safari-537.75-branch/Tools/Scripts/run-javascriptcore-tests</a></li>
<li><a href="#branchessafari53775branchToolsScriptsrunregexptests">branches/safari-537.75-branch/Tools/Scripts/run-regexp-tests</a></li>
<li><a href="#branchessafari53775branchToolsScriptssunspidercompareresults">branches/safari-537.75-branch/Tools/Scripts/sunspider-compare-results</a></li>
<li><a href="#branchessafari53775branchToolsScriptswebkitdirspm">branches/safari-537.75-branch/Tools/Scripts/webkitdirs.pm</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branchessafari53775branchTools">branches/safari-537.75-branch/Tools/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53775branchTools"></a>
<div class="propset"><h4>Property changes: branches/safari-537.75-branch/Tools</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="addfile"><h4>Added: svn:mergeinfo</h4></div>
<a id="branchessafari53775branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Tools/ChangeLog (162556 => 162557)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Tools/ChangeLog 2014-01-22 22:18:28 UTC (rev 162556)
+++ branches/safari-537.75-branch/Tools/ChangeLog 2014-01-22 22:37:26 UTC (rev 162557)
</span><span class="lines">@@ -1,5 +1,34 @@
</span><span class="cx"> 2014-01-22 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><ins>+ Merge r157882
+
+ 2013-10-23 Alex Christensen <achristensen@webkit.org>
+
+ Explicitly build Win32 or x64 configuration on Windows.
+ https://bugs.webkit.org/show_bug.cgi?id=123206
+
+ Reviewed by Brent Fulgham.
+
+ * Scripts/webkitdirs.pm:
+ (jscPath):
+ (determineConfigurationForVisualStudio):
+ (determinePassedConfiguration):
+ Add |Win32 to the end of 32-bit Visual Studio build configurations.
+ (safariPath):
+ * Scripts/build-webkit:
+ * Scripts/old-run-webkit-tests:
+ * Scripts/run-api-tests:
+ (testToolPath):
+ * Scripts/run-javascriptcore-tests:
+ (testapiPath):
+ * Scripts/run-regexp-tests:
+ (testapiPath):
+ * Scripts/sunspider-compare-results:
+ (pathToBuiltJSC):
+ Use configuration instead of configurationForVisualStudio, which are now always different.
+
+2014-01-22 Brent Fulgham <bfulgham@apple.com>
+
</ins><span class="cx"> Merge r157607
</span><span class="cx">
</span><span class="cx"> 2013-10-17 Alex Christensen <achristensen@webkit.org>
</span></span></pre></div>
<a id="branchessafari53775branchToolsScriptsbuildwebkit"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Tools/Scripts/build-webkit (162556 => 162557)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Tools/Scripts/build-webkit 2014-01-22 22:18:28 UTC (rev 162556)
+++ branches/safari-537.75-branch/Tools/Scripts/build-webkit 2014-01-22 22:37:26 UTC (rev 162557)
</span><span class="lines">@@ -333,7 +333,7 @@
</span><span class="cx"> if ($project eq "WebKit") {
</span><span class="cx"> my $webkitSolutionPath = "WebKit.vcxproj/WebKit.sln";
</span><span class="cx"> $result = buildVisualStudioProject($webkitSolutionPath, $clean);
</span><del>- my $vsConfiguration = configurationForVisualStudio();
</del><ins>+ my $vsConfiguration = configuration();
</ins><span class="cx"> if (usingVisualStudioExpress()) {
</span><span class="cx"> # Visual Studio Express is so lame it can't stdout build failures.
</span><span class="cx"> # So we find its logs and dump them to the console ourselves.
</span></span></pre></div>
<a id="branchessafari53775branchToolsScriptsoldrunwebkittests"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Tools/Scripts/old-run-webkit-tests (162556 => 162557)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Tools/Scripts/old-run-webkit-tests 2014-01-22 22:18:28 UTC (rev 162556)
+++ branches/safari-537.75-branch/Tools/Scripts/old-run-webkit-tests 2014-01-22 22:37:26 UTC (rev 162557)
</span><span class="lines">@@ -439,16 +439,16 @@
</span><span class="cx"> my $dumpToolName = $useWebKitTestRunner ? "WebKitTestRunner" : "DumpRenderTree";
</span><span class="cx">
</span><span class="cx"> if (isAppleWinWebKit()) {
</span><del>- $dumpToolName .= "_debug" if configurationForVisualStudio() eq "Debug_All";
- $dumpToolName .= "_debug" if configurationForVisualStudio() eq "Debug_Cairo_CFLite";
</del><ins>+ $dumpToolName .= "_debug" if configuration() eq "Debug_All";
+ $dumpToolName .= "_debug" if configuration() eq "Debug_Cairo";
</ins><span class="cx"> $dumpToolName .= $Config{_exe};
</span><span class="cx"> }
</span><span class="cx"> my $dumpTool = File::Spec->catfile($productDir, $dumpToolName);
</span><span class="cx"> die "can't find executable $dumpToolName (looked in $productDir)\n" unless -x $dumpTool;
</span><span class="cx">
</span><span class="cx"> my $imageDiffTool = "$productDir/ImageDiff";
</span><del>-$imageDiffTool .= "_debug" if isCygwin() && configurationForVisualStudio() eq "Debug_All";
-$imageDiffTool .= "_debug" if isCygwin() && configurationForVisualStudio() eq "Debug_Cairo_CFLite";
</del><ins>+$imageDiffTool .= "_debug" if isCygwin() && configuration() eq "Debug_All";
+$imageDiffTool .= "_debug" if isCygwin() && configuration() eq "Debug_Cairo";
</ins><span class="cx"> die "can't find executable $imageDiffTool (looked in $productDir)\n" if $pixelTests && !-x $imageDiffTool;
</span><span class="cx">
</span><span class="cx"> checkFrameworks() unless isCygwin();
</span></span></pre></div>
<a id="branchessafari53775branchToolsScriptsrunapitests"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Tools/Scripts/run-api-tests (162556 => 162557)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Tools/Scripts/run-api-tests 2014-01-22 22:18:28 UTC (rev 162556)
+++ branches/safari-537.75-branch/Tools/Scripts/run-api-tests 2014-01-22 22:37:26 UTC (rev 162557)
</span><span class="lines">@@ -330,7 +330,7 @@
</span><span class="cx"> return $path unless isAppleWinWebKit();
</span><span class="cx">
</span><span class="cx"> my $suffix;
</span><del>- if (configurationForVisualStudio() eq "Debug_All") {
</del><ins>+ if (configuration() eq "Debug_All") {
</ins><span class="cx"> $suffix = "_debug";
</span><span class="cx"> } else {
</span><span class="cx"> $suffix = "";
</span></span></pre></div>
<a id="branchessafari53775branchToolsScriptsrunjavascriptcoretests"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Tools/Scripts/run-javascriptcore-tests (162556 => 162557)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Tools/Scripts/run-javascriptcore-tests 2014-01-22 22:18:28 UTC (rev 162556)
+++ branches/safari-537.75-branch/Tools/Scripts/run-javascriptcore-tests 2014-01-22 22:37:26 UTC (rev 162557)
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> {
</span><span class="cx"> my ($productDir) = @_;
</span><span class="cx"> my $jscName = "testapi";
</span><del>- $jscName .= "_debug" if configurationForVisualStudio() eq "Debug_All";
</del><ins>+ $jscName .= "_debug" if configuration() eq "Debug_All";
</ins><span class="cx"> return "$productDir/$jscName";
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53775branchToolsScriptsrunregexptests"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Tools/Scripts/run-regexp-tests (162556 => 162557)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Tools/Scripts/run-regexp-tests 2014-01-22 22:18:28 UTC (rev 162556)
+++ branches/safari-537.75-branch/Tools/Scripts/run-regexp-tests 2014-01-22 22:37:26 UTC (rev 162557)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> {
</span><span class="cx"> my ($productDir) = @_;
</span><span class="cx"> my $jscName = "testapi";
</span><del>- $jscName .= "_debug" if configurationForVisualStudio() eq "Debug_All";
</del><ins>+ $jscName .= "_debug" if configuration() eq "Debug_All";
</ins><span class="cx"> return "$productDir/$jscName";
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53775branchToolsScriptssunspidercompareresults"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Tools/Scripts/sunspider-compare-results (162556 => 162557)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Tools/Scripts/sunspider-compare-results 2014-01-22 22:18:28 UTC (rev 162556)
+++ branches/safari-537.75-branch/Tools/Scripts/sunspider-compare-results 2014-01-22 22:37:26 UTC (rev 162557)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> {
</span><span class="cx"> my ($productDir) = @_;
</span><span class="cx"> my $jscName = "jsc";
</span><del>- $jscName .= "_debug" if configurationForVisualStudio() eq "Debug_All";
</del><ins>+ $jscName .= "_debug" if configuration() eq "Debug_All";
</ins><span class="cx"> return "$productDir/$jscName";
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53775branchToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Tools/Scripts/webkitdirs.pm (162556 => 162557)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Tools/Scripts/webkitdirs.pm 2014-01-22 22:18:28 UTC (rev 162556)
+++ branches/safari-537.75-branch/Tools/Scripts/webkitdirs.pm 2014-01-22 22:37:26 UTC (rev 162557)
</span><span class="lines">@@ -373,7 +373,7 @@
</span><span class="cx"> {
</span><span class="cx"> my ($productDir) = @_;
</span><span class="cx"> my $jscName = "jsc";
</span><del>- $jscName .= "_debug" if configurationForVisualStudio() eq "Debug_All";
</del><ins>+ $jscName .= "_debug" if configuration() eq "Debug_All";
</ins><span class="cx"> $jscName .= ".exe" if (isWindows() || isCygwin());
</span><span class="cx"> return "$productDir/$jscName" if -e "$productDir/$jscName";
</span><span class="cx"> return "$productDir/JavaScriptCore.framework/Resources/$jscName";
</span><span class="lines">@@ -388,7 +388,7 @@
</span><span class="cx"> push(@args, '--debug') if ($configuration =~ "^Debug");
</span><span class="cx"> push(@args, '--release') if ($configuration =~ "^Release");
</span><span class="cx"> push(@args, '--32-bit') if ($architecture ne "x86_64" and !isWin64());
</span><del>- push(@args, '--64-bit') if ($architecture eq "x86_64" or isWin64());
</del><ins>+ push(@args, '--64-bit') if (isWin64());
</ins><span class="cx"> push(@args, '--qt') if isQt();
</span><span class="cx"> push(@args, '--gtk') if isGtk();
</span><span class="cx"> push(@args, '--efl') if isEfl();
</span><span class="lines">@@ -440,7 +440,7 @@
</span><span class="cx"> $vsInstallDir = $ENV{'VSINSTALLDIR'};
</span><span class="cx"> $vsInstallDir =~ s|[\\/]$||;
</span><span class="cx"> } else {
</span><del>- $vsInstallDir = File::Spec->catdir(programFilesPath(), "Microsoft Visual Studio 10.0");
</del><ins>+ $vsInstallDir = File::Spec->catdir(programFilesPath(), "Microsoft Visual Studio 12.0");
</ins><span class="cx"> }
</span><span class="cx"> chomp($vsInstallDir = `cygpath "$vsInstallDir"`) if isCygwin();
</span><span class="cx">
</span><span class="lines">@@ -453,7 +453,7 @@
</span><span class="cx">
</span><span class="cx"> my $installDir = visualStudioInstallDir();
</span><span class="cx">
</span><del>- $vsVersion = ($installDir =~ /Microsoft Visual Studio ([0-9]+\.[0-9]*)/) ? $1 : "8";
</del><ins>+ $vsVersion = ($installDir =~ /Microsoft Visual Studio ([0-9]+\.[0-9]*)/) ? $1 : "12";
</ins><span class="cx">
</span><span class="cx"> return $vsVersion;
</span><span class="cx"> }
</span><span class="lines">@@ -463,7 +463,7 @@
</span><span class="cx"> return if defined $configurationForVisualStudio;
</span><span class="cx"> determineConfiguration();
</span><span class="cx"> # FIXME: We should detect when Debug_All or Production has been chosen.
</span><del>- $configurationForVisualStudio = $configuration . (isWin64() ? "|x64" : "");
</del><ins>+ $configurationForVisualStudio = $configuration . (isWin64() ? "|x64" : "|Win32");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub usesPerConfigurationBuildDirectory
</span><span class="lines">@@ -615,32 +615,17 @@
</span><span class="cx"> {
</span><span class="cx"> return if $searchedForPassedConfiguration;
</span><span class="cx"> $searchedForPassedConfiguration = 1;
</span><ins>+ $passedConfiguration = undef;
</ins><span class="cx">
</span><del>- for my $i (0 .. $#ARGV) {
- my $opt = $ARGV[$i];
- if ($opt =~ /^--debug$/i) {
- splice(@ARGV, $i, 1);
</del><ins>+ if (checkForArgumentAndRemoveFromARGV("--debug")) {
</ins><span class="cx"> $passedConfiguration = "Debug";
</span><del>- $passedConfiguration .= "_WinCairo" if (isWinCairo() && isCygwin());
- $passedConfiguration .= "|x64" if isWin64();
- return;
- }
- if ($opt =~ /^--release$/i) {
- splice(@ARGV, $i, 1);
</del><ins>+ } elsif(checkForArgumentAndRemoveFromARGV("--release")) {
</ins><span class="cx"> $passedConfiguration = "Release";
</span><del>- $passedConfiguration .= "_WinCairo" if (isWinCairo() && isCygwin());
- $passedConfiguration .= "|x64" if isWin64();
- return;
- }
- if ($opt =~ /^--profil(e|ing)$/i) {
- splice(@ARGV, $i, 1);
</del><ins>+ } elsif (checkForArgumentAndRemoveFromARGV("--profile") || checkForArgumentAndRemoveFromARGV("--profiling")) {
</ins><span class="cx"> $passedConfiguration = "Profiling";
</span><del>- $passedConfiguration .= "_WinCairo" if (isWinCairo() && isCygwin());
- $passedConfiguration .= "|x64" if isWin64();
- return;
- }
</del><span class="cx"> }
</span><del>- $passedConfiguration = undef;
</del><ins>+
+ $passedConfiguration .= "_WinCairo" if (defined($passedConfiguration) && isWinCairo() && isCygwin());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub passedConfiguration
</span><span class="lines">@@ -670,18 +655,13 @@
</span><span class="cx"> return if $searchedForPassedArchitecture;
</span><span class="cx"> $searchedForPassedArchitecture = 1;
</span><span class="cx">
</span><del>- for my $i (0 .. $#ARGV) {
- my $opt = $ARGV[$i];
- if ($opt =~ /^--32-bit$/i) {
- splice(@ARGV, $i, 1);
- if (isAppleMacWebKit()) {
- $passedArchitecture = `arch`;
- chomp $passedArchitecture;
- }
- return;
</del><ins>+ $passedArchitecture = undef;
+ if (checkForArgumentAndRemoveFromARGV("--32-bit")) {
+ if (isAppleMacWebKit()) {
+ $passedArchitecture = `arch`;
+ chomp $passedArchitecture;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>- $passedArchitecture = undef;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub passedArchitecture
</span><span class="lines">@@ -771,7 +751,7 @@
</span><span class="cx"> my $path = "$configurationProductDir/Safari.exe";
</span><span class="cx"> my $debugPath = "$configurationProductDir/Safari_debug.exe";
</span><span class="cx">
</span><del>- if (configurationForVisualStudio() eq "Debug_All" && -x $debugPath) {
</del><ins>+ if (configuration() eq "Debug_All" && -x $debugPath) {
</ins><span class="cx"> $safariBundle = $debugPath;
</span><span class="cx"> } elsif (-x $path) {
</span><span class="cx"> $safariBundle = $path;
</span><span class="lines">@@ -952,12 +932,21 @@
</span><span class="cx"> return `$command --version 2> $devnull`;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub checkForArgumentAndRemoveFromARGV
</del><ins>+sub checkForArgumentAndRemoveFromARGV($)
</ins><span class="cx"> {
</span><span class="cx"> my $argToCheck = shift;
</span><span class="cx"> return checkForArgumentAndRemoveFromArrayRef($argToCheck, \@ARGV);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+sub checkForArgumentAndRemoveFromARGVGettingValue($$)
+{
+ my ($argToCheck, $valueRef) = @_;
+ my @matchingIndices = findMatchingArguments($argToCheck, \@ARGV);
+ return 0 if ($#matchingIndices != 1);
+ splice(@ARGV, $matchingIndices[0], 1);
+ return $$valueRef = splice(@ARGV, $matchingIndices[0], 1);
+}
+
</ins><span class="cx"> sub findMatchingArguments($$)
</span><span class="cx"> {
</span><span class="cx"> my ($argToCheck, $arrayRef) = @_;
</span><span class="lines">@@ -982,8 +971,9 @@
</span><span class="cx"> {
</span><span class="cx"> my ($argToCheck, $arrayRef) = @_;
</span><span class="cx"> my @indicesToRemove = findMatchingArguments($argToCheck, $arrayRef);
</span><ins>+ my $removeOffset = 0;
</ins><span class="cx"> foreach my $index (@indicesToRemove) {
</span><del>- splice(@$arrayRef, $index, 1);
</del><ins>+ splice(@$arrayRef, $index - $removeOffset++, 1);
</ins><span class="cx"> }
</span><span class="cx"> return scalar @indicesToRemove > 0;
</span><span class="cx"> }
</span><span class="lines">@@ -1650,17 +1640,17 @@
</span><span class="cx"> $vcBuildPath = File::Spec->catfile(visualStudioInstallDir(), qw(Common7 IDE devenv.com));
</span><span class="cx"> if (-e $vcBuildPath) {
</span><span class="cx"> # Visual Studio is installed;
</span><del>- if (visualStudioVersion() eq "10") {
</del><ins>+ if (visualStudioVersion() eq "12") {
</ins><span class="cx"> $vcBuildPath = File::Spec->catfile(visualStudioInstallDir(), qw(Common7 IDE devenv.exe));
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> # Visual Studio not found, try VC++ Express
</span><del>- $vcBuildPath = File::Spec->catfile(visualStudioInstallDir(), qw(Common7 IDE VCExpress.exe));
</del><ins>+ $vcBuildPath = File::Spec->catfile(visualStudioInstallDir(), qw(Common7 IDE WDExpress.exe));
</ins><span class="cx"> if (! -e $vcBuildPath) {
</span><span class="cx"> print "*************************************************************\n";
</span><span class="cx"> print "Cannot find '$vcBuildPath'\n";
</span><span class="cx"> print "Please execute the file 'vcvars32.bat' from\n";
</span><del>- print "'$programFilesPath\\Microsoft Visual Studio 8\\VC\\bin\\'\n";
</del><ins>+ print "'$programFilesPath\\Microsoft Visual Studio 12.0\\VC\\bin\\'\n";
</ins><span class="cx"> print "to setup the necessary environment variables.\n";
</span><span class="cx"> print "*************************************************************\n";
</span><span class="cx"> die;
</span></span></pre>
</div>
</div>
</body>
</html>