Merge "changed the scons aliases to easily rememberable contrail serv…

…ice names"
Juniper · Aug 24, 2015 · 892fa13 · 892fa13
2 parents a4557a7 + 922f61d
commit 892fa13
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 6 deletions.
diff --git a/src/analytics/SConscript b/src/analytics/SConscript
@@ -177,7 +177,7 @@ vizd = AnalyticsEnv.Program(target = 'vizd',
         syslog_collector_obj,
         parser_util_obj,
         ])
-AnalyticsEnv.Alias('src/analytics:vizd', vizd)
+AnalyticsEnv.Alias('contrail-collector', vizd)
 AnalyticsEnv.Default(vizd)
 
 AnalyticsEnv.Requires(OpServerProxy_obj, '#/build/include/rapidjson')

diff --git a/src/analytics/database/SConscript b/src/analytics/database/SConscript
@@ -37,5 +37,6 @@ DatabaseEnv.Default(sdist_gen)
 
 DatabaseEnv.Alias("database:node_mgr", sdist_gen)
 DatabaseEnv.Alias("src/analytics/database:database", sdist_gen)
+DatabaseEnv.Alias("contrail-database", sdist_gen)
 
 DatabaseEnv['DATABASE_PKG'] = sdist_gen
diff --git a/src/control-node/SConscript b/src/control-node/SConscript
@@ -215,6 +215,7 @@ env.Depends(ctrlnode, lib_rtarget)
 env.Depends(ctrlnode, lib_ifmap_server)
 
 env.Alias('control-node', ctrlnode)
+env.Alias('contrail-control', ctrlnode)
 
 env.SConscript('test/SConscript', exports='BuildEnv', duplicate = 0)
 

diff --git a/src/discovery/SConscript b/src/discovery/SConscript
@@ -76,6 +76,7 @@ env.Depends(local_sources_rules, autogen_infra_sources)
 # install everything before building distribution
 env.Depends(sdist_gen, sdist_depends)
 env.Alias('src/discovery:discovery', sdist_gen)
+env.Alias('contrail-discovery', sdist_gen)
 
 if 'install' in BUILD_TARGETS:
     install_cmd = env.Command(None, 'setup.py',

diff --git a/src/dns/SConscript b/src/dns/SConscript
@@ -45,7 +45,7 @@ if sys.platform != 'darwin':
                       '-Wl,--no-whole-archive'])
 
 contrail_dns = env.Program(target = 'contrail-dns', source = ['main.cc'])
-env.Alias('src/dns:contrail-dns', contrail_dns)
+env.Alias('contrail-dns', contrail_dns)
 env.Default(contrail_dns)
 
 # Please update sandesh/common/vns.sandesh on process name change

diff --git a/src/libpartition/SConscript b/src/libpartition/SConscript
@@ -48,4 +48,4 @@ PartEnv['LIBPARTITION_PKG'] = sdist_gen
 #PartEnv.SConscript('docs/SConscript', exports='PartEnv', duplicate = 0)
 
 PartEnv.Default(sdist_gen)
-PartEnv.Alias("src/libpartition:libpartition", sdist_gen)
+PartEnv.Alias("contrail:libpartition", sdist_gen)
diff --git a/src/nodemgr/SConscript b/src/nodemgr/SConscript
@@ -94,3 +94,4 @@ OpEnv.Depends(sdist_gen, sdist_depends)
 OpEnv.Default(sdist_gen)
 
 OpEnv.Alias("src:nodemgr", sdist_gen)
+OpEnv.Alias("contrail-nodemgr", sdist_gen)
diff --git a/src/opserver/SConscript b/src/opserver/SConscript
@@ -93,7 +93,7 @@ OpEnv.SConscript('plugins/alarm_vrouter_interface/SConscript', exports='OpEnv',
 OpEnv.SConscript('docs/SConscript', exports='OpEnv', duplicate = 0)
 
 OpEnv.Default(sdist_gen)
-OpEnv.Alias("src/opserver:opserver", sdist_gen)
+OpEnv.Alias("contrail-analytics-api", sdist_gen)
 
 OpEnv.SConscript('node_mgr/SConscript', exports='BuildEnv', duplicate = 0)
 OpEnv.Alias('install', OpEnv.Install(

diff --git a/src/query_engine/SConscript b/src/query_engine/SConscript
@@ -164,7 +164,7 @@ qedt = env.UnitTest(
         ['../analytics/vizd_table_desc.o', rac,
         '../analytics/viz_constants.o'])
 
-env.Alias("src/query_engine:qed", qed)
+env.Alias("contrail-query-engine", qed)
 env.Alias("src/query_engine:qedt", qedt)
 
 env.Depends(qed, '#/build/include/hiredis/hiredis.h')

diff --git a/src/vnsw/agent/contrail/SConscript b/src/vnsw/agent/contrail/SConscript
@@ -108,7 +108,7 @@ contrail_vrouter_agent = env.Program(target = 'contrail-vrouter-agent',
                                'pkt0_interface_base.cc',
                                 platform_dependent])
 
-env.Alias('agent:contrail-vrouter-agent', contrail_vrouter_agent)
+env.Alias('contrail-vrouter-agent', contrail_vrouter_agent)
 env.Default(contrail_vrouter_agent)
 
 # Please update sandesh/common/vns.sandesh on process name change