|
 |
135360 |
From 839e15f8019b8eb4b4986367aef5c77c58ed3412 Mon Sep 17 00:00:00 2001
|
|
|
135360 |
From: Pranav Kant <pranavk@gnome.org>
|
|
|
135360 |
Date: Sat, 15 Aug 2015 18:48:53 +0530
|
|
|
135360 |
Subject: [PATCH 110/398] create_tree.sh: Generate g-i files
|
|
|
135360 |
|
|
|
135360 |
Change-Id: I1749b5b02018cfe6f85a13aed8de4b31a09788e3
|
|
|
135360 |
Reviewed-on: https://gerrit.libreoffice.org/18494
|
|
|
135360 |
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
135360 |
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
135360 |
(cherry picked from commit 8f2aace934eb2a91a273b6104de6383108b5c82a)
|
|
|
135360 |
---
|
|
|
135360 |
configure.ac | 6 +++
|
|
|
135360 |
m4/introspection.m4 | 94 ++++++++++++++++++++++++++++++++++++++
|
|
|
135360 |
sysui/desktop/share/create_tree.sh | 13 ++++++
|
|
|
135360 |
3 files changed, 113 insertions(+)
|
|
|
135360 |
create mode 100644 m4/introspection.m4
|
|
|
135360 |
|
|
|
135360 |
diff --git a/configure.ac b/configure.ac
|
|
|
135360 |
index 4e27231f6a5f..b1ec23a5afa3 100644
|
|
|
135360 |
--- a/configure.ac
|
|
|
135360 |
+++ b/configure.ac
|
|
|
135360 |
@@ -181,6 +181,11 @@ SRC_ROOT=`pwd`
|
|
|
135360 |
cd $BUILDDIR
|
|
|
135360 |
x_Cygwin=[\#]
|
|
|
135360 |
|
|
|
135360 |
+dnl ======================================
|
|
|
135360 |
+dnl Required GObject introspection version
|
|
|
135360 |
+dnl ======================================
|
|
|
135360 |
+INTROSPECTION_REQUIRED_VERSION=1.32.0
|
|
|
135360 |
+
|
|
|
135360 |
dnl ===================================================================
|
|
|
135360 |
dnl Search all the common names for GNU Make
|
|
|
135360 |
dnl ===================================================================
|
|
|
135360 |
@@ -9903,6 +9908,7 @@ if test "x$enable_gtk3" = "xyes"; then
|
|
|
135360 |
PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.8 gtk+-unix-print-3.0 gmodule-no-export-2.0 glib-2.0 >= 2.38 cairo, ENABLE_GTK3="TRUE", ENABLE_GTK3="")
|
|
|
135360 |
if test "x$ENABLE_GTK3" = "xTRUE"; then
|
|
|
135360 |
R="gtk3"
|
|
|
135360 |
+ GOBJECT_INTROSPECTION_CHECK(INTROSPECTION_REQUIRED_VERSION)
|
|
|
135360 |
else
|
|
|
135360 |
AC_MSG_ERROR([gtk3 or dependent libraries of the correct versions, not found])
|
|
|
135360 |
fi
|
|
|
135360 |
diff --git a/m4/introspection.m4 b/m4/introspection.m4
|
|
|
135360 |
new file mode 100644
|
|
|
135360 |
index 000000000000..532bad82addf
|
|
|
135360 |
--- /dev/null
|
|
|
135360 |
+++ b/m4/introspection.m4
|
|
|
135360 |
@@ -0,0 +1,94 @@
|
|
|
135360 |
+dnl -*- mode: autoconf -*-
|
|
|
135360 |
+dnl Copyright 2009 Johan Dahlin
|
|
|
135360 |
+dnl
|
|
|
135360 |
+dnl This file is free software; the author(s) gives unlimited
|
|
|
135360 |
+dnl permission to copy and/or distribute it, with or without
|
|
|
135360 |
+dnl modifications, as long as this notice is preserved.
|
|
|
135360 |
+dnl
|
|
|
135360 |
+
|
|
|
135360 |
+# serial 1
|
|
|
135360 |
+
|
|
|
135360 |
+m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
|
|
|
135360 |
+[
|
|
|
135360 |
+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
|
|
|
135360 |
+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
|
|
|
135360 |
+ AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
|
|
|
135360 |
+
|
|
|
135360 |
+ dnl enable/disable introspection
|
|
|
135360 |
+ m4_if([$2], [require],
|
|
|
135360 |
+ [dnl
|
|
|
135360 |
+ enable_introspection=yes
|
|
|
135360 |
+ ],[dnl
|
|
|
135360 |
+ AC_ARG_ENABLE(introspection,
|
|
|
135360 |
+ AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
|
|
|
135360 |
+ [Enable introspection for this build]),,
|
|
|
135360 |
+ [enable_introspection=auto])
|
|
|
135360 |
+ ])dnl
|
|
|
135360 |
+
|
|
|
135360 |
+ AC_MSG_CHECKING([for gobject-introspection])
|
|
|
135360 |
+
|
|
|
135360 |
+ dnl presence/version checking
|
|
|
135360 |
+ AS_CASE([$enable_introspection],
|
|
|
135360 |
+ [no], [dnl
|
|
|
135360 |
+ found_introspection="no (disabled, use --enable-introspection to enable)"
|
|
|
135360 |
+ ],dnl
|
|
|
135360 |
+ [yes],[dnl
|
|
|
135360 |
+ PKG_CHECK_EXISTS([gobject-introspection-1.0],,
|
|
|
135360 |
+ AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
|
|
|
135360 |
+ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
|
|
|
135360 |
+ found_introspection=yes,
|
|
|
135360 |
+ AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
|
|
|
135360 |
+ ],dnl
|
|
|
135360 |
+ [auto],[dnl
|
|
|
135360 |
+ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
|
|
|
135360 |
+ dnl Canonicalize enable_introspection
|
|
|
135360 |
+ enable_introspection=$found_introspection
|
|
|
135360 |
+ ],dnl
|
|
|
135360 |
+ [dnl
|
|
|
135360 |
+ AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
|
|
|
135360 |
+ ])dnl
|
|
|
135360 |
+
|
|
|
135360 |
+ AC_MSG_RESULT([$found_introspection])
|
|
|
135360 |
+
|
|
|
135360 |
+ INTROSPECTION_SCANNER=
|
|
|
135360 |
+ INTROSPECTION_COMPILER=
|
|
|
135360 |
+ INTROSPECTION_GENERATE=
|
|
|
135360 |
+ INTROSPECTION_GIRDIR=
|
|
|
135360 |
+ INTROSPECTION_TYPELIBDIR=
|
|
|
135360 |
+ if test "x$found_introspection" = "xyes"; then
|
|
|
135360 |
+ INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
|
|
|
135360 |
+ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
|
|
|
135360 |
+ INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
|
|
|
135360 |
+ INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
|
|
|
135360 |
+ INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
|
|
|
135360 |
+ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
|
|
|
135360 |
+ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
|
|
|
135360 |
+ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
|
|
|
135360 |
+ fi
|
|
|
135360 |
+ AC_SUBST(INTROSPECTION_SCANNER)
|
|
|
135360 |
+ AC_SUBST(INTROSPECTION_COMPILER)
|
|
|
135360 |
+ AC_SUBST(INTROSPECTION_GENERATE)
|
|
|
135360 |
+ AC_SUBST(INTROSPECTION_GIRDIR)
|
|
|
135360 |
+ AC_SUBST(INTROSPECTION_TYPELIBDIR)
|
|
|
135360 |
+ AC_SUBST(INTROSPECTION_CFLAGS)
|
|
|
135360 |
+ AC_SUBST(INTROSPECTION_LIBS)
|
|
|
135360 |
+ AC_SUBST(INTROSPECTION_MAKEFILE)
|
|
|
135360 |
+])
|
|
|
135360 |
+
|
|
|
135360 |
+
|
|
|
135360 |
+dnl Usage:
|
|
|
135360 |
+dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
|
|
|
135360 |
+
|
|
|
135360 |
+AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
|
|
|
135360 |
+[
|
|
|
135360 |
+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
|
|
|
135360 |
+])
|
|
|
135360 |
+
|
|
|
135360 |
+dnl Usage:
|
|
|
135360 |
+dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
|
|
|
135360 |
+
|
|
|
135360 |
+
|
|
|
135360 |
+AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
|
|
|
135360 |
+[
|
|
|
135360 |
+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
|
|
|
135360 |
+])
|
|
|
135360 |
diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh
|
|
|
135360 |
index c6be0bb2a688..45b7c6cb09db 100755
|
|
|
135360 |
--- a/sysui/desktop/share/create_tree.sh
|
|
|
135360 |
+++ b/sysui/desktop/share/create_tree.sh
|
|
|
135360 |
@@ -87,3 +87,16 @@ for i in base calc draw impress writer; do
|
|
|
135360 |
cp "${APPDATA_SOURCE_DIR}/libreoffice-${i}.appdata.xml" "${DESTDIR}/${PREFIXDIR}/share/appdata/${PREFIX}-${i}.appdata.xml"
|
|
|
135360 |
done
|
|
|
135360 |
|
|
|
135360 |
+# Generate gobject-introspection files
|
|
|
135360 |
+mkdir -p "${DESTDIR}/${PREFIXDIR}/share/gir-1.0"
|
|
|
135360 |
+g-ir-scanner "${SRCDIR}/include/LibreOfficeKit/LibreOfficeKitGtk.h" "${SRCDIR}/libreofficekit/source/gtk/lokdocview.cxx" \
|
|
|
135360 |
+ `${PKG_CONFIG} --cflags gobject-introspection-1.0 gtk+-3.0` -I"${SRCDIR}/include/" \
|
|
|
135360 |
+ --include=GLib-2.0 --include=GObject-2.0 --include=Gio-2.0 \
|
|
|
135360 |
+ --library=libreofficekitgtk --library-path="${DESTDIR}/${INSTALLDIR}/program" \
|
|
|
135360 |
+ --include=Gdk-3.0 --include=GdkPixbuf-2.0 --include=Gtk-3.0 \
|
|
|
135360 |
+ --namespace=LOKDocView --nsversion=0.1 --identifier-prefix=LOKDoc --symbol-prefix=lok_doc \
|
|
|
135360 |
+ --output="${DESTDIR}/${PREFIXDIR}/share/gir-1.0/LOKDocView-0.1.gir" --warn-all --no-libtool
|
|
|
135360 |
+
|
|
|
135360 |
+mkdir -p "${DESTDIR}/${LIBDIR}/girepository-1.0"
|
|
|
135360 |
+g-ir-compiler "${DESTDIR}/${PREFIXDIR}/share/gir-1.0/LOKDocView-0.1.gir" \
|
|
|
135360 |
+ --output="${DESTDIR}/${LIBDIR}/girepository-1.0/LOKDocView-0.1.typelib"
|
|
|
135360 |
--
|
|
|
135360 |
2.12.0
|
|
|
135360 |
|