git://git.onelab.eu / nepi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 06350b6)
Removing ns-3 build before rebuilding
authorAlina Quereilhac <alina.quereilhac@inria.fr>
Thu, 29 May 2014 17:21:52 +0000 (19:21 +0200)
committerAlina Quereilhac <alina.quereilhac@inria.fr>
Thu, 29 May 2014 17:21:52 +0000 (19:21 +0200)
src/nepi/resources/linux/ns3/ns3simulation.py patch | blob | history

diff --git a/src/nepi/resources/linux/ns3/ns3simulation.py b/src/nepi/resources/linux/ns3/ns3simulation.py
index a52530f..0080846 100644 (file)
--- a/src/nepi/resources/linux/ns3/ns3simulation.py
+++ b/src/nepi/resources/linux/ns3/ns3simulation.py
@@ -485,6 +485,7 @@ class LinuxNS3Simulation(LinuxApplication, NS3Simulation):
                         " (   "
                          # If not, copy ns-3 build to bin
                         "  cd ${SRC}/dce/ns-3-dce && "
                         " (   "
                          # If not, copy ns-3 build to bin
                         "  cd ${SRC}/dce/ns-3-dce && "
+                        "  rm -rf ${SRC}/dce/ns-3-dce/build && "
                         "  ./waf configure %(enable_opt)s --with-pybindgen=${SRC}/pybindgen/%(pybindgen_version)s "
                         "  --prefix=%(ns3_build_home)s --with-ns3=%(ns3_build_home)s && "
                         "  ./waf build && "
                         "  ./waf configure %(enable_opt)s --with-pybindgen=${SRC}/pybindgen/%(pybindgen_version)s "
                         "  --prefix=%(ns3_build_home)s --with-ns3=%(ns3_build_home)s && "
                         "  ./waf build && "
@@ -512,6 +513,7 @@ class LinuxNS3Simulation(LinuxApplication, NS3Simulation):
                  # If not, copy ns-3 build to bin
                 "  mkdir -p %(ns3_build_home)s && "
                 "  cd ${SRC}/ns-3/%(ns3_version)s && "
                  # If not, copy ns-3 build to bin
                 "  mkdir -p %(ns3_build_home)s && "
                 "  cd ${SRC}/ns-3/%(ns3_version)s && "
+                "  rm -rf ${SRC}/ns-3/%(ns3_version)s/build && "
                 "  ./waf configure -d %(build_mode)s --with-pybindgen=${SRC}/pybindgen/%(pybindgen_version)s "
                 "  --prefix=%(ns3_build_home)s && "
                 "  ./waf build && "
                 "  ./waf configure -d %(build_mode)s --with-pybindgen=${SRC}/pybindgen/%(pybindgen_version)s "
                 "  --prefix=%(ns3_build_home)s && "
                 "  ./waf build && "
nepi