From 4ff6418f145dd4af3a1f5f8b6eba29b958a89521 Mon Sep 17 00:00:00 2001
From: zheng_wenlong <wenlong_zheng@nexty-ele.com>
Date: Fri, 25 Aug 2017 16:51:16 +0900
Subject: Fix problem for not copy package folder

    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>
---
 package/root/config.xml              | 21 ---------------------
 package/root/gear_shift_para.json    | 32 --------------------------------
 package/root/steering_wheel.json     |  5 -----
 package/root/steering_wheel_map.json | 36 ------------------------------------
 src/CMakeLists.txt                   |  6 +++---
 src/config.xml                       | 21 +++++++++++++++++++++
 src/gear_shift_para.json             | 32 ++++++++++++++++++++++++++++++++
 src/steering_wheel.json              |  5 +++++
 src/steering_wheel_map.json          | 36 ++++++++++++++++++++++++++++++++++++
 9 files changed, 97 insertions(+), 97 deletions(-)
 delete mode 100644 package/root/config.xml
 delete mode 100644 package/root/gear_shift_para.json
 delete mode 100644 package/root/steering_wheel.json
 delete mode 100644 package/root/steering_wheel_map.json
 create mode 100644 src/config.xml
 create mode 100644 src/gear_shift_para.json
 create mode 100644 src/steering_wheel.json
 create mode 100644 src/steering_wheel_map.json

diff --git a/package/root/config.xml b/package/root/config.xml
deleted file mode 100644
index 9f3370a..0000000
--- a/package/root/config.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<widget xmlns="http://www.w3.org/ns/widgets" id="agl-service-steering-wheel" version="1.0">
-  <name>steering-wheel-service</name>
-  <icon src="icon.png"/>
-  <content src="config.xml" type="application/vnd.agl.service"/>
-  <description>The name says it all!</description>
-  <author>TOYOTA</author>
-  <license>APL2.0</license>
-  <feature name="urn:AGL:widget:provided-api">
-     <param name="steering-wheel" value="ws" />
-  </feature>
-  <feature name="urn:AGL:widget:required-api">
-	<param name="lib/af-steering-wheel-binding.so" value="local" />
-  </feature>
-  <feature name="urn:AGL:widget:required-permission">
-	<param name="#target" value="main" />
-	<param name="urn:AGL:permission::public:hidden" value="required" />
-  </feature>
-</widget>
-
-
diff --git a/package/root/gear_shift_para.json b/package/root/gear_shift_para.json
deleted file mode 100644
index 3b58da7..0000000
--- a/package/root/gear_shift_para.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"GEAR_PARA" : [
-		{
-		"POS"			: "First",
-		"VAL"			: "4.12",
-		},
-		{
-		"POS"			: "Second",
-		"VAL"			: "2.84",
-		},
-		{
-		"POS"			: "Third",
-		"VAL"			: "2.28",
-		},
-		{
-		"POS"			: "Fourth",
-		"VAL"			: "1.45",
-		},
-		{
-		"POS"			: "Fifth",
-		"VAL"			: "1.0",
-		},
-		{
-		"POS"			: "Sixth",
-		"VAL"			: "0.69",
-		},
-		{
-		"POS"			: "Reverse",
-		"VAL"			: "3.21",
-		},
-	]
-}
\ No newline at end of file
diff --git a/package/root/steering_wheel.json b/package/root/steering_wheel.json
deleted file mode 100644
index 1a5e889..0000000
--- a/package/root/steering_wheel.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	"dev_name":  "/dev/input/js0",
-	"wheel_map": "steering_wheel_map.json",
-	"gear_para": "gear_shift_para.json"
-}
diff --git a/package/root/steering_wheel_map.json b/package/root/steering_wheel_map.json
deleted file mode 100644
index 9e580d9..0000000
--- a/package/root/steering_wheel_map.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	"PROPERTYS" : [
-		{
-		"PROPERTY"		: "VehicleSpeed",
-		"TYPE"			: "uint16_t",
-		},
-		{
-		"PROPERTY"		: "EngineSpeed",
-		"TYPE"			: "uint16_t",
-		},
-		{
-		"PROPERTY"		: "AcceleratorPedalPosition",
-		"TYPE"			: "uint16_t",
-		},
-		{
-		"PROPERTY"		: "TransmissionGearInfo",
-		"TYPE"			: "uint16_t",
-		},
-		{
-		"PROPERTY"		: "TransmissionMode",
-		"TYPE"			: "uint16_t",
-		},
-		{
-		"PROPERTY"		: "SteeringWheelAngle",
-		"TYPE"			: "uint16_t",
-		},
-		{
-		"PROPERTY"		: "TurnSignalStatus",
-		"TYPE"			: "uint16_t",
-		},
-		{
-		"PROPERTY"		: "LightStatusBrake",
-		"TYPE"			: "bool",
-		},
-	]
-}
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/src/config.xml b/src/config.xml
new file mode 100644
index 0000000..9f3370a
--- /dev/null
+++ b/src/config.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<widget xmlns="http://www.w3.org/ns/widgets" id="agl-service-steering-wheel" version="1.0">
+  <name>steering-wheel-service</name>
+  <icon src="icon.png"/>
+  <content src="config.xml" type="application/vnd.agl.service"/>
+  <description>The name says it all!</description>
+  <author>TOYOTA</author>
+  <license>APL2.0</license>
+  <feature name="urn:AGL:widget:provided-api">
+     <param name="steering-wheel" value="ws" />
+  </feature>
+  <feature name="urn:AGL:widget:required-api">
+	<param name="lib/af-steering-wheel-binding.so" value="local" />
+  </feature>
+  <feature name="urn:AGL:widget:required-permission">
+	<param name="#target" value="main" />
+	<param name="urn:AGL:permission::public:hidden" value="required" />
+  </feature>
+</widget>
+
+
diff --git a/src/gear_shift_para.json b/src/gear_shift_para.json
new file mode 100644
index 0000000..3b58da7
--- /dev/null
+++ b/src/gear_shift_para.json
@@ -0,0 +1,32 @@
+{
+	"GEAR_PARA" : [
+		{
+		"POS"			: "First",
+		"VAL"			: "4.12",
+		},
+		{
+		"POS"			: "Second",
+		"VAL"			: "2.84",
+		},
+		{
+		"POS"			: "Third",
+		"VAL"			: "2.28",
+		},
+		{
+		"POS"			: "Fourth",
+		"VAL"			: "1.45",
+		},
+		{
+		"POS"			: "Fifth",
+		"VAL"			: "1.0",
+		},
+		{
+		"POS"			: "Sixth",
+		"VAL"			: "0.69",
+		},
+		{
+		"POS"			: "Reverse",
+		"VAL"			: "3.21",
+		},
+	]
+}
\ No newline at end of file
diff --git a/src/steering_wheel.json b/src/steering_wheel.json
new file mode 100644
index 0000000..1a5e889
--- /dev/null
+++ b/src/steering_wheel.json
@@ -0,0 +1,5 @@
+{
+	"dev_name":  "/dev/input/js0",
+	"wheel_map": "steering_wheel_map.json",
+	"gear_para": "gear_shift_para.json"
+}
diff --git a/src/steering_wheel_map.json b/src/steering_wheel_map.json
new file mode 100644
index 0000000..9e580d9
--- /dev/null
+++ b/src/steering_wheel_map.json
@@ -0,0 +1,36 @@
+{
+	"PROPERTYS" : [
+		{
+		"PROPERTY"		: "VehicleSpeed",
+		"TYPE"			: "uint16_t",
+		},
+		{
+		"PROPERTY"		: "EngineSpeed",
+		"TYPE"			: "uint16_t",
+		},
+		{
+		"PROPERTY"		: "AcceleratorPedalPosition",
+		"TYPE"			: "uint16_t",
+		},
+		{
+		"PROPERTY"		: "TransmissionGearInfo",
+		"TYPE"			: "uint16_t",
+		},
+		{
+		"PROPERTY"		: "TransmissionMode",
+		"TYPE"			: "uint16_t",
+		},
+		{
+		"PROPERTY"		: "SteeringWheelAngle",
+		"TYPE"			: "uint16_t",
+		},
+		{
+		"PROPERTY"		: "TurnSignalStatus",
+		"TYPE"			: "uint16_t",
+		},
+		{
+		"PROPERTY"		: "LightStatusBrake",
+		"TYPE"			: "bool",
+		},
+	]
+}
-- 
cgit 1.2.3-korg