diff --git a/.gitignore b/.gitignore index 391be8d99f8157..ad9913243213ac 100644 --- a/.gitignore +++ b/.gitignore @@ -233,6 +233,7 @@ v8.log /third_party/clang_format/script !/third_party/clang_format/bin/*/*.sha1 /third_party/cld_2/src +/third_party/colorama/src /third_party/cros /third_party/cros_system_api /third_party/cygwin diff --git a/DEPS b/DEPS index 58d4cd5e5a3a23..5f0f0dc24f17a4 100644 --- a/DEPS +++ b/DEPS @@ -99,6 +99,9 @@ deps = { "src/third_party/angle": Var("chromium_git") + "/angle/angle.git@" + Var("angle_revision"), + "src/third_party/colorama/src": + Var("chromium_git") + "/external/colorama.git@799604a104", + "src/third_party/trace-viewer": (Var("googlecode_url") % "trace-viewer") + "/trunk@1281", diff --git a/third_party/colorama/LICENSE b/third_party/colorama/LICENSE new file mode 100644 index 00000000000000..5f567799f395f3 --- /dev/null +++ b/third_party/colorama/LICENSE @@ -0,0 +1,28 @@ +Copyright (c) 2010 Jonathan Hartley +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +* Neither the name of the copyright holders, nor those of its contributors + may be used to endorse or promote products derived from this software without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT HOLDER OR CONTRIBUTORS 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 OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + diff --git a/third_party/colorama/README.chromium b/third_party/colorama/README.chromium new file mode 100644 index 00000000000000..68f9b397765411 --- /dev/null +++ b/third_party/colorama/README.chromium @@ -0,0 +1,13 @@ +Name: colorama +Short Name: colorama +URL: https://github.com/tartley/colorama.git +Version: 799604a104 +License: BSD +Security Critical: no + +Description: +Provides a simple cross-platform API to print colored terminal text from Python +applications. + +Local modifications: +None diff --git a/third_party/devscripts/licensecheck.pl b/third_party/devscripts/licensecheck.pl index 77dc3709779b3a..2dbc5af12efba1 100755 --- a/third_party/devscripts/licensecheck.pl +++ b/third_party/devscripts/licensecheck.pl @@ -531,6 +531,8 @@ ($) $license = "BSD-like $license"; } elsif ($licensetext =~ /GOVERNED BY A BSD-STYLE SOURCE LICENSE/) { $license = "BSD-like $license"; + } elsif ($licensetext =~ /BSD 3-Clause license/) { + $license = "BSD (3 clause) $license"; } if ($licensetext =~ /Mozilla Public License( Version|, v.) ([^ ]+[^., ]),?/) { diff --git a/tools/checklicenses/checklicenses.py b/tools/checklicenses/checklicenses.py index c657efff9b7561..2fc0ae8336d385 100755 --- a/tools/checklicenses/checklicenses.py +++ b/tools/checklicenses/checklicenses.py @@ -297,11 +297,6 @@ def PrintUsage(): 'UNKNOWN', ], - # https://code.google.com/p/colorama/issues/detail?id=44 - 'tools/swarming_client/third_party/colorama': [ - 'UNKNOWN', - ], - # http://crbug.com/334668 # MIT license. 'tools/swarming_client/third_party/httplib2': [