From ae9321004ce3f1afca4709de5997d0a9f24d3dae Mon Sep 17 00:00:00 2001 From: Yongjin Kim Date: Tue, 19 May 2015 09:14:37 +0900 Subject: [PATCH 2/5] init Service Discovery Change-Id: Ib72a5de69a9d3a45288bd27d62f8b2ed765c7ddf Signed-off-by: Yongjin Kim --- CMakeLists.txt | 35 +++++++ LICENSE.APLv2 | 204 +++++++++++++++++++++++++++++++++++++++ NOTICE | 3 + core/CMakeLists.txt | 60 ++++++++++++ core/usd_core.c | 6 ++ core/usd_core.h | 0 include/service_discovery.h | 61 ++++++++++++ packaging/service-discovery.spec | 70 ++++++++++++++ protocol/usd_protocol.c | 0 protocol/usd_protocol.h | 0 sched/usd_sched.c | 0 sched/usd_sched.h | 0 service-discovery.manifest | 20 ++++ service-discovery.pc.in | 9 ++ test/CMakeLists.txt | 45 +++++++++ test/test.c | 6 ++ 16 files changed, 519 insertions(+) create mode 100644 CMakeLists.txt create mode 100644 LICENSE.APLv2 create mode 100644 NOTICE create mode 100644 core/CMakeLists.txt create mode 100644 core/usd_core.c create mode 100644 core/usd_core.h create mode 100644 include/service_discovery.h create mode 100644 packaging/service-discovery.spec create mode 100644 protocol/usd_protocol.c create mode 100644 protocol/usd_protocol.h create mode 100644 sched/usd_sched.c create mode 100644 sched/usd_sched.h create mode 100644 service-discovery.manifest create mode 100644 service-discovery.pc.in create mode 100644 test/CMakeLists.txt create mode 100644 test/test.c diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..a876ee9 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,35 @@ +CMAKE_MINIMUM_REQUIRED(VERSION 2.6) +PROJECT(service-discovery) + +SET(CMAKE_SKIP_BUILD_RPATH TRUE) +SET(VERSION_MAJOR 1) +SET(VERSION "${VERSION_MAJOR}.1.0") + +IF("${CMAKE_BUILD_TYPE}" STREQUAL "") + SET(CMAKE_BUILD_TYPE "Debug") +ENDIF("${CMAKE_BUILD_TYPE}" STREQUAL "") + +MESSAGE("") +MESSAGE(">>> current directory: ${CMAKE_CURRENT_SOURCE_DIR}") +MESSAGE(">>> Build type: ${CMAKE_BUILD_TYPE}") + + +########################################################## +# Define Manager +########################################################## +ADD_SUBDIRECTORY(core) + +########################################################## +# Define Test App +########################################################## +ADD_SUBDIRECTORY(test) + +########################################################## +# Define Install Files +########################################################## + +CONFIGURE_FILE(service-discovery.pc.in service-discovery.pc @ONLY) +INSTALL(FILES ${CMAKE_BINARY_DIR}/service-discovery.pc DESTINATION lib/pkgconfig) + +# LICENSE file +INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE.APLv2 DESTINATION /usr/share/license/service-discovery) diff --git a/LICENSE.APLv2 b/LICENSE.APLv2 new file mode 100644 index 0000000..9443128 --- /dev/null +++ b/LICENSE.APLv2 @@ -0,0 +1,204 @@ +Copyright (c) 2014 - 2015 Samsung Electronics Co., Ltd. All rights reserved. + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + 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. + diff --git a/NOTICE b/NOTICE new file mode 100644 index 0000000..eec59a3 --- /dev/null +++ b/NOTICE @@ -0,0 +1,3 @@ +Copyright (c) 2014 - 2015 Samsung Electronics Co., Ltd. All rights reserved. +Except as noted, this software is licensed under Apache License, Version 2. +Please, see the LICENSE.APLv2 file for Apache License, Version 2 terms and conditions. diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt new file mode 100644 index 0000000..3340f15 --- /dev/null +++ b/core/CMakeLists.txt @@ -0,0 +1,60 @@ +CMAKE_MINIMUM_REQUIRED(VERSION 2.6) +PROJECT(usd-core) + +SET(CMAKE_SKIP_BUILD_RPATH TRUE) + +IF("${CMAKE_BUILD_TYPE}" STREQUAL "") + SET(CMAKE_BUILD_TYPE "Debug") +ENDIF("${CMAKE_BUILD_TYPE}" STREQUAL "") + +MESSAGE("") +MESSAGE(">>> current directory: ${CMAKE_CURRENT_SOURCE_DIR}") +MESSAGE(">>> Build type: ${CMAKE_BUILD_TYPE}") + +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${VISIBILITY} -fvisibility=hidden") +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,--gc-sections -fPIE") + +########################################################## +# Define Core Lib +########################################################## + +SET(CORE-LIB "service-discovery") +SET(CORE-SRCS + ${CMAKE_SOURCE_DIR}/core/usd_core.c + ${CMAKE_SOURCE_DIR}/protocol/usd_protocol.c + ${CMAKE_SOURCE_DIR}/sched/usd_sched.c +) + +INCLUDE_DIRECTORIES( + ${CMAKE_SOURCE_DIR}/include + ${CMAKE_SOURCE_DIR}/core + ${CMAKE_SOURCE_DIR}/protocol + ${CMAKE_SOURCE_DIR}/sched +) + +INCLUDE(FindPkgConfig) +pkg_check_modules(core_pkgs REQUIRED dlog glib-2.0) + +FOREACH(flag ${core_pkgs_CFLAGS}) + SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") +ENDFOREACH(flag) + +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") +#message(">>>[${CORE-LIB}] extra_cflags ${EXTRA_CFLAGS}") +#message(">>>[${CORE-LIB}] core_pkgs_cflags ${core_pkgs_CFLAGS}") +#message(">>>[${CORE-LIB}] result ${CMAKE_C_FLAGS}") + +SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed") + +ADD_LIBRARY(${CORE-LIB} SHARED ${CORE-SRCS}) +TARGET_LINK_LIBRARIES(${CORE-LIB} ${core_pkgs_LDFLAGS}) +SET_TARGET_PROPERTIES(${CORE-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR}) +SET_TARGET_PROPERTIES(${CORE-LIB} PROPERTIES VERSION ${VERSION}) + +INSTALL(TARGETS ${CORE-LIB} DESTINATION lib COMPONENT RuntimeLibraries) + +SET(USD-CORE-HEADERS + ${CMAKE_SOURCE_DIR}/include/service_discovery.h +) + +INSTALL(FILES ${USD-CORE-HEADERS} DESTINATION include/service-discovery) diff --git a/core/usd_core.c b/core/usd_core.c new file mode 100644 index 0000000..72cd2a1 --- /dev/null +++ b/core/usd_core.c @@ -0,0 +1,6 @@ +#include "service_discovery.h" + +int service_discovery_create() +{ + return 0; +} diff --git a/core/usd_core.h b/core/usd_core.h new file mode 100644 index 0000000..e69de29 diff --git a/include/service_discovery.h b/include/service_discovery.h new file mode 100644 index 0000000..1ee3a8b --- /dev/null +++ b/include/service_discovery.h @@ -0,0 +1,61 @@ +/* + * Service Discovery + * + * Copyright (c) 2014 - 2015 Samsung Electronics Co., Ltd. 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. + * + */ + +#ifndef __SERVICE_DISCOVERY_H__ +#define __SERVICE_DISCOVERY_H__ + +#ifndef API +#define API __attribute__ ((visibility("default"))) +#endif + +#ifdef __cplusplus +extern "C" +{ +#endif + +#include + +/** + * @file service_discovery.h + */ + +/** + * @ingroup + * @defgroup + * + * @brief + * + * @section + * \#include + * + *
+ * @{ + */ + +API int service_discovery_create(); + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#endif /* __SERVICE_DISCOVERY_H__ */ diff --git a/packaging/service-discovery.spec b/packaging/service-discovery.spec new file mode 100644 index 0000000..be0631a --- /dev/null +++ b/packaging/service-discovery.spec @@ -0,0 +1,70 @@ +Name: service-discovery +Summary: Service Discovery Framework for Convergence +Version: 0.0.1 +Release: 1 +Group: System/Libraries +License: Apache-2.0 +Source0: %{name}-%{version}.tar.gz + +BuildRequires: cmake +BuildRequires: pkgconfig(dlog) +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gobject-2.0) +BuildRequires: pkgconfig(gthread-2.0) + +%description +Service Discovery Framework Library/Binary package + +%package -n service-discovery-devel +Summary: Headers for Service Discovery Framework +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description -n service-discovery-devel +This package contains the header and pc files of Service Discovery. + +%prep +%setup -q + +%build +export CFLAGS="${CFLAGS} -fPIC -Wall -g -fvisibility=hidden -fdata-sections -ffunction-sections" +export CXXFLAGS="${CXXFLAGS} -fPIC -Wall -g -fvisibility=hidden" +export LDFLAGS="${LDFLAGS} -Wl,--hash-style=both -Wl,--rpath=%{_prefix}/lib -Wl,--as-needed" + +%if 0%{?sec_build_binary_debug_enable} +export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE" +export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE" +export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE" +%endif + +cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + +make %{?_smp_mflags} + +%install +rm -rf %{buildroot} +%make_install + +mkdir -p %{buildroot}/usr/share/license +cp LICENSE.APLv2 %{buildroot}/usr/share/license/service-discovery +cp LICENSE.APLv2 %{buildroot}/usr/share/license/service-discovery-devel + +%post -n service-discovery +/sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files -n service-discovery +%manifest service-discovery.manifest +%defattr(-,system,system,-) +%{_libdir}/lib*.so.* +%{_bindir}/usd-test +/usr/share/license/%{name} + +%files -n service-discovery-devel +%defattr(-,system,system,-) +%{_libdir}/lib*.so +%{_libdir}/pkgconfig/service-discovery.pc +%{_includedir}/service-discovery/*.h +/usr/share/license/%{name}-devel diff --git a/protocol/usd_protocol.c b/protocol/usd_protocol.c new file mode 100644 index 0000000..e69de29 diff --git a/protocol/usd_protocol.h b/protocol/usd_protocol.h new file mode 100644 index 0000000..e69de29 diff --git a/sched/usd_sched.c b/sched/usd_sched.c new file mode 100644 index 0000000..e69de29 diff --git a/sched/usd_sched.h b/sched/usd_sched.h new file mode 100644 index 0000000..e69de29 diff --git a/service-discovery.manifest b/service-discovery.manifest new file mode 100644 index 0000000..25aec40 --- /dev/null +++ b/service-discovery.manifest @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + diff --git a/service-discovery.pc.in b/service-discovery.pc.in new file mode 100644 index 0000000..851ff88 --- /dev/null +++ b/service-discovery.pc.in @@ -0,0 +1,9 @@ +prefix=/usr +libdir=${prefix}/lib +includedir=${prefix}/include + +Name: service-discovery library +Description: service-discovery library 1.0 +Version: $version +Libs: -L${libdir} -lservice-discovery +Cflags: -I${includedir}/service-discovery diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt new file mode 100644 index 0000000..302785c --- /dev/null +++ b/test/CMakeLists.txt @@ -0,0 +1,45 @@ +CMAKE_MINIMUM_REQUIRED(VERSION 2.6) +PROJECT(usd-test) + +SET(CMAKE_SKIP_BUILD_RPATH TRUE) + +IF("${CMAKE_BUILD_TYPE}" STREQUAL "") + SET(CMAKE_BUILD_TYPE "Debug") +ENDIF("${CMAKE_BUILD_TYPE}" STREQUAL "") + +MESSAGE("") +MESSAGE(">>> current directory: ${CMAKE_CURRENT_SOURCE_DIR}") +MESSAGE(">>> Build type: ${CMAKE_BUILD_TYPE}") + +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${VISIBILITY} -fvisibility=hidden") +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,--gc-sections") + +SET(TEST-EXE "usd-test") +SET(TEST-SRCS + ${CMAKE_SOURCE_DIR}/test/test.c +) + +INCLUDE_DIRECTORIES( + ${CMAKE_SOURCE_DIR}/core/include + ${CMAKE_SOURCE_DIR}/protocol/include + ${CMAKE_SOURCE_DIR}/sched/include +) + +INCLUDE(FindPkgConfig) +pkg_check_modules(test_pkgs REQUIRED dlog glib-2.0) + +FOREACH(flag ${test_pkgs_CFLAGS}) + SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") +ENDFOREACH(flag) + +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") +#message(">>>[${TEST-EXE}] extra_cflags ${EXTRA_CFLAGS}") +#message(">>>[${TEST-EXE}] test_pkgs_cflags ${test_pkgs_CFLAGS}") +#message(">>>[${TEST-EXE}] result ${CMAKE_C_FLAGS}") + +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") +SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie") + +ADD_EXECUTABLE(${TEST-EXE} ${TEST-SRCS}) +TARGET_LINK_LIBRARIES(${TEST-EXE} ${test_pkgs_LDFLAGS} service-discovery) +INSTALL(TARGETS ${TEST-EXE} DESTINATION bin) diff --git a/test/test.c b/test/test.c new file mode 100644 index 0000000..7fb1ab9 --- /dev/null +++ b/test/test.c @@ -0,0 +1,6 @@ +#include + +int main() +{ + return 0; +} -- 2.7.4 From 0dc161c42edc446e83dc51f64003b044c41e399c Mon Sep 17 00:00:00 2001 From: Yongjin Kim Date: Fri, 19 Jun 2015 11:17:40 +0900 Subject: [PATCH 3/5] Modify version Change-Id: I22e4a64cb21a805e3854d6b638cc58378373e35a Signed-off-by: Yongjin Kim --- packaging/service-discovery.spec | 2 +- service-discovery.pc.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/service-discovery.spec b/packaging/service-discovery.spec index be0631a..44ece59 100644 --- a/packaging/service-discovery.spec +++ b/packaging/service-discovery.spec @@ -1,6 +1,6 @@ Name: service-discovery Summary: Service Discovery Framework for Convergence -Version: 0.0.1 +Version: 1.1.0 Release: 1 Group: System/Libraries License: Apache-2.0 diff --git a/service-discovery.pc.in b/service-discovery.pc.in index 851ff88..04e551f 100644 --- a/service-discovery.pc.in +++ b/service-discovery.pc.in @@ -4,6 +4,6 @@ includedir=${prefix}/include Name: service-discovery library Description: service-discovery library 1.0 -Version: $version +Version: @VERSION@ Libs: -L${libdir} -lservice-discovery Cflags: -I${includedir}/service-discovery -- 2.7.4 From bd61bf2c14fad8ce10c1566488d6803839e9691c Mon Sep 17 00:00:00 2001 From: "HaJun, Sung" Date: Fri, 19 Jun 2015 16:41:17 +0900 Subject: [PATCH 4/5] Support for aarch64 build Change-Id: Ia7091a3a1f8fc90b2b61b2b077ed6f1b246ce953 Signed-off-by: HaJun, Sung --- CMakeLists.txt | 2 +- core/CMakeLists.txt | 2 +- packaging/service-discovery.spec | 1 + service-discovery.pc.in | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a876ee9..41d6d7e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,7 @@ ADD_SUBDIRECTORY(test) ########################################################## CONFIGURE_FILE(service-discovery.pc.in service-discovery.pc @ONLY) -INSTALL(FILES ${CMAKE_BINARY_DIR}/service-discovery.pc DESTINATION lib/pkgconfig) +INSTALL(FILES ${CMAKE_BINARY_DIR}/service-discovery.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) # LICENSE file INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE.APLv2 DESTINATION /usr/share/license/service-discovery) diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 3340f15..4359340 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -51,7 +51,7 @@ TARGET_LINK_LIBRARIES(${CORE-LIB} ${core_pkgs_LDFLAGS}) SET_TARGET_PROPERTIES(${CORE-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR}) SET_TARGET_PROPERTIES(${CORE-LIB} PROPERTIES VERSION ${VERSION}) -INSTALL(TARGETS ${CORE-LIB} DESTINATION lib COMPONENT RuntimeLibraries) +INSTALL(TARGETS ${CORE-LIB} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries) SET(USD-CORE-HEADERS ${CMAKE_SOURCE_DIR}/include/service_discovery.h diff --git a/packaging/service-discovery.spec b/packaging/service-discovery.spec index 44ece59..6945245 100644 --- a/packaging/service-discovery.spec +++ b/packaging/service-discovery.spec @@ -39,6 +39,7 @@ export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE" %endif cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DLIB_INSTALL_DIR:PATH=%{_libdir} make %{?_smp_mflags} diff --git a/service-discovery.pc.in b/service-discovery.pc.in index 04e551f..17c1ed7 100644 --- a/service-discovery.pc.in +++ b/service-discovery.pc.in @@ -1,5 +1,5 @@ prefix=/usr -libdir=${prefix}/lib +libdir=@LIB_INSTALL_DIR@ includedir=${prefix}/include Name: service-discovery library -- 2.7.4 From c106b5109b2d0b7a96ea780c1c988a6218745607 Mon Sep 17 00:00:00 2001 From: Yongjin Kim Date: Fri, 17 Jul 2015 07:25:06 +0900 Subject: [PATCH 5/5] Apply Smack 3-domain in manifest Change-Id: Ia0249130557f40eb7a324bd346af4404bf504eb8 Signed-off-by: Yongjin Kim --- service-discovery.manifest | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/service-discovery.manifest b/service-discovery.manifest index 25aec40..a76fdba 100644 --- a/service-discovery.manifest +++ b/service-discovery.manifest @@ -1,20 +1,5 @@ - - - - - - - - - - - - - - - + -- 2.7.4