[libcommhistory] Remove static library build

Tests now use the shared library, and the static library is removed entirely. To enable tests, CommHistory::Adaptor is now an exported class, but shouldn't be normally used and shouldn't pose an ABI problem.
sailfishos · Jul 16, 2013 · 417279e · 417279e
1 parent a6a3187
commit 417279e
Show file tree

Hide file tree

Showing 8 changed files with 86 additions and 163 deletions.
diff --git a/rpm/libcommhistory-qt5.spec b/rpm/libcommhistory-qt5.spec
@@ -104,8 +104,6 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/libcommhistory-qt5.a
-%{_libdir}/libcommhistory-qt5.prl
 %{_libdir}/pkgconfig/commhistory-qt5.pc
 %{_includedir}/commhistory-qt5/CommHistory/*
 

diff --git a/rpm/libcommhistory.spec b/rpm/libcommhistory.spec
@@ -101,7 +101,6 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/libcommhistory.a
 %{_libdir}/pkgconfig/commhistory.pc
 %{_includedir}/commhistory/CommHistory/*
 

diff --git a/src/adaptor.h b/src/adaptor.h
@@ -26,10 +26,11 @@
 #include <QtDBus/QtDBus>
 #include "event.h"
 #include "group.h"
+#include "libcommhistoryexport.h"
 
 namespace CommHistory {
 
-class Adaptor : public QDBusAbstractAdaptor
+class LIBCOMMHISTORY_EXPORT Adaptor : public QDBusAbstractAdaptor
 {
     Q_OBJECT
 

diff --git a/src/shared.pro b/src/shared.pro
diff --git a/src/src.pro b/src/src.pro
@@ -20,6 +20,83 @@
 #
 ###############################################################################
 
-TEMPLATE = subdirs
-CONFIG += ordered
-SUBDIRS = shared.pro static.pro
+# -----------------------------------------------------------------------------
+# libcommhistory/src/shared.pro
+# -----------------------------------------------------------------------------
+!include( ../common-project-config.pri ) : \
+    error( "Unable to include common-project-config.pri" )
+!include( ../common-vars.pri ) : \
+    error( "Unable to include common-vars.pri" )
+
+# -----------------------------------------------------------------------------
+# target setup
+# -----------------------------------------------------------------------------
+TEMPLATE = lib
+VERSION  = $$LIBRARY_VERSION
+
+CONFIG  += shared \
+           debug
+
+QT += dbus sql
+
+equals(QT_MAJOR_VERSION, 4) {
+    TARGET = commhistory
+    CONFIG += mobility
+    MOBILITY += contacts
+}
+
+equals(QT_MAJOR_VERSION, 5) {
+    TARGET = commhistory-qt5
+    QT += contacts
+    DEFINES += USING_QTPIM
+}
+
+DEFINES += LIBCOMMHISTORY_SHARED
+QMAKE_CXXFLAGS += -fvisibility=hidden
+
+# -----------------------------------------------------------------------------
+# input
+# -----------------------------------------------------------------------------
+QT_LIKE_HEADERS += headers/CallEvent \
+                   headers/CallModel \
+                   headers/ConversationModel \
+                   headers/Event \
+                   headers/EventModel \
+                   headers/MessagePart \
+                   headers/Group \
+                   headers/GroupModel \
+                   headers/ClassZeroSMSModel \
+                   headers/SingleEventModel \
+                   headers/Events \
+                   headers/Models \
+                   headers/DatabaseIO
+
+include(sources.pri)
+
+# -----------------------------------------------------------------------------
+# Installation target for API header files
+# -----------------------------------------------------------------------------
+headers.files = $$HEADERS \
+                $$QT_LIKE_HEADERS
+
+# -----------------------------------------------------------------------------
+# common installation setup
+# NOTE: remember to set headers.files before this include to have the headers
+# properly setup.
+# -----------------------------------------------------------------------------
+!include( ../common-installs-config.pri ) : \
+    error( "Unable to include common-installs-config.pri" )
+
+# -----------------------------------------------------------------------------
+# Installation target for .pc file
+# -----------------------------------------------------------------------------
+pkgconfig.files = $${TARGET}.pc
+pkgconfig.path  = $${INSTALL_PREFIX}/lib/pkgconfig
+INSTALLS       += pkgconfig
+
+# -----------------------------------------------------------------------------
+# End of file
+# -----------------------------------------------------------------------------
+
+OTHER_FILES += \
+    sources.pri
diff --git a/src/static.pro b/src/static.pro
diff --git a/tests/performance_tests.pri b/tests/performance_tests.pri
@@ -26,12 +26,12 @@ INCLUDEPATH += . ../../src ..
 DEPENDPATH  += $${INCLUDEPATH}
 
 equals(QT_MAJOR_VERSION, 4) {
-    LIBS += ../../src/libcommhistory.a
+    LIBS += ../../src/libcommhistory.so
     CONFIG += mobility
     MOBILITY += contacts
 }
 equals(QT_MAJOR_VERSION, 5) {
-    LIBS += ../../src/libcommhistory-qt5.a
+    LIBS += ../../src/libcommhistory-qt5.so
     QT += contacts
     DEFINES += USING_QTPIM
 }

diff --git a/tests/tests.pri b/tests/tests.pri
@@ -26,12 +26,12 @@ INCLUDEPATH += . ../../src ..
 DEPENDPATH  += $${INCLUDEPATH}
 
 equals(QT_MAJOR_VERSION, 4) {
-    LIBS += ../../src/libcommhistory.a
+    LIBS += ../../src/libcommhistory.so
     CONFIG += mobility
     MOBILITY += contacts
 }
 equals(QT_MAJOR_VERSION, 5) {
-    LIBS += ../../src/libcommhistory-qt5.a
+    LIBS += ../../src/libcommhistory-qt5.so
     QT += contacts
     DEFINES += USING_QTPIM
 }