diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-09-14 14:12:29 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-09-14 12:49:51 +0000 |
| commit | d8026ad65c8d50868f0f2fc0d2bd95820cddea83 (patch) | |
| tree | 2525e576841df9113e021cb2982837687e64fd2d /sysui | |
| parent | b1152bdb3c0b32ba4a0dbf4690aa40086b73081d (diff) | |
sysui: g-ir-scanner is not available in when introspection is disabled
Should fix the RHEL6 build.
Change-Id: I3d6e6a2b43c2d6a43ea0686600cf2f893c518cc8
Reviewed-on: https://gerrit.libreoffice.org/18566
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sysui')
| -rw-r--r-- | sysui/CustomTarget_share.mk | 1 | ||||
| -rwxr-xr-x | sysui/desktop/share/create_tree.sh | 24 |
2 files changed, 14 insertions, 11 deletions
diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk index 2236e68f2376..94855aa2cf23 100644 --- a/sysui/CustomTarget_share.mk +++ b/sysui/CustomTarget_share.mk @@ -180,6 +180,7 @@ $(share_WORKDIR)/%/create_tree.sh: $(share_SRCDIR)/share/create_tree.sh $(share_ echo "ICON_SOURCE_DIR=$(SRCDIR)/sysui/desktop/icons" >> $@ echo "APPDATA_SOURCE_DIR=$(SRCDIR)/sysui/desktop/appstream-appdata" >> $@ echo "PRODUCTVERSION=$(PRODUCTVERSION)" >> $@ + echo "INTROSPECTION_SCANNER=$(INTROSPECTION_SCANNER)" >> $@ cat $< >> $@ chmod 774 $@ diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh index 45b7c6cb09db..c73b89af3ab5 100755 --- a/sysui/desktop/share/create_tree.sh +++ b/sysui/desktop/share/create_tree.sh @@ -88,15 +88,17 @@ for i in base calc draw impress writer; do done # Generate gobject-introspection files -mkdir -p "${DESTDIR}/${PREFIXDIR}/share/gir-1.0" -g-ir-scanner "${SRCDIR}/include/LibreOfficeKit/LibreOfficeKitGtk.h" "${SRCDIR}/libreofficekit/source/gtk/lokdocview.cxx" \ - `${PKG_CONFIG} --cflags gobject-introspection-1.0 gtk+-3.0` -I"${SRCDIR}/include/" \ - --include=GLib-2.0 --include=GObject-2.0 --include=Gio-2.0 \ - --library=libreofficekitgtk --library-path="${DESTDIR}/${INSTALLDIR}/program" \ - --include=Gdk-3.0 --include=GdkPixbuf-2.0 --include=Gtk-3.0 \ - --namespace=LOKDocView --nsversion=0.1 --identifier-prefix=LOKDoc --symbol-prefix=lok_doc \ - --output="${DESTDIR}/${PREFIXDIR}/share/gir-1.0/LOKDocView-0.1.gir" --warn-all --no-libtool +if [ -n "$INTROSPECTION_SCANNER" ]; then + mkdir -p "${DESTDIR}/${PREFIXDIR}/share/gir-1.0" + g-ir-scanner "${SRCDIR}/include/LibreOfficeKit/LibreOfficeKitGtk.h" "${SRCDIR}/libreofficekit/source/gtk/lokdocview.cxx" \ + `${PKG_CONFIG} --cflags gobject-introspection-1.0 gtk+-3.0` -I"${SRCDIR}/include/" \ + --include=GLib-2.0 --include=GObject-2.0 --include=Gio-2.0 \ + --library=libreofficekitgtk --library-path="${DESTDIR}/${INSTALLDIR}/program" \ + --include=Gdk-3.0 --include=GdkPixbuf-2.0 --include=Gtk-3.0 \ + --namespace=LOKDocView --nsversion=0.1 --identifier-prefix=LOKDoc --symbol-prefix=lok_doc \ + --output="${DESTDIR}/${PREFIXDIR}/share/gir-1.0/LOKDocView-0.1.gir" --warn-all --no-libtool -mkdir -p "${DESTDIR}/${LIBDIR}/girepository-1.0" -g-ir-compiler "${DESTDIR}/${PREFIXDIR}/share/gir-1.0/LOKDocView-0.1.gir" \ - --output="${DESTDIR}/${LIBDIR}/girepository-1.0/LOKDocView-0.1.typelib" + mkdir -p "${DESTDIR}/${LIBDIR}/girepository-1.0" + g-ir-compiler "${DESTDIR}/${PREFIXDIR}/share/gir-1.0/LOKDocView-0.1.gir" \ + --output="${DESTDIR}/${LIBDIR}/girepository-1.0/LOKDocView-0.1.typelib" +fi |