Permalink
Switch branches/tags
Nothing to show
Commits on May 16, 2012
  1. Two overflows when many actions are in one target/one script.

    scottmg@chromium.org committed May 16, 2012
    1. Commands were previously joined with &&, which resulted in the command line being too long
    2. cygwin's setup_env.bat was called for each command. This prepends to PATH, which also grows too long.
    
    To fix #1, join the commands by checking errorlevel at each step. To fix #2, only do the path cygwin setup on the first action.
    
    BUG=gyp:261
    
    Review URL: https://chromiumcodereview.appspot.com/10341003
    
    git-svn-id: http://gyp.googlecode.com/svn/trunk@1378 78cadc50-ecff-11dd-a971-7dbc132099af
Commits on May 11, 2012
  1. Correct the order in which OutputDirectory and IntermediateDirectory are

    bradnelson@google.com committed May 11, 2012
    defined, so that IntDir can use the definition of OutDir by topologically
    sorting references to msvs variables.
    
    Moved topological sort to a common location and switched it to a simpler
    more general depth first search version.
    
    BUG=http://code.google.com/p/chromium/issues/detail?id=119528
    TEST=shared_output
    Review URL: https://chromiumcodereview.appspot.com/10378042
    
    git-svn-id: http://gyp.googlecode.com/svn/trunk@1377 78cadc50-ecff-11dd-a971-7dbc132099af
Commits on May 10, 2012
  1. mac ninja: Don't retrict the file types that can be added as bundle r…

    thakis@chromium.org committed May 10, 2012
    …esources.
    
    Review URL: https://chromiumcodereview.appspot.com/10383117/
    Patch from Marshall Greenblatt <marshall@chromium.org>!
    
    git-svn-id: http://gyp.googlecode.com/svn/trunk@1376 78cadc50-ecff-11dd-a971-7dbc132099af
  2. mac ninja: Support LD_RUNPATH_SEARCH_PATHS.

    thakis@chromium.org committed May 10, 2012
    Review URL: https://chromiumcodereview.appspot.com/10384109
    
    git-svn-id: http://gyp.googlecode.com/svn/trunk@1375 78cadc50-ecff-11dd-a971-7dbc132099af
Commits on May 9, 2012
  1. mac make & ninja: Remove workaround for OTHER_CPLUSPLUSFLAGS being a …

    thakis@chromium.org committed May 9, 2012
    …string.
    
    This is now fixed in the upstream gyp files and no longer necessary.
    Review URL: https://chromiumcodereview.appspot.com/10383090
    
    git-svn-id: http://gyp.googlecode.com/svn/trunk@1374 78cadc50-ecff-11dd-a971-7dbc132099af
  2. ninja windows: fix long command lines in more cases

    scottmg@chromium.org committed May 9, 2012
    Discovered that: 1) the long command line test wasn't testing all the link
    command line (.lib and .dll weren't exercised), and 2) the standard executable
    test was right at the edge of the command line length limit, and so sometimes
    wouldn't fail.
    
    So, add tests for dll and lib, move more of the content of all the link lines
    into rsp files, and double the length of the command lines to be sure to hit
    the limit.
    
    R=thakis@chromium.org
    BUG=chromium:127290
    
    Review URL: https://chromiumcodereview.appspot.com/10388042
    
    git-svn-id: http://gyp.googlecode.com/svn/trunk@1373 78cadc50-ecff-11dd-a971-7dbc132099af
  3. Remove some unused variables reported by pyflakes

    mseaborn@chromium.org committed May 9, 2012
    BUG=none
    TEST=trybots
    
    Review URL: https://chromiumcodereview.appspot.com/10383017
    
    git-svn-id: http://gyp.googlecode.com/svn/trunk@1370 78cadc50-ecff-11dd-a971-7dbc132099af
Commits on May 8, 2012
  1. Let GYP recognize the 'WDK_DIR' environment variable when generating …

    alexeypa@chromium.org committed May 8, 2012
    …ninja output on Windows.
    
    TEST=Build chrome.exe using the compiler from Windows SDK 7.1
    
    Review URL: https://chromiumcodereview.appspot.com/10377053
    
    
    git-svn-id: http://gyp.googlecode.com/svn/trunk@1369 78cadc50-ecff-11dd-a971-7dbc132099af
  2. ninja: Add '/', '\', and '.' to the set of shell-safe characters.

    thakis@chromium.org committed May 8, 2012
    With this, -I flags no longer get escaped. This is mostly OCD, but
    a back-of-the-envelope calculation says that this might make empty
    builds faster by 20ms or so.
    Review URL: https://chromiumcodereview.appspot.com/10310068
    
    git-svn-id: http://gyp.googlecode.com/svn/trunk@1368 78cadc50-ecff-11dd-a971-7dbc132099af
  3. Remove duplicate function definitions I accidentally added in r1357.

    thakis@chromium.org committed May 8, 2012
    TBR=scottmg
    Review URL: https://chromiumcodereview.appspot.com/10383073
    
    git-svn-id: http://gyp.googlecode.com/svn/trunk@1367 78cadc50-ecff-11dd-a971-7dbc132099af
  4. Because the files are .c and were without warnings-as-errors, the non…

    scottmg@chromium.org committed May 8, 2012
    …-declared call to printf that was intended to cause an error ended up just being a warning. So, if PCH wasn't working, the test would succeed anyway. Turn on warnings-as-errors to fix this.
    
    Review URL: https://chromiumcodereview.appspot.com/10356060
    
    git-svn-id: http://gyp.googlecode.com/svn/trunk@1366 78cadc50-ecff-11dd-a971-7dbc132099af
  5. Fixup dependencies in rules for VS2010 (MSBuild).

    grt@chromium.org committed May 8, 2012
    VS2010 uses some file tracking juju in various .tlog files to do reality-based dependency tracking.  Custom rules don't use this magic, so the dependency between a rule's inputs and its target is lost.  This change causes a foo.read.1.tlog file to be generated.  This file contains the list of additional dependencies for each primary input file.
    
    BUG=gyp:263
    TEST=python gyptest.py -f msvs test/rules-rebuild/gyptest-default.py
    Review URL: https://chromiumcodereview.appspot.com/10358006
    
    git-svn-id: http://gyp.googlecode.com/svn/trunk@1365 78cadc50-ecff-11dd-a971-7dbc132099af
Commits on May 7, 2012
  1. Create a gyp generator for Eclipse CDT settings

    thakis@chromium.org committed May 7, 2012
    This generate will generate an XML file that can be import into an
    Eclipse CDT project. It will set up all the necesary include paths and
    defines.
    
    Review URL: https://chromiumcodereview.appspot.com/9972015/
    Patch from Jesse Greenwald <jgreenwald@chromium.org>
    
    
    
    git-svn-id: http://gyp.googlecode.com/svn/trunk@1364 78cadc50-ecff-11dd-a971-7dbc132099af
  2. ninja windows: fix mapping of optimization flags

    scottmg@chromium.org committed May 7, 2012
    "FavorSizeOrSpeed" should map to Os/Ot. These were backwards.
    
    "Optimization" can also be set to Disabled/Size/Speed/Max which maps to
    Od/O1/O2/Ox. Seems a bit silly, but that's how VS exposes the compiler
    settings. Previously, Size/Speed here were incorrectly duplicating the Os/Ot
    setting rather than O1/O2.
    
    So, before we were basically doing some random set of optimizing flags.
    
    (I have no idea what the compiler actually attempts to do when you set O1+Ot
    or O2+Os. I guess it must be macro vs. micro level, but it's not very clear
    from the names. Chromium sets them consistently.)
    
    R=thakis@chromium.org
    BUG=126315
    
    Review URL: https://chromiumcodereview.appspot.com/10381032
    
    git-svn-id: http://gyp.googlecode.com/svn/trunk@1363 78cadc50-ecff-11dd-a971-7dbc132099af
Commits on May 5, 2012
  1. MSVS 2008: Fix to ensure that actions are re-run when the command cha…

    mseaborn@chromium.org committed May 5, 2012
    …nges
    
    There was some code to re-run an action, but it only worked if the
    command change came from a change to a .gyp file, and only if the
    "inputs" list was empty.  It didn't work if the command change came
    from a change to a .gypi file.
    
    To fix this, we create "*.gypcmd" stamp files that contain the command
    text, and when the command text changes we update these files'
    timestamps.
    
    If a Gyp target contains multiple actions, this should rerun only the
    actions that changed.
    
    BUG=http://code.google.com/p/gyp/issues/detail?id=262
    TEST=test/actions-args-change
    
    Review URL: https://chromiumcodereview.appspot.com/10375015
    
    git-svn-id: http://gyp.googlecode.com/svn/trunk@1362 78cadc50-ecff-11dd-a971-7dbc132099af
Commits on May 4, 2012
  1. Remove the hack to concat .d files into a single deps file.

    tony@chromium.org committed May 4, 2012
    The speed improvements were minor (maybe 200ms) and it was
    reported that on a RAM disk, it was slower.
    
    It also was causing some users to overflow the command line
    by having 1000 filenames in a single line.
    
    Since it adds a lot of complexity to the Makefile, let's just
    remove it.
    Review URL: https://chromiumcodereview.appspot.com/10368006
    
    git-svn-id: http://gyp.googlecode.com/svn/trunk@1361 78cadc50-ecff-11dd-a971-7dbc132099af
  2. windows: test that \ at end of action arg doesn't work

    scottmg@chromium.org committed May 4, 2012
    Addition of test here http://codereview.chromium.org/10371002/ discovered that
    VS doesn't support an action's argument ending in \ (because it escapes the
    quote that's implicitly added around arguments).
    
    So, change one of those previously added tests to intended failure, and
    simplify escaping in ninja to not do the extra escape of trailing \s. (Sigh.)
    
    R=thakis@chromium.org
    
    Review URL: https://chromiumcodereview.appspot.com/10317012
    
    git-svn-id: http://gyp.googlecode.com/svn/trunk@1360 78cadc50-ecff-11dd-a971-7dbc132099af
Commits on May 3, 2012
  1. ninja windows: normalize 'call x.bat' specially

    scottmg@chromium.org committed May 3, 2012
    Some investigation here: http://chromiumcodereview.appspot.com/10337008/
    
    R=thakis@chromium.org
    BUG=125606
    
    Review URL: https://chromiumcodereview.appspot.com/10302023
    
    git-svn-id: http://gyp.googlecode.com/svn/trunk@1359 78cadc50-ecff-11dd-a971-7dbc132099af
  2. ninja windows: make sure there's a trailing slash on $(VCInstallDir)

    scottmg@chromium.org committed May 3, 2012
    R=thakis@chromium.org
    BUG=125640
    
    Review URL: https://chromiumcodereview.appspot.com/10371002
    
    git-svn-id: http://gyp.googlecode.com/svn/trunk@1358 78cadc50-ecff-11dd-a971-7dbc132099af
  3. Reland "Error on multiple files with same basenames in static library…

    thakis@chromium.org committed May 3, 2012
    … targets."
    
    Disable the check on Android for now. The other platforms should now be fixed.
    
    Original review: https://chromiumcodereview.appspot.com/10010028
    
    Review URL: http://codereview.chromium.org/10342006/
    
    
    
    git-svn-id: http://gyp.googlecode.com/svn/trunk@1357 78cadc50-ecff-11dd-a971-7dbc132099af
Commits on May 2, 2012
  1. ninja windows: fix program path normalization

    scottmg@chromium.org committed May 2, 2012
    Fixes currently broken ninja buildbot tests.
    
    R=thakis@chromium.org
    
    Review URL: https://chromiumcodereview.appspot.com/10337008
    
    git-svn-id: http://gyp.googlecode.com/svn/trunk@1356 78cadc50-ecff-11dd-a971-7dbc132099af
  2. Revert r1354. The world (linux, cros, android) is not ready for it yet.

    thakis@chromium.org committed May 2, 2012
    TBR=scottmg
    Review URL: https://chromiumcodereview.appspot.com/10343006
    
    git-svn-id: http://gyp.googlecode.com/svn/trunk@1355 78cadc50-ecff-11dd-a971-7dbc132099af
  3. Error on multiple files with same basenames in static library targets.

    thakis@chromium.org committed May 2, 2012
    Review URL: https://chromiumcodereview.appspot.com/10010028
    
    git-svn-id: http://gyp.googlecode.com/svn/trunk@1354 78cadc50-ecff-11dd-a971-7dbc132099af
  4. Don't support spaces in command, simplify msvs_emulation

    scottmg@chromium.org committed May 2, 2012
    The batch-file-with-space test doesn't work for the msvs generators.
    
    I looked at trying to fix it, but it got overly complicated because the VS
    generators don't distinguish between the program and arguments to the program.
    In general, I don't think gyp really supports spaces in filenames so it
    doesn't seem worth spending the effort going down that path.
    
    So, test that it doesn't work for all generators, and simplify msvs_emulation for ninja.
    
    R=thakis@chromium.org
    
    Review URL: https://chromiumcodereview.appspot.com/10340002
    
    git-svn-id: http://gyp.googlecode.com/svn/trunk@1353 78cadc50-ecff-11dd-a971-7dbc132099af
  5. Assume that the compiler comes from the SDK if it is detected but Vis…

    alexeypa@chromium.org committed May 2, 2012
    …ual Studio is not installed. Use the seput script from the SDK in such a case.
    
    Review URL: http://chromiumcodereview.appspot.com/10273034
    
    
    git-svn-id: http://gyp.googlecode.com/svn/trunk@1352 78cadc50-ecff-11dd-a971-7dbc132099af
  6. Merge latest ninja_syntax.py from upstream.

    thakis@chromium.org committed May 2, 2012
    Changes:
    * ninja_syntax.py: Fix a bug when passing dict variables to Writer.build()
    * Explicitly turn input/output lists into list objects, for Python 3 compat
    * add rspfile and rspfile_content to ninja_syntax
    * Fix layout width in ninja_syntax.py.
    
    With this, the downstream diff reduces to:
    
    --- ../ninja/misc/ninja_syntax.py       2012-05-01 21:17:37.000000000 -0700
    +++ pylib/gyp/ninja_syntax.py   2012-05-01 21:59:13.000000000 -0700
    @@ -33,13 +35,16 @@
             self._line('%s = %s' % (key, value), indent)
     
         def rule(self, name, command, description=None, depfile=None,
    -             generator=False, restat=False, rspfile=None, rspfile_content=None):
    +             generator=False, restat=False, deplist=None, rspfile=None,
    +             rspfile_content=None):
             self._line('rule %s' % name)
             self.variable('command', command, indent=1)
             if description:
                 self.variable('description', description, indent=1)
             if depfile:
                 self.variable('depfile', depfile, indent=1)
    +        if deplist:
    +            self.variable('deplist', deplist, indent=1)
             if generator:
                 self.variable('generator', '1', indent=1)
             if restat:
    Review URL: https://chromiumcodereview.appspot.com/10312002
    
    git-svn-id: http://gyp.googlecode.com/svn/trunk@1350 78cadc50-ecff-11dd-a971-7dbc132099af
Commits on May 1, 2012
  1. ninja windows: handle more cases in program quoting

    scottmg@chromium.org committed May 1, 2012
    The first argument of a command (the program) can't always be quoted on Windows. In particular, the 'call x.bat' form has to be handled specially.
    
    R=thakis@chromium.org
    BUG=125606
    
    Review URL: https://chromiumcodereview.appspot.com/10269018
    
    git-svn-id: http://gyp.googlecode.com/svn/trunk@1349 78cadc50-ecff-11dd-a971-7dbc132099af
  2. Fix sanitize-rule-names test for scons.

    scottmg@chromium.org committed May 1, 2012
    The scons generator didn't remove invalid characters from rule names; remap
    those. It also doesn't seem to support building files of extensions other than
    a built-in list. So, use .S rather than .X for this test since it doesn't
    matter to the test.
    
    R=thakis@chromium.org
    Review URL: https://chromiumcodereview.appspot.com/10263021
    
    git-svn-id: http://gyp.googlecode.com/svn/trunk@1348 78cadc50-ecff-11dd-a971-7dbc132099af
  3. ninja windows: more support for VS macros

    scottmg@chromium.org committed May 1, 2012
    Add support for VS macros $(InputPath) and $(PlatformName), and improve the locations where they can appear (rule message).
    
    Expansion moved to happen earlier in code flow so that the special locals ($root, $source, etc.) will be included in the output when they appear as the result of a VS macro expansion.
    
    Test case reduced from failing NaCl rule in native_client/build/common.gypi.
    
    R=thakis@chromium.org
    BUG=125606
    
    Review URL: https://chromiumcodereview.appspot.com/10274018
    
    git-svn-id: http://gyp.googlecode.com/svn/trunk@1347 78cadc50-ecff-11dd-a971-7dbc132099af
Commits on Apr 30, 2012
  1. ninja windows: sanitize rule names to not emit corrupt .ninja files

    scottmg@chromium.org committed Apr 30, 2012
    Ninja doesn't want ( and ) in rule names.
    
    R=thakis@chromium.org
    BUG=chromium:125606
    
    Review URL: https://chromiumcodereview.appspot.com/10269012
    
    git-svn-id: http://gyp.googlecode.com/svn/trunk@1346 78cadc50-ecff-11dd-a971-7dbc132099af
  2. ninja windows: make sure that .s files aren't passed to compiler

    scottmg@chromium.org committed Apr 30, 2012
    R=thakis@chromium.org
    BUG=125606
    
    Review URL: https://chromiumcodereview.appspot.com/10270020
    
    git-svn-id: http://gyp.googlecode.com/svn/trunk@1345 78cadc50-ecff-11dd-a971-7dbc132099af
Commits on Apr 27, 2012
  1. Exclude problematic formats from tests, rather than including all oth…

    thakis@chromium.org committed Apr 27, 2012
    …er platforms
    
    This is more robust to changes in the set of available platforms.
    Review URL: http://codereview.chromium.org/10198031/
    
    Patch from Steve Block <steveblock@chromium.org>!
    
    
    
    git-svn-id: http://gyp.googlecode.com/svn/trunk@1344 78cadc50-ecff-11dd-a971-7dbc132099af
  2. ninja windows: fix expansion of some VS macros

    scottmg@chromium.org committed Apr 27, 2012
    Fix expansion of $(OutDir). Also, make sure there's no redundant path contents (.., etc.) when expanding VS macros + gyp variables in the paths. Ninja can be more efficient if it doesn't need to re-canonicalize paths.
    
    (removed the 'normalization' of converting to lower case that was previously in this CL)
    
    R=thakis@chromium.org
    
    Review URL: https://chromiumcodereview.appspot.com/10228016
    
    git-svn-id: http://gyp.googlecode.com/svn/trunk@1343 78cadc50-ecff-11dd-a971-7dbc132099af
  3. ninja windows: don't use copy /y nul $out for STAMP

    scottmg@chromium.org committed Apr 27, 2012
    I really can't figure out why, but using copy /y nul $out for stamp doesn't cause the changes to be visible to the Change Journal (i.e. no update to timestamp is logged). It appears it's doing some sort of hardlink to the nul device which isn't tracked by the file system (but that's mostly a guess). Since this seems to be the only thing it doesn't see, just avoid the problem by using a gyp-win-tool command to STAMP instead.
    
    Basic stamp functionality covered by existing tests. There's no obvious way to confirm that the new version works as desired though (i.e. "normally").
    
    R=thakis@chromium.org
    
    Review URL: https://chromiumcodereview.appspot.com/10236001
    
    git-svn-id: http://gyp.googlecode.com/svn/trunk@1342 78cadc50-ecff-11dd-a971-7dbc132099af
  4. ninja windows: don't print blank lines in RC wrapper

    scottmg@chromium.org committed Apr 27, 2012
    R=thakis@chromium.org
    
    Review URL: https://chromiumcodereview.appspot.com/10233002
    
    git-svn-id: http://gyp.googlecode.com/svn/trunk@1341 78cadc50-ecff-11dd-a971-7dbc132099af