Commit 650807f4 authored by iannucci@chromium.org's avatar iannucci@chromium.org

Bump gyp 1463:1472 to fix nccopy issue on trybots

```---------------------------------------------------------------------
r1472 | sbc@chromium.org | 2012-08-16 15:17:56 -0700 (Thu, 16 Aug 2012) | 7 lines

fix link deadlock when setting LINK.host to $(LINK)

This resulted in double call to flock on linux/make.

BUG=http://code.google.com/p/chromium/issues/detail?id=143274

Review URL: https://chromiumcodereview.appspot.com/10854195
```

---------------------------------------------------------------------
r1471 | iannucci@chromium.org | 2012-08-15 17:05:50 -0700 (Wed, 15 Aug 2012) | 6 lines

Fixes msvs generator for projects with non-default IntermediateDirectories.

Issue was introduced by r1466.

R=bradnelson,scottmg
Review URL: https://chromiumcodereview.appspot.com/10832322
------------------------------------------------------------------------
r1470 | sbc@chromium.org | 2012-08-15 10:11:26 -0700 (Wed, 15 Aug 2012) | 9 lines

Honor $CC_target and friends in make generator.

These get baked into the generated build file if they
are set at gyp time.

BUG=
TEST=compiler-override

Review URL: https://chromiumcodereview.appspot.com/10833021
------------------------------------------------------------------------
r1469 | iannucci@chromium.org | 2012-08-14 13:53:47 -0700 (Tue, 14 Aug 2012) | 17 lines

Prepend 'call' to all non-cygwin commands to prevent incredibuild from aborting
the scripts early.

There are three cases:
  * Command is a batch file
  * Command is an exe/com
  * Command is a builtin (to cmd.exe).

In the first case, call will prevent the overall command action from aborting
when multiple commands are attached to the same file (look for 'and also' in the
msvs generator).

In the second, call does not change the exe's behavior

In the third case, call still performs the requested action correctly. This even
applies to the 'call' builtin, so, 'call call echo foo' is still correct.
Review URL: https://chromiumcodereview.appspot.com/10824293
------------------------------------------------------------------------
r1468 | thakis@chromium.org | 2012-08-13 15:43:17 -0700 (Mon, 13 Aug 2012) | 10 lines

Fix the Android Eclipse CDT generator.

This fixes a couple of problems:
- CONFIGURATION_NAME is now getting set. This seems to be a required
variable now.
- Macro values are now escaped before getting written to the XML out
in order to handle macros with XML syntax.

Review URL: https://chromiumcodereview.appspot.com/10823266/
Patch from Jesse Greenwald <jgreenwald@chromium.org>!
------------------------------------------------------------------------
r1467 | iannucci@chromium.org | 2012-08-10 14:38:59 -0700 (Fri, 10 Aug 2012) | 3 lines

This makes it easier to test combinations of msvs version without having to
muck with environment variables
Review URL: https://chromiumcodereview.appspot.com/10830232
------------------------------------------------------------------------
r1466 | iannucci@chromium.org | 2012-08-09 14:33:12 -0700 (Thu, 09 Aug 2012) | 12 lines

Fixes an issue where OutputDirectory and IntermediateDirectory were being
incorrectly generated without a trailing slash on MSVS 2008.

This only manifested as an issue when running non-cygwin actions under MSVS2008,
where the symptoms would be that a tool using OutDir would write to directories
such as "Releaseobj\\some\\subdir" instead of "Release\\obj\\some\\subdir".

Unfortunately, the wrong path usually wouldn't cause the tool to _fail_, except
when a subsequent step tried to read the output of the previous tool, causing the
secondary tool to fail with confusing errors (reporting that the correct path
could not, in fact, be read).
Review URL: https://chromiumcodereview.appspot.com/10831183
------------------------------------------------------------------------
r1465 | iannucci@chromium.org | 2012-08-09 12:36:02 -0700 (Thu, 09 Aug 2012) | 16 lines

Fix usage of shlex in unit tests on windows.

When shlex was getting an arg like:
  r'"some\interesting\path.file" other_file'

shlex was turning it into:
  ['someinterestingpath.file', 'other_file']

Which _happened_ to work, putting 'someinterestingpath.file' in the working
directory.

This patch doubles up all backslashes prior to splitting, to make the incoming
string conform to shlex's expectations

R=scottmg
Review URL: https://chromiumcodereview.appspot.com/10829252
------------------------------------------------------------------------
r1464 | scottmg@chromium.org | 2012-08-09 11:20:22 -0700 (Thu, 09 Aug 2012) | 4 lines

Use flock-style lock on Windows to limit number of concurrent links

This is mostly for goma builds.
Review URL: https://chromiumcodereview.appspot.com/10837168
------------------------------------------------------------------------

R=cmp, scottmg, Sam Clegg, Nico
NOTRY=true

Review URL: https://chromiumcodereview.appspot.com/10854178

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152118 0039d316-1c4b-4281-b951-d872f2087c98
parent d1ed6b98
......@@ -100,7 +100,7 @@ deps = {
(Var("googlecode_url") % "grit-i18n") + "/trunk@67",
"src/tools/gyp":
(Var("googlecode_url") % "gyp") + "/trunk@1463",
(Var("googlecode_url") % "gyp") + "/trunk@1472",
"src/v8":
(Var("googlecode_url") % "v8") + "/trunk@" + Var("v8_revision"),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment