From 5dc35ba9cbdc6d10f72896e5594d74da28cc979a Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Mon, 16 Jan 2017 21:01:49 +0100 Subject: [PATCH] build: Install notification headers It look like project public headers are installed to 2 level depth subdirectories (service/$domain/*.h*) Change-Id: I36ab613ff6aaf7d960e6ba1e94263f8cfdf7c559 Signed-off-by: Philippe Coval Reviewed-on: https://gerrit.iotivity.org/gerrit/16443 Tested-by: jenkins-iotivity Reviewed-by: Uze Choi --- service/notification/cpp-wrapper/SConscript | 2 ++ service/notification/cpp-wrapper/common/SConscript | 35 ++++++++++++++++++++++ .../notification/cpp-wrapper/consumer/SConscript | 3 ++ .../notification/cpp-wrapper/provider/SConscript | 2 ++ 4 files changed, 42 insertions(+) create mode 100644 service/notification/cpp-wrapper/common/SConscript diff --git a/service/notification/cpp-wrapper/SConscript b/service/notification/cpp-wrapper/SConscript index 7dc5d41..e6455da 100755 --- a/service/notification/cpp-wrapper/SConscript +++ b/service/notification/cpp-wrapper/SConscript @@ -21,6 +21,8 @@ Import('env') target_os = env.get('TARGET_OS') +SConscript('common/SConscript') + # build producer notification wrapper SConscript('provider/SConscript') diff --git a/service/notification/cpp-wrapper/common/SConscript b/service/notification/cpp-wrapper/common/SConscript new file mode 100644 index 0000000..914f2cb --- /dev/null +++ b/service/notification/cpp-wrapper/common/SConscript @@ -0,0 +1,35 @@ +#****************************************************************** +# +# Copyright 2017 Samsung Electronics All Rights Reserved. +# +#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= + +## +# Notification Service c++ wrapper build script +## + +import platform +Import('env') + +lib_env = env.Clone() +SConscript('#service/third_party_libs.scons', 'lib_env') +notification_env = lib_env.Clone() + +list = [ "NSMessage.h", "NSSyncInfo.h", "NSTopicsList.h", "NSUtils.h"] + +for filename in list: + notification_env.UserInstallTargetHeader(filename , 'service/notification', filename) diff --git a/service/notification/cpp-wrapper/consumer/SConscript b/service/notification/cpp-wrapper/consumer/SConscript index a131fc6..115ae46 100755 --- a/service/notification/cpp-wrapper/consumer/SConscript +++ b/service/notification/cpp-wrapper/consumer/SConscript @@ -100,6 +100,9 @@ consumersdk = notification_env.StaticLibrary('notification_consumer_wrapper', no notification_env.InstallTarget(consumersdk, 'libnotification_consumer_wrapper') notification_env.UserInstallTargetLib(consumersdk, 'libnotification_consumer_wrapper') +notification_env.UserInstallTargetHeader("inc/NSProvider.h", 'service/notification', 'NSProvider.h') +notification_env.UserInstallTargetHeader("inc/NSConsumerService.h", 'service/notification', 'NSConsumerService.h') + ###################################################################### # Source files and Targets for Consumer Jni ###################################################################### diff --git a/service/notification/cpp-wrapper/provider/SConscript b/service/notification/cpp-wrapper/provider/SConscript index cc419ab..2be55f1 100755 --- a/service/notification/cpp-wrapper/provider/SConscript +++ b/service/notification/cpp-wrapper/provider/SConscript @@ -110,6 +110,8 @@ notification_provider_src = [ providersdk = notification_env.StaticLibrary('notification_provider_wrapper', notification_provider_src) notification_env.InstallTarget(providersdk, 'libnotification_provider_wrapper') notification_env.UserInstallTargetLib(providersdk, 'libnotification_provider_wrapper') +notification_env.UserInstallTargetHeader('inc/NSConsumer.h', 'service/notification', 'NSConsumer.h') +notification_env.UserInstallTargetHeader('inc/NSProviderService.h', 'service/notification', 'NSProviderService.h') Export('notificationCommonStaticObjs') Export('notificationCommonSharedObjs') -- 2.7.4