Eo: Restructure source tree to be like the rest of the EFL.

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/PROTO/eobj@71904 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f4e1f2e..f7934b8 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,17 +38,18 @@ configure_file (
 
 include(EFLCheck)
 
-add_subdirectory(lib)
-add_subdirectory(examples/evas)
-add_subdirectory(examples/mixin)
-add_subdirectory(examples/signals)
-add_subdirectory(examples/access)
-add_subdirectory(examples/constructors)
-add_subdirectory(examples/function_overrides)
-add_subdirectory(examples/composite_objects)
-add_subdirectory(examples/interface)
-
-add_subdirectory(tests EXCLUDE_FROM_ALL)
+add_subdirectory(src/lib)
+add_subdirectory(src/examples/evas)
+
+add_subdirectory(src/tests/mixin)
+add_subdirectory(src/tests/signals)
+add_subdirectory(src/tests/access)
+add_subdirectory(src/tests/constructors)
+add_subdirectory(src/tests/function_overrides)
+add_subdirectory(src/tests/composite_objects)
+add_subdirectory(src/tests/interface)
+
+add_subdirectory(src/tests/eo_suite EXCLUDE_FROM_ALL)
 
 add_subdirectory(doc)
 

diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index b898de3..56abe89 100644 (file)
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -598,7 +598,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = @CMAKE_SOURCE_DIR@/lib
+INPUT                  = @CMAKE_SOURCE_DIR@/src/lib
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@@ -658,7 +658,7 @@ EXCLUDE_SYMBOLS        =
 # directories that contain example code fragments that are included (see
 # the \include command).
 
-EXAMPLE_PATH           = @CMAKE_SOURCE_DIR@/examples
+EXAMPLE_PATH           = @CMAKE_SOURCE_DIR@/src/examples
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the
 # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp

diff --git a/examples/evas/CMakeLists.txt b/src/examples/evas/CMakeLists.txt
similarity index 93%
rename from examples/evas/CMakeLists.txt
rename to src/examples/evas/CMakeLists.txt
index 0fe04c0..abc63ea 100644 (file)
--- a/examples/evas/CMakeLists.txt
+++ b/src/examples/evas/CMakeLists.txt
@@ -11,7 +11,7 @@ include_directories(
    ${EINA_INCLUDE_DIRS}
    ${EVAS_INCLUDE_DIRS}
    ${ELEMENTARY_INCLUDE_DIRS}
-   ${CMAKE_SOURCE_DIR}/lib
+   ${CMAKE_SOURCE_DIR}/src/lib
    )
 
 add_executable(evas ${EVAS_CC_SOURCES})

diff --git a/examples/evas/elw_box.c b/src/examples/evas/elw_box.c
similarity index 100%
rename from examples/evas/elw_box.c
rename to src/examples/evas/elw_box.c

diff --git a/examples/evas/elw_box.h b/src/examples/evas/elw_box.h
similarity index 100%
rename from examples/evas/elw_box.h
rename to src/examples/evas/elw_box.h

diff --git a/examples/evas/elw_boxedbutton.c b/src/examples/evas/elw_boxedbutton.c
similarity index 100%
rename from examples/evas/elw_boxedbutton.c
rename to src/examples/evas/elw_boxedbutton.c

diff --git a/examples/evas/elw_boxedbutton.h b/src/examples/evas/elw_boxedbutton.h
similarity index 100%
rename from examples/evas/elw_boxedbutton.h
rename to src/examples/evas/elw_boxedbutton.h

diff --git a/examples/evas/elw_button.c b/src/examples/evas/elw_button.c
similarity index 100%
rename from examples/evas/elw_button.c
rename to src/examples/evas/elw_button.c

diff --git a/examples/evas/elw_button.h b/src/examples/evas/elw_button.h
similarity index 100%
rename from examples/evas/elw_button.h
rename to src/examples/evas/elw_button.h

diff --git a/examples/evas/elw_win.c b/src/examples/evas/elw_win.c
similarity index 100%
rename from examples/evas/elw_win.c
rename to src/examples/evas/elw_win.c

diff --git a/examples/evas/elw_win.h b/src/examples/evas/elw_win.h
similarity index 100%
rename from examples/evas/elw_win.h
rename to src/examples/evas/elw_win.h

diff --git a/examples/evas/evas_obj.c b/src/examples/evas/evas_obj.c
similarity index 100%
rename from examples/evas/evas_obj.c
rename to src/examples/evas/evas_obj.c

diff --git a/examples/evas/evas_obj.h b/src/examples/evas/evas_obj.h
similarity index 100%
rename from examples/evas/evas_obj.h
rename to src/examples/evas/evas_obj.h

diff --git a/examples/evas/test.c b/src/examples/evas/test.c
similarity index 100%
rename from examples/evas/test.c
rename to src/examples/evas/test.c

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

diff --git a/lib/Eo.h b/src/lib/Eo.h
similarity index 100%
rename from lib/Eo.h
rename to src/lib/Eo.h

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

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

diff --git a/lib/eo_private.h b/src/lib/eo_private.h
similarity index 100%
rename from lib/eo_private.h
rename to src/lib/eo_private.h

diff --git a/examples/access/CMakeLists.txt b/src/tests/access/CMakeLists.txt
similarity index 92%
rename from examples/access/CMakeLists.txt
rename to src/tests/access/CMakeLists.txt
index a6ab154..dbbd162 100644 (file)
--- a/examples/access/CMakeLists.txt
+++ b/src/tests/access/CMakeLists.txt
@@ -7,7 +7,7 @@ LIST(APPEND ACCESS_CC_SOURCES
 include_directories(
    ${EINA_INCLUDE_DIRS}
    ${EVAS_INCLUDE_DIRS}
-   ${CMAKE_SOURCE_DIR}/lib
+   ${CMAKE_SOURCE_DIR}/src/lib
    )
 
 add_executable(access ${ACCESS_CC_SOURCES})

diff --git a/examples/access/inherit.c b/src/tests/access/inherit.c
similarity index 100%
rename from examples/access/inherit.c
rename to src/tests/access/inherit.c

diff --git a/examples/access/inherit.h b/src/tests/access/inherit.h
similarity index 100%
rename from examples/access/inherit.h
rename to src/tests/access/inherit.h

diff --git a/examples/access/main.c b/src/tests/access/main.c
similarity index 100%
rename from examples/access/main.c
rename to src/tests/access/main.c

diff --git a/examples/access/simple.c b/src/tests/access/simple.c
similarity index 100%
rename from examples/access/simple.c
rename to src/tests/access/simple.c

diff --git a/examples/access/simple.h b/src/tests/access/simple.h
similarity index 100%
rename from examples/access/simple.h
rename to src/tests/access/simple.h

diff --git a/examples/access/simple_protected.h b/src/tests/access/simple_protected.h
similarity index 100%
rename from examples/access/simple_protected.h
rename to src/tests/access/simple_protected.h

diff --git a/examples/composite_objects/CMakeLists.txt b/src/tests/composite_objects/CMakeLists.txt
similarity index 93%
rename from examples/composite_objects/CMakeLists.txt
rename to src/tests/composite_objects/CMakeLists.txt
index a2c677e..ee402c6 100644 (file)
--- a/examples/composite_objects/CMakeLists.txt
+++ b/src/tests/composite_objects/CMakeLists.txt
@@ -7,7 +7,7 @@ LIST(APPEND COMPOSITE_OBJECTS_CC_SOURCES
 include_directories(
    ${EINA_INCLUDE_DIRS}
    ${EVAS_INCLUDE_DIRS}
-   ${CMAKE_SOURCE_DIR}/lib
+   ${CMAKE_SOURCE_DIR}/src/lib
    )
 
 add_executable(composite_objects ${COMPOSITE_OBJECTS_CC_SOURCES})

diff --git a/examples/composite_objects/comp.c b/src/tests/composite_objects/comp.c
similarity index 100%
rename from examples/composite_objects/comp.c
rename to src/tests/composite_objects/comp.c

diff --git a/examples/composite_objects/comp.h b/src/tests/composite_objects/comp.h
similarity index 100%
rename from examples/composite_objects/comp.h
rename to src/tests/composite_objects/comp.h

diff --git a/examples/composite_objects/main.c b/src/tests/composite_objects/main.c
similarity index 100%
rename from examples/composite_objects/main.c
rename to src/tests/composite_objects/main.c

diff --git a/examples/composite_objects/simple.c b/src/tests/composite_objects/simple.c
similarity index 100%
rename from examples/composite_objects/simple.c
rename to src/tests/composite_objects/simple.c

diff --git a/examples/composite_objects/simple.h b/src/tests/composite_objects/simple.h
similarity index 100%
rename from examples/composite_objects/simple.h
rename to src/tests/composite_objects/simple.h

diff --git a/examples/constructors/CMakeLists.txt b/src/tests/constructors/CMakeLists.txt
similarity index 94%
rename from examples/constructors/CMakeLists.txt
rename to src/tests/constructors/CMakeLists.txt
index 7752453..731d93d 100644 (file)
--- a/examples/constructors/CMakeLists.txt
+++ b/src/tests/constructors/CMakeLists.txt
@@ -12,7 +12,7 @@ LIST(APPEND CONSTRUCTORS_CC_SOURCES
 include_directories(
    ${EINA_INCLUDE_DIRS}
    ${EVAS_INCLUDE_DIRS}
-   ${CMAKE_SOURCE_DIR}/lib
+   ${CMAKE_SOURCE_DIR}/src/lib
    )
 
 add_executable(constructors ${CONSTRUCTORS_CC_SOURCES})

diff --git a/examples/constructors/main.c b/src/tests/constructors/main.c
similarity index 100%
rename from examples/constructors/main.c
rename to src/tests/constructors/main.c

diff --git a/examples/constructors/mixin.c b/src/tests/constructors/mixin.c
similarity index 100%
rename from examples/constructors/mixin.c
rename to src/tests/constructors/mixin.c

diff --git a/examples/constructors/mixin.h b/src/tests/constructors/mixin.h
similarity index 100%
rename from examples/constructors/mixin.h
rename to src/tests/constructors/mixin.h

diff --git a/examples/constructors/simple.c b/src/tests/constructors/simple.c
similarity index 100%
rename from examples/constructors/simple.c
rename to src/tests/constructors/simple.c

diff --git a/examples/constructors/simple.h b/src/tests/constructors/simple.h
similarity index 100%
rename from examples/constructors/simple.h
rename to src/tests/constructors/simple.h

diff --git a/examples/constructors/simple2.c b/src/tests/constructors/simple2.c
similarity index 100%
rename from examples/constructors/simple2.c
rename to src/tests/constructors/simple2.c

diff --git a/examples/constructors/simple2.h b/src/tests/constructors/simple2.h
similarity index 100%
rename from examples/constructors/simple2.h
rename to src/tests/constructors/simple2.h

diff --git a/examples/constructors/simple3.c b/src/tests/constructors/simple3.c
similarity index 100%
rename from examples/constructors/simple3.c
rename to src/tests/constructors/simple3.c

diff --git a/examples/constructors/simple3.h b/src/tests/constructors/simple3.h
similarity index 100%
rename from examples/constructors/simple3.h
rename to src/tests/constructors/simple3.h

diff --git a/examples/constructors/simple4.c b/src/tests/constructors/simple4.c
similarity index 100%
rename from examples/constructors/simple4.c
rename to src/tests/constructors/simple4.c

diff --git a/examples/constructors/simple4.h b/src/tests/constructors/simple4.h
similarity index 100%
rename from examples/constructors/simple4.h
rename to src/tests/constructors/simple4.h

diff --git a/examples/constructors/simple5.c b/src/tests/constructors/simple5.c
similarity index 100%
rename from examples/constructors/simple5.c
rename to src/tests/constructors/simple5.c

diff --git a/examples/constructors/simple5.h b/src/tests/constructors/simple5.h
similarity index 100%
rename from examples/constructors/simple5.h
rename to src/tests/constructors/simple5.h

diff --git a/examples/constructors/simple6.c b/src/tests/constructors/simple6.c
similarity index 100%
rename from examples/constructors/simple6.c
rename to src/tests/constructors/simple6.c

diff --git a/examples/constructors/simple6.h b/src/tests/constructors/simple6.h
similarity index 100%
rename from examples/constructors/simple6.h
rename to src/tests/constructors/simple6.h

diff --git a/tests/CMakeLists.txt b/src/tests/eo_suite/CMakeLists.txt
similarity index 94%
rename from tests/CMakeLists.txt
rename to src/tests/eo_suite/CMakeLists.txt
index 88befcf..8612cfc 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/src/tests/eo_suite/CMakeLists.txt
@@ -12,7 +12,7 @@ if (CHECK_ENABLED)
 
    include_directories(
       ${EINA_INCLUDE_DIRS}
-      ${CMAKE_SOURCE_DIR}/lib
+      ${CMAKE_SOURCE_DIR}/src/lib
       ${CHECK_INCLUDE_DIRS}
       )
 

diff --git a/tests/class_simple.c b/src/tests/eo_suite/class_simple.c
similarity index 100%
rename from tests/class_simple.c
rename to src/tests/eo_suite/class_simple.c

diff --git a/tests/class_simple.h b/src/tests/eo_suite/class_simple.h
similarity index 100%
rename from tests/class_simple.h
rename to src/tests/eo_suite/class_simple.h

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

diff --git a/tests/eo_suite.h b/src/tests/eo_suite/eo_suite.h
similarity index 100%
rename from tests/eo_suite.h
rename to src/tests/eo_suite/eo_suite.h

diff --git a/tests/eo_test_class_errors.c b/src/tests/eo_suite/eo_test_class_errors.c
similarity index 100%
rename from tests/eo_test_class_errors.c
rename to src/tests/eo_suite/eo_test_class_errors.c

diff --git a/tests/eo_test_general.c b/src/tests/eo_suite/eo_test_general.c
similarity index 100%
rename from tests/eo_test_general.c
rename to src/tests/eo_suite/eo_test_general.c

diff --git a/tests/eo_test_init.c b/src/tests/eo_suite/eo_test_init.c
similarity index 100%
rename from tests/eo_test_init.c
rename to src/tests/eo_suite/eo_test_init.c

diff --git a/examples/eunit_tests.h b/src/tests/eunit_tests.h
similarity index 100%
rename from examples/eunit_tests.h
rename to src/tests/eunit_tests.h

diff --git a/examples/function_overrides/CMakeLists.txt b/src/tests/function_overrides/CMakeLists.txt
similarity index 94%
rename from examples/function_overrides/CMakeLists.txt
rename to src/tests/function_overrides/CMakeLists.txt
index 85b2d10..3faa077 100644 (file)
--- a/examples/function_overrides/CMakeLists.txt
+++ b/src/tests/function_overrides/CMakeLists.txt
@@ -9,7 +9,7 @@ LIST(APPEND FUNCTION_OVERRIDES_CC_SOURCES
 include_directories(
    ${EINA_INCLUDE_DIRS}
    ${EVAS_INCLUDE_DIRS}
-   ${CMAKE_SOURCE_DIR}/lib
+   ${CMAKE_SOURCE_DIR}/src/lib
    )
 
 add_executable(function_overrides ${FUNCTION_OVERRIDES_CC_SOURCES})

diff --git a/examples/function_overrides/inherit.c b/src/tests/function_overrides/inherit.c
similarity index 100%
rename from examples/function_overrides/inherit.c
rename to src/tests/function_overrides/inherit.c

diff --git a/examples/function_overrides/inherit.h b/src/tests/function_overrides/inherit.h
similarity index 100%
rename from examples/function_overrides/inherit.h
rename to src/tests/function_overrides/inherit.h

diff --git a/examples/function_overrides/inherit2.c b/src/tests/function_overrides/inherit2.c
similarity index 100%
rename from examples/function_overrides/inherit2.c
rename to src/tests/function_overrides/inherit2.c

diff --git a/examples/function_overrides/inherit2.h b/src/tests/function_overrides/inherit2.h
similarity index 100%
rename from examples/function_overrides/inherit2.h
rename to src/tests/function_overrides/inherit2.h

diff --git a/examples/function_overrides/inherit3.c b/src/tests/function_overrides/inherit3.c
similarity index 100%
rename from examples/function_overrides/inherit3.c
rename to src/tests/function_overrides/inherit3.c

diff --git a/examples/function_overrides/inherit3.h b/src/tests/function_overrides/inherit3.h
similarity index 100%
rename from examples/function_overrides/inherit3.h
rename to src/tests/function_overrides/inherit3.h

diff --git a/examples/function_overrides/main.c b/src/tests/function_overrides/main.c
similarity index 100%
rename from examples/function_overrides/main.c
rename to src/tests/function_overrides/main.c

diff --git a/examples/function_overrides/simple.c b/src/tests/function_overrides/simple.c
similarity index 100%
rename from examples/function_overrides/simple.c
rename to src/tests/function_overrides/simple.c

diff --git a/examples/function_overrides/simple.h b/src/tests/function_overrides/simple.h
similarity index 100%
rename from examples/function_overrides/simple.h
rename to src/tests/function_overrides/simple.h

diff --git a/examples/interface/CMakeLists.txt b/src/tests/interface/CMakeLists.txt
similarity index 93%
rename from examples/interface/CMakeLists.txt
rename to src/tests/interface/CMakeLists.txt
index 95c023e..562ecbd 100644 (file)
--- a/examples/interface/CMakeLists.txt
+++ b/src/tests/interface/CMakeLists.txt
@@ -8,7 +8,7 @@ LIST(APPEND INTERFACE_CC_SOURCES
 include_directories(
    ${EINA_INCLUDE_DIRS}
    ${EVAS_INCLUDE_DIRS}
-   ${CMAKE_SOURCE_DIR}/lib
+   ${CMAKE_SOURCE_DIR}/src/lib
    )
 
 add_executable(interface ${INTERFACE_CC_SOURCES})

diff --git a/examples/interface/interface.c b/src/tests/interface/interface.c
similarity index 100%
rename from examples/interface/interface.c
rename to src/tests/interface/interface.c

diff --git a/examples/interface/interface.h b/src/tests/interface/interface.h
similarity index 100%
rename from examples/interface/interface.h
rename to src/tests/interface/interface.h

diff --git a/examples/interface/interface2.c b/src/tests/interface/interface2.c
similarity index 100%
rename from examples/interface/interface2.c
rename to src/tests/interface/interface2.c

diff --git a/examples/interface/interface2.h b/src/tests/interface/interface2.h
similarity index 100%
rename from examples/interface/interface2.h
rename to src/tests/interface/interface2.h

diff --git a/examples/interface/main.c b/src/tests/interface/main.c
similarity index 100%
rename from examples/interface/main.c
rename to src/tests/interface/main.c

diff --git a/examples/interface/simple.c b/src/tests/interface/simple.c
similarity index 100%
rename from examples/interface/simple.c
rename to src/tests/interface/simple.c

diff --git a/examples/mixin/simple.h b/src/tests/interface/simple.h
similarity index 100%
rename from examples/mixin/simple.h
rename to src/tests/interface/simple.h

diff --git a/examples/mixin/CMakeLists.txt b/src/tests/mixin/CMakeLists.txt
similarity index 92%
rename from examples/mixin/CMakeLists.txt
rename to src/tests/mixin/CMakeLists.txt
index d09adac..8953f1d 100644 (file)
--- a/examples/mixin/CMakeLists.txt
+++ b/src/tests/mixin/CMakeLists.txt
@@ -9,7 +9,7 @@ LIST(APPEND MIXIN_CC_SOURCES
 include_directories(
    ${EINA_INCLUDE_DIRS}
    ${EVAS_INCLUDE_DIRS}
-   ${CMAKE_SOURCE_DIR}/lib
+   ${CMAKE_SOURCE_DIR}/src/lib
    )
 
 add_executable(mixin ${MIXIN_CC_SOURCES})

diff --git a/examples/mixin/main.c b/src/tests/mixin/main.c
similarity index 100%
rename from examples/mixin/main.c
rename to src/tests/mixin/main.c

diff --git a/examples/mixin/mixin.c b/src/tests/mixin/mixin.c
similarity index 100%
rename from examples/mixin/mixin.c
rename to src/tests/mixin/mixin.c

diff --git a/examples/mixin/mixin.h b/src/tests/mixin/mixin.h
similarity index 100%
rename from examples/mixin/mixin.h
rename to src/tests/mixin/mixin.h

diff --git a/examples/mixin/mixin2.c b/src/tests/mixin/mixin2.c
similarity index 100%
rename from examples/mixin/mixin2.c
rename to src/tests/mixin/mixin2.c

diff --git a/examples/mixin/mixin2.h b/src/tests/mixin/mixin2.h
similarity index 100%
rename from examples/mixin/mixin2.h
rename to src/tests/mixin/mixin2.h

diff --git a/examples/mixin/mixin3.c b/src/tests/mixin/mixin3.c
similarity index 100%
rename from examples/mixin/mixin3.c
rename to src/tests/mixin/mixin3.c

diff --git a/examples/mixin/mixin3.h b/src/tests/mixin/mixin3.h
similarity index 100%
rename from examples/mixin/mixin3.h
rename to src/tests/mixin/mixin3.h

diff --git a/examples/mixin/simple.c b/src/tests/mixin/simple.c
similarity index 100%
rename from examples/mixin/simple.c
rename to src/tests/mixin/simple.c

diff --git a/examples/interface/simple.h b/src/tests/mixin/simple.h
similarity index 100%
rename from examples/interface/simple.h
rename to src/tests/mixin/simple.h

diff --git a/examples/signals/CMakeLists.txt b/src/tests/signals/CMakeLists.txt
similarity index 92%
rename from examples/signals/CMakeLists.txt
rename to src/tests/signals/CMakeLists.txt
index 04742a7..6fa155f 100644 (file)
--- a/examples/signals/CMakeLists.txt
+++ b/src/tests/signals/CMakeLists.txt
@@ -6,7 +6,7 @@ LIST(APPEND SIGNALS_CC_SOURCES
 include_directories(
    ${EINA_INCLUDE_DIRS}
    ${EVAS_INCLUDE_DIRS}
-   ${CMAKE_SOURCE_DIR}/lib
+   ${CMAKE_SOURCE_DIR}/src/lib
    )
 
 add_executable(signals ${SIGNALS_CC_SOURCES})

diff --git a/examples/signals/main.c b/src/tests/signals/main.c
similarity index 100%
rename from examples/signals/main.c
rename to src/tests/signals/main.c

diff --git a/examples/signals/simple.c b/src/tests/signals/simple.c
similarity index 100%
rename from examples/signals/simple.c
rename to src/tests/signals/simple.c

diff --git a/examples/signals/simple.h b/src/tests/signals/simple.h
similarity index 100%
rename from examples/signals/simple.h
rename to src/tests/signals/simple.h