Commit 71125f8f authored by Philippe Coval's avatar Philippe Coval Committed by Phil Coval

build: install experimental logging headers

Functions in payload_logging.h can be used in examples,
so it's installed in "experimental" sub namespace
along dependencies.

Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: If3a9e4309601c356ab9a2faaa9fbe26283408633
Signed-off-by: default avatarPhilippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21195Tested-by: default avatarjenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash's avatarGeorge Nash <george.nash@intel.com>
Reviewed-by: default avatarDan Mihai <Daniel.Mihai@microsoft.com>
parent 1484a56d
......@@ -23,7 +23,7 @@
#include "octypes.h"
#include "ConcurrentIotivityUtils.h"
#include "ocpayload.h"
#include "logger.h"
#include "experimental/logger.h"
#define TAG "CONCURRENT_IOTIVITY_UTILS"
......
......@@ -21,7 +21,7 @@
#include "curlClient.h"
#include <iostream>
#include "logger.h"
#include "experimental/logger.h"
using namespace std;
using namespace OC::Bridging;
......
......@@ -33,7 +33,7 @@
#include "pluginIf.h"
#include "pluginServer.h"
#include "cbor.h"
#include "logger.h"
#include "experimental/logger.h"
#include "StringConstants.h"
#define TAG "MESSAGE_HANDLER"
......
......@@ -34,7 +34,7 @@
#endif
#include "platform_features.h"
#include "oic_malloc.h"
#include "logger.h"
#include "experimental/logger.h"
#define TAG "PIPE_HANDLER"
......
......@@ -33,7 +33,7 @@
#include <sys/types.h>
#include <sys/wait.h>
#include "messageHandler.h"
#include "logger.h"
#include "experimental/logger.h"
#include "oic_malloc.h"
#include "mpmErrorCode.h"
#include "pluginIf.h"
......
......@@ -38,7 +38,7 @@
#include "oic_malloc.h"
#include "pluginIf.h"
#include "ocpayload.h"
#include "logger.h"
#include "experimental/logger.h"
#include "WorkQueue.h"
#include "ConcurrentIotivityUtils.h"
#include <iostream>
......
......@@ -25,7 +25,7 @@
#include "ocstack.h"
#include "octypes.h"
#include "ocpayload.h"
#include "logger.h"
#include "experimental/logger.h"
#include <string>
#define LOG "IOTIVITY_WORK_ITEM"
......
......@@ -40,7 +40,7 @@
#include "pluginIf.h"
#include "miniPluginManager.h"
#include "messageHandler.h"
#include "logger.h"
#include "experimental/logger.h"
pthread_t readResponsethreadhandle;
......
......@@ -39,7 +39,7 @@
#include "hue_defs.h"
#include "curlClient.h"
#include "cJSON.h"
#include "logger.h"
#include "experimental/logger.h"
#define TAG "HUE_AUTH"
......
......@@ -32,7 +32,7 @@
#include "cJSON.h"
#include <pthread.h>
#include <map>
#include "logger.h"
#include "experimental/logger.h"
#define TAG "HUE_FILE"
......
......@@ -21,7 +21,7 @@
#include "hue_bridge.h"
#include "curlClient.h"
#include "logger.h"
#include "experimental/logger.h"
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
......
......@@ -30,7 +30,7 @@
#include "writer.h"
#include "curlClient.h"
#include "JsonHelper.h"
#include "logger.h"
#include "experimental/logger.h"
#define TAG "HUE_LIGHT"
using namespace rapidjson;
......
......@@ -44,7 +44,7 @@
#include <iostream>
#include <map>
#include <mutex>
#include "logger.h"
#include "experimental/logger.h"
#include "mpmErrorCode.h"
#include "pluginServer.h"
#include "hue_light.h"
......
......@@ -34,7 +34,7 @@
#include "oic_malloc.h"
#include "oic_string.h"
#include "lifx.h"
#include "logger.h"
#include "experimental/logger.h"
#include "ConcurrentIotivityUtils.h"
using namespace std;
......
......@@ -32,7 +32,7 @@
#include <stdexcept>
#include <iostream>
#include "lifx.h"
#include "logger.h"
#include "experimental/logger.h"
#define TAG "LIFX"
using namespace OC::Bridging;
......
......@@ -20,7 +20,7 @@
//
#include "honeywellHelpers.h"
#include "logger.h"
#include "experimental/logger.h"
#include <stdlib.h> // realloc
#include <string.h> // memcpy
#include <sstream> // ostringstream
......
......@@ -51,7 +51,7 @@
#include "oic_malloc.h"
#include "oic_string.h"
#include "honeywellLyric.h"
#include "logger.h"
#include "experimental/logger.h"
#include "ConcurrentIotivityUtils.h"
#include "octypes.h"
#include "ocstack.h"
......
......@@ -32,7 +32,7 @@
#include "document.h"
#include "stringbuffer.h"
#include "writer.h"
#include "logger.h"
#include "experimental/logger.h"
#include <math.h> // for fmin
#include <sstream> // for stringstream
#include <map>
......
......@@ -30,7 +30,7 @@
#include "document.h"
#include "stringbuffer.h"
#include "writer.h"
#include "logger.h"
#include "experimental/logger.h"
#include <math.h> // for fmin
#include <sstream> // for stringstream
#include <map>
......
......@@ -31,7 +31,7 @@
#include "writer.h"
#include "stringbuffer.h"
#include "curlClient.h"
#include "logger.h"
#include "experimental/logger.h"
#include "../honeywellHelpers.h"
#define LOG_TAG "HONEYWELL_THERMOSTAT"
......
......@@ -37,7 +37,7 @@
#include <cstdlib>
#include <iostream>
#include <time.h>
#include "logger.h"
#include "experimental/logger.h"
#include "ConcurrentIotivityUtils.h"
#include "messageHandler.h"
#include "ocpayload.h"
......
......@@ -29,7 +29,7 @@
#include "stringbuffer.h"
#include "writer.h"
#include "JsonHelper.h"
#include "logger.h"
#include "experimental/logger.h"
using namespace rapidjson;
using namespace OC::Bridging;
......
......@@ -28,7 +28,7 @@
#include "writer.h"
#include "stringbuffer.h"
#include "curlClient.h"
#include "logger.h"
#include "experimental/logger.h"
#define TAG "NEST_THERMOSTAT"
......
......@@ -27,7 +27,7 @@
#include <set>
#include <assert.h>
#include <pluginServer.h>
#include "logger.h"
#include "experimental/logger.h"
#define TAG "STUB_PLUGIN"
......
......@@ -18,7 +18,7 @@
//
//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
#include <jni.h>
#include "logger.h"
#include "experimental/logger.h"
#include <stdio.h>
#include "caadapterutils.h"
#include "cainterface.h"
......
......@@ -24,7 +24,7 @@
#ifdef __ANDROID__
#include <android/log.h>
#else
#include "logger.h"
#include "experimental/logger.h"
#endif
#include "OCApi.h"
......
......@@ -34,9 +34,9 @@
#include <unistd.h>
#include <errno.h>
#include "ocstack.h"
#include "logger.h"
#include "experimental/logger.h"
#include "ocpayload.h"
#include "payload_logging.h"
#include "experimental/payload_logging.h"
#include "oic_string.h"
#define DEFAULT_CONTEXT_VALUE (0x99)
......
......@@ -21,7 +21,7 @@
#include "IotivityandZigbeeServer.h"
#include <signal.h>
#include <ocstack.h>
#include <logger.h>
#include "experimental/logger.h"
#include "oic_string.h"
#include "oic_malloc.h"
......
......@@ -32,7 +32,7 @@
#include "oic_malloc.h"
#include "ocstack.h"
#include "ocpayload.h"
#include "logger.h"
#include "experimental/logger.h"
#include <string.h>
#include <stdlib.h>
......
......@@ -28,7 +28,7 @@
#include "oic_malloc.h"
#include "oic_string.h"
#include "ocstack.h"
#include "logger.h"
#include "experimental/logger.h"
#define TAG "pluginlist"
......
......@@ -52,7 +52,7 @@
#include "ocpayload.h"
#include "oic_malloc.h"
#include "oic_string.h"
#include "logger.h"
#include "experimental/logger.h"
#define HexPrepend "0x"
......
......@@ -30,7 +30,7 @@
#include "twsocketlist.h"
#include "oic_string.h"
#include "oic_malloc.h"
#include "logger.h"
#include "experimental/logger.h"
#define TAG "Telegesis_Socket"
......
......@@ -33,7 +33,7 @@
#include "oic_string.h"
#include "oic_malloc.h"
#include "logger.h"
#include "experimental/logger.h"
#include "twtypes.h"
#include "telegesis_socket.h"
......
......@@ -28,7 +28,7 @@
*/
#include "twsocketlist.h"
#include "logger.h"
#include "experimental/logger.h"
#include "oic_malloc.h"
#include <sys/stat.h>
......
......@@ -17,7 +17,7 @@
*
******************************************************************/
#include "logger.h"
#include "experimental/logger.h"
#include "elevatorserver.h"
using namespace OC;
......
......@@ -19,7 +19,7 @@
#include "oic_time.h"
#include "ipcainternal.h"
#include "ocrandom.h"
#include "experimental/ocrandom.h"
// Object that implements interface to IoTivity.
// @future: Consider having an instance of this per app when there's mechanism to unregister
......
......@@ -36,7 +36,7 @@
#include "OCPlatform.h"
#include "OCApi.h"
#include "OCProvisioningManager.hpp"
#include "logger.h"
#include "experimental/logger.h"
#include "oic_malloc.h"
#include "ipca.h"
......
......@@ -20,7 +20,7 @@
#include "iotivity_config.h"
#include "oic_malloc.h"
#include "ipca.h"
#include "ocrandom.h"
#include "experimental/ocrandom.h"
#include "ipcainternal.h"
#define OCFFactoryReset "fr"
......
......@@ -29,7 +29,7 @@ using namespace std::placeholders;
#include "OCApi.h"
#include "pinoxmcommon.h"
#include "srmutility.h"
#include "ocrandom.h"
#include "experimental/ocrandom.h"
#include "oic_platform.h"
#define TAG "IPCA_OcfFramework"
......
......@@ -25,7 +25,7 @@
#include <condition_variable>
#include <gtest/gtest.h>
#include "ocrandom.h"
#include "experimental/ocrandom.h"
#include "octypes.h"
#include "oic_time.h"
#include "ipca.h"
......
......@@ -25,7 +25,7 @@
#include <condition_variable>
#include <gtest/gtest.h>
#include "ocrandom.h"
#include "experimental/ocrandom.h"
#include "ipca.h"
#include "testelevatorserver.h"
#include "testelevatorclient.h"
......
......@@ -20,7 +20,7 @@
#include "OCPlatform.h"
#include "OCApi.h"
#include "OCProvisioningManager.hpp"
#include "logger.h"
#include "experimental/logger.h"
#include "oic_malloc.h"
......
......@@ -17,7 +17,7 @@
*
******************************************************************/
#include "logger.h"
#include "experimental/logger.h"
#include "OCApi.h"
#include "testelevatorserver.h"
#include "ipcatestdata.h"
......
......@@ -221,6 +221,9 @@ common_env.InstallTarget(commonlib, 'c_common')
common_env.UserInstallTargetLib(commonlib, 'c_common')
common_env.UserInstallTargetHeader(
'iotivity_debug.h', 'c_common', 'iotivity_debug.h')
common_env.UserInstallTargetHeader(
'ocrandom/include/experimental/ocrandom.h',
'c_common/experimental', 'ocrandom.h')
common_env.UserInstallTargetHeader(
'platform_features.h', 'c_common', 'platform_features.h')
common_env.UserInstallTargetHeader(
......
......@@ -31,7 +31,7 @@
#endif
#include "iotivity_config.h"
#include "logger.h"
#include "experimental/logger.h"
#ifdef HAVE_FCNTL_H
#include <fcntl.h>
......@@ -54,7 +54,7 @@
#include <windows.h>
#endif
#include "ocrandom.h"
#include "experimental/ocrandom.h"
#include <stdio.h>
#include <stdbool.h>
#include <assert.h>
......
......@@ -20,7 +20,7 @@
//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
extern "C" {
#include "ocrandom.h"
#include "experimental/ocrandom.h"
}
#include <gtest/gtest.h>
......
......@@ -18,7 +18,7 @@
//
//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
#include "ocrandom.h"
#include "experimental/ocrandom.h"
#include "math.h"
#include <Arduino.h>
......
......@@ -21,7 +21,7 @@
extern "C" {
#include "ocrandom.h"
#include "experimental/ocrandom.h"
}
#include <gtest/gtest.h>
......
......@@ -58,7 +58,7 @@
#include <errno.h>
#include <assert.h>
#include <oic_malloc.h>
#include "logger.h"
#include "experimental/logger.h"
/**
* TAG
......
......@@ -31,7 +31,7 @@
#include <errno.h>
#include <oic_malloc.h>
#include "logger.h"
#include "experimental/logger.h"
#include "iotivity_debug.h"