projects
/
framework
/
api
/
device.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2990020
)
upload tizen1.0 source
author
Kim Kibum
<kb0929.kim@samsung.com>
Sun, 29 Apr 2012 07:58:23 +0000
(16:58 +0900)
committer
Kim Kibum
<kb0929.kim@samsung.com>
Sun, 29 Apr 2012 07:58:23 +0000
(16:58 +0900)
CMakeLists.txt
patch
|
blob
|
history
capi-system-device.pc.in
patch
|
blob
|
history
debian/control
patch
|
blob
|
history
debian/rules
patch
|
blob
|
history
packaging/capi-system-device.spec
patch
|
blob
|
history
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
b1e0673
..
9d395bb
100755
(executable)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-10,7
+10,8
@@
SET(PREFIX ${CMAKE_INSTALL_PREFIX})
SET(INC_DIR include)
INCLUDE_DIRECTORIES(${INC_DIR})
SET(INC_DIR include)
INCLUDE_DIRECTORIES(${INC_DIR})
-SET(dependents "devman dlog vconf")
+SET(dependents "devman dlog vconf capi-base-common")
+SET(pc_dependents "capi-base-common")
INCLUDE(FindPkgConfig)
pkg_check_modules(${fw_name} REQUIRED ${dependents})
INCLUDE(FindPkgConfig)
pkg_check_modules(${fw_name} REQUIRED ${dependents})
@@
-35,6
+36,13
@@
ADD_LIBRARY(${fw_name} SHARED ${SOURCES})
TARGET_LINK_LIBRARIES(${fw_name} ${${fw_name}_LDFLAGS})
TARGET_LINK_LIBRARIES(${fw_name} ${${fw_name}_LDFLAGS})
+SET_TARGET_PROPERTIES(${fw_name}
+ PROPERTIES
+ VERSION ${FULLVER}
+ SOVERSION ${MAJORVER}
+ CLEAN_DIRECT_OUTPUT 1
+)
+
INSTALL(TARGETS ${fw_name} DESTINATION lib)
INSTALL(
DIRECTORY ${INC_DIR}/ DESTINATION include/system
INSTALL(TARGETS ${fw_name} DESTINATION lib)
INSTALL(
DIRECTORY ${INC_DIR}/ DESTINATION include/system
@@
-44,9
+52,8
@@
INSTALL(
)
SET(PC_NAME ${fw_name})
)
SET(PC_NAME ${fw_name})
-SET(PC_REQUIRED ${dependents})
+SET(PC_REQUIRED ${
pc_
dependents})
SET(PC_LDFLAGS -l${fw_name})
SET(PC_LDFLAGS -l${fw_name})
-SET(PC_CFLAGS -I\${includedir}/system)
CONFIGURE_FILE(
${fw_name}.pc.in
CONFIGURE_FILE(
${fw_name}.pc.in
diff --git
a/capi-system-device.pc.in
b/capi-system-device.pc.in
index
f758dbd
..
d0610b9
100644
(file)
--- a/
capi-system-device.pc.in
+++ b/
capi-system-device.pc.in
@@
-11,5
+11,5
@@
Description: @PACKAGE_DESCRIPTION@
Version: @VERSION@
Requires: @PC_REQUIRED@
Libs: -L${libdir} @PC_LDFLAGS@
Version: @VERSION@
Requires: @PC_REQUIRED@
Libs: -L${libdir} @PC_LDFLAGS@
-Cflags: -I${includedir}
@PC_CFLAGS@
+Cflags: -I${includedir}
diff --git
a/debian/control
b/debian/control
index
c0f1535
..
605a87d
100644
(file)
--- a/
debian/control
+++ b/
debian/control
@@
-7,7
+7,7
@@
Build-Depends: debhelper (>= 5), dlog-dev, libdevman-dev, libglib2.0-dev, capi-b
Package: capi-system-device
Architecture: any
Package: capi-system-device
Architecture: any
-Depends: ${sh
il
bs:Depends}, ${misc:Depends}
+Depends: ${sh
li
bs:Depends}, ${misc:Depends}
Description: A Device library in Tizen Native API
Package: capi-system-device-dev
Description: A Device library in Tizen Native API
Package: capi-system-device-dev
diff --git
a/debian/rules
b/debian/rules
index
30e9018
..
7cf5611
100755
(executable)
--- a/
debian/rules
+++ b/
debian/rules
@@
-1,5
+1,8
@@
#!/usr/bin/make -f
#!/usr/bin/make -f
+FULLVER ?= $(shell dpkg-parsechangelog | grep Version: | cut -d ' ' -f 2 | cut -d '-' -f 1)
+MAJORVER ?= $(shell echo $(FULLVER) | cut -d '.' -f 1)
+
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@
-13,7
+16,7
@@
CMAKE_BUILD_DIR ?= $(CURDIR)/cmake_build_tmp
configure: configure-stamp
configure-stamp:
dh_testdir
configure: configure-stamp
configure-stamp:
dh_testdir
- mkdir -p $(CMAKE_BUILD_DIR) && cd $(CMAKE_BUILD_DIR) && cmake ..
+ mkdir -p $(CMAKE_BUILD_DIR) && cd $(CMAKE_BUILD_DIR) && cmake ..
-DFULLVER=${FULLVER} -DMAJORVER=${MAJORVER}
touch configure-stamp
touch configure-stamp
diff --git
a/packaging/capi-system-device.spec
b/packaging/capi-system-device.spec
index
37fab56
..
599ca11
100644
(file)
--- a/
packaging/capi-system-device.spec
+++ b/
packaging/capi-system-device.spec
@@
-1,16
+1,17
@@
Name: capi-system-device
Summary: A Device library in TIZEN C API
Version: 0.1.0
Name: capi-system-device
Summary: A Device library in TIZEN C API
Version: 0.1.0
-Release:
1
+Release:
6
Group: TO_BE/FILLED_IN
License: Apache-2.0
Source0: %{name}-%{version}.tar.gz
BuildRequires: cmake
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(devman)
Group: TO_BE/FILLED_IN
License: Apache-2.0
Source0: %{name}-%{version}.tar.gz
BuildRequires: cmake
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(devman)
+BuildRequires: pkgconfig(capi-base-common)
BuildRequires: pkgconfig(dlog)
BuildRequires: pkgconfig(vconf)
BuildRequires: pkgconfig(dlog)
BuildRequires: pkgconfig(vconf)
-BuildRequires: pkgconfig(capi-base-common)
+
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
@@
-31,8
+32,8
@@
Requires: %{name} = %{version}-%{release}
%build
%build
-cmake . -DCMAKE_INSTALL_PREFIX=/usr
-
+MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
+cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
make %{?jobs:-j%jobs}
make %{?jobs:-j%jobs}
@@
-46,10
+47,11
@@
rm -rf %{buildroot}
%files
%files
-%{_libdir}/libcapi-system-device.so
+%{_libdir}/libcapi-system-device.so
.*
%files devel
%{_includedir}/system/device.h
%{_libdir}/pkgconfig/*.pc
%files devel
%{_includedir}/system/device.h
%{_libdir}/pkgconfig/*.pc
+%{_libdir}/libcapi-system-device.so