Christian, Thank you for fixing this further. I didn't find the time to do it.
Geert On Sunday 13 December 2009, Christian Stimming wrote: > Author: cstim > Date: 2009-12-13 16:16:25 -0500 (Sun, 13 Dec 2009) > New Revision: 18495 > Trac: http://svn.gnucash.org/trac/changeset/18495 > > Modified: > gnucash/trunk/packaging/win32/dist.sh > gnucash/trunk/packaging/win32/gnucash.iss.in > Log: > Fix #586122 (follow-up to r18488) by using aqbanking/version.h from its > installation path. > > Also look up the gwenhywfar so-name accordingly. > > Modified: gnucash/trunk/packaging/win32/dist.sh > =================================================================== > --- gnucash/trunk/packaging/win32/dist.sh 2009-12-13 19:22:12 UTC (rev > 18494) +++ gnucash/trunk/packaging/win32/dist.sh 2009-12-13 21:16:25 UTC > (rev 18495) @@ -229,10 +229,12 @@ > cp -a $_REPOS_UDIR/packaging/win32/install-fq-mods.cmd $DIST_UDIR/bin > > _QTDIR_WIN=`echo $QTDIR | sed 's,^/\([A-Za-z]\)/,\1:/,g' ` > - _AQBANKING_SO_EFFECTIVE=$(awk '/AQBANKING_SO_EFFECTIVE/ { print $3 }' > $TMP_UDIR/aqbanking-*/version.h ) + _AQBANKING_SO_EFFECTIVE=$(awk > '/AQBANKING_SO_EFFECTIVE/ { print $3 }' > ${_AQBANKING_UDIR}/include/aqbanking/version.h ) + > _GWENHYWFAR_SO_EFFECTIVE=$(awk '/GWENHYWFAR_SO_EFFECTIVE/ { print $3 }' > ${_AQBANKING_UDIR}/include/gwenhywfar3/gwenhywfar/version.h ) sed < > $_BUILD_UDIR/packaging/win32/gnucash.iss \ > > > $_GNUCASH_UDIR/gnucash.iss \ > > -e "s...@-qtbindir-@#${_QTDIR_WIN}/bin#g" \ > + -e "s...@-gwenhywfar_so_effective-@#${_GWENHYWFAR_SO_EFFECTIVE}#g" \ > -e "s...@-aqbanking_so_effective-@#${_AQBANKING_SO_EFFECTIVE}#g" > } > > > Modified: gnucash/trunk/packaging/win32/gnucash.iss.in > =================================================================== > --- gnucash/trunk/packaging/win32/gnucash.iss.in 2009-12-13 19:22:12 UTC > (rev 18494) +++ gnucash/trunk/packaging/win32/gnucash.iss.in 2009-12-13 > 21:16:25 UTC (rev 18495) @@ -129,7 +129,7 @@ > Root: HKLM; Subkey: "Software\Gwenhywfar\Paths"; ValueType: none; Flags: > uninsdeletekeyifempty Root: HKLM; Subkey: "Software\Gwenhywfar\Paths"; > ValueType: string; ValueName: "prefix"; ValueData: "{app}"; Flags: > uninsdeletevalue Root: HKLM; Subkey: "Software\Gwenhywfar\Paths"; > ValueType: string; ValueName: "libdir"; ValueData: "{app}\lib"; Flags: > uninsdeletevalue -Root: HKLM; Subkey: "Software\Gwenhywfar\Paths"; > ValueType: string; ValueName: "plugindir"; ValueData: > "{app}\lib\gwenhywfar\plugins\38"; Flags: uninsdeletevalue +Root: HKLM; > Subkey: "Software\Gwenhywfar\Paths"; ValueType: string; ValueName: > "plugindir"; ValueData: > "{app}\lib\gwenhywfar\plugi...@-gwenhywfar_so_effective-@"; Flags: > uninsdeletevalue Root: HKLM; Subkey: "Software\Gwenhywfar\Paths"; > ValueType: string; ValueName: "sysconfdir"; ValueData: "{app}\etc"; Flags: > uninsdeletevalue Root: HKLM; Subkey: "Software\Gwenhywfar\Paths"; > ValueType: string; ValueName: "localedir"; ValueData: "{app}\share\locale"; > Flags: uninsdeletevalue > > > _______________________________________________ > gnucash-changes mailing list > [email protected] > https://lists.gnucash.org/mailman/listinfo/gnucash-changes _______________________________________________ gnucash-devel mailing list [email protected] https://lists.gnucash.org/mailman/listinfo/gnucash-devel
