mirror of
https://github.com/shaka-project/shaka-player.git
synced 2026-06-14 15:56:38 +03:00
build: Stop using deprecated tool to generate closure deps (#4060)
The depswriter.py tool from google-closure-library was generating deprecation warnings. This switches to a newer, rewritten version called google-closure-deps.
This commit is contained in:
Joey Parrish
GitHub
+11
-15
@@ -24,17 +24,6 @@ import sys
|
||||
import shakaBuildHelpers
|
||||
|
||||
|
||||
# The relative path in each of these is relative to Closure's base.js, which
|
||||
# lives at node_modules/google-closure-library/closure/goog/base.js
|
||||
deps_args = [
|
||||
'--root_with_prefix=lib ../../../../lib',
|
||||
'--root_with_prefix=ui ../../../../ui',
|
||||
'--root_with_prefix=third_party ../../../../third_party',
|
||||
'--root_with_prefix=dist ../../../../dist',
|
||||
'--root_with_prefix=demo ../../../../demo',
|
||||
]
|
||||
|
||||
|
||||
def main(_):
|
||||
"""Generates the uncompiled dependencies files."""
|
||||
# Update node modules if needed.
|
||||
@@ -50,12 +39,19 @@ def main(_):
|
||||
except OSError:
|
||||
pass
|
||||
os.chdir(base)
|
||||
deps_writer = os.path.join(
|
||||
'node_modules', 'google-closure-library',
|
||||
'closure', 'bin', 'build', 'depswriter.py')
|
||||
|
||||
make_deps = shakaBuildHelpers.get_node_binary(
|
||||
'google-closure-deps', 'closure-make-deps')
|
||||
|
||||
try:
|
||||
cmd_line = [sys.executable or 'python', deps_writer] + deps_args
|
||||
cmd_line = make_deps + [
|
||||
# Folders to search for sources using goog.require/goog.provide
|
||||
'-r', 'demo', 'lib', 'ui', 'third_party',
|
||||
# Individual files to add to those
|
||||
'-f', 'dist/locales.js',
|
||||
# The path to the folder containing the Closure library's base.js
|
||||
'--closure-path', 'node_modules/google-closure-library/closure/goog',
|
||||
]
|
||||
deps = shakaBuildHelpers.execute_get_output(cmd_line)
|
||||
with open(os.path.join(base, 'dist', 'deps.js'), 'wb') as f:
|
||||
f.write(deps)
|
||||
|
||||
Generated
+47
-22
@@ -30,8 +30,9 @@
|
||||
"esprima": "^4.0.1",
|
||||
"fastestsmallesttextencoderdecoder": "^1.0.22",
|
||||
"fontfaceonload": "^1.0.2",
|
||||
"google-closure-compiler-java": "^20220202.0.0",
|
||||
"google-closure-library": "^20220104.0.0",
|
||||
"google-closure-compiler-java": "^20220301.0.0",
|
||||
"google-closure-deps": "^20220301.0.0",
|
||||
"google-closure-library": "^20220301.0.0",
|
||||
"htmlhint": "github:joeyparrish/HTMLHint#1c3a7e8b",
|
||||
"jasmine-ajax": "^4.0.0",
|
||||
"jimp": "^0.16.1",
|
||||
@@ -4567,15 +4568,29 @@
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/google-closure-compiler-java": {
|
||||
"version": "20220202.0.0",
|
||||
"resolved": "https://registry.npmjs.org/google-closure-compiler-java/-/google-closure-compiler-java-20220202.0.0.tgz",
|
||||
"integrity": "sha512-sxCNinmZMMAw0cxlsXoZib3w21Y5WOsQGmUfchlpd3AFJgr9PO4jLp7427UP7KTaLFqygJly7h2Pupqojmf1Cw==",
|
||||
"version": "20220301.0.0",
|
||||
"resolved": "https://registry.npmjs.org/google-closure-compiler-java/-/google-closure-compiler-java-20220301.0.0.tgz",
|
||||
"integrity": "sha512-kv5oaUI4xn3qWYWtRHRqbm314kesfeFlCxiFRcvBIx13mKfR0qvbOkgajLpSM6nb3voNM/E9MB9mfvHJ9XIXSg==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/google-closure-deps": {
|
||||
"version": "20220301.0.0",
|
||||
"resolved": "https://registry.npmjs.org/google-closure-deps/-/google-closure-deps-20220301.0.0.tgz",
|
||||
"integrity": "sha512-ZlJCUwpc9IpsuaeCwt15Y+PfdHhUaQYB4F+wahWVPnQeD5xcSXFd3URrXyYkLbZS+6hUH0ZwWtWZFj+W2eqq0Q==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"minimatch": "^3.0.4",
|
||||
"yargs": "^16.2.0"
|
||||
},
|
||||
"bin": {
|
||||
"closure-make-deps": "bin/closuremakedeps.js",
|
||||
"get-js-version": "bin/getjsversion.js"
|
||||
}
|
||||
},
|
||||
"node_modules/google-closure-library": {
|
||||
"version": "20220104.0.0",
|
||||
"resolved": "https://registry.npmjs.org/google-closure-library/-/google-closure-library-20220104.0.0.tgz",
|
||||
"integrity": "sha512-gHrIxIKcnn9pR/8sVwCLH6C4urmAekSYZKYzTawKG72HQsRnadXOCuRTA+kf6nagDCbsu6HzhSWA2rMBb2L1Aw==",
|
||||
"version": "20220301.0.0",
|
||||
"resolved": "https://registry.npmjs.org/google-closure-library/-/google-closure-library-20220301.0.0.tgz",
|
||||
"integrity": "sha512-GRRBfG80JPqkKkTxiRoVr/x4UmnPW2aeA72NH0zapPtrvSkAOCzfJFrdudLrAJJtXPdSE65+CkYrpZX8tP0mCQ==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/graceful-fs": {
|
||||
@@ -4678,7 +4693,7 @@
|
||||
},
|
||||
"node_modules/htmlhint": {
|
||||
"version": "1.1.2",
|
||||
"resolved": "git+https://github.com/joeyparrish/HTMLHint.git#1c3a7e8bc338a6206baad228dd6bbb6b347f8b02",
|
||||
"resolved": "git+ssh://git@github.com/joeyparrish/HTMLHint.git#1c3a7e8bc338a6206baad228dd6bbb6b347f8b02",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
@@ -5290,7 +5305,7 @@
|
||||
},
|
||||
"node_modules/jsdoc": {
|
||||
"version": "3.6.10",
|
||||
"resolved": "git+https://github.com/joeyparrish/jsdoc.git#2ca85bb6e7686dac8790325d2b029df83547a1b4",
|
||||
"resolved": "git+ssh://git@github.com/joeyparrish/jsdoc.git#2ca85bb6e7686dac8790325d2b029df83547a1b4",
|
||||
"dev": true,
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
@@ -5657,7 +5672,7 @@
|
||||
},
|
||||
"node_modules/less-plugin-clean-css": {
|
||||
"version": "1.5.1",
|
||||
"resolved": "git+https://github.com/austingardner/less-plugin-clean-css.git#4e9e77bf746adcd6e51beeaf8f226bf6e8932822",
|
||||
"resolved": "git+ssh://git@github.com/austingardner/less-plugin-clean-css.git#4e9e77bf746adcd6e51beeaf8f226bf6e8932822",
|
||||
"dev": true,
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
@@ -6163,7 +6178,7 @@
|
||||
},
|
||||
"node_modules/needle": {
|
||||
"version": "3.0.1",
|
||||
"resolved": "git+https://github.com/joeyparrish/needle.git#86b2c2fffc35b4a6433482ea5ebcc1837702d26f",
|
||||
"resolved": "git+ssh://git@github.com/joeyparrish/needle.git#86b2c2fffc35b4a6433482ea5ebcc1837702d26f",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
@@ -11938,15 +11953,25 @@
|
||||
"dev": true
|
||||
},
|
||||
"google-closure-compiler-java": {
|
||||
"version": "20220202.0.0",
|
||||
"resolved": "https://registry.npmjs.org/google-closure-compiler-java/-/google-closure-compiler-java-20220202.0.0.tgz",
|
||||
"integrity": "sha512-sxCNinmZMMAw0cxlsXoZib3w21Y5WOsQGmUfchlpd3AFJgr9PO4jLp7427UP7KTaLFqygJly7h2Pupqojmf1Cw==",
|
||||
"version": "20220301.0.0",
|
||||
"resolved": "https://registry.npmjs.org/google-closure-compiler-java/-/google-closure-compiler-java-20220301.0.0.tgz",
|
||||
"integrity": "sha512-kv5oaUI4xn3qWYWtRHRqbm314kesfeFlCxiFRcvBIx13mKfR0qvbOkgajLpSM6nb3voNM/E9MB9mfvHJ9XIXSg==",
|
||||
"dev": true
|
||||
},
|
||||
"google-closure-deps": {
|
||||
"version": "20220301.0.0",
|
||||
"resolved": "https://registry.npmjs.org/google-closure-deps/-/google-closure-deps-20220301.0.0.tgz",
|
||||
"integrity": "sha512-ZlJCUwpc9IpsuaeCwt15Y+PfdHhUaQYB4F+wahWVPnQeD5xcSXFd3URrXyYkLbZS+6hUH0ZwWtWZFj+W2eqq0Q==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"minimatch": "^3.0.4",
|
||||
"yargs": "^16.2.0"
|
||||
}
|
||||
},
|
||||
"google-closure-library": {
|
||||
"version": "20220104.0.0",
|
||||
"resolved": "https://registry.npmjs.org/google-closure-library/-/google-closure-library-20220104.0.0.tgz",
|
||||
"integrity": "sha512-gHrIxIKcnn9pR/8sVwCLH6C4urmAekSYZKYzTawKG72HQsRnadXOCuRTA+kf6nagDCbsu6HzhSWA2rMBb2L1Aw==",
|
||||
"version": "20220301.0.0",
|
||||
"resolved": "https://registry.npmjs.org/google-closure-library/-/google-closure-library-20220301.0.0.tgz",
|
||||
"integrity": "sha512-GRRBfG80JPqkKkTxiRoVr/x4UmnPW2aeA72NH0zapPtrvSkAOCzfJFrdudLrAJJtXPdSE65+CkYrpZX8tP0mCQ==",
|
||||
"dev": true
|
||||
},
|
||||
"graceful-fs": {
|
||||
@@ -12020,7 +12045,7 @@
|
||||
"dev": true
|
||||
},
|
||||
"htmlhint": {
|
||||
"version": "git+https://github.com/joeyparrish/HTMLHint.git#1c3a7e8bc338a6206baad228dd6bbb6b347f8b02",
|
||||
"version": "git+ssh://git@github.com/joeyparrish/HTMLHint.git#1c3a7e8bc338a6206baad228dd6bbb6b347f8b02",
|
||||
"dev": true,
|
||||
"from": "htmlhint@github:joeyparrish/HTMLHint#1c3a7e8b",
|
||||
"requires": {
|
||||
@@ -12486,7 +12511,7 @@
|
||||
"dev": true
|
||||
},
|
||||
"jsdoc": {
|
||||
"version": "git+https://github.com/joeyparrish/jsdoc.git#2ca85bb6e7686dac8790325d2b029df83547a1b4",
|
||||
"version": "git+ssh://git@github.com/joeyparrish/jsdoc.git#2ca85bb6e7686dac8790325d2b029df83547a1b4",
|
||||
"dev": true,
|
||||
"from": "jsdoc@github:joeyparrish/jsdoc#2ca85bb6",
|
||||
"requires": {
|
||||
@@ -12815,7 +12840,7 @@
|
||||
}
|
||||
},
|
||||
"less-plugin-clean-css": {
|
||||
"version": "git+https://github.com/austingardner/less-plugin-clean-css.git#4e9e77bf746adcd6e51beeaf8f226bf6e8932822",
|
||||
"version": "git+ssh://git@github.com/austingardner/less-plugin-clean-css.git#4e9e77bf746adcd6e51beeaf8f226bf6e8932822",
|
||||
"dev": true,
|
||||
"from": "less-plugin-clean-css@github:austingardner/less-plugin-clean-css#4e9e77bf",
|
||||
"requires": {
|
||||
@@ -13167,7 +13192,7 @@
|
||||
"dev": true
|
||||
},
|
||||
"needle": {
|
||||
"version": "git+https://github.com/joeyparrish/needle.git#86b2c2fffc35b4a6433482ea5ebcc1837702d26f",
|
||||
"version": "git+ssh://git@github.com/joeyparrish/needle.git#86b2c2fffc35b4a6433482ea5ebcc1837702d26f",
|
||||
"dev": true,
|
||||
"from": "needle@github:joeyparrish/needle#86b2c2ff",
|
||||
"optional": true,
|
||||
|
||||
+3
-2
@@ -29,8 +29,9 @@
|
||||
"esprima": "^4.0.1",
|
||||
"fastestsmallesttextencoderdecoder": "^1.0.22",
|
||||
"fontfaceonload": "^1.0.2",
|
||||
"google-closure-compiler-java": "^20220202.0.0",
|
||||
"google-closure-library": "^20220104.0.0",
|
||||
"google-closure-compiler-java": "^20220301.0.0",
|
||||
"google-closure-deps": "^20220301.0.0",
|
||||
"google-closure-library": "^20220301.0.0",
|
||||
"htmlhint": "github:joeyparrish/HTMLHint#1c3a7e8b",
|
||||
"jasmine-ajax": "^4.0.0",
|
||||
"jimp": "^0.16.1",
|
||||
|
||||
Reference in New Issue
Block a user