r14843 - gnucash/trunk/packaging/win32 - install.sh cleanups, as we build-depend on ActivePerl now

Andreas Köhler andi5 at cvs.gnucash.org
Wed Sep 13 14:35:28 EDT 2006


Author: andi5
Date: 2006-09-13 14:35:27 -0400 (Wed, 13 Sep 2006)
New Revision: 14843
Trac: http://svn.gnucash.org/trac/changeset/14843

Removed:
   gnucash/trunk/packaging/win32/intltool-merge
Modified:
   gnucash/trunk/packaging/win32/goffice-0.3.0-patch.diff
   gnucash/trunk/packaging/win32/install.sh
Log:
install.sh cleanups, as we build-depend on ActivePerl now
* remove [no-xml] intltool workarounds and intltool-merge fake script
* move all goffice changes to the patch file


Modified: gnucash/trunk/packaging/win32/goffice-0.3.0-patch.diff
===================================================================
--- gnucash/trunk/packaging/win32/goffice-0.3.0-patch.diff	2006-09-13 17:11:12 UTC (rev 14842)
+++ gnucash/trunk/packaging/win32/goffice-0.3.0-patch.diff	2006-09-13 18:35:27 UTC (rev 14843)
@@ -105,6 +105,15 @@
  goffice_cairo_reqs="
 --- goffice-0.3.0/goffice/Makefile.am~	Sat Aug 26 20:52:04 2006
 +++ goffice-0.3.0/goffice/Makefile.am	Sat Aug 26 20:58:53 2006
+@@ -30,7 +30,7 @@
+ if WITH_WIN32
+ libgoffice_0_la_DEPENDENCIES = goffice.def
+ libgoffice_0_la_LDFLAGS += -no-undefined -export-symbols goffice.def
+-libgoffice_0_la_LIBADD += -luuid -lhtmlhelp -lurlmon
++libgoffice_0_la_LIBADD += -luuid
+ endif
+ 
+ BUILT_SOURCES =	goffice-paths.h
 @@ -66,14 +66,14 @@
  include $(top_srcdir)/goffice.mk
  

Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh	2006-09-13 17:11:12 UTC (rev 14842)
+++ gnucash/trunk/packaging/win32/install.sh	2006-09-13 18:35:27 UTC (rev 14843)
@@ -602,9 +602,6 @@
     else
 	wget_unpacked $LIBGSF_URL $DOWNLOAD_DIR $TMP_DIR
 	qpushd $TMP_UDIR/libgsf-*
-	    cp configure.in configure.in.bak
-	    cat configure.in.bak | sed '/AC_PROG_INTLTOOL/s#$#([],[no-xml])#' > configure.in
-	    autoconf
 	    ./configure --prefix=$_LIBGSF_UDIR \
 	    CPPFLAGS="${GNOME_CPPFLAGS}" \
 	    LDFLAGS="${GNOME_LDFLAGS}"
@@ -626,25 +623,14 @@
 	wget_unpacked $GOFFICE_URL $DOWNLOAD_DIR $TMP_DIR
 	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
 	    automake
 	    autoconf
 	    ./configure --prefix=$_GOFFICE_UDIR \
 	    CPPFLAGS="${GNOME_CPPFLAGS}" \
 	    LDFLAGS="${GNOME_LDFLAGS}"
 	    [ -f dumpdef.pl ] || cp -p ../libgsf-*/dumpdef.pl .
-	    [ -f $mydir/intltool-merge ] && \
-		( mv intltool-merge intltool-merge.bak ; \
-		  cp -p $mydir/intltool-merge . )
-	    echo libgoffice_init >> goffice/local.def
-	    echo libgoffice_shutdown >> goffice/local.def
 	    make
 	    make install
 	qpopd
@@ -703,8 +689,10 @@
     _GNUCASH_WFSDIR=`win_fs_path $GNUCASH_DIR`
     _GNUCASH_UDIR=`unix_path $GNUCASH_DIR`
     qpushd $REPOS_DIR
-    cp configure.in configure.in.bak
-    cat configure.in.bak | sed '/AC_PROG_INTLTOOL/s#TOOL$#TOOL([],[no-xml])#;/GUILE_LOAD_PATH/s,:,;,g' > configure.in
+    if grep "GUILE_LOAD_PATH.*:" configure.in; then
+        cp configure.in configure.in.bak
+        cat configure.in.bak | sed '/GUILE_LOAD_PATH/s,:,;,g' > configure.in
+    fi
     ./autogen.sh
     ./configure \
 	--prefix=$_GNUCASH_WFSDIR \

Deleted: gnucash/trunk/packaging/win32/intltool-merge
===================================================================
--- gnucash/trunk/packaging/win32/intltool-merge	2006-09-13 17:11:12 UTC (rev 14842)
+++ gnucash/trunk/packaging/win32/intltool-merge	2006-09-13 18:35:27 UTC (rev 14843)
@@ -1,9 +0,0 @@
-#!/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