diff options
author | Li, Xiaoming <lixm.fnst@cn.fujitsu.com> | 2020-06-22 11:07:30 +0800 |
---|---|---|
committer | Li Xiaoming <lixm.fnst@cn.fujitsu.com> | 2020-07-21 12:31:15 +0000 |
commit | abb024ffcbf800a51dc7a7c513611141d82b2a3b (patch) | |
tree | d527d9ffb743460058ef3f275cd063efcb65a9d8 | |
parent | 0c6f41e5965d0013cd871659c52c9abb1057550c (diff) |
Fix test folder structureneedlefish_13.93.0needlefish/13.93.0marlin_12.93.0marlin_12.92.0marlin_12.91.0marlin_12.90.1marlin_12.90.0marlin/12.93.0marlin/12.92.0marlin/12.91.0marlin/12.90.1marlin/12.90.0lamprey_11.92.0lamprey_11.91.0lamprey/11.92.0lamprey/11.91.0koi_10.93.0koi_10.92.0koi_10.91.0koi/10.93.0koi/10.92.0koi/10.91.0jellyfish_9.99.4jellyfish_9.99.3jellyfish_9.99.2jellyfish/9.99.4jellyfish/9.99.3jellyfish/9.99.29.99.49.99.39.99.213.93.012.93.012.92.012.91.012.90.112.90.011.92.011.91.010.93.010.92.010.91.0
The test folder should rest in the root of a package.
Bug-AGL: SPEC-2807
Change-Id: I6e44e68f40aaf58d2c59973e6a2413947dcb4eaf
Signed-off-by: Li, Xiaoming <lixm.fnst@cn.fujitsu.com>
-rw-r--r-- | CMakeLists.txt (renamed from binding/src/CMakeLists.txt) | 20 | ||||
-rw-r--r-- | LICENSE (renamed from binding/LICENSE) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | autobuild/agl/autobuild (renamed from binding/autobuild/agl/autobuild) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | autobuild/linux/autobuild (renamed from binding/autobuild/linux/autobuild) | 0 | ||||
-rw-r--r-- | binding/CMakeLists.txt | 20 | ||||
-rw-r--r-- | binding/binding-api.c (renamed from binding/src/binding-api.c) | 0 | ||||
-rw-r--r-- | binding/binding-api.h (renamed from binding/src/binding-api.h) | 0 | ||||
-rw-r--r-- | binding/verbs.cpp (renamed from binding/src/verbs.cpp) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | conf.d/cmake/config.cmake (renamed from binding/conf.d/cmake/config.cmake) | 0 | ||||
-rw-r--r-- | conf.d/wgt/config.xml.in (renamed from binding/conf.d/wgt/config.xml.in) | 0 |
10 files changed, 20 insertions, 20 deletions
diff --git a/binding/src/CMakeLists.txt b/CMakeLists.txt index 0ac597f..459773a 100644 --- a/binding/src/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,7 @@ ########################################################################### # Copyright 2015, 2016, 2017 IoT.bzh # -# author: Fulup Ar Foll <fulup@iot.bzh> -# contrib: Romain Forlot <romain.forlot@iot.bzh> +# author: Romain Forlot <romain.forlot@iot.bzh> # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,20 +16,7 @@ # limitations under the License. ########################################################################### -# Add target to project dependency list -PROJECT_TARGET_ADD(afm-poi-binding) +CMAKE_MINIMUM_REQUIRED(VERSION 3.3) - # Define project Targets - add_library(afm-poi-binding MODULE binding-api.h binding-api.c verbs.cpp) - - # Binder exposes a unique public entry point - SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES - PREFIX "lib" - LABELS "BINDING" - LINK_FLAGS ${BINDINGS_LINK_FLAG} - OUTPUT_NAME ${TARGET_NAME} - ) - - # Library dependencies (include updates automatically) - TARGET_LINK_LIBRARIES(${TARGET_NAME} ${link_libraries}) +include(${CMAKE_CURRENT_SOURCE_DIR}/conf.d/cmake/config.cmake) diff --git a/binding/LICENSE b/LICENSE index 31c692a..31c692a 100644 --- a/binding/LICENSE +++ b/LICENSE diff --git a/binding/autobuild/agl/autobuild b/autobuild/agl/autobuild index a7c25ae..a7c25ae 100755..100644 --- a/binding/autobuild/agl/autobuild +++ b/autobuild/agl/autobuild diff --git a/binding/autobuild/linux/autobuild b/autobuild/linux/autobuild index a7c25ae..a7c25ae 100755..100644 --- a/binding/autobuild/linux/autobuild +++ b/autobuild/linux/autobuild diff --git a/binding/CMakeLists.txt b/binding/CMakeLists.txt index 459773a..0ac597f 100644 --- a/binding/CMakeLists.txt +++ b/binding/CMakeLists.txt @@ -1,7 +1,8 @@ ########################################################################### # Copyright 2015, 2016, 2017 IoT.bzh # -# author: Romain Forlot <romain.forlot@iot.bzh> +# author: Fulup Ar Foll <fulup@iot.bzh> +# contrib: Romain Forlot <romain.forlot@iot.bzh> # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,7 +17,20 @@ # limitations under the License. ########################################################################### -CMAKE_MINIMUM_REQUIRED(VERSION 3.3) +# Add target to project dependency list +PROJECT_TARGET_ADD(afm-poi-binding) -include(${CMAKE_CURRENT_SOURCE_DIR}/conf.d/cmake/config.cmake) + # Define project Targets + add_library(afm-poi-binding MODULE binding-api.h binding-api.c verbs.cpp) + + # Binder exposes a unique public entry point + SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES + PREFIX "lib" + LABELS "BINDING" + LINK_FLAGS ${BINDINGS_LINK_FLAG} + OUTPUT_NAME ${TARGET_NAME} + ) + + # Library dependencies (include updates automatically) + TARGET_LINK_LIBRARIES(${TARGET_NAME} ${link_libraries}) diff --git a/binding/src/binding-api.c b/binding/binding-api.c index 5221cda..5221cda 100644 --- a/binding/src/binding-api.c +++ b/binding/binding-api.c diff --git a/binding/src/binding-api.h b/binding/binding-api.h index e274f9a..e274f9a 100644 --- a/binding/src/binding-api.h +++ b/binding/binding-api.h diff --git a/binding/src/verbs.cpp b/binding/verbs.cpp index f71698a..f71698a 100644 --- a/binding/src/verbs.cpp +++ b/binding/verbs.cpp diff --git a/binding/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index f16f1c3..f16f1c3 100755..100644 --- a/binding/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake diff --git a/binding/conf.d/wgt/config.xml.in b/conf.d/wgt/config.xml.in index 3d649cc..3d649cc 100644 --- a/binding/conf.d/wgt/config.xml.in +++ b/conf.d/wgt/config.xml.in |