generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Introduce a bit of sanity to talk/PRESUBMIT.py's license checking.

Browse Source 
The comma this allows is a very common variant of the license header (3:1
preferred over the no-comma variant in talk/).

Also pacify pylint a bit, and correct a flagrantly incorrect header I happened
to come across.

BUG=2098,2133
R=henrike@webrtc.org, niklas.enbom@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/1866004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4396 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
fischman@webrtc.org 2013-07-25 16:43:30 +00:00
parent 9fbc558dd4
commit 33584f942c
6 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PRESUBMIT.py
View File

@ -97,6 +97,8 @@ def _CommonChecks(input_api, output_api):
results.extend(input_api.canned_checks.RunPylint(input_api, output_api,
black_list=(r'^.*gviz_api\.py$',
r'^.*gaeunit\.py$',
# Embedded shell-script fakes out pylint.
r'^talk/site_scons/site_tools/talk_linux.py$',
r'^third_party/.*\.py$',
r'^testing/.*\.py$',
r'^tools/gyp/.*\.py$',

4
talk/PRESUBMIT.py
View File

@ -25,13 +25,13 @@
def _LicenseHeader(input_api):
"""Returns the license header regexp."""
# Accept any year number from 2011 to the current year
# Accept any year number from 2008 to the current year
current_year = int(input_api.time.strftime('%Y'))
allowed_years = (str(s) for s in reversed(xrange(2008, current_year + 1)))
years_re = '(' + '|'.join(allowed_years) + ')'
license_header = (
r'.*? libjingle\n'
r'.*? Copyright %(year)s Google Inc\.\n'
r'.*? Copyright %(year)s,? Google Inc\.\n'
r'.*?\n'
r'.*? Redistribution and use in source and binary forms, with or without'
r'\n'

2
talk/app/webrtc/java/jni/peerconnection_jni.cc
View File

@ -1,6 +1,6 @@
/*
* libjingle
* Copyright 2013 Google Inc.
* Copyright 2013, Google Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:

2
talk/app/webrtc/peerconnectionfactory_unittest.cc
View File

@ -16,6 +16,8 @@
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
* EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR

2
talk/site_scons/site_tools/talk_noops.py
View File

@ -16,5 +16,5 @@ def generate(env):
)
env.Append(BUILDERS={'RES': builder, 'Grit': builder})
def exists(env):
def exists(dummy):
return 1

2
talk/site_scons/talk.py
View File

@ -564,7 +564,7 @@ def ExtendComponent(env, component, **kwargs):
# name of the EXE (but not PDB) is reconstructed after signing.
postsignprefix = PopEntry(params, 'postsignprefix')
if postsignprefix is not None:
target = postsignprefix + target
target = postsignprefix + target
signed_node = env.SignedBinary(
source = node,
target = '$STAGING_DIR/' + target,