Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use compact SPDX license identifer in JS files #10771

Merged
merged 3 commits into from
Mar 27, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/Fetch.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// Copyright 2016 The Emscripten Authors. All rights reserved.
// Emscripten is available under two separate licenses, the MIT license and the
// University of Illinois/NCSA Open Source License. Both these licenses can be
// found in the LICENSE file.
/**
* @license
* Copyright 2016 The Emscripten Authors
* SPDX-License-Identifier: MIT
*/

var Fetch = {
xhrs: [],
Expand Down
9 changes: 5 additions & 4 deletions src/IDBStore.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// Copyright 2015 The Emscripten Authors. All rights reserved.
// Emscripten is available under two separate licenses, the MIT license and the
// University of Illinois/NCSA Open Source License. Both these licenses can be
// found in the LICENSE file.
/**
* @license
* Copyright 2015 The Emscripten Authors
* SPDX-License-Identifier: MIT
*/

{
indexedDB: function() {
Expand Down
9 changes: 5 additions & 4 deletions src/URIUtils.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// Copyright 2017 The Emscripten Authors. All rights reserved.
// Emscripten is available under two separate licenses, the MIT license and the
// University of Illinois/NCSA Open Source License. Both these licenses can be
// found in the LICENSE file.
/**
* @license
* Copyright 2017 The Emscripten Authors
* SPDX-License-Identifier: MIT
*/

// Prefix of data URIs emitted by SINGLE_FILE and related options.
var dataURIPrefix = 'data:application/octet-stream;base64,';
Expand Down
9 changes: 5 additions & 4 deletions src/arrayUtils.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// Copyright 2017 The Emscripten Authors. All rights reserved.
// Emscripten is available under two separate licenses, the MIT license and the
// University of Illinois/NCSA Open Source License. Both these licenses can be
// found in the LICENSE file.
/**
* @license
* Copyright 2017 The Emscripten Authors
* SPDX-License-Identifier: MIT
*/

/** @type {function(string, boolean=, number=)} */
function intArrayFromString(stringy, dontAddNull, length) {
Expand Down
6 changes: 6 additions & 0 deletions src/base64Decode.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/**
* @license
* Copyright 2020 The Emscripten Authors
* SPDX-License-Identifier: MIT
*/

#if WASM2JS && 0 // TODO: Figure out a way to enable this kind of sharing.

// Binaryen defines the following function if Wasm2JS is being used:
Expand Down
9 changes: 5 additions & 4 deletions src/compiler.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// Copyright 2010 The Emscripten Authors. All rights reserved.
// Emscripten is available under two separate licenses, the MIT license and the
// University of Illinois/NCSA Open Source License. Both these licenses can be
// found in the LICENSE file.
/**
* @license
* Copyright 2010 The Emscripten Authors
* SPDX-License-Identifier: MIT
*/

//"use strict";

Expand Down
9 changes: 5 additions & 4 deletions src/cpuprofiler.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// Copyright 2015 The Emscripten Authors. All rights reserved.
// Emscripten is available under two separate licenses, the MIT license and the
// University of Illinois/NCSA Open Source License. Both these licenses can be
// found in the LICENSE file.
/**
* @license
* Copyright 2015 The Emscripten Authors
* SPDX-License-Identifier: MIT
*/

// cpuprofiler.js is an interactive CPU execution profiler which measures the time spent in executing code that utilizes requestAnimationFrame(), setTimeout() and/or setInterval() handlers to run.
// Visit https://github.com/emscripten-core/emscripten for the latest version.
Expand Down
9 changes: 5 additions & 4 deletions src/deterministic.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// Copyright 2014 The Emscripten Authors. All rights reserved.
// Emscripten is available under two separate licenses, the MIT license and the
// University of Illinois/NCSA Open Source License. Both these licenses can be
// found in the LICENSE file.
/**
* @license
* Copyright 2014 The Emscripten Authors
* SPDX-License-Identifier: MIT
*/

var MAGIC = 0;
Math.random = function() {
Expand Down
9 changes: 5 additions & 4 deletions src/emrun_postjs.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// Copyright 2013 The Emscripten Authors. All rights reserved.
// Emscripten is available under two separate licenses, the MIT license and the
// University of Illinois/NCSA Open Source License. Both these licenses can be
// found in the LICENSE file.
/**
* @license
* Copyright 2013 The Emscripten Authors
* SPDX-License-Identifier: MIT
*/

if (typeof window === "object" && (typeof ENVIRONMENT_IS_PTHREAD === 'undefined' || !ENVIRONMENT_IS_PTHREAD)) {
var emrun_register_handlers = function() {
Expand Down
9 changes: 5 additions & 4 deletions src/emrun_prejs.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// Copyright 2013 The Emscripten Authors. All rights reserved.
// Emscripten is available under two separate licenses, the MIT license and the
// University of Illinois/NCSA Open Source License. Both these licenses can be
// found in the LICENSE file.
/**
* @license
* Copyright 2013 The Emscripten Authors
* SPDX-License-Identifier: MIT
*/

// Route URL GET parameters to argc+argv
if (typeof window === "object") {
Expand Down
9 changes: 5 additions & 4 deletions src/fetch-worker.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// Copyright 2016 The Emscripten Authors. All rights reserved.
// Emscripten is available under two separate licenses, the MIT license and the
// University of Illinois/NCSA Open Source License. Both these licenses can be
// found in the LICENSE file.
/**
* @license
* Copyright 2016 The Emscripten Authors
* SPDX-License-Identifier: MIT
*/

#include "Fetch.js"

Expand Down
6 changes: 6 additions & 0 deletions src/growableHeap.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/**
* @license
* Copyright 2019 The Emscripten Authors
* SPDX-License-Identifier: MIT
*/

// Support for growable heap + pthreads, where the buffer may change, so JS views
// must be updated.
function GROWABLE_HEAP_I8() {
Expand Down
9 changes: 5 additions & 4 deletions src/headless.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// Copyright 2012 The Emscripten Authors. All rights reserved.
// Emscripten is available under two separate licenses, the MIT license and the
// University of Illinois/NCSA Open Source License. Both these licenses can be
// found in the LICENSE file.
/**
* @license
* Copyright 2012 The Emscripten Authors
* SPDX-License-Identifier: MIT
*/

//== HEADLESS ==//

Expand Down
9 changes: 5 additions & 4 deletions src/headlessCanvas.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// Copyright 2013 The Emscripten Authors. All rights reserved.
// Emscripten is available under two separate licenses, the MIT license and the
// University of Illinois/NCSA Open Source License. Both these licenses can be
// found in the LICENSE file.
/**
* @license
* Copyright 2013 The Emscripten Authors
* SPDX-License-Identifier: MIT
*/

function headlessCanvas() {
var that = this;
Expand Down
9 changes: 5 additions & 4 deletions src/hello_world.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// Copyright 2013 The Emscripten Authors. All rights reserved.
// Emscripten is available under two separate licenses, the MIT license and the
// University of Illinois/NCSA Open Source License. Both these licenses can be
// found in the LICENSE file.
/**
* @license
* Copyright 2013 The Emscripten Authors
* SPDX-License-Identifier: MIT
*/

// *** Environment setup code ***
var arguments_ = [];
Expand Down
9 changes: 5 additions & 4 deletions src/jsifier.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// Copyright 2010 The Emscripten Authors. All rights reserved.
// Emscripten is available under two separate licenses, the MIT license and the
// University of Illinois/NCSA Open Source License. Both these licenses can be
// found in the LICENSE file.
/**
* @license
* Copyright 2010 The Emscripten Authors
* SPDX-License-Identifier: MIT
*/

//"use strict";

Expand Down
9 changes: 5 additions & 4 deletions src/library.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// Copyright 2010 The Emscripten Authors. All rights reserved.
// Emscripten is available under two separate licenses, the MIT license and the
// University of Illinois/NCSA Open Source License. Both these licenses can be
// found in the LICENSE file.
/**
* @license
* Copyright 2010 The Emscripten Authors
* SPDX-License-Identifier: MIT
*/

//"use strict";

Expand Down
6 changes: 6 additions & 0 deletions src/library_asmfs.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/**
* @license
* Copyright 2020 The Emscripten Authors
* SPDX-License-Identifier: MIT
*/

var asmFS = {
$FS: {
populate: function(path, mode) {
Expand Down
10 changes: 6 additions & 4 deletions src/library_async.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
// Copyright 2014 The Emscripten Authors. All rights reserved.
// Emscripten is available under two separate licenses, the MIT license and the
// University of Illinois/NCSA Open Source License. Both these licenses can be
// found in the LICENSE file.
/**
* @license
* Copyright 2014 The Emscripten Authors
* SPDX-License-Identifier: MIT
*/

//
// Async support
//
Expand Down
11 changes: 6 additions & 5 deletions src/library_bootstrap_structInfo.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
// Copyright 2015 The Emscripten Authors. All rights reserved.
// Emscripten is available under two separate licenses, the MIT license and the
// University of Illinois/NCSA Open Source License. Both these licenses can be
// found in the LICENSE file.
//
/**
* @license
* Copyright 2015 The Emscripten Authors
* SPDX-License-Identifier: MIT
*/

// no merging, this is the entire library. it is literally just enough to run
// the bootstrap program that prints out C constants for us, we obviously need
// to run without any such constants ourselves...
Expand Down
11 changes: 5 additions & 6 deletions src/library_browser.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
// Copyright 2011 The Emscripten Authors. All rights reserved.
// Emscripten is available under two separate licenses, the MIT license and the
// University of Illinois/NCSA Open Source License. Both these licenses can be
// found in the LICENSE file.

//"use strict";
/**
* @license
* Copyright 2011 The Emscripten Authors
* SPDX-License-Identifier: MIT
*/

// Utilities for browser environments
var LibraryBrowser = {
Expand Down
9 changes: 5 additions & 4 deletions src/library_cyberdwarf.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// Copyright 2016 The Emscripten Authors. All rights reserved.
// Emscripten is available under two separate licenses, the MIT license and the
// University of Illinois/NCSA Open Source License. Both these licenses can be
// found in the LICENSE file.
/**
* @license
* Copyright 2016 The Emscripten Authors
* SPDX-License-Identifier: MIT
*/

var LibraryCyberdwarf = {
// These are empty, designed to be replaced when a debugger is invoked
Expand Down
9 changes: 5 additions & 4 deletions src/library_debugger_toolkit.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// Copyright 2016 The Emscripten Authors. All rights reserved.
// Emscripten is available under two separate licenses, the MIT license and the
// University of Illinois/NCSA Open Source License. Both these licenses can be
// found in the LICENSE file.
/**
* @license
* Copyright 2016 The Emscripten Authors
* SPDX-License-Identifier: MIT
*/

var CyberDWARFHeapPrinter = function(cdFileLocation) {
var BASIC_TYPE = 0,
Expand Down
11 changes: 6 additions & 5 deletions src/library_egl.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
/**
* @license
* Copyright 2012 The Emscripten Authors
* SPDX-License-Identifier: MIT
*/

/*
* Copyright 2012 The Emscripten Authors. All rights reserved.
* Emscripten is available under two separate licenses, the MIT license and the
* University of Illinois/NCSA Open Source License. Both these licenses can be
* found in the LICENSE file.
*
* The EGL implementation supports only one EGLNativeDisplayType, the
* EGL_DEFAULT_DISPLAY. This native display type returns the only supported
* EGLDisplay handle with the magic value 62000. There is only a single
Expand Down
6 changes: 6 additions & 0 deletions src/library_emmalloc.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/**
* @license
* Copyright 2020 The Emscripten Authors
* SPDX-License-Identifier: MIT
*/

mergeInto(LibraryManager.library, {
emmalloc_unclaimed_heap_memory__deps: ['emscripten_get_sbrk_ptr'],
emmalloc_unclaimed_heap_memory: function() {
Expand Down
11 changes: 4 additions & 7 deletions src/library_exceptions.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
/*
* Copyright 2010 The Emscripten Authors. All rights reserved.
* Emscripten is available under two separate licenses, the MIT license and the
* University of Illinois/NCSA Open Source License. Both these licenses can be
* found in the LICENSE file.
*
* C++ exception handling support.
/**
* @license
* Copyright 2010 The Emscripten Authors
* SPDX-License-Identifier: MIT
*/

var LibraryExceptions = {
Expand Down
13 changes: 4 additions & 9 deletions src/library_exceptions_stub.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
/*
* Copyright 2019 The Emscripten Authors. All rights reserved.
* Emscripten is available under two separate licenses, the MIT license and the
* University of Illinois/NCSA Open Source License. Both these licenses can be
* found in the LICENSE file.
*
* C++ exception handling support stubs. This is included when exception
* throwing is disabled - so no exceptions should exist at all. If the code still
* uses them, these stubs will throw at runtime.
/**
* @license
* Copyright 2019 The Emscripten Authors
* SPDX-License-Identifier: MIT
*/

var LibraryExceptions = {};
Expand Down
6 changes: 6 additions & 0 deletions src/library_exports.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/**
* @license
* Copyright 2020 The Emscripten Authors
* SPDX-License-Identifier: MIT
*/

mergeInto(LibraryManager.library, {
emscripten_get_exported_function: function(name) {
name = UTF8ToString(name);
Expand Down
9 changes: 5 additions & 4 deletions src/library_fetch.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// Copyright 2016 The Emscripten Authors. All rights reserved.
// Emscripten is available under two separate licenses, the MIT license and the
// University of Illinois/NCSA Open Source License. Both these licenses can be
// found in the LICENSE file.
/**
* @license
* Copyright 2016 The Emscripten Authors
* SPDX-License-Identifier: MIT
*/

#include Fetch.js

Expand Down
9 changes: 5 additions & 4 deletions src/library_formatString.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// Copyright 2015 The Emscripten Authors. All rights reserved.
// Emscripten is available under two separate licenses, the MIT license and the
// University of Illinois/NCSA Open Source License. Both these licenses can be
// found in the LICENSE file.
/**
* @license
* Copyright 2015 The Emscripten Authors
* SPDX-License-Identifier: MIT
*/

mergeInto(LibraryManager.library, {
// Performs printf-style formatting.
Expand Down
Loading