r14731 - gnucash/trunk - Get goffice building properly.

Derek Atkins warlord at cvs.gnucash.org
Sat Aug 26 17:22:58 EDT 2006


Author: warlord
Date: 2006-08-26 17:22:58 -0400 (Sat, 26 Aug 2006)
New Revision: 14731
Trac: http://svn.gnucash.org/trac/changeset/14731

Added:
   gnucash/trunk/packaging/win32/intltool-merge
Modified:
   gnucash/trunk/
   gnucash/trunk/packaging/win32/custom.sh
   gnucash/trunk/packaging/win32/install.sh
Log:
Get goffice building properly.
- make sure it will build dynamically
- remove unknown symbols
- fix the intltool-merge problem by replacing intltool-merge



Property changes on: gnucash/trunk
___________________________________________________________________
Name: svk:merge
   - d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13132
   + d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13136

Modified: gnucash/trunk/packaging/win32/custom.sh
===================================================================
--- gnucash/trunk/packaging/win32/custom.sh	2006-08-26 19:26:36 UTC (rev 14730)
+++ gnucash/trunk/packaging/win32/custom.sh	2006-08-26 21:22:58 UTC (rev 14731)
@@ -103,6 +103,7 @@
 add_step inst_gnome
 add_step inst_autotools
 add_step inst_libgsf
+add_step inst_goffice
 add_step inst_svn
 add_step svn_up
 add_step inst_gnucash

Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh	2006-08-26 19:26:36 UTC (rev 14730)
+++ gnucash/trunk/packaging/win32/install.sh	2006-08-26 21:22:58 UTC (rev 14731)
@@ -539,20 +539,27 @@
 	set -e
 	smart_wget $GOFFICE_URL $DOWNLOAD_DIR
 	tar -xjpf $DOWNLOAD_UDIR/goffice-*.tar.bz2 -C $TMP_UDIR
+	mydir=`pwd`
 	qpushd $TMP_UDIR/goffice-*
 	    cp configure.in configure.in.bak
 	    cat configure.in.bak | sed '/AC_PROG_INTLTOOL/s#)$#,[no-xml])#' > configure.in
 	    [ -n "$GOFFICE_PATCH" -a -f "$GOFFICE_PATCH" ] && \
 		patch -p1 < $GOFFICE_PATCH
+	    cp goffice/Makefile.am goffice/Makefile.am.bak
+	    cat goffice/Makefile.am.bak \
+		| sed '/LIBADD/s#-lurlmon##;s#-lhtmlhelp##' \
+		> goffice/Makefile.am
+	    cp goffice/goffice.def goffice/goffice.def.bak
+	    cat goffice/goffice.def.bak \
+		| sed '/^go_doc_mark_not_modified$/d;/^go_plugin_init$/d;/^go_plugin_shutdown$/d' \
+		> goffice/goffice.def
+	    automake
 	    autoconf
 	    ./configure --prefix=$_GOFFICE_UDIR
-	    for f in `find . -name Makefile.am` ; do
-		if [ `grep -c INTLTOOL_XML_RULE $f` != 0 ] ; then
-		    cp $f $f.bak
-		    cat $f.bak | sed -e '/INTLTOOL_XML_RULE/d' > $f
-		fi
-	    done
 	    [ -f dumpdef.pl ] || cp -p ../libgsf-*/dumpdef.pl .
+	    [ -f $mydir/intltool-merge ] && \
+		( mv intltool-merge intltool-merge.bak ; \
+		  cp -p $mydir/intltool-merge . )
 	    make
 	    make install
 	qpopd

Added: gnucash/trunk/packaging/win32/intltool-merge
===================================================================
--- gnucash/trunk/packaging/win32/intltool-merge	2006-08-26 19:26:36 UTC (rev 14730)
+++ gnucash/trunk/packaging/win32/intltool-merge	2006-08-26 21:22:58 UTC (rev 14731)
@@ -0,0 +1,9 @@
+#!/bin/sh
+#
+# Fake intltool-merge
+
+if [ "$1" != "-x" -a "$2" != "-u" ] ; then
+  exit 0
+fi
+
+cat "$6" | sed 's/<_/</g;s#</_#</#g;s#</ _#</ #g' > "$7"



More information about the gnucash-changes mailing list