Skip to content

Commit

Permalink
fix: Correct license headers in compiled output
Browse files Browse the repository at this point in the history
This fixes all the license headers in the main library, which corrects
the appearance of the main license in the compiled output.

It seems that the `!` in the header forces the compiler to keep it in
the output.  I believe older compiler releases did this purely based
on `@license`.

Issue #2638

Change-Id: I7f0e918caad10c9af689c9d07672b7fe9be7b2f3
  • Loading branch information
joeyparrish committed Jun 9, 2020
1 parent da79dbc commit f539147
Show file tree
Hide file tree
Showing 183 changed files with 370 additions and 182 deletions.
6 changes: 6 additions & 0 deletions build/wrapper.template.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/

(function() {
// This is "window" in browsers and "global" in nodejs.
// See https://github.com/google/shaka-player/issues/1445
Expand Down
3 changes: 2 additions & 1 deletion lib/abr/ewma.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/abr/ewma_bandwidth_estimator.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/abr/simple_abr_manager.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/ads/ad_manager.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/ads/ads_stats.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/ads/client_side_ad.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/ads/client_side_ad_manager.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/ads/server_side_ad.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/ads/server_side_ad_manager.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/cast/cast_proxy.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/cast/cast_receiver.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/cast/cast_sender.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/cast/cast_utils.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/dash/content_protection.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/dash/dash_parser.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/dash/mpd_utils.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/dash/segment_base.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/dash/segment_list.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/dash/segment_template.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/debug/asserts.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/debug/log.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/deprecate/deprecate.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/deprecate/enforcer.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/deprecate/version.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/hls/hls_classes.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/hls/hls_parser.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/hls/hls_utils.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/hls/manifest_text_parser.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/media/adaptation_set.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/media/adaptation_set_criteria.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/media/buffering_observer.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/media/closed_caption_parser.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/media/drm_engine.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/media/gap_jumping_controller.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/media/manifest_parser.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/media/media_source_engine.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/media/mp4_segment_index_parser.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/media/play_rate_controller.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/media/playhead.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/media/playhead_observer.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/media/presentation_timeline.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/media/region_observer.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/media/region_timeline.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/media/segment_index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/media/segment_reference.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/media/stall_detector.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/media/streaming_engine.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/media/time_ranges_utils.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/media/transmuxer.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/media/video_wrapper.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/media/webm_segment_index_parser.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/net/backoff.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/net/data_uri_plugin.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/net/http_fetch_plugin.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
3 changes: 2 additions & 1 deletion lib/net/http_plugin_utils.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @license
/*! @license
* Shaka Player
* Copyright 2016 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
Loading

0 comments on commit f539147

Please sign in to comment.