Merge lp:~unity-api-team/indicator-network/lp1456307_15.10 into lp:indicator-network/15.10

[Antti Kaijanmäki]

Fix .pc file and docs.

Fix .pc file and docs.

They got broken when moving connectivity-qt over from connectivity-api source package.

connectivity-api and -dev package contents BEFORE:
http://pastebin.ubuntu.com/11225940/
http://pastebin.ubuntu.com/11225952/

-dev package contents AFTER:
http://pastebin.ubuntu.com/11225975/

[Charles Kerr (charlesk)]

LGTM

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-05-12 09:07:46 +0000
+++ CMakeLists.txt	2015-05-19 13:57:17 +0000
@@ -96,6 +96,10 @@
   "config.h"
 )
 
+set(CONNECTIVITY_QT_VERSION_MAJOR 1)
+set(CONNECTIVITY_QT_VERSION_MINOR 0)
+set(CONNECTIVITY_QT_LIB_TARGET connectivity-qt${CONNECTIVITY_QT_VERSION_MAJOR})
+
 add_subdirectory(data)
 add_subdirectory(src)
 

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2015-04-28 14:01:57 +0000
+++ data/CMakeLists.txt	2015-05-19 13:57:17 +0000
@@ -41,21 +41,6 @@
 add_schema ("com.canonical.indicator.network.gschema.xml")
 
 ###########################
-# PkgConfig
-###########################
-
-configure_file(
-  "connectivity-qt.pc.in"
-  "connectivity-qt.pc"
-  @ONLY
-)
-
-install(
-  FILES "${CMAKE_CURRENT_BINARY_DIR}/connectivity-qt.pc"
-  DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
-)
-
-###########################
 # XDG Autostart File
 ###########################
 

=== modified file 'doc/qt/cpp/examples/CMakeLists.txt'
--- doc/qt/cpp/examples/CMakeLists.txt	2015-05-07 10:03:46 +0000
+++ doc/qt/cpp/examples/CMakeLists.txt	2015-05-19 13:57:17 +0000
@@ -4,4 +4,4 @@
   networking_status
   example_networking_status.cpp
 )
-target_link_libraries(networking_status connectivity-qt)
+target_link_libraries(networking_status ${CONNECTIVITY_QT_LIB_TARGET})

=== modified file 'src/connectivity-api/connectivity-qml/CMakeLists.txt'
--- src/connectivity-api/connectivity-qml/CMakeLists.txt	2015-04-28 14:01:57 +0000
+++ src/connectivity-api/connectivity-qml/CMakeLists.txt	2015-05-19 13:57:17 +0000
@@ -11,18 +11,19 @@
   plugin.cpp
 )
 
-add_library(connectivity-qml MODULE
+add_library(connectivity-qml SHARED
   ${CONNECTIVITY_QML_SRC}
 )
+target_link_libraries(
+  connectivity-qml
+  ${CONNECTIVITY_QT_LIB_TARGET}
+)
+
 
 qt5_use_modules(connectivity-qml
   Qml
 )
 
-target_link_libraries(
-  connectivity-qml
-  connectivity-qt
-)
 
 add_qmlplugin(
   Ubuntu.Connectivity

=== modified file 'src/connectivity-api/connectivity-qt/CMakeLists.txt'
--- src/connectivity-api/connectivity-qt/CMakeLists.txt	2015-05-13 10:12:32 +0000
+++ src/connectivity-api/connectivity-qt/CMakeLists.txt	2015-05-19 13:57:17 +0000
@@ -1,8 +1,18 @@
 
-set(API_VERSION 1)
-set(SOVERSION 1)
+set(CONNECTIVITY_QT_INCLUDE_DIR
+"${CMAKE_INSTALL_FULL_INCLUDEDIR}/connectivity-api/qt${CONNECTIVITY_QT_VERSION_MAJOR}")
+
+set(PUBLIC_HEADER_DIR "${CMAKE_SOURCE_DIR}/src/connectivity-api/connectivity-qt/ubuntu/connectivity")
+set(PUBLIC_HEADERS
+    ${PUBLIC_HEADER_DIR}/networking-status.h
+)
+install(FILES ${PUBLIC_HEADERS}
+        DESTINATION "${CONNECTIVITY_QT_INCLUDE_DIR}/ubuntu/connectivity")
+
+
+
 set(SYMBOL_MAP "${DATA_DIR}/connectivity-qt.map")
-set(OUTPUT_NAME "connectivity-qt${SOVERSION}")
+
 include_directories("${CMAKE_SOURCE_DIR}/src/qdbus-stubs")
 
 set(
@@ -40,41 +50,43 @@
 )
 
 add_library(
-    connectivity-qt
+    ${CONNECTIVITY_QT_LIB_TARGET}
     SHARED
     ${CONNECTIVITY_QT_SRC}
+    ${PUBLIC_HEADERS} # public headers have to be included here for Q_DECL_EXPORT to work properly
 )
 
 qt5_use_modules(
-    connectivity-qt
+    ${CONNECTIVITY_QT_LIB_TARGET}
     Core
     DBus
 )
 
 target_link_libraries(
-    connectivity-qt
+    ${CONNECTIVITY_QT_LIB_TARGET}
     qdbus-stubs
 )
 
+set(SO_VERSION ${CONNECTIVITY_QT_VERSION_MAJOR})
 set_target_properties(
-    connectivity-qt
+    ${CONNECTIVITY_QT_LIB_TARGET}
     PROPERTIES
-    OUTPUT_NAME ${OUTPUT_NAME}
-    VERSION ${API_VERSION}.0.0
-    SOVERSION ${SOVERSION}
+    SOVERSION ${SO_VERSION}
     LINK_FLAGS "-Wl,--version-script,${SYMBOL_MAP}"
     LINK_DEPENDS "${SYMBOL_MAP}"
 )
 
 install(
-    TARGETS connectivity-qt
+    TARGETS ${CONNECTIVITY_QT_LIB_TARGET}
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
 
+set(PC_FILE_TARGET "${CMAKE_BINARY_DIR}/${CONNECTIVITY_QT_LIB_TARGET}.pc")
+set(libdir "${CMAKE_INSTALL_FULL_LIBDIR}")
+set(includedir "${CONNECTIVITY_QT_INCLUDE_DIR}")
+set(ABSOLUTE_SO_FILE "${CMAKE_INSTALL_FULL_LIBDIR}/lib${CONNECTIVITY_QT_LIB_TARGET}.so.${SO_VERSION}")
+configure_file("connectivity-qt.pc.in" ${PC_FILE_TARGET} @ONLY)
 install(
-    DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    DESTINATION "include"
-    FILES_MATCHING PATTERN "*.h"
-    PATTERN "internal" EXCLUDE
+  FILES ${PC_FILE_TARGET}
+  DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
 )
-

=== renamed file 'data/connectivity-qt.pc.in' => 'src/connectivity-api/connectivity-qt/connectivity-qt.pc.in'
--- data/connectivity-qt.pc.in	2015-04-28 14:01:57 +0000
+++ src/connectivity-api/connectivity-qt/connectivity-qt.pc.in	2015-05-19 13:57:17 +0000
@@ -1,10 +1,10 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${exec_prefix}/include
- 
-Name: libconnectivity-qt
-Description: Connectivity API for Qt
-Version: 1.0
-Cflags: -I${includedir}
-Libs: -L${libdir} -lconnectivity-qt
+libdir=@libdir@
+includedir=@includedir@
+
+Cflags: -I${includedir}/
+Requires: Qt5DBus
+Libs: @ABSOLUTE_SO_FILE@
+
+Name: connectivity-qt1
+Description: Ubuntu Connectivity API
+Version: @CONNECTIVITY_QT_VERSION_MAJOR@.@CONNECTIVITY_QT_VERSION_MINOR@

=== modified file 'tests/integration/CMakeLists.txt'
--- tests/integration/CMakeLists.txt	2015-04-22 10:06:53 +0000
+++ tests/integration/CMakeLists.txt	2015-05-19 13:57:17 +0000
@@ -29,7 +29,7 @@
     integration-tests
     test-utils
     menuharness
-    connectivity-qt
+    ${CONNECTIVITY_QT_LIB_TARGET}
     ${QTDBUSMOCK_LDFLAGS}
     ${QTDBUSTEST_LDFLAGS}
     ${GTEST_LIBRARIES}