Gnc-Prefs: update the windows build system to handle gsettings properly

- drop installation of files in libexec (we don't ship any anymore)
- make sure gsettings schema files get installed
- drop ORBit2; this was a requirement for GConf only

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23270 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Geert Janssens 2013-10-07 14:31:22 +00:00
parent ebedd85c65
commit 6d00f46304
4 changed files with 758 additions and 762 deletions

View File

@ -264,8 +264,6 @@ set_default LIBTIFF_URL "$GNOME_WIN32_DEPS_URL/libtiff_3.9.2-1_win32
set_default LIBTIFF_DEV_URL "$GNOME_WIN32_DEPS_URL/libtiff-dev_3.9.2-1_win32.zip"
set_default LIBXML2_URL "$GNOME_WIN32_DEPS_URL/libxml2_2.7.7-1_win32.zip"
set_default LIBXML2_DEV_URL "$GNOME_WIN32_DEPS_URL/libxml2-dev_2.7.7-1_win32.zip"
set_default ORBIT2_URL "$GNOME_WIN32_URL/ORBit2/2.14/ORBit2_2.14.16-1_win32.zip"
set_default ORBIT2_DEV_URL "$GNOME_WIN32_URL/ORBit2/2.14/ORBit2-dev_2.14.16-1_win32.zip"
set_default PANGO_URL "$GNOME_WIN32_URL/pango/1.29/pango_1.29.4-1_win32.zip"
set_default PANGO_DEV_URL "$GNOME_WIN32_URL/pango/1.29/pango-dev_1.29.4-1_win32.zip"
set_default PKG_CONFIG_URL "$GNOME_WIN32_DEPS_URL/pkg-config_0.25-1_win32.zip"

View File

@ -98,7 +98,6 @@ function dist_gnome() {
wget_unpacked $LIBPNG_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBTIFF_URL $DOWNLOAD_DIR $DIST_DIR
#wget_unpacked $LIBXML2_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $ORBIT2_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $PANGO_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $ZLIB_URL $DOWNLOAD_DIR $DIST_DIR
echo 'gtk-theme-name = "Nimbus"' > $DIST_DIR/etc/gtk-2.0/gtkrc
@ -234,7 +233,7 @@ function dist_gnucash() {
cp -a $_INSTALL_UDIR/etc/gnucash/* $DIST_UDIR/etc/gnucash
cp -a $_INSTALL_UDIR/lib/lib*.la $DIST_UDIR/bin
mkdir -p $DIST_UDIR/share
cp -a $_INSTALL_UDIR/share/{doc,gnucash,locale} $DIST_UDIR/share
cp -a $_INSTALL_UDIR/share/{doc,gnucash,locale,glib-2.0} $DIST_UDIR/share
cp -a $_REPOS_UDIR/packaging/win32/{getperl.vbs,gnc-path-check,install-fq-mods.cmd} $DIST_UDIR/bin
_QTDIR_WIN=$(unix_path $QTDIR | sed 's,^/\([A-Za-z]\)/,\1:/,g' )

View File

@ -75,7 +75,8 @@ Source: "@prefix@\..\dist\etc\@PACKAGE@\environment"; DestDir: "{app}\etc\@PACKA
; Note: The above AfterInstall function will adapt the
; environment config file on-the-fly by the Pascal script below.
Source: "@prefix@\..\dist\lib\*"; DestDir: "{app}\lib"; Flags: recursesubdirs; Components: main
Source: "@prefix@\..\dist\libexec\*"; DestDir: "{app}\libexec"; Flags: recursesubdirs; Components: main
;; We don't have anything in libexec anymore at the moment
;Source: "@prefix@\..\dist\libexec\*"; DestDir: "{app}\libexec"; Flags: recursesubdirs; Components: main
Source: "@prefix@\..\dist\share\*"; DestDir: "{app}\share"; Flags: recursesubdirs; Components: main
;;; Not needed with AQBANKING5!

View File

@ -545,8 +545,6 @@ function inst_gnome() {
wget_unpacked $LIBTIFF_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
# wget_unpacked $LIBXML2_URL $DOWNLOAD_DIR $GNOME_DIR
# wget_unpacked $LIBXML2_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $ORBIT2_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $ORBIT2_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $PANGO_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $PANGO_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $PKG_CONFIG_URL $DOWNLOAD_DIR $GNOME_DIR