License update (#790)

LICENSE

@@ -1,25 +1,25 @@
-# Copyright (c) 2018, NVIDIA CORPORATION. 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 NVIDIA CORPORATION nor the names 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 ``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 OWNER 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.
+Copyright (c) 2018, NVIDIA CORPORATION. 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 NVIDIA CORPORATION nor the names 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 ``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 OWNER 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.

qa/common/check_copyright.py

@@ -142,25 +142,26 @@ def visit(path):
         line = line.strip()
 
         # The next line must be the copyright line with a single year
-        # or a year range. It must start with either '#' or '//'
-        prefix = None
-        if line.startswith('#'):
-            prefix = '#'
-        elif line.startswith('//'):
-            prefix = '//'
-        else:
-            print("incorrect prefix for copyright line, expecting '#' or '//', for " +
+        # or a year range. It is optionally allowed to have '# ' or
+        # '// ' prefix.
+        prefix = ""
+        if line.startswith('# '):
+            prefix = '# '
+        elif line.startswith('// '):
+            prefix = '// '
+        elif not line.startswith(COPYRIGHT_YEAR_RE0[0]):
+            print("incorrect prefix for copyright line, allowed prefixes '# ' or '// ', for " +
                   path + ": " + line)
             return False
 
         start_year = 0
         end_year = 0
 
-        m = single_re.match(line[(len(prefix) + 1):])
+        m = single_re.match(line[len(prefix):])
         if m and len(m.groups()) == 1:
             start_year = end_year = int(m.group(1))
         else:
-            m = range_re.match(line[(len(prefix) + 1):])
+            m = range_re.match(line[len(prefix):])
             if m and len(m.groups()) == 2:
                 start_year = int(m.group(1))
                 end_year = int(m.group(2))
@@ -185,11 +186,15 @@ def visit(path):
             if copyright_idx >= len(copyright_body):
                 break
 
-            line = line.strip()
+            if len(prefix) == 0:
+                line = line.rstrip()
+            else:
+                line = line.strip()
+
             if len(copyright_body[copyright_idx]) == 0:
-                expected = prefix
+                expected = prefix.strip()
             else:
-                expected = (prefix + " " + copyright_body[copyright_idx])
+                expected = (prefix + copyright_body[copyright_idx])
             if line != expected:
                 print("incorrect copyright body for " + path)
                 print("  expected: '" + expected + "'")