Prefs migration: migrate ofx and aqbanking prefs if these options were enabled at build time

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23294 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Geert Janssens 2013-10-16 15:22:56 +00:00
parent b9b99c8b47
commit e56f99669c
6 changed files with 68 additions and 61 deletions

View File

@ -659,11 +659,15 @@ case "${want_ofx}" in
no) AC_MSG_RESULT(no) ;;
auto) AC_MSG_RESULT(yes -- automatic test) ;;
esac
MIGRATABLE_PREFS_OFX="/dev/null"
if test x${want_ofx} != xno ; then
PKG_CHECK_MODULES(LIBOFX, libofx, [want_ofx="yes"], [want_ofx="no"])
_COMPONENTS="$_COMPONENTS ofx"
MIGRATABLE_PREFS_OFX="$srcdir/src/import-export/ofx/migratable-prefs-ofx.xml"
fi
AM_CONDITIONAL([WITH_OFX], [test "x${want_ofx}" != xno])
AC_SUBST_FILE([MIGRATABLE_PREFS_OFX])
### --------------------------------------------------------------------------
### MT940
AC_ARG_ENABLE( mt940,
@ -685,6 +689,8 @@ AC_ARG_ENABLE( hbci,
if test "x$enableval" != "xno" ; then
AC_MSG_ERROR([--enable-hbci is obsolete -- the option has been renamed into --enable-aqbanking])
fi)
MIGRATABLE_PREFS_AQBANKING="/dev/null"
if test x${want_aqbanking} = xyes ;
then
# Check for Aqbanking library
@ -707,8 +713,10 @@ then
AC_SUBST(AQBANKING_LIBS)
AC_SUBST(AQBANKING_CFLAGS)
_COMPONENTS="$_COMPONENTS aqbanking"
MIGRATABLE_PREFS_AQBANKING="$srcdir/src/import-export/aqbanking/migratable-prefs-aqbanking.xml"
fi
AM_CONDITIONAL([WITH_AQBANKING], [test x${want_aqbanking} = xyes])
AC_SUBST_FILE([MIGRATABLE_PREFS_AQBANKING])
AC_ARG_WITH(qt3_wizard_package,
[AS_HELP_STRING([--with-qt3-wizard-package=name],[name of package containing qt3-wizard (aqbanking)])],
@ -1392,6 +1400,7 @@ AC_CONFIG_FILES(
dnl # non-makefiles
packaging/win32/gnucash.iss
src/bin/gnucash.rc
src/app-utils/migratable-prefs.xml
src/gnome/gnucash.desktop.in
dnl # Please read doc/build-system before adding *anything* here

View File

@ -717,18 +717,7 @@
</pref>
</prefsgroup>
<!--
<prefsgroup>
<gschemaid>org.gnucash.dialogs.import.ofx</gschemaid>
<gconfpath>dialogs-import-ofx.xml</gconfpath>
<pref>
<gschemaname>last-path</gschemaname>
<gschematype>s</gschematype>
<gconfkey>last_path</gconfkey>
</pref>
</prefsgroup>
-->
@MIGRATABLE_PREFS_OFX@
<prefsgroup>
<gschemaid>org.gnucash.dialogs.export.csv</gschemaid>
@ -746,53 +735,7 @@
</pref>
</prefsgroup>
<!--
<prefsgroup>
<gschemaid>org.gnucash.dialogs.import.hbci</gschemaid>
<gconfpath>dialogs-import-hbci.xml</gconfpath>
<pref>
<gschemaname>close-on-finish</gschemaname>
<gschematype>b</gschematype>
<gconfkey>close_on_finish</gconfkey>
</pref>
<pref>
<gschemaname>remember-pin</gschemaname>
<gschematype>b</gschematype>
<gconfkey>remember_pin</gconfkey>
</pref>
<pref>
<gschemaname>verbose-debug</gschemaname>
<gschematype>b</gschematype>
<gconfkey>verbose_debug</gconfkey>
</pref>
<pref>
<gschemaname>format-dtaus</gschemaname>
<gschematype>s</gschematype>
<gconfkey>format_dtaus</gconfkey>
</pref>
<pref>
<gschemaname>format-csv</gschemaname>
<gschematype>s</gschematype>
<gconfkey>format_csv</gconfkey>
</pref>
<pref>
<gschemaname>format-swift-mt940</gschemaname>
<gschematype>s</gschematype>
<gconfkey>format_swift_mt940</gconfkey>
</pref>
<pref>
<gschemaname>format-swift-mt942</gschemaname>
<gschematype>s</gschematype>
<gconfkey>format_swift_mt942</gconfkey>
</pref>
<pref>
<gschemaname>last-path</gschemaname>
<gschematype>s</gschematype>
<gconfkey>last_path</gconfkey>
</pref>
</prefsgroup>
-->
@MIGRATABLE_PREFS_AQBANKING@
<prefsgroup>
<gschemaid>org.gnucash.dialogs.import.generic</gschemaid>

View File

@ -75,6 +75,6 @@ gtkbuilder_DATA = \
assistant-ab-initial.glade \
dialog-ab.glade
EXTRA_DIST = ${ui_DATA} ${gtkbuilder_DATA}
EXTRA_DIST = ${ui_DATA} ${gtkbuilder_DATA} migratable-prefs-aqbanking.xml
AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.import.aqbanking\"

View File

@ -0,0 +1,45 @@
<prefsgroup>
<gschemaid>org.gnucash.dialogs.import.hbci</gschemaid>
<gconfpath>dialogs-import-hbci.xml</gconfpath>
<pref>
<gschemaname>close-on-finish</gschemaname>
<gschematype>b</gschematype>
<gconfkey>close_on_finish</gconfkey>
</pref>
<pref>
<gschemaname>remember-pin</gschemaname>
<gschematype>b</gschematype>
<gconfkey>remember_pin</gconfkey>
</pref>
<pref>
<gschemaname>verbose-debug</gschemaname>
<gschematype>b</gschematype>
<gconfkey>verbose_debug</gconfkey>
</pref>
<pref>
<gschemaname>format-dtaus</gschemaname>
<gschematype>s</gschematype>
<gconfkey>format_dtaus</gconfkey>
</pref>
<pref>
<gschemaname>format-csv</gschemaname>
<gschematype>s</gschematype>
<gconfkey>format_csv</gconfkey>
</pref>
<pref>
<gschemaname>format-swift-mt940</gschemaname>
<gschematype>s</gschematype>
<gconfkey>format_swift_mt940</gconfkey>
</pref>
<pref>
<gschemaname>format-swift-mt942</gschemaname>
<gschematype>s</gschematype>
<gconfkey>format_swift_mt942</gconfkey>
</pref>
<pref>
<gschemaname>last-path</gschemaname>
<gschematype>s</gschematype>
<gconfkey>last_path</gconfkey>
</pref>
</prefsgroup>

View File

@ -44,6 +44,6 @@ uidir = $(GNC_UI_DIR)
ui_DATA = \
gnc-plugin-ofx-ui.xml
EXTRA_DIST = $(ui_DATA)
EXTRA_DIST = $(ui_DATA) migratable-prefs-ofx.xml
AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.import.ofx\"

View File

@ -0,0 +1,10 @@
<prefsgroup>
<gschemaid>org.gnucash.dialogs.import.ofx</gschemaid>
<gconfpath>dialogs-import-ofx.xml</gconfpath>
<pref>
<gschemaname>last-path</gschemaname>
<gschematype>s</gschematype>
<gconfkey>last_path</gconfkey>
</pref>
</prefsgroup>