opendev/gerrit
Code Issues Proposed changes

Bazel: Harmonize names of external repositories

Browse Source 
Recent Bazel versions support dash character in external repository
names. Consistently use them with one exception: javax_inject. This is
needed to match the name in the rules_closure.

Change-Id: I1e75690fe1ee2ab32fffe07c0c30dbed84753960
This commit is contained in:
David Ostrovsky
2018-06-08 09:16:50 +02:00
committed by David Pursehouse
parent 38cb32d7b7
commit f98a60b35f
38 changed files with 204 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/codemirror/BUILD
View File

@@ -5,7 +5,7 @@ load("//lib/codemirror:cm.bzl", "pkg_cm")
java_library(
name = "diff-match-patch",
data = ["//lib:LICENSE-Apache2.0"],
runtime_deps = ["@diff_match_patch//jar"],
runtime_deps = ["@diff-match-patch//jar"],
)
pkg_cm()

8
lib/codemirror/cm.bzl
View File

@@ -231,8 +231,8 @@ DIFF_MATCH_PATCH_TOP = ("META-INF/resources/webjars/google-diff-match-patch/%s"
def pkg_cm():
for archive, suffix, top, license in [
('@codemirror_original//jar', '', TOP, LICENSE),
('@codemirror_minified//jar', '_r', TOP_MINIFIED, LICENSE_MINIFIED)
('@codemirror-original//jar', '', TOP, LICENSE),
('@codemirror-minified//jar', '_r', TOP_MINIFIED, LICENSE_MINIFIED)
]:
# Main JavaScript and addons
genrule2(
@@ -306,13 +306,13 @@ def pkg_cm():
"echo '/** @license' >>$@",
"echo 'LICENSE-Apache2.0' >>$@",
"echo '*/' >>$@",
'unzip -p $(location @diff_match_patch//jar) %s/diff_match_patch.js >>$@' % DIFF_MATCH_PATCH_TOP,
'unzip -p $(location @diff-match-patch//jar) %s/diff_match_patch.js >>$@' % DIFF_MATCH_PATCH_TOP,
"echo ';' >> $@",
'unzip -p $(location %s) %s/addon/merge/merge.js >>$@' % (archive, top)
]
),
tools = [
'@diff_match_patch//jar',
'@diff-match-patch//jar',
# dependency just for license tracking.
':diff-match-patch',
archive,