From: Youngjae Shin Date: Tue, 4 Aug 2020 00:56:30 +0000 (+0900) Subject: [cleanup] revise file location X-Git-Tag: submit/tizen/20200804.071722~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fbdf45e5bf8d8af0ff9d989b02471c59f2fa49e7;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-share.git [cleanup] revise file location Change-Id: I738bbcef8a0ec01aa082c06b710057f239ee00cb --- diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index 46d1687..0000000 --- a/AUTHORS +++ /dev/null @@ -1,2 +0,0 @@ -Jinmin Jung -DoHyun Pyun diff --git a/CMakeLists.txt b/CMakeLists.txt index 379c7f3..5a57c6b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) ADD_SUBDIRECTORY(lib) -ADD_SUBDIRECTORY(bt-share) +ADD_SUBDIRECTORY(app) IF (BUILD_GCOV) -ADD_SUBDIRECTORY(unittest) +ADD_SUBDIRECTORY(tests) ENDIF (BUILD_GCOV) diff --git a/LICENSE b/LICENSE deleted file mode 100644 index a06208b..0000000 --- a/LICENSE +++ /dev/null @@ -1,204 +0,0 @@ -Copyright (c) 2000 - 2011 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/LICENSE.APLv2 b/LICENSE.APLv2 index 6b0b127..f7d6243 100644 --- a/LICENSE.APLv2 +++ b/LICENSE.APLv2 @@ -1,3 +1,4 @@ +Copyright (c) 2000 - 2020 Samsung Electronics Co., Ltd. All rights reserved. Apache License Version 2.0, January 2004 @@ -200,4 +201,3 @@ 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/bt-share/CMakeLists.txt b/app/CMakeLists.txt similarity index 85% rename from bt-share/CMakeLists.txt rename to app/CMakeLists.txt index e443b13..aa2f48c 100644 --- a/bt-share/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -1,19 +1,16 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) PROJECT(bluetooth-share C CXX) -SET(SRCS src/bt-share-main.c -src/bt-share-notification.c -src/bt-share-common.c -src/obex-event-handler.c -src/bt-share-syspopup.c -src/bt-share-ipc.c -src/bt-share-noti-handler.c -src/bt-share-cynara.c +SET(SRCS bt-share-main.c +bt-share-notification.c +bt-share-common.c +obex-event-handler.c +bt-share-syspopup.c +bt-share-ipc.c +bt-share-noti-handler.c +bt-share-cynara.c ) - -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/lib) INCLUDE(FindPkgConfig) @@ -73,4 +70,4 @@ INSTALL(TARGETS bt-share DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibrari ENDIF (BUILD_GCOV) INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin) -#INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/org.bluetooth.share.service DESTINATION share/dbus-1/system-services) +#INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.bluetooth.share.service DESTINATION share/dbus-1/system-services) diff --git a/bt-share/include/applog.h b/app/applog.h similarity index 100% rename from bt-share/include/applog.h rename to app/applog.h diff --git a/bt-share/src/bt-share-common.c b/app/bt-share-common.c similarity index 100% rename from bt-share/src/bt-share-common.c rename to app/bt-share-common.c diff --git a/bt-share/include/bt-share-common.h b/app/bt-share-common.h similarity index 100% rename from bt-share/include/bt-share-common.h rename to app/bt-share-common.h diff --git a/bt-share/src/bt-share-cynara.c b/app/bt-share-cynara.c similarity index 100% rename from bt-share/src/bt-share-cynara.c rename to app/bt-share-cynara.c diff --git a/bt-share/include/bt-share-cynara.h b/app/bt-share-cynara.h similarity index 100% rename from bt-share/include/bt-share-cynara.h rename to app/bt-share-cynara.h diff --git a/bt-share/src/bt-share-ipc.c b/app/bt-share-ipc.c similarity index 100% rename from bt-share/src/bt-share-ipc.c rename to app/bt-share-ipc.c diff --git a/bt-share/include/bt-share-ipc.h b/app/bt-share-ipc.h similarity index 100% rename from bt-share/include/bt-share-ipc.h rename to app/bt-share-ipc.h diff --git a/bt-share/src/bt-share-main.c b/app/bt-share-main.c similarity index 100% rename from bt-share/src/bt-share-main.c rename to app/bt-share-main.c diff --git a/bt-share/include/bt-share-main.h b/app/bt-share-main.h similarity index 100% rename from bt-share/include/bt-share-main.h rename to app/bt-share-main.h diff --git a/bt-share/src/bt-share-noti-handler.c b/app/bt-share-noti-handler.c similarity index 100% rename from bt-share/src/bt-share-noti-handler.c rename to app/bt-share-noti-handler.c diff --git a/bt-share/include/bt-share-noti-handler.h b/app/bt-share-noti-handler.h similarity index 100% rename from bt-share/include/bt-share-noti-handler.h rename to app/bt-share-noti-handler.h diff --git a/bt-share/src/bt-share-notification.c b/app/bt-share-notification.c similarity index 100% rename from bt-share/src/bt-share-notification.c rename to app/bt-share-notification.c diff --git a/bt-share/include/bt-share-notification.h b/app/bt-share-notification.h similarity index 100% rename from bt-share/include/bt-share-notification.h rename to app/bt-share-notification.h diff --git a/bt-share/include/bt-share-resource.h b/app/bt-share-resource.h similarity index 100% rename from bt-share/include/bt-share-resource.h rename to app/bt-share-resource.h diff --git a/bt-share/src/bt-share-syspopup.c b/app/bt-share-syspopup.c similarity index 100% rename from bt-share/src/bt-share-syspopup.c rename to app/bt-share-syspopup.c diff --git a/bt-share/include/bt-share-syspopup.h b/app/bt-share-syspopup.h similarity index 100% rename from bt-share/include/bt-share-syspopup.h rename to app/bt-share-syspopup.h diff --git a/bt-share/src/obex-event-handler.c b/app/obex-event-handler.c similarity index 100% rename from bt-share/src/obex-event-handler.c rename to app/obex-event-handler.c diff --git a/bt-share/include/obex-event-handler.h b/app/obex-event-handler.h similarity index 100% rename from bt-share/include/obex-event-handler.h rename to app/obex-event-handler.h diff --git a/bt-share/src/org.bluetooth.share.service b/app/org.bluetooth.share.service similarity index 100% rename from bt-share/src/org.bluetooth.share.service rename to app/org.bluetooth.share.service diff --git a/debian/bluetooth-share-headers.install.in b/debian/bluetooth-share-headers.install.in deleted file mode 100644 index 8881471..0000000 --- a/debian/bluetooth-share-headers.install.in +++ /dev/null @@ -1,2 +0,0 @@ -/usr/include/bluetooth-share/* -/usr/lib/pkgconfig/* diff --git a/debian/bluetooth-share.install.in b/debian/bluetooth-share.install.in deleted file mode 100644 index 66423bd..0000000 --- a/debian/bluetooth-share.install.in +++ /dev/null @@ -1,3 +0,0 @@ -@PREFIX@/bin/* -/opt/share/bt-ftp -/usr/share/dbus-1/services/*.service \ No newline at end of file diff --git a/debian/bluetooth-share.postinst b/debian/bluetooth-share.postinst deleted file mode 100644 index d7e918c..0000000 --- a/debian/bluetooth-share.postinst +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh - -if [ ! -f /opt/dbspace/.bluetooth_trasnfer.db ] -then - sqlite3 /opt/dbspace/.bluetooth_trasnfer.db 'PRAGMA journal_mode = PERSIST; - create table if not exists inbound ( - id INTEGER PRIMARY KEY autoincrement, - tr_status INTEGER, - file_path TEXT, - dev_name TEXT, - timestamp INTEGER default 0, - addr TEXT - ); - create table if not exists outbound ( - id INTEGER PRIMARY KEY autoincrement, - tr_status INTEGER, - file_path TEXT, - dev_name TEXT, - timestamp INTEGER default 0, - addr TEXT - ); - ' -fi - -# root case -if [ ${USER} == "root" ] -then - # Set vconf values with -g/-u options - - # 5000 is inhouse user id - # do not use relative path - - # For the FTP server folder - - if [ ! -e /opt/share/bt-ftp/Media ] - then - ln -s /opt/media /opt/share/bt-ftp/Media - fi - - if [ ! -e /opt/share/bt-ftp/SD_External ] - then - ln -s /opt/storage/sdcard /opt/share/bt-ftp/SD_External - fi - - chown :5000 /opt/dbspace/.bluetooth_trasnfer.db - chown :5000 /opt/dbspace/.bluetooth_trasnfer.db-journal -fi - -chmod 660 /opt/dbspace/.bluetooth_trasnfer.db -chmod 660 /opt/dbspace/.bluetooth_trasnfer.db-journal diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 2a4f3f8..0000000 --- a/debian/changelog +++ /dev/null @@ -1,359 +0,0 @@ -bluetooth-share (0.0.46) unstable; urgency=low - - * Tagging and Uploading package - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.46 - - -- DoHyun Pyun Wed, 12 Dec 2012 10:06:29 +0900 - -bluetooth-share (0.0.45) unstable; urgency=low - - * Tagging and Uploading package - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.45 - - -- Sunil Kumar Behera Wed, 28 Nov 2012 19:11:47 +0530 - -bluetooth-share (0.0.44) unstable; urgency=low - - * Change the media update method - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.44 - - -- DoHyun Pyun Mon, 26 Nov 2012 13:02:41 +0900 - -bluetooth-share (0.0.43) unstable; urgency=low - - * Modify the manifast - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.43 - - -- DoHyun Pyun Thu, 22 Nov 2012 11:28:29 +0900 - -bluetooth-share (0.0.42) unstable; urgency=low - - * Modify the manifast - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.42 - - -- DoHyun Pyun Wed, 21 Nov 2012 13:02:00 +0900 - -bluetooth-share (0.0.41) unstable; urgency=low - - * Fix the bug about notification - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.41 - - -- DoHyun Pyun Fri, 16 Nov 2012 10:51:28 +0900 - -bluetooth-share (0.0.40) unstable; urgency=low - - * Modify the notification API - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.40 - - -- DoHyun Pyun Thu, 15 Nov 2012 18:09:24 +0900 - -bluetooth-share (0.0.39) unstable; urgency=low - - * Change the contact API - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.39 - - -- DoHyun Pyun Tue, 13 Nov 2012 10:46:00 +0900 - -bluetooth-share (0.0.38) unstable; urgency=low - - * Fix the build break - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.38 - - -- DoHyun Pyun Thu, 08 Nov 2012 14:44:16 +0900 - -bluetooth-share (0.0.37) unstable; urgency=low - - * Fix the JIRA issue - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.37 - - -- DoHyun Pyun Tue, 06 Nov 2012 15:55:39 +0900 - -bluetooth-share (0.0.36) unstable; urgency=low - - * Add -pie compile option - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.36 - - -- DoHyun Pyun Wed, 31 Oct 2012 15:27:26 +0900 - -bluetooth-share (0.0.35) unstable; urgency=low - - * Fix for retry file send crash issue - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.35 - - -- Chethan T N Fri, 26 Oct 2012 17:26:55 +0530 - -bluetooth-share (0.0.34) unstable; urgency=low - - * Change directory path - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.34 - - -- InJun Yang Thu, 25 Oct 2012 13:56:00 +0900 - -bluetooth-share (0.0.33) unstable; urgency=low - - * Fix the bug abt abnormal termination - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.33 - - -- InJun Yang Fri, 19 Oct 2012 17:38:30 +0900 - -bluetooth-share (0.0.32) unstable; urgency=low - - * Fix the bug about OPP server - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.32 - - -- DoHyun Pyun Thu, 18 Oct 2012 09:40:09 +0900 - -bluetooth-share (0.0.31) unstable; urgency=low - - * Fix the bug about OPP server - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.31 - - -- DoHyun Pyun Fri, 12 Oct 2012 15:06:22 +0900 - -bluetooth-share (0.0.30) unstable; urgency=low - - * Change SMACK domain name - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.30 - - -- DoHyun Pyun Mon, 26 Nov 2012 14:42:28 +0900 - -bluetooth-share (0.0.28) unstable; urgency=low - - * Change SMACK domain name - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.28 - - -- Sangki Park Tue, 25 Sep 2012 10:27:55 +0900 - -bluetooth-share (0.0.27) unstable; urgency=low - - * Apply smack manifest file - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.27 - - -- Sangki Park Fri, 21 Sep 2012 10:03:02 +0900 - -bluetooth-share (0.0.26) unstable; urgency=low - - * Upload the package - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.26 - - -- DoHyun Pyun Tue, 11 Sep 2012 11:05:27 +0900 - -bluetooth-share (0.0.25) unstable; urgency=low - - * Upload the package - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.25 - - -- InJun Yang Tue, 07 Aug 2012 12:38:33 +0900 - -bluetooth-share (0.0.24) unstable; urgency=low - - * Fix the PLM issue abt clear button of notification bar - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.24 - - -- InJun Yang Fri, 20 Jul 2012 18:44:33 +0900 - -bluetooth-share (0.0.23) unstable; urgency=low - - * Tagging and upload the package - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.23 - - -- DoHyun Pyun Fri, 20 Jul 2012 13:36:44 +0900 - -bluetooth-share (0.0.22) unstable; urgency=low - - * Upload the package - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.22 - - -- DoHyun Pyun Tue, 17 Jul 2012 10:27:35 +0900 - -bluetooth-share (0.0.21) unstable; urgency=low - - * Upload the package - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.21 - - -- InJun Yang Tue, 10 Jul 2012 19:26:52 +0900 - -bluetooth-share (0.0.20) unstable; urgency=low - - * Upload the package - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.20 - - -- DoHyun Pyun Tue, 10 Jul 2012 17:55:02 +0900 - -bluetooth-share (0.0.19) unstable; urgency=low - - * Ordered by timestamp - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.19 - - -- InJun Yang Tue, 10 Jul 2012 08:57:19 +0900 - -bluetooth-share (0.0.18) unstable; urgency=low - - * Upload the package - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.18 - - -- InJun Yang Fri, 06 Jul 2012 20:09:04 +0900 - -bluetooth-share (0.0.17) unstable; urgency=low - - * Upload the package - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.17 - - -- InJun Yang Wed, 20 Jun 2012 20:45:27 +0900 - -bluetooth-share (0.0.16) unstable; urgency=low - - * Upload the package - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.16 - - -- InJun Yang Fri, 15 Jun 2012 18:45:52 +0900 - -bluetooth-share (0.0.15) unstable; urgency=low - - * Modify the sending flow as UX guideline - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.15 - - -- DoHyun Pyun Mon, 04 Jun 2012 08:59:20 +0900 - -bluetooth-share (0.0.14) unstable; urgency=low - - * Upload the package - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.14 - - -- InJun Yang Tue, 29 May 2012 17:47:33 +0900 - -bluetooth-share (0.0.13) unstable; urgency=low - - * Add db script to postinst file - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.13 - - -- InJun Yang Thu, 24 May 2012 13:05:43 +0900 - -bluetooth-share (0.0.12) unstable; urgency=low - - * Upload the package - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.12 - - -- DoHyun Pyun Wed, 23 May 2012 12:16:47 +0900 - -bluetooth-share (0.0.11) unstable; urgency=low - - * Upload the package - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.11 - - -- DoHyun Pyun Tue, 22 May 2012 09:45:06 +0900 - -bluetooth-share (0.0.10) unstable; urgency=low - - * Upload the package - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.10 - - -- DoHyun Pyun Mon, 21 May 2012 11:06:30 +0900 - -bluetooth-share (0.0.9) unstable; urgency=low - - * Fix the auto activating issue - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.9 - - -- DoHyun Pyun Wed, 16 May 2012 11:36:34 +0900 - -bluetooth-share (0.0.8) unstable; urgency=low - - * Upload the package - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.8 - - -- DoHyun Pyun Tue, 08 May 2012 08:56:03 +0900 - -bluetooth-share (0.0.7) unstable; urgency=low - - * Upload the package - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.7 - - -- InJun Yang Thu, 22 Mar 2012 16:48:32 +0900 - -bluetooth-share (0.0.6) unstable; urgency=low - - * Increase the version number to upload. - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.6 - - -- Sunil Kumar Behera Tue, 21 Feb 2012 14:09:43 +0530 - -bluetooth-share (0.0.5) unstable; urgency=low - - * FIx the spelling of API name (sessioin -> session) - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.5 - - -- DoHyun Pyun Thu, 05 Jan 2012 17:55:10 +0900 - -bluetooth-share (0.0.4) unstable; urgency=low - - * Upload package - * Git: slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.4 - - -- DoHyun Pyun Fri, 30 Dec 2011 08:01:56 +0900 - -bluetooth-share (0.0.3) unstable; urgency=low - - * Upload package - * Git: 165.213.180.234:slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.3 - - -- InJun Yang Wed, 30 Nov 2011 10:24:29 +0900 - -bluetooth-share (0.0.2) unstable; urgency=low - - * Upload package - * Git: 165.213.180.234:slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.2 - - -- InJun Yang Wed, 09 Nov 2011 08:50:32 +0900 - -bluetooth-share (0.0.1) unstable; urgency=low - - * initial release - * Git: 165.213.180.234:slp/pkgs/b/bluetooth-share - * Tag: bluetooth-share_0.0.1 - - -- Injun Yang Fri, 23 Sep 2011 16:17:49 +0900 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 7ed6ff8..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/debian/control b/debian/control deleted file mode 100644 index a44a820..0000000 --- a/debian/control +++ /dev/null @@ -1,33 +0,0 @@ -Source: bluetooth-share -Section: net -Priority: extra -Maintainer: Hocheol Seo , DoHyun Pyun , ChanYeol Park , InJun Yang , Seungyoun Ju -Uploaders: Sunil Behera , Syam Sidhardhan -Build-Depends: debhelper (>= 5), libbluetooth-frwk-dev, libglib2.0-dev, libdbus-1-dev, libdbus-glib-1-dev, libappcore-common-dev, dlog-dev, libappsvc-dev, libbundle-dev, libnotification-dev, libslp-calendar-dev, libcontacts-service-dev, libslp-pm-dev, libslp-sysman-dev, libx11-dev, libappcore-efl-dev, libslp-db-util-dev, libprivilege-control-dev -Standards-Version: 3.7.2 - -Package: bluetooth-share -Section: application -Provides:bluetooth-app-headers -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends},libbluetooth-frwk-0, libdlog-0 -Description: Bluetooth File Share Agent - -Package: bluetooth-share-dbg -Section: debug -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, bluetooth-share (= ${Source-Version}) -Description: Bluetooth file share Agent (unstripped) - -Package: libbluetooth-share -Section: libs -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Bluetooth Share library - -Package: libbluetooth-share-dev -Section: devel -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends},dlog-dev, libdbus-glib-1-dev, libglib2.0-dev, libbluetooth-share (= ${Source-Version}) -XB-Generate-Docs: yes -Description: Bluetooth Share diff --git a/debian/libbluetooth-share-dev.install.in b/debian/libbluetooth-share-dev.install.in deleted file mode 100644 index ceab20e..0000000 --- a/debian/libbluetooth-share-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -/usr/include/* -/usr/lib/pkgconfig/* diff --git a/debian/libbluetooth-share.install.in b/debian/libbluetooth-share.install.in deleted file mode 100644 index fef5120..0000000 --- a/debian/libbluetooth-share.install.in +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/lib* diff --git a/debian/rules b/debian/rules deleted file mode 100755 index e32bf05..0000000 --- a/debian/rules +++ /dev/null @@ -1,113 +0,0 @@ -#!/usr/bin/make -f - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -PREFIX ?= /usr -#RESDIR ?= /usr/bin/bluetooth-share/res -#DATADIR ?= /usr/bin/bluetooth-share/data -CFLAGS ?= -Wall -g -LDFLAGS ?= - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -CFLAGS += -fpie -LDFLAGS += -pie -Wl,--rpath=$(PREFIX)/lib -Wl,--as-needed -Wl,--unresolved-symbols=ignore-in-shared-libs - -configure: configure-stamp -configure-stamp: - dh_testdir - # Add here commands to configure the package. - CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ - cmake . -DCMAKE_INSTALL_PREFIX=$(PREFIX) - touch configure-stamp - - -build: build-stamp - -build-stamp: configure-stamp - dh_testdir - - # Add here commands to compile the package. - $(MAKE) - #docbook-to-man debian/bluetooth.sgml > bluetooth.1 - for f in `find $(CURDIR)/debian/ -name "*.in"`; do \ - cat $$f > $${f%.in}; \ - sed -i -e "s#@PREFIX@#$(PREFIX)#g" $${f%.in}; \ - done - - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - - # Add here commands to clean up after the build process. - -$(MAKE) clean - - for f in `find $(CURDIR)/ -name "CMakeCache.txt"`; do \ - rm -f $${f}; \ - done - for f in `find $(CURDIR)/ -name "CMakeFiles"`; do \ - rm -rf $${f}; \ - done - for f in `find $(CURDIR)/ -name "cmake_install.cmake"`; do \ - rm -f $${f}; \ - done - for f in `find $(CURDIR)/ -name "Makefile"`; do \ - rm -f $${f}; \ - done - for f in `find $(CURDIR)/ -name "install_manifest.txt"`; do \ - rm -f $${f}; \ - done - for f in `find $(CURDIR)/ -name "*.edj"`; do \ - rm -f $${f}; \ - done - for f in `find $(CURDIR)/debian/ -name "*.in"`; do \ - rm -f $${f%.in}; \ - done - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/tmp. - $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install - mkdir -p $(CURDIR)/debian/tmp/opt/share/bt-ftp - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot -# dh_installchangelogs -# dh_installdocs -# dh_installexamples - dh_install --sourcedir=debian/tmp -# dh_installman - dh_link - dh_strip --dbg-package=bluetooth-share-dbg - dh_compress - dh_fixperms -# dh_perl - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure diff --git a/packaging/bluetooth-share.changes b/packaging/bluetooth-share.changes deleted file mode 100644 index 29ab349..0000000 --- a/packaging/bluetooth-share.changes +++ /dev/null @@ -1,4 +0,0 @@ -* Wed Jun 26 2013 Victor Hakoun submit/tizen/20130620.153559@1189c02 -- Fix rmplint issues -- Replace manifest with default floor - diff --git a/packaging/bluetooth-share.manifest b/packaging/bluetooth-share.manifest index c00c25b..a76fdba 100644 --- a/packaging/bluetooth-share.manifest +++ b/packaging/bluetooth-share.manifest @@ -1,5 +1,5 @@ - - - + + + diff --git a/packaging/bluetooth-share.spec b/packaging/bluetooth-share.spec index 4b54535..018312b 100644 --- a/packaging/bluetooth-share.spec +++ b/packaging/bluetooth-share.spec @@ -10,8 +10,6 @@ Group: Network & Connectivity/Bluetooth License: Apache-2.0 Source0: %{name}-%{version}.tar.gz Source1001: %{name}.manifest -Source1002: libbluetooth-share.manifest -Source1003: libbluetooth-share-devel.manifest Source1004: init_db.sh Requires(post): coreutils Requires(post): smack @@ -77,7 +75,7 @@ This package is C-API test application. %prep %setup -q -cp %{SOURCE1001} %{SOURCE1002} %{SOURCE1003} . +cp %{SOURCE1001} . %build %if 0%{?gcov:1} @@ -127,7 +125,7 @@ cp -f packaging/init_db.sh %{buildroot}%{upgrade_data_path} %check %if 0%{?gcov:1} -pushd unittest +pushd tests ./run_coverage.sh popd %endif @@ -137,39 +135,31 @@ popd %{TZ_COMM_DATA}/%{name}/init_db.sh mkdir -p %{_unitdir}/multi-user.target.wants/ -%post -n libbluetooth-share-devel -p /sbin/ldconfig - %post -n libbluetooth-share -p /sbin/ldconfig -%postun -n libbluetooth-share-devel -p /sbin/ldconfig - %postun -n libbluetooth-share -p /sbin/ldconfig %files %manifest %{name}.manifest -%license LICENSE %attr(755, network_fw, network_fw)%{TZ_COMM_DATA}/%{name} -%defattr(-,root,root,-) -%{_bindir}/bluetooth-share +%{_bindir}/%{name} #%{_datadir}/dbus-1/system-services/org.bluetooth.share.service %{TZ_COMM_DATA}/%{name}/init_db.sh -%{_unitdir}/bluetooth-share.service -%{_unitdir}/bluetooth-share-start.service -%{upgrade_script_path}/500.bluetooth-share_upgrade.sh +%{_unitdir}/%{name}.service +%{_unitdir}/%{name}-start.service +%{upgrade_script_path}/500.%{name}_upgrade.sh %{upgrade_data_path}/init_db.sh +%license LICENSE.APLv2 %files -n libbluetooth-share -%manifest libbluetooth-share.manifest -%license LICENSE -%defattr(-, root, root) -%{_libdir}/libbluetooth-share-api.so.0.* +%manifest %{name}.manifest +%{_libdir}/*.so.* +%license LICENSE.APLv2 %files -n libbluetooth-share-devel -%manifest libbluetooth-share-devel.manifest -%defattr(-, root, root) -%{_includedir}/bluetooth-share-api/bluetooth-share-api.h -%{_libdir}/libbluetooth-share-api.so -%{_libdir}/pkgconfig/bluetooth-share-api.pc +%{_includedir}/%{name}-api/%{name}-api.h +%{_libdir}/*.so +%{_libdir}/pkgconfig/%{name}-api.pc %if 0%{?gcov:1} %files gcov diff --git a/packaging/libbluetooth-share-devel.manifest b/packaging/libbluetooth-share-devel.manifest deleted file mode 100644 index c00c25b..0000000 --- a/packaging/libbluetooth-share-devel.manifest +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/packaging/libbluetooth-share.manifest b/packaging/libbluetooth-share.manifest deleted file mode 100644 index c00c25b..0000000 --- a/packaging/libbluetooth-share.manifest +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/unittest/CMakeLists.txt b/tests/CMakeLists.txt similarity index 95% rename from unittest/CMakeLists.txt rename to tests/CMakeLists.txt index 7f6c281..33b4b3e 100644 --- a/unittest/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -30,7 +30,7 @@ INCLUDE_DIRECTORIES(/usr/include/appfw) INCLUDE_DIRECTORIES(/usr/lib/glib-2.0/include/) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/lib) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/bt-share/include) +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/app) SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "\${prefix}") @@ -63,7 +63,7 @@ TARGET_LINK_LIBRARIES(${TARGET_GTEST_TESTS} gtest -L${CMAKE_SOURCE_DIR}/lib -lbluetooth-share-api - -L${CMAKE_SOURCE_DIR}/bt-share + -L${CMAKE_SOURCE_DIR}/app -lbt-share ) diff --git a/unittest/bluetooth-share_test.cpp b/tests/bluetooth-share_test.cpp similarity index 100% rename from unittest/bluetooth-share_test.cpp rename to tests/bluetooth-share_test.cpp diff --git a/unittest/mock/bluetooth-share-mock.c b/tests/mock/bluetooth-share-mock.c similarity index 100% rename from unittest/mock/bluetooth-share-mock.c rename to tests/mock/bluetooth-share-mock.c diff --git a/unittest/run_coverage.sh b/tests/run_coverage.sh similarity index 84% rename from unittest/run_coverage.sh rename to tests/run_coverage.sh index bbdf0c8..24fb7ab 100755 --- a/unittest/run_coverage.sh +++ b/tests/run_coverage.sh @@ -1,6 +1,6 @@ #!/bin/bash -export LD_LIBRARY_PATH=..:.:../lib:../bt-share:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=..:.:../lib:../app:$LD_LIBRARY_PATH pushd ../ RootDir=$PWD popd @@ -15,7 +15,7 @@ fi LD_PRELOAD=./libbluetooth-share-mock.so ./$unitTestFile -CMakeDir=${RootDir}/bt-share/CMakeFiles/bt-share.dir/src/ +CMakeDir=${RootDir}/app/CMakeFiles/bt-share.dir/ CoverageDir=${RootDir}/coverage pushd $CMakeDir