cargdev/angular
1
0
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects Releases Wiki Activity

build: don't use deprecated $(location) pre-declared variable (#36308)

Browse Source 
$(location) is not recommended in the bazel docs as depending on context it will either return the value of $(execpath) or $(rootpath). rules_nodejs now supports $(rootpath) and $(execpath) in templated_args of nodejs_binary.

PR Close #36308
This commit is contained in:
Greg Magolan
2020-03-29 13:29:50 -07:00
committed by Alex Rickabaugh
parent 61e5ab4703
commit c58e6ba13a
8 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/symbol-extractor/cli.ts
View File

@ -9,6 +9,8 @@
import * as fs from 'fs';
import {SymbolExtractor} from './symbol_extractor';
const runfiles = require(process.env['BAZEL_NODE_RUNFILES_HELPER'] as string);
if (require.main === module) {
const args = process.argv.slice(2) as[string, string];
process.exitCode = main(args) ? 0 : 1;
@ -22,8 +24,8 @@ if (require.main === module) {
* ```
*/
function main(argv: [string, string, string] | [string, string]): boolean {
const javascriptFilePath = require.resolve(argv[0]);
const goldenFilePath = require.resolve(argv[1]);
const javascriptFilePath = runfiles.resolveWorkspaceRelative(argv[0]);
const goldenFilePath = runfiles.resolveWorkspaceRelative(argv[1]);
const doUpdate = argv[2] == '--accept';
const javascriptContent = fs.readFileSync(javascriptFilePath).toString();

4
tools/symbol-extractor/index.bzl
View File

@ -24,7 +24,7 @@ def js_expected_symbol_test(name, src, golden, data = [], **kwargs):
name = name,
data = all_data,
entry_point = entry_point,
templated_args = ["$(location %s)" % src, "$(location %s)" % golden],
templated_args = ["$(rootpath %s)" % src, "$(rootpath %s)" % golden],
configuration_env_vars = ["angular_ivy_enabled"],
**kwargs
)
@ -35,6 +35,6 @@ def js_expected_symbol_test(name, src, golden, data = [], **kwargs):
data = all_data,
entry_point = entry_point,
configuration_env_vars = ["angular_ivy_enabled"],
templated_args = ["$(location %s)" % src, "$(location %s)" % golden, "--accept"],
templated_args = ["$(rootpath %s)" % src, "$(rootpath %s)" % golden, "--accept"],
**kwargs
)