ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

sysui: g-ir-scanner is not available in when introspection is disabled

Browse Source 
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>
This commit is contained in:
Miklos Vajna
2015-09-14 12:49:51 +00:00
parent b1152bdb3c
commit d8026ad65c
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config_host.mk.in
+1
View File
@@ -283,6 +283,7 @@ export ICU_RECLASSIFIED_CLOSE_PARENTHESIS=@ICU_RECLASSIFIED_CLOSE_PARENTHESIS@
export ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER=@ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER@
export ICU_RECLASSIFIED_HEBREW_LETTER=@ICU_RECLASSIFIED_HEBREW_LETTER@
export ICU_RECLASSIFIED_PREPEND_SET_EMPTY=@ICU_RECLASSIFIED_PREPEND_SET_EMPTY@
export INTROSPECTION_SCANNER=@INTROSPECTION_SCANNER@
export ILIB=@ILIB@
export INSTALLDIR=@INSTALLDIR@
export INSTALLDIRNAME=@INSTALLDIRNAME@
sysui/CustomTarget_share.mk
+1
View File
@@ -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 $@
sysui/desktop/share/create_tree.sh
+13 -11
View File
@@ -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