Brian O'Connor

Adding maven coords to OAR and onos features.xml genrules

Change-Id: Id2d3b0f4686888a48feb09eacef3f27136c1df0e
......@@ -71,6 +71,7 @@ FEATURES_FOOTER = '</features>'
def compile_features(
name,
features = [],
maven_coords = None,
visibility = [ 'PUBLIC' ],
):
......@@ -83,6 +84,7 @@ def compile_features(
bash = cmd,
visibility = visibility,
out = 'features.xml',
maven_coords = maven_coords,
)
......@@ -137,6 +139,8 @@ def onos_app(
if app_name is None:
app_name = _get_app_name()
maven_coords = '%s:%s:oar:%s' % ( ONOS_GROUP_ID, name, ONOS_VERSION )
if title is None:
print "Missing title for %s" % _get_name()
title = _get_app_name()
......@@ -201,5 +205,6 @@ def onos_app(
name = name + '-oar',
out = 'app.oar',
bash = '$(exe //buck-tools:onos-app-oar) $OUT ' + ' '.join(sources),
maven_coords = maven_coords,
visibility = visibility,
)
......
......@@ -29,6 +29,7 @@ genrule(
compile_features(
name = 'onos-features',
features = FEATURES,
maven_coords = 'org.onosproject:onos-features:xml:features:' + ONOS_VERSION,
)
staged_repos = ['$(location %s-repo)' % f for f in FEATURES]
......@@ -42,7 +43,7 @@ genrule(
name = 'onos-package',
srcs = glob(['bin/*', 'etc/*', 'init/*', 'config/*']),
out = 'onos.tar.gz',
bash = '$(exe //buck-tools:onos-stage) $OUT $(location :onos-karaf) ' + ' '.join(sources),
bash = '$(exe //buck-tools:onos-stage) $OUT ' + ONOS_VERSION + ' $(location :onos-karaf) ' + ' '.join(sources),
visibility = [ 'PUBLIC' ],
)
......