commit 59094fc677f8035a9554f876fec70869709928f2
author Eric Newberry <enewberry@cs.arizona.edu> Thu Nov 02 00:41:32 2017 -0700
committer Eric Newberry <enewberry@cs.arizona.edu> Mon Nov 20 00:32:42 2017 -0700
tree ad9c20f0fcd76ade2a48dabadf726fd37f96f565
parent 3d5b55d4da40ac63327fb9b2944f473c7c0e8f57

increase RAM and CPU cores for Vagrant template

reduce RAM for Vagrant VMs used to run tests

build packages with multiple threads

refs #4382

Change-Id: I30ad59a6e705bafa60f5680f725b528bac5f9833

install_helpers/install_NFD.py

diff --git a/install_helpers/install_NFD.py b/install_helpers/install_NFD.py
index 830644d..748af57 100644
--- a/install_helpers/install_NFD.py
+++ b/install_helpers/install_NFD.py
@@ -7,10 +7,9 @@
     print "**************"
     os.system("git clone --depth 1 https://github.com/named-data/NFD")
     os.chdir("NFD")
-    os.system("./waf distclean")
     os.system("git submodule init && git submodule update")
     os.system("./waf configure")
-    os.system("./waf -j1")
+    os.system("./waf")
     os.system("sudo ./waf install")
     os.system("sudo cp /usr/local/etc/ndn/nfd.conf.sample /usr/local/etc/ndn/nfd.conf")
     os.system("sudo mkdir /usr/local/etc/ndn/keys/")

install_helpers/install_ndncxx.py

diff --git a/install_helpers/install_ndncxx.py b/install_helpers/install_ndncxx.py
index 54fac0d..74495f5 100644
--- a/install_helpers/install_ndncxx.py
+++ b/install_helpers/install_ndncxx.py
@@ -7,9 +7,8 @@
     print "**********************"
     os.system("git clone --depth 1 https://github.com/named-data/ndn-cxx")
     os.chdir("ndn-cxx")
-    os.system("./waf distclean")
     os.system("./waf configure")
-    os.system("./waf -j1")
+    os.system("./waf")
     os.system("sudo ./waf install")
     os.system("mkdir -p ~/.ndn")
     os.system("sudo ldconfig")

install_helpers/install_ndntools.py

diff --git a/install_helpers/install_ndntools.py b/install_helpers/install_ndntools.py
index 9147a2b..d4d0b92 100644
--- a/install_helpers/install_ndntools.py
+++ b/install_helpers/install_ndntools.py
@@ -7,8 +7,7 @@
     print "***********************"
     os.system("git clone --depth 1 https://github.com/named-data/ndn-tools")
     os.chdir("ndn-tools")
-    os.system("./waf distclean")
     os.system("./waf configure")
-    os.system("./waf -j1")
+    os.system("./waf")
     os.system("sudo ./waf install")
     os.chdir("..")

install_helpers/install_ndntraffic.py

diff --git a/install_helpers/install_ndntraffic.py b/install_helpers/install_ndntraffic.py
index 0969f15..f8e85ab 100644
--- a/install_helpers/install_ndntraffic.py
+++ b/install_helpers/install_ndntraffic.py
@@ -7,8 +7,7 @@
     print "********************************"
     os.system("git clone --depth 1 https://github.com/named-data/ndn-traffic-generator")
     os.chdir("ndn-traffic-generator")
-    os.system("./waf distclean")
     os.system("./waf configure")
-    os.system("./waf -j1")
+    os.system("./waf")
     os.system("sudo ./waf install")
     os.chdir("..")

install_helpers/install_repo.py

diff --git a/install_helpers/install_repo.py b/install_helpers/install_repo.py
index 1307724..8748274 100644
--- a/install_helpers/install_repo.py
+++ b/install_helpers/install_repo.py
@@ -1,14 +1,13 @@
 #!/usr/bin/python2
 import os
 
-# Install ndn-tlv-ping
+# Install repo-ng
 def run():
     print "\nINSTALLING repo-ng"
     print "***********************"
     os.system("git clone --depth 1 https://github.com/named-data/repo-ng")
     os.chdir("repo-ng")
-    os.system("./waf distclean")
     os.system("./waf configure")
-    os.system("./waf -j1")
+    os.system("./waf")
     os.system("sudo ./waf install")
     os.chdir("..")