From c3585c30266af0ee0d79a57b20595e53c3f13ca0 Mon Sep 17 00:00:00 2001 From: Tomasz Iwanek Date: Wed, 7 Jan 2015 11:09:16 +0100 Subject: [PATCH] [Cpplint] Single source tree cpplint.py requires consistent single source code tree. Otherwise some rules may not apply. Running: cpplint.py --root-dir=src/ Will obligate each header file to have correct guard macro. This will be fixed in future. =========================================================== To run stylecheck type: ./tools/check-coding-style =========================================================== Change-Id: I05b62b09ce789648a11a305279adcf8ea5a70d51 --- CMakeLists.txt | 6 +----- src/CMakeLists.txt | 5 +++++ {common => src/common}/CMakeLists.txt | 14 +++++++------- {common/src => src/common}/app_installer.cc | 4 ++-- {common/include => src/common}/app_installer.h | 2 +- {common/src => src/common}/context_installer.cc | 2 +- {common/include => src/common}/context_installer.h | 0 {common/include => src/common}/step/step.h | 2 +- {common/src => src/common}/step/step_copy.cc | 4 ++-- {common/include => src/common}/step/step_copy.h | 4 ++-- {common/src => src/common}/step/step_signature.cc | 4 ++-- {common/include => src/common}/step/step_signature.h | 4 ++-- {common/src => src/common}/step/step_unzip.cc | 4 ++-- {common/include => src/common}/step/step_unzip.h | 4 ++-- {common/src => src/common}/utils.cc | 2 +- {common/include => src/common}/utils.h | 0 {native => src/native}/CMakeLists.txt | 4 ++-- {signature => src/signature}/CMakeLists.txt | 10 +++++----- {signature/include => src/signature}/logging.h | 0 {signature/include => src/signature}/marcos.h | 0 {signature/src => src/signature}/signature_data.cc | 2 +- {signature/include => src/signature}/signature_data.h | 2 +- {signature/src => src/signature}/signature_parser.cc | 6 +++--- {signature/include => src/signature}/signature_parser.h | 4 ++-- {signature/src => src/signature}/signature_validator.cc | 10 +++++----- {signature/include => src/signature}/signature_validator.h | 2 +- .../src => src/signature}/signature_xmlsec_adaptor.cc | 4 ++-- .../include => src/signature}/signature_xmlsec_adaptor.h | 2 +- {wgt => src/wgt}/CMakeLists.txt | 4 ++-- {wgt/src => src/wgt}/step_parse.cc | 4 ++-- {wgt/src => src/wgt}/wgt_backend.cc | 8 ++++---- {xpk => src/xpk}/CMakeLists.txt | 4 ++-- tools/check-coding-style | 2 +- 33 files changed, 65 insertions(+), 64 deletions(-) create mode 100644 src/CMakeLists.txt rename {common => src/common}/CMakeLists.txt (81%) rename {common/src => src/common}/app_installer.cc (95%) rename {common/include => src/common}/app_installer.h (94%) rename {common/src => src/common}/context_installer.cc (91%) rename {common/include => src/common}/context_installer.h (100%) rename {common/include => src/common}/step/step.h (96%) rename {common/src => src/common}/step/step_copy.cc (96%) rename {common/include => src/common}/step/step_copy.h (87%) rename {common/src => src/common}/step/step_signature.cc (87%) rename {common/include => src/common}/step/step_signature.h (90%) rename {common/src => src/common}/step/step_unzip.cc (98%) rename {common/include => src/common}/step/step_unzip.h (91%) rename {common/src => src/common}/utils.cc (98%) rename {common/include => src/common}/utils.h (100%) rename {native => src/native}/CMakeLists.txt (89%) rename {signature => src/signature}/CMakeLists.txt (79%) rename {signature/include => src/signature}/logging.h (100%) rename {signature/include => src/signature}/marcos.h (100%) rename {signature/src => src/signature}/signature_data.cc (95%) rename {signature/include => src/signature}/signature_data.h (99%) rename {signature/src => src/signature}/signature_parser.cc (99%) rename {signature/include => src/signature}/signature_parser.h (92%) rename {signature/src => src/signature}/signature_validator.cc (97%) rename {signature/include => src/signature}/signature_validator.h (96%) rename {signature/src => src/signature}/signature_xmlsec_adaptor.cc (99%) rename {signature/include => src/signature}/signature_xmlsec_adaptor.h (95%) rename {wgt => src/wgt}/CMakeLists.txt (89%) rename {wgt/src => src/wgt}/step_parse.cc (94%) rename {wgt/src => src/wgt}/wgt_backend.cc (91%) rename {xpk => src/xpk}/CMakeLists.txt (89%) diff --git a/CMakeLists.txt b/CMakeLists.txt index b4c73db..e04193c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,9 +54,5 @@ FIND_PACKAGE(Boost REQUIRED COMPONENTS system filesystem) # xmlsec1 - choose crypto library which to use ADD_DEFINITIONS("-DXMLSEC_CRYPTO_OPENSSL") -ADD_SUBDIRECTORY(common) -ADD_SUBDIRECTORY(signature) -ADD_SUBDIRECTORY(wgt) -#ADD_SUBDIRECTORY(xpk) -#ADD_SUBDIRECTORY(native) ADD_SUBDIRECTORY(data) +ADD_SUBDIRECTORY(src) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..655404f --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,5 @@ +ADD_SUBDIRECTORY(common) +ADD_SUBDIRECTORY(signature) +ADD_SUBDIRECTORY(wgt) +#ADD_SUBDIRECTORY(xpk) +#ADD_SUBDIRECTORY(native) diff --git a/common/CMakeLists.txt b/src/common/CMakeLists.txt similarity index 81% rename from common/CMakeLists.txt rename to src/common/CMakeLists.txt index 63da0a7..e5a4032 100644 --- a/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -1,16 +1,16 @@ # Target - sources SET(SRCS - src/app_installer.cc - src/context_installer.cc - src/step/step_unzip.cc - src/step/step_signature.cc - src/step/step_copy.cc - src/utils.cc + app_installer.cc + context_installer.cc + step/step_unzip.cc + step/step_signature.cc + step/step_copy.cc + utils.cc ) # Target - definition ADD_LIBRARY(${TARGET_LIBNAME_COMMON} SHARED ${SRCS}) # Target - includes -TARGET_INCLUDE_DIRECTORIES(${TARGET_LIBNAME_COMMON} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") +TARGET_INCLUDE_DIRECTORIES(${TARGET_LIBNAME_COMMON} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../") # Target - deps APPLY_PKG_CONFIG(${TARGET_LIBNAME_COMMON} PUBLIC PKGMGR_DEPS diff --git a/common/src/app_installer.cc b/src/common/app_installer.cc similarity index 95% rename from common/src/app_installer.cc rename to src/common/app_installer.cc index 8a921c8..d9262d0 100644 --- a/common/src/app_installer.cc +++ b/src/common/app_installer.cc @@ -3,8 +3,8 @@ #include #include -#include "include/app_installer.h" -#include "include/context_installer.h" +#include "common/app_installer.h" +#include "common/context_installer.h" namespace common_installer { diff --git a/common/include/app_installer.h b/src/common/app_installer.h similarity index 94% rename from common/include/app_installer.h rename to src/common/app_installer.h index 80f5063..c2af146 100644 --- a/common/include/app_installer.h +++ b/src/common/app_installer.h @@ -5,7 +5,7 @@ #include -#include "include/step/step.h" +#include "common/step/step.h" namespace common_installer { diff --git a/common/src/context_installer.cc b/src/common/context_installer.cc similarity index 91% rename from common/src/context_installer.cc rename to src/common/context_installer.cc index f83095f..9c123bb 100644 --- a/common/src/context_installer.cc +++ b/src/common/context_installer.cc @@ -1,6 +1,6 @@ /* 2014, Copyright © Intel Coporation, license APACHE-2.0, see LICENSE file */ -#include "include/context_installer.h" +#include "common/context_installer.h" #include #include diff --git a/common/include/context_installer.h b/src/common/context_installer.h similarity index 100% rename from common/include/context_installer.h rename to src/common/context_installer.h diff --git a/common/include/step/step.h b/src/common/step/step.h similarity index 96% rename from common/include/step/step.h rename to src/common/step/step.h index 10f0636..3a90f9c 100644 --- a/common/include/step/step.h +++ b/src/common/step/step.h @@ -23,7 +23,7 @@ #ifndef COMMON_INCLUDE_STEP_STEP_H_ #define COMMON_INCLUDE_STEP_STEP_H_ -#include "include/context_installer.h" +#include "common/context_installer.h" namespace common_installer { diff --git a/common/src/step/step_copy.cc b/src/common/step/step_copy.cc similarity index 96% rename from common/src/step/step_copy.cc rename to src/common/step/step_copy.cc index c10fbb9..9d0975e 100644 --- a/common/src/step/step_copy.cc +++ b/src/common/step/step_copy.cc @@ -1,12 +1,12 @@ /* 2014, Copyright © Intel Coporation, license APACHE-2.0, see LICENSE file */ -#include "include/step/step_copy.h" +#include "common/step/step_copy.h" #include #include #include -#include "include/utils.h" +#include "common/utils.h" #define DBG(msg) std::cout << "[Copy] " << msg << std::endl; #define ERR(msg) std::cout << "[ERROR: Copy] " << msg << std::endl; diff --git a/common/include/step/step_copy.h b/src/common/step/step_copy.h similarity index 87% rename from common/include/step/step_copy.h rename to src/common/step/step_copy.h index 98785c0..4edf48f 100644 --- a/common/include/step/step_copy.h +++ b/src/common/step/step_copy.h @@ -3,9 +3,9 @@ #ifndef COMMON_INCLUDE_STEP_STEP_COPY_H_ #define COMMON_INCLUDE_STEP_STEP_COPY_H_ -#include "include/context_installer.h" +#include "common/context_installer.h" -#include "include/step/step.h" +#include "common/step/step.h" namespace common_installer { namespace copy { diff --git a/common/src/step/step_signature.cc b/src/common/step/step_signature.cc similarity index 87% rename from common/src/step/step_signature.cc rename to src/common/step/step_signature.cc index 5185df8..3e15ad0 100644 --- a/common/src/step/step_signature.cc +++ b/src/common/step/step_signature.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by an apache 2.0 license that can be // found in the LICENSE file. -#include +#include "common/step/step_signature.h" #include #include -#include +#include "signature/signature_validator.h" namespace bf = boost::filesystem; diff --git a/common/include/step/step_signature.h b/src/common/step/step_signature.h similarity index 90% rename from common/include/step/step_signature.h rename to src/common/step/step_signature.h index 6a5e5a6..5ad725b 100644 --- a/common/include/step/step_signature.h +++ b/src/common/step/step_signature.h @@ -5,8 +5,8 @@ #ifndef COMMON_STEP_STEP_SIGNATURE_H_ #define COMMON_STEP_STEP_SIGNATURE_H_ -#include "context_installer.h" -#include "step.h" +#include "common/context_installer.h" +#include "common/step/step.h" namespace common_installer { namespace signature { diff --git a/common/src/step/step_unzip.cc b/src/common/step/step_unzip.cc similarity index 98% rename from common/src/step/step_unzip.cc rename to src/common/step/step_unzip.cc index 766e539..f953390 100644 --- a/common/src/step/step_unzip.cc +++ b/src/common/step/step_unzip.cc @@ -1,6 +1,6 @@ /* 2014, Copyright © Intel Coporation, license APACHE-2.0, see LICENSE file */ -#include "include/step/step_unzip.h" +#include "common/step/step_unzip.h" #include #include @@ -18,7 +18,7 @@ #include #include -#include "include/utils.h" +#include "common/utils.h" #define DBG(msg) std::cout << "[Unzip] " << msg << std::endl; #define ERR(msg) std::cout << "[ERROR: Unzip] " << msg << std::endl; diff --git a/common/include/step/step_unzip.h b/src/common/step/step_unzip.h similarity index 91% rename from common/include/step/step_unzip.h rename to src/common/step/step_unzip.h index caa536e..6623382 100644 --- a/common/include/step/step_unzip.h +++ b/src/common/step/step_unzip.h @@ -5,8 +5,8 @@ #include -#include "include/context_installer.h" -#include "include/step/step.h" +#include "common/context_installer.h" +#include "common/step/step.h" namespace common_installer { namespace unzip { diff --git a/common/src/utils.cc b/src/common/utils.cc similarity index 98% rename from common/src/utils.cc rename to src/common/utils.cc index 9f58a3b..1f70185 100644 --- a/common/src/utils.cc +++ b/src/common/utils.cc @@ -1,6 +1,6 @@ /* 2014, Copyright © Intel Coporation, license APACHE-2.0, see LICENSE file */ -#include "include/utils.h" +#include "common/utils.h" #include #include diff --git a/common/include/utils.h b/src/common/utils.h similarity index 100% rename from common/include/utils.h rename to src/common/utils.h diff --git a/native/CMakeLists.txt b/src/native/CMakeLists.txt similarity index 89% rename from native/CMakeLists.txt rename to src/native/CMakeLists.txt index 660c439..03cc0d8 100644 --- a/native/CMakeLists.txt +++ b/src/native/CMakeLists.txt @@ -1,11 +1,11 @@ # Target - sources SET(SRCS - src/tpk-backend.cxx + tpk-backend.cc ) # Target - definition ADD_EXECUTABLE(${TARGET_NATIVE_BACKEND} ${SRCS}) # Target - includes -TARGET_INCLUDE_DIRECTORIES(${TARGET_NATIVE_BACKEND} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/src/") +TARGET_INCLUDE_DIRECTORIES(${TARGET_NATIVE_BACKEND} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../") # Target - deps APPLY_PKG_CONFIG(${TARGET_NATIVE_BACKEND} PUBLIC PKGMGR_INSTALLER_DEPS diff --git a/signature/CMakeLists.txt b/src/signature/CMakeLists.txt similarity index 79% rename from signature/CMakeLists.txt rename to src/signature/CMakeLists.txt index 15f91cf..6ef981c 100644 --- a/signature/CMakeLists.txt +++ b/src/signature/CMakeLists.txt @@ -1,14 +1,14 @@ # Target - sources SET(SRCS - src/signature_data.cc - src/signature_parser.cc - src/signature_validator.cc - src/signature_xmlsec_adaptor.cc + signature_data.cc + signature_parser.cc + signature_validator.cc + signature_xmlsec_adaptor.cc ) # Target - definition ADD_LIBRARY(${TARGET_LIBNAME_SIGNATURE} SHARED ${SRCS}) # Target - includes -TARGET_INCLUDE_DIRECTORIES(${TARGET_LIBNAME_SIGNATURE} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") +TARGET_INCLUDE_DIRECTORIES(${TARGET_LIBNAME_SIGNATURE} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../") # Target - deps APPLY_PKG_CONFIG(${TARGET_LIBNAME_SIGNATURE} PUBLIC OPENSSL_DEPS diff --git a/signature/include/logging.h b/src/signature/logging.h similarity index 100% rename from signature/include/logging.h rename to src/signature/logging.h diff --git a/signature/include/marcos.h b/src/signature/marcos.h similarity index 100% rename from signature/include/marcos.h rename to src/signature/marcos.h diff --git a/signature/src/signature_data.cc b/src/signature/signature_data.cc similarity index 95% rename from signature/src/signature_data.cc rename to src/signature/signature_data.cc index 36753ee..d7fc949 100644 --- a/signature/src/signature_data.cc +++ b/src/signature/signature_data.cc @@ -5,7 +5,7 @@ // Part of this file is redistributed from crosswalk project under BDS-style // license. Check LICENSE-xwalk file. -#include +#include "signature/signature_data.h" namespace common_installer { namespace signature { diff --git a/signature/include/signature_data.h b/src/signature/signature_data.h similarity index 99% rename from signature/include/signature_data.h rename to src/signature/signature_data.h index ef70093..3046008 100644 --- a/signature/include/signature_data.h +++ b/src/signature/signature_data.h @@ -16,7 +16,7 @@ #include #include -#include +#include "signature/marcos.h" namespace common_installer { namespace signature { diff --git a/signature/src/signature_parser.cc b/src/signature/signature_parser.cc similarity index 99% rename from signature/src/signature_parser.cc rename to src/signature/signature_parser.cc index 9c03714..c216fbb 100644 --- a/signature/src/signature_parser.cc +++ b/src/signature/signature_parser.cc @@ -6,7 +6,7 @@ // Part of this file is redistributed from crosswalk project under BDS-style // license. Check LICENSE-xwalk file. -#include +#include "signature/signature_parser.h" #include #include @@ -20,8 +20,8 @@ #include #include -#include -#include +#include "signature/logging.h" +#include "signature/marcos.h" namespace { const char kExpectedXmlns[] = "http://www.w3.org/2000/09/xmldsig#"; diff --git a/signature/include/signature_parser.h b/src/signature/signature_parser.h similarity index 92% rename from signature/include/signature_parser.h rename to src/signature/signature_parser.h index 3cea5ab..96bad1d 100644 --- a/signature/include/signature_parser.h +++ b/src/signature/signature_parser.h @@ -12,8 +12,8 @@ #include -#include -#include +#include "signature/marcos.h" +#include "signature/signature_data.h" namespace common_installer { namespace signature { diff --git a/signature/src/signature_validator.cc b/src/signature/signature_validator.cc similarity index 97% rename from signature/src/signature_validator.cc rename to src/signature/signature_validator.cc index 580b78b..05d6427 100644 --- a/signature/src/signature_validator.cc +++ b/src/signature/signature_validator.cc @@ -5,7 +5,7 @@ // Part of this file is redistributed from crosswalk project under BDS-style // license. Check LICENSE-xwalk file. -#include +#include "signature/signature_validator.h" #include #include @@ -16,10 +16,10 @@ #include #include -#include -#include -#include -#include +#include "signature/logging.h" +#include "signature/signature_data.h" +#include "signature/signature_parser.h" +#include "signature/signature_xmlsec_adaptor.h" namespace bf = boost::filesystem; diff --git a/signature/include/signature_validator.h b/src/signature/signature_validator.h similarity index 96% rename from signature/include/signature_validator.h rename to src/signature/signature_validator.h index 06c0117..6b55c77 100644 --- a/signature/include/signature_validator.h +++ b/src/signature/signature_validator.h @@ -12,7 +12,7 @@ #include -#include +#include "signature/marcos.h" namespace common_installer { namespace signature { diff --git a/signature/src/signature_xmlsec_adaptor.cc b/src/signature/signature_xmlsec_adaptor.cc similarity index 99% rename from signature/src/signature_xmlsec_adaptor.cc rename to src/signature/signature_xmlsec_adaptor.cc index c42226e..20f44ef 100644 --- a/signature/src/signature_xmlsec_adaptor.cc +++ b/src/signature/signature_xmlsec_adaptor.cc @@ -6,7 +6,7 @@ // Part of this file is redistributed from crosswalk project under BDS-style // license. Check LICENSE-xwalk file. -#include +#include "signature/signature_xmlsec_adaptor.h" #include #include @@ -34,7 +34,7 @@ #include #include -#include +#include "signature/logging.h" namespace bai = boost::archive::iterators; namespace bf = boost::filesystem; diff --git a/signature/include/signature_xmlsec_adaptor.h b/src/signature/signature_xmlsec_adaptor.h similarity index 95% rename from signature/include/signature_xmlsec_adaptor.h rename to src/signature/signature_xmlsec_adaptor.h index 1780440..f74e65e 100644 --- a/signature/include/signature_xmlsec_adaptor.h +++ b/src/signature/signature_xmlsec_adaptor.h @@ -10,7 +10,7 @@ #include -#include +#include "signature/signature_data.h" namespace common_installer { namespace signature { diff --git a/wgt/CMakeLists.txt b/src/wgt/CMakeLists.txt similarity index 89% rename from wgt/CMakeLists.txt rename to src/wgt/CMakeLists.txt index 23fd338..067de56 100644 --- a/wgt/CMakeLists.txt +++ b/src/wgt/CMakeLists.txt @@ -1,11 +1,11 @@ # Target - sources SET(SRCS - src/wgt_backend.cc + wgt_backend.cc ) # Target - definition ADD_EXECUTABLE(${TARGET_WGT_BACKEND} ${SRCS}) # Target - includes -TARGET_INCLUDE_DIRECTORIES(${TARGET_WGT_BACKEND} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/src/") +TARGET_INCLUDE_DIRECTORIES(${TARGET_WGT_BACKEND} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../") # Target - deps APPLY_PKG_CONFIG(${TARGET_WGT_BACKEND} PUBLIC PKGMGR_INSTALLER_DEPS diff --git a/wgt/src/step_parse.cc b/src/wgt/step_parse.cc similarity index 94% rename from wgt/src/step_parse.cc rename to src/wgt/step_parse.cc index 4c24a21..8633822 100644 --- a/wgt/src/step_parse.cc +++ b/src/wgt/step_parse.cc @@ -1,9 +1,9 @@ -#include -#include #include #include #include +#include "common/app_installer.h" +#include "common/step.h" namespace { diff --git a/wgt/src/wgt_backend.cc b/src/wgt/wgt_backend.cc similarity index 91% rename from wgt/src/wgt_backend.cc rename to src/wgt/wgt_backend.cc index c90cc5c..961637a 100644 --- a/wgt/src/wgt_backend.cc +++ b/src/wgt/wgt_backend.cc @@ -12,10 +12,10 @@ #include #include -#include "include/app_installer.h" -#include "include/step/step_unzip.h" -#include "include/step/step_signature.h" -#include "include/step/step_copy.h" +#include "common/app_installer.h" +#include "common/step/step_unzip.h" +#include "common/step/step_signature.h" +#include "common/step/step_copy.h" int main(int argc, char **argv) { /* get request data */ diff --git a/xpk/CMakeLists.txt b/src/xpk/CMakeLists.txt similarity index 89% rename from xpk/CMakeLists.txt rename to src/xpk/CMakeLists.txt index e1f2a6d..28bc871 100644 --- a/xpk/CMakeLists.txt +++ b/src/xpk/CMakeLists.txt @@ -1,11 +1,11 @@ # Target - sources SET(SRCS - src/xpk-backend.cxx + xpk_backend.cc ) # Target - definition ADD_EXECUTABLE(${TARGET_XPK_BACKEND} ${SRCS}) # Target - includes -TARGET_INCLUDE_DIRECTORIES(${TARGET_XPK_BACKEND} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/src/") +TARGET_INCLUDE_DIRECTORIES(${TARGET_XPK_BACKEND} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../") # Target - deps APPLY_PKG_CONFIG(${TARGET_XPK_BACKEND} PUBLIC PKGMGR_INSTALLER_DEPS diff --git a/tools/check-coding-style b/tools/check-coding-style index 0d35434..fd60481 100755 --- a/tools/check-coding-style +++ b/tools/check-coding-style @@ -15,7 +15,7 @@ cd $BASE/.. # filters FILTERS="-readability/streams,-build/c++11" -cpplint.py --filter="$FILTERS" $(find . \( -name '*.h' -o -name '*.cc' \) ) +cpplint.py --root=src --filter="$FILTERS" $(find . \( -name '*.h' -o -name '*.cc' \) ) RET=$? JS_RET_VAL=$? -- 2.7.4