From add3e9da998691d22eba53b7b3177f3a65625f98 Mon Sep 17 00:00:00 2001
From: Lalith Suresh <suresh.lalith@gmail.com>
Date: Sat, 5 Mar 2011 00:55:35 +0000
Subject: [PATCH] Migrates topology-reader helpers and examples to module
 directory

---
 src/helper/wscript                                            | 2 --
 .../topology-read/examples}/Inet_small_toposample.txt         | 0
 .../topology-read/examples}/Inet_toposample.txt               | 0
 .../topology-read/examples}/Orbis_toposample.txt              | 0
 .../examples}/RocketFuel_toposample_1239_weights.txt          | 0
 .../topology-read/examples}/topology-example-sim.cc           | 2 +-
 {examples/topology-read => src/topology-read/examples}/waf    | 0
 .../topology-read => src/topology-read/examples}/wscript      | 0
 src/{ => topology-read}/helper/topology-reader-helper.cc      | 0
 src/{ => topology-read}/helper/topology-reader-helper.h       | 0
 src/topology-read/wscript                                     | 4 ++++
 11 files changed, 5 insertions(+), 3 deletions(-)
 rename {examples/topology-read => src/topology-read/examples}/Inet_small_toposample.txt (100%)
 rename {examples/topology-read => src/topology-read/examples}/Inet_toposample.txt (100%)
 rename {examples/topology-read => src/topology-read/examples}/Orbis_toposample.txt (100%)
 rename {examples/topology-read => src/topology-read/examples}/RocketFuel_toposample_1239_weights.txt (100%)
 rename {examples/topology-read => src/topology-read/examples}/topology-example-sim.cc (98%)
 rename {examples/topology-read => src/topology-read/examples}/waf (100%)
 rename {examples/topology-read => src/topology-read/examples}/wscript (100%)
 rename src/{ => topology-read}/helper/topology-reader-helper.cc (100%)
 rename src/{ => topology-read}/helper/topology-reader-helper.h (100%)

diff --git a/src/helper/wscript b/src/helper/wscript
index 0e9087b93..0a385ceaa 100644
--- a/src/helper/wscript
+++ b/src/helper/wscript
@@ -6,7 +6,6 @@ def build(bld):
         'athstats-helper.cc',
         'animation-interface.cc',
         'canvas-location.cc',
-        'topology-reader-helper.cc',
         ]
 
     headers = bld.new_task_gen('ns3header')
@@ -15,7 +14,6 @@ def build(bld):
         'athstats-helper.h',
         'animation-interface.h',
         'canvas-location.h',
-        'topology-reader-helper.h',
         ]
 
     env = bld.env_of_name('default')
diff --git a/examples/topology-read/Inet_small_toposample.txt b/src/topology-read/examples/Inet_small_toposample.txt
similarity index 100%
rename from examples/topology-read/Inet_small_toposample.txt
rename to src/topology-read/examples/Inet_small_toposample.txt
diff --git a/examples/topology-read/Inet_toposample.txt b/src/topology-read/examples/Inet_toposample.txt
similarity index 100%
rename from examples/topology-read/Inet_toposample.txt
rename to src/topology-read/examples/Inet_toposample.txt
diff --git a/examples/topology-read/Orbis_toposample.txt b/src/topology-read/examples/Orbis_toposample.txt
similarity index 100%
rename from examples/topology-read/Orbis_toposample.txt
rename to src/topology-read/examples/Orbis_toposample.txt
diff --git a/examples/topology-read/RocketFuel_toposample_1239_weights.txt b/src/topology-read/examples/RocketFuel_toposample_1239_weights.txt
similarity index 100%
rename from examples/topology-read/RocketFuel_toposample_1239_weights.txt
rename to src/topology-read/examples/RocketFuel_toposample_1239_weights.txt
diff --git a/examples/topology-read/topology-example-sim.cc b/src/topology-read/examples/topology-example-sim.cc
similarity index 98%
rename from examples/topology-read/topology-example-sim.cc
rename to src/topology-read/examples/topology-example-sim.cc
index 70beee0a2..cfaa109fe 100644
--- a/examples/topology-read/topology-example-sim.cc
+++ b/src/topology-read/examples/topology-example-sim.cc
@@ -62,7 +62,7 @@ int main (int argc, char *argv[])
 {
 
   string format ("Inet");
-  string input ("examples/topology-read/Inet_small_toposample.txt");
+  string input ("src/topology-read/examples/Inet_small_toposample.txt");
 
   // Set up command line parameters used to control the experiment.
   CommandLine cmd;
diff --git a/examples/topology-read/waf b/src/topology-read/examples/waf
similarity index 100%
rename from examples/topology-read/waf
rename to src/topology-read/examples/waf
diff --git a/examples/topology-read/wscript b/src/topology-read/examples/wscript
similarity index 100%
rename from examples/topology-read/wscript
rename to src/topology-read/examples/wscript
diff --git a/src/helper/topology-reader-helper.cc b/src/topology-read/helper/topology-reader-helper.cc
similarity index 100%
rename from src/helper/topology-reader-helper.cc
rename to src/topology-read/helper/topology-reader-helper.cc
diff --git a/src/helper/topology-reader-helper.h b/src/topology-read/helper/topology-reader-helper.h
similarity index 100%
rename from src/helper/topology-reader-helper.h
rename to src/topology-read/helper/topology-reader-helper.h
diff --git a/src/topology-read/wscript b/src/topology-read/wscript
index e00c6b195..a7bd29134 100644
--- a/src/topology-read/wscript
+++ b/src/topology-read/wscript
@@ -7,6 +7,7 @@ def build(bld):
        'model/inet-topology-reader.cc',
        'model/orbis-topology-reader.cc',
        'model/rocketfuel-topology-reader.cc',
+       'helper/topology-reader-helper.cc',
         ]
     headers = bld.new_task_gen('ns3header')
     headers.module = 'topology-read'
@@ -16,5 +17,8 @@ def build(bld):
        'model/inet-topology-reader.h',
        'model/orbis-topology-reader.h',
        'model/rocketfuel-topology-reader.h',
+       'helper/topology-reader-helper.h',
         ]
 
+    if bld.env['ENABLE_EXAMPLES']:
+        bld.add_subdirs('examples')