r16880 - gnucash/branches/gda-dev2 - Setup libgda for windows.
Phil Longstaff
plongstaff at cvs.gnucash.org
Sun Jan 20 17:40:52 EST 2008
Author: plongstaff
Date: 2008-01-20 17:40:51 -0500 (Sun, 20 Jan 2008)
New Revision: 16880
Trac: http://svn.gnucash.org/trac/changeset/16880
Added:
gnucash/branches/gda-dev2/packaging/win32/libgda-3.1.2-patch.diff
gnucash/branches/gda-dev2/packaging/win32/libgda-3.1.2-patch2.diff
Modified:
gnucash/branches/gda-dev2/packaging/win32/defaults.sh
gnucash/branches/gda-dev2/packaging/win32/dist.sh
gnucash/branches/gda-dev2/packaging/win32/install.sh
gnucash/branches/gda-dev2/src/backend/gda/Makefile.am
Log:
Setup libgda for windows.
Patch supplied by Nathan Buchanan
Modified: gnucash/branches/gda-dev2/packaging/win32/defaults.sh
===================================================================
--- gnucash/branches/gda-dev2/packaging/win32/defaults.sh 2008-01-20 22:20:05 UTC (rev 16879)
+++ gnucash/branches/gda-dev2/packaging/win32/defaults.sh 2008-01-20 22:40:51 UTC (rev 16880)
@@ -257,6 +257,11 @@
# If set to yes, download Qt from http://www.trolltech.com/developer/downloads/qt/windows,
# install it and set QTDIR in custom.sh, like "QTDIR=/c/Qt/4.2.3".
+set_default LIBGDA_URL "http://ftp.acc.umu.se/pub/GNOME/sources/libgda/3.1/libgda-3.1.2.tar.gz"
+set_default LIBGDA_DIR $GLOBAL_DIR\\libgda
+set_default LIBGDA_PATCH `pwd`/libgda-3.1.2-patch.diff
+set_default LIBGDA_PATCH2 `pwd`/libgda-3.1.2-patch2.diff
+
set_default DOCBOOK_XSL_URL "$SF_MIRROR/docbook/docbook-xsl-1.72.0.zip"
set_default DOCS_URL "http://svn.gnucash.org/repo/gnucash-docs/trunk"
set_default DOCS_DIR $GLOBAL_DIR\\gnucash-docs
@@ -296,6 +301,7 @@
add_step inst_gwenhywfar
add_step inst_ktoblzcheck
add_step inst_aqbanking
+add_step inst_libgda
##
if [ "$CROSS_COMPILE" != "yes" ]; then
add_step inst_inno
Modified: gnucash/branches/gda-dev2/packaging/win32/dist.sh
===================================================================
--- gnucash/branches/gda-dev2/packaging/win32/dist.sh 2008-01-20 22:20:05 UTC (rev 16879)
+++ gnucash/branches/gda-dev2/packaging/win32/dist.sh 2008-01-20 22:40:51 UTC (rev 16880)
@@ -171,6 +171,14 @@
cp -a ${_AQBANKING_UDIR}/share/locale ${DIST_UDIR}/lib
}
+function dist_libgda() {
+ setup Libgda
+ cp -a ${_LIBGDA_UDIR}/bin/* ${DIST_UDIR}/bin
+ cp -a ${_LIBGDA_UDIR}/lib/libgda-3.0 ${DIST_UDIR}/lib
+ cp -a ${_LIBGDA_UDIR}/share/libgda-3.0 ${DIST_UDIR}/share
+ cp -a ${_LIBGDA_UDIR}/share/locale ${DIST_UDIR}/lib
+}
+
function dist_gnucash() {
setup GnuCash
mkdir -p $DIST_UDIR/bin
@@ -245,6 +253,7 @@
dist_libofx
dist_gwenhywfar
dist_aqbanking
+dist_libgda
dist_gnucash
finish
qpopd
Modified: gnucash/branches/gda-dev2/packaging/win32/install.sh
===================================================================
--- gnucash/branches/gda-dev2/packaging/win32/install.sh 2008-01-20 22:20:05 UTC (rev 16879)
+++ gnucash/branches/gda-dev2/packaging/win32/install.sh 2008-01-20 22:40:51 UTC (rev 16880)
@@ -929,6 +929,33 @@
fi
}
+function inst_libgda() {
+ setup LibGDA
+ _LIBGDA_UDIR=`unix_path ${LIBGDA_DIR}`
+ add_to_env ${_LIBGDA_UDIR}/bin PATH
+ add_to_env ${_LIBGDA_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
+ if quiet ${PKG_CONFIG} --exists libgda-3.0
+ then
+ echo "Libgda already installed. skipping."
+ else
+ wget_unpacked $LIBGDA_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/libgda-*
+ qpushd $TMP_UDIR/libgda-*
+ #patch to ignore vfs, as libgda uses depriciated header
+ patch libgda/gda-data-model-dir.c $LIBGDA_PATCH
+ #patch to use g_setenv instead of setenv (bug #510739)
+ patch tools/gda-sql.c $LIBGDA_PATCH2
+ ./configure \
+ --prefix=${_LIBGDA_UDIR} \
+ CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS}" \
+ LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} -lintl"
+ make
+ make install
+ qpopd
+ ${PKG_CONFIG} --exists libgda-3.0 || die "Libgda not installed correctly"
+ fi
+}
+
function svn_up() {
mkdir -p $_REPOS_UDIR
qpushd $REPOS_DIR
@@ -996,7 +1023,7 @@
qpushd src/bin
rm gnucash
make PATH_SEPARATOR=";" \
- bindir="${_INSTALL_UDIR}/bin:${_INSTALL_UDIR}/lib:${_INSTALL_UDIR}/lib/gnucash:${_GOFFICE_UDIR}/bin:${_LIBGSF_UDIR}/bin:${_PCRE_UDIR}/bin:${_GNOME_UDIR}/bin:${_LIBXML2_UDIR}/bin:${_GUILE_UDIR}/bin:${_REGEX_UDIR}/bin:${_AUTOTOOLS_UDIR}/bin:${AQBANKING_UPATH}:${_LIBOFX_UDIR}/bin:${_OPENSP_UDIR}/bin" \
+ bindir="${_INSTALL_UDIR}/bin:${_INSTALL_UDIR}/lib:${_INSTALL_UDIR}/lib/gnucash:${_GOFFICE_UDIR}/bin:${_LIBGSF_UDIR}/bin:${_PCRE_UDIR}/bin:${_GNOME_UDIR}/bin:${_LIBXML2_UDIR}/bin:${_GUILE_UDIR}/bin:${_REGEX_UDIR}/bin:${_AUTOTOOLS_UDIR}/bin:${AQBANKING_UPATH}:${_LIBOFX_UDIR}/bin:${_OPENSP_UDIR}/bin:${LIBGDA_DIR}/bin" \
gnucash
qpopd
@@ -1032,7 +1059,7 @@
# Create a startup script that works without the msys shell
qpushd $_INSTALL_UDIR/bin
- echo "set PATH=${INSTALL_DIR}\\bin;${INSTALL_DIR}\\lib;${INSTALL_DIR}\\lib\\gnucash;${GOFFICE_DIR}\\bin;${LIBGSF_DIR}\\bin;${PCRE_DIR}\\bin;${GNOME_DIR}\\bin;${LIBXML2_DIR}\\bin;${GUILE_DIR}\\bin;${REGEX_DIR}\\bin;${AUTOTOOLS_DIR}\\bin;${AQBANKING_PATH};${LIBOFX_DIR}\\bin;${OPENSP_DIR}\\bin;%PATH%" > gnucash.bat
+ echo "set PATH=${INSTALL_DIR}\\bin;${INSTALL_DIR}\\lib;${INSTALL_DIR}\\lib\\gnucash;${GOFFICE_DIR}\\bin;${LIBGSF_DIR}\\bin;${PCRE_DIR}\\bin;${GNOME_DIR}\\bin;${LIBXML2_DIR}\\bin;${GUILE_DIR}\\bin;${REGEX_DIR}\\bin;${AUTOTOOLS_DIR}\\bin;${AQBANKING_PATH};${LIBOFX_DIR}\\bin;${OPENSP_DIR}\\bin;${LIBGDA_DIR}\\bin;%PATH%" > gnucash.bat
echo "set GUILE_WARN_DEPRECATED=no" >> gnucash.bat
echo "set GNC_MODULE_PATH=${INSTALL_DIR}\\lib\\gnucash" >> gnucash.bat
echo "set GUILE_LOAD_PATH=${INSTALL_DIR}\\share\\gnucash\\guile-modules;${INSTALL_DIR}\\share\\gnucash\\scm;%GUILE_LOAD_PATH%" >> gnucash.bat
Added: gnucash/branches/gda-dev2/packaging/win32/libgda-3.1.2-patch.diff
===================================================================
--- gnucash/branches/gda-dev2/packaging/win32/libgda-3.1.2-patch.diff (rev 0)
+++ gnucash/branches/gda-dev2/packaging/win32/libgda-3.1.2-patch.diff 2008-01-20 22:40:51 UTC (rev 16880)
@@ -0,0 +1,4 @@
+31c31
+< #include <libgnomevfs/gnome-vfs-mime.h>
+---
+> #undef HAVE_GNOMEVFS
Added: gnucash/branches/gda-dev2/packaging/win32/libgda-3.1.2-patch2.diff
===================================================================
--- gnucash/branches/gda-dev2/packaging/win32/libgda-3.1.2-patch2.diff (rev 0)
+++ gnucash/branches/gda-dev2/packaging/win32/libgda-3.1.2-patch2.diff 2008-01-20 22:40:51 UTC (rev 16880)
@@ -0,0 +1,6 @@
+880,881c880,881
+< setenv ("GDA_DATA_MODEL_DUMP_TITLE", "Yes", TRUE);
+< setenv ("GDA_DATA_MODEL_NULL_AS_EMPTY", "Yes", TRUE);
+---
+> g_setenv ("GDA_DATA_MODEL_DUMP_TITLE", "Yes", TRUE);
+> g_setenv ("GDA_DATA_MODEL_NULL_AS_EMPTY", "Yes", TRUE);
Modified: gnucash/branches/gda-dev2/src/backend/gda/Makefile.am
===================================================================
--- gnucash/branches/gda-dev2/src/backend/gda/Makefile.am 2008-01-20 22:20:05 UTC (rev 16879)
+++ gnucash/branches/gda-dev2/src/backend/gda/Makefile.am 2008-01-20 22:40:51 UTC (rev 16880)
@@ -51,13 +51,15 @@
libgnc_backend_gda_utils_la_LIBADD = \
${GLIB_LIBS} ${GCONF_LIBS} \
${top_builddir}/src/engine/libgncmod-engine.la \
- ${LIBGDA_LIBS}
+ ${LIBGDA_LIBS} \
+ ${QOF_LIBS}
libgncmod_backend_gda_la_LDFLAGS = -module -avoid-version
libgncmod_backend_gda_la_LIBADD = \
${GLIB_LIBS} ${GCONF_LIBS} \
${top_builddir}/src/engine/libgncmod-engine.la \
libgnc-backend-gda-utils.la \
- ${LIBGDA_LIBS}
+ ${LIBGDA_LIBS} \
+ ${QOF_LIBS}
INCLUDES = -DG_LOG_DOMAIN=\"gnc.backend.gda\"
More information about the gnucash-changes
mailing list