install-apps: replacing ndn-cpp-dev with ndn-cxx
Change-Id: Ie56b1ce3817ff60d186af52edda8848002a59c62
refs: #1537
diff --git a/install_apps.py b/install_apps.py
index c2c0edc..1af7a8b 100755
--- a/install_apps.py
+++ b/install_apps.py
@@ -11,7 +11,7 @@
print " Latest source codes will be downloaded from their GitHub"
print " named-data repositories (https://github.com/named-data)"
print "\nOPTIONS:"
- print " install_ndncppdev - install ndn-cpp-dev (named-data/ndn-cpp-dev)"
+ print " install_ndncxx - install ndn-cxx (named-data/ndn-cxx)"
print " setup_security - create an identity using ndnsec (/tmp/nfd_integration)"
print " install_NFD - install NFD (named-data/NFD)"
print " install_ndntraffic - install ndn-traffic-generator (named-data/ndn-traffic-generator)"
@@ -26,7 +26,7 @@
inspect.getfile(inspect.currentframe()))[0], "install_helpers")))
if cmd_subfolder not in sys.path:
sys.path.insert(0, cmd_subfolder)
- validOptions = [ "install_ndncppdev",
+ validOptions = [ "install_ndncxx",
"setup_security",
"install_NFD",
"install_ndntraffic",
@@ -44,7 +44,7 @@
break
if optionsStatus == 0 and "help" not in actionList:
if "install_all" in actionList:
- actionList.add("install_ndncppdev")
+ actionList.add("install_ndncxx")
actionList.add("setup_security")
actionList.add("install_NFD")
actionList.add("install_ndntraffic")
@@ -53,8 +53,8 @@
module.run()
module = __import__("install_dependencies")
module.run()
- if "install_ndncppdev" in actionList:
- module = __import__("install_ndncppdev")
+ if "install_ndncxx" in actionList:
+ module = __import__("install_ndncxx")
module.run()
if "setup_security" in actionList:
module = __import__("setup_security")
diff --git a/install_helpers/install_ndncppdev.py b/install_helpers/install_ndncxx.py
similarity index 74%
rename from install_helpers/install_ndncppdev.py
rename to install_helpers/install_ndncxx.py
index 89c7610..87ef0ff 100644
--- a/install_helpers/install_ndncppdev.py
+++ b/install_helpers/install_ndncxx.py
@@ -3,10 +3,10 @@
# Install ndn-cpp-dev
def run():
- print "\nINSTALLING ndn-cpp-dev"
+ print "\nINSTALLING ndn-cxx"
print "**********************"
- os.system("git clone https://github.com/named-data/ndn-cpp-dev --depth 1")
- os.chdir("ndn-cpp-dev")
+ os.system("git clone https://github.com/named-data/ndn-cxx --depth 1")
+ os.chdir("ndn-cxx")
os.system("./waf distclean")
os.system("./waf configure")
os.system("./waf -j1")