diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-08-28 23:32:38 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-08-28 23:32:38 +0200 |
| commit | 1669b29b16411fb7ee1d4b012cc8775338a590c2 (patch) | |
| tree | e9bd54c154441fc01cc40d07dafc1b6ebd85be7a | |
| parent | f3ac7d608633d0f2bad0505c1ed1c25af6048745 (diff) | |
| parent | 908b36b944787b19cc9cffaf71aca5cf292be7b9 (diff) | |
| download | libayatana-common-1669b29b16411fb7ee1d4b012cc8775338a590c2.tar.gz libayatana-common-1669b29b16411fb7ee1d4b012cc8775338a590c2.tar.bz2 libayatana-common-1669b29b16411fb7ee1d4b012cc8775338a590c2.zip | |
Merge branch 'sunweaver-pr/generate-typelib-file'
Attributes GH PR #41: https://github.com/AyatanaIndicators/libayatana-common/pull/41
| -rwxr-xr-x | debian/ayatana-indicator-common.install | 2 | ||||
| -rw-r--r-- | debian/control | 13 | ||||
| -rw-r--r-- | debian/libayatana-common-dev.install | 2 | ||||
| -rwxr-xr-x | debian/rules | 3 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 26 |
5 files changed, 41 insertions, 5 deletions
diff --git a/debian/ayatana-indicator-common.install b/debian/ayatana-indicator-common.install index b252da6..ad0fa10 100755 --- a/debian/ayatana-indicator-common.install +++ b/debian/ayatana-indicator-common.install @@ -1,2 +1,4 @@ #! /usr/bin/dh-exec [linux-any] usr/lib/systemd +usr/share/locale/ +usr/share/glib-2.0/schemas/ diff --git a/debian/control b/debian/control index 897dec8..df2fec0 100644 --- a/debian/control +++ b/debian/control @@ -38,6 +38,7 @@ Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, + gir1.2-ayatanacommon-0.0 (= ${binary:Version}), libayatana-common0 (= ${binary:Version}), Description: Ayatana System Indicators' common API functions (development headers) This package contains common API functions used by Ayatana System @@ -45,6 +46,18 @@ Description: Ayatana System Indicators' common API functions (development header . This package contains the development headers. +Package: gir1.2-ayatanacommon-0.0 +Section: introspection +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${gir:Depends}, +Description: Ayatana System Indicators' common API functions (GObject Introspection) + This package contains common API functions used by Ayatana System + Indicators. + . + This package contains the GObject Introspection file. + Package: ayatana-indicator-common Architecture: all Depends: ${misc:Depends}, diff --git a/debian/libayatana-common-dev.install b/debian/libayatana-common-dev.install index e650b7c..954378f 100644 --- a/debian/libayatana-common-dev.install +++ b/debian/libayatana-common-dev.install @@ -1,3 +1,5 @@ usr/include usr/lib/*/pkgconfig/libayatana-common.pc usr/lib/*/libayatana-common.so +usr/share/gir-1.0/ +usr/share/vala/vapi/ diff --git a/debian/rules b/debian/rules index 82088c0..f23cfb5 100755 --- a/debian/rules +++ b/debian/rules @@ -15,5 +15,8 @@ override_dh_auto_configure: -DCMAKE_INSTALL_DIR=/usr \ $(NULL) +override_dh_missing: + dh_missing --fail-missing + get-orig-source: uscan --noconf --force-download --rename --download-current-version --destdir=.. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 39682a7..dfebdf5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -32,35 +32,51 @@ install(TARGETS ayatana-common DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}) if (INTROSPECTION_FOUND) add_custom_command( - OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon.gir" + OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon-0.0.gir" DEPENDS "ayatana-common" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${INTROSPECTION_SCANNER} utils.c utils.h --namespace=AyatanaCommon + --nsversion=0.0 --c-include=ayatana/common/utils.h --quiet --warn-all --include=GLib-2.0 --library="ayatana-common" --library-path=${CMAKE_CURRENT_BINARY_DIR} - --output "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon.gir" + --output "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon-0.0.gir" ) - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon.gir" DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/gir-1.0") + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon-0.0.gir" DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/gir-1.0") + +# AyatanaCommon.typelib + + add_custom_command( + OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon-0.0.typelib" + DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon-0.0.gir" + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND + ${INTROSPECTION_COMPILER} + --includedir=${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon-0.0.gir + -o "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon-0.0.typelib" + ) + + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon-0.0.typelib" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/girepository-1.0") # AyatanaCommon.vapi if (VALA_COMPILER) add_custom_command( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon.vapi" - DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon.gir" + DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon-0.0.typelib" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${VAPI_GEN} --library=AyatanaCommon - AyatanaCommon.gir + AyatanaCommon-0.0.gir ) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon.vapi" DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/vala/vapi") |