Using $(maven_coords :target) marco
Note: This this macro is not yet available on buck master
Also, simplifying app/fwd buck file and improving onos_app
readability by using feature_coords instead of feature_name
Change-Id: I9aff07d66331a537f6711bf15fd760cf910f1afc
diff --git a/apps/dhcp/BUCK b/apps/dhcp/BUCK
index 5c811d8..4affce2 100644
--- a/apps/dhcp/BUCK
+++ b/apps/dhcp/BUCK
@@ -1,12 +1,11 @@
-
BUNDLES = [
- ('//apps/dhcp/api:onos-app-dhcp-api', ONOS_GROUP_ID + ':' + 'onos-app-dhcp-api' + ':' + ONOS_VERSION),
- ('//apps/dhcp/app:onos-app-dhcp-app', ONOS_GROUP_ID + ':' + 'onos-app-dhcp-app' + ':' + ONOS_VERSION),
+ '//apps/dhcp/api:onos-app-dhcp-api',
+ '//apps/dhcp/app:onos-app-dhcp-app',
]
onos_app(
app_name = 'org.onosproject.dhcp',
- feature_name = ONOS_GROUP_ID + ':onos-app-dhcp:' + ONOS_VERSION,
+ feature_coords = ONOS_GROUP_ID + ':onos-app-dhcp:' + ONOS_VERSION,
title = 'DHCP Server App',
category = 'Utility',
url = 'http://onosproject.org',
diff --git a/apps/fwd/BUCK b/apps/fwd/BUCK
index 1e49af9..9cb77c4 100644
--- a/apps/fwd/BUCK
+++ b/apps/fwd/BUCK
@@ -1,6 +1,3 @@
-SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/test/java/org/onosproject/**/'
-
CURRENT_NAME = 'onos-app-fwd'
CURRENT_TARGET = ':' + CURRENT_NAME
@@ -18,27 +15,16 @@
name = CURRENT_NAME,
srcs = glob([SRC + '/*.java']),
deps = COMPILE_DEPS,
+ test_srcs = glob([TEST + '/*.java']),
+ test_deps = TEST_DEPS,
visibility = ['PUBLIC'],
)
-java_test(
- name = 'tests',
- srcs = glob([TEST + '/*.java']),
- deps = COMPILE_DEPS +
- TEST_DEPS +
- [CURRENT_TARGET],
- source_under_test = [CURRENT_TARGET],
-)
-
-BUNDLES = [
- (CURRENT_TARGET, ONOS_GROUP_ID + ':' + CURRENT_NAME + ':' + ONOS_VERSION),
-]
-
onos_app(
app_name = 'org.onosproject.fwd',
title = 'Reactive Forwarding App',
category = 'Traffic Steering',
url = 'http://onosproject.org',
description = 'Reactive forwarding application using flow subsystem.',
- included_bundles = BUNDLES,
+ included_bundles = [ CURRENT_TARGET ],
)
\ No newline at end of file