From: Ravi Nanjundappa Date: Tue, 3 Nov 2015 06:16:49 +0000 (+0530) Subject: Fix for JIRA issue IOT-599. X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1752f04d1698f494bc5400809be30c091c4b19ba;p=contrib%2Fiotivity.git Fix for JIRA issue IOT-599. - This patch include changes to install the public libraries in ${libdir} and all public headers in ${includedir}. - As of now, the iotivitiy.pc.in file refers to resource C and C++ SDK related libraries only. - If required, the services related public libraries need to segregated into a different .pc.in file. Change-Id: Ie110db76900c29534f6bc36dc9e2424f71e9f71f Signed-off-by: Ravi Nanjundappa Reviewed-on: https://gerrit.iotivity.org/gerrit/3261 Tested-by: jenkins-iotivity Reviewed-by: Jon A. Cruz --- diff --git a/build_common/SConscript b/build_common/SConscript index 6bbdbde..9a79066 100644 --- a/build_common/SConscript +++ b/build_common/SConscript @@ -215,33 +215,25 @@ def __installlib(ienv, targets, name): user_prefix = env.get('PREFIX') if user_prefix: i_n = ienv.Install(user_prefix + '/lib', targets) - else: - i_n = ienv.Install(env.get('BUILD_DIR'), targets) - ienv.Alias("install", i_n) + ienv.Alias("install", i_n) def __installbin(ienv, targets, name): user_prefix = env.get('PREFIX') if user_prefix: i_n = ienv.Install(user_prefix + '/bin', targets) - else: - i_n = ienv.Install(env.get('BUILD_DIR'), targets) - ienv.Alias("install", i_n) + ienv.Alias("install", i_n) def __installheader(ienv, targets, dir, name): user_prefix = env.get('PREFIX') if user_prefix: i_n = ienv.Install(user_prefix + '/include/' + dir ,targets) - else: - i_n = ienv.Install(env.get('BUILD_DIR'), targets) - ienv.Alias("install", i_n) + ienv.Alias("install", i_n) def __installpcfile(ienv, targets, name): user_prefix = env.get('PREFIX') if user_prefix: i_n = ienv.Install(user_prefix + '/lib/pkgconfig', targets) - else: - i_n = ienv.Install(env.get('BUILD_DIR'), targets) - ienv.Alias("install", i_n) + ienv.Alias("install", i_n) def __append_target(ienv, name, targets = None): if targets: diff --git a/extlibs/tinydtls/SConscript b/extlibs/tinydtls/SConscript index 64d5d08..901a94c 100644 --- a/extlibs/tinydtls/SConscript +++ b/extlibs/tinydtls/SConscript @@ -98,5 +98,4 @@ if not env.get('RELEASE'): samples_env.AppendTarget('samples') env.InstallTarget(libtinydtls, 'libtinydtls'); -env.UserInstallTargetLib(libtinydtls, 'libtinydtls'); diff --git a/iotivity.pc.in b/iotivity.pc.in index 03c8d3b..100de75 100644 --- a/iotivity.pc.in +++ b/iotivity.pc.in @@ -6,9 +6,9 @@ libdir=${prefix}/lib includedir=${prefix}/include/ Name: iotivity -Description: IoTivity is an open source reference implementation of the OIC standard specifications. +Description: IoTivity is an open source reference implementation of the OIC standard specifications. This includes the libs for resource c and c++ sdk apis. Version: @VERSION@ URL: https://www.iotivity.org Requires: -Libs: -L${libdir} -lBMISensor -lc_common -loctbstack -lcoap -lpmimpl -lconnectivity_abstraction -lppm -lcpluff -lDiscomfortIndexSensor -lrcs_client -lmosquitto -lmosquittopp -lSSMCore -loc_logger_core -lSSMSDK -loc_logger -loc -lTGMSDKLibrary -locsrm +Libs: -L${libdir} -loctbstack -loc Cflags: -I${includedir} diff --git a/resource/android/SConscript b/resource/android/SConscript index 4ce7309..d7bce9f 100644 --- a/resource/android/SConscript +++ b/resource/android/SConscript @@ -23,4 +23,3 @@ compatibilitylib_src = ['OCAndroid.cpp'] if target_os == 'android': static_compatibilitylib = compatibilitylib_env.StaticLibrary('compatibility', compatibilitylib_src) compatibilitylib_env.InstallTarget(static_compatibilitylib, 'libcompatibility') - compatibilitylib_env.UserInstallTargetLib(static_compatibilitylib, 'libcompatibility') diff --git a/resource/c_common/SConscript b/resource/c_common/SConscript index 2136b4f..58cee3d 100644 --- a/resource/c_common/SConscript +++ b/resource/c_common/SConscript @@ -60,4 +60,3 @@ common_src = [ commonlib = common_env.StaticLibrary('c_common', common_src) common_env.InstallTarget(commonlib, 'c_common') -common_env.UserInstallTargetLib(commonlib, 'c_common') diff --git a/resource/csdk/SConscript b/resource/csdk/SConscript index a8cc76e..edb1805 100644 --- a/resource/csdk/SConscript +++ b/resource/csdk/SConscript @@ -154,4 +154,3 @@ else: liboctbstack_env.UserInstallTargetLib([static_liboctbstack, shared_liboctbstack], 'liboctbstack') liboctbstack_env.UserInstallTargetHeader('stack/include/ocstackconfig.h', 'resource', 'ocstackconfig.h') liboctbstack_env.UserInstallTargetHeader('stack/include/octypes.h', 'resource', 'octypes.h') - liboctbstack_env.UserInstallTargetHeader('stack/include/ocstack.h', 'resource', 'ocstack.h') diff --git a/resource/csdk/connectivity/build/SConscript b/resource/csdk/connectivity/build/SConscript index 953f3f3..e829d4b 100644 --- a/resource/csdk/connectivity/build/SConscript +++ b/resource/csdk/connectivity/build/SConscript @@ -175,17 +175,13 @@ def __installlib(ienv, targets, name): user_prefix = env.get('PREFIX') if user_prefix: i_n = ienv.Install(user_prefix + '/lib', targets) - else: - i_n = ienv.Install(env.get('BUILD_DIR'), targets) - ienv.Alias("install", i_n) + ienv.Alias("install", i_n) def __installbin(ienv, targets, name): user_prefix = env.get('PREFIX') if user_prefix: i_n = ienv.Install(user_prefix + '/bin', targets) - else: - i_n = ienv.Install(env.get('BUILD_DIR'), targets) - ienv.Alias("install", i_n) + ienv.Alias("install", i_n) def __append_target(ienv, target): env.AppendUnique(TS = [target]) diff --git a/resource/csdk/connectivity/lib/libcoap-4.1.1/SConscript b/resource/csdk/connectivity/lib/libcoap-4.1.1/SConscript index 876bc03..f3511c7 100644 --- a/resource/csdk/connectivity/lib/libcoap-4.1.1/SConscript +++ b/resource/csdk/connectivity/lib/libcoap-4.1.1/SConscript @@ -75,4 +75,3 @@ libcoap_src = [ libcoap = libcoap_env.StaticLibrary('libcoap', libcoap_src, OBJPREFIX='libcoap_') libcoap_env.InstallTarget([libcoap], 'libcoap') -libcoap_env.UserInstallTargetLib([libcoap], 'libcoap') \ No newline at end of file diff --git a/resource/csdk/connectivity/samples/android/SConscript b/resource/csdk/connectivity/samples/android/SConscript index 9487cba..6fe7388 100644 --- a/resource/csdk/connectivity/samples/android/SConscript +++ b/resource/csdk/connectivity/samples/android/SConscript @@ -51,6 +51,5 @@ if secured == '1': libRMInterface = app_env.SharedLibrary('RMInterface', sample_src, OBJPREFIX='libRMInterface_') app_env.InstallTarget(libRMInterface, 'RMInterface') -app_env.UserInstallTargetLib(libRMInterface, 'RMInterface') diff --git a/resource/csdk/connectivity/samples/tizen/SConscript b/resource/csdk/connectivity/samples/tizen/SConscript index 7013cf4..8ec6194 100644 --- a/resource/csdk/connectivity/samples/tizen/SConscript +++ b/resource/csdk/connectivity/samples/tizen/SConscript @@ -162,17 +162,13 @@ def __installlib(ienv, targets, name): user_prefix = env.get('PREFIX') if user_prefix: i_n = ienv.Install(user_prefix + '/lib', targets) - else: - i_n = ienv.Install(env.get('BUILD_DIR'), targets) - ienv.Alias("install", i_n) + ienv.Alias("install", i_n) def __installbin(ienv, targets, name): user_prefix = env.get('PREFIX') if user_prefix: i_n = ienv.Install(user_prefix + '/bin', targets) - else: - i_n = ienv.Install(env.get('BUILD_DIR'), targets) - ienv.Alias("install", i_n) + ienv.Alias("install", i_n) def __print_targets(env): Help(''' diff --git a/resource/csdk/connectivity/src/SConscript b/resource/csdk/connectivity/src/SConscript index 367590a..f5670b1 100755 --- a/resource/csdk/connectivity/src/SConscript +++ b/resource/csdk/connectivity/src/SConscript @@ -142,5 +142,4 @@ if ca_os in ['android', 'tizen']: else: calib = env.StaticLibrary('connectivity_abstraction', env.get('CA_SRC')) env.InstallTarget(calib, 'libconnectivity_abstraction') -env.UserInstallTargetLib(calib, 'libconnectivity_abstraction') diff --git a/resource/csdk/routing/SConscript b/resource/csdk/routing/SConscript index 1d2a067..f2464b7 100644 --- a/resource/csdk/routing/SConscript +++ b/resource/csdk/routing/SConscript @@ -58,4 +58,4 @@ elif env.get('ROUTING') == 'EP': routinglib = local_env.StaticLibrary('routingmanager', routing_src) local_env.InstallTarget(routinglib, 'routingmanager') -local_env.UserInstallTargetLib(routinglib, 'routingmanager') + diff --git a/resource/csdk/security/SConscript b/resource/csdk/security/SConscript index 4dcb4c2..276c2b3 100755 --- a/resource/csdk/security/SConscript +++ b/resource/csdk/security/SConscript @@ -135,7 +135,6 @@ if env.get('DTLS_WITH_X509') == '1' and env.get('SECURED') == '1': libocsrm = libocsrm_env.StaticLibrary('libocsrm', libocsrm_src) libocsrm_env.InstallTarget(libocsrm, 'libocsrm') -libocsrm_env.UserInstallTargetLib(libocsrm, 'libocsrm') if target_os in ['linux', 'android', 'tizen'] and env.get('SECURED') == '1': SConscript('provisioning/SConscript') diff --git a/resource/csdk/security/provisioning/SConscript b/resource/csdk/security/provisioning/SConscript index 06cd5bb..0fcd36e 100644 --- a/resource/csdk/security/provisioning/SConscript +++ b/resource/csdk/security/provisioning/SConscript @@ -101,7 +101,6 @@ provisioning_src = [ provisioningserver = provisioning_env.StaticLibrary('ocpmapi', provisioning_src) provisioning_env.InstallTarget(provisioningserver, 'libocpmapi') -provisioning_env.UserInstallTargetLib(provisioningserver, 'libocpmapi') if env.get('DTLS_WITH_X509') == '1': SConscript('ck_manager/SConscript') diff --git a/resource/oc_logger/SConscript b/resource/oc_logger/SConscript index 1fc1a85..9579835 100644 --- a/resource/oc_logger/SConscript +++ b/resource/oc_logger/SConscript @@ -53,7 +53,6 @@ liboc_logger = liboc_logger_env.SharedLibrary('oc_logger', ['c/oc_logger.c', 'c/oc_console_logger.c', 'cpp/oc_ostream_logger.cpp']) liboc_logger_env.InstallTarget([liboc_logger_core, liboc_logger], 'liboc_logger') -liboc_logger_env.UserInstallTargetLib([liboc_logger_core, liboc_logger], 'liboc_logger') if target_os not in ['ios', 'android']: SConscript('examples/SConscript') diff --git a/service/things-manager/SConscript b/service/things-manager/SConscript index 76235f0..da66dbf 100644 --- a/service/things-manager/SConscript +++ b/service/things-manager/SConscript @@ -60,6 +60,10 @@ tgmsdk_shared = things_manager_env.SharedLibrary('TGMSDKLibrary', tgm_src) things_manager_env.InstallTarget([tgmsdk_static,tgmsdk_shared], 'libTGMSDK') things_manager_env.UserInstallTargetLib([tgmsdk_static,tgmsdk_shared], 'libTGMSDK') +things_manager_env.UserInstallTargetHeader('sdk/inc/ActionSet.h', 'service/things-manager', 'ActionSet.h') +things_manager_env.UserInstallTargetHeader('sdk/inc/GroupManager.h', 'service/things-manager', 'GroupManager.h') +things_manager_env.UserInstallTargetHeader('sdk/inc/ThingsConfiguration.h', 'service/things-manager', 'ThingsConfiguration.h') +things_manager_env.UserInstallTargetHeader('sdk/inc/ThingsMaintenance.h', 'service/things-manager', 'ThingsMaintenance.h') # Build JNI layer #if target_os == 'android': diff --git a/service/things-manager/sdk/java/jni/SConscript b/service/things-manager/sdk/java/jni/SConscript index 2a59a1e..d6232a0 100644 --- a/service/things-manager/sdk/java/jni/SConscript +++ b/service/things-manager/sdk/java/jni/SConscript @@ -37,7 +37,6 @@ tm_jni_src = [tm_jni_env.Glob('tm/src/*.cpp'), tm_jni_env.Glob('jniutil/src/*.cp tm_jni = tm_jni_env.SharedLibrary('things-manager-jni', tm_jni_src) tm_jni_env.InstallTarget(tm_jni, 'libthings-manager-jni') -tm_jni_env.UserInstallTargetLib(tm_jni, 'libthings-manager-jni') # Install the libraries to /libs/ directory tm_jni_env.Install(tm_sdk+'/java/libs/'+tm_jni_env.get('TARGET_ARCH'),tm_jni_env.get('BUILD_DIR')+'/liboc_logger.so')