Title: [202986] trunk/Source/_javascript_Core
Revision
202986
Author
[email protected]
Date
2016-07-08 10:15:00 -0700 (Fri, 08 Jul 2016)

Log Message

Built-in generator should generate files with a default copyright
https://bugs.webkit.org/show_bug.cgi?id=159561

Patch by Youenn Fablet <[email protected]> on 2016-07-08
Reviewed by Alex Christensen.

* Scripts/builtins/builtins_model.py:
(BuiltinsCollection._parse_copyright_lines): Adding default copyright to the parsed copyrights.
* Scripts/builtins/builtins_templates.py:
(BuiltinsGeneratorTemplates): Adding a default copyright.
* Scripts/tests/builtins/expected/_javascript_Core-Builtin.Promise-Combined.js-result: Rebasing with added default copyright.
* Scripts/tests/builtins/expected/_javascript_Core-Builtin.Promise-Separate.js-result: Ditto.
* Scripts/tests/builtins/expected/_javascript_Core-Builtin.prototype-Combined.js-result: Ditto.
* Scripts/tests/builtins/expected/_javascript_Core-Builtin.prototype-Separate.js-result: Ditto.
* Scripts/tests/builtins/expected/_javascript_Core-BuiltinConstructor-Combined.js-result: Ditto.
* Scripts/tests/builtins/expected/_javascript_Core-BuiltinConstructor-Separate.js-result: Ditto.
* Scripts/tests/builtins/expected/_javascript_Core-InternalClashingNames-Combined.js-result: Ditto.
* Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result: Ditto.
* Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result: Ditto.
* Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result: Ditto.
* Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result: Ditto.
* Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result: Ditto.

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (202985 => 202986)


--- trunk/Source/_javascript_Core/ChangeLog	2016-07-08 17:11:20 UTC (rev 202985)
+++ trunk/Source/_javascript_Core/ChangeLog	2016-07-08 17:15:00 UTC (rev 202986)
@@ -1,3 +1,28 @@
+2016-07-08  Youenn Fablet  <[email protected]>
+
+        Built-in generator should generate files with a default copyright
+        https://bugs.webkit.org/show_bug.cgi?id=159561
+
+        Reviewed by Alex Christensen.
+
+        * Scripts/builtins/builtins_model.py:
+        (BuiltinsCollection._parse_copyright_lines): Adding default copyright to the parsed copyrights.
+        * Scripts/builtins/builtins_templates.py:
+        (BuiltinsGeneratorTemplates): Adding a default copyright.
+        * Scripts/tests/builtins/expected/_javascript_Core-Builtin.Promise-Combined.js-result: Rebasing with added default copyright.
+        * Scripts/tests/builtins/expected/_javascript_Core-Builtin.Promise-Separate.js-result: Ditto.
+        * Scripts/tests/builtins/expected/_javascript_Core-Builtin.prototype-Combined.js-result: Ditto.
+        * Scripts/tests/builtins/expected/_javascript_Core-Builtin.prototype-Separate.js-result: Ditto.
+        * Scripts/tests/builtins/expected/_javascript_Core-BuiltinConstructor-Combined.js-result: Ditto.
+        * Scripts/tests/builtins/expected/_javascript_Core-BuiltinConstructor-Separate.js-result: Ditto.
+        * Scripts/tests/builtins/expected/_javascript_Core-InternalClashingNames-Combined.js-result: Ditto.
+        * Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result: Ditto.
+        * Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result: Ditto.
+        * Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result: Ditto.
+        * Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result: Ditto.
+        * Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result: Ditto.
+
+
 2016-07-08  Keith Miller  <[email protected]>
 
         TypedArrays need more isNeutered checks.

Modified: trunk/Source/_javascript_Core/Scripts/builtins/builtins_model.py (202985 => 202986)


--- trunk/Source/_javascript_Core/Scripts/builtins/builtins_model.py	2016-07-08 17:11:20 UTC (rev 202985)
+++ trunk/Source/_javascript_Core/Scripts/builtins/builtins_model.py	2016-07-08 17:15:00 UTC (rev 202986)
@@ -27,6 +27,8 @@
 import re
 import os
 
+from builtins_templates import BuiltinsGeneratorTemplates as Templates
+
 log = logging.getLogger('global')
 
 _FRAMEWORK_CONFIG_MAP = {
@@ -219,7 +221,7 @@
         licenseBlock = multilineCommentRegExp.findall(text)[0]
         licenseBlock = licenseBlock[:licenseBlock.index("Redistribution")]
 
-        copyrightLines = []
+        copyrightLines = [Templates.DefaultCopyright]
         for line in licenseBlock.split("\n"):
             line = line.replace("/*", "")
             line = line.replace("*/", "")

Modified: trunk/Source/_javascript_Core/Scripts/builtins/builtins_templates.py (202985 => 202986)


--- trunk/Source/_javascript_Core/Scripts/builtins/builtins_templates.py	2016-07-08 17:11:20 UTC (rev 202985)
+++ trunk/Source/_javascript_Core/Scripts/builtins/builtins_templates.py	2016-07-08 17:15:00 UTC (rev 202986)
@@ -29,6 +29,7 @@
 
 class BuiltinsGeneratorTemplates:
 
+    DefaultCopyright = "2016 Apple Inc. All rights reserved."
     LicenseText = (
     """Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions

Modified: trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-Builtin.Promise-Combined.js-result (202985 => 202986)


--- trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-Builtin.Promise-Combined.js-result	2016-07-08 17:11:20 UTC (rev 202985)
+++ trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-Builtin.Promise-Combined.js-result	2016-07-08 17:15:00 UTC (rev 202986)
@@ -1,6 +1,7 @@
 ### Begin File: JSCBuiltins.h
 /*
  * Copyright (c) 2015 Yusuke Suzuki <[email protected]>.
+ * Copyright (c) 2016 Apple Inc. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -73,6 +74,7 @@
 ### Begin File: JSCBuiltins.cpp
 /*
  * Copyright (c) 2015 Yusuke Suzuki <[email protected]>.
+ * Copyright (c) 2016 Apple Inc. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Modified: trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-Builtin.Promise-Separate.js-result (202985 => 202986)


--- trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-Builtin.Promise-Separate.js-result	2016-07-08 17:11:20 UTC (rev 202985)
+++ trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-Builtin.Promise-Separate.js-result	2016-07-08 17:15:00 UTC (rev 202986)
@@ -1,6 +1,7 @@
 ### Begin File: BuiltinPromiseBuiltins.h
 /*
  * Copyright (c) 2015 Yusuke Suzuki <[email protected]>.
+ * Copyright (c) 2016 Apple Inc. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -73,6 +74,7 @@
 ### Begin File: BuiltinPromiseBuiltins.cpp
 /*
  * Copyright (c) 2015 Yusuke Suzuki <[email protected]>.
+ * Copyright (c) 2016 Apple Inc. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Modified: trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-Builtin.prototype-Combined.js-result (202985 => 202986)


--- trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-Builtin.prototype-Combined.js-result	2016-07-08 17:11:20 UTC (rev 202985)
+++ trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-Builtin.prototype-Combined.js-result	2016-07-08 17:15:00 UTC (rev 202986)
@@ -1,6 +1,6 @@
 ### Begin File: JSCBuiltins.h
 /*
- * Copyright (c) 2014, 2015 Apple Inc. All rights reserved.
+ * Copyright (c) 2014, 2015, 2016 Apple Inc. All rights reserved.
  * Copyright (c) 2015 Yusuke Suzuki <[email protected]>.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -73,7 +73,7 @@
 
 ### Begin File: JSCBuiltins.cpp
 /*
- * Copyright (c) 2014, 2015 Apple Inc. All rights reserved.
+ * Copyright (c) 2014, 2015, 2016 Apple Inc. All rights reserved.
  * Copyright (c) 2015 Yusuke Suzuki <[email protected]>.
  * 
  * Redistribution and use in source and binary forms, with or without

Modified: trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-Builtin.prototype-Separate.js-result (202985 => 202986)


--- trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-Builtin.prototype-Separate.js-result	2016-07-08 17:11:20 UTC (rev 202985)
+++ trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-Builtin.prototype-Separate.js-result	2016-07-08 17:15:00 UTC (rev 202986)
@@ -1,6 +1,6 @@
 ### Begin File: BuiltinPrototypeBuiltins.h
 /*
- * Copyright (c) 2014, 2015 Apple Inc. All rights reserved.
+ * Copyright (c) 2014, 2015, 2016 Apple Inc. All rights reserved.
  * Copyright (c) 2015 Yusuke Suzuki <[email protected]>.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -73,7 +73,7 @@
 
 ### Begin File: BuiltinPrototypeBuiltins.cpp
 /*
- * Copyright (c) 2014, 2015 Apple Inc. All rights reserved.
+ * Copyright (c) 2014, 2015, 2016 Apple Inc. All rights reserved.
  * Copyright (c) 2015 Yusuke Suzuki <[email protected]>.
  * 
  * Redistribution and use in source and binary forms, with or without

Modified: trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-BuiltinConstructor-Combined.js-result (202985 => 202986)


--- trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-BuiltinConstructor-Combined.js-result	2016-07-08 17:11:20 UTC (rev 202985)
+++ trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-BuiltinConstructor-Combined.js-result	2016-07-08 17:15:00 UTC (rev 202986)
@@ -1,6 +1,6 @@
 ### Begin File: JSCBuiltins.h
 /*
- * Copyright (c) 2015 Apple Inc. All rights reserved.
+ * Copyright (c) 2015, 2016 Apple Inc. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -72,7 +72,7 @@
 
 ### Begin File: JSCBuiltins.cpp
 /*
- * Copyright (c) 2015 Apple Inc. All rights reserved.
+ * Copyright (c) 2015, 2016 Apple Inc. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Modified: trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-BuiltinConstructor-Separate.js-result (202985 => 202986)


--- trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-BuiltinConstructor-Separate.js-result	2016-07-08 17:11:20 UTC (rev 202985)
+++ trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-BuiltinConstructor-Separate.js-result	2016-07-08 17:15:00 UTC (rev 202986)
@@ -1,6 +1,6 @@
 ### Begin File: BuiltinConstructorBuiltins.h
 /*
- * Copyright (c) 2015 Apple Inc. All rights reserved.
+ * Copyright (c) 2015, 2016 Apple Inc. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -72,7 +72,7 @@
 
 ### Begin File: BuiltinConstructorBuiltins.cpp
 /*
- * Copyright (c) 2015 Apple Inc. All rights reserved.
+ * Copyright (c) 2015, 2016 Apple Inc. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Modified: trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-InternalClashingNames-Combined.js-result (202985 => 202986)


--- trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-InternalClashingNames-Combined.js-result	2016-07-08 17:11:20 UTC (rev 202985)
+++ trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/_javascript_Core-InternalClashingNames-Combined.js-result	2016-07-08 17:15:00 UTC (rev 202986)
@@ -1,6 +1,7 @@
 ### Begin File: JSCBuiltins.h
 /*
  * Copyright (c) 2015 Canon Inc. All rights reserved.
+ * Copyright (c) 2016 Apple Inc. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -72,6 +73,7 @@
 ### Begin File: JSCBuiltins.cpp
 /*
  * Copyright (c) 2015 Canon Inc. All rights reserved.
+ * Copyright (c) 2016 Apple Inc. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Modified: trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result (202985 => 202986)


--- trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result	2016-07-08 17:11:20 UTC (rev 202985)
+++ trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result	2016-07-08 17:15:00 UTC (rev 202986)
@@ -1,6 +1,7 @@
 ### Begin File: ArbitraryConditionalGuardBuiltins.h
 /*
  * Copyright (c) 2015 Canon Inc. All rights reserved.
+ * Copyright (c) 2016 Apple Inc. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -124,6 +125,7 @@
 ### Begin File: ArbitraryConditionalGuardBuiltins.cpp
 /*
  * Copyright (c) 2015 Canon Inc. All rights reserved.
+ * Copyright (c) 2016 Apple Inc. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Modified: trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result (202985 => 202986)


--- trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result	2016-07-08 17:11:20 UTC (rev 202985)
+++ trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result	2016-07-08 17:15:00 UTC (rev 202986)
@@ -1,6 +1,7 @@
 ### Begin File: GuardedBuiltinBuiltins.h
 /*
  * Copyright (c) 2015 Canon Inc. All rights reserved.
+ * Copyright (c) 2016 Apple Inc. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -124,6 +125,7 @@
 ### Begin File: GuardedBuiltinBuiltins.cpp
 /*
  * Copyright (c) 2015 Canon Inc. All rights reserved.
+ * Copyright (c) 2016 Apple Inc. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Modified: trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result (202985 => 202986)


--- trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result	2016-07-08 17:11:20 UTC (rev 202985)
+++ trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result	2016-07-08 17:15:00 UTC (rev 202986)
@@ -1,6 +1,7 @@
 ### Begin File: GuardedInternalBuiltinBuiltins.h
 /*
  * Copyright (c) 2015 Canon Inc. All rights reserved.
+ * Copyright (c) 2016 Apple Inc. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -156,6 +157,7 @@
 ### Begin File: GuardedInternalBuiltinBuiltins.cpp
 /*
  * Copyright (c) 2015 Canon Inc. All rights reserved.
+ * Copyright (c) 2016 Apple Inc. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Modified: trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result (202985 => 202986)


--- trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result	2016-07-08 17:11:20 UTC (rev 202985)
+++ trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result	2016-07-08 17:15:00 UTC (rev 202986)
@@ -1,6 +1,7 @@
 ### Begin File: UnguardedBuiltinBuiltins.h
 /*
  * Copyright (c) 2015 Canon Inc. All rights reserved.
+ * Copyright (c) 2016 Apple Inc. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -120,6 +121,7 @@
 ### Begin File: UnguardedBuiltinBuiltins.cpp
 /*
  * Copyright (c) 2015 Canon Inc. All rights reserved.
+ * Copyright (c) 2016 Apple Inc. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

Modified: trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result (202985 => 202986)


--- trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result	2016-07-08 17:11:20 UTC (rev 202985)
+++ trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result	2016-07-08 17:15:00 UTC (rev 202986)
@@ -1,6 +1,7 @@
 ### Begin File: xmlCasingTestBuiltins.h
 /*
  * Copyright (c) 2015 Canon Inc. All rights reserved.
+ * Copyright (c) 2016 Apple Inc. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -170,6 +171,7 @@
 ### Begin File: xmlCasingTestBuiltins.cpp
 /*
  * Copyright (c) 2015 Canon Inc. All rights reserved.
+ * Copyright (c) 2016 Apple Inc. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to