Merge changes from topic 'codemirror-obfuscation'
* changes: Use a pre-built minified CodeMirror in the release build Buck: Turn off Codemirror obfuscation in non release build
This commit is contained in:
@@ -19,25 +19,29 @@ gwt_user_agent_permutations(
|
||||
visibility = ['//:'],
|
||||
)
|
||||
|
||||
gwt_module(
|
||||
name = 'ui_module',
|
||||
srcs = glob(['src/main/java/**/*.java']),
|
||||
gwt_xml = 'src/main/java/%s.gwt.xml' % MODULE.replace('.', '/'),
|
||||
resources = glob(['src/main/java/**/*']),
|
||||
deps = [
|
||||
':silk_icons',
|
||||
'//gerrit-gwtui-common:diffy_logo',
|
||||
'//gerrit-gwtui-common:client',
|
||||
'//gerrit-gwtexpui:CSS',
|
||||
'//lib/codemirror:codemirror',
|
||||
'//lib/gwt:user',
|
||||
],
|
||||
visibility = [
|
||||
'//tools/eclipse:classpath',
|
||||
'//Documentation:licenses.txt',
|
||||
'//Documentation:js_licenses.txt',
|
||||
],
|
||||
)
|
||||
def gen_ui_module(name, suffix = ""):
|
||||
gwt_module(
|
||||
name = name + suffix,
|
||||
srcs = glob(['src/main/java/**/*.java']),
|
||||
gwt_xml = 'src/main/java/%s.gwt.xml' % MODULE.replace('.', '/'),
|
||||
resources = glob(['src/main/java/**/*']),
|
||||
deps = [
|
||||
':silk_icons',
|
||||
'//gerrit-gwtui-common:diffy_logo',
|
||||
'//gerrit-gwtui-common:client',
|
||||
'//gerrit-gwtexpui:CSS',
|
||||
'//lib/codemirror:codemirror' + suffix,
|
||||
'//lib/gwt:user',
|
||||
],
|
||||
visibility = [
|
||||
'//tools/eclipse:classpath',
|
||||
'//Documentation:licenses.txt',
|
||||
'//Documentation:js_licenses.txt',
|
||||
],
|
||||
)
|
||||
|
||||
gen_ui_module(name = 'ui_module')
|
||||
gen_ui_module(name = 'ui_module', suffix = '_r')
|
||||
|
||||
java_library(
|
||||
name = 'silk_icons',
|
||||
|
@@ -32,6 +32,7 @@ def gwt_genrule(module, deps, suffix = ""):
|
||||
dbg = 'ui_dbg' + suffix
|
||||
opt = 'ui_opt' + suffix
|
||||
soyc = 'ui_soyc' + suffix
|
||||
module_dep = ':ui_module' + suffix
|
||||
args = GWT_COMPILER_ARGS_RELEASE_MODE if suffix == "_r" else GWT_COMPILER_ARGS
|
||||
|
||||
genrule(
|
||||
@@ -51,7 +52,7 @@ def gwt_genrule(module, deps, suffix = ""):
|
||||
gwt_binary(
|
||||
name = opt,
|
||||
modules = [module],
|
||||
module_deps = [':ui_module'],
|
||||
module_deps = [module_dep],
|
||||
deps = deps + ([':' + dbg] if CPU_COUNT < 8 else []),
|
||||
local_workers = CPU_COUNT,
|
||||
strict = True,
|
||||
@@ -64,7 +65,7 @@ def gwt_genrule(module, deps, suffix = ""):
|
||||
modules = [module],
|
||||
style = 'PRETTY',
|
||||
optimize = 0,
|
||||
module_deps = [':ui_module'],
|
||||
module_deps = [module_dep],
|
||||
deps = deps,
|
||||
local_workers = CPU_COUNT,
|
||||
strict = True,
|
||||
@@ -76,7 +77,7 @@ def gwt_genrule(module, deps, suffix = ""):
|
||||
gwt_binary(
|
||||
name = soyc,
|
||||
modules = [module],
|
||||
module_deps = [':ui_module'],
|
||||
module_deps = [module_dep],
|
||||
deps = deps + [':' + dbg],
|
||||
local_workers = CPU_COUNT,
|
||||
strict = True,
|
||||
|
Reference in New Issue
Block a user