From 39d8c6afe47bbfda283d332dffe0f4c5c985255f Mon Sep 17 00:00:00 2001 From: Christoph Knittel Date: Sun, 26 Jun 2022 21:20:55 +0200 Subject: [PATCH 1/3] Add ninja.COPYING to darwinarm64 dir --- darwinarm64/ninja.COPYING | 202 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 202 insertions(+) create mode 100644 darwinarm64/ninja.COPYING diff --git a/darwinarm64/ninja.COPYING b/darwinarm64/ninja.COPYING new file mode 100644 index 0000000000..131cb1da46 --- /dev/null +++ b/darwinarm64/ninja.COPYING @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2010 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. From 04b4e42705314893397b9a7caf570730aa6bbf70 Mon Sep 17 00:00:00 2001 From: Christoph Knittel Date: Mon, 27 Jun 2022 06:41:25 +0200 Subject: [PATCH 2/3] Update .npmignore --- .npmignore | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.npmignore b/.npmignore index b2e692f434..dd2ca375a6 100644 --- a/.npmignore +++ b/.npmignore @@ -40,4 +40,13 @@ vendor/js_of_ocaml.bc syntax/ *.log ninja -ocaml-tree \ No newline at end of file +ocaml-tree +.istanbul.yml +.prettierignore +.prettierrc.json +dummy.opam +dune +dune-project +scripts/deps.js +scripts/format.js +scripts/local_br_clean.sh From 0fd8bb0e77c4b0e96a9647ac8af614305057003f Mon Sep 17 00:00:00 2001 From: Christoph Knittel Date: Sun, 26 Jun 2022 21:22:00 +0200 Subject: [PATCH 3/3] Run prepublish.sh to update artifacts.json --- jscomp/artifacts.json | 72 ++++++++++++++++--------------------------- 1 file changed, 26 insertions(+), 46 deletions(-) diff --git a/jscomp/artifacts.json b/jscomp/artifacts.json index 981eb3c7c2..d47659c2b1 100644 --- a/jscomp/artifacts.json +++ b/jscomp/artifacts.json @@ -2,7 +2,6 @@ "": [ ".gitattributes", ".gitmodules", - ".istanbul.yml", "CONTRIBUTING.md", "COPYING", "COPYING.LESSER", @@ -19,7 +18,14 @@ ], "darwin": [ "bsb_helper.exe", - "bsc.byte", + "bsc.exe", + "ninja.COPYING", + "ninja.exe", + "refmt.exe", + "rescript.exe" + ], + "darwinarm64": [ + "bsb_helper.exe", "bsc.exe", "ninja.COPYING", "ninja.exe", @@ -116,10 +122,8 @@ "caml_hash.js", "caml_hash_primitive.js", "caml_int32.js", - "caml_int32_extern.js", "caml_int64.js", "caml_int64_extern.js", - "caml_io.js", "caml_js_exceptions.js", "caml_lexer.js", "caml_md5.js", @@ -133,8 +137,6 @@ "caml_string_extern.js", "caml_sys.js", "caml_undefined_extern.js", - "camlinternalFormat.js", - "camlinternalFormatBasics.js", "camlinternalLazy.js", "camlinternalMod.js", "char.js", @@ -145,9 +147,9 @@ "dom_storage.js", "dom_storage2.js", "filename.js", - "format.js", "genlex.js", "hashtbl.js", + "hashtblLabels.js", "int32.js", "int64.js", "js.js", @@ -185,6 +187,7 @@ "list.js", "listLabels.js", "map.js", + "mapLabels.js", "moreLabels.js", "node.js", "node_buffer.js", @@ -198,15 +201,13 @@ "parsing.js", "pervasives.js", "printexc.js", - "printf.js", "queue.js", "random.js", - "scanf.js", "set.js", + "setLabels.js", "sort.js", "stack.js", "stdLabels.js", - "std_exit.js", "stream.js", "string.js", "stringLabels.js", @@ -276,10 +277,8 @@ "caml_hash.js", "caml_hash_primitive.js", "caml_int32.js", - "caml_int32_extern.js", "caml_int64.js", "caml_int64_extern.js", - "caml_io.js", "caml_js_exceptions.js", "caml_lexer.js", "caml_md5.js", @@ -293,8 +292,6 @@ "caml_string_extern.js", "caml_sys.js", "caml_undefined_extern.js", - "camlinternalFormat.js", - "camlinternalFormatBasics.js", "camlinternalLazy.js", "camlinternalMod.js", "char.js", @@ -305,9 +302,9 @@ "dom_storage.js", "dom_storage2.js", "filename.js", - "format.js", "genlex.js", "hashtbl.js", + "hashtblLabels.js", "int32.js", "int64.js", "js.js", @@ -345,6 +342,7 @@ "list.js", "listLabels.js", "map.js", + "mapLabels.js", "moreLabels.js", "node.js", "node_buffer.js", @@ -357,15 +355,13 @@ "parsing.js", "pervasives.js", "printexc.js", - "printf.js", "queue.js", "random.js", - "scanf.js", "set.js", + "setLabels.js", "sort.js", "stack.js", "stdLabels.js", - "std_exit.js", "stream.js", "string.js", "stringLabels.js", @@ -586,6 +582,8 @@ "belt_internalSetInt.ml", "belt_internalSetString.cmt", "belt_internalSetString.ml", + "belt_internals.cmti", + "belt_internals.mli", "buffer.cmi", "buffer.cmt", "buffer.cmti", @@ -606,16 +604,6 @@ "callback.cmti", "callback.ml", "callback.mli", - "camlinternalFormat.cmi", - "camlinternalFormat.cmt", - "camlinternalFormat.cmti", - "camlinternalFormat.ml", - "camlinternalFormat.mli", - "camlinternalFormatBasics.cmi", - "camlinternalFormatBasics.cmt", - "camlinternalFormatBasics.cmti", - "camlinternalFormatBasics.ml", - "camlinternalFormatBasics.mli", "camlinternalLazy.cmi", "camlinternalLazy.cmt", "camlinternalLazy.cmti", @@ -655,11 +643,6 @@ "filename.cmti", "filename.ml", "filename.mli", - "format.cmi", - "format.cmt", - "format.cmti", - "format.ml", - "format.mli", "genlex.cmi", "genlex.cmt", "genlex.cmti", @@ -674,6 +657,9 @@ "hashtbl.cmti", "hashtbl.ml", "hashtbl.mli", + "hashtblLabels.cmi", + "hashtblLabels.cmt", + "hashtblLabels.ml", "int32.cmi", "int32.cmt", "int32.cmti", @@ -831,6 +817,9 @@ "map.cppo.mli", "map.ml", "map.mli", + "mapLabels.cmi", + "mapLabels.cmt", + "mapLabels.ml", "mapm.cppo.ml", "mapm.cppo.mli", "moreLabels.cmi", @@ -881,11 +870,6 @@ "printexc.cmti", "printexc.ml", "printexc.mli", - "printf.cmi", - "printf.cmt", - "printf.cmti", - "printf.ml", - "printf.mli", "queue.cmi", "queue.cmt", "queue.cmti", @@ -896,16 +880,14 @@ "random.cmti", "random.ml", "random.mli", - "scanf.cmi", - "scanf.cmt", - "scanf.cmti", - "scanf.ml", - "scanf.mli", "set.cmi", "set.cmt", "set.cmti", "set.ml", "set.mli", + "setLabels.cmi", + "setLabels.cmt", + "setLabels.ml", "setm.cppo.ml", "setm.cppo.mli", "sort.cmi", @@ -925,9 +907,6 @@ "stdLabels.cmti", "stdLabels.ml", "stdLabels.mli", - "std_exit.cmi", - "std_exit.cmt", - "std_exit.ml", "stream.cmi", "stream.cmt", "stream.cmti", @@ -967,6 +946,7 @@ ], "scripts": [ "LICENSE.ml", + "bin_path.js", "buckle_lto.js", "build_sorted.ml", "buildocaml.js",