maint(dirs): prep for adding bindings

Source tree has been reorganised making way for language
wrappers (bindings) to be added.  RMr soruce is now in
src/rmr, and language specific wrappers will be placed into
subdirectories under src/bindings (e.g. rmr-python).

Change-Id: I2cac4e476e9c803b96cee2640ee2267434009cb1
Signed-off-by: E. Scott Daniels <daniels@research.att.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 225c5f7..cf887cf 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -168,9 +168,9 @@ set( CMAKE_POSITION_INDEPENDENT_CODE ON )
 set( CMAKE_CXX_FLAGS "-g -Wall " )
 
 # Include modules
-add_subdirectory( src/common )
-add_subdirectory( src/nanomsg )
-add_subdirectory( src/nng )
+add_subdirectory( src/rmr/common )
+add_subdirectory( src/rmr/nanomsg )
+add_subdirectory( src/rmr/nng )
 add_subdirectory( doc )                                # this will auto skip if {X}fm is not available
 
 

diff --git a/src/README b/src/README
index 420b935..87b9e5a 100644 (file)
--- a/src/README
+++ b/src/README
@@ -1,13 +1,6 @@
 
-Top level source directory. Each subdirectory contains specific code
-which supports the indicated transport mechanism.  The common subdirectory
-contains modules which are transport mechanism agnostic.
+Top level source directory. 
+       Subdirectories are:
+               rmr              -- main RMr code
+               bindings -- various language bindings (wrappers)
 
-Each sub directory should contain the following directories:
-       src     - Actual C source modules
-       include - Header files
-       test    - Unit test code and scripts to drive when necessary
-
-Also at this level in the file tree, a test directory contains code
-which supports all of the specific unit test code in each of the other
-three directories.

diff --git a/src/bindings/rmr-python/README b/src/bindings/rmr-python/README
new file mode 100644 (file)
index 0000000..534dc60
--- /dev/null
+++ b/src/bindings/rmr-python/README
@@ -0,0 +1,2 @@
+
+Place holder for python binding (wrapper) code.

diff --git a/src/STYLE b/src/rmr/STYLE
similarity index 100%
rename from src/STYLE
rename to src/rmr/STYLE

diff --git a/src/common/CMakeLists.txt b/src/rmr/common/CMakeLists.txt
similarity index 100%
rename from src/common/CMakeLists.txt
rename to src/rmr/common/CMakeLists.txt

diff --git a/src/common/include/RIC_message_types.h b/src/rmr/common/include/RIC_message_types.h
similarity index 100%
rename from src/common/include/RIC_message_types.h
rename to src/rmr/common/include/RIC_message_types.h

diff --git a/src/common/include/rmr.h b/src/rmr/common/include/rmr.h
similarity index 100%
rename from src/common/include/rmr.h
rename to src/rmr/common/include/rmr.h

diff --git a/src/common/include/rmr_agnostic.h b/src/rmr/common/include/rmr_agnostic.h
similarity index 100%
rename from src/common/include/rmr_agnostic.h
rename to src/rmr/common/include/rmr_agnostic.h

diff --git a/src/common/include/rmr_symtab.h b/src/rmr/common/include/rmr_symtab.h
similarity index 100%
rename from src/common/include/rmr_symtab.h
rename to src/rmr/common/include/rmr_symtab.h

diff --git a/src/common/src/README b/src/rmr/common/src/README
similarity index 100%
rename from src/common/src/README
rename to src/rmr/common/src/README

diff --git a/src/common/src/mbuf_api.c b/src/rmr/common/src/mbuf_api.c
similarity index 100%
rename from src/common/src/mbuf_api.c
rename to src/rmr/common/src/mbuf_api.c

diff --git a/src/common/src/ring_static.c b/src/rmr/common/src/ring_static.c
similarity index 100%
rename from src/common/src/ring_static.c
rename to src/rmr/common/src/ring_static.c

diff --git a/src/common/src/rt_generic_static.c b/src/rmr/common/src/rt_generic_static.c
similarity index 100%
rename from src/common/src/rt_generic_static.c
rename to src/rmr/common/src/rt_generic_static.c

diff --git a/src/common/src/rtc_static.c b/src/rmr/common/src/rtc_static.c
similarity index 100%
rename from src/common/src/rtc_static.c
rename to src/rmr/common/src/rtc_static.c

diff --git a/src/common/src/symtab.c b/src/rmr/common/src/symtab.c
similarity index 100%
rename from src/common/src/symtab.c
rename to src/rmr/common/src/symtab.c

diff --git a/src/common/src/tools_static.c b/src/rmr/common/src/tools_static.c
similarity index 100%
rename from src/common/src/tools_static.c
rename to src/rmr/common/src/tools_static.c

diff --git a/src/common/src/wormholes.c b/src/rmr/common/src/wormholes.c
similarity index 100%
rename from src/common/src/wormholes.c
rename to src/rmr/common/src/wormholes.c

diff --git a/src/common/src/wrapper.c b/src/rmr/common/src/wrapper.c
similarity index 100%
rename from src/common/src/wrapper.c
rename to src/rmr/common/src/wrapper.c

diff --git a/src/nanomsg/CMakeLists.txt b/src/rmr/nanomsg/CMakeLists.txt
similarity index 100%
rename from src/nanomsg/CMakeLists.txt
rename to src/rmr/nanomsg/CMakeLists.txt

diff --git a/src/nanomsg/include/rmr_private.h b/src/rmr/nanomsg/include/rmr_private.h
similarity index 100%
rename from src/nanomsg/include/rmr_private.h
rename to src/rmr/nanomsg/include/rmr_private.h

diff --git a/src/nanomsg/src/rmr.c b/src/rmr/nanomsg/src/rmr.c
similarity index 100%
rename from src/nanomsg/src/rmr.c
rename to src/rmr/nanomsg/src/rmr.c

diff --git a/src/nanomsg/src/rtable_static.c b/src/rmr/nanomsg/src/rtable_static.c
similarity index 100%
rename from src/nanomsg/src/rtable_static.c
rename to src/rmr/nanomsg/src/rtable_static.c

diff --git a/src/nanomsg/src/sr_static.c b/src/rmr/nanomsg/src/sr_static.c
similarity index 100%
rename from src/nanomsg/src/sr_static.c
rename to src/rmr/nanomsg/src/sr_static.c

diff --git a/src/nng/CMakeLists.txt b/src/rmr/nng/CMakeLists.txt
similarity index 100%
rename from src/nng/CMakeLists.txt
rename to src/rmr/nng/CMakeLists.txt

diff --git a/src/nng/include/rmr_nng_private.h b/src/rmr/nng/include/rmr_nng_private.h
similarity index 100%
rename from src/nng/include/rmr_nng_private.h
rename to src/rmr/nng/include/rmr_nng_private.h

diff --git a/src/nng/src/rmr_nng.c b/src/rmr/nng/src/rmr_nng.c
similarity index 100%
rename from src/nng/src/rmr_nng.c
rename to src/rmr/nng/src/rmr_nng.c

diff --git a/src/nng/src/rtable_nng_static.c b/src/rmr/nng/src/rtable_nng_static.c
similarity index 100%
rename from src/nng/src/rtable_nng_static.c
rename to src/rmr/nng/src/rtable_nng_static.c

diff --git a/src/nng/src/sr_nng_static.c b/src/rmr/nng/src/sr_nng_static.c
similarity index 100%
rename from src/nng/src/sr_nng_static.c
rename to src/rmr/nng/src/sr_nng_static.c