change names of lib and plugins, fix up installs

sailfishos · May 1, 2013 · 7d64d5a · 7d64d5a
1 parent 4f7bd47
commit 7d64d5a
Show file tree

Hide file tree

Showing 21 changed files with 143 additions and 79 deletions.
diff --git a/core/core.pro b/core/core.pro
@@ -15,7 +15,14 @@ SENSORFW_INCLUDEPATHS = .. \
 DEPENDPATH += $$SENSORFW_INCLUDEPATHS
 INCLUDEPATH += $$SENSORFW_INCLUDEPATHS
 
-QMAKE_LIBDIR_FLAGS += -L../datatypes -lsensordatatypes
+QMAKE_LIBDIR_FLAGS += -L../datatypes
+equals(QT_MAJOR_VERSION, 5):{
+    QMAKE_LIBDIR_FLAGS += -lsensordatatypes
+}
+
+equals(QT_MAJOR_VERSION, 5):{
+    QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5
+}
 
 SOURCES += sensormanager.cpp \
     sensormanager_a.cpp \

diff --git a/rpm/sensorfw-qt5.spec b/rpm/sensorfw-qt5.spec
@@ -30,7 +30,6 @@ Requires(postun): /sbin/ldconfig
 Requires(postun): systemd
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(gconf-2.0)
-BuildRequires:  pkgconfig(contextprovider-1.0)
 Obsoletes:   sensorframework
 
 %description
@@ -58,17 +57,6 @@ Requires:   python
 Contains unit test cases for CI environment.
 
 
-%package contextfw-tests
-Summary:    Test cases for sensord acting as context provider
-Group:      Development/Libraries
-Requires:   %{name} = %{version}-%{release}
-Requires:   sensorfw-tests
-Requires:   contextkit >= 0.3.6
-
-%description contextfw-tests
-Contains test cases for CI environment, for ensuring that sensord provides context properties correctly.
-
-
 %package configs
 Summary:    Sensorfw configuration files
 Group:      System/Libraries
@@ -101,7 +89,7 @@ export LD_RUN_PATH=/usr/lib/sensord/
 # << build pre
 
 %qmake  \
-    CONFIG+=contextprovider
+    CONFIG+=mce
 
 make %{?jobs:-j%jobs}
 
@@ -141,12 +129,13 @@ systemctl daemon-reload
 %defattr(-,root,root,-)
 # >> files
 %attr(755,root,root)%{_sbindir}/sensord
-%{_libdir}/sensord/*.so
-%{_libdir}/*.so.*
+%{_libdir}/sensord-qt5/*.so
+%{_libdir}/libsensorfw*.so.*
+%{_libdir}/libsensordatatypes*.so.*
+%{_libdir}/libsensorclient*.so.*
 %config %{_sysconfdir}/dbus-1/system.d/sensorfw.conf
 %config %{_sysconfdir}/sensorfw/sensord.conf
 %dir %{_sysconfdir}/sensorfw/sensord.conf.d/
-%{_datadir}/contextkit/providers/com.nokia.SensorService.context
 %doc debian/copyright debian/README COPYING
 /%{_lib}/systemd/system/sensord.service
 /%{_lib}/systemd/system/basic.target.wants/sensord.service
@@ -156,32 +145,28 @@ systemctl daemon-reload
 %files devel
 %defattr(-,root,root,-)
 # >> files devel
-%{_libdir}/*.so
+%{_libdir}/libsensorfw*.so
+%{_libdir}/libsensordatatypes*.so
+%{_libdir}/libsensorclient*.so
 %{_libdir}/pkgconfig/*
-%{_includedir}/sensord/*
-%{_datadir}/qt4/mkspecs/features/sensord.prf
+%{_includedir}/sensord-qt5/*
+%{_datadir}/qt5/mkspecs/features/sensord.prf
 # From docs
 #%attr(644,root,root)%{_defaultdocdir}/sensord/html/*
 # << files devel
 
 %files tests
 %defattr(-,root,root,-)
 # >> files tests
-%{_libdir}/sensord/testing/*
+%{_libdir}/libsensorfakeopen*.so
+%{_libdir}/libsensorfakeopen*.so.*
+%{_libdir}/sensord-qt5/testing/*
 %attr(755,root,root)%{_datadir}/sensorfw-tests/*.p*
 %attr(644,root,root)%{_datadir}/sensorfw-tests/*.xml
 %attr(644,root,root)%{_datadir}/sensorfw-tests/*.conf
 %attr(755,root,root)%{_bindir}/*
 # << files tests
 
-%files contextfw-tests
-%defattr(-,root,root,-)
-# >> files contextfw-tests
-%attr(755,root,root)%{_datadir}/sensorfw-contextfw-tests/*.sh
-%attr(755,root,root)%{_datadir}/sensorfw-contextfw-tests/*.p*
-%attr(644,root,root)%{_datadir}/sensorfw-contextfw-tests/*.xml
-# << files contextfw-tests
-
 %files configs
 %defattr(-,root,root,-)
 # >> files configs

diff --git a/rpm/sensorfw-qt5.yaml b/rpm/sensorfw-qt5.yaml
@@ -20,7 +20,6 @@ Requires:
 PkgConfigBR:
     - Qt5Core
     - gconf-2.0
-    - contextprovider-1.0
 
 #PkgBR:
 #    - doxygen
@@ -34,7 +33,7 @@ Builder: qmake
 UseAsNeeded: no
 
 QMakeOptions:
-    - "CONFIG+=contextprovider"
+    - "CONFIG+=mce"
 
 SubPackages:
     - Name: devel
@@ -54,15 +53,6 @@ SubPackages:
       Description: |
         Contains unit test cases for CI environment.
 
-    - Name: contextfw-tests
-      Group: Development/Libraries
-      Requires:
-          - sensorfw-tests
-          - contextkit >= 0.3.6
-      Summary: Test cases for sensord acting as context provider
-      Description: |
-        Contains test cases for CI environment, for ensuring that sensord provides context properties correctly.
-
 #    - Name: doc
 #      Group: Documentation
 #      Summary: API documentation for libsensord

diff --git a/rpm/sensorfw.yaml b/rpm/sensorfw.yaml
@@ -94,12 +94,6 @@ SubPackages:
       Description: |
         Provides Qt 4 compatibility for Qt 5 Sensorfw files.
       AutoDepend: no
-      Obsoletes:
-        - sensorfw
-      Provides:
-        - sensorfw
-      Requires:
-          - sensorfw-qt5
       Files:
           - "%{_libdir}/libsensorclient.so*"
           - "%{_libdir}/libsensordatatypes.so*"

diff --git a/sensord/sensord.pro b/sensord/sensord.pro
@@ -24,10 +24,11 @@ QMAKE_LIBDIR_FLAGS += -L../datatypes \
 
 equals(QT_MAJOR_VERSION, 4):{
     QMAKE_LIBDIR_FLAGS += -lsensordatatypes -lsensorfw
+    TARGET_H.path += /usr/include/sensord
 }
 equals(QT_MAJOR_VERSION, 5):{
     QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorfw-qt5
-
+    TARGET_H.path += /usr/include/sensord-qt5
 }
 QMAKE_RPATHDIR += /usr/lib/sensord
 
@@ -43,7 +44,6 @@ contextprovider {
     PKGCONFIG += contextprovider-1.0
 }
 
-TARGET_H.path += /usr/include/sensord
 TARGET_H.files = $$HEADERS
 target.path = /usr/sbin/
 

diff --git a/tests/adaptors/adaptors.pro b/tests/adaptors/adaptors.pro
@@ -45,4 +45,10 @@ INCLUDEPATH += ../.. \
     ../../adaptors/proximityadaptor \
     ../../adaptors/gyroscopeadaptor
 
-QMAKE_LIBDIR_FLAGS += -L../../builddir/core -L../../core/ -lsensorfw -lrt
+QMAKE_LIBDIR_FLAGS += -L../../builddir/core -L../../core/ -lrt
+equals(QT_MAJOR_VERSION, 4):{
+    QMAKE_LIBDIR_FLAGS += -lsensorfw
+}
+equals(QT_MAJOR_VERSION, 5):{
+    QMAKE_LIBDIR_FLAGS +=  -lsensorfw-qt5
+}
diff --git a/tests/benchmark/benchmarktest/benchmarktest.pro b/tests/benchmark/benchmarktest/benchmarktest.pro
@@ -20,5 +20,11 @@ SENSORFW_INCLUDEPATHS = ../../../include \
 DEPENDPATH += $$SENSORFW_INCLUDEPATHS
 INCLUDEPATH += $$SENSORFW_INCLUDEPATHS
 
-QMAKE_LIBDIR_FLAGS += -L../../../qt-api -lsensorclient \
-                      -L../../../datatypes -lsensordatatypes
+QMAKE_LIBDIR_FLAGS += -L../../../qt-api \
+                      -L../../../datatypes
+equals(QT_MAJOR_VERSION, 4):{
+    QMAKE_LIBDIR_FLAGS += -lsensordatatypes -lsensorclient
+}
+equals(QT_MAJOR_VERSION, 5):{
+    QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5
+}
diff --git a/tests/benchmark/dummyclient/dummyclient.pro b/tests/benchmark/dummyclient/dummyclient.pro
@@ -12,5 +12,12 @@ INCLUDEPATH += ../../../qt-api \
 SOURCES += dummyclient.cpp
 HEADERS += dummyclient.h
 
-QMAKE_LIBDIR_FLAGS += -L../../../qt-api -lsensorclient \
-                      -L../../../datatypes -lsensordatatypes
+QMAKE_LIBDIR_FLAGS += -L../../../qt-api  \
+                      -L../../../datatypes
+
+equals(QT_MAJOR_VERSION, 4):{
+    QMAKE_LIBDIR_FLAGS += -lsensordatatypes
+}
+equals(QT_MAJOR_VERSION, 5):{
+    QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5
+}
diff --git a/tests/chains/chains.pro b/tests/chains/chains.pro
@@ -18,6 +18,12 @@ INCLUDEPATH += ../../include \
     ../../datatypes \
     ../..
 
-QMAKE_LIBDIR_FLAGS += -L../../builddir/datatypes -L../../datatypes/ -lsensordatatypes
-QMAKE_LIBDIR_FLAGS += -L../../builddir/core -L../../core/ -lsensorfw
+QMAKE_LIBDIR_FLAGS += -L../../builddir/datatypes -L../../datatypes/
+QMAKE_LIBDIR_FLAGS += -L../../builddir/core -L../../core/
 QMAKE_RPATHDIR += /usr/lib/sensord
+equals(QT_MAJOR_VERSION, 4):{
+    QMAKE_LIBDIR_FLAGS += -lsensordatatypes -lsensorfw
+}
+equals(QT_MAJOR_VERSION, 5):{
+    QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorfw-qt5
+}
diff --git a/tests/client/client.pro b/tests/client/client.pro
@@ -19,6 +19,11 @@ SENSORFW_INCLUDEPATHS = ../.. \
 DEPENDPATH += $$SENSORFW_INCLUDEPATHS
 INCLUDEPATH += $$SENSORFW_INCLUDEPATHS
 
-QMAKE_LIBDIR_FLAGS += -L../../qt-api -lsensorclient \
-                      -L../../datatypes -lsensordatatypes
-
+QMAKE_LIBDIR_FLAGS += -L../../qt-api \
+                      -L../../datatypes
+equals(QT_MAJOR_VERSION, 4):{
+    QMAKE_LIBDIR_FLAGS += -lsensordatatypes -lsensorclient
+}
+equals(QT_MAJOR_VERSION, 5):{
+    QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5
+}
diff --git a/tests/common-install.pri b/tests/common-install.pri
@@ -2,7 +2,13 @@ QT += testlib
 
 include(../common-config.pri)
 
-QMAKE_LIBDIR_FLAGS += -L../../datatypes -L../../../datatypes -lsensordatatypes
+QMAKE_LIBDIR_FLAGS += -L../../datatypes -L../../../datatypes
+equals(QT_MAJOR_VERSION, 4):{
+    QMAKE_LIBDIR_FLAGS += -lsensordatatypes
+}
+equals(QT_MAJOR_VERSION, 5):{
+    QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5
+}
 
 target.path = /usr/bin
 INSTALLS += target
diff --git a/tests/dataflow/dataflow.pro b/tests/dataflow/dataflow.pro
@@ -20,6 +20,13 @@ INCLUDEPATH += ../../include \
     ../../adaptors \
     ../..
 
-QMAKE_LIBDIR_FLAGS += -L../../builddir/datatypes -L../../datatypes/ -lsensordatatypes
-QMAKE_LIBDIR_FLAGS += -L../../builddir/core -L../../core/ -lsensorfw
+QMAKE_LIBDIR_FLAGS += -L../../builddir/datatypes -L../../datatypes/
+QMAKE_LIBDIR_FLAGS += -L../../builddir/core -L../../core/
 QMAKE_RPATHDIR += /usr/lib/sensord
+
+equals(QT_MAJOR_VERSION, 4):{
+    QMAKE_LIBDIR_FLAGS += -lsensorfw
+}
+equals(QT_MAJOR_VERSION, 5):{
+    QMAKE_LIBDIR_FLAGS += -lsensorfw-qt5
+}
diff --git a/tests/deadclient/deadclient.pro b/tests/deadclient/deadclient.pro
@@ -13,8 +13,14 @@ INCLUDEPATH += ../../ \
                ../../filters \
                ../../qt-api
 
-QMAKE_LIBDIR_FLAGS += -L../../qt-api -lsensorclient \
-                      -L../../datatypes -lsensordatatypes
+QMAKE_LIBDIR_FLAGS += -L../../qt-api  \
+                      -L../../datatypes
+equals(QT_MAJOR_VERSION, 4):{
+    QMAKE_LIBDIR_FLAGS += -lsensordatatypes -lsensorclient
+}
+equals(QT_MAJOR_VERSION, 5):{
+    QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5
+}
 
 # Input
 HEADERS += datareceiver.h testwindow.h

diff --git a/tests/filters/filters.pro b/tests/filters/filters.pro
@@ -31,5 +31,13 @@ INCLUDEPATH += ../../include \
     ../../core \
     ../../datatypes
 
-QMAKE_LIBDIR_FLAGS += -L../../datatypes -lsensordatatypes
-QMAKE_LIBDIR_FLAGS += -L../../builddir/core -L../../core/ -lsensorfw
+QMAKE_LIBDIR_FLAGS += -L../../datatypes
+QMAKE_LIBDIR_FLAGS += -L../../builddir/core -L../../core/
+
+equals(QT_MAJOR_VERSION, 4):{
+    QMAKE_LIBDIR_FLAGS += -lsensordatatypes -lsensorfw
+}
+
+equals(QT_MAJOR_VERSION, 5):{
+    QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorfw-qt5
+}
diff --git a/tests/metadata/metadata.pro b/tests/metadata/metadata.pro
@@ -20,5 +20,11 @@ SENSORFW_INCLUDEPATHS = ../../include \
 DEPENDPATH += $$SENSORFW_INCLUDEPATHS
 INCLUDEPATH += $$SENSORFW_INCLUDEPATHS
 
-QMAKE_LIBDIR_FLAGS += -L../../qt-api -lsensorclient \
-                      -L../../datatypes -lsensordatatypes
+QMAKE_LIBDIR_FLAGS += -L../../qt-api \
+                      -L../../datatypes
+equals(QT_MAJOR_VERSION, 4):{
+    QMAKE_LIBDIR_FLAGS += -lsensordatatypes -lsensorclient
+}
+equals(QT_MAJOR_VERSION, 5):{
+    QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5
+}
diff --git a/tests/powermanagement/driverpolltest/driverpolltest.pro b/tests/powermanagement/driverpolltest/driverpolltest.pro
@@ -20,5 +20,11 @@ SENSORFW_INCLUDEPATHS = ../../../qt-api \
 DEPENDPATH += $$SENSORFW_INCLUDEPATHS
 INCLUDEPATH += $$SENSORFW_INCLUDEPATHS
 
-QMAKE_LIBDIR_FLAGS += -L../../../qt-api -lsensorclient \
-                      -L../../../datatypes -lsensordatatypes
+QMAKE_LIBDIR_FLAGS += -L../../../qt-api  \
+                      -L../../../datatypes
+equals(QT_MAJOR_VERSION, 4):{
+    QMAKE_LIBDIR_FLAGS += -lsensordatatypes -lsensorclient
+}
+equals(QT_MAJOR_VERSION, 5):{
+    QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5
+}
diff --git a/tests/powermanagement/powermanagementtests/powermanagementtests.pro b/tests/powermanagement/powermanagementtests/powermanagementtests.pro
@@ -20,5 +20,11 @@ SENSORFW_INCLUDEPATHS = ../../../qt-api \
 DEPENDPATH += $$SENSORFW_INCLUDEPATHS
 INCLUDEPATH += $$SENSORFW_INCLUDEPATHS
 
-QMAKE_LIBDIR_FLAGS += -L../../../qt-api -lsensorclient \
-                      -L../../../datatypes -lsensordatatypes
+QMAKE_LIBDIR_FLAGS += -L../../../qt-api  \
+                      -L../../../datatypes
+equals(QT_MAJOR_VERSION, 4):{
+    QMAKE_LIBDIR_FLAGS += -lsensordatatypes -lsensorclient
+}
+equals(QT_MAJOR_VERSION, 5):{
+    QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5
+}
diff --git a/tests/powermanagement/standbyoverridetests/standbyoverridetests.pro b/tests/powermanagement/standbyoverridetests/standbyoverridetests.pro
@@ -20,5 +20,11 @@ SENSORFW_INCLUDEPATHS = ../../../qt-api \
 DEPENDPATH += $$SENSORFW_INCLUDEPATHS
 INCLUDEPATH += $$SENSORFW_INCLUDEPATHS
 
-QMAKE_LIBDIR_FLAGS += -L../../../qt-api -lsensorclient \
-                      -L../../../datatypes -lsensordatatypes
+QMAKE_LIBDIR_FLAGS += -L../../../qt-api  \
+                      -L../../../datatypes
+equals(QT_MAJOR_VERSION, 4):{
+    QMAKE_LIBDIR_FLAGS += -lsensordatatypes -lsensorclient
+}
+equals(QT_MAJOR_VERSION, 5):{
+    QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5
+}
diff --git a/tests/testapp/testapp.pro b/tests/testapp/testapp.pro
@@ -32,9 +32,15 @@ SENSORFW_INCLUDEPATHS = ../../include \
 DEPENDPATH += $$SENSORFW_INCLUDEPATHS
 INCLUDEPATH += $$SENSORFW_INCLUDEPATHS
 
-QMAKE_LIBDIR_FLAGS += -L../../qt-api -lsensorclient \
-                      -L../../datatypes -lsensordatatypes \
-                      -L../../core -lsensorfw
+QMAKE_LIBDIR_FLAGS += -L../../qt-api\
+                      -L../../datatypes  \
+                      -L../../core
+equals(QT_MAJOR_VERSION, 4):{
+    QMAKE_LIBDIR_FLAGS += -lsensordatatypes -lsensorclient -lsensorfw
+}
+equals(QT_MAJOR_VERSION, 5):{
+    QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5 -lsensorfw-qt5
+}
 
 DEFINES += TARGET_LIB_$$TARGET_LIB