From 77be7f5c3076cc67475dfecc708276b8f7e446da Mon Sep 17 00:00:00 2001 From: "Blake J. Harnden" Date: Thu, 4 Jan 2018 16:34:22 -0800 Subject: [PATCH] moved ns3 from under daemon to the root of the project and updated references --- Makefile.am | 6 +++--- configure.ac | 8 ++++---- daemon/Makefile.am | 4 ---- doc/ns3.rst | 6 +++--- ns3/.gitignore | 1 + {daemon/ns3 => ns3}/LICENSE | 0 {daemon/ns3 => ns3}/Makefile.am | 0 {daemon/ns3 => ns3}/corens3/.gitignore | 0 {daemon/ns3 => ns3}/corens3/__init__.py | 0 {daemon/ns3 => ns3}/corens3/constants.py.in | 0 {daemon/ns3 => ns3}/corens3/obj.py | 0 {daemon/ns3 => ns3}/examples/ns3lte.py | 0 {daemon/ns3 => ns3}/examples/ns3wifi.py | 0 {daemon/ns3 => ns3}/examples/ns3wifirandomwalk.py | 0 {daemon/ns3 => ns3}/examples/ns3wimax.py | 0 {daemon/ns3 => ns3}/setup.py | 0 16 files changed, 11 insertions(+), 14 deletions(-) create mode 100644 ns3/.gitignore rename {daemon/ns3 => ns3}/LICENSE (100%) rename {daemon/ns3 => ns3}/Makefile.am (100%) rename {daemon/ns3 => ns3}/corens3/.gitignore (100%) rename {daemon/ns3 => ns3}/corens3/__init__.py (100%) rename {daemon/ns3 => ns3}/corens3/constants.py.in (100%) rename {daemon/ns3 => ns3}/corens3/obj.py (100%) rename {daemon/ns3 => ns3}/examples/ns3lte.py (100%) rename {daemon/ns3 => ns3}/examples/ns3wifi.py (100%) rename {daemon/ns3 => ns3}/examples/ns3wifirandomwalk.py (100%) rename {daemon/ns3 => ns3}/examples/ns3wimax.py (100%) rename {daemon/ns3 => ns3}/setup.py (100%) diff --git a/Makefile.am b/Makefile.am index cd250dea..5c8cbe3f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,7 +17,7 @@ if WANT_DAEMON DAEMON = scripts daemon endif if WANT_NETNS - NETNS = netns + NETNS = netns ns3 endif # keep docs last due to dependencies on binaries @@ -138,8 +138,8 @@ endef fpm: clean-local-fpm $(call fpm-gui,rpm,-d "tkimg") $(call fpm-gui,deb,-d "libtk-img") - $(call fpm-python,rpm,daemon/ns3/setup.py) - $(call fpm-python,deb,daemon/ns3/setup.py) + $(call fpm-python,rpm,ns3/setup.py) + $(call fpm-python,deb,ns3/setup.py) $(call fpm-daemon-rpm,systemd) $(call fpm-daemon-rpm,sysv) $(call fpm-daemon-deb,systemd) diff --git a/configure.ac b/configure.ac index 4bc5238f..f9f40828 100644 --- a/configure.ac +++ b/configure.ac @@ -331,13 +331,13 @@ AC_CONFIG_FILES([Makefile doc/man/Makefile doc/figures/Makefile daemon/Makefile - netns/Makefile - netns/version.h daemon/core/constants.py - daemon/ns3/Makefile - daemon/ns3/corens3/constants.py daemon/doc/Makefile daemon/doc/conf.py + netns/Makefile + netns/version.h + ns3/Makefile + ns3/corens3/constants.py packaging/deb/core-daemon.install packaging/deb/core-daemon.prerm packaging/deb/core-gui.install diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 4b1f589c..bc0e5ca5 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -10,10 +10,6 @@ SETUPPY = setup.py SETUPPYFLAGS = -v -if WANT_NETNS - SUBDIRS = ns3 -endif - SBIN_FILES = \ sbin/core-cleanup \ sbin/core-daemon \ diff --git a/doc/ns3.rst b/doc/ns3.rst index 1f3c06c6..7221ba72 100644 --- a/doc/ns3.rst +++ b/doc/ns3.rst @@ -47,7 +47,7 @@ ns-3 Scripting Currently, ns-3 is supported by writing :ref:`Python scripts `, but not through drag-and-drop actions within the GUI. -If you have a copy of the CORE source, look under :file:`core/daemon/ns3/examples/` for example scripts; a CORE installation package puts these under +If you have a copy of the CORE source, look under :file:`ns3/examples/` for example scripts; a CORE installation package puts these under :file:`/usr/share/core/examples/corens3`. To run these scripts, install CORE so the CORE Python libraries are accessible, @@ -168,8 +168,8 @@ a constant-rate 802.11a-based ad hoc network, using a lot of ns-3 defaults. However, programs may be written with a blend of ns-3 API and CORE Python API calls. This section examines some of the fundamental objects in the CORE ns-3 support. Source code can be found in -:file:`daemon/ns3/corens3/obj.py` and example -code in :file:`daemon/ns3/corens3/examples/`. +:file:`ns3/corens3/obj.py` and example +code in :file:`ns3/corens3/examples/`. Ns3Session ---------- diff --git a/ns3/.gitignore b/ns3/.gitignore new file mode 100644 index 00000000..378eac25 --- /dev/null +++ b/ns3/.gitignore @@ -0,0 +1 @@ +build diff --git a/daemon/ns3/LICENSE b/ns3/LICENSE similarity index 100% rename from daemon/ns3/LICENSE rename to ns3/LICENSE diff --git a/daemon/ns3/Makefile.am b/ns3/Makefile.am similarity index 100% rename from daemon/ns3/Makefile.am rename to ns3/Makefile.am diff --git a/daemon/ns3/corens3/.gitignore b/ns3/corens3/.gitignore similarity index 100% rename from daemon/ns3/corens3/.gitignore rename to ns3/corens3/.gitignore diff --git a/daemon/ns3/corens3/__init__.py b/ns3/corens3/__init__.py similarity index 100% rename from daemon/ns3/corens3/__init__.py rename to ns3/corens3/__init__.py diff --git a/daemon/ns3/corens3/constants.py.in b/ns3/corens3/constants.py.in similarity index 100% rename from daemon/ns3/corens3/constants.py.in rename to ns3/corens3/constants.py.in diff --git a/daemon/ns3/corens3/obj.py b/ns3/corens3/obj.py similarity index 100% rename from daemon/ns3/corens3/obj.py rename to ns3/corens3/obj.py diff --git a/daemon/ns3/examples/ns3lte.py b/ns3/examples/ns3lte.py similarity index 100% rename from daemon/ns3/examples/ns3lte.py rename to ns3/examples/ns3lte.py diff --git a/daemon/ns3/examples/ns3wifi.py b/ns3/examples/ns3wifi.py similarity index 100% rename from daemon/ns3/examples/ns3wifi.py rename to ns3/examples/ns3wifi.py diff --git a/daemon/ns3/examples/ns3wifirandomwalk.py b/ns3/examples/ns3wifirandomwalk.py similarity index 100% rename from daemon/ns3/examples/ns3wifirandomwalk.py rename to ns3/examples/ns3wifirandomwalk.py diff --git a/daemon/ns3/examples/ns3wimax.py b/ns3/examples/ns3wimax.py similarity index 100% rename from daemon/ns3/examples/ns3wimax.py rename to ns3/examples/ns3wimax.py diff --git a/daemon/ns3/setup.py b/ns3/setup.py similarity index 100% rename from daemon/ns3/setup.py rename to ns3/setup.py