summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzheng_wenlong <wenlong_zheng@nexty-ele.com>2017-08-25 16:51:16 +0900
committerzheng_wenlong <wenlong_zheng@nexty-ele.com>2017-08-25 16:53:22 +0900
commit4ff6418f145dd4af3a1f5f8b6eba29b958a89521 (patch)
treeb6afcb080f6f92c1639c0ad21231201ad873b950
parent183e61cb341a9bb394b1e933edb66284211ef7e6 (diff)
Fix problem for not copy package folderdab_4.0.3dab/4.0.34.0.3dab
By add package folder but forgot copy it to binary directory. It will cause no config.xml, json in wgt file, and install error. So return to old version but with custom target name package. Change-Id: I156f920b8428357ea2fc8b9aa0725b9dee2a1df5 Signed-off-by: zheng_wenlong <wenlong_zheng@nexty-ele.com>
-rw-r--r--src/CMakeLists.txt6
-rw-r--r--src/config.xml (renamed from package/root/config.xml)0
-rw-r--r--src/gear_shift_para.json (renamed from package/root/gear_shift_para.json)0
-rw-r--r--src/steering_wheel.json (renamed from package/root/steering_wheel.json)0
-rw-r--r--src/steering_wheel_map.json (renamed from package/root/steering_wheel_map.json)0
5 files changed, 3 insertions, 3 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 71168a3..73377ca 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -79,9 +79,9 @@ set_target_properties(af-steering-wheel-binding PROPERTIES
LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/export.map"
)
-#add_custom_command(TARGET af-steering-wheel-binding POST_BUILD
-# COMMAND cp -f ${CMAKE_CURRENT_SOURCE_DIR}/config.xml ${CMAKE_CURRENT_SOURCE_DIR}/steering_wheel.json ${CMAKE_CURRENT_SOURCE_DIR}/icon.png ${PROJECT_BINARY_DIR}/package/root
-# COMMAND cp -f ${CMAKE_CURRENT_SOURCE_DIR}/steering_wheel_map.json ${CMAKE_CURRENT_SOURCE_DIR}/gear_shift_para.json ${PROJECT_BINARY_DIR}/package/root)
+add_custom_command(TARGET af-steering-wheel-binding POST_BUILD
+ COMMAND cp -f ${CMAKE_CURRENT_SOURCE_DIR}/config.xml ${CMAKE_CURRENT_SOURCE_DIR}/steering_wheel.json ${CMAKE_CURRENT_SOURCE_DIR}/icon.png ${PROJECT_BINARY_DIR}/package/root
+ COMMAND cp -f ${CMAKE_CURRENT_SOURCE_DIR}/steering_wheel_map.json ${CMAKE_CURRENT_SOURCE_DIR}/gear_shift_para.json ${PROJECT_BINARY_DIR}/package/root)
add_custom_target(package DEPENDS ${PROJECT_BINARY_DIR}/package/root
COMMAND wgtpkg-pack -f -o ${PROJECT_BINARY_DIR}/package/${PROJECT_NAME}.wgt ${PROJECT_BINARY_DIR}/package/root)
diff --git a/package/root/config.xml b/src/config.xml
index 9f3370a..9f3370a 100644
--- a/package/root/config.xml
+++ b/src/config.xml
diff --git a/package/root/gear_shift_para.json b/src/gear_shift_para.json
index 3b58da7..3b58da7 100644
--- a/package/root/gear_shift_para.json
+++ b/src/gear_shift_para.json
diff --git a/package/root/steering_wheel.json b/src/steering_wheel.json
index 1a5e889..1a5e889 100644
--- a/package/root/steering_wheel.json
+++ b/src/steering_wheel.json
diff --git a/package/root/steering_wheel_map.json b/src/steering_wheel_map.json
index 9e580d9..9e580d9 100644
--- a/package/root/steering_wheel_map.json
+++ b/src/steering_wheel_map.json