From ab879c207a4fafa4d23f06cdd5d82a937db7e60a Mon Sep 17 00:00:00 2001 From: Alina Quereilhac Date: Thu, 29 Mar 2012 17:10:19 +0200 Subject: [PATCH] ns-3 build structure changed. There is no longer a build/release directory. Needed to patch planetlab/application.py to reflect this. --- src/nepi/testbeds/planetlab/application.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/nepi/testbeds/planetlab/application.py b/src/nepi/testbeds/planetlab/application.py index a74dd4ba..450d2679 100644 --- a/src/nepi/testbeds/planetlab/application.py +++ b/src/nepi/testbeds/planetlab/application.py @@ -897,7 +897,9 @@ class NS3Dependency(Dependency): def __init__(self, api = None): super(NS3Dependency, self).__init__(api) - self.buildDepends = 'make waf gcc gcc-c++ gccxml unzip bzr' + self.depends = 'bzr' + + self.buildDepends = 'make waf gcc gcc-c++ gccxml unzip' # We have to download the sources, untar, build... pygccxml_source_url = "http://leaseweb.dl.sourceforge.net/project/pygccxml/pygccxml/pygccxml-1.0/pygccxml-1.0.0.zip" @@ -960,8 +962,8 @@ class NS3Dependency(Dependency): "./waf &&" "./waf install && " "rm -f ${BUILD}/target/lib/*.so && " - "cp -a ${BUILD}/ns3-src/build/release/libns3*.so ${BUILD}/target/lib && " - "cp -a ${BUILD}/ns3-src/build/release/bindings/python/ns ${BUILD}/target/lib &&" + "cp -a ${BUILD}/ns3-src/build/libns3*.so ${BUILD}/target/lib && " + "cp -a ${BUILD}/ns3-src/build/bindings/python/ns ${BUILD}/target/lib &&" "./waf clean " " )" % dict( -- 2.47.0