Re-add debian build files.

and make work with hybris
sailfishos · Jan 13, 2015 · 9d16eb8 · 9d16eb8
1 parent bdc51e7
commit 9d16eb8
Show file tree

Hide file tree

Showing 61 changed files with 373 additions and 349 deletions.
diff --git a/adaptors/adaptor-config.pri b/adaptors/adaptor-config.pri
@@ -16,3 +16,4 @@ publicheaders.files += $$HEADERS
 target.path = $$PLUGINPATH
 
 INSTALLS += target
+
diff --git a/adaptors/adaptors.pro b/adaptors/adaptors.pro
@@ -26,13 +26,24 @@ SUDBIRS += oemtabletgyroscopeadaptor
 SUBDIRS += steaccelerometeradaptor
 SUBDIRS += mpu6050accelerometer
 
-contains(CONFIG,hybris) {
-    SUBDIRS = hybrisaccelerometer
+config_hybris {
+    SUBDIRS += hybrisaccelerometer
     SUBDIRS += hybrisalsadaptor
     SUBDIRS += hybrisgyroscopeadaptor
     SUBDIRS += hybrismagnetometeradaptor
     SUBDIRS += hybrisproximityadaptor
     SUBDIRS += hybrisorientationadaptor
+
+} else {
+# split like this as Sailfish only installs hybris plugins
+    contains(CONFIG,hybris) {
+        SUBDIRS = hybrisaccelerometer
+        SUBDIRS += hybrisalsadaptor
+        SUBDIRS += hybrisgyroscopeadaptor
+        SUBDIRS += hybrismagnetometeradaptor
+        SUBDIRS += hybrisproximityadaptor
+        SUBDIRS += hybrisorientationadaptor
+    }
 }
 
 
diff --git a/adaptors/hybrisaccelerometer/hybrisaccelerometer.pro b/adaptors/hybrisaccelerometer/hybrisaccelerometer.pro
@@ -8,3 +8,6 @@ SOURCES += hybrisaccelerometeradaptor.cpp \
 LIBS+= -L../../core -lhybrissensorfw-qt5
 
 include( ../adaptor-config.pri )
+config_hybris {
+    INCLUDEPATH+=/usr/include/android
+}
diff --git a/adaptors/hybrisalsadaptor/hybrisalsadaptor.pro b/adaptors/hybrisalsadaptor/hybrisalsadaptor.pro
@@ -8,3 +8,6 @@ SOURCES += hybrisalsadaptor.cpp \
 LIBS+= -L../../core -lhybrissensorfw-qt5
 
 include(../adaptor-config.pri )
+config_hybris {
+    INCLUDEPATH+=/usr/include/android
+}
diff --git a/adaptors/hybrisgyroscopeadaptor/hybrisgyroscopeadaptor.pro b/adaptors/hybrisgyroscopeadaptor/hybrisgyroscopeadaptor.pro
@@ -9,3 +9,6 @@ SOURCES += hybrisgyroscopeadaptor.cpp \
 LIBS+= -L../../core -lhybrissensorfw-qt5
 
 include( ../adaptor-config.pri )
+config_hybris {
+    INCLUDEPATH+=/usr/include/android
+}
diff --git a/adaptors/hybrismagnetometeradaptor/hybrismagnetometeradaptor.pro b/adaptors/hybrismagnetometeradaptor/hybrismagnetometeradaptor.pro
@@ -9,3 +9,6 @@ SOURCES += hybrismagnetometeradaptor.cpp \
 LIBS+= -L../../core -lhybrissensorfw-qt5
 
 include( ../adaptor-config.pri )
+config_hybris {
+    INCLUDEPATH+=/usr/include/android
+}
diff --git a/adaptors/hybrisorientationadaptor/hybrisorientationadaptor.pro b/adaptors/hybrisorientationadaptor/hybrisorientationadaptor.pro
@@ -9,3 +9,6 @@ SOURCES += hybrisorientationadaptor.cpp \
 LIBS+= -L../../core -lhybrissensorfw-qt5
 
 include( ../adaptor-config.pri )
+config_hybris {
+    INCLUDEPATH+=/usr/include/android
+}
diff --git a/adaptors/hybrisproximityadaptor/hybrisproximityadaptor.pro b/adaptors/hybrisproximityadaptor/hybrisproximityadaptor.pro
@@ -9,3 +9,6 @@ SOURCES += hybrisproximityadaptor.cpp \
 LIBS+= -L../../core -lhybrissensorfw-qt5
 
 include( ../adaptor-config.pri )
+config_hybris {
+    INCLUDEPATH+=/usr/include/android
+}
diff --git a/config.tests/hybris/hybris.pro b/config.tests/hybris/hybris.pro
@@ -0,0 +1,6 @@
+TEMPLATE = app
+
+INCLUDEPATH=/usr/include/android
+TARGET = hybris
+
+SOURCES += main.cpp
diff --git a/config.tests/hybris/main.cpp b/config.tests/hybris/main.cpp
@@ -0,0 +1,7 @@
+
+#include <android/hardware/sensors.h>
+
+int main()
+{
+    return 0;
+}
diff --git a/core/hybris.pro b/core/hybris.pro
@@ -6,6 +6,7 @@ TARGET = hybrissensorfw
 include( ../common-config.pri )
 
 CONFIG += link_pkgconfig
+INCLUDEPATH+=/usr/include/android
 
 SENSORFW_INCLUDEPATHS = .. \
                         ../include \
@@ -19,7 +20,7 @@ QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5
 
 SOURCES += hybrisadaptor.cpp
 HEADERS += hybrisadaptor.h
-LIBS += -L/usr/lib -lhybris-common -lhardware
+LIBS += -L/usr/lib -lhybris-common -lhardware -L../datatypes
 
 include(../common-install.pri)
 target.path = $$SHAREDLIBPATH

diff --git a/debian/api b/debian/api
@@ -1,32 +1,32 @@
-interface: libsensord
+interface: libsensorfw-qt5
 type: library
 scope: internal
 state: unstable
-libs-pkg: sensord
-dev-pkg: libsensord-dev
+libs-pkg: sensorfw-qt5
+dev-pkg: libsensorfw-qt5-dev
 headers:
- /usr/include/sensord/datatypes/*
- /usr/include/sensord/*_i.h
+ /usr/include/sensord-qt5/datatypes/*
+ /usr/include/sensord-qt5/*_i.h
 libs:
- /usr/lib/libsensorclient.so.1.0.0
+ /usr/lib/libsensorclient-qt5.so.1.0.0
  /usr/lib/libsensordatatypes.so.1.0.0
 
 interface: sensordPlugins
 type: library
 scope: internal
 state: unstable
-libs-pkg: sensord
-dev-pkg: libsensord-dev
+libs-pkg: sensorfw-qt5
+dev-pkg: libsensorfw-qt5-dev
 headers:
- /usr/include/sensord/plugin.h
- /usr/include/sensord/sensormanager.h
- /usr/include/sensord/deviceadaptor.h
- /usr/include/sensord/abstractsensor.h
- /usr/include/sensord/abstractchain.h
- /usr/include/sensord/filter.h
- /usr/include/sensord/bin.h
- /usr/include/sensord/bufferreader.h
- /usr/include/sensord/filterproperty.h
+ /usr/include/sensord-qt5/plugin.h
+ /usr/include/sensord-qt5/sensormanager.h
+ /usr/include/sensord-qt5/deviceadaptor.h
+ /usr/include/sensord-qt5/abstractsensor.h
+ /usr/include/sensord-qt5/abstractchain.h
+ /usr/include/sensord-qt5/filter.h
+ /usr/include/sensord-qt5/bin.h
+ /usr/include/sensord-qt5/bufferreader.h
+ /usr/include/sensord-qt5/filterproperty.h
 libs:
- /usr/lib/libsensorclient.so.1.0.0
+ /usr/lib/libsensorclient-qt5.so.1.0.0
  /usr/lib/libsensordatatypes.so.1.0.0