opendev/gerrit
Code Issues Proposed changes

Bazel: Disambiguate codemirror-minified repository

Browse Source 
This repository is used twice: for GWT and for PG toolchains, under
different names:

* codemirror_minified for GWT
* codemirror-minified for PG

In I1e75690fe1 the external repository names were harmonized, but
renaming of codemirror_minified to codemirror-minified was undone
to avoid collision between the two external repositories.

Make them unique and rename codemirror_minified to
codemirror-minified-gwt to avoid collision.

Change-Id: I14c2f319d0ca451dea9424af9f5080d89dc704ad
This commit is contained in:
David Ostrovsky 2018-06-13 09:01:19 +02:00 committed by David Ostrovsky
parent c56eecab90
commit d2f001b0c4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
WORKSPACE
View File

@ -860,13 +860,13 @@ maven_jar(
)
maven_jar(
name = "codemirror_minified",
name = "codemirror-minified-gwt",
artifact = "org.webjars.npm:codemirror-minified:" + CM_VERSION,
sha1 = "36558ea3b8e30782e1e09c0e7bd781e09614f139",
)
maven_jar(
name = "codemirror_original",
name = "codemirror-original-gwt",
artifact = "org.webjars.npm:codemirror:" + CM_VERSION,
sha1 = "f1f8fbbc3e2d224fdccc43d2f4180658a92320f9",
)

4
lib/codemirror/cm.bzl
View File

@ -235,8 +235,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-gwt//jar', '', TOP, LICENSE),
('@codemirror-minified-gwt//jar', '_r', TOP_MINIFIED, LICENSE_MINIFIED)
]:
# Main JavaScript and addons
genrule2(