Adjust directory structure

Change-Id: I09589c915dae34f0a455c27117c8b6eb2d71a516
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>

diff --git a/idlc/CMakeLists.txt b/idlc/CMakeLists.txt
index 5341487..adf0254 100644 (file)
--- a/idlc/CMakeLists.txt
+++ b/idlc/CMakeLists.txt
@@ -13,22 +13,22 @@ SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -std=c++11")
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS}")
 
 SET(SOURCES
-       src/parser.cc
-       src/document.cc
-       src/declaration.cc
-       src/interface.cc
-       src/type.cc
-       src/parameter.cc
-       src/attribute.cc
-       src/structure.cc
-       src/block.cc
-       src/generator.cc
-       src/proxy_gen.cc
-       src/stub_gen.cc
-       src/main.cc
+       parser.cc
+       document.cc
+       declaration.cc
+       interface.cc
+       type.cc
+       parameter.cc
+       attribute.cc
+       structure.cc
+       block.cc
+       generator.cc
+       proxy_gen.cc
+       stub_gen.cc
+       main.cc
 )
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/inc)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../)
 
 flex_target(TIDLC ${CMAKE_CURRENT_SOURCE_DIR}/tidlc.ll tidlc_l.cpp)
 bison_target(TIDLC ${CMAKE_CURRENT_SOURCE_DIR}/tidlc.yy tidlc_y.cpp)

diff --git a/idlc/src/attribute.cc b/idlc/attribute.cc
similarity index 95%
rename from idlc/src/attribute.cc
rename to idlc/attribute.cc
index 9083e15..83c5df7 100644 (file)
--- a/idlc/src/attribute.cc
+++ b/idlc/attribute.cc
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "attribute.h"
-#include "type.h"
+#include "idlc/attribute.h"
+#include "idlc/type.h"
 
 namespace tidl {
 

diff --git a/idlc/inc/attribute.h b/idlc/attribute.h
similarity index 92%
rename from idlc/inc/attribute.h
rename to idlc/attribute.h
index f66ef28..2f905c1 100644 (file)
--- a/idlc/inc/attribute.h
+++ b/idlc/attribute.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef IDLC_INC_ATTRIBUTE_H_
-#define IDLC_INC_ATTRIBUTE_H_
+#ifndef IDLC_ATTRIBUTE_H_
+#define IDLC_ATTRIBUTE_H_
 
 #include <string>
 #include <list>
@@ -49,4 +49,4 @@ class Attributes {
 
 }  // namespace tidl
 
-#endif  // IDLC_INC_ATTRIBUTE_H_
+#endif  // IDLC_ATTRIBUTE_H_

diff --git a/idlc/src/block.cc b/idlc/block.cc
similarity index 94%
rename from idlc/src/block.cc
rename to idlc/block.cc
index 4557795..a373cf8 100644 (file)
--- a/idlc/src/block.cc
+++ b/idlc/block.cc
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "type.h"
-#include "block.h"
+#include "idlc/type.h"
+#include "idlc/block.h"
 
 namespace tidl {
 

diff --git a/idlc/inc/block.h b/idlc/block.h
similarity index 92%
rename from idlc/inc/block.h
rename to idlc/block.h
index 48ce0d9..dd96b71 100644 (file)
--- a/idlc/inc/block.h
+++ b/idlc/block.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef IDLC_INC_BLOCK_H_
-#define IDLC_INC_BLOCK_H_
+#ifndef IDLC_BLOCK_H_
+#define IDLC_BLOCK_H_
 
 #include <string>
 #include <memory>
@@ -44,5 +44,5 @@ class Block {
 
 }  // namespace tidl
 
-#endif  // IDLC_INC_BLOCK_H_
+#endif  // IDLC_BLOCK_H_
 

diff --git a/idlc/src/declaration.cc b/idlc/declaration.cc
similarity index 94%
rename from idlc/src/declaration.cc
rename to idlc/declaration.cc
index 1caab21..47f8854 100644 (file)
--- a/idlc/src/declaration.cc
+++ b/idlc/declaration.cc
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include "declaration.h"
-#include "type.h"
-#include "parameter.h"
+#include "idlc/declaration.h"
+#include "idlc/type.h"
+#include "idlc/parameter.h"
 
 namespace tidl {
 

diff --git a/idlc/inc/declaration.h b/idlc/declaration.h
similarity index 90%
rename from idlc/inc/declaration.h
rename to idlc/declaration.h
index d29e667..353bd3f 100644 (file)
--- a/idlc/inc/declaration.h
+++ b/idlc/declaration.h
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-#ifndef IDLC_INC_DECLARATION_H_
-#define IDLC_INC_DECLARATION_H_
+#ifndef IDLC_DECLARATION_H_
+#define IDLC_DECLARATION_H_
 
 #include <string>
 #include <list>
 #include <memory>
 
-#include "type.h"
-#include "parameter.h"
+#include "idlc/type.h"
+#include "idlc/parameter.h"
 
 namespace tidl {
 
@@ -54,4 +54,4 @@ class Declarations {
 
 }  // namespace tidl
 
-#endif  // IDLC_INC_DECLARATION_H_
+#endif  // IDLC_DECLARATION_H_

diff --git a/idlc/src/document.cc b/idlc/document.cc
similarity index 93%
rename from idlc/src/document.cc
rename to idlc/document.cc
index 2fd0372..516cc69 100644 (file)
--- a/idlc/src/document.cc
+++ b/idlc/document.cc
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "document.h"
-#include "interface.h"
+#include "idlc/document.h"
+#include "idlc/interface.h"
 
 namespace tidl {
 

diff --git a/idlc/inc/document.h b/idlc/document.h
similarity index 88%
rename from idlc/inc/document.h
rename to idlc/document.h
index 56893db..18ccb7c 100644 (file)
--- a/idlc/inc/document.h
+++ b/idlc/document.h
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#ifndef IDLC_INC_DOCUMENT_H_
-#define IDLC_INC_DOCUMENT_H_
+#ifndef IDLC_DOCUMENT_H_
+#define IDLC_DOCUMENT_H_
 
 #include <list>
 #include <memory>
 
-#include "interface.h"
+#include "idlc/interface.h"
 
 namespace tidl {
 
@@ -37,4 +37,4 @@ class Document {
 
 }  // namespace tidl
 
-#endif  // IDLC_INC_DOCUMENT_H_
+#endif  // IDLC_DOCUMENT_H_

diff --git a/idlc/src/generator.cc b/idlc/generator.cc
similarity index 92%
rename from idlc/src/generator.cc
rename to idlc/generator.cc
index 6274910..9881f1c 100644 (file)
--- a/idlc/src/generator.cc
+++ b/idlc/generator.cc
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include "generator.h"
-#include "block.h"
-#include "interface.h"
-#include "structure.h"
-#include "declaration.h"
+#include "idlc/generator.h"
+#include "idlc/block.h"
+#include "idlc/interface.h"
+#include "idlc/structure.h"
+#include "idlc/declaration.h"
 
 namespace tidl {
 

diff --git a/idlc/inc/generator.h b/idlc/generator.h
similarity index 91%
rename from idlc/inc/generator.h
rename to idlc/generator.h
index 7d6c81f..450a660 100644 (file)
--- a/idlc/inc/generator.h
+++ b/idlc/generator.h
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-#ifndef IDLC_INC_GENERATOR_H_
-#define IDLC_INC_GENERATOR_H_
+#ifndef IDLC_GENERATOR_H_
+#define IDLC_GENERATOR_H_
 
 #include <string>
 #include <fstream>
 #include <iostream>
 #include <memory>
 
-#include "document.h"
-#include "parameter.h"
-#include "type.h"
+#include "idlc/document.h"
+#include "idlc/parameter.h"
+#include "idlc/type.h"
 
 namespace tidl {
 
@@ -56,4 +56,4 @@ class Generator {
 
 }  // namespace tidl
 
-#endif  // IDLC_INC_GENERATOR_H_
+#endif  // IDLC_GENERATOR_H_

diff --git a/idlc/src/interface.cc b/idlc/interface.cc
similarity index 91%
rename from idlc/src/interface.cc
rename to idlc/interface.cc
index 77069f9..8452232 100644 (file)
--- a/idlc/src/interface.cc
+++ b/idlc/interface.cc
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include "declaration.h"
-#include "interface.h"
-#include "block.h"
+#include "idlc/declaration.h"
+#include "idlc/interface.h"
+#include "idlc/block.h"
 
 namespace tidl {
 

diff --git a/idlc/inc/interface.h b/idlc/interface.h
similarity index 86%
rename from idlc/inc/interface.h
rename to idlc/interface.h
index 510f1fe..8ff91d1 100644 (file)
--- a/idlc/inc/interface.h
+++ b/idlc/interface.h
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-#ifndef IDLC_INC_INTERFACE_H_
-#define IDLC_INC_INTERFACE_H_
+#ifndef IDLC_INTERFACE_H_
+#define IDLC_INTERFACE_H_
 
 #include <string>
 #include <memory>
 
-#include "block.h"
-#include "declaration.h"
+#include "idlc/block.h"
+#include "idlc/declaration.h"
 
 namespace tidl {
 
@@ -37,5 +37,5 @@ class Interface : public Block {
 
 }  // namespace tidl
 
-#endif  // IDLC_INC_INTERFACE_H_
+#endif  // IDLC_INTERFACE_H_
 

diff --git a/idlc/src/main.cc b/idlc/main.cc
similarity index 95%
rename from idlc/src/main.cc
rename to idlc/main.cc
index 96ac258..717cf8d 100644 (file)
--- a/idlc/src/main.cc
+++ b/idlc/main.cc
@@ -17,9 +17,9 @@
 #include <iostream>
 #include <cstring>
 
-#include "parser.h"
-#include "proxy_gen.h"
-#include "stub_gen.h"
+#include "idlc/parser.h"
+#include "idlc/proxy_gen.h"
+#include "idlc/stub_gen.h"
 
 namespace {
 

diff --git a/idlc/src/parameter.cc b/idlc/parameter.cc
similarity index 95%
rename from idlc/src/parameter.cc
rename to idlc/parameter.cc
index 0e9b650..0e6807a 100644 (file)
--- a/idlc/src/parameter.cc
+++ b/idlc/parameter.cc
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "parameter.h"
-#include "type.h"
+#include "idlc/parameter.h"
+#include "idlc/type.h"
 
 namespace tidl {
 

diff --git a/idlc/inc/parameter.h b/idlc/parameter.h
similarity index 91%
rename from idlc/inc/parameter.h
rename to idlc/parameter.h
index 7dba036..ea83d44 100644 (file)
--- a/idlc/inc/parameter.h
+++ b/idlc/parameter.h
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-#ifndef IDLC_INC_PARAMETER_H_
-#define IDLC_INC_PARAMETER_H_
+#ifndef IDLC_PARAMETER_H_
+#define IDLC_PARAMETER_H_
 
 #include <string>
 #include <list>
 #include <memory>
 
-#include "type.h"
+#include "idlc/type.h"
 
 namespace tidl {
 
@@ -48,4 +48,4 @@ class Parameters {
 
 }  // namespace tidl
 
-#endif  // IDLC_INC_PARAMETER_H_
+#endif  // IDLC_PARAMETER_H_

diff --git a/idlc/src/parser.cc b/idlc/parser.cc
similarity index 88%
rename from idlc/src/parser.cc
rename to idlc/parser.cc
index 934b1da..414b83f 100644 (file)
--- a/idlc/src/parser.cc
+++ b/idlc/parser.cc
@@ -17,14 +17,14 @@
 #include <fstream>
 #include <string>
 
-#include "parser.h"
-#include "document.h"
-#include "declaration.h"
-#include "parameter.h"
-#include "type.h"
-#include "attribute.h"
-#include "structure.h"
-#include "../tidlc_y.hpp"
+#include "idlc/parser.h"
+#include "idlc/document.h"
+#include "idlc/declaration.h"
+#include "idlc/parameter.h"
+#include "idlc/type.h"
+#include "idlc/attribute.h"
+#include "idlc/structure.h"
+#include "idlc/tidlc_y.hpp"
 
 struct yy_buffer_state;
 yy_buffer_state* yy_scan_buffer(char*, size_t, void*);

diff --git a/idlc/inc/parser.h b/idlc/parser.h
similarity index 90%
rename from idlc/inc/parser.h
rename to idlc/parser.h
index e1ef422..5070b00 100644 (file)
--- a/idlc/inc/parser.h
+++ b/idlc/parser.h
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#ifndef IDLC_INC_PARSER_H_
-#define IDLC_INC_PARSER_H_
+#ifndef IDLC_PARSER_H_
+#define IDLC_PARSER_H_
 
 #include <memory>
 #include <string>
 
-#include "document.h"
+#include "idlc/document.h"
 
 namespace tidl {
 
@@ -42,4 +42,4 @@ class Parser {
 
 }  // namespace tidl
 
-#endif  // IDLC_INC_PARSER_H_
+#endif  // IDLC_PARSER_H_

diff --git a/idlc/src/proxy_gen.cc b/idlc/proxy_gen.cc
similarity index 98%
rename from idlc/src/proxy_gen.cc
rename to idlc/proxy_gen.cc
index 2c0919f..85632ec 100644 (file)
--- a/idlc/src/proxy_gen.cc
+++ b/idlc/proxy_gen.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "proxy_gen.h"
+#include "idlc/proxy_gen.h"
 
 namespace tidl {
 

diff --git a/idlc/inc/proxy_gen.h b/idlc/proxy_gen.h
similarity index 93%
rename from idlc/inc/proxy_gen.h
rename to idlc/proxy_gen.h
index ac59f1c..a3a4370 100644 (file)
--- a/idlc/inc/proxy_gen.h
+++ b/idlc/proxy_gen.h
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#ifndef IDLC_INC_PROXY_GEN_H_
-#define IDLC_INC_PROXY_GEN_H_
+#ifndef IDLC_PROXY_GEN_H_
+#define IDLC_PROXY_GEN_H_
 
 #include <memory>
 #include <string>
 
-#include "generator.h"
+#include "idlc/generator.h"
 
 namespace tidl {
 
@@ -49,4 +49,4 @@ class ProxyGen : public Generator {
 
 }  // namespace tidl
 
-#endif  // IDLC_INC_PROXY_GEN_H_
+#endif  // IDLC_PROXY_GEN_H_

diff --git a/idlc/src/structure.cc b/idlc/structure.cc
similarity index 91%
rename from idlc/src/structure.cc
rename to idlc/structure.cc
index 5ebc5ee..9ade257 100644 (file)
--- a/idlc/src/structure.cc
+++ b/idlc/structure.cc
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include "attribute.h"
-#include "structure.h"
-#include "block.h"
+#include "idlc/attribute.h"
+#include "idlc/structure.h"
+#include "idlc/block.h"
 
 namespace tidl {
 

diff --git a/idlc/inc/structure.h b/idlc/structure.h
similarity index 86%
rename from idlc/inc/structure.h
rename to idlc/structure.h
index 4022bb9..4121ef7 100644 (file)
--- a/idlc/inc/structure.h
+++ b/idlc/structure.h
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-#ifndef IDLC_INC_STRUCTURE_H_
-#define IDLC_INC_STRUCTURE_H_
+#ifndef IDLC_STRUCTURE_H_
+#define IDLC_STRUCTURE_H_
 
 #include <string>
 #include <memory>
 
-#include "block.h"
-#include "attribute.h"
+#include "idlc/block.h"
+#include "idlc/attribute.h"
 
 namespace tidl {
 
@@ -37,5 +37,5 @@ class Structure : public Block {
 
 }  // namespace tidl
 
-#endif  // IDLC_INC_STRUCTURE_H_
+#endif  // IDLC_STRUCTURE_H_
 

diff --git a/idlc/src/stub_gen.cc b/idlc/stub_gen.cc
similarity index 98%
rename from idlc/src/stub_gen.cc
rename to idlc/stub_gen.cc
index 4a40015..59f9c89 100644 (file)
--- a/idlc/src/stub_gen.cc
+++ b/idlc/stub_gen.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "stub_gen.h"
+#include "idlc/stub_gen.h"
 
 namespace tidl {
 

diff --git a/idlc/inc/stub_gen.h b/idlc/stub_gen.h
similarity index 92%
rename from idlc/inc/stub_gen.h
rename to idlc/stub_gen.h
index bf54bc1..2069ff5 100644 (file)
--- a/idlc/inc/stub_gen.h
+++ b/idlc/stub_gen.h
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#ifndef IDLC_INC_STUB_GEN_H_
-#define IDLC_INC_STUB_GEN_H_
+#ifndef IDLC_STUB_GEN_H_
+#define IDLC_STUB_GEN_H_
 
 #include <memory>
 #include <string>
 
-#include "generator.h"
+#include "idlc/generator.h"
 
 namespace tidl {
 
@@ -43,4 +43,4 @@ class StubGen : public Generator {
 
 }  // namespace tidl
 
-#endif  // IDLC_INC_STUB_GEN_H_
+#endif  // IDLC_STUB_GEN_H_

diff --git a/idlc/tidlc.ll b/idlc/tidlc.ll
index 9b85a6e..ab6bc3e 100644 (file)
--- a/idlc/tidlc.ll
+++ b/idlc/tidlc.ll
@@ -1,16 +1,16 @@
 %{
 #include <stdio.h>
 
-#include "parser.h"
-#include "document.h"
-#include "declaration.h"
-#include "type.h"
-#include "parameter.h"
-#include "interface.h"
-#include "attribute.h"
-#include "structure.h"
-#include "block.h"
-#include "tidlc_y.hpp"
+#include "idlc/parser.h"
+#include "idlc/document.h"
+#include "idlc/declaration.h"
+#include "idlc/type.h"
+#include "idlc/parameter.h"
+#include "idlc/interface.h"
+#include "idlc/attribute.h"
+#include "idlc/structure.h"
+#include "idlc/block.h"
+#include "idlc/tidlc_y.hpp"
 
 #define YY_USER_ACTION yylloc->columns(yyleng);
 %}

diff --git a/idlc/tidlc.yy b/idlc/tidlc.yy
index 15ad238..a0fddcd 100644 (file)
--- a/idlc/tidlc.yy
+++ b/idlc/tidlc.yy
@@ -3,16 +3,16 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "parser.h"
-#include "document.h"
-#include "declaration.h"
-#include "type.h"
-#include "parameter.h"
-#include "interface.h"
-#include "attribute.h"
-#include "structure.h"
-#include "block.h"
-#include "tidlc_y.hpp"
+#include "idlc/parser.h"
+#include "idlc/document.h"
+#include "idlc/declaration.h"
+#include "idlc/type.h"
+#include "idlc/parameter.h"
+#include "idlc/interface.h"
+#include "idlc/attribute.h"
+#include "idlc/structure.h"
+#include "idlc/block.h"
+#include "idlc/tidlc_y.hpp"
 
 int yylex(yy::parser::semantic_type *, yy::parser::location_type *, void *);
 

diff --git a/idlc/src/type.cc b/idlc/type.cc
similarity index 98%
rename from idlc/src/type.cc
rename to idlc/type.cc
index 4743610..e78216e 100644 (file)
--- a/idlc/src/type.cc
+++ b/idlc/type.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "type.h"
+#include "idlc/type.h"
 
 namespace tidl {
 

diff --git a/idlc/inc/type.h b/idlc/type.h
similarity index 95%
rename from idlc/inc/type.h
rename to idlc/type.h
index abb75df..6116cd8 100644 (file)
--- a/idlc/inc/type.h
+++ b/idlc/type.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef IDLC_INC_TYPE_H_
-#define IDLC_INC_TYPE_H_
+#ifndef IDLC_TYPE_H_
+#define IDLC_TYPE_H_
 
 #include <string>
 #include <memory>
@@ -82,4 +82,4 @@ class ParameterType {
 
 }  // namespace tidl
 
-#endif  // IDLC_INC_TYPE_H_
+#endif  // IDLC_TYPE_H_

diff --git a/idlc/tools/check-coding-style b/tools/check-coding-style
similarity index 100%
rename from idlc/tools/check-coding-style
rename to tools/check-coding-style