From fe33b9801226c616f5b9d180aa630a1f8b5c794e Mon Sep 17 00:00:00 2001 From: "mal@chromium.org" Date: Sat, 5 Feb 2011 04:10:05 +0000 Subject: Changes to help licenses.py work on Google Chrome officical builds. Mostly ignores paths for internal tools that get pulled in to official builds. Also - remove the mingw-w64 comment: confirmed it's only used during build - fix the pdfsqueeze include now that DEPS are up-to-date to include their 'COPYING' file BUG= none TEST= tools\licenses.py scan only complains about xulrunner-sdk on official branches (still need to update DEPS there). Review URL: http://codereview.chromium.org/6269018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73910 0039d316-1c4b-4281-b951-d872f2087c98 --- tools/licenses.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'tools') diff --git a/tools/licenses.py b/tools/licenses.py index 5c9a8cd..1763b1c 100755 --- a/tools/licenses.py +++ b/tools/licenses.py @@ -63,12 +63,18 @@ PRUNE_PATHS = set([ # Used for development and test, not in the shipping product. os.path.join('third_party','cygwin'), os.path.join('third_party','lighttpd'), - # Filed http://code.google.com/p/nativeclient/issues/detail?id=1323 - # to get clarification about using mingw-w64 from NaCl in Chromium: os.path.join('third_party','mingw-w64'), os.path.join('third_party','pefile'), os.path.join('third_party','python_26'), + # Stuff pulled in from chrome-internal for official builds/tools. + os.path.join('third_party', 'clear_cache'), + os.path.join('third_party', 'gnu'), + os.path.join('third_party', 'googlemac'), + os.path.join('third_party', 'pcre'), + os.path.join('third_party', 'psutils'), + os.path.join('third_party', 'sawbuck'), + # Redistribution does not require attribution in documentation. os.path.join('third_party','directxsdk'), os.path.join('third_party','platformsdk_win2008_6_1'), @@ -125,13 +131,10 @@ SPECIAL_CASES = { "URL": "http://code.google.com/p/google-toolbox-for-mac/", "License File": "COPYING", }, - # Filed issue pdfsqueeze:2 with dmaclach to get an honest LICESNE - # file in the pdfsqueeze repo. - # pdfsqueeze is Apache Licensed, reuse the same file from GTM: os.path.join('third_party', 'pdfsqueeze'): { "Name": "pdfsqueeze", "URL": "http://code.google.com/p/pdfsqueeze/", - "License File": os.path.join('..','GTM','COPYING'), + "License File": "COPYING", }, } -- cgit v1.1