diff options
| author | Dariusz Luksza <dariusz@luksza.org> | 2014-04-30 13:01:19 +0200 |
|---|---|---|
| committer | Dariusz Luksza <dariusz@luksza.org> | 2014-05-01 01:32:15 +0200 |
| commit | 3ffc86a6a0c7b5ae23bb277806275cea6f043015 (patch) | |
| tree | 33e0a26a29e56d075a3b0b10933789599c9fc360 | |
| parent | 5cca35c3650966b4cecfb0beab69477592a3774d (diff) | |
Include gerrit.war in api_{install,deploy}
This patch adds gerrit.war into api_{install,deploy} buck build step.
This allows third party maven based builds depend on gerrit.war
artifact.
Change-Id: I22c8d3339a1647913967e423e45462c2c5c255de
Signed-off-by: Dariusz Luksza <dariusz@luksza.org>
| -rw-r--r-- | BUCK | 2 | ||||
| -rw-r--r-- | Documentation/dev-buck.txt | 4 | ||||
| -rw-r--r-- | tools/build.defs | 3 | ||||
| -rw-r--r-- | tools/maven/BUCK | 1 | ||||
| -rw-r--r-- | tools/maven/package.defs | 5 |
5 files changed, 9 insertions, 6 deletions
@@ -4,7 +4,7 @@ gerrit_war(name = 'gerrit') gerrit_war(name = 'chrome', ui = 'ui_chrome') gerrit_war(name = 'firefox', ui = 'ui_firefox') gerrit_war(name = 'withdocs', context = DOCS) -gerrit_war(name = 'release', context = DOCS + ['//plugins:core.zip']) +gerrit_war(name = 'release', context = DOCS + ['//plugins:core.zip'], visibility = ['//tools/maven:']) API_DEPS = [ ':extension-api', diff --git a/Documentation/dev-buck.txt b/Documentation/dev-buck.txt index 9c993a8e2d..899153c1c2 100644 --- a/Documentation/dev-buck.txt +++ b/Documentation/dev-buck.txt @@ -142,13 +142,13 @@ The output JAR files will be placed in: buck-out/gen/{extension,plugin}-api.jar ---- -Install {extension,plugin}-api to the local maven repository: +Install {extension,plugin}-api and gerrit.war to the local maven repository: ---- buck build api_install ---- -Deploy {extension,plugin}-api to the remote maven repository +Deploy {extension,plugin}-api and gerrit.war to the remote maven repository ---- buck build api_deploy diff --git a/tools/build.defs b/tools/build.defs index b62c850451..21191cfede 100644 --- a/tools/build.defs +++ b/tools/build.defs @@ -67,7 +67,7 @@ def war( visibility = visibility, ) -def gerrit_war(name, ui = 'ui_optdbg', context = []): +def gerrit_war(name, ui = 'ui_optdbg', context = [], visibility = []): war( name = name, libs = LIBS + ['//gerrit-war:version'], @@ -77,4 +77,5 @@ def gerrit_war(name, ui = 'ui_optdbg', context = []): '//gerrit-war:webapp_assets.zip', '//gerrit-gwtui:' + ui + '.zip', ] + context, + visibility = visibility, ) diff --git a/tools/maven/BUCK b/tools/maven/BUCK index 2553d03cf3..ca38e45a88 100644 --- a/tools/maven/BUCK +++ b/tools/maven/BUCK @@ -17,6 +17,7 @@ maven_package( 'gerrit-plugin-api': '//:plugin-api-src', 'gerrit-plugin-gwtui': '//:plugin-gwtui-src', }, + war = {'gerrit-war': '//:release'}, ) python_binary( diff --git a/tools/maven/package.defs b/tools/maven/package.defs index 7306031b7f..7fd227a875 100644 --- a/tools/maven/package.defs +++ b/tools/maven/package.defs @@ -17,11 +17,12 @@ def maven_package( repository = None, url = None, jar = {}, - src = {}): + src = {}, + war = {}): cmd = ['$(exe //tools/maven:mvn)', '-v', version, '-o', '$OUT'] dep = [] - for type,d in [('jar', jar), ('java-source', src)]: + for type,d in [('jar', jar), ('java-source', src), ('war', war)]: for a,t in d.iteritems(): cmd.append('-s %s:%s:$(location %s)' % (a,type,t)) dep.append(t) |