Revert 273353 "Bring Syzygy binaries in using a script rather th..."

Revert 273353 "Bring Syzygy binaries in using a script rather th..."

broke webview_licenses.py:
Got LicenseError "missing README.chromium or licenses.py SPECIAL_CASES entry" while scanning third_party/syzygy


> Bring Syzygy binaries in using a script rather than as a dependency.
> 
> BUG=
> 
> Review URL: https://codereview.chromium.org/306543006

TBR=chrisha@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=273362

[mattm, 2014-05-28 21:49:30]

Committed patchset #1 manually as r273362 (tree was closed).

[chrisha, 2014-05-28 23:11:50]

Strange... The third_party/syzygy directory always existed; this CL was
only changing the way it gets created (via a hook rather than a rep). Do I
need to run through the full-fledged third-party creation process?

http://www.chromium.org/developers/adding-3rd-party-libraries
On May 28, 2014 5:49 PM, <mattm@chromium.org> wrote:

> Reviewers: chrisha,
>
> Description:
> Revert 273353 "Bring Syzygy binaries in using a script rather th..."
>
> broke webview_licenses.py:
> Got LicenseError "missing README.chromium or licenses.py SPECIAL_CASES
> entry"
> while scanning third_party/syzygy
>
>
>  Bring Syzygy binaries in using a script rather than as a dependency.
>>
>
>  BUG=
>>
>
>  Review URL: https://codereview.chromium.org/306543006
>>
>
> TBR=chrisha@chromium.org
>
> Please review this at https://codereview.chromium.org/300223013/
>
> SVN Base: svn://svn.chromium.org/chrome/
>
> Affected files (+7, -36 lines):
>   M     trunk/src/DEPS
>   M     trunk/src/build/get_syzygy_binaries.py
>
>
> Index: trunk/src/DEPS
> ===================================================================
> --- trunk/src/DEPS      (revision 273361)
> +++ trunk/src/DEPS      (working copy)
> @@ -368,6 +368,11 @@
>      "src/third_party/yasm/binaries":
>        "/trunk/deps/third_party/yasm/binaries@154708",
>
> +    # Binary level profile guided optimizations. This points to the
> +    # latest release binaries for the toolchain.
> +    "src/third_party/syzygy/binaries":
> +      (Var("googlecode_url") % "sawbuck") + "/trunk/syzygy/binaries@2154
> ",
> +
>      # Binaries for nacl sdk.
>      "src/third_party/nacl_sdk_binaries":
>        "/trunk/deps/third_party/nacl_sdk_binaries@111576",
> @@ -763,18 +768,7 @@
>                  "-s", "src/build/linux/bin/eu-strip.sha1",
>      ],
>    },
> -  # Pull the Syzygy binaries, used for optimization and instrumentation.
>    {
> -    "name": "syzygy-binaries",
> -    "pattern": ".",
> -    "action": ["python",
> -               "src/build/get_syzygy_binaries.py",
> -               "--output-dir=src/third_party/syzygy/binaries",
> -               "--revision=b08fb72610963d31cc3eae33f746a04e263bd860",
> -               "--overwrite",
> -    ],
> -  },
> -  {
>      # A change to a .gyp, .gypi, or to GYP itself should run the
> generator.
>      "name": "gyp",
>      "pattern": ".",
> Index: trunk/src/build/get_syzygy_binaries.py
> ===================================================================
> --- trunk/src/build/get_syzygy_binaries.py      (revision 273361)
> +++ trunk/src/build/get_syzygy_binaries.py      (working copy)
> @@ -7,14 +7,12 @@
>
>  import cStringIO
>  import hashlib
> -import errno
>  import json
>  import logging
>  import optparse
>  import os
>  import re
>  import shutil
> -import stat
>  import subprocess
>  import urllib2
>  import zipfile
> @@ -174,27 +172,6 @@
>      return not dirs and not files
>
>
> -def _RmTreeHandleReadOnly(func, path, exc):
> -  """An error handling function for use with shutil.rmtree. This will
> -  detect failures to remove read-only files, and will change their
> properties
> -  prior to removing them. This is necessary on Windows as os.remove will
> return
> -  an access error for read-only files, and git repos contain read-only
> -  pack/index files.
> -  """
> -  excvalue = exc[1]
> -  if func in (os.rmdir, os.remove) and excvalue.errno == errno.EACCES:
> -    _LOGGER.debug('Removing read-only path: %s', path)
> -    os.chmod(path, stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)
> -    func(path)
> -  else:
> -    raise
> -
> -
> -def _RmTree(path):
> -  """A wrapper of shutil.rmtree that handles read-only files."""
> -  shutil.rmtree(path, ignore_errors=False, onerror=_RmTreeHandleReadOnly)
> -
> -
>  def _CleanState(output_dir, state, dry_run=False):
>    """Cleans up files/directories in |output_dir| that are referenced by
>    the given |state|. Raises an error if there are local changes. Returns a
> @@ -239,7 +216,7 @@
>      if os.path.exists(p) and _DirIsEmpty(p):
>        _LOGGER.debug('Deleting empty directory "%s".', p)
>        if not dry_run:
> -        _RmTree(p)
> +        shutil.rmtree(p, False)
>
>    return deleted
>
> @@ -379,7 +356,7 @@
>        # If overwrite was specified then take a heavy-handed approach.
>        _LOGGER.debug('Deleting entire installation directory.')
>        if not options.dry_run:
> -        _RmTree(options.output_dir)
> +        shutil.rmtree(options.output_dir, False)
>    else:
>      # Otherwise only delete things that the previous installation put in
> place,
>      # and take care to preserve any local changes.
>
>
>

To unsubscribe from this group and stop receiving emails from it, send an email
to chromium-reviews+unsubscribe@chromium.org.

[mattm, 2014-05-28 23:18:37]

On 2014/05/28 23:11:50, chrisha wrote:
> Strange... The third_party/syzygy directory always existed; this CL was
> only changing the way it gets created (via a hook rather than a rep). Do I
> need to run through the full-fledged third-party creation process?


It was in the "win" section of deps before, so wouldn't have been pulled on that
bot.

[chrisha, 2014-05-29 00:17:34]

Ah, completely missed that. Unfortunately there's no OS dependent hooks
mechanism AFAICT. I'll modify the script to be a no-op for non-win
platforms. Just to be sure I'll also ping the third party folks. Sorry
about this.
On May 28, 2014 7:18 PM, <mattm@chromium.org> wrote:

> On 2014/05/28 23:11:50, chrisha wrote:
>
>> Strange... The third_party/syzygy directory always existed; this CL was
>> only changing the way it gets created (via a hook rather than a rep). Do I
>> need to run through the full-fledged third-party creation process?
>>
>
>
> It was in the "win" section of deps before, so wouldn't have been pulled
> on that
> bot.
>
> https://codereview.chromium.org/300223013/
>

To unsubscribe from this group and stop receiving emails from it, send an email
to chromium-reviews+unsubscribe@chromium.org.

[chrisha, 2014-05-29 13:11:29]

lgtm