Brian O'Connor

Adding maven coords to OAR and onos features.xml genrules

Change-Id: Id2d3b0f4686888a48feb09eacef3f27136c1df0e
...@@ -71,6 +71,7 @@ FEATURES_FOOTER = '</features>' ...@@ -71,6 +71,7 @@ FEATURES_FOOTER = '</features>'
71 def compile_features( 71 def compile_features(
72 name, 72 name,
73 features = [], 73 features = [],
74 + maven_coords = None,
74 visibility = [ 'PUBLIC' ], 75 visibility = [ 'PUBLIC' ],
75 ): 76 ):
76 77
...@@ -83,6 +84,7 @@ def compile_features( ...@@ -83,6 +84,7 @@ def compile_features(
83 bash = cmd, 84 bash = cmd,
84 visibility = visibility, 85 visibility = visibility,
85 out = 'features.xml', 86 out = 'features.xml',
87 + maven_coords = maven_coords,
86 ) 88 )
87 89
88 90
...@@ -137,6 +139,8 @@ def onos_app( ...@@ -137,6 +139,8 @@ def onos_app(
137 if app_name is None: 139 if app_name is None:
138 app_name = _get_app_name() 140 app_name = _get_app_name()
139 141
142 + maven_coords = '%s:%s:oar:%s' % ( ONOS_GROUP_ID, name, ONOS_VERSION )
143 +
140 if title is None: 144 if title is None:
141 print "Missing title for %s" % _get_name() 145 print "Missing title for %s" % _get_name()
142 title = _get_app_name() 146 title = _get_app_name()
...@@ -201,5 +205,6 @@ def onos_app( ...@@ -201,5 +205,6 @@ def onos_app(
201 name = name + '-oar', 205 name = name + '-oar',
202 out = 'app.oar', 206 out = 'app.oar',
203 bash = '$(exe //buck-tools:onos-app-oar) $OUT ' + ' '.join(sources), 207 bash = '$(exe //buck-tools:onos-app-oar) $OUT ' + ' '.join(sources),
208 + maven_coords = maven_coords,
204 visibility = visibility, 209 visibility = visibility,
205 ) 210 )
......
...@@ -29,6 +29,7 @@ genrule( ...@@ -29,6 +29,7 @@ genrule(
29 compile_features( 29 compile_features(
30 name = 'onos-features', 30 name = 'onos-features',
31 features = FEATURES, 31 features = FEATURES,
32 + maven_coords = 'org.onosproject:onos-features:xml:features:' + ONOS_VERSION,
32 ) 33 )
33 34
34 staged_repos = ['$(location %s-repo)' % f for f in FEATURES] 35 staged_repos = ['$(location %s-repo)' % f for f in FEATURES]
...@@ -42,7 +43,7 @@ genrule( ...@@ -42,7 +43,7 @@ genrule(
42 name = 'onos-package', 43 name = 'onos-package',
43 srcs = glob(['bin/*', 'etc/*', 'init/*', 'config/*']), 44 srcs = glob(['bin/*', 'etc/*', 'init/*', 'config/*']),
44 out = 'onos.tar.gz', 45 out = 'onos.tar.gz',
45 - bash = '$(exe //buck-tools:onos-stage) $OUT $(location :onos-karaf) ' + ' '.join(sources), 46 + bash = '$(exe //buck-tools:onos-stage) $OUT ' + ONOS_VERSION + ' $(location :onos-karaf) ' + ' '.join(sources),
46 visibility = [ 'PUBLIC' ], 47 visibility = [ 'PUBLIC' ],
47 ) 48 )
48 49
......