[SSM] change soft sensor description folder path

1. Change folder path
2. Set release folder for documentation

Change-Id: I2c307c813f87631122eec7e867845192739937b5
Signed-off-by: jk13 <jihyeok13.kim@samsung.com>

diff --git a/service/soft-sensor-manager/SConscript b/service/soft-sensor-manager/SConscript
index 563da99..687b690 100644 (file)
--- a/service/soft-sensor-manager/SConscript
+++ b/service/soft-sensor-manager/SConscript
@@ -104,4 +104,13 @@ ssmcore_env.InstallTarget(libssmcore, 'libSSMCORE')
 #######################################################################
 ## build SampleApp
 #######################################################################
-SConscript('SampleApp/SConscript')
\ No newline at end of file
+SConscript('SampleApp/SConscript')
+
+
+######################################################################
+# Copy description xml and deliverables
+######################################################################
+Command("SSMTesterApp","SampleApp/linux/SSMTesterApp/SSMTesterApp", Copy("$TARGET", "$SOURCE"))
+Command("SoftSensorDescription.xml", "SoftSensorPlugin/SoftSensorDescription.xml", Copy("$TARGET", "$SOURCE"))
+Command("THSensorApp","SampleApp/linux/THSensorApp/THSensorApp", Copy("$TARGET", "$SOURCE"))
+Command("THSensorApp1","SampleApp/linux/THSensorApp1/THSensorApp1", Copy("$TARGET", "$SOURCE"))
\ No newline at end of file

diff --git a/service/soft-sensor-manager/SampleApp/linux/SSMTesterApp/SConscript b/service/soft-sensor-manager/SampleApp/linux/SSMTesterApp/SConscript
index 3c0fb46..30f44d6 100644 (file)
--- a/service/soft-sensor-manager/SampleApp/linux/SSMTesterApp/SConscript
+++ b/service/soft-sensor-manager/SampleApp/linux/SSMTesterApp/SConscript
@@ -31,5 +31,5 @@ linux_sample_env.AppendUnique(LIBS = ['pthread'])
 #build sampleapp
 ######################################################################
 ssmtesterapp = linux_sample_env.Program('SSMTesterApp', 'src/SSMTestApp.cpp')
-Alias("SSMTesterApp", ssmtesterapp)
+Alias("ssmtesterapp_sample", ssmtesterapp)
 env.AppendTarget('SSMTesterApp')

diff --git a/service/soft-sensor-manager/SampleApp/linux/THSensorApp1/SConscript b/service/soft-sensor-manager/SampleApp/linux/THSensorApp1/SConscript
index f6c65fa..a238dc0 100644 (file)
--- a/service/soft-sensor-manager/SampleApp/linux/THSensorApp1/SConscript
+++ b/service/soft-sensor-manager/SampleApp/linux/THSensorApp1/SConscript
@@ -25,6 +25,6 @@ linux_sample_env.AppendUnique(LIBS = ['pthread'])
 ######################################################################
 #build sampleapp
 ######################################################################
-thsensorapp1 = linux_sample_env.Program('THSensorApp', 'src/ThingResourceServer1.cpp')
+thsensorapp1 = linux_sample_env.Program('THSensorApp1', 'src/ThingResourceServer1.cpp')
 Alias("thsensorapp1_sample", thsensorapp1)
 env.AppendTarget('thsensorapp1_sample')

diff --git a/service/soft-sensor-manager/SoftSensorPlugin/DiscomfortIndexSensor/SoftSensorDescription.xml b/service/soft-sensor-manager/SoftSensorPlugin/DiscomfortIndexSensor/SoftSensorDescription.xml
deleted file mode 100644 (file)
index 7910214..0000000
--- a/service/soft-sensor-manager/SoftSensorPlugin/DiscomfortIndexSensor/SoftSensorDescription.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<softsensors>
-       
-  <softsensor>
-    <name>DiscomfortIndexSensor</name>
-    <attributes>
-      <attribute>
-        <name>version</name>
-        <type>string</type>
-        <value>1.0</value>
-      </attribute>
-      <attribute>
-        <name>lifetime</name>
-        <type>int</type>
-        <value>60</value>
-      </attribute>
-    </attributes>
-    <outputs>
-      <output>
-        <name>timestamp</name>
-        <type>string</type>
-      </output>
-      <output>
-        <name>temperature</name>
-        <type>string</type>
-      </output>
-      <output>
-        <name>humidity</name>
-        <type>string</type>
-      </output>
-      <output>
-        <name>discomfortIndex</name>
-        <type>int</type>
-      </output>
-    </outputs>
-    <inputs>
-      <input>Thing_TempHumSensor</input>
-      <input>Thing_TempHumSensor1</input>
-    </inputs>
-  </softsensor>
-  
-</softsensors>

diff --git a/service/soft-sensor-manager/SoftSensorPlugin/DiscomfortIndexSensor/build/linux/Makefile b/service/soft-sensor-manager/SoftSensorPlugin/DiscomfortIndexSensor/build/linux/Makefile
index 4aae123..d87e604 100644 (file)
--- a/service/soft-sensor-manager/SoftSensorPlugin/DiscomfortIndexSensor/build/linux/Makefile
+++ b/service/soft-sensor-manager/SoftSensorPlugin/DiscomfortIndexSensor/build/linux/Makefile
@@ -38,7 +38,7 @@ ${TARGET}: ${OBJLIST}
 post_job:
        @echo " " 
        cp -Rdp ./${RST_NAME}/lib${TARGET}.so ${OUTPUTS_DIR}/
-       cp -Rdp ../../${SSXML_NAME} ${OUTPUTS_DIR}/
+       cp -Rdp ../../../${SSXML_NAME} ${OUTPUTS_DIR}/
        @echo "-------------- ${TARGET} Build Successful. -------------"
        @echo "Enter to ${RST_NAME} folder."
        @echo " " 

diff --git a/service/soft-sensor-manager/SoftSensorPlugin/SoftSensorDescription.xml b/service/soft-sensor-manager/SoftSensorPlugin/SoftSensorDescription.xml
new file mode 100644 (file)
index 0000000..8686ff6
--- /dev/null
+++ b/service/soft-sensor-manager/SoftSensorPlugin/SoftSensorDescription.xml
@@ -0,0 +1,136 @@
+<softsensors>
+       
+  <softsensor>
+    <name>DiscomfortIndexSensor</name>
+    <attributes>
+      <attribute>
+        <name>version</name>
+        <type>string</type>
+        <value>1.0</value>
+      </attribute>
+      <attribute>
+        <name>lifetime</name>
+        <type>int</type>
+        <value>60</value>
+      </attribute>
+    </attributes>
+    <outputs>
+      <output>
+        <name>timestamp</name>
+        <type>string</type>
+      </output>
+      <output>
+        <name>temperature</name>
+        <type>string</type>
+      </output>
+      <output>
+        <name>humidity</name>
+        <type>string</type>
+      </output>
+      <output>
+        <name>discomfortIndex</name>
+        <type>int</type>
+      </output>
+    </outputs>
+    <inputs>
+      <input>Thing_TempHumSensor</input>
+      <input>Thing_TempHumSensor1</input>
+    </inputs>
+  </softsensor>
+  
+  <softsensor>
+    <name>IndoorTrajectorySensor</name>
+    <attributes>
+      <attribute>
+        <name>version</name>
+        <type>string</type>
+        <value>1.0</value>
+      </attribute>
+      <attribute>
+        <name>lifetime</name>
+        <type>int</type>
+        <value>60</value>
+      </attribute>
+    </attributes>
+    <outputs>
+      <output>
+        <name>trackeeID</name>
+        <type>string</type>
+      </output>
+      <output>
+        <name>timeT0</name>
+        <type>string</type>
+      </output>
+      <output>
+        <name>ref01T0</name>
+        <type>string</type>
+      </output>
+      <output>
+        <name>ref02T0</name>
+        <type>string</type>
+      </output>
+      <output>
+        <name>ref03T0</name>
+        <type>string</type>
+      </output>
+      <output>
+        <name>timeT1</name>
+        <type>string</type>
+      </output>
+      <output>
+        <name>ref01T1</name>
+        <type>string</type>
+      </output>
+      <output>
+        <name>ref02T1</name>
+        <type>string</type>
+      </output>
+      <output>
+        <name>ref03T1</name>
+        <type>string</type>
+      </output>
+    </outputs>
+    <inputs>
+      <input>Tracker_Thing</input>
+    </inputs>
+  </softsensor>
+  
+  <softsensor>
+    <name>ReferenceSensor</name>
+    <attributes>
+      <attribute>
+        <name>version</name>
+        <type>string</type>
+        <value>1.0</value>
+      </attribute>
+      <attribute>
+        <name>lifetime</name>
+        <type>int</type>
+        <value>60</value>
+      </attribute>
+    </attributes>
+    <outputs>
+      <output>
+        <name>macaddress</name>
+        <type>string</type>
+      </output>
+      <output>
+        <name>servicetype</name>
+        <type>string</type>
+      </output>
+      <output>
+        <name>macaddress1</name>
+        <type>string</type>
+      </output>
+      <output>
+        <name>servicetype1</name>
+        <type>string</type>
+      </output>
+    </outputs>
+    <inputs>
+      <input>Reference_Thing</input>
+      <input>Reference_Thing1</input>
+    </inputs>
+  </softsensor>
+  
+</softsensors>

diff --git a/service/soft-sensor-manager/build/linux/environment.mk b/service/soft-sensor-manager/build/linux/environment.mk
index 28d332c..500f7d1 100644 (file)
--- a/service/soft-sensor-manager/build/linux/environment.mk
+++ b/service/soft-sensor-manager/build/linux/environment.mk
@@ -9,7 +9,7 @@ IOT_CSDK_RELEASE=${IOT_BASE}/csdk/linux/release
 IOT_LOG_DIR=${IOT_BASE}/oc_logger
 IOT_LIB=liboc.a
 IOT_CSDK_LIB=liboctbstack.a
-IOT_LOG_LIB=liboc_logger.a
+IOT_LOG_LIB=oc_logger.a
 
 # service folder path.
 FD_SSM=${ROOT_DIR}/service/soft-sensor-manager