gnucash-on-windows: New branch 'aqb622'
Frank H.Ellenberger
fell at code.gnucash.org
Sun Jul 12 16:21:53 EDT 2020
New branch 'aqb622' created at https://github.com/Gnucash/gnucash-on-windows/commit/cef8fb7b (commit)
commit cef8fb7ba26afaffc08a24a814fdd3890f6bdea0
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Sun Jul 12 19:10:38 2020 +0200
Update to aqbanking-6.2.2, gwenhywfar-5.4.0
AqBanking: Improvements in AqFinTS, AqHBCI, AqOfxConnect.
Gwenhywfar requires libxml2 now.
diff --git a/gnucash.modules b/gnucash.modules
index 170f7bc..ea2d816 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -143,7 +143,7 @@
<autotools id="gwenhywfar" autogen-sh="configure"
autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc --disable-ssl PKG_CONFIG='pkg-config --dont-define-prefix'">
- <branch module="319/gwenhywfar-5.3.0.tar.gz" version="5.3.0"
+ <branch module="331/gwenhywfar-5.4.0.tar.gz" version="5.4.0"
repo="aqbanking">
</branch>
<dependencies>
@@ -174,7 +174,7 @@
<autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
autogenargs="--enable-local-install">
- <branch module="328/aqbanking-6.2.1.tar.gz" repo="aqbanking" version="6.2.1" >
+ <branch module="334/aqbanking-6.2.2.tar.gz" repo="aqbanking" version="6.2.2" >
</branch>
<dependencies>
<dep package="gwenhywfar"/>
commit ec9e183783579fc4d5b839cca752d61ab67635fa
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jul 11 18:46:32 2020 +0200
Remove GTEST_ROOT workaround for master & unstable.
diff --git a/jhbuildrc.in b/jhbuildrc.in
index cc3ae74..9110445 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -92,5 +92,3 @@ if 'CFLAGS' in os.environ:
module_extra_env['bdw-gc']={'CFLAGS':_bdw_gc_cflags}
-if _branch in ('master', 'unstable'):
- module_cmakeargs["gnucash-git"]=('-DGTEST_ROOT=$SRCROOT/googletest')
commit 2e8ac85beef0760cf7f0d138d7d8ab89528f42fb
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jul 11 18:09:37 2020 +0200
Fix GTEST_ROOT & remove GMOCK_ROOT from gnucash-git cmake args.
diff --git a/gnucash.modules b/gnucash.modules
index 5083ea4..170f7bc 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -307,7 +307,7 @@
</cmake>
<cmake id="gnucash-git"
- cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DCMAKE_BUILD_TYPE=Debug">
+ cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/ -DCMAKE_BUILD_TYPE=Debug">
<branch repo="github" module="Gnucash/gnucash.git" revision="master"
checkoutdir="gnucash-git"/>
<dependencies>
commit 9ea38add04a70ee96aa6806f3c9a303f791a7320
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sun Jul 5 21:55:17 2020 +0200
Use cmake build system for all gnucash-docs flavours
diff --git a/gnucash.modules b/gnucash.modules
index 2cfdc7c..5083ea4 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -323,29 +323,27 @@
</dependencies>
</cmake>
- <cmake id="gnucash-docs-git"
+ <cmake id="gnucash-docs-git"
cmakeargs="-G'MSYS Makefiles'"
use-ninja="False"> <!-- Can't use ninja for now. See https://bugs.gnucash.org/show_bug.cgi?id=797622 -->
<branch repo="github" module="Gnucash/gnucash-docs.git" revision="master"
checkoutdir="gnucash-docs-git"/>
- <dependencies>
- <!-- dep package="scrollkeeper"/ -->
- </dependencies>
</cmake>
- <autotools id="gnucash-docs"
- autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
- makeargs="chm" makeinstallargs="install-chm" >
+ <cmake id="gnucash-docs"
+ cmakeargs="-G'MSYS Makefiles'"
+ use-ninja="False"> <!-- Can't use ninja for now. See https://bugs.gnucash.org/show_bug.cgi?id=797622 -->
<branch module="project/gnucash/gnucash%20%28stable%29/4.0/gnucash-docs-4.0.tar.gz"
version="4.0" repo="sourceforge"/>
- </autotools>
+ </cmake>
- <autotools id="gnucash-unstable-docs"
- autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
- makeargs="chm" makeinstallargs="install-chm" >
+ <cmake id="gnucash-unstable-docs"
+ cmakeargs="-G'MSYS Makefiles'"
+ use-ninja="False"> <!-- Can't use ninja for now. See https://bugs.gnucash.org/show_bug.cgi?id=797622 -->
<branch module="project/gnucash/gnucash%20%28unstable%29/3.906/gnucash-docs-3.906.tar.gz"
version="3.906" repo="sourceforge"/>
- </autotools>
+ </cmake>
+
<metamodule id="meta-gnucash-git">
<dependencies>
commit 933ab0392d06a211281c7977ad7c72daab2ee60b
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Jun 28 02:23:50 2020 +0200
Remove GMOCK_ROOT, revise GTEST_ROOT for stable
diff --git a/gnucash.modules b/gnucash.modules
index 55f62fa..2cfdc7c 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -273,7 +273,7 @@
</cmake>
<cmake id="gnucash"
- cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock">
+ cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest">
<branch module="project/gnucash/gnucash%20%28stable%29/4.0/gnucash-4.0.tar.bz2"
repo="sourceforge" version="4.0"/>
<dependencies>
commit 3c25d25f576f9f6246c391941ed1a73b02391d1a
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Jun 28 01:07:06 2020 +0200
Package release of GnuCash 4.0
diff --git a/gnucash.modules b/gnucash.modules
index abeceab..55f62fa 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -274,8 +274,8 @@
<cmake id="gnucash"
cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock">
- <branch module="project/gnucash/gnucash%20%28stable%29/3.11/gnucash-3.11.tar.bz2"
- repo="sourceforge" version="3.11"/>
+ <branch module="project/gnucash/gnucash%20%28stable%29/4.0/gnucash-4.0.tar.bz2"
+ repo="sourceforge" version="4.0"/>
<dependencies>
<dep package="libofx"/>
<dep package="aqbanking"/>
@@ -336,8 +336,8 @@
<autotools id="gnucash-docs"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
makeargs="chm" makeinstallargs="install-chm" >
- <branch module="project/gnucash/gnucash%20%28stable%29/3.11/gnucash-docs-3.11.tar.gz"
- version="3.11" repo="sourceforge"/>
+ <branch module="project/gnucash/gnucash%20%28stable%29/4.0/gnucash-docs-4.0.tar.gz"
+ version="4.0" repo="sourceforge"/>
</autotools>
<autotools id="gnucash-unstable-docs"
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 8984bc2..09dc2b2 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -121,7 +121,7 @@ Source: "@MINGW_DIR@\bin\libboost_locale-mt.dll"; DestDir: "{app}\bin"; Componen
Source: "@MINGW_DIR@\bin\libboost_regex-mt.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libboost_system-mt.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libboost_filesystem-mt.dll"; DestDir: "{app}\bin"; Components: main
-;;Source: "@MINGW_DIR@\bin\libboost_program_options-mt.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libboost_program_options-mt.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libboost_thread-mt.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libbz2-1.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libbrotlidec.dll"; DestDir: "{app}\bin"; Components: main
commit 12b79e98f55e8129b8b8ac2dd5e5f0785c0aaa98
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jun 27 19:14:57 2020 +0200
Package release of GnuCash 3.11
diff --git a/gnucash.modules b/gnucash.modules
index f86a4b4..abeceab 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -274,8 +274,8 @@
<cmake id="gnucash"
cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock">
- <branch module="project/gnucash/gnucash%20%28stable%29/3.10/gnucash-3.10.tar.bz2"
- repo="sourceforge" version="3.10"/>
+ <branch module="project/gnucash/gnucash%20%28stable%29/3.11/gnucash-3.11.tar.bz2"
+ repo="sourceforge" version="3.11"/>
<dependencies>
<dep package="libofx"/>
<dep package="aqbanking"/>
@@ -336,8 +336,8 @@
<autotools id="gnucash-docs"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
makeargs="chm" makeinstallargs="install-chm" >
- <branch module="project/gnucash/gnucash%20%28stable%29/3.10/gnucash-docs-3.10.tar.gz"
- version="3.10" repo="sourceforge"/>
+ <branch module="project/gnucash/gnucash%20%28stable%29/3.11/gnucash-docs-3.11.tar.gz"
+ version="3.11" repo="sourceforge"/>
</autotools>
<autotools id="gnucash-unstable-docs"
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 09dc2b2..8984bc2 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -121,7 +121,7 @@ Source: "@MINGW_DIR@\bin\libboost_locale-mt.dll"; DestDir: "{app}\bin"; Componen
Source: "@MINGW_DIR@\bin\libboost_regex-mt.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libboost_system-mt.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libboost_filesystem-mt.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\libboost_program_options-mt.dll"; DestDir: "{app}\bin"; Components: main
+;;Source: "@MINGW_DIR@\bin\libboost_program_options-mt.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libboost_thread-mt.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libbz2-1.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libbrotlidec.dll"; DestDir: "{app}\bin"; Components: main
commit 86df10e17446fcf24523b1695f926acf47f61eee
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jun 27 19:14:35 2020 +0200
Add libmariadb's plugins to the dist.
Required for libdbdmysql to work.
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 696f680..09dc2b2 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -189,6 +189,7 @@ Source: "@MINGW_DIR@\bin\libwinpthread-1.dll"; DestDir: "{app}\bin"; Components:
Source: "@MINGW_DIR@\bin\libxml2-2.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libxslt-1.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libmariadb.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\lib\mariadb\plugin\*"; DestDir: "{app}\lib\mariadb\plugin"; Components: main
Source: "@MINGW_DIR@\bin\zlib1.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\gspawn-win32-helper.exe"; DestDir: "{app}\bin"; Components: main
commit eb2e946d97d503236a1c02012b3f0eba353a61c6
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Jun 21 02:31:53 2020 +0200
Release Gnucash 3.906
diff --git a/gnucash.modules b/gnucash.modules
index c0f9fc5..f86a4b4 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -291,8 +291,8 @@
<cmake id="gnucash-unstable"
cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/">
- <branch module="project/gnucash/gnucash%20%28unstable%29/3.905/gnucash-3.905.tar.bz2"
- repo="sourceforge" version="3.905"/>
+ <branch module="project/gnucash/gnucash%20%28unstable%29/3.906/gnucash-3.906.tar.bz2"
+ repo="sourceforge" version="3.906"/>
<dependencies>
<dep package="libofx"/>
<dep package="aqbanking"/>
@@ -343,8 +343,8 @@
<autotools id="gnucash-unstable-docs"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
makeargs="chm" makeinstallargs="install-chm" >
- <branch module="project/gnucash/gnucash%20%28unstable%29/3.905/gnucash-docs-3.905.tar.gz"
- version="3.905" repo="sourceforge"/>
+ <branch module="project/gnucash/gnucash%20%28unstable%29/3.906/gnucash-docs-3.906.tar.gz"
+ version="3.906" repo="sourceforge"/>
</autotools>
<metamodule id="meta-gnucash-git">
commit d02f7edef9b27c40166c831b20ced94f067ccbb9
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Jun 14 22:28:29 2020 +0200
Fix typo in gnucash-unstable-docs URI.
diff --git a/gnucash.modules b/gnucash.modules
index 21d035d..c0f9fc5 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -343,7 +343,7 @@
<autotools id="gnucash-unstable-docs"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
makeargs="chm" makeinstallargs="install-chm" >
- <branch module="project/gnucash/gnucash%20%28unstable%29/3.905/gnucash-docs-3.9045tar.gz"
+ <branch module="project/gnucash/gnucash%20%28unstable%29/3.905/gnucash-docs-3.905.tar.gz"
version="3.905" repo="sourceforge"/>
</autotools>
commit 2298188cb7143eab807edf0871e985ac3119fb87
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Jun 14 01:38:19 2020 +0200
Release GnuCash 3.905.
diff --git a/gnucash.modules b/gnucash.modules
index a628de3..21d035d 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -291,8 +291,8 @@
<cmake id="gnucash-unstable"
cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/">
- <branch module="project/gnucash/gnucash%20%28unstable%29/3.904/gnucash-3.904.tar.bz2"
- repo="sourceforge" version="3.904"/>
+ <branch module="project/gnucash/gnucash%20%28unstable%29/3.905/gnucash-3.905.tar.bz2"
+ repo="sourceforge" version="3.905"/>
<dependencies>
<dep package="libofx"/>
<dep package="aqbanking"/>
@@ -343,8 +343,8 @@
<autotools id="gnucash-unstable-docs"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
makeargs="chm" makeinstallargs="install-chm" >
- <branch module="project/gnucash/gnucash%20%28unstable%29/3.904/gnucash-docs-3.904.tar.gz"
- version="3.904" repo="sourceforge"/>
+ <branch module="project/gnucash/gnucash%20%28unstable%29/3.905/gnucash-docs-3.9045tar.gz"
+ version="3.905" repo="sourceforge"/>
</autotools>
<metamodule id="meta-gnucash-git">
commit fce94a0ff55a4cecf77130e18c8f222d12d33c03
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat Jun 13 10:26:19 2020 +0200
Fix guile2 tarball name
diff --git a/gnucash.modules b/gnucash.modules
index ac1641d..a628de3 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -119,8 +119,8 @@
</autotools>
<autotools id="guile2" autogen-sh="autoreconf" autogenargs="--disable-rpath --enable-networking --enable-nls --enable-posix --enable-regex --with-threads=no --with-modules --disable-static">
- <branch repo="sourceforge" module="gnucash/Dependencies/guile-2.2.7.3-g5ef31.tar.xz"
- version=" 2.2.7.3-g5ef31">
+ <branch repo="sourceforge" module="gnucash/Dependencies/guile-2.2.7.3-5ef31.tar.xz"
+ version=" 2.2.7.3-5ef31">
</branch>
<dependencies>
<dep package="libunistring"/>
commit c151d0fd16e57a1a1322822b76192a916b0e0ac1
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu Jun 11 11:42:15 2020 +0200
Drop libcroco from inno installer
It is not available on a freshly set up build environment
and nothing seems to require it either.
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 6d39bc8..696f680 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -128,7 +128,6 @@ Source: "@MINGW_DIR@\bin\libbrotlidec.dll"; DestDir: "{app}\bin"; Components: ma
Source: "@MINGW_DIR@\bin\libbrotlicommon.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libcairo-2.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libcairo-gobject-2.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\libcroco-0.6-3.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libcrypto-1_1.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libdatrie-1.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libepoxy-0.dll"; DestDir: "{app}\bin"; Components: main
commit 69da9b93bab01e6c2d97b5f6ad7449e196c30998
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jun 13 04:49:11 2020 +0200
New guile-2.2.7 tarball.
Fixes build in European timezones.
diff --git a/gnucash.modules b/gnucash.modules
index 76b331a..ac1641d 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -119,8 +119,8 @@
</autotools>
<autotools id="guile2" autogen-sh="autoreconf" autogenargs="--disable-rpath --enable-networking --enable-nls --enable-posix --enable-regex --with-threads=no --with-modules --disable-static">
- <branch repo="sourceforge" module="gnucash/Dependencies/guile-2.2.7.4-9d7759.tar.xz"
- version=" 2.2.7.4-9d7759">
+ <branch repo="sourceforge" module="gnucash/Dependencies/guile-2.2.7.3-g5ef31.tar.xz"
+ version=" 2.2.7.3-g5ef31">
</branch>
<dependencies>
<dep package="libunistring"/>
commit bac5a52d0ddef6c38b24719d9ed40042fcd355a1
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu Jun 11 10:33:34 2020 +0200
Force consistent download filename for signing key
By default wget will append a number to the downloaded file if
a file by that name already exists. This can lead to the wrong
(old) signing key to be passed to pacman if it was updated
upstream and the previous one was still downloaded.
Explicitly setting an output filename will force reuse of that
name. Note this works well in this context only because
we know we're only downloading a single file. It would not
work for a multi-file download.
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 146eb76..787d9db 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -257,7 +257,7 @@ $key_url = $sourceforge_url + $signing_keyfile
$key_id = "C1F4DE993CF5835F"
$webkit = "$arch_long-webkitgtk3-2.4.11-999.3-any.pkg.tar.zst"
$webkit_url = $sourceforge_url + $webkit
-bash-command -command "wget $key_url"
+bash-command -command "wget $key_url -O $signing_keyfile"
bash-command -command "pacman-key --add $signing_keyfile"
bash-command -command "pacman-key --lsign $key_id"
bash-command -command "pacman -U $webkit_url --noconfirm --needed"
commit 47ce0f7a84a6ad2f5d707ddad61c178906c17197
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Jun 7 10:45:23 2020 -0700
Release GnuCash 3.904.
diff --git a/gnucash.modules b/gnucash.modules
index 1c91686..76b331a 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -291,8 +291,8 @@
<cmake id="gnucash-unstable"
cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/">
- <branch module="project/gnucash/gnucash%20%28unstable%29/3.903/gnucash-3.903.tar.bz2"
- repo="sourceforge" version="3.903"/>
+ <branch module="project/gnucash/gnucash%20%28unstable%29/3.904/gnucash-3.904.tar.bz2"
+ repo="sourceforge" version="3.904"/>
<dependencies>
<dep package="libofx"/>
<dep package="aqbanking"/>
@@ -343,8 +343,8 @@
<autotools id="gnucash-unstable-docs"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
makeargs="chm" makeinstallargs="install-chm" >
- <branch module="project/gnucash/gnucash%20%28unstable%29/3.903/gnucash-docs-3.903.tar.gz"
- version="3.903" repo="sourceforge"/>
+ <branch module="project/gnucash/gnucash%20%28unstable%29/3.904/gnucash-docs-3.904.tar.gz"
+ version="3.904" repo="sourceforge"/>
</autotools>
<metamodule id="meta-gnucash-git">
commit db63ab650c28f0a8ba60f9d0af1955c94c6523de
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Jun 7 10:45:04 2020 -0700
Update dependency installations to match latest from MinGW.
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 6237c30..6d39bc8 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -110,9 +110,9 @@ Source: "@INST_DIR@\share\doc\@PACKAGE at -docs\*.hhmap"; DestDir: "{app}\share\@PA
;;;; The second section retrieves the dependencies that we need from MinGW.
;; Required DLLs
;; gnucash.exe: libglib-2.0-0.dll, libgtk-3-0.dll, ligdk-3-0.dll, libatk-1.0-dll, libgobject-2.0-0.dll, libintl-8.dll, libcairo-gobject-2.dll, libcairo-2.dll, libfontconfig-1.0.dll, libfreetype-6.dll, libpixman-1-0.dll, libpng16-16.dll, zlib1.dll, libgdk-pixbuf-2.0-0.dll, libgio-2.0-0.dll, libgmodule-2.0-0.dll, libpango-1.0-0.dll, libpangocairo-1.0-0.dll, libpangowin32-1.0-0.dll, libpangoft2-1.0-0.dll, libharfbuzz-0.dll, libfribidi-0.dll, libiconv-2.dll, libwinpthread-1.dll, libsystre-0.dll, libxml2-2.dll, libxslt-1.dll, libboost_regex-mt.dll, libicuuc57.dll, libicudt57.dll, libtre-5.dll, libffi-6.dll, libgmp-10.dll, libltdl-7.dll
-;; AQBanking: libgcrypt-20.dll, libgnutls-30.dll, libwinpthread-1.0.dll, libgmp-10.dll, libhogweed-5.dll, libidn-11.dll, libintl-8.dll, libnettle-7.dll, libp11-kit-0.dll, libtasn1-6.dll, zlib1.dll, libgpg-error-0.dll, libiconv-2.dll, libintl-8.dll, libgtk-win32-2.0-0.dll
+;; AQBanking: libgcrypt-20.dll, libgnutls-30.dll, libwinpthread-1.0.dll, libgmp-10.dll, libhogweed-6.dll, libidn-11.dll, libintl-8.dll, libnettle-8.dll, libp11-kit-0.dll, libtasn1-6.dll, zlib1.dll, libgpg-error-0.dll, libiconv-2.dll, libintl-8.dll, libgtk-win32-2.0-0.dll
;; libwebkit: libbrotlicommon.dll, libbrotlidec.dll libharfbuzz-icu-0.dll, liborc-0.4-0.dll, libgsttag-1.0-0.dll, libgraphite2.dll, libicudt65.dll, libicuin65.dll, liicuuc65.dll, libicudt.dll, libsoup-2.4-1.dll, libsqlite3-0.dll, libssp-0.dll, libstdc__-6.dll, libunistring-2.dll, libwebp-7.dll
-;;lib/dbd/libdbdmysql.dll: mariadb.dll, libeay32.dll, ssleay32.dll
+;;lib/dbd/libdbdmysql.dll: libmariadb.dll, libeay32.dll, ssleay32.dll
;;lib/dbd/libdbdpgsql.dll: libpq.dll, ssleay32.dll, libeay32.dll
Source: "@MINGW_DIR@\bin\libatk-1.0-0.dll"; DestDir: "{app}\bin"; Components: main
@@ -151,7 +151,7 @@ Source: "@MINGW_DIR@\bin\libgraphite2.dll"; DestDir: "{app}\bin"; Components: ma
Source: "@MINGW_DIR@\bin\libgtk-3-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libharfbuzz-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libharfbuzz-icu-0.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\libhogweed-5.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libhogweed-6.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libiconv-2.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libicudt*.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libicuin*.dll"; DestDir: "{app}\bin"; Components: main
@@ -162,7 +162,7 @@ Source: "@MINGW_DIR@\bin\libjavascriptcoregtk-3.0-0.dll"; DestDir: "{app}\bin";
Source: "@MINGW_DIR@\bin\libjpeg-8.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libltdl-7.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\liblzma-5.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\libnettle-7.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libnettle-8.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libp11-kit-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libpango-1.0-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libpangocairo-1.0-0.dll"; DestDir: "{app}\bin"; Components: main
@@ -189,7 +189,7 @@ Source: "@MINGW_DIR@\bin\libwebkitgtk-3.0-0.dll"; DestDir: "{app}\bin"; Componen
Source: "@MINGW_DIR@\bin\libwinpthread-1.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libxml2-2.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libxslt-1.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\mariadb.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libmariadb.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\zlib1.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\gspawn-win32-helper.exe"; DestDir: "{app}\bin"; Components: main
commit f17470b508ba6452b8d2d8c107e2628f9bfcccb1
Author: John Ralls <jralls at ceridwen.us>
Date: Sun May 31 15:27:32 2020 -0700
Release GnuCash 3.903
diff --git a/gnucash.modules b/gnucash.modules
index ca3b7e3..1c91686 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -291,8 +291,8 @@
<cmake id="gnucash-unstable"
cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/">
- <branch module="project/gnucash/gnucash%20%28unstable%29/3.902/gnucash-3.902.tar.bz2"
- repo="sourceforge" version="3.902"/>
+ <branch module="project/gnucash/gnucash%20%28unstable%29/3.903/gnucash-3.903.tar.bz2"
+ repo="sourceforge" version="3.903"/>
<dependencies>
<dep package="libofx"/>
<dep package="aqbanking"/>
@@ -343,8 +343,8 @@
<autotools id="gnucash-unstable-docs"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
makeargs="chm" makeinstallargs="install-chm" >
- <branch module="project/gnucash/gnucash%20%28unstable%29/3.902/gnucash-docs-3.902.tar.gz"
- version="3.902" repo="sourceforge"/>
+ <branch module="project/gnucash/gnucash%20%28unstable%29/3.903/gnucash-docs-3.903.tar.gz"
+ version="3.903" repo="sourceforge"/>
</autotools>
<metamodule id="meta-gnucash-git">
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 87d3e51..6237c30 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -121,6 +121,7 @@ Source: "@MINGW_DIR@\bin\libboost_locale-mt.dll"; DestDir: "{app}\bin"; Componen
Source: "@MINGW_DIR@\bin\libboost_regex-mt.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libboost_system-mt.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libboost_filesystem-mt.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libboost_program_options-mt.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libboost_thread-mt.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libbz2-1.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libbrotlidec.dll"; DestDir: "{app}\bin"; Components: main
commit 2e7f8b5a0ba363331756cb0bca7a21e63c8e1b6e
Author: John Ralls <jralls at ceridwen.us>
Date: Sat May 30 14:25:03 2020 -0700
New webkit to go with ICU update in MinGW-w64.
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 4e9cede..146eb76 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -255,7 +255,7 @@ $sourceforge_url = "https://downloads.sourceforge.net/gnucash/Dependencies/"
$signing_keyfile = "jralls_public_signing_key.asc"
$key_url = $sourceforge_url + $signing_keyfile
$key_id = "C1F4DE993CF5835F"
-$webkit = "$arch_long-webkitgtk3-2.4.11-999.2-any.pkg.tar.zst"
+$webkit = "$arch_long-webkitgtk3-2.4.11-999.3-any.pkg.tar.zst"
$webkit_url = $sourceforge_url + $webkit
bash-command -command "wget $key_url"
bash-command -command "pacman-key --add $signing_keyfile"
commit 8924705fb7d0a2c428ca4a2f75dd5cea08e1d616
Author: John Ralls <jralls at ceridwen.us>
Date: Sat May 30 14:23:25 2020 -0700
Update guile to 2.2.7.
tarball made from git, can't use project-generated ones. Patches already included.
diff --git a/gnucash.modules b/gnucash.modules
index bcf4cbd..ca3b7e3 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -119,12 +119,8 @@
</autotools>
<autotools id="guile2" autogen-sh="autoreconf" autogenargs="--disable-rpath --enable-networking --enable-nls --enable-posix --enable-regex --with-threads=no --with-modules --disable-static">
- <branch repo="sourceforge" module="gnucash/Dependencies/guile-2.2.4.68-65d98.tar.xz"
- version=" 2.2.4.68-65d98">
- <patch file="0001-Fix-build-on-MinGW-w64.patch" strip="1"/>
- <patch file="0002-MinGW-Don-t-break-build-when-including-libguile.h.patch" strip="1"/>
- <patch file="0003-AC_DEFINE-REPLACE_MKTIME.patch" strip="1"/>
- <patch file="0001-MinGW-doesn-t-do-signals.patch" strip="1"/>
+ <branch repo="sourceforge" module="gnucash/Dependencies/guile-2.2.7.4-9d7759.tar.xz"
+ version=" 2.2.7.4-9d7759">
</branch>
<dependencies>
<dep package="libunistring"/>
commit dd8fa69437b76d05ef7e134f8f1f6b18c7621789
Author: John Ralls <jralls at ceridwen.us>
Date: Thu May 28 13:13:11 2020 -0700
Add WebKitGtk package files, build instructions.
WebKitGtk is no longer supported by MSYS2 so we must package it ourselves.
diff --git a/dependencies/README.md b/dependencies/README.md
new file mode 100644
index 0000000..f099688
--- /dev/null
+++ b/dependencies/README.md
@@ -0,0 +1,19 @@
+MSYS2 Packaging sources for dependencies that we provide via pacman instead of
+building every time with jhbuild.
+
+To build you'll need a working MSYS2 environment including:
+ base-devel
+ msys2-devel
+and one or both of
+ mingw-w64-i686-toolchain
+ mingw-w64-x86_64-toolchain
+If you're building for download you should have both toolchains installed. Note when installing toolchains that you don't need the ada, fortran, or objective-c compilers.
+
+Start an MSYS2 (not Mingw32/Mingw64!) shell and cd to the directory of the package you want to build. Edit PKGBUILD in that directory as needed for new versions and release number. Run
+ makepkg-mingw -sCLf
+
+If you want to build for only one architecture you can set MINGW_INSTALLS=mingw32 or MINGW_INSTALLS=mingw64 as appropriate.
+
+More procedure details may be found at https://www.msys2.org/wiki/Creating-Packages.
+
+If you're building packages for others to install with pacman then you'll need to sign the packages and put your public key in the repository so that others can download and install it to verify the packages you build. Instructions for setting this up are at https://www.msys2.org/wiki/Signing-packages.
diff --git a/dependencies/mingw-w64-webkitgtk/0020-W32-Fixup-dummy-HeapStatistics-implementation.all.patch b/dependencies/mingw-w64-webkitgtk/0020-W32-Fixup-dummy-HeapStatistics-implementation.all.patch
new file mode 100644
index 0000000..7186799
--- /dev/null
+++ b/dependencies/mingw-w64-webkitgtk/0020-W32-Fixup-dummy-HeapStatistics-implementation.all.patch
@@ -0,0 +1,29 @@
+From 0505839dc1793406aa37bc95ee51ea361e9508a0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?=
+ =?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986 at gmail.com>
+Date: Tue, 14 Apr 2015 14:53:29 +0000
+Subject: [PATCH 20/20] [W32] Fixup dummy HeapStatistics implementation
+
+GCC warns that exitWithFailure is marked as noreturn, but it does return:
+../webkitgtk-2.4.8/Source/JavaScriptCore/heap/HeapStatistics.cpp:135:1: warning: 'noreturn' function does return
+
+Call exit(-1) to indicate that no, there is no returning from here.
+---
+ Source/JavaScriptCore/heap/HeapStatistics.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Source/JavaScriptCore/heap/HeapStatistics.cpp b/Source/JavaScriptCore/heap/HeapStatistics.cpp
+index f23def7..ba441f0 100644
+--- a/Source/JavaScriptCore/heap/HeapStatistics.cpp
++++ b/Source/JavaScriptCore/heap/HeapStatistics.cpp
+@@ -132,6 +132,7 @@ void HeapStatistics::logStatistics()
+
+ void HeapStatistics::exitWithFailure()
+ {
++ exit(-1);
+ }
+
+ void HeapStatistics::reportSuccess()
+--
+1.8.5.3
+
diff --git a/dependencies/mingw-w64-webkitgtk/0021-W32-Change-printf-format-atribute-to-gnu_printf-.all.patch b/dependencies/mingw-w64-webkitgtk/0021-W32-Change-printf-format-atribute-to-gnu_printf-.all.patch
new file mode 100644
index 0000000..2300a22
--- /dev/null
+++ b/dependencies/mingw-w64-webkitgtk/0021-W32-Change-printf-format-atribute-to-gnu_printf-.all.patch
@@ -0,0 +1,68 @@
+From f90a814ad83d7c6279eaf1fc59d3d373ba7af259 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?=
+ =?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986 at gmail.com>
+Date: Tue, 14 Apr 2015 17:50:25 +0000
+Subject: [PATCH 21/21] [W32] Change printf format atribute to gnu_printf,
+ MinGW compatibility
+
+"printf" means "gnu_printf" when compiling for non-Windows and means
+"ms_printf" when compiling for Windows. The code, however, does seems to be
+assuming gnu_printf (judging by the use of %z and %l).
+
+Fix this by explicitly specifying gnu_printf format style.
+To ensure that gnu-compatible printf implementation is used, compile
+with -D__USE_MINGW_ANSI_STDIO=1, it will automagically turn all *printf()
+invocations into __mingw_*printf(), which are gnu-compatible.
+
+Only one function that won't be turned is _vsnprintf(). Ifdef its use and
+call vsnprintf() instead when __USE_MINGW_ANSI_STDIO != 0.
+---
+ Source/WTF/wtf/Assertions.cpp | 11 ++++++++++-
+ Source/WTF/wtf/Assertions.h | 4 ++--
+ 2 files changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/Source/WTF/wtf/Assertions.cpp b/Source/WTF/wtf/Assertions.cpp
+index a370302..d846777 100644
+--- a/Source/WTF/wtf/Assertions.cpp
++++ b/Source/WTF/wtf/Assertions.cpp
+@@ -116,12 +116,21 @@ static void vprintf_stderr_common(const char* format, va_list args)
+ size_t size = 1024;
+
+ do {
++ int printed;
+ char* buffer = (char*)malloc(size);
+
+ if (buffer == NULL)
+ break;
+
+- if (_vsnprintf(buffer, size, format, args) != -1) {
++#if defined(__USE_MINGW_ANSI_STDIO) && __USE_MINGW_ANSI_STDIO != 0
++ /* vsnprintf is a macro for __mingw_vsnprintf */
++ printed = vsnprintf(buffer, size, format, args);
++#else
++ /* _vsnprintf is always _vsnprintf from MS CRT */
++ printed = _vsnprintf(buffer, size, format, args);
++#endif
++
++ if (printed != -1) {
+ #if OS(WINCE)
+ // WinCE only supports wide chars
+ wchar_t* wideBuffer = (wchar_t*)malloc(size * sizeof(wchar_t));
+diff --git a/Source/WTF/wtf/Assertions.h b/Source/WTF/wtf/Assertions.h
+index 4d968b8..cb7c7e4 100644
+--- a/Source/WTF/wtf/Assertions.h
++++ b/Source/WTF/wtf/Assertions.h
+@@ -85,8 +85,8 @@
+ /* WTF logging functions can process %@ in the format string to log a NSObject* but the printf format attribute
+ emits a warning when %@ is used in the format string. Until <rdar://problem/5195437> is resolved we can't include
+ the attribute when being used from Objective-C code in case it decides to use %@. */
+-#if COMPILER(GCC) && !defined(__OBJC__)
+-#define WTF_ATTRIBUTE_PRINTF(formatStringArgument, extraArguments) __attribute__((__format__(printf, formatStringArgument, extraArguments)))
++#if COMPILER(GCC) && !defined(__OBJC__) && (!OS(WINDOWS) || (defined(__USE_MINGW_ANSI_STDIO) && __USE_MINGW_ANSI_STDIO != 0))
++#define WTF_ATTRIBUTE_PRINTF(formatStringArgument, extraArguments) __attribute__((__format__(gnu_printf, formatStringArgument, extraArguments)))
+ #else
+ #define WTF_ATTRIBUTE_PRINTF(formatStringArgument, extraArguments)
+ #endif
+--
+1.8.5.3
+
diff --git a/dependencies/mingw-w64-webkitgtk/0022-gl-casts.patch b/dependencies/mingw-w64-webkitgtk/0022-gl-casts.patch
new file mode 100644
index 0000000..d926c0c
--- /dev/null
+++ b/dependencies/mingw-w64-webkitgtk/0022-gl-casts.patch
@@ -0,0 +1,11 @@
+--- webkitgtk-2.4.9/Source/WebCore/platform/graphics/GLContext.cpp.orig 2015-07-12 20:33:29.627600000 +0300
++++ webkitgtk-2.4.9/Source/WebCore/platform/graphics/GLContext.cpp 2015-07-12 20:33:36.054800000 +0300
+@@ -159,7 +159,7 @@
+ return glxContext.release();
+ #endif
+ #if USE(EGL)
+- if (OwnPtr<GLContext> eglContext = GLContextEGL::createContext(windowHandle, sharingContext))
++ if (OwnPtr<GLContext> eglContext = GLContextEGL::createContext((EGLNativeWindowType)windowHandle, sharingContext))
+ return eglContext.release();
+ #endif
+ return nullptr;
diff --git a/dependencies/mingw-w64-webkitgtk/0101-webkitgtk-2.4.3-gcc-asm.all.patch b/dependencies/mingw-w64-webkitgtk/0101-webkitgtk-2.4.3-gcc-asm.all.patch
new file mode 100644
index 0000000..66d0ca1
--- /dev/null
+++ b/dependencies/mingw-w64-webkitgtk/0101-webkitgtk-2.4.3-gcc-asm.all.patch
@@ -0,0 +1,26 @@
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
+@@ -487,7 +487,12 @@ JSValue CLoop::execute(CallFrame* callFrame, Opcode entryOpcode, bool isInitiali
+ rBasePC.vp = codeBlock->instructions().begin();
+ #endif // USE(JSVALUE64)
+
++#if ENABLE(COMPUTED_GOTO_OPCODES)
+ goto llint_generic_return_point;
++#else
++ /* (most probably) causes null pointer dereference:
++ * NEXT_INSTRUCTION(); */
++#endif
+
+ } // END doReturnHelper.
+
+--- a/Source/WTF/wtf/Platform.h
++++ b/Source/WTF/wtf/Platform.h
+@@ -794,7 +794,7 @@
+ #endif
+
+ /* Configure the interpreter */
+-#if COMPILER(GCC)
++#if COMPILER(GCC) && !OS(WINDOWS)
+ #define HAVE_COMPUTED_GOTO 1
+ #endif
+
diff --git a/dependencies/mingw-w64-webkitgtk/0102-fix-build-with-icu-59.1.patch b/dependencies/mingw-w64-webkitgtk/0102-fix-build-with-icu-59.1.patch
new file mode 100644
index 0000000..ec87c93
--- /dev/null
+++ b/dependencies/mingw-w64-webkitgtk/0102-fix-build-with-icu-59.1.patch
@@ -0,0 +1,396 @@
+--- webkitgtk-2.4.11/Source/WTF/wtf/gobject/GlibUtilities.cpp
++++ webkitgtk-2.4.11/Source/WTF/wtf/gobject/GlibUtilities.cpp
+@@ -22,6 +22,7 @@
+ #if OS(WINDOWS)
+ #include <windows.h>
+ #include <wtf/text/WTFString.h>
++#include <wtf/text/win/WCharStringExtras.h>
+ #else
+ #include <limits.h>
+ #include <unistd.h>
+@@ -59,7 +59,7 @@
+ if (!length || (length == MAX_PATH && GetLastError() == ERROR_INSUFFICIENT_BUFFER))
+ return CString();
+
+- String path(buffer, length);
++ String path = wcharToString(buffer, length);
+ return path.utf8();
+ }
+ #endif
+--- null 1970-01-01 03:00:00.000000000 +0300
++++ webkitgtk-2.4.11/Source/WTF/wtf/text/win/WCharStringExtras.h 2017-06-15 14:56:11.000000000 +0300
+@@ -0,0 +1,70 @@
++/*
++ * Copyright (C) 2017 Konstantin Tokarev <annulen at yandex.ru>
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ * notice, this list of conditions and the following disclaimer in the
++ * documentation and/or other materials provided with the distribution.
++ *
++ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
++ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
++ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
++ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
++ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
++ * THE POSSIBILITY OF SUCH DAMAGE.
++ */
++
++#pragma once
++
++#include <wchar.h>
++#include <wtf/text/WTFString.h>
++
++namespace WTF {
++
++inline Vector<wchar_t> stringToNullTerminatedWChar(const String& string)
++{
++ Vector<wchar_t> result;
++
++ if (!string.isNull()) {
++ result.reserveInitialCapacity(string.impl()->length() + 1);
++
++ if (string.is8Bit()) {
++ const LChar* characters8 = string.impl()->characters8();
++ for (size_t i = 0; i < string.impl()->length(); ++i)
++ result.uncheckedAppend(characters8[i]);
++ } else {
++ const UChar* characters16 = string.impl()->characters16();
++ result.append(characters16, string.impl()->length());
++ }
++
++ result.append(0);
++ }
++
++ return result;
++}
++
++inline String wcharToString(const wchar_t* characters, unsigned length)
++{
++ static_assert(sizeof(wchar_t) == sizeof(UChar), "We assume wchar_t and UChar have the same size");
++ return String(reinterpret_cast<const UChar*>(characters), length);
++}
++
++inline String nullTerminatedWCharToString(const wchar_t* characters)
++{
++ return wcharToString(characters, wcslen(characters) - 1);
++}
++
++} // namespace WTF
++
++using WTF::stringToNullTerminatedWChar;
++using WTF::wcharToString;
++using WTF::nullTerminatedWCharToString;
+--- webkitgtk-2.4.11/Source/JavaScriptCore/API/JSStringRef.cpp
++++ webkitgtk-2.4.11/Source/JavaScriptCore/API/JSStringRef.cpp
+@@ -37,7 +37,7 @@
+ JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars)
+ {
+ initializeThreading();
+- return OpaqueJSString::create(chars, numChars).leakRef();
++ return OpaqueJSString::create(reinterpret_cast<const UChar*>(chars), numChars).leakRef();
+ }
+
+ JSStringRef JSStringCreateWithUTF8CString(const char* string)
+@@ -62,7 +62,7 @@
+ JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars)
+ {
+ initializeThreading();
+- return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars)).leakRef();
++ return OpaqueJSString::create(StringImpl::createWithoutCopying(reinterpret_cast<const UChar*>(chars), numChars)).leakRef();
+ }
+
+ JSStringRef JSStringRetain(JSStringRef string)
+@@ -83,7 +83,7 @@
+
+ const JSChar* JSStringGetCharactersPtr(JSStringRef string)
+ {
+- return string->characters();
++ return reinterpret_cast<const JSChar*>(string->characters());
+ }
+
+ size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string)
+--- webkitgtk-2.4.11/Source/JavaScriptCore/runtime/DateConversion.cpp
++++ webkitgtk-2.4.11/Source/JavaScriptCore/runtime/DateConversion.cpp
+@@ -32,6 +32,7 @@
+
+ #if OS(WINDOWS)
+ #include <windows.h>
++#include <wtf/text/win/WCharStringExtras.h>
+ #endif
+
+ using namespace WTF;
+@@ -108,7 +108,8 @@
+ #if OS(WINDOWS)
+ TIME_ZONE_INFORMATION timeZoneInformation;
+ GetTimeZoneInformation(&timeZoneInformation);
+- const WCHAR* timeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName;
++ const WCHAR* winTimeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName;
++ String timeZoneName = nullTerminatedWCharToString(winTimeZoneName);
+ #else
+ struct tm gtm = t;
+ char timeZoneName[70];
+--- webkitgtk-2.4.11/Source/WebKit2/Shared/API/c/WKString.cpp
++++ webkitgtk-2.4.11/Source/WebKit2/Shared/API/c/WKString.cpp
+@@ -55,7 +55,7 @@
+ size_t WKStringGetCharacters(WKStringRef stringRef, WKChar* buffer, size_t bufferLength)
+ {
+ COMPILE_ASSERT(sizeof(WKChar) == sizeof(UChar), WKStringGetCharacters_sizeof_WKChar_matches_UChar);
+- return (toImpl(stringRef)->getCharacters(static_cast<UChar*>(buffer), bufferLength));
++ return (toImpl(stringRef)->getCharacters(reinterpret_cast<UChar*>(buffer), bufferLength));
+ }
+
+ size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef)
+--- webkitgtk-2.4.11/Source/WebCore/plugins/win/PluginDatabaseWin.cpp.orig 2018-04-20 13:47:17.383413300 +0300
++++ webkitgtk-2.4.11/Source/WebCore/plugins/win/PluginDatabaseWin.cpp 2018-04-20 14:16:51.638953200 +0300
+@@ -32,6 +32,7 @@
+ #include "URL.h"
+ #include "PluginPackage.h"
+ #include <wtf/WindowsExtras.h>
++#include <wtf/text/win/WCharStringExtras.h>
+
+ #if OS(WINCE)
+ // WINCE doesn't support Registry Key Access Rights. The parameter should always be 0
+@@ -94,7 +95,7 @@
+ if (result != ERROR_SUCCESS || type != REG_SZ)
+ continue;
+
+- paths.add(String(pathStr, pathStrSize / sizeof(WCHAR) - 1));
++ paths.add(wcharToString(pathStr, pathStrSize / sizeof(WCHAR) - 1));
+ }
+
+ RegCloseKey(key);
+@@ -115,7 +116,7 @@
+ for (Vector<String>::const_iterator it = m_pluginDirectories.begin(); it != end; ++it) {
+ String pattern = *it + "\\*";
+
+- hFind = FindFirstFileW(pattern.charactersWithNullTermination().data(), &findFileData);
++ hFind = FindFirstFileW(stringToNullTerminatedWChar(pattern).data(), &findFileData);
+
+ if (hFind == INVALID_HANDLE_VALUE)
+ continue;
+@@ -124,7 +125,7 @@
+ if (findFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
+ continue;
+
+- String filename = String(findFileData.cFileName, wcslen(findFileData.cFileName));
++ String filename = wcharToString(findFileData.cFileName, wcslen(findFileData.cFileName));
+ if ((!filename.startsWith("np", false) || !filename.endsWith("dll", false)) &&
+ (!equalIgnoringCase(filename, "Plugin.dll") || !it->endsWith("Shockwave 10", false)))
+ continue;
+@@ -211,11 +212,11 @@
+ if (result != ERROR_SUCCESS)
+ break;
+
+- String extensionsPath = String(name, nameLen) + "\\Extensions";
++ String extensionsPath = wcharToString(name, nameLen) + "\\Extensions";
+ HKEY extensionsKey;
+
+ // Try opening the key
+- result = RegOpenKeyEx(key, extensionsPath.charactersWithNullTermination().data(), 0, KEY_READ, &extensionsKey);
++ result = RegOpenKeyEx(key, stringToNullTerminatedWChar(extensionsPath).data(), 0, KEY_READ, &extensionsKey);
+
+ if (result == ERROR_SUCCESS) {
+ // Now get the plugins directory
+@@ -226,7 +227,7 @@
+ result = RegQueryValueEx(extensionsKey, TEXT("Plugins"), 0, &type, (LPBYTE)&pluginsDirectoryStr, &pluginsDirectorySize);
+
+ if (result == ERROR_SUCCESS && type == REG_SZ)
+- directories.append(String(pluginsDirectoryStr, pluginsDirectorySize / sizeof(WCHAR) - 1));
++ directories.append(wcharToString(pluginsDirectoryStr, pluginsDirectorySize / sizeof(WCHAR) - 1));
+
+ RegCloseKey(extensionsKey);
+ }
+@@ -244,7 +245,7 @@
+ DWORD pluginDirectorySize = ::ExpandEnvironmentStringsW(TEXT("%SYSTEMDRIVE%\\PFiles\\Plugins"), pluginDirectoryStr, WTF_ARRAY_LENGTH(pluginDirectoryStr));
+
+ if (pluginDirectorySize > 0 && pluginDirectorySize <= WTF_ARRAY_LENGTH(pluginDirectoryStr))
+- directories.append(String(pluginDirectoryStr, pluginDirectorySize - 1));
++ directories.append(wcharToString(pluginDirectoryStr, pluginDirectorySize - 1));
+ #endif
+
+ DWORD type;
+@@ -254,7 +255,7 @@
+ HRESULT result = getRegistryValue(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\MediaPlayer", L"Installation Directory", &type, &installationDirectoryStr, &installationDirectorySize);
+
+ if (result == ERROR_SUCCESS && type == REG_SZ)
+- directories.append(String(installationDirectoryStr, installationDirectorySize / sizeof(WCHAR) - 1));
++ directories.append(wcharToString(installationDirectoryStr, installationDirectorySize / sizeof(WCHAR) - 1));
+ }
+
+ static inline void addQuickTimePluginDirectory(Vector<String>& directories)
+@@ -266,7 +267,7 @@
+ HRESULT result = getRegistryValue(HKEY_LOCAL_MACHINE, L"Software\\Apple Computer, Inc.\\QuickTime", L"InstallDir", &type, &installationDirectoryStr, &installationDirectorySize);
+
+ if (result == ERROR_SUCCESS && type == REG_SZ) {
+- String pluginDir = String(installationDirectoryStr, installationDirectorySize / sizeof(WCHAR) - 1) + "\\plugins";
++ String pluginDir = wcharToString(installationDirectoryStr, installationDirectorySize / sizeof(WCHAR) - 1) + "\\plugins";
+ directories.append(pluginDir);
+ }
+ }
+@@ -292,10 +293,10 @@
+ if (result != ERROR_SUCCESS)
+ break;
+
+- Vector<int> acrobatVersion = parseVersionString(String(name, nameLen));
++ Vector<int> acrobatVersion = parseVersionString(wcharToString(name, nameLen));
+ if (compareVersions(acrobatVersion, latestAcrobatVersion)) {
+ latestAcrobatVersion = acrobatVersion;
+- latestAcrobatVersionString = String(name, nameLen);
++ latestAcrobatVersionString = wcharToString(name, nameLen);
+ }
+ }
+
+@@ -305,10 +306,10 @@
+ DWORD acrobatInstallPathSize = sizeof(acrobatInstallPathStr);
+
+ String acrobatPluginKeyPath = "Software\\Adobe\\Acrobat Reader\\" + latestAcrobatVersionString + "\\InstallPath";
+- result = getRegistryValue(HKEY_LOCAL_MACHINE, acrobatPluginKeyPath.charactersWithNullTermination().data(), 0, &type, acrobatInstallPathStr, &acrobatInstallPathSize);
++ result = getRegistryValue(HKEY_LOCAL_MACHINE, stringToNullTerminatedWChar(acrobatPluginKeyPath).data(), 0, &type, acrobatInstallPathStr, &acrobatInstallPathSize);
+
+ if (result == ERROR_SUCCESS) {
+- String acrobatPluginDirectory = String(acrobatInstallPathStr, acrobatInstallPathSize / sizeof(WCHAR) - 1) + "\\browser";
++ String acrobatPluginDirectory = wcharToString(acrobatInstallPathStr, acrobatInstallPathSize / sizeof(WCHAR) - 1) + "\\browser";
+ directories.append(acrobatPluginDirectory);
+ }
+ }
+@@ -337,10 +338,10 @@
+ if (result != ERROR_SUCCESS)
+ break;
+
+- Vector<int> javaVersion = parseVersionString(String(name, nameLen));
++ Vector<int> javaVersion = parseVersionString(wcharToString(name, nameLen));
+ if (compareVersions(javaVersion, latestJavaVersion)) {
+ latestJavaVersion = javaVersion;
+- latestJavaVersionString = String(name, nameLen);
++ latestJavaVersionString = wcharToString(name, nameLen);
+ }
+ }
+
+@@ -352,12 +353,12 @@
+ DWORD useNewPluginSize;
+
+ String javaPluginKeyPath = "Software\\JavaSoft\\Java Plug-in\\" + latestJavaVersionString;
+- result = getRegistryValue(HKEY_LOCAL_MACHINE, javaPluginKeyPath.charactersWithNullTermination().data(), L"UseNewJavaPlugin", &type, &useNewPluginValue, &useNewPluginSize);
++ result = getRegistryValue(HKEY_LOCAL_MACHINE, stringToNullTerminatedWChar(javaPluginKeyPath).data(), L"UseNewJavaPlugin", &type, &useNewPluginValue, &useNewPluginSize);
+
+ if (result == ERROR_SUCCESS && useNewPluginValue == 1) {
+- result = getRegistryValue(HKEY_LOCAL_MACHINE, javaPluginKeyPath.charactersWithNullTermination().data(), L"JavaHome", &type, javaInstallPathStr, &javaInstallPathSize);
++ result = getRegistryValue(HKEY_LOCAL_MACHINE, stringToNullTerminatedWChar(javaPluginKeyPath).data(), L"JavaHome", &type, javaInstallPathStr, &javaInstallPathSize);
+ if (result == ERROR_SUCCESS) {
+- String javaPluginDirectory = String(javaInstallPathStr, javaInstallPathSize / sizeof(WCHAR) - 1) + "\\bin\\new_plugin";
++ String javaPluginDirectory = wcharToString(javaInstallPathStr, javaInstallPathSize / sizeof(WCHAR) - 1) + "\\bin\\new_plugin";
+ directories.append(javaPluginDirectory);
+ }
+ }
+@@ -383,7 +384,7 @@
+ if (!PathRemoveFileSpec(moduleFileNameStr))
+ goto exit;
+
+- pluginsDirectory = String(moduleFileNameStr) + "\\Plugins";
++ pluginsDirectory = nullTerminatedWCharToString(moduleFileNameStr) + "\\Plugins";
+ }
+ exit:
+ return pluginsDirectory;
+@@ -400,10 +401,10 @@
+ WCHAR macromediaDirectoryStr[MAX_PATH];
+
+ PathCombine(macromediaDirectoryStr, systemDirectoryStr, TEXT("macromed\\Flash"));
+- directories.append(macromediaDirectoryStr);
++ directories.append(nullTerminatedWCharToString(macromediaDirectoryStr));
+
+ PathCombine(macromediaDirectoryStr, systemDirectoryStr, TEXT("macromed\\Shockwave 10"));
+- directories.append(macromediaDirectoryStr);
++ directories.append(nullTerminatedWCharToString(macromediaDirectoryStr));
+ #endif
+ }
+
+--- webkitgtk-2.4.11/Source/WebCore/plugins/win/PluginPackageWin.cpp.orig 2018-04-20 14:21:08.212931600 +0300
++++ webkitgtk-2.4.11/Source/WebCore/plugins/win/PluginPackageWin.cpp 2018-04-20 14:24:24.570476500 +0300
+@@ -34,10 +34,11 @@
+ #include "PluginDebug.h"
+ #include "Timer.h"
+ #include "npruntime_impl.h"
++#include <shlwapi.h>
+ #include <string.h>
+ #include <wtf/StdLibExtras.h>
+ #include <wtf/text/CString.h>
+-#include <shlwapi.h>
++#include <wtf/text/win/WCharStringExtras.h>
+
+ namespace WebCore {
+
+@@ -47,7 +48,7 @@
+ UINT bufferLength;
+ String subInfo = "\\StringfileInfo\\040904E4\\" + info;
+ bool retval = VerQueryValueW(versionInfoData,
+- const_cast<UChar*>(subInfo.charactersWithNullTermination().data()),
++ stringToNullTerminatedWChar(subInfo).data(),
+ &buffer, &bufferLength);
+ if (!retval || bufferLength == 0)
+ return String();
+@@ -167,13 +168,13 @@
+ bool PluginPackage::fetchInfo()
+ {
+ DWORD versionInfoSize, zeroHandle;
+- versionInfoSize = GetFileVersionInfoSizeW(const_cast<UChar*>(m_path.charactersWithNullTermination().data()), &zeroHandle);
++ versionInfoSize = GetFileVersionInfoSizeW(stringToNullTerminatedWChar(m_path).data(), &zeroHandle);
+ if (versionInfoSize == 0)
+ return false;
+
+ auto versionInfoData = std::make_unique<char[]>(versionInfoSize);
+
+- if (!GetFileVersionInfoW(const_cast<UChar*>(m_path.charactersWithNullTermination().data()),
++ if (!GetFileVersionInfoW(stringToNullTerminatedWChar(m_path).data(),
+ 0, versionInfoSize, versionInfoData.get()))
+ return false;
+
+@@ -247,11 +248,11 @@
+
+ String path = m_path.substring(0, m_path.reverseFind('\\'));
+
+- if (!::SetCurrentDirectoryW(path.charactersWithNullTermination().data()))
++ if (!::SetCurrentDirectoryW(stringToNullTerminatedWChar(path).data()))
+ return false;
+
+ // Load the library
+- m_module = ::LoadLibraryExW(m_path.charactersWithNullTermination().data(), 0, LOAD_WITH_ALTERED_SEARCH_PATH);
++ m_module = ::LoadLibraryExW(stringToNullTerminatedWChar(m_path).data(), 0, LOAD_WITH_ALTERED_SEARCH_PATH);
+
+ if (!::SetCurrentDirectoryW(currentPath)) {
+ if (m_module)
+--- webkitgtk-2.4.11/Source/WebCore/plugins/win/PluginViewWin.cpp.orig 2018-04-20 14:24:40.154903800 +0300
++++ webkitgtk-2.4.11/Source/WebCore/plugins/win/PluginViewWin.cpp 2018-04-20 14:25:32.960996600 +0300
+@@ -71,6 +71,7 @@
+ #include <runtime/JSLock.h>
+ #include <wtf/ASCIICType.h>
+ #include <wtf/text/WTFString.h>
++#include <wtf/text/win/WCharStringExtras.h>
+ #include <wtf/win/GDIObject.h>
+
+ #if OS(WINCE)
+@@ -873,13 +874,13 @@
+
+ // Get file info
+ WIN32_FILE_ATTRIBUTE_DATA attrs;
+- if (GetFileAttributesExW(filename.charactersWithNullTermination().data(), GetFileExInfoStandard, &attrs) == 0)
++ if (GetFileAttributesExW(stringToNullTerminatedWChar(filename).data(), GetFileExInfoStandard, &attrs))
+ return NPERR_FILE_NOT_FOUND;
+
+ if (attrs.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
+ return NPERR_FILE_NOT_FOUND;
+
+- HANDLE fileHandle = CreateFileW(filename.charactersWithNullTermination().data(), FILE_READ_DATA, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0);
++ HANDLE fileHandle = CreateFileW(stringToNullTerminatedWChar(filename).data(), FILE_READ_DATA, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0);
+
+ if (fileHandle == INVALID_HANDLE_VALUE)
+ return NPERR_FILE_NOT_FOUND;
diff --git a/dependencies/mingw-w64-webkitgtk/0103-SingleThread.patch b/dependencies/mingw-w64-webkitgtk/0103-SingleThread.patch
new file mode 100644
index 0000000..51a96ce
--- /dev/null
+++ b/dependencies/mingw-w64-webkitgtk/0103-SingleThread.patch
@@ -0,0 +1,13 @@
+--- webkitgtk-2.4.11/Source/WTF/wtf/ThreadingPthreads.cpp 2016-04-09 23:48:36.000000000 -0700
++++ webkitgtk-2.4.11/Source/WTF/wtf/ThreadingPthreads.cpp 2019-12-14 11:12:18.000000000 -0800
+@@ -128,5 +128,9 @@
+ wtfThreadData();
+ s_dtoaP5Mutex = new Mutex;
+ initializeDates();
++ auto webkit_procs = getenv("WEBKIT_PROCESSORS");
++ int num_processors = webkit_procs ? atoi(webkit_procs) : -1;
++ if (num_processors > 0 && num_processors < 16)
++ pthread_set_num_processors_np(num_processors);
+ }
+
+ static ThreadMap& threadMap()
\ No newline at end of file
diff --git a/dependencies/mingw-w64-webkitgtk/0104-Fix-for-FORTIFY_SOURCE.patch b/dependencies/mingw-w64-webkitgtk/0104-Fix-for-FORTIFY_SOURCE.patch
new file mode 100644
index 0000000..761b313
--- /dev/null
+++ b/dependencies/mingw-w64-webkitgtk/0104-Fix-for-FORTIFY_SOURCE.patch
@@ -0,0 +1,13 @@
+--- webkitgtk-2.4.11/Source/autotools/SetupCompilerFlags.m4
++++ webkitgtk-2.4.11/Source/autotools/SetupCompilerFlags.m4
+@@ -58,6 +58,10 @@
+ CFLAGS="$CFLAGS -O0"
+ fi
+
++#This is probably the wrong place to put it, but need a library flag due to some change in mingw for the D_FORTIFY_SOURCE.
++# https://github.com/msys2/MINGW-packages/issues/5868
++LIBS="$LIBS -lssp"
++
+ # Some architectures need to add libatomic explicitly
+ AC_LANG_PUSH([C++])
+ AC_LINK_IFELSE([AC_LANG_SOURCE([[
diff --git a/dependencies/mingw-w64-webkitgtk/0200-fix-build-with-StuctureInlines.h.patch b/dependencies/mingw-w64-webkitgtk/0200-fix-build-with-StuctureInlines.h.patch
new file mode 100644
index 0000000..75f2628
--- /dev/null
+++ b/dependencies/mingw-w64-webkitgtk/0200-fix-build-with-StuctureInlines.h.patch
@@ -0,0 +1,70 @@
+--- webkitgtk-2.4.11/Source/JavaScriptCore/runtime/ArgumentsIteratorConstructor.cpp 2015-09-03 00:12:57.000000000 +0300
++++ webkitgtk-2.4.11/Source/JavaScriptCore/runtime/ArgumentsIteratorConstructor.cpp 2015-09-03 00:12:57.000000000 +0300
+@@ -31,6 +31,7 @@
+ #include "JSCJSValueInlines.h"
+ #include "JSCellInlines.h"
+ #include "JSGlobalObject.h"
++#include "StructureInlines.h"
+
+ namespace JSC {
+
+--- webkitgtk-2.4.11/Source/JavaScriptCore/runtime/JSPromiseFunctions.cpp 2015-09-03 00:12:58.000000000 +0300
++++ webkitgtk-2.4.11/Source/JavaScriptCore/runtime/JSPromiseFunctions.cpp 2015-09-03 00:12:58.000000000 +0300
+@@ -35,6 +35,7 @@
+ #include "JSPromiseConstructor.h"
+ #include "JSPromiseDeferred.h"
+ #include "NumberObject.h"
++#include "StructureInlines.h"
+
+ namespace JSC {
+
+--- webkitgtk-2.4.11/Source/JavaScriptCore/runtime/MapConstructor.cpp 2015-09-03 00:13:00.000000000 +0300
++++ webkitgtk-2.4.11/Source/JavaScriptCore/runtime/MapConstructor.cpp 2015-09-03 00:13:00.000000000 +0300
+@@ -32,6 +32,7 @@
+ #include "JSGlobalObject.h"
+ #include "JSMap.h"
+ #include "MapPrototype.h"
++#include "StructureInlines.h"
+
+ namespace JSC {
+
+--- webkitgtk-2.4.11/Source/JavaScriptCore/runtime/MapIteratorConstructor.cpp 2015-09-03 00:13:01.000000000 +0300
++++ webkitgtk-2.4.11/Source/JavaScriptCore/runtime/MapIteratorConstructor.cpp 2015-09-03 00:13:01.000000000 +0300
+@@ -31,6 +31,7 @@
+ #include "JSGlobalObject.h"
+ #include "JSMapIterator.h"
+ #include "MapIteratorPrototype.h"
++#include "StructureInlines.h"
+
+ namespace JSC {
+
+--- webkitgtk-2.4.11/Source/JavaScriptCore/runtime/SetConstructor.cpp 2015-09-03 00:13:02.000000000 +0300
++++ webkitgtk-2.4.11/Source/JavaScriptCore/runtime/SetConstructor.cpp 2015-09-03 00:13:02.000000000 +0300
+@@ -33,6 +33,7 @@
+ #include "JSSet.h"
+ #include "MapData.h"
+ #include "SetPrototype.h"
++#include "StructureInlines.h"
+
+ namespace JSC {
+
+--- webkitgtk-2.4.11/Source/JavaScriptCore/runtime/SetIteratorConstructor.cpp 2015-09-03 00:13:04.000000000 +0300
++++ webkitgtk-2.4.11/Source/JavaScriptCore/runtime/SetIteratorConstructor.cpp 2015-09-03 00:13:04.000000000 +0300
+@@ -31,6 +31,7 @@
+ #include "JSGlobalObject.h"
+ #include "JSSetIterator.h"
+ #include "SetIteratorPrototype.h"
++#include "StructureInlines.h"
+
+ namespace JSC {
+
+--- webkitgtk-2.4.11/Source/JavaScriptCore/runtime/WeakMapConstructor.cpp 2015-09-03 00:13:06.000000000 +0300
++++ webkitgtk-2.4.11/Source/JavaScriptCore/runtime/WeakMapConstructor.cpp 2015-09-03 00:13:06.000000000 +0300
+@@ -30,6 +30,7 @@
+ #include "JSCellInlines.h"
+ #include "JSGlobalObject.h"
+ #include "JSWeakMap.h"
++#include "StructureInlines.h"
+ #include "WeakMapPrototype.h"
+
+ namespace JSC {
diff --git a/dependencies/mingw-w64-webkitgtk/0201-fix-build-WebKitTestRunnerGNUMakefile.am.patch b/dependencies/mingw-w64-webkitgtk/0201-fix-build-WebKitTestRunnerGNUMakefile.am.patch
new file mode 100644
index 0000000..9e4e985
--- /dev/null
+++ b/dependencies/mingw-w64-webkitgtk/0201-fix-build-WebKitTestRunnerGNUMakefile.am.patch
@@ -0,0 +1,15 @@
+--- a/Tools/WebKitTestRunner/GNUmakefile.am
++++ a/Tools/WebKitTestRunner/GNUmakefile.am
+@@ -155,7 +155,10 @@ code_generation_dependencies = \
+ Source/WebCore/bindings/scripts/InFilesParser.pm \
+ Source/WebCore/bindings/scripts/generate-bindings.pl
+
+-DerivedSources/InjectedBundle/JS%.cpp: Tools/WebKitTestRunner/InjectedBundle/Bindings/%.idl $(code_generation_dependencies)
++$(top_builddir)/DerivedSources/InjectedBundle:
++ $(AM_V_at)mkdir -p $@
++
++DerivedSources/InjectedBundle/JS%.cpp: Tools/WebKitTestRunner/InjectedBundle/Bindings/%.idl $(code_generation_dependencies) $(top_builddir)/DerivedSources/InjectedBundle
+ $(AM_V_GEN)$(PERL) \
+ -I $(srcdir)/Source/WebCore/bindings/scripts \
+ -I $(srcdir)/Tools/WebKitTestRunner/InjectedBundle/Bindings \
+--
\ No newline at end of file
diff --git a/dependencies/mingw-w64-webkitgtk/0202-fix-trailing-semi-on-macro.patch b/dependencies/mingw-w64-webkitgtk/0202-fix-trailing-semi-on-macro.patch
new file mode 100644
index 0000000..46f4167
--- /dev/null
+++ b/dependencies/mingw-w64-webkitgtk/0202-fix-trailing-semi-on-macro.patch
@@ -0,0 +1,37 @@
+--- a/Source/WebCore/dom/Document.cpp 2016-04-09 23:48:37.000000000 -0700
++++ b/Source/WebCore/dom/Document.cpp 2019-12-20 11:45:17.294655200 -0800
+@@ -3912,12 +3912,12 @@
+ unsigned i = 0;
+
+ UChar32 c;
+- U16_NEXT(characters, i, length, c)
++ U16_NEXT(characters, i, length, c);
+ if (!isValidNameStart(c))
+ return false;
+
+ while (i < length) {
+- U16_NEXT(characters, i, length, c)
++ U16_NEXT(characters, i, length, c);
+ if (!isValidNamePart(c))
+ return false;
+ }
+@@ -3980,7 +3980,7 @@
+ const UChar* s = qualifiedName.deprecatedCharacters();
+ for (unsigned i = 0; i < length;) {
+ UChar32 c;
+- U16_NEXT(s, i, length, c)
++ U16_NEXT(s, i, length, c);
+ if (c == ':') {
+ if (sawColon) {
+ ec = NAMESPACE_ERR;
+--- a/Source/WebCore/platform/graphics/SegmentedFontData.cpp 2016-04-09 23:48:37.000000000 -0700
++++ b/Source/WebCore/platform/graphics/SegmentedFontData.cpp 2019-12-19 17:01:40.264614000 -0800
+@@ -61,7 +61,7 @@
+ {
+ UChar32 c;
+ for (int i = 0; i < length; ) {
+- U16_NEXT(characters, i, length, c)
++ U16_NEXT(characters, i, length, c);
+ if (!containsCharacter(c))
+ return false;
+ }
diff --git a/dependencies/mingw-w64-webkitgtk/PKGBUILD b/dependencies/mingw-w64-webkitgtk/PKGBUILD
new file mode 100644
index 0000000..d199efb
--- /dev/null
+++ b/dependencies/mingw-w64-webkitgtk/PKGBUILD
@@ -0,0 +1,175 @@
+# Maintainer: Alexey Pavlov <alexpux at gmail.com>
+
+_realname=webkitgtk
+pkgbase=mingw-w64-${_realname}
+#pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}2" "${MINGW_PACKAGE_PREFIX}-${_realname}3")
+pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}3")
+pkgver=2.4.11
+pkgrel=999.3
+pkgdesc="GTK+ Web content engine library (mingw-w64)"
+arch=('any')
+url="https://webkitgtk.org/"
+license=("custom")
+options=('!libtool' 'strip' '!debug' 'staticlibs' 'buildflags')
+makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
+ "${MINGW_PACKAGE_PREFIX}-gobject-introspection"
+ "${MINGW_PACKAGE_PREFIX}-gtk3"
+ "${MINGW_PACKAGE_PREFIX}-pkg-config"
+ "${MINGW_PACKAGE_PREFIX}-ruby"
+ "bison"
+ "flex"
+ "gperf"
+ "libtool"
+ "gtk-doc"
+ "perl"
+ "python3")
+depends=("${MINGW_PACKAGE_PREFIX}-cairo"
+ "${MINGW_PACKAGE_PREFIX}-fontconfig"
+ "${MINGW_PACKAGE_PREFIX}-freetype"
+ "${MINGW_PACKAGE_PREFIX}-glib2"
+ "${MINGW_PACKAGE_PREFIX}-harfbuzz"
+ "${MINGW_PACKAGE_PREFIX}-libsoup"
+ "${MINGW_PACKAGE_PREFIX}-icu"
+ "${MINGW_PACKAGE_PREFIX}-libjpeg"
+ "${MINGW_PACKAGE_PREFIX}-libpng"
+ "${MINGW_PACKAGE_PREFIX}-libxml2"
+ "${MINGW_PACKAGE_PREFIX}-libxslt"
+ "${MINGW_PACKAGE_PREFIX}-libwebp"
+ "${MINGW_PACKAGE_PREFIX}-pango"
+ "${MINGW_PACKAGE_PREFIX}-sqlite3"
+ "${MINGW_PACKAGE_PREFIX}-xz")
+source=(https://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz
+ 0020-W32-Fixup-dummy-HeapStatistics-implementation.all.patch
+ 0021-W32-Change-printf-format-atribute-to-gnu_printf-.all.patch
+ 0022-gl-casts.patch
+ 0101-webkitgtk-2.4.3-gcc-asm.all.patch
+ 0102-fix-build-with-icu-59.1.patch
+ 0103-SingleThread.patch
+ 0104-Fix-for-FORTIFY_SOURCE.patch
+ 0200-fix-build-with-StuctureInlines.h.patch
+ 0201-fix-build-WebKitTestRunnerGNUMakefile.am.patch
+ 0202-fix-trailing-semi-on-macro.patch
+ webkitgtk-2.4.9-abs.patch
+ enchant-2.x.patch)
+
+prepare() {
+ cd ${srcdir}/${_realname}-${pkgver}
+ patch -p1 -i ${srcdir}/0020-W32-Fixup-dummy-HeapStatistics-implementation.all.patch
+ patch -p1 -i ${srcdir}/0021-W32-Change-printf-format-atribute-to-gnu_printf-.all.patch
+ patch -p1 -i ${srcdir}/0022-gl-casts.patch
+ patch -p1 -i ${srcdir}/0101-webkitgtk-2.4.3-gcc-asm.all.patch
+ patch -p1 -i ${srcdir}/0102-fix-build-with-icu-59.1.patch
+ patch -p1 -i ${srcdir}/0103-SingleThread.patch
+ patch -p1 -i ${srcdir}/0104-Fix-for-FORTIFY_SOURCE.patch
+ patch -p1 -i ${srcdir}/0200-fix-build-with-StuctureInlines.h.patch
+ patch -p1 -i ${srcdir}/0201-fix-build-WebKitTestRunnerGNUMakefile.am.patch
+ patch -p1 -i ${srcdir}/0202-fix-trailing-semi-on-macro.patch
+# borrowed from Arch Linux
+ patch -p1 -i ${srcdir}/webkitgtk-2.4.9-abs.patch
+ patch -p1 -i ${srcdir}/enchant-2.x.patch
+
+ autoreconf --verbose --install -I Source/autotools
+
+ rm -rf ${srcdir}/build-gtk{2,3}
+ mkdir -p ${srcdir}/build-gtk{2,3}
+}
+
+_build() {
+ _ver="$1"; shift
+ cd ${srcdir}/build-${_ver}
+
+ export PYTHON=/usr/bin/python2
+ export RUBY=${MINGW_PREFIX}/bin/ruby
+ export CPPFLAGS="${CPPFLAGS} -w"
+# -Wno-class-memaccess -Wno-deprecated-copy -Wno-expansion-to-defined -Wno-redundant-move"
+
+ ../${_realname}-${pkgver}/configure \
+ --prefix=${MINGW_PREFIX} \
+ --build=${MINGW_CHOST} \
+ --host=${MINGW_CHOST} \
+ --disable-debug \
+ --enable-credential-storage=no \
+ --enable-accelerated-compositing=no \
+ --enable-debug-symbols=min \
+ --disable-webkit2 \
+ --disable-glibtest \
+ --disable-static \
+ --enable-shared \
+ --enable-optimizations \
+ --disable-x11-target \
+ --enable-win32-target \
+ --enable-gles2=no \
+ --enable-egl=no \
+ --enable-glx=no \
+ --enable-gtk-doc-html=no \
+ --enable-webgl=no \
+ --enable-web-audio=no \
+ --enable-video=no \
+ --enable-geolocation=no \
+ "$@"
+
+ make -j1
+}
+
+build() {
+ local _jit_flag=
+ case ${MINGW_CHOST} in
+ i686*)
+ _jit_flag="-enable-jit"
+ ;;
+ x86_64*)
+ _jit_flag="-disable-jit"
+ ;;
+ esac
+
+ _build gtk3 --disable-gtk-doc --disable-webkit2 --with-gtk=3.0 ${_jit_flag}
+# _build gtk2 --disable-gtk-doc --disable-webkit2 --with-gtk=2.0 ${_jit_flag}
+}
+
+#package_webkitgtk2() {
+# pkgdesc+=" for GTK2"
+# depends+=(${MINGW_PACKAGE_PREFIX}-gtk2)
+# #provides=("${MINGW_PACKAGE_PREFIX}-libwebkit2=${pkgver}")
+# cd "${srcdir}/build-gtk2"
+# make -j DESTDIR="${pkgdir}" install
+# find "${pkgdir}${MINGW_PREFIX}" -name '*.def' -o -name '*.exp' | xargs -rtl1 rm
+#}
+
+package_webkitgtk3() {
+ depends+=(${MINGW_PACKAGE_PREFIX}-gtk3)
+ #optdepends+=("${MINGW_PACKAGE_PREFIX}-gtk2: Netscape plugin support")
+ #provides=("${MINGW_PACKAGE_PREFIX}-webkitgtk3=${pkgver}" "${MINGW_PACKAGE_PREFIX}-libwebkit3=${pkgver}")
+ cd "${srcdir}/build-gtk3"
+ make -j1 DESTDIR="${pkgdir}" install
+ find "${pkgdir}${MINGW_PREFIX}" -name '*.def' -o -name '*.exp' | xargs -rtl1 rm
+}
+
+#package_mingw-w64-i686-webkitgtk2() {
+# package_webkitgtk2
+#}
+
+package_mingw-w64-i686-webkitgtk3() {
+ package_webkitgtk3
+}
+
+#package_mingw-w64-x86_64-webkitgtk2() {
+# package_webkitgtk2
+#}
+
+package_mingw-w64-x86_64-webkitgtk3() {
+ package_webkitgtk3
+}
+
+sha256sums=('588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7'
+ 'e47cf0649f4bc82f96b6f3830964eeb685c56bdfabe43d83a45cfb432df1a261'
+ '6937cbfee2b689084c40785288bedd7aa1f0991c7f922203d2b89a4f67b75836'
+ '2a74b1174410121fe8a25b1a87dfeadd22aebd0337df8a31a42ec99ee1585389'
+ '82f089e1271ccd39ea3fee7c066a06eabb287d6273910c9e9bddb86ba5ad2818'
+ '3d17c925cd6b21a2aafb4d91913b0b3e1a11f532e31190161398b228c367bd31'
+ '68426ac0f19ac52f24641bcb969405a97d96f06510b6bc86854158cf200c6624'
+ 'aba0f436b10527f43e348dabd9fbfe3d99a4bdec81192db8805df31c6b2327c7'
+ 'ff17b9a91147df077cefc1f97dbede017252cb81a4c745c96c587b3c52ecfac7'
+ '393cfe80aa0aa22445bfd542750bff9177a21400ee6280cfe954a2aeacff0fad'
+ 'a39241fe2a46f0596657c977c8477a6997e3376e467cd761ab571f744a9596cd'
+ 'ec294bbb5588a1802a68e3615c6718486b22f922645c5fef686d3d103014bf70'
+ '3bdb4c57c5ff4a86706282905b0f1d4a44a25dd3d6185d94871994db6fdb9b79')
diff --git a/dependencies/mingw-w64-webkitgtk/enchant-2.x.patch b/dependencies/mingw-w64-webkitgtk/enchant-2.x.patch
new file mode 100644
index 0000000..7870295
--- /dev/null
+++ b/dependencies/mingw-w64-webkitgtk/enchant-2.x.patch
@@ -0,0 +1,22 @@
+--- webkitgtk-2.4.9/Source/WebCore/platform/text/enchant/TextCheckerEnchant.cpp.orig 2017-12-06 14:59:40.768262788 -0500
++++ webkitgtk-2.4.9/Source/WebCore/platform/text/enchant/TextCheckerEnchant.cpp 2017-12-06 15:03:10.000000000 -0500
+@@ -128,7 +128,7 @@
+ for (i = 0; i < numberOfSuggestions; i++)
+ guesses.append(String::fromUTF8(suggestions[i]));
+
+- enchant_dict_free_suggestions(*iter, suggestions);
++ enchant_dict_free_string_list(*iter, suggestions);
+ }
+
+ return guesses;
+--- webkitgtk-2.4.11/Source/autotools/FindDependencies.m4.orig 2018-07-04 12:52:47.582565800 +0200
++++ webkitgtk-2.4.11/Source/autotools/FindDependencies.m4 2018-07-04 12:53:18.535026100 +0200
+@@ -154,7 +154,7 @@
+ AC_SUBST(PANGO_LIBS)
+
+ if test "$enable_spellcheck" = "yes"; then
+- PKG_CHECK_MODULES(ENCHANT, enchant >= enchant_required_version, [], [enable_spellcheck="no"])
++ PKG_CHECK_MODULES(ENCHANT, enchant-2 >= enchant_required_version, [], [enable_spellcheck="no"])
+ AC_SUBST(ENCHANT_CFLAGS)
+ AC_SUBST(ENCHANT_LIBS)
+ fi
diff --git a/dependencies/mingw-w64-webkitgtk/webkitgtk-2.4.9-abs.patch b/dependencies/mingw-w64-webkitgtk/webkitgtk-2.4.9-abs.patch
new file mode 100644
index 0000000..9a1c5f9
--- /dev/null
+++ b/dependencies/mingw-w64-webkitgtk/webkitgtk-2.4.9-abs.patch
@@ -0,0 +1,26 @@
+diff -Nur webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/GtkClickCounter.cpp webkitgtk-2.4.9/Source/WebCore/platform/gtk/GtkClickCounter.cpp
+--- webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/GtkClickCounter.cpp 2015-05-20 03:03:24.000000000 -0600
++++ webkitgtk-2.4.9/Source/WebCore/platform/gtk/GtkClickCounter.cpp 2016-02-07 11:30:42.392686308 -0700
+@@ -85,8 +85,8 @@
+ guint32 eventTime = getEventTime(event);
+
+ if ((event->type == GDK_2BUTTON_PRESS || event->type == GDK_3BUTTON_PRESS)
+- || ((abs(buttonEvent->x - m_previousClickPoint.x()) < doubleClickDistance)
+- && (abs(buttonEvent->y - m_previousClickPoint.y()) < doubleClickDistance)
++ || ((fabs(buttonEvent->x - m_previousClickPoint.x()) < doubleClickDistance)
++ && (fabs(buttonEvent->y - m_previousClickPoint.y()) < doubleClickDistance)
+ && (eventTime - m_previousClickTime < static_cast<guint>(doubleClickTime))
+ && (buttonEvent->button == m_previousClickButton)))
+ m_currentClickCount++;
+diff -Nur webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp webkitgtk-2.4.9/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp
+--- webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 2015-05-20 03:03:24.000000000 -0600
++++ webkitgtk-2.4.9/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 2016-02-07 11:49:36.384691005 -0700
+@@ -659,7 +659,7 @@
+ if (!std::isfinite(time))
+ return String::fromUTF8(_("indefinite time"));
+
+- int seconds = static_cast<int>(abs(time));
++ int seconds = static_cast<int>(fabs(time));
+ int days = seconds / (60 * 60 * 24);
+ int hours = seconds / (60 * 60);
+ int minutes = (seconds / 60) % 60;
commit 318ff4ac06cf55bd86c36c8b0b83963869556a77
Author: John Ralls <jralls at ceridwen.us>
Date: Wed May 27 11:31:15 2020 -0700
Add python2 to devtools.
Needed for jhbuild.
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 3c3ffe0..4e9cede 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -235,7 +235,7 @@ bash-command -command "pacman -Syyuu --noconfirm"
# Set up aliases for the parts of msys-devtools and mingw-w64-toolchain that
# we need:
-$devel = "asciidoc autoconf autoconf2.13 autogen automake-wrapper bison diffstat diffutils dos2unix file flex gawk gettext gettext-devel gperf grep groff intltool libtool m4 make man-db pacman pactoys-git patch patchutils perl pkg-config rsync2 sed swig texinfo texinfo-tex wget xmlto git texinfo"
+$devel = "asciidoc autoconf autoconf2.13 autogen automake-wrapper bison diffstat diffutils dos2unix file flex gawk gettext gettext-devel gperf grep groff intltool libtool m4 make man-db pacman pactoys-git patch patchutils perl pkg-config python2 rsync2 sed swig texinfo texinfo-tex wget xmlto git texinfo"
$toolchain = "binutils cmake crt-git gcc gcc-libs gdb headers-git libmangle-git libtool libwinpthread-git make pkg-config tools-git winpthreads-git"
commit 5efdb8b126b9f4207c2972f662d27d5a66841646
Author: John Ralls <jralls at ceridwen.us>
Date: Tue May 26 10:20:49 2020 -0700
Get jhbuild from gitlab.gnome.org
MinGW-w64 dropped the packaged jhbuild, so rewire setup_mingw64 to
clone the gnome repository, patch it to disable DESTDIR, and make
a command file.
Also don't patch FindSWIG.cmake when it's already been patched.
diff --git a/jhbuild.in b/jhbuild.in
new file mode 100644
index 0000000..f93a47d
--- /dev/null
+++ b/jhbuild.in
@@ -0,0 +1,23 @@
+#!/usr/bin/env python2
+# -*- coding: utf-8 -*-
+
+import sys
+import os
+
+if sys.version_info[0] == 2:
+ import __builtin__ as builtins
+else:
+ import builtins
+
+sys.path.insert(0, '@-BASE_DIR-@/src/jhbuild.git')
+pkgdatadir = None
+datadir = None
+import jhbuild
+srcdir = os.path.abspath(os.path.join(os.path.dirname(jhbuild.__file__), '..'))
+
+builtins.__dict__['PKGDATADIR'] = pkgdatadir
+builtins.__dict__['DATADIR'] = datadir
+builtins.__dict__['SRCDIR'] = srcdir
+
+import jhbuild.main
+jhbuild.main.main(sys.argv[1:])
diff --git a/patches/jhbuild.patch b/patches/jhbuild.patch
index 542a896..461c3ed 100644
--- a/patches/jhbuild.patch
+++ b/patches/jhbuild.patch
@@ -1,20 +1,8 @@
---- /usr/lib/python2.7/site-packages/jhbuild/modtypes/cmake.py~ 2017-09-05 16:58:18.206528300 -0700
-+++ /usr/lib/python2.7/site-packages/jhbuild/modtypes/cmake.py 2017-09-05 16:59:24.172738500 -0700
-@@ -159,10 +159,9 @@
- if self.use_ninja:
- self.ensure_ninja_binary()
- extra_env = self.extra_env or {}
-- extra_env['DESTDIR'] = destdir
- buildscript.execute(self.ninja_binary + ' install', cwd=builddir, extra_env=extra_env)
- else:
-- self.make(buildscript, 'install DESTDIR={}'.format(destdir))
-+ self.make(buildscript, 'install')
- self.process_install(buildscript, self.get_revision())
- do_install.depends = [PHASE_BUILD]
-
---- /usr/lib/python2.7/site-packages/jhbuild/modtypes/__init__.py~ 2017-06-01 12:15:14.000000000 -0700
-+++ /usr/lib/python2.7/site-packages/jhbuild/modtypes/__init__.py 2017-09-05 17:44:27.556524900 -0700
-@@ -313,14 +313,16 @@
+diff --git a/jhbuild/modtypes/__init__.py b/jhbuild/modtypes/__init__.py
+index 2919a9f9..8b5f915f 100644
+--- a/jhbuild/modtypes/__init__.py
++++ b/jhbuild/modtypes/__init__.py
+@@ -314,13 +314,15 @@ them into the prefix."""
save_broken_tree = False
broken_name = destdir + '-broken'
destdir_prefix = os.path.join(destdir, stripped_prefix)
@@ -23,7 +11,6 @@
errors = []
+ num_copied = 0
if os.path.isdir(destdir_prefix):
- destdir_install = True
logging.info(_('Moving temporary DESTDIR %r into build prefix') % (destdir, ))
num_copied = self._process_install_files(destdir, destdir_prefix,
buildscript.config.prefix,
@@ -32,7 +19,7 @@
# Now the destdir should have a series of empty directories:
# $JHBUILD_PREFIX/_jhbuild/root-foo/$JHBUILD_PREFIX
-@@ -345,7 +347,8 @@
+@@ -345,7 +347,8 @@ them into the prefix."""
# Even if there are some files outside the DESTDIR, count that as success for now; we just warn
install_succeeded = True
else:
@@ -42,3 +29,19 @@
if save_broken_tree:
if os.path.exists(broken_name):
+diff --git a/jhbuild/modtypes/cmake.py b/jhbuild/modtypes/cmake.py
+index 1bd44e32..4064faaa 100644
+--- a/jhbuild/modtypes/cmake.py
++++ b/jhbuild/modtypes/cmake.py
+@@ -143,9 +143,9 @@ class CMakeModule(MakeModule, NinjaModule, DownloadableModule):
+ buildscript.set_action(_('Installing'), self)
+ destdir = self.prepare_installroot(buildscript)
+ if self.use_ninja:
+- self.ninja(buildscript, 'install', env={'DESTDIR': destdir})
++ self.ninja(buildscript, 'install')
+ else:
+- self.make(buildscript, 'install DESTDIR={}'.format(destdir))
++ self.make(buildscript, 'install')
+ self.process_install(buildscript, self.get_revision())
+ do_install.depends = [PHASE_BUILD]
+
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 585e5fe..3c3ffe0 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -235,7 +235,7 @@ bash-command -command "pacman -Syyuu --noconfirm"
# Set up aliases for the parts of msys-devtools and mingw-w64-toolchain that
# we need:
-$devel = "asciidoc autoconf autoconf2.13 autogen automake-wrapper automake1.10 automake1.11 automake1.12 automake1.13 automake1.14 automake1.15 automake1.6 automake1.7 automake1.8 automake1.9 bison diffstat diffutils dos2unix file flex gawk gettext gettext-devel gperf grep groff intltool libtool m4 make man-db pacman pactoys-git patch patchutils perl pkg-config rsync2 sed swig texinfo texinfo-tex wget xmlto git jhbuild-git texinfo"
+$devel = "asciidoc autoconf autoconf2.13 autogen automake-wrapper bison diffstat diffutils dos2unix file flex gawk gettext gettext-devel gperf grep groff intltool libtool m4 make man-db pacman pactoys-git patch patchutils perl pkg-config rsync2 sed swig texinfo texinfo-tex wget xmlto git texinfo"
$toolchain = "binutils cmake crt-git gcc gcc-libs gdb headers-git libmangle-git libtool libwinpthread-git make pkg-config tools-git winpthreads-git"
@@ -314,8 +314,7 @@ Clone the gnucash-on-windows repository into the target source directory, patch
if (!(test-path -path "$target_dir\\src")) {
New-Item $target_dir\\src -type directory
-}
-if (!(test-path -path "$target_dir\\src\\gnucash-on-windows.git")) {
+}if (!(test-path -path "$target_dir\\src\\gnucash-on-windows.git")) {
bash-command -command "git clone https://github.com/gnucash/gnucash-on-windows.git $target_unix/src/gnucash-on-windows.git"
}
if (!(test-path -path "$target_dir\\src\\gnucash-on-windows.git")) {
@@ -323,8 +322,23 @@ if (!(test-path -path "$target_dir\\src\\gnucash-on-windows.git")) {
exit
}
-bash-command -command "/usr/bin/patch -f -d/ -p0 -i $target_unix/src/gnucash-on-windows.git/patches/jhbuild.patch"
-bash-command -command "/usr/bin/patch -f -d `$(dirname `$(/usr/bin/find /$arch/share/cmake* -name FindSWIG.cmake) ) -p1 -i $target_unix/src/gnucash-on-windows.git/patches/FindSWIG.patch"
+if (!(test-path -path "$target_dir\\src\\jhbuild.git")) {
+ bash-command -command "git clone https://gitlab.gnome.org/GNOME/jhbuild $target_unix/src/jhbuild.git"
+ bash-command -command "/usr/bin/patch -f -d $target_unix/src/jhbuild.git -p1 -i $target_unix/src/gnucash-on-windows.git/patches/jhbuild.patch"
+}
+if (!(test-path -path "$target_dir\\src\\jhbuild.git")) {
+ write-host "Failed to clone the jhbuild repo, exiting."
+ exit
+}
+if (!(test-path -path "$target_dir\\msys2\\usr\\bin\\jhbuild")) {
+ $jhbuild = get-content "$target_dir\\src\\gnucash-on-windows.git\\jhbuild.in" |
+ %{$_ -replace "@-BASE_DIR-@", "$target_unix"}
+ [IO.File]::WriteAllLines("$target_dir\\msys2\\usr\\bin\\jhbuild", $jhbuild)
+}
+
+if (!(get-childitem -path $target_dir\\msys2\\mingw32\\share -recurse -include FindSWIG.cmake.orig -name)) {
+ bash-command -command "/usr/bin/patch -b -f -d `$(dirname `$(/usr/bin/find /$arch/share/cmake* -name FindSWIG.cmake) ) -p1 -i $target_unix/src/gnucash-on-windows.git/patches/FindSWIG.patch"
+}
$jhbuildrc = get-content "$target_dir\\src\\gnucash-on-windows.git\\jhbuildrc.in" |
%{$_ -replace "@-BASE_DIR-@", "$target_unix"} |
commit 2785a680b3a67a5b078e47dbdec89a41b54c8394
Author: John Ralls <jralls at ceridwen.us>
Date: Mon May 25 16:51:35 2020 -0700
Move the Windows README files from the GnuCash source tree to this repo.
Because they're used only by inno setup.
diff --git a/inno_setup/README-ca.win32-bin.txt b/inno_setup/README-ca.win32-bin.txt
new file mode 100644
index 0000000..cba6907
--- /dev/null
+++ b/inno_setup/README-ca.win32-bin.txt
@@ -0,0 +1,50 @@
+GnuCash és un programa de comptabilitat lliure, de codi obert publicat sota la
+Llicència Pública General GNU (GPL) i disponible per a GNU / Linux, *BSD,
+Solaris, Mac OSX i Microsoft Windows.
+
+Dissenyat per ser fà cil d'usar, però potent i flexible, GnuCash permet
+realitzar un seguiment dels comptes bancaris, les existències, els ingressos i les despeses. Tan rà pid i
+intuïtiu d'utilitzar com una llista de verificació, es basa en
+principis comptables professionals per assegurar balanços de comptes i informes precisos.
+
+-------------------
+
+Opcions d'assistència disponibles:
+
+Preguntes freqüents en lÃnia: https://wiki.gnucash.org/wiki/FAQ
+Llistes de correu: https://wiki.gnucash.org/wiki/Mailing_Lists
+IRC (Xat): canal #gnucash al servidor irc.gnome.org, vegeu també https://wiki.gnucash.org/wiki/IRC
+
+Si trobeu errors o problemes, no dubteu a informar-los
+a la nostra eina de seguiment d'errors "Bugzilla":
+https://bugs.gnucash.org/enter_bug.cgi?product=GnuCash
+
+-------------------
+
+CaracterÃstiques principals:
+
+ * Comptabilitat de doble entrada
+ * Comptes d'accions / bons / fons d'inversió
+ * Importació de fitxers QIF / OFX
+ * OFX / HBCI Banca en lÃnia
+ * Informes, grà fics
+ * Comptabilitat de petites empreses
+ * Clients, venedors, treballs, factures, comptes de deutes i cobraments
+ * Transaccions programades
+ * CÃ lculs financers
+
+Podeu trobar més informació i un tutorial sobre com començar
+al menú "Ajuda" quan feu clic a "Guia de conceptes i tutorials".
+
+-------------------
+
+Sobre el programa:
+
+GnuCash és un programa de comptabilitat lliure, de codi obert publicat
+sota la Llicència pública general GNU (GPL). Està desenvolupat de
+manera col·laborativa per 200+ persones.
+
+La programació de GnuCash va començar el 1997, i la seva primera versió
+va ser l'any 1998.
+
+-------------------
diff --git a/inno_setup/README-de.win32-bin.txt b/inno_setup/README-de.win32-bin.txt
new file mode 100644
index 0000000..c20f893
--- /dev/null
+++ b/inno_setup/README-de.win32-bin.txt
@@ -0,0 +1,54 @@
+GnuCash ist eine freie OpenSource-Finanzverwaltung, kostenlos
+erhältlich unter der GNU GPL Lizenz für GNU/Linux, Unix, BSD,
+Solaris, Mac OSX und Microsoft Windows.
+
+Das Programm ist eine Komplettlösung zur Verwaltung der Finanzen von
+Privatanwendern und Kleinbetrieben. Das aus dem Rechnungswesen
+bekannte Prinzip der doppelten Buchführung wird in GnuCash konsequent
+umgesetzt, so dass GnuCash höchste Ansprüche an die Kontenführung
+erfüllen kann. Auch Onlinebanking über HBCI wird unterstützt.
+
+-------------------
+
+Verfügbarer Support
+
+Englische FAQ-Seite: https://wiki.gnucash.org/wiki/FAQ
+Deutsche Mailingliste: https://lists.gnucash.org/mailman/listinfo/gnucash-de
+IRC (Online-Chat): Channel #gnucash auf Server irc.gnome.org, auch
+beschrieben auf https://wiki.gnucash.org/wiki/IRC
+
+Sollten Probleme auftreten, bitten die Entwickler darum, diese als
+englischsprachigen Fehlerbericht in »Bugzilla« einzutragen:
+https://bugs.gnucash.org/enter_bug.cgi?product=GnuCash
+
+-------------------
+
+Feature-Ãœbersicht:
+
+ * Doppelte Buchführung
+ * Aktienkonten, Währungskonten
+ * HBCI Online-Banking
+ * QIF/OFX/MT940 Importieren
+ * Berichte, Diagramme
+ * Buchführung für Kleinbetriebe
+ * Verwaltung von Kunden, Lieferanten, Aufträgen, Rechnungen
+ * Terminierte Buchungen
+ * Finanzrechner
+
+Weitere Informationen und eine (bisher nur englischsprachige)
+Einführung sind im Menü »Hilfe« zu finden unter dem Menüpunkt »GnuCash
+Kurs und Konzepte«.
+
+-------------------
+
+Ãœber GnuCash:
+
+GnuCash ist eine freie OpenSource-Finanzverwaltung, kostenlos
+erhältlich unter der GNU GPL Lizenz. Das Programm wird von 200+
+Programmierern aus mehr als 6 Ländern gemeinsam weiterentwickelt.
+
+Die Anfänge von GnuCash reichen ins Jahr 1997 zurück. Die erste
+Veröffentlichung war im Jahr 1998.
+
+-------------------
+
diff --git a/inno_setup/README-fr.win32-bin.txt b/inno_setup/README-fr.win32-bin.txt
new file mode 100644
index 0000000..e78cdc5
--- /dev/null
+++ b/inno_setup/README-fr.win32-bin.txt
@@ -0,0 +1,55 @@
+GnuCash est un logiciel de comptabilité gratuit et de source
+libre, émis sous licence GNU Public Licence (GPL) et disponible
+sous GNU/Linux, *BSD, Solaris, Mac OSX et Microsoft Windows.
+
+Conçu pour une utilisation aisée, tout en étant puissant et flexible,
+GnuCash permet le suivi des comptes bancaires, des titres, des
+revenus et des dépenses. D'utilisation aussi rapide et intuitive
+qu'un registre de chèques, il est basé sur des principes comptables
+professionnels afin d'assurer des comptes en balance et des rapports
+précis.
+
+-------------------
+
+Sources disponibles d'assistance :
+
+FAQ en ligne: https://wiki.gnucash.org/wiki/FAQ
+Listes de diffusions: https://wiki.gnucash.org/wiki/Mailing_Lists
+IRC (Chat): Canal #gnucash sur le serveur irc.gnome.org,
+Aussi à consulter: https://wiki.gnucash.org/wiki/IRC
+
+N'hésitez pas à rapporter toute erreur ou tout problème rencontré
+sur notre outil de suivi des bogues "Bugzilla":
+https://bugs.gnucash.org/enter_bug.cgi?product=GnuCash
+
+-------------------
+
+Survol des fonctionnalités::
+
+ * Comptabilité à partie double
+ * Comptes de titres en Actions/Obligations/Fonds d'investissement
+ * Importation de fichiers QIF/OFX
+ * Transactions bancaires en ligne OFX/HBCI
+ * Rapports et graphiques
+ * Comptabilité des petites entreprises
+ * Listes des clients, fournisseurs et prestations
+ * Facturation, Comptes clients et comptes fournisseurs
+ * Transactions récurrentes
+ * Calculs financiers
+
+Vous trouverez des informations additionnelles et un tutoriel sur la
+mise en route (en anglais, pour l'instant) en cliquant sur "Tutoriel
+et guide des concepts" dans le menu d'aide.
+
+-------------------
+
+À propos du logiciel:
+
+GnuCash est un logiciel de comptabilité gratuit et de source
+libre, émis sous licence GNU Public Licence (GPL). Il est développé
+en collaboration par plus de 200 personnes.
+
+La programmation de GnuCash a commencé en 1997, sa première version
+a été lancée en 1998.
+
+-------------------
diff --git a/inno_setup/README-hr.win32-bin.txt b/inno_setup/README-hr.win32-bin.txt
new file mode 100644
index 0000000..cd135be
--- /dev/null
+++ b/inno_setup/README-hr.win32-bin.txt
@@ -0,0 +1,51 @@
+GnuCash je slobodan softver za raÄunovodstvo otvorenog koda, izdan pod
+GNU općom javnom licencom (GPL). Dostupan za sustave GNU/Linux, *BSD,
+Solaris, Mac OSX i Microsoft Windows.
+
+Osmišljen da bude jednostavan u upotrebi, istovremeno moćan i prilagodljiv,
+GnuCash ti omogućava praćenje bankovnih raÄuna, dionica, prihoda i rashoda.
+GnuCash se zasniva na profesionalnim raÄunovodstvenim naÄelima kao Å¡to je
+dvojno knjigovodstvo, te osigurava bilancirane knjige i toÄne izvjeÅ¡taje.
+
+-------------------
+
+Dostupna pomoć
+
+Mrežne FAQ stranice: https://wiki.gnucash.org/wiki/FAQ
+PretplatniÄke liste: https://wiki.gnucash.org/wiki/Mailing_Lists
+IRC (Chat): Kanal #gnucash na serveru irc.gnome.org, vidi također
+https://wiki.gnucash.org/wiki/IRC
+
+Ako primijetiš greške ili naiđeš na probleme, slobodno ih prijavi na našu
+„Bugzillaâ€-stranicu za praćenje greÅ¡aka:
+http://bugs.gnucash.org/enter_bug.cgi?product=GnuCash
+
+-------------------
+
+Istaknute karakteristike:
+
+ * dvojno knjigovodstvo
+ * konti dionica, obveznica i uzajamnih fondova
+ * QIF/OFX uvoz
+ * OFX/HBCI internet bankarstvo
+ * izvještaji, dijagrami
+ * raÄunovodstvo za mala poduzeća
+ * kupci, dobavljaÄi, poslovi, IRA/URA raÄuni, konti dugovanja i potraživanja
+ * terminirane transakcije
+ * financijske kalkulacije
+
+Detaljne informacije i upute za rad s GnuCashom možeš naći u izborniku
+„Pomoć → Upute i koncepti za GnuCashâ€.
+
+-------------------
+
+O programu:
+
+GnuCash je slobodan softver za raÄunovodstvo otvorenog koda, izdan pod
+GNU općom javnom licencom (GPL). Razvijen je zajedniÄkim radom
+dvanaestero ljudi iz više od šest zemalja.
+
+PoÄetak programiranja GnuCasha, 1997. Prvo izdanje, 1998.
+
+-------------------
+
diff --git a/inno_setup/README-it.win32-bin.txt b/inno_setup/README-it.win32-bin.txt
new file mode 100644
index 0000000..7751413
--- /dev/null
+++ b/inno_setup/README-it.win32-bin.txt
@@ -0,0 +1,50 @@
+GnuCash è un programma di contabilità  libero e a codice aperto rilasciato con
+licenza GNU Public Licence (GPL) e disponibile per i sistemi GNU/Linux, *BSD,
+Solaris, Mac OSX e Microsoft Windows.
+
+Progettato per essere di facile utilizzo, ma allo stesso tempo potente e flessibile,
+GnuCash permette di tenere traccia dei propri conti bancari, delle azioni, dei costi e dei ricavi.
+Veloce e intuitivo come il registro degli assegni, GnuCash si basa su concetti fondamentali della
+contabilità  assicurando il bilancio dei conti e l'accurattezza dei resoconti.
+
+-------------------
+
+Disponibilità  di supporto
+
+FAQ online (in inglese): https://wiki.gnucash.org/wiki/FAQ
+Mailing List: https://wiki.gnucash.org/wiki/Mailing_Lists
+IRC (Chat): canale #gnucash sul server irc.gnome.org; vedere anche https://wiki.gnucash.org/wiki/IRC
+
+Se si riscontrassero dei problemi o dei bug utilizzando il programma, è possibile comunicarli nel sistema
+di tracciamento dei bug di GnuCash denominato "Bugzilla":
+https://bugs.gnucash.org/enter_bug.cgi?product=GnuCash
+
+-------------------
+
+Caratteristiche principali:
+
+ * Contabilità a partita doppia
+ * Conti per azioni, obbligazioni(bond) e fondi comuni
+ * Importazione di file QIF/OFX
+ * OFX/HBCI Online Banking
+ * Resoconti e grafici
+ * Contabilità  di piccole imprese
+ * Clienti, venditori, lavori, fatture, conti per debiti e crediti correnti
+ * Transazioni pianificate
+ * Calcolatrice finanziaria
+
+Maggiori informazioni e una guida su come iniziare a utilizzare il programma, sono
+raggiungibili tramite il menu "Aiuto" selezionando la voce "Guida ai concetti e manuale".
+
+-------------------
+
+Informazioni sul programma:
+
+GnuCash è un programma di contabilità  libero e a codice aperto rilasciato con
+licenza GNU Public Licence (GPL). E' sviluppato con la collaborazione di
+200+ programmatori.
+
+La programmazione di GnuCash è iniziata nel 1997 e il primo rilascio risale al 1998.
+
+-------------------
+
diff --git a/inno_setup/README-lv.win32-bin.txt b/inno_setup/README-lv.win32-bin.txt
new file mode 100644
index 0000000..9029be0
--- /dev/null
+++ b/inno_setup/README-lv.win32-bin.txt
@@ -0,0 +1,51 @@
+GnuCash ir bezmaksas grÄmatvedÄ«bas programma, ko izplata saskaÅ†Ä ar
+GNU General Public License (GPL) licenci. To var izmantot uz GNU/Linux,
+*BSD, Solaris, Mac OSX un Microsoft Windows datoriem.
+
+GnuCash ir veidots tÄ, lai to bÅ«tu vienkÄrÅ¡i lietot, tajÄ pat laikÄ tas
+ir pietiekami jaudīgs un ļauj uzskaitīt skaidru naudu, banku kontus,
+akcijas, ieņēmumus un izdevumus.
+TajÄ var Ätri un Ä“rti reÄ£istrÄ“t darÄ«jumu, un tÄ ir balstÄ«ta uz
+profesionÄlÄs grÄmatvedÄ«bas principiem, nodroÅ¡inot bilanci un
+precÄ«zus pÄrskatus.
+
+-------------------
+
+TehniskÄ palÄ«dzÄ«ba
+
+Tiešsaistes palīdzība: https://wiki.gnucash.org/wiki/FAQ
+VÄ“stkopas: https://wiki.gnucash.org/wiki/Mailing_Lists
+IRC (sazņa): #gnucash on server irc.gnome.org, skatīt arī https://wiki.gnucash.org/wiki/IRC
+
+Ja atklÄjat kļūdas vai problÄ“mas, nekautrÄ“jieties tÄs reÄ£istrÄ“t "Bugzilla" kļūdu apstrÄdes
+sistÄ“mÄ https://bugs.gnucash.org/enter_bug.cgi?product=GnuCash
+
+-------------------
+
+GalvenÄs iespÄ“jas:
+
+ * DivkÄrÅ¡Ä ieraksta grÄmatvedÄ«ba
+ * Akciju/VÄ“rtspapÄ«ru/KapitÄla daļu konti
+ * QIF/OFX datu imports
+ * OFX/HBCI tiešsaistes banka
+ * PÄrskati, grafiki
+ * Mazo uzņēmumu biznesa atbalsts
+ * Klienti, PiegÄdÄtÄji, Darbi, Saņemtie un izsniegtie rÄ“Ä·ini
+ * IeplÄnoti grÄmatojumi
+ * Finanšu aprēķini
+
+VairÄk informÄcijas un sÄkotnÄ“jÄ apmÄcÄ«ba pieejama aktivizÄ“jot izvÄ“lni
+"PalÄ«dzÄ«ba" un "PamÄcÄ«ba un jÄ“dzienu ceļvedis".
+
+-------------------
+
+Par Å¡o programmu:
+
+GnuCash ir bezmaksas grÄmatvedÄ«bas programma, ko izplata saskaÅ†Ä ar
+GNU General Public License (GPL) licenci. TÄs galvenie izstrÄdÄtÄji ir
+200+ cilvēki.
+
+GnuCash izstrÄde sÄkÄs 1997. gadÄ un tÄs pirmais laidiens bija 1998. gadÄ.
+
+-------------------
+
diff --git a/inno_setup/README-nl.win32-bin.txt b/inno_setup/README-nl.win32-bin.txt
new file mode 100644
index 0000000..bb2f3b0
--- /dev/null
+++ b/inno_setup/README-nl.win32-bin.txt
@@ -0,0 +1,50 @@
+GnuCash is een vrij, open source boekhoudprogramma, uitgegeven
+onder de GNU General Public License (GPL) en is beschikbaar voor
+GNU/Linux, *BSD, Solaris, Mac OSX, en Microsoft Windows.
+
+Het is een eenvoudig te gebruiken, en tegelijkertijd krachtig en flexibel
+programma dat je helpt om je bankrekeningen, aandelen, inkomsten en uitgaven
+te beheren. Zo vlot en intuïtief te gebruiken als een dagboek enerzijds, en
+anderzijds gebaseerd op professionele boekhoudkundige principes om boeken in
+balans en nauwkeurige rapporten te verzekeren.
+
+-------------------
+
+Beschikbare bronnen voor ondersteuning
+
+Online veel gestelde vragen (FAQ): https://wiki.gnucash.org/wiki/FAQ
+Mailing Lijsten: https://wiki.gnucash.org/wiki/Mailing_Lists
+IRC (Chat): Channel #gnucash on server irc.gnome.org, see also https://wiki.gnucash.org/wiki/IRC
+
+Als je programmafouten (bugs) of problemen ervaart, aarzel niet om deze te melden in ons
+bug opvolgsysteem "Bugzilla":
+https://bugs.gnucash.org/enter_bug.cgi?product=GnuCash
+
+-------------------
+
+Interessante functies:
+
+ * Dubbel boekhouden
+ * Aandelen-/belegginsrekeningen
+ * QIF/OFX/HBCI import met dubbele transactie herkenning
+ * Rapporten, grafieken
+ * Klein-ondernemingsboekhouding
+ * Klanten, verkopers, opdrachten, Facturen, Lopende rekening
+ * Periodieke Transacties
+ * Financiële berekeningen
+
+Meer informatie en een handleiding om je op weg te helpen vind je
+in het "Hulp" menu onder het "Tutorial en concepten gids".
+
+-------------------
+
+Over het programma:
+
+GnuCash is a vrij, open source boekhoudprogramma uitgegeven onder de
+GNU General Public License (GPL). Meer dan 200 programmeurs en 40
+documentie schrijvers hebben gedurende 20+ jaar bijgedragen aan de ontwikkeling
+ervan. Voor meer info, zie de AUTHORS en DOCUMENTORS bestanden.
+
+De ontwikkeling van GnuCash begon in 1997, de de eerste uitgave was in 1998.
+
+-------------------
diff --git a/inno_setup/README-zh_CN.win32-bin.txt b/inno_setup/README-zh_CN.win32-bin.txt
new file mode 100644
index 0000000..ca311c3
--- /dev/null
+++ b/inno_setup/README-zh_CN.win32-bin.txt
@@ -0,0 +1,39 @@
+GnuCash 是一个å…费的ã€å¼€æ”¾æºä»£ç çš„ç†è´¢è½¯ä»¶ï¼Œå®ƒä½¿ç”¨ GNU 通用公共许å¯è¯(GPL)，å¯è¿è¡ŒäºŽ GNU/Linuxã€*BSDã€Solarisã€Mac OSX以åŠå¾®è½¯ Windows。
+
+致力于易于使用，但功能强大而且çµæ´»ã€‚GnuCash å…许您跟踪银行账户ã€è‚¡ç¥¨ã€æ”¶å…¥å’Œæ”¯å‡ºã€‚å°±åƒè´¦ç°¿ä¸€æ ·å¿«æ·è€Œä¸”直观，它是基于专业的会计ç†å¿µæ¥ç¡®ä¿å¹³è¡¡çš„账簿和准确的报告。
+
+-------------------
+
+您å¯ä»¥èŽ·å¾—支æŒçš„途径
+
+在线常è§é—®é¢˜è§£ç”: https://wiki.gnucash.org/wiki/FAQ
+邮件列表: https://wiki.gnucash.org/wiki/Mailing_Lists
+IRC (èŠå¤©): irc.gnome.org æœåŠ¡å™¨çš„ #gnucash 频é“，å¦è§ https://wiki.gnucash.org/wiki/IRC
+
+如果您é‡åˆ°äº†ä»»ä½• bug 或者问题，请ä¸è¦çŠ¹è±«ï¼Œå°†å®ƒä»¬æŠ¥å‘Šåˆ°æˆ‘们的 bug 跟踪工具“Bugzillaâ€ï¼šhttps://bugs.gnucash.org/enter_bug.cgi?product=GnuCash
+
+-------------------
+
+功能亮点：
+
+ * å¤å¼è®°è´¦ä¼šè®¡
+ * 股票/债券/基金科目
+ * QIF/OFX 导入
+ * OFX/HBCI 网上银行
+ * 报告ã€å›¾è¡¨
+ * å°åž‹ä¼ä¸šè´¢ä¼š
+ * 客户ã€åŽ‚商ã€ä»»åŠ¡ã€å‘票ã€åº”付账款åŠåº”收账款
+ * 计划的交易
+ * 金èžè®¡ç®—工具
+
+当点击“教程和ç†å¿µæŒ‡å—â€æ—¶ï¼Œå¯ä»¥åœ¨â€œå¸®åŠ©â€èœå•ä¸æ‰¾åˆ°æ›´å¤šçš„ä¿¡æ¯ä»¥åŠå¦‚何开始的教程。
+
+-------------------
+
+关于程åºï¼š
+
+GnuCash 是一个å…费的ã€å¼€æ”¾æºä»£ç çš„ç†è´¢è½¯ä»¶ï¼Œå®ƒä½¿ç”¨ GNU 通用公共许å¯è¯(GPL)。它是由横跨6个国家共200+个开å‘人员共åŒåˆä½œå¼€å‘而æˆã€‚
+
+程åºæ’°å†™å¼€å§‹äºŽ1997年，并且于1998年第一次å‘布。
+
+-------------------
diff --git a/inno_setup/README-zh_TW.win32-bin.txt b/inno_setup/README-zh_TW.win32-bin.txt
new file mode 100644
index 0000000..1e44f30
--- /dev/null
+++ b/inno_setup/README-zh_TW.win32-bin.txt
@@ -0,0 +1,41 @@
+GnuCash 是一個自由ã€é–‹æ”¾åŽŸå§‹ç¢¼çš„帳務軟體，它使用 GNU 通用公共許å¯è‰(GPL)ï¼Œæ”¯æ´ GNU/Linux, *BSD, Solaris, Mac OSX åŠå¾®è»Ÿ Windows。
+
+GnuCash ä¸åƒ…è¨è¨ˆæˆæ˜“於使用，而且功能強大åˆæœ‰å½ˆæ€§ã€‚它å¯ä»¥è¿½è¹¤éŠ€è¡Œå¸³æˆ¶ã€è‚¡ç¥¨ã€æ”¶å…¥èˆ‡æ”¯å‡ºï¼Œå°±åƒç”¨å¸³ç°¿ä¸€æ¨£å¿«æ·ã€ç›´è¦ºã€‚基於專æ¥çš„會計原則確ä¿å¸³ç›®å¹³è¡¡ä¸¦æä¾›æº–ç¢ºçš„å ±è¡¨ã€‚
+
+-------------------
+
+å¯ç²å¾—支æ´çš„管é“
+
+常見å•é¡Œè§£ç”: https://wiki.gnucash.org/wiki/FAQ
+通信論壇: https://wiki.gnucash.org/wiki/Mailing_Lists
+IRC (èŠå¤©): irc.gnome.org 伺æœå™¨çš„ #gnucash é »é“，見 https://wiki.gnucash.org/wiki/IRC
+
+如果您é‡åˆ°äº†ä»»ä½• bug 或å•é¡Œï¼Œè«‹ä¸è¦é²ç–‘，將å•é¡Œå ±å‘Šåˆ°æˆ‘們的 bug 追蹤系統 "Bugzilla": (請用英文)
+https://bugs.gnucash.org/enter_bug.cgi?product=GnuCash
+
+-------------------
+
+功能特點:
+
+ * 複å¼ç°¿è¨˜
+ * 股票/債券/基金帳號
+ * 匯入 QIF/OFX
+ * OFX/HBCI 網路銀行
+ * å„å¼å ±å‘Šã€åœ–表
+ * å°ä¼æ¥è²¡å‹™ç®¡ç†
+ * 客戶ã€å» 商ã€å·¥ä½œã€æ”¶æ“šã€æ‡‰ä»˜å¸³æ¬¾ã€æ‡‰æ”¶å¸³æ¬¾
+ * 交易排程
+ * 金èžè¨ˆç®—工具
+
+更多資訊åŠå…¥é–€æ•™å¸å¯ä»¥åœ¨åŠŸèƒ½è¡¨ "說明" 裡的 "æ•™å¸èˆ‡è§€å¿µæŒ‡å—" 找到。
+
+-------------------
+
+關於程å¼:
+
+GnuCash 是一個自由ã€é–‹æ”¾åŽŸå§‹ç¢¼çš„帳務軟體，它使用 GNU 通用公共許å¯è‰(GPL)發布。它是由橫跨 6 國共 200+ 個開發人員共åŒåˆä½œé–‹ç™¼è€Œæˆã€‚
+
+GnuCash 的程å¼æ’°å¯«å§‹æ–¼ 1997 年，第一版發布於 1998 年。
+
+-------------------
+
diff --git a/inno_setup/README.win32-bin.txt b/inno_setup/README.win32-bin.txt
new file mode 100644
index 0000000..518557a
--- /dev/null
+++ b/inno_setup/README.win32-bin.txt
@@ -0,0 +1,51 @@
+GnuCash is a free, open source accounting program released under the
+GNU General Public License (GPL) and available for GNU/Linux, *BSD,
+Solaris, Mac OSX, and Microsoft Windows.
+
+Designed to be easy to use, yet powerful and flexible, GnuCash allows
+you to track bank accounts, stocks, income and expenses. As quick and
+intuitive to use as a checkbook register, it is based on professional
+accounting principles to ensure balanced books and accurate reports.
+
+-------------------
+
+Available Support Options
+
+Online FAQ: https://wiki.gnucash.org/wiki/FAQ
+Mailing Lists: https://wiki.gnucash.org/wiki/Mailing_Lists
+IRC (Chat): Channel #gnucash on server irc.gnome.org, see also https://wiki.gnucash.org/wiki/IRC
+
+If you encounter any bugs or problems, do not hesitate to report them
+into our bug tracking tool "Bugzilla":
+https://bugs.gnucash.org/enter_bug.cgi?product=GnuCash
+
+-------------------
+
+Feature Highlights:
+
+ * Double-Entry Accounting
+ * Stock/Bond/Mutual Fund Accounts
+ * QIF/OFX Import
+ * OFX/HBCI Online Banking
+ * Reports, Graphs
+ * Small-Business Accounting
+ * Customers, Vendors, Jobs, Invoices, Accounts/Payables and /Receivables
+ * Scheduled Transactions
+ * Financial Calculations
+
+More information and a Tutorial on how to get started can be found in
+the "Help" menu when clicking on "Tutorial and Concepts Guide".
+
+-------------------
+
+About the Program:
+
+GnuCash is a free, open source accounting program released under the
+GNU General Public License (GPL). More than 200 programmers and 40
+documentors have contributed to its development over 20+ years, please
+see the AUTHORS and DOCUMENTORS files.
+
+Programming on GnuCash began in 1997, and its first release was in
+1998.
+
+-------------------
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 4b69bd6..87d3e51 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -23,7 +23,7 @@ PrivilegesRequired=poweruser
OutputDir=.
OutputBaseFilename=@PACKAGE at -@PACKAGE_VERSION at .setup
UninstallFilesDir={app}\uninstall\@PACKAGE@
-InfoAfterFile=@INST_DIR@\share\doc\@PACKAGE@\README.win32-bin.txt
+InfoAfterFile=@GC_WIN_REPOS_DIR@\inno_setup\README.win32-bin.txt
SetupIconFile=@INST_DIR@\share\@PACKAGE@\pixmaps\gnucash-icon.ico
WizardSmallImageFile=@INST_DIR@\share\@PACKAGE@\pixmaps\gnucash-icon-48x48.bmp
@@ -94,13 +94,13 @@ Source: "@INST_DIR@\share\@PACKAGE@\accounts\*"; DestDir: "{app}\share\@PACKAGE@
; And all the @PACKAGE@ documentation
Source: "@INST_DIR@\share\doc\@PACKAGE@\README"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@INST_DIR@\share\doc\@PACKAGE@\README.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@INST_DIR@\share\doc\@PACKAGE@\README-ca.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@INST_DIR@\share\doc\@PACKAGE@\README-de.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@INST_DIR@\share\doc\@PACKAGE@\README-fr.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@INST_DIR@\share\doc\@PACKAGE@\README-it.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@INST_DIR@\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@INST_DIR@\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@GC_WIN_REPOS_DIR@\inno_setup\README.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@GC_WIN_REPOS_DIR@\inno_setup\README-ca.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@GC_WIN_REPOS_DIR@\inno_setup\README-de.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@GC_WIN_REPOS_DIR@\inno_setup\README-fr.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@GC_WIN_REPOS_DIR@\inno_setup\README-it.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@GC_WIN_REPOS_DIR@\inno_setup\README-zh_CN.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@GC_WIN_REPOS_DIR@\inno_setup\README-zh_TW.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
Source: "@INST_DIR@\share\doc\@PACKAGE@\LICENSE"; DestDir: "{app}\doc\@PACKAGE@"; Flags: ignoreversion; Components: main
Source: "@INST_DIR@\share\doc\@PACKAGE@\AUTHORS"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
Source: "@INST_DIR@\share\doc\@PACKAGE@\ChangeLog"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
@@ -487,18 +487,18 @@ end;
[Languages]
Name: "en"; MessagesFile: "compiler:Default.isl"
-Name: "ca"; MessagesFile: "compiler:Languages\Catalan.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-ca.win32-bin.txt"
-Name: "de"; MessagesFile: "compiler:Languages\German.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-de.win32-bin.txt"
+Name: "ca"; MessagesFile: "compiler:Languages\Catalan.isl"; InfoAfterFile: "@GC_WIN_REPOS_DIR@\inno_setup\README-ca.win32-bin.txt"
+Name: "de"; MessagesFile: "compiler:Languages\German.isl"; InfoAfterFile: "@GC_WIN_REPOS_DIR@\inno_setup\README-de.win32-bin.txt"
Name: "el"; MessagesFile: "compiler:Languages\Greek.isl"
-Name: "fr"; MessagesFile: "compiler:Languages\French.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-fr.win32-bin.txt"
-Name: "hr"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Croatian-5.5.3.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-hr.win32-bin.txt"
-Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-it.win32-bin.txt"
+Name: "fr"; MessagesFile: "compiler:Languages\French.isl"; InfoAfterFile: "@GC_WIN_REPOS_DIR@\inno_setup\README-fr.win32-bin.txt"
+Name: "hr"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Croatian-5.5.3.isl"; InfoAfterFile: "@GC_WIN_REPOS_DIR@\inno_setup\README-hr.win32-bin.txt"
+Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"; InfoAfterFile: "@GC_WIN_REPOS_DIR@\inno_setup\README-it.win32-bin.txt"
Name: "ja"; MessagesFile: "compiler:Languages\Japanese.isl"
-Name: "lv"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Latvian-5.5.0.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-lv.win32-bin.txt"
-Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-nl.win32-bin.txt"
+Name: "lv"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Latvian-5.5.0.isl"; InfoAfterFile: "@GC_WIN_REPOS_DIR@\inno_setup\README-lv.win32-bin.txt"
+Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"; InfoAfterFile: "@GC_WIN_REPOS_DIR@\inno_setup\README-nl.win32-bin.txt"
Name: "pt_BR"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
-Name: "zh_CN"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\ChineseSimplified-5.5.3.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"
-Name: "zh_TW"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\ChineseTraditional-5.5.3.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"
+Name: "zh_CN"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\ChineseSimplified-5.5.3.isl"; InfoAfterFile: "@GC_WIN_REPOS_DIR@\inno_setup\README-zh_CN.win32-bin.txt"
+Name: "zh_TW"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\ChineseTraditional-5.5.3.isl"; InfoAfterFile: "@GC_WIN_REPOS_DIR@\inno_setup\README-zh_TW.win32-bin.txt"
;; See http://www.jrsoftware.org/files/istrans/ for a complete list of
;; Inno Setup translations. Unofficial translations must be downloaded
commit e49fa4719fd1c386c745ccd15f693207aa124ba8
Author: John Ralls <jralls at ceridwen.us>
Date: Sat May 23 14:14:40 2020 -0700
Fix building bdw-gc on gcc-10.1.
See https://gcc.cnu.org/gcc-10/porting_to.html, "Default to
-fno-common." for an explanation.
diff --git a/jhbuildrc.in b/jhbuildrc.in
index 4a514e3..cc3ae74 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -86,5 +86,11 @@ module_extra_env["gnucash"]={'GUILE_LOAD_PATH':os.path.join(prefix, 'share', 'gu
module_extra_env["gnucash-unstable"]={'GUILE_LOAD_PATH':os.path.join(prefix, 'share', 'guile', '2.2'), 'GUILE_LOAD_COMPILED_PATH':os.path.join(prefix, 'lib', 'guile', '2.2', 'ccache')}
module_extra_env["gnucash-git"]={'GUILE_LOAD_PATH':os.path.join(prefix, 'share', 'guile', '2.2'), 'GUILE_LOAD_COMPILED_PATH':os.path.join(prefix, 'lib', 'guile', '2.2', 'ccache')}
+_bdw_gc_cflags = '-fcommon'
+if 'CFLAGS' in os.environ:
+ _bdw_gc_cflags = os.environ['CFLAGS'] + ' -fcommon'
+
+module_extra_env['bdw-gc']={'CFLAGS':_bdw_gc_cflags}
+
if _branch in ('master', 'unstable'):
module_cmakeargs["gnucash-git"]=('-DGTEST_ROOT=$SRCROOT/googletest')
commit bf76f1244a55887ef0f41533bda5a2da735d6c3d
Merge: e5726e7 6268bae
Author: John Ralls <jralls at ceridwen.us>
Date: Thu May 21 15:43:31 2020 -0700
Merge Frank Ellenberger's 'aqb621' into master.
commit 6268baedcf3e3e0f6e0fcc47feffda654997d313
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Thu May 21 23:53:07 2020 +0200
Update AqBanking to 6.2.1
Changes in AqBanking, AqFinTS, AqHBCI, AqPaypal, XML
AqHBCI: Also accept warning about empty transactions list when getting statements.
diff --git a/gnucash.modules b/gnucash.modules
index 16a59e0..90a5d53 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -178,7 +178,7 @@
<autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
autogenargs="--enable-local-install">
- <branch module="321/aqbanking-6.2.0beta.tar.gz" repo="aqbanking" version="6.2.0beta" >
+ <branch module="328/aqbanking-6.2.1.tar.gz" repo="aqbanking" version="6.2.1" >
</branch>
<dependencies>
<dep package="gwenhywfar"/>
commit e5726e754aeab73066d3828877c66b1096d566b7
Author: John Ralls <jralls at ceridwen.us>
Date: Sat May 16 17:46:04 2020 -0700
Fix typo in patch name.
diff --git a/gnucash.modules b/gnucash.modules
index 861c5e0..54a3346 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -124,7 +124,7 @@
<patch file="0001-Fix-build-on-MinGW-w64.patch" strip="1"/>
<patch file="0002-MinGW-Don-t-break-build-when-including-libguile.h.patch" strip="1"/>
<patch file="0003-AC_DEFINE-REPLACE_MKTIME.patch" strip="1"/>
- <patch file="0001-MinGW-doesn't-do-signals.patch" strip="1"/>
+ <patch file="0001-MinGW-doesn-t-do-signals.patch" strip="1"/>
</branch>
<dependencies>
<dep package="libunistring"/>
commit 5e67ac411a48cb31b06d76615b2fd87a1c99c069
Author: John Ralls <jralls at ceridwen.us>
Date: Sat May 16 17:28:26 2020 -0700
Build Guile without thread support.
An attempt to prevent garbage collection deadlocks.
diff --git a/gnucash.modules b/gnucash.modules
index 16a59e0..861c5e0 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -102,7 +102,7 @@
</autotools>
<autotools id="bdw-gc" autogen-template="/bin/bash -c 'pushd %(srcdir)s && ./autogen.sh && automake -ac && popd && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s'"
- autogenargs="--enable-threads=pthreads --enable-shared --disable-static">
+ autogenargs="--enable-threads=no --disable-parallel-mark --enable-shared --disable-static">
<branch repo="github" module="ivmai/bdwgc" revision="gc7_6_0" />
<dependencies>
<dep package="libatomic-ops"/>
@@ -118,13 +118,13 @@
</dependencies>
</autotools>
- <autotools id="guile2" autogen-sh="configure" autogenargs="--disable-rpath --enable-networking --enable-nls --enable-posix --enable-regex --with-threads --with-modules --disable-static">
+ <autotools id="guile2" autogen-sh="autoreconf" autogenargs="--disable-rpath --enable-networking --enable-nls --enable-posix --enable-regex --with-threads=no --with-modules --disable-static">
<branch repo="sourceforge" module="gnucash/Dependencies/guile-2.2.4.68-65d98.tar.xz"
version=" 2.2.4.68-65d98">
<patch file="0001-Fix-build-on-MinGW-w64.patch" strip="1"/>
<patch file="0002-MinGW-Don-t-break-build-when-including-libguile.h.patch" strip="1"/>
<patch file="0003-AC_DEFINE-REPLACE_MKTIME.patch" strip="1"/>
-
+ <patch file="0001-MinGW-doesn't-do-signals.patch" strip="1"/>
</branch>
<dependencies>
<dep package="libunistring"/>
diff --git a/patches/0001-MinGW-doesn-t-do-signals.patch b/patches/0001-MinGW-doesn-t-do-signals.patch
new file mode 100644
index 0000000..98d692d
--- /dev/null
+++ b/patches/0001-MinGW-doesn-t-do-signals.patch
@@ -0,0 +1,34 @@
+From 491ce40b7f3127ce6b715219df0f3baa73c71fc0 Mon Sep 17 00:00:00 2001
+From: John Ralls <jralls at ceridwen.us>
+Date: Fri, 15 May 2020 14:54:33 -0700
+Subject: [PATCH] MinGW doesn't do signals.
+
+---
+ libguile/null-threads.h | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/libguile/null-threads.h b/libguile/null-threads.h
+--- a/libguile/null-threads.h
++++ b/libguile/null-threads.h
+@@ -82,10 +82,17 @@ scm_i_sched_yield (void)
+
+ /* Signals
+ */
++#ifdef __MINGW32__
++typedef unsigned int sigset_t;
++#endif
+ static inline int
+ scm_i_pthread_sigmask (int how, const sigset_t *set, sigset_t *oldset)
+ {
++#ifdef __MINGW32__
++ return 0;
++#else
+ return sigprocmask (how, set, oldset);
++#endif
+ }
+
+ /* Mutexes
+
+--
+2.26.0
+
diff --git a/patches/0003-AC_DEFINE-REPLACE_MKTIME.patch b/patches/0003-AC_DEFINE-REPLACE_MKTIME.patch
index 9cc5763..5bb6032 100644
--- a/patches/0003-AC_DEFINE-REPLACE_MKTIME.patch
+++ b/patches/0003-AC_DEFINE-REPLACE_MKTIME.patch
@@ -35,17 +35,6 @@ index 2efd44a22..588d4d139 100644
#ifdef weak_alias
weak_alias (mktime, timelocal)
-diff --git a/lib/timegm.c b/lib/timegm.c
-index 35bc67dc1..949f4b7ad 100644
---- a/lib/timegm.c
-+++ b/lib/timegm.c
-@@ -39,4 +39,6 @@ timegm (struct tm *tmp)
- return __mktime_internal (tmp, __gmtime_r, &gmtime_offset);
- }
-
-+#if ! REPLACE_MKTIME
- #include "mktime.c"
-+#endif
diff --git a/m4/mktime.m4 b/m4/mktime.m4
index d594ddc58..ec7299f08 100644
--- a/m4/mktime.m4
commit 1a58fa9bb31c31d4794946052c21394085fb1a53
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Apr 27 12:53:30 2020 -0700
Rename the release to 3.902.
diff --git a/gnucash.modules b/gnucash.modules
index 4efcd52..16a59e0 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -295,8 +295,8 @@
<cmake id="gnucash-unstable"
cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/">
- <branch module="project/gnucash/gnucash%20%28unstable%29/3.901/gnucash-3.901.tar.bz2"
- repo="sourceforge" version="3.901"/>
+ <branch module="project/gnucash/gnucash%20%28unstable%29/3.902/gnucash-3.902.tar.bz2"
+ repo="sourceforge" version="3.902"/>
<dependencies>
<dep package="libofx"/>
<dep package="aqbanking"/>
@@ -347,8 +347,8 @@
<autotools id="gnucash-unstable-docs"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
makeargs="chm" makeinstallargs="install-chm" >
- <branch module="project/gnucash/gnucash%20%28unstable%29/3.901/gnucash-docs-3.901.tar.gz"
- version="3.901" repo="sourceforge"/>
+ <branch module="project/gnucash/gnucash%20%28unstable%29/3.902/gnucash-docs-3.902.tar.gz"
+ version="3.902" repo="sourceforge"/>
</autotools>
<metamodule id="meta-gnucash-git">
commit 86b082179ce66c65cc497577fd06ff9f06b6b834
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Apr 27 11:47:29 2020 -0700
Adapt build_package.ps1 to treat the 'unstable' branch like 'releases'.
diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index 9d41ba4..90b020f 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -112,9 +112,20 @@ if ($hostname) {
pacman.exe -Su --noconfirm 2>&1 | Tee-Object -FilePath $log_file -Append
#GnuCash build still behaves badly if it finds its old build products. Clean them out.
-if ($branch -eq "releases") {
+if ($branch -in "releases", "unstable") {
$module = get-childitem -path $target_dir\$package\$branch\build -filter gnucash-* -exclude gnucash-docs* -name -directory | sort-object -descending | select -f 1
$install_manifest = "$target_dir\$package\$branch\build\$module\install_manifest.txt"
+ # Force a release build even if nothing has changed.
+ $build_target = "gnucash"
+ $info_dir = "$target_dir\$package\$branch\inst\_jhbuild\info"
+ $manifest_dir = "$target_dir\$package\$branch\inst\_jhbuild\manifests"
+ if ($branch -eq "unstable") { $build_target = "gnucash-unstable" }
+ if (test-path -Path $info_dir\$build_target) {
+ remove-item $info_dir\$build_target
+ }
+ if (test-path -Path $manifest_dir\$build_target) {
+ remove-item $manifest_dir\$build_target
+ }
}
else {
$install_manifest = "$target_dir\$package\$branch\build\gnucash-git\install_manifest.txt"
@@ -123,10 +134,6 @@ else {
if (test-path -path $install_manifest) {
get-content $install_manifest | remove-item
remove-item $install_manifest
- if ($branch -eq "releases") { # Force a release build even if nothing has changed.
- remove-item $target_dir\$package\$branch\inst\_jhbuild\info\gnucash
- remove-item $target_dir\$package\$branch\inst\_jhbuild\manifests\gnucash
- }
}
# Update the gnucash-on-windows repository
@@ -139,7 +146,7 @@ $setup_file_valid = False
$new_file = test-path -path $target_dir\$package\$branch\inst\bin\gnucash.exe -NewerThan $time_stamp
if ($new_file) {
#Build the installer
- $is_git = ($branch.CompareTo("releases") -ne 0)
+ $is_git = ($branch -notin "releases", "unstable")
Write-Output "Creating GnuCash installer." | Tee-Object -FilePath $log_file -Append
$setup_file = & $script_dir\bundle-mingw64.ps1 -root_dir $target_dir -target_dir $target_dir\$package\$branch -package $package -git_build $is_git 2>&1 | Tee-Object -FilePath $log_file -Append
$setup_file_valid = Test-Path -Path "$setup_file"
commit 24c6c02a179c556db98363e9b86fb9a62ef72e78
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Apr 26 23:16:55 2020 -0700
Remove no longer used ALLOW_OLD_GETTEXT from the gnucash cmake args.
diff --git a/gnucash.modules b/gnucash.modules
index 2b08d9b..4efcd52 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -277,7 +277,7 @@
</cmake>
<cmake id="gnucash"
- cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DALLOW_OLD_GETTEXT=ON">
+ cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock">
<branch module="project/gnucash/gnucash%20%28stable%29/3.10/gnucash-3.10.tar.bz2"
repo="sourceforge" version="3.10"/>
<dependencies>
@@ -294,7 +294,7 @@
</cmake>
<cmake id="gnucash-unstable"
- cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/ -DALLOW_OLD_GETTEXT=ON">
+ cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/">
<branch module="project/gnucash/gnucash%20%28unstable%29/3.901/gnucash-3.901.tar.bz2"
repo="sourceforge" version="3.901"/>
<dependencies>
@@ -311,7 +311,7 @@
</cmake>
<cmake id="gnucash-git"
- cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DALLOW_OLD_GETTEXT=ON -DCMAKE_BUILD_TYPE=Debug">
+ cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DCMAKE_BUILD_TYPE=Debug">
<branch repo="github" module="Gnucash/gnucash.git" revision="master"
checkoutdir="gnucash-git"/>
<dependencies>
commit c0a54d7703638e5f0e4dfa0862dfe194e87feeab
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Apr 26 23:13:19 2020 -0700
Revert "Merge 'milotype-inno-6-0-3' into master."
This reverts commit 95d8a5807bbffd7ba6046bc4b70cf0d601ce1ad8, reversing
changes made to 70231d70cb4e36949f2964c55ba45dd04c3c7a7b.
Because we are still using inno-setup 5.3 and a 6.0 translation breaks
the build.
diff --git a/inno_setup/Croatian-5.5.3.isl b/inno_setup/Croatian-5.5.3.isl
new file mode 100644
index 0000000..e05ba3c
--- /dev/null
+++ b/inno_setup/Croatian-5.5.3.isl
@@ -0,0 +1,340 @@
+; *** Inno Setup version 5.5.3+ Croatian messages ***
+; Translated by: Elvis Gambiraža (el.gambo at gmail.com)
+; Based on translation by Krunoslav Kanjuh (krunoslav.kanjuh at zg.t-com.hr)
+;
+; To download user-contributed translations of this file, go to:
+; http://www.jrsoftware.org/files/istrans/
+;
+; Note: When translating this text, do not add periods (.) to the end of
+; messages that didn't have them already, because on those messages Inno
+; Setup adds the periods automatically (appending a period would result in
+; two periods being displayed).
+
+[LangOptions]
+; The following three entries are very important. Be sure to read and
+; understand the '[LangOptions] section' topic in the help file.
+LanguageName=Hrvatski
+LanguageID=$041a
+LanguageCodePage=1250
+; If the language you are translating to requires special font faces or
+; sizes, uncomment any of the following entries and change them accordingly.
+;DialogFontName=MS Shell Dlg
+;DialogFontSize=8
+;WelcomeFontName=Arial
+;WelcomeFontSize=12
+;TitleFontName=Arial
+;TitleFontSize=29
+;CopyrightFontName=Arial
+;CopyrightFontSize=8
+
+[Messages]
+
+; *** Application titles
+SetupAppTitle=Instalacija
+SetupWindowTitle=Instalacija - %1
+UninstallAppTitle=Deinstalacija
+UninstallAppFullTitle=Deinstalacija programa %1
+
+; *** Misc. common
+InformationTitle=Informacija
+ConfirmTitle=Potvrda
+ErrorTitle=Greška
+
+; *** SetupLdr messages
+SetupLdrStartupMessage=Zapoèeli ste instalaciju programa %1. Želite li nastaviti?
+LdrCannotCreateTemp=Ne mogu kreirati privremenu datoteku. Instalacija je prekinuta.
+LdrCannotExecTemp=Ne mogu pokrenuti datoteku u privremenoj mapi. Instalacija je prekinuta.
+
+; *** Startup error messages
+LastErrorMessage=%1.%n%nGreška %2: %3
+SetupFileMissing=Datoteka %1 se ne nalazi u instalacijskoj mapi. Ispravite problem ili nabavite novu kopiju programa.
+SetupFileCorrupt=Instalacijske datoteke su ošteæene. Nabavite novu kopiju programa.
+SetupFileCorruptOrWrongVer=Instalacijske datoteke su ošteæene, ili nisu kompatibilne s ovom verzijom instalacije. Ispravite problem ili nabavite novu kopiju programa.
+InvalidParameter=Neispravan parametar je prenijet na komandnu liniju: %n%n%1
+SetupAlreadyRunning=Instalacija je veæ pokrenuta.
+WindowsVersionNotSupported=Program ne podržava verziju Windowsa koju koristite.
+WindowsServicePackRequired=Program zahtijeva %1 servisni paket %2 ili noviji.
+NotOnThisPlatform=Ovaj program neæe raditi na %1.
+OnlyOnThisPlatform=Ovaj program se mora pokrenuti na %1.
+OnlyOnTheseArchitectures=Ovaj program može biti instaliran na verziji Windowsa dizajniranim za sljedeæu procesorsku arhitekturu:%n%n%1
+MissingWOW64APIs=Ova verzija Windowsa ne posjeduje funkcije koje zahtjeva instalacija za 64-bitnu instalaciju. Kako bi riješili problem instalirajte servisni paket %1.
+WinVersionTooLowError=Ovaj program zahtijeva %1 verziju %2 ili noviju.
+WinVersionTooHighError=Ovaj program ne može biti instaliran na %1 verziji %2 ili novijoj.
+AdminPrivilegesRequired=Morate biti prijavljeni kao administrator prilikom pokretanja ovog programa.
+PowerUserPrivilegesRequired=Morate biti prijavljeni kao administrator ili èlan grupe Power Users prilikom instaliranja ovog programa.
+SetupAppRunningError=Instalacija je otkrila da je %1 pokrenut.%n%nZatvorite program i potom kliknite Dalje za nastavak ili Odustani za prekid instalacije.
+UninstallAppRunningError=Deinstalacija je otkrila da je %1 pokrenut.%n%nZatvorite program i potom kliknite Dalje za nastavak ili Odustani za prekid instalacije.
+
+; *** Misc. errors
+ErrorCreatingDir=Instalacija nije mogla kreirati mapu "%1".
+ErrorTooManyFilesInDir=Instalacija nije mogla kreirati datoteku u mapi "%1" zato što ona sadrži previše datoteka.
+
+; *** Setup common messages
+ExitSetupTitle=Prekid instalacije
+ExitSetupMessage=Instalacija nije završena. Ako sad izaðete, program neæe biti instaliran.%n%nInstalaciju možete pokrenuti kasnije ukoliko ju želite završiti.%n%nPrekid instalacije?
+AboutSetupMenuItem=&O programu
+AboutSetupTitle=Podaci o programu
+AboutSetupMessage=%1 verzija %2%n%3%n%n%1 home page:%n%4
+AboutSetupNote=
+TranslatorNote=Translated by: Elvis Gambiraža
+
+; *** Buttons
+ButtonBack=< Na&trag
+ButtonNext=Na&stavak >
+ButtonInstall=&Instaliraj
+ButtonOK=&U redu
+ButtonCancel=&Otkaži
+ButtonYes=&Da
+ButtonYesToAll=D&a za sve
+ButtonNo=&Ne
+ButtonNoToAll=N&e za sve
+ButtonFinish=&Završi
+ButtonBrowse=&Odaberi...
+ButtonWizardBrowse=O&daberi...
+ButtonNewFolder=&Kreiraj novu mapu
+
+; *** "Select Language" dialog messages
+SelectLanguageTitle=Izaberite jezik
+SelectLanguageLabel=Izberite jezik koji želite koristiti pri instalaciji:
+
+; *** Common wizard text
+ClickNext=Kliknite na Nastavak za nastavak ili Otkaži za prekid instalacije.
+BeveledLabel=
+BrowseDialogTitle=Odabir mape
+BrowseDialogLabel=Odaberite mapu iz liste koja slijedi te kliknite OK.
+NewFolderName=Nova mapa
+
+; *** "Welcome" wizard page
+WelcomeLabel1=Dobro došli u instalaciju programa [name]
+WelcomeLabel2=Ovaj program æe instalirati [name/ver] na vaše raèunalo.%n%nPreporuèamo da zatvorite sve programe prije nego nastavite dalje.
+
+; *** "Password" wizard page
+WizardPassword=Lozinka
+PasswordLabel1=Instalacija je zaštiæena lozinkom.
+PasswordLabel3=Upišite lozinku i kliknite Nastavak. Lozinke su osjetljive na mala i velika slova.
+PasswordEditLabel=&Lozinka:
+IncorrectPassword=Upisana je pogrešna lozinka. Pokušajte ponovo.
+
+; *** "License Agreement" wizard
+WizardLicense=Ugovor o korištenju
+LicenseLabel=Molimo prije nastavka pažljivo proèitajte sljedeæe važne informacije.
+LicenseLabel3=Molimo pažljivo proèitajte Ugovor o korištenju. Morate prihvatiti uvjete ugovora kako bi mogli nastaviti s instalacijom.
+LicenseAccepted=&Prihvaæam ugovor
+LicenseNotAccepted=&Ne prihvaæam ugovor
+
+; *** "Information" wizard pages
+WizardInfoBefore=Informacije
+InfoBeforeLabel=Proèitajte sljedeæe važne informacije prije nastavka.
+InfoBeforeClickLabel=Kada budete spremni nastaviti instalaciju kliknite Nastavak.
+WizardInfoAfter=Informacije
+InfoAfterLabel=Proèitajte sljedeæe važne informacije prije nastavka.
+InfoAfterClickLabel=Kada budete spremni nastaviti instalaciju kliknite Nastavak.
+
+; *** "User Information" wizard page
+WizardUserInfo=Informacije o korisniku
+UserInfoDesc=Upišite informacije o vama.
+UserInfoName=&Ime korisnika:
+UserInfoOrg=&Organizacija:
+UserInfoSerial=&Serijski broj:
+UserInfoNameRequired=Morate upisati ime.
+
+; *** "Select Destination Location" wizard page
+WizardSelectDir=Odaberite odredišnu mapu
+SelectDirDesc=Mapa u koju æe biti instaliran program.
+SelectDirLabel3=Instalacija æe instalirati [name] u sljedeæu mapu
+SelectDirBrowseLabel=Za nastavak kliknite na Nastavak. Ako želite odabrati drugu mapu kliknite na Odaberi.
+DiskSpaceMBLabel=Ovaj program zahtjeva minimalno [mb] MB slobodnog prostora na disku.
+CannotInstallToNetworkDrive=Instalacija ne može instalirati na mrežnu jedinicu.
+CannotInstallToUNCPath=Instalacija ne može instalirati na UNC putanju.
+InvalidPath=Morate unijeti punu stazu zajedno sa slovom diska (npr.%n%nC:\APP%n%nili stazu u obliku%n%n\\server\share)
+InvalidDrive=Disk koji ste odabrali ne postoji. Odaberite neki drugi.
+DiskSpaceWarningTitle=Nedovoljno prostora na disku
+DiskSpaceWarning=Instalacija zahtjeva bar %1 KB slobodnog prostora, a odabrani disk ima samo %2 KB na raspolaganju.%n%nŽelite li nastaviti?
+DirNameTooLong=Predugaèak naziv mape ili staze.
+InvalidDirName=Naziv mape je pogrešan.
+BadDirName32=Naziv mape ne smije sadržavati niti jedan od sljedeæih znakova nakon toèke:%n%n%1
+DirExistsTitle=Mapa veæ postoji
+DirExists=Mapa:%n%n%1%n%nveæ postoji. Želite li instalirati u nju?
+DirDoesntExistTitle=Mapa ne postoji
+DirDoesntExist=Mapa:%n%n%1%n%nne postoji. Želite li ju napraviti?
+
+; *** "Select Components" wizard page
+WizardSelectComponents=Odaberite komponente
+SelectComponentsDesc=Koje komponente želite instalirati?
+SelectComponentsLabel2=Odaberite komponente koje želite instalirati, odnosno uklonite kvaèicu uz komponente koje ne želite:
+FullInstallation=Puna instalacija
+
+; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
+CompactInstallation=Kompaktna instalacija
+CustomInstallation=Instalacija po izboru
+NoUninstallWarningTitle=Postojeæe komponente
+NoUninstallWarning=Instalacija je utvrdila da na vašem raèunalu veæ postoje sljedeæe komponente:%n%n%1%n%nNeodabir tih komponenata ne dovodi do njihove deinstalacije.%n%nŽelite li ipak nastaviti?
+ComponentSize1=%1 KB
+ComponentSize2=%1 MB
+ComponentsDiskSpaceMBLabel=Vaš izbor zahtijeva najmanje [mb] MB prostora na disku.
+
+; *** "Select Additional Tasks" wizard page
+WizardSelectTasks=Odaberite zadatke
+SelectTasksDesc=Koje dodatne zadatke želite izvršiti?
+SelectTasksLabel2=Odaberite zadatke koji æe se izvršiti tijekom instalacije programa [name].
+
+; *** "Select Start Menu Folder" wizard page
+WizardSelectProgramGroup=Odaberite programsku grupu
+SelectStartMenuFolderDesc=Lokacija preèice programa
+SelectStartMenuFolderLabel3=Instalacija æe kreirati preèice za programe u sljedeæoj Start Menu mapi
+SelectStartMenuFolderBrowseLabel=Kako bi nastavili, kliknite na Nastavak. Ako želite odabrati drugu mapu klikni na Odabir.
+MustEnterGroupName=Morate unijeti ime programske grupe.
+GroupNameTooLong=Predugi naziv mape ili staze.
+InvalidGroupName=Naziv mape je pogrešan.
+BadGroupName=Ime programske grupe ne smije sadržavati sljedeæe znakove:%n%n%1
+NoProgramGroupCheck2=&Ne kreiraj %1 programsku grupu
+
+; *** "Ready to Install" wizard page
+WizardReady=Instalacija je spremna
+ReadyLabel1=Instalacija je spremna instalirati [name] na vaše raèunalo.
+ReadyLabel2a=Kliknite na Instaliraj ako želite instalirati program ili na Nazad ako želite pregledati ili promijeniti postavke.
+ReadyLabel2b=Kliknite na Instaliraj ako želite instalirati program.
+ReadyMemoUserInfo=Korisnièki podaci:
+ReadyMemoDir=Odredišna mapa:
+ReadyMemoType=Tip instalacije:
+ReadyMemoComponents=Odabrane komponente:
+ReadyMemoGroup=Programska grupa:
+ReadyMemoTasks=Dodatni zadaci:
+
+; *** "Preparing to Install" wizard page
+WizardPreparing=Priprema instalacije
+PreparingDesc=Instalacija se priprema za instaliranje [name] na vaše raèunalo.
+PreviousInstallNotCompleted=Instalacija/deinstalacija prethodnog programa nije završena. Morate restartati raèunalo kako bi završili tu instalaciju.%n%nNakon restartanja raèunala, ponovno pokrenite Setup kako bi dovršili instalaciju [name].
+CannotContinue=Instalacija ne može nastaviti. Kliknite na Odustani za izlaz.
+ApplicationsFound=Sljedeæi programi koriste datoteke koje instalacijski program treba ažurirati. Preporuèujemo da dopustite instalacijskom programu da zatvori ove programe.
+ApplicationsFound2=Sljedeæi programi koriste datoteke koje instalacijski program treba ažurirati. Preporuèujemo da dopustite instalacijskom programu da zatvori ove programe.
+CloseApplications=&Zatvori programe
+DontCloseApplications=&Ne zatvaraj programe
+ErrorCloseApplications=Ne mogu zatvoriti sve programe. Prije nego nastavite, preporuèujemo da zatvorite sve programe koji koriste datoteke koje instalacijski program treba ažurirati.
+
+; *** "Installing" wizard page
+WizardInstalling=Instaliranje
+InstallingLabel=Prièekajte dok ne završi instalacija programa [name] na vaše raèunalo.
+
+; *** "Setup Completed" wizard page
+FinishedHeadingLabel=Završetak instalacije [name]
+FinishedLabelNoIcons=Instalacija programa [name] je završena.
+FinishedLabel=Instalacija programa [name] je završena. Program možete pokrenuti preko instaliranih ikona.
+ClickFinish=Kliknite na Završi kako biste izašli iz instalacije.
+FinishedRestartLabel=Kako biste instalaciju programa [name] završili, potrebno je ponovno pokrenuti raèunalo. Želite li to sada uèiniti?
+FinishedRestartMessage=Završetak instalacija programa [name], zahtijeva ponovno pokretanje raèunala.%n%nŽelite li to uèiniti sada?
+ShowReadmeCheck=Da, želim proèitati README datoteku
+YesRadio=&Da, želim sada ponovno pokrenuti raèunalo
+NoRadio=&Ne, kasnije æu ga ponovno pokrenuti
+
+; used for example as 'Run MyProg.exe'
+RunEntryExec=&Pokreni %1
+
+; used for example as 'View Readme.txt'
+RunEntryShellExec=Pogledaj %1
+
+; *** "Setup Needs the Next Disk" stuff
+ChangeDiskTitle=Instalacija treba sljedeæi disk
+SelectDiskLabel2=Umetnite disketu %1 i kliknite na OK.%n%nAko se datoteke s ove diskete nalaze na nekom drugom mediju %2 , upišite ispravnu stazu do njega ili kliknite na Odaberi.
+PathLabel=&Staza:
+FileNotInDir2=Datoteka "%1" ne postoji u "%2". Molimo ubacite odgovarajuæi disk ili odaberete drugi %3.
+SelectDirectoryLabel=Odaberite lokaciju sljedeæeg diska.
+
+; *** Installation phase messages
+SetupAborted=Instalacija nije završena.%n%nIspravite problem i opet pokrenite instalaciju.
+EntryAbortRetryIgnore=Kliknite na Ponovi za novi pokušaj, Ignoriraj za nastavak, ili Prekid za prekid instalacije.
+
+; *** Installation status messages
+StatusClosingApplications=Zatvaram programe...
+StatusCreateDirs=Kreiram mape...
+StatusExtractFiles=Izdvajam datoteke...
+StatusCreateIcons=Kreiram ikone...
+StatusCreateIniEntries=Kreiram INI datoteke...
+StatusCreateRegistryEntries=Kreiram podatke za registry...
+StatusRegisterFiles=Registriram datoteke...
+StatusSavingUninstall=Snimam deinstalacijske informacije...
+StatusRunProgram=Završavam instalaciju...
+StatusRestartingApplications=Ponovo pokreæem programe...
+StatusRollback=Poništavam promjene...
+
+; *** Misc. errors
+ErrorInternal2=Interna greška: %1
+ErrorFunctionFailedNoCode=%1 nije uspjelo
+ErrorFunctionFailed=%1 nije uspjelo; kod %2
+ErrorFunctionFailedWithMessage=%1 nije uspjelo; kod %2.%n%3
+ErrorExecutingProgram=Ne mogu pokrenuti datoteku:%n%1
+
+; *** Registry errors
+ErrorRegOpenKey=Greška pri otvaranju registry kljuèa:%n%1\%2
+ErrorRegCreateKey=Greška pri kreiranju registry kljuèa:%n%1\%2
+ErrorRegWriteKey=Greška pri pisanju u registry kljuè:%n%1\%2
+
+; *** INI errors
+ErrorIniEntry=Greška pri kreiranju INI podataka u datoteci "%1".
+
+; *** File copying errors
+FileAbortRetryIgnore=Kliknite Ponovi za novi pokušaj, Ignoriraj za preskok ove datoteke (ne preporuèa se), ili Prekid za prekid instalacije.
+FileAbortRetryIgnore2=Kliknite Ponovi za novi pokušaj, Ignoriraj za nastavak u svakom sluèaju (ne preporuèa se), ili Prekid za prekid instalacije
+SourceIsCorrupted=Izvorišna datoteka je ošteæena
+SourceDoesntExist=Izvorišna datoteka "%1" ne postoji
+ExistingFileReadOnly=Postojeæa datoteka je oznaèena "samo-za-èitanje".%n%nKliknite Ponovi kako biste uklonili oznaku "samo-za-èitanje" i pokušajte ponovno, Ignoriraj za preskok ove datoteke, ili Prekid za prekid instalacije.
+ErrorReadingExistingDest=Pojavila se greška prilikom pokušaja èitanja postojeæe datoteke:
+FileExists=Datoteka veæ postoji.%n%nŽelite li ju zamijeniti?
+ExistingFileNewer=Postojeæa datoteka je novija od one koju pokušavate instalirati. Preporuèa se zadržati postojeæu datoteku.%n%nŽelite li zadržati postojeæu datoteku?
+ErrorChangingAttr=Pojavila se greška prilikom pokušaja promjene atributa postojeæe datoteke:
+ErrorCreatingTemp=Pojavila se greška prilikom pokušaja kreiranja datoteke u odredišnoj mapi:
+ErrorReadingSource=Pojavila se greška prilikom pokušaja èitanja izvorišne datoteke:
+ErrorCopying=Pojavila se greška prilikom pokušaja kopiranja datoteke:
+ErrorReplacingExistingFile=Pojavila se greška prilikom pokušaja zamjene datoteke:
+ErrorRestartReplace=Zamjena nakon ponovnog pokretanja nije uspjela:
+ErrorRenamingTemp=Pojavila se greška prilikom pokušaja preimenovanja datoteke u odredišnoj mapi:
+ErrorRegisterServer=Ne mogu registrirati DLL/OCX: %1
+ErrorRegSvr32Failed=Greška u RegSvr32: greška %1
+ErrorRegisterTypeLib=Ne mogu registrirati type library: %1
+
+; *** Post-installation errors
+ErrorOpeningReadme=Pojavila se greška prilikom pokušaja otvaranja README datoteke.
+ErrorRestartingComputer=Instalacija ne može ponovno pokrenuti raèunalo. Uèinite to ruèno.
+
+; *** Uninstaller messages
+UninstallNotFound=Datoteka "%1" ne postoji. Deinstalacija prekinuta.
+UninstallOpenError=Datoteku "%1" ne mogu otvoriti. Deinstalacija nije moguæa.
+UninstallUnsupportedVer=Deinstalacijska datoteka "%1" je u formatu koji nije prepoznat od ove verzije deinstalacijskog programa. Nije moguæa deinstalacija.
+UninstallUnknownEntry=Nepoznat zapis (%1) je pronaðen u deinstalacijskoj datoteci.
+ConfirmUninstall=Želite li zaista ukloniti %1 i sve njegove komponente?
+UninstallOnlyOnWin64=Ova instalacija može biti uklonjena samo na 64-bitnim Windowsima.
+OnlyAdminCanUninstall=Ova instalacija može biti uklonjena samo od korisnika sa administratorskim pravima.
+UninstallStatusLabel=Prièekajte dok %1 ne bude uklonjen s vašeg raèunala.
+UninstalledAll=Program %1 je uspješno uklonjen sa vašeg raèunala.
+UninstalledMost=Deinstalacija programa %1 je završena.%n%nNeke elemente nije bilo moguæe ukloniti. Uèinite to ruèno.
+UninstalledAndNeedsRestart=Kako bi završili deinstalaciju %1, Vaše raèunalo morate ponovno pokrenuti%n%nŽelite li to uèiniti sada?
+UninstallDataCorrupted="%1" datoteka je ošteæena. Deinstalacija nije moguæa.
+
+; *** Uninstallation phase messages
+ConfirmDeleteSharedFileTitle=Brisanje dijeljene datoteke
+ConfirmDeleteSharedFile2=Sistem ukazuje da sljedeæe dijeljene datoteke ne koristi niti jedan program. Želite li ukloniti te dijeljene datoteke?%n%nAko neki programi i dalje koriste te datoteke, a one se izbrišu, ti programi neæe ispravno raditi. Ako niste sigurni, odaberite Ne. Ostavljanje datoteka neæe uzrokovati štetu vašem sistemu.
+SharedFileNameLabel=Datoteka:
+SharedFileLocationLabel=Staza:
+WizardUninstalling=Deinstalacija
+StatusUninstalling=Deinstaliram %1...
+; *** Shutdown block reasons
+ShutdownBlockReasonInstallingApp=Instaliram %1.
+ShutdownBlockReasonUninstallingApp=Deinstaliram %1.
+
+; The custom messages below aren't used by Setup itself, but if you make
+; use of them in your scripts, you'll want to translate them.
+
+[CustomMessages]
+
+NameAndVersion=%1 verzija %2
+AdditionalIcons=Dodatne ikone:
+CreateDesktopIcon=Kreiraj ikonu na &Desktopu
+CreateQuickLaunchIcon=Kreiraj ikonu u traci za brzo pokretanje
+ProgramOnTheWeb=%1 na internetu
+UninstallProgram=Deinstaliraj %1
+LaunchProgram=Pokreni %1
+AssocFileExtension=Pridru&ži %1 sa %2 ekstenzijom datoteke
+AssocingFileExtension=Pridružujem %1 sa %2 ekstenzijom datoteke
+AutoStartProgramGroupDescription=Pokretanje:
+AutoStartProgram=Automatski pokreni %1
+AddonHostProgramNotFound=%1 se ne nalazi u navedenoj mapi.%n%nŽelite li svejedno nastaviti?
\ No newline at end of file
diff --git a/inno_setup/Croatian-6.0.3.isl b/inno_setup/Croatian-6.0.3.isl
deleted file mode 100644
index 55c7b5b..0000000
--- a/inno_setup/Croatian-6.0.3.isl
+++ /dev/null
@@ -1,367 +0,0 @@
-; *** Inno Setup version 6.0.3+ Croatian messages ***
-; Translated by: Milo Ivir (mail at milotype.de)
-; Based on translation by Elvis Gambiraža (el.gambo at gmail.com)
-; Based on translation by Krunoslav Kanjuh (krunoslav.kanjuh at zg.t-com.hr)
-;
-; To download user-contributed translations of this file, go to:
-; http://www.jrsoftware.org/files/istrans/
-;
-; Note: When translating this text, do not add periods (.) to the end of
-; messages that didn't have them already, because on those messages Inno
-; Setup adds the periods automatically (appending a period would result in
-; two periods being displayed).
-
-[LangOptions]
-; The following three entries are very important. Be sure to read and
-; understand the '[LangOptions] section' topic in the help file.
-LanguageName=Hrvatski
-LanguageID=$041a
-LanguageCodePage=1250
-; If the language you are translating to requires special font faces or
-; sizes, uncomment any of the following entries and change them accordingly.
-;DialogFontName=MS Shell Dlg
-;DialogFontSize=8
-;WelcomeFontName=Arial
-;WelcomeFontSize=12
-;TitleFontName=Arial
-;TitleFontSize=29
-;CopyrightFontName=Arial
-;CopyrightFontSize=8
-
-[Messages]
-
-; *** Application titles
-SetupAppTitle=Instalacija
-SetupWindowTitle=Instalacija – %1
-UninstallAppTitle=Deinstalacija
-UninstallAppFullTitle=Deinstalacija programa %1
-
-; *** Misc. common
-InformationTitle=Informacija
-ConfirmTitle=Potvrda
-ErrorTitle=Greška
-
-; *** SetupLdr messages
-SetupLdrStartupMessage=Ovime će se instalirati %1. Želiš li nastaviti?
-LdrCannotCreateTemp=Nije moguće stvoriti privremenu datoteku. Instalacija je prekinuta
-LdrCannotExecTemp=Nije moguće pokrenuti datoteku u privremenoj mapi. Instalacija je prekinuta
-HelpTextNote=
-
-; *** Startup error messages
-LastErrorMessage=%1.%n%nnGreška %2: %3
-SetupFileMissing=Datoteka %1 se ne nalazi u mapi instalacije. Ispravi problem ili nabavi novu kopiju programa.
-SetupFileCorrupt=Datoteke instalacije su oštećene. Nabavi novu kopiju programa.
-SetupFileCorruptOrWrongVer=Datoteke instalacije su oštećene ili nisu kompatibilne s ovom verzijom instalacije. Ispravi problem ili nabavi novu kopiju programa.
-InvalidParameter=Neispravan parametar je prenijet u naredbenom retku:%n%n%1
-SetupAlreadyRunning=Instalacija je već pokrenuta.
-WindowsVersionNotSupported=Program ne podržava Windows verziju koju koristiš.
-WindowsServicePackRequired=Program zahtijeva %1 servisni paket %2 ili noviji.
-NotOnThisPlatform=Program neće raditi na %1.
-OnlyOnThisPlatform=Program se mora pokrenuti na %1.
-OnlyOnTheseArchitectures=Program se može instalirati na Windows verzijama za sljedeće procesorske arhitekture:%n%n%1
-WinVersionTooLowError=Program zahtijeva %1 verziju %2 ili noviju.
-WinVersionTooHighError=Program se ne može instalirati na %1 verziji %2 ili novijoj.
-AdminPrivilegesRequired=Za instaliranje programa moraš biti prijavljen/a kao administrator.
-PowerUserPrivilegesRequired=Za instaliranje programa moraÅ¡ biti prijavljen/a kao administrator ili kao Älan grupe naprednih korisnika.
-SetupAppRunningError=Instalacija je otkrila da je %1 trenutaÄno pokrenut.%n%nZatvori program i potom pritisni "Dalje" za nastavak ili "Odustani" za prekid.
-UninstallAppRunningError=Deinstalacija je otkrila da je %1 trenutaÄno pokrenut.%n%nZatvori program i potom pritisni "Dalje" za nastavak ili "Odustani" za prekid.
-
-; *** Startup questions
-PrivilegesRequiredOverrideTitle=Odaberi naÄin instaliranja
-PrivilegesRequiredOverrideInstruction=Odaberi naÄin instaliranja
-PrivilegesRequiredOverrideText1=%1 se može instalirati za sve korisnike (potrebna su administratorska prava) ili samo za tebe.
-PrivilegesRequiredOverrideText2=%1 se može instalirati samo za tebe ili za sve korisnike (potrebna su administratorska prava).
-PrivilegesRequiredOverrideAllUsers=Instaliraj z&a sve korisnike
-PrivilegesRequiredOverrideAllUsersRecommended=Instaliraj z&a sve korisnike (preporuÄeno)
-PrivilegesRequiredOverrideCurrentUser=Instaliraj samo za &mene
-PrivilegesRequiredOverrideCurrentUserRecommended=Instaliraj samo za &mene (preporuÄeno)
-
-; *** Misc. errors
-ErrorCreatingDir=Instalacija nije mogla stvoriti mapu "%1"
-ErrorTooManyFilesInDir=Datoteku nije moguće stvoriti u mapi "%1", jer mapa sadrži previše datoteka
-
-; *** Setup common messages
-ExitSetupTitle=Prekini instalaciju
-ExitSetupMessage=Instalacija nije završena. Ako sad izađeš, program neće biti instaliran.%n%nInstalaciju možeš pokrenuti kasnije, ukoliko je želiš dovršiti.%n%nPrekinuti instalaciju?
-AboutSetupMenuItem=&O instalaciji …
-AboutSetupTitle=O instalaciji
-AboutSetupMessage=%1 verzija %2%n%3%n%n%1 poÄetna stranica:%n%4
-AboutSetupNote=
-TranslatorNote=Prevodioci:%n%nKrunoslav Kanjuh%n%nElvis Gambiraža%n%nMilo Ivir
-
-; *** Buttons
-ButtonBack=< Na&trag
-ButtonNext=&Dalje >
-ButtonInstall=&Instaliraj
-ButtonOK=U redu
-ButtonCancel=Odustani
-ButtonYes=&Da
-ButtonYesToAll=D&a za sve
-ButtonNo=&Ne
-ButtonNoToAll=N&e za sve
-ButtonFinish=&Završi
-ButtonBrowse=&Pretraži …
-ButtonWizardBrowse=Odabe&ri …
-ButtonNewFolder=&Stvori novu mapu
-
-; *** "Select Language" dialog messages
-SelectLanguageTitle=Odaberi jezik za instalaciju
-SelectLanguageLabel=Odaberi jezik koji želiš koristiti tijekom instaliranja.
-
-; *** Common wizard text
-ClickNext=Pritisni "Dalje" za nastavak ili "Odustani" za prekid instalacije.
-BeveledLabel=
-BrowseDialogTitle=Odaberi mapu
-BrowseDialogLabel=Odaberi mapu iz popisa i pritisni "U redu".
-NewFolderName=Nova mapa
-
-; *** "Welcome" wizard page
-WelcomeLabel1=ÄŒarobnjak za instalaciju programa [name]
-WelcomeLabel2=Ovime ćeÅ¡ instalirati [name/ver].%n%nPreporuÄujemo da zatvoriÅ¡ sve programe prije nego Å¡to nastaviÅ¡ dalje.
-
-; *** "Password" wizard page
-WizardPassword=Lozinka
-PasswordLabel1=Instalacija je zaštićena lozinkom.
-PasswordLabel3=Upiši lozinku i pritisni "Dalje". Lozinke su osjetljive na mala i velika slova.
-PasswordEditLabel=&Lozinka:
-IncorrectPassword=Upisana je pogrešna lozinka. Pokušaj ponovo.
-
-; *** "License Agreement" wizard page
-WizardLicense=Licencni ugovor
-LicenseLabel=Prije nego Å¡to nastaviÅ¡ dalje, pažljivo proÄitaj sljedeće važne informacije.
-LicenseLabel3=ProÄitaj licencni ugovor. MoraÅ¡ prihvatiti uvjete ugovora, ako želiÅ¡ nastaviti instalirati.
-LicenseAccepted=&Prihvaćam ugovor
-LicenseNotAccepted=&Ne prihvaćam ugovor
-
-; *** "Information" wizard pages
-WizardInfoBefore=Informacije
-InfoBeforeLabel=ProÄitaj sljedeće važne informacije prije nego Å¡to nastaviÅ¡ dalje.
-InfoBeforeClickLabel=Kad želiš nastaviti instalirati, pritisni "Dalje".
-WizardInfoAfter=Informacije
-InfoAfterLabel=ProÄitaj sljedeće važne informacije prije nego Å¡to nastaviÅ¡ dalje.
-InfoAfterClickLabel=Kad želiš nastaviti instalirati, pritisni "Dalje".
-
-; *** "User Information" wizard page
-WizardUserInfo=KorisniÄki podaci
-UserInfoDesc=Upiši svoje podatke.
-UserInfoName=&Ime korisnika:
-UserInfoOrg=&Organizacija:
-UserInfoSerial=&Serijski broj:
-UserInfoNameRequired=Ime je obavezno polje.
-
-; *** "Select Destination Location" wizard page
-WizardSelectDir=Odaberi odredišno mjesto
-SelectDirDesc=Gdje želiš instalirati [name]?
-SelectDirLabel3=[name] će se instalirati u sljedeću mapu.
-SelectDirBrowseLabel=Za nastavak instalacije, pritisni "Dalje". Za odabir jedne druge mape, pritisni "Odaberi".
-DiskSpaceGBLabel=Potrebno je barem [gb] GB slobodnog prostora na disku.
-DiskSpaceMBLabel=Potrebno je barem [mb] MB slobodnog prostora na disku.
-CannotInstallToNetworkDrive=Instalacija ne može instalirati na mrežnu jedinicu.
-CannotInstallToUNCPath=Instalacija ne može instalirati na UNC stazu.
-InvalidPath=Moraš upisati punu stazu zajedno sa slovom diska, npr.:%n%nC:\APP%n%nili UNC stazu u obliku:%n%n\\server\share
-InvalidDrive=Odabrani disk ne postoji. Odaberi jedan drugi.
-DiskSpaceWarningTitle=Nedovoljno prostora na disku
-DiskSpaceWarning=Instalacija treba barem %1 KB slobodnog prostora, no odabrani disk ima samo %2 KB.%n%nSvejedno nastaviti?
-DirNameTooLong=Naziv mape ili staze je predugaÄak.
-InvalidDirName=Naziv mape je neispravan.
-BadDirName32=Naziv mape ne smije sadržavati sljedeće znakove:%n%n%1
-DirExistsTitle=Mapa već postoji
-DirExists=Mapa:%n%n%1%n%nveć postoji. Želiš li svejedno u nju instalirati?
-DirDoesntExistTitle=Mapa ne postoji
-DirDoesntExist=Mapa:%n%n%1%n%nne postoji. Želiš li je stvoriti?
-
-; *** "Select Components" wizard page
-WizardSelectComponents=Odaberi komponente
-SelectComponentsDesc=Koje komponente želiš instalirati?
-SelectComponentsLabel2=Odaberi komponente koje želiÅ¡ instalirati, iskljuÄi komponente koje ne želiÅ¡ instalirati. Za nastavak instalacije pritisni "Dalje".
-FullInstallation=Kompletna instalacija
-; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
-CompactInstallation=Kompaktna instalacija
-CustomInstallation=Prilagođena instalacija
-NoUninstallWarningTitle=Postojeće komponente
-NoUninstallWarning=Instalacija je utvrdila da na tvom raÄunalu već postoje sljedeće komponente:%n%n%1%n%nIskljuÄivanjem tih komponenata, one se neće deinstalirati.%n%nŽeliÅ¡ li svejedno nastaviti?
-ComponentSize1=%1 KB
-ComponentSize2=%1 MB
-ComponentsDiskSpaceGBLabel=TrenutaÄni odabir zahtijeva barem [gb] GB na disku.
-ComponentsDiskSpaceMBLabel=TrenutaÄni odabir zahtijeva barem [mb] MB na disku.
-
-; *** "Select Additional Tasks" wizard page
-WizardSelectTasks=Odaberi dodatne zadatke
-SelectTasksDesc=Koje dodatne zadatke želiš izvršiti?
-SelectTasksLabel2=Odaberi zadatke koje želiš izvršiti tijekom instaliranja programa [name], zatim pritisni "Dalje".
-
-; *** "Select Start Menu Folder" wizard page
-WizardSelectProgramGroup=Odaberi mapu iz "Start" izbornika
-SelectStartMenuFolderDesc=Gdje želiÅ¡ da instalacija spremi programske preÄace?
-SelectStartMenuFolderLabel3=Instalacija će stvoriti programske preÄace u sljedeću mapu "Start" izbornika.
-SelectStartMenuFolderBrowseLabel=Ako želiš nastaviti, pritisni "Dalje". Ako želiš odabrati jednu drugu mapu, pritisni "Odaberi".
-MustEnterGroupName=Moraš upisati naziv mape.
-GroupNameTooLong=Naziv mape ili staze je predugaÄak.
-InvalidGroupName=Naziv mape nije ispravan.
-BadGroupName=Naziv mape ne smije sadržavati sljedeće znakove:%n%n%1
-NoProgramGroupCheck2=&Ne stvaraj mapu u "Start" izborniku
-
-; *** "Ready to Install" wizard page
-WizardReady=Sve je spremno za instaliranje
-ReadyLabel1=Instalacija je spremna za instaliranje programa [name].
-ReadyLabel2a=Pritisni "Instaliraj", ako želiš instalirati program. Pritisni "Natrag", ako želiš pregledati ili promijeniti postavke
-ReadyLabel2b=Pritisni "Instaliraj", ako želiš instalirati program.
-ReadyMemoUserInfo=KorisniÄki podaci:
-ReadyMemoDir=Odredišno mjesto:
-ReadyMemoType=Vrsta instalacije:
-ReadyMemoComponents=Odabrane komponente:
-ReadyMemoGroup=Mapa u "Start" izborniku:
-ReadyMemoTasks=Dodatni zadaci:
-
-; *** "Preparing to Install" wizard page
-WizardPreparing=Priprema za instaliranje
-PreparingDesc=Instalacija se priprema za instaliranje programa [name].
-PreviousInstallNotCompleted=Instaliranje/uklanjanje jednog prethodnog programa nije bilo gotovo. Morat ćeÅ¡ ponovo pokrenuti raÄunalo i dovrÅ¡iti to instaliranje.%n%nNakon ponovnog pokretanja raÄunala, pokreni instalaciju ponovo, kako bi se dovrÅ¡ilo instaliranje programa [name].
-CannotContinue=Instalacija ne može nastaviti rad. Pritisni "Odustani" za izlaz iz instalacije.
-ApplicationsFound=Sljedeći programi koriste datoteke koje instalacija mora aktualizirati. PreporuÄujemo da dopustiÅ¡ instalaciji zatvoriti ove programe.
-ApplicationsFound2=Sljedeći programi koriste datoteke koje instalacija mora aktualizirati. PreporuÄujemo da dopustiÅ¡ instalaciji zatvoriti ove programe. Kad instaliranje zavrÅ¡i, instalacija će pokuÅ¡ati ponovo pokrenuti programe.
-CloseApplications=&Zatvori programe automatski
-DontCloseApplications=&Ne zatvaraj programe
-ErrorCloseApplications=Instalacija nije uspjela automatski zatvoriti programe. PreporuÄujemo da zatvoriÅ¡ sve programe koji koriste datoteke koje se moraju aktualizirati.
-PrepareToInstallNeedsRestart=Instalacija mora ponovo pokrenuti raÄunalo. Nakon ponovnog pokretanja raÄunala, pokreni instalaciju ponovo, kako bi se dovrÅ¡ilo instaliranje programa [name].%n%nŽeliÅ¡ li sada ponovo pokrenuti raÄunalo?
-
-; *** "Installing" wizard page
-WizardInstalling=Instaliranje
-InstallingLabel=PriÄekaj dok ne zavrÅ¡i instaliranje programa [name].
-
-; *** "Setup Completed" wizard page
-FinishedHeadingLabel=ZavrÅ¡avanje instalacijskog Äarobnjaka za [name]
-FinishedLabelNoIcons=Instalacija je završila instaliranje programa [name].
-FinishedLabel=Instalacija je zavrÅ¡ila instaliranje programa [name]. Program se može pokrenuti pomoću instaliranih preÄaca.
-ClickFinish=Za izlaz iz instalacije pritisni "Završi".
-FinishedRestartLabel=Za zavrÅ¡avanje instaliranja programa [name], instalacija mora ponovo pokrenuti raÄunalo. ŽeliÅ¡ li sada ponovo pokrenuti raÄunalo?
-FinishedRestartMessage=Za zavrÅ¡avanje instaliranja programa [name], instalacija mora ponovo pokrenuti raÄunalo.%n%nŽeliÅ¡ li sada ponovo pokrenuti raÄunalo?
-ShowReadmeCheck=Da, želim proÄitati README datoteku
-YesRadio=&Da, sada ponovo pokrenuti raÄunalo
-NoRadio=&Ne, raÄunalo ću kasnije ponovo pokrenuti
-; used for example as 'Run MyProg.exe'
-RunEntryExec=Pokreni %1
-; used for example as 'View Readme.txt'
-RunEntryShellExec=Prikaži %1
-
-; *** "Setup Needs the Next Disk" stuff
-ChangeDiskTitle=Instalacija treba sljedeći disk
-SelectDiskLabel2=Umetni disk %1 i pritisni "U redu".%n%nAko se datoteke s ovog diska nalaze na nekom drugom mjestu od dolje prikazanog, upiši ispravnu stazu ili pritisni "Odaberi".
-PathLabel=&Staza:
-FileNotInDir2=Staza "%1" ne postoji u "%2". Umetni odgovarajući disk ili odaberi jednu drugu mapu.
-SelectDirectoryLabel=Odredi mjesto sljedećeg diska.
-
-; *** Installation phase messages
-SetupAborted=Instalacija nije završena.%n%nIspravi problem i ponovo pokreni instalaciju.
-AbortRetryIgnoreSelectAction=Odaberi radnju
-AbortRetryIgnoreRetry=&Pokušaj ponovo
-AbortRetryIgnoreIgnore=&Zanemari grešku i nastavi
-AbortRetryIgnoreCancel=Prekini s instaliranjem
-
-; *** Installation status messages
-StatusClosingApplications=Zatvaranje programa …
-StatusCreateDirs=Stvaranje mapa …
-StatusExtractFiles=Izdvajanje datoteka …
-StatusCreateIcons=Stvaranje preÄaca …
-StatusCreateIniEntries=Stvaranje INI unosa …
-StatusCreateRegistryEntries=Stvaranje unosa u registar …
-StatusRegisterFiles=Registriranje datoteka …
-StatusSavingUninstall=Spremanje podataka deinstalacije …
-StatusRunProgram=Završavanje instaliranja …
-StatusRestartingApplications=Ponovno pokretanje programa …
-StatusRollback=Poništavanje promjena …
-
-; *** Misc. errors
-ErrorInternal2=Interna greška: %1
-ErrorFunctionFailedNoCode=%1 – neuspjelo
-ErrorFunctionFailed=%1 – neuspjelo; kod %2
-ErrorFunctionFailedWithMessage=%1 – neuspjelo; kod %2.%n%3
-ErrorExecutingProgram=Nije moguće izvršiti datoteku:%n%1
-
-; *** Registry errors
-ErrorRegOpenKey=GreÅ¡ka prilikom otvaranja kljuÄa registra:%n%1\%2
-ErrorRegCreateKey=GreÅ¡ka prilikom stvaranja kljuÄa registra:%n%1\%2
-ErrorRegWriteKey=GreÅ¡ka prilikom pisanja u kljuÄ registra:%n%1\%2
-
-; *** INI errors
-ErrorIniEntry=Greška prilikom stvaranja INI unosa u datoteci "%1".
-
-; *** File copying errors
-FileAbortRetryIgnoreSkipNotRecommended=&PreskoÄi ovu datoteku (ne preporuÄuje se)
-FileAbortRetryIgnoreIgnoreNotRecommended=&Zanemari greÅ¡ku i nastavi (ne preporuÄuje se)
-SourceIsCorrupted=Izvorna datoteka je oštećena
-SourceDoesntExist=Izvorna datoteka "%1" ne postoji
-ExistingFileReadOnly2=Postojeću datoteku nije bilo moguće zamijeniti, jer je oznaÄena sa "samo-za-Äitanje".
-ExistingFileReadOnlyRetry=&Ukloni svojstvo "samo-za-Äitanje" i pokuÅ¡aj ponovo
-ExistingFileReadOnlyKeepExisting=&Zadrži postojeću datoteku
-ErrorReadingExistingDest=Pojavila se greÅ¡ka prilikom pokuÅ¡aja Äitanja postojeće datoteke:
-FileExists=Datoteka već postoji.%n%nŽeliš li da je instalacija prepiše?
-ExistingFileNewer=Postojeća datoteka je novija od one, koju pokuÅ¡avaÅ¡ instalirati. PreporuÄuje se da zadržiÅ¡ postojeću datoteku.%n%nŽeliÅ¡ li zadržati postojeću datoteku?
-ErrorChangingAttr=Pojavila se greška prilikom pokušaja promjene svojstva postojeće datoteke:
-ErrorCreatingTemp=Pojavila se greška prilikom pokušaja stvaranja datoteke u odredišnoj mapi:
-ErrorReadingSource=Pojavila se greÅ¡ka prilikom pokuÅ¡aja Äitanja izvoriÅ¡ne datoteke:
-ErrorCopying=Pojavila se greška prilikom pokušaja kopiranja datoteke:
-ErrorReplacingExistingFile=Pojavila se greška prilikom pokušaja zamijenjivanja datoteke:
-ErrorRestartReplace=Zamijenjivanje nakon ponovnog pokretanja nije uspjelo:
-ErrorRenamingTemp=Pojavila se greška prilikom pokušaja preimenovanja datoteke u odredišnoj mapi:
-ErrorRegisterServer=Nije moguće registrirati DLL/OCX: %1
-ErrorRegSvr32Failed=Greška u RegSvr32. Izlazni kod %1
-ErrorRegisterTypeLib=Nije moguće registrirati biblioteku vrsta: %1
-
-; *** Uninstall display name markings
-; used for example as 'My Program (32-bit)'
-UninstallDisplayNameMark=%1 (%2)
-; used for example as 'My Program (32-bit, All users)'
-UninstallDisplayNameMarks=%1 (%2, %3)
-UninstallDisplayNameMark32Bit=32-bitni
-UninstallDisplayNameMark64Bit=64-bitni
-UninstallDisplayNameMarkAllUsers=Svi korisnici
-UninstallDisplayNameMarkCurrentUser=TrenutaÄni korisnik
-
-; *** Post-installation errors
-ErrorOpeningReadme=Pojavila se greška prilikom pokušaja otvaranja README datoteke.
-ErrorRestartingComputer=Instalacija nije mogla ponovo pokrenuti raÄunalo. UÄini to ruÄno.
-
-; *** Uninstaller messages
-UninstallNotFound=Datoteka "%1" ne postoji. Deinstaliranje nije moguće.
-UninstallOpenError=Datoteku "%1" nije bilo moguće otvoriti. Deinstaliranje nije moguće
-UninstallUnsupportedVer=Deinstalacijska datoteka "%1" je u formatu koji ova verzija deinstalacijskog programa ne prepoznaje. Deinstaliranje nije moguće
-UninstallUnknownEntry=Pronađen je nepoznat zapis (%1) u deinstalacijskoj datoteci
-ConfirmUninstall=Zaista želiš ukloniti %1 i sve pripadajuće komponente?
-UninstallOnlyOnWin64=Ovu instalaciju je moguće ukloniti samo na 64-bitnom Windows sustavu.
-OnlyAdminCanUninstall=Ovu instalaciju može ukloniti samo korisnik s administratorskim pravima.
-UninstallStatusLabel=PriÄekaj dok se %1 uklanja s raÄunala.
-UninstalledAll=%1 je uspjeÅ¡no uklonjen s raÄunala.
-UninstalledMost=Deinstaliranje programa %1 je zavrÅ¡eno.%n%nNeke elemente nije bilo moguće ukloniti. Oni se mogu ukloniti ruÄno.
-UninstalledAndNeedsRestart=Za zavrÅ¡avanje deinstaliranja programa %1, potrebno je ponovo pokrenuti raÄunalo.%n%nŽeliÅ¡ li to sada uÄiniti?
-UninstallDataCorrupted="%1" datoteka je oštećena. Deinstaliranje nije moguće
-
-; *** Uninstallation phase messages
-ConfirmDeleteSharedFileTitle=Ukloniti dijeljene datoteke?
-ConfirmDeleteSharedFile2=Sustav ukazuje na to, da sljedeću dijeljenu datoteku ne koristi niti jedan program. Želiš li ukloniti tu dijeljenu datoteku?%n%nAko neki programi i dalje koriste tu datoteku, a ona se izbriše, ti programi neće ispravno raditi. Ako ne znaš, odaberi "Ne". Datoteka neće štetiti tvom sustavu.
-SharedFileNameLabel=Datoteka:
-SharedFileLocationLabel=Mjesto:
-WizardUninstalling=Stanje deinstalacije
-StatusUninstalling=%1 deinstaliranje …
-
-; *** Shutdown block reasons
-ShutdownBlockReasonInstallingApp=%1 instaliranje.
-ShutdownBlockReasonUninstallingApp=%1 deinstaliranje.
-
-; The custom messages below aren't used by Setup itself, but if you make
-; use of them in your scripts, you'll want to translate them.
-
-[CustomMessages]
-
-NameAndVersion=%1 verzija %2
-AdditionalIcons=Dodatni preÄaci:
-CreateDesktopIcon=Stvori preÄac na ra&dnoj povrÅ¡ini
-CreateQuickLaunchIcon=Stvori preÄac u traci za &brzo pokretanje
-ProgramOnTheWeb=%1 na internetu
-UninstallProgram=Deinstaliraj %1
-LaunchProgram=Pokreni %1
-AssocFileExtension=&Poveži program %1 s datoteÄnim nastavkom %2
-AssocingFileExtension=Povezivanje programa %1 s datoteÄnim nastavkom %2 …
-AutoStartProgramGroupDescription=Pokretanje:
-AutoStartProgram=Automatski pokreni %1
-AddonHostProgramNotFound=%1 nije nađen u odabranoj mapi.%n%nŽeliš li svejedno nastaviti?
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index e188357..4b69bd6 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -491,7 +491,7 @@ Name: "ca"; MessagesFile: "compiler:Languages\Catalan.isl"; InfoAfterFile: "@INS
Name: "de"; MessagesFile: "compiler:Languages\German.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-de.win32-bin.txt"
Name: "el"; MessagesFile: "compiler:Languages\Greek.isl"
Name: "fr"; MessagesFile: "compiler:Languages\French.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-fr.win32-bin.txt"
-Name: "hr"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Croatian-6.0.3.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-hr.win32-bin.txt"
+Name: "hr"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Croatian-5.5.3.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-hr.win32-bin.txt"
Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-it.win32-bin.txt"
Name: "ja"; MessagesFile: "compiler:Languages\Japanese.isl"
Name: "lv"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Latvian-5.5.0.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-lv.win32-bin.txt"
commit 0f08ef0c8dcf86f865a120b39fd84ec55c30fa4c
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Apr 26 15:15:36 2020 -0700
Fix GTEST_ROOT definition on Gnucash-unstable.
diff --git a/gnucash.modules b/gnucash.modules
index 439d87c..2b08d9b 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -294,7 +294,7 @@
</cmake>
<cmake id="gnucash-unstable"
- cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DALLOW_OLD_GETTEXT=ON">
+ cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/ -DALLOW_OLD_GETTEXT=ON">
<branch module="project/gnucash/gnucash%20%28unstable%29/3.901/gnucash-3.901.tar.bz2"
repo="sourceforge" version="3.901"/>
<dependencies>
commit 6c8510dff7018ec7698e9ee36b2fc00c49520232
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Apr 26 09:26:40 2020 -0700
Create new unstable branch.
diff --git a/gnucash.modules b/gnucash.modules
index e44b044..439d87c 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -293,6 +293,23 @@
</dependencies>
</cmake>
+ <cmake id="gnucash-unstable"
+ cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DALLOW_OLD_GETTEXT=ON">
+ <branch module="project/gnucash/gnucash%20%28unstable%29/3.901/gnucash-3.901.tar.bz2"
+ repo="sourceforge" version="3.901"/>
+ <dependencies>
+ <dep package="libofx"/>
+ <dep package="aqbanking"/>
+ <dep package="libdbi-drivers"/>
+ <!--dep package="shared-mime-info"/-->
+ <!--dep package="iso-codes"/-->
+ <dep package="guile2"/>
+ <!--dep package="swig"/-->
+ <dep package="boost"/>
+ <dep package="googletest"/>
+ </dependencies>
+ </cmake>
+
<cmake id="gnucash-git"
cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DALLOW_OLD_GETTEXT=ON -DCMAKE_BUILD_TYPE=Debug">
<branch repo="github" module="Gnucash/gnucash.git" revision="master"
@@ -327,6 +344,13 @@
version="3.10" repo="sourceforge"/>
</autotools>
+ <autotools id="gnucash-unstable-docs"
+ autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
+ makeargs="chm" makeinstallargs="install-chm" >
+ <branch module="project/gnucash/gnucash%20%28unstable%29/3.901/gnucash-docs-3.901.tar.gz"
+ version="3.901" repo="sourceforge"/>
+ </autotools>
+
<metamodule id="meta-gnucash-git">
<dependencies>
<dep package="gnucash-git"/>
@@ -337,7 +361,14 @@
<metamodule id="meta-gnucash">
<dependencies>
<dep package="gnucash"/>
- <dep package="gnucash-docs-git"/>
+ <dep package="gnucash-docs"/>
+ </dependencies>
+ </metamodule>
+
+ <metamodule id="meta-gnucash-unstable">
+ <dependencies>
+ <dep package="gnucash-unstable"/>
+ <dep package="gnucash-unstable-docs"/>
</dependencies>
</metamodule>
diff --git a/jhbuildrc.in b/jhbuildrc.in
index c1a4d1f..4a514e3 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -71,6 +71,8 @@ else:
if _branch == 'releases':
modules = ["meta-gnucash"]
+elif _branch == 'unstable':
+ modules = ['meta-gnucash-unstable']
else:
modules = ["meta-gnucash-git"]
branches['gnucash-git'] = (None, _branch)
@@ -81,7 +83,8 @@ append_autogenargs("libdbi-drivers","--with-dbi-incdir=" + prefix + "/include --
module_makeargs["aqbanking"]="-j 1"
module_extra_env["gnucash"]={'GUILE_LOAD_PATH':os.path.join(prefix, 'share', 'guile', '2.2'), 'GUILE_LOAD_COMPILED_PATH':os.path.join(prefix, 'lib', 'guile', '2.2', 'ccache')}
+module_extra_env["gnucash-unstable"]={'GUILE_LOAD_PATH':os.path.join(prefix, 'share', 'guile', '2.2'), 'GUILE_LOAD_COMPILED_PATH':os.path.join(prefix, 'lib', 'guile', '2.2', 'ccache')}
module_extra_env["gnucash-git"]={'GUILE_LOAD_PATH':os.path.join(prefix, 'share', 'guile', '2.2'), 'GUILE_LOAD_COMPILED_PATH':os.path.join(prefix, 'lib', 'guile', '2.2', 'ccache')}
-if _branch == 'master':
+if _branch in ('master', 'unstable'):
module_cmakeargs["gnucash-git"]=('-DGTEST_ROOT=$SRCROOT/googletest')
commit 95d8a5807bbffd7ba6046bc4b70cf0d601ce1ad8
Merge: 70231d7 6f8e441
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Apr 26 09:05:49 2020 -0700
Merge 'milotype-inno-6-0-3' into master.
https://github.com/Gnucash/gnucash-on-windows/pull/38
commit 6f8e441c0ab7d3b9245e8cf422c6d07d15c4abb9
Author: milotype <43657314+milotype at users.noreply.github.com>
Date: Fri Apr 24 00:45:03 2020 +0200
Delete Croatian-5.5.3.isl
Delete 5.5.3, because I've updated it to 6.0.3
diff --git a/inno_setup/Croatian-5.5.3.isl b/inno_setup/Croatian-5.5.3.isl
deleted file mode 100644
index e05ba3c..0000000
--- a/inno_setup/Croatian-5.5.3.isl
+++ /dev/null
@@ -1,340 +0,0 @@
-; *** Inno Setup version 5.5.3+ Croatian messages ***
-; Translated by: Elvis Gambiraža (el.gambo at gmail.com)
-; Based on translation by Krunoslav Kanjuh (krunoslav.kanjuh at zg.t-com.hr)
-;
-; To download user-contributed translations of this file, go to:
-; http://www.jrsoftware.org/files/istrans/
-;
-; Note: When translating this text, do not add periods (.) to the end of
-; messages that didn't have them already, because on those messages Inno
-; Setup adds the periods automatically (appending a period would result in
-; two periods being displayed).
-
-[LangOptions]
-; The following three entries are very important. Be sure to read and
-; understand the '[LangOptions] section' topic in the help file.
-LanguageName=Hrvatski
-LanguageID=$041a
-LanguageCodePage=1250
-; If the language you are translating to requires special font faces or
-; sizes, uncomment any of the following entries and change them accordingly.
-;DialogFontName=MS Shell Dlg
-;DialogFontSize=8
-;WelcomeFontName=Arial
-;WelcomeFontSize=12
-;TitleFontName=Arial
-;TitleFontSize=29
-;CopyrightFontName=Arial
-;CopyrightFontSize=8
-
-[Messages]
-
-; *** Application titles
-SetupAppTitle=Instalacija
-SetupWindowTitle=Instalacija - %1
-UninstallAppTitle=Deinstalacija
-UninstallAppFullTitle=Deinstalacija programa %1
-
-; *** Misc. common
-InformationTitle=Informacija
-ConfirmTitle=Potvrda
-ErrorTitle=Greška
-
-; *** SetupLdr messages
-SetupLdrStartupMessage=Zapoèeli ste instalaciju programa %1. Želite li nastaviti?
-LdrCannotCreateTemp=Ne mogu kreirati privremenu datoteku. Instalacija je prekinuta.
-LdrCannotExecTemp=Ne mogu pokrenuti datoteku u privremenoj mapi. Instalacija je prekinuta.
-
-; *** Startup error messages
-LastErrorMessage=%1.%n%nGreška %2: %3
-SetupFileMissing=Datoteka %1 se ne nalazi u instalacijskoj mapi. Ispravite problem ili nabavite novu kopiju programa.
-SetupFileCorrupt=Instalacijske datoteke su ošteæene. Nabavite novu kopiju programa.
-SetupFileCorruptOrWrongVer=Instalacijske datoteke su ošteæene, ili nisu kompatibilne s ovom verzijom instalacije. Ispravite problem ili nabavite novu kopiju programa.
-InvalidParameter=Neispravan parametar je prenijet na komandnu liniju: %n%n%1
-SetupAlreadyRunning=Instalacija je veæ pokrenuta.
-WindowsVersionNotSupported=Program ne podržava verziju Windowsa koju koristite.
-WindowsServicePackRequired=Program zahtijeva %1 servisni paket %2 ili noviji.
-NotOnThisPlatform=Ovaj program neæe raditi na %1.
-OnlyOnThisPlatform=Ovaj program se mora pokrenuti na %1.
-OnlyOnTheseArchitectures=Ovaj program može biti instaliran na verziji Windowsa dizajniranim za sljedeæu procesorsku arhitekturu:%n%n%1
-MissingWOW64APIs=Ova verzija Windowsa ne posjeduje funkcije koje zahtjeva instalacija za 64-bitnu instalaciju. Kako bi riješili problem instalirajte servisni paket %1.
-WinVersionTooLowError=Ovaj program zahtijeva %1 verziju %2 ili noviju.
-WinVersionTooHighError=Ovaj program ne može biti instaliran na %1 verziji %2 ili novijoj.
-AdminPrivilegesRequired=Morate biti prijavljeni kao administrator prilikom pokretanja ovog programa.
-PowerUserPrivilegesRequired=Morate biti prijavljeni kao administrator ili èlan grupe Power Users prilikom instaliranja ovog programa.
-SetupAppRunningError=Instalacija je otkrila da je %1 pokrenut.%n%nZatvorite program i potom kliknite Dalje za nastavak ili Odustani za prekid instalacije.
-UninstallAppRunningError=Deinstalacija je otkrila da je %1 pokrenut.%n%nZatvorite program i potom kliknite Dalje za nastavak ili Odustani za prekid instalacije.
-
-; *** Misc. errors
-ErrorCreatingDir=Instalacija nije mogla kreirati mapu "%1".
-ErrorTooManyFilesInDir=Instalacija nije mogla kreirati datoteku u mapi "%1" zato što ona sadrži previše datoteka.
-
-; *** Setup common messages
-ExitSetupTitle=Prekid instalacije
-ExitSetupMessage=Instalacija nije završena. Ako sad izaðete, program neæe biti instaliran.%n%nInstalaciju možete pokrenuti kasnije ukoliko ju želite završiti.%n%nPrekid instalacije?
-AboutSetupMenuItem=&O programu
-AboutSetupTitle=Podaci o programu
-AboutSetupMessage=%1 verzija %2%n%3%n%n%1 home page:%n%4
-AboutSetupNote=
-TranslatorNote=Translated by: Elvis Gambiraža
-
-; *** Buttons
-ButtonBack=< Na&trag
-ButtonNext=Na&stavak >
-ButtonInstall=&Instaliraj
-ButtonOK=&U redu
-ButtonCancel=&Otkaži
-ButtonYes=&Da
-ButtonYesToAll=D&a za sve
-ButtonNo=&Ne
-ButtonNoToAll=N&e za sve
-ButtonFinish=&Završi
-ButtonBrowse=&Odaberi...
-ButtonWizardBrowse=O&daberi...
-ButtonNewFolder=&Kreiraj novu mapu
-
-; *** "Select Language" dialog messages
-SelectLanguageTitle=Izaberite jezik
-SelectLanguageLabel=Izberite jezik koji želite koristiti pri instalaciji:
-
-; *** Common wizard text
-ClickNext=Kliknite na Nastavak za nastavak ili Otkaži za prekid instalacije.
-BeveledLabel=
-BrowseDialogTitle=Odabir mape
-BrowseDialogLabel=Odaberite mapu iz liste koja slijedi te kliknite OK.
-NewFolderName=Nova mapa
-
-; *** "Welcome" wizard page
-WelcomeLabel1=Dobro došli u instalaciju programa [name]
-WelcomeLabel2=Ovaj program æe instalirati [name/ver] na vaše raèunalo.%n%nPreporuèamo da zatvorite sve programe prije nego nastavite dalje.
-
-; *** "Password" wizard page
-WizardPassword=Lozinka
-PasswordLabel1=Instalacija je zaštiæena lozinkom.
-PasswordLabel3=Upišite lozinku i kliknite Nastavak. Lozinke su osjetljive na mala i velika slova.
-PasswordEditLabel=&Lozinka:
-IncorrectPassword=Upisana je pogrešna lozinka. Pokušajte ponovo.
-
-; *** "License Agreement" wizard
-WizardLicense=Ugovor o korištenju
-LicenseLabel=Molimo prije nastavka pažljivo proèitajte sljedeæe važne informacije.
-LicenseLabel3=Molimo pažljivo proèitajte Ugovor o korištenju. Morate prihvatiti uvjete ugovora kako bi mogli nastaviti s instalacijom.
-LicenseAccepted=&Prihvaæam ugovor
-LicenseNotAccepted=&Ne prihvaæam ugovor
-
-; *** "Information" wizard pages
-WizardInfoBefore=Informacije
-InfoBeforeLabel=Proèitajte sljedeæe važne informacije prije nastavka.
-InfoBeforeClickLabel=Kada budete spremni nastaviti instalaciju kliknite Nastavak.
-WizardInfoAfter=Informacije
-InfoAfterLabel=Proèitajte sljedeæe važne informacije prije nastavka.
-InfoAfterClickLabel=Kada budete spremni nastaviti instalaciju kliknite Nastavak.
-
-; *** "User Information" wizard page
-WizardUserInfo=Informacije o korisniku
-UserInfoDesc=Upišite informacije o vama.
-UserInfoName=&Ime korisnika:
-UserInfoOrg=&Organizacija:
-UserInfoSerial=&Serijski broj:
-UserInfoNameRequired=Morate upisati ime.
-
-; *** "Select Destination Location" wizard page
-WizardSelectDir=Odaberite odredišnu mapu
-SelectDirDesc=Mapa u koju æe biti instaliran program.
-SelectDirLabel3=Instalacija æe instalirati [name] u sljedeæu mapu
-SelectDirBrowseLabel=Za nastavak kliknite na Nastavak. Ako želite odabrati drugu mapu kliknite na Odaberi.
-DiskSpaceMBLabel=Ovaj program zahtjeva minimalno [mb] MB slobodnog prostora na disku.
-CannotInstallToNetworkDrive=Instalacija ne može instalirati na mrežnu jedinicu.
-CannotInstallToUNCPath=Instalacija ne može instalirati na UNC putanju.
-InvalidPath=Morate unijeti punu stazu zajedno sa slovom diska (npr.%n%nC:\APP%n%nili stazu u obliku%n%n\\server\share)
-InvalidDrive=Disk koji ste odabrali ne postoji. Odaberite neki drugi.
-DiskSpaceWarningTitle=Nedovoljno prostora na disku
-DiskSpaceWarning=Instalacija zahtjeva bar %1 KB slobodnog prostora, a odabrani disk ima samo %2 KB na raspolaganju.%n%nŽelite li nastaviti?
-DirNameTooLong=Predugaèak naziv mape ili staze.
-InvalidDirName=Naziv mape je pogrešan.
-BadDirName32=Naziv mape ne smije sadržavati niti jedan od sljedeæih znakova nakon toèke:%n%n%1
-DirExistsTitle=Mapa veæ postoji
-DirExists=Mapa:%n%n%1%n%nveæ postoji. Želite li instalirati u nju?
-DirDoesntExistTitle=Mapa ne postoji
-DirDoesntExist=Mapa:%n%n%1%n%nne postoji. Želite li ju napraviti?
-
-; *** "Select Components" wizard page
-WizardSelectComponents=Odaberite komponente
-SelectComponentsDesc=Koje komponente želite instalirati?
-SelectComponentsLabel2=Odaberite komponente koje želite instalirati, odnosno uklonite kvaèicu uz komponente koje ne želite:
-FullInstallation=Puna instalacija
-
-; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
-CompactInstallation=Kompaktna instalacija
-CustomInstallation=Instalacija po izboru
-NoUninstallWarningTitle=Postojeæe komponente
-NoUninstallWarning=Instalacija je utvrdila da na vašem raèunalu veæ postoje sljedeæe komponente:%n%n%1%n%nNeodabir tih komponenata ne dovodi do njihove deinstalacije.%n%nŽelite li ipak nastaviti?
-ComponentSize1=%1 KB
-ComponentSize2=%1 MB
-ComponentsDiskSpaceMBLabel=Vaš izbor zahtijeva najmanje [mb] MB prostora na disku.
-
-; *** "Select Additional Tasks" wizard page
-WizardSelectTasks=Odaberite zadatke
-SelectTasksDesc=Koje dodatne zadatke želite izvršiti?
-SelectTasksLabel2=Odaberite zadatke koji æe se izvršiti tijekom instalacije programa [name].
-
-; *** "Select Start Menu Folder" wizard page
-WizardSelectProgramGroup=Odaberite programsku grupu
-SelectStartMenuFolderDesc=Lokacija preèice programa
-SelectStartMenuFolderLabel3=Instalacija æe kreirati preèice za programe u sljedeæoj Start Menu mapi
-SelectStartMenuFolderBrowseLabel=Kako bi nastavili, kliknite na Nastavak. Ako želite odabrati drugu mapu klikni na Odabir.
-MustEnterGroupName=Morate unijeti ime programske grupe.
-GroupNameTooLong=Predugi naziv mape ili staze.
-InvalidGroupName=Naziv mape je pogrešan.
-BadGroupName=Ime programske grupe ne smije sadržavati sljedeæe znakove:%n%n%1
-NoProgramGroupCheck2=&Ne kreiraj %1 programsku grupu
-
-; *** "Ready to Install" wizard page
-WizardReady=Instalacija je spremna
-ReadyLabel1=Instalacija je spremna instalirati [name] na vaše raèunalo.
-ReadyLabel2a=Kliknite na Instaliraj ako želite instalirati program ili na Nazad ako želite pregledati ili promijeniti postavke.
-ReadyLabel2b=Kliknite na Instaliraj ako želite instalirati program.
-ReadyMemoUserInfo=Korisnièki podaci:
-ReadyMemoDir=Odredišna mapa:
-ReadyMemoType=Tip instalacije:
-ReadyMemoComponents=Odabrane komponente:
-ReadyMemoGroup=Programska grupa:
-ReadyMemoTasks=Dodatni zadaci:
-
-; *** "Preparing to Install" wizard page
-WizardPreparing=Priprema instalacije
-PreparingDesc=Instalacija se priprema za instaliranje [name] na vaše raèunalo.
-PreviousInstallNotCompleted=Instalacija/deinstalacija prethodnog programa nije završena. Morate restartati raèunalo kako bi završili tu instalaciju.%n%nNakon restartanja raèunala, ponovno pokrenite Setup kako bi dovršili instalaciju [name].
-CannotContinue=Instalacija ne može nastaviti. Kliknite na Odustani za izlaz.
-ApplicationsFound=Sljedeæi programi koriste datoteke koje instalacijski program treba ažurirati. Preporuèujemo da dopustite instalacijskom programu da zatvori ove programe.
-ApplicationsFound2=Sljedeæi programi koriste datoteke koje instalacijski program treba ažurirati. Preporuèujemo da dopustite instalacijskom programu da zatvori ove programe.
-CloseApplications=&Zatvori programe
-DontCloseApplications=&Ne zatvaraj programe
-ErrorCloseApplications=Ne mogu zatvoriti sve programe. Prije nego nastavite, preporuèujemo da zatvorite sve programe koji koriste datoteke koje instalacijski program treba ažurirati.
-
-; *** "Installing" wizard page
-WizardInstalling=Instaliranje
-InstallingLabel=Prièekajte dok ne završi instalacija programa [name] na vaše raèunalo.
-
-; *** "Setup Completed" wizard page
-FinishedHeadingLabel=Završetak instalacije [name]
-FinishedLabelNoIcons=Instalacija programa [name] je završena.
-FinishedLabel=Instalacija programa [name] je završena. Program možete pokrenuti preko instaliranih ikona.
-ClickFinish=Kliknite na Završi kako biste izašli iz instalacije.
-FinishedRestartLabel=Kako biste instalaciju programa [name] završili, potrebno je ponovno pokrenuti raèunalo. Želite li to sada uèiniti?
-FinishedRestartMessage=Završetak instalacija programa [name], zahtijeva ponovno pokretanje raèunala.%n%nŽelite li to uèiniti sada?
-ShowReadmeCheck=Da, želim proèitati README datoteku
-YesRadio=&Da, želim sada ponovno pokrenuti raèunalo
-NoRadio=&Ne, kasnije æu ga ponovno pokrenuti
-
-; used for example as 'Run MyProg.exe'
-RunEntryExec=&Pokreni %1
-
-; used for example as 'View Readme.txt'
-RunEntryShellExec=Pogledaj %1
-
-; *** "Setup Needs the Next Disk" stuff
-ChangeDiskTitle=Instalacija treba sljedeæi disk
-SelectDiskLabel2=Umetnite disketu %1 i kliknite na OK.%n%nAko se datoteke s ove diskete nalaze na nekom drugom mediju %2 , upišite ispravnu stazu do njega ili kliknite na Odaberi.
-PathLabel=&Staza:
-FileNotInDir2=Datoteka "%1" ne postoji u "%2". Molimo ubacite odgovarajuæi disk ili odaberete drugi %3.
-SelectDirectoryLabel=Odaberite lokaciju sljedeæeg diska.
-
-; *** Installation phase messages
-SetupAborted=Instalacija nije završena.%n%nIspravite problem i opet pokrenite instalaciju.
-EntryAbortRetryIgnore=Kliknite na Ponovi za novi pokušaj, Ignoriraj za nastavak, ili Prekid za prekid instalacije.
-
-; *** Installation status messages
-StatusClosingApplications=Zatvaram programe...
-StatusCreateDirs=Kreiram mape...
-StatusExtractFiles=Izdvajam datoteke...
-StatusCreateIcons=Kreiram ikone...
-StatusCreateIniEntries=Kreiram INI datoteke...
-StatusCreateRegistryEntries=Kreiram podatke za registry...
-StatusRegisterFiles=Registriram datoteke...
-StatusSavingUninstall=Snimam deinstalacijske informacije...
-StatusRunProgram=Završavam instalaciju...
-StatusRestartingApplications=Ponovo pokreæem programe...
-StatusRollback=Poništavam promjene...
-
-; *** Misc. errors
-ErrorInternal2=Interna greška: %1
-ErrorFunctionFailedNoCode=%1 nije uspjelo
-ErrorFunctionFailed=%1 nije uspjelo; kod %2
-ErrorFunctionFailedWithMessage=%1 nije uspjelo; kod %2.%n%3
-ErrorExecutingProgram=Ne mogu pokrenuti datoteku:%n%1
-
-; *** Registry errors
-ErrorRegOpenKey=Greška pri otvaranju registry kljuèa:%n%1\%2
-ErrorRegCreateKey=Greška pri kreiranju registry kljuèa:%n%1\%2
-ErrorRegWriteKey=Greška pri pisanju u registry kljuè:%n%1\%2
-
-; *** INI errors
-ErrorIniEntry=Greška pri kreiranju INI podataka u datoteci "%1".
-
-; *** File copying errors
-FileAbortRetryIgnore=Kliknite Ponovi za novi pokušaj, Ignoriraj za preskok ove datoteke (ne preporuèa se), ili Prekid za prekid instalacije.
-FileAbortRetryIgnore2=Kliknite Ponovi za novi pokušaj, Ignoriraj za nastavak u svakom sluèaju (ne preporuèa se), ili Prekid za prekid instalacije
-SourceIsCorrupted=Izvorišna datoteka je ošteæena
-SourceDoesntExist=Izvorišna datoteka "%1" ne postoji
-ExistingFileReadOnly=Postojeæa datoteka je oznaèena "samo-za-èitanje".%n%nKliknite Ponovi kako biste uklonili oznaku "samo-za-èitanje" i pokušajte ponovno, Ignoriraj za preskok ove datoteke, ili Prekid za prekid instalacije.
-ErrorReadingExistingDest=Pojavila se greška prilikom pokušaja èitanja postojeæe datoteke:
-FileExists=Datoteka veæ postoji.%n%nŽelite li ju zamijeniti?
-ExistingFileNewer=Postojeæa datoteka je novija od one koju pokušavate instalirati. Preporuèa se zadržati postojeæu datoteku.%n%nŽelite li zadržati postojeæu datoteku?
-ErrorChangingAttr=Pojavila se greška prilikom pokušaja promjene atributa postojeæe datoteke:
-ErrorCreatingTemp=Pojavila se greška prilikom pokušaja kreiranja datoteke u odredišnoj mapi:
-ErrorReadingSource=Pojavila se greška prilikom pokušaja èitanja izvorišne datoteke:
-ErrorCopying=Pojavila se greška prilikom pokušaja kopiranja datoteke:
-ErrorReplacingExistingFile=Pojavila se greška prilikom pokušaja zamjene datoteke:
-ErrorRestartReplace=Zamjena nakon ponovnog pokretanja nije uspjela:
-ErrorRenamingTemp=Pojavila se greška prilikom pokušaja preimenovanja datoteke u odredišnoj mapi:
-ErrorRegisterServer=Ne mogu registrirati DLL/OCX: %1
-ErrorRegSvr32Failed=Greška u RegSvr32: greška %1
-ErrorRegisterTypeLib=Ne mogu registrirati type library: %1
-
-; *** Post-installation errors
-ErrorOpeningReadme=Pojavila se greška prilikom pokušaja otvaranja README datoteke.
-ErrorRestartingComputer=Instalacija ne može ponovno pokrenuti raèunalo. Uèinite to ruèno.
-
-; *** Uninstaller messages
-UninstallNotFound=Datoteka "%1" ne postoji. Deinstalacija prekinuta.
-UninstallOpenError=Datoteku "%1" ne mogu otvoriti. Deinstalacija nije moguæa.
-UninstallUnsupportedVer=Deinstalacijska datoteka "%1" je u formatu koji nije prepoznat od ove verzije deinstalacijskog programa. Nije moguæa deinstalacija.
-UninstallUnknownEntry=Nepoznat zapis (%1) je pronaðen u deinstalacijskoj datoteci.
-ConfirmUninstall=Želite li zaista ukloniti %1 i sve njegove komponente?
-UninstallOnlyOnWin64=Ova instalacija može biti uklonjena samo na 64-bitnim Windowsima.
-OnlyAdminCanUninstall=Ova instalacija može biti uklonjena samo od korisnika sa administratorskim pravima.
-UninstallStatusLabel=Prièekajte dok %1 ne bude uklonjen s vašeg raèunala.
-UninstalledAll=Program %1 je uspješno uklonjen sa vašeg raèunala.
-UninstalledMost=Deinstalacija programa %1 je završena.%n%nNeke elemente nije bilo moguæe ukloniti. Uèinite to ruèno.
-UninstalledAndNeedsRestart=Kako bi završili deinstalaciju %1, Vaše raèunalo morate ponovno pokrenuti%n%nŽelite li to uèiniti sada?
-UninstallDataCorrupted="%1" datoteka je ošteæena. Deinstalacija nije moguæa.
-
-; *** Uninstallation phase messages
-ConfirmDeleteSharedFileTitle=Brisanje dijeljene datoteke
-ConfirmDeleteSharedFile2=Sistem ukazuje da sljedeæe dijeljene datoteke ne koristi niti jedan program. Želite li ukloniti te dijeljene datoteke?%n%nAko neki programi i dalje koriste te datoteke, a one se izbrišu, ti programi neæe ispravno raditi. Ako niste sigurni, odaberite Ne. Ostavljanje datoteka neæe uzrokovati štetu vašem sistemu.
-SharedFileNameLabel=Datoteka:
-SharedFileLocationLabel=Staza:
-WizardUninstalling=Deinstalacija
-StatusUninstalling=Deinstaliram %1...
-; *** Shutdown block reasons
-ShutdownBlockReasonInstallingApp=Instaliram %1.
-ShutdownBlockReasonUninstallingApp=Deinstaliram %1.
-
-; The custom messages below aren't used by Setup itself, but if you make
-; use of them in your scripts, you'll want to translate them.
-
-[CustomMessages]
-
-NameAndVersion=%1 verzija %2
-AdditionalIcons=Dodatne ikone:
-CreateDesktopIcon=Kreiraj ikonu na &Desktopu
-CreateQuickLaunchIcon=Kreiraj ikonu u traci za brzo pokretanje
-ProgramOnTheWeb=%1 na internetu
-UninstallProgram=Deinstaliraj %1
-LaunchProgram=Pokreni %1
-AssocFileExtension=Pridru&ži %1 sa %2 ekstenzijom datoteke
-AssocingFileExtension=Pridružujem %1 sa %2 ekstenzijom datoteke
-AutoStartProgramGroupDescription=Pokretanje:
-AutoStartProgram=Automatski pokreni %1
-AddonHostProgramNotFound=%1 se ne nalazi u navedenoj mapi.%n%nŽelite li svejedno nastaviti?
\ No newline at end of file
commit 6f16d804c30c64f284baead2037ba2d58036acdf
Author: milotype <43657314+milotype at users.noreply.github.com>
Date: Fri Apr 24 00:42:45 2020 +0200
Update gnucash-mingw64.iss
Line 494: changed Croatian-5.3.3.isl to Croatian-6.0.3.isl
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 4b69bd6..e188357 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -491,7 +491,7 @@ Name: "ca"; MessagesFile: "compiler:Languages\Catalan.isl"; InfoAfterFile: "@INS
Name: "de"; MessagesFile: "compiler:Languages\German.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-de.win32-bin.txt"
Name: "el"; MessagesFile: "compiler:Languages\Greek.isl"
Name: "fr"; MessagesFile: "compiler:Languages\French.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-fr.win32-bin.txt"
-Name: "hr"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Croatian-5.5.3.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-hr.win32-bin.txt"
+Name: "hr"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Croatian-6.0.3.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-hr.win32-bin.txt"
Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-it.win32-bin.txt"
Name: "ja"; MessagesFile: "compiler:Languages\Japanese.isl"
Name: "lv"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Latvian-5.5.0.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-lv.win32-bin.txt"
commit 70231d70cb4e36949f2964c55ba45dd04c3c7a7b
Merge: 199afe1 d8535a3
Author: Geert Janssens <geert at kobaltwit.be>
Date: Wed Apr 22 19:42:44 2020 +0200
Merge branch 'swig-3' of https://github.com/fellen/gnucash-on-windows
commit 5466e779fa5060c2fceaa67f53c5d7d85ac62612
Author: milotype <43657314+milotype at users.noreply.github.com>
Date: Tue Apr 21 23:00:28 2020 +0200
Update Croatian inno setup file
This is a copy of the file I've sent to https://jrsoftware.org/files/istrans/
diff --git a/inno_setup/Croatian-6.0.3.isl b/inno_setup/Croatian-6.0.3.isl
new file mode 100644
index 0000000..55c7b5b
--- /dev/null
+++ b/inno_setup/Croatian-6.0.3.isl
@@ -0,0 +1,367 @@
+; *** Inno Setup version 6.0.3+ Croatian messages ***
+; Translated by: Milo Ivir (mail at milotype.de)
+; Based on translation by Elvis Gambiraža (el.gambo at gmail.com)
+; Based on translation by Krunoslav Kanjuh (krunoslav.kanjuh at zg.t-com.hr)
+;
+; To download user-contributed translations of this file, go to:
+; http://www.jrsoftware.org/files/istrans/
+;
+; Note: When translating this text, do not add periods (.) to the end of
+; messages that didn't have them already, because on those messages Inno
+; Setup adds the periods automatically (appending a period would result in
+; two periods being displayed).
+
+[LangOptions]
+; The following three entries are very important. Be sure to read and
+; understand the '[LangOptions] section' topic in the help file.
+LanguageName=Hrvatski
+LanguageID=$041a
+LanguageCodePage=1250
+; If the language you are translating to requires special font faces or
+; sizes, uncomment any of the following entries and change them accordingly.
+;DialogFontName=MS Shell Dlg
+;DialogFontSize=8
+;WelcomeFontName=Arial
+;WelcomeFontSize=12
+;TitleFontName=Arial
+;TitleFontSize=29
+;CopyrightFontName=Arial
+;CopyrightFontSize=8
+
+[Messages]
+
+; *** Application titles
+SetupAppTitle=Instalacija
+SetupWindowTitle=Instalacija – %1
+UninstallAppTitle=Deinstalacija
+UninstallAppFullTitle=Deinstalacija programa %1
+
+; *** Misc. common
+InformationTitle=Informacija
+ConfirmTitle=Potvrda
+ErrorTitle=Greška
+
+; *** SetupLdr messages
+SetupLdrStartupMessage=Ovime će se instalirati %1. Želiš li nastaviti?
+LdrCannotCreateTemp=Nije moguće stvoriti privremenu datoteku. Instalacija je prekinuta
+LdrCannotExecTemp=Nije moguće pokrenuti datoteku u privremenoj mapi. Instalacija je prekinuta
+HelpTextNote=
+
+; *** Startup error messages
+LastErrorMessage=%1.%n%nnGreška %2: %3
+SetupFileMissing=Datoteka %1 se ne nalazi u mapi instalacije. Ispravi problem ili nabavi novu kopiju programa.
+SetupFileCorrupt=Datoteke instalacije su oštećene. Nabavi novu kopiju programa.
+SetupFileCorruptOrWrongVer=Datoteke instalacije su oštećene ili nisu kompatibilne s ovom verzijom instalacije. Ispravi problem ili nabavi novu kopiju programa.
+InvalidParameter=Neispravan parametar je prenijet u naredbenom retku:%n%n%1
+SetupAlreadyRunning=Instalacija je već pokrenuta.
+WindowsVersionNotSupported=Program ne podržava Windows verziju koju koristiš.
+WindowsServicePackRequired=Program zahtijeva %1 servisni paket %2 ili noviji.
+NotOnThisPlatform=Program neće raditi na %1.
+OnlyOnThisPlatform=Program se mora pokrenuti na %1.
+OnlyOnTheseArchitectures=Program se može instalirati na Windows verzijama za sljedeće procesorske arhitekture:%n%n%1
+WinVersionTooLowError=Program zahtijeva %1 verziju %2 ili noviju.
+WinVersionTooHighError=Program se ne može instalirati na %1 verziji %2 ili novijoj.
+AdminPrivilegesRequired=Za instaliranje programa moraš biti prijavljen/a kao administrator.
+PowerUserPrivilegesRequired=Za instaliranje programa moraÅ¡ biti prijavljen/a kao administrator ili kao Älan grupe naprednih korisnika.
+SetupAppRunningError=Instalacija je otkrila da je %1 trenutaÄno pokrenut.%n%nZatvori program i potom pritisni "Dalje" za nastavak ili "Odustani" za prekid.
+UninstallAppRunningError=Deinstalacija je otkrila da je %1 trenutaÄno pokrenut.%n%nZatvori program i potom pritisni "Dalje" za nastavak ili "Odustani" za prekid.
+
+; *** Startup questions
+PrivilegesRequiredOverrideTitle=Odaberi naÄin instaliranja
+PrivilegesRequiredOverrideInstruction=Odaberi naÄin instaliranja
+PrivilegesRequiredOverrideText1=%1 se može instalirati za sve korisnike (potrebna su administratorska prava) ili samo za tebe.
+PrivilegesRequiredOverrideText2=%1 se može instalirati samo za tebe ili za sve korisnike (potrebna su administratorska prava).
+PrivilegesRequiredOverrideAllUsers=Instaliraj z&a sve korisnike
+PrivilegesRequiredOverrideAllUsersRecommended=Instaliraj z&a sve korisnike (preporuÄeno)
+PrivilegesRequiredOverrideCurrentUser=Instaliraj samo za &mene
+PrivilegesRequiredOverrideCurrentUserRecommended=Instaliraj samo za &mene (preporuÄeno)
+
+; *** Misc. errors
+ErrorCreatingDir=Instalacija nije mogla stvoriti mapu "%1"
+ErrorTooManyFilesInDir=Datoteku nije moguće stvoriti u mapi "%1", jer mapa sadrži previše datoteka
+
+; *** Setup common messages
+ExitSetupTitle=Prekini instalaciju
+ExitSetupMessage=Instalacija nije završena. Ako sad izađeš, program neće biti instaliran.%n%nInstalaciju možeš pokrenuti kasnije, ukoliko je želiš dovršiti.%n%nPrekinuti instalaciju?
+AboutSetupMenuItem=&O instalaciji …
+AboutSetupTitle=O instalaciji
+AboutSetupMessage=%1 verzija %2%n%3%n%n%1 poÄetna stranica:%n%4
+AboutSetupNote=
+TranslatorNote=Prevodioci:%n%nKrunoslav Kanjuh%n%nElvis Gambiraža%n%nMilo Ivir
+
+; *** Buttons
+ButtonBack=< Na&trag
+ButtonNext=&Dalje >
+ButtonInstall=&Instaliraj
+ButtonOK=U redu
+ButtonCancel=Odustani
+ButtonYes=&Da
+ButtonYesToAll=D&a za sve
+ButtonNo=&Ne
+ButtonNoToAll=N&e za sve
+ButtonFinish=&Završi
+ButtonBrowse=&Pretraži …
+ButtonWizardBrowse=Odabe&ri …
+ButtonNewFolder=&Stvori novu mapu
+
+; *** "Select Language" dialog messages
+SelectLanguageTitle=Odaberi jezik za instalaciju
+SelectLanguageLabel=Odaberi jezik koji želiš koristiti tijekom instaliranja.
+
+; *** Common wizard text
+ClickNext=Pritisni "Dalje" za nastavak ili "Odustani" za prekid instalacije.
+BeveledLabel=
+BrowseDialogTitle=Odaberi mapu
+BrowseDialogLabel=Odaberi mapu iz popisa i pritisni "U redu".
+NewFolderName=Nova mapa
+
+; *** "Welcome" wizard page
+WelcomeLabel1=ÄŒarobnjak za instalaciju programa [name]
+WelcomeLabel2=Ovime ćeÅ¡ instalirati [name/ver].%n%nPreporuÄujemo da zatvoriÅ¡ sve programe prije nego Å¡to nastaviÅ¡ dalje.
+
+; *** "Password" wizard page
+WizardPassword=Lozinka
+PasswordLabel1=Instalacija je zaštićena lozinkom.
+PasswordLabel3=Upiši lozinku i pritisni "Dalje". Lozinke su osjetljive na mala i velika slova.
+PasswordEditLabel=&Lozinka:
+IncorrectPassword=Upisana je pogrešna lozinka. Pokušaj ponovo.
+
+; *** "License Agreement" wizard page
+WizardLicense=Licencni ugovor
+LicenseLabel=Prije nego Å¡to nastaviÅ¡ dalje, pažljivo proÄitaj sljedeće važne informacije.
+LicenseLabel3=ProÄitaj licencni ugovor. MoraÅ¡ prihvatiti uvjete ugovora, ako želiÅ¡ nastaviti instalirati.
+LicenseAccepted=&Prihvaćam ugovor
+LicenseNotAccepted=&Ne prihvaćam ugovor
+
+; *** "Information" wizard pages
+WizardInfoBefore=Informacije
+InfoBeforeLabel=ProÄitaj sljedeće važne informacije prije nego Å¡to nastaviÅ¡ dalje.
+InfoBeforeClickLabel=Kad želiš nastaviti instalirati, pritisni "Dalje".
+WizardInfoAfter=Informacije
+InfoAfterLabel=ProÄitaj sljedeće važne informacije prije nego Å¡to nastaviÅ¡ dalje.
+InfoAfterClickLabel=Kad želiš nastaviti instalirati, pritisni "Dalje".
+
+; *** "User Information" wizard page
+WizardUserInfo=KorisniÄki podaci
+UserInfoDesc=Upiši svoje podatke.
+UserInfoName=&Ime korisnika:
+UserInfoOrg=&Organizacija:
+UserInfoSerial=&Serijski broj:
+UserInfoNameRequired=Ime je obavezno polje.
+
+; *** "Select Destination Location" wizard page
+WizardSelectDir=Odaberi odredišno mjesto
+SelectDirDesc=Gdje želiš instalirati [name]?
+SelectDirLabel3=[name] će se instalirati u sljedeću mapu.
+SelectDirBrowseLabel=Za nastavak instalacije, pritisni "Dalje". Za odabir jedne druge mape, pritisni "Odaberi".
+DiskSpaceGBLabel=Potrebno je barem [gb] GB slobodnog prostora na disku.
+DiskSpaceMBLabel=Potrebno je barem [mb] MB slobodnog prostora na disku.
+CannotInstallToNetworkDrive=Instalacija ne može instalirati na mrežnu jedinicu.
+CannotInstallToUNCPath=Instalacija ne može instalirati na UNC stazu.
+InvalidPath=Moraš upisati punu stazu zajedno sa slovom diska, npr.:%n%nC:\APP%n%nili UNC stazu u obliku:%n%n\\server\share
+InvalidDrive=Odabrani disk ne postoji. Odaberi jedan drugi.
+DiskSpaceWarningTitle=Nedovoljno prostora na disku
+DiskSpaceWarning=Instalacija treba barem %1 KB slobodnog prostora, no odabrani disk ima samo %2 KB.%n%nSvejedno nastaviti?
+DirNameTooLong=Naziv mape ili staze je predugaÄak.
+InvalidDirName=Naziv mape je neispravan.
+BadDirName32=Naziv mape ne smije sadržavati sljedeće znakove:%n%n%1
+DirExistsTitle=Mapa već postoji
+DirExists=Mapa:%n%n%1%n%nveć postoji. Želiš li svejedno u nju instalirati?
+DirDoesntExistTitle=Mapa ne postoji
+DirDoesntExist=Mapa:%n%n%1%n%nne postoji. Želiš li je stvoriti?
+
+; *** "Select Components" wizard page
+WizardSelectComponents=Odaberi komponente
+SelectComponentsDesc=Koje komponente želiš instalirati?
+SelectComponentsLabel2=Odaberi komponente koje želiÅ¡ instalirati, iskljuÄi komponente koje ne želiÅ¡ instalirati. Za nastavak instalacije pritisni "Dalje".
+FullInstallation=Kompletna instalacija
+; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
+CompactInstallation=Kompaktna instalacija
+CustomInstallation=Prilagođena instalacija
+NoUninstallWarningTitle=Postojeće komponente
+NoUninstallWarning=Instalacija je utvrdila da na tvom raÄunalu već postoje sljedeće komponente:%n%n%1%n%nIskljuÄivanjem tih komponenata, one se neće deinstalirati.%n%nŽeliÅ¡ li svejedno nastaviti?
+ComponentSize1=%1 KB
+ComponentSize2=%1 MB
+ComponentsDiskSpaceGBLabel=TrenutaÄni odabir zahtijeva barem [gb] GB na disku.
+ComponentsDiskSpaceMBLabel=TrenutaÄni odabir zahtijeva barem [mb] MB na disku.
+
+; *** "Select Additional Tasks" wizard page
+WizardSelectTasks=Odaberi dodatne zadatke
+SelectTasksDesc=Koje dodatne zadatke želiš izvršiti?
+SelectTasksLabel2=Odaberi zadatke koje želiš izvršiti tijekom instaliranja programa [name], zatim pritisni "Dalje".
+
+; *** "Select Start Menu Folder" wizard page
+WizardSelectProgramGroup=Odaberi mapu iz "Start" izbornika
+SelectStartMenuFolderDesc=Gdje želiÅ¡ da instalacija spremi programske preÄace?
+SelectStartMenuFolderLabel3=Instalacija će stvoriti programske preÄace u sljedeću mapu "Start" izbornika.
+SelectStartMenuFolderBrowseLabel=Ako želiš nastaviti, pritisni "Dalje". Ako želiš odabrati jednu drugu mapu, pritisni "Odaberi".
+MustEnterGroupName=Moraš upisati naziv mape.
+GroupNameTooLong=Naziv mape ili staze je predugaÄak.
+InvalidGroupName=Naziv mape nije ispravan.
+BadGroupName=Naziv mape ne smije sadržavati sljedeće znakove:%n%n%1
+NoProgramGroupCheck2=&Ne stvaraj mapu u "Start" izborniku
+
+; *** "Ready to Install" wizard page
+WizardReady=Sve je spremno za instaliranje
+ReadyLabel1=Instalacija je spremna za instaliranje programa [name].
+ReadyLabel2a=Pritisni "Instaliraj", ako želiš instalirati program. Pritisni "Natrag", ako želiš pregledati ili promijeniti postavke
+ReadyLabel2b=Pritisni "Instaliraj", ako želiš instalirati program.
+ReadyMemoUserInfo=KorisniÄki podaci:
+ReadyMemoDir=Odredišno mjesto:
+ReadyMemoType=Vrsta instalacije:
+ReadyMemoComponents=Odabrane komponente:
+ReadyMemoGroup=Mapa u "Start" izborniku:
+ReadyMemoTasks=Dodatni zadaci:
+
+; *** "Preparing to Install" wizard page
+WizardPreparing=Priprema za instaliranje
+PreparingDesc=Instalacija se priprema za instaliranje programa [name].
+PreviousInstallNotCompleted=Instaliranje/uklanjanje jednog prethodnog programa nije bilo gotovo. Morat ćeÅ¡ ponovo pokrenuti raÄunalo i dovrÅ¡iti to instaliranje.%n%nNakon ponovnog pokretanja raÄunala, pokreni instalaciju ponovo, kako bi se dovrÅ¡ilo instaliranje programa [name].
+CannotContinue=Instalacija ne može nastaviti rad. Pritisni "Odustani" za izlaz iz instalacije.
+ApplicationsFound=Sljedeći programi koriste datoteke koje instalacija mora aktualizirati. PreporuÄujemo da dopustiÅ¡ instalaciji zatvoriti ove programe.
+ApplicationsFound2=Sljedeći programi koriste datoteke koje instalacija mora aktualizirati. PreporuÄujemo da dopustiÅ¡ instalaciji zatvoriti ove programe. Kad instaliranje zavrÅ¡i, instalacija će pokuÅ¡ati ponovo pokrenuti programe.
+CloseApplications=&Zatvori programe automatski
+DontCloseApplications=&Ne zatvaraj programe
+ErrorCloseApplications=Instalacija nije uspjela automatski zatvoriti programe. PreporuÄujemo da zatvoriÅ¡ sve programe koji koriste datoteke koje se moraju aktualizirati.
+PrepareToInstallNeedsRestart=Instalacija mora ponovo pokrenuti raÄunalo. Nakon ponovnog pokretanja raÄunala, pokreni instalaciju ponovo, kako bi se dovrÅ¡ilo instaliranje programa [name].%n%nŽeliÅ¡ li sada ponovo pokrenuti raÄunalo?
+
+; *** "Installing" wizard page
+WizardInstalling=Instaliranje
+InstallingLabel=PriÄekaj dok ne zavrÅ¡i instaliranje programa [name].
+
+; *** "Setup Completed" wizard page
+FinishedHeadingLabel=ZavrÅ¡avanje instalacijskog Äarobnjaka za [name]
+FinishedLabelNoIcons=Instalacija je završila instaliranje programa [name].
+FinishedLabel=Instalacija je zavrÅ¡ila instaliranje programa [name]. Program se može pokrenuti pomoću instaliranih preÄaca.
+ClickFinish=Za izlaz iz instalacije pritisni "Završi".
+FinishedRestartLabel=Za zavrÅ¡avanje instaliranja programa [name], instalacija mora ponovo pokrenuti raÄunalo. ŽeliÅ¡ li sada ponovo pokrenuti raÄunalo?
+FinishedRestartMessage=Za zavrÅ¡avanje instaliranja programa [name], instalacija mora ponovo pokrenuti raÄunalo.%n%nŽeliÅ¡ li sada ponovo pokrenuti raÄunalo?
+ShowReadmeCheck=Da, želim proÄitati README datoteku
+YesRadio=&Da, sada ponovo pokrenuti raÄunalo
+NoRadio=&Ne, raÄunalo ću kasnije ponovo pokrenuti
+; used for example as 'Run MyProg.exe'
+RunEntryExec=Pokreni %1
+; used for example as 'View Readme.txt'
+RunEntryShellExec=Prikaži %1
+
+; *** "Setup Needs the Next Disk" stuff
+ChangeDiskTitle=Instalacija treba sljedeći disk
+SelectDiskLabel2=Umetni disk %1 i pritisni "U redu".%n%nAko se datoteke s ovog diska nalaze na nekom drugom mjestu od dolje prikazanog, upiši ispravnu stazu ili pritisni "Odaberi".
+PathLabel=&Staza:
+FileNotInDir2=Staza "%1" ne postoji u "%2". Umetni odgovarajući disk ili odaberi jednu drugu mapu.
+SelectDirectoryLabel=Odredi mjesto sljedećeg diska.
+
+; *** Installation phase messages
+SetupAborted=Instalacija nije završena.%n%nIspravi problem i ponovo pokreni instalaciju.
+AbortRetryIgnoreSelectAction=Odaberi radnju
+AbortRetryIgnoreRetry=&Pokušaj ponovo
+AbortRetryIgnoreIgnore=&Zanemari grešku i nastavi
+AbortRetryIgnoreCancel=Prekini s instaliranjem
+
+; *** Installation status messages
+StatusClosingApplications=Zatvaranje programa …
+StatusCreateDirs=Stvaranje mapa …
+StatusExtractFiles=Izdvajanje datoteka …
+StatusCreateIcons=Stvaranje preÄaca …
+StatusCreateIniEntries=Stvaranje INI unosa …
+StatusCreateRegistryEntries=Stvaranje unosa u registar …
+StatusRegisterFiles=Registriranje datoteka …
+StatusSavingUninstall=Spremanje podataka deinstalacije …
+StatusRunProgram=Završavanje instaliranja …
+StatusRestartingApplications=Ponovno pokretanje programa …
+StatusRollback=Poništavanje promjena …
+
+; *** Misc. errors
+ErrorInternal2=Interna greška: %1
+ErrorFunctionFailedNoCode=%1 – neuspjelo
+ErrorFunctionFailed=%1 – neuspjelo; kod %2
+ErrorFunctionFailedWithMessage=%1 – neuspjelo; kod %2.%n%3
+ErrorExecutingProgram=Nije moguće izvršiti datoteku:%n%1
+
+; *** Registry errors
+ErrorRegOpenKey=GreÅ¡ka prilikom otvaranja kljuÄa registra:%n%1\%2
+ErrorRegCreateKey=GreÅ¡ka prilikom stvaranja kljuÄa registra:%n%1\%2
+ErrorRegWriteKey=GreÅ¡ka prilikom pisanja u kljuÄ registra:%n%1\%2
+
+; *** INI errors
+ErrorIniEntry=Greška prilikom stvaranja INI unosa u datoteci "%1".
+
+; *** File copying errors
+FileAbortRetryIgnoreSkipNotRecommended=&PreskoÄi ovu datoteku (ne preporuÄuje se)
+FileAbortRetryIgnoreIgnoreNotRecommended=&Zanemari greÅ¡ku i nastavi (ne preporuÄuje se)
+SourceIsCorrupted=Izvorna datoteka je oštećena
+SourceDoesntExist=Izvorna datoteka "%1" ne postoji
+ExistingFileReadOnly2=Postojeću datoteku nije bilo moguće zamijeniti, jer je oznaÄena sa "samo-za-Äitanje".
+ExistingFileReadOnlyRetry=&Ukloni svojstvo "samo-za-Äitanje" i pokuÅ¡aj ponovo
+ExistingFileReadOnlyKeepExisting=&Zadrži postojeću datoteku
+ErrorReadingExistingDest=Pojavila se greÅ¡ka prilikom pokuÅ¡aja Äitanja postojeće datoteke:
+FileExists=Datoteka već postoji.%n%nŽeliš li da je instalacija prepiše?
+ExistingFileNewer=Postojeća datoteka je novija od one, koju pokuÅ¡avaÅ¡ instalirati. PreporuÄuje se da zadržiÅ¡ postojeću datoteku.%n%nŽeliÅ¡ li zadržati postojeću datoteku?
+ErrorChangingAttr=Pojavila se greška prilikom pokušaja promjene svojstva postojeće datoteke:
+ErrorCreatingTemp=Pojavila se greška prilikom pokušaja stvaranja datoteke u odredišnoj mapi:
+ErrorReadingSource=Pojavila se greÅ¡ka prilikom pokuÅ¡aja Äitanja izvoriÅ¡ne datoteke:
+ErrorCopying=Pojavila se greška prilikom pokušaja kopiranja datoteke:
+ErrorReplacingExistingFile=Pojavila se greška prilikom pokušaja zamijenjivanja datoteke:
+ErrorRestartReplace=Zamijenjivanje nakon ponovnog pokretanja nije uspjelo:
+ErrorRenamingTemp=Pojavila se greška prilikom pokušaja preimenovanja datoteke u odredišnoj mapi:
+ErrorRegisterServer=Nije moguće registrirati DLL/OCX: %1
+ErrorRegSvr32Failed=Greška u RegSvr32. Izlazni kod %1
+ErrorRegisterTypeLib=Nije moguće registrirati biblioteku vrsta: %1
+
+; *** Uninstall display name markings
+; used for example as 'My Program (32-bit)'
+UninstallDisplayNameMark=%1 (%2)
+; used for example as 'My Program (32-bit, All users)'
+UninstallDisplayNameMarks=%1 (%2, %3)
+UninstallDisplayNameMark32Bit=32-bitni
+UninstallDisplayNameMark64Bit=64-bitni
+UninstallDisplayNameMarkAllUsers=Svi korisnici
+UninstallDisplayNameMarkCurrentUser=TrenutaÄni korisnik
+
+; *** Post-installation errors
+ErrorOpeningReadme=Pojavila se greška prilikom pokušaja otvaranja README datoteke.
+ErrorRestartingComputer=Instalacija nije mogla ponovo pokrenuti raÄunalo. UÄini to ruÄno.
+
+; *** Uninstaller messages
+UninstallNotFound=Datoteka "%1" ne postoji. Deinstaliranje nije moguće.
+UninstallOpenError=Datoteku "%1" nije bilo moguće otvoriti. Deinstaliranje nije moguće
+UninstallUnsupportedVer=Deinstalacijska datoteka "%1" je u formatu koji ova verzija deinstalacijskog programa ne prepoznaje. Deinstaliranje nije moguće
+UninstallUnknownEntry=Pronađen je nepoznat zapis (%1) u deinstalacijskoj datoteci
+ConfirmUninstall=Zaista želiš ukloniti %1 i sve pripadajuće komponente?
+UninstallOnlyOnWin64=Ovu instalaciju je moguće ukloniti samo na 64-bitnom Windows sustavu.
+OnlyAdminCanUninstall=Ovu instalaciju može ukloniti samo korisnik s administratorskim pravima.
+UninstallStatusLabel=PriÄekaj dok se %1 uklanja s raÄunala.
+UninstalledAll=%1 je uspjeÅ¡no uklonjen s raÄunala.
+UninstalledMost=Deinstaliranje programa %1 je zavrÅ¡eno.%n%nNeke elemente nije bilo moguće ukloniti. Oni se mogu ukloniti ruÄno.
+UninstalledAndNeedsRestart=Za zavrÅ¡avanje deinstaliranja programa %1, potrebno je ponovo pokrenuti raÄunalo.%n%nŽeliÅ¡ li to sada uÄiniti?
+UninstallDataCorrupted="%1" datoteka je oštećena. Deinstaliranje nije moguće
+
+; *** Uninstallation phase messages
+ConfirmDeleteSharedFileTitle=Ukloniti dijeljene datoteke?
+ConfirmDeleteSharedFile2=Sustav ukazuje na to, da sljedeću dijeljenu datoteku ne koristi niti jedan program. Želiš li ukloniti tu dijeljenu datoteku?%n%nAko neki programi i dalje koriste tu datoteku, a ona se izbriše, ti programi neće ispravno raditi. Ako ne znaš, odaberi "Ne". Datoteka neće štetiti tvom sustavu.
+SharedFileNameLabel=Datoteka:
+SharedFileLocationLabel=Mjesto:
+WizardUninstalling=Stanje deinstalacije
+StatusUninstalling=%1 deinstaliranje …
+
+; *** Shutdown block reasons
+ShutdownBlockReasonInstallingApp=%1 instaliranje.
+ShutdownBlockReasonUninstallingApp=%1 deinstaliranje.
+
+; The custom messages below aren't used by Setup itself, but if you make
+; use of them in your scripts, you'll want to translate them.
+
+[CustomMessages]
+
+NameAndVersion=%1 verzija %2
+AdditionalIcons=Dodatni preÄaci:
+CreateDesktopIcon=Stvori preÄac na ra&dnoj povrÅ¡ini
+CreateQuickLaunchIcon=Stvori preÄac u traci za &brzo pokretanje
+ProgramOnTheWeb=%1 na internetu
+UninstallProgram=Deinstaliraj %1
+LaunchProgram=Pokreni %1
+AssocFileExtension=&Poveži program %1 s datoteÄnim nastavkom %2
+AssocingFileExtension=Povezivanje programa %1 s datoteÄnim nastavkom %2 …
+AutoStartProgramGroupDescription=Pokretanje:
+AutoStartProgram=Automatski pokreni %1
+AddonHostProgramNotFound=%1 nije nađen u odabranoj mapi.%n%nŽeliš li svejedno nastaviti?
commit d8535a3a94ba1e4b80efbb583ef41bca1292d311
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Tue Apr 21 15:30:59 2020 +0200
Update swig to 3.0.12
All other bundles use it already
diff --git a/gnucash.modules b/gnucash.modules
index 7fc99b8..b3259a3 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -233,8 +233,8 @@
</autotools>
<autotools id="swig" autogen-sh="configure">
- <branch repo="sourceforge" module="swig/swig-2.0.11.tar.gz"
- version="2.0.11"/>
+ <branch repo="sourceforge" module="swig/swig-3.0.12.tar.gz"
+ version="3.0.12"/>
<dependencies>
<dep package="pcre"/>
</dependencies>
commit 199afe1652ee46ede4a621d7e0f856f8cd5aa193
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Tue Apr 21 14:51:02 2020 +0200
Update xmlsec to 1.2.29
Reason: use the same version as in flatpak
diff --git a/gnucash.modules b/gnucash.modules
index 7fc99b8..e4a24a3 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -166,9 +166,9 @@
</autotools>
<autotools id="xmlsec" >
- <branch module="lsh123/xmlsec/archive/xmlsec-1_2_28.tar.gz"
- repo="github-tar" version="1.2.28"
- checkoutdir="xmlsec-xmlsec-1_2_28">
+ <branch module="lsh123/xmlsec/archive/xmlsec-1_2_29.tar.gz"
+ repo="github-tar" version="1.2.29"
+ checkoutdir="xmlsec-xmlsec-1_2_29">
<patch file="xmlsec-make-clean.patch" strip="1"/>
</branch>
<dependencies>
commit c7f7c0e3da138c89d531b9a5bc00532d1d8c078b
Merge: 8c8554e b8490cd
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Apr 20 10:45:15 2020 -0700
Merge Frank Ellenberger's 'aqb6.2.0beta' into master.
commit 8c8554efdbba941eeaec727e42235239bd77700e
Author: John Ralls <jralls at ceridwen.us>
Date: Wed Apr 15 13:25:27 2020 -0700
Newly-built webkit to go with latest Mingw-w64 update.
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index c04cc74..585e5fe 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -255,7 +255,7 @@ $sourceforge_url = "https://downloads.sourceforge.net/gnucash/Dependencies/"
$signing_keyfile = "jralls_public_signing_key.asc"
$key_url = $sourceforge_url + $signing_keyfile
$key_id = "C1F4DE993CF5835F"
-$webkit = "$arch_long-webkitgtk3-2.4.11-999.1-any.pkg.tar.xz"
+$webkit = "$arch_long-webkitgtk3-2.4.11-999.2-any.pkg.tar.zst"
$webkit_url = $sourceforge_url + $webkit
bash-command -command "wget $key_url"
bash-command -command "pacman-key --add $signing_keyfile"
commit 4d106a204bda1ffc281f81f937374f9184e29eb7
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu Apr 16 09:30:24 2020 +0200
Update xmlsec patch to upstream's preferred solution
diff --git a/patches/xmlsec-make-clean.patch b/patches/xmlsec-make-clean.patch
index 26efee2..3011fcf 100644
--- a/patches/xmlsec-make-clean.patch
+++ b/patches/xmlsec-make-clean.patch
@@ -1,16 +1,45 @@
+diff --git a/docs/Makefile.am b/docs/Makefile.am
+index a89ba76c..4b196026 100644
+--- a/docs/Makefile.am
++++ b/docs/Makefile.am
+@@ -27,9 +27,9 @@ docs-copy:
+ if [ z"$(srcdir)" != z"$(builddir)" -a z"`uname`" != z"Darwin" ]; \
+ then \
+ $(CP) -ru $(srcdir)/*.html $(srcdir)/*.ico $(srcdir)/images $(builddir)/ ; \
+- chmod u+w $(builddir)/*.html ; \
+- chmod u+w $(builddir)/*.ico ; \
+- chmod -R u+w $(builddir)/images ; \
++ (chmod u+w $(builddir)/*.html || true) ; \
++ (chmod u+w $(builddir)/*.ico || true) ; \
++ (chmod -R u+w $(builddir)/images || true) ; \
+ fi \
+ )
+
+@@ -94,8 +94,8 @@ endif
+ clean-local:
+ -rm -f *.stamp
+ ( if [ z"$(srcdir)" != z"$(builddir)" ] ; then \
+- chmod -R u+w $(builddir)/images && rm -rf $(builddir)/images ; \
+- chmod -R u+w $(builddir)/src && rm -rf $(builddir)/src ; \
++ (chmod -R u+w $(builddir)/images || true) && rm -rf $(builddir)/images ; \
++ (chmod -R u+w $(builddir)/src || true) && rm -rf $(builddir)/src ; \
+ (for i in `find $(builddir) -name "*.html" -print` ; do \
+ echo "Removing files '$$i' ... " ; \
+ chmod -R u+w $$i && rm -f $$i ; \
diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am
-index a1ffd3a7..e88ea929 100644
+index a1ffd3a7..dcf093d1 100644
--- a/docs/api/Makefile.am
+++ b/docs/api/Makefile.am
-@@ -268,9 +268,8 @@ clean-local:
+@@ -268,9 +268,9 @@ clean-local:
-rm -rf $(SOURCE_CODE_DIR) $(EXAMPLES_DIR) $(SCAN_DIR)/*.txt $(SGML_DIR) $(GTKDOC_MKDB_OUTPUT_DIR)
-rm -f *.stamp *.types index.sgml
@( if [ z"$(builddir)" != z"$(srcdir)" ] ; then \
- chmod -R u+w $(builddir)/src && rm -rf $(builddir)/src ; \
- chmod -R u+w $(builddir)/images && rm -rf $(builddir)/images ; \
- chmod -R u+w $(builddir)/*.png && rm -rf $(builddir)/*.png ; \
-+ find $(builddir) -name 'src' -o -name 'images' -o -name '*.png' -exec chmod u+w '{}' ';' ; \
-+ rm -rf $(builddir)/src $(builddir)/images $(builddir)/*.png ; \
++ (chmod -R u+w $(builddir)/src || true) && rm -rf $(builddir)/src ; \
++ (chmod -R u+w $(builddir)/images || true) && rm -rf $(builddir)/images ; \
++ (chmod -R u+w $(builddir)/*.png || true) && rm -rf $(builddir)/*.png ; \
fi ; )
distclean-local: clean-local
commit a702c901d33e48d0f803c6805069b1ab053b9092
Author: Geert Janssens <geert at kobaltwit.be>
Date: Wed Apr 15 15:28:28 2020 +0200
xmlsec - fix make clean before first build
The build system originally tried to run chmod on non-existing files and directories,
resulting in errors which break the build. With the patch the chmod will only be
executed if the files and directories actually exist.
diff --git a/gnucash.modules b/gnucash.modules
index 68b8171..42f4182 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -167,8 +167,10 @@
<autotools id="xmlsec" >
<branch module="lsh123/xmlsec/archive/xmlsec-1_2_28.tar.gz"
- repo="github-tar" version="1.2.28"
- checkoutdir="xmlsec-xmlsec-1_2_28"/>
+ repo="github-tar" version="1.2.28"
+ checkoutdir="xmlsec-xmlsec-1_2_28">
+ <patch file="xmlsec-make-clean.patch" strip="1"/>
+ </branch>
<dependencies>
<dep package="openssl"/>
</dependencies>
diff --git a/patches/xmlsec-make-clean.patch b/patches/xmlsec-make-clean.patch
new file mode 100644
index 0000000..26efee2
--- /dev/null
+++ b/patches/xmlsec-make-clean.patch
@@ -0,0 +1,16 @@
+diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am
+index a1ffd3a7..e88ea929 100644
+--- a/docs/api/Makefile.am
++++ b/docs/api/Makefile.am
+@@ -268,9 +268,8 @@ clean-local:
+ -rm -rf $(SOURCE_CODE_DIR) $(EXAMPLES_DIR) $(SCAN_DIR)/*.txt $(SGML_DIR) $(GTKDOC_MKDB_OUTPUT_DIR)
+ -rm -f *.stamp *.types index.sgml
+ @( if [ z"$(builddir)" != z"$(srcdir)" ] ; then \
+- chmod -R u+w $(builddir)/src && rm -rf $(builddir)/src ; \
+- chmod -R u+w $(builddir)/images && rm -rf $(builddir)/images ; \
+- chmod -R u+w $(builddir)/*.png && rm -rf $(builddir)/*.png ; \
++ find $(builddir) -name 'src' -o -name 'images' -o -name '*.png' -exec chmod u+w '{}' ';' ; \
++ rm -rf $(builddir)/src $(builddir)/images $(builddir)/*.png ; \
+ fi ; )
+
+ distclean-local: clean-local
commit a59bf251e20612016e0879acc2d49946f18fd599
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Apr 14 11:10:54 2020 -0700
Libffi upgraded to libffi-7 in latest mingw64 update.
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 7a54071..4b69bd6 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -132,7 +132,7 @@ Source: "@MINGW_DIR@\bin\libcrypto-1_1.dll"; DestDir: "{app}\bin"; Components: m
Source: "@MINGW_DIR@\bin\libdatrie-1.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libepoxy-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libexpat-1.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\libffi-6.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libffi-7.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libfontconfig-1.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libfreetype-6.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libfribidi-0.dll"; DestDir: "{app}\bin"; Components: main
commit b8490cd27d99be6d8d153c38805ae2720d4a6ff0
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Tue Apr 14 13:09:50 2020 +0200
Update to aqbanking-6.2.0beta & gwenhywfar-5.3.0
Several changes on almost all modules
diff --git a/gnucash.modules b/gnucash.modules
index eb4bd3f..10307ea 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -147,7 +147,7 @@
<autotools id="gwenhywfar" autogen-sh="configure"
autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc --disable-ssl PKG_CONFIG='pkg-config --dont-define-prefix'">
- <branch module="256/gwenhywfar-5.2.0.tar.gz" version="5.2.0"
+ <branch module="319/gwenhywfar-5.3.0.tar.gz" version="5.3.0"
repo="aqbanking">
</branch>
<dependencies>
@@ -176,7 +176,7 @@
<autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
autogenargs="--enable-local-install">
- <branch module="283/aqbanking-6.1.4.tar.gz" repo="aqbanking" version="6.1.4" >
+ <branch module="321/aqbanking-6.2.0beta.tar.gz" repo="aqbanking" version="6.2.0beta" >
</branch>
<dependencies>
<dep package="gwenhywfar"/>
commit 630fb1f421b31ef8f01fdc7e6ecb7b5c25123f16
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Apr 12 12:09:46 2020 -0700
Update gwenhywfar URI.
Changed on aquamaniac.de.
diff --git a/gnucash.modules b/gnucash.modules
index eb4bd3f..68b8171 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -147,7 +147,7 @@
<autotools id="gwenhywfar" autogen-sh="configure"
autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc --disable-ssl PKG_CONFIG='pkg-config --dont-define-prefix'">
- <branch module="256/gwenhywfar-5.2.0.tar.gz" version="5.2.0"
+ <branch module="317/gwenhywfar-5.2.0.tar.gz" version="5.2.0"
repo="aqbanking">
</branch>
<dependencies>
commit 5d6ebb6789b8f4c390e7b2678b94f589cf45ef0d
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Apr 11 14:54:32 2020 -0700
Release GnuCash 3.10.
diff --git a/extra_dist/getperl.vbs b/extra_dist/getperl.vbs
index 4e2d542..959b1f9 100644
--- a/extra_dist/getperl.vbs
+++ b/extra_dist/getperl.vbs
@@ -9,7 +9,7 @@ Dim fso: Set fso = CreateObject("Scripting.FileSystemObject")
Dim tempFolder: tempFolder = fso.GetSpecialFolder(TemporaryFolder)
strHDLocation = Wscript.Arguments.Item(0)
-strVersion = "5.28.1.1"
+strVersion = "5.30.2.1"
' Set your settings
strFileURL = "http://strawberryperl.com/download/" & strVersion & "/strawberry-perl-" & strVersion & "-32bit.msi"
diff --git a/gnucash.modules b/gnucash.modules
index 5c221c8..eb4bd3f 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -276,8 +276,8 @@
<cmake id="gnucash"
cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DALLOW_OLD_GETTEXT=ON">
- <branch module="project/gnucash/gnucash%20%28stable%29/3.9/gnucash-3.9.tar.bz2"
- repo="sourceforge" version="3.9"/>
+ <branch module="project/gnucash/gnucash%20%28stable%29/3.10/gnucash-3.10.tar.bz2"
+ repo="sourceforge" version="3.10"/>
<dependencies>
<dep package="libofx"/>
<dep package="aqbanking"/>
@@ -321,8 +321,8 @@
<autotools id="gnucash-docs"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
makeargs="chm" makeinstallargs="install-chm" >
- <branch module="project/gnucash/gnucash%20%28stable%29/3.9/gnucash-docs-3.9.tar.gz"
- version="3.9" repo="sourceforge"/>
+ <branch module="project/gnucash/gnucash%20%28stable%29/3.10/gnucash-docs-3.10.tar.gz"
+ version="3.10" repo="sourceforge"/>
</autotools>
<metamodule id="meta-gnucash-git">
commit 3f7e38487fdf7e150d7b7bad4e30bc204ec1e17d
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Mar 28 14:45:49 2020 -0700
Release GnuCash 3.9
diff --git a/gnucash.modules b/gnucash.modules
index 00c84ae..5c221c8 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -276,8 +276,8 @@
<cmake id="gnucash"
cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DALLOW_OLD_GETTEXT=ON">
- <branch module="project/gnucash/gnucash%20%28stable%29/3.8/gnucash-3.8.tar.bz2"
- repo="sourceforge" version="3.8"/>
+ <branch module="project/gnucash/gnucash%20%28stable%29/3.9/gnucash-3.9.tar.bz2"
+ repo="sourceforge" version="3.9"/>
<dependencies>
<dep package="libofx"/>
<dep package="aqbanking"/>
@@ -321,8 +321,8 @@
<autotools id="gnucash-docs"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
makeargs="chm" makeinstallargs="install-chm" >
- <branch module="project/gnucash/gnucash%20%28stable%29/3.8/gnucash-docs-3.8.tar.gz"
- version="3.8" repo="sourceforge"/>
+ <branch module="project/gnucash/gnucash%20%28stable%29/3.9/gnucash-docs-3.9.tar.gz"
+ version="3.9" repo="sourceforge"/>
</autotools>
<metamodule id="meta-gnucash-git">
commit 93fd581223c68eaa4bcbe788e5055461d7844b87
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Tue Mar 24 23:19:34 2020 +0100
Update to aqbanking-6.1.4
Fixes on OFX, HBCI, and general (gwen_prefix)
diff --git a/gnucash.modules b/gnucash.modules
index 5045f98..00c84ae 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -176,7 +176,7 @@
<autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
autogenargs="--enable-local-install">
- <branch module="279/aqbanking-6.1.3.tar.gz" repo="aqbanking" version="6.1.3" >
+ <branch module="283/aqbanking-6.1.4.tar.gz" repo="aqbanking" version="6.1.4" >
</branch>
<dependencies>
<dep package="gwenhywfar"/>
commit 28b4102c1eda9acc3ac90eea45d0a96a3bb80faa
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Tue Mar 24 19:03:07 2020 +0100
Update to aqbanking-6.1.3
Several fixes on AqHBCI and OFX
diff --git a/gnucash.modules b/gnucash.modules
index 9db7a1a..5045f98 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -176,7 +176,7 @@
<autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
autogenargs="--enable-local-install">
- <branch module="269/aqbanking-6.1.2.tar.gz" repo="aqbanking" version="6.1.2" >
+ <branch module="279/aqbanking-6.1.3.tar.gz" repo="aqbanking" version="6.1.3" >
</branch>
<dependencies>
<dep package="gwenhywfar"/>
commit 26e046b1ac192428a37fcdae2c883be6d4a15701
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Fri Mar 6 23:03:15 2020 +0100
Update to aqbanking-6.1.2
OFXDC: Fixed a bug concerning calls to AO_V2_SendAndReceive().
diff --git a/gnucash.modules b/gnucash.modules
index 085b528..9db7a1a 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -176,7 +176,7 @@
<autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
autogenargs="--enable-local-install">
- <branch module="266/aqbanking-6.1.1.tar.gz" repo="aqbanking" version="6.1.1" >
+ <branch module="269/aqbanking-6.1.2.tar.gz" repo="aqbanking" version="6.1.2" >
</branch>
<dependencies>
<dep package="gwenhywfar"/>
commit 7f4846ba5254ff05e6cac0083585ed810644ea5b
Author: Geert Janssens <geert at kobaltwit.be>
Date: Tue Feb 25 10:57:16 2020 +0100
gnucash-docs - Default generator on Windows appears to be NMake
We are using MSYS make instead however.
diff --git a/gnucash.modules b/gnucash.modules
index d9e4c6e..085b528 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -309,6 +309,7 @@
</cmake>
<cmake id="gnucash-docs-git"
+ cmakeargs="-G'MSYS Makefiles'"
use-ninja="False"> <!-- Can't use ninja for now. See https://bugs.gnucash.org/show_bug.cgi?id=797622 -->
<branch repo="github" module="Gnucash/gnucash-docs.git" revision="master"
checkoutdir="gnucash-docs-git"/>
commit 8eda5791d69064af4f9f5140a3f9a4be0b85ba6a
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Mon Feb 24 21:43:41 2020 +0100
Update to aqbanking-6.1.1
diff --git a/gnucash.modules b/gnucash.modules
index dcb8987..d9e4c6e 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -176,7 +176,7 @@
<autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
autogenargs="--enable-local-install">
- <branch module="258/aqbanking-6.1.0.tar.gz" repo="aqbanking" version="6.1.0" >
+ <branch module="266/aqbanking-6.1.1.tar.gz" repo="aqbanking" version="6.1.1" >
</branch>
<dependencies>
<dep package="gwenhywfar"/>
commit d27cbba3203ab398ed6349e5db486b6102b1906a
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sun Feb 23 18:29:25 2020 +0100
Force makefiles generator on gnucash-docs-git
Ninja won't work due to the clean command failing on our docs build directory
See https://bugs.gnucash.org/show_bug.cgi?id=797622 for more details
diff --git a/gnucash.modules b/gnucash.modules
index eb2524d..dcb8987 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -308,7 +308,8 @@
</dependencies>
</cmake>
- <cmake id="gnucash-docs-git">
+ <cmake id="gnucash-docs-git"
+ use-ninja="False"> <!-- Can't use ninja for now. See https://bugs.gnucash.org/show_bug.cgi?id=797622 -->
<branch repo="github" module="Gnucash/gnucash-docs.git" revision="master"
checkoutdir="gnucash-docs-git"/>
<dependencies>
commit e263e1a51452f5c7e76902d236f9d976bdef720f
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Feb 21 16:22:01 2020 -0800
Add in the webkit dependencies.
They're no longer indirectly added because we use a self-build mingw-w64-i686-webkit.
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 1ed3624..c04cc74 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -267,7 +267,7 @@ $ignorefile = ""
bash-command -command "perl -ibak -pe 'BEGIN{undef $/;} s#[[]options[]]\R(Include = [^\R]*\R)?#[options]\nInclude = /etc/pacman.d/gnucash-ignores.pacman\n#smg' /etc/pacman.conf"
# Install the remaining dependencies.
-$deps = "boost iso-codes shared-mime-info libmariadbclient postgresql ninja pdcurses"
+$deps = "boost icu gtk3 iso-codes shared-mime-info libmariadbclient libsoup libwebp postgresql ninja pdcurses sqlite3"
Write-Host @"
commit 9574cafaf11d97ba40c831206602f78abc17d066
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Feb 16 13:13:46 2020 -0800
Update Gwenhywfar to 5.2.0 and AQBanking to 6.1.0.
diff --git a/gnucash.modules b/gnucash.modules
index dc2f481..eb2524d 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -147,7 +147,7 @@
<autotools id="gwenhywfar" autogen-sh="configure"
autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc --disable-ssl PKG_CONFIG='pkg-config --dont-define-prefix'">
- <branch module="242/gwenhywfar-5.1.3.tar.gz" version="5.1.3"
+ <branch module="256/gwenhywfar-5.2.0.tar.gz" version="5.2.0"
repo="aqbanking">
</branch>
<dependencies>
@@ -176,7 +176,7 @@
<autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
autogenargs="--enable-local-install">
- <branch module="243/aqbanking-6.0.2.tar.gz" repo="aqbanking" version="6.0.2" >
+ <branch module="258/aqbanking-6.1.0.tar.gz" repo="aqbanking" version="6.1.0" >
</branch>
<dependencies>
<dep package="gwenhywfar"/>
commit 6367ab36aa7554f31522f12284125bc3b586e109
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat Feb 1 12:04:54 2020 +0100
Prepare Windows build for updated gettext base requirement
Generation of a fully translated/translatable gnucash appadata
file, we need gettext 0.20. The gnucash source package will
be adjusted to require that by default.
However as we don't use the gnucash appdata file on Windows
we can relax the basis requirements for our Windows installer
packages.
diff --git a/gnucash.modules b/gnucash.modules
index 6a92c0e..dc2f481 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -275,7 +275,7 @@
</cmake>
<cmake id="gnucash"
- cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock">
+ cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DALLOW_OLD_GETTEXT=ON">
<branch module="project/gnucash/gnucash%20%28stable%29/3.8/gnucash-3.8.tar.bz2"
repo="sourceforge" version="3.8"/>
<dependencies>
@@ -292,7 +292,7 @@
</cmake>
<cmake id="gnucash-git"
- cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DCMAKE_BUILD_TYPE=Debug">
+ cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DALLOW_OLD_GETTEXT=ON -DCMAKE_BUILD_TYPE=Debug">
<branch repo="github" module="Gnucash/gnucash.git" revision="master"
checkoutdir="gnucash-git"/>
<dependencies>
commit 905582b34f5f3bc7e47731bf3e08b91aa958148b
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Wed Jan 29 03:12:48 2020 +0100
Update to aqbanking-6.0.2 and gwenhywfar-5.1.3
Changes by modules:
aqbanking-6.0.2: HBCI, Paypal
aqbanking-6.0.1: OFX2
diff --git a/gnucash.modules b/gnucash.modules
index c26c755..6a92c0e 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -147,7 +147,7 @@
<autotools id="gwenhywfar" autogen-sh="configure"
autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc --disable-ssl PKG_CONFIG='pkg-config --dont-define-prefix'">
- <branch module="234/gwenhywfar-5.1.2.tar.gz" version="5.1.2"
+ <branch module="242/gwenhywfar-5.1.3.tar.gz" version="5.1.3"
repo="aqbanking">
</branch>
<dependencies>
@@ -176,7 +176,7 @@
<autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
autogenargs="--enable-local-install">
- <branch module="235/aqbanking-6.0.0.tar.gz" repo="aqbanking" version="6.0.0" >
+ <branch module="243/aqbanking-6.0.2.tar.gz" repo="aqbanking" version="6.0.2" >
</branch>
<dependencies>
<dep package="gwenhywfar"/>
commit 833f24b3ffcaf589236f52c7a83bfa599be95e53
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Jan 17 15:07:02 2020 -0800
Update Gwenhywfar to 5.1.2 and AQBanking to 6.0.0.
diff --git a/gnucash.modules b/gnucash.modules
index 0bcfb2b..c26c755 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -147,7 +147,7 @@
<autotools id="gwenhywfar" autogen-sh="configure"
autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc --disable-ssl PKG_CONFIG='pkg-config --dont-define-prefix'">
- <branch module="233/gwenhywfar-5.1.1.tar.gz" version="5.1.1"
+ <branch module="234/gwenhywfar-5.1.2.tar.gz" version="5.1.2"
repo="aqbanking">
</branch>
<dependencies>
@@ -176,7 +176,7 @@
<autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
autogenargs="--enable-local-install">
- <branch module="232/aqbanking-5.99.45.tar.gz" repo="aqbanking" version="5.99.45" >
+ <branch module="235/aqbanking-6.0.0.tar.gz" repo="aqbanking" version="6.0.0" >
</branch>
<dependencies>
<dep package="gwenhywfar"/>
commit 46ff2b12670b983a3a1eee9de8cb84b1b37b12bb
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Thu Jan 16 20:36:55 2020 +0100
Update gwenhywfar to 5.1.1
Should fix the problem with Cortal Consors sending a problematic HIPINS
segment.
diff --git a/gnucash.modules b/gnucash.modules
index 7f9a56b..0bcfb2b 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -147,7 +147,7 @@
<autotools id="gwenhywfar" autogen-sh="configure"
autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc --disable-ssl PKG_CONFIG='pkg-config --dont-define-prefix'">
- <branch module="231/gwenhywfar-5.1.0.tar.gz" version="5.1.0"
+ <branch module="233/gwenhywfar-5.1.1.tar.gz" version="5.1.1"
repo="aqbanking">
</branch>
<dependencies>
commit bf30121c353b7c7c58ec78cf1cb9a27200f4ce39
Author: Geert Janssens <geert at kobaltwit.be>
Date: Fri Jan 17 18:28:49 2020 +0100
Update version extraction to match new parameter names in gnucash project
This should be used as of commit d8a304c2c94a4f0d6c4167cfc1bf6e7f7e84d0cf in the gnucash repo.
diff --git a/bundle-mingw64.ps1 b/bundle-mingw64.ps1
index 6beec0d..50f4b8d 100644
--- a/bundle-mingw64.ps1
+++ b/bundle-mingw64.ps1
@@ -109,8 +109,8 @@ if ($PSVersionTable.PSVersion.Major -ge 3) {
$gnc_config_h = "$target_dir\build\$gnucash\common\config.h"
-$major_version = version_item -tag "GNUCASH_MAJOR_VERSION" -path $gnc_config_h
-$minor_version = version_item -tag "GNUCASH_MINOR_VERSION" -path $gnc_config_h
+$major_version = version_item -tag "PROJECT_VERSION_MAJOR" -path $gnc_config_h
+$minor_version = version_item -tag "PROJECT_VERSION_MINOR" -path $gnc_config_h
$package_version = "$major_version.$minor_version"
$inst_dir = "$target_dir\inst"
$mingw_ver = bitness("$inst_dir\bin\gnucash.exe")
commit c31de9460a47372e18fedb14b9b4e385053a9a85
Author: Geert Janssens <geert at kobaltwit.be>
Date: Wed Jan 15 16:30:38 2020 +0100
Drop seemingly unused dlls
Innosetup is installing them, but our build scripts are not installing them in any way.
They may have been required at some point (or dependencies of the removed webkit?)
The resulting package seems to install and run fine without them.
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 1d60d7f..7a54071 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -130,8 +130,6 @@ Source: "@MINGW_DIR@\bin\libcairo-gobject-2.dll"; DestDir: "{app}\bin"; Componen
Source: "@MINGW_DIR@\bin\libcroco-0.6-3.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libcrypto-1_1.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libdatrie-1.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\libdbus-1-3.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\libdbus-glib-1-2.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libepoxy-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libexpat-1.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libffi-6.dll"; DestDir: "{app}\bin"; Components: main
@@ -164,7 +162,6 @@ Source: "@MINGW_DIR@\bin\libjpeg-8.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libltdl-7.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\liblzma-5.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libnettle-7.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\liborc-0.4-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libp11-kit-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libpango-1.0-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libpangocairo-1.0-0.dll"; DestDir: "{app}\bin"; Components: main
commit 386c9f5c7aabfd8be1dff3300c70deaaf76cfb24
Author: Geert Janssens <geert at kobaltwit.be>
Date: Wed Jan 15 12:37:16 2020 +0100
Reconfigure nightlies to build docs using the cmake toolchain
Release builds still use autotools.
This first migration step is try the cmake toolchain in daily use
(it has been tested extensively locally already)
diff --git a/gnucash.modules b/gnucash.modules
index 089a0c8..7f9a56b 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -308,15 +308,13 @@
</dependencies>
</cmake>
- <autotools id="gnucash-docs-git"
- autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
- makeargs="chm" makeinstallargs="install-chm" >
+ <cmake id="gnucash-docs-git">
<branch repo="github" module="Gnucash/gnucash-docs.git" revision="master"
checkoutdir="gnucash-docs-git"/>
<dependencies>
<!-- dep package="scrollkeeper"/ -->
</dependencies>
- </autotools>
+ </cmake>
<autotools id="gnucash-docs"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
commit f8b8aac1623c1b0f89e3f70482f6e22007796c52
Merge: 98e7d3b 96ccab7
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Jan 13 13:58:57 2020 -0800
Merge Jannick's 'inno-setup-fixes' into maint.
commit 98e7d3bf65bf29b3e82d41629cee27eefb73aacd
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Jan 13 12:53:59 2020 -0800
Revert "Use %USERDOCS% for unpack working dir instead of GetDocPath."
This reverts commit 1a89d04bce64efb428462efd934b8a7555f8738c, an
experiment that shouldn't have been published.
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 049efbd..aa0ae41 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -41,17 +41,17 @@ Name: desktopicon; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm
Name: menuicon; Description: "{cm:CreateMenuLink}"; GroupDescription: "{cm:AdditionalIcons}"
[Icons]
-Name: "{group}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "%USERDOCS%"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: menuicon
+Name: "{group}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "{code:GetDocPath}"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: menuicon
Name: "{group}\{cm:IconName_README}"; Filename: "{app}\doc\@PACKAGE@\{cm:IconFilename_README}"; Comment: "{cm:IconComment_README}"; Tasks: menuicon
Name: "{group}\{cm:IconName_FAQ}"; Filename: "http://wiki.gnucash.org/wiki/FAQ"; Tasks: menuicon
Name: "{group}\{cm:IconName_Bugzilla}"; Filename: "https://bugs.gnucash.org/enter_bug.cgi?product=GnuCash"; Tasks: menuicon
Name: "{group}\{cm:IconName_InstallFQ}"; Filename: "{app}\bin\install-fq-mods.cmd"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_InstallFQ}"; Tasks: menuicon
Name: "{group}\{cm:IconName_Uninstall}"; Filename: "{uninstallexe}"; Comment: "{cm:IconComment_Uninstall}"; Tasks: menuicon
-Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "%USERDOCS%"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: desktopicon
+Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "{code:GetDocPath}"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: desktopicon
[Run]
-Filename: "{app}\bin\@PACKAGE at .exe"; Description: "{cm:RunPrg}"; WorkingDir: "%USERDOCS%"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent
+Filename: "{app}\bin\@PACKAGE at .exe"; Description: "{cm:RunPrg}"; WorkingDir: "{code:GetDocPath}"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent
Filename: "{app}\bin\guile.cmd"; Flags: runhidden
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index dbea428..1ed3624 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -239,7 +239,6 @@ $devel = "asciidoc autoconf autoconf2.13 autogen automake-wrapper automake1.10 a
$toolchain = "binutils cmake crt-git gcc gcc-libs gdb headers-git libmangle-git libtool libwinpthread-git make pkg-config tools-git winpthreads-git"
-$clang_toolchain = "clang libc++ libc++abi lld libunwind clang-tools-extra compiler-rt"
# Install the system and toolchain:
$msys_devel = make-pkgnames -prefix "msys/" -items $devel
commit f4359547d422df9acf8e7e34a92faaac9fd628ae
Merge: 18baa1c 29185d9
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Jan 12 20:40:22 2020 -0800
Merge branch 'aqb5.99.45' of https://github.com/fellen/gnucash-on-windows
diff --cc gnucash.modules
index 8fbb12c,6ad1f86..089a0c8
--- a/gnucash.modules
+++ b/gnucash.modules
@@@ -147,7 -147,7 +147,7 @@@
<autotools id="gwenhywfar" autogen-sh="configure"
autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc --disable-ssl PKG_CONFIG='pkg-config --dont-define-prefix'">
- <branch module="228/gwenhywfar-5.0.0.tar.gz" version="5.0.0"
- <branch module="2231/gwenhywfar-5.1.0.tar.gz" version="5.1.0"
++ <branch module="231/gwenhywfar-5.1.0.tar.gz" version="5.1.0"
repo="aqbanking">
</branch>
<dependencies>
commit 29185d96f11de6f2bef15d518012f4bec2f43e0f
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Mon Jan 13 04:13:26 2020 +0100
Update to aqbanking-5.99.45, gwenhywfar-5.1.0, libchipcard-5.1.5rc2
diff --git a/gnucash.modules b/gnucash.modules
index 377043c..6ad1f86 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -135,7 +135,7 @@
</autotools>
<autotools id="libchipcard" autogen-sh="configure" autogenargs="--enable-local-install PKG_CONFIG='pkg-config --dont-define-prefix'">
- <branch module="221/libchipcard-5.1.4rc1.tar.gz" version="5.1.4rc1"
+ <branch module="229/libchipcard-5.1.5rc2.tar.gz" version="5.1.5rc2"
repo="aqbanking">
</branch>
<dependencies>
@@ -147,7 +147,7 @@
<autotools id="gwenhywfar" autogen-sh="configure"
autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc --disable-ssl PKG_CONFIG='pkg-config --dont-define-prefix'">
- <branch module="223/gwenhywfar-4.99.25rc9.tar.gz" version="4.99.25rc9"
+ <branch module="2231/gwenhywfar-5.1.0.tar.gz" version="5.1.0"
repo="aqbanking">
</branch>
<dependencies>
@@ -176,7 +176,7 @@
<autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
autogenargs="--enable-local-install">
- <branch module="224/aqbanking-5.99.44beta.tar.gz" repo="aqbanking" version="5.99.44beta" >
+ <branch module="232/aqbanking-5.99.45.tar.gz" repo="aqbanking" version="5.99.45" >
</branch>
<dependencies>
<dep package="gwenhywfar"/>
commit 18baa1c4b503d90069f84c99ce3a45b213ec9993
Author: Christian Stimming <christian at cstimming.de>
Date: Sun Jan 12 22:41:04 2020 +0100
Update gwenhywfar 5.0.0, libchipcard 5.1.5rc2
diff --git a/gnucash.modules b/gnucash.modules
index 377043c..8fbb12c 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -135,7 +135,7 @@
</autotools>
<autotools id="libchipcard" autogen-sh="configure" autogenargs="--enable-local-install PKG_CONFIG='pkg-config --dont-define-prefix'">
- <branch module="221/libchipcard-5.1.4rc1.tar.gz" version="5.1.4rc1"
+ <branch module="229/libchipcard-5.1.5rc2.tar.gz" version="5.1.5rc2"
repo="aqbanking">
</branch>
<dependencies>
@@ -147,7 +147,7 @@
<autotools id="gwenhywfar" autogen-sh="configure"
autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc --disable-ssl PKG_CONFIG='pkg-config --dont-define-prefix'">
- <branch module="223/gwenhywfar-4.99.25rc9.tar.gz" version="4.99.25rc9"
+ <branch module="228/gwenhywfar-5.0.0.tar.gz" version="5.0.0"
repo="aqbanking">
</branch>
<dependencies>
commit 96ccab78d1be07a164dfcf1d5c59f80613ddabf0
Author: Jannick <thirdedition at gmx.net>
Date: Sat Jan 4 11:42:13 2020 +0100
inno-setup: remove 'guile.cmd' from installation
The wrapper 'guile.cmd' to be created at install-time effectively sets
the GUILE_LOAD_PATH for guile. However, the environment for GC at run-time
is implied by the file 'environment' (generated by 'environment.in' at
configure-time, see gnucash repo). So 'guile.cmd' appears to be obsolete.
Moreover, 'guile.cmd' does not appear in the installation folder, because
the procedure 'MyAfterInstallConfig' is not called at install-time. Let's
remove the procedure, too.
* inno_setup/gnucash-mingw64.iss:
- remove for 'guile.cmd' creation, run, uninstall commands
- remove procedure 'MyAfterInstallConfig'
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index d30f3d5..1d60d7f 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -52,7 +52,6 @@ Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir
[Run]
Filename: "{app}\bin\@PACKAGE at .exe"; Description: "{cm:RunPrg}"; WorkingDir: "{code:GetDocPath}"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent
-Filename: "{app}\bin\guile.cmd"; Flags: runhidden
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Here we configure the included files and the place of their
@@ -265,7 +264,6 @@ Root: HKLM; Subkey: "Software\AqBanking\Paths"; ValueType: string; ValueName: "c
; Delete the created config script on uninstall
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
[UninstallDelete]
-Type: files; Name: "{app}\bin\guile.cmd"
Type: files; Name: "{app}\etc\@PACKAGE@\environment"
Type: filesandordirs; Name: "{app}\share\guile"
Type: dirifempty; Name: "{app}\etc\@PACKAGE@"
@@ -409,30 +407,6 @@ begin
StringChange(Result, '\', '/');
end;
-procedure MyAfterInstallConfig();
-var
- FileName, FileString, appdir, libdir, pkglibdir, pkgdatadir: String;
- Res: Boolean;
-begin
-
- { Get the installation-specific paths }
- appdir := ExpandConstant('{app}');
- pkgdatadir := appdir + '\share\@PACKAGE@';
-
- { Create the guile.cmd file; #10 is the linefeed character and #13 CR }
-
- FileName := appdir + '\bin\guile.cmd' ;
- FileString := 'set GUILE_LOAD_PATH=' + pkgdatadir + '\scm;' + appdir + '\share\guile\2.2;%GUILE_LOAD_PATH%'#13#10 ;
- FileString := FileString + 'start guile.exe %*'#13#10 ;
-
- { Save the final file }
-
- Res := SaveStringToFile(FileName, FileString, False);
- if Res = False then
- MsgBox('Error on saving '+FileName+' for completing the installation', mbInformation, MB_OK);
-
-end;
-
function BackslashPath(const S: String): String;
begin
{ Convert c:\soft to c:/soft }
commit a12203d47be909269f91d73f80956bfbc1e9a823
Author: Jannick <thirdedition at gmx.net>
Date: Fri Jan 3 21:55:45 2020 +0100
inno-setup: revert changes relating to working dir of desktop link
inno_setup/gnucash-mingw64.iss:
- revert %USERDOCS%-related changes of 1a89d04.
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 336856e..d30f3d5 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -41,17 +41,17 @@ Name: desktopicon; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm
Name: menuicon; Description: "{cm:CreateMenuLink}"; GroupDescription: "{cm:AdditionalIcons}"
[Icons]
-Name: "{group}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "%USERDOCS%"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: menuicon
+Name: "{group}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "{code:GetDocPath}"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: menuicon
Name: "{group}\{cm:IconName_README}"; Filename: "{app}\doc\@PACKAGE@\{cm:IconFilename_README}"; Comment: "{cm:IconComment_README}"; Tasks: menuicon
Name: "{group}\{cm:IconName_FAQ}"; Filename: "http://wiki.gnucash.org/wiki/FAQ"; Tasks: menuicon
Name: "{group}\{cm:IconName_Bugzilla}"; Filename: "https://bugs.gnucash.org/enter_bug.cgi?product=GnuCash"; Tasks: menuicon
Name: "{group}\{cm:IconName_InstallFQ}"; Filename: "{app}\bin\install-fq-mods.cmd"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_InstallFQ}"; Tasks: menuicon
Name: "{group}\{cm:IconName_Uninstall}"; Filename: "{uninstallexe}"; Comment: "{cm:IconComment_Uninstall}"; Tasks: menuicon
-Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "%USERDOCS%"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: desktopicon
+Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "{code:GetDocPath}"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: desktopicon
[Run]
-Filename: "{app}\bin\@PACKAGE at .exe"; Description: "{cm:RunPrg}"; WorkingDir: "%USERDOCS%"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent
+Filename: "{app}\bin\@PACKAGE at .exe"; Description: "{cm:RunPrg}"; WorkingDir: "{code:GetDocPath}"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent
Filename: "{app}\bin\guile.cmd"; Flags: runhidden
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
commit 6a2d5dae2c76468dcc8ea5c270b25d245028c0fb
Author: Jannick <thirdedition at gmx.net>
Date: Fri Jan 3 06:03:30 2020 +0100
inno-setup: remove trailing white spaces
* inno_setup/gnucash-mingw64.iss: here
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 049efbd..336856e 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -220,8 +220,8 @@ Source: "@GC_WIN_REPOS_DIR@\extra_dist\*"; DestDir: "{app}\bin"; Flags: recurses
Root: HKCR; Subkey: ".gnucash"; ValueType: string; ValueName: ""; ValueData: "GnuCash.Financial.Data"; Flags: uninsdeletevalue
Root: HKCR; Subkey: ".gnucash"; ValueType: string; ValueName: "Content Type"; ValueData: "application/x-gnucash"; Flags: uninsdeletevalue
Root: HKCR; Subkey: "GnuCash.Financial.Data"; ValueType: string; ValueName: ""; ValueData: "GnuCash Financial Data"; Flags: uninsdeletevalue
-Root: HKCR; Subkey: "GnuCash.Financial.Data\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico,0"
-Root: HKCR; Subkey: "GnuCash.Financial.Data\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\bin\@PACKAGE at .exe"" ""%1"""
+Root: HKCR; Subkey: "GnuCash.Financial.Data\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico,0"
+Root: HKCR; Subkey: "GnuCash.Financial.Data\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\bin\@PACKAGE at .exe"" ""%1"""
Root: HKLM; Subkey: "Software\GnuCash"; ValueType: none; Flags: uninsdeletekeyifempty
Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: none; Flags: uninsdeletekeyifempty
@@ -454,7 +454,7 @@ begin
{ Get the installation-specific paths }
EnvFile := ExpandConstant(CurrentFileName);
- EtcDir := ExtractFileDir(EnvFile);
+ EtcDir := ExtractFileDir(EnvFile);
{ Load the current contents of the environment file }
Res := LoadStringsFromFile(EnvFile, EnvStrList);
@@ -740,7 +740,7 @@ hr.IconComment_Uninstall=Deinstaliraj raÄunovodstveni program GnuCash
;; ;;;;;;;;;;;;;;;;;;;;;
;; Italian translation
-; *** Pagina di "Selezione dei componenti"
+; *** Pagina di "Selezione dei componenti"
it.FullInstall=Installazione completa
it.CustomInstall=Installazione personalizzata
it.CreateDesktopIcon=Crea un'icona sul desktop
commit 1335548e0457dc4ebcda247eb2865431a76d7c44
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Dec 29 15:58:58 2019 -0800
Bug 797538 - Missing libbrotlidec.ddl on maint build gnucash-3.8-2019-12-29-git-3.8+.setup.exe
And several other changes as well to the dependencies.
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index f4a7285..049efbd 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -112,7 +112,7 @@ Source: "@INST_DIR@\share\doc\@PACKAGE at -docs\*.hhmap"; DestDir: "{app}\share\@PA
;; Required DLLs
;; gnucash.exe: libglib-2.0-0.dll, libgtk-3-0.dll, ligdk-3-0.dll, libatk-1.0-dll, libgobject-2.0-0.dll, libintl-8.dll, libcairo-gobject-2.dll, libcairo-2.dll, libfontconfig-1.0.dll, libfreetype-6.dll, libpixman-1-0.dll, libpng16-16.dll, zlib1.dll, libgdk-pixbuf-2.0-0.dll, libgio-2.0-0.dll, libgmodule-2.0-0.dll, libpango-1.0-0.dll, libpangocairo-1.0-0.dll, libpangowin32-1.0-0.dll, libpangoft2-1.0-0.dll, libharfbuzz-0.dll, libfribidi-0.dll, libiconv-2.dll, libwinpthread-1.dll, libsystre-0.dll, libxml2-2.dll, libxslt-1.dll, libboost_regex-mt.dll, libicuuc57.dll, libicudt57.dll, libtre-5.dll, libffi-6.dll, libgmp-10.dll, libltdl-7.dll
;; AQBanking: libgcrypt-20.dll, libgnutls-30.dll, libwinpthread-1.0.dll, libgmp-10.dll, libhogweed-5.dll, libidn-11.dll, libintl-8.dll, libnettle-7.dll, libp11-kit-0.dll, libtasn1-6.dll, zlib1.dll, libgpg-error-0.dll, libiconv-2.dll, libintl-8.dll, libgtk-win32-2.0-0.dll
-;; libwebkit: libenchant.dll, libgeoclue-0.dll, libgstapp-1.0-0.dll, libgstaudio-1.0-0.dll, libgstbase-1.0-0.dll, libgstfft-1.0-0.dll, libgstpbutils-1.0-0.dll, libgstpbutils-1.0-0.dll, libgstreamer-1.0-0.dll, libgstvideo-1.0-0.dll, libharfbuzz-icu-0.dll, liborc-0.4-0.dll, libgsttag-1.0-0.dll, libgraphite2.dll, libicuin57.dll, liicuuc57.dll, libicudt57.dll, libsoup-2.4-1.dll, libsqlite3-0.dll, libwebp-7.dll
+;; libwebkit: libbrotlicommon.dll, libbrotlidec.dll libharfbuzz-icu-0.dll, liborc-0.4-0.dll, libgsttag-1.0-0.dll, libgraphite2.dll, libicudt65.dll, libicuin65.dll, liicuuc65.dll, libicudt.dll, libsoup-2.4-1.dll, libsqlite3-0.dll, libssp-0.dll, libstdc__-6.dll, libunistring-2.dll, libwebp-7.dll
;;lib/dbd/libdbdmysql.dll: mariadb.dll, libeay32.dll, ssleay32.dll
;;lib/dbd/libdbdpgsql.dll: libpq.dll, ssleay32.dll, libeay32.dll
@@ -124,6 +124,8 @@ Source: "@MINGW_DIR@\bin\libboost_system-mt.dll"; DestDir: "{app}\bin"; Componen
Source: "@MINGW_DIR@\bin\libboost_filesystem-mt.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libboost_thread-mt.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libbz2-1.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libbrotlidec.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libbrotlicommon.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libcairo-2.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libcairo-gobject-2.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libcroco-0.6-3.dll"; DestDir: "{app}\bin"; Components: main
@@ -131,7 +133,6 @@ Source: "@MINGW_DIR@\bin\libcrypto-1_1.dll"; DestDir: "{app}\bin"; Components: m
Source: "@MINGW_DIR@\bin\libdatrie-1.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libdbus-1-3.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libdbus-glib-1-2.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\libenchant-2.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libepoxy-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libexpat-1.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libffi-6.dll"; DestDir: "{app}\bin"; Components: main
@@ -140,9 +141,7 @@ Source: "@MINGW_DIR@\bin\libfreetype-6.dll"; DestDir: "{app}\bin"; Components: m
Source: "@MINGW_DIR@\bin\libfribidi-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libgcrypt-20.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libgdk-3-0.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\libgdk-win32-2.0-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libgdk_pixbuf-2.0-0.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\libgeoclue-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libgio-2.0-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libglib-2.0-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libgmodule-2.0-0.dll"; DestDir: "{app}\bin"; Components: main
@@ -151,17 +150,7 @@ Source: "@MINGW_DIR@\bin\libgnutls-30.dll"; DestDir: "{app}\bin"; Components: ma
Source: "@MINGW_DIR@\bin\libgobject-2.0-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libgpg-error-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libgraphite2.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\libgstapp-1.0-0.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\libgstaudio-1.0-0.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\libgstbase-1.0-0.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\libgstfft-1.0-0.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\libgstpbutils-1.0-0.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\libgstpbutils-1.0-0.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\libgstreamer-1.0-0.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\libgsttag-1.0-0.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\libgstvideo-1.0-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libgtk-3-0.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\libgtk-win32-2.0-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libharfbuzz-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libharfbuzz-icu-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libhogweed-5.dll"; DestDir: "{app}\bin"; Components: main
@@ -182,8 +171,8 @@ Source: "@MINGW_DIR@\bin\libpango-1.0-0.dll"; DestDir: "{app}\bin"; Components:
Source: "@MINGW_DIR@\bin\libpangocairo-1.0-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libpangoft2-1.0-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libpangowin32-1.0-0.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\libpixman-1-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libpcre-1.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libpixman-1-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libpng16-16.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libpq.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libpsl-5.dll"; DestDir: "{app}\bin"; Components: main
@@ -191,10 +180,13 @@ Source: "@MINGW_DIR@\bin\librsvg-2-2.dll"; DestDir: "{app}\bin"; Components: mai
Source: "@MINGW_DIR@\bin\libsoup-2.4-1.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libsqlite3-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libssl-1_1.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libssp-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libstdc++-6.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libsystre-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libtasn1-6.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libthai-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libtre-5.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libunistring-2.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libwebp-7.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libwebkitgtk-3.0-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libwinpthread-1.dll"; DestDir: "{app}\bin"; Components: main
@@ -209,7 +201,6 @@ Source: "@MINGW_DIR@\bin\gspawn-win32-helper-console.exe"; DestDir: "{app}\bin";
Source: "@MINGW_DIR@\lib\gdk-pixbuf-2.0\2.10.0\loaders\*.dll"; DestDir: "{app}\lib\gdk-pixbuf-2.0\2.10.0\loaders"; Components: main
Source: "@MINGW_DIR@\lib\gdk-pixbuf-2.0\2.10.0\loaders.cache"; DestDir: "{app}\lib\gdk-pixbuf-2.0\2.10.0\"; Components: main
Source: "@MINGW_DIR@\lib\postgresql\*.dll"; DestDir: "{app}\lib\postgreql"; Components: main
-Source: "@MINGW_DIR@\lib\sqlite3.25.3\sqlite3253.dll"; DestDir: "{app}\lib\sqlite3.21.0"; Components: main
Source: "@MINGW_DIR@\share\icons\*"; DestDir: "{app}\share\icons"; Flags: recursesubdirs; Components: main
Source: "@MINGW_DIR@\share\themes\*"; DestDir: "{app}\share\themes"; Flags: recursesubdirs; Components: main
commit 7a7b94ae519ca0a35270c91269d9f753fe997510
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Dec 28 15:27:08 2019 -0800
Release GnuCash 3.8
diff --git a/gnucash.modules b/gnucash.modules
index 19cea4b..377043c 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -276,8 +276,8 @@
<cmake id="gnucash"
cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock">
- <branch module="project/gnucash/gnucash%20%28stable%29/3.7/gnucash-3.7.tar.bz2"
- repo="sourceforge" version="3.7"/>
+ <branch module="project/gnucash/gnucash%20%28stable%29/3.8/gnucash-3.8.tar.bz2"
+ repo="sourceforge" version="3.8"/>
<dependencies>
<dep package="libofx"/>
<dep package="aqbanking"/>
@@ -321,8 +321,8 @@
<autotools id="gnucash-docs"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
makeargs="chm" makeinstallargs="install-chm" >
- <branch module="project/gnucash/gnucash%20%28stable%29/3.7/gnucash-docs-3.7.tar.gz"
- version="3.7" repo="sourceforge"/>
+ <branch module="project/gnucash/gnucash%20%28stable%29/3.8/gnucash-docs-3.8.tar.gz"
+ version="3.8" repo="sourceforge"/>
</autotools>
<metamodule id="meta-gnucash-git">
commit cbf63811274f5d8960533eb11261a35eb120b720
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Dec 27 14:31:57 2019 -0800
Use a webkitgtk3 package built by the GnuCash team.
To replace the obsolescent one no longer supported by MinGW-w64.
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 25bef59..dbea428 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -268,7 +268,7 @@ $ignorefile = ""
bash-command -command "perl -ibak -pe 'BEGIN{undef $/;} s#[[]options[]]\R(Include = [^\R]*\R)?#[options]\nInclude = /etc/pacman.d/gnucash-ignores.pacman\n#smg' /etc/pacman.conf"
# Install the remaining dependencies.
-$deps = "iso-codes shared-mime-info libmariadbclient postgresql ninja pdcurses"
+$deps = "boost iso-codes shared-mime-info libmariadbclient postgresql ninja pdcurses"
Write-Host @"
commit cedc5ffb7f3983102e71caed140fcbc9fe76472b
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Dec 27 14:29:39 2019 -0800
Run pacman -Syyuu twice.
If there's a core update the first one just does that.
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 86ae27d..25bef59 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -230,6 +230,7 @@ Write-Host @"
Updating the installation. Accept the proposed changes. If the window doesn't close on its own then close it and re-run the script when it finishes.
"@
+bash-command -command "pacman -Syyuu --noconfirm"
bash-command -command "pacman -Syyuu --noconfirm"
# Set up aliases for the parts of msys-devtools and mingw-w64-toolchain that
@@ -246,29 +247,23 @@ bash-command -command "pacman -S $msys_devel --noconfirm --needed"
$mingw_toolchain = make-pkgnames -prefix $mingw_prefix -items $toolchain
bash-command -command "pacman -S $mingw_toolchain --noconfirm --needed"
-# webkitgtk3 was removed from the pacman database but the package is still available via direct url
-# so we install it from that url directly.
-# Note webkitgtk3 depends on icu. Icu updates require dependent packages to be rebuilt to work with the new version.
-# However as there won't be any webkitgtk3 updates, we have to peg icu to the version the last webkitgtk3
-# was built with. That also impacts other icu dependent packages: boost and harfbuzz. As we peg icu
-# we equally need to peg these two.
-# Note that webkitgtk3 will pull in gtk3 automatically.
-
+# The mingw-w64-webkitgtk3 package is no longer supported by the msys2
+# project so we have our own build on SourceForge.
Write-Host @"
-
-Now we'll install webkitgtk3 via direct url as it's no longer in the pacman database. With this we install a couple of other packages that are pegged to fixed version numbers due to how icu forces package dependencies. If the window doesn't close on its own then close it and re-run the script when it finishes.
-"@
-$direct_deps = "webkitgtk3-2.4.11-6-any.pkg.tar.xz boost-1.67.0-2-any.pkg.tar.xz harfbuzz-1.8.4-1-any.pkg.tar.xz icu-61.1-1-any.pkg.tar.xz"
-$mingw_direct_deps = make-pkgnames -prefix $mingw_url_prefix -items $direct_deps
-bash-command -command "pacman -U $mingw_direct_deps --noconfirm --needed"
-
-# Tell pacman to no longer update these manually installed packages
-$ignorefile = @"
-IgnorePkg = mingw-w64-i686-icu
-IgnorePkg = mingw-w64-i686-boost
-IgnorePkg = mingw-w64-i686-harfbuzz
-IgnorePkg = mingw-w64-i686-webkitgtk3
+Now we'll install a pre-built webkitgtk3 package we've created and placed in the GnuCash project on SourceForge. It will install several more dependencies from Mingw-w64's repository.
"@
+$sourceforge_url = "https://downloads.sourceforge.net/gnucash/Dependencies/"
+$signing_keyfile = "jralls_public_signing_key.asc"
+$key_url = $sourceforge_url + $signing_keyfile
+$key_id = "C1F4DE993CF5835F"
+$webkit = "$arch_long-webkitgtk3-2.4.11-999.1-any.pkg.tar.xz"
+$webkit_url = $sourceforge_url + $webkit
+bash-command -command "wget $key_url"
+bash-command -command "pacman-key --add $signing_keyfile"
+bash-command -command "pacman-key --lsign $key_id"
+bash-command -command "pacman -U $webkit_url --noconfirm --needed"
+
+$ignorefile = ""
[IO.File]::WriteAllLines( "$msys2_root\etc\pacman.d\gnucash-ignores.pacman", $ignorefile)
bash-command -command "perl -ibak -pe 'BEGIN{undef $/;} s#[[]options[]]\R(Include = [^\R]*\R)?#[options]\nInclude = /etc/pacman.d/gnucash-ignores.pacman\n#smg' /etc/pacman.conf"
commit b9cc630773cc85f99b287ff4fc8e673489cd66ff
Author: John Ralls <jralls at ceridwen.us>
Date: Wed Dec 25 15:18:45 2019 -0800
Update the msys installer to the current version.
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 2851ff3..86ae27d 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -137,8 +137,8 @@ function make-unixpath([string]$path) {
# Install MSYS2 for the current machine's architechture.
if (!(test-path -path $bash_path)) {
- $mingw64_installer32 = "$preferred_mirror/distrib/i686/msys2-i686-20180531.exe"
- $mingw64_installer64 = "$preferred_mirror/distrib/x86_64/msys2-x86_64-20180531.exe"
+ $mingw64_installer32 = "$preferred_mirror/distrib/i686/msys2-i686-20190524.exe"
+ $mingw64_installer64 = "$preferred_mirror/distrib/x86_64/msys2-x86_64-20190524.exe"
$mingw64_installer_file = "$download_dir\msys2.exe"
$mingw64_installer = If ([IntPtr]::size -eq 4) {$mingw64_installer32} Else {$mingw64_installer64}
commit 70f6645c27e3653d0339432f4fb2fdbcbfdea23f
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Nov 18 14:14:19 2019 -0800
Remove PKG_CONFIG environment variable from gwenhywfar.
The explicit path seems no longer needed.
diff --git a/jhbuildrc.in b/jhbuildrc.in
index 5ae55ed..c1a4d1f 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -82,7 +82,6 @@ module_makeargs["aqbanking"]="-j 1"
module_extra_env["gnucash"]={'GUILE_LOAD_PATH':os.path.join(prefix, 'share', 'guile', '2.2'), 'GUILE_LOAD_COMPILED_PATH':os.path.join(prefix, 'lib', 'guile', '2.2', 'ccache')}
module_extra_env["gnucash-git"]={'GUILE_LOAD_PATH':os.path.join(prefix, 'share', 'guile', '2.2'), 'GUILE_LOAD_COMPILED_PATH':os.path.join(prefix, 'lib', 'guile', '2.2', 'ccache')}
-module_extra_env["gwenhywfar"]={'PKG_CONFIG': os.path.join('/', _arch, 'bin', 'pkg-config')}
if _branch == 'master':
module_cmakeargs["gnucash-git"]=('-DGTEST_ROOT=$SRCROOT/googletest')
commit ec7d28db10d7babe8d09d04ded1ce6f8ec357b85
Author: Geert Janssens <geert at kobaltwit.be>
Date: Mon Nov 18 22:36:52 2019 +0100
Make libchipcard depend explicitly on gwenhywfar
diff --git a/gnucash.modules b/gnucash.modules
index d2b12b4..19cea4b 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -141,6 +141,7 @@
<dependencies>
<dep package="gcrypt"/>
<dep package="gnutls"/>
+ <dep package="gwenhywfar"/>
</dependencies>
</autotools>
commit ff9e626708d09cb467450b8178eb51e1db1b0998
Author: Geert Janssens <geert at kobaltwit.be>
Date: Mon Nov 18 22:30:04 2019 +0100
Adjust modules to allow libchipcard to work with gwenhywfar's pkg-config setup
The problem is pkg-config by default tries to determine a prefix based on
where it finds the .pc file. Unfortunately on Windows that results in a
Windows style path (C:\...). This is relevant here as libchipcard depends
on gwenhywfar paths returned by pkg-config. This is a recent change in
gwenhywfar.
The current libchipcard version depends on this only indirectly as it calls
gwenhwyfar-config, installed by the gwenhywfar package. Future versions of
libchipcard will use pkg-config directly instead.
The fix is to prevent pkg-config from determining the prefix, and just use
the paths as found in the pc file. That can be achieved by setting the
'--dont-define-prefix' pkg-config switch.
As current libchipcard only uses it indirectly via gwenhywfar, this commit
sets it for the gwenhywfar build. However as future versions of libchipcard
will use pkg-config directly the switch is also added for libchipcard
already as well.
diff --git a/gnucash.modules b/gnucash.modules
index 993b6a3..d2b12b4 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -134,7 +134,7 @@
</dependencies>
</autotools>
- <autotools id="libchipcard" autogen-sh="configure" autogenargs="--enable-local-install">
+ <autotools id="libchipcard" autogen-sh="configure" autogenargs="--enable-local-install PKG_CONFIG='pkg-config --dont-define-prefix'">
<branch module="221/libchipcard-5.1.4rc1.tar.gz" version="5.1.4rc1"
repo="aqbanking">
</branch>
@@ -145,7 +145,7 @@
</autotools>
<autotools id="gwenhywfar" autogen-sh="configure"
- autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc --disable-ssl">
+ autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc --disable-ssl PKG_CONFIG='pkg-config --dont-define-prefix'">
<branch module="223/gwenhywfar-4.99.25rc9.tar.gz" version="4.99.25rc9"
repo="aqbanking">
</branch>
@@ -156,7 +156,7 @@
</autotools>
<autotools id="gwenhywfar-git" autogen-template="make -fMakefile.cvs && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
- autogenargs="--with-guis='' --enable-local-install --disable-binreloc --disable-ssl">
+ autogenargs="--with-guis='' --enable-local-install --disable-binreloc --disable-ssl PKG_CONFIG='pkg-config --dont-define-prefix'">
<branch module="gwenhywfar" repo="aquamaniac"/>
<dependencies>
<dep package="gcrypt"/>
commit d35a21eb366e1a5c397d70043aca0d2e11921095
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Nov 17 11:58:32 2019 -0800
Bug 797434 - GPL is not an EULA
Display the GPL as an InfoBeforeFile instead of as a LicenseFile.
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index a407c86..f4a7285 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -16,7 +16,7 @@ AppUpdatesURL=http://www.gnucash.org
VersionInfoVersion=@PACKAGE_VERSION@
DefaultDirName={pf}\@PACKAGE@
DefaultGroupName=GnuCash
-LicenseFile=@INST_DIR@\share\doc\@PACKAGE@\LICENSE
+InfoBeforeFile=@INST_DIR@\share\doc\@PACKAGE@\LICENSE
Compression=lzma
MinVersion=5.0
PrivilegesRequired=poweruser
commit eed33740938bd43405cbc87e8162d5e5d2c4e111
Author: Christian Stimming <christian at cstimming.de>
Date: Mon Nov 11 08:32:42 2019 +0100
Update aqbanking+gwenyhwfar+libchipcard versions
diff --git a/gnucash.modules b/gnucash.modules
index 5921001..993b6a3 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -135,9 +135,8 @@
</autotools>
<autotools id="libchipcard" autogen-sh="configure" autogenargs="--enable-local-install">
- <branch module="138/libchipcard-5.1.3beta.tar.gz" version="5.1.3beta"
+ <branch module="221/libchipcard-5.1.4rc1.tar.gz" version="5.1.4rc1"
repo="aqbanking">
- <patch file="libchipcard-5.1.3.decl.patch" strip="1"/>
</branch>
<dependencies>
<dep package="gcrypt"/>
@@ -147,7 +146,7 @@
<autotools id="gwenhywfar" autogen-sh="configure"
autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc --disable-ssl">
- <branch module="210/gwenhywfar-4.99.24rc8.tar.gz" version="4.99.24rc8"
+ <branch module="223/gwenhywfar-4.99.25rc9.tar.gz" version="4.99.25rc9"
repo="aqbanking">
</branch>
<dependencies>
@@ -176,7 +175,7 @@
<autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
autogenargs="--enable-local-install">
- <branch module="215/aqbanking-5.99.43beta.tar.gz" repo="aqbanking" version="5.99.43beta" >
+ <branch module="224/aqbanking-5.99.44beta.tar.gz" repo="aqbanking" version="5.99.44beta" >
</branch>
<dependencies>
<dep package="gwenhywfar"/>
commit 5dda94e905370b695fa2827d9179ed230e16d745
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Tue Oct 22 08:46:47 2019 +0200
Fix missed version from previous commit
diff --git a/gnucash.modules b/gnucash.modules
index 066db09..5921001 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -176,7 +176,7 @@
<autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
autogenargs="--enable-local-install">
- <branch module="215/aqbanking-5.99.43beta.tar.gz" repo="aqbanking" version="5.99.42beta" >
+ <branch module="215/aqbanking-5.99.43beta.tar.gz" repo="aqbanking" version="5.99.43beta" >
</branch>
<dependencies>
<dep package="gwenhywfar"/>
commit d75d606acf36884ee46d1e3c7e9eedfd892b98a8
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Oct 21 12:45:55 2019 -0700
Bump AQB to the just-released 5.99.43beta.
diff --git a/gnucash.modules b/gnucash.modules
index eb628b3..066db09 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -176,7 +176,7 @@
<autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
autogenargs="--enable-local-install">
- <branch module="211/aqbanking-5.99.42beta.tar.gz" repo="aqbanking" version="5.99.42beta" >
+ <branch module="215/aqbanking-5.99.43beta.tar.gz" repo="aqbanking" version="5.99.42beta" >
</branch>
<dependencies>
<dep package="gwenhywfar"/>
commit 16683ee182866a3f69018984aedec918b4c9c22e
Author: Christian Stimming <christian at cstimming.de>
Date: Sun Oct 20 18:03:19 2019 +0200
update AqBanking 5.99.42beta, Gwenhywfar 4.99.24rc4
diff --git a/gnucash.modules b/gnucash.modules
index c03d955..eb628b3 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -147,7 +147,7 @@
<autotools id="gwenhywfar" autogen-sh="configure"
autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc --disable-ssl">
- <branch module="202/gwenhywfar-4.99.22rc6.tar.gz" version="4.99.22rc6"
+ <branch module="210/gwenhywfar-4.99.24rc8.tar.gz" version="4.99.24rc8"
repo="aqbanking">
</branch>
<dependencies>
@@ -176,7 +176,7 @@
<autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
autogenargs="--enable-local-install">
- <branch module="203/aqbanking-5.99.40beta.tar.gz" repo="aqbanking" version="5.99.40beta" >
+ <branch module="211/aqbanking-5.99.42beta.tar.gz" repo="aqbanking" version="5.99.42beta" >
</branch>
<dependencies>
<dep package="gwenhywfar"/>
commit 0eaa1c804048f1ca946a468b05398cc08b1c01cd
Author: Christian Stimming <christian at cstimming.de>
Date: Sat Oct 12 18:27:36 2019 +0200
update AqBanking 5.99.40beta, Gwenhywfar 4.99.22rc6
diff --git a/gnucash.modules b/gnucash.modules
index cf43c3f..c03d955 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -147,9 +147,8 @@
<autotools id="gwenhywfar" autogen-sh="configure"
autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc --disable-ssl">
- <branch module="168/gwenhywfar-4.99.20rc4.tar.gz" version="4.99.20rc4"
+ <branch module="202/gwenhywfar-4.99.22rc6.tar.gz" version="4.99.22rc6"
repo="aqbanking">
- <patch file="gwenhywfar-4.99.20-db.c.patch" strip="1"/>
</branch>
<dependencies>
<dep package="gcrypt"/>
@@ -177,8 +176,7 @@
<autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
autogenargs="--enable-local-install">
- <branch module="174/aqbanking-5.99.38beta.tar.gz" repo="aqbanking" version="5.99.38beta" >
- <patch file="aqbanking-5.99-strndup.patch" strip="1"/>
+ <branch module="203/aqbanking-5.99.40beta.tar.gz" repo="aqbanking" version="5.99.40beta" >
</branch>
<dependencies>
<dep package="gwenhywfar"/>
commit 71864dc389bc2354e8a4f9eaa7bf0239d8bafd69
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sun Oct 6 22:15:19 2019 +0200
Stop blocking glib schema compilation
This is an additional step to get gnucash
running directly from the build environment
instead of having to make and run a Windows installer.
With this you can run gnucash from a mingw32 shell as follows:
XDG_DATA_DIRS="<mingw32-dir>/share" <path-to-gnucash>
A bit more experimentation is needed to have that last bit
set directly from the install step
diff --git a/gnucash.modules b/gnucash.modules
index 5956682..cf43c3f 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -277,7 +277,7 @@
</cmake>
<cmake id="gnucash"
- cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DCOMPILE_GSCHEMAS=OFF">
+ cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock">
<branch module="project/gnucash/gnucash%20%28stable%29/3.7/gnucash-3.7.tar.bz2"
repo="sourceforge" version="3.7"/>
<dependencies>
@@ -294,7 +294,7 @@
</cmake>
<cmake id="gnucash-git"
- cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DCOMPILE_GSCHEMAS=OFF -DCMAKE_BUILD_TYPE=Debug">
+ cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DCMAKE_BUILD_TYPE=Debug">
<branch repo="github" module="Gnucash/gnucash.git" revision="master"
checkoutdir="gnucash-git"/>
<dependencies>
commit ffe8d7b3b48313f649c73f5d1bd3c105dbc52717
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sun Oct 6 22:09:09 2019 +0200
Switch to building with ninja
The remaining issues were resolved recently and it looks
ninja is less frequently stepping onto its own toes
(no locked file errors as we had with make).
diff --git a/gnucash.modules b/gnucash.modules
index 718f8a0..5956682 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -277,8 +277,7 @@
</cmake>
<cmake id="gnucash"
- cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DCOMPILE_GSCHEMAS=OFF"
- use-ninja="False">
+ cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DCOMPILE_GSCHEMAS=OFF">
<branch module="project/gnucash/gnucash%20%28stable%29/3.7/gnucash-3.7.tar.bz2"
repo="sourceforge" version="3.7"/>
<dependencies>
@@ -295,8 +294,7 @@
</cmake>
<cmake id="gnucash-git"
- cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DCOMPILE_GSCHEMAS=OFF -DCMAKE_BUILD_TYPE=Debug"
- use-ninja="False">
+ cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DCOMPILE_GSCHEMAS=OFF -DCMAKE_BUILD_TYPE=Debug">
<branch repo="github" module="Gnucash/gnucash.git" revision="master"
checkoutdir="gnucash-git"/>
<dependencies>
commit 97fb8730fb633427eb6250a8fbf9e0dbc289496c
Author: Christian Stimming <christian at cstimming.de>
Date: Thu Oct 3 13:11:30 2019 +0200
update AqBanking 5.99.38beta, Gwenhywfar 4.99.20rc4
diff --git a/gnucash.modules b/gnucash.modules
index be72f13..718f8a0 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -147,8 +147,10 @@
<autotools id="gwenhywfar" autogen-sh="configure"
autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc --disable-ssl">
- <branch module="160/gwenhywfar-4.99.18rc2.tar.gz" version="4.99.18rc2"
- repo="aqbanking" />
+ <branch module="168/gwenhywfar-4.99.20rc4.tar.gz" version="4.99.20rc4"
+ repo="aqbanking">
+ <patch file="gwenhywfar-4.99.20-db.c.patch" strip="1"/>
+ </branch>
<dependencies>
<dep package="gcrypt"/>
<dep package="gnutls"/>
@@ -175,7 +177,7 @@
<autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
autogenargs="--enable-local-install">
- <branch module="162/aqbanking-5.99.35beta.tar.gz" repo="aqbanking" version="5.99.35beta" >
+ <branch module="174/aqbanking-5.99.38beta.tar.gz" repo="aqbanking" version="5.99.38beta" >
<patch file="aqbanking-5.99-strndup.patch" strip="1"/>
</branch>
<dependencies>
diff --git a/patches/gwenhywfar-4.99.20-db.c.patch b/patches/gwenhywfar-4.99.20-db.c.patch
new file mode 100644
index 0000000..c723eb8
--- /dev/null
+++ b/patches/gwenhywfar-4.99.20-db.c.patch
@@ -0,0 +1,11 @@
+--- a/src/parser/db.c 2019-09-29 10:36:22.000000000 -0700
++++ b/src/parser/db.c 2019-10-03 09:33:38.194129400 -0700
+@@ -1960,7 +1960,7 @@
+
+
+
+-int _replaceVarsCb(void *cbPtr, const char *name, int index, int maxLen, GWEN_BUFFER *dstBuf)
++int GWENHYWFAR_CB _replaceVarsCb(void *cbPtr, const char *name, int index, int maxLen, GWEN_BUFFER *dstBuf)
+ {
+ GWEN_DB_NODE *db;
+ int rv;
commit d526540b7fb646eb92e72d0fe39aa4ca6d19952d
Author: Frank H. Ellenberger <fellen at users.noreply.github.com>
Date: Thu Sep 26 23:55:02 2019 +0200
update AqBanking 5.99.35beta, Gwenhywfar 4.99.18rc2
diff --git a/gnucash.modules b/gnucash.modules
index 4ce4921..be72f13 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -147,7 +147,7 @@
<autotools id="gwenhywfar" autogen-sh="configure"
autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc --disable-ssl">
- <branch module="156/gwenhywfar-4.99.17rc1.tar.gz" version="4.99.17rc1"
+ <branch module="160/gwenhywfar-4.99.18rc2.tar.gz" version="4.99.18rc2"
repo="aqbanking" />
<dependencies>
<dep package="gcrypt"/>
@@ -175,7 +175,7 @@
<autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
autogenargs="--enable-local-install">
- <branch module="157/aqbanking-5.99.34beta.tar.gz" repo="aqbanking" version="5.99.34beta" >
+ <branch module="162/aqbanking-5.99.35beta.tar.gz" repo="aqbanking" version="5.99.35beta" >
<patch file="aqbanking-5.99-strndup.patch" strip="1"/>
</branch>
<dependencies>
commit c2105ec02032b43ea3942a8e29dc07d68aabfc14
Author: Geert Janssens <geert at kobaltwit.be>
Date: Wed Sep 25 22:06:42 2019 +0200
HTMLHELP_DIR is unused
We copy the necessary files while setting up the build environment
based on install data found in the registry.
diff --git a/gnucash.modules b/gnucash.modules
index a51fd1f..4ce4921 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -275,7 +275,7 @@
</cmake>
<cmake id="gnucash"
- cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DCOMPILE_GSCHEMAS=OFF"
+ cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DCOMPILE_GSCHEMAS=OFF"
use-ninja="False">
<branch module="project/gnucash/gnucash%20%28stable%29/3.7/gnucash-3.7.tar.bz2"
repo="sourceforge" version="3.7"/>
@@ -293,7 +293,7 @@
</cmake>
<cmake id="gnucash-git"
- cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DCOMPILE_GSCHEMAS=OFF -DCMAKE_BUILD_TYPE=Debug"
+ cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DCOMPILE_GSCHEMAS=OFF -DCMAKE_BUILD_TYPE=Debug"
use-ninja="False">
<branch repo="github" module="Gnucash/gnucash.git" revision="master"
checkoutdir="gnucash-git"/>
commit c7b444b3797f1e426e989c5f7db5e4af76fe9cdc
Author: Geert Janssens <geert at kobaltwit.be>
Date: Wed Sep 25 21:55:55 2019 +0200
Rsync inside bash requires a unix like path
This got lost in a recent refactoring commit
diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index 6b8b1b7..9d41ba4 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -165,6 +165,7 @@ Write-Output "Build Ended $time_stamp" | Tee-Object -FilePath $log_file -Append
if ($hostname) {
bash.exe -lc "$script_unix/buildserver/upload_build_log.sh $log_unix $hostname $log_dir $branch 2>&1"
if ($setup_file_valid) {
+ $setup_file = make-unixpath -path $setup_file
bash.exe -lc "rsync.exe -e ssh -a $setup_file $hostname/$branch 2>&1"
}
}
commit d06452c6d663302b6262c1e7fed4f3f342c70773
Author: Geert Janssens <geert at kobaltwit.be>
Date: Wed Sep 25 21:55:07 2019 +0200
Force move of installer package if one with same name already exists
This is the easiest. A possibly more refined edition could
add a number to the end to allow more than one build from the same
gnucash-git source. This could be to compare changes in dependencies
or in the build system.
diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index f5630d8..6b8b1b7 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -146,7 +146,7 @@ if ($new_file) {
if ($setup_file_valid) {
$destination_dir="$target_dir\win32\$branch"
New-Item -ItemType Directory -Force -Path "$destination_dir" | Out-Null
- Move-Item -Path "$setup_file" -Destination "$destination_dir"
+ Move-Item -Path "$setup_file" -Destination "$destination_dir" -Force
$pkg_name = Split-Path -Path "$setup_file" -Leaf
$setup_file = "$destination_dir\$pkg_name"
Write-Output "Created GnuCash Setup File $setup_file" | Tee-Object -FilePath $log_file -Append
commit 05cc9a91efc353e6e117c602f9f3e8896c342cca
Author: Geert Janssens <geert at kobaltwit.be>
Date: Wed Sep 25 20:19:12 2019 +0200
Test for installer generation failures and report them
diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index 33bf54e..f5630d8 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -134,19 +134,28 @@ if (test-path -path $install_manifest) {
#git.exe -C $script_unix pull --rebase 2>&1 | Tee-Object -FilePath $log_file -Append
# Build the latest GnuCash and all dependencies not installed via mingw64
bash.exe -lc "jhbuild --no-interact -f $script_unix/jhbuildrc build --clean 2>&1" | Tee-Object -FilePath $log_file -Append
+
+$setup_file_valid = False
$new_file = test-path -path $target_dir\$package\$branch\inst\bin\gnucash.exe -NewerThan $time_stamp
if ($new_file) {
#Build the installer
$is_git = ($branch.CompareTo("releases") -ne 0)
Write-Output "Creating GnuCash installer." | Tee-Object -FilePath $log_file -Append
$setup_file = & $script_dir\bundle-mingw64.ps1 -root_dir $target_dir -target_dir $target_dir\$package\$branch -package $package -git_build $is_git 2>&1 | Tee-Object -FilePath $log_file -Append
- $destination_dir="$target_dir\win32\$branch"
- New-Item -ItemType Directory -Force -Path "$destination_dir" | Out-Null
- Move-Item -Path "$setup_file" -Destination "$destination_dir"
- $pkg_name = Split-Path -Path "$setup_file" -Leaf
- $setup_file = "$destination_dir\$pkg_name"
- $setup_file = make-unixpath -path $setup_file
- Write-Output "Created GnuCash Setup File $setup_file" | Tee-Object -FilePath $log_file -Append
+ $setup_file_valid = Test-Path -Path "$setup_file"
+ if ($setup_file_valid) {
+ $destination_dir="$target_dir\win32\$branch"
+ New-Item -ItemType Directory -Force -Path "$destination_dir" | Out-Null
+ Move-Item -Path "$setup_file" -Destination "$destination_dir"
+ $pkg_name = Split-Path -Path "$setup_file" -Leaf
+ $setup_file = "$destination_dir\$pkg_name"
+ Write-Output "Created GnuCash Setup File $setup_file" | Tee-Object -FilePath $log_file -Append
+ }
+ else {
+ Write-Output "An error occurred while creating the GnuCash installer:" | Tee-Object -FilePath $log_file -Append
+ Write-Output "$setup_file" | Tee-Object -FilePath $log_file -Append
+ }
+
}
$time_stamp = get-date -format "yyyy-MM-dd HH:mm:ss"
@@ -155,7 +164,7 @@ Write-Output "Build Ended $time_stamp" | Tee-Object -FilePath $log_file -Append
# Copy the transcript and installer to the download server and delete them.
if ($hostname) {
bash.exe -lc "$script_unix/buildserver/upload_build_log.sh $log_unix $hostname $log_dir $branch 2>&1"
- if ($new_file) {
+ if ($setup_file_valid) {
bash.exe -lc "rsync.exe -e ssh -a $setup_file $hostname/$branch 2>&1"
}
}
commit 035ef5d367ec425ea35d5f441b6dfbd97819dbe5
Author: Geert Janssens <geert at kobaltwit.be>
Date: Wed Sep 25 17:25:20 2019 +0200
Store local and remote build artefacts in the same directory hierarchy
This will allow old file cleanup using rsync in the future
diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index ffd15e0..33bf54e 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -93,11 +93,14 @@ $target_unix = make-unixpath -path $target_dir
$log_dir = "build-logs"
#Make sure that there's no running transcript, then start one:
-$time_stamp = get-date -format "yyyy-MM-dd-HH-mm-ss"
-$log_file = "$target_dir\build-$branch-$time_stamp.log"
+$time_stamp_file = get-date -format "yyyy-MM-dd-HH-mm-ss"
+$yyyy_mm_dir = get-date -format "yyyy-MM"
+$log_dir_full = "$target_dir\win32\$log_dir\$branch\$yyyy_mm_dir"
+$log_file = "$log_dir_full\build-$branch-$time_stamp_file.log"
$log_unix = make-unixpath -path $log_file
-$time_stamp = get-date -format "yyyy-MM-dd HH:mm:ss"
+New-Item -ItemType Directory -Force -Path "$log_dir_full" | Out-Null
+$time_stamp = get-date -format "yyyy-MM-dd HH:mm:ss"
Write-Output "Build Started $time_stamp" | Tee-Object -FilePath $log_file
git.exe -C $script_unix pull 2>&1 | Tee-Object -FilePath $log_file -Append
#copy the file to the download server so that everyone can see we've started
@@ -137,6 +140,11 @@ if ($new_file) {
$is_git = ($branch.CompareTo("releases") -ne 0)
Write-Output "Creating GnuCash installer." | Tee-Object -FilePath $log_file -Append
$setup_file = & $script_dir\bundle-mingw64.ps1 -root_dir $target_dir -target_dir $target_dir\$package\$branch -package $package -git_build $is_git 2>&1 | Tee-Object -FilePath $log_file -Append
+ $destination_dir="$target_dir\win32\$branch"
+ New-Item -ItemType Directory -Force -Path "$destination_dir" | Out-Null
+ Move-Item -Path "$setup_file" -Destination "$destination_dir"
+ $pkg_name = Split-Path -Path "$setup_file" -Leaf
+ $setup_file = "$destination_dir\$pkg_name"
$setup_file = make-unixpath -path $setup_file
Write-Output "Created GnuCash Setup File $setup_file" | Tee-Object -FilePath $log_file -Append
}
commit ae8216f949bc47673970855c17a174dce60abf3f
Author: Geert Janssens <geert at kobaltwit.be>
Date: Wed Sep 25 19:47:50 2019 +0200
Fix SO_EFFECTIVE extraction code
Newer aqbanking and gwenhywfar have changed their include directory name
Properly use gwen_dir and aqb_dir variables for substiution in inno setup
diff --git a/bundle-mingw64.ps1 b/bundle-mingw64.ps1
index 8ea3647..6beec0d 100644
--- a/bundle-mingw64.ps1
+++ b/bundle-mingw64.ps1
@@ -114,8 +114,8 @@ $minor_version = version_item -tag "GNUCASH_MINOR_VERSION" -path $gnc_config_h
$package_version = "$major_version.$minor_version"
$inst_dir = "$target_dir\inst"
$mingw_ver = bitness("$inst_dir\bin\gnucash.exe")
-$aqb_dir = version_item -tag "SO_EFFECTIVE "-path "$inst_dir\include\aqbanking5\aqbanking\version.h"
-$gwen_dir = version_item -tag "SO_EFFECTIVE " -path "$inst_dir\include\gwenhywfar4\gwenhywfar\version.h"
+$aqb_dir = version_item -tag "SO_EFFECTIVE "-path "$inst_dir\include\aqbanking6\aqbanking\version.h"
+$gwen_dir = version_item -tag "SO_EFFECTIVE " -path "$inst_dir\include\gwenhywfar5\gwenhywfar\version.h"
# We must use sed under bash in order to preserve the UTF-8 encoding
# with Unix line endings; PowerShell wants to re-code the output as
@@ -131,8 +131,8 @@ $issue_out = make-unixpath -path $target_dir\gnucash.iss
$proc = bash-command("sed < $issue_in > $issue_out \
-e ""s#@MINGW_DIR@#$root\\\\\\\\msys2\\\\\\\\mingw$mingw_ver#g"" \
-e ""s#@INST_DIR@#$target\\\\\\\\inst#g"" \
- -e ""s#@-gwenhywfar_so_effective-@#$gwen_ver#g"" \
- -e ""s#@-aqbanking_so_effective-@#$aqb_Dir#g"" \
+ -e ""s#@-gwenhywfar_so_effective-@#$gwen_dir#g"" \
+ -e ""s#@-aqbanking_so_effective-@#$aqb_dir#g"" \
-e ""s#@PACKAGE_VERSION@#$package_version#g"" \
-e ""s#@PACKAGE@#$package#g"" \
-e ""s#@GNUCASH_MAJOR_VERSION@#$major_version#g"" \
commit 8783290443f57091487a03be479be9667636e09d
Author: Geert Janssens <geert at kobaltwit.be>
Date: Wed Sep 25 17:24:11 2019 +0200
Update parameter comments for bundle-mingw64.ps1
diff --git a/bundle-mingw64.ps1 b/bundle-mingw64.ps1
index bc9616e..8ea3647 100644
--- a/bundle-mingw64.ps1
+++ b/bundle-mingw64.ps1
@@ -32,9 +32,21 @@ You may need to allow running scripts on your computer and depending
on where the target_dir is you may need to run the script with
Administrator privileges.
+.PARAMETER root_dir
+
+Mandatory. The root path to the build environment. Typically C:\gcdev64.
+
.PARAMETER target_dir
-Optional. The root path to the build environment. Defaults to the root of the script's path, e.g. if the script's path is C:\gcdev64\src\gnucash-on-windows.git\bundle-mingw64.ps1 the default target_dir will be C:\gcdev64.
+Mandatory. The base path to where the build to be packaged is located. This is typically $root_dir\gnucash\$branch, for example C:\gcdev64\gnucash\maint
+
+.PARAMETER package
+
+Mandatory. The name of the package to bundle. This is currently only used by the Inno installer builder for things like the registry group to add values to.
+
+.PARAMETER package
+
+Mandatory. Boolean to indicate whether or not this is a git build.
#>
@@ -175,4 +187,4 @@ if ($git_build) {
}
rename-item -path $setup_result $final_file
}
-return $final_file
\ No newline at end of file
+return $final_file
commit 7e6d97d82b140b42e74a03698b1d476547fc7bd1
Author: Geert Janssens <geert at kobaltwit.be>
Date: Wed Sep 25 16:40:53 2019 +0200
Remove obsolete patch files
diff --git a/patches/aqbanking-5.99.33beta-mconsole.patch b/patches/aqbanking-5.99.33beta-mconsole.patch
deleted file mode 100644
index d8e7943..0000000
--- a/patches/aqbanking-5.99.33beta-mconsole.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/src/tools/aqbanking-cli/Makefile.am
-+++ b/src/tools/aqbanking-cli/Makefile.am
-@@ -37,6 +37,9 @@ aqbanking_cli_SOURCES= \
- control.c
-
- aqbanking_cli_LDFLAGS=
-+aqhbci_tool4_LDFLAGS=
-+aqpaypal_tool_LDFLAGS=
-+aqebics_tool_LDFLAGS=
- #-Wl,-static
-
- DEFS += -DLOCALEDIR=\"$(localedir)\" -DAQBANKING_CLI_VERSION_STRING=\"@AQBANKING_CLI_VERSION_STRING@\"
-@@ -68,6 +68,10 @@ aqebics_tool_LDADD= \
- if IS_WINDOWS
-
- aqbanking_cli_LDFLAGS+=-mconsole
-+aqhbci_tool4_LDFLAGS+=-mconsole
-+aqpaypal_tool_LDFLAGS+=-mconsole
-+aqebics_tool_LDFLAGS+=-mconsole
-+
-
- endif
-
-
diff --git a/patches/gwenhywfar-4.99.16-clean.patch b/patches/gwenhywfar-4.99.16-clean.patch
deleted file mode 100644
index 6dc7a1b..0000000
--- a/patches/gwenhywfar-4.99.16-clean.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in 2019-09-20 11:59:23.000000000 -0700
-+++ b/Makefile.in 2019-09-22 12:31:05.662210400 -0700
-@@ -1212,7 +1212,7 @@
- clean-local: clean-local-check
- .PHONY: clean-local
- clean-local-check:
-- rm -rf apidoc gwenhywfar5
-+ rm -rf apidoc
-
- listdoc.h: $(top_builddir)/admin/mklistdoc
- admin/mklistdoc -v -I $(top_srcdir)/src/base `find "$(top_builddir)/gwenhywfar5/gwenhywfar" -name "*.h" | LC_ALL=C sort` >listdoc.h
diff --git a/patches/gwenhywfar-4.99.16-decl.patch b/patches/gwenhywfar-4.99.16-decl.patch
deleted file mode 100644
index 6ba60d3..0000000
--- a/patches/gwenhywfar-4.99.16-decl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/sio/syncio_tls.c 2019-09-20 11:59:23.000000000 -0700
-+++ b/src/sio/syncio_tls.c 2019-09-21 18:12:03.751296700 -0700
-@@ -123,7 +123,9 @@
-
-
-
--int GWEN_SyncIo_Tls_Internal_CheckCert(GWEN_SYNCIO *sio, const GWEN_SSLCERTDESCR *cert)
-+GWENHYWFAR_CB int
-+GWEN_SyncIo_Tls_Internal_CheckCert(GWEN_SYNCIO *sio,
-+ const GWEN_SSLCERTDESCR *cert)
- {
- GWEN_SYNCIO_TLS *xio;
-
commit 681c606773e9eb15971415487f3fdc4eabe54e77
Author: Geert Janssens <geert at kobaltwit.be>
Date: Wed Sep 25 16:39:16 2019 +0200
Revert back to wrapping rsync in a bash shell
Directly invoking rsync in powershell gives an odd remote error
(null) unknown option
diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index 198c010..ffd15e0 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -148,6 +148,6 @@ Write-Output "Build Ended $time_stamp" | Tee-Object -FilePath $log_file -Append
if ($hostname) {
bash.exe -lc "$script_unix/buildserver/upload_build_log.sh $log_unix $hostname $log_dir $branch 2>&1"
if ($new_file) {
- rsync.exe -e ssh -a "$setup_file $hostname/$branch" 2>&1
+ bash.exe -lc "rsync.exe -e ssh -a $setup_file $hostname/$branch 2>&1"
}
}
commit 23cb2c05ba1a0f506dda5b8c3a85e87732a95579
Author: Geert Janssens <geert at kobaltwit.be>
Date: Wed Sep 25 15:16:39 2019 +0200
Drop aqbanking mconsole patch
It has been incorporated in version 5.99.34beta
diff --git a/gnucash.modules b/gnucash.modules
index c343af9..a51fd1f 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -177,7 +177,6 @@
autogenargs="--enable-local-install">
<branch module="157/aqbanking-5.99.34beta.tar.gz" repo="aqbanking" version="5.99.34beta" >
<patch file="aqbanking-5.99-strndup.patch" strip="1"/>
- <patch file="aqbanking-5.99.33beta-mconsole.patch" strip="1"/>
</branch>
<dependencies>
<dep package="gwenhywfar"/>
commit 0dec6bb2c0736f439c270ccb1f2f9be4ac51a6d1
Author: Geert Janssens <geert at kobaltwit.be>
Date: Wed Sep 25 14:57:46 2019 +0200
Drop patches for gwenhywfar
They have been incorporated into 4.99.17rc1
diff --git a/gnucash.modules b/gnucash.modules
index d11b83a..c343af9 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -148,10 +148,7 @@
<autotools id="gwenhywfar" autogen-sh="configure"
autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc --disable-ssl">
<branch module="156/gwenhywfar-4.99.17rc1.tar.gz" version="4.99.17rc1"
- repo="aqbanking" >
- <patch file="gwenhywfar-4.99.16-clean.patch" strip="1"/>
- <patch file="gwenhywfar-4.99.16-decl.patch" strip="1"/>
- </branch>
+ repo="aqbanking" />
<dependencies>
<dep package="gcrypt"/>
<dep package="gnutls"/>
commit c1ca0943794545897557c0d81dad6cd069a2b502
Author: Geert Janssens <geert at kobaltwit.be>
Date: Wed Sep 25 14:44:55 2019 +0200
Update gwenhywfar to 4.99.17rc
diff --git a/gnucash.modules b/gnucash.modules
index b0ea074..d11b83a 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -147,7 +147,7 @@
<autotools id="gwenhywfar" autogen-sh="configure"
autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc --disable-ssl">
- <branch module="140/gwenhywfar-4.99.16beta.tar.gz" version="4.99.16beta"
+ <branch module="156/gwenhywfar-4.99.17rc1.tar.gz" version="4.99.17rc1"
repo="aqbanking" >
<patch file="gwenhywfar-4.99.16-clean.patch" strip="1"/>
<patch file="gwenhywfar-4.99.16-decl.patch" strip="1"/>
commit 3f17b8865986951fd0318e5264656f0f87f4a0c1
Author: Geert Janssens <geert at kobaltwit.be>
Date: Wed Sep 25 14:37:34 2019 +0200
Reduce strndup patch
34beta has it applied to xml.c
Add #define as in xml.c to minimize the impact in transport.c
diff --git a/patches/aqbanking-5.99-strndup.patch b/patches/aqbanking-5.99-strndup.patch
index 2fc5c37..3bc0faa 100644
--- a/patches/aqbanking-5.99-strndup.patch
+++ b/patches/aqbanking-5.99-strndup.patch
@@ -1,6 +1,6 @@
--- a/src/libs/plugins/backends/aqfints/transportlayer/transport.c 2019-09-21 08:53:32.000000000 -0700
+++ b/src/libs/plugins/backends/aqfints/transportlayer/transport.c 2019-09-22 10:34:04.486430000 -0700
-@@ -17,6 +17,24 @@
+@@ -17,6 +17,26 @@
/* code headers */
/* macro functions */
@@ -21,71 +21,9 @@
+ return cpy;
+ }
+}
++
++#define strndup my_strndup
+
GWEN_INHERIT_FUNCTIONS(AQFINTS_TRANSPORT)
-@@ -200,7 +218,8 @@
- if (p2==NULL) {
- DBG_ERROR(AQFINTS_LOGDOMAIN, "Bad data (missing second '+')");
- return GWEN_ERROR_BAD_DATA;
-- } /* read message size */ copiedString=strndup(p1, (p2-p1));
-+ } /* read message size */
-+ copiedString=my_strndup(p1, (p2-p1));
- assert(copiedString);
- if (1!=sscanf(p1, "%d", &msgSize)) {
- DBG_ERROR(AQFINTS_LOGDOMAIN, "Bad size field [%s]", copiedString);
---- a/src/libs/plugins/imexporters/xml/xml.c 2019-09-21 08:53:32.000000000 -0700
-+++ b/src/libs/plugins/imexporters/xml/xml.c 2019-09-22 10:38:02.321923600 -0700
-@@ -31,9 +31,23 @@
-
- static AB_TRANSACTION *dbToTransaction(AB_IMEXPORTER *ie, GWEN_DB_NODE *db);
- static void handleTransactionDetails(AB_TRANSACTION *t, const char *sDetails);
-+static char *my_strndup(const char *src, size_t n)
-+{
-+ int len;
-
-+ len=strlen(src);
-+ if (len<n)
-+ return strdup(src);
-+ else {
-+ char *cpy;
-
--
-+ cpy=(char *) malloc(n+1);
-+ assert(cpy);
-+ memmove(cpy, src, n);
-+ cpy[n]=0;
-+ return cpy;
-+ }
-+}
-
- AB_IMEXPORTER *AB_ImExporterXML_new(AB_BANKING *ab)
- {
-@@ -592,7 +606,7 @@
- if (s>sStart) {
- char *sCopy;
-
-- sCopy=strndup(sStart, s-sStart);
-+ sCopy=my_strndup(sStart, s-sStart);
- assert(sCopy);
- AB_Transaction_SetTransactionKey(t, sCopy);
- free(sCopy);
-@@ -609,7 +623,7 @@
- char *sCopy;
- int num=0;
-
-- sCopy=strndup(sStart, s-sStart);
-+ sCopy=my_strndup(sStart, s-sStart);
- assert(sCopy);
- if (1!=sscanf(sCopy, "%d", &num)) {
- DBG_WARN(AQBANKING_LOGDOMAIN, "Transaction details with invalid code (2nd element) in \"%s\", ignoring", sDetails);
-@@ -629,7 +643,7 @@
- if (s>sStart) {
- char *sCopy;
-
-- sCopy=strndup(sStart, s-sStart);
-+ sCopy=my_strndup(sStart, s-sStart);
- assert(sCopy);
- AB_Transaction_SetPrimanota(t, sCopy);
- free(sCopy);
commit 77e3d9e1d25d305b4fa4ec419f600b2aac2144a4
Author: Geert Janssens <geert at kobaltwit.be>
Date: Wed Sep 25 13:03:11 2019 +0200
Update aqbanking to latest beta (5.99.34beta)
diff --git a/gnucash.modules b/gnucash.modules
index 1c445e6..b0ea074 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -178,7 +178,7 @@
<autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
autogenargs="--enable-local-install">
- <branch module="145/aqbanking-5.99.33beta.tar.gz" repo="aqbanking" version="5.99.33beta" >
+ <branch module="157/aqbanking-5.99.34beta.tar.gz" repo="aqbanking" version="5.99.34beta" >
<patch file="aqbanking-5.99-strndup.patch" strip="1"/>
<patch file="aqbanking-5.99.33beta-mconsole.patch" strip="1"/>
</branch>
commit 533ac3b055c2e92272472b494f87bad7ecf55064
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sun Sep 22 13:27:39 2019 +0200
Bash tweaks in server script
* use bash directly instead of via Send-Process
* drop bash for commands that don't need it
* use powershell redirection (which is pretty much like bash redirection)
* use powershell native Write-Output command for simple text message
rather than making a detour via 'bash -lc echo'
Notes on the redirection
* sometimes the bash command still includes the error redirection
This is because powershell make error output much more verbose
and I wasn't sure that was adding much useful info.
* Powershell redirections don't work with Write-Host. They
do work with Write-Output so I have replaced those.
diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index a4f4242..198c010 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -65,19 +65,22 @@ $progressPreference = 'silentlyContinue'
$env:MSYSTEM = 'MINGW32'
$env:TERM = 'dumb' #Prevent escape codes in the log.
$env:TARGET = "$package-$branch"
+# This allows us to run Msys2 commands such as bash.exe directly
+$Env:Path = "$Env:Path;$target_dir\msys2\usr\bin"
if ($PSVersionTable.PSVersion.Major -ge 3) {
$PSDefaultParameterValues['*:Encoding'] = 'utf8'
- }
+}
+
+if (!(test-path -path $target_dir\msys2\usr\bin\bash.exe)) {
+ Write-Output "Shell program not found, aborting."
+ Exit 1
+}
function bash-command() {
param ([string]$command = "")
- if (!(test-path -path $target_dir\msys2\usr\bin\bash.exe)) {
- write-host "Shell program not found, aborting."
- return
- }
- #write-host "Running bash command ""$command"""
- Start-Process -FilePath "$target_dir\msys2\usr\bin\bash.exe" -ArgumentList "-lc ""$command""" -NoNewWindow -Wait
+ #Write-Output "Running bash command ""$command"""
+ bash.exe -lc "$command 2>&1"
}
function make-unixpath([string]$path) {
@@ -95,15 +98,15 @@ $log_file = "$target_dir\build-$branch-$time_stamp.log"
$log_unix = make-unixpath -path $log_file
$time_stamp = get-date -format "yyyy-MM-dd HH:mm:ss"
-bash-command -command "cd $script_unix && git pull"
-bash-command -command "echo Build Started $time_stamp > $log_unix"
+Write-Output "Build Started $time_stamp" | Tee-Object -FilePath $log_file
+git.exe -C $script_unix pull 2>&1 | Tee-Object -FilePath $log_file -Append
#copy the file to the download server so that everyone can see we've started
if ($hostname) {
- bash-command -command "$script_unix/buildserver/upload_build_log.sh $log_unix $hostname $log_dir $branch"
+ bash.exe -lc "$script_unix/buildserver/upload_build_log.sh $log_unix $hostname $log_dir $branch"
}
# Update MinGW-w64
-bash-command -command "pacman -Su --noconfirm > >(tee -a $log_unix) 2>&1"
+pacman.exe -Su --noconfirm 2>&1 | Tee-Object -FilePath $log_file -Append
#GnuCash build still behaves badly if it finds its old build products. Clean them out.
if ($branch -eq "releases") {
@@ -124,26 +127,27 @@ if (test-path -path $install_manifest) {
}
# Update the gnucash-on-windows repository
-#bash-command -command "cd $script_unix && git reset --hard && git pull --rebase"
+#git.exe -C $script_unix reset --hard 2>&1 | Tee-Object -FilePath $log_file -Append
+#git.exe -C $script_unix pull --rebase 2>&1 | Tee-Object -FilePath $log_file -Append
# Build the latest GnuCash and all dependencies not installed via mingw64
-bash-command -command "jhbuild --no-interact -f $script_unix/jhbuildrc build --clean > >(tee -a $log_unix) 2>&1"
+bash.exe -lc "jhbuild --no-interact -f $script_unix/jhbuildrc build --clean 2>&1" | Tee-Object -FilePath $log_file -Append
$new_file = test-path -path $target_dir\$package\$branch\inst\bin\gnucash.exe -NewerThan $time_stamp
if ($new_file) {
#Build the installer
$is_git = ($branch.CompareTo("releases") -ne 0)
- bash-command -command "echo 'Creating GnuCash installer.' > >(tee -a $log_unix)"
+ Write-Output "Creating GnuCash installer." | Tee-Object -FilePath $log_file -Append
$setup_file = & $script_dir\bundle-mingw64.ps1 -root_dir $target_dir -target_dir $target_dir\$package\$branch -package $package -git_build $is_git 2>&1 | Tee-Object -FilePath $log_file -Append
$setup_file = make-unixpath -path $setup_file
- write-host "Created GnuCash Setup File $setup_file"
+ Write-Output "Created GnuCash Setup File $setup_file" | Tee-Object -FilePath $log_file -Append
}
$time_stamp = get-date -format "yyyy-MM-dd HH:mm:ss"
-bash-command -command "echo Build Ended $time_stamp >> $log_unix"
+Write-Output "Build Ended $time_stamp" | Tee-Object -FilePath $log_file -Append
# Copy the transcript and installer to the download server and delete them.
if ($hostname) {
- bash-command -command "$script_unix/buildserver/upload_build_log.sh $log_unix $hostname $log_dir $branch"
+ bash.exe -lc "$script_unix/buildserver/upload_build_log.sh $log_unix $hostname $log_dir $branch 2>&1"
if ($new_file) {
- bash-command -command "rsync -e ssh -a $setup_file $hostname/$branch"
+ rsync.exe -e ssh -a "$setup_file $hostname/$branch" 2>&1
}
}
commit 709e278ff51f02e23c9c8127ec043d91abdf1dfb
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Sep 24 11:39:13 2019 -0700
Link all aqbanking console programs with -mconsole on Windows.
So that they actually display their output.
Temporary fix for https://www.aquamaniac.de/rdm/issues/71
can be removed after release of 5.99.34
diff --git a/gnucash.modules b/gnucash.modules
index f4dcde7..1c445e6 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -180,6 +180,7 @@
autogenargs="--enable-local-install">
<branch module="145/aqbanking-5.99.33beta.tar.gz" repo="aqbanking" version="5.99.33beta" >
<patch file="aqbanking-5.99-strndup.patch" strip="1"/>
+ <patch file="aqbanking-5.99.33beta-mconsole.patch" strip="1"/>
</branch>
<dependencies>
<dep package="gwenhywfar"/>
diff --git a/patches/aqbanking-5.99.33beta-mconsole.patch b/patches/aqbanking-5.99.33beta-mconsole.patch
new file mode 100644
index 0000000..d8e7943
--- /dev/null
+++ b/patches/aqbanking-5.99.33beta-mconsole.patch
@@ -0,0 +1,24 @@
+--- a/src/tools/aqbanking-cli/Makefile.am
++++ b/src/tools/aqbanking-cli/Makefile.am
+@@ -37,6 +37,9 @@ aqbanking_cli_SOURCES= \
+ control.c
+
+ aqbanking_cli_LDFLAGS=
++aqhbci_tool4_LDFLAGS=
++aqpaypal_tool_LDFLAGS=
++aqebics_tool_LDFLAGS=
+ #-Wl,-static
+
+ DEFS += -DLOCALEDIR=\"$(localedir)\" -DAQBANKING_CLI_VERSION_STRING=\"@AQBANKING_CLI_VERSION_STRING@\"
+@@ -68,6 +68,10 @@ aqebics_tool_LDADD= \
+ if IS_WINDOWS
+
+ aqbanking_cli_LDFLAGS+=-mconsole
++aqhbci_tool4_LDFLAGS+=-mconsole
++aqpaypal_tool_LDFLAGS+=-mconsole
++aqebics_tool_LDFLAGS+=-mconsole
++
+
+ endif
+
+
commit 0596987c56b1144f1b4ff4590f0626549cbca568
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Sep 22 11:26:13 2019 -0700
Update gwen, aqb, and libchipcard to the latest betas.
And patch them so that they actually build on MinGW-w64.
diff --git a/gnucash.modules b/gnucash.modules
index 61b8221..f4dcde7 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -137,6 +137,7 @@
<autotools id="libchipcard" autogen-sh="configure" autogenargs="--enable-local-install">
<branch module="138/libchipcard-5.1.3beta.tar.gz" version="5.1.3beta"
repo="aqbanking">
+ <patch file="libchipcard-5.1.3.decl.patch" strip="1"/>
</branch>
<dependencies>
<dep package="gcrypt"/>
@@ -146,8 +147,11 @@
<autotools id="gwenhywfar" autogen-sh="configure"
autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc --disable-ssl">
- <branch module="136/gwenhywfar-4.99.15beta.tar.gz" version="4.99.15beta"
- repo="aqbanking" />
+ <branch module="140/gwenhywfar-4.99.16beta.tar.gz" version="4.99.16beta"
+ repo="aqbanking" >
+ <patch file="gwenhywfar-4.99.16-clean.patch" strip="1"/>
+ <patch file="gwenhywfar-4.99.16-decl.patch" strip="1"/>
+ </branch>
<dependencies>
<dep package="gcrypt"/>
<dep package="gnutls"/>
@@ -174,7 +178,8 @@
<autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
autogenargs="--enable-local-install">
- <branch module="134/aqbanking-5.99.30beta.tar.gz" repo="aqbanking" version="5.99.30beta" >
+ <branch module="145/aqbanking-5.99.33beta.tar.gz" repo="aqbanking" version="5.99.33beta" >
+ <patch file="aqbanking-5.99-strndup.patch" strip="1"/>
</branch>
<dependencies>
<dep package="gwenhywfar"/>
diff --git a/patches/aqbanking-5.99-strndup.patch b/patches/aqbanking-5.99-strndup.patch
new file mode 100644
index 0000000..2fc5c37
--- /dev/null
+++ b/patches/aqbanking-5.99-strndup.patch
@@ -0,0 +1,91 @@
+--- a/src/libs/plugins/backends/aqfints/transportlayer/transport.c 2019-09-21 08:53:32.000000000 -0700
++++ b/src/libs/plugins/backends/aqfints/transportlayer/transport.c 2019-09-22 10:34:04.486430000 -0700
+@@ -17,6 +17,24 @@
+ /* code headers */
+
+ /* macro functions */
++static char *my_strndup(const char *src, size_t n)
++{
++ int len;
++
++ len=strlen(src);
++ if (len<n)
++ return strdup(src);
++ else {
++ char *cpy;
++
++ cpy=(char *) malloc(n+1);
++ assert(cpy);
++ memmove(cpy, src, n);
++ cpy[n]=0;
++ return cpy;
++ }
++}
++
+ GWEN_INHERIT_FUNCTIONS(AQFINTS_TRANSPORT)
+
+
+@@ -200,7 +218,8 @@
+ if (p2==NULL) {
+ DBG_ERROR(AQFINTS_LOGDOMAIN, "Bad data (missing second '+')");
+ return GWEN_ERROR_BAD_DATA;
+- } /* read message size */ copiedString=strndup(p1, (p2-p1));
++ } /* read message size */
++ copiedString=my_strndup(p1, (p2-p1));
+ assert(copiedString);
+ if (1!=sscanf(p1, "%d", &msgSize)) {
+ DBG_ERROR(AQFINTS_LOGDOMAIN, "Bad size field [%s]", copiedString);
+--- a/src/libs/plugins/imexporters/xml/xml.c 2019-09-21 08:53:32.000000000 -0700
++++ b/src/libs/plugins/imexporters/xml/xml.c 2019-09-22 10:38:02.321923600 -0700
+@@ -31,9 +31,23 @@
+
+ static AB_TRANSACTION *dbToTransaction(AB_IMEXPORTER *ie, GWEN_DB_NODE *db);
+ static void handleTransactionDetails(AB_TRANSACTION *t, const char *sDetails);
++static char *my_strndup(const char *src, size_t n)
++{
++ int len;
+
++ len=strlen(src);
++ if (len<n)
++ return strdup(src);
++ else {
++ char *cpy;
+
+-
++ cpy=(char *) malloc(n+1);
++ assert(cpy);
++ memmove(cpy, src, n);
++ cpy[n]=0;
++ return cpy;
++ }
++}
+
+ AB_IMEXPORTER *AB_ImExporterXML_new(AB_BANKING *ab)
+ {
+@@ -592,7 +606,7 @@
+ if (s>sStart) {
+ char *sCopy;
+
+- sCopy=strndup(sStart, s-sStart);
++ sCopy=my_strndup(sStart, s-sStart);
+ assert(sCopy);
+ AB_Transaction_SetTransactionKey(t, sCopy);
+ free(sCopy);
+@@ -609,7 +623,7 @@
+ char *sCopy;
+ int num=0;
+
+- sCopy=strndup(sStart, s-sStart);
++ sCopy=my_strndup(sStart, s-sStart);
+ assert(sCopy);
+ if (1!=sscanf(sCopy, "%d", &num)) {
+ DBG_WARN(AQBANKING_LOGDOMAIN, "Transaction details with invalid code (2nd element) in \"%s\", ignoring", sDetails);
+@@ -629,7 +643,7 @@
+ if (s>sStart) {
+ char *sCopy;
+
+- sCopy=strndup(sStart, s-sStart);
++ sCopy=my_strndup(sStart, s-sStart);
+ assert(sCopy);
+ AB_Transaction_SetPrimanota(t, sCopy);
+ free(sCopy);
diff --git a/patches/gwenhywfar-4.99.16-clean.patch b/patches/gwenhywfar-4.99.16-clean.patch
new file mode 100644
index 0000000..6dc7a1b
--- /dev/null
+++ b/patches/gwenhywfar-4.99.16-clean.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in 2019-09-20 11:59:23.000000000 -0700
++++ b/Makefile.in 2019-09-22 12:31:05.662210400 -0700
+@@ -1212,7 +1212,7 @@
+ clean-local: clean-local-check
+ .PHONY: clean-local
+ clean-local-check:
+- rm -rf apidoc gwenhywfar5
++ rm -rf apidoc
+
+ listdoc.h: $(top_builddir)/admin/mklistdoc
+ admin/mklistdoc -v -I $(top_srcdir)/src/base `find "$(top_builddir)/gwenhywfar5/gwenhywfar" -name "*.h" | LC_ALL=C sort` >listdoc.h
diff --git a/patches/gwenhywfar-4.99.16-decl.patch b/patches/gwenhywfar-4.99.16-decl.patch
new file mode 100644
index 0000000..6ba60d3
--- /dev/null
+++ b/patches/gwenhywfar-4.99.16-decl.patch
@@ -0,0 +1,13 @@
+--- a/src/sio/syncio_tls.c 2019-09-20 11:59:23.000000000 -0700
++++ b/src/sio/syncio_tls.c 2019-09-21 18:12:03.751296700 -0700
+@@ -123,7 +123,9 @@
+
+
+
+-int GWEN_SyncIo_Tls_Internal_CheckCert(GWEN_SYNCIO *sio, const GWEN_SSLCERTDESCR *cert)
++GWENHYWFAR_CB int
++GWEN_SyncIo_Tls_Internal_CheckCert(GWEN_SYNCIO *sio,
++ const GWEN_SSLCERTDESCR *cert)
+ {
+ GWEN_SYNCIO_TLS *xio;
+
diff --git a/patches/libchipcard-5.1.3.decl.patch b/patches/libchipcard-5.1.3.decl.patch
new file mode 100644
index 0000000..aa2b572
--- /dev/null
+++ b/patches/libchipcard-5.1.3.decl.patch
@@ -0,0 +1,13 @@
+--- a/src/lib/client/cards/zkacard/zkacard.c 2019-02-05 12:29:41.000000000 -0800
++++ b/src/lib/client/cards/zkacard/zkacard.c 2019-09-22 08:59:23.775111300 -0700
+@@ -769,8 +769,8 @@
+
+ return LC_Client_ResultOk;
+ }
+-
+-LC_CLIENT_RESULT CHIPCARD_CB LC_ZkaCard__SeccosSearchRecord(LC_CARD *card,
++CHIPCARD_API
++LC_CLIENT_RESULT LC_ZkaCard__SeccosSearchRecord(LC_CARD *card,
+ uint32_t flags,
+ int recNum,
+ const char *searchPattern,
commit f7749d30eff75844cc1a343c755c7bd6cab2b741
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sun Sep 22 13:11:51 2019 +0200
Consistently use same output redirection format
diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index ae8d1b2..a4f4242 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -126,7 +126,7 @@ if (test-path -path $install_manifest) {
# Update the gnucash-on-windows repository
#bash-command -command "cd $script_unix && git reset --hard && git pull --rebase"
# Build the latest GnuCash and all dependencies not installed via mingw64
-bash-command -command "jhbuild --no-interact -f $script_unix/jhbuildrc build --clean > >(tee -a $log_unix) 2> >(tee -a $log_unix)"
+bash-command -command "jhbuild --no-interact -f $script_unix/jhbuildrc build --clean > >(tee -a $log_unix) 2>&1"
$new_file = test-path -path $target_dir\$package\$branch\inst\bin\gnucash.exe -NewerThan $time_stamp
if ($new_file) {
#Build the installer
commit 85730bd178e6bfaf371e864b70a5832415655275
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Sep 21 15:45:32 2019 -0700
Handle different GTEST_ROOT values for maint and master.
diff --git a/jhbuildrc.in b/jhbuildrc.in
index 4d86544..5ae55ed 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -84,3 +84,5 @@ module_extra_env["gnucash"]={'GUILE_LOAD_PATH':os.path.join(prefix, 'share', 'gu
module_extra_env["gnucash-git"]={'GUILE_LOAD_PATH':os.path.join(prefix, 'share', 'guile', '2.2'), 'GUILE_LOAD_COMPILED_PATH':os.path.join(prefix, 'lib', 'guile', '2.2', 'ccache')}
module_extra_env["gwenhywfar"]={'PKG_CONFIG': os.path.join('/', _arch, 'bin', 'pkg-config')}
+if _branch == 'master':
+ module_cmakeargs["gnucash-git"]=('-DGTEST_ROOT=$SRCROOT/googletest')
commit 49bd9779b364b389d34fb6f681135c4f4f0679fa
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat Sep 21 10:58:15 2019 +0200
Remove stray double quote
diff --git a/gnucash.modules b/gnucash.modules
index 4cd68dd..61b8221 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -135,7 +135,7 @@
</autotools>
<autotools id="libchipcard" autogen-sh="configure" autogenargs="--enable-local-install">
- <branch module="138/libchipcard-5.1.3beta".tar.gz" version="5.1.3beta"
+ <branch module="138/libchipcard-5.1.3beta.tar.gz" version="5.1.3beta"
repo="aqbanking">
</branch>
<dependencies>
commit 8022a1748c57f734268bac586758810e498f7e95
Author: Frank H. Ellenberger <fellen at users.noreply.github.com>
Date: Thu Sep 19 11:21:12 2019 +0200
Fix redmines file numbers
diff --git a/gnucash.modules b/gnucash.modules
index d23c8d3..4cd68dd 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -146,7 +146,7 @@
<autotools id="gwenhywfar" autogen-sh="configure"
autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc --disable-ssl">
- <branch module="108/gwenhywfar-4.99.15beta.tar.gz" version="4.99.15beta"
+ <branch module="136/gwenhywfar-4.99.15beta.tar.gz" version="4.99.15beta"
repo="aqbanking" />
<dependencies>
<dep package="gcrypt"/>
@@ -174,7 +174,7 @@
<autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
autogenargs="--enable-local-install">
- <branch module="107/aqbanking-5.99.30beta.tar.gz" repo="aqbanking" version="5.99.30beta" >
+ <branch module="134/aqbanking-5.99.30beta.tar.gz" repo="aqbanking" version="5.99.30beta" >
</branch>
<dependencies>
<dep package="gwenhywfar"/>
commit af164a8ba443e487f30e7ef4e41870754f0f7351
Author: Frank H. Ellenberger <fellen at users.noreply.github.com>
Date: Thu Sep 19 06:01:30 2019 +0200
Aqb6Beta: use new security media
A bunch of new security media were defined.
Revert this commit, if no stable libchipcard is released before we release!
diff --git a/gnucash.modules b/gnucash.modules
index dcb068b..d23c8d3 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -135,8 +135,8 @@
</autotools>
<autotools id="libchipcard" autogen-sh="configure" autogenargs="--enable-local-install">
- <branch module="gnucash/Dependencies/libchipcard-5.0.4.tar.gz" version="5.0.4"
- repo="sourceforge">
+ <branch module="138/libchipcard-5.1.3beta".tar.gz" version="5.1.3beta"
+ repo="aqbanking">
</branch>
<dependencies>
<dep package="gcrypt"/>
commit 64a55bc5e8f94ea4b231c8c0e8c1c2385c8e39eb
Author: Frank H. Ellenberger <fellen at users.noreply.github.com>
Date: Thu Sep 19 05:13:46 2019 +0200
Use Aqb/Gwen betas to test optional FinTS 4.1 changes
* It should reenable access to many german banks.
* It will give us much more testers.
Revert it, if no stable AqBanking6 gets released before our next release!
diff --git a/gnucash.modules b/gnucash.modules
index c65605f..dcb068b 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -146,7 +146,7 @@
<autotools id="gwenhywfar" autogen-sh="configure"
autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc --disable-ssl">
- <branch module="108/gwenhywfar-4.20.2.tar.gz" version="4.20.2"
+ <branch module="108/gwenhywfar-4.99.15beta.tar.gz" version="4.99.15beta"
repo="aqbanking" />
<dependencies>
<dep package="gcrypt"/>
@@ -174,7 +174,7 @@
<autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
autogenargs="--enable-local-install">
- <branch module="107/aqbanking-5.8.2.tar.gz" repo="aqbanking" version="5.8.2" >
+ <branch module="107/aqbanking-5.99.30beta.tar.gz" repo="aqbanking" version="5.99.30beta" >
</branch>
<dependencies>
<dep package="gwenhywfar"/>
commit 58c17cac09e36e7fa75d77bddacefdefff1388bb
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Sep 7 18:12:34 2019 -0700
Build 3.7 Release.
diff --git a/gnucash.modules b/gnucash.modules
index c7698e0..c65605f 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -146,7 +146,8 @@
<autotools id="gwenhywfar" autogen-sh="configure"
autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc --disable-ssl">
- <branch module="108/gwenhywfar-4.20.2.tar.gz" version="4.20.2" repo="aqbanking" />
+ <branch module="108/gwenhywfar-4.20.2.tar.gz" version="4.20.2"
+ repo="aqbanking" />
<dependencies>
<dep package="gcrypt"/>
<dep package="gnutls"/>
@@ -274,8 +275,8 @@
<cmake id="gnucash"
cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DCOMPILE_GSCHEMAS=OFF"
use-ninja="False">
- <branch repo="sourceforge" module="project/gnucash/gnucash%20%28stable%29/3.6/gnucash-3.6.tar.bz2"
- version="3.6"/>
+ <branch module="project/gnucash/gnucash%20%28stable%29/3.7/gnucash-3.7.tar.bz2"
+ repo="sourceforge" version="3.7"/>
<dependencies>
<dep package="libofx"/>
<dep package="aqbanking"/>
@@ -320,8 +321,8 @@
<autotools id="gnucash-docs"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
makeargs="chm" makeinstallargs="install-chm" >
- <branch module="project/gnucash/gnucash%20%28stable%29/3.6/gnucash-docs-3.5.tar.gz"
- version="3.6" repo="sourceforge"/>
+ <branch module="project/gnucash/gnucash%20%28stable%29/3.7/gnucash-docs-3.7.tar.gz"
+ version="3.7" repo="sourceforge"/>
</autotools>
<metamodule id="meta-gnucash-git">
commit 49d0e8809da2ff026d368a6c1b2d46e8794f094d
Author: Geert Janssens <geert at kobaltwit.be>
Date: Tue Aug 27 23:49:44 2019 +0200
Checkoutdirs are no longer needed for gwenhywfar and aqbanking
The new redmine system at aquamaniac has sane download urls
diff --git a/gnucash.modules b/gnucash.modules
index b39fe28..c7698e0 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -146,8 +146,7 @@
<autotools id="gwenhywfar" autogen-sh="configure"
autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc --disable-ssl">
- <branch module="108/gwenhywfar-4.20.2.tar.gz" version="4.20.2" repo="aqbanking" checkoutdir="gwenhywfar-4.20.2">
- </branch>
+ <branch module="108/gwenhywfar-4.20.2.tar.gz" version="4.20.2" repo="aqbanking" />
<dependencies>
<dep package="gcrypt"/>
<dep package="gnutls"/>
@@ -174,7 +173,7 @@
<autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
autogenargs="--enable-local-install">
- <branch module="107/aqbanking-5.8.2.tar.gz" repo="aqbanking" version="5.8.2" checkoutdir="aqbanking-5.8.2">
+ <branch module="107/aqbanking-5.8.2.tar.gz" repo="aqbanking" version="5.8.2" >
</branch>
<dependencies>
<dep package="gwenhywfar"/>
commit 726fefd4cab73f8b43b45be41954293b52e1484b
Author: Christian Stimming <christian at cstimming.de>
Date: Tue Aug 27 22:46:58 2019 +0200
Update aqbanking/gwenhywfar.
Needed because gwen 4.20.1 contains a crashing bug, fixed in 4.20.2.
diff --git a/gnucash.modules b/gnucash.modules
index 9e86fad..b39fe28 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -146,8 +146,7 @@
<autotools id="gwenhywfar" autogen-sh="configure"
autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc --disable-ssl">
- <branch module="104/gwenhywfar-4.20.1.tar.gz" version="4.20.1" repo="aqbanking" checkoutdir="gwenhywfar-4.20.1">
- <patch file="gwenhywfar-4.20.1-clean-targets.patch" strip="1"/>
+ <branch module="108/gwenhywfar-4.20.2.tar.gz" version="4.20.2" repo="aqbanking" checkoutdir="gwenhywfar-4.20.2">
</branch>
<dependencies>
<dep package="gcrypt"/>
@@ -175,7 +174,7 @@
<autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
autogenargs="--enable-local-install">
- <branch module="105/aqbanking-5.8.1.tar.gz" repo="aqbanking" version="5.8.1" checkoutdir="aqbanking-5.8.1">
+ <branch module="107/aqbanking-5.8.2.tar.gz" repo="aqbanking" version="5.8.2" checkoutdir="aqbanking-5.8.2">
</branch>
<dependencies>
<dep package="gwenhywfar"/>
commit dc4fb89ddb579a2c2540eb3a90deb89d19e7a5c0
Author: Geert Janssens <geert at kobaltwit.be>
Date: Fri Aug 23 19:03:02 2019 +0200
Explicitly use ssh for rsync communication
diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index 8939fce..ae8d1b2 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -144,6 +144,6 @@ bash-command -command "echo Build Ended $time_stamp >> $log_unix"
if ($hostname) {
bash-command -command "$script_unix/buildserver/upload_build_log.sh $log_unix $hostname $log_dir $branch"
if ($new_file) {
- bash-command -command "rsync -a $setup_file $hostname/$branch"
+ bash-command -command "rsync -e ssh -a $setup_file $hostname/$branch"
}
}
diff --git a/buildserver/upload_build_log.sh b/buildserver/upload_build_log.sh
index 78ff21d..b8246e8 100755
--- a/buildserver/upload_build_log.sh
+++ b/buildserver/upload_build_log.sh
@@ -23,7 +23,7 @@ function create_remote_dir()
# For this hack $base_dir is just an arbitrary existing directory
# It doesn't matter which one
# No files will be copied from it anyway because of the exclude parameter
- rsync -a --exclude='*' "$base_dir"/ "$1"
+ rsync -e ssh -a --exclude='*' "$base_dir"/ "$1"
fi
}
@@ -37,7 +37,7 @@ then
# the final remote directory to store it
# So let's just store it in the top-level so we have a trace
# of the build start or very early failures
- rsync -a "$log_file" "$host"/build-logs
+ rsync -e ssh -a "$log_file" "$host"/build-logs
else
# Now the subdirectory to store the log file is is known
# In addition group per month to simplify navigation even more
@@ -46,14 +46,14 @@ then
create_remote_dir "$host"/build-logs/$remote_branch_dir
create_remote_dir "$host"/build-logs/$remote_branch_dir/$month_part
- rsync -a "$log_file" "$host"/build-logs/$remote_branch_dir/$month_part
+ rsync -e ssh -a "$log_file" "$host"/build-logs/$remote_branch_dir/$month_part
# Finally remove the initially start build log uploaded earlier
# Disable fatal error handling though to prevent the complete script from exiting
# if no early build log exists
echo "Removing initial startup build log uploaded earlier"
set +ex
- rsync -rv --delete --include="$(basename $log_file)" --exclude='*' "$base_dir"/ "$host"/build-logs/
+ rsync -e ssh -rv --delete --include="$(basename $log_file)" --exclude='*' "$base_dir"/ "$host"/build-logs/
set -ex
fi
fi
commit f894a2572d73a03334b843d5647a0ccb86dcb083
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu Aug 22 14:03:11 2019 +0200
Fully switch to rsync for uploading files
diff --git a/README.md b/README.md
index a850fe7..d1a2f8f 100644
--- a/README.md
+++ b/README.md
@@ -83,7 +83,7 @@ This repository includes a script, ```buildserver\build_package.ps1``` that comb
### build_package.ps1 options
* **-branch**: ```maint```, ```master```, or ```release```. The last builds the release configured in gnucash.modules from the release tarball.
* **-target_dir**: The **target_dir** configured into ```setup-mingw64.ps1```.
-* **-hostname**: The upload URI. Optional. If set the script will attempt to scp the gnucash-xxx-setup.exe and the build log to hard-coded subdirectories under this URI. The user running the script must have correctly configured ssh to connect to the URI with a key; there's no provision for password authentication.
+* **-hostname**: The upload URI. Optional. If set the script will attempt to rsync the gnucash-xxx-setup.exe and the build log to hard-coded subdirectories under this URI. The user running the script must have correctly configured ssh to connect to the URI with a key; there's no provision for password authentication.
## Other files:
* ```jhbuildrc.in``` Template jhbuild configuration file, converted to ```jhbuildrc``` by ```setup-mingw64.ps1``` with the **target_dir**.
@@ -91,4 +91,4 @@ This repository includes a script, ```buildserver\build_package.ps1``` that comb
* ```inno_setup/```: Configuration and localization files for building ```gnucash-xxx-setup.exe``` with Inno Setup.
* ```patches/```: Modifications to the source packages required to build in this environment.
* ```extra_dist/```: The Online Quote Installation tool.
-* ```exetype.pl```: A perl script for converting the executable type of programs between Windowed and Console. It is sometimes useful to convert the GnuCash executable to Console type (it's built as Windowed) to capture some text output it emits before logging starts.
\ No newline at end of file
+* ```exetype.pl```: A perl script for converting the executable type of programs between Windowed and Console. It is sometimes useful to convert the GnuCash executable to Console type (it's built as Windowed) to capture some text output it emits before logging starts.
diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index 4c85a10..8939fce 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -144,6 +144,6 @@ bash-command -command "echo Build Ended $time_stamp >> $log_unix"
if ($hostname) {
bash-command -command "$script_unix/buildserver/upload_build_log.sh $log_unix $hostname $log_dir $branch"
if ($new_file) {
- bash-command -command "scp -p $setup_file $hostname/$branch"
+ bash-command -command "rsync -a $setup_file $hostname/$branch"
}
}
commit e826d82372b561cf1be3ec01699a6b0a7b9952e4
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu Aug 22 10:58:33 2019 +0200
Store build logs in subdirectories per branch and per month
Note this update requires an additional msys package to be installed (rsync2)
so you may have to re-run setup-mingw64.ps1 once before
starting buildserver/build_package.ps1.
diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index 2b462d3..4c85a10 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -99,7 +99,7 @@ bash-command -command "cd $script_unix && git pull"
bash-command -command "echo Build Started $time_stamp > $log_unix"
#copy the file to the download server so that everyone can see we've started
if ($hostname) {
- bash-command -command "scp -p $log_unix $hostname/$log_dir/"
+ bash-command -command "$script_unix/buildserver/upload_build_log.sh $log_unix $hostname $log_dir $branch"
}
# Update MinGW-w64
@@ -142,7 +142,7 @@ bash-command -command "echo Build Ended $time_stamp >> $log_unix"
# Copy the transcript and installer to the download server and delete them.
if ($hostname) {
- bash-command -command "scp -p $log_unix $hostname/$log_dir/"
+ bash-command -command "$script_unix/buildserver/upload_build_log.sh $log_unix $hostname $log_dir $branch"
if ($new_file) {
bash-command -command "scp -p $setup_file $hostname/$branch"
}
diff --git a/buildserver/upload_build_log.sh b/buildserver/upload_build_log.sh
new file mode 100755
index 0000000..78ff21d
--- /dev/null
+++ b/buildserver/upload_build_log.sh
@@ -0,0 +1,59 @@
+#! /bin/bash
+#
+# A function to upload build logs
+# If a branch is known it will upload to
+# build-logs/branch/yyyy-mm/logfile
+# otherwise it will upload to
+# build-logs/logfile
+
+log_file=$1
+host=$2
+log_dir=$3
+remote_branch_dir=$4
+base_dir=$(pwd) # A dummy base directory used in rsync
+
+# This function will create a remote directory
+# It will only run if $host is configured.
+# Note it assumes the parent directory exists and it won't
+# create intermediate subdirectories if that is not the case
+function create_remote_dir()
+{
+ if [[ -n "$host" ]]
+ then
+ # For this hack $base_dir is just an arbitrary existing directory
+ # It doesn't matter which one
+ # No files will be copied from it anyway because of the exclude parameter
+ rsync -a --exclude='*' "$base_dir"/ "$1"
+ fi
+}
+
+if [[ -n "$host" ]]
+then
+ echo "Uploading log file '$(basename $log_file)'"
+ create_remote_dir "$host"/build-logs
+ if [[ -z "$remote_branch_dir" ]]
+ then
+ # We don't know the build type yet, so we can't determine
+ # the final remote directory to store it
+ # So let's just store it in the top-level so we have a trace
+ # of the build start or very early failures
+ rsync -a "$log_file" "$host"/build-logs
+ else
+ # Now the subdirectory to store the log file is is known
+ # In addition group per month to simplify navigation even more
+ month_part=$(date +%Y-%m)
+
+ create_remote_dir "$host"/build-logs/$remote_branch_dir
+ create_remote_dir "$host"/build-logs/$remote_branch_dir/$month_part
+
+ rsync -a "$log_file" "$host"/build-logs/$remote_branch_dir/$month_part
+
+ # Finally remove the initially start build log uploaded earlier
+ # Disable fatal error handling though to prevent the complete script from exiting
+ # if no early build log exists
+ echo "Removing initial startup build log uploaded earlier"
+ set +ex
+ rsync -rv --delete --include="$(basename $log_file)" --exclude='*' "$base_dir"/ "$host"/build-logs/
+ set -ex
+ fi
+fi
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 2b2b72a..2851ff3 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -234,7 +234,7 @@ bash-command -command "pacman -Syyuu --noconfirm"
# Set up aliases for the parts of msys-devtools and mingw-w64-toolchain that
# we need:
-$devel = "asciidoc autoconf autoconf2.13 autogen automake-wrapper automake1.10 automake1.11 automake1.12 automake1.13 automake1.14 automake1.15 automake1.6 automake1.7 automake1.8 automake1.9 bison diffstat diffutils dos2unix file flex gawk gettext gettext-devel gperf grep groff intltool libtool m4 make man-db pacman pactoys-git patch patchutils perl pkg-config sed swig texinfo texinfo-tex wget xmlto git jhbuild-git texinfo"
+$devel = "asciidoc autoconf autoconf2.13 autogen automake-wrapper automake1.10 automake1.11 automake1.12 automake1.13 automake1.14 automake1.15 automake1.6 automake1.7 automake1.8 automake1.9 bison diffstat diffutils dos2unix file flex gawk gettext gettext-devel gperf grep groff intltool libtool m4 make man-db pacman pactoys-git patch patchutils perl pkg-config rsync2 sed swig texinfo texinfo-tex wget xmlto git jhbuild-git texinfo"
$toolchain = "binutils cmake crt-git gcc gcc-libs gdb headers-git libmangle-git libtool libwinpthread-git make pkg-config tools-git winpthreads-git"
commit 03242a92e8d9cd5cf72f30068611c943a500682a
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu Aug 22 13:56:32 2019 +0200
Revert "Store build logs in subdirectories per branch and per month"
The build server currently doesn't have rsync permissions to the webhost.
This commit can be restored once the proper permissions are there.
This reverts commit 8073b34c5c1a52a6ef37dba33e1173291192b7d4.
diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index 4c85a10..2b462d3 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -99,7 +99,7 @@ bash-command -command "cd $script_unix && git pull"
bash-command -command "echo Build Started $time_stamp > $log_unix"
#copy the file to the download server so that everyone can see we've started
if ($hostname) {
- bash-command -command "$script_unix/buildserver/upload_build_log.sh $log_unix $hostname $log_dir $branch"
+ bash-command -command "scp -p $log_unix $hostname/$log_dir/"
}
# Update MinGW-w64
@@ -142,7 +142,7 @@ bash-command -command "echo Build Ended $time_stamp >> $log_unix"
# Copy the transcript and installer to the download server and delete them.
if ($hostname) {
- bash-command -command "$script_unix/buildserver/upload_build_log.sh $log_unix $hostname $log_dir $branch"
+ bash-command -command "scp -p $log_unix $hostname/$log_dir/"
if ($new_file) {
bash-command -command "scp -p $setup_file $hostname/$branch"
}
diff --git a/buildserver/upload_build_log.sh b/buildserver/upload_build_log.sh
deleted file mode 100755
index 78ff21d..0000000
--- a/buildserver/upload_build_log.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#! /bin/bash
-#
-# A function to upload build logs
-# If a branch is known it will upload to
-# build-logs/branch/yyyy-mm/logfile
-# otherwise it will upload to
-# build-logs/logfile
-
-log_file=$1
-host=$2
-log_dir=$3
-remote_branch_dir=$4
-base_dir=$(pwd) # A dummy base directory used in rsync
-
-# This function will create a remote directory
-# It will only run if $host is configured.
-# Note it assumes the parent directory exists and it won't
-# create intermediate subdirectories if that is not the case
-function create_remote_dir()
-{
- if [[ -n "$host" ]]
- then
- # For this hack $base_dir is just an arbitrary existing directory
- # It doesn't matter which one
- # No files will be copied from it anyway because of the exclude parameter
- rsync -a --exclude='*' "$base_dir"/ "$1"
- fi
-}
-
-if [[ -n "$host" ]]
-then
- echo "Uploading log file '$(basename $log_file)'"
- create_remote_dir "$host"/build-logs
- if [[ -z "$remote_branch_dir" ]]
- then
- # We don't know the build type yet, so we can't determine
- # the final remote directory to store it
- # So let's just store it in the top-level so we have a trace
- # of the build start or very early failures
- rsync -a "$log_file" "$host"/build-logs
- else
- # Now the subdirectory to store the log file is is known
- # In addition group per month to simplify navigation even more
- month_part=$(date +%Y-%m)
-
- create_remote_dir "$host"/build-logs/$remote_branch_dir
- create_remote_dir "$host"/build-logs/$remote_branch_dir/$month_part
-
- rsync -a "$log_file" "$host"/build-logs/$remote_branch_dir/$month_part
-
- # Finally remove the initially start build log uploaded earlier
- # Disable fatal error handling though to prevent the complete script from exiting
- # if no early build log exists
- echo "Removing initial startup build log uploaded earlier"
- set +ex
- rsync -rv --delete --include="$(basename $log_file)" --exclude='*' "$base_dir"/ "$host"/build-logs/
- set -ex
- fi
-fi
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 2851ff3..2b2b72a 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -234,7 +234,7 @@ bash-command -command "pacman -Syyuu --noconfirm"
# Set up aliases for the parts of msys-devtools and mingw-w64-toolchain that
# we need:
-$devel = "asciidoc autoconf autoconf2.13 autogen automake-wrapper automake1.10 automake1.11 automake1.12 automake1.13 automake1.14 automake1.15 automake1.6 automake1.7 automake1.8 automake1.9 bison diffstat diffutils dos2unix file flex gawk gettext gettext-devel gperf grep groff intltool libtool m4 make man-db pacman pactoys-git patch patchutils perl pkg-config rsync2 sed swig texinfo texinfo-tex wget xmlto git jhbuild-git texinfo"
+$devel = "asciidoc autoconf autoconf2.13 autogen automake-wrapper automake1.10 automake1.11 automake1.12 automake1.13 automake1.14 automake1.15 automake1.6 automake1.7 automake1.8 automake1.9 bison diffstat diffutils dos2unix file flex gawk gettext gettext-devel gperf grep groff intltool libtool m4 make man-db pacman pactoys-git patch patchutils perl pkg-config sed swig texinfo texinfo-tex wget xmlto git jhbuild-git texinfo"
$toolchain = "binutils cmake crt-git gcc gcc-libs gdb headers-git libmangle-git libtool libwinpthread-git make pkg-config tools-git winpthreads-git"
commit b1a9e078c4f20a3d67416c04ca2d4f1334db1c91
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu Aug 22 13:55:34 2019 +0200
Restore "Update gnucash-mingw64.iss library versions to match latest mingw64 update."
This was unintentionally reverted
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 66e3a50..a407c86 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -111,7 +111,7 @@ Source: "@INST_DIR@\share\doc\@PACKAGE at -docs\*.hhmap"; DestDir: "{app}\share\@PA
;;;; The second section retrieves the dependencies that we need from MinGW.
;; Required DLLs
;; gnucash.exe: libglib-2.0-0.dll, libgtk-3-0.dll, ligdk-3-0.dll, libatk-1.0-dll, libgobject-2.0-0.dll, libintl-8.dll, libcairo-gobject-2.dll, libcairo-2.dll, libfontconfig-1.0.dll, libfreetype-6.dll, libpixman-1-0.dll, libpng16-16.dll, zlib1.dll, libgdk-pixbuf-2.0-0.dll, libgio-2.0-0.dll, libgmodule-2.0-0.dll, libpango-1.0-0.dll, libpangocairo-1.0-0.dll, libpangowin32-1.0-0.dll, libpangoft2-1.0-0.dll, libharfbuzz-0.dll, libfribidi-0.dll, libiconv-2.dll, libwinpthread-1.dll, libsystre-0.dll, libxml2-2.dll, libxslt-1.dll, libboost_regex-mt.dll, libicuuc57.dll, libicudt57.dll, libtre-5.dll, libffi-6.dll, libgmp-10.dll, libltdl-7.dll
-;; AQBanking: libgcrypt-20.dll, libgnutls-30.dll, libwinpthread-1.0.dll, libgmp-10.dll, libhogweed-4.dll, libidn-11.dll, libintl-8.dll, libnettle-6.dll, libp11-kit-0.dll, libtasn1-6.dll, zlib1.dll, libgpg-error-0.dll, libiconv-2.dll, libintl-8.dll, libgtk-win32-2.0-0.dll
+;; AQBanking: libgcrypt-20.dll, libgnutls-30.dll, libwinpthread-1.0.dll, libgmp-10.dll, libhogweed-5.dll, libidn-11.dll, libintl-8.dll, libnettle-7.dll, libp11-kit-0.dll, libtasn1-6.dll, zlib1.dll, libgpg-error-0.dll, libiconv-2.dll, libintl-8.dll, libgtk-win32-2.0-0.dll
;; libwebkit: libenchant.dll, libgeoclue-0.dll, libgstapp-1.0-0.dll, libgstaudio-1.0-0.dll, libgstbase-1.0-0.dll, libgstfft-1.0-0.dll, libgstpbutils-1.0-0.dll, libgstpbutils-1.0-0.dll, libgstreamer-1.0-0.dll, libgstvideo-1.0-0.dll, libharfbuzz-icu-0.dll, liborc-0.4-0.dll, libgsttag-1.0-0.dll, libgraphite2.dll, libicuin57.dll, liicuuc57.dll, libicudt57.dll, libsoup-2.4-1.dll, libsqlite3-0.dll, libwebp-7.dll
;;lib/dbd/libdbdmysql.dll: mariadb.dll, libeay32.dll, ssleay32.dll
;;lib/dbd/libdbdpgsql.dll: libpq.dll, ssleay32.dll, libeay32.dll
@@ -164,7 +164,7 @@ Source: "@MINGW_DIR@\bin\libgtk-3-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libgtk-win32-2.0-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libharfbuzz-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libharfbuzz-icu-0.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\libhogweed-4.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libhogweed-5.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libiconv-2.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libicudt*.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libicuin*.dll"; DestDir: "{app}\bin"; Components: main
@@ -175,7 +175,7 @@ Source: "@MINGW_DIR@\bin\libjavascriptcoregtk-3.0-0.dll"; DestDir: "{app}\bin";
Source: "@MINGW_DIR@\bin\libjpeg-8.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libltdl-7.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\liblzma-5.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\libnettle-6.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libnettle-7.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\liborc-0.4-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libp11-kit-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libpango-1.0-0.dll"; DestDir: "{app}\bin"; Components: main
commit 5a24c7e0d07fb17ebf9fa2a79e285b605d5f1b63
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu Aug 22 13:52:19 2019 +0200
Revert "Update gnucash-mingw64.iss library versions to match latest mingw64 update."
The build server currently doesn't have rsync permissions to the webhost.
This commit can be restored once the proper permissions are there.
This reverts commit c7b3b3c08f7e5c5d95122911576d9613d9c9a3bf.
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index a407c86..66e3a50 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -111,7 +111,7 @@ Source: "@INST_DIR@\share\doc\@PACKAGE at -docs\*.hhmap"; DestDir: "{app}\share\@PA
;;;; The second section retrieves the dependencies that we need from MinGW.
;; Required DLLs
;; gnucash.exe: libglib-2.0-0.dll, libgtk-3-0.dll, ligdk-3-0.dll, libatk-1.0-dll, libgobject-2.0-0.dll, libintl-8.dll, libcairo-gobject-2.dll, libcairo-2.dll, libfontconfig-1.0.dll, libfreetype-6.dll, libpixman-1-0.dll, libpng16-16.dll, zlib1.dll, libgdk-pixbuf-2.0-0.dll, libgio-2.0-0.dll, libgmodule-2.0-0.dll, libpango-1.0-0.dll, libpangocairo-1.0-0.dll, libpangowin32-1.0-0.dll, libpangoft2-1.0-0.dll, libharfbuzz-0.dll, libfribidi-0.dll, libiconv-2.dll, libwinpthread-1.dll, libsystre-0.dll, libxml2-2.dll, libxslt-1.dll, libboost_regex-mt.dll, libicuuc57.dll, libicudt57.dll, libtre-5.dll, libffi-6.dll, libgmp-10.dll, libltdl-7.dll
-;; AQBanking: libgcrypt-20.dll, libgnutls-30.dll, libwinpthread-1.0.dll, libgmp-10.dll, libhogweed-5.dll, libidn-11.dll, libintl-8.dll, libnettle-7.dll, libp11-kit-0.dll, libtasn1-6.dll, zlib1.dll, libgpg-error-0.dll, libiconv-2.dll, libintl-8.dll, libgtk-win32-2.0-0.dll
+;; AQBanking: libgcrypt-20.dll, libgnutls-30.dll, libwinpthread-1.0.dll, libgmp-10.dll, libhogweed-4.dll, libidn-11.dll, libintl-8.dll, libnettle-6.dll, libp11-kit-0.dll, libtasn1-6.dll, zlib1.dll, libgpg-error-0.dll, libiconv-2.dll, libintl-8.dll, libgtk-win32-2.0-0.dll
;; libwebkit: libenchant.dll, libgeoclue-0.dll, libgstapp-1.0-0.dll, libgstaudio-1.0-0.dll, libgstbase-1.0-0.dll, libgstfft-1.0-0.dll, libgstpbutils-1.0-0.dll, libgstpbutils-1.0-0.dll, libgstreamer-1.0-0.dll, libgstvideo-1.0-0.dll, libharfbuzz-icu-0.dll, liborc-0.4-0.dll, libgsttag-1.0-0.dll, libgraphite2.dll, libicuin57.dll, liicuuc57.dll, libicudt57.dll, libsoup-2.4-1.dll, libsqlite3-0.dll, libwebp-7.dll
;;lib/dbd/libdbdmysql.dll: mariadb.dll, libeay32.dll, ssleay32.dll
;;lib/dbd/libdbdpgsql.dll: libpq.dll, ssleay32.dll, libeay32.dll
@@ -164,7 +164,7 @@ Source: "@MINGW_DIR@\bin\libgtk-3-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libgtk-win32-2.0-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libharfbuzz-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libharfbuzz-icu-0.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\libhogweed-5.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libhogweed-4.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libiconv-2.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libicudt*.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libicuin*.dll"; DestDir: "{app}\bin"; Components: main
@@ -175,7 +175,7 @@ Source: "@MINGW_DIR@\bin\libjavascriptcoregtk-3.0-0.dll"; DestDir: "{app}\bin";
Source: "@MINGW_DIR@\bin\libjpeg-8.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libltdl-7.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\liblzma-5.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\libnettle-7.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libnettle-6.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\liborc-0.4-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libp11-kit-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libpango-1.0-0.dll"; DestDir: "{app}\bin"; Components: main
commit 8073b34c5c1a52a6ef37dba33e1173291192b7d4
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu Aug 22 10:58:33 2019 +0200
Store build logs in subdirectories per branch and per month
Note this update requires an additional msys package to be installed (rsync2)
so you may have to re-run setup-mingw64.ps1 once before
starting buildserver/build_package.ps1.
diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index 2b462d3..4c85a10 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -99,7 +99,7 @@ bash-command -command "cd $script_unix && git pull"
bash-command -command "echo Build Started $time_stamp > $log_unix"
#copy the file to the download server so that everyone can see we've started
if ($hostname) {
- bash-command -command "scp -p $log_unix $hostname/$log_dir/"
+ bash-command -command "$script_unix/buildserver/upload_build_log.sh $log_unix $hostname $log_dir $branch"
}
# Update MinGW-w64
@@ -142,7 +142,7 @@ bash-command -command "echo Build Ended $time_stamp >> $log_unix"
# Copy the transcript and installer to the download server and delete them.
if ($hostname) {
- bash-command -command "scp -p $log_unix $hostname/$log_dir/"
+ bash-command -command "$script_unix/buildserver/upload_build_log.sh $log_unix $hostname $log_dir $branch"
if ($new_file) {
bash-command -command "scp -p $setup_file $hostname/$branch"
}
diff --git a/buildserver/upload_build_log.sh b/buildserver/upload_build_log.sh
new file mode 100755
index 0000000..78ff21d
--- /dev/null
+++ b/buildserver/upload_build_log.sh
@@ -0,0 +1,59 @@
+#! /bin/bash
+#
+# A function to upload build logs
+# If a branch is known it will upload to
+# build-logs/branch/yyyy-mm/logfile
+# otherwise it will upload to
+# build-logs/logfile
+
+log_file=$1
+host=$2
+log_dir=$3
+remote_branch_dir=$4
+base_dir=$(pwd) # A dummy base directory used in rsync
+
+# This function will create a remote directory
+# It will only run if $host is configured.
+# Note it assumes the parent directory exists and it won't
+# create intermediate subdirectories if that is not the case
+function create_remote_dir()
+{
+ if [[ -n "$host" ]]
+ then
+ # For this hack $base_dir is just an arbitrary existing directory
+ # It doesn't matter which one
+ # No files will be copied from it anyway because of the exclude parameter
+ rsync -a --exclude='*' "$base_dir"/ "$1"
+ fi
+}
+
+if [[ -n "$host" ]]
+then
+ echo "Uploading log file '$(basename $log_file)'"
+ create_remote_dir "$host"/build-logs
+ if [[ -z "$remote_branch_dir" ]]
+ then
+ # We don't know the build type yet, so we can't determine
+ # the final remote directory to store it
+ # So let's just store it in the top-level so we have a trace
+ # of the build start or very early failures
+ rsync -a "$log_file" "$host"/build-logs
+ else
+ # Now the subdirectory to store the log file is is known
+ # In addition group per month to simplify navigation even more
+ month_part=$(date +%Y-%m)
+
+ create_remote_dir "$host"/build-logs/$remote_branch_dir
+ create_remote_dir "$host"/build-logs/$remote_branch_dir/$month_part
+
+ rsync -a "$log_file" "$host"/build-logs/$remote_branch_dir/$month_part
+
+ # Finally remove the initially start build log uploaded earlier
+ # Disable fatal error handling though to prevent the complete script from exiting
+ # if no early build log exists
+ echo "Removing initial startup build log uploaded earlier"
+ set +ex
+ rsync -rv --delete --include="$(basename $log_file)" --exclude='*' "$base_dir"/ "$host"/build-logs/
+ set -ex
+ fi
+fi
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 2b2b72a..2851ff3 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -234,7 +234,7 @@ bash-command -command "pacman -Syyuu --noconfirm"
# Set up aliases for the parts of msys-devtools and mingw-w64-toolchain that
# we need:
-$devel = "asciidoc autoconf autoconf2.13 autogen automake-wrapper automake1.10 automake1.11 automake1.12 automake1.13 automake1.14 automake1.15 automake1.6 automake1.7 automake1.8 automake1.9 bison diffstat diffutils dos2unix file flex gawk gettext gettext-devel gperf grep groff intltool libtool m4 make man-db pacman pactoys-git patch patchutils perl pkg-config sed swig texinfo texinfo-tex wget xmlto git jhbuild-git texinfo"
+$devel = "asciidoc autoconf autoconf2.13 autogen automake-wrapper automake1.10 automake1.11 automake1.12 automake1.13 automake1.14 automake1.15 automake1.6 automake1.7 automake1.8 automake1.9 bison diffstat diffutils dos2unix file flex gawk gettext gettext-devel gperf grep groff intltool libtool m4 make man-db pacman pactoys-git patch patchutils perl pkg-config rsync2 sed swig texinfo texinfo-tex wget xmlto git jhbuild-git texinfo"
$toolchain = "binutils cmake crt-git gcc gcc-libs gdb headers-git libmangle-git libtool libwinpthread-git make pkg-config tools-git winpthreads-git"
commit c7b3b3c08f7e5c5d95122911576d9613d9c9a3bf
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Aug 17 14:47:33 2019 -0700
Update gnucash-mingw64.iss library versions to match latest mingw64 update.
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 66e3a50..a407c86 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -111,7 +111,7 @@ Source: "@INST_DIR@\share\doc\@PACKAGE at -docs\*.hhmap"; DestDir: "{app}\share\@PA
;;;; The second section retrieves the dependencies that we need from MinGW.
;; Required DLLs
;; gnucash.exe: libglib-2.0-0.dll, libgtk-3-0.dll, ligdk-3-0.dll, libatk-1.0-dll, libgobject-2.0-0.dll, libintl-8.dll, libcairo-gobject-2.dll, libcairo-2.dll, libfontconfig-1.0.dll, libfreetype-6.dll, libpixman-1-0.dll, libpng16-16.dll, zlib1.dll, libgdk-pixbuf-2.0-0.dll, libgio-2.0-0.dll, libgmodule-2.0-0.dll, libpango-1.0-0.dll, libpangocairo-1.0-0.dll, libpangowin32-1.0-0.dll, libpangoft2-1.0-0.dll, libharfbuzz-0.dll, libfribidi-0.dll, libiconv-2.dll, libwinpthread-1.dll, libsystre-0.dll, libxml2-2.dll, libxslt-1.dll, libboost_regex-mt.dll, libicuuc57.dll, libicudt57.dll, libtre-5.dll, libffi-6.dll, libgmp-10.dll, libltdl-7.dll
-;; AQBanking: libgcrypt-20.dll, libgnutls-30.dll, libwinpthread-1.0.dll, libgmp-10.dll, libhogweed-4.dll, libidn-11.dll, libintl-8.dll, libnettle-6.dll, libp11-kit-0.dll, libtasn1-6.dll, zlib1.dll, libgpg-error-0.dll, libiconv-2.dll, libintl-8.dll, libgtk-win32-2.0-0.dll
+;; AQBanking: libgcrypt-20.dll, libgnutls-30.dll, libwinpthread-1.0.dll, libgmp-10.dll, libhogweed-5.dll, libidn-11.dll, libintl-8.dll, libnettle-7.dll, libp11-kit-0.dll, libtasn1-6.dll, zlib1.dll, libgpg-error-0.dll, libiconv-2.dll, libintl-8.dll, libgtk-win32-2.0-0.dll
;; libwebkit: libenchant.dll, libgeoclue-0.dll, libgstapp-1.0-0.dll, libgstaudio-1.0-0.dll, libgstbase-1.0-0.dll, libgstfft-1.0-0.dll, libgstpbutils-1.0-0.dll, libgstpbutils-1.0-0.dll, libgstreamer-1.0-0.dll, libgstvideo-1.0-0.dll, libharfbuzz-icu-0.dll, liborc-0.4-0.dll, libgsttag-1.0-0.dll, libgraphite2.dll, libicuin57.dll, liicuuc57.dll, libicudt57.dll, libsoup-2.4-1.dll, libsqlite3-0.dll, libwebp-7.dll
;;lib/dbd/libdbdmysql.dll: mariadb.dll, libeay32.dll, ssleay32.dll
;;lib/dbd/libdbdpgsql.dll: libpq.dll, ssleay32.dll, libeay32.dll
@@ -164,7 +164,7 @@ Source: "@MINGW_DIR@\bin\libgtk-3-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libgtk-win32-2.0-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libharfbuzz-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libharfbuzz-icu-0.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\libhogweed-4.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libhogweed-5.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libiconv-2.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libicudt*.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libicuin*.dll"; DestDir: "{app}\bin"; Components: main
@@ -175,7 +175,7 @@ Source: "@MINGW_DIR@\bin\libjavascriptcoregtk-3.0-0.dll"; DestDir: "{app}\bin";
Source: "@MINGW_DIR@\bin\libjpeg-8.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libltdl-7.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\liblzma-5.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\libnettle-6.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libnettle-7.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\liborc-0.4-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libp11-kit-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libpango-1.0-0.dll"; DestDir: "{app}\bin"; Components: main
commit 88c795f455fda9e3adfa98a80d5d588a547adc89
Author: Christian Stimming <christian at cstimming.de>
Date: Thu Aug 15 20:54:34 2019 +0200
Update aqbanking to 5.8.1 (non-beta). Fix URL for gwenhywfar-4.20.1.
(The URL includes an integer value for the internal website management.)
diff --git a/gnucash.modules b/gnucash.modules
index c6f0857..9e86fad 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -146,7 +146,7 @@
<autotools id="gwenhywfar" autogen-sh="configure"
autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc --disable-ssl">
- <branch module="10/gwenhywfar-4.20.1.tar.gz" version="4.20.1" repo="aqbanking" checkoutdir="gwenhywfar-4.20.1">
+ <branch module="104/gwenhywfar-4.20.1.tar.gz" version="4.20.1" repo="aqbanking" checkoutdir="gwenhywfar-4.20.1">
<patch file="gwenhywfar-4.20.1-clean-targets.patch" strip="1"/>
</branch>
<dependencies>
@@ -175,7 +175,7 @@
<autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
autogenargs="--enable-local-install">
- <branch module="103/aqbanking-5.8.0beta.tar.gz" repo="aqbanking" version="5.8.0" checkoutdir="aqbanking-5.8.0">
+ <branch module="105/aqbanking-5.8.1.tar.gz" repo="aqbanking" version="5.8.1" checkoutdir="aqbanking-5.8.1">
</branch>
<dependencies>
<dep package="gwenhywfar"/>
commit 62c328760349f08cc0fb64ce50a531b997215f18
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Aug 11 14:45:48 2019 -0700
Change gwenhywfar environment to specify PKG_CONFIG instead of CFLAGS.
And re-enable Gwenhywfar 4.20.1.
Gwenhywfar 4.20.1 tries to check pkg-config for gtk3 but can't find
pkg-config without help. Once it can find pkg-config it doesn't need
to have the gtk3 paths added to CFLAGS and CXXFLAGS.
Also patch gwenhywfar to not delete the gwenhywfar4 directory during
clean. The links are created by configure so should be deleted during
distclean; removing them in clean breaks subsequent builds until the
build directory is reconfigured.
diff --git a/gnucash.modules b/gnucash.modules
index cff5708..c6f0857 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -146,7 +146,8 @@
<autotools id="gwenhywfar" autogen-sh="configure"
autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc --disable-ssl">
- <branch module="10/gwenhywfar-4.20.0.tar.gz" version="4.20.0" repo="aqbanking" checkoutdir="gwenhywfar-4.20.0">
+ <branch module="10/gwenhywfar-4.20.1.tar.gz" version="4.20.1" repo="aqbanking" checkoutdir="gwenhywfar-4.20.1">
+ <patch file="gwenhywfar-4.20.1-clean-targets.patch" strip="1"/>
</branch>
<dependencies>
<dep package="gcrypt"/>
diff --git a/jhbuildrc.in b/jhbuildrc.in
index 32a9a92..4d86544 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -76,13 +76,11 @@ else:
branches['gnucash-git'] = (None, _branch)
branches['gnucash-docs-git'] = (None, _branch)
-_gtk_cflags = _popen("pkg-config --cflags gtk+-3.0")
-_gtk_ldflags= _popen("pkg-config --libs gtk+-3.0")
append_autogenargs("libofx", "--with-opensp-includes=" + prefix + "/include/OpenSP --with-opensp-libs=" + prefix + "/lib")
append_autogenargs("libdbi-drivers","--with-dbi-incdir=" + prefix + "/include --with-dbi-libdir=" + prefix + "/lib")
module_makeargs["aqbanking"]="-j 1"
module_extra_env["gnucash"]={'GUILE_LOAD_PATH':os.path.join(prefix, 'share', 'guile', '2.2'), 'GUILE_LOAD_COMPILED_PATH':os.path.join(prefix, 'lib', 'guile', '2.2', 'ccache')}
module_extra_env["gnucash-git"]={'GUILE_LOAD_PATH':os.path.join(prefix, 'share', 'guile', '2.2'), 'GUILE_LOAD_COMPILED_PATH':os.path.join(prefix, 'lib', 'guile', '2.2', 'ccache')}
-module_extra_env["gwenhywfar"]={'CFLAGS': _gtk_cflags, 'LDFLAGS': _gtk_ldflags}
+module_extra_env["gwenhywfar"]={'PKG_CONFIG': os.path.join('/', _arch, 'bin', 'pkg-config')}
diff --git a/patches/gwenhywfar-4.20.1-clean-targets.patch b/patches/gwenhywfar-4.20.1-clean-targets.patch
new file mode 100644
index 0000000..a490b62
--- /dev/null
+++ b/patches/gwenhywfar-4.20.1-clean-targets.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in 2019-08-08 15:42:36.000000000 -0700
++++ b/Makefile.in 2019-08-12 14:57:37.642988300 -0700
+@@ -1212,7 +1212,7 @@
+ clean-local: clean-local-check
+ .PHONY: clean-local
+ clean-local-check:
+- rm -rf apidoc gwenhywfar4
++ rm -rf apidoc
+
+ listdoc.h: $(top_builddir)/admin/mklistdoc
+ admin/mklistdoc -v -I $(top_srcdir)/src/base `find "$(top_builddir)/gwenhywfar4/gwenhywfar" -name "*.h" | LC_ALL=C sort` >listdoc.h
commit d80fbecb8dbafdda11b85b038fb53796d8cf73be
Author: Christian Stimming <christian at cstimming.de>
Date: Sat Aug 10 12:45:24 2019 +0200
Revert version change of gwenhywfar: Maybe 4.20.0 builds without problems on windows.
diff --git a/gnucash.modules b/gnucash.modules
index 8fa1ad0..cff5708 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -146,7 +146,7 @@
<autotools id="gwenhywfar" autogen-sh="configure"
autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc --disable-ssl">
- <branch module="104/gwenhywfar-4.20.1.tar.gz" version="4.20.1" repo="aqbanking" checkoutdir="gwenhywfar-4.20.1">
+ <branch module="10/gwenhywfar-4.20.0.tar.gz" version="4.20.0" repo="aqbanking" checkoutdir="gwenhywfar-4.20.0">
</branch>
<dependencies>
<dep package="gcrypt"/>
commit e9754cc3baff6d76ac2fc49ef18f36b7ede43a1a
Author: Christian Stimming <christian at cstimming.de>
Date: Fri Aug 9 20:00:12 2019 +0200
Update gwen/aqbanking to latest version, as needed for server changes in Germany's banks.
diff --git a/gnucash.modules b/gnucash.modules
index ca2700b..8fa1ad0 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -18,7 +18,7 @@
<repository type="git" name="aquamaniac"
href="https://git.aquamaniac.de/git/"/>
<repository type="tarball" name="aqbanking"
- href="https://www.aquamaniac.de/sites/download/"/>
+ href="https://www.aquamaniac.de/rdm/attachments/download/"/>
<repository type="git" name="github"
href="git://github.com/"/>
<repository type="tarball" name="github-tar"
@@ -146,7 +146,7 @@
<autotools id="gwenhywfar" autogen-sh="configure"
autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc --disable-ssl">
- <branch module="download.php?package=01&release=208&file=02&dummy=gwenhywfar-4.20.0.tar.gz" version="4.20.0" repo="aqbanking" checkoutdir="gwenhywfar-4.20.0">
+ <branch module="104/gwenhywfar-4.20.1.tar.gz" version="4.20.1" repo="aqbanking" checkoutdir="gwenhywfar-4.20.1">
</branch>
<dependencies>
<dep package="gcrypt"/>
@@ -174,8 +174,7 @@
<autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
autogenargs="--enable-local-install">
- <branch module="download.php?package=03&release=217&file=02&dummy=aqbanking-5.7.8.tar.gz" repo="aqbanking" version="5.7.8" checkoutdir="aqbanking-5.7.8">
- <patch file="Fix-signature-mismatch-in-abgui.c.patch" strip='1'/>
+ <branch module="103/aqbanking-5.8.0beta.tar.gz" repo="aqbanking" version="5.8.0" checkoutdir="aqbanking-5.8.0">
</branch>
<dependencies>
<dep package="gwenhywfar"/>
commit 0178c941cdd858639b67bf97f14c1f4500921e0b
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Jun 30 07:55:17 2019 -0700
Fix bad version dir.
diff --git a/gnucash.modules b/gnucash.modules
index e4e0536..ca2700b 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -276,7 +276,7 @@
<cmake id="gnucash"
cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DCOMPILE_GSCHEMAS=OFF"
use-ninja="False">
- <branch repo="sourceforge" module="project/gnucash/gnucash%20%28stable%29/3.5/gnucash-3.6.tar.bz2"
+ <branch repo="sourceforge" module="project/gnucash/gnucash%20%28stable%29/3.6/gnucash-3.6.tar.bz2"
version="3.6"/>
<dependencies>
<dep package="libofx"/>
commit 9251e848bb564e2b95e83febdabac7eb6f696676
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jun 29 17:28:55 2019 -0700
Build 3.6 release.
diff --git a/gnucash.modules b/gnucash.modules
index 0d4e6d1..e4e0536 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -276,8 +276,8 @@
<cmake id="gnucash"
cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DCOMPILE_GSCHEMAS=OFF"
use-ninja="False">
- <branch repo="sourceforge" module="project/gnucash/gnucash%20%28stable%29/3.5/gnucash-3.5.tar.bz2"
- version="3.5"/>
+ <branch repo="sourceforge" module="project/gnucash/gnucash%20%28stable%29/3.5/gnucash-3.6.tar.bz2"
+ version="3.6"/>
<dependencies>
<dep package="libofx"/>
<dep package="aqbanking"/>
@@ -322,8 +322,8 @@
<autotools id="gnucash-docs"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
makeargs="chm" makeinstallargs="install-chm" >
- <branch module="project/gnucash/gnucash%20%28stable%29/3.5/gnucash-docs-3.5.tar.gz"
- version="3.5" repo="sourceforge"/>
+ <branch module="project/gnucash/gnucash%20%28stable%29/3.6/gnucash-docs-3.5.tar.gz"
+ version="3.6" repo="sourceforge"/>
</autotools>
<metamodule id="meta-gnucash-git">
commit be2570985eb46e259a83a3244730e76eb2531b04
Merge: 86dcf63 35f2b26
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Jun 18 16:30:28 2019 -0700
Merge Milotype's gc-on-win-hr into master.
commit 35f2b260ef9194101c16210709111e0699fa674f
Author: milotype <43657314+milotype at users.noreply.github.com>
Date: Mon Jun 17 15:55:39 2019 +0200
Update gnucash-mingw64-hr.iss with Croatian
Added Croatian strings to the file
diff --git a/inno_setup/Croatian-5.5.3.isl b/inno_setup/Croatian-5.5.3.isl
new file mode 100644
index 0000000..e05ba3c
--- /dev/null
+++ b/inno_setup/Croatian-5.5.3.isl
@@ -0,0 +1,340 @@
+; *** Inno Setup version 5.5.3+ Croatian messages ***
+; Translated by: Elvis Gambiraža (el.gambo at gmail.com)
+; Based on translation by Krunoslav Kanjuh (krunoslav.kanjuh at zg.t-com.hr)
+;
+; To download user-contributed translations of this file, go to:
+; http://www.jrsoftware.org/files/istrans/
+;
+; Note: When translating this text, do not add periods (.) to the end of
+; messages that didn't have them already, because on those messages Inno
+; Setup adds the periods automatically (appending a period would result in
+; two periods being displayed).
+
+[LangOptions]
+; The following three entries are very important. Be sure to read and
+; understand the '[LangOptions] section' topic in the help file.
+LanguageName=Hrvatski
+LanguageID=$041a
+LanguageCodePage=1250
+; If the language you are translating to requires special font faces or
+; sizes, uncomment any of the following entries and change them accordingly.
+;DialogFontName=MS Shell Dlg
+;DialogFontSize=8
+;WelcomeFontName=Arial
+;WelcomeFontSize=12
+;TitleFontName=Arial
+;TitleFontSize=29
+;CopyrightFontName=Arial
+;CopyrightFontSize=8
+
+[Messages]
+
+; *** Application titles
+SetupAppTitle=Instalacija
+SetupWindowTitle=Instalacija - %1
+UninstallAppTitle=Deinstalacija
+UninstallAppFullTitle=Deinstalacija programa %1
+
+; *** Misc. common
+InformationTitle=Informacija
+ConfirmTitle=Potvrda
+ErrorTitle=Greška
+
+; *** SetupLdr messages
+SetupLdrStartupMessage=Zapoèeli ste instalaciju programa %1. Želite li nastaviti?
+LdrCannotCreateTemp=Ne mogu kreirati privremenu datoteku. Instalacija je prekinuta.
+LdrCannotExecTemp=Ne mogu pokrenuti datoteku u privremenoj mapi. Instalacija je prekinuta.
+
+; *** Startup error messages
+LastErrorMessage=%1.%n%nGreška %2: %3
+SetupFileMissing=Datoteka %1 se ne nalazi u instalacijskoj mapi. Ispravite problem ili nabavite novu kopiju programa.
+SetupFileCorrupt=Instalacijske datoteke su ošteæene. Nabavite novu kopiju programa.
+SetupFileCorruptOrWrongVer=Instalacijske datoteke su ošteæene, ili nisu kompatibilne s ovom verzijom instalacije. Ispravite problem ili nabavite novu kopiju programa.
+InvalidParameter=Neispravan parametar je prenijet na komandnu liniju: %n%n%1
+SetupAlreadyRunning=Instalacija je veæ pokrenuta.
+WindowsVersionNotSupported=Program ne podržava verziju Windowsa koju koristite.
+WindowsServicePackRequired=Program zahtijeva %1 servisni paket %2 ili noviji.
+NotOnThisPlatform=Ovaj program neæe raditi na %1.
+OnlyOnThisPlatform=Ovaj program se mora pokrenuti na %1.
+OnlyOnTheseArchitectures=Ovaj program može biti instaliran na verziji Windowsa dizajniranim za sljedeæu procesorsku arhitekturu:%n%n%1
+MissingWOW64APIs=Ova verzija Windowsa ne posjeduje funkcije koje zahtjeva instalacija za 64-bitnu instalaciju. Kako bi riješili problem instalirajte servisni paket %1.
+WinVersionTooLowError=Ovaj program zahtijeva %1 verziju %2 ili noviju.
+WinVersionTooHighError=Ovaj program ne može biti instaliran na %1 verziji %2 ili novijoj.
+AdminPrivilegesRequired=Morate biti prijavljeni kao administrator prilikom pokretanja ovog programa.
+PowerUserPrivilegesRequired=Morate biti prijavljeni kao administrator ili èlan grupe Power Users prilikom instaliranja ovog programa.
+SetupAppRunningError=Instalacija je otkrila da je %1 pokrenut.%n%nZatvorite program i potom kliknite Dalje za nastavak ili Odustani za prekid instalacije.
+UninstallAppRunningError=Deinstalacija je otkrila da je %1 pokrenut.%n%nZatvorite program i potom kliknite Dalje za nastavak ili Odustani za prekid instalacije.
+
+; *** Misc. errors
+ErrorCreatingDir=Instalacija nije mogla kreirati mapu "%1".
+ErrorTooManyFilesInDir=Instalacija nije mogla kreirati datoteku u mapi "%1" zato što ona sadrži previše datoteka.
+
+; *** Setup common messages
+ExitSetupTitle=Prekid instalacije
+ExitSetupMessage=Instalacija nije završena. Ako sad izaðete, program neæe biti instaliran.%n%nInstalaciju možete pokrenuti kasnije ukoliko ju želite završiti.%n%nPrekid instalacije?
+AboutSetupMenuItem=&O programu
+AboutSetupTitle=Podaci o programu
+AboutSetupMessage=%1 verzija %2%n%3%n%n%1 home page:%n%4
+AboutSetupNote=
+TranslatorNote=Translated by: Elvis Gambiraža
+
+; *** Buttons
+ButtonBack=< Na&trag
+ButtonNext=Na&stavak >
+ButtonInstall=&Instaliraj
+ButtonOK=&U redu
+ButtonCancel=&Otkaži
+ButtonYes=&Da
+ButtonYesToAll=D&a za sve
+ButtonNo=&Ne
+ButtonNoToAll=N&e za sve
+ButtonFinish=&Završi
+ButtonBrowse=&Odaberi...
+ButtonWizardBrowse=O&daberi...
+ButtonNewFolder=&Kreiraj novu mapu
+
+; *** "Select Language" dialog messages
+SelectLanguageTitle=Izaberite jezik
+SelectLanguageLabel=Izberite jezik koji želite koristiti pri instalaciji:
+
+; *** Common wizard text
+ClickNext=Kliknite na Nastavak za nastavak ili Otkaži za prekid instalacije.
+BeveledLabel=
+BrowseDialogTitle=Odabir mape
+BrowseDialogLabel=Odaberite mapu iz liste koja slijedi te kliknite OK.
+NewFolderName=Nova mapa
+
+; *** "Welcome" wizard page
+WelcomeLabel1=Dobro došli u instalaciju programa [name]
+WelcomeLabel2=Ovaj program æe instalirati [name/ver] na vaše raèunalo.%n%nPreporuèamo da zatvorite sve programe prije nego nastavite dalje.
+
+; *** "Password" wizard page
+WizardPassword=Lozinka
+PasswordLabel1=Instalacija je zaštiæena lozinkom.
+PasswordLabel3=Upišite lozinku i kliknite Nastavak. Lozinke su osjetljive na mala i velika slova.
+PasswordEditLabel=&Lozinka:
+IncorrectPassword=Upisana je pogrešna lozinka. Pokušajte ponovo.
+
+; *** "License Agreement" wizard
+WizardLicense=Ugovor o korištenju
+LicenseLabel=Molimo prije nastavka pažljivo proèitajte sljedeæe važne informacije.
+LicenseLabel3=Molimo pažljivo proèitajte Ugovor o korištenju. Morate prihvatiti uvjete ugovora kako bi mogli nastaviti s instalacijom.
+LicenseAccepted=&Prihvaæam ugovor
+LicenseNotAccepted=&Ne prihvaæam ugovor
+
+; *** "Information" wizard pages
+WizardInfoBefore=Informacije
+InfoBeforeLabel=Proèitajte sljedeæe važne informacije prije nastavka.
+InfoBeforeClickLabel=Kada budete spremni nastaviti instalaciju kliknite Nastavak.
+WizardInfoAfter=Informacije
+InfoAfterLabel=Proèitajte sljedeæe važne informacije prije nastavka.
+InfoAfterClickLabel=Kada budete spremni nastaviti instalaciju kliknite Nastavak.
+
+; *** "User Information" wizard page
+WizardUserInfo=Informacije o korisniku
+UserInfoDesc=Upišite informacije o vama.
+UserInfoName=&Ime korisnika:
+UserInfoOrg=&Organizacija:
+UserInfoSerial=&Serijski broj:
+UserInfoNameRequired=Morate upisati ime.
+
+; *** "Select Destination Location" wizard page
+WizardSelectDir=Odaberite odredišnu mapu
+SelectDirDesc=Mapa u koju æe biti instaliran program.
+SelectDirLabel3=Instalacija æe instalirati [name] u sljedeæu mapu
+SelectDirBrowseLabel=Za nastavak kliknite na Nastavak. Ako želite odabrati drugu mapu kliknite na Odaberi.
+DiskSpaceMBLabel=Ovaj program zahtjeva minimalno [mb] MB slobodnog prostora na disku.
+CannotInstallToNetworkDrive=Instalacija ne može instalirati na mrežnu jedinicu.
+CannotInstallToUNCPath=Instalacija ne može instalirati na UNC putanju.
+InvalidPath=Morate unijeti punu stazu zajedno sa slovom diska (npr.%n%nC:\APP%n%nili stazu u obliku%n%n\\server\share)
+InvalidDrive=Disk koji ste odabrali ne postoji. Odaberite neki drugi.
+DiskSpaceWarningTitle=Nedovoljno prostora na disku
+DiskSpaceWarning=Instalacija zahtjeva bar %1 KB slobodnog prostora, a odabrani disk ima samo %2 KB na raspolaganju.%n%nŽelite li nastaviti?
+DirNameTooLong=Predugaèak naziv mape ili staze.
+InvalidDirName=Naziv mape je pogrešan.
+BadDirName32=Naziv mape ne smije sadržavati niti jedan od sljedeæih znakova nakon toèke:%n%n%1
+DirExistsTitle=Mapa veæ postoji
+DirExists=Mapa:%n%n%1%n%nveæ postoji. Želite li instalirati u nju?
+DirDoesntExistTitle=Mapa ne postoji
+DirDoesntExist=Mapa:%n%n%1%n%nne postoji. Želite li ju napraviti?
+
+; *** "Select Components" wizard page
+WizardSelectComponents=Odaberite komponente
+SelectComponentsDesc=Koje komponente želite instalirati?
+SelectComponentsLabel2=Odaberite komponente koje želite instalirati, odnosno uklonite kvaèicu uz komponente koje ne želite:
+FullInstallation=Puna instalacija
+
+; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
+CompactInstallation=Kompaktna instalacija
+CustomInstallation=Instalacija po izboru
+NoUninstallWarningTitle=Postojeæe komponente
+NoUninstallWarning=Instalacija je utvrdila da na vašem raèunalu veæ postoje sljedeæe komponente:%n%n%1%n%nNeodabir tih komponenata ne dovodi do njihove deinstalacije.%n%nŽelite li ipak nastaviti?
+ComponentSize1=%1 KB
+ComponentSize2=%1 MB
+ComponentsDiskSpaceMBLabel=Vaš izbor zahtijeva najmanje [mb] MB prostora na disku.
+
+; *** "Select Additional Tasks" wizard page
+WizardSelectTasks=Odaberite zadatke
+SelectTasksDesc=Koje dodatne zadatke želite izvršiti?
+SelectTasksLabel2=Odaberite zadatke koji æe se izvršiti tijekom instalacije programa [name].
+
+; *** "Select Start Menu Folder" wizard page
+WizardSelectProgramGroup=Odaberite programsku grupu
+SelectStartMenuFolderDesc=Lokacija preèice programa
+SelectStartMenuFolderLabel3=Instalacija æe kreirati preèice za programe u sljedeæoj Start Menu mapi
+SelectStartMenuFolderBrowseLabel=Kako bi nastavili, kliknite na Nastavak. Ako želite odabrati drugu mapu klikni na Odabir.
+MustEnterGroupName=Morate unijeti ime programske grupe.
+GroupNameTooLong=Predugi naziv mape ili staze.
+InvalidGroupName=Naziv mape je pogrešan.
+BadGroupName=Ime programske grupe ne smije sadržavati sljedeæe znakove:%n%n%1
+NoProgramGroupCheck2=&Ne kreiraj %1 programsku grupu
+
+; *** "Ready to Install" wizard page
+WizardReady=Instalacija je spremna
+ReadyLabel1=Instalacija je spremna instalirati [name] na vaše raèunalo.
+ReadyLabel2a=Kliknite na Instaliraj ako želite instalirati program ili na Nazad ako želite pregledati ili promijeniti postavke.
+ReadyLabel2b=Kliknite na Instaliraj ako želite instalirati program.
+ReadyMemoUserInfo=Korisnièki podaci:
+ReadyMemoDir=Odredišna mapa:
+ReadyMemoType=Tip instalacije:
+ReadyMemoComponents=Odabrane komponente:
+ReadyMemoGroup=Programska grupa:
+ReadyMemoTasks=Dodatni zadaci:
+
+; *** "Preparing to Install" wizard page
+WizardPreparing=Priprema instalacije
+PreparingDesc=Instalacija se priprema za instaliranje [name] na vaše raèunalo.
+PreviousInstallNotCompleted=Instalacija/deinstalacija prethodnog programa nije završena. Morate restartati raèunalo kako bi završili tu instalaciju.%n%nNakon restartanja raèunala, ponovno pokrenite Setup kako bi dovršili instalaciju [name].
+CannotContinue=Instalacija ne može nastaviti. Kliknite na Odustani za izlaz.
+ApplicationsFound=Sljedeæi programi koriste datoteke koje instalacijski program treba ažurirati. Preporuèujemo da dopustite instalacijskom programu da zatvori ove programe.
+ApplicationsFound2=Sljedeæi programi koriste datoteke koje instalacijski program treba ažurirati. Preporuèujemo da dopustite instalacijskom programu da zatvori ove programe.
+CloseApplications=&Zatvori programe
+DontCloseApplications=&Ne zatvaraj programe
+ErrorCloseApplications=Ne mogu zatvoriti sve programe. Prije nego nastavite, preporuèujemo da zatvorite sve programe koji koriste datoteke koje instalacijski program treba ažurirati.
+
+; *** "Installing" wizard page
+WizardInstalling=Instaliranje
+InstallingLabel=Prièekajte dok ne završi instalacija programa [name] na vaše raèunalo.
+
+; *** "Setup Completed" wizard page
+FinishedHeadingLabel=Završetak instalacije [name]
+FinishedLabelNoIcons=Instalacija programa [name] je završena.
+FinishedLabel=Instalacija programa [name] je završena. Program možete pokrenuti preko instaliranih ikona.
+ClickFinish=Kliknite na Završi kako biste izašli iz instalacije.
+FinishedRestartLabel=Kako biste instalaciju programa [name] završili, potrebno je ponovno pokrenuti raèunalo. Želite li to sada uèiniti?
+FinishedRestartMessage=Završetak instalacija programa [name], zahtijeva ponovno pokretanje raèunala.%n%nŽelite li to uèiniti sada?
+ShowReadmeCheck=Da, želim proèitati README datoteku
+YesRadio=&Da, želim sada ponovno pokrenuti raèunalo
+NoRadio=&Ne, kasnije æu ga ponovno pokrenuti
+
+; used for example as 'Run MyProg.exe'
+RunEntryExec=&Pokreni %1
+
+; used for example as 'View Readme.txt'
+RunEntryShellExec=Pogledaj %1
+
+; *** "Setup Needs the Next Disk" stuff
+ChangeDiskTitle=Instalacija treba sljedeæi disk
+SelectDiskLabel2=Umetnite disketu %1 i kliknite na OK.%n%nAko se datoteke s ove diskete nalaze na nekom drugom mediju %2 , upišite ispravnu stazu do njega ili kliknite na Odaberi.
+PathLabel=&Staza:
+FileNotInDir2=Datoteka "%1" ne postoji u "%2". Molimo ubacite odgovarajuæi disk ili odaberete drugi %3.
+SelectDirectoryLabel=Odaberite lokaciju sljedeæeg diska.
+
+; *** Installation phase messages
+SetupAborted=Instalacija nije završena.%n%nIspravite problem i opet pokrenite instalaciju.
+EntryAbortRetryIgnore=Kliknite na Ponovi za novi pokušaj, Ignoriraj za nastavak, ili Prekid za prekid instalacije.
+
+; *** Installation status messages
+StatusClosingApplications=Zatvaram programe...
+StatusCreateDirs=Kreiram mape...
+StatusExtractFiles=Izdvajam datoteke...
+StatusCreateIcons=Kreiram ikone...
+StatusCreateIniEntries=Kreiram INI datoteke...
+StatusCreateRegistryEntries=Kreiram podatke za registry...
+StatusRegisterFiles=Registriram datoteke...
+StatusSavingUninstall=Snimam deinstalacijske informacije...
+StatusRunProgram=Završavam instalaciju...
+StatusRestartingApplications=Ponovo pokreæem programe...
+StatusRollback=Poništavam promjene...
+
+; *** Misc. errors
+ErrorInternal2=Interna greška: %1
+ErrorFunctionFailedNoCode=%1 nije uspjelo
+ErrorFunctionFailed=%1 nije uspjelo; kod %2
+ErrorFunctionFailedWithMessage=%1 nije uspjelo; kod %2.%n%3
+ErrorExecutingProgram=Ne mogu pokrenuti datoteku:%n%1
+
+; *** Registry errors
+ErrorRegOpenKey=Greška pri otvaranju registry kljuèa:%n%1\%2
+ErrorRegCreateKey=Greška pri kreiranju registry kljuèa:%n%1\%2
+ErrorRegWriteKey=Greška pri pisanju u registry kljuè:%n%1\%2
+
+; *** INI errors
+ErrorIniEntry=Greška pri kreiranju INI podataka u datoteci "%1".
+
+; *** File copying errors
+FileAbortRetryIgnore=Kliknite Ponovi za novi pokušaj, Ignoriraj za preskok ove datoteke (ne preporuèa se), ili Prekid za prekid instalacije.
+FileAbortRetryIgnore2=Kliknite Ponovi za novi pokušaj, Ignoriraj za nastavak u svakom sluèaju (ne preporuèa se), ili Prekid za prekid instalacije
+SourceIsCorrupted=Izvorišna datoteka je ošteæena
+SourceDoesntExist=Izvorišna datoteka "%1" ne postoji
+ExistingFileReadOnly=Postojeæa datoteka je oznaèena "samo-za-èitanje".%n%nKliknite Ponovi kako biste uklonili oznaku "samo-za-èitanje" i pokušajte ponovno, Ignoriraj za preskok ove datoteke, ili Prekid za prekid instalacije.
+ErrorReadingExistingDest=Pojavila se greška prilikom pokušaja èitanja postojeæe datoteke:
+FileExists=Datoteka veæ postoji.%n%nŽelite li ju zamijeniti?
+ExistingFileNewer=Postojeæa datoteka je novija od one koju pokušavate instalirati. Preporuèa se zadržati postojeæu datoteku.%n%nŽelite li zadržati postojeæu datoteku?
+ErrorChangingAttr=Pojavila se greška prilikom pokušaja promjene atributa postojeæe datoteke:
+ErrorCreatingTemp=Pojavila se greška prilikom pokušaja kreiranja datoteke u odredišnoj mapi:
+ErrorReadingSource=Pojavila se greška prilikom pokušaja èitanja izvorišne datoteke:
+ErrorCopying=Pojavila se greška prilikom pokušaja kopiranja datoteke:
+ErrorReplacingExistingFile=Pojavila se greška prilikom pokušaja zamjene datoteke:
+ErrorRestartReplace=Zamjena nakon ponovnog pokretanja nije uspjela:
+ErrorRenamingTemp=Pojavila se greška prilikom pokušaja preimenovanja datoteke u odredišnoj mapi:
+ErrorRegisterServer=Ne mogu registrirati DLL/OCX: %1
+ErrorRegSvr32Failed=Greška u RegSvr32: greška %1
+ErrorRegisterTypeLib=Ne mogu registrirati type library: %1
+
+; *** Post-installation errors
+ErrorOpeningReadme=Pojavila se greška prilikom pokušaja otvaranja README datoteke.
+ErrorRestartingComputer=Instalacija ne može ponovno pokrenuti raèunalo. Uèinite to ruèno.
+
+; *** Uninstaller messages
+UninstallNotFound=Datoteka "%1" ne postoji. Deinstalacija prekinuta.
+UninstallOpenError=Datoteku "%1" ne mogu otvoriti. Deinstalacija nije moguæa.
+UninstallUnsupportedVer=Deinstalacijska datoteka "%1" je u formatu koji nije prepoznat od ove verzije deinstalacijskog programa. Nije moguæa deinstalacija.
+UninstallUnknownEntry=Nepoznat zapis (%1) je pronaðen u deinstalacijskoj datoteci.
+ConfirmUninstall=Želite li zaista ukloniti %1 i sve njegove komponente?
+UninstallOnlyOnWin64=Ova instalacija može biti uklonjena samo na 64-bitnim Windowsima.
+OnlyAdminCanUninstall=Ova instalacija može biti uklonjena samo od korisnika sa administratorskim pravima.
+UninstallStatusLabel=Prièekajte dok %1 ne bude uklonjen s vašeg raèunala.
+UninstalledAll=Program %1 je uspješno uklonjen sa vašeg raèunala.
+UninstalledMost=Deinstalacija programa %1 je završena.%n%nNeke elemente nije bilo moguæe ukloniti. Uèinite to ruèno.
+UninstalledAndNeedsRestart=Kako bi završili deinstalaciju %1, Vaše raèunalo morate ponovno pokrenuti%n%nŽelite li to uèiniti sada?
+UninstallDataCorrupted="%1" datoteka je ošteæena. Deinstalacija nije moguæa.
+
+; *** Uninstallation phase messages
+ConfirmDeleteSharedFileTitle=Brisanje dijeljene datoteke
+ConfirmDeleteSharedFile2=Sistem ukazuje da sljedeæe dijeljene datoteke ne koristi niti jedan program. Želite li ukloniti te dijeljene datoteke?%n%nAko neki programi i dalje koriste te datoteke, a one se izbrišu, ti programi neæe ispravno raditi. Ako niste sigurni, odaberite Ne. Ostavljanje datoteka neæe uzrokovati štetu vašem sistemu.
+SharedFileNameLabel=Datoteka:
+SharedFileLocationLabel=Staza:
+WizardUninstalling=Deinstalacija
+StatusUninstalling=Deinstaliram %1...
+; *** Shutdown block reasons
+ShutdownBlockReasonInstallingApp=Instaliram %1.
+ShutdownBlockReasonUninstallingApp=Deinstaliram %1.
+
+; The custom messages below aren't used by Setup itself, but if you make
+; use of them in your scripts, you'll want to translate them.
+
+[CustomMessages]
+
+NameAndVersion=%1 verzija %2
+AdditionalIcons=Dodatne ikone:
+CreateDesktopIcon=Kreiraj ikonu na &Desktopu
+CreateQuickLaunchIcon=Kreiraj ikonu u traci za brzo pokretanje
+ProgramOnTheWeb=%1 na internetu
+UninstallProgram=Deinstaliraj %1
+LaunchProgram=Pokreni %1
+AssocFileExtension=Pridru&ži %1 sa %2 ekstenzijom datoteke
+AssocingFileExtension=Pridružujem %1 sa %2 ekstenzijom datoteke
+AutoStartProgramGroupDescription=Pokretanje:
+AutoStartProgram=Automatski pokreni %1
+AddonHostProgramNotFound=%1 se ne nalazi u navedenoj mapi.%n%nŽelite li svejedno nastaviti?
\ No newline at end of file
diff --git a/inno_setup/Croatian-6.0.0.isl b/inno_setup/Croatian-6.0.0.isl
deleted file mode 100644
index 20bc6c2..0000000
--- a/inno_setup/Croatian-6.0.0.isl
+++ /dev/null
@@ -1,365 +0,0 @@
-?; *** Inno Setup version 6.0.0+ Croatian messages ***
-; Translated by: Milo Ivir (mail at milotype.de)
-; Based on translation by Elvis Gambiraža (el.gambo at gmail.com)
-; Based on translation by Krunoslav Kanjuh (krunoslav.kanjuh at zg.t-com.hr)
-;
-; To download user-contributed translations of this file, go to:
-; http://www.jrsoftware.org/files/istrans/
-;
-; Note: When translating this text, do not add periods (.) to the end of
-; messages that didn't have them already, because on those messages Inno
-; Setup adds the periods automatically (appending a period would result in
-; two periods being displayed).
-
-[LangOptions]
-; The following three entries are very important. Be sure to read and
-; understand the '[LangOptions] section' topic in the help file.
-LanguageName=Hrvatski
-LanguageID=$041a
-LanguageCodePage=1250
-; If the language you are translating to requires special font faces or
-; sizes, uncomment any of the following entries and change them accordingly.
-;DialogFontName=MS Shell Dlg
-;DialogFontSize=8
-;WelcomeFontName=Arial
-;WelcomeFontSize=12
-;TitleFontName=Arial
-;TitleFontSize=29
-;CopyrightFontName=Arial
-;CopyrightFontSize=8
-
-[Messages]
-
-; *** Application titles
-SetupAppTitle=Instalacija
-SetupWindowTitle=Instalacija – %1
-UninstallAppTitle=Deinstalacija
-UninstallAppFullTitle=Deinstalacija programa %1
-
-; *** Misc. common
-InformationTitle=Informacija
-ConfirmTitle=Potvrda
-ErrorTitle=Greška
-
-; *** SetupLdr messages
-SetupLdrStartupMessage=Ovime æeš instalirati %1. Želiš li nastaviti?
-LdrCannotCreateTemp=Nije moguæe stvoriti privremenu datoteku. Instalacija je prekinuta
-LdrCannotExecTemp=Nije moguæe pokrenuti datoteku u privremenoj mapi. Instalacija je prekinuta
-HelpTextNote=
-
-; *** Startup error messages
-LastErrorMessage=%1.%n%nnGreška %2: %3
-SetupFileMissing=Datoteka %1 se ne nalazi u mapi instalacije. Ispravi problem ili nabavi novu kopiju programa.
-SetupFileCorrupt=Datoteke instalacije su ošteæene. Nabavi novu kopiju programa.
-SetupFileCorruptOrWrongVer=Datoteke instalacije su ošteæene ili nisu kompatibilne s ovom verzijom instalacije. Ispravi problem ili nabavi novu kopiju programa.
-InvalidParameter=Neispravan parametar je prenijet u naredbenom retku:%n%n%1
-SetupAlreadyRunning=Instalacija je veæ pokrenuta.
-WindowsVersionNotSupported=Program ne podržava verziju Windowsa koju koristite.
-WindowsServicePackRequired=Program zahtijeva %1 servisni paket %2 ili noviji.
-NotOnThisPlatform=Ovaj program neæe raditi na %1.
-OnlyOnThisPlatform=Ovaj program se mora pokrenuti na %1.
-OnlyOnTheseArchitectures=Ovaj program može biti instaliran na verziji Windowsa dizajniranim za sljedeæu procesorsku arhitekturu:%n%n%1
-WinVersionTooLowError=Ovaj program zahtijeva %1 verziju %2 ili noviju.
-WinVersionTooHighError=Ovaj program se ne može instalirati na %1 verziji %2 ili novijoj.
-AdminPrivilegesRequired=Morate biti prijavljeni kao administrator prilikom instaliranja ovog programa.
-PowerUserPrivilegesRequired=Morate biti prijavljeni kao administrator ili èlan grupe naprednih korisnika prilikom instaliranja ovog programa.
-SetupAppRunningError=Instalacija je otkrila da je %1 pokrenut.%n%nZatvorite program i potom kliknite "Dalje" za nastavak ili "Odustani" za prekid instalacije.
-UninstallAppRunningError=Deinstalacija je otkrila da je %1 pokrenut.%n%nZatvorite program i potom kliknite "Dalje" za nastavak ili "Odustani" za prekid instalacije.
-
-; *** Startup questions
-PrivilegesRequiredOverrideTitle=Odaberite naèin instaliranja
-PrivilegesRequiredOverrideInstruction=Odaberite naèin instaliranja
-PrivilegesRequiredOverrideText1=%1 se može instalirati za sve korisnike (zahtijeva administrativna prava) ili samo za vas.
-PrivilegesRequiredOverrideText2=%1 se može instalirati samo za vas ili za sve korisnike (zahtijeva administrativna prava).
-PrivilegesRequiredOverrideAllUsers=Instaliraj z&a sve korisnike
-PrivilegesRequiredOverrideAllUsersRecommended=Instaliraj z&a sve korisnike (preporuèeno)
-PrivilegesRequiredOverrideCurrentUser=Instaliraj samo za &mene
-PrivilegesRequiredOverrideCurrentUserRecommended=Instaliraj samo za &mene (preporuèeno)
-
-; *** Misc. errors
-ErrorCreatingDir=Instalacija nije mogla stvoriti mapu "%1"
-ErrorTooManyFilesInDir=Nemoguæe stvaranje datoteke u mapi "%1", jer ona sadrži previše datoteka
-
-; *** Setup common messages
-ExitSetupTitle=Prekini instalaciju
-ExitSetupMessage=Instalacija nije završena. Ako sad izaðete, program neæe biti instaliran.%n%nInstalaciju možete pokrenuti kasnije, ukoliko ju želite završiti.%n%nPrekinuti instalaciju?
-AboutSetupMenuItem=&O instalaciji …
-AboutSetupTitle=O instalaciji
-AboutSetupMessage=%1 verzija %2%n%3%n%n%1 poèetna stranica:%n%4
-AboutSetupNote=
-TranslatorNote=Prevodioci:%n%nKrunoslav Kanjuh%n%nElvis Gambiraža%n%nMilo Ivir
-
-; *** Buttons
-ButtonBack=< Na&trag
-ButtonNext=&Dalje >
-ButtonInstall=&Instaliraj
-ButtonOK=U redu
-ButtonCancel=Odustani
-ButtonYes=&Da
-ButtonYesToAll=D&a za sve
-ButtonNo=&Ne
-ButtonNoToAll=N&e za sve
-ButtonFinish=&Završi
-ButtonBrowse=&Pretraži …
-ButtonWizardBrowse=Odabe&ri …
-ButtonNewFolder=&Stvori novu mapu
-
-; *** "Select Language" dialog messages
-SelectLanguageTitle=Odaberite jezik za instalaciju
-SelectLanguageLabel=Odberite jezik koji želite koristiti tijekom instaliranja.
-
-; *** Common wizard text
-ClickNext=Kliknite "Dalje" za nastavak ili "Odustani" za prekid instalacije.
-BeveledLabel=
-BrowseDialogTitle=Odaberite mapu
-BrowseDialogLabel=Odaberite mapu iz popisa te kliknite "U redu".
-NewFolderName=Nova mapa
-
-; *** "Welcome" wizard page
-WelcomeLabel1=Dobro došli u instalaciju programa [name]
-WelcomeLabel2=Ovaj program æe instalirati [name/ver] na vaše raèunalo.%n%nPreporuèamo da zatvorite sve programe prije nego što nastavite dalje.
-
-; *** "Password" wizard page
-WizardPassword=Lozinka
-PasswordLabel1=Instalacija je zaštiæena lozinkom.
-PasswordLabel3=Upišite lozinku i kliknite "Dalje". Lozinke su osjetljive na mala i velika slova.
-PasswordEditLabel=&Lozinka:
-IncorrectPassword=Upisana je pogrešna lozinka. Pokušajte ponovo.
-
-; *** "License Agreement" wizard page
-WizardLicense=Licencni ugovor
-LicenseLabel=Prije nastavka pažljivo proèitajte sljedeæe važne informacije.
-LicenseLabel3=Proèitajte licencni ugovor. Morate prihvatiti uvjete ugovora kako biste nastavili s instaliranjem.
-LicenseAccepted=&Prihvaæam ugovor
-LicenseNotAccepted=&Ne prihvaæam ugovor
-
-; *** "Information" wizard pages
-WizardInfoBefore=Informacije
-InfoBeforeLabel=Proèitajte sljedeæe važne informacije prije nego što nastavite dalje.
-InfoBeforeClickLabel=Kada ste spremni nastaviti s instaliranjem, kliknite "Dalje".
-WizardInfoAfter=Informacije
-InfoAfterLabel=Proèitajte sljedeæe važne informacije prije nego što nastavite dalje.
-InfoAfterClickLabel=Kada ste spremni nastaviti s instaliranjem, kliknite "Dalje".
-
-; *** "User Information" wizard page
-WizardUserInfo=Informacije o korisniku
-UserInfoDesc=Upišite informacije o vama.
-UserInfoName=&Ime korisnika:
-UserInfoOrg=&Organizacija:
-UserInfoSerial=&Serijski broj:
-UserInfoNameRequired=Morate upisati ime.
-
-; *** "Select Destination Location" wizard page
-WizardSelectDir=Odaberite odredišno mjesto
-SelectDirDesc=Gdje treba instalirati [name]?
-SelectDirLabel3=Instalacija æe instalirati [name] u sljedeæu mapu.
-SelectDirBrowseLabel=Za nastavak kliknite na "Dalje". Ako želite odabrati drugu mapu, kliknite na "Odaberi".
-DiskSpaceMBLabel=Potrebno je barem [mb] MB slobodnog prostora na disku.
-CannotInstallToNetworkDrive=Instalacija ne može instalirati na mrežnu jedinicu.
-CannotInstallToUNCPath=Instalacija ne može instalirati na UNC stazu.
-InvalidPath=Morate unijeti punu stazu zajedno sa slovom diska, npr.:%n%nC:\APP%n%nili UNC stazu u obliku:%n%n\\server\share
-InvalidDrive=Disk koji ste odabrali ne postoji. Odaberite neki drugi.
-DiskSpaceWarningTitle=Nedovoljno prostora na disku
-DiskSpaceWarning=Instalacija zahtijeva barem %1 KB slobodnog prostora, a odabrani disk ima samo %2 KB na raspolaganju.%n%nŽelite li svejedno nastaviti?
-DirNameTooLong=Naziv mape ili staze je predugaèak.
-InvalidDirName=Naziv mape je neispravan.
-BadDirName32=Naziv mape ne smije sadržavati niti jedan od sljedeæih znakova:%n%n%1
-DirExistsTitle=Mapa veæ postoji
-DirExists=Mapa:%n%n%1%n%nveæ postoji. Želite li svejedno u nju instalirati?
-DirDoesntExistTitle=Mapa ne postoji
-DirDoesntExist=The folder:%n%n%1%n%nne postoji. Želite li ju stvoriti?
-
-; *** "Select Components" wizard page
-WizardSelectComponents=Odaberite komponente
-SelectComponentsDesc=Koje komponente želite instalirati?
-SelectComponentsLabel2=Odaberite komponente koje želite instalirati, iskljuèite komponente koje ne želite instalirati. Za nastavak kliknite na "Dalje".
-FullInstallation=Kompletna instalacija
-; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
-CompactInstallation=Kompaktna instalacija
-CustomInstallation=Prilagoðena instalacija
-NoUninstallWarningTitle=Postojeæe komponente
-NoUninstallWarning=Instalacija je utvrdila da na vašem raèunalu veæ postoje sljedeæe komponente:%n%n%1%n%nIskljuèivanjem tih komponenata, one neæe biti deinstalirane.%n%nŽelite li ipak nastaviti?
-ComponentSize1=%1 KB
-ComponentSize2=%1 MB
-ComponentsDiskSpaceMBLabel=Trenutaèni odabir zahtijeva barem [mb] MB na disku.
-
-; *** "Select Additional Tasks" wizard page
-WizardSelectTasks=Odaberite dodatne zadatke
-SelectTasksDesc=Koje dodatne zadatke želite izvršiti?
-SelectTasksLabel2=Odaberite zadatke koje želite izvršiti tijekom instaliranja programa [name], zatim kliknite "Dalje".
-
-; *** "Select Start Menu Folder" wizard page
-WizardSelectProgramGroup=Odaberite mapu iz "Start" izbornika
-SelectStartMenuFolderDesc=Gdje želite da instalacija spremi programske preèace?
-SelectStartMenuFolderLabel3=Instalacija æe stvoriti programske preèace u sljedeæu mapu "Start" izbornika.
-SelectStartMenuFolderBrowseLabel=Kliknite "Dalje" za nastavak ili "Odaberi" za odabir jedne druge mape.
-MustEnterGroupName=Morate upisati naziv mape.
-GroupNameTooLong=Naziv mape ili staze je predug.
-InvalidGroupName=Naziv mape nije ispravan.
-BadGroupName=Naziv mape ne smije sadržavati sljedeæe znakove:%n%n%1
-NoProgramGroupCheck2=&Ne stvaraj mapu u "Start" izborniku
-
-; *** "Ready to Install" wizard page
-WizardReady=Sve je spremno za instaliranje
-ReadyLabel1=Instalacija je spremna za instaliranje [name] na vaše raèunalo.
-ReadyLabel2a=Kliknite "Instaliraj" ako želite instalirati program ili "Natrag" ako želite pregledati ili promijeniti postavke
-ReadyLabel2b=Kliknite "Instaliraj" ako želite instalirati program.
-ReadyMemoUserInfo=Korisnièki podaci:
-ReadyMemoDir=Odredišno mjesto:
-ReadyMemoType=Vrsta instalacije:
-ReadyMemoComponents=Odabrane komponente:
-ReadyMemoGroup=Mapa u "Start" izborniku:
-ReadyMemoTasks=Dodatni zadaci:
-
-; *** "Preparing to Install" wizard page
-WizardPreparing=Priprema za instaliranje
-PreparingDesc=Instalacija se priprema za instaliranje [name] na vaše raèunalo.
-PreviousInstallNotCompleted=The installation/removal of a previous program was not completed. You will need to restart your computer to complete that installation.%n%nAfter restarting your computer, run Setup again to complete the installation of [name].
-CannotContinue=Instalacija ne može nastaviti. Kliknite na "Odustani" za izlaz.
-ApplicationsFound=Sljedeæi programi koriste datoteke koje instalacija mora aktualiziranti. Preporuèamo da dopustite instalaciji da zatvori ove programe.
-ApplicationsFound2=Sljedeæi programi koriste datoteke koje instalacija mora aktualiziranti. Preporuèamo da dopustite instalaciji da zatvori ove programe. Kad instaliranje završi, instalacija æe pokušati ponovo pokrenuti programe.
-CloseApplications=&Zatvori programe automatski
-DontCloseApplications=&Ne zatvaraj programe
-ErrorCloseApplications=Instalacija nij uspjela automatski zatvoriti programe. Preporuèamo da zatvorite sve programe koji koriste datoteke, koje se moraju aktulaizirati.
-Setup was unable to automatically close all applications. It is recommended that you close all applications using files that need to be updated by Setup before continuing.
-
-; *** "Installing" wizard page
-WizardInstalling=Instaliranje
-InstallingLabel=Prièekajte dok ne završi instaliranje programa [name] na vaše raèunalo.
-
-; *** "Setup Completed" wizard page
-FinishedHeadingLabel=Završavanje instalacijskog èarobnjaka za [name]
-FinishedLabelNoIcons=Instalacija je završila instaliranje programa [name] na vaše raèunalo.
-FinishedLabel=Instalacija je završila instaliranje programa [name] na vaše raèunalo. Program se može pokrenuti pomoæu instaliranih preèaca.
-ClickFinish=Kliknite na "Završi" kako biste izašli iz instalacije.
-FinishedRestartLabel=Kako biste završili instaliranje programa [name], potrebno je ponovo pokrenuti raèunalo. Želite li to sada uèiniti?
-FinishedRestartMessage=Kako biste završili instaliranje programa [name], potrebno je ponovo pokrenuti raèunalo.%n%nŽelite li to sada uèiniti?
-ShowReadmeCheck=Da, želim proèitati README datoteku
-YesRadio=&Da, želim sad ponovo pokrenuti raèunalo
-NoRadio=&Ne, kasnije æu ponovo pokrenuti raèunalo
-; used for example as 'Run MyProg.exe'
-RunEntryExec=Pokreni %1
-; used for example as 'View Readme.txt'
-RunEntryShellExec=Prikaži %1
-
-; *** "Setup Needs the Next Disk" stuff
-ChangeDiskTitle=Instalacija treba sljedeæi disk
-SelectDiskLabel2=Umetnite disk %1 i kliknite na "U redu".%n%nAko se datoteke s ovog diska nalaze na nekom drugom mjestu od prikazanog ispod, upišite ispravnu stazu ili kliknite na "Odaberi".
-PathLabel=&Staza:
-FileNotInDir2=Staza "%1" ne postoji u "%2". Umetnite odgovarajuæi disk ili odaberite jednu drugu mapu.
-SelectDirectoryLabel=Odaberite mjesto sljedeæeg diska.
-
-; *** Installation phase messages
-SetupAborted=Instalacija nije završena.%n%nIspravite problem i ponovo pokrenite instalaciju.
-AbortRetryIgnoreSelectAction=Odaberite radnju
-AbortRetryIgnoreRetry=&Pokušaj ponovo
-AbortRetryIgnoreIgnore=&Zanemari grešku i nastavi
-AbortRetryIgnoreCancel=Prekini s instaliranjem
-
-; *** Installation status messages
-StatusClosingApplications=Zatvaranje programa …
-StatusCreateDirs=Stvaranje mapa …
-StatusExtractFiles=Izdvajanje datoteka …
-StatusCreateIcons=Stvaranje preèaca …
-StatusCreateIniEntries=Stvaranje INI unosa …
-StatusCreateRegistryEntries=Stvaranje unosa u registar …
-StatusRegisterFiles=Registriranje datoteka …
-StatusSavingUninstall=Spremanje podataka deinstalacije …
-StatusRunProgram=Završavanje instaliranja …
-StatusRestartingApplications=Ponovno pokretanje programa …
-StatusRollback=Poništavanje promjena …
-
-; *** Misc. errors
-ErrorInternal2=Interna greška: %1
-ErrorFunctionFailedNoCode=%1 nije uspjelo
-ErrorFunctionFailed=%1 nije uspjelo; kod %2
-ErrorFunctionFailedWithMessage=%1 failed; kod %2.%n%3
-ErrorExecutingProgram=Nije moguæe pokrenuti datoteku:%n%1
-
-; *** Registry errors
-ErrorRegOpenKey=Greška prilikom otvaranja kljuèa registra:%n%1\%2
-ErrorRegCreateKey=Greška prilikom stvaranja kljuèa registra:%n%1\%2
-ErrorRegWriteKey=Greška prilikom pisanja u kljuè registra:%n%1\%2
-
-; *** INI errors
-ErrorIniEntry=Greška prilikom stvaranja INI unosa u datoteci "%1".
-
-; *** File copying errors
-FileAbortRetryIgnoreSkipNotRecommended=&Preskoèi ovu datoteku (ne preporuèa se)
-FileAbortRetryIgnoreIgnoreNotRecommended=&Zanemari grešku i nastavi (ne preporuèa se)
-SourceIsCorrupted=Izvorišna datoteka je ošteæena
-SourceDoesntExist=Izvorišna datoteka "%1" ne postoji
-ExistingFileReadOnly2=Postojeæu datoteku nije bilo moguæe zamijeniti, jer je oznaèena sa "samo-za-èitanje".
-ExistingFileReadOnlyRetry=&Uklonite atribut "samo-za-èitanje" i pokušajte ponovo
-ExistingFileReadOnlyKeepExisting=&Zadrži postojeæu datoteku
-ErrorReadingExistingDest=Pojavila se greška prilikom pokušaja èitanja postojeæe datoteke:
-FileExists=The file already exists.%n%nŽelite li da ju instalacija prepiše?
-ExistingFileNewer=Postojeæa datoteka je novija od one, koju pokušavate instalirati. Preporuèa se da zadržite postojeæu datoteku.%n%nŽelite li zadržati postojeæu datoteku?
-ErrorChangingAttr=Pojavila se greška prilikom pokušaja promjene atributa postojeæe datoteke:
-ErrorCreatingTemp=Pojavila se greška prilikom pokušaja stvaranja datoteke u odredišnoj mapi:
-ErrorReadingSource=Pojavila se greška prilikom pokušaja èitanja izvorišne datoteke:
-ErrorCopying=Pojavila se greška prilikom pokušaja kopiranja datoteke:
-ErrorReplacingExistingFile=Pojavila se greška prilikom pokušaja zamijenjivanja datoteke:
-ErrorRestartReplace=Zamijenjivanje nakon ponovnog pokretanja nije uspjelo:
-ErrorRenamingTemp=Pojavila se greška prilikom pokušaja preimenovanja datoteke u odredišnoj mapi:
-ErrorRegisterServer=Nije moguæe registrirati DLL/OCX: %1
-ErrorRegSvr32Failed=Greška u RegSvr32. Izlazni kod %1
-ErrorRegisterTypeLib=Nije moguæe registrirati type library: %1
-
-; *** Uninstall display name markings
-; used for example as 'My Program (32-bit)'
-UninstallDisplayNameMark=%1 (%2)
-; used for example as 'My Program (32-bit, All users)'
-UninstallDisplayNameMarks=%1 (%2, %3)
-UninstallDisplayNameMark32Bit=32-bitni
-UninstallDisplayNameMark64Bit=64-bitni
-UninstallDisplayNameMarkAllUsers=Svi korisnici
-UninstallDisplayNameMarkCurrentUser=Trenutaèni korisnik
-
-; *** Post-installation errors
-ErrorOpeningReadme=Pojavila se greška prilikom pokušaja otvaranja README datoteke.
-ErrorRestartingComputer=Instalacija nije mogla ponovo pokrenuti raèunalo. Uèinite to ruèno.
-
-; *** Uninstaller messages
-UninstallNotFound=Datoteka "%1" ne postoji. Deinstaliranje nije moguæe.
-UninstallOpenError=Datoteku "%1" nije bilo moguæe otvoriti. Deinstaliranje nije moguæe
-UninstallUnsupportedVer=Deinstalacijska datoteka "%1" je u formatu koji ova verzija deinstalacijskog programa ne prepoznaje. Deinstaliranje nije moguæe
-UninstallUnknownEntry=Nepoznat zapis (%1) je pronaðen u deinstalacijskoj datoteci
-ConfirmUninstall=Zaista želite ukloniti %1 i sve pripadajuæe komponente?
-UninstallOnlyOnWin64=Ovu instalaciju je moguæe ukloniti samo na 64-bitnom Windows sustavu.
-OnlyAdminCanUninstall=Ovu instalaciju je moguæe ukloniti samo korisnik s administrativnim pravima.
-UninstallStatusLabel=Prièekajte dok se %1 uklanja s vašeg raèunala.
-UninstalledAll=%1 je uspješno uklonjen s vašeg raèunala.
-UninstalledMost=Deinstaliranje programa %1 je završeno.%n%nNeke elemente nije bilo moguæe ukloniti. Mogu se ukloniti ruèno.
-UninstalledAndNeedsRestart=Kako biste završili deinstalirati %1, morate ponovo pokrenuti vaše raèunalo%n%nŽelite li to sad uèiniti?
-UninstallDataCorrupted="%1" datoteka je ošteæena. Deinstaliranje nije moguæe
-
-; *** Uninstallation phase messages
-ConfirmDeleteSharedFileTitle=Ukloniti dijeljene datoteke?
-ConfirmDeleteSharedFile2=Sustav ukazuje na to, da sljedeæe dijeljenu datoteku ne koristi niti jedan program. Želite li ukloniti tu dijeljenu datoteku?%n%nAko neki programi i dalje koriste tu datoteku, a ona se izbriše, ti programi neæe ispravno raditi. Ako niste sigurni, odaberite "Ne". Datoteka neæe štetiti vašem sustavu.
-SharedFileNameLabel=Datoteka:
-SharedFileLocationLabel=Mjesto:
-WizardUninstalling=Stanje deinstalacije
-StatusUninstalling=%1 deinstaliranje …
-
-; *** Shutdown block reasons
-ShutdownBlockReasonInstallingApp=%1 instaliranje.
-ShutdownBlockReasonUninstallingApp=%1 deinstaliranje.
-
-; The custom messages below aren't used by Setup itself, but if you make
-; use of them in your scripts, you'll want to translate them.
-
-[CustomMessages]
-
-NameAndVersion=%1 verzija %2
-AdditionalIcons=Dodatni preèaci:
-CreateDesktopIcon=Stvori preèac na ra&dnoj površini
-CreateQuickLaunchIcon=Stvori preèac u traci za &brzo pokretanje
-ProgramOnTheWeb=%1 na internetu
-UninstallProgram=Deinstaliraj %1
-LaunchProgram=Pokreni %1
-AssocFileExtension=&Poveži program %1 s datoteènim nastavkom %2
-AssocingFileExtension=Povezivanje programa %1 s datoteènim nastavkom %2 …
-AutoStartProgramGroupDescription=Pokretanje:
-AutoStartProgram=Automatski pokreni %1
-AddonHostProgramNotFound=%1 nije naðen u odabranoj mapi.%n%nŽelite li svejedno nastaviti?
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index eb8a891..27c9495 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -528,6 +528,7 @@ Name: "ca"; MessagesFile: "compiler:Languages\Catalan.isl"; InfoAfterFile: "@INS
Name: "de"; MessagesFile: "compiler:Languages\German.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-de.win32-bin.txt"
Name: "el"; MessagesFile: "compiler:Languages\Greek.isl"
Name: "fr"; MessagesFile: "compiler:Languages\French.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-fr.win32-bin.txt"
+Name: "hr"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Croatian-5.5.3.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-hr.win32-bin.txt"
Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-it.win32-bin.txt"
Name: "ja"; MessagesFile: "compiler:Languages\Japanese.isl"
Name: "lv"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Latvian-5.5.0.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-lv.win32-bin.txt"
@@ -583,6 +584,7 @@ ca.LanguageCodePage=0
de.LanguageCodePage=0
el.LanguageCodePage=0
fr.LanguageCodePage=0
+hr.LanguageCodePage=0
it.LanguageCodePage=0
ja.LanguageCodePage=0
nl.LanguageCodePage=0
@@ -709,6 +711,40 @@ fr.IconName_Uninstall=Dé-installer GnuCash
fr.IconComment_Uninstall=Désinstalle le gestionnaire financier GnuCash
+;; ;;;;;;;;;;;;;;;;;;;;
+;; Croatian translation
+
+; *** "Select Components" wizard page
+hr.FullInstall=Kompletna instalacija
+hr.CustomInstall=Prilagođena instalacija
+hr.CreateDesktopIcon=Stvori ikonu na radnoj površini
+hr.CreateMenuLink=Stvori poveznicu u izborniku Start
+hr.RunPrg=Pokreni GnuCash
+hr.AdditionalIcons=Stvori ove ikone:
+hr.StatusMsgFirewall=Instaliranje pravila vatrozida Windowsa …
+; *** "Another install" wizard page
+; %1 in the following messages will be replaced with the application name and version, like "GnuCash 2.3.15"
+hr.AIWP_Title=Nađena je jedna druga instalacija
+hr.AIWP_Description=%1 je trenutaÄno instaliran na ovom raÄunalu
+hr.AIWP_Message=Ovu raniju instalaciju moraš ukloniti prije nego što nastaviš s instaliranjem.%n%nAko to ne želiš, klikni "Odustani" i prekinut ćeš ovo instaliranje.%n%nKlikni "Dalje" ako želiš ukloniti %1 i nastaviti s instaliranjem.%n%nNapomena: Uklonit će se samo program, ne i tvoji financijski podaci.
+
+hr.MainFiles=GnuCash program
+hr.TranslFiles=Hrvatski prijevod
+hr.TemplFiles=Predlošci kontnih planova
+
+hr.IconComment_GnuCash=GnuCash – slobodan raÄunovodstveni program
+hr.IconName_README=Prikaži GnuCash README
+hr.IconComment_README=Prikaži informativnu README-datoteku
+hr.IconFilename_README=README-hr.win32-bin.txt
+hr.IconName_FAQ=ÄŒesto postavljana pitanja o GnuCashu (web stranica na engleskom)
+hr.IconName_Bugzilla=Prijavi grešku (web stranica na engleskom)
+hr.IconName_InstallFQ=Instaliraj dohvaćanje internetskih teÄajeva za GnuCash
+hr.IconComment_InstallFQ=Instaliraj potreban perl modul Finance-Quote za dohvaćanje teÄajeva putem interneta. Zahtijeva ActivePerl ili Strawberry Perl 5.8 ili noviji
+hr.IconName_Theme=Odaberi GnuCashovu temu
+hr.IconName_Uninstall=Deinstaliraj GnuCash
+hr.IconComment_Uninstall=Deinstaliraj raÄunovodstveni program GnuCash
+
+
;; ;;;;;;;;;;;;;;;;;;;;;
;; Italian translation
commit 86dcf63f350875b96e7d093ffd3b9975037cfeee
Author: Geert Janssens <geert at kobaltwit.be>
Date: Mon Jun 17 22:58:54 2019 +0200
Update installer script for restructured scheme files
lib/gnucash/scm is used for gnucash 3.x
lib/guile/2.2/site/ is the new location starting with gnucah 4.x
As the same build scripts are used for both series, make the
old path optional. Note this may require a clean build for
master to get right.
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index eb8a891..e4cdff1 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -67,8 +67,9 @@ Source: "@INST_DIR@\etc\@PACKAGE@\environment"; DestDir: "{app}\etc\@PACKAGE@";
; Note: The above AfterInstall function will adapt the
; environment config file on-the-fly by the Pascal script below.
Source: "@INST_DIR@\lib\*"; DestDir: "{app}\lib"; Flags: recursesubdirs; Components: main
-Source: "@INST_DIR@\lib\gnucash\scm\ccache\2.2\*"; DestDir: "{app}\lib\gnucash\scm\ccache\2.2"; Flags: recursesubdirs; Components: main
-Source: "@INST_DIR@\lib\guile\2.2\ccache\*"; DestDir: "{app}\lib\guile\2.2\ccache"; Flags: recursesubdirs; Components: main
+; Deprecated installation location for gnucash guile scripts. Can be removed after we're done with gnucash 3.x
+Source: "@INST_DIR@\lib\gnucash\scm\ccache\2.2\*"; DestDir: "{app}\lib\gnucash\scm\ccache\2.2"; Flags: recursesubdirs skipifsourcedoesntexist; Components: main
+Source: "@INST_DIR@\lib\guile\2.2\*"; DestDir: "{app}\lib\guile\2.2"; Flags: recursesubdirs; Components: main
Source: "@INST_DIR@\lib\dbd\*.dll"; DestDir: "{app}\lib"; Components: main
Source: "@INST_DIR@\lib\aqbanking\*"; DestDir: "{app}\lib\aqbanking"; Excludes: "*.dll.a"; Flags: recursesubdirs; Components: main
Source: "@INST_DIR@\lib\gwenhywfar\*"; DestDir: "{app}\lib\gwenhywfar"; Excludes: "*.dll.a"; Flags: recursesubdirs; Components: main
commit fe814e72222f4cfada484776b5e0ed971e8bb5ec
Author: milotype <43657314+milotype at users.noreply.github.com>
Date: Mon Jun 17 15:52:35 2019 +0200
Added Croatian-6.0.0.isl
As this is an "unofficial" language, I took the time and translated the newest version. My translation is based upon the current "Croatian-5.3.3.isl" file, with some corrections and additions where needed. I will also send this new file to the person in charge for the "Unofficial translations" at http://www.jrsoftware.org/files/istrans/
Can someone please check if the file's encoding is correct. I work on a Mac-OS, not on Windows. I did convert the file to windows-1250 with a convertor.
If needed I can provide the same file in utf-8.
diff --git a/inno_setup/Croatian-6.0.0.isl b/inno_setup/Croatian-6.0.0.isl
new file mode 100644
index 0000000..20bc6c2
--- /dev/null
+++ b/inno_setup/Croatian-6.0.0.isl
@@ -0,0 +1,365 @@
+?; *** Inno Setup version 6.0.0+ Croatian messages ***
+; Translated by: Milo Ivir (mail at milotype.de)
+; Based on translation by Elvis Gambiraža (el.gambo at gmail.com)
+; Based on translation by Krunoslav Kanjuh (krunoslav.kanjuh at zg.t-com.hr)
+;
+; To download user-contributed translations of this file, go to:
+; http://www.jrsoftware.org/files/istrans/
+;
+; Note: When translating this text, do not add periods (.) to the end of
+; messages that didn't have them already, because on those messages Inno
+; Setup adds the periods automatically (appending a period would result in
+; two periods being displayed).
+
+[LangOptions]
+; The following three entries are very important. Be sure to read and
+; understand the '[LangOptions] section' topic in the help file.
+LanguageName=Hrvatski
+LanguageID=$041a
+LanguageCodePage=1250
+; If the language you are translating to requires special font faces or
+; sizes, uncomment any of the following entries and change them accordingly.
+;DialogFontName=MS Shell Dlg
+;DialogFontSize=8
+;WelcomeFontName=Arial
+;WelcomeFontSize=12
+;TitleFontName=Arial
+;TitleFontSize=29
+;CopyrightFontName=Arial
+;CopyrightFontSize=8
+
+[Messages]
+
+; *** Application titles
+SetupAppTitle=Instalacija
+SetupWindowTitle=Instalacija – %1
+UninstallAppTitle=Deinstalacija
+UninstallAppFullTitle=Deinstalacija programa %1
+
+; *** Misc. common
+InformationTitle=Informacija
+ConfirmTitle=Potvrda
+ErrorTitle=Greška
+
+; *** SetupLdr messages
+SetupLdrStartupMessage=Ovime æeš instalirati %1. Želiš li nastaviti?
+LdrCannotCreateTemp=Nije moguæe stvoriti privremenu datoteku. Instalacija je prekinuta
+LdrCannotExecTemp=Nije moguæe pokrenuti datoteku u privremenoj mapi. Instalacija je prekinuta
+HelpTextNote=
+
+; *** Startup error messages
+LastErrorMessage=%1.%n%nnGreška %2: %3
+SetupFileMissing=Datoteka %1 se ne nalazi u mapi instalacije. Ispravi problem ili nabavi novu kopiju programa.
+SetupFileCorrupt=Datoteke instalacije su ošteæene. Nabavi novu kopiju programa.
+SetupFileCorruptOrWrongVer=Datoteke instalacije su ošteæene ili nisu kompatibilne s ovom verzijom instalacije. Ispravi problem ili nabavi novu kopiju programa.
+InvalidParameter=Neispravan parametar je prenijet u naredbenom retku:%n%n%1
+SetupAlreadyRunning=Instalacija je veæ pokrenuta.
+WindowsVersionNotSupported=Program ne podržava verziju Windowsa koju koristite.
+WindowsServicePackRequired=Program zahtijeva %1 servisni paket %2 ili noviji.
+NotOnThisPlatform=Ovaj program neæe raditi na %1.
+OnlyOnThisPlatform=Ovaj program se mora pokrenuti na %1.
+OnlyOnTheseArchitectures=Ovaj program može biti instaliran na verziji Windowsa dizajniranim za sljedeæu procesorsku arhitekturu:%n%n%1
+WinVersionTooLowError=Ovaj program zahtijeva %1 verziju %2 ili noviju.
+WinVersionTooHighError=Ovaj program se ne može instalirati na %1 verziji %2 ili novijoj.
+AdminPrivilegesRequired=Morate biti prijavljeni kao administrator prilikom instaliranja ovog programa.
+PowerUserPrivilegesRequired=Morate biti prijavljeni kao administrator ili èlan grupe naprednih korisnika prilikom instaliranja ovog programa.
+SetupAppRunningError=Instalacija je otkrila da je %1 pokrenut.%n%nZatvorite program i potom kliknite "Dalje" za nastavak ili "Odustani" za prekid instalacije.
+UninstallAppRunningError=Deinstalacija je otkrila da je %1 pokrenut.%n%nZatvorite program i potom kliknite "Dalje" za nastavak ili "Odustani" za prekid instalacije.
+
+; *** Startup questions
+PrivilegesRequiredOverrideTitle=Odaberite naèin instaliranja
+PrivilegesRequiredOverrideInstruction=Odaberite naèin instaliranja
+PrivilegesRequiredOverrideText1=%1 se može instalirati za sve korisnike (zahtijeva administrativna prava) ili samo za vas.
+PrivilegesRequiredOverrideText2=%1 se može instalirati samo za vas ili za sve korisnike (zahtijeva administrativna prava).
+PrivilegesRequiredOverrideAllUsers=Instaliraj z&a sve korisnike
+PrivilegesRequiredOverrideAllUsersRecommended=Instaliraj z&a sve korisnike (preporuèeno)
+PrivilegesRequiredOverrideCurrentUser=Instaliraj samo za &mene
+PrivilegesRequiredOverrideCurrentUserRecommended=Instaliraj samo za &mene (preporuèeno)
+
+; *** Misc. errors
+ErrorCreatingDir=Instalacija nije mogla stvoriti mapu "%1"
+ErrorTooManyFilesInDir=Nemoguæe stvaranje datoteke u mapi "%1", jer ona sadrži previše datoteka
+
+; *** Setup common messages
+ExitSetupTitle=Prekini instalaciju
+ExitSetupMessage=Instalacija nije završena. Ako sad izaðete, program neæe biti instaliran.%n%nInstalaciju možete pokrenuti kasnije, ukoliko ju želite završiti.%n%nPrekinuti instalaciju?
+AboutSetupMenuItem=&O instalaciji …
+AboutSetupTitle=O instalaciji
+AboutSetupMessage=%1 verzija %2%n%3%n%n%1 poèetna stranica:%n%4
+AboutSetupNote=
+TranslatorNote=Prevodioci:%n%nKrunoslav Kanjuh%n%nElvis Gambiraža%n%nMilo Ivir
+
+; *** Buttons
+ButtonBack=< Na&trag
+ButtonNext=&Dalje >
+ButtonInstall=&Instaliraj
+ButtonOK=U redu
+ButtonCancel=Odustani
+ButtonYes=&Da
+ButtonYesToAll=D&a za sve
+ButtonNo=&Ne
+ButtonNoToAll=N&e za sve
+ButtonFinish=&Završi
+ButtonBrowse=&Pretraži …
+ButtonWizardBrowse=Odabe&ri …
+ButtonNewFolder=&Stvori novu mapu
+
+; *** "Select Language" dialog messages
+SelectLanguageTitle=Odaberite jezik za instalaciju
+SelectLanguageLabel=Odberite jezik koji želite koristiti tijekom instaliranja.
+
+; *** Common wizard text
+ClickNext=Kliknite "Dalje" za nastavak ili "Odustani" za prekid instalacije.
+BeveledLabel=
+BrowseDialogTitle=Odaberite mapu
+BrowseDialogLabel=Odaberite mapu iz popisa te kliknite "U redu".
+NewFolderName=Nova mapa
+
+; *** "Welcome" wizard page
+WelcomeLabel1=Dobro došli u instalaciju programa [name]
+WelcomeLabel2=Ovaj program æe instalirati [name/ver] na vaše raèunalo.%n%nPreporuèamo da zatvorite sve programe prije nego što nastavite dalje.
+
+; *** "Password" wizard page
+WizardPassword=Lozinka
+PasswordLabel1=Instalacija je zaštiæena lozinkom.
+PasswordLabel3=Upišite lozinku i kliknite "Dalje". Lozinke su osjetljive na mala i velika slova.
+PasswordEditLabel=&Lozinka:
+IncorrectPassword=Upisana je pogrešna lozinka. Pokušajte ponovo.
+
+; *** "License Agreement" wizard page
+WizardLicense=Licencni ugovor
+LicenseLabel=Prije nastavka pažljivo proèitajte sljedeæe važne informacije.
+LicenseLabel3=Proèitajte licencni ugovor. Morate prihvatiti uvjete ugovora kako biste nastavili s instaliranjem.
+LicenseAccepted=&Prihvaæam ugovor
+LicenseNotAccepted=&Ne prihvaæam ugovor
+
+; *** "Information" wizard pages
+WizardInfoBefore=Informacije
+InfoBeforeLabel=Proèitajte sljedeæe važne informacije prije nego što nastavite dalje.
+InfoBeforeClickLabel=Kada ste spremni nastaviti s instaliranjem, kliknite "Dalje".
+WizardInfoAfter=Informacije
+InfoAfterLabel=Proèitajte sljedeæe važne informacije prije nego što nastavite dalje.
+InfoAfterClickLabel=Kada ste spremni nastaviti s instaliranjem, kliknite "Dalje".
+
+; *** "User Information" wizard page
+WizardUserInfo=Informacije o korisniku
+UserInfoDesc=Upišite informacije o vama.
+UserInfoName=&Ime korisnika:
+UserInfoOrg=&Organizacija:
+UserInfoSerial=&Serijski broj:
+UserInfoNameRequired=Morate upisati ime.
+
+; *** "Select Destination Location" wizard page
+WizardSelectDir=Odaberite odredišno mjesto
+SelectDirDesc=Gdje treba instalirati [name]?
+SelectDirLabel3=Instalacija æe instalirati [name] u sljedeæu mapu.
+SelectDirBrowseLabel=Za nastavak kliknite na "Dalje". Ako želite odabrati drugu mapu, kliknite na "Odaberi".
+DiskSpaceMBLabel=Potrebno je barem [mb] MB slobodnog prostora na disku.
+CannotInstallToNetworkDrive=Instalacija ne može instalirati na mrežnu jedinicu.
+CannotInstallToUNCPath=Instalacija ne može instalirati na UNC stazu.
+InvalidPath=Morate unijeti punu stazu zajedno sa slovom diska, npr.:%n%nC:\APP%n%nili UNC stazu u obliku:%n%n\\server\share
+InvalidDrive=Disk koji ste odabrali ne postoji. Odaberite neki drugi.
+DiskSpaceWarningTitle=Nedovoljno prostora na disku
+DiskSpaceWarning=Instalacija zahtijeva barem %1 KB slobodnog prostora, a odabrani disk ima samo %2 KB na raspolaganju.%n%nŽelite li svejedno nastaviti?
+DirNameTooLong=Naziv mape ili staze je predugaèak.
+InvalidDirName=Naziv mape je neispravan.
+BadDirName32=Naziv mape ne smije sadržavati niti jedan od sljedeæih znakova:%n%n%1
+DirExistsTitle=Mapa veæ postoji
+DirExists=Mapa:%n%n%1%n%nveæ postoji. Želite li svejedno u nju instalirati?
+DirDoesntExistTitle=Mapa ne postoji
+DirDoesntExist=The folder:%n%n%1%n%nne postoji. Želite li ju stvoriti?
+
+; *** "Select Components" wizard page
+WizardSelectComponents=Odaberite komponente
+SelectComponentsDesc=Koje komponente želite instalirati?
+SelectComponentsLabel2=Odaberite komponente koje želite instalirati, iskljuèite komponente koje ne želite instalirati. Za nastavak kliknite na "Dalje".
+FullInstallation=Kompletna instalacija
+; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
+CompactInstallation=Kompaktna instalacija
+CustomInstallation=Prilagoðena instalacija
+NoUninstallWarningTitle=Postojeæe komponente
+NoUninstallWarning=Instalacija je utvrdila da na vašem raèunalu veæ postoje sljedeæe komponente:%n%n%1%n%nIskljuèivanjem tih komponenata, one neæe biti deinstalirane.%n%nŽelite li ipak nastaviti?
+ComponentSize1=%1 KB
+ComponentSize2=%1 MB
+ComponentsDiskSpaceMBLabel=Trenutaèni odabir zahtijeva barem [mb] MB na disku.
+
+; *** "Select Additional Tasks" wizard page
+WizardSelectTasks=Odaberite dodatne zadatke
+SelectTasksDesc=Koje dodatne zadatke želite izvršiti?
+SelectTasksLabel2=Odaberite zadatke koje želite izvršiti tijekom instaliranja programa [name], zatim kliknite "Dalje".
+
+; *** "Select Start Menu Folder" wizard page
+WizardSelectProgramGroup=Odaberite mapu iz "Start" izbornika
+SelectStartMenuFolderDesc=Gdje želite da instalacija spremi programske preèace?
+SelectStartMenuFolderLabel3=Instalacija æe stvoriti programske preèace u sljedeæu mapu "Start" izbornika.
+SelectStartMenuFolderBrowseLabel=Kliknite "Dalje" za nastavak ili "Odaberi" za odabir jedne druge mape.
+MustEnterGroupName=Morate upisati naziv mape.
+GroupNameTooLong=Naziv mape ili staze je predug.
+InvalidGroupName=Naziv mape nije ispravan.
+BadGroupName=Naziv mape ne smije sadržavati sljedeæe znakove:%n%n%1
+NoProgramGroupCheck2=&Ne stvaraj mapu u "Start" izborniku
+
+; *** "Ready to Install" wizard page
+WizardReady=Sve je spremno za instaliranje
+ReadyLabel1=Instalacija je spremna za instaliranje [name] na vaše raèunalo.
+ReadyLabel2a=Kliknite "Instaliraj" ako želite instalirati program ili "Natrag" ako želite pregledati ili promijeniti postavke
+ReadyLabel2b=Kliknite "Instaliraj" ako želite instalirati program.
+ReadyMemoUserInfo=Korisnièki podaci:
+ReadyMemoDir=Odredišno mjesto:
+ReadyMemoType=Vrsta instalacije:
+ReadyMemoComponents=Odabrane komponente:
+ReadyMemoGroup=Mapa u "Start" izborniku:
+ReadyMemoTasks=Dodatni zadaci:
+
+; *** "Preparing to Install" wizard page
+WizardPreparing=Priprema za instaliranje
+PreparingDesc=Instalacija se priprema za instaliranje [name] na vaše raèunalo.
+PreviousInstallNotCompleted=The installation/removal of a previous program was not completed. You will need to restart your computer to complete that installation.%n%nAfter restarting your computer, run Setup again to complete the installation of [name].
+CannotContinue=Instalacija ne može nastaviti. Kliknite na "Odustani" za izlaz.
+ApplicationsFound=Sljedeæi programi koriste datoteke koje instalacija mora aktualiziranti. Preporuèamo da dopustite instalaciji da zatvori ove programe.
+ApplicationsFound2=Sljedeæi programi koriste datoteke koje instalacija mora aktualiziranti. Preporuèamo da dopustite instalaciji da zatvori ove programe. Kad instaliranje završi, instalacija æe pokušati ponovo pokrenuti programe.
+CloseApplications=&Zatvori programe automatski
+DontCloseApplications=&Ne zatvaraj programe
+ErrorCloseApplications=Instalacija nij uspjela automatski zatvoriti programe. Preporuèamo da zatvorite sve programe koji koriste datoteke, koje se moraju aktulaizirati.
+Setup was unable to automatically close all applications. It is recommended that you close all applications using files that need to be updated by Setup before continuing.
+
+; *** "Installing" wizard page
+WizardInstalling=Instaliranje
+InstallingLabel=Prièekajte dok ne završi instaliranje programa [name] na vaše raèunalo.
+
+; *** "Setup Completed" wizard page
+FinishedHeadingLabel=Završavanje instalacijskog èarobnjaka za [name]
+FinishedLabelNoIcons=Instalacija je završila instaliranje programa [name] na vaše raèunalo.
+FinishedLabel=Instalacija je završila instaliranje programa [name] na vaše raèunalo. Program se može pokrenuti pomoæu instaliranih preèaca.
+ClickFinish=Kliknite na "Završi" kako biste izašli iz instalacije.
+FinishedRestartLabel=Kako biste završili instaliranje programa [name], potrebno je ponovo pokrenuti raèunalo. Želite li to sada uèiniti?
+FinishedRestartMessage=Kako biste završili instaliranje programa [name], potrebno je ponovo pokrenuti raèunalo.%n%nŽelite li to sada uèiniti?
+ShowReadmeCheck=Da, želim proèitati README datoteku
+YesRadio=&Da, želim sad ponovo pokrenuti raèunalo
+NoRadio=&Ne, kasnije æu ponovo pokrenuti raèunalo
+; used for example as 'Run MyProg.exe'
+RunEntryExec=Pokreni %1
+; used for example as 'View Readme.txt'
+RunEntryShellExec=Prikaži %1
+
+; *** "Setup Needs the Next Disk" stuff
+ChangeDiskTitle=Instalacija treba sljedeæi disk
+SelectDiskLabel2=Umetnite disk %1 i kliknite na "U redu".%n%nAko se datoteke s ovog diska nalaze na nekom drugom mjestu od prikazanog ispod, upišite ispravnu stazu ili kliknite na "Odaberi".
+PathLabel=&Staza:
+FileNotInDir2=Staza "%1" ne postoji u "%2". Umetnite odgovarajuæi disk ili odaberite jednu drugu mapu.
+SelectDirectoryLabel=Odaberite mjesto sljedeæeg diska.
+
+; *** Installation phase messages
+SetupAborted=Instalacija nije završena.%n%nIspravite problem i ponovo pokrenite instalaciju.
+AbortRetryIgnoreSelectAction=Odaberite radnju
+AbortRetryIgnoreRetry=&Pokušaj ponovo
+AbortRetryIgnoreIgnore=&Zanemari grešku i nastavi
+AbortRetryIgnoreCancel=Prekini s instaliranjem
+
+; *** Installation status messages
+StatusClosingApplications=Zatvaranje programa …
+StatusCreateDirs=Stvaranje mapa …
+StatusExtractFiles=Izdvajanje datoteka …
+StatusCreateIcons=Stvaranje preèaca …
+StatusCreateIniEntries=Stvaranje INI unosa …
+StatusCreateRegistryEntries=Stvaranje unosa u registar …
+StatusRegisterFiles=Registriranje datoteka …
+StatusSavingUninstall=Spremanje podataka deinstalacije …
+StatusRunProgram=Završavanje instaliranja …
+StatusRestartingApplications=Ponovno pokretanje programa …
+StatusRollback=Poništavanje promjena …
+
+; *** Misc. errors
+ErrorInternal2=Interna greška: %1
+ErrorFunctionFailedNoCode=%1 nije uspjelo
+ErrorFunctionFailed=%1 nije uspjelo; kod %2
+ErrorFunctionFailedWithMessage=%1 failed; kod %2.%n%3
+ErrorExecutingProgram=Nije moguæe pokrenuti datoteku:%n%1
+
+; *** Registry errors
+ErrorRegOpenKey=Greška prilikom otvaranja kljuèa registra:%n%1\%2
+ErrorRegCreateKey=Greška prilikom stvaranja kljuèa registra:%n%1\%2
+ErrorRegWriteKey=Greška prilikom pisanja u kljuè registra:%n%1\%2
+
+; *** INI errors
+ErrorIniEntry=Greška prilikom stvaranja INI unosa u datoteci "%1".
+
+; *** File copying errors
+FileAbortRetryIgnoreSkipNotRecommended=&Preskoèi ovu datoteku (ne preporuèa se)
+FileAbortRetryIgnoreIgnoreNotRecommended=&Zanemari grešku i nastavi (ne preporuèa se)
+SourceIsCorrupted=Izvorišna datoteka je ošteæena
+SourceDoesntExist=Izvorišna datoteka "%1" ne postoji
+ExistingFileReadOnly2=Postojeæu datoteku nije bilo moguæe zamijeniti, jer je oznaèena sa "samo-za-èitanje".
+ExistingFileReadOnlyRetry=&Uklonite atribut "samo-za-èitanje" i pokušajte ponovo
+ExistingFileReadOnlyKeepExisting=&Zadrži postojeæu datoteku
+ErrorReadingExistingDest=Pojavila se greška prilikom pokušaja èitanja postojeæe datoteke:
+FileExists=The file already exists.%n%nŽelite li da ju instalacija prepiše?
+ExistingFileNewer=Postojeæa datoteka je novija od one, koju pokušavate instalirati. Preporuèa se da zadržite postojeæu datoteku.%n%nŽelite li zadržati postojeæu datoteku?
+ErrorChangingAttr=Pojavila se greška prilikom pokušaja promjene atributa postojeæe datoteke:
+ErrorCreatingTemp=Pojavila se greška prilikom pokušaja stvaranja datoteke u odredišnoj mapi:
+ErrorReadingSource=Pojavila se greška prilikom pokušaja èitanja izvorišne datoteke:
+ErrorCopying=Pojavila se greška prilikom pokušaja kopiranja datoteke:
+ErrorReplacingExistingFile=Pojavila se greška prilikom pokušaja zamijenjivanja datoteke:
+ErrorRestartReplace=Zamijenjivanje nakon ponovnog pokretanja nije uspjelo:
+ErrorRenamingTemp=Pojavila se greška prilikom pokušaja preimenovanja datoteke u odredišnoj mapi:
+ErrorRegisterServer=Nije moguæe registrirati DLL/OCX: %1
+ErrorRegSvr32Failed=Greška u RegSvr32. Izlazni kod %1
+ErrorRegisterTypeLib=Nije moguæe registrirati type library: %1
+
+; *** Uninstall display name markings
+; used for example as 'My Program (32-bit)'
+UninstallDisplayNameMark=%1 (%2)
+; used for example as 'My Program (32-bit, All users)'
+UninstallDisplayNameMarks=%1 (%2, %3)
+UninstallDisplayNameMark32Bit=32-bitni
+UninstallDisplayNameMark64Bit=64-bitni
+UninstallDisplayNameMarkAllUsers=Svi korisnici
+UninstallDisplayNameMarkCurrentUser=Trenutaèni korisnik
+
+; *** Post-installation errors
+ErrorOpeningReadme=Pojavila se greška prilikom pokušaja otvaranja README datoteke.
+ErrorRestartingComputer=Instalacija nije mogla ponovo pokrenuti raèunalo. Uèinite to ruèno.
+
+; *** Uninstaller messages
+UninstallNotFound=Datoteka "%1" ne postoji. Deinstaliranje nije moguæe.
+UninstallOpenError=Datoteku "%1" nije bilo moguæe otvoriti. Deinstaliranje nije moguæe
+UninstallUnsupportedVer=Deinstalacijska datoteka "%1" je u formatu koji ova verzija deinstalacijskog programa ne prepoznaje. Deinstaliranje nije moguæe
+UninstallUnknownEntry=Nepoznat zapis (%1) je pronaðen u deinstalacijskoj datoteci
+ConfirmUninstall=Zaista želite ukloniti %1 i sve pripadajuæe komponente?
+UninstallOnlyOnWin64=Ovu instalaciju je moguæe ukloniti samo na 64-bitnom Windows sustavu.
+OnlyAdminCanUninstall=Ovu instalaciju je moguæe ukloniti samo korisnik s administrativnim pravima.
+UninstallStatusLabel=Prièekajte dok se %1 uklanja s vašeg raèunala.
+UninstalledAll=%1 je uspješno uklonjen s vašeg raèunala.
+UninstalledMost=Deinstaliranje programa %1 je završeno.%n%nNeke elemente nije bilo moguæe ukloniti. Mogu se ukloniti ruèno.
+UninstalledAndNeedsRestart=Kako biste završili deinstalirati %1, morate ponovo pokrenuti vaše raèunalo%n%nŽelite li to sad uèiniti?
+UninstallDataCorrupted="%1" datoteka je ošteæena. Deinstaliranje nije moguæe
+
+; *** Uninstallation phase messages
+ConfirmDeleteSharedFileTitle=Ukloniti dijeljene datoteke?
+ConfirmDeleteSharedFile2=Sustav ukazuje na to, da sljedeæe dijeljenu datoteku ne koristi niti jedan program. Želite li ukloniti tu dijeljenu datoteku?%n%nAko neki programi i dalje koriste tu datoteku, a ona se izbriše, ti programi neæe ispravno raditi. Ako niste sigurni, odaberite "Ne". Datoteka neæe štetiti vašem sustavu.
+SharedFileNameLabel=Datoteka:
+SharedFileLocationLabel=Mjesto:
+WizardUninstalling=Stanje deinstalacije
+StatusUninstalling=%1 deinstaliranje …
+
+; *** Shutdown block reasons
+ShutdownBlockReasonInstallingApp=%1 instaliranje.
+ShutdownBlockReasonUninstallingApp=%1 deinstaliranje.
+
+; The custom messages below aren't used by Setup itself, but if you make
+; use of them in your scripts, you'll want to translate them.
+
+[CustomMessages]
+
+NameAndVersion=%1 verzija %2
+AdditionalIcons=Dodatni preèaci:
+CreateDesktopIcon=Stvori preèac na ra&dnoj površini
+CreateQuickLaunchIcon=Stvori preèac u traci za &brzo pokretanje
+ProgramOnTheWeb=%1 na internetu
+UninstallProgram=Deinstaliraj %1
+LaunchProgram=Pokreni %1
+AssocFileExtension=&Poveži program %1 s datoteènim nastavkom %2
+AssocingFileExtension=Povezivanje programa %1 s datoteènim nastavkom %2 …
+AutoStartProgramGroupDescription=Pokretanje:
+AutoStartProgram=Automatski pokreni %1
+AddonHostProgramNotFound=%1 nije naðen u odabranoj mapi.%n%nŽelite li svejedno nastaviti?
commit 85fe534c0a5cd3c91ab1579d8721015ad9f244c4
Author: Geert Janssens <geert at kobaltwit.be>
Date: Fri Jun 7 11:57:11 2019 +0200
Declare all language strings to be UTF-8
At least that's how I interpret the Inno documentation on language support
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 1773175..eb8a891 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -577,18 +577,18 @@ IconName_Theme=Select GnuCash Theme
IconName_Uninstall=Uninstall GnuCash
IconComment_Uninstall=Uninstall the Finance Manager GnuCash
-;; List of Code pages, used in gnucash.cmd
-LanguageCodePage=1252
-ca.LanguageCodePage=1252
-de.LanguageCodePage=1252
-el.LanguageCodePage=1253
-fr.LanguageCodePage=1252
-it.LanguageCodePage=1252
-ja.LanguageCodePage=932
-nl.LanguageCodePage=1252
-pt_BR.LanguageCodePage=1252
-zh_CN.LanguageCodePage=936
-zh_TW.LanguageCodePage=950
+;; List of Code pages
+LanguageCodePage=0
+ca.LanguageCodePage=0
+de.LanguageCodePage=0
+el.LanguageCodePage=0
+fr.LanguageCodePage=0
+it.LanguageCodePage=0
+ja.LanguageCodePage=0
+nl.LanguageCodePage=0
+pt_BR.LanguageCodePage=0
+zh_CN.LanguageCodePage=0
+zh_TW.LanguageCodePage=0
;; ;;;;;;;;;;;;;;;;;;;;;
;; Catalan translation
commit fcddc1bb72af1c98b4141e02890890fb06f69345
Merge: e1ea347 70b7874
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Jun 3 09:36:21 2019 -0700
Merge Dale Phurrough's msys2_repo_mirror into master.
commit e1ea3478e3f24a850f4b1caaf8fa6e1fee42849a
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Jun 3 09:31:57 2019 -0700
Bug 797254 - guile2 fails to build in Windows...
time_rz.c:308: undefined reference to `rpl_mktime'
Patch the gnulib part to correctly handle builds where REPLACE_TIMEGM
is true and REPLACE_MKTIME may or may not be true.
Also switch to building a snapshot from Guile's repo and applying our
patches via jhbuild instead of using a snapshot of a private repo.
diff --git a/gnucash.modules b/gnucash.modules
index b2d8c0f..0d4e6d1 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -119,8 +119,12 @@
</autotools>
<autotools id="guile2" autogen-sh="configure" autogenargs="--disable-rpath --enable-networking --enable-nls --enable-posix --enable-regex --with-threads --with-modules --disable-static">
- <branch repo="sourceforge" module="gnucash/Dependencies/guile-2.2.4.71-28dbc.tar.xz"
- version=" 2.2.4.71-28dbc">
+ <branch repo="sourceforge" module="gnucash/Dependencies/guile-2.2.4.68-65d98.tar.xz"
+ version=" 2.2.4.68-65d98">
+ <patch file="0001-Fix-build-on-MinGW-w64.patch" strip="1"/>
+ <patch file="0002-MinGW-Don-t-break-build-when-including-libguile.h.patch" strip="1"/>
+ <patch file="0003-AC_DEFINE-REPLACE_MKTIME.patch" strip="1"/>
+
</branch>
<dependencies>
<dep package="libunistring"/>
diff --git a/patches/0001-Fix-build-on-MinGW-w64.patch b/patches/0001-Fix-build-on-MinGW-w64.patch
new file mode 100644
index 0000000..b77dd0f
--- /dev/null
+++ b/patches/0001-Fix-build-on-MinGW-w64.patch
@@ -0,0 +1,80 @@
+From 4a78dfc58c82fa87a0d9128c4c9e331cadd20eeb Mon Sep 17 00:00:00 2001
+From: John Ralls <jralls at ceridwen.us>
+Date: Tue, 23 Apr 2019 15:06:48 -0700
+Subject: [PATCH 1/3] Fix build on MinGW-w64
+
+Fixes bug 35405
+
+ * lib/poll.h: MinGW provides struct pollfd in winsock2.h and
+ lib/threads.h includes it so disable declaring it in poll.h and
+ get the declaration from winsock2.h. Otherwise gcc complains that
+ poll() has a different signature between the declaration and
+ definition.
+ * libguile/socket.c: TCP declarations are in winsock.h on Windows.
+ * libguile/timegm.c: MinGW doesn't include mktime so include mktime.c to
+ provide it.
+---
+ lib/poll.in.h | 5 +++++
+ lib/timegm.c | 2 ++
+ libguile/socket.c | 6 +++++-
+ 3 files changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/lib/poll.in.h b/lib/poll.in.h
+index e9b141d8f..3b0a99165 100644
+--- a/lib/poll.in.h
++++ b/lib/poll.in.h
+@@ -40,6 +40,9 @@
+
+
+ #if !@HAVE_POLL_H@
++# ifdef __MINGW32__
++# include <winsock2.h>
++# endif
+
+ /* fake a poll(2) environment */
+ # define POLLIN 0x0001 /* any readable data available */
+@@ -55,12 +58,14 @@
+
+ # if !GNULIB_defined_poll_types
+
++# ifndef __MINGW32__
+ struct pollfd
+ {
+ int fd; /* which file descriptor to poll */
+ short events; /* events we are interested in */
+ short revents; /* events found on return */
+ };
++# endif
+
+ typedef unsigned long nfds_t;
+
+diff --git a/lib/timegm.c b/lib/timegm.c
+index 168da8ead..35bc67dc1 100644
+--- a/lib/timegm.c
++++ b/lib/timegm.c
+@@ -38,3 +38,5 @@ timegm (struct tm *tmp)
+ tmp->tm_isdst = 0;
+ return __mktime_internal (tmp, __gmtime_r, &gmtime_offset);
+ }
++
++#include "mktime.c"
+diff --git a/libguile/socket.c b/libguile/socket.c
+index 71c17e892..f5371b6c8 100644
+--- a/libguile/socket.c
++++ b/libguile/socket.c
+@@ -40,7 +40,11 @@
+ #include <sys/un.h>
+ #endif
+ #include <netinet/in.h>
+-#include <netinet/tcp.h>
++#ifdef __MINGW32__
++# include <winsock.h>
++#else
++# include <netinet/tcp.h>
++#endif
+ #include <netdb.h>
+ #include <arpa/inet.h>
+
+--
+2.21.0
+
diff --git a/patches/0002-MinGW-Don-t-break-build-when-including-libguile.h.patch b/patches/0002-MinGW-Don-t-break-build-when-including-libguile.h.patch
new file mode 100644
index 0000000..974028d
--- /dev/null
+++ b/patches/0002-MinGW-Don-t-break-build-when-including-libguile.h.patch
@@ -0,0 +1,28 @@
+From eb6137334bf60be48fdae68cabdb9609cc4bfb21 Mon Sep 17 00:00:00 2001
+From: John Ralls <jralls at ceridwen.us>
+Date: Sun, 26 May 2019 16:35:33 -0700
+Subject: [PATCH 2/3] MinGW: Don't break build when including libguile.h
+
+---
+ libguile/iselect.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/libguile/iselect.h b/libguile/iselect.h
+index 945ad14af..c2f42d38b 100644
+--- a/libguile/iselect.h
++++ b/libguile/iselect.h
+@@ -29,7 +29,11 @@
+ /* Needed for FD_SET on some systems. */
+ #include <sys/types.h>
+
++#ifdef __MINGW32__
++#include <winsock2.h>
++#else
+ #include <sys/select.h>
++#endif
+
+ SCM_API int scm_std_select (int fds,
+ fd_set *rfds,
+--
+2.21.0
+
diff --git a/patches/0003-AC_DEFINE-REPLACE_MKTIME.patch b/patches/0003-AC_DEFINE-REPLACE_MKTIME.patch
new file mode 100644
index 0000000..9cc5763
--- /dev/null
+++ b/patches/0003-AC_DEFINE-REPLACE_MKTIME.patch
@@ -0,0 +1,67 @@
+From 28dbcca3e1e75a709ce780788951e7ca413843b7 Mon Sep 17 00:00:00 2001
+From: John Ralls <jralls at ceridwen.us>
+Date: Mon, 27 May 2019 12:01:29 -0700
+Subject: [PATCH 3/3] AC_DEFINE REPLACE_MKTIME
+
+Using it to control redefinition of mktime() and inclusion of mktime.c
+in timegm.c.
+
+The former prevents duplicate definitions from mktime.c and the C
+runtime. The latter prevents duplicate definitions when both mktime.c
+and timegm.c are built.
+---
+ lib/mktime.c | 2 ++
+ lib/timegm.c | 2 ++
+ m4/mktime.m4 | 2 ++
+ 3 files changed, 6 insertions(+)
+
+diff --git a/lib/mktime.c b/lib/mktime.c
+index 2efd44a22..588d4d139 100644
+--- a/lib/mktime.c
++++ b/lib/mktime.c
+@@ -462,6 +462,7 @@ __mktime_internal (struct tm *tp,
+ static mktime_offset_t localtime_offset;
+
+ /* Convert *TP to a time_t value. */
++#if REPLACE_MKTIME
+ time_t
+ mktime (struct tm *tp)
+ {
+@@ -476,6 +477,7 @@ mktime (struct tm *tp)
+
+ return __mktime_internal (tp, __localtime_r, &localtime_offset);
+ }
++#endif
+
+ #ifdef weak_alias
+ weak_alias (mktime, timelocal)
+diff --git a/lib/timegm.c b/lib/timegm.c
+index 35bc67dc1..949f4b7ad 100644
+--- a/lib/timegm.c
++++ b/lib/timegm.c
+@@ -39,4 +39,6 @@ timegm (struct tm *tmp)
+ return __mktime_internal (tmp, __gmtime_r, &gmtime_offset);
+ }
+
++#if ! REPLACE_MKTIME
+ #include "mktime.c"
++#endif
+diff --git a/m4/mktime.m4 b/m4/mktime.m4
+index d594ddc58..ec7299f08 100644
+--- a/m4/mktime.m4
++++ b/m4/mktime.m4
+@@ -244,9 +244,11 @@ main ()
+
+ if test $gl_cv_func_working_mktime = no; then
+ REPLACE_MKTIME=1
++ AC_DEFINE([REPLACE_MKTIME], [1], [System mktime is defective or missing.])
+ else
+ REPLACE_MKTIME=0
+ fi
++
+ ])
+
+ AC_DEFUN([gl_FUNC_MKTIME_INTERNAL], [
+--
+2.21.0
+
commit b4186f16438ab27e9e272c103fe6faf92c1c8c2f
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat Jun 1 12:05:56 2019 +0200
Swig 4 installs in /usr/share/swig
This is in the standard search path so we no longer need to explicitly set SWIG_DIR.
diff --git a/jhbuildrc.in b/jhbuildrc.in
index 4502da9..32a9a92 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -81,7 +81,6 @@ _gtk_ldflags= _popen("pkg-config --libs gtk+-3.0")
append_autogenargs("libofx", "--with-opensp-includes=" + prefix + "/include/OpenSP --with-opensp-libs=" + prefix + "/lib")
append_autogenargs("libdbi-drivers","--with-dbi-incdir=" + prefix + "/include --with-dbi-libdir=" + prefix + "/lib")
module_makeargs["aqbanking"]="-j 1"
-module_cmakeargs["gnucash-git"]="-DSWIG_DIR=" + os.path.join(_mingw_base, 'share', 'swig', '3.0.12')
module_extra_env["gnucash"]={'GUILE_LOAD_PATH':os.path.join(prefix, 'share', 'guile', '2.2'), 'GUILE_LOAD_COMPILED_PATH':os.path.join(prefix, 'lib', 'guile', '2.2', 'ccache')}
module_extra_env["gnucash-git"]={'GUILE_LOAD_PATH':os.path.join(prefix, 'share', 'guile', '2.2'), 'GUILE_LOAD_COMPILED_PATH':os.path.join(prefix, 'lib', 'guile', '2.2', 'ccache')}
commit 70b7874943e82f36720d0da0650b9e929d593d09
Author: Dale Phurrough <dale at hidale.com>
Date: Tue May 28 21:29:03 2019 +0200
msys2 repo mirror by preferred_mirror param
- preferred_mirror param updates msys2
/etc/pacman.conf with given URI
- good when msys2 repo unavailable or slow
- survives mirrorlist package update from
msys2 repo
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 8f56c2c..2b2b72a 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -46,14 +46,20 @@ target_dir\downloads.
.PARAMETER msys2_root
-Optional. The root path of an already installed MSys2 environment.
+Optional. The root path of an already installed MSys2 environment.
E.g. C:\msys64.
.PARAMETER x86_64
-Optional. A switch value.If true the toolchain will build x86_64
+Optional. A switch value. If true the toolchain will build x86_64
binaries; if false it will build i686 binaries. Defaults to false.
+.PARAMETER preferred_mirror
+
+Optional. A URI to a preferred repository mirror for both the
+development environment setup and for the MSys2 package manager.
+Defaults to http://repo.msys2.org
+
#>
[CmdletBinding()]
@@ -61,7 +67,8 @@ Param(
[Parameter()] [string]$target_dir = "c:\\gcdev64",
[Parameter()] [string]$download_dir = "$target_dir\\downloads",
[Parameter()] [string]$msys2_root = "$target_dir\\msys2",
- [Parameter()] [switch]$x86_64
+ [Parameter()] [switch]$x86_64,
+ [Parameter()] [string]$preferred_mirror = "http://repo.msys2.org"
)
$bash_path = "$msys2_root\\usr\\bin\\bash.exe"
@@ -80,7 +87,8 @@ $arch_long = "mingw-w64-$arch_code"
$mingw_prefix = "$arch/$arch_long-"
$mingw_path = "/$arch"
$mingw_bin = "$mingw_path/bin"
-$mingw_url_prefix = "http://repo.msys2.org/mingw/$arch_code/$arch_long-"
+$preferred_mirror = $preferred_mirror.TrimEnd('/')
+$mingw_url_prefix = "$preferred_mirror/mingw/$arch_code/$arch_long-"
$env:MSYSTEM = $arch.ToUpper()
if (!(test-path -path $target_dir)) {
@@ -129,8 +137,8 @@ function make-unixpath([string]$path) {
# Install MSYS2 for the current machine's architechture.
if (!(test-path -path $bash_path)) {
- $mingw64_installer32 = "http://repo.msys2.org/distrib/i686/msys2-i686-20180531.exe"
- $mingw64_installer64 = "http://repo.msys2.org/distrib/x86_64/msys2-x86_64-20180531.exe"
+ $mingw64_installer32 = "$preferred_mirror/distrib/i686/msys2-i686-20180531.exe"
+ $mingw64_installer64 = "$preferred_mirror/distrib/x86_64/msys2-x86_64-20180531.exe"
$mingw64_installer_file = "$download_dir\msys2.exe"
$mingw64_installer = If ([IntPtr]::size -eq 4) {$mingw64_installer32} Else {$mingw64_installer64}
@@ -165,6 +173,21 @@ if (!(test-path -path $bash_path)) {
exit
}
+# prepend preferred_mirror to pacman mirrorlists
+if ($PSBoundParameters.ContainsKey('preferred_mirror')) {
+ $mirror_beacon = '# This and the next line are managed by GnuCash bootstrap: setup-mingw64.ps1'
+ $mirrorconf_list = ( '[mingw32]', 'mingw/i686'),
+ ( '[mingw64]', 'mingw/x86_64'),
+ ( '[msys]', 'msys/$arch')
+ $pacmanconf_path = "$msys2_root\etc\pacman.conf"
+ $pacmanconf = (Get-Content -Path "$pacmanconf_path" -Raw) -creplace "(?m)^${mirror_beacon}\r?\nServer = .+\r?\n",''
+ foreach ($mirrorconf in $mirrorconf_list) {
+ $mirror_prepend = "$($mirrorconf[0])`n$mirror_beacon`nServer = $preferred_mirror/$($mirrorconf[1])`n"
+ $pacmanconf = $pacmanconf -creplace ([System.Text.RegularExpressions.Regex]::Escape($mirrorconf[0]) + '.*\r?\n'),$mirror_prepend
+ }
+ Set-Content -NoNewline -Value $pacmanconf -Path "$pacmanconf_path"
+}
+
# Install Html Help Workshop
$html_help_workshop_url = "http://download.microsoft.com/download/0/a/9/0a939ef6-e31c-430f-a3df-dfae7960d564/htmlhelp.exe"
@@ -198,7 +221,7 @@ Updating the new installation. A bash window will open. In that window accept th
There will be a second update.
"@
- bash-command -command "pacman -Syuu --noconfirm"
+ bash-command -command "pacman -Syyuu --noconfirm"
}
#Update the system.
@@ -207,7 +230,7 @@ Write-Host @"
Updating the installation. Accept the proposed changes. If the window doesn't close on its own then close it and re-run the script when it finishes.
"@
-bash-command -command "pacman -Syuu --noconfirm"
+bash-command -command "pacman -Syyuu --noconfirm"
# Set up aliases for the parts of msys-devtools and mingw-w64-toolchain that
# we need:
@@ -246,7 +269,7 @@ IgnorePkg = mingw-w64-i686-boost
IgnorePkg = mingw-w64-i686-harfbuzz
IgnorePkg = mingw-w64-i686-webkitgtk3
"@
-[IO.File]::WriteAllLines( (join-path $target_dir (join-path "msys2" (join-path "etc" (join-path "pacman.d" "gnucash-ignores.pacman")))), $ignorefile)
+[IO.File]::WriteAllLines( "$msys2_root\etc\pacman.d\gnucash-ignores.pacman", $ignorefile)
bash-command -command "perl -ibak -pe 'BEGIN{undef $/;} s#[[]options[]]\R(Include = [^\R]*\R)?#[options]\nInclude = /etc/pacman.d/gnucash-ignores.pacman\n#smg' /etc/pacman.conf"
# Install the remaining dependencies.
commit 1a9ae94a8712b1431a605af89af1ca7755cf9914
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jun 1 12:09:09 2019 -0700
Latest tweaks to guile tarball.
diff --git a/gnucash.modules b/gnucash.modules
index d0bdbee..b2d8c0f 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -119,8 +119,8 @@
</autotools>
<autotools id="guile2" autogen-sh="configure" autogenargs="--disable-rpath --enable-networking --enable-nls --enable-posix --enable-regex --with-threads --with-modules --disable-static">
- <branch repo="sourceforge" module="gnucash/Dependencies/guile-2.2.4.71-cf330.tar.xz"
- version=" 2.2.4.71-cf330">
+ <branch repo="sourceforge" module="gnucash/Dependencies/guile-2.2.4.71-28dbc.tar.xz"
+ version=" 2.2.4.71-28dbc">
</branch>
<dependencies>
<dep package="libunistring"/>
commit 5518fdb5868d2d08730c8c154c2307f1ef5d99e2
Author: John Ralls <jralls at ceridwen.us>
Date: Wed May 29 21:29:57 2019 -0700
Bug 797259 - msys2 mingw-w64-i686-ncurses package no longer in repo database.
Changed to pdcurses.
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 296cf5d..8f56c2c 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -250,7 +250,7 @@ IgnorePkg = mingw-w64-i686-webkitgtk3
bash-command -command "perl -ibak -pe 'BEGIN{undef $/;} s#[[]options[]]\R(Include = [^\R]*\R)?#[options]\nInclude = /etc/pacman.d/gnucash-ignores.pacman\n#smg' /etc/pacman.conf"
# Install the remaining dependencies.
-$deps = "iso-codes shared-mime-info libmariadbclient postgresql ninja ncurses"
+$deps = "iso-codes shared-mime-info libmariadbclient postgresql ninja pdcurses"
Write-Host @"
commit 2d00ce3ee8897d6edc2e830fe907851775f08a3c
Author: Geert Janssens <geert at kobaltwit.be>
Date: Wed May 29 16:03:08 2019 +0200
Guile tarball is xz compressed, not bzip2
diff --git a/gnucash.modules b/gnucash.modules
index da1ce23..d0bdbee 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -119,7 +119,7 @@
</autotools>
<autotools id="guile2" autogen-sh="configure" autogenargs="--disable-rpath --enable-networking --enable-nls --enable-posix --enable-regex --with-threads --with-modules --disable-static">
- <branch repo="sourceforge" module="gnucash/Dependencies/guile-2.2.4.71-cf330.tar.bz2"
+ <branch repo="sourceforge" module="gnucash/Dependencies/guile-2.2.4.71-cf330.tar.xz"
version=" 2.2.4.71-cf330">
</branch>
<dependencies>
commit 03e084bc5435ad049c16df8e44713be81c85adf6
Author: John Ralls <jralls at ceridwen.us>
Date: Tue May 28 12:22:48 2019 -0700
One more fix for patching FindSWIG.cmake.
diff --git a/gnucash.modules b/gnucash.modules
index bf6566a..da1ce23 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -119,8 +119,8 @@
</autotools>
<autotools id="guile2" autogen-sh="configure" autogenargs="--disable-rpath --enable-networking --enable-nls --enable-posix --enable-regex --with-threads --with-modules --disable-static">
- <branch repo="sourceforge" module="gnucash/Dependencies/guile-2.2.4+mingw.tar.bz2"
- version="2.2.4+mingw">
+ <branch repo="sourceforge" module="gnucash/Dependencies/guile-2.2.4.71-cf330.tar.bz2"
+ version=" 2.2.4.71-cf330">
</branch>
<dependencies>
<dep package="libunistring"/>
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 3081906..296cf5d 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -307,7 +307,7 @@ if (!(test-path -path "$target_dir\\src\\gnucash-on-windows.git")) {
}
bash-command -command "/usr/bin/patch -f -d/ -p0 -i $target_unix/src/gnucash-on-windows.git/patches/jhbuild.patch"
-bash-command -command "/usr/bin/patch -f -d $(dirname $(/usr/bin/find /$arch/share/cmake* -name FindSWIG.cmake) ) -p2 -i $target_unix/src/gnucash-on-windows.git/patches/FindSWIG.patch"
+bash-command -command "/usr/bin/patch -f -d `$(dirname `$(/usr/bin/find /$arch/share/cmake* -name FindSWIG.cmake) ) -p1 -i $target_unix/src/gnucash-on-windows.git/patches/FindSWIG.patch"
$jhbuildrc = get-content "$target_dir\\src\\gnucash-on-windows.git\\jhbuildrc.in" |
%{$_ -replace "@-BASE_DIR-@", "$target_unix"} |
commit 6f845622415df86b9ac04b06fd4414c04938a090
Author: John Ralls <jralls at ceridwen.us>
Date: Mon May 27 12:17:29 2019 -0700
Convert patches to relative paths.
Allows builds from arbitrary checkouts.
diff --git a/gnucash.modules b/gnucash.modules
index 11ea028..bf6566a 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -118,7 +118,6 @@
</dependencies>
</autotools>
- <!-- Unfortunately in addition to needing a few patches this hangs when it tries to compile Scheme. -->
<autotools id="guile2" autogen-sh="configure" autogenargs="--disable-rpath --enable-networking --enable-nls --enable-posix --enable-regex --with-threads --with-modules --disable-static">
<branch repo="sourceforge" module="gnucash/Dependencies/guile-2.2.4+mingw.tar.bz2"
version="2.2.4+mingw">
@@ -172,7 +171,7 @@
<autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
autogenargs="--enable-local-install">
<branch module="download.php?package=03&release=217&file=02&dummy=aqbanking-5.7.8.tar.gz" repo="aqbanking" version="5.7.8" checkoutdir="aqbanking-5.7.8">
- <patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/patches/Fix-signature-mismatch-in-abgui.c.patch" strip='1'/>
+ <patch file="Fix-signature-mismatch-in-abgui.c.patch" strip='1'/>
</branch>
<dependencies>
<dep package="gwenhywfar"/>
@@ -207,8 +206,8 @@
autogen-template='/bin/bash -c "pushd %(srcdir)s && ./autoinit.sh && popd && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"'>
<branch repo="sourceforge" module="openjade/OpenSP-1.5.2.tar.gz"
version='1.5.2'>
- <patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/patches/opensp-1.5.2.patch" strip='1'/>
- <patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/patches/OpenSP-1.5.2-non-posix-functions.patch" strip='1'/>
+ <patch file="opensp-1.5.2.patch" strip='1'/>
+ <patch file="OpenSP-1.5.2-non-posix-functions.patch" strip='1'/>
</branch>
</autotools>
@@ -247,7 +246,7 @@
<autotools id="libdbi" autogen-sh="autoreconf" autogenargs="--disable-docs">
<branch repo="sourceforge" module="libdbi/libdbi-0.8.4.tar.gz"
version="0.8.4">
- <patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/patches/libdbi-0.8.3.patch" strip="1"/>
+ <patch file="libdbi-0.8.3.patch" strip="1"/>
</branch>
</autotools>
@@ -255,8 +254,8 @@
autogenargs='--disable-docs --with-sqlite3 --with-sqlite3-dir="/mingw32" --with-pgsql --with-pgsql-dir="/mingw32" --with-mysql --with-mysql-dir="/mingw32" '>
<branch repo="sourceforge" version="0.8.3"
module="libdbi-drivers/libdbi-drivers-0.8.3-1.tar.gz">
- <patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/patches/libdbi-drivers-errno.patch" strip="1"/>
- <patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/patches/libdbi-drivers-linkage.patch" strip="1"/>
+ <patch file="libdbi-drivers-errno.patch" strip="1"/>
+ <patch file="libdbi-drivers-linkage.patch" strip="1"/>
</branch>
<dependencies>
<dep package="libdbi"/>
commit 7ebb814bb54215e07b3862a30b16478cc1afcaa0
Author: John Ralls <jralls at ceridwen.us>
Date: Sun May 26 15:59:35 2019 -0700
Include missing name parameter and use explicit path for find.
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index ea7fd5a..3081906 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -307,7 +307,7 @@ if (!(test-path -path "$target_dir\\src\\gnucash-on-windows.git")) {
}
bash-command -command "/usr/bin/patch -f -d/ -p0 -i $target_unix/src/gnucash-on-windows.git/patches/jhbuild.patch"
-bash-command -command "/usr/bin/patch -f -d $(dirname $(find /$arch/share/cmake*) ) -p1 -i $target_unix/src/gnucash-on-windows.git/patches/FindSWIG.patch"
+bash-command -command "/usr/bin/patch -f -d $(dirname $(/usr/bin/find /$arch/share/cmake* -name FindSWIG.cmake) ) -p2 -i $target_unix/src/gnucash-on-windows.git/patches/FindSWIG.patch"
$jhbuildrc = get-content "$target_dir\\src\\gnucash-on-windows.git\\jhbuildrc.in" |
%{$_ -replace "@-BASE_DIR-@", "$target_unix"} |
commit 520cec8583848eb54763ee5d3bc4ae2b4afaa709
Author: John Ralls <jralls at ceridwen.us>
Date: Sun May 26 09:24:28 2019 -0700
Bug 797257 - fragile windows patch FindSWIG.patch;...
recommend remove version string dependency.
diff --git a/patches/FindSWIG.patch b/patches/FindSWIG.patch
index fb8f236..cf018c9 100644
--- a/patches/FindSWIG.patch
+++ b/patches/FindSWIG.patch
@@ -1,6 +1,6 @@
diff -u /mingw32/share/cmake-3.14/Modules/FindSWIG.cmake~ /mingw32/share/cmake-3.14/Modules/FindSWIG.cmake
---- /mingw32/share/cmake-3.14/Modules/FindSWIG.cmake 2017-08-10 06:36:32.000000000 -0700
-+++ /mingw32/share/cmake-3.14/Modules/FindSWIG.cmake 2017-09-05 10:34:59.692229400 -0700
+--- a/FindSWIG.cmake 2017-08-10 06:36:32.000000000 -0700
++++ b/FindSWIG.cmake 2017-09-05 10:34:59.692229400 -0700
@@ -41,7 +41,7 @@
endif()
else()
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 512004d..ea7fd5a 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -307,7 +307,7 @@ if (!(test-path -path "$target_dir\\src\\gnucash-on-windows.git")) {
}
bash-command -command "/usr/bin/patch -f -d/ -p0 -i $target_unix/src/gnucash-on-windows.git/patches/jhbuild.patch"
-bash-command -command "/usr/bin/patch -f -d/ -p0 -i $target_unix/src/gnucash-on-windows.git/patches/FindSWIG.patch"
+bash-command -command "/usr/bin/patch -f -d $(dirname $(find /$arch/share/cmake*) ) -p1 -i $target_unix/src/gnucash-on-windows.git/patches/FindSWIG.patch"
$jhbuildrc = get-content "$target_dir\\src\\gnucash-on-windows.git\\jhbuildrc.in" |
%{$_ -replace "@-BASE_DIR-@", "$target_unix"} |
commit 7efabac8dcf9af9fbc29a4e544b68a8d0f55bd40
Author: John Ralls <jralls at ceridwen.us>
Date: Sat May 25 13:04:48 2019 -0700
Bug 797253 - perl dependency not available in setup-mingw64.ps1,...
causes build error.
Move installing the rest of MinGW and the toolchain to before the
direct-deps installation.
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index e61916f..512004d 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -217,6 +217,12 @@ $toolchain = "binutils cmake crt-git gcc gcc-libs gdb headers-git libmangle-git
$clang_toolchain = "clang libc++ libc++abi lld libunwind clang-tools-extra compiler-rt"
+# Install the system and toolchain:
+$msys_devel = make-pkgnames -prefix "msys/" -items $devel
+bash-command -command "pacman -S $msys_devel --noconfirm --needed"
+$mingw_toolchain = make-pkgnames -prefix $mingw_prefix -items $toolchain
+bash-command -command "pacman -S $mingw_toolchain --noconfirm --needed"
+
# webkitgtk3 was removed from the pacman database but the package is still available via direct url
# so we install it from that url directly.
# Note webkitgtk3 depends on icu. Icu updates require dependent packages to be rebuilt to work with the new version.
@@ -251,12 +257,7 @@ Write-Host @"
Now we'll install the dependencies. Accept the installation as usual. About half-way through it will stop with a message about fontconfig. Just type "Return" at it and it will resume after a minute or two (be patient!) and complete the installation.
"@
-$msys_devel = make-pkgnames -prefix "msys/" -items $devel
-$mingw_toolchain = make-pkgnames -prefix $mingw_prefix -items $toolchain
$mingw_deps = make-pkgnames -prefix $mingw_prefix -items $deps
-
-bash-command -command "pacman -S $msys_devel --noconfirm --needed"
-bash-command -command "pacman -S $mingw_toolchain --noconfirm --needed"
bash-command -command "pacman -S $mingw_deps --noconfirm --needed"
$target_unix = make-unixpath $target_dir
commit f61aafdd4ddfa57625a1e139fa1fb7c1fa0d9648
Author: John Ralls <jralls at ceridwen.us>
Date: Sat May 25 12:34:48 2019 -0700
Fix doubled 'patches' in libdbi-drivers patch href.
diff --git a/gnucash.modules b/gnucash.modules
index 378aa68..11ea028 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -255,7 +255,7 @@
autogenargs='--disable-docs --with-sqlite3 --with-sqlite3-dir="/mingw32" --with-pgsql --with-pgsql-dir="/mingw32" --with-mysql --with-mysql-dir="/mingw32" '>
<branch repo="sourceforge" version="0.8.3"
module="libdbi-drivers/libdbi-drivers-0.8.3-1.tar.gz">
- <patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/patches/patches/libdbi-drivers-errno.patch" strip="1"/>
+ <patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/patches/libdbi-drivers-errno.patch" strip="1"/>
<patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/patches/libdbi-drivers-linkage.patch" strip="1"/>
</branch>
<dependencies>
commit 4199156cc51d66ae31a4749be718d469dcd25b29
Author: John Ralls <jralls at ceridwen.us>
Date: Sat May 25 10:13:51 2019 -0700
Bug 797252 - missing /opensp-1.5.2.patch file required in...
/gnucash.modules for Windows gnucash.
Plus two libdbi patches, inadvertently removed while cleaning
out the old buildsystem.
diff --git a/gnucash.modules b/gnucash.modules
index 1130ae6..378aa68 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -207,7 +207,7 @@
autogen-template='/bin/bash -c "pushd %(srcdir)s && ./autoinit.sh && popd && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"'>
<branch repo="sourceforge" module="openjade/OpenSP-1.5.2.tar.gz"
version='1.5.2'>
- <patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/opensp-1.5.2.patch" strip='1'/>
+ <patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/patches/opensp-1.5.2.patch" strip='1'/>
<patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/patches/OpenSP-1.5.2-non-posix-functions.patch" strip='1'/>
</branch>
</autotools>
@@ -247,7 +247,7 @@
<autotools id="libdbi" autogen-sh="autoreconf" autogenargs="--disable-docs">
<branch repo="sourceforge" module="libdbi/libdbi-0.8.4.tar.gz"
version="0.8.4">
- <patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/libdbi-0.8.3.patch" strip="1"/>
+ <patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/patches/libdbi-0.8.3.patch" strip="1"/>
</branch>
</autotools>
@@ -255,7 +255,7 @@
autogenargs='--disable-docs --with-sqlite3 --with-sqlite3-dir="/mingw32" --with-pgsql --with-pgsql-dir="/mingw32" --with-mysql --with-mysql-dir="/mingw32" '>
<branch repo="sourceforge" version="0.8.3"
module="libdbi-drivers/libdbi-drivers-0.8.3-1.tar.gz">
- <patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/libdbi-drivers-errno.patch" strip="1"/>
+ <patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/patches/patches/libdbi-drivers-errno.patch" strip="1"/>
<patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/patches/libdbi-drivers-linkage.patch" strip="1"/>
</branch>
<dependencies>
diff --git a/patches/libdbi-0.8.3.patch b/patches/libdbi-0.8.3.patch
new file mode 100644
index 0000000..5291902
--- /dev/null
+++ b/patches/libdbi-0.8.3.patch
@@ -0,0 +1,61 @@
+diff -Nur libdbi-0.8.3-old/include/dbi/dbd.h libdbi-0.8.3/include/dbi/dbd.h
+--- libdbi-0.8.3-old/include/dbi/dbd.h 2005-08-15 21:18:18.000000000 +0200
++++ libdbi-0.8.3/include/dbi/dbd.h 2008-10-05 15:57:24.889982668 +0200
+@@ -52,7 +52,7 @@
+ size_t dbd_quote_binary(dbi_conn_t *conn, const unsigned char *orig, size_t from_length, unsigned char **ptr_dest);
+ size_t dbd_conn_quote_string(dbi_conn_t *conn, const char *orig, char *dest);
+ const char *dbd_select_db(dbi_conn_t *conn, const char *db);
+-int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr);
++int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr);
+ unsigned long long dbd_get_seq_last(dbi_conn_t *conn, const char *sequence);
+ unsigned long long dbd_get_seq_next(dbi_conn_t *conn, const char *sequence);
+ int dbd_ping(dbi_conn_t *conn);
+@@ -63,7 +63,7 @@
+ void _dbd_result_add_field(dbi_result_t *result, unsigned int fieldidx, char *name, unsigned short type, unsigned int attribs);
+ dbi_row_t *_dbd_row_allocate(unsigned int numfields);
+ void _dbd_row_finalize(dbi_result_t *result, dbi_row_t *row, unsigned long long rowidx);
+-void _dbd_internal_error_handler(dbi_conn_t *conn, const char *errmsg, const int errno);
++void _dbd_internal_error_handler(dbi_conn_t *conn, const char *errmsg, const int err_no);
+ dbi_result_t *_dbd_result_create_from_stringarray(dbi_conn_t *conn, unsigned long long numrows_matched, const char **stringarray);
+ void _dbd_register_driver_cap(dbi_driver_t *driver, const char *capname, int value);
+ void _dbd_register_conn_cap(dbi_conn_t *conn, const char *capname, int value);
+--- libdbi-0.8.3/src/dbd_helper.c.orig Sun Sep 13 16:34:39 2009
++++ libdbi-0.8.3/src/dbd_helper.c Sun Sep 13 16:35:02 2009
+@@ -145,7 +145,7 @@
+ return len;
+ }
+
+-void _dbd_internal_error_handler(dbi_conn_t *conn, const char *errmsg, const int errno) {
++void _dbd_internal_error_handler(dbi_conn_t *conn, const char *errmsg, const int err_no) {
+ int my_errno = DBI_ERROR_NONE;
+ int errstatus;
+ char *my_errmsg = NULL;
+@@ -154,7 +154,7 @@
+ free(conn->error_message);
+ }
+
+- if (errno == DBI_ERROR_DBD) {
++ if (err_no == DBI_ERROR_DBD) {
+ /* translate into a client-library specific error number */
+ errstatus = conn->driver->functions->geterror(conn, &my_errno, &my_errmsg);
+
+@@ -171,8 +171,8 @@
+ }
+ }
+ else if (errmsg) {
+- conn->error_flag = errno; /* legacy code may rely on this */
+- conn->error_number = errno;
++ conn->error_flag = err_no; /* legacy code may rely on this */
++ conn->error_number = err_no;
+ conn->error_message = strdup(errmsg);
+
+ if (conn->error_handler != NULL) {
+@@ -181,7 +181,7 @@
+ }
+ else {
+ /* pass internal errors to the internal libdbi handler */
+- _error_handler(conn, errno);
++ _error_handler(conn, err_no);
+ }
+
+ }
diff --git a/patches/libdbi-drivers-errno.patch b/patches/libdbi-drivers-errno.patch
new file mode 100644
index 0000000..9de25a5
--- /dev/null
+++ b/patches/libdbi-drivers-errno.patch
@@ -0,0 +1,167 @@
+diff --git a/drivers/firebird/dbd_firebird.c b/drivers/firebird/dbd_firebird.c
+index 4a1f30d..035479e 100755
+--- a/drivers/firebird/dbd_firebird.c
++++ b/drivers/firebird/dbd_firebird.c
+@@ -524,10 +524,10 @@ const char *dbd_select_db(dbi_conn_t *conn, const char *db)
+ return db;
+ }
+
+-int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr)
++int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr)
+ {
+ /* error_message and error_number were already set by calls to _dbd_internal_error_handler */
+- *errno = conn->error_number;
++ *err_no = conn->error_number;
+ *errstr = (conn->error_message) ? strdup(conn->error_message):NULL;
+ return 1;
+ }
+diff --git a/drivers/freetds/dbd_freetds.c b/drivers/freetds/dbd_freetds.c
+index 2a24764..9f57d85 100644
+--- a/drivers/freetds/dbd_freetds.c
++++ b/drivers/freetds/dbd_freetds.c
+@@ -733,10 +733,10 @@ const char *dbd_select_db(dbi_conn_t * conn, const char *db)
+ return (char *) db;
+ }
+
+-int dbd_geterror(dbi_conn_t * conn, int *errno, char **errstr)
++int dbd_geterror(dbi_conn_t * conn, int *err_no, char **errstr)
+ {
+ /* put error number into errno, error string into errstr
+- * return 0 if error, 1 if errno filled, 2 if errstr filled, 3 if both errno and errstr filled */
++ * return 0 if error, 1 if err_no filled, 2 if errstr filled, 3 if both err_no and errstr filled */
+
+ /* We havn't functions for read error types in freetds */
+ return -1;
+diff --git a/drivers/msql/dbd_msql.c b/drivers/msql/dbd_msql.c
+index bdf270e..cef20a8 100644
+--- a/drivers/msql/dbd_msql.c
++++ b/drivers/msql/dbd_msql.c
+@@ -277,12 +277,12 @@
+ return db;
+ }
+
+-int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr)
++int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr)
+ {
+ if(!msqlErrMsg)
+ return -1;
+
+- *errno = 0;
++ *err_no = 0;
+ *errstr = strdup(msqlErrMsg);
+ return 2;
+ }
+diff --git a/drivers/mysql/dbd_mysql.c b/drivers/mysql/dbd_mysql.c
+index 7d06f62..237506c 100644
+--- a/drivers/mysql/dbd_mysql.c
++++ b/drivers/mysql/dbd_mysql.c
+@@ -553,15 +553,15 @@ const char *dbd_select_db(dbi_conn_t *conn, const char *db) {
+ return db;
+ }
+
+-int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr) {
+- /* put error number into errno, error string into errstr
+- * return 0 if error, 1 if errno filled, 2 if errstr filled, 3 if both errno and errstr filled */
++int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr) {
++ /* put error number into err_no, error string into errstr
++ * return 0 if error, 1 if err_no filled, 2 if errstr filled, 3 if both err_no and errstr filled */
+
+ if (strcmp("",mysql_error((MYSQL *)conn->connection)) == 0) {
+ return -1;
+ }
+
+- *errno = mysql_errno((MYSQL *)conn->connection);
++ *err_no = mysql_errno((MYSQL *)conn->connection);
+ *errstr = strdup(mysql_error((MYSQL *)conn->connection));
+ return 3;
+ }
+diff --git a/drivers/oracle/dbd_oracle.c b/drivers/oracle/dbd_oracle.c
+index 1f38094..d220a9e 100755
+--- a/drivers/oracle/dbd_oracle.c
++++ b/drivers/oracle/dbd_oracle.c
+@@ -400,12 +400,12 @@ const char *dbd_select_db(dbi_conn_t *conn, const char *db)
+ return NULL; /* Oracle can't do that .... */
+ }
+
+-int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr)
++int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr)
+ {
+ char errbuf[1024];
+ int errcode = 0;
+ Oraconn *Oconn = conn->connection;
+- *errno = 0;
++ *err_no = 0;
+
+ if (!conn->connection) {
+ *errstr = strdup("Unable to connect to database.");
+@@ -414,7 +414,7 @@ int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr)
+ OCIErrorGet((dvoid *)Oconn->err, (ub4) 1, (text *) NULL, &errcode, errbuf,
+ (ub4) sizeof(errbuf), OCI_HTYPE_ERROR);
+ *errstr = strdup(errbuf);
+- *errno = errcode;
++ *err_no = errcode;
+ }
+
+ return 3;
+diff --git a/drivers/pgsql/dbd_pgsql.c b/drivers/pgsql/dbd_pgsql.c
+index 0433550..c097dac 100644
+--- a/drivers/pgsql/dbd_pgsql.c
++++ b/drivers/pgsql/dbd_pgsql.c
+@@ -520,11 +520,11 @@ const char *dbd_select_db(dbi_conn_t *conn, const char *db) {
+ return db;
+ }
+
+-int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr) {
+- /* put error number into errno, error string into errstr
+- * return 0 if error, 1 if errno filled, 2 if errstr filled, 3 if both errno and errstr filled */
++int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr) {
++ /* put error number into err_no, error string into errstr
++ * return 0 if error, 1 if err_no filled, 2 if errstr filled, 3 if both err_no and errstr filled */
+
+- *errno = 0;
++ *err_no = 0;
+ *errstr = strdup(PQerrorMessage((PGconn *)conn->connection));
+
+ return 2;
+diff --git a/drivers/sqlite/dbd_sqlite.c b/drivers/sqlite/dbd_sqlite.c
+index 94dacc0..aeadfa5 100644
+--- a/drivers/sqlite/dbd_sqlite.c
++++ b/drivers/sqlite/dbd_sqlite.c
+@@ -911,13 +911,13 @@ const char *dbd_select_db(dbi_conn_t *conn, const char *db) {
+ return db;
+ }
+
+-int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr) {
+- /* put error number into errno, error string into errstr
+- * return 0 if error, 1 if errno filled, 2 if errstr filled, 3 if both errno and errstr filled */
++int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr) {
++ /* put error number into err_no, error string into errstr
++ * return 0 if error, 1 if err_no filled, 2 if errstr filled, 3 if both err_no and errstr filled */
+ int result = 0;
+
+ if (conn->error_number) {
+- *errno = conn->error_number;
++ *err_no = conn->error_number;
+ result++;
+ }
+ if (conn->error_message) {
+diff --git a/drivers/sqlite3/dbd_sqlite3.c b/drivers/sqlite3/dbd_sqlite3.c
+index dc85465..3360c27 100644
+--- a/drivers/sqlite3/dbd_sqlite3.c
++++ b/drivers/sqlite3/dbd_sqlite3.c
+@@ -880,11 +880,11 @@ const char *dbd_select_db(dbi_conn_t *conn, const char *db) {
+ return db;
+ }
+
+-int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr) {
+- /* put error number into errno, error string into errstr
+- * return 0 if error, 1 if errno filled, 2 if errstr filled, 3 if both errno and errstr filled */
++int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr) {
++ /* put error number into err_no, error string into errstr
++ * return 0 if error, 1 if err_no filled, 2 if errstr filled, 3 if both err_no and errstr filled */
+
+- *errno = sqlite3_errcode((sqlite3 *)conn->connection);
++ *err_no = sqlite3_errcode((sqlite3 *)conn->connection);
+ *errstr = strdup((char*)sqlite3_errmsg((sqlite3 *)conn->connection));
+ return 3;
+ }
diff --git a/patches/opensp-1.5.2.patch b/patches/opensp-1.5.2.patch
new file mode 100644
index 0000000..3271365
--- /dev/null
+++ b/patches/opensp-1.5.2.patch
@@ -0,0 +1,40 @@
+--- a/lib/Makefile.am Thu Dec 15 13:13:16 2005
++++ b/lib/Makefile.am Tue Feb 6 10:57:58 2007
+@@ -76,7 +76,9 @@
+ splibpch.h token.h app_inst.cxx arc_inst.cxx entmgr_inst.cxx \
+ parser_inst.cxx xentmgr_inst.cxx SubstTable.cxx \
+ UTF16CodingSystem.cxx Fixed4CodingSystem.cxx \
+- memcmp.c memmove.c strerror.c
++ memcmp.c memmove.c strerror.c WinInetStorage.cxx \
++ WinInetStorageMessages.h WinInetStorageMessages.msg \
++ WinInetStorageMessages.rc WinApp.cxx Win32CodingSystem.cxx
+
+ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/generic
+
+--- a/lib/MessageReporter.cxx 2005-07-21 07:05:17.000000000 -0700
++++ b/lib/MessageReporter.cxx 2017-05-06 11:51:04.348011200 -0700
+@@ -13,7 +13,8 @@
+ #include "macros.h"
+
+ #include <string.h>
+-
++#include <iostream>
++#include <sstream>
+
+ #ifdef SP_NAMESPACE
+ namespace SP_NAMESPACE {
+@@ -123,8 +124,12 @@
+ os() << ':';
+ }
+ if (options_ & messageNumbers)
+- os() << (unsigned long)message.type->module() << "."
++ {
++ std::ostringstream ss;
++ ss << (void*)message.type->module();
++ os() << ss.str().c_str() << "."
+ << (unsigned long)message.type->number() << ":";
++ }
+ switch (message.type->severity()) {
+ case MessageType::info:
+ formatFragment(MessageReporterMessages::infoTag, os());
+
commit c68c63a5e772330aa09dab98478b8125a9e71c57
Author: John Ralls <jralls at ceridwen.us>
Date: Tue May 14 11:53:01 2019 -0700
Clean the build directory before building to prevent privilege errors.
diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index a24d516..2b462d3 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -126,7 +126,7 @@ if (test-path -path $install_manifest) {
# Update the gnucash-on-windows repository
#bash-command -command "cd $script_unix && git reset --hard && git pull --rebase"
# Build the latest GnuCash and all dependencies not installed via mingw64
-bash-command -command "jhbuild --no-interact -f $script_unix/jhbuildrc build > >(tee -a $log_unix) 2> >(tee -a $log_unix)"
+bash-command -command "jhbuild --no-interact -f $script_unix/jhbuildrc build --clean > >(tee -a $log_unix) 2> >(tee -a $log_unix)"
$new_file = test-path -path $target_dir\$package\$branch\inst\bin\gnucash.exe -NewerThan $time_stamp
if ($new_file) {
#Build the installer
commit 6af1681a9dd66f195513451820b6658bc0f5c26f
Author: John Ralls <jralls at ceridwen.us>
Date: Thu May 2 15:59:11 2019 -0700
Add documentation of the bundle-mingw64.ps1 parameters to README.md.
diff --git a/README.md b/README.md
index 8572243..a850fe7 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,8 @@ If you don't routinely run PowerShell scripts on your computer you will need to
In a PowerShell session run ```path/to/setup-mingw64.ps1```; the path will depend on your browser settings but if you have a default setup then it's ```~/Downloads/setup-mingw64.ps1```.
-###setup-mingw64 Options
+### setup-mingw64 Options
+
```setup-mingw64.ps1``` takes four optional arguments:
* **-target_dir**: The full path to where the MinGW-W64 environment will be created. **Default**: ```C:\gcdev64```. The default requires Administrative privileges to create. If you use a directory in your home directory instead then you will not require Admin privileges.
@@ -52,7 +53,7 @@ These create terminal emulation sessions running the Bash shell with the environ
Once you've built GnuCash all the way through you can get a build-and-run environment by starting a MinGW shell and running ```TARGET=gnucash-maint jhbuild -f jhbuildrc shell``` from the ```gnucash-on-windows.git``` directory.
-```cd $PREFIX/../build/gnucash-git``` to get to the build directory and ```$PREFIX/../src/gnucash-git``` to get to the local repo.
+```cd $PREFIX/../build/gnucash-git``` to get to the build directory and ```cd $PREFIX/../src/gnucash-git``` to get to the local repo.
To install the gdb debugger run ```pacman -Su gdb```. You need not be in a jhbuild shell.
@@ -60,18 +61,29 @@ To install the gdb debugger run ```pacman -Su gdb```. You need not be in a jhbui
1. Start a Powershell session.
1. Change to the installation directory ```cd C:\gcdev64\src\gnucash-on-windows.git```
-1. run ```bundle-mingw64.ps1 -root_dir C:\gcdev64 -target_dir C:\gcdev64\gnucash\maint -package maint -git_build $true```
+1. run
+```
+bundle-mingw64.ps1 -root_dir C:\gcdev64 -target_dir C:\gcdev64\gnucash\maint -package maint -git_build $true
+```
That will create a date-stamped and versioned ```gnucash-xxx-setup.exe``` in ```C:\gcdev64\gnucash\maint```. You'll need to adjust paths and versions accordingly if you changed **target_dir** when you ran ```setup-mingw64.ps1``` or built ```master``` instead of maint.
+### bundle-mingw64.ps1 Parameters
+
+All Parameters are required and have no defaults.
+* **-root_dir** The root directory of the installation, corresponds to **target_dir** for ```setup-mingw64.ps1```.
+* **-target_dir** The directory where the source, build, and installation directories are. This is normally **target_dir**```\gnucash\branch``` with branch being either ```master```, ```maint```, or ```release```.
+* **-package**: The thing we're bundling. Always ```gnucash```.
+* **-git_build**: ```$true``` if GnuCash was built from git, ```$false``` otherwise. Only use ```$false``` for release builds.
+
## Buildserver
This repository includes a script, ```buildserver\build_package.ps1``` that combines building and bundling GnuCash and uploading the result to a distribution webserver into a single command. It's intended for automated nightly build scripts.
### build_package.ps1 options
-* **branch**: ```maint```, ```master```, or ```release```. The last builds the release configured in gnucash.modules from the release tarball.
-* **target_dir**: The **target_dir** configured into ```setup-mingw64.ps1```.
-* **hostname**: The upload URI. Optional. If set the script will attempt to scp the gnucash-xxx-setup.exe and the build log to hard-coded subdirectories under this URI. The user running the script must have correctly configured ssh to connect to the URI with a key; there's no provision for password authentication.
+* **-branch**: ```maint```, ```master```, or ```release```. The last builds the release configured in gnucash.modules from the release tarball.
+* **-target_dir**: The **target_dir** configured into ```setup-mingw64.ps1```.
+* **-hostname**: The upload URI. Optional. If set the script will attempt to scp the gnucash-xxx-setup.exe and the build log to hard-coded subdirectories under this URI. The user running the script must have correctly configured ssh to connect to the URI with a key; there's no provision for password authentication.
## Other files:
* ```jhbuildrc.in``` Template jhbuild configuration file, converted to ```jhbuildrc``` by ```setup-mingw64.ps1``` with the **target_dir**.
commit 5ad565b49b2b4a48ce3c5f30429b2f6f8042821a
Author: John Ralls <jralls at ceridwen.us>
Date: Thu May 2 15:37:58 2019 -0700
Clean out the old build scripts and provide a new README.md.
diff --git a/0001-Fix-various-issues-when-compiling-natively-on-MinGW.patch b/0001-Fix-various-issues-when-compiling-natively-on-MinGW.patch
deleted file mode 100644
index 8dfad03..0000000
--- a/0001-Fix-various-issues-when-compiling-natively-on-MinGW.patch
+++ /dev/null
@@ -1,474 +0,0 @@
-From bf808730aad08b1052db9d2b91fdf79713886db4 Mon Sep 17 00:00:00 2001
-From: John Ralls <jralls at ceridwen.us>
-Date: Sun, 26 Oct 2014 15:39:21 -0700
-Subject: [PATCH] Fix various issues when compiling natively on MinGW.
-
-* On Windows, utf8.h and UTF8.h are the same, so #include <utf8.h> gets
-UTF8.h. Rename the latter to WTF-UTF8.h
-* Like Solaris, Windows needs to include either sys/time.h or time.h.
-* The ICU I18N library is called libicuin instead of libicu18n.
-* DumpRenderTree refused to link until the LDADD and LDFLAGS parameters
-were removed from the makefile. Don't understand why, it just happened
-to work when I was trying to get an error message.
----
- Source/JavaScriptCore/API/JSClassRef.cpp | 2 +-
- Source/JavaScriptCore/API/JSStringRef.cpp | 2 +-
- .../runtime/JSGlobalObjectFunctions.cpp | 2 +-
- Source/JavaScriptCore/runtime/UString.cpp | 2 +-
- Source/JavaScriptCore/tools/CodeProfiling.cpp | 2 +-
- Source/JavaScriptCore/wtf/text/AtomicString.cpp | 2 +-
- Source/JavaScriptCore/wtf/text/WTFString.cpp | 2 +-
- Source/JavaScriptCore/wtf/unicode/UTF8.cpp | 2 +-
- Source/JavaScriptCore/wtf/unicode/UTF8.h | 84 ----------------------
- Source/JavaScriptCore/wtf/unicode/WTF-UTF8.h | 84 ++++++++++++++++++++++
- .../wtf/unicode/glib/UnicodeGLib.cpp | 2 +-
- Source/WebCore/loader/icon/IconRecord.h | 2 +-
- Source/WebCore/page/Page.h | 2 +-
- .../platform/network/ResourceResponseBase.h | 2 +-
- Source/WebCore/platform/text/String.cpp | 2 +-
- Source/WebCore/xml/XSLTProcessorLibxslt.cpp | 2 +-
- Source/WebKit2/Shared/WebString.h | 2 +-
- Tools/GNUmakefile.am | 34 ++++-----
- configure.ac | 4 +-
- 19 files changed, 118 insertions(+), 118 deletions(-)
- delete mode 100644 Source/JavaScriptCore/wtf/unicode/UTF8.h
- create mode 100644 Source/JavaScriptCore/wtf/unicode/WTF-UTF8.h
-
-diff --git a/Source/JavaScriptCore/API/JSClassRef.cpp b/Source/JavaScriptCore/API/JSClassRef.cpp
-index 298c734..d375a9d 100644
---- a/Source/JavaScriptCore/API/JSClassRef.cpp
-+++ b/Source/JavaScriptCore/API/JSClassRef.cpp
-@@ -34,7 +34,7 @@
- #include <runtime/ObjectPrototype.h>
- #include <runtime/Identifier.h>
- #include <wtf/text/StringHash.h>
--#include <wtf/unicode/UTF8.h>
-+#include <wtf/unicode/WTF-UTF8.h>
-
- using namespace std;
- using namespace JSC;
-diff --git a/Source/JavaScriptCore/API/JSStringRef.cpp b/Source/JavaScriptCore/API/JSStringRef.cpp
-index ea31da6..1acb197 100644
---- a/Source/JavaScriptCore/API/JSStringRef.cpp
-+++ b/Source/JavaScriptCore/API/JSStringRef.cpp
-@@ -28,7 +28,7 @@
-
- #include "InitializeThreading.h"
- #include "OpaqueJSString.h"
--#include <wtf/unicode/UTF8.h>
-+#include <wtf/unicode/WTF-UTF8.h>
-
- using namespace JSC;
- using namespace WTF::Unicode;
-diff --git a/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp b/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp
-index 204144c..ade2997 100644
---- a/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp
-+++ b/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp
-@@ -42,7 +42,7 @@
- #include <wtf/Assertions.h>
- #include <wtf/MathExtras.h>
- #include <wtf/StringExtras.h>
--#include <wtf/unicode/UTF8.h>
-+#include <wtf/unicode/WTF-UTF8.h>
-
- using namespace WTF;
- using namespace Unicode;
-diff --git a/Source/JavaScriptCore/runtime/UString.cpp b/Source/JavaScriptCore/runtime/UString.cpp
-index 5b1e9a0..52e697e 100644
---- a/Source/JavaScriptCore/runtime/UString.cpp
-+++ b/Source/JavaScriptCore/runtime/UString.cpp
-@@ -39,7 +39,7 @@
- #include <wtf/StringExtras.h>
- #include <wtf/Vector.h>
- #include <wtf/dtoa.h>
--#include <wtf/unicode/UTF8.h>
-+#include <wtf/unicode/WTF-UTF8.h>
-
- #if HAVE(STRINGS_H)
- #include <strings.h>
-diff --git a/Source/JavaScriptCore/tools/CodeProfiling.cpp b/Source/JavaScriptCore/tools/CodeProfiling.cpp
-index f116038..1017caf 100644
---- a/Source/JavaScriptCore/tools/CodeProfiling.cpp
-+++ b/Source/JavaScriptCore/tools/CodeProfiling.cpp
-@@ -33,7 +33,7 @@
- #include <signal.h>
- #endif
-
--#if OS(LINUX)
-+#if OS(LINUX) || defined(__MINGW32__)
- #include <sys/time.h>
- #endif
-
-diff --git a/Source/JavaScriptCore/wtf/text/AtomicString.cpp b/Source/JavaScriptCore/wtf/text/AtomicString.cpp
-index d775e7b..f2ef1ab 100644
---- a/Source/JavaScriptCore/wtf/text/AtomicString.cpp
-+++ b/Source/JavaScriptCore/wtf/text/AtomicString.cpp
-@@ -28,7 +28,7 @@
- #include <wtf/HashSet.h>
- #include <wtf/Threading.h>
- #include <wtf/WTFThreadData.h>
--#include <wtf/unicode/UTF8.h>
-+#include <wtf/unicode/WTF-UTF8.h>
-
- namespace WTF {
-
-diff --git a/Source/JavaScriptCore/wtf/text/WTFString.cpp b/Source/JavaScriptCore/wtf/text/WTFString.cpp
-index 04c970a..2c1eba5 100644
---- a/Source/JavaScriptCore/wtf/text/WTFString.cpp
-+++ b/Source/JavaScriptCore/wtf/text/WTFString.cpp
-@@ -30,7 +30,7 @@
- #include <wtf/StringExtras.h>
- #include <wtf/Vector.h>
- #include <wtf/dtoa.h>
--#include <wtf/unicode/UTF8.h>
-+#include <wtf/unicode/WTF-UTF8.h>
- #include <wtf/unicode/Unicode.h>
-
- using namespace std;
-diff --git a/Source/JavaScriptCore/wtf/unicode/UTF8.cpp b/Source/JavaScriptCore/wtf/unicode/UTF8.cpp
-index 8ea5c69..e0366da 100644
---- a/Source/JavaScriptCore/wtf/unicode/UTF8.cpp
-+++ b/Source/JavaScriptCore/wtf/unicode/UTF8.cpp
-@@ -25,7 +25,7 @@
- */
-
- #include "config.h"
--#include "UTF8.h"
-+#include "WTF-UTF8.h"
-
- #include "ASCIICType.h"
- #include <wtf/StringHasher.h>
-diff --git a/Source/JavaScriptCore/wtf/unicode/UTF8.h b/Source/JavaScriptCore/wtf/unicode/UTF8.h
-deleted file mode 100644
-index bc2497b..0000000
---- a/Source/JavaScriptCore/wtf/unicode/UTF8.h
-+++ /dev/null
-@@ -1,84 +0,0 @@
--/*
-- * Copyright (C) 2007 Apple Inc. All rights reserved.
-- *
-- * Redistribution and use in source and binary forms, with or without
-- * modification, are permitted provided that the following conditions
-- * are met:
-- * 1. Redistributions of source code must retain the above copyright
-- * notice, this list of conditions and the following disclaimer.
-- * 2. Redistributions in binary form must reproduce the above copyright
-- * notice, this list of conditions and the following disclaimer in the
-- * documentation and/or other materials provided with the distribution.
-- *
-- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
-- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
-- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-- */
--
--#ifndef WTF_UTF8_h
--#define WTF_UTF8_h
--
--#include "Unicode.h"
--
--namespace WTF {
--namespace Unicode {
--
-- // Given a first byte, gives the length of the UTF-8 sequence it begins.
-- // Returns 0 for bytes that are not legal starts of UTF-8 sequences.
-- // Only allows sequences of up to 4 bytes, since that works for all Unicode characters (U-00000000 to U-0010FFFF).
-- int UTF8SequenceLength(char);
--
-- // Takes a null-terminated C-style string with a UTF-8 sequence in it and converts it to a character.
-- // Only allows Unicode characters (U-00000000 to U-0010FFFF).
-- // Returns -1 if the sequence is not valid (including presence of extra bytes).
-- int decodeUTF8Sequence(const char*);
--
-- typedef enum {
-- conversionOK, // conversion successful
-- sourceExhausted, // partial character in source, but hit end
-- targetExhausted, // insuff. room in target for conversion
-- sourceIllegal // source sequence is illegal/malformed
-- } ConversionResult;
--
-- // These conversion functions take a "strict" argument. When this
-- // flag is set to strict, both irregular sequences and isolated surrogates
-- // will cause an error. When the flag is set to lenient, both irregular
-- // sequences and isolated surrogates are converted.
-- //
-- // Whether the flag is strict or lenient, all illegal sequences will cause
-- // an error return. This includes sequences such as: <F4 90 80 80>, <C0 80>,
-- // or <A0> in UTF-8, and values above 0x10FFFF in UTF-32. Conformant code
-- // must check for illegal sequences.
-- //
-- // When the flag is set to lenient, characters over 0x10FFFF are converted
-- // to the replacement character; otherwise (when the flag is set to strict)
-- // they constitute an error.
--
-- WTF_EXPORT_PRIVATE ConversionResult convertUTF8ToUTF16(
-- const char** sourceStart, const char* sourceEnd,
-- UChar** targetStart, UChar* targetEnd, bool strict = true);
--
-- ConversionResult convertLatin1ToUTF8(
-- const LChar** sourceStart, const LChar* sourceEnd,
-- char** targetStart, char* targetEnd);
--
-- WTF_EXPORT_PRIVATE ConversionResult convertUTF16ToUTF8(
-- const UChar** sourceStart, const UChar* sourceEnd,
-- char** targetStart, char* targetEnd, bool strict = true);
--
-- unsigned calculateStringHashAndLengthFromUTF8(const char* data, const char* dataEnd, unsigned& dataLength, unsigned& utf16Length);
--
-- bool equalUTF16WithUTF8(const UChar* a, const UChar* aEnd, const char* b, const char* bEnd);
--
--} // namespace Unicode
--} // namespace WTF
--
--#endif // WTF_UTF8_h
-diff --git a/Source/JavaScriptCore/wtf/unicode/WTF-UTF8.h b/Source/JavaScriptCore/wtf/unicode/WTF-UTF8.h
-new file mode 100644
-index 0000000..bc2497b
---- /dev/null
-+++ b/Source/JavaScriptCore/wtf/unicode/WTF-UTF8.h
-@@ -0,0 +1,84 @@
-+/*
-+ * Copyright (C) 2007 Apple Inc. All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
-+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
-+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#ifndef WTF_UTF8_h
-+#define WTF_UTF8_h
-+
-+#include "Unicode.h"
-+
-+namespace WTF {
-+namespace Unicode {
-+
-+ // Given a first byte, gives the length of the UTF-8 sequence it begins.
-+ // Returns 0 for bytes that are not legal starts of UTF-8 sequences.
-+ // Only allows sequences of up to 4 bytes, since that works for all Unicode characters (U-00000000 to U-0010FFFF).
-+ int UTF8SequenceLength(char);
-+
-+ // Takes a null-terminated C-style string with a UTF-8 sequence in it and converts it to a character.
-+ // Only allows Unicode characters (U-00000000 to U-0010FFFF).
-+ // Returns -1 if the sequence is not valid (including presence of extra bytes).
-+ int decodeUTF8Sequence(const char*);
-+
-+ typedef enum {
-+ conversionOK, // conversion successful
-+ sourceExhausted, // partial character in source, but hit end
-+ targetExhausted, // insuff. room in target for conversion
-+ sourceIllegal // source sequence is illegal/malformed
-+ } ConversionResult;
-+
-+ // These conversion functions take a "strict" argument. When this
-+ // flag is set to strict, both irregular sequences and isolated surrogates
-+ // will cause an error. When the flag is set to lenient, both irregular
-+ // sequences and isolated surrogates are converted.
-+ //
-+ // Whether the flag is strict or lenient, all illegal sequences will cause
-+ // an error return. This includes sequences such as: <F4 90 80 80>, <C0 80>,
-+ // or <A0> in UTF-8, and values above 0x10FFFF in UTF-32. Conformant code
-+ // must check for illegal sequences.
-+ //
-+ // When the flag is set to lenient, characters over 0x10FFFF are converted
-+ // to the replacement character; otherwise (when the flag is set to strict)
-+ // they constitute an error.
-+
-+ WTF_EXPORT_PRIVATE ConversionResult convertUTF8ToUTF16(
-+ const char** sourceStart, const char* sourceEnd,
-+ UChar** targetStart, UChar* targetEnd, bool strict = true);
-+
-+ ConversionResult convertLatin1ToUTF8(
-+ const LChar** sourceStart, const LChar* sourceEnd,
-+ char** targetStart, char* targetEnd);
-+
-+ WTF_EXPORT_PRIVATE ConversionResult convertUTF16ToUTF8(
-+ const UChar** sourceStart, const UChar* sourceEnd,
-+ char** targetStart, char* targetEnd, bool strict = true);
-+
-+ unsigned calculateStringHashAndLengthFromUTF8(const char* data, const char* dataEnd, unsigned& dataLength, unsigned& utf16Length);
-+
-+ bool equalUTF16WithUTF8(const UChar* a, const UChar* aEnd, const char* b, const char* bEnd);
-+
-+} // namespace Unicode
-+} // namespace WTF
-+
-+#endif // WTF_UTF8_h
-diff --git a/Source/JavaScriptCore/wtf/unicode/glib/UnicodeGLib.cpp b/Source/JavaScriptCore/wtf/unicode/glib/UnicodeGLib.cpp
-index a01c3ee..a99cefb 100644
---- a/Source/JavaScriptCore/wtf/unicode/glib/UnicodeGLib.cpp
-+++ b/Source/JavaScriptCore/wtf/unicode/glib/UnicodeGLib.cpp
-@@ -24,7 +24,7 @@
- #include "UnicodeGLib.h"
-
- #include <wtf/Vector.h>
--#include <wtf/unicode/UTF8.h>
-+#include <wtf/unicode/WTF-UTF8.h>
-
- #define UTF8_IS_SURROGATE(character) (character >= 0x10000 && character <= 0x10FFFF)
-
-diff --git a/Source/WebCore/loader/icon/IconRecord.h b/Source/WebCore/loader/icon/IconRecord.h
-index 50ef7f7..a4d7c20 100644
---- a/Source/WebCore/loader/icon/IconRecord.h
-+++ b/Source/WebCore/loader/icon/IconRecord.h
-@@ -38,7 +38,7 @@
- #include <wtf/OwnPtr.h>
- #include <wtf/text/StringHash.h>
-
--#if OS(SOLARIS)
-+#if OS(SOLARIS) || defined (__MINGW32__)
- #include <sys/types.h> // For time_t structure.
- #endif
-
-diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h
-index 090b42c..eba7ca1 100644
---- a/Source/WebCore/page/Page.h
-+++ b/Source/WebCore/page/Page.h
-@@ -34,7 +34,7 @@
- #include <wtf/HashSet.h>
- #include <wtf/Noncopyable.h>
-
--#if OS(SOLARIS)
-+#if OS(SOLARIS) || defined (__MINGW32__)
- #include <sys/time.h> // For time_t structure.
- #endif
-
-diff --git a/Source/WebCore/platform/network/ResourceResponseBase.h b/Source/WebCore/platform/network/ResourceResponseBase.h
-index 3c61666..5e76d17 100644
---- a/Source/WebCore/platform/network/ResourceResponseBase.h
-+++ b/Source/WebCore/platform/network/ResourceResponseBase.h
-@@ -35,7 +35,7 @@
- #include <wtf/PassOwnPtr.h>
- #include <wtf/RefPtr.h>
-
--#if OS(SOLARIS)
-+#if OS(SOLARIS) || defined (__MINGW32__)
- #include <sys/time.h> // For time_t structure.
- #endif
-
-diff --git a/Source/WebCore/platform/text/String.cpp b/Source/WebCore/platform/text/String.cpp
-index f2f8d2e..78905ec 100644
---- a/Source/WebCore/platform/text/String.cpp
-+++ b/Source/WebCore/platform/text/String.cpp
-@@ -24,7 +24,7 @@
-
- #include "SharedBuffer.h"
- #include "TextBreakIterator.h"
--#include <wtf/unicode/UTF8.h>
-+#include <wtf/unicode/WTF-UTF8.h>
- #include <wtf/unicode/Unicode.h>
-
- using namespace WTF;
-diff --git a/Source/WebCore/xml/XSLTProcessorLibxslt.cpp b/Source/WebCore/xml/XSLTProcessorLibxslt.cpp
-index 076a852..fe5787a 100644
---- a/Source/WebCore/xml/XSLTProcessorLibxslt.cpp
-+++ b/Source/WebCore/xml/XSLTProcessorLibxslt.cpp
-@@ -50,7 +50,7 @@
- #include <wtf/Vector.h>
- #include <wtf/text/CString.h>
- #include <wtf/text/StringBuffer.h>
--#include <wtf/unicode/UTF8.h>
-+#include <wtf/unicode/WTF-UTF8.h>
-
- #if PLATFORM(MAC)
- #include "SoftLinking.h"
-diff --git a/Source/WebKit2/Shared/WebString.h b/Source/WebKit2/Shared/WebString.h
-index 18b3fc8..0f04d70 100644
---- a/Source/WebKit2/Shared/WebString.h
-+++ b/Source/WebKit2/Shared/WebString.h
-@@ -30,7 +30,7 @@
- #include <JavaScriptCore/JSStringRef.h>
- #include <wtf/PassRefPtr.h>
- #include <wtf/text/WTFString.h>
--#include <wtf/unicode/UTF8.h>
-+#include <wtf/unicode/WTF-UTF8.h>
-
- namespace WebKit {
-
-diff --git a/Tools/GNUmakefile.am b/Tools/GNUmakefile.am
-index fe7a1ce..8b56ee0 100644
---- a/Tools/GNUmakefile.am
-+++ b/Tools/GNUmakefile.am
-@@ -156,23 +156,23 @@ Programs_DumpRenderTree_CFLAGS = \
- $(GTK_CFLAGS) \
- $(LIBSOUP_CFLAGS)
-
--Programs_DumpRenderTree_LDADD = \
-- libjavascriptcoregtk- at WEBKITGTK_API_MAJOR_VERSION@. at WEBKITGTK_API_MINOR_VERSION@.la \
-- libwebkitgtk- at WEBKITGTK_API_MAJOR_VERSION@. at WEBKITGTK_API_MINOR_VERSION@.la \
-- libWebCoreInternals.la \
-- $(GLOBALDEPS_LIBS) \
-- $(CAIRO_LIBS) \
-- $(GTK_LIBS) \
-- $(GLIB_LIBS) \
-- $(LIBSOUP_LIBS) \
-- $(FREETYPE_LIBS) \
-- $(WINMM_LIBS) \
-- $(XRENDER_LIBS) \
-- $(XT_LIBS)
--
--Programs_DumpRenderTree_LDFLAGS = \
-- -no-fast-install \
-- -no-install
-+#Programs_DumpRenderTree_LDADD = \
-+# libjavascriptcoregtk- at WEBKITGTK_API_MAJOR_VERSION@. at WEBKITGTK_API_MINOR_VERSION@.la \
-+# libwebkitgtk- at WEBKITGTK_API_MAJOR_VERSION@. at WEBKITGTK_API_MINOR_VERSION@.la \
-+# libWebCoreInternals.la \
-+# $(GLOBALDEPS_LIBS) \
-+# $(CAIRO_LIBS) \
-+# $(GTK_LIBS) \
-+# $(GLIB_LIBS) \
-+# $(LIBSOUP_LIBS) \
-+# $(FREETYPE_LIBS) \
-+# $(WINMM_LIBS) \
-+# $(XRENDER_LIBS) \
-+# $(XT_LIBS)
-+
-+#Programs_DumpRenderTree_LDFLAGS = \
-+# -no-fast-install \
-+# -no-install
-
- # clean target
- CLEANFILES += \
-diff --git a/configure.ac b/configure.ac
-index 126ca85..99beb38 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -419,8 +419,8 @@ if test "$with_unicode_backend" = "icu"; then
- UNICODE_LIBS="-licucore"
- ;;
- *-*-mingw*)
-- UNICODE_CFLAGS=""
-- UNICODE_LIBS="-licui18n -licuuc"
-+ UNICODE_CFLAGS="-I/c/gcdev/webkit/include"
-+ UNICODE_LIBS="-licuin -licuuc"
- ;;
- *)
- AC_PATH_PROG(icu_config, icu-config, no)
---
-1.9.4.msysgit.0
-
diff --git a/0002-webkit-second-MinGW.patch b/0002-webkit-second-MinGW.patch
deleted file mode 100644
index 9a4df0f..0000000
--- a/0002-webkit-second-MinGW.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 71465d31b0531f79c74964b47521adeb25f9b462 Mon Sep 17 00:00:00 2001
-From: John Ralls <jralls at ceridwen.us>
-Date: Sat, 1 Nov 2014 11:59:24 -0700
-Subject: [PATCH 2/2] webkit second MinGW
-
-Adds some minor fixes that escaped the first patch
----
- .../platform/image-decoders/jpeg/JPEGImageDecoder.cpp | 3 +++
- .../WebKit/gtk/WebCoreSupport/TextCheckerClientGtk.cpp | 2 +-
- Source/WebKit/gtk/webkit/webkitspellcheckerenchant.cpp | 16 ++++++++--------
- 3 files changed, 12 insertions(+), 9 deletions(-)
-
-diff --git a/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp b/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
-index f0fbe44..7eddeaf 100644
---- a/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
-+++ b/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
-@@ -56,6 +56,9 @@
- #endif
-
- extern "C" {
-+#ifdef __MINGW32__
-+#define HAVE_BOOLEAN
-+#endif
- #include "jpeglib.h"
- #if USE(ICCJPEG)
- #include "iccjpeg.h"
-diff --git a/Source/WebKit/gtk/WebCoreSupport/TextCheckerClientGtk.cpp b/Source/WebKit/gtk/WebCoreSupport/TextCheckerClientGtk.cpp
-index 6dbb48f..cecb20e 100644
---- a/Source/WebKit/gtk/WebCoreSupport/TextCheckerClientGtk.cpp
-+++ b/Source/WebKit/gtk/WebCoreSupport/TextCheckerClientGtk.cpp
-@@ -56,7 +56,7 @@ void TextCheckerClientGtk::learnWord(const String& text)
-
- void TextCheckerClientGtk::checkSpellingOfString(const UChar* text, int length, int* misspellingLocation, int* misspellingLength)
- {
-- GOwnPtr<gchar> utf8Text(g_utf16_to_utf8(const_cast<gunichar2*>(text), length, 0, 0, 0));
-+ GOwnPtr<gchar> utf8Text(g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(text), length, 0, 0, 0));
- webkit_spell_checker_check_spelling_of_string(m_spellChecker.get(), utf8Text.get(), misspellingLocation, misspellingLength);
- }
-
-diff --git a/Source/WebKit/gtk/webkit/webkitspellcheckerenchant.cpp b/Source/WebKit/gtk/webkit/webkitspellcheckerenchant.cpp
-index 6a08c44..5488bb5 100644
---- a/Source/WebKit/gtk/webkit/webkitspellcheckerenchant.cpp
-+++ b/Source/WebKit/gtk/webkit/webkitspellcheckerenchant.cpp
-@@ -41,7 +41,7 @@ struct _WebKitSpellCheckerEnchantPrivate {
- GSList* enchantDicts;
- };
-
--static void webkit_spell_checker_enchant_spell_checker_interface_init(WebKitSpellCheckerInterface* interface);
-+static void webkit_spell_checker_enchant_spell_checker_interface_init(WebKitSpellCheckerInterface* iface);
-
- G_DEFINE_TYPE_WITH_CODE(WebKitSpellCheckerEnchant, webkit_spell_checker_enchant, G_TYPE_OBJECT,
- G_IMPLEMENT_INTERFACE(WEBKIT_TYPE_SPELL_CHECKER,
-@@ -259,14 +259,14 @@ static void ignoreWord(WebKitSpellChecker* checker, const char* word)
- }
- }
-
--static void webkit_spell_checker_enchant_spell_checker_interface_init(WebKitSpellCheckerInterface* interface)
-+static void webkit_spell_checker_enchant_spell_checker_interface_init(WebKitSpellCheckerInterface* iface)
- {
-- interface->check_spelling_of_string = checkSpellingOfString;
-- interface->get_guesses_for_word = getGuessesForWord;
-- interface->update_spell_checking_languages = updateSpellCheckingLanguages;
-- interface->get_autocorrect_suggestions_for_misspelled_word = getAutocorrectSuggestionsForMisspelledWord;
-- interface->learn_word = learnWord;
-- interface->ignore_word = ignoreWord;
-+ iface->check_spelling_of_string = checkSpellingOfString;
-+ iface->get_guesses_for_word = getGuessesForWord;
-+ iface->update_spell_checking_languages = updateSpellCheckingLanguages;
-+ iface->get_autocorrect_suggestions_for_misspelled_word = getAutocorrectSuggestionsForMisspelledWord;
-+ iface->learn_word = learnWord;
-+ iface->ignore_word = ignoreWord;
- }
-
- #endif /* ENABLE(SPELLCHECK) */
---
-1.9.4.msysgit.0
-
diff --git a/CMakeLists.txt b/CMakeLists.txt
deleted file mode 100644
index 451e553..0000000
--- a/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-# Edit cmake/custom.cmake with overrides for the variables set in cmake/defaults.cmake.
-# Call cmake defining the variables you need to build the modules you want and set -G "MSYS Makefile".
-# Important variables are
-# GNC_BUILD_GLIB Specifies GLib, Harfbuzz, and their dependencies.
-# GNC_BUILD_DEPS Specifies all dependencies.
-# "Specified" dependencies will be built into ${GLOBAL_DEP_BUILD_DIR}.
-# GNC_INSTALL_DEPS Installs the dependencies into ${GLOBAL_DIR}.
-# GNC_MAKE_TARBALLS Makes the distribution tarballs for upload to SourceForge from the specified dependencies.
-cmake_minimum_required (VERSION 3.3.2)
-include (cmake/defaults.cmake)
-include (cmake/custom.cmake)
-include (ExternalProject)
-# We can't set up any environment here so we must call make with some
-# enviroment variables set on the command line. Note that Python >=
-# 2.5 is required to install glib in order to create
-# glib-codegen. It's not needed, but that doesn't seem to matter.
-# PATH=$PATH:<INSTALL_DIR>/bin:<INSTALL_DIR>/lib PKG_CONFIG_PATH=<INSTALL_DIR>/lib/pkgconfig CXXFLAGS="$CXXFLAGS -std=gnu++11" PYTHON=/path/to/python.exe make
-# Note especially that -std=g++11; if it's not set then icu will set
-# it to -std=c++0x which breaks building harfbuzz because it uses
-# strdup which is a GCC extention.
-if (GNC_BUILD_DEPS OR GNC_BUILD_GLIB)
-include (cmake/glib.cmake)
-endif()
diff --git a/README b/README
deleted file mode 100644
index a85a63c..0000000
--- a/README
+++ /dev/null
@@ -1,245 +0,0 @@
-These scripts will provide a build environment to build GnuCash on Windows.
-The scripts will take care of building/installing all the dependencies needed
-to build an run GnuCash on Windows.
-
-Note: this build system depends on the mingw project which provides the gcc compiler
- in a Windows environment. You can read more about mingw on its homepage:
- http://www.mingw.org/
-
-These scripts support two ways to build a Windows/mingw32 version of GnuCash:
-- directly on a Windows PC
-- via cross-compilation on Linux (Note 2014-05-07: the scripts have been under
- heavy modification recently. The cross-compilation may no longer work.)
-
------------------------------------------
-1. Build GnuCash directly on a Windows PC
------------------------------------------
-
-Building GnuCash directly on a Windows PC requires you to enter commands
-directly on a command line. Several command line interfaces exist. To
-build GnuCash you will need to use two:
-
-1. The Windows built-in command prompt (cmd.exe)
-2. The Msys shell (will be installed automatically)
-
-This is mentioned here because both command lines have a completely different
-set of commands available so it will matter which command line to start from
-for certain steps. In principle the instruction below will always specify
-which command line to use.
-
-Some notes on path names to begin:
-----------------------------------
-* Avoid using paths with spaces. Some parts of the build system don't cope well
- with spaces. So don't install in c:\Program Files. The build system by
- default assumes c:\gcdev as base directory called $GLOBAL_DIR from now on).
-
-* Windows and mingw/msys use a slightly different notation for paths. When
- working in an msys shell window you are advised to always use the msys notation.
- Outside the msys shell window you should use the Windows notation. Here is an
- example to show the difference:
- Windows: c:\gcdev\gnucash-on-windows.git
- Msys : /c/gcdev/gnucash-on-windows.git
- The difference is in the direction of the slashes and that c: is replaced with /c
- Note for completeness that in msys you can also use the Windows notation. However
- msys interprets a '\' as an escape character. So to use back slashes you will have
- to escape them. So the below will also work in msys:
- Msys (alternate): c:\\gcdev\\gnucash-on-windows.git
-
-
-The steps
----------
-On to building GnuCash now. The scripts have been set up to require as little
-manual actions as possible. The following should get you going:
-
-a. Download bootstrap_win_dev.vbs from the gnucash-on-windows
- repository on Github. Direct url:
- https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/bootstrap_win_dev.vbs
-
-b. Run this script by double-clicking it and follow the instructions.
- If the script's output window closes before you get to a "Happy hacking"
- message then something went wrong. To figure out what you can instead
- open a Windows command prompt (cmd.exe) and run the script as
- cscript.exe <path\to>\bootstrap_win_dev.vbs
- Be sure to replace <path\to> with the correct path.
-
-Note: by default everything will be installed inside c:\gcdev\
- You could alter this location by passing some parameters
- to bootstrap_win_dev.vbs. There are a couple of other parameters
- you can set to influence what is installed where. Please read the
- bootstrap script to learn which ones. If you want to pass
- parameters you will have to run the script from the command line
- of course instead of double-clicking it.
-
-Note: if you intend to use the buildserver scripts (see separate directory)
- to have a fully automated build that runs at regular intervals
- there are some restrictions to the paths you can/should alter.
- For more detail please check README.txt in the buildserver directory.
-
-You are now ready to build gnucash for the first time. The build is
-fully parameterized. That means which versions of libraries and tools
-to install, where to install them, which branch to build and so on can
-all be defined. If not set explicitly some default values will be
-used. If you're already familiar with the Windows build you may want
-to customize some of these parameters. If not sure - don't. The build
-should run just fine without it.
-
-The default values will all be found in 'defaults.sh'. You can
-override any of these in 'custom.sh'. The boostrap script you ran in
-step b. already created an initial version of this file.
-
-Some particular additions you may want to make to custom.sh are:
-GNUCASH_SCM_REV=maint
-will switch the branch of GnuCash that the script builds from 'master' to 'maint'.
-WITH_CMAKE=yes
-WITH_NINJA=yes
-Will use CMake and ninja instead of autotools and make to configure and build GnuCash (and only GnuCash, it has no effect on any of the dependencies). If you leave off WITH_NINJA it will configure with CMake and build with make. CMake + ninja builds are substantially faster than autotools ones.
-
-c. Open an Msys shell window. You do this by running
- c:\gcdev\mingw\msys\1.0\msys.bat
- Unless you chose to install mingw/msys in another directory of course.
- Let the automated build begin by:
-
- cd /c/gcdev/gnucash-on-windows.git
- ./install.sh
-
- If you chose to set up the build environment in a different location adjust
- the path accordingly.
-
-d. To generate a self-installing setup.exe file that contains *everything* run
- the following command after install.sh has completed:
-
- ./dist.sh
-
-
-And next ?
-----------
-If you got here without errors then congratulations ! You have just completed
-your first successful GnuCash Build. To use this version you can launch the
-Windows GnuCash Installer you just built in step d. You can find this installer
-in c:\gcdev\gnucash\. It works just like any other installer for a piece of
-Windows software: you double-click it and follow the instructions that are
-displayed.
-
-At some point you may want to build GnuCash again to get updates. To do so you
-should start with updating the GnuCash source files as well as the scripts
-used to build GnuCash on Windows.
-
-The former are stored in c:\gcdev\gnucash.git
-The latter in c:\gcdev\gnucash-on-windows.git
-
-As the name suggests both are managed by a tool called git. Below is only a
-minimal explanation on how to update these directories.
-- Open a Windows Explorer
-- Right-click on the gnucash-on-windows.git directory
-- Select Git Bash. This will open a command prompt.
-- Enter one command: git pull
-- Close the command prompt again
-This example shows how to update gnucash-on-windows.git but the same steps
-apply as well for gnucash.git.
-
-If you want to do more advanced things such as modifying code or building
-from a git branch other than the default 'master' branch you will need to
-familiarize yourself with git more intimately. A good starting point is
-http://wiki.gnucash.org/wiki/Git
-
-In general more information with regards to building GnuCash on Windows is
-collected on http://wiki.gnucash.org/wiki/Windows/Development
-
-At the time of this writing it should still be adapted to the new build
-scripts (2014-05-07).
-
-Known Issues/Things to improve
-------------------------------
-
-* It appears that installing html help on Windows systems more recent
- than Windows XP can fail. It looks like the installer triggers a
- Windows authorization dialog. For some reason this dialog can't be
- displayed when the installer is started from an msys shell.
-
- The workaround is a bit awkward currently and consists of
-
- 1. install html help directly by double-clicking it. Remember to
- install it where the gnucash build scripts expect it ! That is
- c:\gcdev\hh by default.
- 2. Inside your msys shell window enter
- these commands:
-
- pushd /c/gcdev/hh
- _HHCTRL_OCX=$(which hhctrl.ocx || true)
- [ "$_HHCTRL_OCX" ] || die "Did not find hhctrl.ocx"
- pexports -h include/htmlhelp.h $_HHCTRL_OCX > lib/htmlhelp.def
- pushd lib
- dlltool -k -d htmlhelp.def -l libhtmlhelp.a
- mv htmlhelp.lib htmlhelp.lib.bak
- popd
- popd
-
- 3. You can now rerun install.sh which should get past the html help
- installation step
-
- (Reference: http://lists.gnucash.org/pipermail/gnucash-devel/2014-May/037561.html
- and following messages)
-
-* Error: unrecognized “l†format
- This seems to happen on more recent Windows systems as well, perhaps only
- on 64-bit systems. The cause seems to be that mingw is using a very old
- version of msvcrt.dll which doen't know about the %lld modifier to print
- 64-bit integers.
- To work around this you can add a line in custom.sh:
- EXTRA_CFLAGS=" -D__USE_MINGW_ANSI_STDIO"
-
- The same list message mentioned a couple of additional flags to set
- but these were not explained. For completeness the complete line
- was:
-
- EXTRA_CFLAGS=" -Wall -Werror -fno-builtin-dgettext -fno-builtin-towupper -fno-builtin-iswlower -ggdb3 -D__USE_MINGW_ANSI_STDIO"
- Adjust as you see fit.
-
- (Reference: http://lists.gnucash.org/pipermail/gnucash-devel/2014-May/037561.html
- and following messages)
-
---------------------------------------------
-2. Cross-compile GnuCash/win32 on a linux PC
---------------------------------------------
-Cross-compiling a Windows/mingw32 executable of GnuCash on a Linux
-host system.
-
-Note: as mentioned earlier this part is probably no longer accurate due to
- the heavy changes to the build system in April 2014. It is kept here
- as a reminder to update it and fix any issues encountered.
-
-These steps need to be performed:
-
-1. Look at defaults.sh and create a file named custom.sh to specify adapted
- directory variables. If you want verbose output of any script
- step, add "set -x" to that file. Particularly for cross-compiling,
- set these variables:
- * cross_compile: should be set to yes
- * GLOBAL_DIR: the base directory for all other directory definitions,
- unless you explicitly override it for some directories.
- * MINGW_DIR: set this to your preferred prefix of the mingw32 gcc/binutils
- on your Linux installation.
- (It is strongly recommended to choose a prefix different
- from your normal compiler tool chain in order to distinguish
- your native vs. cross compiler more easily.)
-
-2. Then run the script create_cross_mingw.sh - it will
- download, compile, and install a mingw32 tool chain.
-
-3. Download a binary windows packages for "guile" e.g. from
- http://www.tu-harburg.de/~et2cs/gnc/ and unpack it into the
- directory $GUILE_DIR as given in defaults.sh. (This is done because
- the build system for guile doesn't support cross-compiling.)
-
-4. Call install.sh, which will read the directory settings from
- defaults.sh/custom.sh. It should download, compile, and install everything
- automatically. Eventually the windows gnucash is installed into
- $GNUCASH_DIR.
-
-5. The content of $GNUCASH_DIR (as well as all the other binary
- packages) should then be copied to a windows machine. The paths
- in $GNUCASH_DIR/bin/gnucash and/or $GNUCASH_DIR/bin/gnucash.cmd
- need to be adjusted for the installation location on the
- windows machine.
-
-Good luck!
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..8572243
--- /dev/null
+++ b/README.md
@@ -0,0 +1,82 @@
+# Building GnuCash on Windows
+
+This repository provides a simple, repeatable means to build GnuCash 3 on Microsoft Windows using [MinGW-W64](https://mingw-w64.org/doku.php), [Gnome's jhbuild](https://wiki.gnome.org/action/show/Projects/Jhbuild?action=show&redirect=Jhbuild), and [JRSoftware's Inno Setup](http://www.jrsoftware.org/isinfo.php). It is what drives building the official All-in-One installers and what the GnuCash core development team uses to create development environments.
+
+## Requirements
+
+* Windows Vista or later. You must have an account with Administrator privileges.
+* Powershell 3.0 or later. Note that Vista and Win7 provided only Powershell 2.0. [Get an upgrade from Microsoft](https://docs.microsoft.com/en-us/powershell/scripting/install/installing-windows-powershell?view=powershell-6).
+
+## Installation
+
+Download [setup-mingw.ps1](https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/setup-mingw64.ps1).
+
+Start a Powershell session:
+* Click the Start icon and start typing "powershell" until Windows recognizes it and presents a menu item. Click that.
+
+If you need Administrative Privileges:
+* Win10, right-click on the Start icon and select ```Windows Powershell (Admin)```
+* Win7, click the Start icon and start typing "powershell" until ```Windows PowerShell``` appears in the search dialog. Right-click on it and select ```Run as Administrator```.
+
+If you don't routinely run PowerShell scripts on your computer you will need to first set the [Execution Policy](https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_execution_policies?view=powershell-3.0) to **RemoteSigned**. You will need Powershell session with Administrative Privileges for this step:
+1. Start Powershell with Admin Privileges
+1. Run ```set-executionpolicy -executionpolicy RemoteSigned -scope LocalMachine```
+1. Quit Powershell if you plan to run ```setup-mingw64.ps1``` without Administrative Privileges.
+
+In a PowerShell session run ```path/to/setup-mingw64.ps1```; the path will depend on your browser settings but if you have a default setup then it's ```~/Downloads/setup-mingw64.ps1```.
+
+###setup-mingw64 Options
+```setup-mingw64.ps1``` takes four optional arguments:
+* **-target_dir**: The full path to where the MinGW-W64 environment will be created. **Default**: ```C:\gcdev64```. The default requires Administrative privileges to create. If you use a directory in your home directory instead then you will not require Admin privileges.
+
+* **-download_dir**: The name of the subdirectory in **target_dir** where source tarballs will be downloaded to. **Default**: **target_dir**```\downloads```.
+
+* **-msyw2_root**: The base directory of the MSYS2/MinGW-W64 environment. You can reuse an existing environment, but we don't recommend changing this. **Default**:**target_dir**```\msys2```.
+
+* **-x86_64**: Setting this will build a 64-bit GnuCash. **Default**: Unset, for 32-bit builds able to run on older systems.
+
+It will take a while to complete. When it's done you'll have a new group in your Start Menu named ```MSYS2 64bit``` or ```MSYS2 32bit``` depending on the bitness of your version of Windows. Note that this is independent of whether you set the **-x86_64** option. In that group you'll find 3 selections:
+* MSYS2 MSys2
+* MSYS2 MingGW 32-bit
+* MSYS2 MinGW 64-bit
+
+These create terminal emulation sessions running the Bash shell with the environment configured for different uses. You will nearly always want to use the MinGW with the bitness you selected.
+
+## Building GnuCash
+
+1. Start an MSYS MinGW shell for the selected bitness.
+1. Change directories to the installation directory ```cd /c/gcdev64/src/gnucash-on-windows.git```. Substitute the path if you set **-target_dir** to something else. Note that in this shell you'll use ```/c``` instead of ```C:``` for the drive letter.
+1. run ```TARGET=gnucash-maint jhbuild -f jhbuildrc build``` to build the ```maint``` branch, substitute ```gnucash-master``` for ```gnucash-maint``` if you want to build the ```master``` branch.
+
+## Developing
+
+Once you've built GnuCash all the way through you can get a build-and-run environment by starting a MinGW shell and running ```TARGET=gnucash-maint jhbuild -f jhbuildrc shell``` from the ```gnucash-on-windows.git``` directory.
+
+```cd $PREFIX/../build/gnucash-git``` to get to the build directory and ```$PREFIX/../src/gnucash-git``` to get to the local repo.
+
+To install the gdb debugger run ```pacman -Su gdb```. You need not be in a jhbuild shell.
+
+## Bundling GnuCash
+
+1. Start a Powershell session.
+1. Change to the installation directory ```cd C:\gcdev64\src\gnucash-on-windows.git```
+1. run ```bundle-mingw64.ps1 -root_dir C:\gcdev64 -target_dir C:\gcdev64\gnucash\maint -package maint -git_build $true```
+
+That will create a date-stamped and versioned ```gnucash-xxx-setup.exe``` in ```C:\gcdev64\gnucash\maint```. You'll need to adjust paths and versions accordingly if you changed **target_dir** when you ran ```setup-mingw64.ps1``` or built ```master``` instead of maint.
+
+## Buildserver
+
+This repository includes a script, ```buildserver\build_package.ps1``` that combines building and bundling GnuCash and uploading the result to a distribution webserver into a single command. It's intended for automated nightly build scripts.
+
+### build_package.ps1 options
+* **branch**: ```maint```, ```master```, or ```release```. The last builds the release configured in gnucash.modules from the release tarball.
+* **target_dir**: The **target_dir** configured into ```setup-mingw64.ps1```.
+* **hostname**: The upload URI. Optional. If set the script will attempt to scp the gnucash-xxx-setup.exe and the build log to hard-coded subdirectories under this URI. The user running the script must have correctly configured ssh to connect to the URI with a key; there's no provision for password authentication.
+
+## Other files:
+* ```jhbuildrc.in``` Template jhbuild configuration file, converted to ```jhbuildrc``` by ```setup-mingw64.ps1``` with the **target_dir**.
+* ```gnucash.modules```: The jhbuild moduleset for building GnuCash.
+* ```inno_setup/```: Configuration and localization files for building ```gnucash-xxx-setup.exe``` with Inno Setup.
+* ```patches/```: Modifications to the source packages required to build in this environment.
+* ```extra_dist/```: The Online Quote Installation tool.
+* ```exetype.pl```: A perl script for converting the executable type of programs between Windowed and Console. It is sometimes useful to convert the GnuCash executable to Console type (it's built as Windowed) to capture some text output it emits before logging starts.
\ No newline at end of file
diff --git a/aqbanking-4.2.4-r2132.patch b/aqbanking-4.2.4-r2132.patch
deleted file mode 100644
index b94803a..0000000
--- a/aqbanking-4.2.4-r2132.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- trunk/src/plugins/parsers/dtaus/dtaus-export.c 2011/01/11 19:59:25 2131
-+++ trunk/src/plugins/parsers/dtaus/dtaus-export.c 2011/01/13 21:47:48 2132
-@@ -531,7 +531,7 @@
- return -1;
- }
- AB_Value_AddValue(sumDEM, val);
-- snprintf(buffer, sizeof(buffer), "%011.0lf", AB_Value_GetValueAsDouble(val)*100.0);
-+ snprintf(buffer, sizeof(buffer), "%011.0f", AB_Value_GetValueAsDouble(val)*100.0);
- AB_Value_free(val);
- if (AHB_DTAUS__AddNum(dst, 11, buffer)) {
- DBG_ERROR(AQBANKING_LOGDOMAIN, "Error writing to buffer");
-@@ -587,7 +587,7 @@
- return -1;
- }
- AB_Value_AddValue(sumEUR, val);
-- snprintf(buffer, sizeof(buffer), "%011.0lf", AB_Value_GetValueAsDouble(val)*100.0);
-+ snprintf(buffer, sizeof(buffer), "%011.0f", AB_Value_GetValueAsDouble(val)*100.0);
- AB_Value_free(val);
- if (AHB_DTAUS__AddNum(dst, 11, buffer)) {
- DBG_ERROR(AQBANKING_LOGDOMAIN, "Error writing to buffer");
-@@ -768,7 +768,7 @@
- }
-
- /* field 5: sum of DEM values */
-- snprintf(buffer, sizeof(buffer), "%013.0lf",
-+ snprintf(buffer, sizeof(buffer), "%013.0f",
- AB_Value_GetValueAsDouble(sumDEM)*100.0);
- if (AHB_DTAUS__AddNum(dst, 13, buffer)) {
- DBG_ERROR(AQBANKING_LOGDOMAIN, "Error writing to buffer");
-@@ -776,7 +776,7 @@
- }
-
- /* field 6: sum of peer account ids */
-- snprintf(buffer, sizeof(buffer), "%017.0lf",
-+ snprintf(buffer, sizeof(buffer), "%017.0f",
- AB_Value_GetValueAsDouble(sumAccountIds));
- if (AHB_DTAUS__AddNum(dst, 17, buffer)) {
- DBG_ERROR(AQBANKING_LOGDOMAIN, "Error writing to buffer");
-@@ -784,7 +784,7 @@
- }
-
- /* field 7: sum of peer bank codes */
-- snprintf(buffer, sizeof(buffer), "%017.0lf",
-+ snprintf(buffer, sizeof(buffer), "%017.0f",
- AB_Value_GetValueAsDouble(sumBankCodes));
- if (AHB_DTAUS__AddNum(dst, 17, buffer)) {
- DBG_ERROR(AQBANKING_LOGDOMAIN, "Error writing to buffer");
-@@ -792,7 +792,7 @@
- }
-
- /* field 8: sum of EUR values */
-- snprintf(buffer, sizeof(buffer), "%013.0lf",
-+ snprintf(buffer, sizeof(buffer), "%013.0f",
- AB_Value_GetValueAsDouble(sumEUR)*100.0);
- if (AHB_DTAUS__AddNum(dst, 13, buffer)) {
- DBG_ERROR(AQBANKING_LOGDOMAIN, "Error writing to buffer");
diff --git a/bootstrap_win_dev.vbs b/bootstrap_win_dev.vbs
deleted file mode 100644
index 7bd2915..0000000
--- a/bootstrap_win_dev.vbs
+++ /dev/null
@@ -1,515 +0,0 @@
-' bootstap_win_dev.vbs
-'
-' The goal of this script is to simplify setting up a development
-' environment to develop for GnuCash on Windows.
-' It will set up an absolute minimal environment from where
-' the regular GnuCash Windows build system can take over.
-' This minimal environment consists of
-' - mingw-get: the mingw package installer tool
-' - msys-base: a basic MSYS shell environment
-' - git for windows, required for:-
-' - the GnuCash source code repository, cloned from the github GnuCash repository
-'
-' The bootstrap script can also be run on top of an existing set up
-' in which case the script will only do what is necessary to get
-' the above items in place. For example, if git is already installed
-' in the location pointed to by GIT_DIR below, it won't be installed
-' again.
-'
-' IN CASE OF UNEXPECTED CLOSING OF THE CONSOLE
-' Please open a console (cmd.exe) and run the script under cscript.exe as follows:
-' cscript.exe <path-to-this-script>
-' This will keep your console open, so you can read if there were errors
-
-' Script start
-' ------------
-' Ensure we have a visible console to display output
-CheckStartMode
-
-' This regexp is used to "Windoize" path names when this script is called
-' from inside an msys environment (like from the build_tags.sh script)
-' It should be a noop when the script is called from a pure Windows cmd prompt
-Set myRegExp = New RegExp
-myRegExp.Global = True
-myRegExp.Pattern = "/"
-
-' Parameters than can be overridden on the command line
-' -----------------------------------------------------
-' Everything will be installed in the base directory specified below.
-' If this path doesn't suit you, you can specify another path as a named
-' variable on the command line like so:
-' bootstrap_win_dev.vbs /GLOBAL_DIR:c:\soft
-
-' Note: avoid paths with spaces or other special characters (like &).
-' these can confuse msys/mingw or some of the tools depending on them.
-
-' Any of the parameters set up below can be overridden in this way.
-If WScript.Arguments.Named.Exists("GLOBAL_DIR") Then
- GLOBAL_DIR = myRegExp.Replace (WScript.Arguments.Named.Item("GLOBAL_DIR"), "\")
-Else
- GLOBAL_DIR = "c:\gcdev"
-End If
-If WScript.Arguments.Named.Exists("MINGW_DIR") Then
- MINGW_DIR = myRegExp.Replace (WScript.Arguments.Named.Item("MINGW_DIR"), "\")
-Else
- MINGW_DIR = GLOBAL_DIR & "\mingw"
-End If
-If WScript.Arguments.Named.Exists("TMP_DIR") Then
- TMP_DIR = myRegExp.Replace (WScript.Arguments.Named.Item("TMP_DIR"), "\")
-Else
- TMP_DIR= GLOBAL_DIR & "\tmp"
-End If
-If WScript.Arguments.Named.Exists("DOWNLOAD_DIR") Then
- DOWNLOAD_DIR = myRegExp.Replace (WScript.Arguments.Named.Item("DOWNLOAD_DIR"), "\")
-Else
- DOWNLOAD_DIR= GLOBAL_DIR & "\downloads"
-End If
-If WScript.Arguments.Named.Exists("GIT_PKG") Then
- GIT_PKG = WScript.Arguments.Named.Item("GIT_PKG")
-Else
- GIT_PKG = "Git-1.9.4-preview20140611"
-End If
-If WScript.Arguments.Named.Exists("strGitBaseUrl") Then
- strGitBaseUrl = WScript.Arguments.Named.Item("strGitBaseUrl")
-Else
- strGitBaseUrl = "https://github.com/msysgit/msysgit/releases/download/"
-End If
-If WScript.Arguments.Named.Exists("GIT_URL") Then
- GIT_URL = WScript.Arguments.Named.Item("GIT_URL")
-Else
- GIT_URL = strGitBaseUrl & GIT_PKG & "/" & GIT_PKG & ".exe"
-End If
-If WScript.Arguments.Named.Exists("GIT_DIR") Then
- GIT_DIR = myRegExp.Replace (WScript.Arguments.Named.Item("GIT_DIR"), "\")
-Else
- GIT_DIR = GLOBAL_DIR & "\git-1.9.4"
-End If
-If WScript.Arguments.Named.Exists("GC_WIN_REPOS_URL") Then
- GC_WIN_REPOS_URL = WScript.Arguments.Named.Item("GC_WIN_REPOS_URL")
-Else
- GC_WIN_REPOS_URL = "git://github.com/Gnucash/gnucash-on-windows.git"
-End If
-If WScript.Arguments.Named.Exists("GC_WIN_REPOS_DIR") Then
- GC_WIN_REPOS_DIR = myRegExp.Replace (WScript.Arguments.Named.Item("GC_WIN_REPOS_DIR"), "\")
-Else
- GC_WIN_REPOS_DIR = GLOBAL_DIR & "\gnucash-on-windows.git"
-End If
-If WScript.Arguments.Named.Exists("REPOS_URL") Then
- REPOS_URL = WScript.Arguments.Named.Item("REPOS_URL")
-Else
- REPOS_URL = "git://github.com/Gnucash/gnucash.git"
-End If
-If WScript.Arguments.Named.Exists("REPOS_DIR") Then
- REPOS_DIR = myRegExp.Replace (WScript.Arguments.Named.Item("REPOS_DIR"), "\")
-Else
- REPOS_DIR = GLOBAL_DIR & "\gnucash.git"
-End If
-
-' If you want the script to run without prompting the user,
-' add the /silent:yes switch to the command line
-' It will still print output though to help in locating errors
-silent = False
-If WScript.Arguments.Named.Exists("silent") Then
- silent = True
-End If
-
-' Parameters that can't/shouldn't be overridden
-'----------------------------------------------
-' Global parameters for visual basic
-Set objFso = CreateObject("Scripting.FileSystemObject")
-Set stdout = objFso.GetStandardStream(1)
-Set stdin = objFso.GetStandardStream(0)
-Set objWsh = WScript.CreateObject ("WScript.Shell")
-Const ForReading = 1, ForWriting = 2, ForAppending = 8
-
-Welcome
-
-
-' Create base directories if necessary
-' ------------------------------------
-If Not objFso.FolderExists(GLOBAL_DIR) Then
- stdout.Write "Creating " & GLOBAL_DIR & "... "
- objFso.CreateFolder(GLOBAL_DIR)
- stdout.WriteLine "Ok"
-End If
-If Not objFso.FolderExists(MINGW_DIR) Then
- stdout.Write "Creating " & MINGW_DIR & "... "
- objFso.CreateFolder(MINGW_DIR)
- stdout.WriteLine "Ok"
-End If
-If Not objFso.FolderExists(TMP_DIR) Then
- stdout.Write "Creating " & TMP_DIR & "... "
- objFso.CreateFolder(TMP_DIR)
- stdout.WriteLine "Ok"
-End If
-If Not objFso.FolderExists(DOWNLOAD_DIR) Then
- stdout.Write "Creating " & DOWNLOAD_DIR & "... "
- objFso.CreateFolder(DOWNLOAD_DIR)
- stdout.WriteLine "Ok"
-End If
-
-
-' Install mingw-get
-' -----------------
-
-strMingwGet = MINGW_DIR & "\bin\mingw-get.exe"
-stdout.Write "Checking " & strMingwGet & "... "
-If objFso.FileExists(strMingwGet) Then
- stdout.WriteLine "Found, no need to install"
-Else
- stdout.WriteLine "Not found, will be installed"
-
- strMingwGetZip = DOWNLOAD_DIR & "\mingw-get.zip"
- If Not objFso.FileExists(strMingwGetZip) Then
- stdout.Write "Downloading mingw-get.zip (slow!)... "
- strMingwGetZipUrl = "https://github.com/Gnucash/gnucash-on-windows/raw/master/mingw-get.zip"
- HTTPDownloadBinaryFile strMingwGetZipUrl, strMingwGetZip
- stdout.WriteLine "Success"
- End If
-
- ' Extract mingw-get.zip into our MINGW_DIR
- ' using a detour via a temporary directory to deal with the
- ' cludgy way to detect when extracting is finished.
- ' I couldn't find a better way so far.
- stdout.Write "Installing mingw-get... "
- strMingwTmpDir = TMP_DIR & "\mingwtmp"
- If objFso.FolderExists(strMingwTmpDir) Then
- objFso.DeleteFolder strMingwTmpDir , True
- End If
- ExtractAll DOWNLOAD_DIR & "\mingw-get.zip", strMingwTmpDir
- objFso.CopyFolder strMingwTmpDir & "\*", MINGW_DIR, True
- objFso.DeleteFolder strMingwTmpDir , True
- ' Create a default profile for mingw-get to avoid constant warnings
- objFso.CopyFile MINGW_DIR & "\var\lib\mingw-get\data\defaults.xml", MINGW_DIR & "\var\lib\mingw-get\data\profile.xml"
- stdout.WriteLine "Success"
-
-End If
-
-
-' Instal Basic Msys (we need msys-wget to install git)
-' ----------------------------------------------------
-' Note: we don't check if these are installed already.
-' mingw-get will do this for us automatically.
-stdout.Write "Installing msys and wget... "
-strMingwGet = MINGW_DIR & "\bin\mingw-get.exe"
-
-objWsh.Run strMingwGet & " install mingw-get msys-base msys-wget msys-patch", 1, True
-'Set objExec = objWsh.Exec (strMingwGet & " install msys-base msys-wget")
-
-strWget = MINGW_DIR & "\msys\1.0\bin\wget.exe"
-If Not objFso.FileExists(strWget) Then
- stdout.WriteLine "Failed"
- stdout.WriteBlankLines (1)
- stdout.WriteLine "*** ERROR ***"
- stdout.WriteLine "Msys/Wget installation failed."
- stdout.WriteBlankLines (1)
- stdout.WriteLine "Cannot continue until this has been resolved."
- AbortScript
-End If
-stdout.WriteLine "Success"
-
-
-' Install Git
-' -----------
-strGit = GIT_DIR & "\bin\git.exe"
-stdout.Write "Checking " & strGit & "... "
-If objFso.FileExists(strGit) Then
- stdout.WriteLine "Found, no need to install"
-Else
- stdout.WriteLine "Not found, will be installed"
-
- strGitPkg = DOWNLOAD_DIR & "\" & GIT_PKG & ".exe"
- If Not objFso.FileExists(strGitPkg) Then
- stdout.Write "Downloading git installer... "
- objWsh.Run strWget & " -O" & strGitPkg & " --no-check-certificate " & GIT_URL, 1, true
-
- If Not objFso.FileExists(strGitPkg) Then
- stdout.WriteLine "Failed"
- stdout.WriteBlankLines (1)
- stdout.WriteLine "*** ERROR ***"
- stdout.WriteLine "Download git installer failed."
- stdout.WriteBlankLines (1)
- stdout.WriteLine "Cannot continue until this has been resolved."
- AbortScript
- End If
- stdout.WriteLine "Success"
- End If
-
- stdout.Write "Installing git... "
- objWsh.Run strGitPkg & " /SP- /SILENT /DIR=" & GIT_DIR, 1, true
-
- If Not objFso.FileExists(strGit) Then
- stdout.WriteLine "Failed"
- stdout.WriteBlankLines (1)
- stdout.WriteLine "*** ERROR ***"
- stdout.WriteLine "Git installation failed."
- stdout.WriteBlankLines (1)
- stdout.WriteLine "Cannot continue until this has been resolved."
- AbortScript
- End If
- stdout.WriteLine "Sucess"
-End If
-
-
-' Set up gnucash-on-windows git repository
-' ----------------------------------------
-strBootstrap = GC_WIN_REPOS_DIR & "\bootstrap_win_dev.vbs"
-stdout.WriteLine "Checking if " & GC_WIN_REPOS_DIR
-stdout.Write " is a gnucash-on-windows git repository... "
-If objFso.FolderExists(GC_WIN_REPOS_DIR & "\.git") And objFso.FileExists(strBootstrap) Then
- stdout.WriteLine "Most likely ok, won't clone"
-Else
- stdout.WriteLine "Not found"
- stdout.WriteLine "Set up gnucash-on-windows git repository... "
- objWsh.Run strGit & " clone " & GC_WIN_REPOS_URL & " " & GC_WIN_REPOS_DIR, 1, true
-
- If Not objFso.FileExists(strBootstrap) Then
- stdout.WriteLine "Failed"
- stdout.WriteBlankLines (1)
- stdout.WriteLine "*** ERROR ***"
- stdout.WriteLine "Failed to set up gnucash-on-windows git repository."
- stdout.WriteBlankLines (1)
- stdout.WriteLine "Cannot continue until this has been resolved."
- AbortScript
- End If
- stdout.WriteLine "Ok"
-End If
-
-
-' Set up gnucash git repository
-' -----------------------------
-strGCbin = REPOS_DIR & "\src\bin\gnucash-bin.c"
-stdout.WriteLine "Checking if " & REPOS_DIR
-stdout.Write " is a GnuCash git repository... "
-If objFso.FolderExists(REPOS_DIR & "\.git") And objFso.FileExists(strGCbin) Then
- stdout.WriteLine "Most likely ok, won't clone"
-Else
- stdout.WriteLine "Not found"
- stdout.WriteLine "Set up GnuCash git repository... "
- objWsh.Run strGit & " clone " & REPOS_URL & " " & REPOS_DIR, 1, true
-
- If Not objFso.FileExists(strGCbin) Then
- stdout.WriteLine "Failed"
- stdout.WriteBlankLines (1)
- stdout.WriteLine "*** ERROR ***"
- stdout.WriteLine "Failed to set up GnuCash git repository."
- stdout.WriteBlankLines (1)
- stdout.WriteLine "Cannot continue until this has been resolved."
- AbortScript
- End If
- stdout.WriteLine "Ok"
-End If
-
-' Create custom.sh
-' ----------------
-strCustomSh = GC_WIN_REPOS_DIR & "\custom.sh"
-bExistingCustomSh = False
-If objFso.FileExists(strCustomSh) Then
- stdout.WriteLine "Found existing custom.sh file"
- bExistingCustomSh = True
-Else
- ' Create a custom.sh file that matches the parameters set at the beginning of this script
- ' This ensures install.sh will find the development environment we set up
- ' Note: we're deliberately not storing versions of used components in the autogenerated custom.sh
- ' This allows install.sh to update to newer versions if deemed useful
- stdout.Write "Autogenerating custom.sh file... "
- Set myRegExp = New RegExp
- myRegExp.Global = True
- myRegExp.Pattern = "\\"
-
- strGlobalDir = myRegExp.Replace (GLOBAL_DIR, "\\")
- strMingwDir = myRegExp.Replace (MINGW_DIR, "\\")
- strMsysDir = myRegExp.Replace (MINGW_DIR & "\msys\1.0", "\\")
- strTmpDir = myRegExp.Replace (TMP_DIR, "\\")
- strDownloadDir = myRegExp.Replace (DOWNLOAD_DIR, "\\")
- strGitDir = myRegExp.Replace (GIT_DIR, "\\")
- strGCWinReposDir = myRegExp.Replace (GC_WIN_REPOS_DIR, "\\")
- strReposDir = myRegExp.Replace (REPOS_DIR, "\\")
-
- Set objCustomSh = objFso.OpenTextFile( strCustomSh, ForWriting, True )
- objCustomSh.WriteLine "# custom.sh, automatically created by bootstrap_win_dev.vbs"
- objCustomSh.WriteLine "#"
- objCustomSh.WriteLine "# The parameters set here match the parameters used by"
- objCustomSh.WriteLine "# bootstrap_win_dev.vbs to set up the GnuCash development"
- objCustomSh.WriteLine "# environment and should ensure the install.sh works out"
- objCustomSh.WriteLine "# of the box."
- objCustomSh.WriteLine "#"
- objCustomSh.WriteLine "# You are free to modify these parameters to suit you,"
- objCustomSh.WriteLine "# but keep in mind that if you ever want to run"
- objCustomSh.WriteLine "# bootstrap_win_dev.vbs again you should make sure"
- objCustomSh.WriteLine "# the parameters it uses match the ones you set here."
- objCustomSh.WriteBlankLines 1
- objCustomSh.WriteLine "GLOBAL_DIR=" & strGlobalDir
- objCustomSh.WriteLine "MINGW_DIR=" & strMingwDir
- objCustomSh.WriteLine "MSYS_DIR=" & strMsysDir
- objCustomSh.WriteLine "TMP_DIR=" & strTmpDir
- objCustomSh.WriteLine "DOWNLOAD_DIR=" & strDownloadDir
- objCustomSh.WriteLine "GIT_DIR=" & strGitDir
- objCustomSh.WriteLine "REPOS_TYPE=git" ' Bootstrap only works with a git repo
- objCustomSh.WriteLine "GC_WIN_REPOS_URL=" & GC_WIN_REPOS_URL
- objCustomSh.WriteLine "GC_WIN_REPOS_DIR=" & strGCWinReposDir
- objCustomSh.WriteLine "REPOS_URL=" & REPOS_URL
- objCustomSh.WriteLine "REPOS_DIR=" & strReposDir
- objCustomSh.Close
- stdout.WriteLine "Success"
-End If
-
-
-' End message
-' -----------
-stdout.WriteBlankLines 1
-stdout.WriteLine "Bootstrap completed successfully !"
-stdout.WriteBlankLines 1
-stdout.WriteLine "You can now continue as follows"
-stdout.WriteLine "- Use git to checkout the desired branch/tag in " & REPOS_DIR
-stdout.WriteLine "- Open the msys shell"
-stdout.WriteLine "- cd " & GC_WIN_REPOS_DIR
-stdout.WriteLine "- Properly configure a custom.sh"
-stdout.WriteLine " (if you changed any default path in the bootstrap script)"
-stdout.WriteLine "- Run install.sh"
-stdout.WriteBlankLines 1
-stdout.WriteLine "Happy hacking !"
-
-AbortScript
-
-
-' Functions used in the script
-' ----------------------------
-' Initial message to user
-Sub Welcome
- If silent then
- ' Don't interact with user if in silent mode
- stdout.WriteLine "Skipping intro because silent mode was set"
- Exit Sub
- End If
-
- stdout.WriteLine "Boostrap GnuCash Development on Windows"
- stdout.WriteLine "---------------------------------------"
- stdout.WriteLine "This script is intended for people that wish to develop GnuCash on Windows"
- stdout.WriteLine "It will download and install the minimal set of tools"
- stdout.WriteLine "to run a first build of the GnuCash sources."
- stdout.WriteLine "It will install"
- stdout.WriteLine "- mingw-get, an msys shell and wget in " & MINGW_DIR
- stdout.WriteLine "- git in " & GIT_DIR
- stdout.WriteLine "- a gnucash-on-windows git repository cloned from"
- stdout.WriteLine " " & GC_WIN_REPOS_URL
- stdout.WriteLine " into " & GC_WIN_REPOS_DIR
- stdout.WriteLine "- a GnuCash git repository cloned from"
- stdout.WriteLine " " & REPOS_URL
- stdout.WriteLine " into " & REPOS_DIR
- stdout.WriteBlankLines 1
- stdout.WriteLine "Notes:"
- stdout.WriteLine "* Components already found in the given locations"
- stdout.WriteLine " won't be touched. Instead the available versions"
- stdout.WriteLine " will be used in that case."
- stdout.WriteLine "* If the proposed locations don't suit you, you can"
- stdout.WriteLine " pass alternate locations as named parameters to this script."
- stdout.WriteLine " For example to use c:\soft as base directory you can run this script as"
- stdout.WriteLine " bootstrap_win_dev.vbs /GLOBAL_DIR:c:\soft"
- stdout.WriteLine " Which parameters you can modify can be found near the beginning of this script."
- stdout.WriteBlankLines 1
- stdout.Write "Continue with the set up (Y/N) ? "
- chRead = stdin.ReadLine
- If Not (UCase(Left(chRead,1)) = "Y") Then
- stdout.WriteLine "Installation interrupted."
- AbortScript
- End If
-End Sub
-
-
-' Download a binary type file over http
-Sub HTTPDownloadBinaryFile( myURL, myPath )
-' This Sub downloads the FILE specified in myURL to the path specified in myPath.
-'
-' myURL must always end with a file name
-' myPath may be a directory or a file name; in either case the directory must exist
-'
-' Based on a script written by Rob van der Woude
-' http://www.robvanderwoude.com
-' Ref: https://stackoverflow.com/questions/29367130/downloading-a-file-in-vba-and-storing-it
-
- ' Standard housekeeping
- Dim i, objFile, objHTTP, strFile, strMsg
-
- Const adSaveCreateOverWrite = 2, adSaveCreateNotExist = 1
- Const adTypeBinary = 1
-
- ' Check if the specified target file or folder exists,
- ' and build the fully qualified path of the target file
- If objFso.FolderExists( myPath ) Then
- strFile = objFso.BuildPath( myPath, Mid( myURL, InStrRev( myURL, "/" ) + 1 ) )
- ElseIf objFso.FolderExists( Left( myPath, InStrRev( myPath, "\" ) - 1 ) ) Then
- strFile = myPath
- Else
- stdout.WriteLine "ERROR: Target folder not found."
- AbortScript
- End If
-
- ' Create an HTTP object
- Set objHTTP = CreateObject( "MSXML2.ServerXMLHTTP" )
-
- ' Download the specified URL
- objHTTP.Open "GET", myURL, False
- objHTTP.Send
-
- ' Write the downloaded byte stream to the target file
- If objHTTP.Status = 200 Then
- ' Create the target stream
- Set oStream = WScript.CreateObject( "ADODB.Stream" )
- oStream.Open
- oStream.Type = adTypeBinary
- oStream.Write objHTTP.responseBody
- oStream.SaveToFile strFile, adSaveCreateOverWrite ' 1 = no overwrite, 2 = overwrite
- ' Close the target file
- oStream.Close
- End If
-End Sub
-
-' Extract a zip file strZipFile into strFolder
-Function ExtractAll(strZipFile, strFolder)
- Set objShell = CreateObject("Shell.Application")
- If Not objFso.FolderExists(strFolder) Then
- objFso.CreateFolder(strFolder)
- End If
-
- intCount = objShell.NameSpace(strFolder).Items.Count
- Set colItems = objShell.NameSpace(strZipFile).Items
- objShell.NameSpace(strFolder).CopyHere colItems, 256
- Do Until objShell.NameSpace(strFolder).Items.Count = intCount + colItems.Count
- WScript.Sleep 200
- Loop
-End Function
-
-
-' Make sure we run in a console (so output is visible)
-' Blatantly copied from
-' https://stackoverflow.com/questions/4692542/force-a-vbs-to-run-using-cscript-instead-of-wscript
-Sub CheckStartMode
- Dim Arg, Str
- If Not LCase( Right( WScript.FullName, 12 ) ) = "\cscript.exe" Then
- For Each Arg In WScript.Arguments
- If InStr( Arg, " " ) Then Arg = """" & Arg & """"
- Str = Str & " " & Arg
- Next
- CreateObject( "WScript.Shell" ).Run _
- "cscript //nologo """ & _
- WScript.ScriptFullName & _
- """ " & Str
- WScript.Quit
- End If
-End Sub
-
-
-' Abort the script
-Sub AbortScript
- If silent then
- ' Don't interact with user if in silent mode
- Exit Sub
- End If
-
- stdout.WriteBlankLines 1
- stdout.Write "Pres enter to continue... "
- chRead = stdin.Read (1)
- WScript.Quit
-End Sub
-
diff --git a/buildserver/README.txt b/buildserver/README.txt
deleted file mode 100644
index 341c1e8..0000000
--- a/buildserver/README.txt
+++ /dev/null
@@ -1,94 +0,0 @@
-*- Buildserver -*
------------------
-
-The build server is a set of scripts written to allow
-a Windows pc to repeatedly build the Gnucash
-Windows installer starting from the GnuCash sources.
-
-It is meant to set up some nightly builds system and is
-currently configured to
-- build the gnucash master (development) branch
-- build any new release tag
-- optionally build the gnucash maint (stable) branch
-
-Note: whether these scripts really run 'nightly' or at
- another interval depends on how the build server
- is configured (see below).
-
-
-Setup
------
-
-Note: if you have already set up a gnucash build environment using
- bootstrap_win_dev.vbs and install.sh you can skip to step 5.
-
-1. Download bootstrap_win_dev.vbs from the gnucash-on-windows
- repository on Github. Direct url:
- https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/bootstrap_win_dev.vbs
-
-2. Run this script by double-clicking it and follow the instructions.
- If the script's output window closes before you get to a "Happy hacking"
- message then something went wrong. To figure out what you can instead
- open a Windows command prompt (cmd.exe) and run the script as
- cscript.exe <path\to>\bootstrap_win_dev.vbs
- Be sure to replace <path\to> with the correct path.
-
-Note: by default everything will be installed inside c:\gcdev\
- You could alter this location and some other paths by passing
- some parameters to bootstrap_win_dev.vbs. Which parameters exist can
- be read in the bootstrap script itself. You should take care however that
- mingw/msys and the gnucash-on-windows git repository will be installed
- where the build_periodic.bat script expects them. If not your buildserver
- will fail to work.
-
-3. If this has run successfully open an msys (bash) console. Unless
- you have altered the default paths, you will find this in
- c:\gcdev\mingw\msys\1.0\msys.bat
-
-4. Let's run the script to build gnucash and its dependencies once manually.
- This is mainly necessary to get html help installed which requires human
- interaction. To do so enter the following commands in msys:
- cd /c/gcdev/gnucash-on-windows.git
- ./install.sh
-
- You can interrupt install.sh after html help is installed if you like.
-
-5. (Optional) The build server scripts have the option to upload the
- Gnucash Windows installer and build log to a remote server. For this
- to work it requires the scp.exe tool to be installed. To do so run
- this command in the msys console:
- mingw-get install msys-openssh
-
-Note: the feature to upload the installer and log are currently still
- using some hard coded parameters:
- - it will only attempt to upload if the build machine is called
- 'gnucash-win32'
- - it will always upload to code.gnucash.org:public_html/win32
- as user 'upload'
- So it's currently only useful on the primary build server.
-
-6. The next step is to tell Windows to run the buildserver scripts at
- regular intervals. For this you can set up a "Scheduled Task" via
- the Windows Control Panel. Configure the task as follows:
- - Run: c:\gcdev\gnucash-on-windows.git\buildserver\build_periodic.bat
- - Start in: c:\gcdev\gnucash-on-windows.git
- - Choose a schedule. For nightly builds schedule it to run every day.
- You are free to select other intervals as you see fit.
-
-7. Wait until the next scheduled time has passed and check how it went.
- Note that the first time the build can take a long time. The current
- primary build server takes about 5-6 hours. This is a virtual machine
- running Windows XP. While the build is still running you should see
- a windows console in which the build output is printed as the
- build proceeds. This window closes automatically when the build finishes.
-
- Upon a succesfull build you should find the newly created Gnucash
- Windows installer in c:\gcdev\output along with the build log.
-
- If that is not the case you can check the build log to learn what went
- wrong. If there is even no build log that means the build encountered
- an error pretty early in the process (before logging has started). To
- learn what this was you can open a Windows command prompt (cmd.exe) and
- manually run
- c:\gcdev\gnucash-on-windows.git\buildserver\build_periodic.bat
- That should give some indication of what is failing.
diff --git a/buildserver/build_package.sh b/buildserver/build_package.sh
deleted file mode 100644
index 5a0b6dd..0000000
--- a/buildserver/build_package.sh
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/bin/sh
-
-#
-# This assumes we're in the "gnucash-on-windows" directory for the correct build.
-# It could be for tag build environment, or it could
-# be the top-level daily-build gnucash-on-windows directory.
-# For this script to work, git must have been setup before
-# in a way that doesn't conflict with the GnuCash build.
-# The easiest way to do so is to run the build once manually
-# with a properly set up custom.sh.
-#
-
-set -o pipefail
-set -e
-LOG_DIR=build-logs
-BUILD_HOST="gnucash-win32"
-LOG_HOST=upload at code.gnucash.org:public_html/win32
-
-function on_error() {
- if [ `hostname` = ${BUILD_HOST} ]; then
- scp -p ${LOGFILE} ${LOG_HOST}/$LOG_DIR
- fi
- exit
-}
-
-BUILDSERVER_DIR="$(dirname "$0")"
-GC_WIN_DIR="$BUILDSERVER_DIR/.."
-. "$GC_WIN_DIR/functions.sh"
-. ./defaults.sh
-. ./custom.sh
-
-_GIT_UDIR=`unix_path $GIT_DIR`
-set_env "$_GIT_UDIR/bin/git" GIT_CMD
-export GIT_CMD
-tag="${1:-$GNUCASH_SCM_REV}"
-
-# Determine where to upload to
-# NOTE: this assumes "tag" to be either a tag or a branch, not a
-# commit hash. It will probably work with a hash as well,
-# but will create a directory for the hash
-_REPOS_UDIR=`unix_path $REPOS_DIR`
-qpushd "$_REPOS_UDIR"
-if [ -n "$($GIT_CMD tag -l $tag)" ]; then
- TARGET_DIR=releases
- LOG_TAG=$tag
-else
- TARGET_DIR=$tag
- LOG_TAG=$TARGET_DIR
-fi
-qpopd
-
-set_default OUTPUT_DIR $GLOBAL_DIR\\output
-LOGFILENAME=build-${LOG_TAG}-`date +'%Y-%m-%d'`.log
-
-_OUTPUT_DIR=`unix_path $OUTPUT_DIR`
-LOGFILE=${_OUTPUT_DIR}/${LOGFILENAME}
-mkdir -p ${_OUTPUT_DIR}
-
-# Small hack to create $LOG_DIR on the webserver if it doesn't exist yet
-if [ `hostname` = ${BUILD_HOST} ]; then
- mkdir -p "$_OUTPUT_DIR/$LOG_DIR"
- scp -r "$_OUTPUT_DIR/$LOG_DIR" ${LOG_HOST}
- rmdir "$_OUTPUT_DIR/$LOG_DIR"
-fi
-
-# If we're running on the build server, copy a temporary logfile
-# content to the webserver to signal that the build is in progress
-if [ `hostname` = ${BUILD_HOST} ]; then
- _PWD=`pwd`
- echo "Build for tag \"${tag}\" is in progress (current working directory: ${_PWD}) ..." > ${LOGFILE}
- scp -p ${LOGFILE} ${LOG_HOST}/${LOG_DIR}
-fi
-
-set +e
-trap on_error ERR
-
-# Run the compile
-_GC_WIN_REPOS_UDIR=`unix_path $GC_WIN_REPOS_DIR`
-$_GC_WIN_REPOS_UDIR/install.sh 2>&1 | tee ${LOGFILE}
-
-# This directory needs to be removed before calling dist.sh
-DIST_DIR=${INSTALL_DIR}\\..\\dist
-_DIST_UDIR=`unix_path $DIST_DIR`
-rm -rf ${_DIST_UDIR}
-
-# Create the installer
-$_GC_WIN_REPOS_UDIR/dist.sh 2>&1 | tee -a ${LOGFILE}
-
-# Choose the output filename based on our "build_from_tarball" setting
-# Make sure this logic matches the logic in dist.sh!
-_BUILD_UDIR=`unix_path $BUILD_DIR`
-_GNUCASH_UDIR=`unix_path $GNUCASH_DIR`
-_GNUCASH_CONFIG_H=${_BUILD_UDIR}/config.h
-if [ "$WITH_CMAKE" == "yes" ]; then
- _GNUCASH_CONFIG_H=${_BUILD_UDIR}/src/config.h
-fi
-PKG_VERSION=`grep PACKAGE_VERSION ${_GNUCASH_CONFIG_H} | cut -d" " -f3 | cut -d\" -f2 `
-REVISION=`grep GNUCASH_SCM_REV ${_BUILD_UDIR}/src/core-utils/gnc-vcs-info.h | cut -d" " -f3 | cut -d\" -f2 `
-
-if [ "$BUILD_FROM_TARBALL" = "no" ]; then
- SETUP_FILENAME="gnucash-${PKG_VERSION}-$(date +'%Y-%m-%d')-git-${REVISION}-setup.exe"
-else
- SETUP_FILENAME="gnucash-${PKG_VERSION}-setup.exe"
-fi
-# Copy the resulting installer into the output directory
-mv ${_GNUCASH_UDIR}/${SETUP_FILENAME} ${_OUTPUT_DIR}
-echo "Buildserver has moved final installer to"
-echo ${_OUTPUT_DIR}/${SETUP_FILENAME}
-
-#
-# Verify that PKG_VERSION == $tag, and add to the build log if it's not.
-# Note: only do this if tag exists and matches x.y.z
-#
-if [ -n "${tag}" ] ; then
- case "${tag}" in
- [0-9]*.[0-9]*.[0-9]*)
- if [ "${PKG_VERSION}" != "${tag}" ] ; then
- echo "" >> ${LOGFILE}
- echo " *** ERROR: Package Version ${PKG_VERSION} doesn't match Tag ${tag}" >> ${LOGFILE}
- echo "" >> ${LOGFILE}
- fi
- ;;
- esac
-fi
-
-# If we're running on the build server then upload the files
-if [ `hostname` = ${BUILD_HOST} ]; then
- # Small hack to create the $TARGET_DIR on the webserver if it doesn't exist yet
- mkdir -p "$_OUTPUT_DIR/$TARGET_DIR"
- scp -r "$_OUTPUT_DIR/$TARGET_DIR" ${LOG_HOST}
- rmdir "$_OUTPUT_DIR/$TARGET_DIR"
- # Copy the files to the chosen target directory
- scp -p ${LOGFILE} ${LOG_HOST}/$LOG_DIR
- scp -p ${_OUTPUT_DIR}/${SETUP_FILENAME} ${LOG_HOST}/$TARGET_DIR
-fi
diff --git a/buildserver/build_periodic.bat b/buildserver/build_periodic.bat
deleted file mode 100644
index a0256e0..0000000
--- a/buildserver/build_periodic.bat
+++ /dev/null
@@ -1,14 +0,0 @@
-rem This is the Windows Batch Script for the periodic builds.
-rem It simply calls the actual MSYS Shell script to perform
-rem the periodic build and then the tag builds.
-rem Typically this is called from a timed command on Windows.
-rem On the GnuCash build server this timed command is run daily which the comments below suggest.
-
-cd c:\gcdev\gnucash-on-windows.git\
-
-rem Tags build for 2.6.1 and newer (daily -- only tags that weren't built yet)
-c:\gcdev\mingw\msys\1.0\bin\sh.exe --login c:\gcdev\gnucash-on-windows.git\buildserver\build_tags.sh
-rem maintenance branch build (daily)
-c:\gcdev-maint\mingw\msys\1.0\bin\sh.exe --login c:\gcdev-maint\gnucash-on-windows.git\buildserver\build_periodic.sh
-rem Development build (daily)
-rem This doesn't work any more. c:\gcdev\mingw\msys\1.0\bin\sh.exe --login c:\gcdev\gnucash-on-windows.git\buildserver\build_periodic.sh
diff --git a/buildserver/build_periodic.sh b/buildserver/build_periodic.sh
deleted file mode 100644
index 3336b7d..0000000
--- a/buildserver/build_periodic.sh
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/sh
-#
-# Notes:
-# 1. for this script to work, git must have been setup before
-# in a way that doesn't conflict with the GnuCash build.
-# If you set up the build environment using the bootstrap script
-# this should have been taken care of automatically.
-#
-# 2. Should this script change in the source repository, then the
-# git pull below will fail due to a limitation in Windows that
-# won't allow to change a file that is "in use". So in the rare
-# situation this script needs to be updated, you will need to
-# run the git pull once yourself.
-#
-# 3. This script assumes it's called with a full absolute path.
-# eg: c:\\gcdev\\gnucash-on-windows.git\\buildserver\\build_periodic.sh
-# or /c/gcdev/gnucash-on-windows.git/buildserver/build_periodic.sh
-# Failing to do so will break the build.
-
-set -e
-
-# Determine how frequently to run this script
-# Currently only 'weekly' restricts the run frequency
-# Any other periodicity will just run the script regardless of how long it has
-# been since the last run.
-# As this script is meant to be called from build_periodic.bat the frequency
-# that script is run will effectively determine how regularly this script is run.
-periodicity=$1
-if [ x$periodicity = xweekly ]
-then
- ## Only run this script on Monday night (first day of the week)
- if [ `date +%u` != 1 ]
- then
- exit
- fi
-fi
-
-BUILDSERVER_DIR="$(dirname "$0")"
-GC_WIN_DIR="$BUILDSERVER_DIR/.."
-. "$GC_WIN_DIR/functions.sh"
-
-qpushd "$GC_WIN_DIR"
-. ./defaults.sh
-
-# Variables
-_GIT_UDIR=`unix_path $GIT_DIR`
-set_env "$_GIT_UDIR/bin/git" GIT_CMD
-export GIT_CMD
-
-# Update the gnucash-on-windows build scripts
-echo "Pulling latest changes from gnucash-on-windows..."
-_GC_WIN_REPOS_UDIR=`unix_path $GC_WIN_REPOS_DIR`
-qpushd "$_GC_WIN_REPOS_UDIR"
-$GIT_CMD pull
-qpopd
-
-################################################################
-# determine if there are any new commits since the last time we ran
-#
-_REPOS_UDIR=`unix_path $REPOS_DIR`
-qpushd "$_REPOS_UDIR"
-
-# Update the gnucash repository
-echo "Pulling latest changes from gnucash.git..."
-$GIT_CMD pull
-# If we don't have a rev file then start from 'now' and force a build
-revfile=$_GC_WIN_REPOS_UDIR/last_rev_periodic
-if [ ! -f ${revfile} ] ; then
- oldrev=a # definitely an invalid, so non-existing git rev
-else
- oldrev=$(cat ${revfile})
-fi
-newrev=$($GIT_CMD rev-parse HEAD)
-qpopd # leave gnucash repository
-
-if [[ "${oldrev}" != "${newrev}" ]]; then
- $BUILDSERVER_DIR/build_package.sh
-fi
-
-# move the new file into place, will only happen if the build was successful
-echo ${newrev} > ${revfile}
-
-qpopd # return to directory the script was invoked from (not necessarily the directory this script resides in)
diff --git a/buildserver/build_tags.sh b/buildserver/build_tags.sh
deleted file mode 100644
index a5f0f8d..0000000
--- a/buildserver/build_tags.sh
+++ /dev/null
@@ -1,152 +0,0 @@
-#!/bin/sh
-#
-# Notes:
-# 1. for this script to work, git must have been setup before
-# in a way that doesn't conflict with the GnuCash build.
-# The easiest way to do so is to run the build once manually
-# with a properly set up custom.sh.
-#
-# 2. Should this script change in the source repository, then the
-# git pull below will fail due to a limitation in Windows that
-# won't allow to change a file that is "in use". So in the rare
-# situation this script needs to be updated, you will need to
-# run the git pull once yourself.
-#
-# 3. This script assumes it's called with a full absolute path.
-# eg: c:\\gcdev\\gnucash-on-windows.git\\buildserver\\build_tags.sh
-# or /c/gcdev/gnucash-on-windows.git/buildserver/build_tags.sh
-# Failing to do so will break the build.
-
-set -e
-
-################################################################
-# Setup our environment (we need the DOWNLOAD_DIR)
-
-BUILDSERVER_DIR="$(dirname "$0")"
-GC_WIN_DIR="$BUILDSERVER_DIR/.."
-. "$GC_WIN_DIR/functions.sh"
-
-qpushd "$GC_WIN_DIR"
-. ./defaults.sh
-
-# Variables
-_GIT_UDIR=`unix_path $GIT_DIR`
-set_env "$_GIT_UDIR/bin/git" GIT_CMD
-export GIT_CMD
-
-# Update the gnucash-on-windows build scripts
-echo "Pulling latest changes from gnucash-on-windows..."
-_GC_WIN_REPOS_UDIR=`unix_path $GC_WIN_REPOS_DIR`
-qpushd "$_GC_WIN_REPOS_UDIR"
-$GIT_CMD pull
-. ./functions.sh
-. ./defaults.sh
-qpopd
-
-
-################################################################
-# determine if there are any new tags since the last time we ran
-#
-_REPOS_UDIR=`unix_path $REPOS_DIR`
-qpushd "$_REPOS_UDIR"
-
-# Update the gnucash repository
-echo "Fetching new tags from upstream repository..."
-$GIT_CMD fetch -t
-
-# If we don't have a tagfile then start from 'now'
-tagfile=$_GC_WIN_REPOS_UDIR/tags
-if [ ! -f ${tagfile} ] ; then
- for one_tag in $($GIT_CMD tag)
- do
- tag_hash=$($GIT_CMD rev-parse ${one_tag})
- echo ${one_tag}/${tag_hash} >> ${tagfile}
- done
-fi
-
-# Figure out the new set of tags
-prev_built_tags="$(cat "${tagfile}")"
-built_tags=
-tags=
-rm -f ${tagfile}.new
-for one_tag in $($GIT_CMD tag)
-do
- tag_hash=$($GIT_CMD rev-parse ${one_tag})
- if [ -n "$(grep ${one_tag}/${tag_hash} <<< "${prev_built_tags}")" ]
- then
- built_tags="${built_tags}${one_tag}/${tag_hash}"$'\n'
- else
- tags="${tags}${one_tag}/${tag_hash}"$'\n'
- fi
-done
-qpopd
-
-qpopd # return to directory the script was invoked from (not necessarily the directory this script resides in)
-
-################################################################
-# Now iterate over all the new tags (if any) and build a package
-
-for tag_rev in $tags ; do
- tag_hash=${tag_rev#*/}
- tag=${tag_rev%/*}
-
- echo "Building tag $tag"
-
- # Git builds are only supported from 2.5 up
- get_major_minor $tag
- if (( $major_minor < 205 ))
- then
- echo " *** Tag $tag is older than 2.5 or not a release tag. Skipping."
- else
-
- TAG_GLOBAL_DIR="c:\\gcdev\\gnucash-${tag}"
- _TAG_GLOBAL_UDIR=$(unix_path "$TAG_GLOBAL_DIR")
- rm -fr $_TAG_GLOBAL_UDIR
-
- # Set up a clean build environment for this tag
- # This will automatically create a custom.sh with
- # several parameters correctly pre-set like
- # GLOBAL_DIR, DOWNLOAD_DIR,...
- cscript.exe $_GC_WIN_REPOS_UDIR/bootstrap_win_dev.vbs /silent:yes /GLOBAL_DIR:$TAG_GLOBAL_DIR /DOWNLOAD_DIR:$DOWNLOAD_DIR /GIT_DIR:$GIT_DIR
-
- # Check out the tag and setup custom.sh
- echo "Checking out tag $tag"
- TAG_REPOS_DIR="${TAG_GLOBAL_DIR}\\gnucash.git"
- _TAG_REPOS_UDIR=$(unix_path "$TAG_REPOS_DIR")
- qpushd $TAG_REPOS_DIR
- $GIT_CMD checkout $tag
- qpopd
-
- TAG_WIN_REPOS_DIR="${TAG_GLOBAL_DIR}\\gnucash-on-windows.git"
- _TAG_WIN_REPOS_UDIR=$(unix_path "$TAG_WIN_REPOS_DIR")
-
- # BUILD_FROM_TARBALL is special:
- # in install.sh place we check !=yes, in defaults.sh =yes, in dist.sh =no
- # We want it to look like 'no' in install and defaults, but yes in dist
- # so this hack works!
- echo "BUILD_FROM_TARBALL=maybe" >> ${_TAG_WIN_REPOS_UDIR}/custom.sh
-
- # Point HH_DIR at the global installation because we don't need to redo it
- echo -n "HH_DIR=" >> ${_TAG_WIN_REPOS_UDIR}/custom.sh
- echo "${GLOBAL_DIR}\\hh" | sed -e 's/\\/\\\\/g' >> ${_TAG_WIN_REPOS_UDIR}/custom.sh
-
- # Inform the build scripts of the tag we're building.
- echo "GNUCASH_SCM_REV=$tag" >> ${_TAG_WIN_REPOS_UDIR}/custom.sh
- #Set up CMAKE and NINJA build:
- echo "WITH_CMAKE=yes" >> ${_TAG_WIN_REPOS_UDIR}/custom.sh
- echo "WITH_NINJA=yes" >> ${_TAG_WIN_REPOS_UDIR}/custom.sh
-
- # Now build the tag! (this will upload it too)
- # Use the build_package script from master (cwd), not from the tag
- qpushd ${_TAG_WIN_REPOS_UDIR}
- ${BUILDSERVER_DIR}/build_package.sh ${tag}
- qpopd
-
- fi
-
- # Successful build of one tag. We may be in a loop to build several tags.
- # So mark this one as done to prevent it from being restarted if a subsequent
- # build fails.
- built_tags="${built_tags}${tag_rev}"$'\n'
- echo "${built_tags}" | sort | grep -v '^$' > ${tagfile}
-done
diff --git a/cmake/custom.cmake b/cmake/custom.cmake
deleted file mode 100644
index 7d2452c..0000000
--- a/cmake/custom.cmake
+++ /dev/null
@@ -1,23 +0,0 @@
-# Note: All directories must be without spaces!
-#
-# set (REPOS_URL "git at github.com:Gnucash/gnucash.git")
-# set (SF_MIRROR "http://switch.dl.sourceforge.net/sourceforge")
-# set (DISABLE_OPTIMIZATIONS yes)
-set (GLOBAL_DIR /c/gcdev) # all directories will use this
-# set (WGET_RATE 50k) #limit download bandwith to 50KB/s
-# set (NO_SAVE_PROFILE yes) # don't save env settings to /etc/profile.d
-# set (QTDIR c:/Qt/4.2.3)
-# set (CROSS_COMPILE yes)
-#EXTRA_CFLAGS="-fno-builtin-dgettext -fno-builtin-towupper -fno-builtin-iswlower"
-set (GLOBAL_BUILD_DIR /c/gcdev)
-set (MINGW_DIR=${GLOBAL_BUILD_DIR}/mingw)
-set (MSYS_DIR ${MINGW_DIR}/msys/1.0)
-set (TMP_DIR c:/gcdev/tmp)
-set (DOWNLOAD_DIR=${GLOBAL_DIR}/downloads)
-set (GIT_DIR ${GLOBAL_DIR}/git-1.9.4)
-set (REPOS_TYPE git)
-set (GC_WIN_REPOS_URL ssh://code.gnucash.org/gnucash-on-windows)
-set (GC_WIN_REPOS_DIR ${GLOBAL_BUILD_DIR}/gnucash-on-windows)
-set (REPOS_URL ssh://code.gnucash.org/gnucash)
-set (REPOS_DIR ${GLOBAL_BUILD_DIR}/gnucash.git)
-
diff --git a/cmake/defaults.cmake b/cmake/defaults.cmake
deleted file mode 100644
index a85754c..0000000
--- a/cmake/defaults.cmake
+++ /dev/null
@@ -1,399 +0,0 @@
-# Note: All directories must be without spaces!
-#
-
-set (GLOBAL_DIR c:/gcdev)
-set (GLOBAL_BUILD_DIR c:/gcdev)
-set (GLOBAL_DEP_BUILD_DIR ${GLOBAL_DIR}/dependencies)
-set (TMP_DIR ${GLOBAL_DIR}/tmp)
-set (DOWNLOAD_DIR ${GLOBAL_DIR}/downloads)
-
-if ($ENV{BUILD_FROM_TARBALL})
- if (-f "../../src/swig-runtime.h")
- set (BUILD_FROM_TARBALL yes)
- else()
- set (BUILD_FROM_TARBALL no)
- endif()
-endif()
-
-set (GC_WIN_REPOS_DIR ${GLOBAL_DIR}/gnucash-on-windows.git)
-set (REPOS_DIR ${GLOBAL_DIR}/gnucash.git)
-if (${BUILD_FROM_TARBALL})
- set (GNUCASH_DIR ${REPOS_DIR})
- # keep this pointing from BUILD_DIR to REPOS_DIR
- set (REL_REPOS_DIR ..)
-else()
- set (GNUCASH_DIR ${GLOBAL_DIR}/gnucash)
- # keep this pointing from BUILD_DIR to REPOS_DIR
- set (REL_REPOS_DIR ../../gnucash.git)
-
- set (REPOS_TYPE "git")
- set (GNUCASH_SCM_REV "master")
- set (REPOS_URL "git://github.com/Gnucash/gnucash.git")
-endif()
-set (BUILD_DIR ${GNUCASH_DIR}/build)
-if (${WITH_CMAKE})
- set (BUILD_DIR ${GNUCASH_DIR}/cmake-build)
-endif()
-set (INSTALL_DIR ${GNUCASH_DIR}/inst)
-
-set (DIST_DIR ${GNUCASH_DIR}/dist)
-
-set (WITH_CUTECASH no)
-set (WITH_CMAKE no)
-set (WITH_NINJA no)
-set (CUTECASH_BUILD_DIR ${GNUCASH_DIR}/build-cutecash)
-
-
-
-####
-# For cross-compiling, change this to "yes"
-set (CROSS_COMPILE "no")
-
-# If "yes", build without optimizations (-O0) and ease debugging
-set (DISABLE_OPTIMIZATIONS no)
-
-set (MINGW_DIR ${GLOBAL_DIR}/mingw)
-set (MSYS_DIR ${MINGW_DIR}/msys)
-
-# tools here means binaries runnable without other DLLs or data files
-set (TOOLS_DIR ${GLOBAL_DIR}/tools)
-set (MSYS_BISON_VERSION "2.4.2-1")
-set (MSYS_FLEX_VERSION "2.5.35-2")
-set (MSYS_M4_VERSION "1.4.16-2")
-set (MSYS_PATCH_VERSION "2.6.1-1")
-set (MSYS_PERL_VERSION "5.8.8-1")
-set (MSYS_UNZIP_VERSION "6.0-1")
-set (MSYS_WGET_VERSION "1.12-1")
-
-set (SF_MIRROR "http://downloads.sf.net")
-set (GTK_MIRROR "ftp.gtk.org/pub")
-set (GNOME_MIRROR "http://ftp.gnome.org/pub/gnome")
-set (FREEDESKTOP_MIRROR "http://www.freedesktop.org/software")
-set (GNOME_SRC_MIRROR ${GNOME_MIRROR}/sources)
-set (GNOME_WIN32_URL "${GNOME_MIRROR}/binaries/win32")
-set (GNOME_WIN32_DEPS_URL "${GNOME_WIN32_URL}/dependencies")
-set (GC_DEPS_URL "${SF_MIRROR}/gnucash/Dependencies")
-
-
-# Mingw toolchain
-
-set (MINGW_AUTOCONF_VERSION "10-1")
-set (MINGW_AUTOCONF21_VERSION "2.13-4")
-set (MINGW_AUTOCONF25_VERSION "2.68-1")
-set (MINGW_AUTOMAKE111_VERSION "1.11.1-1")
-set (MINGW_AUTOMAKE110_VERSION "1.10.2-1")
-set (MINGW_AUTOMAKE19_VERSION "1.9.6-3")
-set (MINGW_AUTOMAKE18_VERSION "1.8.5-1")
-set (MINGW_AUTOMAKE17_VERSION "1.7.9-1")
-set (MINGW_AUTOMAKE16_VERSION "1.6.3-1")
-set (MINGW_AUTOMAKE15_VERSION "1.5-1")
-set (MINGW_AUTOMAKE14_VERSION "1.4p6-1")
-set (MINGW_AUTOMAKE_VERSION "4-1")
-set (MINGW_BINUTILS_VERSION "2.23.1-1")
-set (MINGW_BINUTILS_VERSION "2.23.1-1")
-set (MINGW_GCC_VERSION "4.8.1-3")
-set (MINGW_GETTEXT_VERSION "0.18.1.1-2")
-set (MINGW_GMP_VERSION "5.1.2-1")
-set (MINGW_LIBEXPAT_VERSION "2.1.0-1")
-set (MINGW_LIBICONV_VERSION "1.14-2")
-set (MINGW_LIBLTDL_VERSION "2.4-1")
-set (MINGW_LIBTOOL_VERSION "2.4-1")
-set (MINGW_MPC_VERSION "1.0.1-2")
-set (MINGW_MPFR_VERSION "3.1.2-2")
-set (MINGW_PEXPORTS_VERSION "0.46")
-set (MINGW_PTHREAD_W32_VERSION "2.9.1-1")
-set (MINGW_RT_VERSION "3.21")
-set (MINGW_ZLIB_VERSION "1.2.8-1")
-set (MINGW_W32API_VERSION "3.17-2")
-set (MINGW_MAKE_VERSION "3.82-5")
-
-if (${CROSS_COMPILE})
- # Use native toolchain
- set (LD ld)
- set (CC gcc)
- set (DLLTOOL dlltool)
- set (RANLIB ranlib)
-
- # For native build on Windows we can use the precompiled binaries
- # defined above
-
-else()
- # What flavor of GCC cross-compiler are we building?
- set (TARGET "mingw32")
-
- # Insert your cross-compiler mingw32 bin-directories here
- set (HOST_XCOMPILE "--host=${TARGET}")
-
- # Where does the cross-compiler go?
- # This should be the directory into which your cross-compiler
- # will be installed. Remember that if you set this to a directory
- # that only root has write access to, you will need to run this
- # script as root.
- set (PREFIX `unix_path ${MINGW_DIR}`)
-
- # Use native toolchain
- set (LD ${TARGET}-ld)
- set (CC ${TARGET}-gcc)
- set (DLLTOOL ${TARGET}-dlltool)
- set (RANLIB ${TARGET}-ranlib)
-
- # For cross compilation we need to build our own toolchain
- set (BINUTILS_SRC_URL "${SF_MIRROR}/mingw/binutils-2.20.1-src.tar.gz")
- set (GCC_CORE_SRC_URL "${SF_MIRROR}/mingw/gcc-core-3.4.5-20060117-2-src.tar.gz")
- set (GCC_GPP_SRC_URL "${SF_MIRROR}/mingw/gcc-g++-3.4.5-20060117-2-src.tar.gz")
- # Not required for GnuCash
- #set (GCC_G77_SRC_URL "${SF_MIRROR}/mingw/gcc-g77-3.4.5-20060117-2-src.tar.gz")
- #set (GCC_OBJC_SRC_URL "${SF_MIRROR}/mingw/gcc-objc-3.4.5-20060117-2-src.tar.gz")
- #set (GCC_JAVA_SRC_URL "${SF_MIRROR}/mingw/gcc-java-3.4.5-20060117-2-src.tar.gz")
- #set (GCC_ADA_SRC_URL "${SF_MIRROR}/mingw/gcc-ada-3.4.5-20060117-2-src.tar.gz")
-
- # What directory will the cross-compiler be built in?
- # This is the directory into which source archives will
- # be downloaded, expanded, compiled, etc. You need to
- # have write-access to this directory. If you leave it
- # blank, it defaults to the current directory.
- set (XC_BUILD_DIR `unix_path ${TMP_DIR}`)
-
- # Purge anything and everything already in the ${PREFIX}
- #(also known as the destination or installation) directory?
- # Set to "yes" to purge, any other value omits the purge step.
- set (PURGE_DIR "no")
-
- # If you wish to apply a patch to GCC, put it in the SRC_DIR
- # and add its filename here.
- set (GCC_PATCH "")
-
- # These are the files from the SDL website
- # These are optional, set them to "" if you don't want them
- #set (SDL_URL "http://www.libsdl.org/extras/win32/common")
- #set (OPENGL_URL "${SDL_URL}/opengl-devel.tar.gz")
- #set (DIRECTX_URL "${SDL_URL}/directx-devel.tar.gz")
-endif()
-
-set (CROSS_GCC_SRC_URL "${SF_MIRROR}/mingw/gcc-4.4.0-src.tar.bz2")
-set (CROSS_GCC_SRC2_URL "${SF_MIRROR}/mingw/gcc-4.4.0-mingw32-src-2.tar.gz")
-#set (CROSS_GCC_SRC_URL "${SF_MIRROR}/mingw/gcc-4.5.0-1-mingw32-src.tar.lzma")
-set (CROSS_BINUTILS_SRC_URL "${SF_MIRROR}/mingw/binutils-2.20.1-src.tar.gz")
-
-# do not use regex-gnu or regex-spencer v3.8.g3, see bug #382852
-set (REGEX_URL "${GNOME_WIN32_DEPS_URL}/libgnurx-2.5.zip")
-set (REGEX_DEV_URL "${GNOME_WIN32_DEPS_URL}/libgnurx-dev-2.5.zip")
-set (REGEX_DIR ${GLOBAL_DIR}/regex)
-
-set (READLINE_BIN_URL "${SF_MIRROR}/gnuwin32/readline-5.0-1-bin.zip")
-set (READLINE_LIB_URL "${SF_MIRROR}/gnuwin32/readline-5.0-1-lib.zip")
-set (READLINE_DIR ${GLOBAL_DIR}/readline)
-
-set (GMP_URL "ftp://ftp.gnu.org/gnu/gmp/gmp-4.3.1.tar.bz2")
-set (GMP_ABI 32)
-set (GMP_DIR ${GLOBAL_DIR}/gmp)
-set (GMP5_BIN_URL "${SF_MIRROR}/mingw/libgmp-5.0.1-1-mingw32-dll-10.tar.lzma")
-set (GMP5_DEV_URL "${SF_MIRROR}/mingw/gmp-5.0.1-1-mingw32-dev.tar.lzma")
-
-SET (GUILE_VERSION "1.8.8")
-set (GUILE_URL "http://ftp.gnu.org/pub/gnu/guile/guile-${GUILE_VERSION}.tar.gz")
-set (GUILE_DIR ${GLOBAL_DIR}/guile)
-set (GUILE_PATCH ${CMAKE_SOURCE_DIR}/guile-1.8.patch)
-
-set (OPENSSL_URL "http://www.openssl.org/source/openssl-0.9.8j.tar.gz")
-set (OPENSSL_DIR ${GLOBAL_DIR}/openssl)
-
-SET (ZLIB_VERSION "1.2.8")
-SET (ZLIB_SRC_URL ${SF_MIRROR}/libpng/zlib-${ZLIB_VERSION}.tar.xz)
-# This is the last version of GLib that supports Windows XP.
-SET (GLIB_MINOR_VERSION "2.42")
-SET (GLIB_MICRO_VERSION "2")
-set (GLIB_VERSION ${GLIB_MINOR_VERSION}.${GLIB_MICRO_VERSION})
-SET (GLIB_SRC_URL ${GNOME_SRC_MIRROR}/glib/${GLIB_MINOR_VERSION}/glib-${GLIB_VERSION}.tar.xz)
-SET (GNUTLS_VERSION "3.2.19")
-set (BUILD_GNUTLS_FROM_SOURCE "no")
-set (GNUTLS_URL "${GC_DEPS_URL}/gnutls-3.2.19-minGW.tgz")
-set (GNUTLS_DEV_URL "${GC_DEPS_URL}/gnutls-3.2.19-dev-minGW.tgz")
-set (GNUTLS_PKG_URL "ftp://ftp.gnutls.org/gcrypt/gnutls/w32/gnutls-${GNUTLS_VERSION}-w32.zip")
-SET (GCRYPT_VERSION "1.6.2")
-set (GCRYPT_SRC_URL "ftp://ftp.gnutls.org/gcrypt/libgcrypt/libgcrypt-${GCRYPT_VERSION}.tar.bz2")
-SET (GPG_ERROR_VERSION "1.17")
-set (GPG_ERROR_SRC_URL "ftp://ftp.gnutls.org/gcrypt/libgpg-error/libgpg-error-${GPG_ERROR_VERSION}.tar.bz2")
-set (GLIB_NETWORKING_SRC_URL "${GNOME_MIRROR}/sources/glib-networking/2.38/glib-networking-${GLIB_VERSION}.tar.xz")
-set (GNUTLS_DIR ${GLOBAL_DIR}/gnutls)
-
-set (MINGW_UTILS_URL "${SF_MIRROR}/mingw/mingw-utils-0.3.tar.gz")
-set (MINGW_UTILS_DIR ${TOOLS_DIR})
-
-set (EXETYPE_SCRIPT ${CMAKE_SOURCE_DIR}/exetype.pl)
-set (EXETYPE_DIR ${TOOLS_DIR})
-
-set (XMLSOFT_URL "http://xmlsoft.org/sources/win32")
-set (XSLT_BASE_URL "http://ftp.acc.umu.se/pub/GNOME/sources/libxslt/1.1")
-set (XML2_BASE_URL "ftp://xmlsoft.org/libxml2")
-SET (LIBXSLT_VERSION "1.1.28")
-set (LIBXSLT_SRC_URL "${XML2_BASE_URL}/libxslt-${LIBXSLT_VERSION}.tar.gz")
-#set (LIBXSLT_MAKEFILE_PATCH "${CMAKE_SOURCE_DIR}/libxslt-1.1.22.Makefile.in.patch")
-SET (LIBXML2_VERSION "2.9.0")
-set (LIBXML2_SRC_URL "${XML2_BASE_URL}/libxml2-${LIBXML2_VERSION}.tar.gz")
-set (LIBXSLT_ICONV_URL "${XMLSOFT_URL}/iconv-1.9.2.win32.zip")
-set (LIBXSLT_ZLIB_URL "${XMLSOFT_URL}/zlib-1.2.3.win32.zip")
-set (LIBXSLT_DIR ${GLOBAL_DIR}/libxslt)
-
-set (EXPAT_URL "${GNOME_WIN32_DEPS_URL}/expat_2.0.1-1_win32.zip")
-set (EXPAT_DEV_URL "${GNOME_WIN32_DEPS_URL}/expat-dev_2.0.1-1_win32.zip")
-set (FREETYPE_VERSION "2.6.4")
-set (FREETYPE_URL "${SF_MIRROR}/freetype/freetype-${FREETYPE_VERSION}.tar.bz2")
-set (FONTCONFIG_VERSION "2.12.0")
-set (FONTCONFIG_URL ${FREEDESKTOP_MIRROR}/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2)
-set (HARFBUZZ_VERSION "1.2.7")
-set (HARFBUZZ_URL ${FREEDESKTOP_MIRROR}/harfbuzz/release/harfbuzz-${HARFBUZZ_VERSION}.tar.bz2)
-set (GAIL_URL "${GNOME_WIN32_URL}/gail/1.22/gail-1.22.0.zip")
-set (GAIL_DEV_URL "${GNOME_WIN32_URL}/gail/1.22/gail-dev-1.22.0.zip")
-set (GETTEXT_RUNTIME_URL "${GNOME_WIN32_DEPS_URL}/gettext-runtime_0.18.1.1-2_win32.zip")
-set (GETTEXT_RUNTIME_DEV_URL "${GNOME_WIN32_DEPS_URL}/gettext-runtime-dev_0.18.1.1-2_win32.zip")
-set (GETTEXT_TOOLS_URL "${GNOME_WIN32_DEPS_URL}/gettext-tools-dev_0.18.1.1-2_win32.zip")
-set (GTK_DOC_URL "${GNOME_MIRROR}/sources/gtk-doc/1.13/gtk-doc-1.13.tar.bz2")
-set (GTK_PREFS_URL "${SF_MIRROR}/gtk-win/gtk2_prefs-0.4.1.bin-gtk2.10-win32.zip")
-set (GTK_THEME_URL "${SF_MIRROR}/gtk-win/gtk2-themes-2009-09-07-win32_bin.zip")
-set (ICU_VERSION "55.1")
-set (ICU_USCORE_VERSION "55_1")
-set (ICU_URL "http://download.icu-project.org/files/icu4c/${ICU_VERSION}/icu4c-${ICU_USCORE_VERSION}-src.tgz")
-set (INTLTOOL_URL "${GNOME_WIN32_URL}/intltool/0.40/intltool_0.40.4-1_win32.zip")
-set (LIBFFI_VERSION "3.2.1")
-set (LIBFFI_URL "ftp://sourceware.org/pub/libffi/libffi-${LIBFFI_VERSION}.tar.gz")
-set (LIBART_LGPL_URL "${GNOME_WIN32_URL}/libart_lgpl/2.3/libart-lgpl_2.3.21-1_win32.zip")
-set (LIBART_LGPL_DEV_URL "${GNOME_WIN32_URL}/libart_lgpl/2.3/libart-lgpl-dev_2.3.21-1_win32.zip")
-set (LIBICONV_URL "${GNOME_WIN32_DEPS_URL}/libiconv-1.9.1.bin.woe32.zip")
-set (LIBPNG_URL "${GNOME_WIN32_DEPS_URL}/libpng_1.4.3-1_win32.zip")
-set (LIBPNG_DEV_URL "${GNOME_WIN32_DEPS_URL}/libpng-dev_1.4.3-1_win32.zip")
-set (LIBTIFF_URL "${GC_DEPS_URL}/tiff-4.0.3-mingw.tgz")
-set (LIBTIFF_DEV_URL "${GC_DEPS_URL}/tiff-4.0.3-dev-mingw.tgz")
-set (LIBXML2_URL "${GNOME_WIN32_DEPS_URL}/libxml2_2.7.7-1_win32.zip")
-set (LIBXML2_DEV_URL "${GNOME_WIN32_DEPS_URL}/libxml2-dev_2.7.7-1_win32.zip")
-set (PKG_CONFIG_VER "0.29.1")
-set (PKG_CONFIG_MIRROR https://pkg-config.freedesktop.org/releases/)
-set (PKG_CONFIG_SRC_URL ${PKG_CONFIG_MIRROR}/pkg-config-${PKG_CONFIG_VER}.tar.gz)
-set (PKG_CONFIG_URL "${GNOME_WIN32_DEPS_URL}/pkg-config_0.25-1_win32.zip")
-set (PKG_CONFIG_DEV_URL "${GNOME_WIN32_DEPS_URL}/pkg-config-dev_0.25-1_win32.zip")
-set (GLIB_URL "${GC_DEPS_URL}/glib-${GLIB_VERSION}-2-minGW.tgz")
-set (GLIB_DEV_URL "${GC_DEPS_URL}/glib-${GLIB_VERSION}-2-dev-minGW.tgz")
-set (CAIRO_VERSION "1.10.2")
-set (CAIRO_URL "${GC_DEPS_URL}/cairo-1.10.2-minGW.tgz")
-set (CAIRO_DEV_URL "${GC_DEPS_URL}/cairo-1.10.2-dev-minGW.tgz")
-set (GTK_VERSION "2.24.24")
-set (GTK_URL "${GC_DEPS_URL}/gtk+-2.24.24-minGW.tgz")
-set (GTK_DEV_URL "${GC_DEPS_URL}/gtk+-2.24.24-dev-minGW.tgz")
-set (ZLIB_URL "${GNOME_WIN32_DEPS_URL}/zlib_1.2.5-2_win32.zip")
-set (ZLIB_DEV_URL "${GNOME_WIN32_DEPS_URL}/zlib-dev_1.2.5-2_win32.zip")
-
-set (GNOME_DIR ${GLOBAL_DIR}/gnome)
-
-set (SWIG_URL "${SF_MIRROR}/swig/swigwin-2.0.11.zip")
-set (SWIG_DIR ${GLOBAL_DIR}/swig)
-
-set (PCRE_BIN_URL "${SF_MIRROR}/gnuwin32/pcre-7.0-bin.zip")
-set (PCRE_LIB_URL "${SF_MIRROR}/gnuwin32/pcre-7.0-lib.zip")
-set (PCRE_DIR ${GLOBAL_DIR}/pcre)
-
-SET (LIBGSF_VERSION "1.14.21")
-set (LIBGSF_URL "${GNOME_MIRROR}/sources/libgsf/1.14/libgsf-${LIBGSF_VERSION}.tar.bz2")
-set (LIBGSF_DIR ${GLOBAL_DIR}/libgsf)
-
-SET (GOFFICE_VERSION "0.8.17")
-set (GOFFICE_URL "${GNOME_MIRROR}/sources/goffice/0.8/goffice-${GOFFICE_VERSION}.tar.bz2")
-set (GOFFICE_DIR ${GLOBAL_DIR}/goffice)
-#set (GOFFICE_PATCH ${CMAKE_SOURCE_DIR}/goffice-x.x.x.patch)
-
-set (GLADE_URL "${GNOME_MIRROR}/sources/glade3/3.0/glade3-3.1.2.tar.bz2")
-set (GLADE_DIR ${GLOBAL_DIR}/glade)
-
-set (INNO_URL "http://files.jrsoftware.org/is/5/isetup-5.3.9-unicode.exe")
-set (INNO_DIR ${GLOBAL_DIR}/inno)
-
-set (HH_URL "http://download.microsoft.com/download/0/a/9/0a939ef6-e31c-430f-a3df-dfae7960d564/htmlhelp.exe")
-set (HH_DIR ${GLOBAL_DIR}/hh)
-
-set (BUILD_WEBKIT_FROM_SOURCE no)
-set (WEBKIT_VERSION "1.8.3")
-set (WEBKIT_URL "${SF_MIRROR}/gnucash/webkit-${WEBKIT_VERSION}-minGW.tgz")
-set (WEBKIT_DEV_URL "${SF_MIRROR}/gnucash/webkit-${WEBKIT_VERSION}-dev-minGW.tgz")
-set (WEBKIT_DIR ${GLOBAL_DIR}/webkit)
-#NB: The Fedora project maintains a source version that has been patched for building in a Fedora-MinGW cross-compiler. This isn't quite good enough to build in MinGW itself, but it's a lot closer and less work than starting with a tarball direct from the WebKitGtk project.
-set (WEBKIT_SRC_URL "https://pkgs.fedoraproject.org/repo/pkgs/mingw-webkitgtk/webkit-1.8.3.tar.xz/dcbf9d5e2e6391f857c29a57528b32a6/webkit-1.8.3.tar.xz")
-set (WEBKIT_MINGW_PATCH_1 ${CMAKE_SOURCE_DIR}/0001-Fix-various-issues-when-compiling-natively-on-MinGW.patch)
-set (WEBKIT_MINGW_PATCH_2 ${CMAKE_SOURCE_DIR}/0002-webkit-second-minGW.patch)
-set (ENCHANT_VERSION "1.5.0")
-set (ENCHANT_URL "${GNOME_WIN32_URL}/dependencies/enchant_${ENCHANT_VERSION}-2_win32.zip")
-set (ENCHANT_DEV_URL "${GNOME_WIN32_URL}/dependencies/enchant-dev_${ENCHANT_VERSION}-2_win32.zip")
-set (ENCHANT_DIR ${GLOBAL_DIR}/enchant)
-set (BUILD_LIBSOUP_FROM_SOURCE no)
-set (LIBSOUP_VERSION "2.48.0")
-set (LIBSOUP_URL "${SF_MIRROR}/gnucash/libsoup-${LIBSOUP_VERSION}-minGW.tgz")
-set (LIBSOUP_DEV_URL "${SF_MIRROR}/gnucash/libsoup-${LIBSOUP_VERSION}-dev-minGW.tgz")
-set (LIBSOUP_DIR ${GLOBAL_DIR}/libsoup)
-set (LIBSOUP_SRC_URL "${GNOME_MIRROR}/sources/libsoup/2.48/libsoup-${LIBSOUP_VERSION}.tar.xz")
-set (LIBSOUP_BAD_SYMBOL_PATCH ${CMAKE_SOURCE_DIR}/libsoup-2.48.0-bad-symbol.patch)
-set (LIBSOUP_RESERVED_WORD_PATCH ${CMAKE_SOURCE_DIR}/libsoup-2.48.0-soup-server-reserved-word.patch)
-set (ICU4C_URL "http://download.icu-project.org/files/icu4c/4.4.1/icu4c-4_4_1-Win32-msvc9.zip")
-set (ICU4C_SRC_URL "http://download.icu-project.org/files/icu4c/4.4.1/icu4c-4_4_1-src.tgz")
-set (ICU4C_DIR ${GLOBAL_DIR}/icu-mingw32)
-set (ICU4C_PATCH ${CMAKE_SOURCE_DIR}/icu-crossmingw.patch)
-
-set (GIT_URL "https://github.com/msysgit/msysgit/releases/download/Git-1.9.4-preview20140611/Git-1.9.4-preview20140611.exe")
-set (GIT_DIR ${GLOBAL_DIR}/git-1.9.4)
-
-# OFX import in gnucash and ofx directconnect support for aqbanking
-set (OPENSP_URL "${SF_MIRROR}/openjade/OpenSP-1.5.2.tar.gz")
-set (OPENSP_DIR ${GLOBAL_DIR}/opensp)
-set (OPENSP_PATCH ${CMAKE_SOURCE_DIR}/opensp-1.5.2.patch)
-
-SET (LIBOFX_VERSION "0.9.9")
-set (LIBOFX_URL "${SF_MIRROR}/libofx/libofx-${LIBOFX_VERSION}.tar.gz")
-set (LIBOFX_DIR ${GLOBAL_DIR}/libofx)
-set (LIBOFX_PATCH ${CMAKE_SOURCE_DIR}/libofx-0.9.8.patch)
-
-## online banking: gwenhywfar+aqbanking
-SET (GWENHYWFAR_VERSION "4.15.3")
-## NB: Dummy means dummy! The important value in the following url is
-## the release number, not the file name at the end!
-set (GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=201&file=01&dummy gwenhywfar-4.15.3.tar.gz")
-set (GWENHYWFAR_DIR ${GLOBAL_DIR}/gwenhywfar)
-
-SET (AQBANKING_VERSION "5.6.10")
-## NB: Dummy means dummy! The important value in the following url is
-## the release number, not the file name at the end!
-set (AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=206&file=01&dummy aqbanking-5.6.10.tar.gz")
-set (AQBANKING_DIR ${GLOBAL_DIR}/aqbanking)
-set (AQB_PATCH ${CMAKE_SOURCE_DIR}/swift940-strndup.patch)
-
-set (SQLITE3_URL "http://sqlite.org/sqlite-amalgamation-3.6.1.tar.gz")
-set (SQLITE3_DIR ${GLOBAL_DIR}/sqlite3)
-set (MYSQL_LIB_URL "http://mirror.csclub.uwaterloo.ca/mysql/Downloads/Connector-C/mysql-connector-c-noinstall-6.0.1-win32.zip")
-set (MYSQL_LIB_DIR ${GLOBAL_DIR}/mysql)
-set (LIBMYSQL_DEF ${CMAKE_SOURCE_DIR}/libmysql.def)
-set (PGSQL_LIB_URL "${SF_MIRROR}/gnucash/pgsql-win32-2.tar.gz")
-set (PGSQL_DIR ${GLOBAL_DIR}/pgsql)
-set (LIBDBI_URL "${SF_MIRROR}/libdbi/libdbi-0.8.4.tar.gz")
-set (LIBDBI_DIR ${GLOBAL_DIR}/libdbi)
-set (LIBDBI_PATCH ${CMAKE_SOURCE_DIR}/libdbi-0.8.3.patch)
-set (LIBDBI_DRIVERS_URL "${SF_MIRROR}/libdbi-drivers/libdbi-drivers-0.8.3-1.tar.gz")
-set (LIBDBI_DRIVERS_DIR ${GLOBAL_DIR}/libdbi-drivers)
-set (LIBDBI_DRIVERS_PATCH ${CMAKE_SOURCE_DIR}/libdbi-drivers-errno.patch)
-
-set (CMAKE_URL "https://cmake.org/files/v3.3/cmake-3.3.2-win32-x86.zip")
-set (CMAKE_DIR ${GLOBAL_DIR}/cmake)
-
-set (NINJA_URL "http://github.com/ninja-build/ninja/releases/download/v1.6.0/ninja-win.zip")
-set (NINJA_DIR ${GLOBAL_DIR}/ninja)
-
-set (DOCBOOK_XSL_URL "${SF_MIRROR}/docbook/docbook-xsl-1.76.1.zip")
-set (DOCBOOK_DTD_URL "http://www.oasis-open.org/docbook/xml/4.1.2/docbkx412.zip")
-if (REPOS_TYPE STREQUAL "git")
- set (DOCS_SCM_REV "master")
- set (DOCS_URL "git://github.com/Gnucash/gnucash-docs.git")
-endif()
-set (UPDATE_DOCS yes)
-set (DOCS_DIR ${GLOBAL_DIR}/gnucash-docs)
-set (XSLTPROCFLAGS "")
-
-set (ISOCODES_URL "http://pkg-isocodes.alioth.debian.org/downloads/iso-codes-3.49.tar.xz")
-set (ISOCODES_DIR ${GLOBAL_DIR}/isocodes)
-
-set (BOOST_URL "${SF_MIRROR}/boost/boost/boost_1_55_0.tar.bz2")
-set (BOOST_DIR ${GLOBAL_DIR}/boost)
diff --git a/cmake/glib.cmake b/cmake/glib.cmake
deleted file mode 100644
index dc50b3e..0000000
--- a/cmake/glib.cmake
+++ /dev/null
@@ -1,103 +0,0 @@
-set_property (GLOBAL PROPERTY EP_BASE ${GLOBAL_DEP_BUILD_DIR})
-set (INSTALL_DIR ${GLOBAL_DEP_BUILD_DIR}/glib-install)
-set (CMAKE_INSTALL_PREFIX ${INSTALL_DIR})
-ExternalProject_Add(pkgconfig
- URL ${PKG_CONFIG_SRC_URL}
- CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix ${INSTALL_DIR} --with-internal-glib
- BUILD_COMMAND make
- INSTALL_COMMAND make install
- INSTALL_DIR ${INSTALL_DIR}
- )
-ExternalProject_Add(zlib
- URL ${ZLIB_SRC_URL}
- CONFIGURE_COMMAND sed -i s/SHARED_MODE=0/SHARED_MODE=1/ <SOURCE_DIR>/win32/Makefile.gcc
- BUILD_COMMAND make -f <SOURCE_DIR>/win32/Makefile.gcc
- BUILD_IN_SOURCE 1
- INSTALL_COMMAND prefix=${INSTALL_DIR} INCLUDE_PATH=${INSTALL_DIR}/include LIBRARY_PATH=${INSTALL_DIR}/lib BINARY_PATH=${INSTALL_DIR}/bin make -f <SOURCE_DIR>/win32/Makefile.gcc install
- INSTALL_DIR ${INSTALL_DIR}
- )
-ExternalProject_Add(intltool
- URL ${INTLTOOL_URL}
- SOURCE_DIR ${INSTALL_DIR}
- CONFIGURE_COMMAND ""
- BUILD_COMMAND ""
- INSTALL_COMMAND ""
- )
-ExternalProject_Add(freetype
- URL ${FREETYPE_URL}
- CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix ${INSTALL_DIR} --without-bzip2 --without-png
- BUILD_COMMAND make
- INSTALL_COMMAND make install
- INSTALL_DIR ${INSTALL_DIR}
- DEPENDS intltool
- )
-ExternalProject_Get_Property(freetype source_dir)
-ExternalProject_Add_Step(freetype export-fix
- COMMAND sh -c "rm include/freetype/ftmac.h"
- WORKING_DIRECTORY ${source_dir}
- DEPENDEES configure
- DEPENDERS build
-)
-ExternalProject_Add(fontconfig
- URL ${FONTCONFIG_URL}
- CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix ${INSTALL_DIR} --disable-docs
- BUILD_COMMAND make
- INSTALL_COMMAND make install
- INSTALL_DIR ${INSTALL_DIR}
- DEPENDS freetype;pkgconfig
- )
-ExternalProject_Add(libffi
- URL ${LIBFFI_URL}
- CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix ${INSTALL_DIR}
- BUILD_COMMAND make
- INSTALL_COMMAND make install
- INSTALL_DIR ${INSTALL_DIR}
- )
-ExternalProject_Add(glib
- URL ${GLIB_SRC_URL}
- CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix ${INSTALL_DIR} --with-pcre=internal
- PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/glib-timezone.patch
- BUILD_COMMAND make
- INSTALL_COMMAND make install
- INSTALL_DIR ${INSTALL_DIR}
- DEPENDS libffi;zlib
- )
-ExternalProject_Add(harfbuzz
- URL ${HARFBUZZ_URL}
- CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix ${INSTALL_DIR}
- BUILD_COMMAND make
- INSTALL_DIR ${INSTALL_DIR}
- DEPENDS fontconfig;glib
- )
-# harfbuzz has a dependency on glib for three unicode functions, so we
-# need to build it again after building glib.
-ExternalProject_Add_Step(harfbuzz fix-pkgconfig-prefix
- COMMAND sh -c "chmod -R o+w ${INSTALL_DIR}"
- COMMAND sh -c "sed -i 's at prefix *= *${INSTALL_DIR}@prefix = c:/gcdev@' ${INSTALL_DIR}/lib/pkgconfig/*.pc"
- COMMAND sh -c "sed -i s@${INSTALL_DIR}@\\$\\{prefix\\}@ ${INSTALL_DIR}/lib/pkgconfig/*.pc"
- DEPENDEES install
- )
-if (GNC_MAKE_TARBALLS)
- set (TARBALL_DIR ${GLOBAL_DIR}/dependencies)
- ExternalProject_Add_Step(harfbuzz tarballs
- COMMAND sh -c "tar cjf ${TARBALL_DIR}/glib-${GLIB_VERSION}-MinGW-bin.tar.bz2 bin etc share"
- COMMAND sh -c "tar cjf ${TARBALL_DIR}/glib-${GLIB_VERSION}-MinGW-dev.tar.bz2 include lib/pkgconfig lib/glib-2.0 lib/libffi-${LIBFFI_VERSION} lib/*.a"
- BYPRODUCTS ${TARBALL_DIR}/glib-${GLIB_VERSION}-MinGW-bin.tar.bz2 ${TARBALL_DIR}/glib-${GLIB_VERSION}-MinGW-dev.tar.bz2
- WORKING_DIRECTORY ${INSTALL_DIR}
- DEPENDEES fix-pkgconfig-prefix
- )
-endif()
-
-if (GNC_INSTALL_DEPS OR GNC_INSTALL_GLIB)
- ExternalProject_Add_Step(harfbuzz final_install
- COMMAND sh -c "cp ${INSTALL_DIR}/bin/* ${GLOBAL_DIR}/gnome/bin"
- COMMAND sh -c "cp ${INSTALL_DIR}/lib/*.a ${GLOBAL_DIR}/gnome/lib"
- COMMAND sh -c "cp ${INSTALL_DIR}/lib/pkgconfig/* ${GLOBAL_DIR}/gnome/lib/pkgconfig"
- COMMAND sh -c "cp -r ${INSTALL_DIR}/lib/glib-2.0 ${GLOBAL_DIR}/gnome/lib/"
- COMMAND sh -c "cp -r ${INSTALL_DIR}/lib/libffi-${LIBFFI_VERSION} ${GLOBAL_DIR}/gnome/lib/"
- COMMAND sh -c "cp -r ${INSTALL_DIR}/etc ${GLOBAL_DIR}/gnome/"
- COMMAND sh -c "cp -r ${INSTALL_DIR}/share ${GLOBAL_DIR}/gnome/"
- ALWAYS 1
- DEPENDEES fix-pkgconfig-prefix
- )
-endif()
diff --git a/cmake/webkit.cmake b/cmake/webkit.cmake
deleted file mode 100644
index c76e554..0000000
--- a/cmake/webkit.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-ExternalProject_Add(icu
- URL ${ICU_URL}
- CONFIGURE_COMMAND <SOURCE_DIR>/source/configure --prefix ${INSTALL_DIR}
- BUILD_COMMAND make
- INSTALL_COMMAND make install COMMAND sh -c "pushd ${INSTALL_DIR}/lib && for i in icu\*.dll$<SEMICOLON> do mv $i ../bin/lib$i$<SEMICOLON> done && popd" COMMAND sh -c "sed -i -e 's/libdir = \${exec_prefix}\\/lib/libdir = \${exec_prefix}\\/bin/' ${INSTALL_DIR}/lib/pkgconfig/icu*.pc"
- INSTALL_DIR ${INSTALL_DIR}
- )
diff --git a/create_cross_mingw.sh b/create_cross_mingw.sh
deleted file mode 100755
index 1291a30..0000000
--- a/create_cross_mingw.sh
+++ /dev/null
@@ -1,300 +0,0 @@
-#! /bin/bash
-
-GC_WIN_DIR="$(dirname "$0")"
-. "$GC_WIN_DIR/functions.sh"
-
-qpushd "$GC_WIN_DIR"
-. defaults.sh
-
-#
-# From http://www.mingw.org/MinGWiki/index.php/BuildMingwCross
-#
-
-# This is my script for building a complete MinGW cross-compiler toolchain
-# that runs under Linux to produce executables that run under Windows. It
-# probably works (or can easily be adapted to work) under any unix system.
-#
-# It is based in large part on Sam Lantinga's script, which in turn was
-# based partly on Ray Kelm's script, which in turn was built on
-# Mo Dejong's script for doing the same, but with some added fixes.
-#
-# My changes:
-# 1. Adapted the script to the new packaging of MinGW GCC, which is
-# currently split into core and auxiliary components.
-# 2. The script now determines the GCC and BINUTILS directory name
-# directly from the tar file contents. This gets around common
-# problems due to the directory names not always following the
-# expected patterns.
-# 3. Grouped together and simplified the macros that users need to
-# define.
-# 4. Made optional components truly optional -- leave the
-# corresponding archive names blank and they will be ignored.
-# 5. Included an option to purge the installation directory before
-# installing the current cross-compiler.
-#
-# NOTE: If you choose a destination directory for the installation (set
-# in the macro PREFIX) for which you do not have write access, you will
-# need to run this script with root (or equivalent) privileges.
-#
-#
-# Updated by Igor Mikolic-Torreira <igormt at alumni.caltech.edu>
-
-# Make sure these are initialized as we want them
-
-GCC_CORE=""
-BINUTILS=""
-GCC_LANGS="c"
-
-
-# Set our build directory and where our sources will go
-
-if [ "x$XC_BUILD_DIR" = "x" ]; then
- # Default to the current directory
- XC_BUILD_DIR=$(pwd)
-fi
-SRCDIR="$XC_BUILD_DIR/source"
-
-
-# Need install directory first on the path so gcc can find binutils
-
-PATH="$PREFIX/bin:$PATH"
-
-# Prepare directories used by download function
-
-DOWNLOAD_UDIR=`unix_path $DOWNLOAD_DIR`
-TMP_UDIR=`unix_path $TMP_DIR`
-mkdir -p "$TMP_UDIR"
-mkdir -p "$DOWNLOAD_UDIR"
-mkdir -p "$SRCDIR"
-
-# Make sure wget is installed
-if test "x`which wget`" = "x" ; then
- echo "You need to install wget."
- exit 1
-fi
-
-qpushd "$XC_BUILD_DIR"
-
-
-#-----------------------------------------------------
-#
-# Functions that do most of the work
-#
-#-----------------------------------------------------
-
-
-function purge_existing_install
-{
- echo "Purging the existing files in $PREFIX"
- mkdir -p "$PREFIX"
- if cd "$PREFIX"; then
- rm -rf *
- fi
- cd "$XC_BUILD_DIR"
-}
-
-
-function install_libs
-{
- echo "Installing cross libs and includes"
- mkdir -p "$PREFIX/$TARGET"
-
- wget_unpacked "$MINGW_RT_URL" "$DOWNLOAD_DIR" "$PREFIX/$TARGET"
- wget_unpacked "$W32API_URL" "$DOWNLOAD_DIR" "$PREFIX/$TARGET"
-
- if [ "x$OPENGL_URL" != "x" ]; then
- wget_unpacked "$GCC_OPENGL_SRC_URL" "$DOWNLOAD_DIR" "$SRCDIR"
- fi
- if [ "x$DIRECTX_URL" != "x" ]; then
- wget_unpacked "$GCC_DIRECTX_SRC_URL" "$DOWNLOAD_DIR" "$SRCDIR"
- fi
-}
-
-
-function install_binutils
-{
- setup " binutils (cross-compile)"
-
- if quiet $PREFIX/bin/$TARGET-ld --version
- then
- echo "binutils already installed. skipping."
- else
- wget_unpacked "$BINUTILS_SRC_URL" "$DOWNLOAD_DIR" "$SRCDIR"
- BINUTILS_SRC_DIR=$_EXTRACT_UDIR
-
- BINUTILS_BUILD_DIR="$XC_BUILD_DIR/binutils-$TARGET"
- rm -rf "$BINUTILS_BUILD_DIR"
- mkdir "$BINUTILS_BUILD_DIR"
- qpushd "$BINUTILS_BUILD_DIR"
-
- echo -n "Configuring ... "
- "$BINUTILS_SRC_DIR/configure" --prefix="$PREFIX" --target=$TARGET --disable-nls \
- --with-gcc --with-gnu-as --with-gnu-ld --disable-shared &> configure.log
- echo done
-
- echo -n "Building ... "
- make CFLAGS="-O2 -fno-exceptions" LDFLAGS="-s" &> make.log
- if test $? -ne 0; then
- echo "failed - log available: $BINUTILS_BUILD_DIR/make.log"
- exit 1
- fi
- echo done
-
- echo -n "Installing ... "
- make install &> make-install.log
- if test $? -ne 0; then
- echo "failed - log available: $BINUTILS_BUILD_DIR/make-install.log"
- exit 1
- fi
- echo done
-
- qpopd
- fi
-}
-
-
-function install_gcc
-{
- setup " gcc (cross-compile)"
-
- if quiet $PREFIX/bin/$TARGET-g++ --version
- then
- echo "gcc already installed. skipping."
- else
- # Filename doesn't match expanded directory, let's fix that
- TARGET_FILE=${GCC_CORE_SRC_URL##*/}
- TARGET_FILE=${TARGET_FILE/-core-/-}
- wget_unpacked "$GCC_CORE_SRC_URL" "$DOWNLOAD_DIR" "$SRCDIR" $TARGET_FILE
- GCC_SRC_DIR=$_EXTRACT_UDIR
-
- if [ "x$GCC_GPP_SRC_URL" != "x" ]; then
- GCC_LANGS=${GCC_LANGS}",c++"
- wget_unpacked "$GCC_GPP_SRC_URL" "$DOWNLOAD_DIR" "$SRCDIR"
- fi
- if [ "x$GCC_G77_SRC_URL" != "x" ]; then
- GCC_LANGS=${GCC_LANGS}",f77"
- wget_unpacked "$GCC_G77_SRC_URL" "$DOWNLOAD_DIR" "$SRCDIR"
- fi
- if [ "x$GCC_OBJC_SRC_URL" != "x" ]; then
- GCC_LANGS=${GCC_LANGS}",objc"
- wget_unpacked "$GCC_OBJC_SRC_URL" "$DOWNLOAD_DIR" "$SRCDIR"
- fi
- if [ "x$GCC_JAVA_SRC_URL" != "x" ]; then
- GCC_LANGS=${GCC_LANGS}",java"
- wget_unpacked "$GCC_JAVA_SRC_URL" "$DOWNLOAD_DIR" "$SRCDIR"
- fi
- if [ "x$GCC_ADA_SRC_URL" != "x" ]; then
- GCC_LANGS=${GCC_LANGS}",ada"
- wget_unpacked "$GCC_ADA_SRC_URL" "$DOWNLOAD_DIR" "$SRCDIR"
- fi
-
- if [ "$GCC_PATCH" != "" ]; then
- echo -n "Patching ... "
- qpushd "$GCC_SRC_DIR"
- patch -p1 < "$SRCDIR/$GCC_PATCH"
- qpopd
- echo done
- fi
-
- GCC_BUILD_DIR="$XC_BUILD_DIR/gcc-$TARGET"
- rm -rf "$GCC_BUILD_DIR"
- mkdir "$GCC_BUILD_DIR"
- qpushd "$GCC_BUILD_DIR"
-
- echo -n "Configuring ... "
- "$GCC_SRC_DIR/configure" -v \
- --prefix="$PREFIX" --target=$TARGET \
- --with-headers="$PREFIX/$TARGET/include" \
- --with-gcc --with-gnu-ld --with-gnu-as \
- --enable-threads --disable-nls --enable-languages=$GCC_LANGS \
- --disable-win32-registry --disable-shared --enable-sjlj-exceptions --enable-libgcj \
- --disable-java-awt --without-x --enable-java-gc=boehm --disable-libgcj-debug \
- --enable-interpreter --enable-hash-synchronization --enable-libstdcxx-debug \
- &> configure.log
- echo done
-
- echo -n "Building ... "
- make CFLAGS="-O2" CXXFLAGS="-O2" GCJFLAGS="-O2" LDFLAGS="-s" DEBUG_FLAGS="-g0" &> make.log
- if test $? -ne 0; then
- echo "failed - log available: $GCC_BUILD_DIR/make.log"
- exit 1
- fi
- echo done
-
- # 2010-04-28 I doubt the code below is ever called. GCC_ADA is never defined
- # Should this be GCC_ADA_SRC_URL ?
- if [ "x$GCC_ADA" != "x" ]; then
- qpushd gcc
- echo -n "Building gnatlib ... "
- make "CFLAGS=-O2" "LDFLAGS=-s" gnatlib_and_tools &> make-gnatlib.log
- if test $? -ne 0; then
- echo "failed - log available: $GCC_BUILD_DIR/gcc/make-gnatlib.log"
- exit 1
- fi
- echo done
- qpopd
- fi
-
- echo "Installing ... "
- make install &> make-install.log
- if test $? -ne 0; then
- echo "failed - log available: $GCC_BUILD_DIR/make-install.log"
- exit 1
- fi
- echo done
-
- qpopd
- fi
-}
-
-
-function final_tweaks
-{
- echo "Finalizing installation"
-
- # remove gcc build headers
- rm -rf "$PREFIX/$TARGET/sys-include"
-
- # Add extra binary links
- if [ ! -f "$PREFIX/$TARGET/bin/objdump" ]; then
- ln "$PREFIX/bin/$TARGET-objdump" "$PREFIX/$TARGET/bin/objdump"
- fi
-
- # make cc and c++ symlinks to gcc and g++
- if [ ! -f "$PREFIX/$TARGET/bin/g++" ]; then
- ln "$PREFIX/bin/$TARGET-g++" "$PREFIX/$TARGET/bin/g++"
- fi
- if [ ! -f "$PREFIX/$TARGET/bin/cc" ]; then
- ln -s "gcc" "$PREFIX/$TARGET/bin/cc"
- fi
- if [ ! -f "$PREFIX/$TARGET/bin/c++" ]; then
- ln -s "g++" "$PREFIX/$TARGET/bin/c++"
- fi
-
- # strip all the binaries
- ls "$PREFIX"/bin/* "$PREFIX/$TARGET"/bin/* | egrep -v '.dll$' | egrep -v 'gccbug$' |
- while read file; do
- strip "$file"
- done
-
- echo "Installation complete!"
-}
-
-
-
-#
-# Main part of the script
-#
-if [ "x$PURGE_DIR" = "xyes" ]; then
- purge_existing_install
-fi
-
-install_libs
-install_binutils
-install_gcc
-final_tweaks
-
-#
-# End
-#
-qpopd
diff --git a/crossbuild_webkit.sh b/crossbuild_webkit.sh
deleted file mode 100755
index fd51dd5..0000000
--- a/crossbuild_webkit.sh
+++ /dev/null
@@ -1,521 +0,0 @@
-#!/bin/bash
-
-[ ! "$BASH" -a -x /bin/bash ] && exec /bin/bash "$0" "$@"
-
-set -e
-
-echo -n "Build Starting at "
-date
-
-GC_WIN_DIR="$(dirname "$0")"
-. "$GC_WIN_DIR/functions.sh"
-
-qpushd "$GC_WIN_DIR"
-. defaults.sh
-
-register_env_var ACLOCAL_FLAGS " "
-register_env_var AUTOTOOLS_CPPFLAGS " "
-register_env_var AUTOTOOLS_LDFLAGS " "
-register_env_var GMP_CPPFLAGS " "
-register_env_var GMP_LDFLAGS " "
-register_env_var GNOME_CPPFLAGS " "
-register_env_var GNOME_LDFLAGS " "
-register_env_var GNUTLS_CPPFLAGS " "
-register_env_var GNUTLS_LDFLAGS " "
-register_env_var GUILE_LOAD_PATH ";"
-register_env_var GUILE_CPPFLAGS " "
-register_env_var GUILE_LDFLAGS " "
-register_env_var HH_CPPFLAGS " "
-register_env_var HH_LDFLAGS " "
-register_env_var INTLTOOL_PERL " "
-register_env_var LIBDBI_CPPFLAGS " "
-register_env_var LIBDBI_LDFLAGS " "
-register_env_var PATH ":"
-register_env_var PCRE_CPPFLAGS " "
-register_env_var PCRE_LDFLAGS " "
-register_env_var PKG_CONFIG ":" ""
-register_env_var PKG_CONFIG_PATH ":"
-register_env_var READLINE_CPPFLAGS " "
-register_env_var READLINE_LDFLAGS " "
-register_env_var REGEX_CPPFLAGS " "
-register_env_var REGEX_LDFLAGS " "
-register_env_var WEBKIT_CFLAGS " "
-register_env_var WEBKIT_LIBS " "
-
-function prepare() {
-# check gnome
-
- setup "prepare"
- TMP_UDIR=`unix_path $TMP_DIR`
- DOWNLOAD_UDIR=`unix_path $DOWNLOAD_DIR`
- _GLOBAL_UDIR=`unix_path $GLOBAL_DIR`
- _MINGW_UDIR=`unix_path $MINGW_DIR`
- add_to_env $_MINGW_UDIR/bin PATH
- mkdir -p $TMP_UDIR
- if [ "$CROSS_COMPILE" != "yes" ]; then
- die "Cross Compile needed"
- fi
- _UNAME_O=`uname -o`
-
- if [ "$_UNAME_O" = "Msys" ]; then
- die "You can't build webkit on msys. Use Cygwin on Windows instead."
- fi
-
- if [ "$_UNAME_O" = "Cygwin" ] &&
- [ "$_GLOBAL_UDIR/mingw" = "$_MINGW_UDIR" ] ||
- [ "$_GLOBAL_UDIR/msys" = "$_MINGW_UDIR" ];
- then
- die "Please set \$MINGW_DIR other than \$GLOBAL_DIR\\\\mingw or \$GLOBAL_DIR\\\\msys on Cygwin."
- fi
-
- if [ -n "$CCACHE_LINK_DIR" ]; then
- export PATH=$CCACHE_LINK_DIR:$PATH
- fi
-}
-
-function inst_crossmingw() {
- setup "Cross mingw"
- _MINGW_UDIR=`unix_path $MINGW_DIR`
- mkdir -p `unix_path $MINGW_DIR\\\\mingw32`
- if [ -d $_MINGW_UDIR ] &&
- quiet $CC -v
- then
- echo "Cross mingw installed."
- if [ ` $CC -dumpversion | cut -d. -f1` -le 3 ] ;then
- die "GCC 4.4 or higher needed"
- fi
- else
- echo "Installing Cross mingw32 gcc 4.x"
- mkdir -p $_MINGW_UDIR
- wget_unpacked $MINGW_RT_URL $DOWNLOAD_DIR $MINGW_DIR\\mingw32
- [ -n "$MINGW_RT_DEV_URL" ] && wget_unpacked $MINGW_RT_DEV_URL $DOWNLOAD_DIR $MINGW_DIR\\mingw32
- wget_unpacked $W32API_URL $DOWNLOAD_DIR $MINGW_DIR\\mingw32
- [ -n "$PTHREADS_W32_URL" ] && wget_unpacked $PTHREADS_W32_URL $DOWNLOAD_DIR $MINGW_DIR\\mingw32
- [ -n "$PTHREADS_W32_DEV_URL" ] && wget_unpacked $PTHREADS_W32_DEV_URL $DOWNLOAD_DIR $MINGW_DIR\\mingw32
-
- inst_crossbinutils
- inst_crossgcc
- fi
-}
-
-function inst_crossbinutils() {
- _MINGW_UDIR=`unix_path $MINGW_DIR`
- if quiet $LD -v
- then
- echo "Cross binutils already installed."
- else
- wget_unpacked $CROSS_BINUTILS_SRC_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/binutils-*
- mkdir -p $TMP_UDIR/build-binutils
- qpushd $TMP_UDIR/build-binutils
- $TMP_UDIR/binutils-*/configure \
- --prefix=$_MINGW_UDIR --target=mingw32 \
- --with-gcc --with-gnu-as --with-gnu-ld --enable-shared
- make
- make install
- qpopd
- if quiet $_MINGW_UDIR/bin/mingw32-ld -v
- then
- rm -rf $TMP_UDIR/binutils-* $TMP_UDIR/build-binutils
- echo "Cross binutils installed successfully."
- else
- die "Cross binutils install failure"
- fi
- fi
-}
-
-function inst_crossgcc(){
- _MINGW_UDIR=`unix_path $MINGW_DIR`
- if quiet $CC
- then
- echo "Cross gcc alreadyinstalled."
- else
- mkdir -p $_MINGW_UDIR/mingw32/include
- mkdir -p $TMP_UDIR/build-gcc
- mkdir -p $TMP_UDIR/mydir
- wget_unpacked $CROSS_GCC_SRC_URL $DOWNLOAD_DIR $TMP_DIR
- wget_unpacked $CROSS_GCC_SRC2_URL $DOWNLOAD_DIR $TMP_DIR\\mydir
- assert_one_dir $TMP_UDIR/gcc-*
- qpushd $TMP_UDIR/gcc-*
- dos2unix $TMP_UDIR/mydir/patches/gcc*.patch
-# FIXME: gcc-4.4.0 patch workaround
- for i in $TMP_UDIR/mydir/patches/gcc*.patch; do
-# patch -p0 < $i
- patch -p0 < $i || echo -n ""
- done
- cat >> libstdc++-v3/include/bits/c++config << EOF
-#ifndef _GLIBCXX_IMPORT
-#ifdef _GLIBCXX_DLL
-#define _GLIBCXX_IMPORT __attribute__((dllimport))
-#else
-#define _GLIBCXX_IMPORT
-#endif
-#endif
-EOF
- qpopd
- qpushd $TMP_UDIR/build-gcc
- $TMP_UDIR/gcc-*/configure \
- --prefix=$_MINGW_UDIR --target=$TARGET \
- --with-headers=$_MINGW_UDIR/mingw32/include \
- --enable-languages=c,c++ \
- --with-gcc --with-gnu-ld --with-gnu-as \
- --disable-sjlj-exceptions --enable-shared \
- --with-dwarf2 --disable-win32-registry \
- --enable-libstdcxx-debug --enable-version-specific-runtime-libs \
- --enable-threads
- make
- make install
- qpopd
- if quiet $CC -v
- then
- rm -rf $TMP_UDIR/build-gcc $TMP_UDIR/gcc-* $TMP_UDIR/mydir
- echo "Cross gcc installed successfully."
- else
- die "Cross install failure"
- fi
- fi
-}
-
-function inst_libxslt_gnome() {
- setup libxslt-gnome
- _GNOME_UDIR=`unix_path $GNOME_DIR`
- add_to_env -I$_GNOME_UDIR/include GNOME_CPPFLAGS
- add_to_env -L$_GNOME_UDIR/lib GNOME_LDFLAGS
- add_to_env $_GNOME_UDIR/lib/pkgconfig PKG_CONFIG_PATH
- if [ "$CROSS_COMPILE" != "yes" ]; then
- add_to_env $_GNOME_UDIR//pkg-config-msys.sh PKG_CONFIG
- else
- add_to_env pkg-config PKG_CONFIG
- fi
- if quiet ${PKG_CONFIG} --exists libxslt &&
- [ -f $_GNOME_UDIR/lib/pkgconfig/libxslt.pc ] &&
- quiet intltoolize --version
- then
- echo "libxslt-gnome installed. skipping."
- else
- # create dummy xml2-config
- cat > $_GNOME_UDIR/bin/xml2-config << EOF
-#!/bin/bash
-if [ "\$1" = "--version" ]; then
- pkg-config --modversion libxml-2.0
-else
- pkg-config \$1 libxml-2.0
-fi
-EOF
- chmod a+x $_GNOME_UDIR/bin/xml2-config
-
- wget_unpacked $LIBXSLT_SRC_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/libxslt-*
- qpushd $TMP_UDIR/libxslt-*
- ./configure ${HOST_XCOMPILE} \
- --with-libxml-prefix=$_GNOME_UDIR \
- --with-libxml-include-prefix=$_GNOME_UDIR/include/libxml2 \
- --with-libxml-libs-prefix=$_GNOME_UDIR/lib \
- PKG_CONFIG_PATH="$_GNOME_UDIR/lib/pkgconfig" \
- --prefix=${_GNOME_UDIR} \
- --enable-static=no \
- --with-plugins=no \
- --with-python=no \
- CPPFLAGS="$GNOME_CPPFLAGS $GNUTLS_CPPFLAGS" \
- LDFLAGS="$GNOME_LDFLAGS $GNUTLS_LDFLAGS"
- make .
- cd libxslt
- make EXTRA_LIBS="-L$_GNOME_UDIR/bin -lxml2-2"
- cd ..
- make
- make install
- qpopd
- rm -r $TMP_UDIR/libxslt-*
- fi
-}
-
-function check_gnome() {
- setup "Checking GNOME "
- _GNOME_UDIR=`unix_path $GNOME_DIR`
- add_to_env -I$_GNOME_UDIR/include GNOME_CPPFLAGS
- add_to_env -L$_GNOME_UDIR/lib GNOME_LDFLAGS
- add_to_env $_GNOME_UDIR/lib/pkgconfig PKG_CONFIG_PATH
- if [ "$CROSS_COMPILE" != "yes" ]; then
- add_to_env $_GNOME_UDIR/bin/pkg-config-msys.sh PKG_CONFIG
- else
- add_to_env pkg-config PKG_CONFIG
- fi
- if quiet ${PKG_CONFIG} --exists gtk+-2.0 cairo libxml-2.0 &&
- quiet intltoolize --version
- then
- echo "gnome packages installed."
- else
- die "gnome packages are not installed. Please install by install.sh"
- fi
-}
-
-function check_gnutls() {
- setup "Checking GNUTLS"
- _GNUTLS_UDIR=`unix_path ${GNUTLS_DIR}`
- add_to_env ${_GNUTLS_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
- add_to_env "-I${_GNUTLS_UDIR}/include" GNUTLS_CPPFLAGS
- add_to_env "-L${_GNUTLS_UDIR}/lib" GNUTLS_LDFLAGS
- if quiet ${PKG_CONFIG} --exists gnutls &&
- [ -f $_GNUTLS_UDIR/lib/pkgconfig/gnutls.pc ] &&
- quiet intltoolize --version
- then
- echo "GNUTLS already installed."
- else
- die "GNUTLS packages are not installed. Please install by install.sh"
- fi
-}
-
-function inst_enchant () {
- setup enchant
- _GNOME_UDIR=`unix_path $GNOME_DIR`
- add_to_env -I$_GNOME_UDIR/include GNOME_CPPFLAGS
- add_to_env -L$_GNOME_UDIR/lib GNOME_LDFLAGS
- add_to_env $_GNOME_UDIR/lib/pkgconfig PKG_CONFIG_PATH
- if [ "$CROSS_COMPILE" != "yes" ]; then
- add_to_env $_GNOME_UDIR/bin/pkg-config-msys.sh PKG_CONFIG
- else
- add_to_env pkg-config PKG_CONFIG
- fi
- if quiet ${PKG_CONFIG} --exists enchant &&
- [ -f $_GNOME_UDIR/lib/pkgconfig/enchant.pc ] &&
- quiet intltoolize --version
- then
- echo "enchant installed. skipping."
- else
- wget_unpacked $ENCHANT_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $ENCHANT_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- fix_pkgconfigprefix $_GNOME_UDIR $_GNOME_UDIR/lib/pkgconfig/enchant.pc
- fi
-}
-
-
-function inst_libsoup () {
- setup libsoup
- _GNOME_UDIR=`unix_path $GNOME_DIR`
- add_to_env -I$_GNOME_UDIR/include GNOME_CPPFLAGS
- add_to_env -L$_GNOME_UDIR/lib GNOME_LDFLAGS
- add_to_env $_GNOME_UDIR/lib/pkgconfig PKG_CONFIG_PATH
- if [ "$CROSS_COMPILE" != "yes" ]; then
- add_to_env $_GNOME_UDIR/bin/pkg-config-msys.sh PKG_CONFIG
- else
- add_to_env pkg-config PKG_CONFIG
- fi
- if quiet ${PKG_CONFIG} --exists libsoup-2.4 &&
- [ -f $_GNOME_UDIR/lib/pkgconfig/libsoup-2.4.pc ] &&
- quiet intltoolize --version
- then
- echo "libsoup installed. skipping."
- else
-# wget_unpacked $LIBSOUP_URL $DOWNLOAD_DIR $GNOME_DIR
-# wget_unpacked $LIBSOUP_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
-# libsoup binaries are too old so it is necessary to build new ones.
- wget_unpacked $LIBSOUP_SRC_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/libsoup-*
- qpushd $TMP_UDIR/libsoup-*
- ./configure ${HOST_XCOMPILE} \
- --prefix=${_GNOME_UDIR} \
- --with-libxml-prefix=${_GNOME_UDIR} \
- CPPFLAGS="$GNOME_CPPFLAGS $GNUTLS_CPPFLAGS" \
- LDFLAGS="$GNOME_LDFLAGS $GNUTLS_LDFLAGS"
- make
- make install
- qpopd
- rm -r $TMP_UDIR/libsoup-*
- fi
-}
-
-function inst_webkit() {
- setup WebKitGTK+
- _MINGW_UDIR=`unix_path $MINGW_DIR`
- _GNOME_UDIR=`unix_path $GNOME_DIR`
- _WEBKIT_DIR=`unix_path $WEBKIT_DIR`
- add_to_env -I$_GNOME_UDIR/include GNOME_CPPFLAGS
- add_to_env -L$_GNOME_UDIR/lib GNOME_LDFLAGS
- add_to_env $_GNOME_UDIR/lib/pkgconfig PKG_CONFIG_PATH
- _GNUTLS_UDIR=`unix_path $GNUTLS_DIR`
- add_to_env -I$_GNUTLS_UDIR/include GNOME_CPPFLAGS
- add_to_env -L$_GNUTLS_UDIR/lib GNOME_LDFLAGS
- add_to_env $_GNUTLS_UDIR/lib/pkgconfig PKG_CONFIG_PATH
- _SQLITE3_UDIR=`unix_path $SQLITE3_DIR`
- add_to_env -I$_SQLITE3_UDIR/include GNOME_CPPFLAGS
- add_to_env -L$_SQLITE3_UDIR/lib GNOME_LDFLAGS
- add_to_env $_SQLITE3_UDIR/lib/pkgconfig PKG_CONFIG_PATH
- _ICU4C_UDIR=`unix_path $ICU4C_DIR`
- add_to_env -I$_ICU4C_UDIR/include GNOME_CPPFLAGS
- add_to_env -L$_ICU4C_UDIR/lib GNOME_LDFLAGS
-
- if [ "$CROSS_COMPILE" != "yes" ]; then
- add_to_env $_GNOME_UDIR/bin/pkg-config-msys.sh PKG_CONFIG
- else
- add_to_env pkg-config PKG_CONFIG
- fi
- if quiet ${PKG_CONFIG} --exists webkit-1.0 &&
- [ -f $_GNOME_UDIR/lib/pkgconfig/webkit-1.0.pc ] &&
- quiet intltoolize --version
- then
- echo "WebKitGTK+ installed. skipping."
- else
- wget_unpacked $WEBKIT_SRC_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/webkit-*
- qpushd $TMP_UDIR/webkit-*
- if [ -n "$WEBKIT_PATCH" -a -f "$WEBKIT_PATCH" ] ; then
- patch -p1 < $WEBKIT_PATCH
- fi
- if [ -n "$WEBKIT_PATCH2" -a -f "$WEBKIT_PATCH2" ] ; then
- patch -p1 < $WEBKIT_PATCH2
- fi
- perl -pi.bak -e"s!/usr/bin/gcc!$CC!" \
- WebCore/dom/make_names.pl \
- WebCore/css/make-css-file-arrays.pl \
- WebCore/bindings/scripts/IDLParser.pm
- ./configure ${HOST_XCOMPILE} \
- CPPFLAGS="$GNOME_CPPFLAGS" \
- --prefix=${_WEBKIT_DIR} \
- --enable-silent-rules \
- --disable-datalist \
- --disable-dom-storage \
- --disable-eventsource \
- --disable-filters \
- --disable-gtk-doc-html \
- --disable-offline-web-applications \
- --disable-ruby \
- --disable-shared-workers \
- --disable-silent-rules \
- --disable-svg-animation \
- --disable-svg-as-image \
- --disable-svg-fonts \
- --disable-svg-foreign-object \
- --disable-svg-use \
- --disable-video \
- --disable-workers \
- --disable-xpath \
- --with-target=win32 \
- --with-unicode-backend=icu \
- CFLAGS="-g -O2 -std=gnu99" \
- CXXFLAGS="-g -O2 -std=gnu++98" \
- LDFLAGS="$GNOME_LDFLAGS"
- make
- make install
- qpopd
- rm -rf $TMP_UDIR/webkit-*
- fi
-}
-
-function inst_sqlite3() {
- setup sqlite3
- _SQLITE3_UDIR=`unix_path ${SQLITE3_DIR}`
- if [ -f ${_SQLITE3_UDIR}/bin/libsqlite3-0.dll ]
- then
- echo "SQLite3 already installed. Skipping."
- else
- wget_unpacked $SQLITE3_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/sqlite-*
- qpushd $TMP_UDIR/sqlite-*
- ./configure ${HOST_XCOMPILE} \
- --prefix=${_SQLITE3_UDIR}
- make
- make install
- qpopd
- test -f ${_SQLITE3_UDIR}/bin/libsqlite3-0.dll || die "SQLite3 not installed correctly"
- rm -rf ${TMP_UDIR}/sqlite-*
- fi
-}
-
-function inst_icu4c() {
- setup icu4c
- _ICU4C_UDIR=`unix_path $ICU4C_DIR`
- if [ -f "$_ICU4C_UDIR/bin/uconv.exe" ]
- then
- echo "icu4c already installed. Skipping."
- else
- wget_unpacked $ICU4C_SRC_URL $DOWNLOAD_DIR $TMP_DIR
- qpushd $TMP_UDIR/icu
- patch -p1 < $ICU4C_PATCH
- qpopd
- build_icu4c_native
- inst_icu4c_mingw32
- # cleanup
- rm -rf $TMP_UDIR/icu*
- fi
-}
-
-function build_icu4c_native() {
- setup icu4c-native
- mkdir -p $TMP_UDIR/icu-native
- if [ -e "$TMP_UDIR/icu-native/bin/uconv.exe" ]
- then
- echo "native icu4c already compiled. Skipping."
- else
- qpushd $TMP_UDIR/icu-native
- if uname -o |grep Linux > /dev/null 2>&1
- then
- $TMP_UDIR/icu/source/runConfigureICU Linux
- elif uname -o |grep Cygwin > /dev/null 2>&1
- then
- $TMP_UDIR/icu/source/runConfigureICU Cygwin
- else
- die "Failed to execute runConfigICU. Please edit this script"
- fi
- make
- make check
- for i in $TMP_UDIR/icu-native/bin/* ; do
- [ ! -f $i.exe ] && ln -s $i $i.exe
- done
- qpopd
- echo "icu4c native compiled successfully"
- fi
-}
-
-function inst_icu4c_mingw32() {
- setup icu4c-mingw32
- _ICU4C_UDIR=`unix_path $ICU4C_DIR`
- rm -rf $TMP_UDIR/icu-cross
- mkdir -p $TMP_UDIR/icu-cross
-
- # Note: If you have TARGET=i586-mingw32mingw, for this library you
- # need to set a different --host argument here due to some known
- # bug in the ICU source package
- #HOST_XCOMPILE="--host=i586-mingw32"
-
- qpushd $TMP_UDIR/icu-cross
- $TMP_UDIR/icu/source/configure ${HOST_XCOMPILE} \
- --prefix=$_ICU4C_UDIR \
- --with-cross-build=$TMP_UDIR/icu-native \
- --with-data-packaging=library \
- CC=$CC CPP="$CC -E" RANLIB=$RANLIB CXX=$TARGET-g++
- make \
- CFLAGS="-g -O2 -std=gnu99" \
- CXXFLAGS="-g -O2 -std=gnu++98"
- make install
- qpopd
- if [ -f "$_ICU4C_UDIR/bin/uconv.exe" ]
- then
- echo "icu4c installed successfully."
- else
- die "icu4c installation falure"
- fi
-}
-
-reset_steps
-add_step prepare
-add_step inst_crossmingw
-add_step prepare
-add_step check_gnome
-add_step check_gnutls
-add_step inst_libxslt_gnome
-add_step inst_enchant
-add_step inst_libsoup
-add_step inst_sqlite3
-add_step inst_icu4c
-add_step inst_webkit
-
-eval_now
-
-for step in "${steps[@]}" ; do
- eval $step
-done
-qpopd
-
-echo -n "Build Finished at "
-date
-
diff --git a/custom.sh.sample b/custom.sh.sample
deleted file mode 100644
index d78fc8f..0000000
--- a/custom.sh.sample
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/bash
-# This is an example custom.sh file. Copy this file to custom.sh and
-# edit it.
-#
-# Note: All directories must be without spaces!
-#
-# REPOS_URL="git at github.com:Gnucash/gnucash.git"
-# SF_MIRROR="http://switch.dl.sourceforge.net/sourceforge"
-# DISABLE_OPTIMIZATIONS=yes
-# GLOBAL_DIR=Z:\\mydir # all directories will use this
-# WGET_RATE=50k #limit download bandwith to 50KB/s
-# NO_SAVE_PROFILE=yes # don't save env settings to /etc/profile.d
-# late_eval 'INSTALL_DIR=$GNUCASH_DIR\\myinst' # no need to define GNUCASH_DIR
-# block_step inst_docs
-# late_eval 'add_step greetings'
-# function greetings() { setup Greetings; }
-# QTDIR=c:\\Qt\\4.2.3
-# CROSS_COMPILE=yes
-#Uncomment this for building on Win7 (and maybe Vista):
-#EXTRA_CFLAGS="-fno-builtin-dgettext -fno-builtin-towupper -fno-builtin-iswlower"
diff --git a/defaults.sh b/defaults.sh
deleted file mode 100644
index 1546752..0000000
--- a/defaults.sh
+++ /dev/null
@@ -1,412 +0,0 @@
-#!/bin/sh # for emacs
-#
-# Don't edit this file directly. Edit `custom.sh' in the same directory
-# instead. That will be read in at the beginning of this script.
-#
-# You can use the full power of bash 2.04 scripting. In particular, you can
-# set any variable mentioned here to something non-empty and it will not be
-# overridden later. However, you must define all variables you make use of
-# yourself. Expressions registered with late_eval are executed at the end of
-# the script.
-#
-# Note: All directories must be without spaces!
-#
-
-[ "$__SOURCED_DEFAULTS" ] && return
-__SOURCED_DEFAULTS=1
-
-[ -f "./custom.sh" ] && . ./custom.sh || true
-
-set_default GLOBAL_DIR c:\\gcdev
-set_default TMP_DIR $GLOBAL_DIR\\tmp
-set_default DOWNLOAD_DIR $GLOBAL_DIR\\downloads
-
-if [ -z "$BUILD_FROM_TARBALL" ]; then
- if [ -f "../../src/swig-runtime.h" ]; then
- BUILD_FROM_TARBALL=yes
- else
- BUILD_FROM_TARBALL=no
- fi
-fi
-
-set_default GC_WIN_REPOS_DIR $GLOBAL_DIR\\gnucash-on-windows.git
-set_default REPOS_DIR $GLOBAL_DIR\\gnucash.git
-if [ "$BUILD_FROM_TARBALL" = "yes" ]; then
- set_default GNUCASH_DIR $REPOS_DIR
- # keep this pointing from BUILD_DIR to REPOS_DIR
- set_default REL_REPOS_DIR ..
-else
- set_default GNUCASH_DIR $GLOBAL_DIR\\gnucash
- # keep this pointing from BUILD_DIR to REPOS_DIR
- set_default REL_REPOS_DIR ..\\..\\gnucash.git
-
- set_default REPOS_TYPE "git"
- if [ "$REPOS_TYPE" = "git" ]; then
- set_default GNUCASH_SCM_REV "master"
- set_default REPOS_URL "git://github.com/Gnucash/gnucash.git"
- fi
-fi
-set_default BUILD_DIR $GNUCASH_DIR\\build
-if [ x"$WITH_CMAKE" = xyes ]; then
- set_default BUILD_DIR $GNUCASH_DIR\\cmake-build
-fi
-set_default INSTALL_DIR $GNUCASH_DIR\\inst
-
-set_default DIST_DIR $GNUCASH_DIR\\dist
-
-set_default WITH_CUTECASH no
-set_default WITH_CMAKE no
-set_default WITH_NINJA no
-set_default CUTECASH_BUILD_DIR $GNUCASH_DIR\\build-cutecash
-
-
-
-####
-# For cross-compiling, change this to "yes"
-set_default CROSS_COMPILE "no"
-
-# If "yes", build without optimizations (-O0) and ease debugging
-set_default DISABLE_OPTIMIZATIONS no
-
-set_default MINGW_DIR $GLOBAL_DIR\\mingw
-set_default MSYS_DIR $MINGW_DIR\\msys
-
-# tools here means binaries runnable without other DLLs or data files
-set_default TOOLS_DIR $GLOBAL_DIR\\tools
-set_default MSYS_BISON_VERSION "2.4.2-1"
-set_default MSYS_FLEX_VERSION "2.5.35-2"
-set_default MSYS_M4_VERSION "1.4.16-2"
-set_default MSYS_PATCH_VERSION "2.6.1-1"
-set_default MSYS_PERL_VERSION "5.8.8-1"
-set_default MSYS_UNZIP_VERSION "6.0-1"
-set_default MSYS_WGET_VERSION "1.12-1"
-
-set_default SF_MIRROR "http://downloads.sf.net"
-set_default GTK_MIRROR "ftp.gtk.org/pub"
-set_default GNOME_MIRROR "ftp.gnome.org/pub/gnome"
-set_default GNOME_WIN32_URL "$GNOME_MIRROR/binaries/win32"
-set_default GNOME_WIN32_DEPS_URL "$GNOME_WIN32_URL/dependencies"
-set_default GC_DEPS_URL "$SF_MIRROR/gnucash/Dependencies"
-
-
-# Mingw toolchain
-
-set_default MINGW_AUTOCONF_VERSION "10-1"
-set_default MINGW_AUTOCONF21_VERSION "2.13-4"
-set_default MINGW_AUTOCONF25_VERSION "2.68-1"
-set_default MINGW_AUTOMAKE111_VERSION "1.11.1-1"
-set_default MINGW_AUTOMAKE110_VERSION "1.10.2-1"
-set_default MINGW_AUTOMAKE19_VERSION "1.9.6-3"
-set_default MINGW_AUTOMAKE18_VERSION "1.8.5-1"
-set_default MINGW_AUTOMAKE17_VERSION "1.7.9-1"
-set_default MINGW_AUTOMAKE16_VERSION "1.6.3-1"
-set_default MINGW_AUTOMAKE15_VERSION "1.5-1"
-set_default MINGW_AUTOMAKE14_VERSION "1.4p6-1"
-set_default MINGW_AUTOMAKE_VERSION "4-1"
-set_default MINGW_BINUTILS_VERSION "2.23.1-1"
-set_default MINGW_BINUTILS_VERSION "2.23.1-1"
-set_default MINGW_GCC_VERSION "4.9.3-1"
-set_default MINGW_GETTEXT_VERSION "0.18.1.1-2"
-set_default MINGW_GMP_VERSION "5.1.2-1"
-set_default MINGW_LIBEXPAT_VERSION "2.1.0-1"
-set_default MINGW_LIBICONV_VERSION "1.14-2"
-set_default MINGW_LIBLTDL_VERSION "2.4-1"
-set_default MINGW_LIBTOOL_VERSION "2.4-1"
-set_default MINGW_MPC_VERSION "1.0.1-2"
-set_default MINGW_MPFR_VERSION "3.1.2-2"
-set_default MINGW_PEXPORTS_VERSION "0.46"
-set_default MINGW_PTHREAD_W32_VERSION "2.10-pre-20160821"
-set_default MINGW_RT_VERSION "3.22.4"
-set_default MINGW_ZLIB_VERSION "1.2.8-1"
-set_default MINGW_W32API_VERSION "3.18.2"
-set_default MINGW_MAKE_VERSION "3.82-5"
-
-if [ "$CROSS_COMPILE" != yes ]; then
- # Use native toolchain
- set_default LD ld
- set_default CC gcc
- set_default DLLTOOL dlltool
- set_default RANLIB ranlib
-
- # For native build on Windows we can use the precompiled binaries
- # defined above
-
-else
- # What flavor of GCC cross-compiler are we building?
- set_default TARGET "mingw32"
-
- # Insert your cross-compiler mingw32 bin-directories here
- set_default HOST_XCOMPILE "--host=$TARGET"
-
- # Where does the cross-compiler go?
- # This should be the directory into which your cross-compiler
- # will be installed. Remember that if you set this to a directory
- # that only root has write access to, you will need to run this
- # script as root.
- set_default PREFIX `unix_path $MINGW_DIR`
-
- # Use native toolchain
- set_default LD $TARGET-ld
- set_default CC $TARGET-gcc
- set_default DLLTOOL $TARGET-dlltool
- set_default RANLIB $TARGET-ranlib
-
- # For cross compilation we need to build our own toolchain
- set_default BINUTILS_SRC_URL "$SF_MIRROR/mingw/binutils-2.20.1-src.tar.gz"
- set_default GCC_CORE_SRC_URL "$SF_MIRROR/mingw/gcc-core-3.4.5-20060117-2-src.tar.gz"
- set_default GCC_GPP_SRC_URL "$SF_MIRROR/mingw/gcc-g++-3.4.5-20060117-2-src.tar.gz"
- # Not required for GnuCash
- set_default GCC_G77_SRC_URL "" #"$SF_MIRROR/mingw/gcc-g77-3.4.5-20060117-2-src.tar.gz"
- set_default GCC_OBJC_SRC_URL "" #"$SF_MIRROR/mingw/gcc-objc-3.4.5-20060117-2-src.tar.gz"
- set_default GCC_JAVA_SRC_URL "" #"$SF_MIRROR/mingw/gcc-java-3.4.5-20060117-2-src.tar.gz"
- set_default GCC_ADA_SRC_URL "" #"$SF_MIRROR/mingw/gcc-ada-3.4.5-20060117-2-src.tar.gz"
-
- # What directory will the cross-compiler be built in?
- # This is the directory into which source archives will
- # be downloaded, expanded, compiled, etc. You need to
- # have write-access to this directory. If you leave it
- # blank, it defaults to the current directory.
- set_default XC_BUILD_DIR `unix_path $TMP_DIR`
-
- # Purge anything and everything already in the $PREFIX
- #(also known as the destination or installation) directory?
- # Set to "yes" to purge, any other value omits the purge step.
- set_default PURGE_DIR "no"
-
- # If you wish to apply a patch to GCC, put it in the SRC_DIR
- # and add its filename here.
- set_default GCC_PATCH ""
-
- # These are the files from the SDL website
- # These are optional, set them to "" if you don't want them
- set_default SDL_URL "" #http://www.libsdl.org/extras/win32/common"
- set_default OPENGL_URL "" #"$SDL_URL/opengl-devel.tar.gz"
- set_default DIRECTX_URL "" #$SDL_URL/directx-devel.tar.gz"
-fi
-
-set_default CROSS_GCC_SRC_URL "$SF_MIRROR/mingw/gcc-4.4.0-src.tar.bz2"
-set_default CROSS_GCC_SRC2_URL "$SF_MIRROR/mingw/gcc-4.4.0-mingw32-src-2.tar.gz"
-#set_default CROSS_GCC_SRC_URL "$SF_MIRROR/mingw/gcc-4.5.0-1-mingw32-src.tar.lzma"
-set_default CROSS_BINUTILS_SRC_URL "$SF_MIRROR/mingw/binutils-2.20.1-src.tar.gz"
-
-# do not use regex-gnu or regex-spencer v3.8.g3, see bug #382852
-set_default REGEX_URL "$GNOME_WIN32_DEPS_URL/libgnurx-2.5.zip"
-set_default REGEX_DEV_URL "$GNOME_WIN32_DEPS_URL/libgnurx-dev-2.5.zip"
-set_default REGEX_DIR $GLOBAL_DIR\\regex
-
-set_default READLINE_BIN_URL "$SF_MIRROR/gnuwin32/readline-5.0-1-bin.zip"
-set_default READLINE_LIB_URL "$SF_MIRROR/gnuwin32/readline-5.0-1-lib.zip"
-set_default READLINE_DIR $GLOBAL_DIR\\readline
-
-set_default GMP_URL "ftp://ftp.gnu.org/gnu/gmp/gmp-4.3.1.tar.bz2"
-set_default GMP_ABI 32
-set_default GMP_DIR $GLOBAL_DIR\\gmp
-set_default GMP5_BIN_URL "$SF_MIRROR/mingw/libgmp-5.0.1-1-mingw32-dll-10.tar.lzma"
-set_default GMP5_DEV_URL "$SF_MIRROR/mingw/gmp-5.0.1-1-mingw32-dev.tar.lzma"
-
-GUILE_VERSION="1.8.8"
-set_default GUILE_URL "http://ftp.gnu.org/pub/gnu/guile/guile-${GUILE_VERSION}.tar.gz"
-set_default GUILE_DIR $GLOBAL_DIR\\guile
-set_default GUILE_PATCH `pwd`/guile-1.8.patch
-
-set_default OPENSSL_URL "http://www.openssl.org/source/openssl-0.9.8j.tar.gz"
-set_default OPENSSL_DIR $GLOBAL_DIR\\openssl
-
-GLIB_VERSION="2.42.2"
-GNUTLS_VERSION="3.2.19"
-set_default BUILD_GNUTLS_FROM_SOURCE "no"
-set_default GNUTLS_URL "$GC_DEPS_URL/gnutls-3.2.19-minGW.tgz"
-set_default GNUTLS_DEV_URL "$GC_DEPS_URL/gnutls-3.2.19-dev-minGW.tgz"
-set_default GNUTLS_PKG_URL "ftp://ftp.gnutls.org/gcrypt/gnutls/w32/gnutls-${GNUTLS_VERSION}-w32.zip"
-GCRYPT_VERSION="1.6.2"
-set_default GCRYPT_SRC_URL "ftp://ftp.gnutls.org/gcrypt/libgcrypt/libgcrypt-${GCRYPT_VERSION}.tar.bz2"
-GPG_ERROR_VERSION="1.17"
-set_default GPG_ERROR_SRC_URL "ftp://ftp.gnutls.org/gcrypt/libgpg-error/libgpg-error-${GPG_ERROR_VERSION}.tar.bz2"
-set_default GLIB_NETWORKING_SRC_URL "$GNOME_MIRROR/sources/glib-networking/2.38/glib-networking-${GLIB_VERSION}.tar.xz"
-set_default GNUTLS_DIR $GLOBAL_DIR\\gnutls
-
-set_default MINGW_UTILS_URL "$SF_MIRROR/mingw/mingw-utils-0.3.tar.gz"
-set_default MINGW_UTILS_DIR $TOOLS_DIR
-
-set_default EXETYPE_SCRIPT `pwd`/exetype.pl
-set_default EXETYPE_DIR $TOOLS_DIR
-
-XMLSOFT_URL="http://xmlsoft.org/sources/win32"
-#XSLT_BASE_URL="http://ftp.acc.umu.se/pub/GNOME/sources/libxslt/1.1"
-XML2_BASE_URL="ftp://xmlsoft.org/libxml2"
-LIBXSLT_VERSION="1.1.28"
-#LIBXSLT_VERSION=1.1.26
-set_default LIBXSLT_SRC_URL "${XML2_BASE_URL}/libxslt-${LIBXSLT_VERSION}.tar.gz"
-#set_default LIBXSLT_MAKEFILE_PATCH "`pwd`/libxslt-1.1.22.Makefile.in.patch"
-LIBXML2_VERSION="2.9.0"
-set_default LIBXML2_SRC_URL "${XML2_BASE_URL}/libxml2-${LIBXML2_VERSION}.tar.gz"
-set_default LIBXSLT_ICONV_URL "${XMLSOFT_URL}/iconv-1.9.2.win32.zip"
-set_default LIBXSLT_ZLIB_URL "${XMLSOFT_URL}/zlib-1.2.3.win32.zip"
-set_default LIBXSLT_DIR $GLOBAL_DIR\\libxslt
-
-set_default EXPAT_URL "$GNOME_WIN32_DEPS_URL/expat_2.0.1-1_win32.zip"
-set_default EXPAT_DEV_URL "$GNOME_WIN32_DEPS_URL/expat-dev_2.0.1-1_win32.zip"
-set_default FREETYPE_URL "$GNOME_WIN32_DEPS_URL/freetype_2.4.4-1_win32.zip"
-set_default FREETYPE_DEV_URL "$GNOME_WIN32_DEPS_URL/freetype-dev_2.4.4-1_win32.zip"
-set_default GAIL_URL "$GNOME_WIN32_URL/gail/1.22/gail-1.22.0.zip"
-set_default GAIL_DEV_URL "$GNOME_WIN32_URL/gail/1.22/gail-dev-1.22.0.zip"
-set_default GETTEXT_RUNTIME_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime_0.18.1.1-2_win32.zip"
-set_default GETTEXT_RUNTIME_DEV_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime-dev_0.18.1.1-2_win32.zip"
-set_default GETTEXT_TOOLS_URL "$GNOME_WIN32_DEPS_URL/gettext-tools-dev_0.18.1.1-2_win32.zip"
-set_default GTK_DOC_URL "$GNOME_MIRROR/sources/gtk-doc/1.13/gtk-doc-1.13.tar.bz2"
-set_default GTK_PREFS_URL "$SF_MIRROR/gtk-win/gtk2_prefs-0.4.1.bin-gtk2.10-win32.zip"
-set_default GTK_THEME_URL "$SF_MIRROR/gtk-win/gtk2-themes-2009-09-07-win32_bin.zip"
-set_default INTLTOOL_URL "$GNOME_WIN32_URL/intltool/0.40/intltool_0.40.4-1_win32.zip"
-set_default LIBART_LGPL_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart-lgpl_2.3.21-1_win32.zip"
-set_default LIBART_LGPL_DEV_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart-lgpl-dev_2.3.21-1_win32.zip"
-set_default LIBGNOMECANVAS_URL "$GNOME_WIN32_URL/libgnomecanvas/2.30/libgnomecanvas_2.30.1-1_win32.zip"
-set_default LIBGNOMECANVAS_DEV_URL "$GNOME_WIN32_URL/libgnomecanvas/2.30/libgnomecanvas-dev_2.30.1-1_win32.zip"
-set_default LIBICONV_URL "$GNOME_WIN32_DEPS_URL/libiconv-1.9.1.bin.woe32.zip"
-set_default LIBPNG_URL "$GNOME_WIN32_DEPS_URL/libpng_1.4.3-1_win32.zip"
-set_default LIBPNG_DEV_URL "$GNOME_WIN32_DEPS_URL/libpng-dev_1.4.3-1_win32.zip"
-set_default LIBTIFF_URL "$GC_DEPS_URL/tiff-4.0.3-mingw.tgz"
-set_default LIBTIFF_DEV_URL "$GC_DEPS_URL/tiff-4.0.3-dev-mingw.tgz"
-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 PKG_CONFIG_URL "$GNOME_WIN32_DEPS_URL/pkg-config_0.25-1_win32.zip"
-set_default PKG_CONFIG_DEV_URL "$GNOME_WIN32_DEPS_URL/pkg-config-dev_0.25-1_win32.zip"
-set_default GLIB_URL "$GC_DEPS_URL/glib-2.42.2-MinGW-bin.tar.bz2"
-set_default GLIB_DEV_URL "$GC_DEPS_URL/glib-2.42.2-MinGW-dev.tar.bz2"
-set_default CAIRO_VERSION="1.10.2"
-set_default CAIRO_URL "$GC_DEPS_URL/cairo-1.10.2-minGW.tgz"
-set_default CAIRO_DEV_URL "$GC_DEPS_URL/cairo-1.10.2-dev-minGW.tgz"
-set_default GTK_VERSION="2.24.24"
-set_default GTK_URL "$GC_DEPS_URL/gtk+-2.24.24-minGW.tgz"
-set_default GTK_DEV_URL "$GC_DEPS_URL/gtk+-2.24.24-dev-minGW.tgz"
-set_default ZLIB_URL "$GNOME_WIN32_DEPS_URL/zlib_1.2.5-2_win32.zip"
-set_default ZLIB_DEV_URL "$GNOME_WIN32_DEPS_URL/zlib-dev_1.2.5-2_win32.zip"
-
-set_default GNOME_DIR $GLOBAL_DIR\\gnome
-
-set_default SWIG_URL "$SF_MIRROR/swig/swigwin-2.0.11.zip"
-set_default SWIG_DIR $GLOBAL_DIR\\swig
-
-set_default PCRE_BIN_URL "$SF_MIRROR/gnuwin32/pcre-7.0-bin.zip"
-set_default PCRE_LIB_URL "$SF_MIRROR/gnuwin32/pcre-7.0-lib.zip"
-set_default PCRE_DIR $GLOBAL_DIR\\pcre
-
-LIBGSF_VERSION="1.14.39"
-set_default LIBGSF_URL "$GNOME_MIRROR/sources/libgsf/1.14/libgsf-${LIBGSF_VERSION}.tar.xz"
-set_default LIBGSF_DIR $GLOBAL_DIR\\libgsf
-
-GOFFICE_VERSION="0.8.17"
-set_default GOFFICE_URL "$GNOME_MIRROR/sources/goffice/0.8/goffice-${GOFFICE_VERSION}.tar.bz2"
-set_default GOFFICE_DIR $GLOBAL_DIR\\goffice
-set_default GOFFICE_PATCH `pwd`/goffice-enable-shared.patch
-
-set_default GLADE_URL "$GNOME_MIRROR/sources/glade3/3.0/glade3-3.1.2.tar.bz2"
-set_default GLADE_DIR $GLOBAL_DIR\\glade
-
-set_default INNO_URL "http://files.jrsoftware.org/is/5/isetup-5.3.9-unicode.exe"
-set_default INNO_DIR $GLOBAL_DIR\\inno
-
-set_default HH_URL "http://download.microsoft.com/download/0/a/9/0a939ef6-e31c-430f-a3df-dfae7960d564/htmlhelp.exe"
-set_default HH_DIR $GLOBAL_DIR\\hh
-
-set_default BUILD_WEBKIT_FROM_SOURCE no
-set_default WEBKIT_VERSION "1.8.3"
-set_default WEBKIT_URL "$SF_MIRROR/gnucash/webkit-${WEBKIT_VERSION}-minGW-1.tgz"
-set_default WEBKIT_DEV_URL "$SF_MIRROR/gnucash/webkit-${WEBKIT_VERSION}-dev-minGW.tgz"
-set_default WEBKIT_DIR $GLOBAL_DIR\\webkit
-#NB: The Fedora project maintains a source version that has been patched for building in a Fedora-MinGW cross-compiler. This isn't quite good enough to build in MinGW itself, but it's a lot closer and less work than starting with a tarball direct from the WebKitGtk project.
-set_default WEBKIT_SRC_URL "https://pkgs.fedoraproject.org/repo/pkgs/mingw-webkitgtk/webkit-1.8.3.tar.xz/dcbf9d5e2e6391f857c29a57528b32a6/webkit-1.8.3.tar.xz"
-set_default WEBKIT_MINGW_PATCH_1=`pwd`/0001-Fix-various-issues-when-compiling-natively-on-MinGW.patch
-set_default WEBKIT_MINGW_PATCH_2=`pwd`/0002-webkit-second-minGW.patch
-set_default ENCHANT_VERSION "1.5.0"
-set_default ENCHANT_URL "$GNOME_WIN32_URL/dependencies/enchant_${ENCHANT_VERSION}-2_win32.zip"
-set_default ENCHANT_DEV_URL "$GNOME_WIN32_URL/dependencies/enchant-dev_${ENCHANT_VERSION}-2_win32.zip"
-set_default ENCHANT_DIR $GLOBAL_DIR\\enchant
-set_default BUILD_LIBSOUP_FROM_SOURCE no
-set_default LIBSOUP_VERSION "2.48.0"
-set_default LIBSOUP_URL "$SF_MIRROR/gnucash/libsoup-${LIBSOUP_VERSION}-minGW.tgz"
-set_default LIBSOUP_DEV_URL "$SF_MIRROR/gnucash/libsoup-${LIBSOUP_VERSION}-dev-minGW.tgz"
-set_default LIBSOUP_DIR $GLOBAL_DIR\\libsoup
-set_default LIBSOUP_SRC_URL "$GNOME_MIRROR/sources/libsoup/2.48/libsoup-${LIBSOUP_VERSION}.tar.xz"
-set_default LIBSOUP_BAD_SYMBOL_PATCH `pwd`/libsoup-2.48.0-bad-symbol.patch
-set_default LIBSOUP_RESERVED_WORD_PATCH `pwd`/libsoup-2.48.0-soup-server-reserved-word.patch
-set_default ICU4C_URL "http://download.icu-project.org/files/icu4c/4.4.1/icu4c-4_4_1-Win32-msvc9.zip"
-set_default ICU4C_SRC_URL "http://download.icu-project.org/files/icu4c/57.1/icu4c-57_1-src.tgz"
-set_default ICU4C_DIR $GLOBAL_DIR\\icu-mingw32
-set_default ICU4C_PATCH ""
-
-set_default GIT_URL "https://github.com/msysgit/msysgit/releases/download/Git-1.9.4-preview20140611/Git-1.9.4-preview20140611.exe"
-set_default GIT_DIR $GLOBAL_DIR\\git-1.9.4
-
-# OFX import in gnucash and ofx directconnect support for aqbanking
-set_default OPENSP_URL "$SF_MIRROR/openjade/OpenSP-1.5.2.tar.gz"
-set_default OPENSP_DIR $GLOBAL_DIR\\opensp
-set_default OPENSP_PATCH `pwd`/opensp-1.5.2.patch
-
-LIBOFX_VERSION="0.9.9"
-set_default LIBOFX_URL "$SF_MIRROR/libofx/libofx-${LIBOFX_VERSION}.tar.gz"
-set_default LIBOFX_DIR $GLOBAL_DIR\\libofx
-set_default LIBOFX_PATCH `pwd`/libofx-0.9.8.patch
-
-## online banking: gwenhywfar+aqbanking
-GWENHYWFAR_VERSION="4.18.0"
-## NB: Dummy means dummy! The important value in the following url is
-## the release number, not the file name at the end!
-set_default GWENHYWFAR_URL "https://www.aquamaniac.de/sites/download/download.php?package=01&release=206&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
-set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
-
-AQBANKING_VERSION="5.7.6beta"
-## NB: Dummy means dummy! The important value in the following url is
-## the release number, not the file name at the end!
-set_default AQBANKING_URL "https://www.aquamaniac.de/sites/download/download.php?package=03&release=215&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
-set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
-set_default AQB_PATCH ""
-
-set_default SQLITE3_URL "https://sqlite.org/2017/sqlite-autoconf-3180000.tar.gz"
-set_default SQLITE3_DIR $GLOBAL_DIR\\sqlite3
-set_default MYSQL_LIB_URL "http://mirror.csclub.uwaterloo.ca/mysql/Downloads/Connector-C/mysql-connector-c-noinstall-6.0.1-win32.zip"
-set_default MYSQL_LIB_DIR $GLOBAL_DIR\\mysql
-set_default LIBMYSQL_DEF `pwd`/libmysql.def
-set_default PGSQL_LIB_URL "$SF_MIRROR/gnucash/pgsql-win32-2.tar.gz"
-set_default PGSQL_DIR $GLOBAL_DIR\\pgsql
-set_default LIBDBI_URL "$SF_MIRROR/libdbi/libdbi-0.8.4.tar.gz"
-set_default LIBDBI_DIR $GLOBAL_DIR\\libdbi
-set_default LIBDBI_PATCH `pwd`/libdbi-0.8.3.patch
-set_default LIBDBI_DRIVERS_URL "$SF_MIRROR/libdbi-drivers/libdbi-drivers-0.8.3-1.tar.gz"
-set_default LIBDBI_DRIVERS_DIR $GLOBAL_DIR\\libdbi-drivers
-set_default LIBDBI_DRIVERS_PATCH `pwd`/libdbi-drivers-errno.patch
-
-set_default CMAKE_URL "https://cmake.org/files/v3.3/cmake-3.3.2-win32-x86.zip"
-set_default CMAKE_DIR $GLOBAL_DIR\\cmake
-
-set_default NINJA_URL "http://github.com/ninja-build/ninja/releases/download/v1.6.0/ninja-win.zip"
-set_default NINJA_DIR $GLOBAL_DIR\\ninja
-
-set_default DOCBOOK_XSL_URL "$SF_MIRROR/docbook/docbook-xsl-1.76.1.zip"
-set_default DOCBOOK_DTD_URL "http://www.oasis-open.org/docbook/xml/4.1.2/docbkx412.zip"
-if [ "$REPOS_TYPE" = "git" ]; then
- set_default DOCS_SCM_REV "master"
- set_default DOCS_URL "git://github.com/Gnucash/gnucash-docs.git"
-fi
-set_default UPDATE_DOCS yes
-set_default DOCS_DIR $GLOBAL_DIR\\gnucash-docs
-set_default XSLTPROCFLAGS ""
-
-set_default ISOCODES_URL "http://pkg-isocodes.alioth.debian.org/downloads/iso-codes-3.49.tar.xz"
-set_default ISOCODES_DIR $GLOBAL_DIR\\isocodes
-
-set_default BOOST_URL "$SF_MIRROR/boost/boost/boost_1_55_0.tar.bz2"
-set_default BOOST_DIR $GLOBAL_DIR\\boost
-# Limit the built libraries to what we think we'll need. Note
-# that the python and context libraries depend on Python and
-# Visual Studio respectively to build, so don't add them.
-set_default BOOST_LIBS "atomic,chrono,date_time,filesystem,locale,log,program_options,regex,signals,system,test"
-
-set_default GTEST_REPO "https://github.com/google/googletest"
-set_default GTEST_VERSION "master"
-set_default GTEST_DIR $GLOBAL_DIR\\gtest
-
-set_default WGET_EXTRA_OPTIONS "--no-check-certificate"
-### Local Variables: ***
-### sh-basic-offset: 4 ***
-### indent-tabs-mode: nil ***
-### End: ***
diff --git a/devrc.sh b/devrc.sh
deleted file mode 100644
index d211368..0000000
--- a/devrc.sh
+++ /dev/null
@@ -1,84 +0,0 @@
-# devrc.sh: Sets the paths for building and running programs with the
-# gnucash-on-windows environment.
-# Copyright 2014 John Ralls <jralls at ceridwen.fremont.ca.us
-# This is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, see <http://www.gnu.org/licenses/>.
-#
-# Usage: In a MinGW shell
-# . /c/gcdev/gnucash-on-windows.git/devrc.sh
-# To restore the environment
-# export PATH=$OLDPATH
-# unset PKG_CONFIG_PATH
-# unset CPPFLAGS
-# unset LDFLAGS
-# unset GIT_CMD
-# Do NOT try to run install.sh or dist.sh within the devrc.sh environment.
-
-export OLDPATH=$PATH
-
-
-_savedir="$(pwd)"
-cd "$(dirname ${BASH_SOURCE[0]})"
-_currdir="$(pwd)"
-cd "$_savedir"
-
-_dirname="$(basename $_currdir)"
-if [ $(expr $_dirname : gnucash-on-windows.*) -ne 0 ]; then
- GLOBAL_UDIR="$(dirname $_currdir)"
-else
- echo "Source me in gnucash-on-windows so that I can set the right directory."
- return
-fi
-AQBANKING_UDIR=$GLOBAL_UDIR/aqbanking
-CMAKE_UDIR=$GLOBAL_UDIR/cmake
-GWENHYWFAR_UDIR=$GLOBAL_UDIR/gwenhywfar
-ENCHANT_UDIR=$GLOBAL_UDIR/enchant
-GNOME_UDIR=$GLOBAL_UDIR/gnome
-GNUCASH_UDIR=$GLOBAL_UDIR/gnucash/inst
-GNUTLS_UDIR=$GLOBAL_UDIR/gnutls
-GOFFICE_UDIR=$GLOBAL_UDIR/goffice
-GUILE_UDIR=$GLOBAL_UDIR/guile
-ICU4C_DIR=$GLOBAL_UDIR/icu-mingw32
-LIBDBI_UDIR=$GLOBAL_UDIR/libdbi
-LIBGSF_UDIR=$GLOBAL_UDIR/libgsf
-LIBOFX_UDIR=$GLOBAL_UDIR/libofx
-LIBSOUP_UDIR=$GLOBAL_UDIR/libsoup
-LIBXSLT_UDIR=$GLOBAL_UDIR/libxslt
-MYSQL_UDIR=$GLOBAL_UDIR/mysql
-NINJA_UDIR=$GLOBAL_UDIR/ninja
-OPENSP_UDIR=$GLOBAL_UDIR/opensp
-PCRE_UDIR=$GLOBAL_UDIR/pcre
-PGSQL_UDIR=$GLOBAL_UDIR/pgsql
-REGEX_UDIR=$GLOBAL_UDIR/regex
-SQLITE3_UDIR=$GLOBAL_UDIR/sqlite3
-SWIG_UDIR=$GLOBAL_UDIR/swig
-WEBKIT_UDIR=$GLOBAL_UDIR/webkit
-BOOST_UDIR=$GLOBAL_UDIR/boost
-
-PATH=$AQBANKING_UDIR/bin:$CMAKE_UDIR/bin:$GWENHYWFAR_UDIR/bin:$ENCHANT_UDIR/bin:$GNOME_UDIR/bin:$GNUCASH_UDIR/bin:$GNUCASH_UDIR/lib:$GNUTLS_UDIR/bin:$GOFFICE_UDIR/bin:$GUILE_UDIR/bin:$ICU4C_DIR/lib:$LIBDBI_UDIR/bin:$LIBGSF_UDIR/bin:$LIBOFX_UDIR/bin:$LIBSOUP_UDIR/bin:$LIBXSLT_UDIR/bin:$MYSQL_UDIR/bin:$MYSQL_UDIR/lib:$NINJA_UDIR:$OPENSP_UDIR/bin:$PCRE_UDIR/bin:$PGSQL_UDIR/bin:$PGSQL_UDIR/lib:$REGEX_UDIR/bin:$SQLITE3_UDIR/bin:$SWIG_UDIR:$WEBKIT_UDIR/bin:$BOOST_UDIR/lib
-
-PATH=$PATH:$OLDPATH
-
-export PATH
-
-export LTDL_LIBRARY_PATH=$GNUCASH_UDIR/lib
-export GNOME2_PATH=$GNOME_UDIR
-export ACLOCAL_FLAGS="-I $GNOME_UDIR/share/aclocal -I $GUILE_UDIR/share/aclocal"
-
-export PKG_CONFIG_PATH="$AQBANKING_UDIR/lib/pkgconfig:$ENCHANT_UDIR/lib/pkgconfig:$GOFFICE_UDIR/lib/pkgconfig:$GNOME_UDIR/lib/pkgconfig:$GNUTLS_UDIR/lib/pkgconfig:$GUILE_UDIR/lib/pkgconfig:$GWENHYWFAR_UDIR/lib/pkgconfig:$GLOBAL_UDIR/isocodes/share/pkgconfig:$LIBGSF_UDIR/lib/pkgconfig:$LIBOFX_UDIR/lib/pkgconfig:$LIBSOUP_UDIR/lib/pkgconfig:$LIBXSLT_UDIR/lib/pkgconfig:$PCRE_UDIR/lib/pkgconfig:$WEBKIT_UDIR/lib/pkgconfig"
-
-export CPPFLAGS="-I$AQBANKING_UDIR/include -I$ENCHANT_UDIR/include -I$GOFFICE_UDIR/include -I$GNOME_UDIR/include -I$GNOME_UDIR/include/glib-2.0 -I$GNOME_UDIR/lib/glib-2.0/include -I$GNUTLS_UDIR/include -I$GUILE_UDIR/include -I$GWENHYWFAR_UDIR/include -I$GLOBAL_UDIR/isocodes/include -I$LIBGSF_UDIR/include -I$LIBOFX_UDIR/include -I$LIBSOUP_UDIR/include -I$LIBXSLT_UDIR/include -I$PCRE_UDIR/include -I$WEBKIT_UDIR/pkgconfig -I$LIBDBI_UDIR/include -D__USE_MINGW_ANSI_STDIO"
-
-export LDFLAGS="-L$AQBANKING_UDIR/lib -L$ENCHANT_UDIR/lib -L$GOFFICE_UDIR/lib -L$GNOME_UDIR/lib -L$GNUTLS_UDIR/lib -L$GUILE_UDIR/lib -L$GWENHYWFAR_UDIR/lib -L$GLOBAL_UDIR/isocodes/lib -L$LIBGSF_UDIR/lib -L$LIBOFX_UDIR/lib -L$LIBSOUP_UDIR/lib -L$LIBXSLT_UDIR/lib -L$PCRE_UDIR/lib -L$WEBKIT_UDIR/lib -L$LIBDBI_UDIR/lib -L$GLOBAL_UDIR/hh/lib -L$REGEX_UDIR/lib -L$BOOST_UDIR/lib"
-
-export GIT_CMD=$GLOBAL_UDIR/git/git.exe
diff --git a/dist-impl.sh b/dist-impl.sh
deleted file mode 100755
index da18387..0000000
--- a/dist-impl.sh
+++ /dev/null
@@ -1,320 +0,0 @@
-#!/bin/sh
-#
-# GnuCash shellscript functions for dist.sh
-#
-
-function dist_prepare() {
- TMP_UDIR=`unix_path $TMP_DIR`
- if [ -x $DIST_DIR ]; then
- echo "Removing previous DIST_DIR ${DIST_DIR}"
- rm -fr "${DIST_DIR}"
- fi
- _UNZIP_UDIR=`unix_path $UNZIP_DIR`
- _GUILE_UDIR=`unix_path $GUILE_DIR`
- _WIN_UDIR=`unix_path $WINDIR`
- _EXETYPE_UDIR=`unix_path $EXETYPE_DIR`
- _GNOME_UDIR=`unix_path $GNOME_DIR`
- _BOOST_UDIR=`unix_path $BOOST_DIR`
- _PCRE_UDIR=`unix_path $PCRE_DIR`
- _LIBSOUP_UDIR=`unix_path $LIBSOUP_DIR`
- _ENCHANT_UDIR=`unix_path $ENCHANT_DIR`
- _LIBGSF_UDIR=`unix_path $LIBGSF_DIR`
- _GOFFICE_UDIR=`unix_path $GOFFICE_DIR`
- _OPENSP_UDIR=`unix_path $OPENSP_DIR`
- _LIBOFX_UDIR=`unix_path $LIBOFX_DIR`
- _LIBXSLT_UDIR=`unix_path $LIBXSLT_DIR`
- _GNUTLS_UDIR=`unix_path $GNUTLS_DIR`
- _GWENHYWFAR_UDIR=`unix_path $GWENHYWFAR_DIR`
- _AQBANKING_UDIR=`unix_path $AQBANKING_DIR`
- _SQLITE3_UDIR=`unix_path ${SQLITE3_DIR}`
- _MYSQL_LIB_UDIR=`unix_path ${MYSQL_LIB_DIR}`
- _PGSQL_UDIR=`unix_path ${PGSQL_DIR}`
- _LIBDBI_UDIR=`unix_path ${LIBDBI_DIR}`
- _LIBDBI_DRIVERS_UDIR=`unix_path ${LIBDBI_DRIVERS_DIR}`
- _LIBGDA_UDIR=`unix_path $LIBGDA_DIR`
- _GNUCASH_UDIR=`unix_path $GNUCASH_DIR`
- _GC_WIN_REPOS_UDIR=`unix_path $GC_WIN_REPOS_DIR`
- _REPOS_UDIR=`unix_path $REPOS_DIR`
- _BUILD_UDIR=`unix_path $BUILD_DIR`
- _DIST_UDIR=`unix_path $DIST_DIR`
- _MINGW_UDIR=`unix_path $MINGW_DIR`
- _INSTALL_UDIR=`unix_path $INSTALL_DIR`
- _INNO_UDIR=`unix_path $INNO_DIR`
- _WEBKIT_UDIR=`unix_path $WEBKIT_DIR`
- _ICU4C_UDIR=`unix_path $ICU4C_DIR`
- _ISOCODES_UDIR=`unix_path $ISOCODES_DIR`
- _MINGW_WFSDIR=`win_fs_path $MINGW_DIR`
- add_to_env $_UNZIP_UDIR/bin PATH # unzip
- add_to_env $_EXETYPE_UDIR/bin PATH # exetype
-
- _PID=$$
-}
-
-function dist_mingw() {
- setup mingw
-
- # Prepare mingw-get to install to alternative location
- MINGWGET_DIST_DIR=${GNUCASH_DIR}\\mingw-get-dist
- MINGWGET_DIST_UDIR=`unix_path $MINGWGET_DIST_DIR`
- mkdir -p $MINGWGET_DIST_UDIR/{bin,libexec,var/lib/mingw-get/data}
- cp $_MINGW_UDIR/bin/mingw-get.exe $MINGWGET_DIST_UDIR/bin/
- cp -a $_MINGW_UDIR/libexec/mingw-get/ $MINGWGET_DIST_UDIR/libexec/
- cp -a $_MINGW_UDIR/var/lib/mingw-get/data/defaults.xml $MINGWGET_DIST_UDIR/var/lib/mingw-get/data/profile.xml
- perl -pi.bak -e 's!.*subsystem="mingw32".*! <sysroot subsystem="mingw32" path="%R/../dist" />!' $MINGWGET_DIST_UDIR/var/lib/mingw-get/data/profile.xml
- rm -f $MINGWGET_DIST_UDIR/var/lib/mingw-get/data/{manifest,sysroot}*
-
- configure_msys "$_PID" "$_MINGW_WFSDIR"
-
- add_to_env $_MINGW_UDIR/bin PATH
- add_to_env $MINGWGET_DIST_UDIR/bin/ PATH
-
- mingw_smart_get mingw32-libgmp-dll ${MINGW_GMP_VERSION}
- mingw_smart_get mingw32-libpthread-dll ${MINGW_PTHREAD_W32_VERSION}
- mingw_smart_get mingw32-libz-dll ${MINGW_ZLIB_VERSION}
- mingw_smart_get mingw32-libgcc-dll ${MINGW_GCC_VERSION}
- mingw_smart_get mingw32-libiconv-dll ${MINGW_LIBICONV_VERSION}
- mingw_smart_get mingw32-libintl-dll ${MINGW_GETTEXT_VERSION}
- mingw_smart_get mingw32-libltdl-dll ${MINGW_LIBLTDL_VERSION}
-}
-
-function dist_aqbanking() {
- setup aqbanking
- cp -a ${_AQBANKING_UDIR}/bin/*.exe ${_DIST_UDIR}/bin
- cp -a ${_AQBANKING_UDIR}/bin/*.dll ${_DIST_UDIR}/bin
- cp -a ${_AQBANKING_UDIR}/lib/aqbanking ${_DIST_UDIR}/lib
- cp -a ${_AQBANKING_UDIR}/share/aqbanking ${_DIST_UDIR}/share
- cp -a ${_AQBANKING_UDIR}/share/locale ${_DIST_UDIR}/share
-}
-
-function dist_boost() {
- setup Boost
- get_major_minor "$GNUCASH_SCM_REV"
- if [ "$GNUCASH_SCM_REV" != "master" ] &&
- (( $major_minor <= 206 )); then
- echo "Skipping. Boost is only needed for the master branch or future 2.7.x and up versions of gnucash."
- return
- fi
-
- cp -a ${_BOOST_UDIR}/lib/*.dll ${_DIST_UDIR}/bin
-}
-
-function dist_gnome() {
- setup Gnome platform
- wget_unpacked $CAIRO_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $EXPAT_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $FREETYPE_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $GAIL_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $GETTEXT_RUNTIME_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $GLIB_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $GTK_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $LIBART_LGPL_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $LIBGNOMECANVAS_URL $DOWNLOAD_DIR $DIST_DIR
- smart_wget $LIBICONV_URL $DOWNLOAD_DIR
- unzip -q $LAST_FILE bin/iconv.dll -d $DIST_DIR
- wget_unpacked $LIBPNG_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $LIBTIFF_URL $DOWNLOAD_DIR $DIST_DIR
- #wget_unpacked $LIBXML2_URL $DOWNLOAD_DIR $DIST_DIR
- echo 'gtk-theme-name = "Nimbus"' > $DIST_DIR/etc/gtk-2.0/gtkrc
-
- wget_unpacked $GTK_THEME_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/gtk2-themes-*
- cp -a $TMP_UDIR/gtk2-themes-*/lib $DIST_DIR/
- cp -a $TMP_UDIR/gtk2-themes-*/share $DIST_DIR/
- rm -rf $TMP_UDIR/gtk2-themes-*
-
- wget_unpacked $GTK_PREFS_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/gtk2_prefs-*
- mv $TMP_UDIR/gtk2_prefs-*/gtk2_prefs.exe $DIST_DIR/bin
- rm -rf $TMP_UDIR/gtk2_prefs-*
-
- cp -a $_GNOME_UDIR/bin/libxml*.dll $DIST_DIR/bin
-
- if [ -d $_DIST_UDIR/lib/locale ] ; then
- # Huh, is this removed in newer gtk?
- cp -a $_DIST_UDIR/lib/locale $_DIST_UDIR/share
- rm -rf $_DIST_UDIR/lib/locale
- fi
-}
-
-function dist_gnutls() {
- setup gnutls
- cp -a ${_GNUTLS_UDIR}/bin/*.dll ${_DIST_UDIR}/bin
- cp -a ${_GNUTLS_UDIR}/bin/*.exe ${_DIST_UDIR}/bin
-}
-
-function dist_goffice() {
- setup GOffice
- mkdir -p $_DIST_UDIR/bin
- cp -a $_GOFFICE_UDIR/bin/libgoffice*.dll $_DIST_UDIR/bin
- mkdir -p $_DIST_UDIR/lib
- cp -a $_GOFFICE_UDIR/lib/goffice $_DIST_UDIR/lib
- mkdir -p $_DIST_UDIR/share
- cp -a $_GOFFICE_UDIR/share/{goffice,locale,pixmaps} $_DIST_UDIR/share
-}
-
-function dist_guile() {
- setup Guile
- mkdir -p $_DIST_UDIR/bin
- cp -a $_GUILE_UDIR/bin/libguile*.dll $_DIST_UDIR/bin
- cp -a $_GUILE_UDIR/bin/guile.exe $_DIST_UDIR/bin
- mkdir -p $_DIST_UDIR/share
- cp -a $_GUILE_UDIR/share/guile $_DIST_UDIR/share
-}
-
-function dist_gwenhywfar() {
- setup gwenhywfar
- cp -a ${_GWENHYWFAR_UDIR}/bin/*.dll ${_DIST_UDIR}/bin
- mkdir -p ${_DIST_UDIR}/etc
- cp -a ${_GWENHYWFAR_UDIR}/lib/gwenhywfar ${_DIST_UDIR}/lib
- mkdir -p ${_DIST_UDIR}/share
- cp -a ${_GWENHYWFAR_UDIR}/share/gwenhywfar ${_DIST_UDIR}/share
-}
-
-function dist_isocodes() {
- setup isocodes
- mkdir -p $_DIST_UDIR/share
- cp -a $_ISOCODES_UDIR/share/{locale,xml} $_DIST_UDIR/share
-}
-
-function dist_libdbi() {
- setup LibDBI
- cp -a ${_SQLITE3_UDIR}/bin/* ${_DIST_UDIR}/bin
- cp -a ${_MYSQL_LIB_UDIR}/bin/*.{dll,manifest} ${_DIST_UDIR}/bin
- cp -a ${_MYSQL_LIB_UDIR}/lib/*.dll ${_DIST_UDIR}/bin
- cp -a ${_PGSQL_UDIR}/bin/* ${_DIST_UDIR}/bin
- cp -a ${_PGSQL_UDIR}/lib/*.dll ${_DIST_UDIR}/bin
- cp -a ${_LIBDBI_UDIR}/bin/* ${_DIST_UDIR}/bin
- mkdir ${_DIST_UDIR}/lib/dbd
- cp -a ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/*.dll ${_DIST_UDIR}/lib/dbd
-}
-
-function dist_libgsf() {
- setup libGSF
- mkdir -p $_DIST_UDIR/bin
- cp -a $_LIBGSF_UDIR/bin/libgsf*.dll $_DIST_UDIR/bin
- mkdir -p $_DIST_UDIR/share
- cp -a $_LIBGSF_UDIR/share/locale $_DIST_UDIR/share
-}
-
-function dist_libofx() {
- setup OpenSP and LibOFX
- cp -a ${_OPENSP_UDIR}/bin/*.dll ${_DIST_UDIR}/bin
- cp -a ${_OPENSP_UDIR}/share/OpenSP ${_DIST_UDIR}/share
- cp -a ${_LIBOFX_UDIR}/bin/*.dll ${_DIST_UDIR}/bin
- cp -a ${_LIBOFX_UDIR}/bin/*.exe ${_DIST_UDIR}/bin
- cp -a ${_LIBOFX_UDIR}/share/libofx ${_DIST_UDIR}/share
-}
-
-function dist_openssl() {
- setup OpenSSL
- _OPENSSL_UDIR=`unix_path $OPENSSL_DIR`
- mkdir -p $_DIST_UDIR/bin
- cp -a $_OPENSSL_UDIR/bin/*.dll $_DIST_UDIR/bin
-}
-
-function dist_pcre() {
- setup pcre
- mkdir -p $_DIST_UDIR/bin
- cp -a $_PCRE_UDIR/bin/pcre3.dll $_DIST_UDIR/bin
-}
-
-function dist_regex() {
- setup RegEx
- smart_wget $REGEX_URL $DOWNLOAD_DIR
- unzip -q $LAST_FILE bin/libgnurx-0.dll -d $DIST_DIR
-}
-
-function dist_webkit() {
- setup WebKit
- cp -a ${_LIBSOUP_UDIR}/bin/* ${_DIST_UDIR}/bin
- cp -a ${_LIBXSLT_UDIR}/bin/* ${_DIST_UDIR}/bin
- cp -a ${_ENCHANT_UDIR}/bin/* ${_DIST_UDIR}/bin
- cp -a ${_WEBKIT_UDIR}/bin/* ${_DIST_UDIR}/bin
-}
-
-function dist_icu4c() {
- setup icu4c
- get_major_minor "$GNUCASH_SCM_REV"
- cp -a ${_ICU4C_UDIR}/lib/*.dll ${_DIST_UDIR}/bin
-}
-
-function dist_gnucash() {
- setup GnuCash
- mkdir -p $_DIST_UDIR/bin
- cp $_MINGW_UDIR/bin/pthreadGC-3.dll $_DIST_UDIR/bin
- cp -a $_INSTALL_UDIR/bin/* $_DIST_UDIR/bin
- mkdir -p $_DIST_UDIR/etc/gnucash
- cp -a $_INSTALL_UDIR/etc/gnucash/* $_DIST_UDIR/etc/gnucash
-
- # For CMake builds, there are no lib*.la files, so skip.
- if [ "$WITH_CMAKE" != "yes" ]; then
- cp -a $_INSTALL_UDIR/lib/lib*.la $_DIST_UDIR/bin
- fi
-
- mkdir -p $_DIST_UDIR/share
- cp -a $_INSTALL_UDIR/share/{doc,gnucash,locale,glib-2.0} $_DIST_UDIR/share
- cp -a $_GC_WIN_REPOS_UDIR/extra_dist/{getperl.vbs,gnc-path-check,install-fq-mods.cmd} $_DIST_UDIR/bin
-
- _QTDIR_WIN=$(unix_path $QTDIR | sed 's,^/\([A-Za-z]\)/,\1:/,g' )
- # aqbanking >= 5.0.0
- AQBANKING_VERSION_H=${_AQBANKING_UDIR}/include/aqbanking5/aqbanking/version.h
- GWENHYWFAR_VERSION_H=${_GWENHYWFAR_UDIR}/include/gwenhywfar4/gwenhywfar/version.h
- GNUCASH_CONFIG_H=${_BUILD_UDIR}/config.h
- if [ "$WITH_CMAKE" == "yes" ]; then
- GNUCASH_CONFIG_H=${_BUILD_UDIR}/src/config.h
- fi
-
- _AQBANKING_SO_EFFECTIVE=$(awk '/AQBANKING_SO_EFFECTIVE / { print $3 }' ${AQBANKING_VERSION_H} )
- _GWENHYWFAR_SO_EFFECTIVE=$(awk '/GWENHYWFAR_SO_EFFECTIVE / { print $3 }' ${GWENHYWFAR_VERSION_H} )
- PACKAGE_VERSION=$(awk '/ PACKAGE_VERSION / { print $3 }' ${GNUCASH_CONFIG_H} | cut -d\" -f2 )
- PACKAGE=$(awk '/ PACKAGE / { print $3 }' ${GNUCASH_CONFIG_H} | cut -d\" -f2 )
- GNUCASH_MAJOR_VERSION=$(awk '/ GNUCASH_MAJOR_VERSION / { print $3 }' ${GNUCASH_CONFIG_H} )
- GNUCASH_MINOR_VERSION=$(awk '/ GNUCASH_MINOR_VERSION / { print $3 }' ${GNUCASH_CONFIG_H} )
- GNUCASH_MICRO_VERSION=$(awk '/ GNUCASH_MICRO_VERSION / { print $3 }' ${GNUCASH_CONFIG_H} )
- DIST_WFSDIR=$(echo $DIST_DIR | sed -e 's#\\#\\\\#g')
- GC_WIN_REPOS_WFSDIR=$(echo $GC_WIN_REPOS_DIR | sed -e 's#\\#\\\\#g')
- sed < $_GC_WIN_REPOS_UDIR/inno_setup/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" \
- -e "s#@PACKAGE_VERSION@#${PACKAGE_VERSION}#g" \
- -e "s#@PACKAGE@#${PACKAGE}#g" \
- -e "s#@GNUCASH_MAJOR_VERSION@#${GNUCASH_MAJOR_VERSION}#g" \
- -e "s#@GNUCASH_MINOR_VERSION@#${GNUCASH_MINOR_VERSION}#g" \
- -e "s#@GNUCASH_MICRO_VERSION@#${GNUCASH_MICRO_VERSION}#g" \
- -e "s#@DIST_DIR@#${DIST_WFSDIR}#g" \
- -e "s#@GC_WIN_REPOS_DIR@#${GC_WIN_REPOS_WFSDIR}#g"
-}
-
-function dist_finish() {
- if [ "$WITH_CMAKE" != "yes" ]; then
- # Strip redirections in distributed libtool .la files.
- # Skip this for CMake builds, which don't generate *.la files.
-
- for file in $_DIST_UDIR/bin/*.la; do
- cat $file | sed 's,^libdir=,#libdir=,' > $file.new
- mv $file.new $file
- done
- fi;
-
- echo "Now running the Inno Setup Compiler for creating the setup.exe"
- ${_INNO_UDIR}/iscc //Q ${_GNUCASH_UDIR}/gnucash.iss
-
- if [ "$BUILD_FROM_TARBALL" = "no" ]; then
- # And changing output filename
- PKG_VERSION=`grep PACKAGE_VERSION ${GNUCASH_CONFIG_H} | cut -d" " -f3 | cut -d\" -f2 `
- REVISION=`grep GNUCASH_SCM_REV ${_BUILD_UDIR}/src/core-utils/gnc-vcs-info.h | cut -d" " -f3 | cut -d\" -f2 `
- SETUP_FILENAME="gnucash-${PKG_VERSION}-$(date +'%Y-%m-%d')-${REPOS_TYPE}-${REVISION}-setup.exe"
- qpushd ${_GNUCASH_UDIR}
- mv gnucash-${PKG_VERSION}-setup.exe ${SETUP_FILENAME}
- qpopd
- echo "Final resulting Setup program is:"
- echo ${_GNUCASH_UDIR}/${SETUP_FILENAME}
- fi
-}
-
-### Local Variables: ***
-### sh-basic-offset: 4 ***
-### indent-tabs-mode: nil ***
-### End: ***
diff --git a/dist.sh b/dist.sh
deleted file mode 100755
index 4d56fbc..0000000
--- a/dist.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/sh
-
-set -e
-
-function on_error() {
- setup "An error occurred, exiting."
- restore_msys "$_PID"
-}
-trap on_error ERR
-
-echo -n "Build (dist) Starting at "
-date
-
-GC_WIN_DIR="$(dirname "$0")"
-. "$GC_WIN_DIR/functions.sh"
-
-qpushd "$GC_WIN_DIR"
-. defaults.sh
-. dist-impl.sh
-
-# variables
-register_env_var PATH ":"
-
-# steps
-add_step dist_prepare
-add_step dist_mingw
-add_step dist_regex
-add_step dist_guile
-add_step dist_gnome
-add_step dist_isocodes
-add_step dist_pcre
-add_step dist_libgsf
-add_step dist_goffice
-add_step dist_libofx
-add_step dist_gnutls
-add_step dist_gwenhywfar
-add_step dist_aqbanking
-add_step dist_libdbi
-add_step dist_webkit
-add_step dist_icu4c
-add_step dist_boost
-add_step dist_gnucash
-add_step dist_finish
-
-# run commands registered with late_eval
-eval_now
-
-for step in "${steps[@]}" ; do
- eval $step
-done
-
-setup Restore MSYS
-restore_msys "$_PID"
-
-qpopd
-
-
-echo -n "Build (dist) Finished at "
-date
-
-### Local Variables: ***
-### sh-basic-offset: 4 ***
-### indent-tabs-mode: nil ***
-### End: ***
diff --git a/functions.sh b/functions.sh
deleted file mode 100644
index 02c7b77..0000000
--- a/functions.sh
+++ /dev/null
@@ -1,354 +0,0 @@
-[ "$__SOURCED_FUNCTIONS" ] && return
-__SOURCED_FUNCTIONS=1
-
-function set_default() {
- local _varname=$1; shift
- if [ -z "`eval echo '"$'"$_varname"'"'`" ]; then
- eval "$_varname"'="'"$*"'"' #" help emacs on windows
- fi
-}
-
-function block_step() { blocked_steps=("${blocked_steps[@]}" "$@"); }
-function reset_steps() { steps=(); blocked_steps=(); }
-function add_step() {
- while [ "$1" ]; do
- _is_blocked=
- for blocked in "${blocked_steps[@]}"; do
- if [ "$blocked" = "$1" ]; then
- _is_blocked=yes
- break
- fi
- done
- if [ "$_is_blocked" != "yes" ]; then
- steps=("${steps[@]}" "$1")
- block_step "$1"
- fi
- shift
- done
-}
-
-function late_eval() { late_cmds=("${late_cmds[@]}" "$@"); }
-function eval_now() {
- for cmd in "${late_cmds[@]}"; do
- eval $cmd
- done
-}
-
-function quiet() { "$@" &>/dev/null; }
-
-# c:/dir/sub
-function qpushd() { pushd "$@" >/dev/null; }
-function qpopd() { popd >/dev/null; }
-function win_fs_path() { echo "$*" | sed 's,\\,/,g'; }
-function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
-function unix_ldpath() { echo "$*" | sed 's,\\,/,g'; }
-
-# usage: wpwd [rel]
-# rel can be any relative path
-function wpwd() {
- qpushd `unix_path "${1:-.}"`
- pwd -W
- qpopd
-}
-
-# usage: smart_wget URL DESTDIR [DESTFILE]
-function smart_wget() {
- _FILE=`basename $1`
- # Remove url garbage from filename that would not be removed by wget
- _UFILE=${3:-${_FILE##*=}}
- _DLD=`unix_path $2`
-
- # If the file already exists in the download directory ($2)
- # then don't do anything. But if it does NOT exist then
- # download the file to the tmpdir and then when that completes
- # move it to the dest dir.
- if [ ! -f $_DLD/$_UFILE ] ; then
- # If WGET_RATE is set (in bytes/sec), limit download bandwith
- if [ ! -z "$WGET_RATE" ] ; then
- wget --passive-ftp -c $1 -P $TMP_UDIR --limit-rate=$WGET_RATE $WGET_EXTRA_OPTIONS
- else
- wget --passive-ftp -c $1 -P $TMP_UDIR $WGET_EXTRA_OPTIONS
- fi
- mv $TMP_UDIR/$_FILE $_DLD/$_UFILE
- fi
- LAST_FILE=$_DLD/$_UFILE
-}
-
-# usage: wget_unpacked URL DOWNLOAD_DIR UNPACK_DIR [DESTFILE]
-function wget_unpacked() {
- smart_wget $1 $2 $4
- _EXTRACT_UDIR=`unix_path $3`
- _EXTRACT_SUBDIR=
- echo -n "Extracting $_UFILE ... "
- case $LAST_FILE in
- *.zip)
- unzip -q -o $LAST_FILE -d $_EXTRACT_UDIR
- _PACK_DIR=$(zipinfo -1 $LAST_FILE '*/*' 2>/dev/null | head -1)
- ;;
- *.tar.gz|*.tgz)
- tar -xzpf $LAST_FILE -C $_EXTRACT_UDIR
- _PACK_DIR=$(tar -ztf $LAST_FILE 2>/dev/null | head -1)
- ;;
- *.tar.bz2)
- tar -xjpf $LAST_FILE -C $_EXTRACT_UDIR
- _PACK_DIR=$(tar -jtf $LAST_FILE 2>/dev/null | head -1)
- ;;
- *.tar.xz)
- tar -xJpf $LAST_FILE -C $_EXTRACT_UDIR
- _PACK_DIR=$(tar -Jtf $LAST_FILE 2>/dev/null | head -1)
- ;;
- *.tar.lzma)
- lzma -dc $LAST_FILE |tar xpf - -C $_EXTRACT_UDIR
- _PACK_DIR=$(lzma -dc $LAST_FILE |tar -tf - 2>/dev/null | head -1)
- ;;
- *)
- die "Cannot unpack file $LAST_FILE!"
- ;;
- esac
-
- # Get the path where the files were actually unpacked
- # This can be a subdirectory of the requested directory, if the
- # tarball or zipfile contained a relative path.
- _PACK_DIR=$(echo "$_PACK_DIR" | sed 's,^\([^/]*\).*,\1,')
- if (( ${#_PACK_DIR} > 3 )) # Skip the bin and lib directories from the test
- then
- _EXTRACT_SUBDIR=$(echo $_UFILE | sed "s,^\($_PACK_DIR\).*,/\1,;t;d")
- fi
- _EXTRACT_UDIR="$_EXTRACT_UDIR$_EXTRACT_SUBDIR"
- echo "done"
-}
-
-function setup() {
- echo
- echo "############################################################"
- echo "### $*"
- echo "############################################################"
-}
-
-function die() {
- echo
- [ "$*" ] && echo "!!! $* !!!"
- echo "!!! ABORTING !!!"
- restore_msys
- exit -1
-}
-
-# usage: register_env_var NAME SEPARATOR [DEFAULT]
-function register_env_var() {
- [ $# -ge 2 -a $# -le 3 ] || die hard
- eval "SEPS_$1"'="'"$2"'"'
- if [ $# -eq 3 ]; then
- eval "$1_BASE=$3"
- else
- eval "$1_BASE"'=$'"$1"
- fi
- eval "$1_ADDS="
- eval export "$1"
- ENV_VARS="$ENV_VARS $1"
-}
-ENV_VARS=
-
-# usage: add_to_env VALUE NAME
-function add_to_env() {
- _SEP=`eval echo '"$'"SEPS_$2"'"'`
- _ENV=`eval echo '"$'"$2"'"'`
- _SED=`eval echo '"s#.*'"${_SEP}$1${_SEP}"'.*##"'`
- _TEST=`echo "${_SEP}${_ENV}${_SEP}" | sed "${_SED}"`
- if [ "$_TEST" ]; then
- if [ "$_ENV" ]; then
- eval "$2_ADDS"'="'"$1${_SEP}"'$'"$2_ADDS"'"'
- else
- eval "$2_ADDS"'="'"$1"'"'
- fi
- eval "$2"'="$'"$2_ADDS"'$'"$2_BASE"'"'
- fi
-}
-
-# usage: set_env_or_die VALUE NAME
-# like add_to_env, but die if $NAME has been set to a different value
-function set_env_or_die() {
- _OLDADDS=`eval echo '"$'"$2_ADDS"'"'`
- add_to_env "$1" "$2"
- _NEWADDS=`eval echo '"$'"$2_ADDS"'"'`
- if [ "$_OLDADDS" != "$_NEWADDS" ]; then
- _BASE=`eval echo '"$'"$2_BASE"'"'`
- if [ "$_BASE" ]; then
- _ENV=`eval echo '"$'"$2"'"'`
- echo "Must not overwrite environment variable '$2' (${_OLDADDS}${_BASE}) by '$1'."
- echo "Try to remove the offending installed software or unset the variable."
- die
- fi
- fi
-}
-
-# usage set_env VALUE NAME
-# like $NAME=$VALUE, but also reset env tracking variables
-function set_env() {
- eval "$2=$1"
- eval "$2_BASE="
- eval "$2_ADDS=$1"
-}
-
-function assert_one_dir() {
- counted=$(ls -d "$@" 2>/dev/null | wc -l)
- if [[ $counted -eq 0 ]]; then
- die "Exactly one directory is required, but detected $counted; please check why $@ wasn't created"
- fi
- if [[ $counted -gt 1 ]]; then
- die "Exactly one directory is required, but detected $counted; please delete all but the latest one: $@"
- fi
-}
-
-function fix_pkgconfigprefix() {
- _PREFIX=$1
- shift
- perl -pi.bak -e"s!^prefix=.*\$!prefix=$_PREFIX!" $@
- qpopd
-}
-
-function dos2unix() {
- perl -pi.bak -e"s!\\r\\n\$!\\n!" $@
-}
-
-function configure_msys() {
- # Make sure msys will be using this mingw
- SUFFIX=$1
- _MINGW_WFSDIR=$2
- echo "configuring msys to use $_MINGW_WFSDIR."
- touch /etc/fstab
- cp /etc/fstab /etc/fstab.$SUFFIX
- sed '\,/mingw$, d' /etc/fstab > tmp
- echo "$_MINGW_WFSDIR /mingw" >> tmp
- mv tmp /etc/fstab
-}
-
-function restore_msys() {
- SUFFIX=$1
- if [ -f /ect/fstab.$SUFFIX ]; then
- echo "resetting msys to use original mingw."
- rm /etc/fstab
- mv /etc/fstab.$SUFFIX /etc/fstab
- fi
-}
-
-function mingw_smart_get () {
- PACKAGE=$1
- VERSION=$2
-
- echo "Attempting to install $PACKAGE-$VERSION"
-
- # Check if a sensible package name has been given
- [ "$PACKAGE" ] || return
-
- _MINGW_UDIR=`unix_path $MINGW_DIR`
-
- # Check if a package has already been installed or not. This is
- # a workaround for mingw-get's unfortunate refusal to upgrade a
- # package when calling mingw-get install on an already installed one
- # or mingw-get upgrade on a package that's not installed
-
- # Note: awk is used below instead of grep, because the tests
- # can return without a result. Grep exists with a non-zero
- # exit value in that case, which will cause the script to
- # abort (due to set -e being set). Awk does not.
- # Note: mingw-get is deliberately called without a fixed path
- # this allows the install and dist scripts to use
- # different versions of the tool (or more precisely different
- # configurations for the tool).
-
- echo "Checking package status..."
- COMPONENTS="$(mingw-get show "$PACKAGE" | awk '/Components:/')"
- if [ -n "$COMPONENTS" ]
- then
- # This package has subcomponents, we need to test
- # the install status of the subcomponents instead
- # Since we call mingw-get on the general package name
- # all subcomponents normally get installed together
- # so testing for only one subcomponent should be sufficient
- # This assumption may lead to a situation where manulal
- # intervention is needed in case of errors during mingw-get calls
- # Let's hope that such errors are the exception
- echo "Found the package to have components."
- COMPONENT="${COMPONENTS#Components: }"
- COMPONENT="${COMPONENT%%,*}"
- SUBPACKAGE="$PACKAGE-$COMPONENT"
- else
- echo "No components, proceding to check package status"
- SUBPACKAGE="$PACKAGE"
- fi
- echo "Checking $SUBPACKAGE versions"
- INSTVERSION="$(mingw-get show "$SUBPACKAGE" | awk '/Installed Version:/')"
- INSTVERSION="${INSTVERSION#Installed Version: }"
- REPOVERSION="$(mingw-get show "$SUBPACKAGE" | awk '/Repository Version:/')"
- REPOVERSION="${REPOVERSION#Repository Version: }"
-
- # If a version string is given add add it to the package name
- [ -n "$VERSION" ] && PACKAGE="${PACKAGE}=${VERSION}"
-
- if [ -z "$INSTVERSION" ]
- then
- # Unknown package
- echo "Package $PACKAGE is unknown by mingw."
- die "Package $PACKAGE is unknown by mingw."
- elif [ "$INSTVERSION" == "none" ]
- then
- # Package not yet installed
- echo "installing $PACKAGE"
- mingw-get install ${PACKAGE}
- elif [ -n "$VERSION" ] && [ -z "$(echo "$INSTVERSION" | awk "/$VERSION/")" ]
- then
- # Requested version differs from installed version
- echo "upgrading $PACKAGE from $INSTVERSION to $VERSION"
- mingw-get upgrade ${PACKAGE}
- elif [ -z "$VERSION" ] && [ "$INSTVERSION" != "$REPOVERSION" ]
- then
- # No version requested, but installed version differs from version in repo
- echo "upgrading because installed doesn't match repo $PACKAGE"
- mingw-get upgrade ${PACKAGE}
- else
- echo "Package $PACKAGE is up to date"
- fi
-}
-
-# Take a version number in the form M.m.µ-b
-# and return the major (M) and minor (m) component in numeric form
-# as follows: major*100 + minor
-# for example: 2.4.8-1 would yield 204
-# If the version entered is not a version in the expected format
-# 0 will be returned.
-function get_major_minor () {
- version=$1
- major_minor=$(perl -e '($maj,$min,$rest) = <> =~ /([0-9]*)[.]([0-9]*)(.*)/; print $maj*100+$min;' <<< $version)
-}
-
-function fix_lt_file () {
- filename="$2";
- orig_dir=`grep ^libdir= $filename | cut -d "'" -f 2`
- orig_dir=`dirname $orig_dir`
- target_dir="$1"/`echo $(dirname "$filename") | sed -e"s;$1/;;"`
- global_udir=`unix_path ${GLOBAL_DIR}`
-
- perl -pi.bak \
- -e"s{-L$orig_dir}{-L$target_dir}g;" \
- -e"s{([/a-z0-9A-Z:_-]+)/lib([a-zA-Z0-9._-]+)\.la}{-L\1 -l\2}g;" \
- -e"s{(/c|c:)/gcdev/}{$global_udir/}g;" \
- -e"s{^libdir=.*$}{libdir='$target_dir'}" \
- $filename
-}
-
-function fix_libtool_files () {
-if test -n "$1" -a -d "$1"; then
- for i in `find "$1" -name *.la`; do
- fix_lt_file $1 $i
- done
-else
- echo "Can't find directory $1"
- exit 1
-fi
-}
-
-### Local Variables: ***
-### mode: shell-script ***
-### sh-basic-offset: 4 ***
-### indent-tabs-mode: nil ***
-### End: ***
diff --git a/get-install-path.vbs b/get-install-path.vbs
deleted file mode 100755
index 3022963..0000000
--- a/get-install-path.vbs
+++ /dev/null
@@ -1,33 +0,0 @@
-' This helper script will try to determine the installation directory
-' for HTML Help Workshop. If found it will be returned on stdout
-'
-' Exit codes:
-' 0 if program was found to be installed
-' 1 if program was not found to be installed
-
-' Note: the script works as follows
-' - it will query the Uninstall information in the Windows registry
-' - when it finds uninstall information for HTML Help Workshop it will read the uninstall string
-' - and will extract the installation path from this string
-
-Const HKLM = &H80000002 'HKEY_LOCAL_MACHINE
-
-strKey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\"
-strDisplayName = "DisplayName"
-strUninstallString = "UninstallString"
-
-Set objReg = GetObject("winmgmts://./root/default:StdRegProv")
-objReg.EnumKey HKLM, strKey, arrSubkeys
-
-For Each strSubkey In arrSubkeys
- intRet1 = objReg.GetStringValue(HKLM, strKey & strSubkey, strDisplayName, strValue)
- If strValue = "HTML Help Workshop" Then
- intRet1 = objReg.GetStringValue(HKLM, strKey & strSubkey, strUninstallString, strValue)
- Set myRegExp = new RegExp
- myRegExp.Global = True
- myRegExp.Pattern = "\\setup.exe.*"
- strInstallDir = myRegExp.Replace (strValue, "")
- WScript.Echo strInstallDir
- WScript.Quit 0
- End If
-Next
\ No newline at end of file
diff --git a/glib-timezone.patch b/glib-timezone.patch
deleted file mode 100644
index f28b867..0000000
--- a/glib-timezone.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/glib/gtimezone.c b/glib/gtimezone.c
-index b61529f..2e2369c 100644
---- a/glib/gtimezone.c
-+++ b/glib/gtimezone.c
-@@ -893,7 +893,7 @@ init_zone_from_rules (GTimeZone *gtz,
- ++info_index;
- skip_first_std_trans = TRUE;
- }
-- else if (rules[ri].std_offset || rules[ri].dlt_offset)
-+ else
- {
- const guint start_year = rules[ri].start_year;
- const guint end_year = rules[ri + 1].start_year;
diff --git a/goffice-enable-shared.patch b/goffice-enable-shared.patch
deleted file mode 100644
index 0ce48a6..0000000
--- a/goffice-enable-shared.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.in 2011-06-16 16:46:53 -0700
-+++ b/configure.in 2016-10-22 15:29:49 -0700
-@@ -69,7 +69,7 @@
- AC_PROG_YACC
- AM_PROG_LEX
- AC_PROG_LN_S
--AM_PROG_LIBTOOL
-+LT_INIT([win32-dll])
- DOLT
- AC_STDC_HEADERS
- AC_SYS_LARGEFILE
diff --git a/guile-1.8.patch b/guile-1.8.patch
deleted file mode 100644
index a8d082d..0000000
--- a/guile-1.8.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- guile-1.8.8.old/srfi/Makefile.am 2010-12-13 18:24:40.000000000 +0100
-+++ guile-1.8.8.new/srfi/Makefile.am 2014-04-27 16:42:24.000000000 +0200
-@@ -43,19 +43,19 @@
-
- libguile_srfi_srfi_1_v_ at LIBGUILE_SRFI_SRFI_1_MAJOR@_la_SOURCES = srfi-1.x srfi-1.c
- libguile_srfi_srfi_1_v_ at LIBGUILE_SRFI_SRFI_1_MAJOR@_la_LIBADD = ../libguile/libguile.la
--libguile_srfi_srfi_1_v_ at LIBGUILE_SRFI_SRFI_1_MAJOR@_la_LDFLAGS = -no-undefined -export-dynamic -version-info @LIBGUILE_SRFI_SRFI_1_INTERFACE@
-+libguile_srfi_srfi_1_v_ at LIBGUILE_SRFI_SRFI_1_MAJOR@_la_LDFLAGS = -no-undefined -export-dynamic -avoid-version
-
- libguile_srfi_srfi_4_v_ at LIBGUILE_SRFI_SRFI_4_MAJOR@_la_SOURCES = srfi-4.x srfi-4.c
- libguile_srfi_srfi_4_v_ at LIBGUILE_SRFI_SRFI_4_MAJOR@_la_LIBADD = ../libguile/libguile.la
--libguile_srfi_srfi_4_v_ at LIBGUILE_SRFI_SRFI_4_MAJOR@_la_LDFLAGS = -no-undefined -export-dynamic -version-info @LIBGUILE_SRFI_SRFI_4_INTERFACE@
-+libguile_srfi_srfi_4_v_ at LIBGUILE_SRFI_SRFI_4_MAJOR@_la_LDFLAGS = -no-undefined -export-dynamic -avoid-version
-
- libguile_srfi_srfi_13_14_v_ at LIBGUILE_SRFI_SRFI_13_14_MAJOR@_la_SOURCES = srfi-13.x srfi-13.c srfi-14.x srfi-14.c
- libguile_srfi_srfi_13_14_v_ at LIBGUILE_SRFI_SRFI_13_14_MAJOR@_la_LIBADD = ../libguile/libguile.la
--libguile_srfi_srfi_13_14_v_ at LIBGUILE_SRFI_SRFI_13_14_MAJOR@_la_LDFLAGS = -no-undefined -export-dynamic -version-info @LIBGUILE_SRFI_SRFI_13_14_INTERFACE@
-+libguile_srfi_srfi_13_14_v_ at LIBGUILE_SRFI_SRFI_13_14_MAJOR@_la_LDFLAGS = -no-undefined -export-dynamic -avoid-version
-
- libguile_srfi_srfi_60_v_ at LIBGUILE_SRFI_SRFI_60_MAJOR@_la_SOURCES = srfi-60.x srfi-60.c
- libguile_srfi_srfi_60_v_ at LIBGUILE_SRFI_SRFI_60_MAJOR@_la_LIBADD = ../libguile/libguile.la
--libguile_srfi_srfi_60_v_ at LIBGUILE_SRFI_SRFI_60_MAJOR@_la_LDFLAGS = -no-undefined -export-dynamic -version-info @LIBGUILE_SRFI_SRFI_60_INTERFACE@
-+libguile_srfi_srfi_60_v_ at LIBGUILE_SRFI_SRFI_60_MAJOR@_la_LDFLAGS = -no-undefined -export-dynamic -avoid-version
-
- srfidir = $(datadir)/guile/$(GUILE_EFFECTIVE_VERSION)/srfi
- srfi_DATA = srfi-1.scm \
---- a/libguile/pthread-threads.h 2010-12-13 09:24:40 -0800
-+++ b/libguile/pthread-threads.h 2015-03-30 11:38:56 -0700
-@@ -24,10 +24,16 @@
-
- /* The pthreads-threads implementation. This is a direct mapping.
- */
-+#if !defined(_TIMESPEC_DEFINED) && defined(__struct_timespec_defined)
-+#define _TIMESPEC_DEFINED 1
-+#endif
-
- #include <pthread.h>
- #include <sched.h>
-
-+#if !defined(__struct_timespec_defined) && defined(_TIMESPEC_DEFINED)
-+#define __struct_timespec_defined 1
-+#endif
- /* Threads
- */
- #define scm_i_pthread_t pthread_t
-
diff --git a/gwen-4.13.1.patch b/gwen-4.13.1.patch
deleted file mode 100644
index 03ee295..0000000
--- a/gwen-4.13.1.patch
+++ /dev/null
@@ -1,131 +0,0 @@
---- a/src/sar/sar.c Wed Dec 31 05:29:02 2014
-+++ b/src/sar/sar.c Sun Mar 29 18:40:06 2015
-@@ -614,7 +614,8 @@
-
-
- int GWEN_Sar_AddAndDigestFileLink(GWEN_SAR *sr, const GWEN_SAR_FILEHEADER *fh, GWEN_MDIGEST *md) {
--#if _BSD_SOURCE || _XOPEN_SOURCE >= 500 || (_XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED) || _POSIX_C_SOURCE >= 200112L || defined(OS_DARWIN)
-+#if ((_BSD_SOURCE || _XOPEN_SOURCE >= 500 || (_XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED) || _POSIX_C_SOURCE >= 200112L) && !defined(__MINGW32__)) || defined(OS_DARWIN)
-+
- int rv;
- const char *fname;
- GWEN_BUFFER *hbuf;
-@@ -1352,7 +1353,7 @@
-
-
- int GWEN_Sar_ExtractAndDigestFileLink(GWEN_SAR *sr, const GWEN_SAR_FILEHEADER *fh, int checkOnly) {
--#if _BSD_SOURCE || _XOPEN_SOURCE >= 500 || (_XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED) || _POSIX_C_SOURCE >= 200112L || defined(OS_DARWIN)
-+#if ((_BSD_SOURCE || _XOPEN_SOURCE >= 500 || (_XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED) || _POSIX_C_SOURCE >= 200112L) && !defined(__MINGW32__)) || defined(OS_DARWIN)
- int rv;
- const char *fname;
- uint32_t perms;
-
---- a/gui/testdialogs/dlg_test.c Sun Oct 12 06:12:22 2014
-+++ b/gui/testdialogs/dlg_test.c Sun Mar 29 19:11:48 2015
-@@ -18,11 +18,6 @@
- #include <gwenhywfar/pathmanager.h>
-
-
--#ifdef OS_WIN32
--# include <windows.h>
--# define sleep(x) Sleep(x)
--#endif
--
- #include <unistd.h>
-
-
---- a/gui/testdialogs/dlg_test2.c Sun Oct 12 06:12:22 2014
-+++ b/gui/testdialogs/dlg_test2.c Sun Mar 29 19:11:48 2015
-@@ -16,11 +16,6 @@
- #include <gwenhywfar/pathmanager.h>
-
-
--#ifdef OS_WIN32
--# include <windows.h>
--# define sleep(x) Sleep(x)
--#endif
--
- #include <unistd.h>
-
-
---- a/gui/gtk2/libtest.c Sun Oct 12 06:12:22 2014
-+++ b/gui/gtk2/libtest.c Mon Mar 30 06:32:34 2015
-@@ -19,12 +19,6 @@
- #include <gwenhywfar/dialog.h>
- #include <gwenhywfar/debug.h>
-
--
--#ifdef OS_WIN32
--# include <windows.h>
--# define sleep(x) Sleep(x)
--#endif
--
- #include <unistd.h>
-
-
---- a/src/crypt3/cryptkey_be.h 2014-10-12 15:12:22 +0200
-+++ b/src/crypt3/cryptkey_be.h 2015-05-07 20:51:40 +0200
-@@ -18,22 +18,22 @@
-
-
-
--typedef int (*GWEN_CRYPT_KEY_SIGN_FN)(GWEN_CRYPT_KEY *k,
-+typedef GWENHYWFAR_CB int (*GWEN_CRYPT_KEY_SIGN_FN)(GWEN_CRYPT_KEY *k,
- const uint8_t *pInData,
- uint32_t inLen,
- uint8_t *pSignatureData,
- uint32_t *pSignatureLen);
--typedef int (*GWEN_CRYPT_KEY_VERIFY_FN)(GWEN_CRYPT_KEY *k,
-+typedef GWENHYWFAR_CB int (*GWEN_CRYPT_KEY_VERIFY_FN)(GWEN_CRYPT_KEY *k,
- const uint8_t *pInData,
- uint32_t inLen,
- const uint8_t *pSignatureData,
- uint32_t signatureLen);
--typedef int (*GWEN_CRYPT_KEY_ENCIPHER_FN)(GWEN_CRYPT_KEY *k,
-+typedef GWENHYWFAR_CB int (*GWEN_CRYPT_KEY_ENCIPHER_FN)(GWEN_CRYPT_KEY *k,
- const uint8_t *pInData,
- uint32_t inLen,
- uint8_t *pOutData,
- uint32_t *pOutLen);
--typedef int (*GWEN_CRYPT_KEY_DECIPHER_FN)(GWEN_CRYPT_KEY *k,
-+typedef GWENHYWFAR_CB int (*GWEN_CRYPT_KEY_DECIPHER_FN)(GWEN_CRYPT_KEY *k,
- const uint8_t *pInData,
- uint32_t inLen,
- uint8_t *pOutData,
---- a/src/crypt3/cryptkeysym.c 2014-10-12 15:12:22 +0200
-+++ b/src/crypt3/cryptkeysym.c 2015-05-07 20:51:04 +0200
-@@ -29,7 +29,7 @@
-
-
-
--int GWEN_Crypt_KeySym_Encipher(GWEN_CRYPT_KEY *k,
-+GWENHYWFAR_CB int GWEN_Crypt_KeySym_Encipher(GWEN_CRYPT_KEY *k,
- const uint8_t *pInData,
- uint32_t inLen,
- uint8_t *pOutData,
-@@ -53,7 +53,7 @@
-
-
-
--int GWEN_Crypt_KeySym_Decipher(GWEN_CRYPT_KEY *k,
-+GWENHYWFAR_CB int GWEN_Crypt_KeySym_Decipher(GWEN_CRYPT_KEY *k,
- const uint8_t *pInData,
- uint32_t inLen,
- uint8_t *pOutData,
---- a/src/crypt3/cryptkeysym_p.h 2014-10-12 15:12:22 +0200
-+++ b/src/crypt3/cryptkeysym_p.h 2015-05-07 20:50:41 +0200
-@@ -29,12 +29,12 @@
-
- static GWENHYWFAR_CB void GWEN_Crypt_KeySym_freeData(void *bp, void *p);
-
--static int GWEN_Crypt_KeySym_Encipher(GWEN_CRYPT_KEY *k,
-+static GWENHYWFAR_CB int GWEN_Crypt_KeySym_Encipher(GWEN_CRYPT_KEY *k,
- const uint8_t *pInData,
- uint32_t inLen,
- uint8_t *pOutData,
- uint32_t *pOutLen);
--static int GWEN_Crypt_KeySym_Decipher(GWEN_CRYPT_KEY *k,
-+static GWENHYWFAR_CB int GWEN_Crypt_KeySym_Decipher(GWEN_CRYPT_KEY *k,
- const uint8_t *pInData,
- uint32_t inLen,
- uint8_t *pOutData,
diff --git a/icu-crossmingw.patch b/icu-crossmingw.patch
deleted file mode 100644
index 0fd4f24..0000000
--- a/icu-crossmingw.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- icu.orig/source/config/mh-mingw 2010-04-29 00:27:52.000000000 +0900
-+++ icu/source/config/mh-mingw 2010-05-02 16:18:18.821561705 +0900
-@@ -71,8 +71,8 @@
-
- # The #M# is used to delete lines for icu-config
- # Current full path directory.
--#CURR_FULL_DIR=$(shell pwd -W)#M# for MSYS
--CURR_FULL_DIR=$(subst \,/,$(shell cmd /c cd))#M# for Cygwin shell
-+CURR_FULL_DIR=$(shell pwd)#M# for MSYS
-+#CURR_FULL_DIR=$(subst \,/,$(shell cmd /c cd))#M# for Cygwin shell
- # Current full path directory for use in source code in a -D compiler option.
- #CURR_SRCCODE_FULL_DIR=$(subst /,\\\\,$(shell pwd -W))#M# for MSYS
- CURR_SRCCODE_FULL_DIR=$(subst \,/,$(shell cmd /c cd))#M# for Cygwin shell
diff --git a/inno_setup/gnucash.iss b/inno_setup/gnucash.iss
deleted file mode 100644
index 615f690..0000000
--- a/inno_setup/gnucash.iss
+++ /dev/null
@@ -1,801 +0,0 @@
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Input configuration for the Inno Setup Compiler
-; Copyright (c) 2004-2005 Christian Stimming <stimming at tuhh.de>
-;
-; Inno Setup Compiler: See http://www.jrsoftware.org/isdl.php
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-[Setup]
-; Using the name here directly because we want it capitalized
-AppName=GnuCash
-AppVerName=GnuCash @PACKAGE_VERSION@
-AppPublisher=GnuCash Development Team
-AppPublisherURL=http://www.gnucash.org
-AppSupportURL=http://www.gnucash.org
-AppUpdatesURL=http://www.gnucash.org
-VersionInfoVersion=@PACKAGE_VERSION@
-DefaultDirName={pf}\@PACKAGE@
-DefaultGroupName=GnuCash
-LicenseFile=@DIST_DIR@\share\doc\@PACKAGE@\COPYING
-Compression=lzma
-MinVersion=5.0,5.0
-PrivilegesRequired=poweruser
-OutputDir=.
-OutputBaseFilename=@PACKAGE at -@PACKAGE_VERSION at -setup
-UninstallFilesDir={app}\uninstall\@PACKAGE@
-InfoAfterFile=@DIST_DIR@\share\doc\@PACKAGE@\README.win32-bin.txt
-SetupIconFile=@DIST_DIR@\share\@PACKAGE@\pixmaps\gnucash-icon.ico
-WizardSmallImageFile=@DIST_DIR@\share\@PACKAGE@\pixmaps\gnucash-icon-48x48.bmp
-
-[Types]
-Name: "full"; Description: "{cm:FullInstall}"
-Name: "custom"; Description: "{cm:CustomInstall}"; Flags: iscustom
-
-[Components]
-Name: "main"; Description: "{cm:MainFiles}"; Types: full custom; Flags: fixed
-;Name: "translations"; Description: "{cm:TranslFiles}"; Types: full
-;Name: "templates"; Description: "{cm:TemplFiles}"; Types: full
-
-[Tasks]
-Name: desktopicon; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"
-Name: menuicon; Description: "{cm:CreateMenuLink}"; GroupDescription: "{cm:AdditionalIcons}"
-
-[Icons]
-Name: "{group}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "{code:GetDocPath}"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: menuicon
-Name: "{group}\{cm:IconName_README}"; Filename: "{app}\doc\@PACKAGE@\{cm:IconFilename_README}"; Comment: "{cm:IconComment_README}"; Tasks: menuicon
-Name: "{group}\{cm:IconName_FAQ}"; Filename: "http://wiki.gnucash.org/wiki/FAQ"; Tasks: menuicon
-Name: "{group}\{cm:IconName_Bugzilla}"; Filename: "http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash"; Tasks: menuicon
-Name: "{group}\{cm:IconName_InstallFQ}"; Filename: "{app}\bin\install-fq-mods.cmd"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_InstallFQ}"; Tasks: menuicon
-Name: "{group}\{cm:IconName_Theme}"; Filename: "{app}\bin\gtk2_prefs.exe"; WorkingDir: "{app}\bin"; Tasks: menuicon
-Name: "{group}\{cm:IconName_Uninstall}"; Filename: "{uninstallexe}"; Comment: "{cm:IconComment_Uninstall}"; Tasks: menuicon
-
-Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "{code:GetDocPath}"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: desktopicon
-
-[Run]
-Filename: "{app}\bin\pango-querymodules.exe"; Parameters: " --system --update-cache"; Flags: runhidden
-Filename: "{app}\bin\@PACKAGE at .exe"; Description: "{cm:RunPrg}"; WorkingDir: "{code:GetDocPath}"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent
-Filename: "{app}\bin\guile.cmd"; Flags: runhidden
-
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Here we configure the included files and the place of their
-; installation
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-[Files]
-; The main executables and DLLs
-Source: "@DIST_DIR@\bin\*"; DestDir: "{app}\bin"; Flags: recursesubdirs ignoreversion; Components: main
-Source: "@DIST_DIR@\etc\*"; DestDir: "{app}\etc"; Flags: recursesubdirs; Components: main
-Source: "@DIST_DIR@\etc\@PACKAGE@\environment"; DestDir: "{app}\etc\@PACKAGE@"; Components: main; AfterInstall: MyAfterInstallEnvironment()
-; Note: The above AfterInstall function will adapt the
-; environment config file on-the-fly by the Pascal script below.
-Source: "@DIST_DIR@\lib\*"; DestDir: "{app}\lib"; Flags: recursesubdirs; Components: main
-;; We don't have anything in libexec anymore at the moment
-;Source: "@DIST_DIR@\libexec\*"; DestDir: "{app}\libexec"; Flags: recursesubdirs; Components: main
-Source: "@DIST_DIR@\share\*"; DestDir: "{app}\share"; Flags: recursesubdirs; Components: main
-
-;; The translations
-;Source: "@DIST_DIR@\share\locale\*"; DestDir: "{app}\share\locale"; Flags: recursesubdirs; Components: translations
-;
-;; The account templates
-;Source: "@DIST_DIR@\share\@PACKAGE@\accounts\*"; DestDir: "{app}\share\@PACKAGE@\accounts"; Flags: recursesubdirs; Components: templates
-
-; And all the documentation
-Source: "@DIST_DIR@\share\doc\@PACKAGE@\README"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@DIST_DIR@\share\doc\@PACKAGE@\README.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@DIST_DIR@\share\doc\@PACKAGE@\README-ca.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@DIST_DIR@\share\doc\@PACKAGE@\README-de.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@DIST_DIR@\share\doc\@PACKAGE@\README-fr.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@DIST_DIR@\share\doc\@PACKAGE@\README-it.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@DIST_DIR@\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@DIST_DIR@\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@DIST_DIR@\share\doc\@PACKAGE@\COPYING"; DestDir: "{app}\doc\@PACKAGE@"; Flags: ignoreversion; Components: main
-Source: "@DIST_DIR@\share\doc\@PACKAGE@\AUTHORS"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@DIST_DIR@\share\doc\@PACKAGE@\ChangeLog"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-
-
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Define the registry keys Setup should create (HKLM = HKEY_LOCAL_MACHINE)
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-[Registry]
-Root: HKCR; Subkey: ".gnucash"; ValueType: string; ValueName: ""; ValueData: "GnuCash.Financial.Data"; Flags: uninsdeletevalue
-Root: HKCR; Subkey: ".gnucash"; ValueType: string; ValueName: "Content Type"; ValueData: "application/x-gnucash"; Flags: uninsdeletevalue
-Root: HKCR; Subkey: "GnuCash.Financial.Data"; ValueType: string; ValueName: ""; ValueData: "GnuCash Financial Data"; Flags: uninsdeletevalue
-Root: HKCR; Subkey: "GnuCash.Financial.Data\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico,0"
-Root: HKCR; Subkey: "GnuCash.Financial.Data\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\bin\@PACKAGE at .exe"" ""%1"""
-
-Root: HKLM; Subkey: "Software\GnuCash"; ValueType: none; Flags: uninsdeletekeyifempty
-Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: none; Flags: uninsdeletekeyifempty
-Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "prefix"; ValueData: "{app}"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\GnuCash"; ValueType: string; ValueName: "InstallationDirectory"; ValueData: "{app}"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "libdir"; ValueData: "{app}\lib"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "pkglibdir"; ValueData: "{app}\lib\@PACKAGE@"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "sysconfdir"; ValueData: "{app}\etc"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "localedir"; ValueData: "{app}\share\locale"; Flags: uninsdeletevalue
-
-; Store the version information
-Root: HKLM; Subkey: "Software\GnuCash\Version"; ValueType: none; Flags: uninsdeletekeyifempty
-Root: HKLM; Subkey: "Software\GnuCash\Version"; ValueType: string; ValueName: "Version"; ValueData: "@PACKAGE_VERSION@"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\GnuCash\Version"; ValueType: dword; ValueName: "VersionMajor"; ValueData: "@GNUCASH_MAJOR_VERSION@"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\GnuCash\Version"; ValueType: dword; ValueName: "VersionMinor"; ValueData: "@GNUCASH_MINOR_VERSION@"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\GnuCash\Version"; ValueType: dword; ValueName: "VersionMicro"; ValueData: "@GNUCASH_MICRO_VERSION@"; Flags: uninsdeletevalue
-
-; Additionally, we have to install the paths for gwenhywfar
-Root: HKLM; Subkey: "Software\Gwenhywfar"; ValueType: none; Flags: uninsdeletekeyifempty
-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\@-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
-
-; And we also need some registry keys for aqbanking
-Root: HKLM; Subkey: "Software\Aqbanking"; ValueType: none; Flags: uninsdeletekeyifempty
-Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: none; Flags: uninsdeletekeyifempty
-Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "providerdir"; ValueData: "{app}\lib\aqbanking\plugins\@-aqbanking_so_effective-@\providers"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "bankinfodir"; ValueData: "{app}\lib\aqbanking\plugins\@-aqbanking_so_effective-@\bankinfo"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "importerdir"; ValueData: "{app}\lib\aqbanking\plugins\@-aqbanking_so_effective-@\imexporters"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "wizarddir"; ValueData: "{app}\lib\aqbanking\plugins\@-aqbanking_so_effective-@\wizards"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "pkgdatadir"; ValueData: "{app}\share\aqbanking"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "sysconfdir"; ValueData: "{app}\etc"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "localedir"; ValueData: "{app}\share\locale"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\AqBanking\Paths"; ValueType: string; ValueName: "xmldatadir"; ValueData: "{app}\share\aqhbci\xml"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\AqBanking\Paths"; ValueType: string; ValueName: "cfgmoduledir"; ValueData: "{app}\lib\aqbanking\plugins\@-aqbanking_so_effective-@\frontends\qbanking\cfgmodules"; Flags: uninsdeletevalue
-
-
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Delete the created config script on uninstall
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-[UninstallDelete]
-Type: files; Name: "{app}\bin\guile.cmd"
-Type: files; Name: "{app}\etc\@PACKAGE@\environment"
-Type: filesandordirs; Name: "{app}\share\guile"
-Type: dirifempty; Name: "{app}\etc\@PACKAGE@"
-Type: dirifempty; Name: "{app}\etc"
-
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Perform some additional actions in code that can't be done
-; by the installer by default. The code snippets below hook
-; into the installer code at specific events. See
-; http://www.jrsoftware.org/ishelp/index.php?topic=scriptintro
-; for more information on iss scription and a syntax reference.
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-[Code]
-var
- PrevInstDetectedPage : TOutputMsgWizardPage;
- PrevAppName, PrevUninstallString : String;
- PrevVersionMajor, PrevVersionMinor, PrevVersionMicro : Cardinal;
- Uninstallrequired : Boolean;
-
-// ----------------------------------------------------------------
-// Sometimes it's not possible to install a newer version of
-// GnuCash over an older one on Windows. This happens for example
-// when libraries or reports are moved around in the newer version.
-// The code below will detect an existing GnuCash installation
-// and will remove it (if the user accepts) before installing
-// the version the user has selected.
-// ----------------------------------------------------------------
-
-{ Lookup the registry information on a previous installation }
-procedure GetPrevInstallInfo();
-var
- sUnInstPath, sAppVersionPath: String;
- rootKey : Integer;
-begin
- sAppVersionPath := 'Software\GnuCash\Version';
- sUnInstPath := 'Software\Microsoft\Windows\CurrentVersion\Uninstall\GnuCash_is1';
-
- PrevAppName := '';
- PrevUninstallString := '';
- PrevVersionMajor := 0;
- PrevVersionMinor := 0;
- PrevVersionMicro := 0;
-
- if RegKeyExists(HKLM, sUnInstPath) then
- rootKey := HKLM
- else
- rootKey := HKCU;
-
- RegQueryStringValue(rootKey, sUnInstPath, 'UninstallString', PrevUninstallString);
- RegQueryStringValue(rootKey, sUnInstPath, 'DisplayName', PrevAppName);
- RegQueryDwordValue(rootKey, sAppVersionPath, 'VersionMajor', PrevVersionMajor);
- RegQueryDwordValue(rootKey, sAppVersionPath, 'VersionMinor', PrevVersionMinor);
- RegQueryDwordValue(rootKey, sAppVersionPath, 'VersionMicro', PrevVersionMicro);
-end;
-
-{ Check if there is another GnuCash currently installed }
-{ If so, the user will be prompted if it can be uninstalled first. }
-{ If the user doesn't allow uninstall, the installation will be aborted. }
-procedure CheckUninstallRequired();
-begin
- UninstallRequired := True;
- GetPrevInstallInfo;
-
- if (PrevUninstallString = '') then
- UninstallRequired := False
-// We used to check on major-minor versions to determine the uninstall requirement,
-// but this is not always sufficient. So the following code won't be used until
-// refined.
-// else if (PrevVersionMajor = @GNUCASH_MAJOR_VERSION@) and (PrevVersionMinor = @GNUCASH_MINOR_VERSION@) then
-// UninstallRequired := False;
-end;
-
-{ Uninstall the current installation }
-function UnInstallOldVersion(): Integer;
-var
- sUnInstallString: String;
- iResultCode: Integer;
-begin
-// Return Values:
-// 1 - uninstall string is empty
-// 2 - error executing the UnInstallString
-// 3 - successfully executed the UnInstallString
-
- // default return value
- Result := 0;
-
- if PrevUninstallString <> '' then begin
- sUnInstallString := RemoveQuotes(PrevUninstallString);
- if Exec(sUnInstallString, '/SILENT /NORESTART /SUPPRESSMSGBOXES','', SW_HIDE, ewWaitUntilTerminated, iResultCode) then
- Result := 3
- else
- Result := 2;
- end else
- Result := 1;
-end;
-
-function GetPrevAppName(Param: String): String;
-begin
- Result := PrevAppName;
-end;
-
-{ Setup a page to display if a previous (incompatible) GnuCash installation is found }
-procedure InitializeWizard;
-begin
- CheckUninstallRequired;
- PrevInstDetectedPage := CreateOutputMsgPage(wpReady,
- ExpandConstant('{cm:AIWP_Title}'),
- ExpandConstant('{cm:AIWP_Description,{code:GetPrevAppName}}'),
- ExpandConstant('{cm:AIWP_Message,{code:GetPrevAppName}}'));
-end;
-
-{ Determine whether the previous installation page should be displayed or not }
-function ShouldSkipPage(PageID: Integer): Boolean;
-begin
- Result := False
- if (PageID = PrevInstDetectedPage.ID) and (not UninstallRequired) then
- Result := True;
-end;
-
-{ If a previous (incompatible) installation is present start the installation }
-{ process with deleting this old installation }
-procedure CurStepChanged(CurStep: TSetupStep);
-begin
- if (CurStep=ssInstall) and (UninstallRequired) then
- UnInstallOldVersion();
-end;
-
-// ------------------------------------------------------------
-// The GnuCash environment file contains paths that have to be
-// adapted at install time. The code below does that.
-// ------------------------------------------------------------
-function MingwBacksl(const S: String): String;
-begin
- { Modify the path name S so that it can be used by MinGW }
- if Length(ExtractFileDrive(S)) = 0 then
- Result := S
- else begin
- Result := '/'+S;
- StringChange(Result, ':\', '\');
- end;
- StringChange(Result, '\', '/');
-end;
-
-procedure MyAfterInstallConfig();
-var
- FileName, FileString, appdir, libdir, pkglibdir, pkgdatadir: String;
- Res: Boolean;
-begin
-
- { Get the installation-specific paths }
- appdir := ExpandConstant('{app}');
- pkgdatadir := appdir + '\share\@PACKAGE@';
-
- { Create the guile.cmd file; #10 is the linefeed character and #13 CR }
-
- FileName := appdir + '\bin\guile.cmd' ;
- FileString := 'set GUILE_LOAD_PATH=' + pkgdatadir + '\scm;' + appdir + '\share\guile\1.8;%GUILE_LOAD_PATH%'#13#10 ;
- FileString := FileString + 'start guile.exe %*'#13#10 ;
-
- { Save the final file }
-
- Res := SaveStringToFile(FileName, FileString, False);
- if Res = False then
- MsgBox('Error on saving '+FileName+' for completing the installation', mbInformation, MB_OK);
-
-end;
-
-function BackslashPath(const S: String): String;
-begin
- { Convert c:\soft to c:/soft }
- Result := S;
- StringChange(Result, '\', '/');
-end;
-
-procedure MyAfterInstallEnvironment();
-var
- EnvFile, EtcDir: String;
- iLineCounter, iSize : Integer;
- EnvStrList: TArrayOfString;
- Res: Boolean;
-begin
- { Make some Windows-only changes to the etc/@PACKAGE@/environment file }
- { If you make any changes here, you should probably also change the equivalent sections }
- { in install.sh }
- { A new line is stared with #13#10 - #10 is the linefeed character and #13 CR }
-
- { Get the installation-specific paths }
- EnvFile := ExpandConstant(CurrentFileName);
- EtcDir := ExtractFileDir(EnvFile);
-
- { Load the current contents of the environment file }
- Res := LoadStringsFromFile(EnvFile, EnvStrList);
- if Res = False then
- MsgBox('Error on reading ' + EnvFile + ' for completing the installation', mbInformation, MB_OK);
-
- iSize := GetArrayLength(EnvStrList);
- for iLineCounter := 0 to iSize-1 do
- begin
- { Adapt GUILE_LOAD_PATH parameter and prevent cygwin interference in SCHEME_LIBRARY_PATH }
- if (Pos('GUILE_LOAD_PATH', EnvStrList[iLineCounter]) = 1) then
- begin
- StringChangeEx(EnvStrList[iLineCounter], '{GUILE_LOAD_PATH}', '{GNC_HOME}/share/guile/1.8;{GUILE_LOAD_PATH}', True);
-
- EnvStrList[iLineCounter] := EnvStrList[iLineCounter] + #13#10 + '# Clear SCHEME_LIBRARY_PATH to prevent interference from other guile installations (like cygwin)' + #13#10;
- EnvStrList[iLineCounter] := EnvStrList[iLineCounter] + 'SCHEME_LIBRARY_PATH=' + #13#10;
- end;
- { Adapt GNC_DBD_DIR parameter }
- if (Pos('GNC_DBD_DIR', EnvStrList[iLineCounter]) > 0) then
- EnvStrList[iLineCounter] := 'GNC_DBD_DIR={GNC_HOME}/lib/dbd';
- { Adapt XDG_DATA_DIRS parameter }
- if (Pos('XDG_DATA_DIRS=', EnvStrList[iLineCounter]) > 0) then
- EnvStrList[iLineCounter] := 'XDG_DATA_DIRS={GNC_HOME}/share;{XDG_DATA_DIRS};/usr/local/share;/usr/share';
- end;
-
- { Save the final file }
- Res := ForceDirectories(EtcDir);
- if Res = False then
- MsgBox('Error on creating ' + EtcDir + ' for completing the installation', mbInformation, MB_OK);
-
- Res := SaveStringsToFile(EnvFile, EnvStrList, False);
- if Res = False then
- MsgBox('Error on saving ' + EnvFile + ' for completing the installation', mbInformation, MB_OK);
-end;
-
-// Sometimes a user either doesn't have a CSIDL_PERSONAL setting or
-// it's invalid. This function tests is and if that's the case returns
-// CSIDL_COMMON_DOCUMENTS. Code lifted from
-// http://stackoverflow.com/questions/28635548/avoiding-failed-to-expand-shell-folder-constant-userdocs-errors-in-inno-setup.
-
-function GetDocPath(Param: string): string;
-var Folder: string;
-begin
- try
- // first try to expand the {userdocs} folder; if this raises that
- // internal exception, you'll fall down to the except block where
- // you expand the {allusersprofile}
- Folder := ExpandConstant('{userdocs}');
- // the {userdocs} folder expanding succeded, so let's test if the
- // folder exists and if not, expand {allusersprofile}
- if not DirExists(Folder) then
- Folder := ExpandConstant('{allusersprofile}');
- except
- Folder := ExpandConstant('{allusersprofile}');
- end;
- // return the result
- Result := Folder;
-end;
-
-[Languages]
-Name: "en"; MessagesFile: "compiler:Default.isl"
-Name: "ca"; MessagesFile: "compiler:Languages\Catalan.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-ca.win32-bin.txt"
-Name: "de"; MessagesFile: "compiler:Languages\German.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-de.win32-bin.txt"
-Name: "el"; MessagesFile: "compiler:Languages\Greek.isl"
-Name: "fr"; MessagesFile: "compiler:Languages\French.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-fr.win32-bin.txt"
-Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-it.win32-bin.txt"
-Name: "ja"; MessagesFile: "compiler:Languages\Japanese.isl"
-Name: "lv"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Latvian-5.5.0.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-lv.win32-bin.txt"
-Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-nl.win32-bin.txt"
-Name: "pt_BR"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
-Name: "zh_CN"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\ChineseSimplified-5.5.3.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"
-Name: "zh_TW"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\ChineseTraditional-5.5.3.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"
-
-;; See http://www.jrsoftware.org/files/istrans/ for a complete list of
-;; Inno Setup translations. Unofficial translations must be downloaded
-;; and added to this repository as is done with Latvian and Chinese above.
-;; Unofficial translations should be updated when Inno Setup is.
-
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; These are only for improved text messages
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-[Messages]
-
-[CustomMessages]
-; *** "Select Components" wizard page
-FullInstall=Full installation
-CustomInstall=Custom installation
-CreateDesktopIcon=Create a &desktop icon
-CreateMenuLink=Create a start menu link
-RunPrg=Run GnuCash now
-AdditionalIcons=Create these icons:
-StatusMsgFirewall=Installing Windows firewall rules...
-; *** "Another install" wizard page
-; %1 in the following messages will be replaced with the application name and version, like "GnuCash 2.3.15"
-AIWP_Title=Another installation has been found
-AIWP_Description=%1 is currently installed on this computer
-AIWP_Message=This earlier installation has to be removed before continuing.%n%nIf you don't want that, click Cancel now to abort the current installation.%n%nClick Next to remove %1 and continue with the installation.%n%nNote: Only the program will be removed, not your financial data.
-
-MainFiles=GnuCash Program
-TranslFiles=Translation Files
-TemplFiles=Account Template Files
-
-IconComment_GnuCash=GnuCash Free Finance Manager
-IconName_README=Show GnuCash README
-IconComment_README=Show the README file
-IconFilename_README=README.win32-bin.txt
-IconName_FAQ=GnuCash FAQ (Online)
-IconName_Bugzilla=Report a GnuCash Bug (Online)
-IconName_InstallFQ=Install Online Price Retrieval for GnuCash
-IconComment_InstallFQ=Install the necessary perl module Finance-Quote for online retrieval of prices. Requires ActivePerl or Strawberry Perl 5.8 or later
-IconName_Theme=Select GnuCash Theme
-IconName_Uninstall=Uninstall GnuCash
-IconComment_Uninstall=Uninstall the Finance Manager GnuCash
-
-;; List of Code pages, used in gnucash.cmd
-LanguageCodePage=1252
-ca.LanguageCodePage=1252
-de.LanguageCodePage=1252
-el.LanguageCodePage=1253
-fr.LanguageCodePage=1252
-it.LanguageCodePage=1252
-ja.LanguageCodePage=932
-nl.LanguageCodePage=1252
-pt_BR.LanguageCodePage=1252
-zh_CN.LanguageCodePage=936
-zh_TW.LanguageCodePage=950
-
-;; ;;;;;;;;;;;;;;;;;;;;;
-;; Catalan translation
-
-ca.FullInstall=Instal·lació completa
-ca.CustomInstall=Instal·lació personalitzada
-ca.CreateDesktopIcon=Crear una icona a l'escriptori
-ca.CreateMenuLink=Crear una drecera al menú d'inici
-ca.RunPrg=Executar el GnuCash ara
-ca.AdditionalIcons=Crear les següents icones
-ca.StatusMsgFirewall=Instal·lació de les regles del tallafocs de Windows
-
-ca.MainFiles=Programa GnuCash
-ca.TranslFiles=Traducció catalana
-ca.TemplFiles=Model d'estructura de comptes
-
-ca.IconComment_GnuCash=GnuCash, el gestor de finances OpenSource
-ca.IconName_README=Mostra el LLEGIU-ME del GnuCash
-ca.IconComment_README=Mostra el fitxer LLEGIU-ME
-ca.IconFilename_README=README-ca.win32-bin.txt
-ca.IconName_FAQ=GnuCash FAQ - Preguntes freqüents (en lÃnia, en anglès)
-ca.IconName_Bugzilla=Informar d'un error al GnuCash (en lÃnia, en anglès)
-ca.IconName_InstallFQ=Instal·lar les cotitzacions en lÃnia per al GnuCash
-ca.IconComment_InstallFQ=Instal·leu el mòdul perl necessari Finance-Quote per a la recuperació de preus en lÃnia. Requereix ActivePerl o Strawberry Perl 5.8 o posterior
-ca.IconName_Theme=Selecció del tema GnuCash
-ca.IconName_Uninstall=Desinstal·lar GnuCash
-ca.IconComment_Uninstall=Desinstal·lar el gestor de finances GnuCash
-
-ca.AIWP_Title=S'ha trobat una altra instal·lació
-ca.AIWP_Description=%1 actualment està instal·lat en aquesta computadora
-ca.AIWP_Message=Aquesta instal·lació anterior s'ha d'eliminar abans de continuar.%n%nSi no voleu això, feu clic a »Cancel·la« ara per cancel·lar la instal·lació actual.%n%nFeu clic a »Següent« per eliminar %1 i continuar amb la instal·lació.%n%nNota: Només es retirarà el programa, no les vostres dades financeres.
-
-
-;; ;;;;;;;;;;;;;;;;;;;;
-;; German translation
-
-de.FullInstall=Komplett-Installation
-de.CustomInstall=Benutzerdefiniert
-de.CreateDesktopIcon=Ein Icon auf dem Desktop erstellen
-de.CreateMenuLink=Eine Verknüpfung im Startmenü erstellen
-de.RunPrg=GnuCash jetzt starten
-de.AdditionalIcons=Folgende Icons erstellen:
-de.StatusMsgFirewall=Windows Firewall für GnuCash automatisch Anpassen (empfohlen)...
-
-de.MainFiles=GnuCash Hauptprogramm
-de.TranslFiles=Deutsche Ãœbersetzung
-de.TemplFiles=Beispiel-Kontenrahmen
-
-de.IconComment_GnuCash=GnuCash OpenSource-Finanzverwaltung
-de.IconName_README=GnuCash README anzeigen
-de.IconComment_README=Die Informationsdatei (README) anzeigen
-de.IconFilename_README=README-de.win32-bin.txt
-de.IconName_FAQ=GnuCash Häufige Fragen (online, engl.)
-de.IconName_Bugzilla=Fehlerbericht einsenden für GnuCash (online, engl.)
-de.IconName_InstallFQ=Erweiterung um Wechselkurse mit GnuCash online abzurufen
-de.IconComment_InstallFQ=Aktien- und Devisenkurse online abrufen (optionales Modul Finance-Quote: Achtung! Erfordert das Programm ActivePerl oder Strawberry Perl 5.8 oder neuer)
-de.IconName_Theme=GnuCash's Erscheinungsbild (GTK-Thema) auswählen
-de.IconName_Uninstall=Deinstallieren von GnuCash
-de.IconComment_Uninstall=Die OpenSource-Finanzverwaltung GnuCash wieder deinstallieren und vom Computer löschen
-
-de.AIWP_Title=Frühere Version gefunden
-de.AIWP_Description=%1 ist momentan auf diesem Computer installiert
-de.AIWP_Message=Diese frühere Version muss vor der neuen Installation entfernt werden. %n%nFalls Sie das nicht möchten, klicken Sie jetzt auf »Abbrechen«.%n%nKlicken Sie auf »Fortsetzen«, um %1 zu entfernen und die neue Version zu installieren.%n%nHinweis: Lediglich die Programmversion wird entfernt, aber nicht Ihre finanziellen Daten.
-
-
-;; ;;;;;;;;;;;;;;;;;;;
-;; Greek translation
-
-el.FullInstall=ΠλήÏης εγκατάσταση
-el.CustomInstall=Î ÏοσαÏμοσμÎνη εγκατάσταση
-el.CreateDesktopIcon=ΔημιουÏγία εικονιδίου στην επιφάνεια εÏγασίας
-el.CreateMenuLink=Î Ïοσθήκη στο Î¼ÎµÎ½Î¿Ï ÎˆÎ½Î±Ïξη
-el.RunPrg=ΕκτÎλεση του GnuCash Ï„ÏŽÏα
-el.AdditionalIcons=ΔημιουÏγία εικονιδίων:
-el.StatusMsgFirewall=Εγκατάσταση κανόνων για το τοίχος Ï€Ïοστασίας των Windows...
-
-el.MainFiles=Î ÏόγÏαμμα GnuCash
-el.TranslFiles=ΑÏχεία μετάφÏασεων
-el.TemplFiles=ΑÏχεία με Ï€Ïότυπα λογαÏιασμών
-
-el.IconComment_GnuCash=GnuCash Ï€ÏόγÏαμμα διαχ. οικονομικών
-el.IconName_README=GnuCash - Εμφάνιση του README
-el.IconComment_README=Εμφάνιση του αÏχείου README
-el.IconFilename_README=README.win32-bin.txt
-el.IconName_FAQ=GnuCash - ΣυχνÎÏ‚ εÏωτήσεις (Online)
-el.IconName_Bugzilla=GnuCash - ΑναφοÏά σφάλματος (Online)
-el.IconName_InstallFQ=GnuCash - Εγκατάσταση λήψης τιμών (online)
-el.IconComment_InstallFQ=Εγκατάσταση του perl module Finance-Quote για λήψη τιμών online. Απαιτεί ActivePerl/Strawberry Perl 5.8+
-el.IconName_Uninstall=Απεγκατάσταση GnuCash
-el.IconComment_Uninstall=Απεγκατάσταση του διαχειÏιστή οικονομικών GnuCash
-
-
-;; ;;;;;;;;;;;;;;;;;;;;
-;; French translation
-
-fr.FullInstall=Installation complète
-fr.CustomInstall=Installation personnalisée
-fr.CreateDesktopIcon=Créer un icône sur le bureau
-fr.CreateMenuLink=Créer un lien dans le menu de démarrage
-fr.RunPrg=Démarrer GnuCash maintenant
-fr.AdditionalIcons=Créer les icônes suivants:
-fr.StatusMsgFirewall=Installation des règles de pare-feu de Windows
-
-fr.MainFiles=Programme GnuCash
-fr.TranslFiles=Traduction française
-fr.TemplFiles=Modèle de plan comptable
-
-fr.IconComment_GnuCash=GnuCash, le gestionnaire financier OpenSource
-fr.IconName_README=Afficher le GnuCash LISEZMOI
-fr.IconComment_README=Afficher le fichier LISEZMOI
-fr.IconFilename_README=README-fr.win32-bin.txt
-fr.IconName_FAQ=GnuCash FAQ (En ligne, en anglais)
-fr.IconName_Bugzilla=Envoyer un rapport d'erreur pour GnuCash (En ligne, en anglais)
-fr.IconName_InstallFQ=Installer les quotations en ligne pour GnuCash
-fr.IconComment_InstallFQ=Installation du module Finance-Quote requis pour le téléchargement du cours des devises et actions. Le programme ActivePerl 5.8 ou plus récent est aussi requis
-fr.IconName_Theme=Selection du style GnuCash
-fr.IconName_Uninstall=Dé-installer GnuCash
-fr.IconComment_Uninstall=Désinstalle le gestionnaire financier GnuCash
-
-
-;; ;;;;;;;;;;;;;;;;;;;;;
-;; Italian translation
-
-; *** Pagina di "Selezione dei componenti"
-it.FullInstall=Installazione completa
-it.CustomInstall=Installazione personalizzata
-it.CreateDesktopIcon=Crea un'icona sul desktop
-it.CreateMenuLink=Crea un collegamento nel menu "Start"
-it.RunPrg=Avvia GnuCash
-it.AdditionalIcons=Crea queste icone:
-it.StatusMsgFirewall=Installazione delle regole per il firewall di Windows...
-; *** Pagina di "Altra installazione"
-; nel messaggio seguente la stringa %1 sarà sostituita dal nome e dalla versione dell'applicazione, ad esempio "GnuCash 2.3.15"
-it.AIWP_Title=È stata trovata un'altra installazione
-it.AIWP_Description=%1 è installato in questo computer
-it.AIWP_Message=Questa precedente installazione deve essere rimossa prima di continuare.%n%nSe non si intende rimuoverla, fare clic su «Annulla» per terminare l'installazione.%n%nFare invece clic su «Avanti» per rimuovere %1 e continuare con l'installazione.%n%nNota: verrà rimosso solo il programma, non i propri dati finanziari.
-
-it.MainFiles=File del programma GnuCash
-it.TranslFiles=Traduzione Italiana
-it.TemplFiles=Modelli di strutture dei conti
-
-it.IconComment_GnuCash=GnuCash: gestore di finanze libero
-it.IconName_README=Mostra il file GnuCash LEGGIMI
-it.IconComment_README=Mostra il file LEGGIMI
-it.IconFilename_README=README-it.win32-bin.txt
-it.IconName_FAQ=GnuCash FAQ (online, in Inglese)
-it.IconName_Bugzilla=Segnalare un bug en GnuCash (online, in Inglese)
-it.IconName_InstallFQ=Installa la funzione di ricerca delle quotazioni online per GnuCash
-it.IconComment_InstallFQ=Installa il modulo di perl Finance-Quote necessario per ricevere le quotazioni online. Richiede ActivePerl 5.8+
-it.IconName_Theme=Selezione del tema GnuCash
-it.IconName_Uninstall=Disinstalla GnuCash
-it.IconComment_Uninstall=Disinstalla il programma di gestione delle finanze GnuCash
-
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Japanese translation
-
-ja.FullInstall=完全インストール
-ja.CustomInstall=カスタムインストール
-ja.CreateDesktopIcon=デスクトップã«ã‚¢ã‚¤ã‚³ãƒ³ã‚’作æˆ(&D)
-ja.CreateMenuLink=スタートメニューã«ãƒªãƒ³ã‚¯ã‚’作æˆ
-ja.RunPrg=GnuCashã‚’ã™ãã«å®Ÿè¡Œ
-ja.AdditionalIcons=作æˆã•ã‚ŒãŸã‚¢ã‚¤ã‚³ãƒ³:
-ja.StatusMsgFirewall=ファイアウォール定義をインストールä¸
-; *** "Another install" wizard page
-; %1 in the following messages will be replaced with the application name and version, like "GnuCash 2.3.15"
-ja.AIWP_Title=ä»–ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã™
-ja.AIWP_Description=ã“ã®ã‚³ãƒ³ãƒ”ュータã«ã¯ %1 ãŒç¾åœ¨ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã™
-ja.AIWP_Message=インストールを継続ã™ã‚‹å‰ã«å‰ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¯ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¾ã™ã€‚%n%nã‚‚ã—ã“ã®å‹•ä½œã‚’望ã¾ãªã„ãªã‚‰ã€Œã‚ャンセルã€ã‚’クリックã—ã¦ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’ä¸æ¢ã—ã¦ãã ã•ã„。%n%n%1 を削除ã—ã¦ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’継続ã™ã‚‹å ´åˆã¯ã€Œæ¬¡ã¸ã€ã‚’クリックã—ã¦ãã ã•ã„。%n%n備考: 作æˆã—ãŸè²¡å‹™ãƒ‡ãƒ¼ã‚¿ã¯å‰Šé™¤ã•ã‚Œã¾ã›ã‚“。プãƒã‚°ãƒ©ãƒ ã®ã¿ãŒå‰Šé™¤ã•ã‚Œã¾ã™ã€‚
-
-ja.MainFiles=GnuCashプãƒã‚°ãƒ©ãƒ
-ja.TranslFiles=翻訳ファイル
-ja.TemplFiles=勘定科目テンプレートファイル
-
-ja.IconComment_GnuCash=GnuCash フリーã®è²¡å‹™ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢
-ja.IconName_README=GnuCash - READMEを表示
-ja.IconComment_README=READMEファイルを表示ã—ã¾ã™
-ja.IconFilename_README=README.win32-bin.txt
-ja.IconName_FAQ=GnuCash - FAQ (オンライン)
-ja.IconName_Bugzilla=GnuCash - ãƒã‚°ã‚’å ±å‘Š (オンライン)
-ja.IconName_InstallFQ=GnuCash - ã‚ªãƒ³ãƒ©ã‚¤ãƒ³ç›¸å ´è¡¨å–得ツールをインストール
-ja.IconComment_InstallFQ=ã‚ªãƒ³ãƒ©ã‚¤ãƒ³ç›¸å ´è¡¨ã‚’å–å¾—ã™ã‚‹ãŸã‚ã«Finance-Quote perl モジュールをインストールã—ã¾ã™ã€‚ActivePerl5.8ã¾ãŸã¯5.10ãŒå¿…è¦ã§ã™
-ja.IconName_Theme=GnuCash テーマã®é¸æŠž
-ja.IconName_Uninstall=GnuCashをアンインストール
-ja.IconComment_Uninstall=財務ソフトウェアGnuCashをアンインストールã—ã¾ã™
-
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Latvian translation
-
-; *** "Select Components" wizard page
-lv.FullInstall=Pilna uzstÄdÄ«Å¡ana
-lv.CustomInstall=IzvÄ“les uzstÄdÄ«Å¡ana
-lv.CreateDesktopIcon=Izveidot &darbvirsmas ikonu
-lv.CreateMenuLink=Izveidot starta izvēlnes saiti
-lv.RunPrg=Palaist GnuCash tagad
-lv.AdditionalIcons=Izveidot sekojošas ikonas:
-lv.StatusMsgFirewall=UzstÄda Windows ugunssienas likumus...
-
-; *** "Another install" wizard page
-; %1 in the following messages will be replaced with the application name and version, like "GnuCash 2.3.15"
-lv.AIWP_Title=Ir atrasta cita programmas versija
-lv.AIWP_Description=Uz Å¡Ä« datora jau ir uzstÄdÄ«t %1 versija
-lv.AIWP_Message=Pirms turpinÄt, ir nepiecieÅ¡ams noņemt iepriekÅ¡ uzstÄdÄ«to versiju.%n%nJa nevÄ“laties to darÄ«t, spiediet Atcelt pogu, un Å¡Ä« uzstÄdÄ«Å¡ana tiks atcelta.%n%nSpiediet TurpinÄt, lai noņemtu %1 un turpinÄtu jaunÄs versijas uzstÄdÄ«Å¡anu.%n%nNote: Tiks noņemta tikai iepriekÅ¡Ä“jÄs programmas versija. JÅ«su finanÅ¡u dati aiztikti netiks.
-
-lv.MainFiles=GnuCash Programma
-lv.TranslFiles=Tulkojumu faili
-lv.TemplFiles=Kontu sagatavju faili
-
-lv.IconComment_GnuCash=GnuCash grÄmatvedÄ«bas programma
-lv.IconName_README=GnuCash - ParÄdÄ«t README
-lv.IconComment_README=ParÄda README failu
-lv.IconFilename_README=README-lv.win32-bin.txt
-lv.IconName_FAQ=GnuCash - BUJ (tiešsaistē)
-lv.IconName_Bugzilla=GnuCash - Ziņot par kļūdu (tiešsaistē)
-lv.IconName_InstallFQ=GnuCash - UzstÄdÄ«t tieÅ¡saistes kursu iegÅ«Å¡anu
-lv.IconComment_InstallFQ=UzstÄdÄ«t nepiecieÅ¡amos Perl moduļus valÅ«tas kursu iegÅ«Å¡anai. NepiecieÅ¡ams ActivePerl 5.8+
-lv.IconName_Theme=Izvēlieties tēmu GnuCash
-lv.IconName_Uninstall=Noņemt GnuCash
-lv.IconComment_Uninstall=Noņemt GnuCash grÄmatvedÄ«bas programmu
-
-
-;; ;;;;;;;;;;;;;;;;;
-;; Dutch translation
-
-nl.FullInstall=Volledige installatie
-nl.CustomInstall=Aangepaste installatie
-nl.CreateDesktopIcon=Een icoon op het Bureaublad plaatsen
-nl.CreateMenuLink=Een koppeling in menu Start plaatsen
-nl.RunPrg=GnuCash nu starten
-nl.AdditionalIcons=Deze iconen aanmaken:
-nl.StatusMsgFirewall=Windows Firewall-regels installeren...
-
-nl.MainFiles=Programmabestanden voor GnuCash
-nl.TranslFiles=Vertalingsbestanden
-nl.TemplFiles=Grootboekrekeningssjablonen
-
-nl.IconComment_GnuCash=GnuCash vrije boekhoudsoftware
-nl.IconName_README=GnuCash LEESMIJ tonen
-nl.IconComment_README=Het LEESMIJ-bestand weergeven
-nl.IconFilename_README=README-nl.win32-bin.txt
-nl.IconName_FAQ=GnuCash FAQ (online)
-nl.IconName_Bugzilla=Een bug melden in GnuCash (online)
-nl.IconName_InstallFQ=Online koersinformatie installeren voor GnuCash
-nl.IconComment_InstallFQ=De Perl-module Finance-Quote installeren om online koersen op te vragen. Hiervoor is ActivePerl or Strawberry Perl 5.8 of recenter nodig.
-nl.IconName_Theme=Thema voor GnuCash selecteren
-nl.IconName_Uninstall=GnuCash verwijderen
-nl.IconComment_Uninstall=De vrije boekhoudsoftware GnuCash verwijderen
-nl.AIWP_Title=Een eerdere installatie werd gevonden
-nl.AIWP_Description=%1 is momenteel op deze computer geïnstalleerd
-nl.AIWP_Message=Deze eerdere installatie moet verwijderd worden alvorens verder te gaan.%n%nAls u dat niet wil, klik dan nu op Annuleren om de huidige installatie af te breken.%n%nKlik op Volgende om %1 te verwijderen en de installatie te vervolgen.%n%nOpmerking: alleen het programma zal verwijderd worden, niet je financiële gegevens.
-
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Brazilian Portuguese translation
-
-pt_BR.FullInstall=Instalação Completa
-pt_BR.CustomInstall=Instalação Personalizada
-pt_BR.CreateDesktopIcon=Criar um Ãcone na Ãrea de Trabalho
-pt_BR.CreateMenuLink=Criar um link no menu Iniciar
-pt_BR.RunPrg=Executar o GnuCash agora
-pt_BR.AdditionalIcons=Criar estes Ãcones:
-pt_BR.StatusMsgFirewall=Instalando as regras de firewall do Windows...
-
-pt_BR.MainFiles=Programa GnuCash
-pt_BR.TranslFiles=Tradução
-pt_BR.TemplFiles=Modelos de Conta
-
-pt_BR.IconComment_GnuCash=Gerenciador Financeiro Livre GnuCash
-pt_BR.IconName_README=GnuCash - Mostrar LEIA-ME (README)
-pt_BR.IconComment_README=Mostra o arquivo LEIA-ME (README)
-pt_BR.IconFilename_README=LEIA-ME.win32-bin.txt
-pt_BR.IconName_FAQ=GnuCash - Perguntas Freqüentes (online, inglês)
-pt_BR.IconName_Bugzilla=GnuCash - Relatar um erro (online, inglês)
-pt_BR.IconName_InstallFQ=GnuCash - Instalar a Consulta de Preços Online
-pt_BR.IconComment_InstallFQ=Instala o módulo perl Finance-Quote, necessário para a busca de preços online. Requer ActivePerl 5.8+.
-pt_BR.IconName_Uninstall=Desinstalar o GnuCash
-pt_BR.IconComment_Uninstall=Desinstala o Gerenciador Financeiro GnuCash
-
-
-;; ;;;;;;;;;;;;;;;;;
-;; Simplified Chinese translation
-
-zh_CN.FullInstall=完全安装
-zh_CN.CustomInstall=自定义安装
-zh_CN.CreateDesktopIcon=创建桌é¢å›¾æ ‡
-zh_CN.CreateMenuLink=创建开始èœå•é“¾æŽ¥
-zh_CN.RunPrg=现在开始è¿è¡Œ GnuCash
-zh_CN.AdditionalIcons=åˆ›å»ºè¿™äº›å›¾æ ‡
-zh_CN.StatusMsgFirewall=æ£åœ¨å®‰è£… Windows 防ç«å¢™è§„则...
-
-zh_CN.MainFiles=GnuCash 程åº
-zh_CN.TranslFiles=翻译文件
-zh_CN.TemplFiles=会计科目模æ¿æ–‡ä»¶
-
-zh_CN.IconComment_GnuCash=GnuCash å…费财务管ç†
-zh_CN.IconName_README=GnuCash - 显示自述文件
-zh_CN.IconComment_README=显示自述文件
-zh_CN.IconFilename_README=README-zh_CN.win32-bin.txt
-zh_CN.IconName_FAQ=GnuCash - 常è§é—®é¢˜ (在线)
-zh_CN.IconName_Bugzilla=GnuCash - 报告软件 Bug (在线)
-zh_CN.IconName_InstallFQ=GnuCash - å®‰è£…åœ¨çº¿ä»·æ ¼æ£€ç´¢åŠŸèƒ½
-zh_CN.IconComment_InstallFQ=å®‰è£…åœ¨çº¿ä»·æ ¼æ£€ç´¢æ‰€å¿…éœ€çš„ Perl Finance-Quote模å—ã€‚éœ€è¦ ActivePerl 5.8 或 5.10
-zh_CN.IconName_Uninstall=å¸è½½ GnuCash
-zh_CN.IconComment_Uninstall=å¸è½½è´¢åŠ¡ç®¡ç†è½¯ä»¶ GnuCash
-
-;; ;;;;;;;;;;;;;;;;;
-;; Traditional Chinese translation
-
-; *** "Select Components" wizard page
-zh_TW.FullInstall=完整安è£
-zh_TW.CustomInstall=自訂安è£
-zh_TW.CreateDesktopIcon=產生桌é¢åœ–示
-zh_TW.CreateMenuLink=產生開始功能表圖示
-zh_TW.RunPrg=ç¾åœ¨é–‹å§‹åŸ·è¡Œ GnuCash
-zh_TW.AdditionalIcons=建立這些圖示:
-zh_TW.StatusMsgFirewall=æ£åœ¨å®‰è£ Windows 防ç«ç‰†è¦å‰‡...
-; *** "Another install" wizard page
-; %1 in the following messages will be replaced with the application name and version, like "GnuCash 2.3.15"
-zh_TW.AIWP_Title=發ç¾å·²å®‰è£éŽ
-zh_TW.AIWP_Description=%1 已經安è£æ–¼ç³»çµ±ä¸
-zh_TW.AIWP_Message=èˆŠç‰ˆå¿…é ˆå…ˆç§»é™¤æ‰èƒ½ç¹¼çºŒã€‚%n%n若您ä¸æƒ³ç§»é™¤ï¼Œç¾åœ¨å°±é»žé¸ã€Œå–消ã€ä¸æ–·å®‰è£ã€‚%n%n點é¸ã€Œä¸‹ä¸€æ¥ã€æœƒç§»é™¤ %1 並繼續安è£ã€‚%n%n注æ„: åªæœ‰ç¨‹å¼æœƒè¢«ç§»é™¤ï¼Œä¸æœƒå½±éŸ¿åˆ°æ‚¨çš„財務資料å˜æª”。
-
-zh_TW.MainFiles=GnuCash 程å¼
-zh_TW.TranslFiles=ç¿»è¯æª”
-zh_TW.TemplFiles=會計科目範本檔
-
-zh_TW.IconComment_GnuCash=GnuCash 自由財務管ç†
-zh_TW.IconName_README=GnuCash - 顯示 README
-zh_TW.IconComment_README=顯示 README 檔
-zh_TW.IconFilename_README=README-zh_TW.win32-bin.txt
-zh_TW.IconName_FAQ=GnuCash - 常見å•é¡Œ (線上)
-zh_TW.IconName_Bugzilla=GnuCash - å›žå ±ç¨‹å¼ Bug (線上)
-zh_TW.IconName_InstallFQ=GnuCash - 安è£ç¶²è·¯å ±åƒ¹æˆªå–功能
-zh_TW.IconComment_InstallFQ=安è£æˆªå–ç¶²è·¯å ±åƒ¹æ‰€éœ€çš„ Perl Finance-Quote æ¨¡çµ„ã€‚éœ€è¦ ActivePerl 5.8 或 5.10
-zh_TW.IconName_Theme=é¸æ“‡ä»‹é¢é¢¨æ ¼ GnuCash
-zh_TW.IconName_Uninstall=åå®‰è£ GnuCash
-zh_TW.IconComment_Uninstall=å安è£è²¡å‹™ç®¡ç†å“¡ GnuCash
diff --git a/install-impl.sh b/install-impl.sh
deleted file mode 100644
index 18baa4e..0000000
--- a/install-impl.sh
+++ /dev/null
@@ -1,1694 +0,0 @@
-#!/bin/sh
-#
-# GnuCash shellscript functions for install.sh
-#
-
-function inst_prepare() {
- # Necessary so that intltoolize doesn't come up with some
- # foolish AC_CONFIG_AUX_DIR; bug#362006
- # We cannot simply create install-sh in the repository, because
- # this will confuse other parts of the tools
- _REPOS_UDIR=`unix_path $REPOS_DIR`
- level0=.
- level1=$(basename ${_REPOS_UDIR})
- level2=$(basename $(dirname ${_REPOS_UDIR}))"/"$level1
- for mydir in $level0 $level1 $level2; do
- if [ -f $mydir/make-gnucash-potfiles.in ]; then
- die "Do not save install.sh in the repository or one its parent directories"
- fi
- done
-# # Remove old empty install-sh files
-# if [ -f ${_REPOS_UDIR}/install-sh -a "$(cat ${_REPOS_UDIR}/install-sh &>/dev/null | wc -l)" -eq 0 ]; then
-# rm -f ${_REPOS_UDIR}/install-sh
-# fi
- # Partially remove RegEx-GNU if installed
- _REGEX_UDIR=`unix_path $REGEX_DIR`
- if [ -f ${_REGEX_UDIR}/contrib/regex-0.12-GnuWin32.README ]; then
- qpushd ${_REGEX_UDIR}
- rm -f bin/*regex*.dll
- rm -f contrib/regex*
- rm -f lib/*regex*
- qpopd
- fi
-
- DOWNLOAD_UDIR=`unix_path $DOWNLOAD_DIR`
- TMP_UDIR=`unix_path $TMP_DIR`
- mkdir -p $TMP_UDIR
- mkdir -p $DOWNLOAD_UDIR
-
- if [ "$DISABLE_OPTIMIZATIONS" = "yes" ]; then
- export CFLAGS="$CFLAGS -g -O0"
- fi
-
- if [ "$CROSS_COMPILE" = "yes" ]; then
- # to avoid using the build machine's installed packages
- set_env "" PKG_CONFIG_PATH # registered
- export PKG_CONFIG_LIBDIR="" # not registered
- fi
-
- # Save pid for use in temporary files
- _PID=$$
-}
-
-function inst_msys() {
- setup MSys
- _MINGW_UDIR=`unix_path $MINGW_DIR`
- _MINGW_LDDIR=/mingw/lib
- _MSYS_UDIR=`unix_path $MSYS_DIR`
- add_to_env $_MINGW_UDIR/bin PATH
- add_to_env $_MSYS_UDIR/bin PATH
-
- # The bootstrap script already set some of this up
- # It will be set up again here to catch version updates of any of these packages
- mingw-get update
- mingw-get upgrade mingw-get
-
- # Note: msys-base can't be upgraded by this script
- # it potentially will want to upgrade bash
- # which will fail because bash is running
- # If you want to install a newer version
- # of msys-base anyway, then
- # - open a traditional windows command shell
- # - cd into your MINGW's bin directory
- # (Default: c:\soft\mingw\bin)
- # - run mingw-get upgrade msys-base
- # - or mingw-get upgrade msys-base=<new-version>
- #mingw_smart_get upgrade msys-base
- mingw_smart_get msys-wget ${MSYS_WGET_VERSION}
- mingw_smart_get msys-m4 ${MSYS_M4_VERSION}
- mingw_smart_get msys-patch ${MSYS_PATCH_VERSION}
- mingw_smart_get msys-perl ${MSYS_PERL_VERSION}
- mingw_smart_get msys-unzip ${MSYS_UNZIP_VERSION}
- mingw_smart_get msys-bison ${MSYS_BISON_VERSION}
- mingw_smart_get msys-flex ${MSYS_FLEX_VERSION}
-
- quiet perl --help || die "perl not installed correctly"
- quiet wget --version || die "wget unavailable"
- quiet unzip --help || die "unzip unavailable"
-}
-
-function inst_cmake() {
- setup CMake
- _CMAKE_UDIR=`unix_path ${CMAKE_DIR}`
- add_to_env ${_CMAKE_UDIR}/bin PATH
- if [ -f ${_CMAKE_UDIR}/bin/cmake.exe ]
- then
- echo "cmake already installed in $_CMAKE_UDIR. skipping."
- else
- WGET_EXTRA_OPTIONS="--no-check-certificate"
- wget_unpacked $CMAKE_URL $DOWNLOAD_DIR $CMAKE_DIR
- unset WGET_EXTRA_OPTIONS
- assert_one_dir ${_CMAKE_UDIR}/cmake-3*
- mv ${_CMAKE_UDIR}/cmake-3*/* ${_CMAKE_UDIR}
- rm -rf ${_CMAKE_UDIR}/cmake-3*
-
- [ -f ${_CMAKE_UDIR}/bin/cmake.exe ] || die "cmake not installed correctly"
- fi
-}
-
-function inst_ninja() {
- setup Ninja
- _NINJA_UDIR=`unix_path ${NINJA_DIR}`
- add_to_env ${_NINJA_UDIR} PATH
- if [ -f ${_NINJA_UDIR}/ninja.exe ]
- then
- echo "ninja already install in $_NINJA_UDIR. skipping."
- else
- WGET_EXTRA_OPTIONS="--no-check-certificate -O $TMP_DIR\\$(basename $NINJA_URL)"
- wget_unpacked $NINJA_URL $DOWNLOAD_DIR $NINJA_DIR
- unset WGET_EXTRA_OPTIONS
-
- [ -f ${_NINJA_UDIR}/ninja.exe ] || die "ninja not installed correctly"
- fi
-}
-
-function inst_exetype() {
- setup exetype
- _EXETYPE_UDIR=`unix_path $EXETYPE_DIR`
- add_to_env $_EXETYPE_UDIR/bin PATH
- if quiet which exetype
- then
- echo "exetype already installed in $_EXETYPE_UDIR. skipping."
- else
- mkdir -p $_EXETYPE_UDIR/bin
- cp $EXETYPE_SCRIPT $_EXETYPE_UDIR/bin/exetype
- chmod +x $_EXETYPE_UDIR/bin/exetype
- quiet which exetype || die "exetype unavailable"
- fi
-}
-
-function test_for_mingw() {
- if [ "$CROSS_COMPILE" == "yes" ]; then
- ${CC} --version && ${LD} --help
- else
-# g++ --version && mingw32-make --help
- g++ --version
- fi
-}
-
-function inst_mingw() {
- setup MinGW
- _MINGW_UDIR=`unix_path $MINGW_DIR`
- _MINGW_WFSDIR=`win_fs_path $MINGW_DIR`
- # Configure msys to use mingw on the above path before running any tests !
- configure_msys "$_PID" "$_MINGW_WFSDIR"
- add_to_env $_MINGW_UDIR/bin PATH
-
- mkdir -p $_MINGW_UDIR
-
- # Download the precompiled packages in any case to get their DLLs
- # NOTE: installation order matters here - care should be taken
- # that each call to mingw_smart_get really installs one package
- # or group of packages that embody one entity such as gcc's subpackages)
- # This is due to the very limited package management features
- # of mingw-get (which is called by mingw_smart_get.
- # If multiple packages are automatically installed in
- # one command, it becomes virtually impossible to guarantee
- # the predetermined versions of all packages will be installed
- # (instead of the most recent one)
-
- # Win32 runtime and api
- mingw_smart_get mingw32-mingwrt-dev ${MINGW_RT_VERSION}
- mingw_smart_get mingw32-w32api-dev ${MINGW_W32API_VERSION}
- # GCC/G++ dependencies
- mingw_smart_get mingw32-libgmp-dll ${MINGW_GMP_VERSION}
- mingw_smart_get mingw32-libmpfr-dll ${MINGW_MPFR_VERSION}
- mingw_smart_get mingw32-libmpc-dll ${MINGW_MPC_VERSION}
- mingw_smart_get mingw32-libpthread-dll ${MINGW_PTHREAD_W32_VERSION}
- mingw_smart_get mingw32-libz-dll ${MINGW_ZLIB_VERSION}
- mingw_smart_get mingw32-libgcc-dll ${MINGW_GCC_VERSION}
- # Gettext and friends - should come before binutils
- mingw_smart_get mingw32-libiconv-dev ${MINGW_LIBICONV_VERSION}
- mingw_smart_get mingw32-libexpat-dev ${MINGW_LIBEXPAT_VERSION}
- mingw_smart_get mingw32-gettext-dev ${MINGW_GETTEXT_VERSION}
- # Binutils and GCC/G++ binaries
- mingw_smart_get mingw32-binutils-bin ${MINGW_BINUTILS_VERSION}
- mingw_smart_get mingw32-gcc ${MINGW_GCC_VERSION}
- mingw_smart_get mingw32-gcc-g++ ${MINGW_GCC_VERSION}
- # Autotools
- mingw_smart_get mingw32-autoconf2.1 ${MINGW_AUTOCONF21_VERSION}
- mingw_smart_get mingw32-autoconf2.5 ${MINGW_AUTOCONF25_VERSION}
- mingw_smart_get mingw32-autoconf ${MINGW_AUTOCONF_VERSION}
- mingw_smart_get mingw32-automake1.11 ${MINGW_AUTOMAKE111_VERSION}
- mingw_smart_get mingw32-automake1.10 ${MINGW_AUTOMAKE110_VERSION}
- mingw_smart_get mingw32-automake1.9 ${MINGW_AUTOMAKE19_VERSION}
- mingw_smart_get mingw32-automake1.8 ${MINGW_AUTOMAKE18_VERSION}
- mingw_smart_get mingw32-automake1.7 ${MINGW_AUTOMAKE17_VERSION}
- mingw_smart_get mingw32-automake1.6 ${MINGW_AUTOMAKE16_VERSION}
- mingw_smart_get mingw32-automake1.5 ${MINGW_AUTOMAKE15_VERSION}
- mingw_smart_get mingw32-automake1.4 ${MINGW_AUTOMAKE14_VERSION}
- mingw_smart_get mingw32-automake ${MINGW_AUTOMAKE_VERSION}
- mingw_smart_get mingw32-libtool ${MINGW_LIBTOOL_VERSION}
- mingw_smart_get mingw32-libltdl ${MINGW_LIBLTDL_VERSION}
- mingw_smart_get mingw32-libiconv-bin ${MINGW_LIBICONV_VERSION}
- # Build dependencies for gnucash and other self-built libraries
- mingw_smart_get mingw32-gmp-dev ${MINGW_GMP_VERSION}
- mingw_smart_get mingw32-pthreads-w32-dev ${MINGW_PTHREAD_W32_VERSION}
-
- if [ "$CROSS_COMPILE" != "yes" ]; then
- mingw_smart_get mingw32-pexports ${MINGW_PEXPORTS_VERSION}
- quiet which pexports || die "mingw-utils not installed correctly (pexports)"
- # Hack to make Gnome's pkg-config happy (without having to rebuild it)
- cp "${_MINGW_UDIR}"/bin/libintl*.dll "${_MINGW_UDIR}/bin/intl.dll"
- else
- ./create_cross_mingw.sh
- fi
-
- # Test if everything worked out correctly
- quiet test_for_mingw || die "mingw not installed correctly"
- quiet autoconf --help || die "autoconf not installed correctly"
- quiet automake --help || die "automake not installed correctly"
- quiet libtoolize --help && \
- quiet ${LD} -lltdl -o $TMP_UDIR/ofile || die "libtool/libtoolize not installed correctly"
-
- # Still needed ?
- #[ ! -d $_AUTOTOOLS_UDIR/share/aclocal ] || add_to_env "-I $_AUTOTOOLS_UDIR/share/aclocal" ACLOCAL_FLAGS
-}
-
-function inst_swig() {
- setup Swig
- _SWIG_UDIR=`unix_path $SWIG_DIR`
- add_to_env $_SWIG_UDIR PATH
- if quiet swig -version
- then
- echo "swig already installed in $_SWIG_UDIR. skipping."
- else
- wget_unpacked $SWIG_URL $DOWNLOAD_DIR $SWIG_DIR
- qpushd $SWIG_DIR
- mv swigwin-* mydir
- mv mydir/* .
- mv mydir/.[A-Za-z]* . # hidden files
- rmdir mydir
- rm INSTALL # bites with /bin/install
- qpopd
- quiet swig -version || die "swig unavailable"
- fi
-}
-
-function inst_git() {
- setup Git
- _GIT_UDIR=`unix_path $GIT_DIR`
- # Don't add git's directory to the PATH, its installed DLLs conflict
- # with the ones in our mingw environment
- # add_to_env $_GIT_UDIR/bin PATH
- if quiet git --help
- then
- echo "git already installed in the system path. skipping."
- set_env git GIT_CMD
- elif quiet "$_GIT_UDIR/bin/git" --help
- then
- echo "git already installed in $_GIT_UDIR. skipping."
- set_env "$_GIT_UDIR/bin/git" GIT_CMD
- else
- WGET_EXTRA_OPTIONS="--no-check-certificate -O$TMP_DIR\\$(basename $GIT_URL)" # github certificate can't be verified on WinXP
- smart_wget $GIT_URL $DOWNLOAD_DIR $(basename $GIT_URL)
- $LAST_FILE //SP- //SILENT //DIR="$GIT_DIR"
- set_env "$_GIT_UDIR/bin/git" GIT_CMD
- unset WGET_EXTRA_OPTIONS
- quiet "$GIT_CMD" --help || die "git unavailable"
- fi
- # Make sure GIT_CMD is available to subshells if it is set
- [ -n "$GIT_CMD" ] && export GIT_CMD
-}
-
-function inst_aqbanking() {
- setup AqBanking
- _AQBANKING_UDIR=`unix_path ${AQBANKING_DIR}`
- add_to_env ${_AQBANKING_UDIR}/bin PATH
- add_to_env ${_AQBANKING_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
- if quiet ${PKG_CONFIG} --exact-version=${AQBANKING_VERSION} aqbanking
- then
- echo "AqBanking ${AQBANKING_VERSION} already installed in $_AQBANKING_UDIR. skipping."
- else
- # Mingw's wget isn't clever enough to find alternative dns names in certificates
- # So it won't find that git.aquamaniacs.de (the cert CN) is equivalent to www.aquamaniacs.de
- WGET_EXTRA_OPTIONS="--no-check-certificate"
- wget_unpacked $AQBANKING_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/aqbanking-*
- qpushd $TMP_UDIR/aqbanking-*
- if [ -n "$AQB_PATCH" -a -f "$AQB_PATCH" ]; then
- patch -p1 < $AQB_PATCH
- fi
-
- _AQ_CPPFLAGS="-I${_LIBOFX_UDIR}/include ${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS} -I${_GWENHYWFAR_UDIR}/include/gwenhywfar4"
- _AQ_LDFLAGS="-L${_LIBOFX_UDIR}/lib ${GNOME_LDFLAGS} ${GNUTLS_LDFLAGS}"
- if test x$CROSS_COMPILE = xyes; then
- XMLMERGE="xmlmerge"
- else
- XMLMERGE="${_GWENHYWFAR_UDIR}/bin/xmlmerge"
- fi
- _AQ_BACKENDS="aqhbci aqofxconnect"
- if [ -n "$AQBANKING_PATCH" -a -f "$AQBANKING_PATCH" ] ; then
- patch -p1 < $AQBANKING_PATCH
- #automake
- #aclocal -I m4 ${ACLOCAL_FLAGS}
- #autoconf
- fi
- ./configure ${HOST_XCOMPILE} \
- --with-gwen-dir=${_GWENHYWFAR_UDIR} \
- --with-xmlmerge=${XMLMERGE} \
- --with-frontends="cbanking" \
- --with-backends="${_AQ_BACKENDS}" \
- CPPFLAGS="${_AQ_CPPFLAGS}" \
- LDFLAGS="${_AQ_LDFLAGS}" \
- --prefix=${_AQBANKING_UDIR}
- make
- rm -rf ${_AQBANKING_UDIR}
- make install
- qpopd
- qpushd ${_AQBANKING_UDIR}/bin
- exetype aqbanking-cli.exe console
- exetype aqhbci-tool4.exe console
- qpopd
- ${PKG_CONFIG} --exists aqbanking || die "AqBanking not installed correctly"
- rm -rf ${TMP_UDIR}/aqbanking-*
- fi
- [ ! -d $_AQBANKING_UDIR/share/aclocal ] || add_to_env "-I $_AQBANKING_UDIR/share/aclocal" ACLOCAL_FLAGS
-}
-
-function inst_enchant() {
- setup enchant
- _ENCHANT_UDIR=`unix_path $ENCHANT_DIR`
- add_to_env ${_ENCHANT_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
- add_to_env -L${_ENCHANT_UDIR}/lib ENCHANT_LDFLAGS
- if quiet ${PKG_CONFIG} --exists enchant
- then
- echo "enchant already installed in $_ENCHANT_UDIR. skipping."
- else
- wget_unpacked $ENCHANT_URL $DOWNLOAD_DIR $ENCHANT_DIR
- wget_unpacked $ENCHANT_DEV_URL $DOWNLOAD_DIR $ENCHANT_DIR
- quiet ${PKG_CONFIG} --exists enchant || die "enchant not installed correctly"
- fi
-}
-
-function inst_glade() {
- setup Glade
- _GLADE_UDIR=`unix_path $GLADE_DIR`
- _GLADE_WFSDIR=`win_fs_path $GLADE_DIR`
- add_to_env $_GLADE_UDIR/bin PATH
- if quiet glade-3 --version
- then
- echo "glade already installed in $_GLADE_UDIR. skipping."
- else
- wget_unpacked $GLADE_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/glade3-*
- qpushd $TMP_UDIR/glade3-*
- ./configure ${HOST_XCOMPILE} --prefix=$_GLADE_WFSDIR
- make
- make install
- qpopd
- quiet glade-3 --version || die "glade not installed correctly"
- rm -rf ${TMP_UDIR}/glade3-*
- fi
-}
-
-function inst_gnome() {
- setup Gnome platform
- _GNOME_UDIR=`unix_path $GNOME_DIR`
- add_to_env -I$_GNOME_UDIR/include GNOME_CPPFLAGS
- add_to_env -L$_GNOME_UDIR/lib GNOME_LDFLAGS
- add_to_env $_GNOME_UDIR/bin PATH
- add_to_env $_GNOME_UDIR/lib/pkgconfig PKG_CONFIG_PATH
- add_to_env pkg-config PKG_CONFIG
- if quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-2.0 &&
- quiet ${PKG_CONFIG} --atleast-version=${CAIRO_VERSION} cairo &&
- quiet ${PKG_CONFIG} --exact-version=${LIBXML2_VERSION} libxml-2.0 &&
- quiet intltoolize --version
- then
- echo "gnome packages installed in $_GNOME_UDIR. skipping."
- else
- mkdir -p $_GNOME_UDIR
- wget_unpacked $CAIRO_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $CAIRO_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $EXPAT_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $EXPAT_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $FREETYPE_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $FREETYPE_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GAIL_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GAIL_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GLIB_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GLIB_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GTK_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GTK_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $INTLTOOL_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBART_LGPL_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBART_LGPL_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBGNOMECANVAS_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBGNOMECANVAS_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBPNG_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBPNG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBTIFF_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBTIFF_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $PKG_CONFIG_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $PKG_CONFIG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $ZLIB_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $ZLIB_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- echo 'gtk-theme-name = "Nimbus"' > ${_GNOME_UDIR}/etc/gtk-2.0/gtkrc
-
- wget_unpacked $GTK_THEME_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/gtk2-themes-*
- cp -a $TMP_UDIR/gtk2-themes-*/lib $_GNOME_UDIR/
- cp -a $TMP_UDIR/gtk2-themes-*/share $_GNOME_UDIR/
- rm -rf $TMP_UDIR/gtk2-themes-*
-
- wget_unpacked $GTK_PREFS_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/gtk2_prefs-*
- mv $TMP_UDIR/gtk2_prefs-*/gtk2_prefs.exe $_GNOME_UDIR/bin
- rm -rf $TMP_UDIR/gtk2_prefs-*
-
- wget_unpacked $GTK_DOC_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/gtk-doc-*
- mv $TMP_UDIR/gtk-doc-*/gtk-doc.m4 $_GNOME_UDIR/share/aclocal
- rm -rf $TMP_UDIR/gtk-doc-*
-
- # Fix paths to tools used by gnome provided intltool scripts
- qpushd $_GNOME_UDIR
- for file in bin/intltool-*; do
- sed '1s,!.*perl,!'"perl"',;s,/opt/gnu/bin/iconv,iconv,' $file > tmp
- mv tmp $file
- done
- qpopd
-
- qpushd $_GNOME_UDIR/lib/pkgconfig
- perl -pi.bak -e"s!^prefix=.*\$!prefix=$_GNOME_UDIR!" *.pc
- #perl -pi.bak -e's!^Libs: !Libs: -L\${prefix}/bin !' *.pc
- qpopd
- fix_libtool_files ${_GNOME_UDIR}
-
- if quiet ${PKG_CONFIG} --exact-version=${LIBXML2_VERSION} libxml-2.0 ; then
- echo "Libxml2 already compiled + installed"
- else
- wget_unpacked $LIBXML2_SRC_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/libxml2-*
- qpushd $TMP_UDIR/libxml2-*
- ./configure ${HOST_XCOMPILE} \
- --prefix=${_GNOME_UDIR} \
- --disable-static \
- --with-python=no \
- --without-threads \
- CPPFLAGS="${GNOME_CPPFLAGS}" LDFLAGS="${GNOME_LDFLAGS}"
- make
- make install
- qpopd
- rm -rf ${TMP_UDIR}/libxml2-*
- fi
-
- quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-2.0 || die "gnome not installed correctly: no gtk+-2.0 with atleast-version=${GTK_VERSION}"
- quiet ${PKG_CONFIG} --atleast-version=${CAIRO_VERSION} cairo || die "gnome not installed correctly: no cairo with atleast-version=${CAIRO_VERSION}"
- quiet ${PKG_CONFIG} --exact-version=${LIBXML2_VERSION} libxml-2.0 || die "gnome not installed correctly: no libxml-2.0 with exact-version=${LIBXML2_VERSION}"
- quiet intltoolize --version || die "gnome not installed correctly: no intltoolize"
- fi
- [ ! -d $_GNOME_UDIR/share/aclocal ] || add_to_env "-I $_GNOME_UDIR/share/aclocal" ACLOCAL_FLAGS
-}
-
-function inst_gnutls() {
- setup GNUTLS
- _GNUTLS_UDIR=`unix_path ${GNUTLS_DIR}`
- add_to_env ${_GNUTLS_UDIR}/bin PATH
- add_to_env ${_GNUTLS_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
- add_to_env "-I${_GNUTLS_UDIR}/include" GNUTLS_CPPFLAGS
- add_to_env "-L${_GNUTLS_UDIR}/lib" GNUTLS_LDFLAGS
- if quiet ${PKG_CONFIG} --exact-version=${GNUTLS_VERSION} gnutls
- then
- echo "GNUTLS already installed in $_GNUTLS_UDIR. skipping."
- else
- if [ "$BUILD_GNUTLS_FROM_SOURCE" = "yes" ]; then
- mkdir -p $_GNUTLS_UDIR
- wget_unpacked $GNUTLS_PKG_URL $DOWNLOAD_DIR $GNUTLS_DIR
- wget_unpacked $GCRYPT_SRC_URL $DOWNLOAD_DIR $TMP_DIR
- wget_unpacked $GPG_ERROR_SRC_URL $DOWNLOAD_DIR $TMP_DIR
- wget_unpacked $GLIB_NETWORKING_SRC_URL $DOWNLOAD_DIR $TMP_DIR
- rm $_GNUTLS_UDIR/lib/*.la
- assert_one_dir $TMP_UDIR/libgcrypt-*
- assert_one_dir $TMP_UDIR/libgpg-error-*
- assert_one_dir $TMP_UDIR/glib-networking-*
- qpushd $TMP_UDIR/libgpg-error-*
- sed -i'' s/ro// po/LINGUAS #Converting ro.po to UTF8 hangs
- ./configure ${HOST_XCOMPILE} --prefix=$_GNUTLS_UDIR --disable-nls \
- --disable-languages \
- CPPFLAGS="${GNOME_CPPFLAGS}" \
- LDFLAGS="${GNOME_LDFLAGS}"
- make
- make install
- qpopd
- qpushd $TMP_UDIR/libgcrypt-*
- ./configure ${HOST_XCOMPILE} --prefix=$_GNUTLS_UDIR \
- CPPFLAGS="${GNOME_CPPFLAGS}" \
- LDFLAGS="${GNOME_LDFLAGS}"
- make
- make install
- qpopd
- qpushd $TMP_UDIR/glib-networking-*
- ./configure ${HOST_XCOMPILE} --prefix=$_GNUTLS_UDIR \
- --with-ca-certificates=no \
- --with-pkcs11=no \
- CPPFLAGS="${GNOME_CPPFLAGS}" \
- LDFLAGS="${GNOME_LDFLAGS}"
- make
- make install
- qpopd
-
- rm -f $_GNUTLS_UDIR/lib/*.la
- else
- mkdir -p $_GNUTLS_UDIR
- wget_unpacked $GNUTLS_URL $DOWNLOAD_DIR $GNUTLS_DIR
- wget_unpacked $GNUTLS_DEV_URL $DOWNLOAD_DIR $GNUTLS_DIR
- fix_libtool_files ${_GNUTLS_UDIR}
- fi
- quiet ${PKG_CONFIG} --exists gnutls || die "GNUTLS not installed correctly"
- fi
- [ ! -d $_GNUTLS_UDIR/share/aclocal ] || add_to_env "-I $_GNUTLS_UDIR/share/aclocal" ACLOCAL_FLAGS
-}
-
-function inst_goffice() {
- setup GOffice
- _GOFFICE_UDIR=`unix_path $GOFFICE_DIR`
- add_to_env $_GOFFICE_UDIR/bin PATH
- add_to_env $_GOFFICE_UDIR/lib/pkgconfig PKG_CONFIG_PATH
- if quiet ${PKG_CONFIG} --atleast-version=${GOFFICE_VERSION} libgoffice-0.8
- then
- echo "goffice already installed in $_GOFFICE_UDIR. skipping."
- else
- wget_unpacked $GOFFICE_URL $DOWNLOAD_DIR $TMP_DIR
- mydir=`pwd`
- assert_one_dir $TMP_UDIR/goffice-*
- qpushd $TMP_UDIR/goffice-*
- [ -n "$GOFFICE_PATCH" -a -f "$GOFFICE_PATCH" ] && \
- patch -p1 < $GOFFICE_PATCH
- libtoolize --force
- aclocal ${ACLOCAL_FLAGS} -I .
- automake
- autoconf
- ./configure ${HOST_XCOMPILE} --prefix=$_GOFFICE_UDIR \
- CPPFLAGS="${GNOME_CPPFLAGS} ${PCRE_CPPFLAGS} ${HH_CPPFLAGS}" \
- LDFLAGS="${GNOME_LDFLAGS} ${PCRE_LDFLAGS} ${HH_LDFLAGS}"
- [ -d ../libgsf-* ] || die "We need the unpacked package $TMP_UDIR/libgsf-*; please unpack it in $TMP_UDIR"
- [ -f dumpdef.pl ] || cp -p ../libgsf-*/dumpdef.pl .
- make
- rm -rf ${_GOFFICE_UDIR}
- make install
- qpopd
- ${PKG_CONFIG} --exists libgoffice-0.8 && [ -f $_GOFFICE_UDIR/bin/libgoffice*.dll ] || die "goffice not installed correctly"
- rm -rf ${TMP_UDIR}/goffice-*
- rm -rf ${TMP_UDIR}/libgsf-*
- fi
-}
-
-function inst_guile() {
- setup Guile
- _GUILE_WFSDIR=`win_fs_path $GUILE_DIR`
- _GUILE_UDIR=`unix_path $GUILE_DIR`
- _GUILE_LDDIR=`unix_ldpath $GUILE_DIR`
- _WIN_UDIR=`unix_path $WINDIR`
- add_to_env -I$_GUILE_UDIR/include GUILE_CPPFLAGS
- add_to_env -L$_GUILE_LDDIR/lib GUILE_LDFLAGS
- add_to_env $_GUILE_UDIR/bin PATH
- add_to_env ${_GUILE_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
- if quiet guile -c '(use-modules (srfi srfi-39))' &&
- quiet ${PKG_CONFIG} --atleast-version=${GUILE_VERSION} guile-1.8
- then
- echo "guile and slib already installed in $_GUILE_UDIR. skipping."
- else
- smart_wget $GUILE_URL $DOWNLOAD_DIR
- _GUILE_BALL=$LAST_FILE
- tar -xzpf $_GUILE_BALL -C $TMP_UDIR
- assert_one_dir $TMP_UDIR/guile-*
- qpushd $TMP_UDIR/guile-*
- if [ -n "$GUILE_PATCH" -a -f "$GUILE_PATCH" ]; then
- patch -p1 < $GUILE_PATCH
- fi
-
- autoreconf -fvi
- ./configure ${HOST_XCOMPILE} -C \
- --disable-elisp \
- --disable-error-on-warning \
- --disable-dependency-tracking \
- --prefix=$_GUILE_WFSDIR \
- ac_cv_func_regcomp_rx=yes \
- ac_cv_func_strncasecmp=yes \
- CPPFLAGS="${READLINE_CPPFLAGS} ${REGEX_CPPFLAGS}" \
- LDFLAGS="${READLINE_LDFLAGS} ${REGEX_LDFLAGS} -Wl,--enable-auto-import"
- make
- make install
- qpopd
- guile -c '(use-modules (srfi srfi-39))' || die "guile not installed correctly"
-
- # If this libguile is used from MSVC compiler, we must
- # deactivate some macros of scmconfig.h again.
- SCMCONFIG_H=$_GUILE_UDIR/include/libguile/scmconfig.h
- cat >> ${SCMCONFIG_H} <<EOF
-
-#ifdef _MSC_VER
-# undef HAVE_STDINT_H
-# undef HAVE_INTTYPES_H
-# undef HAVE_UNISTD_H
-#endif
-EOF
- # Also, for MSVC compiler we need to create an import library
- if [ x"$(which pexports.exe > /dev/null 2>&1)" != x ]
- then
- pexports $_GUILE_UDIR/bin/libguile.dll > $_GUILE_UDIR/lib/libguile.def
- ${DLLTOOL} -d $_GUILE_UDIR/lib/libguile.def -D $_GUILE_UDIR/bin/libguile.dll -l $_GUILE_UDIR/lib/libguile.lib
- fi
- # Also, for MSVC compiler we need to slightly modify the gc.h header
- GC_H=$_GUILE_UDIR/include/libguile/gc.h
- grep -v 'extern .*_freelist2;' ${GC_H} > ${GC_H}.tmp
- grep -v 'extern int scm_block_gc;' ${GC_H}.tmp > ${GC_H}
- cat >> ${GC_H} <<EOF
-#ifdef _MSC_VER
-# define LIBGUILEDECL __declspec (dllimport)
-#else
-# define LIBGUILEDECL /* */
-#endif
-extern LIBGUILEDECL SCM scm_freelist2;
-extern LIBGUILEDECL struct scm_t_freelist scm_master_freelist2;
-extern LIBGUILEDECL int scm_block_gc;
-EOF
- rm -rf ${TMP_UDIR}/guile-*
- fi
- if [ "$CROSS_COMPILE" = "yes" ]; then
- mkdir -p $_GUILE_UDIR/bin
- qpushd $_GUILE_UDIR/bin
- # The cross-compiling guile expects these program names
- # for the build-time guile
- ln -sf /usr/bin/guile-config mingw32-guile-config
- ln -sf /usr/bin/guile mingw32-build-guile
- qpopd
- fi
- [ ! -d $_GUILE_UDIR/share/aclocal ] || add_to_env "-I $_GUILE_UDIR/share/aclocal" ACLOCAL_FLAGS
-}
-
-function inst_gwenhywfar() {
- setup Gwenhywfar
- _GWENHYWFAR_UDIR=`unix_path ${GWENHYWFAR_DIR}`
- add_to_env ${_GWENHYWFAR_UDIR}/bin PATH
- add_to_env ${_GWENHYWFAR_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
- if quiet ${PKG_CONFIG} --exact-version=${GWENHYWFAR_VERSION} gwenhywfar
- then
- echo "Gwenhywfar ${GWENHYWFAR_VERSION} already installed in $_GWENHYWFAR_UDIR. skipping."
- else
-# INSTALLED_GWEN=`${PKG_CONFIG} --modversion gwenhywfar`
-# echo "GWENHYWFAR installed version ${INSTALLED_GWEN} doesn't match required version ${GWENHYWFAR_VERSION}"
-# exit
- # Mingw's wget isn't clever enough to find alternative dns names in certificates
- # So it won't find that git.aquamaniacs.de (the cert CN) is equivalent to www.aquamaniacs.de
- WGET_EXTRA_OPTIONS="--no-check-certificate"
- wget_unpacked $GWENHYWFAR_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/gwenhywfar-*
- qpushd $TMP_UDIR/gwenhywfar-*
-
- if [ -n "$GWEN_PATCH" -a -f "$GWEN_PATCH" ]; then
- patch -p1 < $GWEN_PATCH
- fi
- # circumvent binreloc bug, http://trac.autopackage.org/ticket/28
- # Note: gwenhywfar-3.x and higher don't use openssl anymore.
- ./configure ${HOST_XCOMPILE} \
- --with-libgcrypt-prefix=$_GNUTLS_UDIR \
- --disable-binreloc \
- --disable-ssl \
- --prefix=$_GWENHYWFAR_UDIR \
- --with-guis=gtk2 \
- CPPFLAGS="${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS} `pkg-config --cflags gtk+-2.0`" \
- CFLAGS="-g -O2 -fno-omit-frame-pointer" \
- LDFLAGS="${GNOME_LDFLAGS} ${GNUTLS_LDFLAGS} -lintl"
- make
-# [ "$CROSS_COMPILE" != "yes" ] && make check
- rm -rf ${_GWENHYWFAR_UDIR}
- make install
- qpopd
-# fix_libtool_files ${_GWENHYWFAR_UDIR}
- ${PKG_CONFIG} --exists gwenhywfar || die "Gwenhywfar not installed correctly"
- rm -rf ${TMP_UDIR}/gwenhywfar-*
- fi
- [ ! -d $_GWENHYWFAR_UDIR/share/aclocal ] || add_to_env "-I $_GWENHYWFAR_UDIR/share/aclocal" ACLOCAL_FLAGS
-}
-
-function inst_isocodes() {
- setup isocodes
- _ISOCODES_UDIR=`unix_path ${ISOCODES_DIR}`
- add_to_env $_ISOCODES_UDIR/share/pkgconfig PKG_CONFIG_PATH
- if [ -f ${_ISOCODES_UDIR}/share/pkgconfig/iso-codes.pc ]
- then
- echo "isocodes already installed in $_ISOCODES_UDIR. skipping."
- else
- wget_unpacked $ISOCODES_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/iso-codes-*
- qpushd $TMP_UDIR/iso-codes-*
- ./configure ${HOST_XCOMPILE} \
- --prefix=${_ISOCODES_UDIR}
- make
- make install
- qpopd
- quiet [ -f ${_ISOCODES_UDIR}/share/pkgconfig/iso-codes.pc ] || die "isocodes not installed correctly"
- rm -rf ${TMP_UDIR}/iso-codes-*
- fi
-}
-
-function inst_libdbi() {
- setup LibDBI
- _SQLITE3_UDIR=`unix_path ${SQLITE3_DIR}`
- _MYSQL_LIB_UDIR=`unix_path ${MYSQL_LIB_DIR}`
- _PGSQL_UDIR=`unix_path ${PGSQL_DIR}`
- _LIBDBI_UDIR=`unix_path ${LIBDBI_DIR}`
- _LIBDBI_DRIVERS_UDIR=`unix_path ${LIBDBI_DRIVERS_DIR}`
- add_to_env -I$_LIBDBI_UDIR/include LIBDBI_CPPFLAGS
- add_to_env -L$_LIBDBI_UDIR/lib LIBDBI_LDFLAGS
- add_to_env -I${_SQLITE3_UDIR}/include SQLITE_CFLAGS
- add_to_env "-L${_SQLITE3_UDIR}/lib -lsqlite3" SQLITE_LIBS
- if test -f ${_SQLITE3_UDIR}/bin/libsqlite3-0.dll
- then
- echo "SQLite3 already installed in $_SQLITE3_UDIR. skipping."
- else
- wget_unpacked $SQLITE3_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/sqlite-*
- qpushd $TMP_UDIR/sqlite-*
- autoreconf -if
- ./configure ${HOST_XCOMPILE} \
- --prefix=${_SQLITE3_UDIR}
- make
- make install
- qpopd
- test -f ${_SQLITE3_UDIR}/bin/libsqlite3-0.dll || die "SQLite3 not installed correctly"
- rm -rf ${TMP_UDIR}/sqlite-*
- fi
- if test -f ${_MYSQL_LIB_UDIR}/lib/libmysql.dll -a \
- -f ${_MYSQL_LIB_UDIR}/lib/libmysqlclient.a
- then
- echo "MySQL library already installed in $_MYSQL_LIB_UDIR. skipping."
- else
- wget_unpacked $MYSQL_LIB_URL $DOWNLOAD_DIR $TMP_DIR
- mkdir -p $_MYSQL_LIB_UDIR
- assert_one_dir $TMP_UDIR/mysql*
- cp -r $TMP_UDIR/mysql*/* $_MYSQL_LIB_UDIR
- cp -r $TMP_UDIR/mysql*/include $_MYSQL_LIB_UDIR/include/mysql
- rm -rf ${TMP_UDIR}/mysql*
- qpushd $_MYSQL_LIB_UDIR/lib
- ${DLLTOOL} --input-def $LIBMYSQL_DEF --dllname libmysql.dll --output-lib libmysqlclient.a -k
- test -f ${_MYSQL_LIB_UDIR}/lib/libmysql.dll || die "mysql not installed correctly - libmysql.dll"
- test -f ${_MYSQL_LIB_UDIR}/lib/libmysqlclient.a || die "mysql not installed correctly - libmysqlclient.a"
- qpopd
- fi
- if test -f ${_PGSQL_UDIR}/lib/libpq.dll
- then
- echo "PGSQL library already installed in $_PGSQL_UDIR. skipping."
- else
- wget_unpacked $PGSQL_LIB_URL $DOWNLOAD_DIR $TMP_DIR
- cp -r $TMP_UDIR/pgsql* $_PGSQL_UDIR
- rm -rf ${TMP_UDIR}/pgsql*
- test -f ${_PGSQL_UDIR}/lib/libpq.dll || die "libpq not installed correctly"
- fi
- if test -f ${_LIBDBI_UDIR}/bin/libdbi-1.dll
- then
- echo "libdbi already installed in $_LIBDBI_UDIR. skipping."
- else
- wget_unpacked $LIBDBI_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/libdbi-0*
- qpushd $TMP_UDIR/libdbi-0*
- if [ -n "$LIBDBI_PATCH" -a -f "$LIBDBI_PATCH" ]; then
- patch -p1 < $LIBDBI_PATCH
- fi
- if [ "$CROSS_COMPILE" = "yes" ]; then
- rm -f ltmain.sh aclocal.m4
- libtoolize --force
- aclocal
- autoheader
- automake --add-missing
- autoconf
- fi
- ./configure ${HOST_XCOMPILE} \
- --disable-docs \
- --prefix=${_LIBDBI_UDIR}
- make
- make install
- qpopd
- qpushd ${_LIBDBI_UDIR}
- if [ x"$(which pexports.exe > /dev/null 2>&1)" != x ]
- then
- pexports bin/libdbi-1.dll > lib/libdbi.def
- ${DLLTOOL} -d lib/libdbi.def -D bin/libdbi-1.dll -l lib/libdbi.lib
- fi
- qpopd
- test -f ${_LIBDBI_UDIR}/bin/libdbi-1.dll || die "libdbi not installed correctly"
- rm -rf ${TMP_UDIR}/libdbi-0*
- fi
- if test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdsqlite3.dll -a \
- -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdmysql.dll -a \
- -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdpgsql.dll
- then
- echo "libdbi drivers already installed in $_LIBDBI_DRIVERS_UDIR. skipping."
- else
- wget_unpacked $LIBDBI_DRIVERS_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/libdbi-drivers-*
- qpushd $TMP_UDIR/libdbi-drivers*
- [ -n "$LIBDBI_DRIVERS_PATCH" -a -f "$LIBDBI_DRIVERS_PATCH" ] && \
- patch -p1 < $LIBDBI_DRIVERS_PATCH
- ./configure ${HOST_XCOMPILE} \
- --disable-docs \
- --with-dbi-incdir=${_LIBDBI_UDIR}/include \
- --with-dbi-libdir=${_LIBDBI_UDIR}/lib \
- --with-sqlite3 \
- --with-sqlite3-dir=${_SQLITE3_UDIR} \
- --with-mysql \
- --with-mysql-dir=${_MYSQL_LIB_UDIR} \
- --with-pgsql \
- --with-pgsql-dir=${_PGSQL_UDIR} \
- --prefix=${_LIBDBI_DRIVERS_UDIR}
- make LDFLAGS="$LDFLAGS -no-undefined"
- make install
- qpopd
- test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdsqlite3.dll || die "libdbi sqlite3 driver not installed correctly"
- test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdmysql.dll || die "libdbi mysql driver not installed correctly"
- test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdpgsql.dll || die "libdbi pgsql driver not installed correctly"
- rm -rf ${TMP_UDIR}/libdbi-drivers-*
- fi
-}
-
-function inst_libgsf() {
- setup libGSF
- _LIBGSF_UDIR=`unix_path $LIBGSF_DIR`
- add_to_env $_LIBGSF_UDIR/bin PATH
- add_to_env $_LIBGSF_UDIR/lib/pkgconfig PKG_CONFIG_PATH
- if quiet ${PKG_CONFIG} --exists libgsf-1 &&
- quiet ${PKG_CONFIG} --atleast-version=${LIBGSF_VERSION} libgsf-1
- then
- echo "libgsf already installed in $_LIBGSF_UDIR. skipping."
- else
- rm -rf ${TMP_UDIR}/libgsf-*
- wget_unpacked $LIBGSF_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/libgsf-*
- qpushd $TMP_UDIR/libgsf-*
- ./configure ${HOST_XCOMPILE} \
- --prefix=$_LIBGSF_UDIR \
- --disable-static \
- --without-python \
- CPPFLAGS="${GNOME_CPPFLAGS}" \
- LDFLAGS="${GNOME_LDFLAGS}"
- make
- rm -rf ${_LIBGSF_UDIR}
- make install
- qpopd
- ${PKG_CONFIG} --exists libgsf-1 || die "libgsf not installed correctly: No libgsf-1"
- #${PKG_CONFIG} --exists libgsf-gnome-1 || die "libgsf not installed correctly: No libgsf-gnome-1"
- fi
-}
-
-function inst_libofx() {
- setup Libofx
- _LIBOFX_UDIR=`unix_path ${LIBOFX_DIR}`
- add_to_env ${_LIBOFX_UDIR}/bin PATH
- add_to_env ${_LIBOFX_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
- if quiet ${PKG_CONFIG} --exists libofx && quiet ${PKG_CONFIG} --atleast-version=${LIBOFX_VERSION} libofx
- then
- echo "Libofx already installed in $_LIBOFX_UDIR. skipping."
- else
- wget_unpacked $LIBOFX_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/libofx-*
- qpushd $TMP_UDIR/libofx-*
- if [ -n "$LIBOFX_PATCH" -a -f "$LIBOFX_PATCH" ]; then
- patch -p1 < $LIBOFX_PATCH
-# libtoolize --force
-# aclocal ${ACLOCAL_FLAGS}
-# automake
-# autoconf
-# ACLOCAL="aclocal $ACLOCAL_FLAGS" autoreconf -fvi $ACLOCAL_FLAGS
- fi
- ./configure ${HOST_XCOMPILE} \
- --prefix=${_LIBOFX_UDIR} \
- --with-opensp-includes=${_OPENSP_UDIR}/include/OpenSP \
- --with-opensp-libs=${_OPENSP_UDIR}/lib \
- CPPFLAGS="-DOS_WIN32 ${GNOME_CPPFLAGS}" \
- --disable-static \
- --with-iconv=${_GNOME_UDIR}
- make LDFLAGS="${LDFLAGS} -no-undefined ${GNOME_LDFLAGS} -liconv"
- make install
- qpopd
- quiet ${PKG_CONFIG} --exists libofx || die "Libofx not installed correctly"
- rm -rf ${TMP_UDIR}/libofx-*
- fi
-}
-
-#Building LibSoup requires python. Setting $PYTHON isn't sufficient, it must be on the path.
-function inst_libsoup() {
- setup libsoup
- _LIBSOUP_UDIR=`unix_path $LIBSOUP_DIR`
- add_to_env $_LIBSOUP_UDIR/lib/pkgconfig PKG_CONFIG_PATH
- if quiet ${PKG_CONFIG} --exists libsoup-2.4
- then
- echo "libsoup already installed in $_LIBSOUP_UDIR. skipping."
- else
- if [ "$BUILD_LIBSOUP_FROM_SOURCE" = "yes" ]; then
- wget_unpacked $LIBSOUP_SRC_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/libsoup-*
- qpushd $TMP_UDIR/libsoup-*
- patch -p1 < $LIBSOUP_BAD_SYMBOL_PATCH
- patch -p1 < $LIBSOUP_RESERVED_WORD_PATCH
- ./configure ${HOST_XCOMPILE} \
- --prefix=${_LIBSOUP_UDIR} \
- --disable-gtk-doc \
- --without-gnome \
- CPPFLAGS=-I${_GNOME_UDIR}/include \
- LDFLAGS="-L${_GNOME_UDIR}/lib -Wl,-s -lz"
- make
- make install
- qpopd
- else
- mkdir -p $_LIBSOUP_UDIR
- wget_unpacked $LIBSOUP_URL $DOWNLOAD_DIR $LIBSOUP_DIR
- wget_unpacked $LIBSOUP_DEV_URL $DOWNLOAD_DIR $LIBSOUP_DIR
- fix_libtool_files ${_LIBSOUP_UDIR}
- fi
- quiet ${PKG_CONFIG} --exists libsoup-2.4 || die "libsoup not installed correctly"
- rm -rf ${TMP_UDIR}/libsoup-*
- fi
- LIBSOUP_CPPFLAGS=`${PKG_CONFIG} --cflags libsoup-2.4`
-}
-
-function inst_libxslt() {
- setup LibXSLT
- _LIBXSLT_UDIR=`unix_path $LIBXSLT_DIR`
- add_to_env $_LIBXSLT_UDIR/bin PATH
- add_to_env $_LIBXSLT_UDIR/lib/pkgconfig PKG_CONFIG_PATH
- add_to_env -L${_LIBXSLT_UDIR}/lib LIBXSLT_LDFLAGS
- if quiet which xsltproc &&
- quiet ${PKG_CONFIG} --atleast-version=${LIBXSLT_VERSION} libxslt
- then
- echo "libxslt already installed in $_LIBXSLT_UDIR. skipping."
- else
- #wget_unpacked ${LIBXSLT_ICONV_URL} ${DOWNLOAD_DIR} ${LIBXSLT_DIR}
- #wget_unpacked ${LIBXSLT_ZLIB_URL} ${DOWNLOAD_DIR} ${LIBXSLT_DIR}
-
- wget_unpacked $LIBXSLT_SRC_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/libxslt-*
- qpushd $TMP_UDIR/libxslt-*
- if [ -n "$LIBXSLT_MAKEFILE_PATCH" -a -f "$LIBXSLT_MAKEFILE_PATCH" ]; then
- patch -p0 -u -i ${LIBXSLT_MAKEFILE_PATCH}
- fi
- ./configure ${HOST_XCOMPILE} \
- --prefix=${_LIBXSLT_UDIR} \
- --with-python=no \
- --with-libxml-prefix=${_GNOME_UDIR} \
- CPPFLAGS="${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS}" \
- LDFLAGS="${GNOME_LDFLAGS} ${GNUTLS_LDFLAGS}"
- make
- make install
- qpopd
- rm -rf ${TMP_UDIR}/libxslt-*
-
- quiet which xsltproc || die "libxslt not installed correctly"
- fi
-}
-
-function inst_opensp() {
- setup OpenSP
- _OPENSP_UDIR=`unix_path ${OPENSP_DIR}`
- add_to_env ${_OPENSP_UDIR}/bin PATH
- if test -f ${_OPENSP_UDIR}/bin/libosp-5.dll
- then
- echo "OpenSP already installed in $_OPENSP_UDIR. skipping."
- else
- wget_unpacked $OPENSP_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/OpenSP-*
- qpushd $TMP_UDIR/OpenSP-*
- [ -n "$OPENSP_PATCH" -a -f "$OPENSP_PATCH" ] && \
- patch -p0 < $OPENSP_PATCH
- libtoolize --force
- aclocal ${ACLOCAL_FLAGS} -I m4
- automake
- autoconf
- ./configure ${HOST_XCOMPILE} \
- --prefix=${_OPENSP_UDIR} \
- --disable-doc-build --disable-static
- # On many windows machines, none of the programs will
- # build, but we only need the library, so ignore the rest.
- make all-am
- make -C lib
- make -i
- make -i install
- qpopd
- test -f ${_OPENSP_UDIR}/bin/libosp-5.dll || die "OpenSP not installed correctly"
- rm -rf $TMP_UDIR/OpenSP-*
- fi
-}
-
-function inst_openssl() {
- setup OpenSSL
- _OPENSSL_UDIR=`unix_path $OPENSSL_DIR`
- add_to_env $_OPENSSL_UDIR/bin PATH
- # Make sure the files of Win32OpenSSL-0_9_8d are really gone!
- if test -f $_OPENSSL_UDIR/unins000.exe ; then
- die "Wrong version of OpenSSL installed! Run $_OPENSSL_UDIR/unins000.exe and start install.sh again."
- fi
- # Make sure the files of openssl-0.9.7c-{bin,lib}.zip are really gone!
- if [ -f $_OPENSSL_UDIR/lib/libcrypto.dll.a ] ; then
- die "Found old OpenSSL installation in $_OPENSSL_UDIR. Please remove that first."
- fi
-
- if quiet ${LD} -L$_OPENSSL_UDIR/lib -leay32 -lssl32 -o $TMP_UDIR/ofile ; then
- echo "openssl already installed in $_OPENSSL_UDIR. skipping."
- else
- smart_wget $OPENSSL_URL $DOWNLOAD_DIR
- echo -n "Extracting ${LAST_FILE##*/} ... "
- tar -xzpf $LAST_FILE -C $TMP_UDIR &>/dev/null | true
- echo "done"
- assert_one_dir $TMP_UDIR/openssl-*
- qpushd $TMP_UDIR/openssl-*
- for _dir in crypto ssl ; do
- qpushd $_dir
- find . -name "*.h" -exec cp {} ../include/openssl/ \;
- qpopd
- done
- cp *.h include/openssl
- _COMSPEC_U=`unix_path $COMSPEC`
- PATH=$_ACTIVE_PERL_UDIR/ActivePerl/Perl/bin:$_MINGW_UDIR/bin $_COMSPEC_U //c ms\\mingw32
- mkdir -p $_OPENSSL_UDIR/bin
- mkdir -p $_OPENSSL_UDIR/lib
- mkdir -p $_OPENSSL_UDIR/include
- cp -a libeay32.dll libssl32.dll $_OPENSSL_UDIR/bin
- cp -a libssl32.dll $_OPENSSL_UDIR/bin/ssleay32.dll
- for _implib in libeay32 libssl32 ; do
- cp -a out/$_implib.a $_OPENSSL_UDIR/lib/$_implib.dll.a
- done
- cp -a include/openssl $_OPENSSL_UDIR/include
- qpopd
- quiet ${LD} -L$_OPENSSL_UDIR/lib -leay32 -lssl32 -o $TMP_UDIR/ofile || die "openssl not installed correctly"
- rm -rf ${TMP_UDIR}/openssl-*
- fi
- _eay32dll=$(echo $(which libeay32.dll)) # which sucks
- if [ -z "$_eay32dll" ] ; then
- die "Did not find libeay32.dll in your PATH, why that?"
- fi
- if [ "$_eay32dll" != "$_OPENSSL_UDIR/bin/libeay32.dll" ] ; then
- die "Found $_eay32dll in PATH. If you have added $_OPENSSL_UDIR/bin to your PATH before, make sure it is listed before paths from other packages shipping SSL libraries. In particular, check $_MINGW_UDIR/etc/profile.d/installer.sh."
- fi
-}
-
-function inst_pcre() {
- setup pcre
- _PCRE_UDIR=`unix_path $PCRE_DIR`
- add_to_env -I$_PCRE_UDIR/include PCRE_CPPFLAGS
- add_to_env -L$_PCRE_UDIR/lib PCRE_LDFLAGS
- add_to_env $_PCRE_UDIR/bin PATH
- if quiet ${LD} $PCRE_LDFLAGS -lpcre -o $TMP_UDIR/ofile
- then
- echo "pcre already installed in $_PCRE_UDIR. skipping."
- else
- mkdir -p $_PCRE_UDIR
- wget_unpacked $PCRE_BIN_URL $DOWNLOAD_DIR $PCRE_DIR
- wget_unpacked $PCRE_LIB_URL $DOWNLOAD_DIR $PCRE_DIR
- fi
- quiet ${LD} $PCRE_LDFLAGS -lpcre -o $TMP_UDIR/ofile || die "pcre not installed correctly"
-}
-
-function inst_readline() {
- setup Readline
- _READLINE_UDIR=`unix_path $READLINE_DIR`
- add_to_env -I$_READLINE_UDIR/include READLINE_CPPFLAGS
- add_to_env -L$_READLINE_UDIR/lib READLINE_LDFLAGS
- add_to_env $_READLINE_UDIR/bin PATH
- if quiet ${LD} $READLINE_LDFLAGS -lreadline -o $TMP_UDIR/ofile
- then
- echo "readline already installed in $_READLINE_UDIR. skipping."
- else
- mkdir -p $_READLINE_UDIR
- wget_unpacked $READLINE_BIN_URL $DOWNLOAD_DIR $READLINE_DIR
- wget_unpacked $READLINE_LIB_URL $DOWNLOAD_DIR $READLINE_DIR
- quiet ${LD} $READLINE_LDFLAGS -lreadline -o $TMP_UDIR/ofile || die "readline not installed correctly"
- fi
-}
-
-function inst_regex() {
- setup RegEx
- _REGEX_UDIR=`unix_path $REGEX_DIR`
- add_to_env -lregex REGEX_LDFLAGS
- add_to_env -I$_REGEX_UDIR/include REGEX_CPPFLAGS
- add_to_env -L$_REGEX_UDIR/lib REGEX_LDFLAGS
- add_to_env $_REGEX_UDIR/bin PATH
- if quiet ${LD} $REGEX_LDFLAGS -o $TMP_UDIR/ofile
- then
- echo "regex already installed in $_REGEX_UDIR. skipping."
- else
- mkdir -p $_REGEX_UDIR
- wget_unpacked $REGEX_URL $DOWNLOAD_DIR $REGEX_DIR
- wget_unpacked $REGEX_DEV_URL $DOWNLOAD_DIR $REGEX_DIR
- quiet ${LD} $REGEX_LDFLAGS -o $TMP_UDIR/ofile || die "regex not installed correctly"
- fi
-}
-
-#To build webkit from source you need an extra dependency, gperf. You
-#can most easily get it from
-#http://gnuwin32.sourceforge.net/packages.html; install it in
-#c:\Programs\GnuWin32.
-#You also need python 2.6+ and ICU 50+
-#Setting $PYTHON isn't sufficient, it must be on the path.
-#Make sure that $CC is set, otherwise the perl modules will try to use /usr/bin/gcc which doesn't exist.
-#Build ICU and install it in /c/gcdev/webkit. Symlink icu*.dll to libicu*.dll.
-#
-#After building and before installing, make the following changes to
-#$(top_builddir)/Source/WebKit/gtk/webkit-1.0.pc:
-#${prefix}/lib -> ${prefix}/bin
-#Libs: ${libdir} -lwebkitgtk-1.0 -> Libs: ${libdir} -lwebkitgtk-1.0-0
-#
-function inst_webkit() {
- setup WebKit
- _WEBKIT_UDIR=`unix_path ${WEBKIT_DIR}`
- add_to_env ${_WEBKIT_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
- if quiet ${PKG_CONFIG} --exists webkit-1.0 &&
- quiet ${PKG_CONFIG} --atleast-version=${WEBKIT_VERSION} webkit-1.0
- then
- echo "webkit already installed in $_WEBKIT_UDIR. skipping."
- else
- if [ "$BUILD_WEBKIT_FROM_SOURCE" = "yes" ]; then
- wget_unpacked $WEBKIT_SRC_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir ${TMP_UDIR}/webkit-*
- qpushd $TMP_UDIR/webkit-*
- add_to_env /c/Programs/GnuWin32/bin PATH
- SAVED_PATH=$PATH
- add_to_env ${_ACTIVE_PERL_BASE_DIR}/bin PATH
- export PERL5LIB=${_ACTIVE_PERL_BASE_DIR}/lib
-
- patch -p1 -u < $WEBKIT_MINGW_PATCH_1
- patch -p1 -u < $WEBKIT_MINGW_PATCH_2
- autoreconf -fis -ISource/autotools -I$GNOME_DIR/share/aclocal
- ./configure \
- --prefix=${_WEBKIT_UDIR} \
- --with-target=win32 \
- --with-gtk=2.0 \
- --disable-geolocation \
- --enable-web-sockets \
- --disable-video \
- CPPFLAGS="${GNOME_CPPFLAGS} ${SQLITE_CFLAGS}" \
- LDFLAGS="${GNOME_LDFLAGS} ${SQLITE_LIBS}" \
- PERL="${_ACTIVE_PERL_BASE_DIR}/bin/perl"
- cp $WEBKIT_WEBKITENUMTYPES_CPP DerivedSources
- cp $WEBKIT_WEBKITENUMTYPES_H Webkit/gtk/webkit
- make
- make install
- PATH=$SAVED_PATH
- qpopd
- else
- mkdir -p $_WEBKIT_UDIR
- wget_unpacked $WEBKIT_URL $DOWNLOAD_DIR $WEBKIT_DIR
- wget_unpacked $WEBKIT_DEV_URL $DOWNLOAD_DIR $WEBKIT_DIR
- fix_libtool_files ${_WEBKIT_UDIR}
- fi
- quiet ${PKG_CONFIG} --exists webkit-1.0 || die "webkit not installed correctly"
- rm -rf ${TMP_UDIR}/webkit-*
-
- qpushd $_WEBKIT_UDIR/lib/pkgconfig
- perl -pi.bak -e"s!^prefix=.*\$!prefix=$_WEBKIT_UDIR!" *.pc
- qpopd
- fi
-}
-
-function inst_inno() {
- setup Inno Setup Compiler
- _INNO_UDIR=`unix_path $INNO_DIR`
- add_to_env $_INNO_UDIR PATH
- if quiet which iscc
- then
- echo "Inno Setup Compiler already installed in $_INNO_UDIR. skipping."
- else
- smart_wget $INNO_URL $DOWNLOAD_DIR
- $LAST_FILE //SP- //SILENT //DIR="$INNO_DIR"
- quiet which iscc || die "iscc (Inno Setup Compiler) not installed correctly"
- fi
-}
-
-function test_for_hh() {
- qpushd $TMP_UDIR
- cat > ofile.c <<EOF
-#include <windows.h>
-#include <htmlhelp.h>
-int main(int argc, char **argv) {
- HtmlHelpW(0, (wchar_t*)"", HH_HELP_CONTEXT, 0);
- return 0;
-}
-EOF
- gcc -shared -o ofile.dll ofile.c "$HH_CPPFLAGS" "$HH_LDFLAGS" -lhtmlhelp || return 1
- rm ofile*
- qpopd
-}
-
-function inst_hh() {
- setup HTML Help Workshop
- HH_SYS_DIR=$(cscript //nologo get-install-path.vbs)
- if [ -z "$HH_SYS_DIR" ]; then
- smart_wget $HH_URL $DOWNLOAD_DIR
- echo "!!! Attention !!!"
- echo "!!! This is the only installation step that requires your direct input !!!"
- echo "!!! Contray to older installation scripts the HtmlHelp Workshop should !!!"
- echo "!!! no longer be installed in $HH_DIR !!!"
- echo "!!! When asked for an installation path, DO NOT specify $HH_DIR !!!"
- CMD=$(basename "$LAST_FILE")
- cscript //nologo run-as-admin.vbs $CMD "" "$DOWNLOAD_DIR"
- HH_SYS_DIR=$(cscript //nologo get-install-path.vbs)
- if [ -z "$HH_SYS_DIR" ]; then
- die "HTML Help Workshop not installed correctly (Windows installer failed for some reason)"
- fi
- fi
-
- _HH_UDIR=`unix_path $HH_DIR`
- _HH_SYS_UDIR="`unix_path $HH_SYS_DIR`"
- if [ "$_HH_UDIR" = "$_HH_SYS_UDIR" ]; then
- echo "Warning: Installing HTML Help Workshop inside the gnucash development directory is no longer recommended."
- echo " The script will proceed in $HH_DIR\\mingw for now."
- echo " To fix this for future safety, you should"
- echo " - uninstall HTML Help Workshop"
- echo " - delete directory $HH_DIR and all of its remaining content"
- echo " - rerun install.sh"
- echo
- _HH_UDIR="$_HH_UDIR/mingw"
- fi
-
- add_to_env -I$_HH_UDIR/include HH_CPPFLAGS
- add_to_env -L$_HH_UDIR/lib HH_LDFLAGS
- add_to_env "$_HH_SYS_UDIR" PATH
- if quiet test_for_hh
- then
- echo "html help workshop already installed in $_HH_UDIR. skipping."
- else
- mkdir -p $_HH_UDIR/{include,lib}
- _HHCTRL_OCX=$(which hhctrl.ocx || true)
- [ "$_HHCTRL_OCX" ] || die "Did not find hhctrl.ocx"
- cp "$_HH_SYS_UDIR/include/htmlhelp.h" $_HH_UDIR/include
- qpushd "$_HH_UDIR"
- pexports -h include/htmlhelp.h $_HHCTRL_OCX > $_HH_UDIR/lib/htmlhelp.def
- qpopd
- qpushd $_HH_UDIR/lib
- ${DLLTOOL} -k -d htmlhelp.def -l libhtmlhelp.a
- qpopd
- test_for_hh || die "HTML Help Workshop not installed correctly (link test failed)"
- fi
-}
-
-
-function inst_icu4c() {
- setup icu4c
- _ICU4C_UDIR=`unix_path $ICU4C_DIR`
- if [ -f "$_ICU4C_UDIR/lib/libicuuc.dll.a" ]
- then
- echo "icu4c already installed. Skipping."
- else
- wget_unpacked $ICU4C_SRC_URL $DOWNLOAD_DIR $TMP_DIR
-# qpushd $TMP_UDIR/icu
-# patch -p1 < $ICU4C_PATCH
- # qpopd
- mkdir $TMP_UDIR/icu/build
- qpushd $TMP_UDIR/icu/build
- ../source/configure --prefix ${_ICU4C_UDIR} \
- --disable-strict \
- --disable-extras \
- --disable-layout \
- --disable-layoutex \
- --disable-tests \
- --disable-samples \
- CPPFLAGS="${CPPFLAGS} -DU_CHARSET_IS_UTF8=1 -DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1 -DU_USING_ICU_NAMESPACE=0" \
- CXXFLAGS="${CXXFLAGS} -std=gnu++11"
-
- make V=0
- make install V=0
- ln ${_ICU4C_UDIR}/lib/libicudt.dll.a ${_ICU4C_UDIR}/lib/libicudata.dll.a
- ln ${_ICU4C_UDIR}/lib/libicuin.dll.a ${_ICU4C_UDIR}/lib/libicui18n.dll.a
- qpopd
- # cleanup
- rm -rf $TMP_UDIR/icu*
- fi
- add_to_env ${_ICU4C_UDIR}/lib PATH
- add_to_env ${_ICU4C_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
-}
-
-function inst_boost() {
- setup Boost
- get_major_minor "$GNUCASH_SCM_REV"
- if [ "$GNUCASH_SCM_REV" != "master" ] &&
- (( $major_minor <= 206 )); then
- echo "Skipping. Boost is only needed for the master branch or future 2.7.x and up versions of gnucash."
- return
- fi
- _BOOST_UDIR=`unix_path ${BOOST_DIR}`
- _ICU4C_WDIR=`win_fs_path ${ICU4C_DIR}`
- # The boost m4 macro included with gnucash looks for boost in either
- # $BOOST_ROOT/staging (useless here) or $ac_boost_path, while the cmake build
- # looks in $BOOST_ROOT. So we set both to support both build systems.
- set_env ${_BOOST_UDIR} BOOST_ROOT
- set_env ${_BOOST_UDIR} ac_boost_path
- export BOOST_ROOT ac_boost_path
- add_to_env ${_BOOST_UDIR}/lib PATH
- if test -f ${_BOOST_UDIR}/lib/libboost_date_time.dll
- then
- echo "Boost already installed in $_BOOST_UDIR. skipping."
- else
- wget_unpacked $BOOST_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/boost_*
- qpushd $TMP_UDIR/boost_*
- ./bootstrap.sh --with-toolset=mingw \
- --prefix=${_BOOST_UDIR} \
- --with-icu=${_ICU4C_WDIR} \
- --with-libraries=${BOOST_LIBS}
- sed -i"" "s/mingw /gcc /" project-config.jam
- ./b2 --prefix=${_BOOST_UDIR} --layout=system \
- link=shared variant=release \
- -sICU_PATH=${_ICU4C_WDIR} \
- install
- qpopd
- test -f ${_BOOST_UDIR}/lib/libboost_date_time.dll || die "Boost not installed correctly"
- rm -rf $TMP_UDIR/boost_*
- fi
-}
-
-function inst_gtest() {
- setup Google Test Framework
- get_major_minor "$GNUCASH_SCM_REV"
- if [ "$GNUCASH_SCM_REV" != "master" ] &&
- (( $major_minor <= 206 )); then
- echo "Skipping. The Google test framework is only needed for the master branch or future 2.7.x and up versions of gnucash."
- return
- fi
-
- _GTEST_UDIR=`unix_path ${GTEST_DIR}`
- set_env ${_GTEST_UDIR}/googletest GTEST_ROOT
- set_env ${_GTEST_UDIR}/googlemock GMOCK_ROOT
- export GTEST_ROOT GMOCK_ROOT
- if [ -f ${GTEST_ROOT}/src/gtest-all.cc ] &&
- [ -f ${GTEST_ROOT}/include/gtest/gtest.h ] &&
- [ -f ${GMOCK_ROOT}/src/gmock-all.cc ] &&
- [ -f ${GMOCK_ROOT}/include/gmock/gmock.h ]
- then
- echo "Google test framework already installed in ${_GTEST_UDIR}. skipping."
- else
- rm -fr ${_GTEST_UDIR}
- $GIT_CMD clone $GTEST_REPO -b $GTEST_VERSION ${_GTEST_UDIR}
-
- ([ -f ${GTEST_ROOT}/src/gtest-all.cc ] &&
- [ -f ${GTEST_ROOT}/include/gtest/gtest.h ] &&
- [ -f ${GMOCK_ROOT}/src/gmock-all.cc ] &&
- [ -f ${GMOCK_ROOT}/include/gmock/gmock.h ]) || die "Google test framework not installed correctly"
- fi
-}
-
-function inst_cutecash() {
- setup Cutecash
- _BUILD_UDIR=`unix_path $CUTECASH_BUILD_DIR`
- _REPOS_UDIR=`unix_path $REPOS_DIR`
- mkdir -p $_BUILD_UDIR
-
- qpushd $_BUILD_UDIR
- cmake ${_REPOS_UDIR} \
- -G"MSYS Makefiles" \
- -DREGEX_INCLUDE_PATH=${_REGEX_UDIR}/include \
- -DREGEX_LIBRARY=${_REGEX_UDIR}/lib/libregex.a \
- -DGUILE_INCLUDE_DIR=${_GUILE_UDIR}/include \
- -DGUILE_LIBRARY=${_GUILE_UDIR}/bin/libguile.dll \
- -DLIBINTL_INCLUDE_PATH=${_GNOME_UDIR}/include \
- -DLIBINTL_LIBRARY=${_GNOME_UDIR}/bin/intl.dll \
- -DLIBXML2_INCLUDE_DIR=${_GNOME_UDIR}/include/libxml2 \
- -DLIBXML2_LIBRARIES=${_GNOME_UDIR}/bin/libxml2-2.dll \
- -DPKG_CONFIG_EXECUTABLE=${_GNOME_UDIR}/bin/pkg-config \
- -DZLIB_INCLUDE_DIR=${_GNOME_UDIR}/include \
- -DZLIB_LIBRARY=${_GNOME_UDIR}/bin/zlib1.dll \
- -DSWIG_EXECUTABLE=${_SWIG_UDIR}/swig.exe \
- -DHTMLHELP_INCLUDE_PATH=${_HH_UDIR}/include \
- -DWITH_SQL=ON \
- -DLIBDBI_INCLUDE_PATH=${_LIBDBI_UDIR}/include \
- -DLIBDBI_LIBRARY=${_LIBDBI_UDIR}/lib/libdbi.dll.a \
- -DCMAKE_BUILD_TYPE=Debug
- make
- qpopd
-}
-
-function inst_gnucash_using_cmake() {
- setup "Gnucash (using cmake)"
- _INSTALL_UDIR=`unix_path $INSTALL_DIR`
- _BUILD_UDIR=`unix_path $BUILD_DIR`
- _GLOBAL_UDIR=`unix_path $GLOBAL_DIR`
- _REPOS_UDIR=`unix_path $REPOS_DIR`
- _NINJA_UDIR=`unix_path $NINJA_DIR`
- _MSYS_UDIR=`unix_path $MSYS_DIR`
- _HH_UDIR=`unix_path $HH_DIR`
- _LIBDBI_DRIVERS_UDIR=`unix_path ${LIBDBI_DRIVERS_DIR}`
-
- mkdir -p $_BUILD_UDIR
-
- # Remove existing INSTALL_UDIR
- if [ -x $_INSTALL_UDIR ]; then
- echo Removing previous inst dir $_INSTALL_UDIR ...
- rm -rf "$_INSTALL_UDIR"
- fi;
-
- add_to_env $_INSTALL_UDIR/bin PATH
-
- if [ "$BUILD_FROM_TARBALL" != "yes" ]; then
- qpushd $REPOS_DIR
- $GIT_CMD checkout $GNUCASH_SCM_REV
- qpopd
- fi
-
- _CMAKE_MAKE_PROGRAM=$_MSYS_UDIR/bin/make
- if [ "$CMAKE_GENERATOR" = "Ninja" ]; then
- _CMAKE_MAKE_PROGRAM=$_NINJA_UDIR/ninja.exe
- fi
- qpushd $_BUILD_UDIR
- if [ -f CMakeCache.txt ]; then
- rm CMakeCache.txt
- fi
- cmake -G "$CMAKE_GENERATOR" \
- -D CMAKE_INSTALL_PREFIX=${_INSTALL_UDIR} \
- -D CMAKE_PREFIX_PATH=${_GLOBAL_UDIR} \
- -D PERL_EXECUTABLE=${_MSYS_UDIR}/bin/perl \
- -D CMAKE_MAKE_PROGRAM=${_CMAKE_MAKE_PROGRAM} \
- -D WITH_AQBANKING=ON \
- -D GNC_DBD_DIR=${_LIBDBI_DRIVERS_UDIR}/lib/dbd \
- -D HTMLHELP_DIR=${_HH_UDIR} \
- -D GIT_EXECUTABLE=${GIT_DIR}/bin/git.exe \
- ${_REPOS_UDIR}
- ${_CMAKE_MAKE_PROGRAM} install
- qpopd
-}
-
-function inst_gnucash() {
- setup GnuCash
- _INSTALL_WFSDIR=`win_fs_path $INSTALL_DIR`
- _INSTALL_UDIR=`unix_path $INSTALL_DIR`
- _BUILD_UDIR=`unix_path $BUILD_DIR`
- _REPOS_UDIR=`unix_path $REPOS_DIR`
- mkdir -p $_BUILD_UDIR
- add_to_env $_INSTALL_UDIR/bin PATH
-
- AQBANKING_OPTIONS="--enable-aqbanking"
- AQBANKING_UPATH="${_OPENSSL_UDIR}/bin:${_GWENHYWFAR_UDIR}/bin:${_AQBANKING_UDIR}/bin"
- LIBOFX_OPTIONS="--enable-ofx"
-
- if [ "$BUILD_FROM_TARBALL" != "yes" ]; then
- qpushd $REPOS_DIR
- $GIT_CMD checkout $GNUCASH_SCM_REV
- ./autogen.sh
- qpopd
- fi
-
- qpushd $_BUILD_UDIR
- $_REPOS_UDIR/configure ${HOST_XCOMPILE} \
- --prefix=$_INSTALL_WFSDIR \
- --enable-debug \
- --enable-dbi \
- --with-dbi-dbd-dir=$( echo ${_LIBDBI_DRIVERS_UDIR} | sed 's,^/\([A-Za-z]\)/,\1:/,g' )/lib/dbd \
- ${LIBOFX_OPTIONS} \
- ${AQBANKING_OPTIONS} \
- --enable-binreloc \
- --enable-locale-specific-tax \
- CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GUILE_CPPFLAGS} ${LIBDBI_CPPFLAGS} ${HH_CPPFLAGS} ${LIBSOUP_CPPFLAGS} -D_WIN32 ${EXTRA_CFLAGS}" \
- LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${HH_LDFLAGS} -L${_SQLITE3_UDIR}/lib -L${_ENCHANT_UDIR}/lib -L${_LIBXSLT_UDIR}/lib" \
- PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
-
- make
-
- make_install
- qpopd
-}
-
-# This function will be called by make_install.sh as well,
-# so do not regard variables from inst_* functions as set
-# Parameters allowed: skip_scripts
-function make_install() {
- _BUILD_UDIR=`unix_path $BUILD_DIR`
- _INSTALL_UDIR=`unix_path $INSTALL_DIR`
- _GOFFICE_UDIR=`unix_path $GOFFICE_DIR`
- _LIBGSF_UDIR=`unix_path $LIBGSF_DIR`
- _PCRE_UDIR=`unix_path $PCRE_DIR`
- _GNOME_UDIR=`unix_path $GNOME_DIR`
- _GUILE_UDIR=`unix_path $GUILE_DIR`
- _REGEX_UDIR=`unix_path $REGEX_DIR`
- _OPENSSL_UDIR=`unix_path $OPENSSL_DIR`
- _GWENHYWFAR_UDIR=`unix_path ${GWENHYWFAR_DIR}`
- _AQBANKING_UDIR=`unix_path ${AQBANKING_DIR}`
- _LIBOFX_UDIR=`unix_path ${LIBOFX_DIR}`
- _OPENSP_UDIR=`unix_path ${OPENSP_DIR}`
- _LIBDBI_UDIR=`unix_path ${LIBDBI_DIR}`
- _SQLITE3_UDIR=`unix_path ${SQLITE3_DIR}`
- _WEBKIT_UDIR=`unix_path ${WEBKIT_DIR}`
- _GNUTLS_UDIR=`unix_path ${GNUTLS_DIR}`
- AQBANKING_UPATH="${_OPENSSL_UDIR}/bin:${_GWENHYWFAR_UDIR}/bin:${_AQBANKING_UDIR}/bin"
- AQBANKING_PATH="${OPENSSL_DIR}\\bin;${GWENHYWFAR_DIR}\\bin;${AQBANKING_DIR}\\bin"
-
- for param in "$@"; do
- [ "$param" = "skip_scripts" ] && _skip_scripts=1
- done
-
- make install
-
- qpushd $_INSTALL_UDIR/bin
- if [ ! -f $_MINGW_UDIR/bin/libstdc++-6.dll ] ; then die "File $_MINGW_UDIR/bin/libstdc++-6.dll is missing. Install step unavailable in cross-compile." ; fi
-
- # Copy libstdc++-6.dll and its dependency to gnucash bin directory
- # to prevent DLL loading errors
- # (__gxx_personality_v0 not found in libstdc++-6.dll)
- cp $_MINGW_UDIR/bin/{libstdc++-6.dll,libgcc_s_dw2-1.dll} .
- qpopd
-
- qpushd $_INSTALL_UDIR/lib
- # Move modules that are compiled without -module to lib/gnucash and
- # correct the 'dlname' in the libtool archives. We do not use these
- # files to dlopen the modules, so actually this is unneeded.
- # Also, in all installed .la files, remove the dependency_libs line
- mv bin/*.dll gnucash/*.dll $_INSTALL_UDIR/bin 2>/dev/null || true
- for A in gnucash/*.la; do
- sed '/dependency_libs/d;s#../bin/##' $A > tmp ; mv tmp $A
- done
- for A in *.la; do
- sed '/dependency_libs/d' $A > tmp ; mv tmp $A
- done
- qpopd
-
- if [ -z $_skip_scripts ]; then
- # Create a startup script that works without the msys shell
- # If you make any changes here, you should probably also change
- # the equivalent sections in inno_setup/gnucash.iss, and
- # (in the gnucash source repository) src/bin/environment*.in
- qpushd $_INSTALL_UDIR/bin
- cat > gnucash-launcher.cmd <<EOF
- at echo off
-setlocal
-set PATH=$INSTALL_DIR\\bin;%PATH%
-set PATH=$INSTALL_DIR\\lib;%PATH%
-set PATH=$INSTALL_DIR\\lib\\gnucash;%PATH%
-set PATH=$BOOST_DIR\\lib;%PATH%
-set PATH=$GNUTLS_DIR\\bin;%PATH%
-set PATH=$MINGW_DIR\\bin;%PATH%
-set PATH=$GOFFICE_DIR\\bin;%PATH%
-set PATH=$LIBGSF_DIR\\bin;%PATH%
-set PATH=$PCRE_DIR\\bin;%PATH%
-set PATH=$GNOME_DIR\\bin;%PATH%
-set PATH=$GUILE_DIR\\bin;%PATH%
-set PATH=$WEBKIT_DIR\\bin;%PATH%
-set PATH=$REGEX_DIR\\bin;%PATH%
-set PATH=$AQBANKING_PATH;%PATH%
-set PATH=$LIBOFX_DIR\\bin;%PATH%
-set PATH=$OPENSP_DIR\\bin;%PATH%
-set PATH=$LIBDBI_DIR\\bin;%PATH%
-set PATH=$SQLITE3_DIR\\bin;%PATH%
-set PATH=$MYSQL_LIB_DIR\\lib;%PATH%
-set PATH=$PGSQL_DIR\\bin;%PATH%
-set PATH=$PGSQL_DIR\\lib;%PATH%
-set PATH=$ENCHANT_DIR\\bin;%PATH%
-set PATH=$ENCHANT_DIR\\lib;%PATH%
-set PATH=$LIBSOUP_DIR\\bin;%PATH%
-set PATH=$LIBSOUP_DIR\\lib;%PATH%
-set PATH=$LIBXSLT_DIR\\bin;%PATH%
-set PATH=$LIBXSLT_DIR\\lib;%PATH%
-set PATH=$ICU4C_DIR\\lib;%PATH%
-
-set LTDL_LIBRARY_PATH=${INSTALL_DIR}\\lib
-
-start gnucash %*
-EOF
- qpopd
- fi
-}
-
-function checkupd_docs_git() {
-
- if [ "$UPDATE_DOCS" = "yes" ]; then
- if [ -x .git ]; then
- setup "Docs - Update repository (git)"
- $GIT_CMD pull
- else
- setup "Docs - Checkout repository (git)"
- $GIT_CMD clone $DOCS_URL .
- $GIT_CMD checkout $DOCS_SCM_REV
- fi
- fi
-}
-
-function make_chm() {
- _CHM_TYPE=$1
- _CHM_LANG=$2
- _XSLTPROC_OPTS=$3
- echo "Processing $_CHM_TYPE ($_CHM_LANG) ..."
- qpushd $_CHM_TYPE/$_CHM_LANG
- ## Some debug output
- #echo xsltproc $XSLTPROCFLAGS $_XSLTPROC_OPTS --path ../../../docbookx-dtd ../../../docbook-xsl/htmlhelp/htmlhelp.xsl gnucash-$_CHM_TYPE.xml
- #ls ../../../docbookx-dtd ../../../docbook-xsl/htmlhelp/htmlhelp.xsl gnucash-$_CHM_TYPE.xml
- xsltproc $XSLTPROCFLAGS $_XSLTPROC_OPTS --path ../../../docbookx-dtd ../../../docbook-xsl/htmlhelp/htmlhelp.xsl gnucash-$_CHM_TYPE.xml
- count=0
- echo >> htmlhelp.hhp
- echo "[ALIAS]" >> htmlhelp.hhp
- echo "IDH_0=index.html" >> htmlhelp.hhp
- echo "#define IDH_0 0" > mymaps
- echo "[Map]" > htmlhelp.hhmap
- echo "Searching for anchors ..."
- for id in `cat *.xml | sed '/sect.*id=/!d;s,.*id=["'\'']\([^"'\'']*\)["'\''].*,\1,'` ; do
- files=`grep -l "[\"']${id}[\"']" *.html` || continue
- echo "IDH_$((++count))=${files}#${id}" >> htmlhelp.hhp
- echo "#define IDH_${count} ${count}" >> mymaps
- echo "${id}=${count}" >> htmlhelp.hhmap
- done
- echo >> htmlhelp.hhp
- echo "[MAP]" >> htmlhelp.hhp
- cat mymaps >> htmlhelp.hhp
- rm mymaps
- echo "Will now call hhc.exe for $_CHM_TYPE ($_CHM_LANG)..."
- hhc htmlhelp.hhp >/dev/null || true
- echo "... hhc.exe completed successfully."
- cp -fv htmlhelp.chm $_DOCS_INST_UDIR/$_CHM_LANG/gnucash-$_CHM_TYPE.chm
- cp -fv htmlhelp.hhmap $_DOCS_INST_UDIR/$_CHM_LANG/gnucash-$_CHM_TYPE.hhmap
- qpopd
-}
-
-function inst_docs() {
- setup "Docbook xsl and dtd"
- _DOCS_UDIR=`unix_path $DOCS_DIR`
- if [ ! -d $_DOCS_UDIR/docbook-xsl ] ; then
- wget_unpacked $DOCBOOK_XSL_URL $DOWNLOAD_DIR $DOCS_DIR
- # add a pause to allow windows to realize that the files now exist
- sleep 1
- mv $_DOCS_UDIR/docbook-xsl-* $_DOCS_UDIR/docbook-xsl
- else
- echo "Docbook xsl already installed. Skipping."
- fi
- if [ ! -d $_DOCS_UDIR/docbookx-dtd ] ; then
- mkdir -p $_DOCS_UDIR/docbookx-dtd
- wget_unpacked $DOCBOOK_DTD_URL $DOWNLOAD_DIR $DOCS_DIR/docbookx-dtd
- else
- echo "Docbook dtd already installed. Skipping."
- fi
-
- mkdir -p $_DOCS_UDIR/repos
- qpushd $_DOCS_UDIR/repos
- checkupd_docs_git
- setup docs
- _DOCS_INST_UDIR=`unix_path $INSTALL_DIR`/share/gnucash/help
- mkdir -p $_DOCS_INST_UDIR/{C,de,it,ja}
- make_chm guide C
- make_chm guide de
- make_chm guide it
-# Temporarily disabled because it makes hh
-# make_chm guide ja "--stringparam chunker.output.encoding Shift_JIS --stringparam htmlhelp.encoding Shift_JIS"
- make_chm help C
- make_chm help de
-# make_chm help it
- qpopd
-}
-
-function inst_finish() {
- setup Finish...
- if [ "$NO_SAVE_PROFILE" != "yes" ]; then
- _NEW=x
- for _ENV in $ENV_VARS; do
- _ADDS=`eval echo '"\$'"${_ENV}"'_ADDS"'`
- if [ "$_ADDS" ]; then
- if [ "$_NEW" ]; then
- echo
- echo "Environment variables changed, please do the following"
- echo
- [ -d /etc/profile.d ] || echo "mkdir -p /etc/profile.d"
- _NEW=
- fi
- _VAL=`eval echo '"$'"${_ENV}_BASE"'"'`
- if [ "$_VAL" ]; then
- _CHANGE="export ${_ENV}=\"${_ADDS}"'$'"${_ENV}\""
- else
- _CHANGE="export ${_ENV}=\"${_ADDS}\""
- fi
- echo $_CHANGE
- echo echo "'${_CHANGE}' >> /etc/profile.d/installer.sh"
- fi
- done
- fi
- if [ "$CROSS_COMPILE" = "yes" ]; then
- echo "You might want to create a binary tarball now as follows:"
- qpushd $GLOBAL_DIR
- echo tar -czf $HOME/gnucash-fullbin.tar.gz --anchored \
- --exclude='*.a' --exclude='*.o' --exclude='*.h' \
- --exclude='*.info' --exclude='*.html' \
- --exclude='*include/*' --exclude='*gtk-doc*' \
- --exclude='bin*' \
- --exclude='mingw32/*' --exclude='*bin/mingw32-*' \
- --exclude='gnucash-trunk*' \
- *
- qpopd
- fi
-}
-
-### Local Variables: ***
-### sh-basic-offset: 4 ***
-### indent-tabs-mode: nil ***
-### End: ***
diff --git a/install.sh b/install.sh
deleted file mode 100644
index 04396fd..0000000
--- a/install.sh
+++ /dev/null
@@ -1,146 +0,0 @@
-#!/bin/sh
-#
-# Steps will be executed in the order they were added. They can only be added
-# at most once if they have not been blocked already (adding implies blocking).
-# To add a custom step <s>, just implement "function <s>()". Keep in mind that
-# blocking or reordering may render install.sh & friends non-functional.
-
-
-[ ! "$BASH" -a -x /bin/bash ] && exec /bin/bash "$0" "$@"
-
-set -e
-
-function on_error() {
- setup "An error occurred, exiting."
- restore_msys "$_PID"
-}
-trap on_error ERR
-
-echo -n "Build Starting at "
-date
-
-GC_WIN_DIR="$(dirname "$0")"
-. "$GC_WIN_DIR/functions.sh"
-
-qpushd "$GC_WIN_DIR"
-. ./defaults.sh
-. ./install-impl.sh
-
-# variables
-register_env_var ACLOCAL_FLAGS " "
-register_env_var ENCHANT_LDFLAGS " "
-register_env_var GNOME_CPPFLAGS " "
-register_env_var GNOME_LDFLAGS " "
-register_env_var GNUTLS_CPPFLAGS " "
-register_env_var GNUTLS_LDFLAGS " "
-register_env_var GUILE_LOAD_PATH ";"
-register_env_var GUILE_CPPFLAGS " "
-register_env_var GUILE_LDFLAGS " "
-register_env_var HH_CPPFLAGS " "
-register_env_var HH_LDFLAGS " "
-register_env_var INTLTOOL_PERL " "
-register_env_var LIBDBI_CPPFLAGS " "
-register_env_var LIBDBI_LDFLAGS " "
-register_env_var LIBXSLT_LDFLAGS " "
-register_env_var PATH ":"
-register_env_var PCRE_CPPFLAGS " "
-register_env_var PCRE_LDFLAGS " "
-register_env_var PKG_CONFIG " "
-register_env_var PKG_CONFIG_PATH ":"
-register_env_var READLINE_CPPFLAGS " "
-register_env_var READLINE_LDFLAGS " "
-register_env_var REGEX_CPPFLAGS " "
-register_env_var REGEX_LDFLAGS " "
-register_env_var SQLITE_CFLAGS " "
-register_env_var SQLITE_LIBS " "
-
-# steps
-# There is no reason to ever need to comment these out!
-# * commented out glade, as it is not needed to run gnucash
-add_step inst_prepare
-if [ "$CROSS_COMPILE" != "yes" ]; then
- add_step inst_msys
-fi
-add_step inst_mingw
-# Install html help as soon as possible.
-# It's the only step requiring human
-# interaction, so better do it at the beginning
-# so the user doesn't need to wait all the time.
-if [ "$CROSS_COMPILE" != "yes" ]; then
- add_step inst_hh
-fi
-add_step inst_regex
-add_step inst_readline
-add_step inst_exetype
-add_step inst_gnome
-add_step inst_guile
-if [ "$CROSS_COMPILE" != "yes" ]; then
- add_step inst_git
-fi
-add_step inst_gnutls
-add_step inst_libxslt
-add_step inst_isocodes
-add_step inst_swig
-add_step inst_pcre
-add_step inst_libgsf
-add_step inst_goffice
-#add_step inst_glade
-add_step inst_opensp
-add_step inst_libofx
-## Online banking:
-add_step inst_gwenhywfar
-add_step inst_aqbanking
-add_step inst_libdbi
-
-# icu, libsoup and enchant needed by webkit
-add_step inst_icu4c
-add_step inst_libsoup
-add_step inst_enchant
-add_step inst_webkit
-# boost, and gtest now needed for C++ on master only
-add_step inst_boost
-add_step inst_gtest
-
-##
-if [ "$WITH_CUTECASH" = "yes" ]; then
- add_step inst_cmake
- add_step inst_cutecash
-fi
-
-if [ "$WITH_CMAKE" = "yes" ]; then
- add_step inst_cmake
- CMAKE_GENERATOR="MSYS Makefiles"
- if [ "$WITH_NINJA" = "yes" ]; then
- add_step inst_ninja
- CMAKE_GENERATOR="Ninja"
- fi
- add_step inst_gnucash_using_cmake
-else
- add_step inst_gnucash
-fi
-
-if [ "$CROSS_COMPILE" != "yes" ]; then
- add_step inst_inno
-fi
-add_step inst_docs
-add_step inst_finish
-
-# run commands registered with late_eval
-eval_now
-
-for step in "${steps[@]}" ; do
- eval $step
-done
-
-setup Restore MSYS
-restore_msys "$_PID"
-
-qpopd
-
-echo -n "Build Finished at "
-date
-
-### Local Variables: ***
-### sh-basic-offset: 4 ***
-### indent-tabs-mode: nil ***
-### End: ***
diff --git a/libdbi-0.8.3.patch b/libdbi-0.8.3.patch
deleted file mode 100644
index 5291902..0000000
--- a/libdbi-0.8.3.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -Nur libdbi-0.8.3-old/include/dbi/dbd.h libdbi-0.8.3/include/dbi/dbd.h
---- libdbi-0.8.3-old/include/dbi/dbd.h 2005-08-15 21:18:18.000000000 +0200
-+++ libdbi-0.8.3/include/dbi/dbd.h 2008-10-05 15:57:24.889982668 +0200
-@@ -52,7 +52,7 @@
- size_t dbd_quote_binary(dbi_conn_t *conn, const unsigned char *orig, size_t from_length, unsigned char **ptr_dest);
- size_t dbd_conn_quote_string(dbi_conn_t *conn, const char *orig, char *dest);
- const char *dbd_select_db(dbi_conn_t *conn, const char *db);
--int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr);
-+int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr);
- unsigned long long dbd_get_seq_last(dbi_conn_t *conn, const char *sequence);
- unsigned long long dbd_get_seq_next(dbi_conn_t *conn, const char *sequence);
- int dbd_ping(dbi_conn_t *conn);
-@@ -63,7 +63,7 @@
- void _dbd_result_add_field(dbi_result_t *result, unsigned int fieldidx, char *name, unsigned short type, unsigned int attribs);
- dbi_row_t *_dbd_row_allocate(unsigned int numfields);
- void _dbd_row_finalize(dbi_result_t *result, dbi_row_t *row, unsigned long long rowidx);
--void _dbd_internal_error_handler(dbi_conn_t *conn, const char *errmsg, const int errno);
-+void _dbd_internal_error_handler(dbi_conn_t *conn, const char *errmsg, const int err_no);
- dbi_result_t *_dbd_result_create_from_stringarray(dbi_conn_t *conn, unsigned long long numrows_matched, const char **stringarray);
- void _dbd_register_driver_cap(dbi_driver_t *driver, const char *capname, int value);
- void _dbd_register_conn_cap(dbi_conn_t *conn, const char *capname, int value);
---- libdbi-0.8.3/src/dbd_helper.c.orig Sun Sep 13 16:34:39 2009
-+++ libdbi-0.8.3/src/dbd_helper.c Sun Sep 13 16:35:02 2009
-@@ -145,7 +145,7 @@
- return len;
- }
-
--void _dbd_internal_error_handler(dbi_conn_t *conn, const char *errmsg, const int errno) {
-+void _dbd_internal_error_handler(dbi_conn_t *conn, const char *errmsg, const int err_no) {
- int my_errno = DBI_ERROR_NONE;
- int errstatus;
- char *my_errmsg = NULL;
-@@ -154,7 +154,7 @@
- free(conn->error_message);
- }
-
-- if (errno == DBI_ERROR_DBD) {
-+ if (err_no == DBI_ERROR_DBD) {
- /* translate into a client-library specific error number */
- errstatus = conn->driver->functions->geterror(conn, &my_errno, &my_errmsg);
-
-@@ -171,8 +171,8 @@
- }
- }
- else if (errmsg) {
-- conn->error_flag = errno; /* legacy code may rely on this */
-- conn->error_number = errno;
-+ conn->error_flag = err_no; /* legacy code may rely on this */
-+ conn->error_number = err_no;
- conn->error_message = strdup(errmsg);
-
- if (conn->error_handler != NULL) {
-@@ -181,7 +181,7 @@
- }
- else {
- /* pass internal errors to the internal libdbi handler */
-- _error_handler(conn, errno);
-+ _error_handler(conn, err_no);
- }
-
- }
diff --git a/libdbi-drivers-errno.patch b/libdbi-drivers-errno.patch
deleted file mode 100644
index 9de25a5..0000000
--- a/libdbi-drivers-errno.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-diff --git a/drivers/firebird/dbd_firebird.c b/drivers/firebird/dbd_firebird.c
-index 4a1f30d..035479e 100755
---- a/drivers/firebird/dbd_firebird.c
-+++ b/drivers/firebird/dbd_firebird.c
-@@ -524,10 +524,10 @@ const char *dbd_select_db(dbi_conn_t *conn, const char *db)
- return db;
- }
-
--int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr)
-+int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr)
- {
- /* error_message and error_number were already set by calls to _dbd_internal_error_handler */
-- *errno = conn->error_number;
-+ *err_no = conn->error_number;
- *errstr = (conn->error_message) ? strdup(conn->error_message):NULL;
- return 1;
- }
-diff --git a/drivers/freetds/dbd_freetds.c b/drivers/freetds/dbd_freetds.c
-index 2a24764..9f57d85 100644
---- a/drivers/freetds/dbd_freetds.c
-+++ b/drivers/freetds/dbd_freetds.c
-@@ -733,10 +733,10 @@ const char *dbd_select_db(dbi_conn_t * conn, const char *db)
- return (char *) db;
- }
-
--int dbd_geterror(dbi_conn_t * conn, int *errno, char **errstr)
-+int dbd_geterror(dbi_conn_t * conn, int *err_no, char **errstr)
- {
- /* put error number into errno, error string into errstr
-- * return 0 if error, 1 if errno filled, 2 if errstr filled, 3 if both errno and errstr filled */
-+ * return 0 if error, 1 if err_no filled, 2 if errstr filled, 3 if both err_no and errstr filled */
-
- /* We havn't functions for read error types in freetds */
- return -1;
-diff --git a/drivers/msql/dbd_msql.c b/drivers/msql/dbd_msql.c
-index bdf270e..cef20a8 100644
---- a/drivers/msql/dbd_msql.c
-+++ b/drivers/msql/dbd_msql.c
-@@ -277,12 +277,12 @@
- return db;
- }
-
--int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr)
-+int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr)
- {
- if(!msqlErrMsg)
- return -1;
-
-- *errno = 0;
-+ *err_no = 0;
- *errstr = strdup(msqlErrMsg);
- return 2;
- }
-diff --git a/drivers/mysql/dbd_mysql.c b/drivers/mysql/dbd_mysql.c
-index 7d06f62..237506c 100644
---- a/drivers/mysql/dbd_mysql.c
-+++ b/drivers/mysql/dbd_mysql.c
-@@ -553,15 +553,15 @@ const char *dbd_select_db(dbi_conn_t *conn, const char *db) {
- return db;
- }
-
--int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr) {
-- /* put error number into errno, error string into errstr
-- * return 0 if error, 1 if errno filled, 2 if errstr filled, 3 if both errno and errstr filled */
-+int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr) {
-+ /* put error number into err_no, error string into errstr
-+ * return 0 if error, 1 if err_no filled, 2 if errstr filled, 3 if both err_no and errstr filled */
-
- if (strcmp("",mysql_error((MYSQL *)conn->connection)) == 0) {
- return -1;
- }
-
-- *errno = mysql_errno((MYSQL *)conn->connection);
-+ *err_no = mysql_errno((MYSQL *)conn->connection);
- *errstr = strdup(mysql_error((MYSQL *)conn->connection));
- return 3;
- }
-diff --git a/drivers/oracle/dbd_oracle.c b/drivers/oracle/dbd_oracle.c
-index 1f38094..d220a9e 100755
---- a/drivers/oracle/dbd_oracle.c
-+++ b/drivers/oracle/dbd_oracle.c
-@@ -400,12 +400,12 @@ const char *dbd_select_db(dbi_conn_t *conn, const char *db)
- return NULL; /* Oracle can't do that .... */
- }
-
--int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr)
-+int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr)
- {
- char errbuf[1024];
- int errcode = 0;
- Oraconn *Oconn = conn->connection;
-- *errno = 0;
-+ *err_no = 0;
-
- if (!conn->connection) {
- *errstr = strdup("Unable to connect to database.");
-@@ -414,7 +414,7 @@ int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr)
- OCIErrorGet((dvoid *)Oconn->err, (ub4) 1, (text *) NULL, &errcode, errbuf,
- (ub4) sizeof(errbuf), OCI_HTYPE_ERROR);
- *errstr = strdup(errbuf);
-- *errno = errcode;
-+ *err_no = errcode;
- }
-
- return 3;
-diff --git a/drivers/pgsql/dbd_pgsql.c b/drivers/pgsql/dbd_pgsql.c
-index 0433550..c097dac 100644
---- a/drivers/pgsql/dbd_pgsql.c
-+++ b/drivers/pgsql/dbd_pgsql.c
-@@ -520,11 +520,11 @@ const char *dbd_select_db(dbi_conn_t *conn, const char *db) {
- return db;
- }
-
--int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr) {
-- /* put error number into errno, error string into errstr
-- * return 0 if error, 1 if errno filled, 2 if errstr filled, 3 if both errno and errstr filled */
-+int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr) {
-+ /* put error number into err_no, error string into errstr
-+ * return 0 if error, 1 if err_no filled, 2 if errstr filled, 3 if both err_no and errstr filled */
-
-- *errno = 0;
-+ *err_no = 0;
- *errstr = strdup(PQerrorMessage((PGconn *)conn->connection));
-
- return 2;
-diff --git a/drivers/sqlite/dbd_sqlite.c b/drivers/sqlite/dbd_sqlite.c
-index 94dacc0..aeadfa5 100644
---- a/drivers/sqlite/dbd_sqlite.c
-+++ b/drivers/sqlite/dbd_sqlite.c
-@@ -911,13 +911,13 @@ const char *dbd_select_db(dbi_conn_t *conn, const char *db) {
- return db;
- }
-
--int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr) {
-- /* put error number into errno, error string into errstr
-- * return 0 if error, 1 if errno filled, 2 if errstr filled, 3 if both errno and errstr filled */
-+int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr) {
-+ /* put error number into err_no, error string into errstr
-+ * return 0 if error, 1 if err_no filled, 2 if errstr filled, 3 if both err_no and errstr filled */
- int result = 0;
-
- if (conn->error_number) {
-- *errno = conn->error_number;
-+ *err_no = conn->error_number;
- result++;
- }
- if (conn->error_message) {
-diff --git a/drivers/sqlite3/dbd_sqlite3.c b/drivers/sqlite3/dbd_sqlite3.c
-index dc85465..3360c27 100644
---- a/drivers/sqlite3/dbd_sqlite3.c
-+++ b/drivers/sqlite3/dbd_sqlite3.c
-@@ -880,11 +880,11 @@ const char *dbd_select_db(dbi_conn_t *conn, const char *db) {
- return db;
- }
-
--int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr) {
-- /* put error number into errno, error string into errstr
-- * return 0 if error, 1 if errno filled, 2 if errstr filled, 3 if both errno and errstr filled */
-+int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr) {
-+ /* put error number into err_no, error string into errstr
-+ * return 0 if error, 1 if err_no filled, 2 if errstr filled, 3 if both err_no and errstr filled */
-
-- *errno = sqlite3_errcode((sqlite3 *)conn->connection);
-+ *err_no = sqlite3_errcode((sqlite3 *)conn->connection);
- *errstr = strdup((char*)sqlite3_errmsg((sqlite3 *)conn->connection));
- return 3;
- }
diff --git a/libmysql.def b/libmysql.def
deleted file mode 100644
index 4eb5cc6..0000000
--- a/libmysql.def
+++ /dev/null
@@ -1,106 +0,0 @@
-LIBRARY LIBMYSQL.dll
-EXPORTS
-myodbc_remove_escape
-mysql_affected_rows at 4
-mysql_autocommit
-mysql_change_user
-mysql_character_set_name
-mysql_close at 4
-mysql_commit
-mysql_data_seek at 12
-mysql_debug
-mysql_dump_debug_info
-mysql_embedded
-mysql_eof
-mysql_errno at 4
-mysql_error at 4
-mysql_escape_string at 12
-mysql_fetch_field
-mysql_fetch_field_direct
-mysql_fetch_fields at 4
-mysql_fetch_lengths at 4
-mysql_fetch_row at 4
-mysql_field_count
-mysql_field_seek
-mysql_field_tell
-mysql_free_result at 4
-mysql_get_character_set_info
-mysql_get_client_info
-mysql_get_client_version
-mysql_get_host_info
-mysql_get_parameters
-mysql_get_proto_info
-mysql_get_server_info
-mysql_get_server_version
-mysql_get_ssl_cipher
-mysql_hex_string
-mysql_info
-mysql_init at 4
-mysql_insert_id at 4
-mysql_kill
-mysql_list_dbs
-mysql_list_fields
-mysql_list_processes
-mysql_list_tables
-mysql_more_results
-mysql_next_result
-mysql_num_fields at 4
-mysql_num_rows at 4
-mysql_options
-mysql_ping at 4
-mysql_query at 8
-mysql_read_query_result
-mysql_real_connect at 32
-mysql_real_escape_string at 16
-mysql_real_query at 12
-mysql_refresh
-mysql_rollback
-mysql_row_seek
-mysql_row_tell
-mysql_select_db at 8
-mysql_send_query
-mysql_server_end
-mysql_server_init
-mysql_set_character_set
-mysql_set_local_infile_default
-mysql_set_local_infile_handler
-mysql_set_server_option
-mysql_shutdown
-mysql_sqlstate
-mysql_ssl_set
-mysql_stat
-mysql_stmt_affected_rows
-mysql_stmt_attr_get
-mysql_stmt_attr_set
-mysql_stmt_bind_param
-mysql_stmt_bind_result
-mysql_stmt_close
-mysql_stmt_data_seek
-mysql_stmt_errno
-mysql_stmt_error
-mysql_stmt_execute
-mysql_stmt_fetch
-mysql_stmt_fetch_column
-mysql_stmt_field_count
-mysql_stmt_free_result
-mysql_stmt_init
-mysql_stmt_insert_id
-mysql_stmt_next_result
-mysql_stmt_num_rows
-mysql_stmt_param_count
-mysql_stmt_param_metadata
-mysql_stmt_prepare
-mysql_stmt_reset
-mysql_stmt_result_metadata
-mysql_stmt_row_seek
-mysql_stmt_row_tell
-mysql_stmt_send_long_data
-mysql_stmt_sqlstate
-mysql_stmt_store_result
-mysql_store_result at 4
-mysql_thread_end
-mysql_thread_id
-mysql_thread_init
-mysql_thread_safe
-mysql_use_result
-mysql_warning_count
diff --git a/libofx-0.9.8.patch b/libofx-0.9.8.patch
deleted file mode 100644
index 7942b06..0000000
--- a/libofx-0.9.8.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/lib/ofx_preproc.cpp 2013-04-17 20:09:11 +0000
-+++ b/lib/ofx_preproc.cpp 2013-10-14 09:00:31 +0000
-@@ -310,7 +310,7 @@
- size_t outbytesleft = inbytesleft * 2 - 1;
- iconv_buffer = (char*) malloc (inbytesleft * 2);
- memset(iconv_buffer, 0, inbytesleft * 2);
--#if defined(OS_WIN32) || defined(__sun)
-+#if defined(__sun)
- const char * inchar = (const char *)s_buffer.c_str();
- #else
- char * inchar = (char *)s_buffer.c_str();
---- a/lib/win32.cpp Wed Mar 30 15:30:50 2011
-+++ b/lib/win32.cpp Sun Mar 29 15:07:27 2015
-@@ -25,7 +25,7 @@
-
-
-
--#ifdef OS_WIN32
-+#if defined(OS_WIN32) && !defined(__MINGW32__)
-
- int mkstemp(char *tmpl)
- {
-
---- a/lib/win32.hh Wed Mar 30 15:30:50 2011
-+++ b/lib/win32.hh Sun Mar 29 16:26:58 2015
-@@ -21,7 +21,7 @@
- #endif
-
-
--#ifdef OS_WIN32
-+#if defined(OS_WIN32) && !defined(__MINGW32__)
-
- int mkstemp(char *tmpl);
-
diff --git a/libsoup-2.48.0-bad-symbol.patch b/libsoup-2.48.0-bad-symbol.patch
deleted file mode 100644
index 052b8de..0000000
--- a/libsoup-2.48.0-bad-symbol.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/libsoup/libsoup-2.4.sym 2014-10-29 22:37:54 -0700
-+++ b/libsoup/libsoup-2.4.sym 2014-06-18 07:42:51 -0700
-@@ -348,7 +348,6 @@
- soup_server_get_async_context
- soup_server_get_listener
- soup_server_get_listeners
--soup_server_get_gsocket
- soup_server_get_port
- soup_server_get_type
- soup_server_get_uris
diff --git a/libsoup-2.48.0-soup-server-reserved-word.patch b/libsoup-2.48.0-soup-server-reserved-word.patch
deleted file mode 100644
index c7c0adc..0000000
--- a/libsoup-2.48.0-soup-server-reserved-word.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/libsoup/soup-server.h 2014-10-29 22:51:10 -0700
-+++ b/libsoup/soup-server.h 2014-10-30 12:27:08 -0700
-@@ -80,7 +80,7 @@
-
- SOUP_AVAILABLE_IN_2_48
- gboolean soup_server_listen (SoupServer *server,
-- GSocketAddress *interface,
-+ GSocketAddress *iface,
- SoupServerListenOptions options,
- GError **error);
- SOUP_AVAILABLE_IN_2_48
diff --git a/libxslt-1.1.22.Makefile.in.patch b/libxslt-1.1.22.Makefile.in.patch
deleted file mode 100755
index ecf8be5..0000000
--- a/libxslt-1.1.22.Makefile.in.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- libxslt/Makefile.in.orig 2007-08-23 11:22:57 -0400
-+++ libxslt/Makefile.in 2011-04-05 17:11:09 -0400
-@@ -293,8 +293,8 @@
- xsltwin32config.h.in \
- libxslt.h
-
--libxslt_la_LIBADD = $(EXTRA_LIBS)
--libxslt_la_LDFLAGS = -version-info @LIBXSLT_VERSION_INFO@
-+libxslt_la_LIBADD = $(EXTRA_LIBS) $(WIN32_EXTRA_LIBADD)
-+libxslt_la_LDFLAGS = -version-info @LIBXSLT_VERSION_INFO@ $(WIN32_EXTRA_LDFLAGS)
- man_MANS = libxslt.3
- EXTRA_DIST = $(man_MANS) trio.h triodef.h
- all: all-am
---- libexslt/Makefile.in.orig 2007-08-23 11:22:57 -0400
-+++ libexslt/Makefile.in 2011-04-05 17:11:44 -0400
-@@ -269,8 +269,8 @@
- libexslt.h \
- dynamic.c
-
--libexslt_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS)
--libexslt_la_LDFLAGS = -version-info @LIBEXSLT_VERSION_INFO@ $(LIBGCRYPT_LIBS)
-+libexslt_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS) $(WIN32_EXTRA_LIBADD)
-+libexslt_la_LDFLAGS = -version-info @LIBEXSLT_VERSION_INFO@ $(LIBGCRYPT_LIBS) $(WIN32_EXTRA_LDFLAGS)
- man_MANS = libexslt.3
- EXTRA_DIST = $(man_MANS)
- all: all-am
diff --git a/make_install.sh b/make_install.sh
deleted file mode 100644
index 9c3dbaa..0000000
--- a/make_install.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-set -e
-
-GC_WIN_DIR="$(dirname "$0")"
-. "$GC_WIN_DIR/functions.sh"
-
-qpushd "$GC_WIN_DIR"
-. defaults.sh
-reset_steps
-. install.sh
-qpopd
-
-prepare
-_INSTALL_WFSDIR=`win_fs_path $INSTALL_DIR`
-_INSTALL_UDIR=`unix_path $INSTALL_DIR`
-
-make_install "$@"
diff --git a/mingw-get.zip b/mingw-get.zip
deleted file mode 100755
index 0334dad..0000000
Binary files a/mingw-get.zip and /dev/null differ
diff --git a/opensp-1.5.2.patch b/opensp-1.5.2.patch
deleted file mode 100644
index 3271365..0000000
--- a/opensp-1.5.2.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/lib/Makefile.am Thu Dec 15 13:13:16 2005
-+++ b/lib/Makefile.am Tue Feb 6 10:57:58 2007
-@@ -76,7 +76,9 @@
- splibpch.h token.h app_inst.cxx arc_inst.cxx entmgr_inst.cxx \
- parser_inst.cxx xentmgr_inst.cxx SubstTable.cxx \
- UTF16CodingSystem.cxx Fixed4CodingSystem.cxx \
-- memcmp.c memmove.c strerror.c
-+ memcmp.c memmove.c strerror.c WinInetStorage.cxx \
-+ WinInetStorageMessages.h WinInetStorageMessages.msg \
-+ WinInetStorageMessages.rc WinApp.cxx Win32CodingSystem.cxx
-
- INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/generic
-
---- a/lib/MessageReporter.cxx 2005-07-21 07:05:17.000000000 -0700
-+++ b/lib/MessageReporter.cxx 2017-05-06 11:51:04.348011200 -0700
-@@ -13,7 +13,8 @@
- #include "macros.h"
-
- #include <string.h>
--
-+#include <iostream>
-+#include <sstream>
-
- #ifdef SP_NAMESPACE
- namespace SP_NAMESPACE {
-@@ -123,8 +124,12 @@
- os() << ':';
- }
- if (options_ & messageNumbers)
-- os() << (unsigned long)message.type->module() << "."
-+ {
-+ std::ostringstream ss;
-+ ss << (void*)message.type->module();
-+ os() << ss.str().c_str() << "."
- << (unsigned long)message.type->number() << ":";
-+ }
- switch (message.type->severity()) {
- case MessageType::info:
- formatFragment(MessageReporterMessages::infoTag, os());
-
diff --git a/pi.sh b/pi.sh
deleted file mode 100644
index 4415196..0000000
--- a/pi.sh
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright (C) Earnie Boyd <earnie at users.sf.net>
-# This file is a part of msysDVLPR.
-# http://www.mingw.org/msysdvlpr.shmtl
-#
-
-echo
-echo "This is a post install process that will try to normalize between"
-echo "your MinGW install if any as well as your previous MSYS installs "
-echo "if any. I don't have any traps as aborts will not hurt anything."
-echo -n "Do you wish to continue with the post install? [yn ] "; read ans
-if [ $ans == 'n' ]; then exit 1; fi
-
-. /etc/profile
-
-echo
-echo -n "Do you have MinGW installed? [yn ] "; read ans
-if [ $ans == y ]
-then
- echo
- echo "Please answer the following in the form of c:/foo/bar."
- echo -n "Where is your MinGW installation? "; read ans
- if [ -f $ans/bin/gcc.exe ]
- then
- mingwpath=$ans
- else
- mingwpath=
- fi
- if [ -z "$mingwpath" ]
- then
- echo
- echo I could not find $ans/bin/gcc.exe. You must have given an invalid
- echo path to your MinGW environment. I am reversing to no MinGW
- echo installation. If you do have MinGW installed then you can manually
- echo bind the mount point /mingw to C:/mingw '('replace C: with the
- echo drive of your choice')' by creating an /etc/fstab file with a line
- echo that has a value similar to:
- echo C:/mingw /mingw
- echo -n Press ENTER to continue; read ans
- fi
-else
- mingwpath=
- echo
- echo "When you install MinGW I suggest you install it to C:/mingw"
- echo '(replace C: with the drive of your choice). Then create an'
- echo '/etc/fstab file with a line that has a value similar to:'
- echo 'C:/mingw /mingw'
- echo -n 'Press ENTER to continue '; read ans
-fi
-
-if [ ! -z "$mingwpath" ]
-then
- if [ -f /etc/fstab ]
- then
- echo
- echo "I see that you already have an /etc/fstab file. Do you wish for me"
- echo -n "to add mount bindings for $mingwpath to /mingw? [yn ]"; read ans
- if [ $ans == 'y' ]
- then
- cat <<EOF>>/etc/fstab
-$mingwpath /mingw
-EOF
- fi
- else
- echo
- echo -n "Creating /etc/fstab with mingw mount bindings."
- cat <<EOF>/etc/fstab
-$mingwpath /mingw
-EOF
- fi
-fi
-
-echo
-echo " Normalizing your MSYS environment."
-echo
-
-for I in awk cmd echo egrep ex fgrep printf pwd rvi rview rvim vi view
-do
- if [ -f /bin/$I. ]
- then
- echo You have script /bin/$I
- if [ -f /bin/$I.exe ]
- then
- echo Removing /bin/$I.exe
- rm -f /bin/$I.exe
- fi
- fi
-done
-
-for I in ftp ln make
-do
- if [ -f /bin/$I.exe ] && [ -f /bin/$I. ]
- then
- echo You have both /bin/$I.exe and /bin/$I.
- echo Removing /bin/$I.
- rm -f /bin/$I.
- fi
-done
-
-if [ -z "$mingwpath" ]
-then
- echo
- echo MinGW-1.1 has a version of make.exe within it\'s bin/ directory.
- echo Please be sure to rename this file to mingw32-make.exe once you've
- echo installed MinGW-1.1 because it\'s very deficient in function.
- echo -n Press ENTER to continue. ; read ans
-else
- if [ -f $mingwpath/bin/make.exe ]
- then
- echo
- echo Renaming $mingwpath/bin/make.exe to mingw32-make.exe.
- mv $mingwpath/bin/make.exe $mingwpath/bin/mingw32-make.exe
- else
- echo
- echo Oh joy, you do not have $mingwpath/bin/make.exe. Keep it that way.
- fi
-fi
diff --git a/reset.sh b/reset.sh
deleted file mode 100644
index 86cdb36..0000000
--- a/reset.sh
+++ /dev/null
@@ -1,141 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#### Load defaults.sh
-
-GC_WIN_DIR="$(dirname "$0")"
-. "$GC_WIN_DIR/functions.sh"
-
-qpushd "$GC_WIN_DIR"
-. defaults.sh
-
-## too bad, bash 2.04 has no real support for arrays
-
-# 0 = get confirmation
-# 1 = delete
-_phase=0
-
-# usage: add_precious_path <step> <path>
-function add_precious_path() {
- _precious_paths="${_precious_paths} $1|$2"
-}
-
-add_precious_path msys $MSYS_DIR
-add_precious_path wget $WGET_DIR
-add_precious_path git $GIT_DIR
-add_precious_path repos $REPOS_DIR
-add_precious_path hh $HH_DIR
-
-# usage: eval_path <path> <force>
-function eval_path() {
- if [ "$2" != "force" ]; then
- for _precious in $_precious_paths; do
- _prec_step="${_precious%%|*}"
- _prec_path="${_precious##*|}"
- _preclen="${#_prec_path}"
- _dirss="${1:0:${_preclen}}"
- _dirlen="${#1}"
- _precss="${_prec_path:0:${_dirlen}}"
- if [ "$_dirss" = "$_prec_path" -o "$_precss" = "$1" ]; then
- if [ "$_phase" != "1" ]; then
- echo " - will not remove $1 to save $_prec_path ($_prec_step)"
- fi
- return
- fi
- done
- fi
- if [ "$_phase" = "1" ]; then
- echo rm -rf $1
- rm -rf $1
- else
- echo " * rm -rf $1"
- fi
-}
-
-function eval_all() {
- eval_path $UNZIP_DIR
- eval_path $REGEX_DIR
- eval_path $READLINE_DIR
- eval_path $ACTIVE_PERL_DIR
- eval_path $AUTOTOOLS_DIR
- eval_path $GUILE_DIR
- eval_path $OPENSSL_DIR
- eval_path $MINGW_DIR
- eval_path $MINGW_UTILS_DIR
- eval_path $EXETYPE_DIR
- eval_path $LIBXML2_DIR
- eval_path $GNOME_DIR
- eval_path $SWIG_DIR
- eval_path $PCRE_DIR
- eval_path $LIBGSF_DIR
- eval_path $GOFFICE_DIR
- eval_path $GLADE_DIR
- eval_path $INNO_DIR
- eval_path $HH_DIR
- eval_path $OPENSP_DIR
- eval_path $LIBOFX_DIR
- eval_path $GMP_DIR
- eval_path $GNUTLS_DIR
- eval_path $GWENHYWFAR_DIR
- eval_path $AQBANKING_DIR
- eval_path $LIBGDA_DIR
- eval_path $SQLITE3_DIR
- eval_path $LIBDBI_DIR
- eval_path $LIBDBI_DRIVERS_DIR
- eval_path $BUILD_DIR
- eval_path $INSTALL_DIR
- eval_path $GNUCASH_DIR\\dist
- eval_path $GNUCASH_DIR\\gnucash.iss
- eval_path $TMP_DIR
- eval_path $MSYS_DIR\\etc\\profile.d\\installer.sh force
- eval_path $DOCS_DIR
- eval_path $LIBXSLT_DIR
- eval_path $LIBBONOBOUI_DIR
- eval_path $MYSQL_LIB_DIR
- eval_path $PGSQL_DIR
- eval_path $WEBKIT_DIR
- eval_path $ISOCODES_DIR
-}
-
-echo
-echo "This will reset your installation of gnucash."
-echo "The following tasks will be executed:"
-
-while true; do
- echo
- eval_all
- echo
- echo -n "Are you sure you want to do this: Yes, first add safe paths or no? [y/s/N] "
- read resp
- case "$resp" in
- y*|Y*)
- _phase=1
- break
- ;;
- s*|S*)
- echo
- echo -n "Add safe path (e.g. c:\\\\soft\\\\tmp): "
- read path
- [ "$path" ] && add_precious_path user_defined $path
- ;;
- *)
- exit 0
- ;;
- esac
-done
-
-#### Now clear out the install
-
-echo
-qpushd $GLOBAL_DIR
- eval_all
-qpopd
-
-echo "Done"
-exit 0
-
-### Local Variables: ***
-### sh-basic-offset: 4 ***
-### indent-tabs-mode: nil ***
-### End: ***
diff --git a/swift940-strndup.patch b/swift940-strndup.patch
deleted file mode 100644
index 0132853..0000000
--- a/swift940-strndup.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/src/plugins/parsers/swift/swift940.c 2015-06-01 10:16:28.000000000 -0700
-+++ b/src/plugins/parsers/swift/swift940.c 2016-06-20 16:45:18.000000000 -0700
-@@ -31,9 +31,18 @@
-
-
- /* #define ENABLE_FULL_SEPA_LOG */
-+inline char* strndup_impl(char* instr, size_t len)
-+{
-+ char *outstr = malloc(len +1);
-+ if (outstr)
-+ {
-+ memset(outstr, 0, len);
-+ memcpy(outstr, instr, len);
-+ }
-+ return outstr;
-+}
-
--
--
-+#define strndup(str, len) strndup_impl(str, len)
- #define CENTURY_CUTOFF_YEAR 79
-
-
-@@ -266,7 +277,7 @@
-
- /* found begin of the next SEPA field or end of buffer */
- if (s > sLastTagStart) {
-- int tagLen;
-+ size_t tagLen;
-
- /* we currently have a field, close that first */
- tagLen=s-sLastTagStart;
diff --git a/webkitenumtypes.cpp b/webkitenumtypes.cpp
deleted file mode 100755
index 62268c8..0000000
--- a/webkitenumtypes.cpp
+++ /dev/null
@@ -1,248 +0,0 @@
-
-/* Generated data (by glib-mkenums) */
-
-#include <config.h>
-#include <glib-object.h>
-#include "./WebKit/gtk/webkit/webkitenumtypes.h"
-
-extern "C" {
-
-
-/* enumerations from "./WebKit/gtk/webkit/webkitdownload.h" */
-static const GEnumValue _webkit_download_status_values[] = {
- { WEBKIT_DOWNLOAD_STATUS_ERROR, "WEBKIT_DOWNLOAD_STATUS_ERROR", "error" },
- { WEBKIT_DOWNLOAD_STATUS_CREATED, "WEBKIT_DOWNLOAD_STATUS_CREATED", "created" },
- { WEBKIT_DOWNLOAD_STATUS_STARTED, "WEBKIT_DOWNLOAD_STATUS_STARTED", "started" },
- { WEBKIT_DOWNLOAD_STATUS_CANCELLED, "WEBKIT_DOWNLOAD_STATUS_CANCELLED", "cancelled" },
- { WEBKIT_DOWNLOAD_STATUS_FINISHED, "WEBKIT_DOWNLOAD_STATUS_FINISHED", "finished" },
- { 0, NULL, NULL }
-};
-
-GType webkit_download_status_get_type(void)
-{
- static GType type = 0;
-
- if (!type)
- type = g_enum_register_static("WebKitDownloadStatus", _webkit_download_status_values);
-
- return type;
-}
-
-static const GEnumValue _webkit_download_error_values[] = {
- { WEBKIT_DOWNLOAD_ERROR_CANCELLED_BY_USER, "WEBKIT_DOWNLOAD_ERROR_CANCELLED_BY_USER", "cancelled-by-user" },
- { WEBKIT_DOWNLOAD_ERROR_DESTINATION, "WEBKIT_DOWNLOAD_ERROR_DESTINATION", "destination" },
- { WEBKIT_DOWNLOAD_ERROR_NETWORK, "WEBKIT_DOWNLOAD_ERROR_NETWORK", "network" },
- { 0, NULL, NULL }
-};
-
-GType webkit_download_error_get_type(void)
-{
- static GType type = 0;
-
- if (!type)
- type = g_enum_register_static("WebKitDownloadError", _webkit_download_error_values);
-
- return type;
-}
-
-
-/* enumerations from "./WebKit/gtk/webkit/webkiterror.h" */
-static const GEnumValue _webkit_network_error_values[] = {
- { WEBKIT_NETWORK_ERROR_FAILED, "WEBKIT_NETWORK_ERROR_FAILED", "failed" },
- { WEBKIT_NETWORK_ERROR_TRANSPORT, "WEBKIT_NETWORK_ERROR_TRANSPORT", "transport" },
- { WEBKIT_NETWORK_ERROR_UNKNOWN_PROTOCOL, "WEBKIT_NETWORK_ERROR_UNKNOWN_PROTOCOL", "unknown-protocol" },
- { WEBKIT_NETWORK_ERROR_CANCELLED, "WEBKIT_NETWORK_ERROR_CANCELLED", "cancelled" },
- { WEBKIT_NETWORK_ERROR_FILE_DOES_NOT_EXIST, "WEBKIT_NETWORK_ERROR_FILE_DOES_NOT_EXIST", "file-does-not-exist" },
- { 0, NULL, NULL }
-};
-
-GType webkit_network_error_get_type(void)
-{
- static GType type = 0;
-
- if (!type)
- type = g_enum_register_static("WebKitNetworkError", _webkit_network_error_values);
-
- return type;
-}
-
-static const GEnumValue _webkit_policy_error_values[] = {
- { WEBKIT_POLICY_ERROR_FAILED, "WEBKIT_POLICY_ERROR_FAILED", "failed" },
- { WEBKIT_POLICY_ERROR_CANNOT_SHOW_MIME_TYPE, "WEBKIT_POLICY_ERROR_CANNOT_SHOW_MIME_TYPE", "cannot-show-mime-type" },
- { WEBKIT_POLICY_ERROR_CANNOT_SHOW_URL, "WEBKIT_POLICY_ERROR_CANNOT_SHOW_URL", "cannot-show-url" },
- { WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE, "WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE", "frame-load-interrupted-by-policy-change" },
- { WEBKIT_POLICY_ERROR_CANNOT_USE_RESTRICTED_PORT, "WEBKIT_POLICY_ERROR_CANNOT_USE_RESTRICTED_PORT", "cannot-use-restricted-port" },
- { 0, NULL, NULL }
-};
-
-GType webkit_policy_error_get_type(void)
-{
- static GType type = 0;
-
- if (!type)
- type = g_enum_register_static("WebKitPolicyError", _webkit_policy_error_values);
-
- return type;
-}
-
-static const GEnumValue _webkit_plugin_error_values[] = {
- { WEBKIT_PLUGIN_ERROR_FAILED, "WEBKIT_PLUGIN_ERROR_FAILED", "failed" },
- { WEBKIT_PLUGIN_ERROR_CANNOT_FIND_PLUGIN, "WEBKIT_PLUGIN_ERROR_CANNOT_FIND_PLUGIN", "cannot-find-plugin" },
- { WEBKIT_PLUGIN_ERROR_CANNOT_LOAD_PLUGIN, "WEBKIT_PLUGIN_ERROR_CANNOT_LOAD_PLUGIN", "cannot-load-plugin" },
- { WEBKIT_PLUGIN_ERROR_JAVA_UNAVAILABLE, "WEBKIT_PLUGIN_ERROR_JAVA_UNAVAILABLE", "java-unavailable" },
- { WEBKIT_PLUGIN_ERROR_CONNECTION_CANCELLED, "WEBKIT_PLUGIN_ERROR_CONNECTION_CANCELLED", "connection-cancelled" },
- { WEBKIT_PLUGIN_ERROR_WILL_HANDLE_LOAD, "WEBKIT_PLUGIN_ERROR_WILL_HANDLE_LOAD", "will-handle-load" },
- { 0, NULL, NULL }
-};
-
-GType webkit_plugin_error_get_type(void)
-{
- static GType type = 0;
-
- if (!type)
- type = g_enum_register_static("WebKitPluginError", _webkit_plugin_error_values);
-
- return type;
-}
-
-
-/* enumerations from "./WebKit/gtk/webkit/webkithittestresult.h" */
-static const GFlagsValue _webkit_hit_test_result_context_values[] = {
- { WEBKIT_HIT_TEST_RESULT_CONTEXT_DOCUMENT, "WEBKIT_HIT_TEST_RESULT_CONTEXT_DOCUMENT", "document" },
- { WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK, "WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK", "link" },
- { WEBKIT_HIT_TEST_RESULT_CONTEXT_IMAGE, "WEBKIT_HIT_TEST_RESULT_CONTEXT_IMAGE", "image" },
- { WEBKIT_HIT_TEST_RESULT_CONTEXT_MEDIA, "WEBKIT_HIT_TEST_RESULT_CONTEXT_MEDIA", "media" },
- { WEBKIT_HIT_TEST_RESULT_CONTEXT_SELECTION, "WEBKIT_HIT_TEST_RESULT_CONTEXT_SELECTION", "selection" },
- { WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE, "WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE", "editable" },
- { 0, NULL, NULL }
-};
-
-GType webkit_hit_test_result_context_get_type(void)
-{
- static GType type = 0;
-
- if (!type)
- type = g_flags_register_static("WebKitHitTestResultContext", _webkit_hit_test_result_context_values);
-
- return type;
-}
-
-
-/* enumerations from "./WebKit/gtk/webkit/webkitwebframe.h" */
-static const GEnumValue _webkit_load_status_values[] = {
- { WEBKIT_LOAD_PROVISIONAL, "WEBKIT_LOAD_PROVISIONAL", "provisional" },
- { WEBKIT_LOAD_COMMITTED, "WEBKIT_LOAD_COMMITTED", "committed" },
- { WEBKIT_LOAD_FINISHED, "WEBKIT_LOAD_FINISHED", "finished" },
- { WEBKIT_LOAD_FIRST_VISUALLY_NON_EMPTY_LAYOUT, "WEBKIT_LOAD_FIRST_VISUALLY_NON_EMPTY_LAYOUT", "first-visually-non-empty-layout" },
- { WEBKIT_LOAD_FAILED, "WEBKIT_LOAD_FAILED", "failed" },
- { 0, NULL, NULL }
-};
-
-GType webkit_load_status_get_type(void)
-{
- static GType type = 0;
-
- if (!type)
- type = g_enum_register_static("WebKitLoadStatus", _webkit_load_status_values);
-
- return type;
-}
-
-
-/* enumerations from "./WebKit/gtk/webkit/webkitwebnavigationaction.h" */
-static const GEnumValue _webkit_web_navigation_reason_values[] = {
- { WEBKIT_WEB_NAVIGATION_REASON_LINK_CLICKED, "WEBKIT_WEB_NAVIGATION_REASON_LINK_CLICKED", "link-clicked" },
- { WEBKIT_WEB_NAVIGATION_REASON_FORM_SUBMITTED, "WEBKIT_WEB_NAVIGATION_REASON_FORM_SUBMITTED", "form-submitted" },
- { WEBKIT_WEB_NAVIGATION_REASON_BACK_FORWARD, "WEBKIT_WEB_NAVIGATION_REASON_BACK_FORWARD", "back-forward" },
- { WEBKIT_WEB_NAVIGATION_REASON_RELOAD, "WEBKIT_WEB_NAVIGATION_REASON_RELOAD", "reload" },
- { WEBKIT_WEB_NAVIGATION_REASON_FORM_RESUBMITTED, "WEBKIT_WEB_NAVIGATION_REASON_FORM_RESUBMITTED", "form-resubmitted" },
- { WEBKIT_WEB_NAVIGATION_REASON_OTHER, "WEBKIT_WEB_NAVIGATION_REASON_OTHER", "other" },
- { 0, NULL, NULL }
-};
-
-GType webkit_web_navigation_reason_get_type(void)
-{
- static GType type = 0;
-
- if (!type)
- type = g_enum_register_static("WebKitWebNavigationReason", _webkit_web_navigation_reason_values);
-
- return type;
-}
-
-
-/* enumerations from "./WebKit/gtk/webkit/webkitwebsettings.h" */
-static const GEnumValue _webkit_editing_behavior_values[] = {
- { WEBKIT_EDITING_BEHAVIOR_MAC, "WEBKIT_EDITING_BEHAVIOR_MAC", "mac" },
- { WEBKIT_EDITING_BEHAVIOR_WINDOWS, "WEBKIT_EDITING_BEHAVIOR_WINDOWS", "windows" },
- { 0, NULL, NULL }
-};
-
-GType webkit_editing_behavior_get_type(void)
-{
- static GType type = 0;
-
- if (!type)
- type = g_enum_register_static("WebKitEditingBehavior", _webkit_editing_behavior_values);
-
- return type;
-}
-
-
-/* enumerations from "./WebKit/gtk/webkit/webkitwebview.h" */
-static const GEnumValue _webkit_navigation_response_values[] = {
- { WEBKIT_NAVIGATION_RESPONSE_ACCEPT, "WEBKIT_NAVIGATION_RESPONSE_ACCEPT", "accept" },
- { WEBKIT_NAVIGATION_RESPONSE_IGNORE, "WEBKIT_NAVIGATION_RESPONSE_IGNORE", "ignore" },
- { WEBKIT_NAVIGATION_RESPONSE_DOWNLOAD, "WEBKIT_NAVIGATION_RESPONSE_DOWNLOAD", "download" },
- { 0, NULL, NULL }
-};
-
-GType webkit_navigation_response_get_type(void)
-{
- static GType type = 0;
-
- if (!type)
- type = g_enum_register_static("WebKitNavigationResponse", _webkit_navigation_response_values);
-
- return type;
-}
-
-static const GEnumValue _webkit_cache_model_values[] = {
- { WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER, "WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER", "document-viewer" },
- { WEBKIT_CACHE_MODEL_WEB_BROWSER, "WEBKIT_CACHE_MODEL_WEB_BROWSER", "web-browser" },
- { 0, NULL, NULL }
-};
-
-GType webkit_cache_model_get_type(void)
-{
- static GType type = 0;
-
- if (!type)
- type = g_enum_register_static("WebKitCacheModel", _webkit_cache_model_values);
-
- return type;
-}
-
-static const GEnumValue _webkit_web_view_target_info_values[] = {
- { WEBKIT_WEB_VIEW_TARGET_INFO_HTML, "WEBKIT_WEB_VIEW_TARGET_INFO_HTML", "html" },
- { WEBKIT_WEB_VIEW_TARGET_INFO_TEXT, "WEBKIT_WEB_VIEW_TARGET_INFO_TEXT", "text" },
- { WEBKIT_WEB_VIEW_TARGET_INFO_IMAGE, "WEBKIT_WEB_VIEW_TARGET_INFO_IMAGE", "image" },
- { WEBKIT_WEB_VIEW_TARGET_INFO_URI_LIST, "WEBKIT_WEB_VIEW_TARGET_INFO_URI_LIST", "uri-list" },
- { WEBKIT_WEB_VIEW_TARGET_INFO_NETSCAPE_URL, "WEBKIT_WEB_VIEW_TARGET_INFO_NETSCAPE_URL", "netscape-url" },
- { 0, NULL, NULL }
-};
-
-GType webkit_web_view_target_info_get_type(void)
-{
- static GType type = 0;
-
- if (!type)
- type = g_enum_register_static("WebKitWebViewTargetInfo", _webkit_web_view_target_info_values);
-
- return type;
-}
-
-}
-
-/* Generated data ends here */
-
diff --git a/webkitenumtypes.h b/webkitenumtypes.h
deleted file mode 100755
index 5d40777..0000000
--- a/webkitenumtypes.h
+++ /dev/null
@@ -1,92 +0,0 @@
-
-/* Generated data (by glib-mkenums) */
-
-#ifndef WEBKIT_ENUM_TYPES_H
-#define WEBKIT_ENUM_TYPES_H
-
-#include <glib-object.h>
-
-#include <webkit/webkitdefines.h>
-
-G_BEGIN_DECLS
-
-#include <webkit/webkitdownload.h>
-
-#define WEBKIT_TYPE_DOWNLOAD_STATUS webkit_download_status_get_type()
-
-WEBKIT_API GType
-webkit_download_status_get_type(void);
-
-#define WEBKIT_TYPE_DOWNLOAD_ERROR webkit_download_error_get_type()
-
-WEBKIT_API GType
-webkit_download_error_get_type(void);
-
-#include <webkit/webkiterror.h>
-
-#define WEBKIT_TYPE_NETWORK_ERROR webkit_network_error_get_type()
-
-WEBKIT_API GType
-webkit_network_error_get_type(void);
-
-#define WEBKIT_TYPE_POLICY_ERROR webkit_policy_error_get_type()
-
-WEBKIT_API GType
-webkit_policy_error_get_type(void);
-
-#define WEBKIT_TYPE_PLUGIN_ERROR webkit_plugin_error_get_type()
-
-WEBKIT_API GType
-webkit_plugin_error_get_type(void);
-
-#include <webkit/webkithittestresult.h>
-
-#define WEBKIT_TYPE_HIT_TEST_RESULT_CONTEXT webkit_hit_test_result_context_get_type()
-
-WEBKIT_API GType
-webkit_hit_test_result_context_get_type(void);
-
-#include <webkit/webkitwebframe.h>
-
-#define WEBKIT_TYPE_LOAD_STATUS webkit_load_status_get_type()
-
-WEBKIT_API GType
-webkit_load_status_get_type(void);
-
-#include <webkit/webkitwebnavigationaction.h>
-
-#define WEBKIT_TYPE_WEB_NAVIGATION_REASON webkit_web_navigation_reason_get_type()
-
-WEBKIT_API GType
-webkit_web_navigation_reason_get_type(void);
-
-#include <webkit/webkitwebsettings.h>
-
-#define WEBKIT_TYPE_EDITING_BEHAVIOR webkit_editing_behavior_get_type()
-
-WEBKIT_API GType
-webkit_editing_behavior_get_type(void);
-
-#include <webkit/webkitwebview.h>
-
-#define WEBKIT_TYPE_NAVIGATION_RESPONSE webkit_navigation_response_get_type()
-
-WEBKIT_API GType
-webkit_navigation_response_get_type(void);
-
-#define WEBKIT_TYPE_CACHE_MODEL webkit_cache_model_get_type()
-
-WEBKIT_API GType
-webkit_cache_model_get_type(void);
-
-#define WEBKIT_TYPE_WEB_VIEW_TARGET_INFO webkit_web_view_target_info_get_type()
-
-WEBKIT_API GType
-webkit_web_view_target_info_get_type(void);
-
-G_END_DECLS
-
-#endif
-
-/* Generated data ends here */
-
commit 55a031879667137c8ddd0ec7247d315137c77f61
Author: John Ralls <jralls at ceridwen.us>
Date: Thu May 2 11:28:17 2019 -0700
Fix error in gnucash extra environment.
diff --git a/jhbuildrc.in b/jhbuildrc.in
index 585efa2..4502da9 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -83,7 +83,7 @@ append_autogenargs("libdbi-drivers","--with-dbi-incdir=" + prefix + "/include --
module_makeargs["aqbanking"]="-j 1"
module_cmakeargs["gnucash-git"]="-DSWIG_DIR=" + os.path.join(_mingw_base, 'share', 'swig', '3.0.12')
-module_extra_env["gnucash"]={'GUILE_LOAD_PATH':os.path.join(prefix, 'share', 'guile', '2.2'), 'GUILE_LOAD_PATH':os.path.join(prefix, 'lib', 'guile', '2.2', 'ccache')}
-module_extra_env["gnucash-git"]={'GUILE_LOAD_PATH':os.path.join(prefix, 'share', 'guile', '2.2'), 'GUILE_LOAD_PATH':os.path.join(prefix, 'lib', 'guile', '2.2', 'ccache')}
+module_extra_env["gnucash"]={'GUILE_LOAD_PATH':os.path.join(prefix, 'share', 'guile', '2.2'), 'GUILE_LOAD_COMPILED_PATH':os.path.join(prefix, 'lib', 'guile', '2.2', 'ccache')}
+module_extra_env["gnucash-git"]={'GUILE_LOAD_PATH':os.path.join(prefix, 'share', 'guile', '2.2'), 'GUILE_LOAD_COMPILED_PATH':os.path.join(prefix, 'lib', 'guile', '2.2', 'ccache')}
module_extra_env["gwenhywfar"]={'CFLAGS': _gtk_cflags, 'LDFLAGS': _gtk_ldflags}
commit fbd83a592083f5599c09b3827c6e70cb1f815c05
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Apr 30 20:26:22 2019 -0700
Upgrade Xmlsec to 1.2.28.
Required to work with latest Mingw64 OpenSSL package.
diff --git a/gnucash.modules b/gnucash.modules
index 29b8c62..1130ae6 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -160,10 +160,10 @@
</dependencies>
</autotools>
- <autotools id="xmlsec" autogenargs="--disable-x509">
- <branch module="lsh123/xmlsec/archive/xmlsec-1_2_25.tar.gz"
- repo="github-tar" version="1.2.25"
- checkoutdir="xmlsec-xmlsec-1_2_25"/>
+ <autotools id="xmlsec" >
+ <branch module="lsh123/xmlsec/archive/xmlsec-1_2_28.tar.gz"
+ repo="github-tar" version="1.2.28"
+ checkoutdir="xmlsec-xmlsec-1_2_28"/>
<dependencies>
<dep package="openssl"/>
</dependencies>
commit e8c752fa545080c53a023d1775f966d46149a931
Author: Geert Janssens <geert at kobaltwit.be>
Date: Tue Apr 30 17:34:53 2019 +0200
Fix htmlhelp workshop installation errors
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 5f70b5f..e61916f 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -173,7 +173,7 @@ $html_help_workshop_installer = "htmlhelp.exe"
$installed_hh = get-item -path "hkcu:\SOFTWARE\Microsoft\HTML Help Workshop" | foreach-object{$_.GetValue("InstallDir")}
if (! (($installed_hh) -and (test-path -path $installed_hh))) {
- install-package -url $html_help_workshop_url -download_file "$download_dir\\$html_help_workshop_installer" -install_dir ${env:ProgramFiles(x86)} -setup_cmd $html_help_installer
+ install-package -url $html_help_workshop_url -download_file "$download_dir\\$html_help_workshop_installer" -install_dir ${env:ProgramFiles(x86)} -setup_cmd $html_help_workshop_installer
}
$hhctrl_ocx = "c:\Windows\System32\hhctrl.ocx"
if (!(test-path -path $hhctrl_ocx)) {
@@ -273,7 +273,7 @@ if (!(test-path -path $htmlhelp_h)) {
$installed_hh = get-item -path "hkcu:\SOFTWARE\Microsoft\HTML Help Workshop" | foreach-object{$_.GetValue("InstallDir")}
}
$installed_hh = make-unixpath -path $installed_hh
- if (!installed_hh) {
+ if (!$installed_hh) {
Write-Host @"
****** ERROR ****
There was an error installing HTML Help Workshop. This will prevent building the documentation. If you didn't before, run setup-mingw64.ps1 in a PowerShell instance with Administrative priviledge. If you did that already, you may need to install HTML Help Workshop by hand.
commit b64957ec7e249d82b08137dc6fa40594443ab911
Author: Geert Janssens <geert at kobaltwit.be>
Date: Tue Apr 30 14:22:29 2019 +0200
Install webkitgtk3 from direct url instead of pacman database
The package was dropped from the pacman database recently but the packages can
still be downloaded via direct url.
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index a5397bc..5f70b5f 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -80,6 +80,7 @@ $arch_long = "mingw-w64-$arch_code"
$mingw_prefix = "$arch/$arch_long-"
$mingw_path = "/$arch"
$mingw_bin = "$mingw_path/bin"
+$mingw_url_prefix = "http://repo.msys2.org/mingw/$arch_code/$arch_long-"
$env:MSYSTEM = $arch.ToUpper()
if (!(test-path -path $target_dir)) {
@@ -216,8 +217,34 @@ $toolchain = "binutils cmake crt-git gcc gcc-libs gdb headers-git libmangle-git
$clang_toolchain = "clang libc++ libc++abi lld libunwind clang-tools-extra compiler-rt"
+# webkitgtk3 was removed from the pacman database but the package is still available via direct url
+# so we install it from that url directly.
+# Note webkitgtk3 depends on icu. Icu updates require dependent packages to be rebuilt to work with the new version.
+# However as there won't be any webkitgtk3 updates, we have to peg icu to the version the last webkitgtk3
+# was built with. That also impacts other icu dependent packages: boost and harfbuzz. As we peg icu
+# we equally need to peg these two.
# Note that webkitgtk3 will pull in gtk3 automatically.
-$deps = "webkitgtk3 boost iso-codes shared-mime-info libmariadbclient postgresql ninja ncurses"
+
+Write-Host @"
+
+Now we'll install webkitgtk3 via direct url as it's no longer in the pacman database. With this we install a couple of other packages that are pegged to fixed version numbers due to how icu forces package dependencies. If the window doesn't close on its own then close it and re-run the script when it finishes.
+"@
+$direct_deps = "webkitgtk3-2.4.11-6-any.pkg.tar.xz boost-1.67.0-2-any.pkg.tar.xz harfbuzz-1.8.4-1-any.pkg.tar.xz icu-61.1-1-any.pkg.tar.xz"
+$mingw_direct_deps = make-pkgnames -prefix $mingw_url_prefix -items $direct_deps
+bash-command -command "pacman -U $mingw_direct_deps --noconfirm --needed"
+
+# Tell pacman to no longer update these manually installed packages
+$ignorefile = @"
+IgnorePkg = mingw-w64-i686-icu
+IgnorePkg = mingw-w64-i686-boost
+IgnorePkg = mingw-w64-i686-harfbuzz
+IgnorePkg = mingw-w64-i686-webkitgtk3
+"@
+[IO.File]::WriteAllLines( (join-path $target_dir (join-path "msys2" (join-path "etc" (join-path "pacman.d" "gnucash-ignores.pacman")))), $ignorefile)
+bash-command -command "perl -ibak -pe 'BEGIN{undef $/;} s#[[]options[]]\R(Include = [^\R]*\R)?#[options]\nInclude = /etc/pacman.d/gnucash-ignores.pacman\n#smg' /etc/pacman.conf"
+
+# Install the remaining dependencies.
+$deps = "iso-codes shared-mime-info libmariadbclient postgresql ninja ncurses"
Write-Host @"
@@ -230,7 +257,7 @@ $mingw_deps = make-pkgnames -prefix $mingw_prefix -items $deps
bash-command -command "pacman -S $msys_devel --noconfirm --needed"
bash-command -command "pacman -S $mingw_toolchain --noconfirm --needed"
-bash-command -command "pacman -S $mingw_deps --noconfirm --needed"
+bash-command -command "pacman -S $mingw_deps --noconfirm --needed"
$target_unix = make-unixpath $target_dir
$download_unix = make-unixpath $download_dir
commit 5d2253889e63c5a83d4764a87620e0c6f37e7917
Author: Geert Janssens <geert at kobaltwit.be>
Date: Tue Apr 30 14:21:17 2019 +0200
Deduplicate a few variable definitions
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index d99bd69..a5397bc 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -68,20 +68,20 @@ $bash_path = "$msys2_root\\usr\\bin\\bash.exe"
$progressPreference = 'silentlyContinue'
if ($x86_64) {
- $mingw_prefix = "mingw64/mingw-w64-x86_64-"
- $mingw_path = "/mingw64"
- $mingw_bin = "/mingw64/bin"
- $env:MSYSTEM = "MINGW64"
$arch = "mingw64"
+ $arch_code = "x86_64"
}
else {
- $mingw_prefix = "mingw32/mingw-w64-i686-"
- $mingw_path = "/mingw32"
- $mingw_bin = "/mingw32/bin"
- $env:MSYSTEM = "MINGW32"
$arch = "mingw32"
+ $arch_code = "i686"
}
+$arch_long = "mingw-w64-$arch_code"
+$mingw_prefix = "$arch/$arch_long-"
+$mingw_path = "/$arch"
+$mingw_bin = "$mingw_path/bin"
+$env:MSYSTEM = $arch.ToUpper()
+
if (!(test-path -path $target_dir)) {
new-item "$target_dir" -type directory
}
commit da23962d999aad3a1e248fac0ccb309b5deded8f
Author: Geert Janssens <geert at kobaltwit.be>
Date: Tue Apr 30 10:56:34 2019 +0200
Update cmake patch to version 3.14
diff --git a/patches/FindSWIG.patch b/patches/FindSWIG.patch
index 2ba7d77..fb8f236 100644
--- a/patches/FindSWIG.patch
+++ b/patches/FindSWIG.patch
@@ -1,6 +1,6 @@
- diff -u /mingw32/share/cmake-3.10/Modules/FindSWIG.cmake~ /mingw32/share/cmake-3.10/Modules/FindSWIG.cmake
---- /mingw32/share/cmake-3.12/Modules/FindSWIG.cmake 2017-08-10 06:36:32.000000000 -0700
-+++ /mingw32/share/cmake-3.12/Modules/FindSWIG.cmake 2017-09-05 10:34:59.692229400 -0700
+ diff -u /mingw32/share/cmake-3.14/Modules/FindSWIG.cmake~ /mingw32/share/cmake-3.14/Modules/FindSWIG.cmake
+--- /mingw32/share/cmake-3.14/Modules/FindSWIG.cmake 2017-08-10 06:36:32.000000000 -0700
++++ /mingw32/share/cmake-3.14/Modules/FindSWIG.cmake 2017-09-05 10:34:59.692229400 -0700
@@ -41,7 +41,7 @@
endif()
else()
commit ac4de50e27906c359c9ed4590d9dd1f5db1b7453
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Apr 26 13:45:37 2019 -0700
Fix malformed guile load path string.
diff --git a/jhbuildrc.in b/jhbuildrc.in
index 8bcc62c..585efa2 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -82,10 +82,8 @@ append_autogenargs("libofx", "--with-opensp-includes=" + prefix + "/include/Open
append_autogenargs("libdbi-drivers","--with-dbi-incdir=" + prefix + "/include --with-dbi-libdir=" + prefix + "/lib")
module_makeargs["aqbanking"]="-j 1"
module_cmakeargs["gnucash-git"]="-DSWIG_DIR=" + os.path.join(_mingw_base, 'share', 'swig', '3.0.12')
-module_makeargs["gnucash"]="-j 8"
-module_makeargs["gnucash-git"]="-j 8"
-module_extra_env["gnucash"]={'GUILE_LOAD_PATH':'$PREFIX/share/guile/2.2' 'GUILE_LOAD_COMPILED_PATH':'$PREFIX/lib/guile/2.2/ccache'}
-module_extra_env["gnucash-git"]={'GUILE_LOAD_PATH':'$PREFIX/share/guile/2.2' 'GUILE_LOAD_COMPILED_PATH':'$PREFIX/lib/guile/2.2/ccache'}
+module_extra_env["gnucash"]={'GUILE_LOAD_PATH':os.path.join(prefix, 'share', 'guile', '2.2'), 'GUILE_LOAD_PATH':os.path.join(prefix, 'lib', 'guile', '2.2', 'ccache')}
+module_extra_env["gnucash-git"]={'GUILE_LOAD_PATH':os.path.join(prefix, 'share', 'guile', '2.2'), 'GUILE_LOAD_PATH':os.path.join(prefix, 'lib', 'guile', '2.2', 'ccache')}
module_extra_env["gwenhywfar"]={'CFLAGS': _gtk_cflags, 'LDFLAGS': _gtk_ldflags}
commit 1365ad57688d328ff517d2192ea37141bd4b3bee
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Apr 25 17:20:05 2019 -0700
Set GUILE_LOAD_PATH and GUILE_LOAD_COMPILED_PATH for GnuCash build.
Removing no longer needed ACLOCAL flags and increasing parallelism
diff --git a/jhbuildrc.in b/jhbuildrc.in
index 033c8cc..8bcc62c 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -82,9 +82,10 @@ append_autogenargs("libofx", "--with-opensp-includes=" + prefix + "/include/Open
append_autogenargs("libdbi-drivers","--with-dbi-incdir=" + prefix + "/include --with-dbi-libdir=" + prefix + "/lib")
module_makeargs["aqbanking"]="-j 1"
module_cmakeargs["gnucash-git"]="-DSWIG_DIR=" + os.path.join(_mingw_base, 'share', 'swig', '3.0.12')
-module_makeargs["gnucash"]="-j 1"
-module_makeargs["gnucash-git"]="-j 1"
+module_makeargs["gnucash"]="-j 8"
+module_makeargs["gnucash-git"]="-j 8"
-module_extra_env["gnucash"]={'ACLOCAL_FLAGS':'-I' + os.path.join(_mingw_base, 'share', 'aclocal')}
+module_extra_env["gnucash"]={'GUILE_LOAD_PATH':'$PREFIX/share/guile/2.2' 'GUILE_LOAD_COMPILED_PATH':'$PREFIX/lib/guile/2.2/ccache'}
+module_extra_env["gnucash-git"]={'GUILE_LOAD_PATH':'$PREFIX/share/guile/2.2' 'GUILE_LOAD_COMPILED_PATH':'$PREFIX/lib/guile/2.2/ccache'}
module_extra_env["gwenhywfar"]={'CFLAGS': _gtk_cflags, 'LDFLAGS': _gtk_ldflags}
commit c739d231b5dc4775d40433d3148979a4a4d4c7ab
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Apr 25 14:53:28 2019 -0700
Guile 2.2 for Windows.
diff --git a/gnucash.modules b/gnucash.modules
index 04c3856..29b8c62 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -119,11 +119,9 @@
</autotools>
<!-- Unfortunately in addition to needing a few patches this hangs when it tries to compile Scheme. -->
- <autotools id="guile2" autogen-sh="autoreconf" autogenargs="--without-threads">
- <branch repo="ftp.gnu.org" module="guile/guile-2.0.14.tar.gz"
- version="2.0.14">
- <patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/patches/guile-2.0.14-mingw64-fixups.patch" strip="1"/>
- <patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/patches/guile-2.0.14-Fix-mktime-test.patch" strip="1"/>
+ <autotools id="guile2" autogen-sh="configure" autogenargs="--disable-rpath --enable-networking --enable-nls --enable-posix --enable-regex --with-threads --with-modules --disable-static">
+ <branch repo="sourceforge" module="gnucash/Dependencies/guile-2.2.4+mingw.tar.bz2"
+ version="2.2.4+mingw">
</branch>
<dependencies>
<dep package="libunistring"/>
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index b9e0678..1773175 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -67,8 +67,8 @@ Source: "@INST_DIR@\etc\@PACKAGE@\environment"; DestDir: "{app}\etc\@PACKAGE@";
; Note: The above AfterInstall function will adapt the
; environment config file on-the-fly by the Pascal script below.
Source: "@INST_DIR@\lib\*"; DestDir: "{app}\lib"; Flags: recursesubdirs; Components: main
-Source: "@INST_DIR@\lib\gnucash\scm\ccache\2.0\*"; DestDir: "{app}\lib\gnucash\scm\ccache\2.0"; Flags: recursesubdirs; Components: main
-Source: "@INST_DIR@\lib\guile\2.0\ccache\*"; DestDir: "{app}\lib\guile\2.0\ccache"; Flags: recursesubdirs; Components: main
+Source: "@INST_DIR@\lib\gnucash\scm\ccache\2.2\*"; DestDir: "{app}\lib\gnucash\scm\ccache\2.2"; Flags: recursesubdirs; Components: main
+Source: "@INST_DIR@\lib\guile\2.2\ccache\*"; DestDir: "{app}\lib\guile\2.2\ccache"; Flags: recursesubdirs; Components: main
Source: "@INST_DIR@\lib\dbd\*.dll"; DestDir: "{app}\lib"; Components: main
Source: "@INST_DIR@\lib\aqbanking\*"; DestDir: "{app}\lib\aqbanking"; Excludes: "*.dll.a"; Flags: recursesubdirs; Components: main
Source: "@INST_DIR@\lib\gwenhywfar\*"; DestDir: "{app}\lib\gwenhywfar"; Excludes: "*.dll.a"; Flags: recursesubdirs; Components: main
@@ -215,7 +215,6 @@ Source: "@MINGW_DIR@\share\themes\*"; DestDir: "{app}\share\themes"; Flags: recu
Source: "@MINGW_DIR@\share\xml\iso-codes\*"; DestDir: "{app}\share\xml\iso-codes"; Flags: recursesubdirs; Components: main
Source: "@MINGW_DIR@\share\xml\fontconfig\*"; DestDir: "{app}\share\xml\fontconfig"; Flags: recursesubdirs; Components: main
-Source: "@MINGW_DIR@\etc\gtk-2.0\*"; Destdir: "{app}\etc\gtk-2.0"; Flags: recursesubdirs; Components: main
Source: "@MINGW_DIR@\etc\gtk-3.0\*"; Destdir: "{app}\etc\gtk-3.0"; Flags: recursesubdirs; Components: main
Source: "@MINGW_DIR@\etc\fonts\*"; DestDir: "{app}\etc\fonts"; Flags: recursesubdirs; Components: main
@@ -431,7 +430,7 @@ begin
{ Create the guile.cmd file; #10 is the linefeed character and #13 CR }
FileName := appdir + '\bin\guile.cmd' ;
- FileString := 'set GUILE_LOAD_PATH=' + pkgdatadir + '\scm;' + appdir + '\share\guile\2.0;%GUILE_LOAD_PATH%'#13#10 ;
+ FileString := 'set GUILE_LOAD_PATH=' + pkgdatadir + '\scm;' + appdir + '\share\guile\2.2;%GUILE_LOAD_PATH%'#13#10 ;
FileString := FileString + 'start guile.exe %*'#13#10 ;
{ Save the final file }
@@ -476,7 +475,7 @@ begin
{ Adapt GUILE_LOAD_PATH parameter and prevent cygwin interference in SCHEME_LIBRARY_PATH }
if (Pos('GUILE_LOAD_PATH', EnvStrList[iLineCounter]) = 1) then
begin
- StringChangeEx(EnvStrList[iLineCounter], '{GUILE_LOAD_PATH}', '{GNC_HOME}/share/guile/2.0;{GUILE_LOAD_PATH}', True);
+ StringChangeEx(EnvStrList[iLineCounter], '{GUILE_LOAD_PATH}', '{GNC_HOME}/share/guile/2.2;{GUILE_LOAD_PATH}', True);
EnvStrList[iLineCounter] := EnvStrList[iLineCounter] + #13#10 + '# Clear SCHEME_LIBRARY_PATH to prevent interference from other guile installations (like cygwin)' + #13#10;
EnvStrList[iLineCounter] := EnvStrList[iLineCounter] + 'SCHEME_LIBRARY_PATH=' + #13#10;
commit fe22df601c6d5b181db35052c5b17ce3e70fd417
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Apr 21 10:16:35 2019 -0700
Change handling of html help workshop installation failure.
Instead of bailing out, print a more detailed error and continue with
the rest of the script.
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 4bb4061..d99bd69 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -246,13 +246,20 @@ if (!(test-path -path $htmlhelp_h)) {
$installed_hh = get-item -path "hkcu:\SOFTWARE\Microsoft\HTML Help Workshop" | foreach-object{$_.GetValue("InstallDir")}
}
$installed_hh = make-unixpath -path $installed_hh
- bash-command -command "cp $installed_hh/include/htmlhelp.h $mingw_path/include"
+ if (!installed_hh) {
+ Write-Host @"
+****** ERROR ****
+There was an error installing HTML Help Workshop. This will prevent building the documentation. If you didn't before, run setup-mingw64.ps1 in a PowerShell instance with Administrative priviledge. If you did that already, you may need to install HTML Help Workshop by hand.
+****************
+"@
+ } else {
+ bash-command -command "cp $installed_hh/include/htmlhelp.h $mingw_path/include"
- bash-command -command "$mingw_bin/gendef $hhctrl_ocx - > $mingw_path/lib/htmlhelp.def"
- bash-command -command "$mingw_bin/dlltool -k -d $mingw_path/lib/htmlhelp.def -l $mingw_path/lib/libhtmlhelp.a"
+ bash-command -command "$mingw_bin/gendef $hhctrl_ocx - > $mingw_path/lib/htmlhelp.def"
+ bash-command -command "$mingw_bin/dlltool -k -d $mingw_path/lib/htmlhelp.def -l $mingw_path/lib/libhtmlhelp.a"
+ }
if (!(test-path -path $htmlhelp_h)) {
Write-Host "HTML Help Workshop isn't correctly installed."
- exit
}
}
Write-Host @"
commit fa0ddaff6b6ccc8f94e10bfb5ecec5fd70686fba
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Apr 8 15:52:43 2019 -0700
Update the Bugzilla URL for the Report a GnuCash Bug Start Menu item.
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index e8c21a9..b9e0678 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -44,7 +44,7 @@ Name: menuicon; Description: "{cm:CreateMenuLink}"; GroupDescription: "{cm:Addit
Name: "{group}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "%USERDOCS%"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: menuicon
Name: "{group}\{cm:IconName_README}"; Filename: "{app}\doc\@PACKAGE@\{cm:IconFilename_README}"; Comment: "{cm:IconComment_README}"; Tasks: menuicon
Name: "{group}\{cm:IconName_FAQ}"; Filename: "http://wiki.gnucash.org/wiki/FAQ"; Tasks: menuicon
-Name: "{group}\{cm:IconName_Bugzilla}"; Filename: "http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash"; Tasks: menuicon
+Name: "{group}\{cm:IconName_Bugzilla}"; Filename: "https://bugs.gnucash.org/enter_bug.cgi?product=GnuCash"; Tasks: menuicon
Name: "{group}\{cm:IconName_InstallFQ}"; Filename: "{app}\bin\install-fq-mods.cmd"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_InstallFQ}"; Tasks: menuicon
Name: "{group}\{cm:IconName_Uninstall}"; Filename: "{uninstallexe}"; Comment: "{cm:IconComment_Uninstall}"; Tasks: menuicon
commit 0ba3a0afa26f50f87a00e38a61eac5ebc1516877
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Apr 7 13:11:09 2019 -0700
Update strawberry perl version to the latest recommended on the website.
diff --git a/extra_dist/getperl.vbs b/extra_dist/getperl.vbs
index 7d66c65..4e2d542 100644
--- a/extra_dist/getperl.vbs
+++ b/extra_dist/getperl.vbs
@@ -9,7 +9,7 @@ Dim fso: Set fso = CreateObject("Scripting.FileSystemObject")
Dim tempFolder: tempFolder = fso.GetSpecialFolder(TemporaryFolder)
strHDLocation = Wscript.Arguments.Item(0)
-strVersion = "5.28.0.1"
+strVersion = "5.28.1.1"
' Set your settings
strFileURL = "http://strawberryperl.com/download/" & strVersion & "/strawberry-perl-" & strVersion & "-32bit.msi"
commit 5d6f7db24d46e91f168855ce20308f4f42878e1d
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Apr 7 13:08:44 2019 -0700
Bug 797178 - 3.5 install-fq-mods.cmd requires ssleay32.dll, but it's...
no longer installed as part of GnuCash
Because it's obsolete. Remove the check from install-fq-mods.cmd.
diff --git a/extra_dist/install-fq-mods.cmd b/extra_dist/install-fq-mods.cmd
index d704321..c007430 100644
--- a/extra_dist/install-fq-mods.cmd
+++ b/extra_dist/install-fq-mods.cmd
@@ -1,14 +1,6 @@
@echo off
setlocal
-REM ----------------------------------------------------------------------------
-if not exist ssleay32.dll (
- echo.
- echo Did not find ssleay32.dll in current directory.
- echo Please start this cmd file in the bin directory created by the setup.exe.
- goto error
-)
-
REM ----------------------------------------------------------------------------
echo.
echo * Check Perl
commit 1a89d04bce64efb428462efd934b8a7555f8738c
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Mar 21 16:43:49 2019 -0700
Use %USERDOCS% for unpack working dir instead of GetDocPath.
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 8548578..e8c21a9 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -41,17 +41,17 @@ Name: desktopicon; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm
Name: menuicon; Description: "{cm:CreateMenuLink}"; GroupDescription: "{cm:AdditionalIcons}"
[Icons]
-Name: "{group}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "{code:GetDocPath}"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: menuicon
+Name: "{group}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "%USERDOCS%"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: menuicon
Name: "{group}\{cm:IconName_README}"; Filename: "{app}\doc\@PACKAGE@\{cm:IconFilename_README}"; Comment: "{cm:IconComment_README}"; Tasks: menuicon
Name: "{group}\{cm:IconName_FAQ}"; Filename: "http://wiki.gnucash.org/wiki/FAQ"; Tasks: menuicon
Name: "{group}\{cm:IconName_Bugzilla}"; Filename: "http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash"; Tasks: menuicon
Name: "{group}\{cm:IconName_InstallFQ}"; Filename: "{app}\bin\install-fq-mods.cmd"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_InstallFQ}"; Tasks: menuicon
Name: "{group}\{cm:IconName_Uninstall}"; Filename: "{uninstallexe}"; Comment: "{cm:IconComment_Uninstall}"; Tasks: menuicon
-Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "{code:GetDocPath}"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: desktopicon
+Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "%USERDOCS%"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: desktopicon
[Run]
-Filename: "{app}\bin\@PACKAGE at .exe"; Description: "{cm:RunPrg}"; WorkingDir: "{code:GetDocPath}"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent
+Filename: "{app}\bin\@PACKAGE at .exe"; Description: "{cm:RunPrg}"; WorkingDir: "%USERDOCS%"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent
Filename: "{app}\bin\guile.cmd"; Flags: runhidden
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index a92405f..4bb4061 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -214,6 +214,7 @@ $devel = "asciidoc autoconf autoconf2.13 autogen automake-wrapper automake1.10 a
$toolchain = "binutils cmake crt-git gcc gcc-libs gdb headers-git libmangle-git libtool libwinpthread-git make pkg-config tools-git winpthreads-git"
+$clang_toolchain = "clang libc++ libc++abi lld libunwind clang-tools-extra compiler-rt"
# Note that webkitgtk3 will pull in gtk3 automatically.
$deps = "webkitgtk3 boost iso-codes shared-mime-info libmariadbclient postgresql ninja ncurses"
commit 53b1c6038401b0817957397f2035387d3d9e66ed
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Mar 30 16:54:24 2019 -0700
Fix missing quote
diff --git a/gnucash.modules b/gnucash.modules
index 879e670..04c3856 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -275,7 +275,7 @@
<cmake id="gnucash"
cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DCOMPILE_GSCHEMAS=OFF"
use-ninja="False">
- <branch repo="sourceforge" module=project/gnucash/gnucash%20%28stable%29/3.5/gnucash-3.5.tar.bz2"
+ <branch repo="sourceforge" module="project/gnucash/gnucash%20%28stable%29/3.5/gnucash-3.5.tar.bz2"
version="3.5"/>
<dependencies>
<dep package="libofx"/>
commit a0abdd53d97bdaf9d518e42a0932dd4bd1d6bf8c
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Mar 30 16:45:53 2019 -0700
Correct spelling of project.
diff --git a/gnucash.modules b/gnucash.modules
index 6fb1bc9..879e670 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -275,7 +275,7 @@
<cmake id="gnucash"
cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DCOMPILE_GSCHEMAS=OFF"
use-ninja="False">
- <branch repo="sourceforge" module=projects/gnucash/gnucash%20%28stable%29/3.5/gnucash-3.5.tar.bz2"
+ <branch repo="sourceforge" module=project/gnucash/gnucash%20%28stable%29/3.5/gnucash-3.5.tar.bz2"
version="3.5"/>
<dependencies>
<dep package="libofx"/>
@@ -321,7 +321,7 @@
<autotools id="gnucash-docs"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
makeargs="chm" makeinstallargs="install-chm" >
- <branch module="projects/gnucash/gnucash%20%28stable%29/3.5/gnucash-docs-3.5.tar.gz"
+ <branch module="project/gnucash/gnucash%20%28stable%29/3.5/gnucash-docs-3.5.tar.gz"
version="3.5" repo="sourceforge"/>
</autotools>
commit f6edb30dbad2e6c75ce80c6e7742dfa825b1e80f
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Mar 30 15:30:53 2019 -0700
Release GnuCash 3.5
diff --git a/gnucash.modules b/gnucash.modules
index 648a6db..6fb1bc9 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -275,8 +275,8 @@
<cmake id="gnucash"
cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DCOMPILE_GSCHEMAS=OFF"
use-ninja="False">
- <branch repo="sourceforge" module="gnucash/stable/gnucash-3.4.tar.bz2"
- version="3.4"/>
+ <branch repo="sourceforge" module=projects/gnucash/gnucash%20%28stable%29/3.5/gnucash-3.5.tar.bz2"
+ version="3.5"/>
<dependencies>
<dep package="libofx"/>
<dep package="aqbanking"/>
@@ -321,8 +321,8 @@
<autotools id="gnucash-docs"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
makeargs="chm" makeinstallargs="install-chm" >
- <branch module="gnucash/gnucash-docs/gnucash-docs-3.4.tar.gz"
- version="3.4" repo="sourceforge"/>
+ <branch module="projects/gnucash/gnucash%20%28stable%29/3.5/gnucash-docs-3.5.tar.gz"
+ version="3.5" repo="sourceforge"/>
</autotools>
<metamodule id="meta-gnucash-git">
commit bf11501af926098ff0c82fbe30baccad56ee6784
Author: Christian Stimming <christian at cstimming.de>
Date: Wed Feb 13 11:46:56 2019 +0100
Remove ktoblzcheck dependency.
diff --git a/cmake/defaults.cmake b/cmake/defaults.cmake
index d1b02f0..a85754c 100644
--- a/cmake/defaults.cmake
+++ b/cmake/defaults.cmake
@@ -355,10 +355,6 @@ SET (GWENHYWFAR_VERSION "4.15.3")
set (GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=201&file=01&dummy gwenhywfar-4.15.3.tar.gz")
set (GWENHYWFAR_DIR ${GLOBAL_DIR}/gwenhywfar)
-SET (KTOBLZCHECK_VERSION "1.48")
-set (KTOBLZCHECK_URL "${SF_MIRROR}/ktoblzcheck/ktoblzcheck-${KTOBLZCHECK_VERSION}.tar.gz")
-# ktoblzcheck is being installed into GWENHYWFAR_DIR
-
SET (AQBANKING_VERSION "5.6.10")
## NB: Dummy means dummy! The important value in the following url is
## the release number, not the file name at the end!
diff --git a/crossbuild_webkit.sh b/crossbuild_webkit.sh
index a1e51dc..fd51dd5 100755
--- a/crossbuild_webkit.sh
+++ b/crossbuild_webkit.sh
@@ -30,8 +30,6 @@ register_env_var HH_LDFLAGS " "
register_env_var INTLTOOL_PERL " "
register_env_var LIBDBI_CPPFLAGS " "
register_env_var LIBDBI_LDFLAGS " "
-register_env_var KTOBLZCHECK_CPPFLAGS " "
-register_env_var KTOBLZCHECK_LDFLAGS " "
register_env_var PATH ":"
register_env_var PCRE_CPPFLAGS " "
register_env_var PCRE_LDFLAGS " "
diff --git a/defaults.sh b/defaults.sh
index 3d00fa6..1546752 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -354,10 +354,6 @@ GWENHYWFAR_VERSION="4.18.0"
set_default GWENHYWFAR_URL "https://www.aquamaniac.de/sites/download/download.php?package=01&release=206&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
-KTOBLZCHECK_VERSION="1.49"
-set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-${KTOBLZCHECK_VERSION}.tar.gz"
-# ktoblzcheck is being installed into GWENHYWFAR_DIR
-
AQBANKING_VERSION="5.7.6beta"
## NB: Dummy means dummy! The important value in the following url is
## the release number, not the file name at the end!
diff --git a/dist-impl.sh b/dist-impl.sh
index 240dafb..da18387 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -176,12 +176,6 @@ function dist_isocodes() {
cp -a $_ISOCODES_UDIR/share/{locale,xml} $_DIST_UDIR/share
}
-function dist_ktoblzcheck() {
- setup ktoblzcheck
- # dll is already copied in dist_gwenhywfar
- cp -a ${_GWENHYWFAR_UDIR}/share/ktoblzcheck ${_DIST_UDIR}/share
-}
-
function dist_libdbi() {
setup LibDBI
cp -a ${_SQLITE3_UDIR}/bin/* ${_DIST_UDIR}/bin
diff --git a/dist.sh b/dist.sh
index b4886f6..4d56fbc 100755
--- a/dist.sh
+++ b/dist.sh
@@ -34,7 +34,6 @@ add_step dist_goffice
add_step dist_libofx
add_step dist_gnutls
add_step dist_gwenhywfar
-add_step dist_ktoblzcheck
add_step dist_aqbanking
add_step dist_libdbi
add_step dist_webkit
diff --git a/gnucash.modules b/gnucash.modules
index fba91cb..648a6db 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -162,11 +162,6 @@
</dependencies>
</autotools>
- <autotools id="ktoblzcheck" autogen-sh="configure">
- <branch module="ktoblzcheck/ktoblzcheck-1.47.tar.gz" version="1.47"
- repo="sourceforge"/>
- </autotools>
-
<autotools id="xmlsec" autogenargs="--disable-x509">
<branch module="lsh123/xmlsec/archive/xmlsec-1_2_25.tar.gz"
repo="github-tar" version="1.2.25"
@@ -184,7 +179,6 @@
<dependencies>
<dep package="gwenhywfar"/>
<dep package="gmp"/>
- <dep package="ktoblzcheck"/>
<dep package="xmlsec"/>
<dep package="libchipcard"/>
</dependencies>
@@ -199,7 +193,6 @@
<dep package="libofx"/>
<dep package="gwenhywfar-svn"/>
<dep package="gmp"/>
- <dep package="ktoblzcheck"/>
<dep package="xmlsec"/>
<dep package="libchipcard"/>
</dependencies>
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index a18afaa..8548578 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -79,7 +79,6 @@ Source: "@INST_DIR@\share\@PACKAGE@\*"; DestDir: "{app}\share\@PACKAGE@"; Flags:
Source: "@INST_DIR@\share\aqbanking\*"; DestDir: "{app}\share\aqbanking"; Flags: recursesubdirs; Components: main
Source: "@INST_DIR@\share\gwenhywfar\*"; DestDir: "{app}\share\gwenhywfar"; Flags: recursesubdirs; Components: main
Source: "@INST_DIR@\share\chipcard\*"; DestDir: "{app}\share\chipcard"; Flags: recursesubdirs; Components: main
-Source: "@INST_DIR@\share\ktoblzcheck\*"; DestDir: "{app}\share\ktoblzcheck"; Flags: recursesubdirs; Components: main
Source: "@INST_DIR@\share\guile\*"; DestDir: "{app}\share\guile"; Flags: recursesubdirs; Components: main
Source: "@INST_DIR@\share\glib-2.0\*"; DestDir: "{app}\share\glib-2.0"; Flags: recursesubdirs; Components: main
Source: "@INST_DIR@\share\libofx\*"; DestDir: "{app}\share\libofx"; Flags: recursesubdirs; Components: main
diff --git a/install-impl.sh b/install-impl.sh
index f688d16..18baa4e 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -290,8 +290,8 @@ function inst_aqbanking() {
patch -p1 < $AQB_PATCH
fi
- _AQ_CPPFLAGS="-I${_LIBOFX_UDIR}/include ${KTOBLZCHECK_CPPFLAGS} ${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS} -I${_GWENHYWFAR_UDIR}/include/gwenhywfar4"
- _AQ_LDFLAGS="-L${_LIBOFX_UDIR}/lib ${KTOBLZCHECK_LDFLAGS} ${GNOME_LDFLAGS} ${GNUTLS_LDFLAGS}"
+ _AQ_CPPFLAGS="-I${_LIBOFX_UDIR}/include ${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS} -I${_GWENHYWFAR_UDIR}/include/gwenhywfar4"
+ _AQ_LDFLAGS="-L${_LIBOFX_UDIR}/lib ${GNOME_LDFLAGS} ${GNUTLS_LDFLAGS}"
if test x$CROSS_COMPILE = xyes; then
XMLMERGE="xmlmerge"
else
@@ -704,33 +704,6 @@ function inst_isocodes() {
fi
}
-function inst_ktoblzcheck() {
- setup Ktoblzcheck
- # Out of convenience ktoblzcheck is being installed into
- # GWENHYWFAR_DIR
- add_to_env "-I${_GWENHYWFAR_UDIR}/include" KTOBLZCHECK_CPPFLAGS
- add_to_env "-L${_GWENHYWFAR_UDIR}/lib" KTOBLZCHECK_LDFLAGS
- if quiet ${PKG_CONFIG} --exact-version=${KTOBLZCHECK_VERSION} ktoblzcheck
- then
- echo "Ktoblzcheck ${KTOBLZCHECK_VERSION} already installed in $_GWENHYWFAR_UDIR. skipping."
- else
- wget_unpacked $KTOBLZCHECK_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/ktoblzcheck-*
- qpushd $TMP_UDIR/ktoblzcheck-*
- # circumvent binreloc bug, http://trac.autopackage.org/ticket/28
- ./configure ${HOST_XCOMPILE} \
- --prefix=${_GWENHYWFAR_UDIR} \
- --disable-binreloc \
- --disable-python
- make
-# [ "$CROSS_COMPILE" != "yes" ] && make check
- make install
- qpopd
- ${PKG_CONFIG} --exists ktoblzcheck || die "Ktoblzcheck not installed correctly"
- rm -rf ${TMP_UDIR}/ktoblzcheck-*
- fi
-}
-
function inst_libdbi() {
setup LibDBI
_SQLITE3_UDIR=`unix_path ${SQLITE3_DIR}`
@@ -1482,8 +1455,8 @@ function inst_gnucash() {
${AQBANKING_OPTIONS} \
--enable-binreloc \
--enable-locale-specific-tax \
- CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GUILE_CPPFLAGS} ${LIBDBI_CPPFLAGS} ${KTOBLZCHECK_CPPFLAGS} ${HH_CPPFLAGS} ${LIBSOUP_CPPFLAGS} -D_WIN32 ${EXTRA_CFLAGS}" \
- LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} ${HH_LDFLAGS} -L${_SQLITE3_UDIR}/lib -L${_ENCHANT_UDIR}/lib -L${_LIBXSLT_UDIR}/lib" \
+ CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GUILE_CPPFLAGS} ${LIBDBI_CPPFLAGS} ${HH_CPPFLAGS} ${LIBSOUP_CPPFLAGS} -D_WIN32 ${EXTRA_CFLAGS}" \
+ LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${HH_LDFLAGS} -L${_SQLITE3_UDIR}/lib -L${_ENCHANT_UDIR}/lib -L${_LIBXSLT_UDIR}/lib" \
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
make
diff --git a/install.sh b/install.sh
index 883ad44..04396fd 100644
--- a/install.sh
+++ b/install.sh
@@ -42,8 +42,6 @@ register_env_var INTLTOOL_PERL " "
register_env_var LIBDBI_CPPFLAGS " "
register_env_var LIBDBI_LDFLAGS " "
register_env_var LIBXSLT_LDFLAGS " "
-register_env_var KTOBLZCHECK_CPPFLAGS " "
-register_env_var KTOBLZCHECK_LDFLAGS " "
register_env_var PATH ":"
register_env_var PCRE_CPPFLAGS " "
register_env_var PCRE_LDFLAGS " "
@@ -91,7 +89,6 @@ add_step inst_opensp
add_step inst_libofx
## Online banking:
add_step inst_gwenhywfar
-add_step inst_ktoblzcheck
add_step inst_aqbanking
add_step inst_libdbi
commit f83a219478fbbcf636198bf0f4751fff250355ae
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Feb 11 15:45:50 2019 -0800
Bug 797081 - OFX Import drops long memo strings if the memo is followed...
directly with a proprietary tag on the same line.
Fixed in libofx, this commit uses it for the Windows build.
diff --git a/gnucash.modules b/gnucash.modules
index 93c36f1..fba91cb 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -222,8 +222,8 @@
</autotools>
<autotools id="libofx" autogen-sh='autoreconf'>
- <branch repo="sourceforge" module="libofx/libofx-0.9.13.tar.gz"
- version="0.9.13"/>
+ <branch repo="sourceforge" module="libofx/libofx-0.9.14.tar.gz"
+ version="0.9.14"/>
<dependencies>
<dep package="OpenSP"/>
</dependencies>
commit 598e01e926712b1bd5aa37bfe6f5c57f25d763a2
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat Jan 12 16:04:21 2019 +0100
Bug 797036 - Runtime Error During 3.4 Upgrade
allusersprofile is not (or not any more) an internal constant of the Inno Setup compiler
So expand it as an environment variable instead.
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 6add9cb..a18afaa 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -511,14 +511,14 @@ begin
try
// first try to expand the {userdocs} folder; if this raises that
// internal exception, you'll fall down to the except block where
- // you expand the {allusersprofile}
+ // you expand the {%allusersprofile}
Folder := ExpandConstant('{userdocs}');
// the {userdocs} folder expanding succeded, so let's test if the
- // folder exists and if not, expand {allusersprofile}
+ // folder exists and if not, expand {%allusersprofile}
if not DirExists(Folder) then
- Folder := ExpandConstant('{allusersprofile}');
+ Folder := ExpandConstant('{%allusersprofile}');
except
- Folder := ExpandConstant('{allusersprofile}');
+ Folder := ExpandConstant('{%allusersprofile}');
end;
// return the result
Result := Folder;
commit 7ac93fe12789a6718c3741c9419b3146bd5b0a58
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Jan 3 16:27:38 2019 -0800
Update bundle to correspond to Mingw64 updates.
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index aa02c18..6add9cb 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -127,10 +127,11 @@ Source: "@MINGW_DIR@\bin\libbz2-1.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libcairo-2.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libcairo-gobject-2.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libcroco-0.6-3.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libcrypto-1_1.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libdatrie-1.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libdbus-1-3.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libdbus-glib-1-2.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\libeay32.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\libenchant.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libenchant-2.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libepoxy-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libexpat-1.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libffi-6.dll"; DestDir: "{app}\bin"; Components: main
@@ -168,7 +169,6 @@ Source: "@MINGW_DIR@\bin\libiconv-2.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libicudt*.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libicuin*.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libicuuc*.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\libidn-11.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libidn2-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libintl-8.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libjavascriptcoregtk-3.0-0.dll"; DestDir: "{app}\bin"; Components: main
@@ -186,11 +186,14 @@ Source: "@MINGW_DIR@\bin\libpixman-1-0.dll"; DestDir: "{app}\bin"; Components: m
Source: "@MINGW_DIR@\bin\libpcre-1.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libpng16-16.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libpq.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libpsl-5.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\librsvg-2-2.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libsoup-2.4-1.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libsqlite3-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libssl-1_1.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libsystre-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libtasn1-6.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libthai-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libtre-5.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libwebp-7.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libwebkitgtk-3.0-0.dll"; DestDir: "{app}\bin"; Components: main
@@ -198,7 +201,6 @@ Source: "@MINGW_DIR@\bin\libwinpthread-1.dll"; DestDir: "{app}\bin"; Components:
Source: "@MINGW_DIR@\bin\libxml2-2.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libxslt-1.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\mariadb.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\ssleay32.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\zlib1.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\gspawn-win32-helper.exe"; DestDir: "{app}\bin"; Components: main
@@ -207,7 +209,7 @@ Source: "@MINGW_DIR@\bin\gspawn-win32-helper-console.exe"; DestDir: "{app}\bin";
Source: "@MINGW_DIR@\lib\gdk-pixbuf-2.0\2.10.0\loaders\*.dll"; DestDir: "{app}\lib\gdk-pixbuf-2.0\2.10.0\loaders"; Components: main
Source: "@MINGW_DIR@\lib\gdk-pixbuf-2.0\2.10.0\loaders.cache"; DestDir: "{app}\lib\gdk-pixbuf-2.0\2.10.0\"; Components: main
Source: "@MINGW_DIR@\lib\postgresql\*.dll"; DestDir: "{app}\lib\postgreql"; Components: main
-Source: "@MINGW_DIR@\lib\sqlite3.21.0\sqlite3210.dll"; DestDir: "{app}\lib\sqlite3.21.0"; Components: main
+Source: "@MINGW_DIR@\lib\sqlite3.25.3\sqlite3253.dll"; DestDir: "{app}\lib\sqlite3.21.0"; Components: main
Source: "@MINGW_DIR@\share\icons\*"; DestDir: "{app}\share\icons"; Flags: recursesubdirs; Components: main
Source: "@MINGW_DIR@\share\themes\*"; DestDir: "{app}\share\themes"; Flags: recursesubdirs; Components: main
commit e05728784cc4880417f63c9ae41441b5945926fd
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Dec 30 09:12:00 2018 -0800
Release GnuCash 3.4
diff --git a/gnucash.modules b/gnucash.modules
index de94227..93c36f1 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -282,8 +282,8 @@
<cmake id="gnucash"
cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DCOMPILE_GSCHEMAS=OFF"
use-ninja="False">
- <branch repo="sourceforge" module="gnucash/stable/gnucash-3.3.tar.bz2"
- version="3.3"/>
+ <branch repo="sourceforge" module="gnucash/stable/gnucash-3.4.tar.bz2"
+ version="3.4"/>
<dependencies>
<dep package="libofx"/>
<dep package="aqbanking"/>
@@ -328,8 +328,8 @@
<autotools id="gnucash-docs"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
makeargs="chm" makeinstallargs="install-chm" >
- <branch module="gnucash/gnucash-docs/gnucash-docs-3.3.tar.gz"
- version="3.3" repo="sourceforge"/>
+ <branch module="gnucash/gnucash-docs/gnucash-docs-3.4.tar.gz"
+ version="3.4" repo="sourceforge"/>
</autotools>
<metamodule id="meta-gnucash-git">
commit ecb4f165efa1f984920001f77e66cd23c077f6b4
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Dec 9 11:48:58 2018 -0800
Update msys2 tarballs to latest.
The 2016 ones don't work anymore.
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 41a6eb6..a92405f 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -128,8 +128,8 @@ function make-unixpath([string]$path) {
# Install MSYS2 for the current machine's architechture.
if (!(test-path -path $bash_path)) {
- $mingw64_installer32 = "http://repo.msys2.org/distrib/i686/msys2-i686-20161025.exe"
- $mingw64_installer64 = "http://repo.msys2.org/distrib/x86_64/msys2-x86_64-20161025.exe"
+ $mingw64_installer32 = "http://repo.msys2.org/distrib/i686/msys2-i686-20180531.exe"
+ $mingw64_installer64 = "http://repo.msys2.org/distrib/x86_64/msys2-x86_64-20180531.exe"
$mingw64_installer_file = "$download_dir\msys2.exe"
$mingw64_installer = If ([IntPtr]::size -eq 4) {$mingw64_installer32} Else {$mingw64_installer64}
commit 14dd470045f4d780a2a0ba8a68aa0b81f64ea93e
Merge: b7ba832 3892893
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu Nov 15 15:01:16 2018 +0100
Merge branch 'finance-quote_v1' of https://github.com/jannick0/gnucash-on-windows
The commit updating the outdated version of strawberry perl conflicted
with a similar commit by jralls. I have chosen to stick with jralls'
version as it separates the version string from the url which is
easier to maintain in the future.
commit b7ba832245743b1ec20369a6dab51b16fdb015fd
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Sep 29 16:44:49 2018 -0700
Release GnuCash 3.3.
diff --git a/gnucash.modules b/gnucash.modules
index a818d26..de94227 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -282,8 +282,8 @@
<cmake id="gnucash"
cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DCOMPILE_GSCHEMAS=OFF"
use-ninja="False">
- <branch repo="sourceforge" module="gnucash/stable/gnucash-3.2.tar.bz2"
- version="3.2"/>
+ <branch repo="sourceforge" module="gnucash/stable/gnucash-3.3.tar.bz2"
+ version="3.3"/>
<dependencies>
<dep package="libofx"/>
<dep package="aqbanking"/>
@@ -328,8 +328,8 @@
<autotools id="gnucash-docs"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
makeargs="chm" makeinstallargs="install-chm" >
- <branch module="gnucash/gnucash-docs/gnucash-docs-3.2.tar.gz"
- version="3.2" repo="sourceforge"/>
+ <branch module="gnucash/gnucash-docs/gnucash-docs-3.3.tar.gz"
+ version="3.3" repo="sourceforge"/>
</autotools>
<metamodule id="meta-gnucash-git">
commit 81ab3b3516c488502c6efd3894103908ebabbc46
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Sep 28 15:14:16 2018 -0700
Bug 791725 - [Finance::Quote] update hardcoded download link...
of strawberry perl in getperl.vbs
diff --git a/extra_dist/getperl.vbs b/extra_dist/getperl.vbs
index 07ceaa0..7d66c65 100644
--- a/extra_dist/getperl.vbs
+++ b/extra_dist/getperl.vbs
@@ -9,13 +9,13 @@ Dim fso: Set fso = CreateObject("Scripting.FileSystemObject")
Dim tempFolder: tempFolder = fso.GetSpecialFolder(TemporaryFolder)
strHDLocation = Wscript.Arguments.Item(0)
+strVersion = "5.28.0.1"
' Set your settings
- strFileURL = "http://strawberryperl.com/download/5.18.2.2/strawberry-perl-5.18.2.2-32bit.msi"
+ strFileURL = "http://strawberryperl.com/download/" & strVersion & "/strawberry-perl-" & strVersion & "-32bit.msi"
Wscript.Echo " copying " & strFileURL
Wscript.Echo " to " & strHDLocation
-
' Fetch the file
Set objXMLHTTP = CreateObject("MSXML2.XMLHTTP")
commit 4ba69dcd96f307cd54f06c9d2a1310c8ae419116
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Sep 17 14:48:05 2018 -0700
Update the FindSWIG patch to match the current version of CMake installed by MSys2.
diff --git a/patches/FindSWIG.patch b/patches/FindSWIG.patch
index 4278502..2ba7d77 100644
--- a/patches/FindSWIG.patch
+++ b/patches/FindSWIG.patch
@@ -1,6 +1,6 @@
diff -u /mingw32/share/cmake-3.10/Modules/FindSWIG.cmake~ /mingw32/share/cmake-3.10/Modules/FindSWIG.cmake
---- /mingw32/share/cmake-3.10/Modules/FindSWIG.cmake~ 2017-08-10 06:36:32.000000000 -0700
-+++ /mingw32/share/cmake-3.10/Modules/FindSWIG.cmake 2017-09-05 10:34:59.692229400 -0700
+--- /mingw32/share/cmake-3.12/Modules/FindSWIG.cmake 2017-08-10 06:36:32.000000000 -0700
++++ /mingw32/share/cmake-3.12/Modules/FindSWIG.cmake 2017-09-05 10:34:59.692229400 -0700
@@ -41,7 +41,7 @@
endif()
else()
commit bc708c6b3d2b02900e8cd83672fb976b98ac407b
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Sep 17 14:47:26 2018 -0700
Build the branch for gnucash-docs-git.
diff --git a/jhbuildrc.in b/jhbuildrc.in
index 27a84cf..033c8cc 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -74,6 +74,7 @@ if _branch == 'releases':
else:
modules = ["meta-gnucash-git"]
branches['gnucash-git'] = (None, _branch)
+ branches['gnucash-docs-git'] = (None, _branch)
_gtk_cflags = _popen("pkg-config --cflags gtk+-3.0")
_gtk_ldflags= _popen("pkg-config --libs gtk+-3.0")
commit da0a8ff11db766004083bdc15b3c6d5f2e109541
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Jun 24 15:13:20 2018 -0700
Release GnuCash 3.2.
diff --git a/gnucash.modules b/gnucash.modules
index 6775395..a818d26 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -282,8 +282,8 @@
<cmake id="gnucash"
cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DCOMPILE_GSCHEMAS=OFF"
use-ninja="False">
- <branch repo="sourceforge" module="gnucash/stable/gnucash-3.1.tar.bz2"
- version="3.1"/>
+ <branch repo="sourceforge" module="gnucash/stable/gnucash-3.2.tar.bz2"
+ version="3.2"/>
<dependencies>
<dep package="libofx"/>
<dep package="aqbanking"/>
@@ -328,8 +328,8 @@
<autotools id="gnucash-docs"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
makeargs="chm" makeinstallargs="install-chm" >
- <branch module="gnucash/gnucash-docs/gnucash-docs-3.1.tar.gz"
- version="3.1" repo="sourceforge"/>
+ <branch module="gnucash/gnucash-docs/gnucash-docs-3.2.tar.gz"
+ version="3.2" repo="sourceforge"/>
</autotools>
<metamodule id="meta-gnucash-git">
commit 9169b3ea4befe565b3dbe35f291f94bcb394a463
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Jun 7 12:16:34 2018 -0700
Remove extra UTF-8 BOM from gnucash.iss.
diff --git a/inno_setup/gnucash.iss b/inno_setup/gnucash.iss
index 8a81fcf..615f690 100644
--- a/inno_setup/gnucash.iss
+++ b/inno_setup/gnucash.iss
@@ -1,4 +1,4 @@
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Input configuration for the Inno Setup Compiler
; Copyright (c) 2004-2005 Christian Stimming <stimming at tuhh.de>
;
commit da073de4959206c2f13e285caa7823261e312629
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Jun 5 17:09:13 2018 -0700
Bug 796432 - chinese not show correctly in intall
The gnucash*.iss files need a UTF8 BOM because Microsoft says so.
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 3f1afb3..aa02c18 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -1,4 +1,4 @@
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Input configuration for the Inno Setup Compiler
; Copyright (c) 2004-2005 Christian Stimming <stimming at tuhh.de>
; Copyright 2017 John Ralls <jralls at ceridwen.us>
@@ -530,11 +530,11 @@ Name: "el"; MessagesFile: "compiler:Languages\Greek.isl"
Name: "fr"; MessagesFile: "compiler:Languages\French.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-fr.win32-bin.txt"
Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-it.win32-bin.txt"
Name: "ja"; MessagesFile: "compiler:Languages\Japanese.isl"
-Name: "lv"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Latvian5.5.0.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-lv.win32-bin.txt"
+Name: "lv"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Latvian-5.5.0.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-lv.win32-bin.txt"
Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-nl.win32-bin.txt"
Name: "pt_BR"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
Name: "zh_CN"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\ChineseSimplified-5.5.3.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"
-Name: "zh_TW"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\ChineseTrad-5.5.3.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"
+Name: "zh_TW"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\ChineseTraditional-5.5.3.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"
;; See http://www.jrsoftware.org/files/istrans/ for a complete list of
;; Inno Setup translations. Unofficial translations must be downloaded
diff --git a/inno_setup/gnucash.iss b/inno_setup/gnucash.iss
index 37d9b54..8a81fcf 100644
--- a/inno_setup/gnucash.iss
+++ b/inno_setup/gnucash.iss
@@ -1,4 +1,4 @@
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Input configuration for the Inno Setup Compiler
; Copyright (c) 2004-2005 Christian Stimming <stimming at tuhh.de>
;
@@ -406,7 +406,7 @@ Name: "lv"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Latvian-5.5.0.isl"; Inf
Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-nl.win32-bin.txt"
Name: "pt_BR"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
Name: "zh_CN"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\ChineseSimplified-5.5.3.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"
-Name: "zh_TW"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\ChineseTrad-5.5.3.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"
+Name: "zh_TW"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\ChineseTraditional-5.5.3.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"
;; See http://www.jrsoftware.org/files/istrans/ for a complete list of
;; Inno Setup translations. Unofficial translations must be downloaded
commit e5f0222203551a6e4d7764993f8da1afeaddd1d4
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Jun 5 15:20:58 2018 -0700
--amend
diff --git a/inno_setup/gnucash.iss b/inno_setup/gnucash.iss
index 250d6d5..37d9b54 100644
--- a/inno_setup/gnucash.iss
+++ b/inno_setup/gnucash.iss
@@ -405,7 +405,7 @@ Name: "ja"; MessagesFile: "compiler:Languages\Japanese.isl"
Name: "lv"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Latvian-5.5.0.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-lv.win32-bin.txt"
Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-nl.win32-bin.txt"
Name: "pt_BR"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
-Name: "zh_CN"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\ChineseSimp-5.5.3.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"
+Name: "zh_CN"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\ChineseSimplified-5.5.3.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"
Name: "zh_TW"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\ChineseTrad-5.5.3.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"
;; See http://www.jrsoftware.org/files/istrans/ for a complete list of
commit b45cd16b422209fc4ceb403dffba1f58df831b36
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Jun 5 15:20:45 2018 -0700
--amend
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 63e1c3b..3f1afb3 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -533,7 +533,7 @@ Name: "ja"; MessagesFile: "compiler:Languages\Japanese.isl"
Name: "lv"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Latvian5.5.0.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-lv.win32-bin.txt"
Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-nl.win32-bin.txt"
Name: "pt_BR"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
-Name: "zh_CN"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\ChineseSimp-5.5.3.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"
+Name: "zh_CN"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\ChineseSimplified-5.5.3.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"
Name: "zh_TW"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\ChineseTrad-5.5.3.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"
;; See http://www.jrsoftware.org/files/istrans/ for a complete list of
commit c01d13e1088d59108a09d3fd2962cc6330ab0e4b
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Jun 5 15:20:01 2018 -0700
Update Latvian and Chinese Inno Setup translations from http://www.jrsoftware.org/files/istrans/.
diff --git a/inno_setup/ChineseSimp-12-5.1.11.isl b/inno_setup/ChineseSimp-12-5.1.11.isl
deleted file mode 100644
index 5f54e3e..0000000
--- a/inno_setup/ChineseSimp-12-5.1.11.isl
+++ /dev/null
@@ -1,320 +0,0 @@
-; *** Inno Setup version 5.1.11+ Simplified Chinese messages ***
-;
-; Based on previous version by Peng Bai
-; Update by Mack Zhang (hua_wuxin at 21cn.com) on Apr. 10, 2008
-;
-; To download user-contributed translations of this file, go to:
-; http://www.jrsoftware.org/files/istrans/
-;
-; Note: When translating this text, do not add periods (.) to the end of
-; messages that didn't have them already, because on those messages Inno
-; Setup adds the periods automatically (appending a period would result in
-; two periods being displayed).
-
-[LangOptions]
-; The following three entries are very important. Be sure to read and
-; understand the '[LangOptions] section' topic in the help file.
-LanguageName=Chinese(Simplified)
-LanguageID=$0804
-LanguageCodePage=936
-; If the language you are translating to requires special font faces or
-; sizes, uncomment any of the following entries and change them accordingly.
-DialogFontName=ËÎÌå
-DialogFontSize=9
-;WelcomeFontName=Verdana
-;WelcomeFontSize=12
-;TitleFontName=Arial
-;TitleFontSize=29
-;CopyrightFontName=Arial
-;CopyrightFontSize=8
-
-[Messages]
-
-; *** Application titles
-SetupAppTitle=°²×°Ïòµ¼
-SetupWindowTitle=°²×°Ïòµ¼ - %1
-UninstallAppTitle=жÔØÏòµ¼
-UninstallAppFullTitle=%1 жÔØÏòµ¼
-
-; *** Misc. common
-InformationTitle=ÐÅÏ¢
-ConfirmTitle=È·ÈÏ
-ErrorTitle=´íÎó
-
-; *** SetupLdr messages
-SetupLdrStartupMessage=°²×°Ïòµ¼½«ÔÚÄãµÄµçÄÔÉÏ°²×° %1¡£ÄãÈ·¶¨Òª¼ÌÐøÂð£¿
-LdrCannotCreateTemp=ÎÞ·¨´´½¨ÁÙʱÎļþ¡£°²×°ÖÐÖ¹
-LdrCannotExecTemp=ÎÞ·¨ÔËÐÐÁÙʱÎļþ¼ÐÖеÄÎļþ¡£°²×°ÖÐÖ¹
-
-; *** Startup error messages
-LastErrorMessage=%1.%n%n´íÎó %2£º%3
-SetupFileMissing=°²×°Îļþ¼ÐȱÉÙÎļþ %1¡£Çë¾ÀÕý´ËÎÊÌâ»òÕßË÷È¡Èí¼þµÄа汾¡£
-SetupFileCorrupt=°²×°ÎļþÒÑË𻵡£ÇëË÷È¡Èí¼þµÄа汾¡£
-SetupFileCorruptOrWrongVer=°²×°ÎļþÒÑË𻵣¬»òÕßÓë´Ë°²×°Ïòµ¼µÄ°æ±¾²»¼æÈÝ¡£Çë¾ÀÕý´ËÎÊÌâ»òÕßË÷È¡Èí¼þµÄа汾¡£
-NotOnThisPlatform=´Ë³ÌÐò²»ÄÜÔÚ %1 ÉÏÔËÐС£
-OnlyOnThisPlatform=´Ë³ÌÐò±ØÐëÔÚ %1 ÉÏÔËÐС£
-OnlyOnTheseArchitectures=´Ë³ÌÐòÖ»ÄÜ°²×°ÔÚΪÏÂÁд¦ÀíÆ÷¼Ü¹¹Éè¼ÆµÄ Windows °æ±¾ÖУº%n%n%1
-MissingWOW64APIs=µ±Ç°µÄ Windows °æ±¾Ã»Óаüº¬Ö´ÐÐ 64 λ°²×°Ïòµ¼ËùÐèµÄº¯Êý¡£ÈôÒª¾ÀÕý´ËÎÊÌ⣬Çë°²×° Service Pack %1¡£
-WinVersionTooLowError=´Ë³ÌÐòÐèÒª %1 v%2 »ò¸ü¸ß°æ±¾¡£
-WinVersionTooHighError=´Ë³ÌÐò²»ÄÜ°²×°ÔÚ %1 v%2 »ò¸ü¸ß°æ±¾ÉÏ¡£
-AdminPrivilegesRequired=°²×°´Ë³ÌÐòʱÄã±ØÐëÒÔ¹ÜÀíÔ±Éí·ÝµÇ¼¡£
-PowerUserPrivilegesRequired=°²×°´Ë³ÌÐòʱÄã±ØÐëÒÔ¹ÜÀíÔ±»ò Power Users ×é³ÉÔ±µÄÉí·ÝµÇ¼¡£
-SetupAppRunningError=°²×°Ïòµ¼·¢ÏÖ %1 ÕýÔÚÔËÐС£%n%nÇëÁ¢¼´¹Ø±ÕÆäËùÓÐʵÀý£¬È»ºóµ¥»÷¡°È·¶¨¡±¼ÌÐø£¬»òµ¥»÷¡°È¡Ïû¡±Í˳ö¡£
-UninstallAppRunningError=жÔسÌÐò·¢ÏÖ %1 ÕýÔÚÔËÐС£%n%nÇëÁ¢¼´¹Ø±ÕÆäËùÓÐʵÀý£¬È»ºóµ¥»÷¡°È·¶¨¡±¼ÌÐø£¬»òµ¥»÷¡°È¡Ïû¡±Í˳ö¡£
-
-; *** Misc. errors
-ErrorCreatingDir=°²×°Ïòµ¼ÎÞ·¨´´½¨Îļþ¼Ð¡°%1¡±
-ErrorTooManyFilesInDir=ÎÞ·¨ÔÚÎļþ¼Ð¡°%1¡±Öд´½¨Îļþ£¬ÒòΪËü°üº¬ÁËÌ«¶àÎļþ
-
-; *** Setup common messages
-ExitSetupTitle=Í˳ö°²×°
-ExitSetupMessage=°²×°ÉÐδÍê³É¡£Èç¹ûÄãÏÖÔÚÍ˳ö£¬Èí¼þ½«²»»á°²×°¡£%n%nÄã¿ÉÒÔÔÚÆäËüʱ¼äÖØÐÂÔËÐа²×°Ïòµ¼À´Íê³É°²×°¡£%n%nÏÖÔÚÍ˳ö°²×°Âð£¿
-AboutSetupMenuItem=¹ØÓÚ°²×°Ïòµ¼(&A)...
-AboutSetupTitle=¹ØÓÚ°²×°Ïòµ¼
-AboutSetupMessage=%1 °æ±¾ %2%n%3%n%n%1 Ö÷Ò³£º%n%4
-AboutSetupNote=
-TranslatorNote=
-
-; *** Buttons
-ButtonBack=< ÉÏÒ»²½(&B)
-ButtonNext=ÏÂÒ»²½(&N) >
-ButtonInstall=°²×°(&I)
-ButtonOK=È·¶¨
-ButtonCancel=È¡Ïû
-ButtonYes=ÊÇ(&Y)
-ButtonYesToAll=È«ÊÇ(&A)
-ButtonNo=·ñ(&N)
-ButtonNoToAll=È«·ñ(&O)
-ButtonFinish=Íê³É(&F)
-ButtonBrowse=ä¯ÀÀ(&B)...
-ButtonWizardBrowse=ä¯ÀÀ(&R)...
-ButtonNewFolder=´´½¨Îļþ¼Ð(&M)
-
-; *** "Select Language" dialog messages
-SelectLanguageTitle=Ñ¡Ôñ°²×°ÓïÑÔ
-SelectLanguageLabel=Ñ¡Ôñ°²×°ÆÚ¼äҪʹÓõÄÓïÑÔ£º
-
-; *** Common wizard text
-ClickNext=µ¥»÷¡°ÏÂÒ»²½¡±¼ÌÐø£¬»òµ¥»÷¡°È¡Ïû¡±Í˳ö°²×°¡£
-BeveledLabel=
-BrowseDialogTitle=ä¯ÀÀÎļþ¼Ð
-BrowseDialogLabel=Ñ¡ÔñÒ»¸öÎļþ¼Ð£¬È»ºóµ¥»÷¡°È·¶¨¡±¡£
-NewFolderName=н¨Îļþ¼Ð
-
-; *** "Welcome" wizard page
-WelcomeLabel1=»¶ÓʹÓà [name] °²×°Ïòµ¼
-WelcomeLabel2=°²×°Ïòµ¼½«ÔÚÄãµÄµçÄÔÉÏ°²×° [name/ver]¡£%n%n½¨ÒéÄãÔÚ¼ÌÐø֮ǰ¹Ø±ÕËùÓÐÆäËüÓ¦ÓóÌÐò¡£
-
-; *** "Password" wizard page
-WizardPassword=ÃÜÂë
-PasswordLabel1=´Ë°²×°Ïòµ¼ÓÐÃÜÂë±£»¤¡£
-PasswordLabel3=ÇëÊäÈëÃÜÂ룬Ȼºóµ¥»÷¡°ÏÂÒ»²½¡±½øÈëÏÂÒ»²½¡£ÃÜÂëÇø·Ö´óСд¡£
-PasswordEditLabel=ÃÜÂë(&P)£º
-IncorrectPassword=ÄãÊäÈëµÄÃÜÂë²»ÕýÈ·¡£ÇëÖØÊÔ¡£
-
-; *** "License Agreement" wizard page
-WizardLicense=Ðí¿ÉÐÒé
-LicenseLabel=ÇëÔÚ¼ÌÐø֮ǰÔĶÁÒÔÏÂÖØÒªÐÅÏ¢¡£
-LicenseLabel3=ÇëÔĶÁÒÔÏÂÐí¿ÉÐÒé¡£ÔÚ¼ÌÐø°²×°Ö®Ç°£¬Äã±ØÐë½ÓÊÜ´ËÐÒéµÄÌõ¿î¡£
-LicenseAccepted=ÎÒ½ÓÊÜÐÒé(&A)
-LicenseNotAccepted=ÎÒ²»½ÓÊÜÐÒé(&D)
-
-; *** "Information" wizard pages
-WizardInfoBefore=ÐÅÏ¢
-InfoBeforeLabel=ÇëÔÚ¼ÌÐø֮ǰÔĶÁÒÔÏÂÖØÒªÐÅÏ¢¡£
-InfoBeforeClickLabel=µ±Äã×¼±¸ºÃ¼ÌÐø°²×°ºó£¬Çëµ¥»÷¡°ÏÂÒ»²½¡±¡£
-WizardInfoAfter=ÐÅÏ¢
-InfoAfterLabel=ÇëÔÚ¼ÌÐø֮ǰÔĶÁÒÔÏÂÖØÒªÐÅÏ¢¡£
-InfoAfterClickLabel=µ±Äã×¼±¸ºÃ¼ÌÐø°²×°ºó£¬Çëµ¥»÷¡°ÏÂÒ»²½¡±¡£
-
-; *** "User Information" wizard page
-WizardUserInfo=Óû§ÐÅÏ¢
-UserInfoDesc=ÇëÊäÈëÄãµÄÐÅÏ¢¡£
-UserInfoName=Óû§Ãû(&U)£º
-UserInfoOrg=×éÖ¯(&O)£º
-UserInfoSerial=ÐòÁкÅ(&S)£º
-UserInfoNameRequired=±ØÐëÊäÈëÓû§Ãû¡£
-
-; *** "Select Destination Location" wizard page
-WizardSelectDir=Ñ¡ÔñÄ¿±êλÖÃ
-SelectDirDesc=½« [name] °²×°µ½ÄÄÀ
-SelectDirLabel3=°²×°Ïòµ¼½«°Ñ [name] °²×°µ½ÒÔÏÂÎļþ¼ÐÖС£
-SelectDirBrowseLabel=ÈôÒª¼ÌÐø£¬µ¥»÷¡°ÏÂÒ»²½¡±¡£Èç¹ûÄãҪѡÔñ²»Í¬µÄÎļþ¼Ð£¬Çëµ¥»÷¡°ä¯ÀÀ¡±¡£
-DiskSpaceMBLabel=ÖÁÉÙÐèÒª [mb] MB µÄ¿ÕÏдÅÅ̿ռ䡣
-ToUNCPathname=°²×°Ïòµ¼²»ÄÜ°²×°µ½ UNC ·¾¶¡£Èç¹ûÄãÊÇҪͨ¹ýÍøÂç°²×°£¬ÇëÓ³ÉäÍøÂçÇý¶¯Æ÷¡£
-InvalidPath=Äã±ØÐëÊäÈë´øÓÐÅÌ·ûµÄÍêÕû·¾¶¡£ÀýÈ磺%n%nC:\APP%n%n»òÕß UNC ·¾¶¸ñʽ£º%n%n\\server\share
-InvalidDrive=ÄãÑ¡ÔñµÄÇý¶¯Æ÷»ò UNC ¹²Ïí²»´æÔÚ»ò²»¿É·ÃÎÊ¡£ÇëÖØÐÂÑ¡Ôñ¡£
-DiskSpaceWarningTitle=ûÓÐ×ã¹»µÄ´ÅÅÌ¿Õ¼ä
-DiskSpaceWarning=°²×°Ïòµ¼ÖÁÉÙÐèÒª %1 KB µÄÊ£Óà¿Õ¼ä£¬µ«ÊÇËùÑ¡Çý¶¯Æ÷Ö»ÓÐ %2 KB ¿ÉÓá£%n%nÄãÎÞÂÛÈçºÎÒ²Òª¼ÌÐøÂð£¿
-DirNameTooLong=Îļþ¼ÐÃû³Æ»ò·¾¶Ì«³¤¡£
-InvalidDirName=Îļþ¼ÐÃû³ÆÎÞЧ¡£
-BadDirName32=Îļþ¼ÐÃû³Æ²»ÄÜ°üº¬ÏÂÁÐ×Ö·û£º%n%n%1
-DirExistsTitle=Îļþ¼ÐÒÑ´æÔÚ
-DirExists=Îļþ¼Ð£º%n%n%1%n%nÒÑ´æÔÚ¡£ÄãÈ·¶¨Òª°²×°µ½¸ÃÎļþ¼ÐÂð£¿
-DirDoesntExistTitle=Îļþ¼Ð²»´æÔÚ
-DirDoesntExist=Îļþ¼Ð£º%n%n%1%n%n²»´æÔÚ¡£´´½¨¸ÃÎļþ¼ÐÂð£¿
-
-; *** "Select Components" wizard page
-WizardSelectComponents=Ñ¡Ôñ×é¼þ
-SelectComponentsDesc=Òª°²×°ÄÄЩ×é¼þ£¿
-SelectComponentsLabel2=ÇëÑ¡ÔñÄãÒª°²×°µÄ×é¼þ£¬Çå³ýÄã²»Ïë°²×°µÄ×é¼þ¡£×¼±¸ºÃºóµã»÷¡°ÏÂÒ»²½¡±¡£
-FullInstallation=ÍêÕû°²×°
-; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
-CompactInstallation=¼ò½à°²×°
-CustomInstallation=¶¨ÖÆ°²×°
-NoUninstallWarningTitle=×é¼þÒÑ´æÔÚ
-NoUninstallWarning=°²×°Ïòµ¼·¢ÏÖÏÂÁÐ×é¼þÒѾ°²×°£º%n%n%1%n%nÈ¡ÏûÑ¡¶¨²»»áжÔØÕâЩ×é¼þ¡£%n%n¼ÌÐø°²×°Âð£¿
-ComponentSize1=%1 KB
-ComponentSize2=%1 MB
-ComponentsDiskSpaceMBLabel=µ±Ç°µÄÑ¡ÔñÖÁÉÙÐèÒª [mb] MB ´ÅÅ̿ռ䡣
-
-; *** "Select Additional Tasks" wizard page
-WizardSelectTasks=Ñ¡Ôñ¸½¼ÓÈÎÎñ
-SelectTasksDesc=ÒªÖ´ÐÐÄÄЩ¸½¼ÓÈÎÎñ£¿
-SelectTasksLabel2=ÇëÑ¡ÔñÔÚ°²×° [name] Æڼ䰲װÏòµ¼ÒªÖ´Ðеĸ½¼ÓÈÎÎñ£¬È»ºóµã»÷¡°ÏÂÒ»²½¡±¡£
-
-; *** "Select Start Menu Folder" wizard page
-WizardSelectProgramGroup=Ñ¡Ôñ¿ªÊ¼²Ëµ¥Îļþ¼Ð
-SelectStartMenuFolderDesc=°Ñ³ÌÐò¿ì½Ý·½Ê½·Åµ½ÄÄÀ
-SelectStartMenuFolderLabel3=°²×°Ïòµ¼½«ÔÚÒÔÏ¿ªÊ¼²Ëµ¥Îļþ¼ÐÖд´½¨³ÌÐò¿ì½Ý·½Ê½¡£
-SelectStartMenuFolderBrowseLabel=µã»÷¡°ÏÂÒ»²½¡±½øÈëÏÂÒ»²½¡£Èç¹ûÄãҪѡÔñ²»Í¬µÄÎļþ¼Ð£¬Çëµã»÷¡°ä¯ÀÀ¡±¡£
-MustEnterGroupName=Äã±ØÐëÊäÈëÎļþ¼ÐÃû³Æ
-GroupNameTooLong=Îļþ¼ÐÃû³Æ»ò·¾¶Ì«³¤
-InvalidGroupName=Îļþ¼ÐÃû³ÆÎÞЧ
-BadGroupName=Îļþ¼ÐÃû³Æ²»ÄÜ°üº¬ÏÂÁÐ×Ö·û£º%n%n%1
-NoProgramGroupCheck2=½ûÖ¹´´½¨¿ªÊ¼²Ëµ¥Îļþ¼Ð(&D)
-
-; *** "Ready to Install" wizard page
-WizardReady=×¼±¸°²×°
-ReadyLabel1=°²×°Ïòµ¼ÏÖÔÚ×¼±¸¿ªÊ¼°²×° [name]¡£
-ReadyLabel2a=µã»÷¡°°²×°¡±¼ÌÐø°²×°£¬Èç¹ûÄãÏëÒª²é¿´»òÕ߸ü¸ÄÉèÖÃÇëµã»÷¡°ÉÏÒ»²½¡±¡£
-ReadyLabel2b=µã»÷¡°°²×°¡±¼ÌÐø°²×°¡£
-ReadyMemoUserInfo=Óû§ÐÅÏ¢£º
-ReadyMemoDir=Ä¿±êλÖãº
-ReadyMemoType=°²×°ÀàÐÍ£º
-ReadyMemoComponents=ËùÑ¡×é¼þ£º
-ReadyMemoGroup=¿ªÊ¼²Ëµ¥Îļþ¼Ð£º
-ReadyMemoTasks=¸½¼ÓÈÎÎñ£º
-
-; *** "Preparing to Install" wizard page
-WizardPreparing=ÕýÔÚ×¼±¸°²×°
-PreparingDesc=°²×°Ïòµ¼ÕýÔÚ×¼±¸°²×° [name]¡£
-PreviousInstallNotCompleted=ÏÈÇ°³ÌÐòµÄ°²×°/жÔØÉÐδÍê³É¡£ÄãÐèÒªÖØÆôµçÄÔÀ´Íê³É°²×°¡£%n%nµçÄÔÖØÆôÖ®ºó£¬ÇëÖØÐÂÔËÐа²×°Ïòµ¼À´Íê³É [name] µÄ°²×°¡£
-CannotContinue=°²×°Ïòµ¼²»ÄܼÌÐø¡£Çëµã»÷¡°È¡Ïû¡±Í˳ö¡£
-
-; *** "Installing" wizard page
-WizardInstalling=ÕýÔÚ°²×°
-InstallingLabel=ÕýÔÚÄãµÄ¼ÆËã»úÖа²×° [name]£¬ÇëÉÔµÈ...
-
-; *** "Setup Completed" wizard page
-FinishedHeadingLabel=Íê³É [name] °²×°
-FinishedLabelNoIcons=°²×°Ïòµ¼ÒÑÍê³É [name] µÄ°²×°¡£
-FinishedLabel=°²×°Ïòµ¼ÒÑÍê³É [name] µÄ°²×°¡£¿ÉÒÔͨ¹ýÑ¡ÔñÒÑ°²×°µÄͼ±êÀ´ÔËÐÐÓ¦ÓóÌÐò¡£
-ClickFinish=µã»÷¡°Íê³É¡±Í˳ö°²×°¡£
-FinishedRestartLabel=ΪÁËÍê³É [name] µÄ°²×°£¬°²×°Ïòµ¼±ØÐëÖØÆôµçÄÔ¡£ÄãÒªÁ¢¼´ÖØÆôÂð£¿
-FinishedRestartMessage=ΪÁËÍê³É [name] µÄ°²×°£¬°²×°Ïòµ¼±ØÐëÖØÆôµçÄÔ¡£%n%nÄãÒªÁ¢¼´ÖØÆôÂð£¿
-ShowReadmeCheck=ÊÇ£¬ÎÒÒª²é¿´×ÔÊöÎļþ
-YesRadio=ÊÇ£¬Á¢¼´ÖØÆôµçÄÔ(&Y)
-NoRadio=·ñ£¬ÉÔºóÖØÆôµçÄÔ(&N)
-; used for example as 'Run MyProg.exe'
-RunEntryExec=ÔËÐÐ %1
-; used for example as 'View Readme.txt'
-RunEntryShellExec=²é¿´ %1
-
-; *** "Setup Needs the Next Disk" stuff
-ChangeDiskTitle=°²×°Ïòµ¼ÐèÒªÏÂÒ»¸ö´ÅÅÌ
-SelectDiskLabel2=Çë²åÈë´ÅÅÌ %1 ²¢µã»÷¡°È·¶¨¡±¡£%n%nÈç¹ûÔÚ³ýÁËÏÂÃæÏÔʾµÄÎļþ¼ÐÒÔÍâµÄÎļþ¼ÐÖÐÕÒ²»µ½¸Ã´ÅÅÌÉϵÄÎļþ£¬¾ÍÇëÊäÈëÕýÈ·µÄ·¾¶»òµã»÷¡°ä¯ÀÀ¡±¡£
-PathLabel=·¾¶(&P)£º
-FileNotInDir2=Îļþ¡°%1¡±²»ÔÚ¡°%2¡±ÖС£Çë²åÈëÕýÈ·µÄ´ÅÅÌ»òÑ¡ÔñÆäËûÎļþ¼Ð¡£
-SelectDirectoryLabel=ÇëÖ¸¶¨ÏÂÒ»¸ö´ÅÅ̵ÄλÖá£
-
-; *** Installation phase messages
-SetupAborted=°²×°ÉÐδÍê³É¡£%n%nÇë¾ÀÕýÎÊÌâ²¢ÖØÐÂÔËÐа²×°Ïòµ¼¡£
-EntryAbortRetryIgnore=µã»÷¡°ÖØÊÔ¡±ÖØг¢ÊÔ£¬µã»÷¡°ºöÂÔ¡±¼ÌÐø°²×°£¬»òµã»÷¡°ÖÐÖ¹¡±È¡Ïû°²×°¡£
-
-; *** Installation status messages
-StatusCreateDirs=ÕýÔÚ´´½¨Îļþ¼Ð...
-StatusExtractFiles=ÕýÔÚÌáÈ¡Îļþ...
-StatusCreateIcons=ÕýÔÚ´´½¨¿ì½Ý·½Ê½...
-StatusCreateIniEntries=ÕýÔÚ´´½¨ INI ÏîÄ¿...
-StatusCreateRegistryEntries=ÕýÔÚ´´½¨×¢²á±íÏîÄ¿...
-StatusRegisterFiles=ÕýÔÚ×¢²áÎļþ...
-StatusSavingUninstall=ÕýÔÚ±£´æжÔØÐÅÏ¢...
-StatusRunProgram=ÕýÔÚÍê³É°²×°...
-StatusRollback=ÕýÔڻعö¸ü¸Ä...
-
-; *** Misc. errors
-ErrorInternal2=ÄÚ²¿´íÎó£º%1
-ErrorFunctionFailedNoCode=%1 ʧ°Ü
-ErrorFunctionFailed=%1 ʧ°Ü¡£´úÂë %2
-ErrorFunctionFailedWithMessage=%1 ʧ°Ü¡£´úÂë %2¡£%n%3
-ErrorExecutingProgram=ÎÞ·¨Ö´ÐÐÎļþ£º%n%1
-
-; *** Registry errors
-ErrorRegOpenKey=´ò¿ª×¢²á±í¼üʱ³ö´í£º%n%1\%2
-ErrorRegCreateKey=´´½¨×¢²á±í¼üʱ³ö´í£º%n%1\%2
-ErrorRegWriteKey=дÈë×¢²á±í¼üʱ³ö´í£º%n%1\%2
-
-; *** INI errors
-ErrorIniEntry=ÔÚÎļþ¡°%1¡±Öд´½¨ INI ÏîĿʱ³ö´í¡£
-
-; *** File copying errors
-FileAbortRetryIgnore=µã»÷¡°ÖØÊÔ¡±ÖØг¢ÊÔ£¬µã»÷¡°ºöÂÔ¡±Ìø¹ý´ËÎļþ (²»ÍƼö)£¬»òµã»÷¡°ÖÐÖ¹¡±È¡Ïû°²×°¡£
-FileAbortRetryIgnore2=µã»÷¡°ÖØÊÔ¡±ÖØг¢ÊÔ£¬µã»÷¡°ºöÂÔ¡±¼ÌÐø°²×° (²»ÍƼö)£¬»òµã»÷¡°ÖÐÖ¹¡±È¡Ïû°²×°¡£
-SourceIsCorrupted=Ô´ÎļþÒÑËð»µ
-SourceDoesntExist=Ô´Îļþ¡°%1¡±²»´æÔÚ
-ExistingFileReadOnly=ÏÖÓÐÎļþΪֻ¶Á¡£%n%nµã»÷¡°ÖØÊÔ¡±ÒƳýÖ»¶ÁÊôÐÔ²¢ÖØÊÔ£¬µã»÷¡°ºöÂÔ¡±Ìø¹ý´ËÎļþ£¬»òµã»÷¡°ÖÐÖ¹¡±È¡Ïû°²×°¡£
-ErrorReadingExistingDest=¶ÁÈ¡ÏÖÓÐÎļþʱ·¢Éú´íÎó£º
-FileExists=ÎļþÒÑ´æÔÚ¡£%n%nÄãÒª¸²¸ÇËüÂð£¿
-ExistingFileNewer=ÏÖÓÐÎļþ±È°²×°Ïòµ¼Òª°²×°µÄ»¹Ð¡£½¨ÒéÄã±£ÁôÏÖÓÐÎļþ¡£%n%n±£ÁôÏÖÓÐÎļþÂð£¿
-ErrorChangingAttr=¸ü¸ÄÏÖÓÐÎļþµÄÊôÐÔʱ·¢Éú´íÎó£º
-ErrorCreatingTemp=ÔÚÄ¿±êÎļþ¼ÐÖд´½¨Îļþʱ·¢Éú´íÎó£º
-ErrorReadingSource=¶ÁÈ¡Ô´Îļþʱ·¢Éú´íÎó£º
-ErrorCopying=¸´ÖÆÎļþʱ·¢Éú´íÎó£º
-ErrorReplacingExistingFile=Ìæ»»ÏÖÓÐÎļþʱ·¢Éú´íÎó£º
-ErrorRestartReplace=ÖØÆôºóÌ滻ʧ°Ü£º
-ErrorRenamingTemp=ÖØÃüÃûÄ¿±êÎļþ¼ÐÖеÄÎļþʱ·¢Éú´íÎó£º
-ErrorRegisterServer=ÎÞ·¨×¢²á DLL/OCX£º%1
-ErrorRegSvr32Failed=RegSvr32 ʧ°Ü¡£·µ»ØÖµ£º%1
-ErrorRegisterTypeLib=ÎÞ·¨×¢²áÀàÐͿ⣺%1
-
-; *** Post-installation errors
-ErrorOpeningReadme=´ò¿ª×ÔÊöÎļþʱ·¢Éú´íÎó¡£
-ErrorRestartingComputer=°²×°Ïòµ¼ÎÞ·¨ÖØÆôµçÄÔ¡£ÇëÊÖ¶¯ÖØÆô¡£
-
-; *** Uninstaller messages
-UninstallNotFound=Îļþ¡°%1¡±²»´æÔÚ¡£²»ÄÜжÔØ¡£
-UninstallOpenError=Îļþ¡°%1¡±²»ÄÜ´ò¿ª¡£²»ÄÜжÔØ
-UninstallUnsupportedVer=жÔØÈÕÖ¾Îļþ¡°%1¡±µÄ¸ñʽ²»Äܱ»´Ë°æ±¾µÄжÔسÌÐòʶ±ð¡£²»ÄÜжÔØ
-UninstallUnknownEntry=жÔØÈÕÖ¾ÖÐÓöµ½Ò»¸öδ֪µÄÏîÄ¿ (%1)
-ConfirmUninstall=ÄãÊÇ·ñÈ·¶¨ÒªÍêȫɾ³ý %1 ¼°ÆäËùÓÐ×é¼þ£¿
-UninstallOnlyOnWin64=´Ë°²×°Ö»ÄÜÔÚ 64 λ Windows ÉÏжÔØ¡£
-OnlyAdminCanUninstall=´Ë°²×°Ö»ÄÜÓɾ߱¸¹ÜÀíԱȨÏÞµÄÓû§Ð¶ÔØ¡£
-UninstallStatusLabel=ÕýÔÚɾ³ý %1£¬ÇëÉÔµÈ...
-UninstalledAll=%1 Òѳɹ¦É¾³ý¡£
-UninstalledMost=%1 жÔØÍê³É¡£%n%nijЩÏîÄ¿²»ÄÜɾ³ý£¬¿ÉÒÔÊÖ¶¯É¾³ý¡£
-UninstalledAndNeedsRestart=ÈôÒªÍê³É %1 µÄжÔØ£¬±ØÐëÖØÆôµçÄÔ¡£%n%nÄãÒªÁ¢¼´ÖØÆôÂð£¿
-UninstallDataCorrupted=Îļþ¡°%1¡±ÒÑË𻵡£²»ÄÜжÔØ
-
-; *** Uninstallation phase messages
-ConfirmDeleteSharedFileTitle=ɾ³ý¹²ÏíÎļþÂð£¿
-ConfirmDeleteSharedFile2=ÏÂÁй²ÏíÎļþ²»ÔÙ±»ÈκγÌÐòʹÓá£ÄãҪɾ³ý¸Ã¹²ÏíÎļþÂð£¿%n%nÈç¹û»¹ÓгÌÐòʹÓøÃÎļþ¶øËüÒѱ»É¾³ý£¬ÕâЩ³ÌÐò¿ÉÄÜÎÞ·¨Õý³£ÔËÐС£Èç¹ûÄ㲻ȷ¶¨£¬¾ÍÇëÑ¡Ôñ¡°·ñ¡±¡£ÁôϸÃÎļþ²»»á¶ÔϵͳÔì³ÉÈκÎΣº¦¡£
-SharedFileNameLabel=ÎļþÃû£º
-SharedFileLocationLabel=λÖãº
-WizardUninstalling=жÔØ״̬
-StatusUninstalling=ÕýÔÚжÔØ %1...
-
-; The custom messages below aren't used by Setup itself, but if you make
-; use of them in your scripts, you'll want to translate them.
-
-[CustomMessages]
-
-NameAndVersion=%1 °æ±¾ %2
-AdditionalIcons=¸½¼Óͼ±ê£º
-CreateDesktopIcon=´´½¨×ÀÃæͼ±ê(&D)
-CreateQuickLaunchIcon=´´½¨¿ìËÙÆô¶¯À¸Í¼±ê(&Q)
-ProgramOnTheWeb=%1 ÍøÕ¾
-UninstallProgram=жÔØ %1
-LaunchProgram=ÔËÐÐ %1
-AssocFileExtension=½« %1 Óë %2 ÎļþÀ©Õ¹Ãû¹ØÁª(&A)
-AssocingFileExtension=ÕýÔÚ½« %1 Óë %2 ÎļþÀ©Õ¹Ãû¹ØÁª...
diff --git a/inno_setup/ChineseSimplified-5.5.3.isl b/inno_setup/ChineseSimplified-5.5.3.isl
new file mode 100644
index 0000000..6029850
--- /dev/null
+++ b/inno_setup/ChineseSimplified-5.5.3.isl
@@ -0,0 +1,337 @@
+; *** Inno Setup version 5.5.3+ Chinese (Simplified) messages ***
+; By Qiming Li (qiming at clault.com)
+;
+; To download user-contributed translations of this file, go to:
+; http://www.jrsoftware.org/files/istrans/
+;
+; Note: When translating this text, do not add periods (.) to the end of
+; messages that didn't have them already, because on those messages Inno
+; Setup adds the periods automatically (appending a period would result in
+; two periods being displayed).
+
+[LangOptions]
+; The following three entries are very important. Be sure to read and
+; understand the '[LangOptions] section' topic in the help file.
+LanguageName=<4E2D><6587><FF08><7B80><4F53><FF09>
+LanguageID=$0804
+LanguageCodePage=936
+; If the language you are translating to requires special font faces or
+; sizes, uncomment any of the following entries and change them accordingly.
+DialogFontName=ËÎÌå
+;DialogFontSize=8
+;WelcomeFontName=Verdana
+;WelcomeFontSize=12
+;TitleFontName=Arial
+;TitleFontSize=29
+;CopyrightFontName=Arial
+;CopyrightFontSize=8
+
+[Messages]
+
+; *** Application titles
+SetupAppTitle=°²×°Ïòµ¼
+SetupWindowTitle=°²×°Ïòµ¼ - %1
+UninstallAppTitle=жÔØÏòµ¼
+UninstallAppFullTitle=%1жÔØÏòµ¼
+
+; *** Misc. common
+InformationTitle=ÐÅÏ¢
+ConfirmTitle=È·ÈÏ
+ErrorTitle=´íÎó
+
+; *** SetupLdr messages
+SetupLdrStartupMessage=°²×°Ïòµ¼½«ÔÚÄúµÄµçÄÔÉÏ°²×°%1¡£È·¶¨Òª¼ÌÐøÂð£¿
+LdrCannotCreateTemp=ÎÞ·¨´´½¨ÁÙʱÎļþ¡£°²×°ÒÑÖÕÖ¹
+LdrCannotExecTemp=ÎÞ·¨ÔËÐÐÁÙʱÎļþ¼ÐÖеÄÎļþ¡£°²×°ÒÑÖÕÖ¹
+
+; *** Startup error messages
+LastErrorMessage=%1.%n%n´íÎó %2: %3
+SetupFileMissing=°²×°Ä¿Â¼ÖÐȱʧÎļþ%1¡£Çë½â¾ö¸ÃÎÊÌ⣬»òÖØлñÈ¡Ò»·Ý³ÌÐò¿½±´¡£
+SetupFileCorrupt=°²×°ÎļþÒѱ»Ë𻵡£ÇëÖØлñÈ¡Ò»·Ý³ÌÐò¿½±´¡£
+SetupFileCorruptOrWrongVer=°²×°ÎļþÒѱ»Ë𻵣¬»òÓë±¾°²×°Ïòµ¼°æ±¾²»¼æÈÝ¡£Çë½â¾ö¸ÃÎÊÌ⣬»òÖØлñÈ¡Ò»·Ý³ÌÐò¿½±´¡£
+InvalidParameter=ÎÞЧÃüÁîÐвÎÊý£º%n%n%1
+SetupAlreadyRunning=°²×°³ÌÐòÒѾÔËÐС£
+WindowsVersionNotSupported=³ÌÐò²»Ö§³ÖÄúµçÄÔÉÏÔËÐеÄWindows°æ±¾¡£
+WindowsServicePackRequired=³ÌÐòÒªÇó%1 Service Pack %2»ò¸üа汾¡£
+NotOnThisPlatform=³ÌÐò²»¿ÉÔÚ%1ÉÏÔËÐС£
+OnlyOnThisPlatform=³ÌÐò±ØÐëÔÚ%1ÉÏÔËÐС£
+OnlyOnTheseArchitectures=³ÌÐòÖ»ÄÜÔÚΪÒÔÏ´¦ÀíÆ÷¼Ü¹¹ËùÉè¼ÆµÄWindows°æ±¾ÉÏ°²×°£º%n%n%1
+MissingWOW64APIs=ÄúËùʹÓõÄWindows°æ±¾Ã»Óаüº¬½øÐÐ64λ°²×°ËùÐèµÄ¹¦ÄÜ¡£Çë°²×°Service Pack %1½â¾ö´ËÎÊÌâ¡£
+WinVersionTooLowError=³ÌÐòÒªÇó%2°æ±¾»òÒÔÉϵÄ%1¡£
+WinVersionTooHighError=³ÌÐò²»¿É°²×°µÄ%2»ò¸ü¸ß°æ±¾µÄ%1ÉÏ¡£
+AdminPrivilegesRequired=Äú±ØÐëµÇ¼Ϊ¹ÜÀíÔ±²ÅÄÜ°²×°´Ë³ÌÐò¡£
+PowerUserPrivilegesRequired=Äú±ØÐëµÇ¼Ϊ¹ÜÀíÔ±»ò¸ßȨÏÞÓû§²ÅÄÜ°²×°´Ë³ÌÐò¡£
+SetupAppRunningError=°²×°Ïòµ¼¼ì²âµ½%1ÕýÔÚÔËÐС£%n%nÇë¹Ø±ÕÆäËùÓд°¿Ú²¢µã»÷¡°È·¶¨¡±¼ÌÐø£¬»òµã»÷¡°È¡Ïû¡±Í˳ö°²×°¡£
+UninstallAppRunningError=жÔØÏòµ¼¼ì²âµ½%1ÕýÔÚÔËÐС£%n%nÇë¹Ø±ÕÆäËùÓд°¿Ú£¬È»ºóµã»÷¡°È·¶¨¡±¼ÌÐø£¬»òµã»÷¡°È¡Ïû¡±Í˳ö¡£
+
+; *** Misc. errors
+ErrorCreatingDir=°²×°Ïòµ¼ÎÞ·¨´´½¨Îļþ¼Ð¡°%1¡±
+ErrorTooManyFilesInDir=ÓÉÓÚÎļþ¼Ð¡°%1¡±ÖÐÎļþ¹ý¶à£¬ÎÞ·¨ÔÚÆäÖд´½¨Îļþ
+
+; *** Setup common messages
+ExitSetupTitle=Í˳ö°²×°Ïòµ¼
+ExitSetupMessage=°²×°ÉÐδÍê³É¡£Èç¹ûÏÖÔÚÍ˳ö£¬³ÌÐò½«²»»á±»°²×°¡£ %n%nÄú¿ÉÒÔÏ´ÎÔÙÔËÐа²×°Ïòµ¼À´Íê³É³ÌÐòµÄ°²×°¡£%n%nÈ·¶¨Í˳ö°²×°Ïòµ¼Âð£¿
+AboutSetupMenuItem=¹ØÓÚ°²×°Ïòµ¼(&A)¡
+AboutSetupTitle=¹ØÓÚ°²×°Ïòµ¼
+AboutSetupMessage=%1°æ±¾%2%n%3%n%n%1Ö÷Ò³£º%n%4
+AboutSetupNote=
+TranslatorNote=
+
+; *** Buttons
+ButtonBack=< ÉÏÒ»²½(&B)
+ButtonNext=ÏÂÒ»²½(&N) >
+ButtonInstall=°²×°(&I)
+ButtonOK=È·¶¨
+ButtonCancel=È¡Ïû
+ButtonYes=ÊÇ(&Y)
+ButtonYesToAll=È«Ñ¡ÊÇ(&A)
+ButtonNo=·ñ(&N)
+ButtonNoToAll=È«Ñ¡·ñ(&O)
+ButtonFinish=½áÊø(&F)
+ButtonBrowse=ä¯ÀÀ(&B)¡
+ButtonWizardBrowse=ä¯ÀÀ(&R)¡
+ButtonNewFolder=´´½¨Îļþ¼Ð(&M)
+
+; *** "Select Language" dialog messages
+SelectLanguageTitle=Ñ¡ÔñÓïÑÔ
+SelectLanguageLabel=Ñ¡Ôñ°²×°Ê±Ê¹ÓÃÓïÑÔ£º
+
+; *** Common wizard text
+ClickNext=µã»÷¡°ÏÂÒ»²½¡±¼ÌÐø£¬»ò¡°È¡Ïû¡±Í˳ö°²×°Ïòµ¼¡£
+BeveledLabel=
+BrowseDialogTitle=ä¯ÀÀÑ¡ÔñÎļþ¼Ð
+BrowseDialogLabel=ÔÚÒÔÏÂÁбíÖÐÑ¡È¡Ò»¸öÎļþ¼Ð£¬²¢µã»÷¡°È·¶¨¡±¡£
+NewFolderName=н¨Îļþ¼Ð
+
+; *** "Welcome" wizard page
+WelcomeLabel1=»¶ÓʹÓÃ[name]°²×°Ïòµ¼
+WelcomeLabel2=±¾Ïòµ¼½«ÔÚÄúµÄµçÄÔÉÏ°²×°[name/ver]%n%n½¨ÒéÄúÔÚ¼ÌÐø֮ǰ¹Ø±ÕÆäËûËùÓÐÓ¦ÓóÌÐò¡£
+
+; *** "Password" wizard page
+WizardPassword=ÃÜÂë
+PasswordLabel1=±¾°²×°³ÌÐòÓÉÃÜÂë±£»¤¡£
+PasswordLabel3=ÇëÊäÈëÃÜÂ룬²¢µã»÷¡°ÏÂÒ»²½¡±¡£ÃÜÂëÇø·Ö´óСд¡£
+PasswordEditLabel=ÃÜÂë(&P)£º
+IncorrectPassword=ÄúÊäÈëµÄÃÜÂë²»ÕýÈ·¡£ÇëÖØÊÔ¡£
+
+; *** "License Agreement" wizard page
+WizardLicense=Ðí¿ÉÐÒé
+LicenseLabel=ÇëÔĶÁÒÔÏÂÖØÒªÐÅÏ¢£¬È»ºóÔÙ½øÈëÏÂÒ»²½¡£
+LicenseLabel3=ÇëÔĶÁÒÔÏÂÐí¿ÉÐÒé¡£Äú±ØÐë½ÓÊÜ´ËÐÒéµÄÌõ¿î£¬È»ºó²ÅÄܼÌÐø°²×°¡£
+LicenseAccepted=ÎÒ½ÓÊÜÐÒé(&A)
+LicenseNotAccepted=ÎÒ²»½ÓÊÜÐÒé(&D)
+
+; *** "Information" wizard pages
+WizardInfoBefore=ÐÅÏ¢
+InfoBeforeLabel=ÇëÔĶÁÒÔÏÂÖØÒªÐÅÏ¢ÔÙ½øÈëÏÂÒ»²½¡£
+InfoBeforeClickLabel=×¼±¸ºÃ¼ÌÐø°²×°ºó£¬µã»÷¡°ÏÂÒ»²½¡±¡£
+WizardInfoAfter=ÐÅÏ¢
+InfoAfterLabel=ÇëÔĶÁÒÔÏÂÖØÒªÐÅÏ¢ÔÙ½øÈëÏÂÒ»²½¡£
+InfoAfterClickLabel=×¼±¸ºÃ¼ÌÐø°²×°ºó£¬µã»÷¡°ÏÂÒ»²½¡±¡£
+
+; *** "User Information" wizard page
+WizardUserInfo=Óû§ÐÅÏ¢
+UserInfoDesc=ÇëÊäÈëÄúµÄÐÅÏ¢
+UserInfoName=Óû§Ãû³Æ(&U)£º
+UserInfoOrg=»ú¹¹Ãû³Æ(&O)£º
+UserInfoSerial=ÐòÁкÅÂë(&S)£º
+UserInfoNameRequired=±ØÐëÊäÈëÓû§Ãû
+
+; *** "Select Destination Location" wizard page
+WizardSelectDir=Ñ¡Ôñ°²×°Î»ÖÃ
+SelectDirDesc=½«[name]°²×°µ½ºÎ´¦£¿
+SelectDirLabel3=°²×°Ïòµ¼½«°Ñ[name]°²×°µ½ÒÔÏÂÎļþ¼ÐÖС£
+SelectDirBrowseLabel=µã»÷¡°ÏÂÒ»²½¡±¼ÌÐø¡£Èç¹ûÄúҪѡÔñ²»Í¬µÄÎļþ¼Ð£¬Çëµã»÷¡°ä¯ÀÀ¡±¡£
+DiskSpaceMBLabel=±ØÐëÖÁÉÙÓÐ[mb]Õ××Ö½Ú£¨MB£©µÄÏÐÖôÅÅ̿ռ䡣
+CannotInstallToNetworkDrive=ÎÞ·¨°²×°ÖÁÍøÂçÇý¶¯Æ÷¡£
+CannotInstallToUNCPath=ÎÞ·¨°²×°ÖÁUNC·¾¶¡£
+InvalidPath=Äú±ØÐëÊäÈë°üÀ¨ÅÌ·ûµÄÍêÕû·¾¶£¬ÀýÈ磺%n%nC:\Ó¦ÓóÌÐò%n%n»òÈçϸñʽµÄUNC·¾¶£º%n%n\\·þÎñÆ÷Ãû\¹²ÏíĿ¼Ãû
+InvalidDrive=ÄúÑ¡ÔñµÄÇý¶¯Æ÷»òUNC¹²Ïí²»´æÔÚ»ò²»¿É·ÃÎÊ¡£ÇëÁíÑ¡Ò»¸ö¡£
+DiskSpaceWarningTitle=´ÅÅ̿ռ䲻×ã
+DiskSpaceWarning=±ØÐëÖÁÉÙÓÐ%1ǧ×Ö½Ú£¨KB£©µÄÏÐÖÿռä²Å¿É°²×°£¬µ«ËùÑ¡Çý¶¯Æ÷½öÓÐ%2ǧ×Ö½Ú£¨KB£©¿ÉÓÿռ䡣%n%nÄúÈ·¶¨Òª¼ÌÐøÂð£¿
+DirNameTooLong=Îļþ¼ÐÃû³Æ»ò·¾¶Ì«³¤¡£
+InvalidDirName=Îļþ¼ÐÃû³ÆÎÞЧ¡£
+BadDirName32=Îļþ¼ÐÃû³Æ²»ÄÜ°üº¬ÏÂÁÐ×Ö·û£º%n%n%1
+DirExistsTitle=Îļþ¼ÐÒÑ´æÔÚ
+DirExists=Îļþ¼Ð%n%n%1%n%nÒÑ´æÔÚ¡£ÄúÈ·¶¨Òª°²×°µ½¸ÃÎļþ¼ÐÂð£¿
+DirDoesntExistTitle=Îļþ¼Ð²»´æÔÚ
+DirDoesntExist=Îļþ¼Ð%n%n%1%n%n²»´æÔÚ¡£ÄúÒª´´½¨¸ÃÎļþ¼ÐÂð£¿
+
+; *** "Select Components" wizard page
+WizardSelectComponents=Ñ¡Ôñ×é¼þ
+SelectComponentsDesc=Òª°²×°ÄÄЩ×é¼þ£¿
+SelectComponentsLabel2=ÇëÑ¡ÔñÒª°²×°µÄ×é¼þ£¬Çå³ý²»Òª°²×°µÄ×é¼þ¡£×¼±¸ºÃºóµã»÷¡°ÏÂÒ»²½¡±¡£
+FullInstallation=È«²¿°²×°
+; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
+CompactInstallation=¼ò½à°²×°
+CustomInstallation=×Ô¶¨Òå°²×°
+NoUninstallWarningTitle=×é¼þÒÑ´æÔÚ
+NoUninstallWarning=°²×°Ïòµ¼¼ì²âµ½ÒѾ°²×°ÏÂÁÐ×é¼þ£º%n%n%1%n%nÈ¡ÏûÑ¡¶¨²»»áжÔØÕâЩ×é¼þ¡£%n%nÄúÈ·¶¨Òª¼ÌÐø°²×°Âð£¿
+ComponentSize1=%1ǧ×Ö½Ú£¨KB£©
+ComponentSize2=%1Õ××Ö½Ú£¨MB£©
+ComponentsDiskSpaceMBLabel=Ä¿Ç°ËùÑ¡×é¼þÒªÇóÖÁÉÙ[mb]Õ××Ö½Ú£¨MB£©´ÅÅ̿ռ䡣
+
+; *** "Select Additional Tasks" wizard page
+WizardSelectTasks=Ñ¡Ôñ¸½¼ÓÈÎÎñ
+SelectTasksDesc=ÒªÖ´ÐÐÄÄЩ¸½¼ÓÈÎÎñ£¿
+SelectTasksLabel2=ÇëÑ¡Ôñ°²×°[name]ʱÐèÒªÖ´Ðеĸ½¼ÓÈÎÎñ£¬È»ºóµã»÷¡°ÏÂÒ»²½¡±¡£
+
+; *** "Select Start Menu Folder" wizard page
+WizardSelectProgramGroup=Ñ¡Ôñ¿ªÊ¼²Ëµ¥Îļþ¼Ð
+SelectStartMenuFolderDesc=°Ñ³ÌÐò¿ì½Ý·½Ê½·Åµ½ÄÄÀ
+SelectStartMenuFolderLabel3=°²×°Ïòµ¼½«ÔÚÒÔÏ¿ªÊ¼²Ëµ¥Îļþ¼ÐÖд´½¨³ÌÐò¿ì½Ý·½Ê½¡£
+SelectStartMenuFolderBrowseLabel=µã»÷¡°ÏÂÒ»²½¡±¼ÌÐø¡£ÈçҪѡÔñÁíÒ»¸öÎļþ¼Ð£¬µã»÷¡°ä¯ÀÀ¡±¡£
+MustEnterGroupName=Äú±ØÐëÊäÈëÎļþ¼ÐÃû³Æ
+GroupNameTooLong=Îļþ¼ÐÃû³Æ»ò·¾¶Ì«³¤¡£
+InvalidGroupName=Îļþ¼ÐÃû³ÆÎÞЧ¡£
+BadGroupName=Îļþ¼ÐÃû³Æ²»ÄÜ°üº¬ÏÂÁÐ×Ö·û£º%n%n%1
+NoProgramGroupCheck2=²»Òª´´½¨¿ªÊ¼²Ëµ¥Îļþ¼Ð(&D)
+
+; *** "Ready to Install" wizard page
+WizardReady=°²×°×¼±¸Íê±Ï
+ReadyLabel1=°²×°Ïòµ¼ÒÑ×¼±¸Íê±Ï£¬½«¿ªÊ¼ÔÚÄúµÄµçÄÔÉÏ°²×°[name]¡£
+ReadyLabel2a=µã»÷¡°°²×°¡±¿ªÊ¼°²×°¡£ÈçҪȷÈÏ»ò¸ü¸ÄÉèÖÃÇëµã»÷¡°ÉÏÒ»²½¡±¡£
+ReadyLabel2b=µã»÷¡°°²×°¡±¿ªÊ¼°²×°¡£
+ReadyMemoUserInfo=Óû§ÐÅÏ¢£º
+ReadyMemoDir=°²×°Î»Öãº
+ReadyMemoType=°²×°ÀàÐÍ£º
+ReadyMemoComponents=ËùÑ¡×é¼þ£º
+ReadyMemoGroup=¿ªÊ¼²Ëµ¥Îļþ¼Ð£º
+ReadyMemoTasks=¸½¼ÓÈÎÎñ£º
+
+; *** "Preparing to Install" wizard page
+WizardPreparing=×¼±¸°²×°
+PreparingDesc=°²×°Ïòµ¼ÕýÔÚ×¼±¸ÔÚÄúµÄµçÄÔÉÏ°²×°[name]¡£
+PreviousInstallNotCompleted=ÉϴγÌÐò°²×°/жÔØδÄÜÍê³É¡£ÄúÐèÒªÖØÆôµçÄÔÀ´Íê³ÉÉϴΰ²×°¡£%n%nµçÄÔÖØÆôÖ®ºó£¬ÇëÖØÐÂÔËÐа²×°Ïòµ¼À´°²×°[name]¡£
+CannotContinue=°²×°ÎÞ·¨¼ÌÐø¡£Çëµã»÷¡°È¡Ïû¡±Í˳ö¡£
+ApplicationsFound=°²×°Ïòµ¼ÐèÒª¸üеÄÎļþ±»ÏÂÁÐÓ¦ÓóÌÐòÕ¼Ó᣽¨ÒéÔÊÐí°²×°Ïòµ¼×Ô¶¯¹Ø±ÕÕâЩӦÓóÌÐò¡£
+ApplicationsFound2=°²×°Ïòµ¼ÐèÒª¸üеÄÎļþ±»ÏÂÁÐÓ¦ÓóÌÐòÕ¼Ó᣽¨ÒéÔÊÐí°²×°Ïòµ¼×Ô¶¯¹Ø±ÕÕâЩӦÓóÌÐò¡£°²×°Íê³Éºó£¬°²×°Ïòµ¼½«³¢ÊÔÖØÐÂÆô¶¯ÕâЩӦÓóÌÐò¡£
+CloseApplications=×Ô¶¯¹Ø±ÕÓ¦ÓóÌÐò(&A)
+DontCloseApplications=²»×Ô¶¯¹Ø±ÕÓ¦ÓóÌÐò(&D)
+ErrorCloseApplications=°²×°Ïòµ¼ÎÞ·¨×Ô¶¯¹Ø±ÕËùÓеÄÓ¦ÓóÌÐò¡£ÔÚ½øÈëÏÂÒ»²½Ö®Ç°£¬½¨ÒéÄú¹Ø±ÕÄÇЩռÓð²×°Ïòµ¼ÐèÒª¸üÐÂÎļþµÄÓ¦ÓóÌÐò¡£
+
+; *** "Installing" wizard page
+WizardInstalling=ÕýÔÚ°²×°
+InstallingLabel=ÇëÉÔºò£¬°²×°Ïòµ¼ÕýÔÚÄúµÄµçÄÔÉÏ°²×°[name]¡£
+
+; *** "Setup Completed" wizard page
+FinishedHeadingLabel=[name]°²×°Íê³É
+FinishedLabelNoIcons=°²×°Ïòµ¼ÒÑÔÚÄúµÄµçÄÔÉÏ°²×°[name]¡£
+FinishedLabel=°²×°Ïòµ¼ÒÑÔÚÄúµÄµçÄÔÉÏ°²×°[name]¡£¿ÉÒÔͨ¹ýÒÑ°²×°µÄ¿ì½Ý·½Ê½À´´ò¿ª´ËÓ¦ÓóÌÐò¡£
+ClickFinish=µã»÷¡°½áÊø¡±Í˳ö°²×°¡£
+FinishedRestartLabel=ΪÁËÍê³É[name]µÄ°²×°£¬°²×°Ïòµ¼±ØÐëÖØÆôÄúµÄµçÄÔ¡£ÒªÁ¢¼´ÖØÆôÂð£¿
+FinishedRestartMessage=ΪÁËÍê³É[name]µÄ°²×°£¬°²×°Ïòµ¼±ØÐëÖØÆôÄúµÄµçÄÔ¡£%n%nÒªÁ¢¼´ÖØÆôÂð£¿
+ShowReadmeCheck=ÊÇ£¬ÎÒÒªÔĶÁ×ÔÊöÎļþ
+YesRadio=ÊÇ£¬Á¢¼´ÖØÆôµçÄÔ(&Y)
+NoRadio=·ñ£¬ÉÔºóÎÒÔÙÖØÆôµçÄÔ(&N)
+; used for example as 'Run MyProg.exe'
+RunEntryExec=ÔËÐÐ%1
+; used for example as 'View Readme.txt'
+RunEntryShellExec=²éÔÄ%1
+
+; *** "Setup Needs the Next Disk" stuff
+ChangeDiskTitle=°²×°Ïòµ¼ÐèÒªÏÂÒ»ÕÅ´ÅÅÌ
+SelectDiskLabel2=Çë²åÈë´ÅÅÌ%1 ²¢µã»÷¡°È·¶¨¡±¡£%n%nÈç¹û¸Ã´ÅÅÌÖеÄÎļþ²¢²»ÔÚÒÔÏÂËùʾÎļþ¼ÐÖУ¬ÇëÊäÈëÕýÈ·µÄ·¾¶»òµã»÷¡°ä¯ÀÀ¡±¡£
+PathLabel=·¾¶(&P)£º
+FileNotInDir2=Îļþ¡°%1¡±²»ÔÚ¡°%2¡±ÖС£Çë²åÈëÕýÈ·µÄ´ÅÅÌ»òÑ¡ÔñÆäËüÎļþ¼Ð¡£
+SelectDirectoryLabel=ÇëÖ¸¶¨ÏÂÒ»ÕÅ´ÅÅ̵ÄλÖá£
+
+; *** Installation phase messages
+SetupAborted=°²×°Î´ÄÜÍê³É¡£%n%nÇë½â¾öÎÊÌâºóÔÙÖØÐÂÔËÐа²×°Ïòµ¼¡£
+EntryAbortRetryIgnore=µã»÷¡°ÖØÊÔ¡±ÖØг¢ÊÔ£¬µã»÷¡°ºöÂÔ¡±¼ÌÐø°²×°£¬»òµã»÷¡°ÖÐÖ¹¡±È¡Ïû°²×°¡£
+
+; *** Installation status messages
+StatusClosingApplications=ÕýÔڹرÕÓ¦ÓóÌÐò¡
+StatusCreateDirs=ÕýÔÚ´´½¨Îļþ¼Ð¡
+StatusExtractFiles=ÕýÔÚÈ¡³öÎļþ¡
+StatusCreateIcons=ÕýÔÚ´´½¨¿ì½Ý·½Ê½¡
+StatusCreateIniEntries=ÕýÔÚ´´½¨INIÌõÄ¿¡
+StatusCreateRegistryEntries=ÕýÔÚ´´½¨×¢²á±íÌõÄ¿¡
+StatusRegisterFiles=ÕýÔÚ´´½¨×¢²á±íÏîÄ¿¡
+StatusSavingUninstall=ÕýÔÚ±£´æжÔØÐÅÏ¢¡
+StatusRunProgram=ÕýÔÚ½áÊø°²×°¡
+StatusRestartingApplications=ÕýÔÚÖØÆôÓ¦ÓóÌÐò¡
+StatusRollback=ÕýÔÚ³·Ïú¸ü¸Ä¡
+
+; *** Misc. errors
+ErrorInternal2=ÄÚ²¿´íÎó£º%1
+ErrorFunctionFailedNoCode=%1ʧ°Ü
+ErrorFunctionFailed=%1ʧ°Ü£¬´íÎóÂë%2
+ErrorFunctionFailedWithMessage=%1ʧ°Ü£¬´íÎóÂë%2¡£%n%3
+ErrorExecutingProgram=ÎÞ·¨ÔËÐгÌÐò£º%n%1
+
+; *** Registry errors
+ErrorRegOpenKey=´ò¿ª×¢²á±í¼üʱ³ö´í£º%n%1\%2
+ErrorRegCreateKey=´´½¨×¢²á±í¼üʱ³ö´í£º%n%1\%2
+ErrorRegWriteKey=дÈë×¢²á±í¼üʱ³ö´í£º%n%1\%2
+
+; *** INI errors
+ErrorIniEntry=ÔÚÎļþ¡°%1¡±Öд´½¨INIÌõĿʱ³ö´í¡£
+
+; *** File copying errors
+FileAbortRetryIgnore=µã»÷¡°ÖØÊÔ¡±ÖØг¢ÊÔ£¬µã»÷¡°ºöÂÔ¡±Ìø¹ý´ËÎļþ£¨²»ÍƼöÕâÑù×ö£©£¬»òµã»÷¡°ÖÐÖ¹¡±È¡Ïû°²×°¡£
+FileAbortRetryIgnore2=µã»÷¡°ÖØÊÔ¡±ÖØг¢ÊÔ£¬µã»÷¡°ºöÂÔ¡±¼ÌÐø°²×°£¨²»ÍƼöÕâÑù×ö£©£¬»òµã»÷¡°ÖÐÖ¹¡±È¡Ïû°²×°¡£
+SourceIsCorrupted=Ô´ÎļþÒÑËð»µ
+SourceDoesntExist=Ô´Îļþ¡°%1¡±²»´æÔÚ
+ExistingFileReadOnly=ÏÖÓÐÎļþ±»±ê¼ÇΪֻ¶Á¡£%n%nµã»÷¡°ÖØÊÔ¡±ÒƳýÆäÖ»¶ÁÊôÐÔ²¢ÖØг¢ÊÔ£¬µã»÷¡°ºöÂÔ¡±Ìø¹ý´ËÎļþ£¬»òµã»÷¡°ÖÐÖ¹¡±È¡Ïû°²×°¡£
+ErrorReadingExistingDest=¶ÁÈ¡ÏÖÓÐÎļþʱ³ö´í£º
+FileExists=ÎļþÒÑ´æÔÚ¡£%n%nÈð²×°Ïòµ¼¸²¸ÇËüÂð£¿
+ExistingFileNewer=ÏÖÓÐÎļþ±È°²×°Ïòµ¼ÊÔͼ°²×°µÄ»¹ÒªÐ¡£½¨Òé±£ÁôÏÖÓÐÎļþ¡£%n%nÄúÒª±£ÁôÏÖÓÐÎļþÂð£¿
+ErrorChangingAttr=¸ü¸ÄÏÖÓÐÎļþÊôÐÔʱ³ö´í£º
+ErrorCreatingTemp=ÔÚÄ¿µÄÎļþ¼ÐÖд´½¨Îļþʱ³ö´í£º
+ErrorReadingSource=¶ÁÈ¡Ô´Îļþʱ³ö´í£º
+ErrorCopying=¸´ÖÆÎļþʱ³ö´í£º
+ErrorReplacingExistingFile=Ìæ»»ÏÖÓÐÎļþʱ³ö´í£º
+ErrorRestartReplace=ÖØÆôÌ滻ʧ°Ü£º
+ErrorRenamingTemp=ΪĿµÄÎļþ¼ÐÖÐÎļþÖØÃüÃûʱ³ö´í£º
+ErrorRegisterServer=ÎÞ·¨×¢²á¶¯Ì¬¿â»ò¿Ø¼þ£¨DLL/OCX£©£º%1
+ErrorRegSvr32Failed=ÔËÐÐRegSvr32ʧ°Ü£¬Æä·µ»ØֵΪ£º%1
+ErrorRegisterTypeLib=ÎÞ·¨×¢²áÀàÐͿ⣺%1
+
+; *** Post-installation errors
+ErrorOpeningReadme=´ò¿ª×ÔÊöÎļþʱ³ö´í¡£
+ErrorRestartingComputer=°²×°Ïòµ¼ÎÞ·¨ÖØÆôµçÄÔ¡£ÇëÊÖ¶¯ÖØÆô¡£
+
+; *** Uninstaller messages
+UninstallNotFound=Îļþ¡°%1¡±²»´æÔÚ¡£ÎÞ·¨Ð¶ÔØ¡£
+UninstallOpenError=ÎÞ·¨´ò¿ªÎļþ¡°%1¡±¡£ÎÞ·¨Ð¶ÔØ
+UninstallUnsupportedVer=´Ë°æ±¾µÄжÔØÏòµ¼ÎÞ·¨Ê¶±ðжÔØÈÕÖ¾Îļþ¡°%1¡±µÄ¸ñʽ¡£ÎÞ·¨Ð¶ÔØ
+UninstallUnknownEntry=ÔÚжÔØÈÕÖ¾ÖÐÓöµ½Î´ÖªÌõÄ¿ (%1)
+ConfirmUninstall=ÄúÊÇ·ñÈ·¶¨ÒªÍêȫɾ³ý%1¼°ÆäËùÓÐ×é¼þ£¿
+UninstallOnlyOnWin64=´Ë°²×°Ö»ÄÜÔÚ64λWindowsÉÏжÔØ¡£
+OnlyAdminCanUninstall=´Ë°²×°Ö»ÄÜÓɾ߱¸¹ÜÀíԱȨÏÞµÄÓû§Ð¶ÔØ¡£
+UninstallStatusLabel=ÇëÉÔºò£¬ÕýÔÚɾ³ý%1¡£
+UninstalledAll=Òѳɹ¦µØ´ÓÄúµÄµçÄÔÖÐɾ³ý%1¡£
+UninstalledMost=%1жÔØÍê±Ï¡£%n%nijЩÏîÄ¿ÎÞ·¨ÔÚжÔعý³ÌÖÐɾ³ý¡£¿ÉÒÔÊÖ¶¯É¾³ýÕâЩÏîÄ¿¡£
+UninstalledAndNeedsRestart=ÈôÒªÍê³É%1µÄжÔØ£¬±ØÐëÖØÆôµçÄÔ¡£%n%nÒªÁ¢¼´ÖØÆôÂð£¿
+UninstallDataCorrupted=Îļþ¡°%1¡±ÒÑË𻵡£ÎÞ·¨Ð¶ÔØ
+
+; *** Uninstallation phase messages
+ConfirmDeleteSharedFileTitle=ɾ³ý¹²ÏíÎļþÂð£¿
+ConfirmDeleteSharedFile2=ϵͳÏÔʾûÓÐÈκγÌÐòʹÓÃÒÔϹ²ÏíÎļþ¡£ÒªÉ¾³ý¸Ã¹²ÏíÎļþÂð£¿%n%nÈç¹ûÓгÌÐòʹÓøÃÎļþ£¬µ±Ëü±»É¾³ýºóÕâЩ³ÌÐò¿ÉÄÜÎÞ·¨Õý³£ÔËÐС£Èç¹û²»È·¶¨£¬ÇëÑ¡Ôñ¡°·ñ¡±¡£ÁôϸÃÎļþ²»»á¶ÔϵͳÔì³ÉÈκÎΣº¦¡£
+SharedFileNameLabel=ÎļþÃû£º
+SharedFileLocationLabel=λÖãº
+WizardUninstalling=жÔØ״̬
+StatusUninstalling=ÕýÔÚжÔØ%1¡
+
+; *** Shutdown block reasons
+ShutdownBlockReasonInstallingApp=ÕýÔÚ°²×°%1¡£
+ShutdownBlockReasonUninstallingApp=ÕýÔÚжÔØ%1¡£
+
+; The custom messages below aren't used by Setup itself, but if you make
+; use of them in your scripts, you'll want to translate them.
+
+[CustomMessages]
+
+NameAndVersion=%1°æ±¾%2
+AdditionalIcons=¸½¼Ó¿ì½Ý·½Ê½£º
+CreateDesktopIcon=´´½¨×ÀÃæ¿ì½Ý·½Ê½(&D)
+CreateQuickLaunchIcon=´´½¨¿ìËÙÆô¶¯À¸¿ì½Ý·½Ê½(&Q)
+ProgramOnTheWeb=%1ÍøÕ¾
+UninstallProgram=жÔØ%1
+LaunchProgram=ÔËÐÐ%1
+AssocFileExtension=½«%1Óë%2ÎļþÀ©Õ¹Ãû¹ØÁª(&A)
+AssocingFileExtension=ÕýÔÚ½«%1Óë%2ÎļþÀ©Õ¹Ãû¹ØÁª¡
+AutoStartProgramGroupDescription=Æô¶¯£º
+AutoStartProgram=×Ô¶¯Æô¶¯%1
+AddonHostProgramNotFound=ÔÚÄúËùÑ¡Îļþ¼ÐÖÐÕÒ²»µ½%1¡£%n%nÊÇ·ñÈÔÈ»¼ÌÐø£¿
diff --git a/inno_setup/ChineseTrad-2-5.1.11.isl b/inno_setup/ChineseTraditional-5.5.3.isl
similarity index 80%
rename from inno_setup/ChineseTrad-2-5.1.11.isl
rename to inno_setup/ChineseTraditional-5.5.3.isl
index cc4f2a5..fc3c4b2 100644
--- a/inno_setup/ChineseTrad-2-5.1.11.isl
+++ b/inno_setup/ChineseTraditional-5.5.3.isl
@@ -1,16 +1,15 @@
-; *** Inno Setup version 5.1.11+ Chinese (Traditional) messages ***
+; *** Inno Setup version 5.5.3+ Chinese (Traditional) messages by Samuel Lee (751555749 at qq.com) ***
;
; To download user-contributed translations of this file, go to:
-; http://www.jrsoftware.org/is3rdparty.php
-;
-; Translated by: Patrick Pang (uncleleft at yahoo.com.hk)
+; http://www.jrsoftware.org/files/istrans/
;
; Note: When translating this text, do not add periods (.) to the end of
; messages that didn't have them already, because on those messages Inno
; Setup adds the periods automatically (appending a period would result in
; two periods being displayed).
-
[LangOptions]
+; The following three entries are very important. Be sure to read and
+; understand the '[LangOptions] section' topic in the help file.
LanguageName=<7e41><9ad4><4e2d><6587>
LanguageID=$0404
LanguageCodepage=950
@@ -26,13 +25,11 @@ CopyrightFontName=
CopyrightFontSize=9
[Messages]
-
; *** Application titles
SetupAppTitle=¦w¸Ëµ{¦¡
SetupWindowTitle=%1 ¦w¸Ëµ{¦¡
UninstallAppTitle=¸Ñ°£¦w¸Ë
UninstallAppFullTitle=¸Ñ°£¦w¸Ë %1
-
; *** Misc. common
InformationTitle=°T®§
ConfirmTitle=½T»{
@@ -48,6 +45,10 @@ LastErrorMessage=%1%n%n
SetupFileMissing=¦w¸Ë¸ê®Æ§¨¤¤¿ò¥¢ÀÉ®× %1¡C½Ð×¥¿¦¹°ÝÃD©Î«·s¨ú±o¦¹³nÅé¡C
SetupFileCorrupt=¦w¸ËÀɮפw¸g·l·´¡C½Ð«·s¨ú±o¦¹³nÅé¡C
SetupFileCorruptOrWrongVer=¦w¸ËÀɮפw¸g·l·´¡A©Î»P¦w¸Ëµ{¦¡ªºª©¥»¤£²Å¡C½Ð«·s¨ú±o¦¹³nÅé¡C
+InvalidParameter=¬YÓµL®ÄªºÅܶq¤w³Q¶Ç»¼¨ì¤F©R¥O¦C:%n%n%1
+SetupAlreadyRunning=¦w¸Ëµ{¦¡¤w¸g¦b°õ¦æ¡C
+WindowsVersionNotSupported=¥»¦w¸Ëµ{¦¡¨Ã¤£¤ä´©¥Ø«e¦b¹q¸£©Ò¹B¦æªº Windows ª©¥»¡C
+WindowsServicePackRequired=¥»¦w¸Ëµ{¦¡»Ýn %1 Service Pack %2 ©Î§ó·s¡C
NotOnThisPlatform=³oÓµ{¦¡µLªk¦b %1 °õ¦æ¡C
OnlyOnThisPlatform=³oÓµ{¦¡¥²¶·¦b %1 °õ¦æ¡C
OnlyOnTheseArchitectures=³oÓµ{¦¡¥u¯à¦b±Mªù¬°¥H¤U³B²z¾¹¬[ºc¦Ó³]pªº Windows ¤W¦w¸Ë:%n%n%1
@@ -60,8 +61,8 @@ SetupAppRunningError=
UninstallAppRunningError=¸Ñ°£¦w¸Ëµ{¦¡°»´ú¨ì %1 ¥¿¦b°õ¦æ¡C%n%n½ÐÃö³¬¸Óµ{¦¡«á«ö [½T©w] Ä~Äò¡A©Î«ö [¨ú®ø] Â÷¶}¡C
; *** Misc. errors
-ErrorCreatingDir=¦w¸Ëµ{¦¡µLªk«Ø¥ß¸ê®Æ§¨ "%1"¡C
-ErrorTooManyFilesInDir=µLªk¦b¸ê®Æ§¨ "%1" ¤º«Ø¥ßÀɮסA¦]¬°¸ê®Æ§¨¤º¦³¤Ó¦hªºÀɮסC
+ErrorCreatingDir=¦w¸Ëµ{¦¡µLªk«Ø¥ß¸ê®Æ§¨¡§%1¡¨¡C
+ErrorTooManyFilesInDir=µLªk¦b¸ê®Æ§¨¡§%1¡¨¤º«Ø¥ßÀɮסA¦]¬°¸ê®Æ§¨¤º¦³¤Ó¦hªºÀɮסC
; *** Setup common messages
ExitSetupTitle=µ²§ô¦w¸Ëµ{¦¡
@@ -70,11 +71,11 @@ AboutSetupMenuItem=
AboutSetupTitle=Ãö©ó¦w¸Ëµ{¦¡
AboutSetupMessage=%1 ª©¥» %2%n%3%n%n%1 ºô§}:%n%4
AboutSetupNote=
-TranslatorNote=ÁcÅ餤¤å»y¨t¥Ñ Patrick Pang (uncleleft at yahoo.com.hk) ºûÅ@¡C
+TranslatorNote=
; *** Buttons
ButtonBack=< ¤W¤@¨B(&B)
-ButtonNext=¤U¤@¨B(&N) >
+ButtonNext=¤U¤@¨B(&N) >
ButtonInstall=¦w¸Ë(&I)
ButtonOK=½T©w
ButtonCancel=¨ú®ø
@@ -100,7 +101,7 @@ NewFolderName=
; *** "Welcome" wizard page
WelcomeLabel1=Åwªï¨Ï¥Î [name] ¦w¸Ëµ{¦¡
-WelcomeLabel2=³oÓ¦w¸Ëµ{¦¡±N·|¦w¸Ë [name/ver] ¨ì±zªº¹q¸£¡C%n%n§Ú̱j¯P«Øij±z¦b¦w¸Ë¹Lµ{¤¤Ãö³¬¨ä¥¦ªºÀ³¥Îµ{¦¡¡A¥HÁקK»P¦w¸Ëµ{¦¡µo¥Í½Ä¬ð¡C
+WelcomeLabel2=³oÓ¦w¸Ëµ{¦¡±N·|¦w¸Ë [name/ver] ¨ì±zªº¹q¸£¡C%n%n§Ú̱j¯P«Øij±z¦b¦w¸Ë¹Lµ{¤¤Ãö³¬¨ä¥¦ªºÀ³¥Îµ{¦¡¡A¥HÁקK»P¦w¸Ëµ{¦¡µo¥Í¨R¬ð¡C
; *** "Password" wizard page
WizardPassword=±K½X
@@ -136,9 +137,10 @@ UserInfoNameRequired=
WizardSelectDir=¿ï¾Ü¥Øªº¸ê®Æ§¨
SelectDirDesc=¿ï¾Ü¦w¸Ëµ{¦¡¦w¸Ë [name] ªº¦ì¸m¡C
SelectDirLabel3=¦w¸Ëµ{¦¡±N·|§â [name] ¦w¸Ë¨ì¤U±ªº¸ê®Æ§¨¡C
-SelectDirBrowseLabel=«ö [½T©w] Ä~Äò¡A¦pªG±z·Q¿ï¾Ü¥t¤@Ó¸ê®Æ§¨¡A½Ð«ö [ÂsÄý]¡C
+SelectDirBrowseLabel=«ö [¤U¤@¨B] Ä~Äò¡A¦pªG±z·Q¿ï¾Ü¥t¤@Ó¸ê®Æ§¨¡A½Ð«ö [ÂsÄý]¡C
DiskSpaceMBLabel=³Ì¤Ö»Ýn [mb] MB ºÏºÐªÅ¶¡¡C
-ToUNCPathname=¦w¸Ëµ{¦¡µLªk¦w¸Ë©ó UNC ¸ô®|¦WºÙ¡C¦pªG±z§Æ±æ¦w¸Ë©óºô¸ô¤W¨ä¥L¹q¸£¤¤¡A±z¥²¶·«Ø¥ß¤@Ó©T©w³s±µªººô¸ôºÏºÐ¾÷¡C
+CannotInstallToNetworkDrive=¦w¸Ëµ{¦¡µLªk¦w¸Ë©óºôµ¸ºÏºÐ¾÷¡C
+CannotInstallToUNCPath=¦w¸Ëµ{¦¡µLªk¦w¸Ë©ó UNC ¸ô®|¡C
InvalidPath=±z¥²¶·¿é¤J§¹¾ãªº¸ô®|¦WºÙ¤ÎºÏºÐ¾÷¥N½X¡C%n%n¨Ò¦p C:\App ©Î UNC ¸ô®|®æ¦¡ \\¦øªA¾¹\¦@¥Î¸ê®Æ§¨¡C
InvalidDrive=±z¿ï¨úªººÏºÐ¾÷©Î UNC ¦WºÙ¤£¦s¦b©ÎµLªk¦s¨ú¡A½Ð¿ï¾Ü¨ä¥Lªº¥Øªº¦a¡C
DiskSpaceWarningTitle=ºÏºÐªÅ¶¡¤£¨¬
@@ -154,7 +156,7 @@ DirDoesntExist=
; *** "Select Components" wizard page
WizardSelectComponents=¿ï¾Ü¤¸¥ó
SelectComponentsDesc=¿ï¾Ü±N·|³Q¦w¸Ëªº¤¸¥ó¡C
-SelectComponentsLabel2=¿ï¾Ü±z·Qn¦w¸Ëªº¤¸¥ó¤Î²M°£±z¤£·Q¦w¸Ëªº¤¸¥ó¡AµM«á«ö [¤U¤@¨B] Ä~Äò¦w¸Ë¡C
+SelectComponentsLabel2=¿ï¾Ü±z·Qn¦w¸Ëªº¤¸¥ó¡F²M°£±z¤£·Q¦w¸Ëªº¤¸¥ó¡CµM«á«ö [¤U¤@¨B] Ä~Äò¦w¸Ë¡C
FullInstallation=§¹¾ã¦w¸Ë
; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
CompactInstallation=³Ì¤p¦w¸Ë
@@ -174,7 +176,7 @@ SelectTasksLabel2=
WizardSelectProgramGroup=¿ï¾Ü¡u¶}©l¡v¥\¯àªíªº¸ê®Æ§¨
SelectStartMenuFolderDesc=¿ï¾Ü¦w¸Ëµ{¦¡«Ø¥ßµ{¦¡ªº±¶®|ªº¦ì¸m¡C
SelectStartMenuFolderLabel3=¦w¸Ëµ{¦¡±N·|§âµ{¦¡ªº±¶®|«Ø¥ß¦b¤U±ªº¡u¶}©l¡v¥\¯àªí¸ê®Æ§¨¡C
-SelectStartMenuFolderBrowseLabel=«ö [½T©w] Ä~Äò¡A¦pªG±z·Q¿ï¾Ü¥t¤@Ó¸ê®Æ§¨¡A½Ð«ö [ÂsÄý]¡C
+SelectStartMenuFolderBrowseLabel=«ö [¤U¤@¨B] Ä~Äò¡A¦pªG±z·Q¿ï¾Ü¥t¤@Ó¸ê®Æ§¨¡A½Ð«ö [ÂsÄý]¡C
MustEnterGroupName=±z¥²¶·¿é¤J¤@Ó¸ê®Æ§¨ªº¦WºÙ¡C
GroupNameTooLong=¸ê®Æ§¨¦WºÙ©Î¸ô®|¤Óªø¡C
InvalidGroupName=¸ê®Æ§¨¦WºÙ¤£¥¿½T¡C
@@ -192,16 +194,19 @@ ReadyMemoType=
ReadyMemoComponents=¿ï¾Üªº¤¸¥ó:
ReadyMemoGroup=¡u¶}©l¡v¥\¯àªí¸ê®Æ§¨:
ReadyMemoTasks=ªþ¥[¤u§@:
-
; *** "Preparing to Install" wizard page
WizardPreparing=·Ç³Æ¦w¸Ëµ{¦¡
PreparingDesc=¦w¸Ëµ{¦¡·Ç³Æ±N [name] ¦w¸Ë¨ì±zªº¹q¸£¤W¡C
PreviousInstallNotCompleted=¥ý«eªº¦w¸Ë/ ¸Ñ°£¦w¸Ë©|¥¼§¹¦¨¡A±z¥²¶·«·s±Ò°Ê¹q¸£¥H§¹¦¨¸Ó¦w¸Ë¡C%n%n¦b«·s±Ò°Ê¹q¸£¤§«á¡A½Ð¦A°õ¦æ³oÓµ{¦¡¨Ó¦w¸Ë [name]¡C
CannotContinue=¦w¸Ëµ{¦¡µLªkÄ~Äò¡C½Ð«ö [¨ú®ø] Â÷¶}¡C
-
+ApplicationsFound=¤U±ªºÀ³¥Îµ{¦¡¥¿¦b¨Ï¥Î¦w¸Ëµ{¦¡©Ò»Ýn§ó·sªº¤åÀÉ¡C«Øij±z¤¹³\¦w¸Ëµ{¦¡¦Û°ÊÃö³¬³o¨ÇÀ³¥Îµ{¦¡¡C
+ApplicationsFound2=¤U±ªºÀ³¥Îµ{¦¡¥¿¦b¨Ï¥Î¦w¸Ëµ{¦¡©Ò»Ýn§ó·sªº¤åÀÉ¡C«Øij±z¤¹³\¦w¸Ëµ{¦¡¦Û°ÊÃö³¬³o¨ÇÀ³¥Îµ{¦¡¡C·í¦w¸Ë¹Lµ{µ²§ô«á¡A¥»¦w¸Ëµ{¦¡±N·|¹Á¸Õ«·s¶}±Ò¸ÓÀ³¥Îµ{¦¡¡C
+CloseApplications=Ãö³¬À³¥Îµ{¦¡(&A)
+DontCloseApplications=¤£nÃö³¬À³¥Îµ{¦¡ (&D)
+ErrorCloseApplications=¦w¸Ëµ{¦¡µLªk¦Û°ÊÃö³¬©Ò¦³À³¥Îµ{¦¡¡C«Øij±z¦bÄ~Äò«e¥ýÃö³¬©Ò¦³À³¥Îµ{¦¡¨Ï¥ÎªºÀɮסC
; *** "Installing" wizard page
WizardInstalling=¥¿¦b¦w¸Ë
-InstallingLabel=½ÐµyÔ¡A¦w¸Ëµ{¦¡¥¿¦b±N [name] ¦w¸Ë¨ì±zªº¹q¸£¤W¡C
+InstallingLabel=½ÐµyÔ¡A¦w¸Ëµ{¦¡¥¿¦b±N [name] ¦w¸Ë¨ì±zªº¹q¸£¤W
; *** "Setup Completed" wizard page
FinishedHeadingLabel=¦w¸Ë§¹¦¨
@@ -222,7 +227,7 @@ RunEntryShellExec=
ChangeDiskTitle=¦w¸Ëµ{¦¡»Ýn¤U¤@±iºÏ¤ù
SelectDiskLabel2=½Ð´¡¤JºÏ¤ù %1¡AµM«á«ö [½T©w]¡C%n%n¦pªGÀɮפ£¦b¥H¤U©ÒÅã¥Üªº¸ê®Æ§¨¤§¤¤¡A½Ð¿é¤J¥¿½Tªº¸ê®Æ§¨¦WºÙ©Î«ö [ÂsÄý] ¿ï¨ú¡C
PathLabel=¸ô®|(&P):
-FileNotInDir2=ÀÉ®× "%1" µLªk¦b "%2" §ä¨ì¡C½Ð´¡¤J¥¿½TªººÏ¤ù©Î¿ï¾Ü¨ä¥¦ªº¸ê®Æ§¨¡C
+FileNotInDir2=Àɮס§%1¡¨µLªk¦b¡§%2¡¨§ä¨ì¡C½Ð´¡¤J¥¿½TªººÏ¤ù©Î¿ï¾Ü¨ä¥¦ªº¸ê®Æ§¨¡C
SelectDirectoryLabel=½Ð«ü©w¤U¤@±iºÏ¤ùªº¦ì¸m¡C
; *** Installation phase messages
@@ -230,6 +235,7 @@ SetupAborted=
EntryAbortRetryIgnore=«ö [«¸Õ] «¸Õ¤@¦¸¡A«ö¤U [²¤¹L] ¸õ¹L³oÓÀɮסA©Î«ö¤U [¤¤¤î] µ²§ô¦w¸Ë¡C
; *** Installation status messages
+StatusClosingApplications=¥¿¦bÃö³¬À³¥Îµ{¦¡...
StatusCreateDirs=¥¿¦b«Ø¥ß¸ê®Æ§¨...
StatusExtractFiles=¥¿¦b¸ÑÀ£ÁYÀÉ®×...
StatusCreateIcons=¥¿¦b«Ø¥ßµ{¦¡¶°¹Ï¥Ü...
@@ -238,13 +244,14 @@ StatusCreateRegistryEntries=
StatusRegisterFiles=¥¿¦bµn¿ýÀÉ®×...
StatusSavingUninstall=Àx¦s¸Ñ°£¦w¸Ë¸ê°T...
StatusRunProgram=¥¿¦b§¹¦¨¦w¸Ë...
+StatusRestartingApplications=¥¿¦b«·s¶}±ÒÀ³¥Îµ{¦¡...
StatusRollback=¥¿¦b´_ìÅܧó...
; *** Misc. errors
-ErrorInternal2=¤º³¡¿ù»~: %1¡C
-ErrorFunctionFailedNoCode=%1 ¥¢±Ñ¡C
-ErrorFunctionFailed=%1 ¥¢±Ñ¡C¥N½X %2¡C
-ErrorFunctionFailedWithMessage=%1 ¥¢±Ñ¡C¥N½X %2¡C%n%3
+ErrorInternal2=¤º³¡¿ù»~: %1
+ErrorFunctionFailedNoCode=%1 ¥¢±Ñ
+ErrorFunctionFailed=%1 ¥¢±Ñ¡F¥N½X %2
+ErrorFunctionFailedWithMessage=%1 ¥¢±Ñ¡F¥N½X %2.%n%3
ErrorExecutingProgram=µLªk°õ¦æÀÉ®×:%n%1
; *** Registry errors
@@ -253,36 +260,36 @@ ErrorRegCreateKey=
ErrorRegWriteKey=µLªkÅܧóµn¿ý¶µ¥Ø:%n%1\%2
; *** INI errors
-ErrorIniEntry=µLªk«Ø¥ß INI ¶µ¥Ø "%1"¡C
+ErrorIniEntry=¦bÀɮס§%1¡¨«Ø¥ß INI ¶µ¥Ø¿ù»~¡C
; *** File copying errors
FileAbortRetryIgnore=«ö [«¸Õ] ¦A¸Õ¤@¦¸¡A«ö [²¤¹L] ¸õ¹L³oÓÀɮס]¤£«Øij¡^¡A©Î«ö [¤¤¤î] µ²§ô¦w¸Ë¡C
FileAbortRetryIgnore2=«ö [«¸Õ] ¦A¸Õ¤@¦¸¡A«ö [²¤¹L] Ä~Äò¶i¦æ¡]¤£«Øij¡^¡A©Î«ö [¤¤¤î] µ²§ô¦w¸Ë¡C
SourceIsCorrupted=¨Ó·½Àɮפw¸g·l·´¡C
-SourceDoesntExist=¨Ó·½ÀÉ®× "%1" ¤£¦s¦b¡C
-ExistingFileReadOnly=ÀÉ®×Äݩʤw³]¬°°ßŪ¡C%n%n«ö [«¸Õ] ±N°ßŪÄݩʲ¾°£¨Ã¦A¸Õ¤@¦¸¡A«ö [²¤¹L] ¸õ¹L³oÓÀɮסA©Î«ö [¤¤¤î] µ²§ô¦w¸Ë¡C
+SourceDoesntExist=¨Ó·½Àɮס§%1¡¨¤£¦s¦b¡C
+ExistingFileReadOnly=ÀÉ®×Äݩʤw³]¬°°ßŪ¡C%n%n«ö [«¸Õ] ±N°ßŪÄݩʲ¾°£¦}¦A¸Õ¤@¦¸¡A«ö [²¤¹L] ¸õ¹L³oÓÀɮסA©Î«ö [¤¤¤î] µ²§ô¦w¸Ë¡C
ErrorReadingExistingDest=Ū¨ú¤@Ó¤w¦s¦bªºÀɮ׮ɵo¥Í¿ù»~:
FileExists=Àɮפw¸g¦s¦b¡C±zn¨ú¥N¥Ø«eªºÀɮ׶Ü?
ExistingFileNewer=¦s¦bªºÀɮת©¥»¤ñ¸û·s¡A«Øij±z«O¯d¥Ø«e¤w¦s¦bªºÀɮסC%n%n±zn«O¯d¥Ø«e¤w¦s¦bªºÀɮ׶Ü?
ErrorChangingAttr=¦bÅܧóÀÉ®×Äݩʮɵo¥Í¿ù»~:
ErrorCreatingTemp=¦b¥Øªº¸ê®Æ§¨¤¤«Ø¥ßÀɮ׮ɵo¥Í¿ù»~:
ErrorReadingSource=Ū¨úì©lÀɮ׮ɵo¥Í¿ù»~:
-ErrorCopying=½Æ»sÀɮ׮ɵo¥Í¿ù»~:
+ErrorCopying=´_¨îÀɮ׮ɵo¥Í¿ù»~:
ErrorReplacingExistingFile=¨ú¥NÀɮ׮ɵo¥Í¿ù»~:
ErrorRestartReplace=«·s±Ò°Ê¹q¸£«á¨ú¥NÀÉ®×¥¢±Ñ:
ErrorRenamingTemp=¦b¥Øªº¸ê®Æ§¨ÅܧóÀɮצWºÙ®Éµo¥Í¿ù»~:
-ErrorRegisterServer=µLªkµn¿ý DLL/OCX ÀÉ®×: %1¡C
-ErrorRegSvr32Failed=°õ¦æ RegSvr32 ¥¢±Ñ¡A¿ù»~½X¬° %1¡C
-ErrorRegisterTypeLib=µLªkµn¿ý Type Library: %1¡C
+ErrorRegisterServer=µLªkª`¥U DLL/OCX ÀÉ®×: %1¡C
+ErrorRegSvr32Failed=RegSvr32 ¥¢±Ñ¡F°h¥X¥N½X %1
+ErrorRegisterTypeLib=µLªkª`¥UÃþ«¬®w: %1¡C
; *** Post-installation errors
ErrorOpeningReadme=¶}±ÒŪ§ÚÀɮ׮ɵo¥Í¿ù»~¡C
ErrorRestartingComputer=¦w¸Ëµ{¦¡µLªk«·s±Ò°Ê¹q¸£¡A½Ð¥H¤â°Ê¤è¦¡¦Û¦æ«·s±Ò°Ê¹q¸£¡C
; *** Uninstaller messages
-UninstallNotFound=ÀÉ®× "%1" ¤£¦s¦b¡AµLªk²¾°£µ{¦¡¡C
-UninstallOpenError=µLªk¶}±ÒÀÉ®× "%1"¡AµLªk²¾°£µ{¦¡¡C
-UninstallUnsupportedVer=³oÓª©¥»ªº¸Ñ°£¦w¸Ëµ{¦¡µLªk¿ëÃÑ°O¿ýÀÉ "%1" ¤§®æ¦¡¡AµLªk¸Ñ°£¦w¸Ë¡C
+UninstallNotFound=Àɮס§%1¡¨¤£¦s¦b¡AµLªk²¾°£µ{¦¡¡C
+UninstallOpenError=µLªk¶}±ÒÀɮס§%1¡¨¡AµLªk²¾°£µ{¦¡¡C
+UninstallUnsupportedVer=³oÓª©¥»ªº¸Ñ°£¦w¸Ëµ{¦¡µLªk¿ëÃÑ°O¿ýÀÉ ¡§%1¡¨ ¤§®æ¦¡¡AµLªk¸Ñ°£¦w¸Ë¡C
UninstallUnknownEntry=¸Ñ°£¦w¸Ë°O¿ýÀɤ¤µo²{¥¼ª¾ªº°O¿ý (%1)¡C
ConfirmUninstall=±z½T©wn§¹¥þ²¾°£ %1 ¤Î¨ä¬ÛÃöªºÀɮ׶Ü?
UninstallOnlyOnWin64=³oÓµ{¦¡¥u¯à¦b 64 ¦ì¤¸ªº Windows ¤W¸Ñ°£¦w¸Ë¡C
@@ -291,7 +298,7 @@ UninstallStatusLabel=
UninstalledAll=%1 ¤w¸g¦¨¥\±q±zªº¹q¸£¤¤²¾°£¡C
UninstalledMost=%1 ¸Ñ°£¦w¸Ë§¹¦¨¡C%n%n¬Y¨ÇÀɮפΤ¸¥óµLªk²¾°£¡A±z¥i¥H¦Û¦æ§R°£³o¨ÇÀɮסC
UninstalledAndNeedsRestart=n§¹¦¨ %1 ªº¸Ñ°£¦w¸Ëµ{§Ç¡A±z¥²¶·«·s±Ò°Ê¹q¸£¡C%n%n±z·Qn²{¦b«·s±Ò°Ê¹q¸£¶Ü?
-UninstallDataCorrupted=ÀÉ®× "%1" ¤w¸g·l·´¡AµLªk¸Ñ°£¦w¸Ë¡C
+UninstallDataCorrupted=Àɮס§%1¡¨¤w¸g·l·´¡AµLªk¸Ñ°£¦w¸Ë¡C
; *** Uninstallation phase messages
ConfirmDeleteSharedFileTitle=²¾°£¦@¥ÎÀÉ®×
@@ -301,11 +308,14 @@ SharedFileLocationLabel=
WizardUninstalling=¸Ñ°£¦w¸Ëª¬ºA
StatusUninstalling=¥¿¦b¸Ñ°£¦w¸Ë %1...
+; *** Shutdown block reasons
+ShutdownBlockReasonInstallingApp=¥¿¦b¦w¸Ë %1.
+ShutdownBlockReasonUninstallingApp=¥¿¦b¸Ñ°£¦w¸Ë %1.
+
; The custom messages below aren't used by Setup itself, but if you make
; use of them in your scripts, you'll want to translate them.
[CustomMessages]
-
NameAndVersion=%1 ª©¥» %2
AdditionalIcons=ªþ¥[¹Ï¥Ü:
CreateDesktopIcon=«Ø¥ß®à±¹Ï¥Ü(&D)
@@ -315,3 +325,7 @@ UninstallProgram=
LaunchProgram=±Ò°Ê %1
AssocFileExtension=±N %1 »PÀÉ®×°ÆÀɦW %2 ²£¥ÍÃöÁp(&A)
AssocingFileExtension=¥¿¦b±N %1 »PÀÉ®×°ÆÀɦW %2 ²£¥ÍÃöÁp...
+AutoStartProgramGroupDescription=¶}±Ò:
+AutoStartProgram=¦Û°Ê¶}±Ò %1
+AddonHostProgramNotFound=%1 µLªk¦b±z©Ò¿ïªº¸ê®Æ§¨¤¤§ä¨ì¡C%n%n±z¬O§_ÁÙnÄ~Äò¡H
+
diff --git a/inno_setup/Latvian-1-5.1.11.isl b/inno_setup/Latvian-5.5.0.isl
similarity index 73%
rename from inno_setup/Latvian-1-5.1.11.isl
rename to inno_setup/Latvian-5.5.0.isl
index 1ceb7c2..cd99b34 100644
--- a/inno_setup/Latvian-1-5.1.11.isl
+++ b/inno_setup/Latvian-5.5.0.isl
@@ -1,7 +1,7 @@
;Agris Ausejs
;******************************************************
; *** ***
-; *** Inno Setup version 5.1.11+ Latvian messages ***
+; *** Inno Setup version 5.5.1+ Latvian messages ***
; *** ***
; *** Original Author: ***
; *** ***
@@ -40,9 +40,9 @@ LanguageCodePage=1257
; *** Application titles
SetupAppTitle=Uzstâdîðana
-SetupWindowTitle=Noòemðana - %1
-UninstallAppTitle=Noòemðana
-UninstallAppFullTitle=%1 Noòemðana
+SetupWindowTitle=Uzstâdîðana - %1
+UninstallAppTitle=Atinstalâcija
+UninstallAppFullTitle=%1 Atinstalâcija
; *** Misc. common
InformationTitle=Informâcija
@@ -56,29 +56,33 @@ LdrCannotExecTemp=Neiesp
; *** Startup error messages
LastErrorMessage=%1.%n%nKïûda %2: %3
-SetupFileMissing=Datne %1 nav atrodama uzstâdîðanas mapç. Lûdzu, izlabojiet kïûdu vai iegâdâjieties jaunu programmas kopiju.
+SetupFileMissing=Datne %1 nav atrodama instalâcijas mapç. Lûdzu, izlabojiet kïûdu vai iegâdâjieties jaunu programmas kopiju.
SetupFileCorrupt=Uzstâdâmâs datnes ir sabojâtas. Lûdzu, iegâdâjieties jaunu programmas kopiju.
-SetupFileCorruptOrWrongVer=Uzstâdâmâs datnes ir bojâtas vai nav savienojamas ar ðo uzstâdîðanas programmu. Lûdzu, izlabojiet ðo kïûdu vai iegâdâjieties jaunu programmas kopiju.
+SetupFileCorruptOrWrongVer=Uzstâdâmâs datnes ir bojâtas vai nav savienojamas ar ðo Uzstâdîðanas programmu. Lûdzu, izlabojiet ðo kïûdu vai iegâdâjieties jaunu programmas kopiju.
+InvalidParameter=Nederîgs parametrs tika pieòemts uz komandrindas:%n%n%1
+SetupAlreadyRunning=Uzstâdîðana jau darbojas.
+WindowsVersionNotSupported=Ðî programma neatbalsta Windows versiju datorâ darbojas.
+WindowsServicePackRequired=Ðî programma pieprasa %1 servisa pakotnes %2 vai jaunâka.
NotOnThisPlatform=Ðo programmu nevar palaist uz %1.
OnlyOnThisPlatform=Ðî programma darbojas uz %1.
OnlyOnTheseArchitectures=Ðo programmu var uzstâdît tikai uz ðâdâm Windows versijâm:%n%n%1
-MissingWOW64APIs=Paðlaik palaistâ Windows versija neatbalsta 64-bitu uzstâdîðanu. Lai izlabotu ðo kïûdu, uzinstalçjiet Service Pack %1.
+MissingWOW64APIs=Paðlaik palaistâ Windows versija neatbalsta 64-bitu instalâciju. Lai izlabotu ðo kïûdu, uzinstalçjiet Service Pack %1.
WinVersionTooLowError=Ðî programma pieprasa %1 versiju %2 vai jaunâku.
WinVersionTooHighError=Ðo programmu nevar uzstâdît uz %1 versijas %2 vai jaunâkas.
-AdminPrivilegesRequired=Jums ir jâbût adminstratoram, lai varçtu uzsâkt uzstâdîðanu.
+AdminPrivilegesRequired=Jums ir jâbût adminstratoram, lai varçtu uzsâkt instalâciju.
PowerUserPrivilegesRequired=Jums ir jâbût administratoram vai pilnvarotam lietotâjam, lai uzstâdîtu ðo programmu.
SetupAppRunningError=Uzstâdîðana ir atklâjusi, ka %1 paðlaik darbojas.%n%nLûdzu, aizveriet visas programmas un spiediet "Ok" vai "Atcelt", lai izietu.
-UninstallAppRunningError=Noòeðana ir atklâjusi ka %1 paðlaik darbojas.%n%nLûdzu, aizveriet visas programmas un spiediet "Ok", lai turpinâtu, vai "Atcelt", lai izietu.
+UninstallAppRunningError=Atinstalâcija ir atklâjusi ka %1 paðlaik darbojas.%n%nLûdzu, aizveriet visas programmas un spiediet "Ok", lai turpinâtu, vai "Atcelt", lai izietu.
; *** Misc. errors
ErrorCreatingDir=Uzstâdîðanâ ir neiespçjami izveidot mapi "%1"
ErrorTooManyFilesInDir=Neiespçjami izveidot datnes mapç "%1", jo tâ satur pârâk daudz datòu
; *** Setup common messages
-ExitSetupTitle=Iziet no uzstâdîðanas
-ExitSetupMessage=Uzstâdîðana nav pabeigta. Ja Jûs tagad iziesiet, tad programma netiks uzstâdîta.%n%nLai uzstâdîtu programmu, jums bûs atkal jâpalaiþ uzstâdîðana. %n%nIziet no uzstâdîðanas?
-AboutSetupMenuItem=&Par uzstâdîðanu...
-AboutSetupTitle=Par uzstâdîðanu
+ExitSetupTitle=Iziet no Uzstâdîðanas
+ExitSetupMessage=Uzstâdîðana nav pabeigta. Ja Jûs tagad iziesiet, tad programma netiks uzinstalçta.%n%nJums bûs atkal jâpalaiþ Uzstâdîðana, lai pabeigtu programmas instalâciju.%n%nIziet no Uzstâdîðanas?
+AboutSetupMenuItem=&Par Uzstâdîðanu...
+AboutSetupTitle=Par Uzstâdîðanu
AboutSetupMessage=%1 versija %2%n%3%n%n%1 mâjas lapa:%n%4
AboutSetupNote=
TranslatorNote=
@@ -99,23 +103,23 @@ ButtonWizardBrowse=P
ButtonNewFolder=I&zveidot jaunu mapi
; *** "Select Language" dialog messages
-SelectLanguageTitle=Izvçlieties uzstâdîðanas valodu
-SelectLanguageLabel=Izvçlieties valodu, kurâ notiks uzstâdîðana:
+SelectLanguageTitle=Izvçlieties Uzstâdîðanas valodu
+SelectLanguageLabel=Izvçlieties valodu, kurâ notiks Uzstâdîðana:
; *** Common wizard text
-ClickNext=Spiediet "Tâlâk", lai turpinâtu, vai "Atcelt", lai izietu no uzstâdîðanas.
+ClickNext=Spiediet "Tâlâk", lai turpinâtu, vai "Atcelt", lai izietu no Uzstâdîðanas.
BeveledLabel=
BrowseDialogTitle=Pârlûkot mapi
BrowseDialogLabel=Izvçlieties mapi no saraksta, tad spiediet "Ok".
NewFolderName=Jauna mape
; *** "Welcome" wizard page
-WelcomeLabel1=Laipni lûdzam [name] uzstâdîðanâ
-WelcomeLabel2=Ðis uzstâdîs [name/ver] uz Jûsu datora.%n%nPirms turpinâðanas vçlams aizvçrt visas programmas.
+WelcomeLabel1=Laipni lûdzam [name] Uzstâdîðanâ
+WelcomeLabel2=Ðis uzstâdîs [name/ver] uz Jûsu datora.%n%nVçlams aizvçrt visas programmas pirms turpinâðanas.
; *** "Password" wizard page
WizardPassword=Parole
-PasswordLabel1=Ðî uzstâdîðana ir aizsargâta ar paroli.
+PasswordLabel1=Ðî instalâcija ir aizsargâta ar paroli.
PasswordLabel3=Lûdzu, ievadiet paroli, tad spiediet "Tâlâk", lai turpinâtu. Parole ir reìistrjutîga.
PasswordEditLabel=&Parole:
IncorrectPassword=Parole, ko Jûs ievadîjât, ir nepareiza. Lûdzu, mçìiniet vçlreiz.
@@ -123,24 +127,24 @@ IncorrectPassword=Parole, ko J
; *** "License Agreement" wizard page
WizardLicense=Lîgums
LicenseLabel=Lûdzu, izlasiet sekojoðo informâciju, pirms turpinât.
-LicenseLabel3=Lûdzu, izlasiet Lîgumu. Jums ir jâapstiprina Lîgums, lai turpinâtu uzstâdîðanu.
+LicenseLabel3=Lûdzu, izlasiet Lîgumu. Jums ir jâapstiprina Lîgums, lai turpinâtu instalâciju.
LicenseAccepted=Es &piekrîtu lîgumam
LicenseNotAccepted=Es &nepiekrîtu lîgumam
; *** "Information" wizard pages
WizardInfoBefore=Informâcija
InfoBeforeLabel=Lûdzu, izlasiet ðo informâciju.
-InfoBeforeClickLabel=Kad esat gatavs turpinât uzstâdîðanu, spiediet "Tâlâk".
+InfoBeforeClickLabel=Kad esat gatavs turpinât instalâciju, spiediet "Tâlâk".
WizardInfoAfter=Informâcija
InfoAfterLabel=Lûdzu izlasiet sekojoðo informâciju.
-InfoAfterClickLabel=Kad esat gatavs turpinât uzstâdîðanu, spiediet "Tâlâk".
+InfoAfterClickLabel=Kad esat gatavs turpinât instalâciju, spiediet "Tâlâk".
; *** "User Information" wizard page
WizardUserInfo=Lietotâja informâcija
UserInfoDesc=Lûdzu, ievadiet savu informâciju.
UserInfoName=&Lietotâja vârds:
UserInfoOrg=&Organizâcija:
-UserInfoSerial=&Sçrijas numurs:
+UserInfoSerial=&Seriâlais numurs:
UserInfoNameRequired=Jums ir jâievada savs vârds.
; *** "Select Destination Location" wizard page
@@ -149,11 +153,12 @@ SelectDirDesc=Kur [name] tiks instal
SelectDirLabel3=[name] datnes tiks instalçtas norâdîtajâ mapç.
SelectDirBrowseLabel=Lai turpinâtu, spiediet "Tâlâk". Ja vçlaties norâdît citu mapi, spiediet "Pârlûkot".
DiskSpaceMBLabel=Ir nepiecieðami brîvi [mb] MB uz cietâ diska.
-ToUNCPathname=Uzstâdîðana nevar uzstâdît datnes norâdîtajâ adresç. Ja Jûs mçìinât uzstâdît tîklâ, tad Jums ir nepiecieðama speciâla mape.
-InvalidPath=Jums ir jânorâda pilna uzstâdîðanas adrese, piemçrs:%n%nC:\APP%n%nvai UNC adrese:%n%n\\server\share
+CannotInstallToNetworkDrive=Iestatîðana nevar instalçt ar tîkla disku.
+CannotInstallToUNCPath=Iestatîðana nevar uzstâdît uz UNC ceïu.
+InvalidPath=Jums ir jânorâda pilna instalâcijas adrese, piemçrs:%n%nC:\APP%n%nvai UNC adrese:%n%n\\server\share
InvalidDrive=Ierîce UNC, kuru Jûs izvçlçjâties, nepastâv vai arî nav pieejama. Lûdzu, izvçlieties citu.
DiskSpaceWarningTitle=Nepietiek vietas uz diska
-DiskSpaceWarning=Uzstâdîðanai ir nepiecieðami vismaz %1 KB brîvâs vietas uz diska, bet pieejami ir tikai %2 KB.%n%nVai vçlaties turpinât?
+DiskSpaceWarning=Instalâcijai ir nepiecieðami vismaz %1 KB brîvâs vietas uz diska, bet pieejami ir tikai %2 KB.%n%nVai vçlaties turpinât?
DirNameTooLong=Mapes nosaukums vai adrese ir pârâk gara.
InvalidDirName=Mapes nosaukums nav derîgs.
BadDirName32=Mapes nosaukumâ nedrîkst bût ðâdi simboli:%n%n%1
@@ -166,10 +171,10 @@ DirDoesntExist=Mape:%n%n%1%n%ndoes nepast
WizardSelectComponents=Izvçlieties sastâvdaïas
SelectComponentsDesc=Kurus komponentus vçlaties uzstâdît?
SelectComponentsLabel2=Izvçlieties komponentus, kurus vçlaties uzstâdît. Spiediet "Tâlâk", lai turpinâtu.
-FullInstallation=Pilna uzstâdîðana
+FullInstallation=Pilna Uzstâdîðana
; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
-CompactInstallation=Kompakta uzstâdîðana
-CustomInstallation=Izveidot uzstâdîðanu
+CompactInstallation=Kompakta Uzstâdîðana
+CustomInstallation=Izveidot Uzstâdîðanu
NoUninstallWarningTitle=Komponenti jau pastâv
NoUninstallWarning=Uzstâdîðana ir atklâjusi ka ðâdi faili jau ir uzstâdîti:%n%n%1%n%nAtiestatiet ðos komponentus.%n%nVai vçlaties turpinât?
ComponentSize1=%1 KB
@@ -179,11 +184,11 @@ ComponentsDiskSpaceMBLabel=Pa
; *** "Select Additional Tasks" wizard page
WizardSelectTasks=Papilduzdevumu izvçlne
SelectTasksDesc=Kurus papilduzdevumus vajadzçtu veikt?
-SelectTasksLabel2=Izvçlieties, kâdi papilduzdevumi tiks veikti [name] uzstâdîðanas laikâ, tad spiediet "Tâlâk".
+SelectTasksLabel2=Izvçlieties, kâdi papilduzdevumi tiks veikti [name] Uzstâdîðanas laikâ, tad spiediet "Tâlâk".
; *** "Select Start Menu Folder" wizard page
WizardSelectProgramGroup=Izvçlieties Start Menu mapi
-SelectStartMenuFolderDesc=Kur uzstâdîðanas programmai vajadzçtu likt îsinâjumikonas?
+SelectStartMenuFolderDesc=Kur Uzstâdîðanas programmai vajadzçtu likt îsinâjumikonas?
SelectStartMenuFolderLabel3=Uzstâdîðana izveidos îsinâjumikonas Start Menu mapç.
SelectStartMenuFolderBrowseLabel=Lai turpinâtu, spiediet "Tâlâk". Ja vçlaties norâdît citu mapi, spiediet "Pârlûkot".
MustEnterGroupName=Jums ir jânorâda mape.
@@ -193,10 +198,10 @@ BadGroupName=Mapes nosaukums satur k
NoProgramGroupCheck2=&Neizveidot Start Menu mapi
; *** "Ready to Install" wizard page
-WizardReady=Gatavs uzstâdîðanai
+WizardReady=Gatavs instalâcijai
ReadyLabel1=Uzstâdîðana ir gatava instalçt [name] uz Jûsu datora.
-ReadyLabel2a=Spiediet "Uzstâdît", lai sâktu uzstâdîðanu, vai spiediet Atpakaï, lai izmainîtu parametrus.
-ReadyLabel2b=Spiediet "Uzstâdît", lai sâktu uzstâdîðanu.
+ReadyLabel2a=Spiediet "Uzstâdît", lai sâktu instalâciju, vai spiediet Atpakaï, lai izmainîtu parametrus.
+ReadyLabel2b=Spiediet "Uzstâdît", lai sâktu instalâciju.
ReadyMemoUserInfo=Lietotâja informâcija:
ReadyMemoDir=Galamçríis:
ReadyMemoType=Uzstâdîðanas tips:
@@ -205,20 +210,24 @@ ReadyMemoGroup=Start Menu mape:
ReadyMemoTasks=Papilduzdevumi:
; *** "Preparing to Install" wizard page
-WizardPreparing=Gatavoties uzstâdîðanai
+WizardPreparing=Gatavoties instalâcijai
PreparingDesc=Uzstâdîðana ir gatava instalçt [name] uz Jûsu datora.
-PreviousInstallNotCompleted=Uzstâdîðana/noòemðana iepriekðçjai programmai nav pabeigta. Jums ir jâpârstartç dators, lai pabeigtu uzstâdîðanu.%n%nPçc pârstartçðanas palaidiet uzstâdîðanu no jauna, lai pabeigtu uzstâdît [name].
+PreviousInstallNotCompleted=Instalâcija/noòemðana iepriekðçjai programmai nav pabeigta. Jums ir jâpârstartç dators, lai pabeigtu instalâciju.%n%nPçc pârstartçðanas palaidiet uzstâdîðanu no jauna, lai pabeigtu uzstâdît [name].
CannotContinue=Uzstâdîðanu nevar turpinât. Lûdzu, spiediet "Atcelt", lai izietu.
+ApplicationsFound=Ðâdas lietojumprogrammas izmanto failus, kas ir jâatjaunina ar Setup. Tas ir ieteicams, ka jûs ïaujat Setup automâtiski aizvçrt ðos pieteikumus.
+ApplicationsFound2=Ðâdas lietojumprogrammas izmanto failus, kas ir jâatjaunina ar Setup. Tas ir ieteicams, ka jûs ïaujat Setup automâtiski aizvçrt ðos pieteikumus. Pçc uzstâdîðana ir pabeigta, Setup mçìinâs atsâkt pieteikumus.
+CloseApplications=&Automâtiski aizvçrtu programmas
+DontCloseApplications=&Nav aizvçrtu programmas
; *** "Installing" wizard page
-WizardInstalling=Uzstâdîðana
+WizardInstalling=Instalâcija
InstallingLabel=Lûdzu, uzgaidiet, kamçr [name] tiks uzstâdîts uz Jûsu datora.
; *** "Setup Completed" wizard page
-FinishedHeadingLabel=Pabeigta [name] uzstâdîðana
+FinishedHeadingLabel=Pabeigta [name] Uzstâdîðana
FinishedLabelNoIcons=Uzstâdîðana pabeigta.
FinishedLabel=Uzstâdîðana pabeigta. Programmu var palaist, uzklikðíinot uz izveidotajâm ikonâm.
-ClickFinish=Spiediet "Pabeigt", lai aizvçrtu uzstâdîðanu.
+ClickFinish=Spiediet "Pabeigt", lai aizvçrtu Uzstâdîðanu.
FinishedRestartLabel=Lai pabeigtu [name] uzstâdîðanu, nepiecieðams pârstartçt Jûsu datoru. Vai vçlaties to darît tagad?
FinishedRestartMessage=Lai pabeigtu [name] uzstâdîðanu, nepiecieðams pârstartçt Jûsu datoru.%n%nVai vçlaties to darît tagad?
ShowReadmeCheck=Jâ, vçlos apskatît README failu
@@ -237,18 +246,20 @@ FileNotInDir2=Datne "%1" neatrodas "%2". L
SelectDirectoryLabel=Lûdzu, norâdiet nâkamâ diska atraðanâs vietu.
; *** Installation phase messages
-SetupAborted=Uzstâdîðana netika pabeigta.%n%nLûdzu, izlabojiet kïûdu un palaidiet uzstâdîðanu no jauna.
-EntryAbortRetryIgnore=Spiediet "Atkârtot", lai mçìinâtu vçlreiz, vai "Ignorçt", lai turpinâtu, vai "Pârtraukt", lai beigtu uzstâdîðanu.
+SetupAborted=Uzstâdîðana netika pabeigta.%n%nLûdzu, izlabojiet kïûdu un palaidiet Uzstâdîðanu no jauna.
+EntryAbortRetryIgnore=Spiediet "Atkârtot", lai mçìinâtu vçlreiz, vai "Ignorçt", lai turpinâtu, vai "Pârtraukt", lai beigtu instalâciju.
; *** Installation status messages
+StatusClosingApplications=Noslçguma pieteikumi...
StatusCreateDirs=Mapju izveidoðana...
StatusExtractFiles=Datòu kopçðana...
StatusCreateIcons=Îsinâjumikonu izveidoðana...
StatusCreateIniEntries=Izveido INI ierakstu...
StatusCreateRegistryEntries=Izveido reìistra ierakstus...
StatusRegisterFiles=Reìistrç datnes...
-StatusSavingUninstall=Saglabâ noòemðanas datus...
-StatusRunProgram=Pabeidz uzstâdîðanu...
+StatusSavingUninstall=Saglabâ atinstalçðanas datus...
+StatusRunProgram=Pabeidz instalâciju...
+StatusRestartingApplications=Restartçðana pieteikumi...
StatusRollback=Izveido izmaiòas...
; *** Misc. errors
@@ -256,7 +267,7 @@ ErrorInternal2=Iek
ErrorFunctionFailedNoCode=%1 cieta neveiksmi
ErrorFunctionFailed=%1 cieta neveiksmi; kods %2
ErrorFunctionFailedWithMessage=%1 cieta neveiksmi; kods %2.%n%3
-ErrorExecutingProgram=Nespçju palaist failu:%n%1
+ErrorExecutingProgram=Neiespçjami palaist failu:%n%1
; *** Registry errors
ErrorRegOpenKey=Kïûda, atverot reìistra atslçgu:%n%1\%2
@@ -267,13 +278,13 @@ ErrorRegWriteKey=K
ErrorIniEntry=Kïûda, izveidojot INI ieraksta datni "%1".
; *** File copying errors
-FileAbortRetryIgnore=Spiediet "Atkârtot", lai mçìinâtu vçlreiz, "Ignorçt", lai izlaistu datni (nav ieteicams), vai "Pârtraukt", lai beigtu uzstâdîðanu.
-FileAbortRetryIgnore2=Spiediet "Atkârtot", lai mçìinâtu vçlreiz, "Ignorçt", lai turpinâtu (nav ieteicams), vai "Pârtraukt", lai beigtu uzstâdîðanu.
+FileAbortRetryIgnore=Spiediet "Atkârtot", lai mçìinâtu vçlreiz, "Ignorçt", lai izlaistu datni (nav ieteicams), vai "Pârtraukt", lai beigtu instalâciju.
+FileAbortRetryIgnore2=Spiediet "Atkârtot", lai mçìinâtu vçlreiz, "Ignorçt", lai turpinâtu (nav ieteicams), vai "Pârtraukt", lai beigtu instalâciju.
SourceIsCorrupted=Datnes avots ir bojâts
SourceDoesntExist=Datnes avots "%1" nepastâv
-ExistingFileReadOnly=Pastâvoðâ datne ir izveidota kâ read-only.%n%nSpiediet "Atkârtot", lai noòemtu read-only îpaðîbu un mçìinâtu vçlreiz, "Ignorçt", lai izlaistu datni, vai "Pârtraukt", lai beigtu uzstâdîðanu.
+ExistingFileReadOnly=Pastâvoðâ datne ir izveidota kâ read-only.%n%nSpiediet "Atkârtot", lai noòemtu read-only îpaðîbu un mçìinâtu vçlreiz, "Ignorçt", lai izlaistu datni, vai "Pârtraukt", lai beigtu instalâciju.
ErrorReadingExistingDest=Kïûda, nolasot pastâvoðo datni:
-FileExists=Datne jau pastâv.%n%nVai vçlaties, lai uzstâdîðana to pârraksta?
+FileExists=Datne jau pastâv.%n%nVai vçlaties, lai Uzstâdîðana to pârraksta?
ExistingFileNewer=Pastâvoðâ datne ir jaunâka par to, kuru nepiecieðams uzstâdît. Vçlams atstât jau pastâvoðo datni.%n%nVai vçlaties to paturçt?
ErrorChangingAttr=Radusies kïûda, mçìinot nomainît datnes îpaðîbu:
ErrorCreatingTemp=Radusies kïûda, izveidojot datni galamçría mapç:
@@ -283,7 +294,7 @@ ErrorReplacingExistingFile=Radusies k
ErrorRestartReplace=Atkârtota aizstâðana cietusi neveiksmi:
ErrorRenamingTemp=Radusies kïûda, nomainot nosaukumu datnei galamçría mapç:
ErrorRegisterServer=Neiespçjami reìistrçt DLL/OCX: %1
-ErrorRegisterServerMissingExport=DllReìistra servera eksports nav atrodams
+ErrorRegSvr32Failed=RegSvr32 neizdevâs ar izejas kodu %1
ErrorRegisterTypeLib=Neiespçjami reìistrçt tipa bibliotçku: %1
; *** Post-installation errors
@@ -291,26 +302,30 @@ ErrorOpeningReadme=Radusies k
ErrorRestartingComputer=Uzstâdîðana nevar pârstartçt datoru. Lûdzu, izdariet to manuâli.
; *** Uninstaller messages
-UninstallNotFound=Datne "%1" nepastâv. Nevar noòemt.
-UninstallOpenError=Datni "%1" nevar atvçrt. Nevar noòemt
-UninstallUnsupportedVer=Noòeðanas datne "%1" nav atpazîstama ðai noòemðanas programmai. Nevar noòemt
-UninstallUnknownEntry=Nezinâms ieraksts (%1) izveidoja sadursmi ar noòeðanu
+UninstallNotFound=Datne "%1" nepastâv. Nevar atinstalçt.
+UninstallOpenError=Datni "%1" nevar atvçrt. Nevar atinstalçt
+UninstallUnsupportedVer=Atinstalçðanas datne "%1" nav atpazîstama ðai atinstalçðanas programmai. Nevar atinstalçt
+UninstallUnknownEntry=Nezinâms ieraksts (%1) izveidoja sadursmi ar atinstalâciju
ConfirmUninstall=Vai esat pârliecinâts, ka vçlaties pilnîbâ noòemt %1 un visus tâ komponentus?
-UninstallOnlyOnWin64=Noòemðanu var veikt tikai ar 64-bitu Windows.
-OnlyAdminCanUninstall=Noòeðanu var veikt tikai lietotâjs ar Adminstratora privilçìijâm.
+UninstallOnlyOnWin64=Ðo instalâciju var noòemt tikai ar 64-bitu Windows.
+OnlyAdminCanUninstall=Atinstalâciju var veikt tikai lietotâjs ar Adminstratora privilçìijâm.
UninstallStatusLabel=Lûdzu uzgaidiet, kamçr %1 tiek noòemts no Jûsu datora.
UninstalledAll=%1 tika veiksmîgi noòemts no Jûsu datora.
-UninstalledMost=%1 noòeðana pabeigta.%n%nDaþus elementus nevarçja noòemt. Tos var noòemt manuâli.
-UninstalledAndNeedsRestart=Lai pabeigtu noòeðanu %1, Jûsu dators jâpârstartç.%n%nVai vçlaties to darît tagad?
-UninstallDataCorrupted="%1" datne ir bojâta. Nevar noòemt
+UninstalledMost=%1 atinstalâcija pabeigta.%n%nDaþus elementus nevarçja noòemt. Tos var noòemt manuâli.
+UninstalledAndNeedsRestart=Lai pabeigtu atinstalâciju %1, Jûsu dators jâpârstartç.%n%nVai vçlaties to darît tagad?
+UninstallDataCorrupted="%1" datne ir bojâta. Nevar atinstalçt
; *** Uninstallation phase messages
ConfirmDeleteSharedFileTitle=Noòemt kopîgâs datnes?
ConfirmDeleteSharedFile2=Sistçma ir secinâjusi, ka ðîs koplietoðanas datnes vairs netiks lietotas. Vai vçlaties tâs noòemt?%n%nJa kâda cita programma izmanto ðîs datnes, tad ðî programma var strâdât nekorekti. Ja neesat droðs, izvçlieties "Nç". Atstâjot ðîs datnes, Jûsu datoram netiks nodarîti nekâdi bojâjumi.
SharedFileNameLabel=Faila nosaukums:
SharedFileLocationLabel=Atraðanâs vieta:
-WizardUninstalling=Noòeðanas statuss
-StatusUninstalling=Noòem %1...
+WizardUninstalling=Atinstalçðanas Statuss
+StatusUninstalling=Atinstalç %1...
+
+; *** Shutdown block reasons
+ShutdownBlockReasonInstallingApp=Instalçðana %1.
+ShutdownBlockReasonUninstallingApp=Atinstalç %1.
; The custom messages below aren't used by Setup itself, but if you make
; use of them in your scripts, you'll want to translate them.
@@ -322,7 +337,10 @@ AdditionalIcons=Papildu ikonas:
CreateDesktopIcon=Izveidot &darbvisrmas ikonu
CreateQuickLaunchIcon=Izveidot &Quick Launch ikonu
ProgramOnTheWeb=%1 Internçtâ
-UninstallProgram=Noòemt %1
+UninstallProgram=Atinstalçt %1
LaunchProgram=Palaist %1
AssocFileExtension=&Apvienot %1 ar %2 faila paplaðinâjumu
-AssocingFileExtension=Apvieno %1 ar %2 faila paplaðinâjumu...
+AssocingFileExtension=Apvienoðana %1 ar %2 faila paplaðinâjumu...
+AutoStartProgramGroupDescription=starta:
+AutoStartProgram=Automâtiski sâkt %1
+AddonHostProgramNotFound=%1 nevar atrasties mapç jûs izvçlçjâties.%n%nVai vçlaties turpinât?
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index ddcac6f..63e1c3b 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -530,16 +530,16 @@ Name: "el"; MessagesFile: "compiler:Languages\Greek.isl"
Name: "fr"; MessagesFile: "compiler:Languages\French.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-fr.win32-bin.txt"
Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-it.win32-bin.txt"
Name: "ja"; MessagesFile: "compiler:Languages\Japanese.isl"
-Name: "lv"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Latvian-1-5.1.11.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-lv.win32-bin.txt"
+Name: "lv"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Latvian5.5.0.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-lv.win32-bin.txt"
Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-nl.win32-bin.txt"
Name: "pt_BR"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
-Name: "zh_CN"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\ChineseSimp-12-5.1.11.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"
-Name: "zh_TW"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\ChineseTrad-2-5.1.11.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"
+Name: "zh_CN"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\ChineseSimp-5.5.3.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"
+Name: "zh_TW"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\ChineseTrad-5.5.3.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"
-;; The following language files are available as well, in alphabetical
-;; order: Basque, BrazilianPortuguese, Catalan, Czech, Danish, Dutch,
-;; Finnish, Hungarian, Italian, Norwegian, Polish, Portuguese,
-;; Russian, Slovak, Slovenian, Spanish
+;; See http://www.jrsoftware.org/files/istrans/ for a complete list of
+;; Inno Setup translations. Unofficial translations must be downloaded
+;; and added to this repository as is done with Latvian and Chinese above.
+;; Unofficial translations should be updated when Inno Setup is.
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; These are only for improved text messages
diff --git a/inno_setup/gnucash.iss b/inno_setup/gnucash.iss
index 7b46984..250d6d5 100644
--- a/inno_setup/gnucash.iss
+++ b/inno_setup/gnucash.iss
@@ -402,16 +402,16 @@ Name: "el"; MessagesFile: "compiler:Languages\Greek.isl"
Name: "fr"; MessagesFile: "compiler:Languages\French.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-fr.win32-bin.txt"
Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-it.win32-bin.txt"
Name: "ja"; MessagesFile: "compiler:Languages\Japanese.isl"
-Name: "lv"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Latvian-1-5.1.11.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-lv.win32-bin.txt"
+Name: "lv"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Latvian-5.5.0.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-lv.win32-bin.txt"
Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-nl.win32-bin.txt"
Name: "pt_BR"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
-Name: "zh_CN"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\ChineseSimp-12-5.1.11.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"
-Name: "zh_TW"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\ChineseTrad-2-5.1.11.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"
+Name: "zh_CN"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\ChineseSimp-5.5.3.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"
+Name: "zh_TW"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\ChineseTrad-5.5.3.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"
-;; The following language files are available as well, in alphabetical
-;; order: Basque, BrazilianPortuguese, Catalan, Czech, Danish, Dutch,
-;; Finnish, Hungarian, Italian, Norwegian, Polish, Portuguese,
-;; Russian, Slovak, Slovenian, Spanish
+;; See http://www.jrsoftware.org/files/istrans/ for a complete list of
+;; Inno Setup translations. Unofficial translations must be downloaded
+;; and added to this repository as is done with Latvian and Chinese above.
+;; Unofficial translations should be updated when Inno Setup is.
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; These are only for improved text messages
commit b2da7735bc75234b606c71bdb1228026279392be
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Jun 5 15:05:36 2018 -0700
Update Inno Setup translations for built-in languages.
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index f4a3614..ddcac6f 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -524,12 +524,12 @@ end;
[Languages]
Name: "en"; MessagesFile: "compiler:Default.isl"
-Name: "ca"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Catalan.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-ca.win32-bin.txt"
+Name: "ca"; MessagesFile: "compiler:Languages\Catalan.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-ca.win32-bin.txt"
Name: "de"; MessagesFile: "compiler:Languages\German.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-de.win32-bin.txt"
-Name: "el"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Greek-4-5.1.11.isl"
+Name: "el"; MessagesFile: "compiler:Languages\Greek.isl"
Name: "fr"; MessagesFile: "compiler:Languages\French.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-fr.win32-bin.txt"
Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-it.win32-bin.txt"
-Name: "ja"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Japanese-5-5.1.11.isl"
+Name: "ja"; MessagesFile: "compiler:Languages\Japanese.isl"
Name: "lv"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Latvian-1-5.1.11.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-lv.win32-bin.txt"
Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-nl.win32-bin.txt"
Name: "pt_BR"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
diff --git a/inno_setup/gnucash.iss b/inno_setup/gnucash.iss
index e224d56..7b46984 100644
--- a/inno_setup/gnucash.iss
+++ b/inno_setup/gnucash.iss
@@ -396,12 +396,12 @@ end;
[Languages]
Name: "en"; MessagesFile: "compiler:Default.isl"
-Name: "ca"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Catalan.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-ca.win32-bin.txt"
+Name: "ca"; MessagesFile: "compiler:Languages\Catalan.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-ca.win32-bin.txt"
Name: "de"; MessagesFile: "compiler:Languages\German.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-de.win32-bin.txt"
-Name: "el"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Greek-4-5.1.11.isl"
+Name: "el"; MessagesFile: "compiler:Languages\Greek.isl"
Name: "fr"; MessagesFile: "compiler:Languages\French.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-fr.win32-bin.txt"
Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-it.win32-bin.txt"
-Name: "ja"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Japanese-5-5.1.11.isl"
+Name: "ja"; MessagesFile: "compiler:Languages\Japanese.isl"
Name: "lv"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Latvian-1-5.1.11.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-lv.win32-bin.txt"
Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-nl.win32-bin.txt"
Name: "pt_BR"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
commit 02404748feed3d7d3921138dcffc16faaf952aec
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Jun 5 14:16:13 2018 -0700
Remove Catalan, Greek, and Japanese Inno Setup translations.
These languages are included in the Inno Setup distribution.
diff --git a/inno_setup/Catalan.isl b/inno_setup/Catalan.isl
deleted file mode 100644
index 5a91e2c..0000000
--- a/inno_setup/Catalan.isl
+++ /dev/null
@@ -1,319 +0,0 @@
-; *** Inno Setup version 5.5.3+ Catalan messages ***
-;
-; Translated by Carles Millan (email: carles at carlesmillan.cat)
-
-[LangOptions]
-
-LanguageName=Catal<00E0>
-LanguageID=$0403
-LanguageCodePage=1252
-
-[Messages]
-
-; *** Application titles
-SetupAppTitle=Instal·lació
-SetupWindowTitle=Instal·lació - %1
-UninstallAppTitle=Desinstal·lació
-UninstallAppFullTitle=Desinstal·la %1
-
-; *** Misc. common
-InformationTitle=Informació
-ConfirmTitle=Confirmació
-ErrorTitle=Error
-
-; *** SetupLdr messages
-SetupLdrStartupMessage=Aquest programa instal·larà %1. Voleu continuar?
-LdrCannotCreateTemp=No s'ha pogut crear un fitxer temporal. Instal·lació cancel·lada
-LdrCannotExecTemp=No s'ha pogut executar el fitxer a la carpeta temporal. Instal·lació cancel·lada
-
-; *** Startup error messages
-LastErrorMessage=%1.%n%nError %2: %3
-SetupFileMissing=El fitxer %1 no es troba a la carpeta d'instal·lació. Resoleu el problema o obteniu una nova còpia del programa.
-SetupFileCorrupt=Els fitxers d'instal·lació estan corromputs. Obteniu una nova còpia del programa.
-SetupFileCorruptOrWrongVer=Els fitxers d'instal·lació estan espatllats, o són incompatibles amb aquesta versió del programa. Resoleu el problema o obteniu una nova còpia del programa.
-InvalidParameter=Un paràmetre invàlid ha estat passat a la línia de comanda:%n%n%1
-SetupAlreadyRunning=La instal·lació ja està en curs.
-WindowsVersionNotSupported=Aquest programa no suporta la versió de Windows instal·lada al vostre ordinador.
-WindowsServicePackRequired=Aquest programa necessita %1 Service Pack %2 o posterior.
-NotOnThisPlatform=Aquest programa no funcionarà sota %1.
-OnlyOnThisPlatform=Aquest programa només pot ser executat sota %1.
-OnlyOnTheseArchitectures=Aquest programa només pot ser instal·lat en versions de Windows dissenyades per a les següents arquitectures de processador:%n%n%1
-MissingWOW64APIs=Aquesta versió de Windows no conté la funcionalitat necessària per a realitzar una instal·lació de 64 bits. Per tal de corregir aquest problema instal·leu el Service Pack %1.
-WinVersionTooLowError=Aquest programa requereix %1 versió %2 o posterior.
-WinVersionTooHighError=Aquest programa no pot ser instal·lat sota %1 versió %2 o posterior.
-AdminPrivilegesRequired=Cal que tingueu privilegis d'administrador per poder instal·lar aquest programa.
-PowerUserPrivilegesRequired=Cal que accediu com a administrador o com a membre del grup Power Users en instal·lar aquest programa.
-SetupAppRunningError=El programa d'instal·lació ha detectat que %1 s'està executant actualment.%n%nTanqueu el programa i premeu Accepta per a continuar o Cancel·la per a sortir.
-UninstallAppRunningError=El programa de desinstal·lació ha detectat que %1 s'està executant en aquest moment.%n%nTanqueu el programa i premeu Accepta per a continuar o Cancel·la per a sortir.
-
-; *** Misc. errors
-ErrorCreatingDir=El programa d'instal·lació no ha pogut crear la carpeta "%1"
-ErrorTooManyFilesInDir=No s'ha pogut crear un fitxer a la carpeta "%1" perquè conté massa fitxers
-
-; *** Setup common messages
-ExitSetupTitle=Surt
-ExitSetupMessage=La instal·lació no s'ha completat. Si sortiu ara, el programa no serà instal·lat.%n%nPer a completar-la podreu tornar a executar el programa d'instal·lació quan vulgueu.%n%nVoleu sortir-ne?
-AboutSetupMenuItem=&Sobre la instal·lació...
-AboutSetupTitle=Sobre la instal·lació
-AboutSetupMessage=%1 versió %2%n%3%n%nPàgina web de %1:%n%4
-AboutSetupNote=
-TranslatorNote=Catalan translation by Carles Millan (carles at carlesmillan.cat)
-
-; *** Buttons
-ButtonBack=< &Enrere
-ButtonNext=&Següent >
-ButtonInstall=&Instal·la
-ButtonOK=Accepta
-ButtonCancel=Cancel·la
-ButtonYes=&Sí
-ButtonYesToAll=Sí a &tot
-ButtonNo=&No
-ButtonNoToAll=N&o a tot
-ButtonFinish=&Finalitza
-ButtonBrowse=&Explora...
-ButtonWizardBrowse=&Cerca...
-ButtonNewFolder=Crea &nova carpeta
-
-; *** "Select Language" dialog messages
-SelectLanguageTitle=Trieu idioma
-SelectLanguageLabel=Trieu idioma a emprar durant la instal·lació:
-
-; *** Common wizard text
-ClickNext=Premeu Següent per a continuar o Cancel·la per a abandonar la instal·lació.
-BeveledLabel=
-BrowseDialogTitle=Trieu una carpeta
-BrowseDialogLabel=Trieu la carpeta de destinació i premeu Accepta.
-NewFolderName=Nova carpeta
-
-; *** "Welcome" wizard page
-WelcomeLabel1=Benvingut a l'assistent d'instal·lació de [name]
-WelcomeLabel2=Aquest programa instal·larà [name/ver] al vostre ordinador.%n%nÉs molt recomanable que abans de continuar tanqueu tots els altres programes oberts, per tal d'evitar conflictes durant el procés d'instal·lació.
-
-; *** "Password" wizard page
-WizardPassword=Contrasenya
-PasswordLabel1=Aquesta instal·lació està protegida amb una contrasenya.
-PasswordLabel3=Indiqueu la contrasenya i premeu Següent per a continuar. Aquesta contrasenya distingeix entre majúscules i minúscules.
-PasswordEditLabel=&Contrasenya:
-IncorrectPassword=La contrasenya introduïda no és correcta. Torneu-ho a intentar.
-
-; *** "License Agreement" wizard page
-WizardLicense=Acord de Llicència
-LicenseLabel=Cal que llegiu aquesta informació abans de continuar.
-LicenseLabel3=Cal que llegiu l'Acord de Llicència següent. Cal que n'accepteu els termes abans de continuar amb la instal·lació.
-LicenseAccepted=&Accepto l'acord
-LicenseNotAccepted=&No accepto l'acord
-
-; *** "Information" wizard pages
-WizardInfoBefore=Informació
-InfoBeforeLabel=Llegiu la informació següent abans de continuar.
-InfoBeforeClickLabel=Quan estigueu preparat per a continuar, premeu Següent.
-WizardInfoAfter=Informació
-InfoAfterLabel=Llegiu la informació següent abans de continuar.
-InfoAfterClickLabel=Quan estigueu preparat per a continuar, premeu Següent
-
-; *** "User Information" wizard page
-WizardUserInfo=Informació sobre l'usuari
-UserInfoDesc=Introduïu la vostra informació.
-UserInfoName=&Nom de l'usuari:
-UserInfoOrg=&Organització
-UserInfoSerial=&Número de sèrie:
-UserInfoNameRequired=Cal que hi introduïu un nom
-
-; *** "Select Destination Location" wizard page
-WizardSelectDir=Trieu Carpeta de Destinació
-SelectDirDesc=On s'ha d'instal·lar [name]?
-SelectDirLabel3=El programa d'instal·lació instal·larà [name] a la carpeta següent.
-SelectDirBrowseLabel=Per a continuar, premeu Següent. Si desitgeu triar una altra capeta, premeu Cerca.
-DiskSpaceMBLabel=Aquest programa necessita un mínim de [mb] MB d'espai a disc.
-CannotInstallToNetworkDrive=La instal·lació no es pot fer en un disc de xarxa.
-CannotInstallToUNCPath=La instal·lació no es pot fer a una ruta UNC.
-InvalidPath=Cal donar una ruta completa amb lletra d'unitat, per exemple:%n%nC:\Aplicació%n%no bé una ruta UNC en la forma:%n%n\\servidor\compartit
-InvalidDrive=El disc o ruta de xarxa seleccionat no existeix, trieu-ne un altre.
-DiskSpaceWarningTitle=No hi ha prou espai al disc
-DiskSpaceWarning=El programa d'instal·lació necessita com a mínim %1 KB d'espai lliure, però el disc seleccionat només té %2 KB disponibles.%n%nTot i amb això, desitgeu continuar?
-DirNameTooLong=El nom de la carpeta o de la ruta és massa llarg.
-InvalidDirName=El nom de la carpeta no és vàlid.
-BadDirName32=Un nom de carpeta no pot contenir cap dels caràcters següents:%n%n%1
-DirExistsTitle=La carpeta existeix
-DirExists=La carpeta:%n%n%1%n%nja existeix. Voleu instal·lar igualment el programa en aquesta carpeta?
-DirDoesntExistTitle=La Carpeta No Existeix
-DirDoesntExist=La carpeta:%n%n%1%n%nno existeix. Voleu que sigui creada?
-
-; *** "Select Program Group" wizard page
-WizardSelectComponents=Trieu Components
-SelectComponentsDesc=Quins components cal instal·lar?
-SelectComponentsLabel2=Trieu els components que voleu instal·lar; elimineu els components que no voleu instal·lar. Premeu Següent per a continuar.
-FullInstallation=Instal·lació completa
-; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
-CompactInstallation=Instal·lació compacta
-CustomInstallation=Instal·lació personalitzada
-NoUninstallWarningTitle=Els components Existeixen
-NoUninstallWarning=El programa d'instal·lació ha detectat que els components següents ja es troben al vostre ordinador:%n%n%1%n%nSi no estan seleccionats no seran desinstal·lats.%n%nVoleu continuar igualment?
-ComponentSize1=%1 Kb
-ComponentSize2=%1 Mb
-ComponentsDiskSpaceMBLabel=Aquesta selecció requereix un mínim de [mb] Mb d'espai al disc.
-
-; *** "Select Additional Tasks" wizard page
-WizardSelectTasks=Trieu tasques addicionals
-SelectTasksDesc=Quines tasques addicionals cal executar?
-SelectTasksLabel2=Trieu les tasques addicionals que voleu que siguin executades mentre s'instal·la [name], i després premeu Següent.
-
-; *** "Select Start Menu Folder" wizard page
-WizardSelectProgramGroup=Trieu la carpeta del Menú Inici
-SelectStartMenuFolderDesc=On cal situar els enllaços del programa?
-SelectStartMenuFolderLabel3=El programa d'instal·lació crearà l'accés directe al programa a la següent carpeta del menú d'Inici.
-SelectStartMenuFolderBrowseLabel=Per a continuar, premeu Següent. Si desitgeu triar una altra carpeta, premeu Cerca.
-MustEnterGroupName=Cal que hi introduïu un nom de carpeta.
-GroupNameTooLong=El nom de la carpeta o de la ruta és massa llarg.
-InvalidGroupName=El nom de la carpeta no és vàlid.
-BadGroupName=El nom del grup no pot contenir cap dels caràcters següents:%n%n%1
-NoProgramGroupCheck2=&No creïs una carpeta al Menú Inici
-
-; *** "Ready to Install" wizard page
-WizardReady=Preparat per a instal·lar
-ReadyLabel1=El programa d'instal·lació està preparat per a iniciar la instal·lació de [name] al vostre ordinador.
-ReadyLabel2a=Premeu Instal·la per a continuar amb la instal·lació, o Enrere si voleu revisar o modificar les opcions d'instal·lació.
-ReadyLabel2b=Premeu Instal·la per a continuar amb la instal·lació.
-ReadyMemoUserInfo=Informació de l'usuari:
-ReadyMemoDir=Carpeta de destinació:
-ReadyMemoType=Tipus d'instal·lació:
-ReadyMemoComponents=Components seleccionats:
-ReadyMemoGroup=Carpeta del Menú Inici:
-ReadyMemoTasks=Tasques addicionals:
-
-; *** "Preparing to Install" wizard page
-WizardPreparing=Preparant la instal·lació
-PreparingDesc=Preparant la instal·lació de [name] al vostre ordinador.
-PreviousInstallNotCompleted=La instal·lació o desinstal·lació anterior no s'ha dut a terme. Caldrà que reinicieu l'ordinador per a finalitzar aquesta instal·lació.%n%nDesprés de reiniciar l'ordinador, executeu aquest programa de nou per completar la instal·lació de [name].
-CannotContinue=La instal·lació no pot continuar. Premeu Cancel·la per a sortir.
-ApplicationsFound=Les següents aplicacions estan fent servir fitxers que necessiten ser actualitzats per la instal·lació. Es recomana que permeteu a la instal·lació tancar automàticament aquestes aplicacions.
-ApplicationsFound2=Les següents aplicacions estan fent servir fitxers que necessiten ser actualitzats per la instal·lació. Es recomana que permeteu a la instal·lació tancar automàticament aquestes aplicacions. Després de completar la instal·lació s'intentarà reiniciar les aplicacions.
-CloseApplications=&Tanca automàticament les aplicacions
-DontCloseApplications=&No tanquis les aplicacions
-ErrorCloseApplications=El programa d'instal·lació no ha pogut tancar automàticament totes les aplicacions. Es recomana que abans de continuar tanqueu totes les aplicacions que estan usant fitxers que han de ser actualitzats pel programa d'instal·lació.
-
-; *** "Installing" wizard page
-WizardInstalling=Instal·lant
-InstallingLabel=Espereu mentre s'instal·la [name] al vostre ordinador.
-
-; *** "Setup Completed" wizard page
-FinishedHeadingLabel=Completant l'assistent d'instal·lació de [name]
-FinishedLabelNoIcons=El programa ha finalitzat la instal·lació de [name] al vostre ordinador.
-FinishedLabel=El programa ha finalitzat la instal·lació de [name] al vostre ordinador. L'aplicació pot ser iniciada seleccionant les icones instal·lades.
-ClickFinish=Premeu Finalitza per a sortir de la instal·lació.
-FinishedRestartLabel=Per a completar la instal·lació de [name] cal reiniciar l'ordinador. Voleu fer-ho ara?
-FinishedRestartMessage=Per a completar la instal·lació de [name] cal reiniciar l'ordinador. Voleu fer-ho ara?
-ShowReadmeCheck=Sí, vull visualitzar el fitxer LLEGIUME.TXT
-YesRadio=&Sí, reiniciar l'ordinador ara
-NoRadio=&No, reiniciaré l'ordinador més tard
-; used for example as 'Run MyProg.exe'
-RunEntryExec=Executa %1
-; used for example as 'View Readme.txt'
-RunEntryShellExec=Visualitza %1
-
-; *** "Setup Needs the Next Disk" stuff
-ChangeDiskTitle=El programa d'instal·lació necessita el disc següent
-SelectDiskLabel2=Introduiu el disc %1 i premeu Continua.%n%nSi els fitxers d'aquest disc es poden trobar en una carpeta diferent de la indicada tot seguit, introduïu-ne la ruta correcta o bé premeu Explora.
-PathLabel=&Ruta:
-FileNotInDir2=El fitxer "%1" no s'ha pogut trobar a "%2". Introduïu el disc correcte o trieu una altra carpeta.
-SelectDirectoryLabel=Indiqueu on es troba el disc següent.
-
-; *** Installation phase messages
-SetupAborted=La instal·lació no s'ha completat.%n%n%Resoleu el problema i executeu de nou el programa d'instal·lació.
-EntryAbortRetryIgnore=Premeu Reintenta per a intentar-ho de nou, Ignora per a continuar igualment, o Abandona per a abandonar la instal·lació.
-
-; *** Installation status messages
-StatusClosingApplications=Tancant aplicacions...
-StatusCreateDirs=Creant carpetes...
-StatusExtractFiles=Extraient fitxers...
-StatusCreateIcons=Creant enllaços del programa...
-StatusCreateIniEntries=Creant entrades al fitxer INI...
-StatusCreateRegistryEntries=Creant entrades de registre...
-StatusRegisterFiles=Registrant fitxers...
-StatusSavingUninstall=Desant informació de desinstal·lació...
-StatusRunProgram=Finalitzant la instal·lació...
-StatusRestartingApplications=Reiniciant aplicacions...
-StatusRollback=Desfent els canvis...
-
-; *** Misc. errors
-ErrorInternal2=Error intern: %1
-ErrorFunctionFailedNoCode=%1 ha fallat
-ErrorFunctionFailed=%1 ha fallat; codi %2
-ErrorFunctionFailedWithMessage=%1 ha fallat; codi %2.%n%3
-ErrorExecutingProgram=No es pot executar el fitxer:%n%1
-
-; *** Registry errors
-ErrorRegOpenKey=Error en obrir la clau de registre:%n%1\%2
-ErrorRegCreateKey=Error en crear la clau de registre:%n%1\%2
-ErrorRegWriteKey=Error en escriure a la clau de registre:%n%1\%2
-
-; *** INI errors
-ErrorIniEntry=Error en crear l'entrada INI al fitxer "%1".
-
-; *** File copying errors
-FileAbortRetryIgnore=Premeu Reintenta per a intentar-ho de nou, Ignora per a saltar-se aquest fitxer (no recomanat), o Abandona per a abandonar la instal·lació.
-FileAbortRetryIgnore2=Premeu Reintenta per a intentar-ho de nou, Ignora per a continuar igualment (no recomanat), o Abandona per a abandonar la instal·lació.
-SourceIsCorrupted=El fitxer d'origen està corromput
-SourceDoesntExist=El fitxer d'origen "%1" no existeix
-ExistingFileReadOnly=El fitxer és de només lectura.%n%nPremeu Reintenta per a treure-li l'atribut de només lectura i tornar-ho a intentar, Ignora per a saltar-se'l (no recomanat), o Abandona per a abandonar la instal·lació.
-ErrorReadingExistingDest=S'ha produït un error en llegir el fitxer:
-FileExists=El fitxer ja existeix.%n%nVoleu que sigui sobre-escrit?
-ExistingFileNewer=El fitxer existent és més nou que el que s'intenta instal·lar. Es recomana mantenir el fitxer existent.%n%nVoleu mantenir-lo?
-ErrorChangingAttr=Hi ha hagut un error en canviar els atributs del fitxer:
-ErrorCreatingTemp=Hi ha hagut un error en crear un fitxer a la carpeta de destinació:
-ErrorReadingSource=Hi ha hagut un error en llegir el fitxer d'origen:
-ErrorCopying=Hi ha hagut un error en copiar un fitxer:
-ErrorReplacingExistingFile=Hi ha hagut un error en reemplaçar el fitxer existent:
-ErrorRestartReplace=Ha fallat reemplaçar:
-ErrorRenamingTemp=Hi ha hagut un error en reanomenar un fitxer a la carpeta de destinació:
-ErrorRegisterServer=No s'ha pogut registrar el DLL/OCX: %1
-ErrorRegSvr32Failed=Ha fallat RegSvr32 amb el codi de sortida %1
-ErrorRegisterTypeLib=No s'ha pogut registrar la biblioteca de tipus: %1
-
-; *** Post-installation errors
-ErrorOpeningReadme=Hi ha hagut un error en obrir el fitxer LLEGIUME.TXT.
-ErrorRestartingComputer=El programa d'instal·lació no ha pogut reiniciar l'ordinador. Cal que ho feu manualment.
-
-; *** Uninstaller messages
-UninstallNotFound=El fitxer "%1" no existeix. No es pot desinstal·lar.
-UninstallOpenError=El fitxer "%1" no pot ser obert. No es pot desinstal·lar
-UninstallUnsupportedVer=El fitxer de desinstal·lació "%1" està en un format no reconegut per aquesta versió del desinstal·lador. No es pot desinstal·lar
-UninstallUnknownEntry=S'ha trobat una entrada desconeguda (%1) al fitxer de desinstal·lació.
-ConfirmUninstall=Esteu segur de voler eliminar completament %1 i tots els seus components?
-UninstallOnlyOnWin64=Aquest programa només pot ser desinstal·lat en Windows de 64 bits.
-OnlyAdminCanUninstall=Aquest programa només pot ser desinstal·lat per un usuari amb privilegis d'administrador.
-UninstallStatusLabel=Espereu mentre s'elimina %1 del vostre ordinador.
-UninstalledAll=%1 ha estat desinstal·lat correctament del vostre ordinador.
-UninstalledMost=Desinstal·lació de %1 completada.%n%nAlguns elements no s'han pogut eliminar. Poden ser eliminats manualment.
-UninstalledAndNeedsRestart=Per completar la instal·lació de %1, cal reiniciar el vostre ordinador.%n%nVoleu fer-ho ara?
-UninstallDataCorrupted=El fitxer "%1" està corromput. No es pot desinstal·lar.
-
-; *** Uninstallation phase messages
-ConfirmDeleteSharedFileTitle=Eliminar fitxer compartit?
-ConfirmDeleteSharedFile2=El sistema indica que el fitxer compartit següent ja no és emprat per cap altre programa. Voleu que la desinstal·lació elimini aquest fitxer?%n%nSi algun programa encara el fa servir i és eliminat, podria no funcionar correctament. Si no n'esteu segur, trieu No. Deixar el fitxer al sistema no farà cap mal.
-SharedFileNameLabel=Nom del fitxer:
-SharedFileLocationLabel=Localització:
-WizardUninstalling=Estat de la desinstal·lació
-StatusUninstalling=Desinstal·lant %1...
-
-; *** Shutdown block reasons
-ShutdownBlockReasonInstallingApp=Instal·lant %1.
-ShutdownBlockReasonUninstallingApp=Desinstal·lant %1.
-
-; The custom messages below aren't used by Setup itself, but if you make
-; use of them in your scripts, you'll want to translate them.
-
-[CustomMessages]
-
-NameAndVersion=%1 versió %2
-AdditionalIcons=Icones addicionals:
-CreateDesktopIcon=Crea una icona a l'&Escriptori
-CreateQuickLaunchIcon=Crea una icona a la &Barra de tasques
-ProgramOnTheWeb=%1 a Internet
-UninstallProgram=Desinstal·la %1
-LaunchProgram=Obre %1
-AssocFileExtension=&Associa %1 amb l'extensió de fitxer %2
-AssocingFileExtension=Associant %1 amb l'extensió de fitxer %2...
-AutoStartProgramGroupDescription=Inici:
-AutoStartProgram=Inicia automàticament %1
-AddonHostProgramNotFound=%1 no ha pogut ser trobat a la carpeta seleccionada.%n%nVoleu continuar igualment?
diff --git a/inno_setup/Greek-4-5.1.11.isl b/inno_setup/Greek-4-5.1.11.isl
deleted file mode 100644
index 9b20357..0000000
--- a/inno_setup/Greek-4-5.1.11.isl
+++ /dev/null
@@ -1,368 +0,0 @@
-; *** Inno Setup version 5.1.11+ Greek messages ***
-;
-; Note: When translating this text, do not add periods (.) to the end of
-; messages that didn't have them already, because on those messages Inno
-; Setup adds the periods automatically (appending a period would result in
-; two periods being displayed).
-;
-; Translated by Anastasis Chatzioglou
-; http://anasto.go.to
-; baldycom at hotmail.com
-;
-
-[LangOptions]
-LanguageName=Greek
-LanguageID=$408
-LanguageCodePage=1253
-; If the language you are translating to requires special font faces or
-; sizes, uncomment any of the following entries and change them accordingly.
-;DialogFontName=MS Shell Dlg
-;DialogFontSize=8
-;DialogFontStandardHeight=13
-;TitleFontName=Arial
-;TitleFontSize=29
-;WelcomeFontName=Verdana
-;WelcomeFontSize=12
-;CopyrightFontName=Arial
-;CopyrightFontSize=8
-DialogFontName=MS Shell Dlg
-DialogFontSize=8
-;4.1.4+
-;DialogFontStandardHeight=13
-TitleFontName=Arial
-TitleFontSize=29
-WelcomeFontName=Arial
-WelcomeFontSize=12
-CopyrightFontName=Arial
-CopyrightFontSize=8
-
-[Messages]
-; *** Application titles
-SetupAppTitle=ÅãêáôÜóôáóç
-SetupWindowTitle=ÅãêáôÜóôáóç -%1
-UninstallAppTitle=ÁðåãêáôÜóôáóç
-UninstallAppFullTitle=%1 ÁðåãêáôÜóôáóç
-; 2.0.x
-;DefaultUninstallIconName=ÁðåãêáôÜóôáóç %1
-
-; *** Misc. common
-InformationTitle=Ðëçñïöïñßåò
-ConfirmTitle=Åðéâåâáßùóç
-ErrorTitle=ÓöÜëìá
-
-; *** SetupLdr messages
-SetupLdrStartupMessage=Èá åêôåëåóôåß ç åãêáôÜóôáóç ôïõ %1. ÈÝëåôå íá óõíå÷ßóåôå;
-LdrCannotCreateTemp=ÓöÜëìá óôç äçìéïõñãßá ðñïóùñéíïý áñ÷åßïõ. Ç åãêáôÜóôáóç èá ôåñìáôéóôåß ôþñá.
-LdrCannotExecTemp=ÓöÜëìá óôçí åêôÝëåóç áñ÷åßïõ óôïí ðñïóùñéíü êáôÜëïãï. Ç åãêáôÜóôáóç ôåñìáôßæåôáé.
-
-; *** Startup error messages
-LastErrorMessage=%1.%n%nÓöÜëìá %2: %3
-SetupFileMissing=Äåí âñßóêåôáé ôï áñ÷åßï %1 óôïí êáôÜëïãï åãêáôÜóôáóçò. ºóùò ÷ñåéÜæåôáé íá ðñïìçèåõôåßôå Ýíá íÝï áíôßãñáöï ôïõ ðñïãñÜììáôïò.
-SetupFileCorrupt=Ôï áñ÷åßï åãêáôÜóôáóçò åßíáé êáôåóôñáììÝíï. ºóùò ÷ñåéÜæåôáé íá ðñïìçèåõôåßôå Ýíá íÝï áíôßãñáöï ôïõ ðñïãñÜììáôïò.
-SetupFileCorruptOrWrongVer=Ôï áñ÷åßï åãêáôÜóôáóçò åßíáé êáôåóôñáììÝíï ç åßíáé óå ëÜèïò Ýêäïóç. ºóùò ÷ñåéÜæåôáé íá ðñïìçèåõôåßôå Ýíá íÝï áíôßãñáöï ôïõ ðñïãñÜììáôïò.
-NotOnThisPlatform=Áõôü ôï ðñüãñáììá äåí ìðïñåß íá åêôåëåóôåß óå %1.
-OnlyOnThisPlatform=Áõôü ôï ðñüãñáììá åêôåëåßôáé ìüíï óå %1.
-; 5.1.0+
-OnlyOnTheseArchitectures=Áõôü ôï ðñüãñáììá ìðïñåß íá åãêáôáóôáèåß ìïíü óå Windows ó÷åäéáóìÝíá ãéá åðåîåñãáóôÝò ìå áñ÷éôåêôïíéêÞ:%n%n%1
-MissingWOW64APIs=Ç Ýêäïóç ôùí Windows ðïõ åêôåëåßôáé äåí äéáèÝôåé ëåéôïõñãéêüôçôá 64-bit. Ãéá íá äéïñèùèåß ôï ðñüâëçìá åãêáôÝóôçóå ôï Service Pack %1.
-WinVersionTooLowError=Áõôü ôï ðñüãñáììá áðáéôåß %1 Ýêäïóç ç íåüôåñç.
-WinVersionTooHighError=Áõôü ôï ðñüãñáììá äåí ìðïñåß íá åêôåëåóôåß óå %1 Ýêäïóç ç íåüôåñç.
-AdminPrivilegesRequired=ÐñÝðåé íá åßóôå ï Äéá÷åéñéóôÞò óõóôÞìáôïò ãéá íá åãêáôáóôÞóåôå áõôü ôï ðñüãñáììá.
-PowerUserPrivilegesRequired=ÐñÝðåé íá åßóôå ï Äéá÷åéñéóôÞò óõóôÞìáôïò Þ Power User ãéá íá åãêáôáóôÞóåôå áõôü ôï ðñüãñáììá.
-SetupAppRunningError=Ç åãêáôÜóôáóç åíôüðéóå üôé åêôåëåßôáé ç åöáñìïãÞ %1. Ðáñáêáëþ êëåßóôå ôçí åöáñìïãÞ ôþñá êáé ðáôÞóôå ÅíôÜîåé ãéá íá óõíå÷ßóåôå.
-UninstallAppRunningError=Ç áðåãêáôÜóôáóç åíôüðéóå üôé åêôåëåßôáé ç åöáñìïãÞ %1. Ðáñáêáëþ êëåßóôå ôçí åöáñìïãÞ ôþñá êáé ðáôÞóôå ÅíôÜîåé ãéá íá óõíå÷ßóåôå.
-
-; *** Misc. errors
-ErrorCreatingDir=Ç åãêáôÜóôáóç äåí ìðïñåß íá äçìéïõñãÞóåé ôïí êáôÜëïãï %1.
-ErrorTooManyFilesInDir=Äåí ìðïñåß íá äçìéïõñãçèåß Ýíá áñ÷åßï óôïí êáôÜëïãï "%1" åðåéäÞ Þäç ðåñéÝ÷åé ðïëëÜ áñ÷åßá.
-
-; *** Setup common messages
-ExitSetupTitle=ÔÝëïò ÅãêáôÜóôáóçò.
-ExitSetupMessage=Ç åãêáôÜóôáóç äåí Ý÷åé ôåëåéþóåé. Áí ôç óôáìáôÞóåôå ôþñá ôï ðñüãñáììá ðïõ ðñïóðáèÞóáôå íá åãêáôáóôÞóåôå äåí èá ëåéôïõñãåß.%n%nÌðïñåßôå íá åêôåëÝóåôå îáíÜ ôçí åãêáôÜóôáóç áñãüôåñá.
-AboutSetupMenuItem=&Ó÷åôéêÜ ìå ôçí ÅãêáôÜóôáóç...
-AboutSetupTitle=Ó÷åôéêÜ ìå ôçí ÅãêáôÜóôáóç.
-AboutSetupMessage=%1 Ýêäïóç %2%n%3%n%n%1 ðñïóùðéêÞ óåëßäá%n%4
-AboutSetupNote=Anasto
-; 5.1.0+
-TranslatorNote=Anastasis Chatzioglou - baldycom at hotmail.com
-
-; *** Buttons
-ButtonBack=< &Ðßóù
-ButtonNext=&Åðüìåíï >
-ButtonInstall=&ÅãêáôÜóôáóç
-ButtonOK=Å&íôÜîåé
-ButtonCancel=&Áêõñï
-ButtonYes=Í&áé
-ButtonYesToAll=Íáé óå &Ïëá
-ButtonNo=Ï&÷é
-ButtonNoToAll=Ï÷é &óå ïëá
-ButtonFinish=&ÔÝëïò
-ButtonBrowse=&ÁíáæÞôçóç...
-;4.1.3
-ButtonWizardBrowse=&Åýñåóç...
-ButtonNewFolder=&Äçìéïõñãßá íÝïõ öáêÝëïõ
-
-; *** "Select Language" dialog messages
-; 4.0.x
-SelectLanguageTitle=ÅðéëïãÞ ôçò ãëþóóáò åãêáôÜóôáóçò
-SelectLanguageLabel=ÅðéëïãÞ ôçò ãëþóóáò ãéá ÷ñÞóç êáôÜ ôçí äéÜñêåéá ôçò åãêáôÜóôáóçò:
-
-
-; *** Common wizard text
-ClickNext=ÐáôÞóôå Åðüìåíï ãéá íá óõíå÷ßóåôå Þ ¢êõñï ãéá íá ôåñìáôßóåôå ôçí åãêáôÜóôáóç.
-; 2.0.x
-;ClickNextModern=ÐáôÞóôå Åðüìåíï ãéá íá óõíå÷ßóåôå Þ ¢êõñï ãéá íá ôåñìáôßóåôå ôçí åãêáôÜóôáóç.
-;;; - anasto -
-BeveledLabel=anasto
-;4.1.3
-BrowseDialogTitle=Åýñåóç öáêÝëïõ
-BrowseDialogLabel=ÅðéëÝîôå öÜêåëï óôçí ëßóôá êáé ìåôÜ ðáôÞóôå OK.
-NewFolderName=ÍÝïò öÜêåëïò
-
-; *** "Welcome" wizard page
-WelcomeLabel1=Êáëùóïñßóáôå óôçí åãêáôÜóôáóç ôïõ [name].
-WelcomeLabel2=Èá ãßíåé åãêáôÜóôáóç ôïõ [name/ver] óôïí õðïëïãéóôÞ óáò.%n%nÐñéí óõíå÷ßóåôå óáò óõíéóôïýìå íá êëåßóåôå êÜèå Üëëç åöáñìïãÞ ðïõ ðéèáíüí åêôåëåßôå.
-
-; *** "Password" wizard page
-WizardPassword=ÅéóáãùãÞ Êùäéêïý
-PasswordLabel1=ÁõôÞ ç åãêáôÜóôáóç ÷ñåéÜæåôáé êùäéêü ãéá íá åêôåëåóôåß.
-PasswordLabel3=Ðáñáêáëþ äþóôå ôïí êùäéêü óáò êáé ðáôÞóôå Åðüìåíï ãéá íá óõíå÷ßóåôå.
-PasswordEditLabel=&Êùäéêüò:
-IncorrectPassword=Ï êùäéêüò ðïõ äþóáôå åßíáé ëÜèïò. ÎáíáðñïóðáèÞóôå.
-
-; *** "License Agreement" wizard page
-WizardLicense=Áäåéá ×ñÞóçò
-LicenseLabel=Ðáñáêáëþ äéáâÜóôå ðñïóåêôéêÜ ôéò ðáñáêÜôù ðëçñïöïñßåò ðñéí óõíå÷ßóåôå.
-; 2.0.x
-;LicenseLabel1=Ðáñáêáëþ äéáâÜóôå ðñïóåêôéêÜ ôéò ðáñáêÜôù ðëçñïöïñßåò ðñéí óõíå÷ßóåôå. ×ñçóéìïðïéÞóôå ôçí ìðÜñá êýëéóçò ãéá íá äåßôå üëï ôï êåßìåíï.
-;LicenseLabel2=ÁðïäÝ÷åóôå ôïõò üñïõò ôçò ¢äåéáò ×ñÞóçò; Áí åðéëÝîåôå ü÷é ç åãêáôÜóôáóç èá ôåñìáôéóôåß. Ãéá íá óõíå÷éóôåß ç åãêáôÜóôáóç ðñÝðåé íá áðïäÝ÷åóôå ôïõò üñïõò ôçò ¢äåéáò ×ñÞóçò.
-LicenseLabel3=Ðáñáêáëþ äéáâÜóôå ðñïóåêôéêÜ ôéò ðáñáêÜôù ðëçñïöïñßåò ðñéí óõíå÷ßóåôå. ÐñÝðåé íá áðïäÝ÷åóôå ôïõò üñïõò ôçò ¢äåéáò ×ñÞóçò ðñéí íá óõíå÷ßóåôå ôçí åãêáôÜóôáóç.
-LicenseAccepted=&ÄÝ÷ïìáé ôïõò üñïõò ôçò ¢äåéáò ×ñÞóçò
-LicenseNotAccepted=Äåí &áðïäÝ÷ïìáé ôïõò üñïõò ôçò ¢äåéáò ×ñÞóçò
-
-; *** "Information" wizard pages
-WizardInfoBefore=Ðëçñïöïñßåò
-InfoBeforeLabel=Ðáñáêáëþ äéáâÜóôå ðñïóåêôéêÜ ôéò ðáñáêÜôù ðëçñïöïñßåò ðñéí óõíå÷ßóåôå.
-InfoBeforeClickLabel=Áí åßóôå Ýôïéìïé íá óõíå÷ßóåôå ðáôÞóôå Åðüìåíï.
-WizardInfoAfter=Ðëçñïöïñßåò
-InfoAfterLabel=Ðáñáêáëþ äéáâÜóôå ðñïóåêôéêÜ ôéò ðáñáêÜôù ðëçñïöïñßåò ðñéí óõíå÷ßóåôå.
-InfoAfterClickLabel=Áí åßóôå Ýôïéìïé íá óõíå÷ßóåôå ðáôÞóôå Åðüìåíï.
-
-; *** "User Information" wizard page
-WizardUserInfo=Ðëçñïöïñßåò ãéá ôïí ×ñÞóôç
-UserInfoDesc=Ðáñáêáëþ äþóôå ôéò ðëçñïöïñßåò.
-UserInfoName=&Ïíïìá ×ñÞóôç:
-UserInfoOrg=&Åôáéñåßá:
-UserInfoSerial=&Óåéñéáêü Áñéèìü:
-UserInfoNameRequired=ÐñÝðåé íá äþóåôå üíïìá.
-
-; *** "Select Destination Location" wizard page
-; 4.0.x
-WizardSelectDir=ÅðéëÝîôå ôïí êáôÜëïãï ðïõ èá åãêáôáóôáèåß ôï ðñüãñáììá.
-SelectDirDesc=Ðïõ èá åãêáôáóôáèåß ôï [name];
-;SelectDirLabel=ÅðéëÝîôå ôïí êáôÜëïãï ðïõ èá åãêáôáóôáèåß ôï ðñüãñáììá. ÐáôÞóôå Åðüìåíï ãéá íá óõíå÷ßóåôå.
-DiskSpaceMBLabel=Áõôü ôï ðñüãñáììá ÷ñåéÜæåôáé [mb] MB ÷þñï óôïí äßóêï.
-ToUNCPathname=Ç åãêáôÜóôáóç äåí ìðïñåß íá ãßíåé óå äßóêï äéêôýïõ. Áí èÝëåôå íá ãßíåé ç åãêáôÜóôáóç óå äßóêï äéêôýïõ ðñÝðåé íá ïñßóåôå áõôüí ôï äßóêï.
-InvalidPath=Äþóôå ôçí ðëÞñç äéáäñïìÞ.%nðáñÜäåéãìá:%n%nC:\APP
-InvalidDrive=Ï ôïðéêüò äßóêïò ç ï äßóêïò äéêôýïõ ðïõ åðéëÝîáôå äåí õðÜñ÷åé ç äåí åßíáé ðñïóâÜóéìïò. ÅðéëÝîôå Üëëïí.
-DiskSpaceWarningTitle=Äåí õðÜñ÷åé áñêåôüò ÷þñïò óôï äßóêï.
-DiskSpaceWarning=Ç åãêáôÜóôáóç ÷ñåéÜæåôáé ôïõëÜ÷éóôïí %1 KB åëåýèåñï ÷þñï óôï äßóêï áëëÜ ï åðéëåãìÝíïò ïäçãüò äéáèÝôåé ìüíïí %2 KB.%n%nÈÝëåôå íá óõíå÷ßóåôå ïðùóäÞðïôå;
-BadDirName32=Ïíüìáôá êáôáëüãùí äåí ìðïñïýí íá ðåñéÝ÷ïõí êÜðïéïí áðü ôïõò ðáñáêÜôù ÷áñáêôÞñåò:%n%n%1
-DirExistsTitle=Ï êáôÜëïãïò õðÜñ÷åé.
-DirExists=Ï êáôÜëïãïò:%n%n%1%n%nõðÜñ÷åé Þäç. ÈÝëåôå íá ãßíåé ç åãêáôÜóôáóç óå áõôüí ôïí êáôÜëïãï;
-DirDoesntExistTitle=Ï êáôÜëïãïò äåí õðÜñ÷åé.
-DirDoesntExist=Ï êáôÜëïãïò:%n%n%1%n%näåí õðÜñ÷åé. ÈÝëåôå íá äçìéïõñãçèåß;
-;4.1.3
-InvalidDirName=ËÜèïò üíïìá öáêÝëïõ.
-;4.1.5
-DirNameTooLong=Ôï üíïìá ôïõ öáêÝëïõ åßíáé ðïëý ìåãÜëï.
-;4.1.8
-;SelectDirLabel2=Ôï [name] èá åãêáôáóôáèåß óôïí áêüëïõèï öÜêåëï.%n%nÃéá óõíÝ÷åéá ðáôÞóôå Åðüìåíï. Áí èÝëåôå Üëëï öÜêåëï, ðáôÞóôå Åýñåóç.
-SelectDirLabel3=Ôï [name] èá åãêáôáóôáèåß óôïí áêüëïõèï öÜêåëï.
-SelectDirBrowseLabel=Ãéá óõíÝ÷åéá ðáôÞóôå Åðüìåíï. Áí èÝëåôå Üëëï öÜêåëï, ðáôÞóôå Åýñåóç.
-
-; *** "Select Components" wizard page
-WizardSelectComponents=ÅðéëïãÞ Óõóôáôéêþí
-SelectComponentsDesc=Ðïéá óõóôáôéêÜ èÝëåôå íá åãêáôáóôáèïýí;
-SelectComponentsLabel2=ÅðéëÝîôå ôá óõóôáôéêÜ ðïõ èÝëåôå íá åãêáôáóôÞóåôå êáé ðáôÞóôå Åðüìåíï ãéá óõíÝ÷åéá ôçò åãêáôÜóôáóçò.
-FullInstallation=ÐëÞñçò ÅãêáôÜóôáóç.
-; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
-CompactInstallation=ÐåñéïñéóìÝíç ÅãêáôÜóôáóç.
-CustomInstallation=ÅðéëåãìÝíç ÅãêáôÜóôáóç.
-NoUninstallWarningTitle=Ôá óõóôáôéêÜ õðÜñ÷ïõí.
-NoUninstallWarning=Ç åãêáôÜóôáóç äéáðßóôùóå üôé ôá ðáñáêÜôù óõóôáôéêÜ åßíáé Þäç åãêáôåóôçìÝíá óôïí õðïëïãéóôÞ óáò:%n%n%1
-ComponentSize1=%1 KB
-ComponentSize2=%1 MB
-ComponentsDiskSpaceMBLabel=Ç óõãêåêñéìÝíç åðéëïãÞ áðáéôåß ôïõëÜ÷éóôïí [mb] MB åëåýèåñï ÷þñï óôïí äßóêï.
-
-; *** "Select Additional Tasks" wizard page
-WizardSelectTasks=ÅðéëïãÞ ÐåñáéôÝñù Åíåñãåéþí
-SelectTasksDesc=ÐïéÝò åðéðëÝïí åíÝñãåéåò èÝëåôå íá ãßíïõí;
-SelectTasksLabel2=ÅðéëÝîôå ôéò åðéðëÝïí åíÝñãåéåò ðïõ èÝëåôå íá ãßíïõí êáôÜ ôçí åãêáôÜóôáóç ôïõ [name] êáé ðáôÞóôå Åðüìåíï.
-
-; *** "Select Start Menu Folder" wizard page
-; 2.0.x
-;ReadyMemoTasks=ÅðéðëÝïí ÅíÝñãåéåò:
-WizardSelectProgramGroup=ÅðéëïãÞ Êáôáëüãïõ Óôï Ìåíïý Åêêßíçóç.
-SelectStartMenuFolderDesc=Ðïõ èá ôïðïèåôçèïýí ïé óõíôïìåýóåéò ôïõ ðñïãñÜììáôïò;
-; 4.0.x
-;SelectStartMenuFolderLabel=ÅðéëÝîôå ôïí êáôÜëïãï óôï ìåíïý åêêßíçóç óôïí ïðïßï èÝëåôå äçìéïõñãçèïýí ïé óõíôïìåýóåéò ôïõ ðñïãñÜììáôïò êáé ðáôÞóôå Åðüìåíï.
-; 5.1.0+
-;NoIconsCheck=&×ùñßò äçìéïõñãßá åéêïíéäßùí
-MustEnterGroupName=ÐñÝðåé íá äþóåôå ôï üíïìá åíüò êáôáëüãïõ.
-BadGroupName=Ïíüìáôá êáôáëüãùí äåí ìðïñïýí íá ðåñéÝ÷ïõí êÜðïéïí áðü ôïõò ðáñáêÜôù ÷áñáêôÞñåò:%n%n%1
-NoProgramGroupCheck2=&×ùñßò äçìéïõñãßá êáôáëüãïõ óôï ìåíïý åêêßíçóç.
-;4.1.3
-InvalidGroupName=Ôï üíïìá ôïõ group äåí åßíáé óùóôü.
-;4.1.4+
-GroupNameTooLong=Ôï üíïìá ôïõ group åéíáé ðïëý ìåãÜëï.
-;4.1.8
-;SelectStartMenuFolderLabel2=To setup èá äçìéïõñãÞóåé ôéò óõíôïìåýóåéò ôïõ ðñïãñÜììáôïò óôï áêüëïõèï group.%n%nÃéá óõíÝ÷åéá, ðáôÞóôå Åðüìåíï. Áí èÝëåôå Üëëï group, ðáôÞóôå åýñåóç.
-SelectStartMenuFolderLabel3=Ôï setup èá äçìéïõñãÞóåé ôéò óõíôïìåýóåéò ôïõ ðñïãñÜììáôïò óôï áêüëïõèï group.
-SelectStartMenuFolderBrowseLabel=Ãéá óõíÝ÷åéá, ðáôÞóôå Åðüìåíï. Áí èÝëåôå Üëëï group, ðáôÞóôå åýñåóç.
-
-
-; *** "Ready to Install" wizard page
-WizardReady=¸ôïéìïò ãéá åãêáôÜóôáóç
-ReadyLabel1=Ç åãêáôÜóôáóç ôïõ [name] åßíáé Ýôïéìç íá åêôåëåóôåß óôïí õðïëïãéóôÞ óáò.
-ReadyLabel2a=ÐáôÞóôå ÅãêáôÜóôáóç ãéá íá óõíå÷ßóåôå Þ Ðßóù áí èÝëåôå íá áëëÜîåôå êÜðïéåò ñõèìßóåéò.
-ReadyLabel2b=ÐáôÞóôå ÅãêáôÜóôáóç ãéá íá óõíå÷ßóåôå.
-ReadyMemoUserInfo=Ðëçñïöïñßåò ×ñÞóôç:
-ReadyMemoDir=ÊáôÜëïãïò ðñïïñéóìïý:
-ReadyMemoType=Åßäïò åãêáôÜóôáóçò:
-ReadyMemoComponents=ÅðéëåãìÝíá óõóôáôéêÜ:
-ReadyMemoGroup=ÊáôÜëïãïò óôï ìåíïý ÐñïãñÜììáôá:
-ReadyMemoTasks=ÅðéðëÝïí ÅíÝñãåéåò:
-
-; *** "Preparing to Install" wizard page
-WizardPreparing=Ðñïåôïéìáóßá ÅãêáôÜóôáóçò
-PreparingDesc=Ç åãêáôÜóôáóç ðñïåôïéìÜæåé ôï ðñüãñáììá [name] íá ôïðïèåôçèåß óôïí õðïëïãéóôÞ.
-PreviousInstallNotCompleted=The installation/removal of a previous program was not completed. You will need to restart your computer to complete that installation.%n%nAfter restarting your computer, run Setup again to complete the installation of [name].
-CannotContinue=Setup cannot continue. Please click Cancel to exit.
-
-; *** "Installing" wizard page
-WizardInstalling=Ðñüïäïò ÅãêáôÜóôáóçò
-InstallingLabel=Ðáñáêáëþ ðåñéìÝíåôå íá ïëïêëçñùèåß ç åãêáôÜóôáóç ôïõ [name] óôïí õðïëïãéóôÞ óáò.
-
-; *** "Setup Completed" wizard page
-; 2.0.x
-;WizardFinished=Ç ÅãêáôÜóôáóç Ïëïêëçñþèçêå
-FinishedHeadingLabel=Completing the [name] Setup Wizard
-FinishedLabelNoIcons=Ç åãêáôÜóôáóç ôïõ [name] óôïí õðïëïãéóôÞ óáò ôåëåßùóå ìå åðéôõ÷ßá.
-FinishedLabel=Ç åãêáôÜóôáóç ôïõ [name] óôïí õðïëïãéóôÞ óáò ôåëåßùóå ìå åðéôõ÷ßá. Ìðïñåßôå íá îåêéíÞóåôå ôï ðñüãñáììá åðéëÝãïíôáò ôï åéêïíßäéï ðïõ äçìéïõñãÞèçêå óôï ìåíïý åêêßíçóç.
-ClickFinish=ÐáôÞóôå ÔÝëïò ãéá íá ôåñìáôßóåôå ôï ðñüãñáììá åãêáôÜóôáóçò.
-FinishedRestartLabel=Ãéá íá ïëïêëçñùèåß ç åãêáôÜóôáóç ôïõ [name] ðñÝðåé íá ãßíåé åðáíåêêßíçóç ôïõ õðïëïãéóôÞ óáò. ÈÝëåôå íá ãßíåé ôþñá;
-FinishedRestartMessage=Ãéá íá ïëïêëçñùèåß ç åãêáôÜóôáóç ôïõ [name] ðñÝðåé íá ãßíåé åðáíåêêßíçóç ôïõ õðïëïãéóôÞ óáò.%n%nÈÝëåôå íá ãßíåé ôþñá;
-ShowReadmeCheck=Íáé èÝëù íá äéáâÜóù ôéò ðëçñïöïñßåò ôïõ ðñïãñÜììáôïò
-YesRadio=&Íáé íá ãßíåé åðáíåêêßíçóç ôþñá.
-NoRadio=&Ï÷é èá êÜíù åðáíåêêßíçóç áñãüôåñá.
-; used for example as 'Run MyProg.exe'
-RunEntryExec=Íá åêôåëåóôåß ôï ðñüãñáììá %1
-; used for example as 'View Readme.txt'
-RunEntryShellExec=Íá åêôåëåóôåß ôï %1
-
-; *** "Setup Needs the Next Disk" stuff
-ChangeDiskTitle=ÔïðïèåôÞóôå ôçí åðüìåíç äéóêÝôôá
-; 4.0.x
-;SelectDirectory=ÅðéëÝîôå êáôÜëïãï
-SelectDiskLabel2=ÔïðïèåôÞóôå ôçí äéóêÝôôá %1 êáé ðáôÞóôå ÅíôÜîåé.
-PathLabel=&ÄéáäñïìÞ
-FileNotInDir2=Ôï áñ÷åßï "%1" äåí âñßóêåôáé óôï "%2". ÔïðïèåôÞóôå ôç óùóôÞ äéóêÝôôá.
-SelectDirectoryLabel=Äþóôå ôçí ôïðïèåóßá ôçò åðüìåíçò äéóêÝôôáò.
-
-; *** Installation phase messages
-SetupAborted=Ç åãêáôÜóôáóç äåí ïëïêëçñþèçêå.%n%nÄéïñèþóôå ôï ðñüâëçìá êáé åêôåëÝóôå îáíÜ ôçí åãêáôÜóôáóç.
-EntryAbortRetryIgnore=ÐáôÞóôå Retry ãéá íá îáíáðñïóðáèÞóåôå, Ignore ãéá íá óõíå÷ßóåôå ç Abort ãéá íá ôåñìáôßóåôå ôçí åãêáôÜóôáóç.
-
-; *** Installation status messages
-StatusCreateDirs=Äçìéïõñãßá êáôáëüãùí...
-StatusExtractFiles=Áðïóõìðßåóç áñ÷åßùí...
-StatusCreateIcons=Äçìéïõñãßá åéêïíéäßùí...
-StatusCreateIniEntries=Êáôá÷þñçóç óôï ÉÍÉ áñ÷åßï óõóôÞìáôïò...
-StatusCreateRegistryEntries=Êáôá÷þñçóç óôï ìçôñþï óõóôÞìáôïò...
-StatusRegisterFiles=Êáôá÷þñçóç áñ÷åßùí
-StatusSavingUninstall=Ðëçñïöïñßåò áðåãêáôÜóôáóçò...
-StatusRunProgram=Ôåëåéþíïíôáò ôçí åãêáôÜóôáóç...
-StatusRollback=Rolling back changes...
-
-; *** Misc. errors
-; 2.0.x
-;ErrorInternal=ÓöÜëìá %1
-ErrorInternal2=ÓöÜëìá %1
-ErrorFunctionFailedNoCode=%1 ÓöÜëìá
-ErrorFunctionFailed=%1 ÓöÜëìá, êùä. %2
-ErrorFunctionFailedWithMessage=%1 ÓöÜëìá, êùä. %2%n%3
-ErrorExecutingProgram=Äåí ìðïñåß íá åêôåëåóôåß ôï áñ÷åßï:%n%1
-
-;2.0.x
-;ErrorDDEExecute=DDE: ÓöÜëìá êáôÜ ôçí åêôÝëåóç ôçò åíÝñãåéáò (code: %1)
-;ErrorDDECommandFailed=DDE: Ç åíôïëÞ áðÝôõ÷å.
-;ErrorDDERequest=DDE: ÓöÜëìá êáôÜ ôçí åêôÝëåóç ôçò åíÝñãåéáò (code: %1)
-
-; *** Registry errors
-ErrorRegOpenKey=Äåí ìðïñåß íá äéáâáóôåß ôï êëåéäß ìçôñþïõ óõóôÞìáôïò:%n%1\%2
-ErrorRegCreateKey=Äåí ìðïñåß íá äçìéïõñãçèåß ôï êëåéäß ìçôñþïõ óõóôÞìáôïò:%n%1\%2
-ErrorRegWriteKey=Äåí ìðïñåß íá ãßíåé êáôá÷þñçóç óôï êëåéäß ìçôñþïõ óõóôÞìáôïò:%n%1\%2
-
-; *** INI errors
-ErrorIniEntry=Äåí ìðïñåß íá ãßíåé êáôá÷þñçóç óôï ÉÍÉ áñ÷åßï óõóôÞìáôïò "%1".
-
-; *** File copying errors
-FileAbortRetryIgnore=ÐáôÞóôå Retry ãéá íá îáíáðñïóðáèÞóåôå, Ignore ãéá íá óõíå÷ßóåôå ç Abort ãéá íá ôåñìáôßóåôå ôçí åãêáôÜóôáóç.
-FileAbortRetryIgnore2=ÐáôÞóôå Retry ãéá íá îáíáðñïóðáèÞóåôå, Ignore ãéá íá óõíå÷ßóåôå ç Abort ãéá íá ôåñìáôßóåôå ôçí åãêáôÜóôáóç.
-SourceIsCorrupted=Ôï áñ÷åßï ðñïÝëåõóçò åßíáé êáôåóôñáììÝíï.
-SourceDoesntExist=Ôï áñ÷åßï ðñïÝëåõóçò "%1" äåí õðÜñ÷åé.
-ExistingFileReadOnly=Ôï áñ÷åßï åßíáé ìðáñêáñéóìÝíï ìüíï ãéá áíÜãíùóç.%n%nÐáôÞóôå Retry ãéá íá ôï îåìáñêÜñåôå êáé íá ðñïóðáèÞóåôå ðÜëé, Ignore ãéá íá ôï ðñïóðåñÜóåôå ç Abort ãéá íá ôåñìáôßóåôå ôçí åãêáôÜóôáóç.
-ErrorReadingExistingDest=ÐáñïõóéÜóôçêå óöÜëìá êáôÜ ôçí áíÜãíùóç ôïõ áñ÷åßïõ:
-FileExists=Ôï áñ÷åßï õðÜñ÷åé.%n%nÈÝëåôå íá îáíáãñáöôåß;
-ExistingFileNewer=Åíá áñ÷åßï ðïõ âñÝèçêå óôïí õðïëïãéóôÞ óáò åßíáé íåüôåñçò Ýêäïóçò áðï åêåßíï ôçò åãêáôÜóôáóçò. Ðñïôåßíåôáé íá êñáôÞóåôå ôï õðÜñ÷ïí áñ÷åßï.%n%nÈÝëåôå íá êñáôÞóåôå ôï õðÜñ÷ïí áñ÷åßï;
-ErrorChangingAttr=ÐñïÝêõøå óöÜëìá óôçí ðñïóðÜèåéá íá áëëá÷ôïýí ôá ÷áñáêôçñéóôéêÜ ôïõ áñ÷åßïõ:
-ErrorCreatingTemp=ÐñïÝêõøå óöÜëìá óôçí ðñïóðÜèåéá íá äçìéïõñãçèåß Ýíá áñ÷åßï óôïí êáôÜëïãï ðñïïñéóìïý:
-ErrorReadingSource=ÐñïÝêõøå óöÜëìá óôçí ðñïóðÜèåéá áíÜãíùóçò ôïõ áñ÷åßïõ ðñïÝëåõóçò:
-ErrorCopying=ÐñïÝêõøå óöÜëìá óôçí ðñïóðÜèåéá íá áíôéãñáöåß ôï áñ÷åßï:
-ErrorReplacingExistingFile=ÐñïÝêõøå óöÜëìá óôçí ðñïóðÜèåéá íá áíôéêáôáóôáèåß ôï õðÜñ÷ïí áñ÷åßï:
-ErrorRestartReplace=ÐñïÝêõøå óöÜëìá óôçí ðñïóðÜèåéá íá ãßíåé åðáíåêêßíçóç êáé áíôéêáôÜóôáóç áñ÷åßïõ:
-ErrorRenamingTemp=ÐñïÝêõøå óöÜëìá óôçí ðñïóðÜèåéá ìåôïíïìáóßáò åíüò áñ÷åßïõ óôïí êáôÜëïãï ðñïïñéóìïý:
-ErrorRegisterServer=ÐñïÝêõøå óöÜëìá óôçí ðñïóðÜèåéá êáôá÷þñçóçò DLL/OCX: %1
-ErrorRegSvr32Failed=RegSvr32 failed with exit code %1
-ErrorRegisterTypeLib=Unable to register the type library: %1
-
-; *** Post-installation errors
-ErrorOpeningReadme=ÐñïÝêõøå óöÜëìá óôçí ðñïóðÜèåéá íá öïñôùèåß ôï áñ÷åßï ðëçñïöïñéþí.
-ErrorRestartingComputer=ÐñïÝêõøå óöÜëìá óôçí ðñïóðÜèåéá åðáíåêêßíçóçò ôïõ õðïëïãéóôÞ.%nÐáñáêáëþ åðáíåêêéíÞóôå ôïí õðïëïãéóôÞ óáò.
-
-; *** Uninstaller messages
-UninstallNotFound=Ôï áñ÷åßï "%1" äåí âñÝèçêå. Ç áðåãêáôÜóôáóç äåí ìðïñåß íá ãßíåé
-; 4.0.x
-UninstallOpenError=Ôï áñ÷åßï "%1" äåí ìðüñåóå íá öïñôùèåß. Ç áðåãêáôÜóôáóç äåí ìðïñåß íá ãßíåé
-UninstallUnsupportedVer=Ôï áñ÷åßï "%1" äåí áíáãíùñßæåôáé áðü áõôÞ ôçí Ýêäïóç ôçò åãêáôÜóôáóçò, Ç áðåãêáôÜóôáóç äåí ìðïñåß íá åêôåëåóôåß
-UninstallUnknownEntry=Ôï áñ÷åßï "%1" äåí áíáãíùñßæåôáé áðü áõôÞ ôçí Ýêäïóç ôçò åãêáôÜóôáóçò, Ç áðåãêáôÜóôáóç äåí ìðïñåß íá åêôåëåóôåß
-ConfirmUninstall=Åßóôå óßãïõñïé üôé èÝëåôå íá äéáãñÜøåôå ôï %1 êáé üëá ôá óõóôáôéêÜ ôïõ;
-; 5.1.0+
-UninstallOnlyOnWin64=ÁõôÞ ç åöáñìïãÞ ìðïñåß íá áðåãêáôáóôáèåß ìüíï óå 64-bit Windows.
-OnlyAdminCanUninstall=Ç áðåãêáôÜóôáóç ìðïñåß íá åêôåëåóôåß ìüíï áðü ôïí Äéá÷åéñéóôÞ óõóôÞìáôïò
-UninstallStatusLabel=Ðáñáêáëþ ðåñéìÝíåôå üóï ôï %1 äéáãñÜöåôå áðü ôïí õðïëïãéóôÞ óáò
-UninstalledAll=Ç áðåãêáôÜóôáóç ôïõ %1 Ýãéíå ìå åðéôõ÷ßá.
-UninstalledMost=Ç áðåãêáôÜóôáóç ôïõ %1 Ýãéíå ìå åðéôõ÷ßá.%n%nÊÜðïéá óõóôáôéêÜ ðïõ ðáñÝìåéíáí óôïí õðïëïãéóôÞ óáò èá ðñÝðåé íá ôá äéáãñÜøåôå åóåßò.
-UninstalledAndNeedsRestart=To complete the uninstallation of %1, your computer must be restarted.%n%nWould you like to restart now?
-UninstallDataCorrupted="%1" Áõôü ôï áñ÷åßï åßíáé êáôåóôñáììÝíï. Äåí ìðïñåß íá ãßíåé áðåãêáôÜóôáóç.
-
-; *** Uninstallation phase messages
-ConfirmDeleteSharedFileTitle=ÈÝëåôå íá äéáãñáöïýí ôá êïéíÜ áñ÷åßá;
-ConfirmDeleteSharedFile2=Ôá êïéíÜ áñ÷åßá äåí ÷ñçóéìïðïéïýíôáé áðü êÜðïéï ðñüãñáììá. ÈÝëåôå íá äéáãñáöïýí;%n%nÁí êÜðïéï ðñüãñáììá ôá ÷ñçóéìïðïéåß ßóùò äåí åêôåëåßôáé óùóôÜ áí ôá äéáãñÜøåôå. Áí äåí åßóôå óßãïõñïé áöÞóôå ôá óôï óýóôçìá óáò äåí ðñïêáëïýí êÜðïéï ðñüâëçìá.
-SharedFileNameLabel=Ïíïìá Áñ÷åßïõ:
-SharedFileLocationLabel=Ôïðïèåóßá:
-WizardUninstalling=Ðñüïäïò ÁðåãêáôÜóôáóçò:
-StatusUninstalling=ÁðåãêáôÜóôáóç ôïõ %1...
-
-[CustomMessages]
-NameAndVersion=%1 Ýêäïóç %2
-AdditionalIcons=ÅðéðëÝïí åéêïíßäéá:
-CreateDesktopIcon=Äçìéïõñãßá åíüò &åéêïíéäßïõ óôçí åðéöÜíåéá åñãáóßáò
-CreateQuickLaunchIcon=Äçìéïõñãßá åíüò åéêïíéäßïõ óôç &ÃñÞãïñç Åêêßíçóç
-ProgramOnTheWeb=Ôï %1 óôï Internet
-UninstallProgram=ÁðåãêáôÜóôáóç ôïõ %1
-LaunchProgram=Åêêßíçóç ôïõ %1
-AssocFileExtension=%Áíôéóôïß÷éóç ôïõ %1 ìå ôçí %2 åðÝêôáóç áñ÷åßïõ
-AssocingFileExtension=Ãßíåôáé áíôéóôïß÷çóç ôïõ %1 ìå ôçí %2 åðÝêôáóç áñ÷åßïõ...
-
diff --git a/inno_setup/Japanese-5-5.1.11.isl b/inno_setup/Japanese-5-5.1.11.isl
deleted file mode 100644
index a5772d3..0000000
--- a/inno_setup/Japanese-5-5.1.11.isl
+++ /dev/null
@@ -1,312 +0,0 @@
-; *** Inno Setup version 5.1.11+ Japanese messages ***
-;
-; Translated by Ryou Minakami (ryou32jp at yahoo.co.jp)
-; Fixes and updates: Koichi Shirasuka (shirasuka at eugrid.co.jp)
-;
-; $jrsoftware: issrc/Files/Default.isl,v 1.66 2005/02/25 20:23:48 mlaan Exp $
-
-[LangOptions]
-LanguageName=Japanese
-LanguageID=$0411
-LanguageCodePage=932
-
-; If you don't need to support Windows 9x, commenting the following 4 lines gives better looking (banners not stretched).
-DialogFontName=‚l‚r ‚oƒSƒVƒbƒN
-DialogFontSize=9
-TitleFontName=‚l‚r ‚oƒSƒVƒbƒN
-TitleFontSize=29
-
-; Required for Win2K/older to display the welcome message with correct font.
-WelcomeFontName=‚l‚r ‚oƒSƒVƒbƒN
-WelcomeFontSize=12
-
-[Messages]
-
-; *** Application titles
-SetupAppTitle=ƒZƒbƒgƒAƒbƒv
-SetupWindowTitle=%1 ƒZƒbƒgƒAƒbƒv
-UninstallAppTitle=ƒAƒ“ƒCƒ“ƒXƒg[ƒ‹
-UninstallAppFullTitle=%1 ƒAƒ“ƒCƒ“ƒXƒg[ƒ‹
-
-; *** Misc. common
-InformationTitle=î•ñ
-ConfirmTitle=Šm”F
-ErrorTitle=ƒGƒ‰[
-
-; *** SetupLdr messages
-SetupLdrStartupMessage=%1 ‚ðƒCƒ“ƒXƒg[ƒ‹‚µ‚Ü‚·B‘±s‚µ‚Ü‚·‚©H
-LdrCannotCreateTemp=ˆêŽžƒtƒ@ƒCƒ‹‚ð쬂ł«‚Ü‚¹‚ñBƒZƒbƒgƒAƒbƒv‚𒆎~‚µ‚Ü‚·B
-LdrCannotExecTemp=ˆêŽžƒtƒHƒ‹ƒ_‚̃tƒ@ƒCƒ‹‚ðŽÀs‚Å‚«‚Ü‚¹‚ñBƒZƒbƒgƒAƒbƒv‚𒆎~‚µ‚Ü‚·B
-
-; *** Startup error messages
-LastErrorMessage=%1.%n%nƒGƒ‰[ %2: %3
-SetupFileMissing=ƒtƒ@ƒCƒ‹ %1 ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñB–â‘è‚ð‰ðŒˆ‚·‚é‚©V‚µ‚¢ƒZƒbƒgƒAƒbƒvƒvƒƒOƒ‰ƒ€‚ð“üŽè‚µ‚Ä‚‚¾‚³‚¢B
-SetupFileCorrupt=ƒZƒbƒgƒAƒbƒvƒtƒ@ƒCƒ‹‚ª‰ó‚ê‚Ä‚¢‚Ü‚·BV‚µ‚¢ƒZƒbƒgƒAƒbƒvƒvƒƒOƒ‰ƒ€‚ð“üŽè‚µ‚Ä‚‚¾‚³‚¢B
-SetupFileCorruptOrWrongVer=ƒZƒbƒgƒAƒbƒvƒtƒ@ƒCƒ‹‚ª‰ó‚ê‚Ä‚¢‚é‚©A‚±‚̃o[ƒWƒ‡ƒ“‚̃ZƒbƒgƒAƒbƒv‚ƌ݊·«‚ª‚ ‚è‚Ü‚¹‚ñB–â‘è‚ð‰ðŒˆ‚·‚é‚©V‚µ‚¢ƒZƒbƒgƒAƒbƒvƒvƒƒOƒ‰ƒ€‚ð“üŽè‚µ‚Ä‚‚¾‚³‚¢B
-NotOnThisPlatform=‚±‚̃vƒƒOƒ‰ƒ€‚Í %1 ‚Å‚Í“®ì‚µ‚Ü‚¹‚ñB
-OnlyOnThisPlatform=‚±‚̃vƒƒOƒ‰ƒ€‚ÌŽÀs‚É‚Í %1 ‚ª•K—v‚Å‚·B
-OnlyOnTheseArchitectures=‚±‚̃vƒƒOƒ‰ƒ€‚Í%n%n%1ƒvƒƒZƒbƒTŒü‚¯‚ÌWindows‚É‚µ‚©ƒCƒ“ƒXƒg[ƒ‹‚Å‚«‚Ü‚¹‚ñB
-MissingWOW64APIs=ŒäŽg—p’†‚Ì64-bit”ÅWindows‚É‚Í‚±‚̃vƒƒOƒ‰ƒ€‚ðƒCƒ“ƒXƒg[ƒ‹‚µA“®ì‚³‚¹‚éˆ×‚É•K—v‚È‹@”\‚ªŠÜ‚Ü‚ê‚Ä‚¢‚Ü‚¹‚ñB‚±‚Ì–â‘è‚ðC³‚·‚éˆ×‚ɂ̓T[ƒrƒXƒpƒbƒN%1‚ðƒCƒ“ƒXƒg[ƒ‹‚µ‚Ä‚‚¾‚³‚¢B
-WinVersionTooLowError=‚±‚̃vƒƒOƒ‰ƒ€‚ÌŽÀs‚É‚Í %1 %2 ˆÈ~‚ª•K—v‚Å‚·B
-WinVersionTooHighError=‚±‚̃vƒƒOƒ‰ƒ€‚Í %1 %2 ˆÈ~‚Å‚Í“®ì‚µ‚Ü‚¹‚ñB
-AdminPrivilegesRequired=‚±‚̃vƒƒOƒ‰ƒ€‚ðƒCƒ“ƒXƒg[ƒ‹‚·‚邽‚ß‚É‚ÍŠÇ—ŽÒ‚Æ‚µ‚ăƒOƒCƒ“‚·‚é•K—v‚ª‚ ‚è‚Ü‚·B
-PowerUserPrivilegesRequired=‚±‚̃vƒƒOƒ‰ƒ€‚ðƒCƒ“ƒXƒg[ƒ‹‚·‚邽‚ß‚É‚ÍŠÇ—ŽÒ‚Ü‚½‚̓pƒ[ƒ†[ƒU[‚Æ‚µ‚ăƒOƒCƒ“‚·‚é•K—v‚ª‚ ‚è‚Ü‚·B
-SetupAppRunningError=ƒZƒbƒgƒAƒbƒv‚ÍŽÀs’†‚Ì %1 ‚ðŒŸo‚µ‚Ü‚µ‚½B%n%nŠJ‚¢‚Ä‚¢‚éƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚ð‚·‚×‚Ä•Â‚¶‚Ä‚©‚çuOKv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢BuƒLƒƒƒ“ƒZƒ‹v‚ðƒNƒŠƒbƒN‚·‚é‚ÆAƒZƒbƒgƒAƒbƒv‚ðI—¹‚µ‚Ü‚·B
-UninstallAppRunningError=ƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚ÍŽÀs’†‚Ì %1 ‚ðŒŸo‚µ‚Ü‚µ‚½B%n%nŠJ‚¢‚Ä‚¢‚éƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚ð‚·‚×‚Ä•Â‚¶‚Ä‚©‚çuOKv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢BuƒLƒƒƒ“ƒZƒ‹v‚ðƒNƒŠƒbƒN‚·‚é‚ÆAƒZƒbƒgƒAƒbƒv‚ðI—¹‚µ‚Ü‚·B
-
-; *** Misc. errors
-ErrorCreatingDir=ƒfƒBƒŒƒNƒgƒŠ %1 ‚ð쬒†‚ɃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B
-ErrorTooManyFilesInDir=ƒfƒBƒŒƒNƒgƒŠ %1 ‚Ƀtƒ@ƒCƒ‹‚ð쬒†‚ɃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½Bƒtƒ@ƒCƒ‹‚Ì”‚ª‘½‚·‚¬‚Ü‚·B
-
-; *** Setup common messages
-ExitSetupTitle=ƒZƒbƒgƒAƒbƒvI—¹
-ExitSetupMessage=ƒZƒbƒgƒAƒbƒvì‹Æ‚ÍŠ®—¹‚µ‚Ä‚¢‚Ü‚¹‚ñB‚±‚±‚ŃZƒbƒgƒAƒbƒv‚𒆎~‚·‚é‚ƃvƒƒOƒ‰ƒ€‚̓Cƒ“ƒXƒg[ƒ‹‚³‚ê‚Ü‚¹‚ñB%n%n‰ü‚߂ăCƒ“ƒXƒg[ƒ‹‚·‚éꇂÍA‚à‚¤ˆê“xƒZƒbƒgƒAƒbƒv‚ðŽÀs‚µ‚Ä‚‚¾‚³‚¢B%n%nƒZƒbƒgƒAƒbƒv‚ðI—¹‚µ‚Ü‚·‚©H
-AboutSetupMenuItem=ƒZƒbƒgƒAƒbƒv‚ɂ‚¢‚Ä(&A)...
-AboutSetupTitle=ƒZƒbƒgƒAƒbƒv‚ɂ‚¢‚Ä
-AboutSetupMessage=%1 %2%n%3%n%n%1 ƒz[ƒ€ƒy[ƒW:%n%4
-AboutSetupNote=
-TranslatorNote=
-
-; *** Buttons
-ButtonBack=< –ß‚é(&B)
-ButtonNext=ŽŸ‚Ö(&N) >
-ButtonInstall=ƒCƒ“ƒXƒg[ƒ‹(&I)
-ButtonOK=OK
-ButtonCancel=ƒLƒƒƒ“ƒZƒ‹
-ButtonYes=‚Í‚¢(&Y)
-ButtonYesToAll=‚·‚ׂĂ͂¢(&A)
-ButtonNo=‚¢‚¢‚¦(&N)
-ButtonNoToAll=‚·‚ׂĂ¢‚¢‚¦(&O)
-ButtonFinish=Š®—¹(&F)
-ButtonBrowse=ŽQÆ(&B)...
-ButtonWizardBrowse=ŽQÆ(&r)
-ButtonNewFolder=V‚µ‚¢ƒtƒHƒ‹ƒ_(&M)
-
-; *** "Select Language" dialog messages
-SelectLanguageTitle=ƒZƒbƒgƒAƒbƒv‚ÉŽg—p‚·‚錾Œê‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B
-SelectLanguageLabel=ƒCƒ“ƒXƒg[ƒ‹’†‚É—˜—p‚·‚錾Œê‚ðï‚Ñ‚Ü‚·:
-
-; *** Common wizard text
-ClickNext=‘±s‚·‚é‚É‚ÍuŽŸ‚ÖvAƒZƒbƒgƒAƒbƒv‚ðI—¹‚·‚é‚É‚ÍuƒLƒƒƒ“ƒZƒ‹v‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
-BeveledLabel=
-BrowseDialogTitle=ƒtƒHƒ‹ƒ_ŽQÆ
-BrowseDialogLabel=ƒŠƒXƒg‚©‚çƒtƒHƒ‹ƒ_‚ð‘I‚ÑOK‚ð‰Ÿ‚µ‚Ä‚‚¾‚³‚¢B
-NewFolderName=V‚µ‚¢ƒtƒHƒ‹ƒ_
-
-; *** "Welcome" wizard page
-WelcomeLabel1=[name] ƒZƒbƒgƒAƒbƒvƒEƒBƒU[ƒh‚ÌŠJŽn
-WelcomeLabel2=‚±‚̃vƒƒOƒ‰ƒ€‚Í‚²Žg—p‚̃Rƒ“ƒsƒ…[ƒ^‚Ö [name/ver] ‚ðƒCƒ“ƒXƒg[ƒ‹‚µ‚Ü‚·B%n%n‘±s‚·‚é‘O‚É‘¼‚̃AƒvƒŠƒP[ƒVƒ‡ƒ“‚ð‚·‚×‚ÄI—¹‚µ‚Ä‚‚¾‚³‚¢B
-
-; *** "Password" wizard page
-WizardPassword=ƒpƒXƒ[ƒh
-PasswordLabel1=‚±‚̃Cƒ“ƒXƒg[ƒ‹ƒvƒƒOƒ‰ƒ€‚̓pƒXƒ[ƒh‚É‚æ‚Á‚ĕی삳‚ê‚Ä‚¢‚Ü‚·B
-PasswordLabel3=ƒpƒXƒ[ƒh‚ð“ü—Í‚µ‚ÄuŽŸ‚Öv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢BƒpƒXƒ[ƒh‚͑啶Žš‚Ƭ•¶Žš‚ª‹æ•Ê‚³‚ê‚Ü‚·B
-PasswordEditLabel=ƒpƒXƒ[ƒh(&P):
-IncorrectPassword=“ü—Í‚³‚ꂽƒpƒXƒ[ƒh‚ª³‚µ‚‚ ‚è‚Ü‚¹‚ñB‚à‚¤ˆê“x“ü—Í‚µ‚È‚¨‚µ‚Ä‚‚¾‚³‚¢B
-
-; *** "License Agreement" wizard page
-WizardLicense=Žg—p‹–‘øŒ_–ñ‘‚Ì“¯ˆÓ
-LicenseLabel=‘±s‚·‚é‘O‚Ɉȉº‚Ìd—v‚Èî•ñ‚ð‚¨“Ç‚Ý‚‚¾‚³‚¢B
-LicenseLabel3=ˆÈ‰º‚ÌŽg—p‹–‘øŒ_–ñ‘‚ð‚¨“Ç‚Ý‚‚¾‚³‚¢BƒCƒ“ƒXƒg[ƒ‹‚ð‘±s‚·‚é‚É‚Í‚±‚ÌŒ_–ñ‘‚É“¯ˆÓ‚·‚é•K—v‚ª‚ ‚è‚Ü‚·B
-LicenseAccepted=“¯ˆÓ‚·‚é(&A)
-LicenseNotAccepted=“¯ˆÓ‚µ‚È‚¢(&D)
-
-; *** "Information" wizard pages
-WizardInfoBefore=î•ñ
-InfoBeforeLabel=‘±s‚·‚é‘O‚Ɉȉº‚Ìd—v‚Èî•ñ‚ð‚¨“Ç‚Ý‚‚¾‚³‚¢B
-InfoBeforeClickLabel=ƒZƒbƒgƒAƒbƒv‚ð‘±s‚·‚é‚É‚ÍuŽŸ‚Öv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
-WizardInfoAfter=î•ñ
-InfoAfterLabel=‘±s‚·‚é‘O‚Ɉȉº‚Ìd—v‚Èî•ñ‚ð‚¨“Ç‚Ý‚‚¾‚³‚¢B
-InfoAfterClickLabel=ƒZƒbƒgƒAƒbƒv‚ð‘±s‚·‚é‚É‚ÍuŽŸ‚Öv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
-
-; *** "User Information" wizard page
-WizardUserInfo=ƒ†[ƒU[î•ñ
-UserInfoDesc=ƒ†[ƒU[î•ñ‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B
-UserInfoName=ƒ†[ƒU[–¼(&U):
-UserInfoOrg=‘gD(&O):
-UserInfoSerial=ƒVƒŠƒAƒ‹”Ô†(&S):
-UserInfoNameRequired=ƒ†[ƒU[–¼‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B
-
-; *** "Select Destination Location" wizard page
-WizardSelectDir=ƒCƒ“ƒXƒg[ƒ‹æ‚ÌŽw’è
-SelectDirDesc=[name] ‚̃Cƒ“ƒXƒg[ƒ‹æ‚ðŽw’肵‚Ä‚‚¾‚³‚¢B
-SelectDirLabel3=[name] ‚ðƒCƒ“ƒXƒg[ƒ‹‚·‚éƒtƒHƒ‹ƒ_‚ðŽw’肵‚ÄAuŽŸ‚Öv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
-SelectDirBrowseLabel=‘±‚¯‚é‚É‚ÍuŽŸ‚Öv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B•Ê‚̃tƒHƒ‹ƒ_‚ð‘I‘ð‚·‚é‚É‚ÍuŽQÆv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
-DiskSpaceMBLabel=‚±‚̃vƒƒOƒ‰ƒ€‚ÍÅ’á [mb] MB‚̃fƒBƒXƒN‹ó‚«—̈æ‚ð•K—v‚Æ‚µ‚Ü‚·B
-ToUNCPathname=ƒZƒbƒgƒAƒbƒv‚ÍUNCƒtƒHƒ‹ƒ_‚ɃCƒ“ƒXƒg[ƒ‹‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñBƒlƒbƒgƒ[ƒN‚ɃCƒ“ƒXƒg[ƒ‹‚·‚éꇂ̓lƒbƒgƒ[ƒNƒhƒ‰ƒCƒu‚ÉŠ„‚è“–‚Ä‚Ä‚‚¾‚³‚¢B
-InvalidPath=ƒhƒ‰ƒCƒu•¶Žš‚ðŠÜ‚ÞŠ®‘S‚ȃpƒX‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B%n%n—áFC:\APP%n%n‚Ü‚½‚ÍUNCŒ`Ž®‚̃pƒX‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B%n%n—áF\\server\share
-InvalidDrive=Žw’肵‚½ƒhƒ‰ƒCƒu‚Ü‚½‚ÍUNCƒpƒX‚ªŒ©‚‚©‚ç‚È‚¢‚©ƒAƒNƒZƒX‚Å‚«‚Ü‚¹‚ñB•Ê‚̃pƒX‚ðŽw’肵‚Ä‚‚¾‚³‚¢B
-DiskSpaceWarningTitle=ƒfƒBƒXƒN‹ó‚«—̈æ‚Ì•s‘«
-DiskSpaceWarning=ƒCƒ“ƒXƒg[ƒ‹‚É‚ÍÅ’á %1 KB‚̃fƒBƒXƒN‹ó‚«—̈悪•K—v‚Å‚·‚ªAŽw’肳‚ꂽƒhƒ‰ƒCƒu‚É‚Í %2 KB‚̋󂫗̈悵‚©‚ ‚è‚Ü‚¹‚ñB%n%n‚±‚Ì‚Ü‚Ü‘±s‚µ‚Ü‚·‚©H
-DirNameTooLong=ƒhƒ‰ƒCƒu–¼–”‚̓pƒX‚ª’·‰ß‚¬‚Ü‚·B
-InvalidDirName=ƒtƒHƒ‹ƒ_–¼‚ª–³Œø‚Å‚·B
-BadDirName32=ˆÈ‰º‚Ì•¶Žš‚ðŠÜ‚ÞƒtƒHƒ‹ƒ_–¼‚ÍŽw’è‚Å‚«‚Ü‚¹‚ñB:%n%n%1
-DirExistsTitle=Šù‘¶‚̃tƒHƒ‹ƒ_
-DirExists=ƒtƒHƒ‹ƒ_ %n%n%1%n%n‚ªŠù‚É‘¶Ý‚µ‚Ü‚·B‚±‚Ì‚Ü‚Ü‚±‚̃tƒHƒ‹ƒ_‚ÖƒCƒ“ƒXƒg[ƒ‹‚µ‚Ü‚·‚©H
-DirDoesntExistTitle=ƒtƒHƒ‹ƒ_‚ªŒ©‚‚©‚è‚Ü‚¹‚ñB
-DirDoesntExist=ƒtƒHƒ‹ƒ_ %n%n%1%n%n‚ªŒ©‚‚©‚è‚Ü‚¹‚ñBV‚µ‚¢ƒtƒHƒ‹ƒ_‚ð쬂µ‚Ü‚·‚©H
-
-; *** "Select Components" wizard page
-WizardSelectComponents=ƒRƒ“ƒ|[ƒlƒ“ƒg‚Ì‘I‘ð
-SelectComponentsDesc=ƒCƒ“ƒXƒg[ƒ‹ƒRƒ“ƒ|[ƒlƒ“ƒg‚ð‘I‘ð‚µ‚Ä‚‚¾‚³‚¢B
-SelectComponentsLabel2=ƒCƒ“ƒXƒg[ƒ‹‚·‚éƒRƒ“ƒ|[ƒlƒ“ƒg‚ð‘I‘ð‚µ‚Ä‚‚¾‚³‚¢BƒCƒ“ƒXƒg[ƒ‹‚·‚é•K—v‚Ì‚È‚¢ƒRƒ“ƒ|[ƒlƒ“ƒg‚̓`ƒFƒbƒN‚ðŠO‚µ‚Ä‚‚¾‚³‚¢B‘±s‚·‚é‚É‚ÍuŽŸ‚Öv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
-FullInstallation=ƒtƒ‹ƒCƒ“ƒXƒg[ƒ‹
-; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
-CompactInstallation=ƒRƒ“ƒpƒNƒgƒCƒ“ƒXƒg[ƒ‹
-CustomInstallation=ƒJƒXƒ^ƒ€ƒCƒ“ƒXƒg[ƒ‹
-NoUninstallWarningTitle=Šù‘¶‚̃Rƒ“ƒ|[ƒlƒ“ƒg
-NoUninstallWarning=ƒZƒbƒgƒAƒbƒv‚͈ȉº‚̃Rƒ“ƒ|[ƒlƒ“ƒg‚ªŠù‚ɃCƒ“ƒXƒg[ƒ‹‚³‚ê‚Ä‚¢‚邱‚Æ‚ðŒŸo‚µ‚Ü‚µ‚½B%n%n%1%n%n‚±‚ê‚ç‚̃Rƒ“ƒ|[ƒlƒ“ƒg‚Ì‘I‘ð‚ð‰ðœ‚µ‚Ä‚àƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚Í‚³‚ê‚Ü‚¹‚ñB%n%n‚±‚Ì‚Ü‚Ü‘±s‚µ‚Ü‚·‚©H
-ComponentSize1=%1 KB
-ComponentSize2=%1 MB
-ComponentsDiskSpaceMBLabel=Œ»Ý‚Ì‘I‘ð‚ÍÅ’á [mb] MB‚̃fƒBƒXƒN‹ó‚«—̈æ‚ð•K—v‚Æ‚µ‚Ü‚·B
-
-; *** "Select Additional Tasks" wizard page
-WizardSelectTasks=’ljÁƒ^ƒXƒN‚Ì‘I‘ð
-SelectTasksDesc=ŽÀs‚·‚é’ljÁƒ^ƒXƒN‚ð‘I‘ð‚µ‚Ä‚‚¾‚³‚¢B
-SelectTasksLabel2=[name] ƒCƒ“ƒXƒg[ƒ‹Žž‚ÉŽÀs‚·‚é’ljÁƒ^ƒXƒN‚ð‘I‘ð‚µ‚ÄAuŽŸ‚Öv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
-
-; *** "Select Start Menu Folder" wizard page
-WizardSelectProgramGroup=ƒvƒƒOƒ‰ƒ€ƒOƒ‹[ƒv‚ÌŽw’è
-SelectStartMenuFolderDesc=ƒvƒƒOƒ‰ƒ€ƒAƒCƒRƒ“‚ð쬂·‚éꊂðŽw’肵‚Ä‚‚¾‚³‚¢B
-SelectStartMenuFolderLabel3=ƒZƒbƒgƒAƒbƒv‚̓Xƒ^[ƒgƒƒjƒ…[‚ɃvƒƒOƒ‰ƒ€‚̃Vƒ‡[ƒgƒJƒbƒg‚ð쬂µ‚Ü‚·B
-SelectStartMenuFolderBrowseLabel=‘±‚¯‚é‚É‚ÍuŽŸ‚Öv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢Bˆá‚¤ƒfƒBƒŒƒNƒgƒŠ‚ð‘I‘ð‚·‚é‚É‚ÍuŽQÆv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
-MustEnterGroupName=ƒOƒ‹[ƒv–¼‚ðŽw’肵‚Ä‚‚¾‚³‚¢B
-GroupNameTooLong=ƒtƒHƒ‹ƒ_–¼–”‚̓pƒX‚ª’·‰ß‚¬‚Ü‚·B
-InvalidGroupName=ƒOƒ‹[ƒv–¼‚ª–³Œø‚Å‚·B
-BadGroupName=ˆÈ‰º‚Ì•¶Žš‚ðŠÜ‚ÞƒOƒ‹[ƒv–¼‚ÍŽw’è‚Å‚«‚Ü‚¹‚ñB:%n%n%1
-NoProgramGroupCheck2=ƒvƒƒOƒ‰ƒ€ƒOƒ‹[ƒv‚ð쬂µ‚È‚¢(&D)
-
-; *** "Ready to Install" wizard page
-WizardReady=ƒCƒ“ƒXƒg[ƒ‹€”õŠ®—¹
-ReadyLabel1=‚²Žg—p‚̃Rƒ“ƒsƒ…[ƒ^‚Ö [name] ‚ðƒCƒ“ƒXƒg[ƒ‹‚·‚途õ‚ª‚Å‚«‚Ü‚µ‚½B
-ReadyLabel2a=ƒCƒ“ƒXƒg[ƒ‹‚ð‘±s‚·‚é‚É‚ÍuƒCƒ“ƒXƒg[ƒ‹v‚ðAÝ’è‚ÌŠm”F‚â•ÏX‚ðs‚¤‚É‚Íu–ß‚év‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
-ReadyLabel2b=ƒCƒ“ƒXƒg[ƒ‹‚ð‘±s‚·‚é‚É‚ÍuƒCƒ“ƒXƒg[ƒ‹v‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
-ReadyMemoUserInfo=ƒ†[ƒU[î•ñ:
-ReadyMemoDir=ƒCƒ“ƒXƒg[ƒ‹æ:
-ReadyMemoType=ƒZƒbƒgƒAƒbƒv‚ÌŽí—Þ:
-ReadyMemoComponents=‘I‘ðƒRƒ“ƒ|[ƒlƒ“ƒg:
-ReadyMemoGroup=ƒvƒƒOƒ‰ƒ€ƒOƒ‹[ƒv:
-ReadyMemoTasks=’ljÁƒ^ƒXƒNˆê——:
-
-; *** "Preparing to Install" wizard page
-WizardPreparing=ƒCƒ“ƒXƒg[ƒ‹€”õ’†
-PreparingDesc=‚²Žg—p‚̃Rƒ“ƒsƒ…[ƒ^‚Ö [name] ‚ðƒCƒ“ƒXƒg[ƒ‹‚·‚途õ‚ð‚µ‚Ä‚¢‚Ü‚·B
-PreviousInstallNotCompleted=‘O‰ñs‚Á‚½ƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚̃Cƒ“ƒXƒg[ƒ‹‚Ü‚½‚Í휂ªŠ®—¹‚µ‚Ä‚¢‚Ü‚¹‚ñBŠ®—¹‚·‚é‚ɂ̓Rƒ“ƒsƒ…[ƒ^‚ðÄ‹N“®‚·‚é•K—v‚ª‚ ‚è‚Ü‚·B%n%n[name] ‚̃Cƒ“ƒXƒg[ƒ‹‚ðŠ®—¹‚·‚邽‚ß‚É‚ÍAÄ‹N“®Œã‚É‚à‚¤ˆê“xƒZƒbƒgƒAƒbƒv‚ðŽÀs‚µ‚Ä‚‚¾‚³‚¢B
-CannotContinue=ƒZƒbƒgƒAƒbƒv‚ð‘±s‚Å‚«‚Ü‚¹‚ñBuƒLƒƒƒ“ƒZƒ‹v‚ðƒNƒŠƒbƒN‚µ‚ăZƒbƒgƒAƒbƒv‚ðI—¹‚µ‚Ä‚‚¾‚³‚¢B
-
-; *** "Installing" wizard page
-WizardInstalling=ƒCƒ“ƒXƒg[ƒ‹ó‹µ
-InstallingLabel=‚²Žg—p‚̃Rƒ“ƒsƒ…[ƒ^‚É [name] ‚ðƒCƒ“ƒXƒg[ƒ‹‚µ‚Ä‚¢‚Ü‚·B‚µ‚΂炂¨‘Ò‚¿‚‚¾‚³‚¢B
-
-; *** "Setup Completed" wizard page
-FinishedHeadingLabel=[name] ƒZƒbƒgƒAƒbƒvƒEƒBƒU[ƒh‚ÌŠ®—¹
-FinishedLabelNoIcons=‚²Žg—p‚̃Rƒ“ƒsƒ…[ƒ^‚É [name] ‚ªƒZƒbƒgƒAƒbƒv‚³‚ê‚Ü‚µ‚½B
-FinishedLabel=‚²Žg—p‚̃Rƒ“ƒsƒ…[ƒ^‚É [name] ‚ªƒZƒbƒgƒAƒbƒv‚³‚ê‚Ü‚µ‚½BƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚ðŽÀs‚·‚é‚ɂ̓Cƒ“ƒXƒg[ƒ‹‚³‚ꂽƒAƒCƒRƒ“‚ð‘I‘ð‚µ‚Ä‚‚¾‚³‚¢B
-ClickFinish=ƒZƒbƒgƒAƒbƒv‚ðI—¹‚·‚é‚É‚ÍuŠ®—¹v‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
-FinishedRestartLabel=[name] ‚̃Cƒ“ƒXƒg[ƒ‹‚ðŠ®—¹‚·‚邽‚ß‚É‚ÍAƒRƒ“ƒsƒ…[ƒ^‚ðÄ‹N“®‚·‚é•K—v‚ª‚ ‚è‚Ü‚·B‚·‚®‚ÉÄ‹N“®‚µ‚Ü‚·‚©H
-FinishedRestartMessage=[name] ‚̃Cƒ“ƒXƒg[ƒ‹‚ðŠ®—¹‚·‚邽‚ß‚É‚ÍAƒRƒ“ƒsƒ…[ƒ^‚ðÄ‹N“®‚·‚é•K—v‚ª‚ ‚è‚Ü‚·B%n%n‚·‚®‚ÉÄ‹N“®‚µ‚Ü‚·‚©H
-ShowReadmeCheck=READMEƒtƒ@ƒCƒ‹‚ð•\Ž¦‚·‚éB
-YesRadio=‚·‚®Ä‹N“®(&Y)
-NoRadio=Œã‚ÅŽè“®‚ÅÄ‹N“®(&N)
-; used for example as 'Run MyProg.exe'
-RunEntryExec=%1 ‚ÌŽÀs
-; used for example as 'View Readme.txt'
-RunEntryShellExec=%1 ‚Ì•\Ž¦
-
-; *** "Setup Needs the Next Disk" stuff
-ChangeDiskTitle=ƒfƒBƒXƒN‚Ì‘}“ü
-SelectDiskLabel2=ƒfƒBƒXƒN %1 ‚ð‘}“ü‚µAuOKv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B%n%n‚±‚̃fƒBƒXƒN‚̃tƒ@ƒCƒ‹‚ª‰º‚É•\Ž¦‚³‚ê‚Ä‚¢‚éƒtƒHƒ‹ƒ_ˆÈŠO‚Ìꊂɂ ‚éꇂÍA³‚µ‚¢ƒpƒX‚ð“ü—Í‚·‚é‚©uŽQÆvƒ{ƒ^ƒ“‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
-PathLabel=ƒpƒX(&P):
-FileNotInDir2=ƒtƒ@ƒCƒ‹ %1 ‚ª %2 ‚ÉŒ©‚‚©‚è‚Ü‚¹‚ñB³‚µ‚¢ƒfƒBƒXƒN‚ð‘}“ü‚·‚é‚©A•Ê‚̃tƒHƒ‹ƒ_‚ðŽw’肵‚Ä‚‚¾‚³‚¢B
-SelectDirectoryLabel=ŽŸ‚̃fƒBƒXƒN‚Ì‚ ‚éꊂðŽw’肵‚Ä‚‚¾‚³‚¢B
-
-; *** Installation phase messages
-SetupAborted=ƒZƒbƒgƒAƒbƒv‚ÍŠ®—¹‚µ‚Ä‚¢‚Ü‚¹‚ñB%n%n–â‘è‚ð‰ðŒˆ‚µ‚Ä‚©‚çA‚à‚¤ˆê“xƒZƒbƒgƒAƒbƒv‚ðŽÀs‚µ‚Ä‚‚¾‚³‚¢B
-EntryAbortRetryIgnore=‚à‚¤ˆê“x‚â‚è‚È‚¨‚·‚É‚ÍuÄŽŽsvAƒGƒ‰[‚𖳎‹‚µ‚Ä‘±s‚·‚é‚É‚Íu–³Ž‹vAƒCƒ“ƒXƒg[ƒ‹‚𒆎~‚·‚é‚É‚Íu’†Ž~v‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
-
-; *** Installation status messages
-StatusCreateDirs=ƒtƒHƒ‹ƒ_‚ð쬂µ‚Ä‚¢‚Ü‚·...
-StatusExtractFiles=ƒtƒ@ƒCƒ‹‚ð“WŠJ‚µ‚Ä‚¢‚Ü‚·...
-StatusCreateIcons=ƒVƒ‡|ƒgƒJƒbƒg‚ð쬂µ‚Ä‚¢‚Ü‚·...
-StatusCreateIniEntries=INIƒtƒ@ƒCƒ‹‚ðݒ肵‚Ä‚¢‚Ü‚·...
-StatusCreateRegistryEntries=ƒŒƒWƒXƒgƒŠ‚ðݒ肵‚Ä‚¢‚Ü‚·...
-StatusRegisterFiles=ƒtƒ@ƒCƒ‹‚ð“o˜^‚µ‚Ä‚¢‚Ü‚·...
-StatusSavingUninstall=ƒAƒ“ƒCƒ“ƒXƒg[ƒ‹î•ñ‚ð•Û‘¶‚µ‚Ä‚¢‚Ü‚·...
-StatusRunProgram=ƒCƒ“ƒXƒg[ƒ‹‚ðŠ®—¹‚µ‚Ä‚¢‚Ü‚·...
-StatusRollback=•ÏX‚ðŒ³‚É–ß‚µ‚Ä‚¢‚Ü‚·...
-
-; *** Misc. errors
-ErrorInternal2=“à•”ƒGƒ‰[: %1
-ErrorFunctionFailedNoCode=%1 ƒGƒ‰[
-ErrorFunctionFailed=%1 ƒGƒ‰[: ƒR[ƒh %2
-ErrorFunctionFailedWithMessage=%1 ƒGƒ‰[: ƒR[ƒh %2.%n%3
-ErrorExecutingProgram=ƒtƒ@ƒCƒ‹ŽÀsƒGƒ‰[:%n%1
-
-; *** Registry errors
-ErrorRegOpenKey=ƒŒƒWƒXƒgƒŠƒL[ƒI[ƒvƒ“ƒGƒ‰[:%n%1\%2
-ErrorRegCreateKey=ƒŒƒWƒXƒgƒŠƒL[쬃Gƒ‰[:%n%1\%2
-ErrorRegWriteKey=ƒŒƒWƒXƒgƒŠƒL[‘‚«ž‚݃Gƒ‰[:%n%1\%2
-
-; *** INI errors
-ErrorIniEntry=INIƒtƒ@ƒCƒ‹ƒGƒ“ƒgƒŠì¬ƒGƒ‰[: ƒtƒ@ƒCƒ‹ %1
-
-; *** File copying errors
-FileAbortRetryIgnore=‚à‚¤ˆê“x‚â‚è‚È‚¨‚·‚É‚ÍuÄŽŽsvA‚±‚̃tƒ@ƒCƒ‹‚ðƒXƒLƒbƒv‚µ‚Ä‘±s‚·‚é‚É‚Íu–³Ž‹vi„§‚³‚ê‚Ü‚¹‚ñjAƒCƒ“ƒXƒg[ƒ‹‚𒆎~‚·‚é‚É‚Íu’†Ž~v‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
-FileAbortRetryIgnore2=‚à‚¤ˆê“x‚â‚è‚È‚¨‚·‚É‚ÍuÄŽŽsvA‚±‚̃tƒ@ƒCƒ‹‚ðƒXƒLƒbƒv‚µ‚Ä‘±s‚·‚é‚É‚Íu–³Ž‹vi„§‚³‚ê‚Ü‚¹‚ñjAƒCƒ“ƒXƒg[ƒ‹‚𒆎~‚·‚é‚É‚Íu’†Ž~v‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
-SourceIsCorrupted=ƒRƒs[Œ³‚̃tƒ@ƒCƒ‹‚ª‰ó‚ê‚Ä‚¢‚Ü‚·B
-SourceDoesntExist=ƒRƒs[Œ³‚̃tƒ@ƒCƒ‹ %1 ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñB
-ExistingFileReadOnly=Šù‘¶‚̃tƒ@ƒCƒ‹‚Í“Ç‚ÝŽæ‚èê—p‚Å‚·B%n%n“Ç‚ÝŽæ‚èê—p‘®«‚ð‰ðœ‚µ‚Ä‚à‚¤ˆê“x‚â‚è‚È‚¨‚·‚É‚ÍuÄŽŽsvA‚±‚̃tƒ@ƒCƒ‹‚ðƒXƒLƒbƒv‚µ‚Ä‘±s‚·‚é‚É‚Íu–³Ž‹vAƒCƒ“ƒXƒg[ƒ‹‚𒆎~‚·‚é‚É‚Íu’†Ž~v‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
-ErrorReadingExistingDest=Šù‘¶‚̃tƒ@ƒCƒ‹‚ð“Ç‚Ýž‚Ý’†‚ɃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B:
-FileExists=ƒtƒ@ƒCƒ‹‚ÍŠù‚É‘¶Ý‚µ‚Ü‚·B%n%nã‘‚«‚µ‚Ü‚·‚©H
-ExistingFileNewer=ƒCƒ“ƒXƒg[ƒ‹‚µ‚悤‚Æ‚µ‚Ä‚¢‚éƒtƒ@ƒCƒ‹‚æ‚è‚àV‚µ‚¢ƒtƒ@ƒCƒ‹‚ª‘¶Ý‚µ‚Ü‚·BŠù‘¶‚̃tƒ@ƒCƒ‹‚ðŽc‚·‚±‚Æ‚ð‚¨§‚ß‚µ‚Ü‚·B%n%nŠù‘¶‚̃tƒ@ƒCƒ‹‚ðŽc‚µ‚Ü‚·‚©B
-ErrorChangingAttr=Šù‘¶ƒtƒ@ƒCƒ‹‚Ì‘®«‚ð•ÏX’†‚ɃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B:
-ErrorCreatingTemp=ƒRƒs[æ‚̃tƒHƒ‹ƒ_‚Ƀtƒ@ƒCƒ‹‚ð쬒†‚ɃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B:
-ErrorReadingSource=ƒRƒs[Œ³‚̃tƒ@ƒCƒ‹‚ð“Ç‚Ýž‚Ý’†‚ɃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B:
-ErrorCopying=ƒtƒ@ƒCƒ‹‚ðƒRƒs[’†‚ɃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B:
-ErrorReplacingExistingFile=Šù‘¶ƒtƒ@ƒCƒ‹‚ð’u‚«Š·‚¦’†‚ɃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B:
-ErrorRestartReplace=’u‚«Š·‚¦ÄŠJ’†‚ɃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B:
-ErrorRenamingTemp=ƒRƒs[æƒtƒHƒ‹ƒ_‚̃tƒ@ƒCƒ‹–¼‚ð•ÏX’†‚ɃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B:
-ErrorRegisterServer=DLL/OCX‚Ì“o˜^‚ÉŽ¸”s‚µ‚Ü‚µ‚½B: %1
-ErrorRegSvr32Failed=RegSvr32‚̓Gƒ‰[ƒR[ƒh %1 ‚É‚æ‚莸”s‚µ‚Ü‚µ‚½B
-ErrorRegisterTypeLib=ƒ^ƒCƒvƒ‰ƒCƒuƒ‰ƒŠ‚Ö‚Ì“o˜^‚ÉŽ¸”s‚µ‚Ü‚µ‚½B: %1
-
-; *** Post-installation errors
-ErrorOpeningReadme=READMEƒtƒ@ƒCƒ‹‚̃I[ƒvƒ“‚ÉŽ¸”s‚µ‚Ü‚µ‚½B
-ErrorRestartingComputer=ƒRƒ“ƒsƒ…[ƒ^‚ÌÄ‹N“®‚ÉŽ¸”s‚µ‚Ü‚µ‚½BŽè“®‚ÅÄ‹N“®‚µ‚Ä‚‚¾‚³‚¢B
-
-; *** Uninstaller messages
-UninstallNotFound=ƒtƒ@ƒCƒ‹ %1 ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñBƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚ðŽÀs‚Å‚«‚Ü‚¹‚ñB
-UninstallOpenError=ƒtƒ@ƒCƒ‹ %1 ‚ðŠJ‚¯‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñBƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚ðŽÀs‚Å‚«‚Ü‚¹‚ñB
-UninstallUnsupportedVer=ƒAƒ“ƒCƒ“ƒXƒg[ƒ‹ƒƒOƒtƒ@ƒCƒ‹ %1 ‚ÍA‚±‚̃o[ƒWƒ‡ƒ“‚̃Aƒ“ƒCƒ“ƒXƒg[ƒ‹ƒvƒƒOƒ‰ƒ€‚ª”FŽ¯‚Å‚«‚È‚¢Œ`Ž®‚Å‚·BƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚ðŽÀs‚Å‚«‚Ü‚¹‚ñB
-UninstallUnknownEntry=ƒAƒ“ƒCƒ“ƒXƒg[ƒ‹ƒƒO‚É•s–¾‚̃Gƒ“ƒgƒŠ %1 ‚ªŒ©‚‚©‚è‚Ü‚µ‚½B
-ConfirmUninstall=%1 ‚Æ‚»‚ÌŠÖ˜AƒRƒ“ƒ|[ƒlƒ“ƒg‚ð‚·‚×‚Ä휂µ‚Ü‚·B‚æ‚낵‚¢‚Å‚·‚©H
-UninstallOnlyOnWin64=‚±‚̃vƒƒOƒ‰ƒ€‚Í64-bit”ÅWindowsã‚ł̂݃Aƒ“ƒCƒ“ƒXƒg[ƒ‹‚Å‚«‰Â”\‚Å‚·B
-OnlyAdminCanUninstall=ƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚·‚邽‚ß‚É‚ÍŠÇ—ŽÒŒ ŒÀ‚ª•K—v‚Å‚·B
-UninstallStatusLabel=‚²Žg—p‚̃Rƒ“ƒsƒ…[ƒ^‚©‚ç %1 ‚ð휂µ‚Ä‚¢‚Ü‚·B‚µ‚΂炂¨‘Ò‚¿‚‚¾‚³‚¢B
-UninstalledAll=%1 ‚Í‚²Žg—p‚̃Rƒ“ƒsƒ…[ƒ^‚©‚ç³í‚É휂³‚ê‚Ü‚µ‚½B
-UninstalledMost=%1 ‚̃Aƒ“ƒCƒ“ƒXƒg[ƒ‹‚ªŠ®—¹‚µ‚Ü‚µ‚½B%n%n‚¢‚‚‚©‚Ì€–Ú‚ªíœ‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½BŽè“®‚Å휂µ‚Ä‚‚¾‚³‚¢B
-UninstalledAndNeedsRestart=%1 ‚Ìíœ‚ðŠ®—¹‚·‚邽‚ß‚É‚ÍAƒRƒ“ƒsƒ…[ƒ^‚ðÄ‹N“®‚·‚é•K—v‚ª‚ ‚è‚Ü‚·B‚·‚®‚ÉÄ‹N“®‚µ‚Ü‚·‚©H
-UninstallDataCorrupted=ƒtƒ@ƒCƒ‹ "%1" ‚ª‰ó‚ê‚Ä‚¢‚Ü‚·BƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚ðŽÀs‚Å‚«‚Ü‚¹‚ñB
-
-; *** Uninstallation phase messages
-ConfirmDeleteSharedFileTitle=‹¤—Lƒtƒ@ƒCƒ‹‚Ìíœ
-ConfirmDeleteSharedFile2=ƒVƒXƒeƒ€ã‚ÅAŽŸ‚Ì‹¤—Lƒtƒ@ƒCƒ‹‚͂ǂ̃vƒƒOƒ‰ƒ€‚Å‚àŽg—p‚³‚ê‚Ä‚¢‚Ü‚¹‚ñB‚±‚Ì‹¤—Lƒtƒ@ƒCƒ‹‚ð휂µ‚Ü‚·‚©H%n%n‘¼‚̃vƒƒOƒ‰ƒ€‚ª‚Ü‚¾‚±‚̃tƒ@ƒCƒ‹‚ðŽg—p‚·‚éê‡A휂·‚é‚ƃvƒƒOƒ‰ƒ€‚ª“®ì‚µ‚È‚‚È‚é‹°‚ꂪ‚ ‚è‚Ü‚·B‚ ‚Ü‚èŠmŽÀ‚Å‚È‚¢ê‡‚Íu‚¢‚¢‚¦v‚ð‘I‘ð‚µ‚Ä‚‚¾‚³‚¢BƒVƒXƒeƒ€‚Ƀtƒ@ƒCƒ‹‚ðŽc‚µ‚Ä‚à–â‘è‚ðˆø‚«‹N‚±‚·‚±‚Æ‚Í‚ ‚è‚Ü‚¹‚ñB
-SharedFileNameLabel=ƒtƒ@ƒCƒ‹–¼:
-SharedFileLocationLabel=êŠ:
-WizardUninstalling=ƒAƒ“ƒCƒ“ƒXƒg[ƒ‹ó‹µ
-StatusUninstalling=%1 ‚ðƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚µ‚Ä‚¢‚Ü‚·...
-
-; The custom messages below aren't used by Setup itself, but if you make
-; use of them in your scripts, you'll want to translate them.
-
-[CustomMessages]
-
-NameAndVersion=%1 ƒo[ƒWƒ‡ƒ“ %2
-AdditionalIcons=ƒAƒCƒRƒ“‚ð’ljÁ‚·‚é:
-CreateDesktopIcon=ƒfƒXƒNƒgƒbƒvã‚ɃAƒCƒRƒ“‚ð쬂·‚é(&d)
-CreateQuickLaunchIcon=&Quick Launch ƒAƒCƒRƒ“‚ð쬂·‚é
-ProgramOnTheWeb=%1 on the Web
-UninstallProgram=%1 ‚ðƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚·‚é
-LaunchProgram=%1 ‚ðŽÀs‚·‚é
-AssocFileExtension=%2 ƒtƒ@ƒCƒ‹Šg’£‚É %1‚ðŠÖ˜A•t‚¯‚Ü‚·B
-AssocingFileExtension=%2 ‚É %1‚ðŠÖ˜A•t‚¯‚Ü‚·B
commit 3892893b7a24086665de506a8e49ed7df7ff33da
Author: Jannick <thirdedition at gmx.net>
Date: Fri May 25 16:44:03 2018 +0200
install-fq-mods.cmd: add check for ALPHAVANTAGE_API_KEY
including user information as how to apply it.
diff --git a/extra_dist/install-fq-mods.cmd b/extra_dist/install-fq-mods.cmd
index 74540d8..d704321 100644
--- a/extra_dist/install-fq-mods.cmd
+++ b/extra_dist/install-fq-mods.cmd
@@ -105,6 +105,22 @@ echo.
perl -w gnc-fq-update
if %errorlevel% neq 0 goto error
+REM ----------------------------------------------------------------------------
+echo.
+echo * Check environment variable ALPHAVANTAGE_API_KEY
+echo.
+
+echo. ***
+echo. *** You need an API key (from https://www.alphavantage.co)
+echo. *** to run the Perl module Finance::Quote.
+echo. ***
+echo. *** Make it available to GnuCash by
+if not [%ALPHAVANTAGE_API_KEY%] == [] set "done=(done) "
+echo. *** - setting the environment variable ALPHAVANTAGE_API_KEY %done%or
+echo. *** - starting GnuCash and adding the Alpha Vantage api key in
+echo. *** Edit-^>Preferences-^>Online Quotes
+echo. ***
+
REM ----------------------------------------------------------------------------
echo.
echo * Run gnc-fq-check
commit b47bf993b7ee7ad6d0cab5c0361d326c4e69be65
Author: Jannick <thirdedition at gmx.net>
Date: Fri May 25 16:11:06 2018 +0200
install-fq-mods.cmd: update for migration to Alpha Vantage.
diff --git a/extra_dist/install-fq-mods.cmd b/extra_dist/install-fq-mods.cmd
index f7ce2c0..74540d8 100644
--- a/extra_dist/install-fq-mods.cmd
+++ b/extra_dist/install-fq-mods.cmd
@@ -116,7 +116,7 @@ REM ----------------------------------------------------------------------------
echo.
echo * Run gnc-fq-helper
echo.
-echo (yahoo "AMZN") | perl -w gnc-fq-helper
+echo (alphavantage "AMZN") | perl -w gnc-fq-helper
if %errorlevel% neq 0 goto error
REM ----------------------------------------------------------------------------
@@ -134,5 +134,6 @@ echo.
REM ----------------------------------------------------------------------------
:end
+endlocal
pause
commit 12152926645f7b0bd0223aa0f7584a3f23a884fb
Author: Jannick <thirdedition at gmx.net>
Date: Fri May 25 16:05:16 2018 +0200
getperl.vbs: strawberry perl link updated
diff --git a/extra_dist/getperl.vbs b/extra_dist/getperl.vbs
index 07ceaa0..cc10c65 100644
--- a/extra_dist/getperl.vbs
+++ b/extra_dist/getperl.vbs
@@ -11,7 +11,8 @@ Dim tempFolder: tempFolder = fso.GetSpecialFolder(TemporaryFolder)
strHDLocation = Wscript.Arguments.Item(0)
' Set your settings
- strFileURL = "http://strawberryperl.com/download/5.18.2.2/strawberry-perl-5.18.2.2-32bit.msi"
+ ' link can be updated from http://strawberryperl.com/
+ strFileURL = "http://strawberryperl.com/download/5.26.2.1/strawberry-perl-5.26.2.1-32bit.msi"
Wscript.Echo " copying " & strFileURL
Wscript.Echo " to " & strHDLocation
commit 8a61821b8f20c0b85b870c55e6cb66b0dd3fe928
Author: Geert Janssens <geert at kobaltwit.be>
Date: Tue May 1 22:51:00 2018 +0200
Update libofx to 0.9.13
This version obsoletes our tempfile patch (it's included in the
release).
diff --git a/gnucash.modules b/gnucash.modules
index 5b9571e..6775395 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -222,10 +222,8 @@
</autotools>
<autotools id="libofx" autogen-sh='autoreconf'>
- <branch repo="sourceforge" module="libofx/libofx-0.9.10.tar.gz"
- version="0.9.10">
- <patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/patches/libofx-tempfile.patch" strip='1'/>
- </branch>
+ <branch repo="sourceforge" module="libofx/libofx-0.9.13.tar.gz"
+ version="0.9.13"/>
<dependencies>
<dep package="OpenSP"/>
</dependencies>
diff --git a/patches/libofx-tempfile.patch b/patches/libofx-tempfile.patch
deleted file mode 100644
index 1ba632a..0000000
--- a/patches/libofx-tempfile.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-diff --git a/lib/ofx_preproc.cpp b/lib/ofx_preproc.cpp
-index 68a4170..c5fc7ee 100644
---- a/lib/ofx_preproc.cpp
-+++ b/lib/ofx_preproc.cpp
-@@ -34,13 +34,13 @@
- #include <iconv.h>
- #endif
-
--#ifdef OS_WIN32
-+#ifdef __WIN32__
- # define DIRSEP "\\"
- #else
- # define DIRSEP "/"
- #endif
-
--#ifdef OS_WIN32
-+#ifdef __WIN32__
- # include "win32.hh"
- # include <windows.h> // for GetModuleFileName()
- # undef ERROR
-@@ -111,7 +111,11 @@ int ofx_proc_file(LibofxContextPtr ctx, const char * p_filename)
- mkTempFileName("libofxtmpXXXXXX", tmp_filename, sizeof(tmp_filename));
-
- message_out(DEBUG, "ofx_proc_file(): Creating temp file: " + string(tmp_filename));
-+#ifdef __WIN32__
-+ tmp_file_fd = mkstemp_win32(tmp_filename);
-+#else
- tmp_file_fd = mkstemp(tmp_filename);
-+#endif
- if (tmp_file_fd)
- {
- tmp_file.open(tmp_filename);
-@@ -310,7 +314,7 @@ int ofx_proc_file(LibofxContextPtr ctx, const char * p_filename)
- size_t outbytesleft = inbytesleft * 2 - 1;
- iconv_buffer = (char*) malloc (inbytesleft * 2);
- memset(iconv_buffer, 0, inbytesleft * 2);
--#if defined(OS_WIN32) || defined(__sun)
-+#if defined(__sun)
- const char * inchar = (const char *)s_buffer.c_str();
- #else
- char * inchar = (char *)s_buffer.c_str();
-@@ -528,7 +532,7 @@ string sanitize_proprietary_tags(string input_string)
- }
-
-
--#ifdef OS_WIN32
-+#ifdef __WIN32__
- static std::string get_dtd_installation_directory()
- {
- // Partial implementation of
-@@ -583,7 +587,7 @@ std::string find_dtd(LibofxContextPtr ctx, const std::string& dtd_filename)
- }
- }
-
--#ifdef OS_WIN32
-+#ifdef __WIN32__
- dtd_path_filename = get_dtd_installation_directory();
- if (!dtd_path_filename.empty())
- {
-diff --git a/lib/ofx_utilities.cpp b/lib/ofx_utilities.cpp
-index 602c866..8ef4668 100644
---- a/lib/ofx_utilities.cpp
-+++ b/lib/ofx_utilities.cpp
-@@ -28,7 +28,7 @@
- #include "messages.hh"
- #include "ofx_utilities.hh"
-
--#ifdef OS_WIN32
-+#ifdef __WIN32__
- # define DIRSEP "\\"
- #else
- # define DIRSEP "/"
-@@ -273,7 +273,7 @@ std::string get_tmp_dir()
- if (var) return var;
- var = getenv("TEMP");
- if (var) return var;
--#ifdef OS_WIN32
-+#ifdef __WIN32__
- return "C:\\";
- #else
- return "/tmp";
-diff --git a/lib/win32.cpp b/lib/win32.cpp
-index 69078f2..5f863de 100644
---- a/lib/win32.cpp
-+++ b/lib/win32.cpp
-@@ -25,9 +25,9 @@
-
-
-
--#ifdef OS_WIN32
-+#ifdef __WIN32__
-
--int mkstemp(char *tmpl)
-+int mkstemp_win32(char *tmpl)
- {
- int fd = -1;
- int len;
-diff --git a/lib/win32.hh b/lib/win32.hh
-index 353093a..8df3970 100644
---- a/lib/win32.hh
-+++ b/lib/win32.hh
-@@ -21,9 +21,9 @@
- #endif
-
-
--#ifdef OS_WIN32
-+#ifdef __WIN32__
-
--int mkstemp(char *tmpl);
-+int mkstemp_win32(char *tmpl);
-
-
- #endif
commit 1ef3508b6d053e02c127abe618d5679fcd46d035
Author: Geert Janssens <geert at kobaltwit.be>
Date: Tue May 1 21:41:16 2018 +0200
Default to debug builds for git based builds
Release builds will remain normal. This should make it easier to
create a stack trace from the nightly builds.
diff --git a/gnucash.modules b/gnucash.modules
index fc53ed2..5b9571e 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -300,7 +300,7 @@
</cmake>
<cmake id="gnucash-git"
- cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DCOMPILE_GSCHEMAS=OFF"
+ cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DCOMPILE_GSCHEMAS=OFF -DCMAKE_BUILD_TYPE=Debug"
use-ninja="False">
<branch repo="github" module="Gnucash/gnucash.git" revision="master"
checkoutdir="gnucash-git"/>
commit c5f680b20023857f15a133e002c3e3ab1ded1831
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Apr 28 15:08:20 2018 -0700
Include docs-3.1 in the release.
diff --git a/gnucash.modules b/gnucash.modules
index f2ee349..fc53ed2 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -330,8 +330,8 @@
<autotools id="gnucash-docs"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
makeargs="chm" makeinstallargs="install-chm" >
- <branch module="gnucash/gnucash-docs/gnucash-docs-3.0.tar.gz"
- version="3.0" repo="sourceforge"/>
+ <branch module="gnucash/gnucash-docs/gnucash-docs-3.1.tar.gz"
+ version="3.1" repo="sourceforge"/>
</autotools>
<metamodule id="meta-gnucash-git">
commit 28dae407049837c69ba24ef89c36f5e57486f898
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Apr 28 15:05:26 2018 -0700
Release GnuCash 3.1
diff --git a/gnucash.modules b/gnucash.modules
index cb88f69..f2ee349 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -284,8 +284,8 @@
<cmake id="gnucash"
cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DCOMPILE_GSCHEMAS=OFF"
use-ninja="False">
- <branch repo="sourceforge" module="gnucash/stable/gnucash-3.0.tar.bz2"
- version="3.0"/>
+ <branch repo="sourceforge" module="gnucash/stable/gnucash-3.1.tar.bz2"
+ version="3.1"/>
<dependencies>
<dep package="libofx"/>
<dep package="aqbanking"/>
commit 2ab108315df200724ae2a2240ce1bd8de0a256cd
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat Apr 28 15:06:53 2018 +0200
Ofx patch - version 3
The previous version still had build issues because it needed
a few extra OS_WIN32 instances replaced with __WIN32__.
I have chosen to replace all of them. And this time I tested locally
before commit. I believe this one finally works.
diff --git a/patches/libofx-tempfile.patch b/patches/libofx-tempfile.patch
index e037fe6..1ba632a 100644
--- a/patches/libofx-tempfile.patch
+++ b/patches/libofx-tempfile.patch
@@ -1,8 +1,24 @@
---- a/lib/ofx_preproc.cpp 2013-04-17 20:09:11 +0000
-+++ b/lib/ofx_preproc.cpp 2013-10-14 09:00:31 +0000
-@@ -109,11 +109,15 @@ int ofx_proc_file(LibofxContextPtr ctx, const char * p_filename)
- }
+diff --git a/lib/ofx_preproc.cpp b/lib/ofx_preproc.cpp
+index 68a4170..c5fc7ee 100644
+--- a/lib/ofx_preproc.cpp
++++ b/lib/ofx_preproc.cpp
+@@ -34,13 +34,13 @@
+ #include <iconv.h>
+ #endif
+
+-#ifdef OS_WIN32
++#ifdef __WIN32__
+ # define DIRSEP "\\"
+ #else
+ # define DIRSEP "/"
+ #endif
+-#ifdef OS_WIN32
++#ifdef __WIN32__
+ # include "win32.hh"
+ # include <windows.h> // for GetModuleFileName()
+ # undef ERROR
+@@ -111,7 +111,11 @@ int ofx_proc_file(LibofxContextPtr ctx, const char * p_filename)
mkTempFileName("libofxtmpXXXXXX", tmp_filename, sizeof(tmp_filename));
message_out(DEBUG, "ofx_proc_file(): Creating temp file: " + string(tmp_filename));
@@ -14,11 +30,7 @@
if (tmp_file_fd)
{
tmp_file.open(tmp_filename);
- if (!tmp_file)
- {
-@@ -308,11 +312,11 @@ int ofx_proc_file(LibofxContextPtr ctx, const char * p_filename)
- #ifdef HAVE_ICONV
- size_t inbytesleft = strlen(s_buffer.c_str());
+@@ -310,7 +314,7 @@ int ofx_proc_file(LibofxContextPtr ctx, const char * p_filename)
size_t outbytesleft = inbytesleft * 2 - 1;
iconv_buffer = (char*) malloc (inbytesleft * 2);
memset(iconv_buffer, 0, inbytesleft * 2);
@@ -27,11 +39,51 @@
const char * inchar = (const char *)s_buffer.c_str();
#else
char * inchar = (char *)s_buffer.c_str();
- #endif
- char * outchar = iconv_buffer;
---- a/lib/win32.cpp Wed Mar 30 15:30:50 2011
-+++ b/lib/win32.cpp Sun Mar 29 15:07:27 2015
-@@ -25,11 +25,11 @@
+@@ -528,7 +532,7 @@ string sanitize_proprietary_tags(string input_string)
+ }
+
+
+-#ifdef OS_WIN32
++#ifdef __WIN32__
+ static std::string get_dtd_installation_directory()
+ {
+ // Partial implementation of
+@@ -583,7 +587,7 @@ std::string find_dtd(LibofxContextPtr ctx, const std::string& dtd_filename)
+ }
+ }
+
+-#ifdef OS_WIN32
++#ifdef __WIN32__
+ dtd_path_filename = get_dtd_installation_directory();
+ if (!dtd_path_filename.empty())
+ {
+diff --git a/lib/ofx_utilities.cpp b/lib/ofx_utilities.cpp
+index 602c866..8ef4668 100644
+--- a/lib/ofx_utilities.cpp
++++ b/lib/ofx_utilities.cpp
+@@ -28,7 +28,7 @@
+ #include "messages.hh"
+ #include "ofx_utilities.hh"
+
+-#ifdef OS_WIN32
++#ifdef __WIN32__
+ # define DIRSEP "\\"
+ #else
+ # define DIRSEP "/"
+@@ -273,7 +273,7 @@ std::string get_tmp_dir()
+ if (var) return var;
+ var = getenv("TEMP");
+ if (var) return var;
+-#ifdef OS_WIN32
++#ifdef __WIN32__
+ return "C:\\";
+ #else
+ return "/tmp";
+diff --git a/lib/win32.cpp b/lib/win32.cpp
+index 69078f2..5f863de 100644
+--- a/lib/win32.cpp
++++ b/lib/win32.cpp
+@@ -25,9 +25,9 @@
@@ -43,11 +95,11 @@
{
int fd = -1;
int len;
- char *nf;
- int i;
---- a/lib/win32.hh Wed Mar 30 15:30:50 2011
-+++ b/lib/win32.hh Sun Mar 29 16:26:58 2015
-@@ -21,11 +21,11 @@
+diff --git a/lib/win32.hh b/lib/win32.hh
+index 353093a..8df3970 100644
+--- a/lib/win32.hh
++++ b/lib/win32.hh
+@@ -21,9 +21,9 @@
#endif
@@ -59,4 +111,3 @@
#endif
-
commit b606f4f6c74f5dc8528cc025f3e29d633cbd2e64
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat Apr 28 13:50:59 2018 +0200
Adjust ofx patch to make it apply properly
diff --git a/patches/libofx-tempfile.patch b/patches/libofx-tempfile.patch
index 624c92d..e037fe6 100644
--- a/patches/libofx-tempfile.patch
+++ b/patches/libofx-tempfile.patch
@@ -22,7 +22,7 @@
size_t outbytesleft = inbytesleft * 2 - 1;
iconv_buffer = (char*) malloc (inbytesleft * 2);
memset(iconv_buffer, 0, inbytesleft * 2);
--#if defined(__WIN32__) || defined(__sun)
+-#if defined(OS_WIN32) || defined(__sun)
+#if defined(__sun)
const char * inchar = (const char *)s_buffer.c_str();
#else
@@ -35,7 +35,8 @@
- #ifdef __WIN32__
+-#ifdef OS_WIN32
++#ifdef __WIN32__
-int mkstemp(char *tmpl)
+int mkstemp_win32(char *tmpl)
@@ -50,7 +51,8 @@
#endif
- #ifdef __WIN32__
+-#ifdef OS_WIN32
++#ifdef __WIN32__
-int mkstemp(char *tmpl);
+int mkstemp_win32(char *tmpl);
commit 6e36fbf4f13e614c121ec40fa1217eb3afc049e5
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Apr 27 16:21:43 2018 -0700
Bug 793461 - Transaction matcher window blank when importing QFX
Use compiler-defined __WIN32__ instead of not-defined OS_WIN32.
diff --git a/patches/libofx-tempfile.patch b/patches/libofx-tempfile.patch
index c67198b..624c92d 100644
--- a/patches/libofx-tempfile.patch
+++ b/patches/libofx-tempfile.patch
@@ -6,7 +6,7 @@
mkTempFileName("libofxtmpXXXXXX", tmp_filename, sizeof(tmp_filename));
message_out(DEBUG, "ofx_proc_file(): Creating temp file: " + string(tmp_filename));
-+#ifdef OS_WIN32
++#ifdef __WIN32__
+ tmp_file_fd = mkstemp_win32(tmp_filename);
+#else
tmp_file_fd = mkstemp(tmp_filename);
@@ -22,7 +22,7 @@
size_t outbytesleft = inbytesleft * 2 - 1;
iconv_buffer = (char*) malloc (inbytesleft * 2);
memset(iconv_buffer, 0, inbytesleft * 2);
--#if defined(OS_WIN32) || defined(__sun)
+-#if defined(__WIN32__) || defined(__sun)
+#if defined(__sun)
const char * inchar = (const char *)s_buffer.c_str();
#else
@@ -35,7 +35,7 @@
- #ifdef OS_WIN32
+ #ifdef __WIN32__
-int mkstemp(char *tmpl)
+int mkstemp_win32(char *tmpl)
@@ -50,7 +50,7 @@
#endif
- #ifdef OS_WIN32
+ #ifdef __WIN32__
-int mkstemp(char *tmpl);
+int mkstemp_win32(char *tmpl);
commit dbb9f9a87ef2967793168f3680739fd6fce7961d
Author: Geert Janssens <geert at kobaltwit.be>
Date: Fri Apr 20 09:44:01 2018 +0200
Patch with -f instead of -t
-t was interpreting already applied patches as reversed patches, resulting
in the patch to be undone again. With this every other run of setup-mingw64.ps1
would result in a cmake that couldn't find swig.
The workaround in jhbuild can probably be removed again now.
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index c8a8323..41a6eb6 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -270,8 +270,8 @@ if (!(test-path -path "$target_dir\\src\\gnucash-on-windows.git")) {
exit
}
-bash-command -command "/usr/bin/patch -t -d/ -p0 -i $target_unix/src/gnucash-on-windows.git/patches/jhbuild.patch"
-bash-command -command "/usr/bin/patch -t -d/ -p0 -i $target_unix/src/gnucash-on-windows.git/patches/FindSWIG.patch"
+bash-command -command "/usr/bin/patch -f -d/ -p0 -i $target_unix/src/gnucash-on-windows.git/patches/jhbuild.patch"
+bash-command -command "/usr/bin/patch -f -d/ -p0 -i $target_unix/src/gnucash-on-windows.git/patches/FindSWIG.patch"
$jhbuildrc = get-content "$target_dir\\src\\gnucash-on-windows.git\\jhbuildrc.in" |
%{$_ -replace "@-BASE_DIR-@", "$target_unix"} |
commit 2bd3a281ddbf7a4ce997ee4ef275f749e2f5a79e
Author: Geert Janssens <geert at kobaltwit.be>
Date: Tue Apr 17 10:53:36 2018 +0200
Add missing libfribidi-0.dll dependency in inno setup file
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 8be5ab3..f4a3614 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -110,7 +110,7 @@ Source: "@INST_DIR@\share\doc\@PACKAGE at -docs\*.hhmap"; DestDir: "{app}\share\@PA
;;;; The second section retrieves the dependencies that we need from MinGW.
;; Required DLLs
-;; gnucash.exe: libglib-2.0-0.dll, libgtk-3-0.dll, ligdk-3-0.dll, libatk-1.0-dll, libgobject-2.0-0.dll, libintl-8.dll, libcairo-gobject-2.dll, libcairo-2.dll, libfontconfig-1.0.dll, libfreetype-6.dll, libpixman-1-0.dll, libpng16-16.dll, zlib1.dll, libgdk-pixbuf-2.0-0.dll, libgio-2.0-0.dll, libgmodule-2.0-0.dll, libpango-1.0-0.dll, libpangocairo-1.0-0.dll, libpangowin32-1.0-0.dll, libpangoft2-1.0-0.dll, libharfbuzz-0.dll, libiconv-2.dll, libwinpthread-1.dll, libsystre-0.dll, libxml2-2.dll, libxslt-1.dll, libboost_regex-mt.dll, libicuuc57.dll, libicudt57.dll, libtre-5.dll, libffi-6.dll, libgmp-10.dll, libltdl-7.dll
+;; gnucash.exe: libglib-2.0-0.dll, libgtk-3-0.dll, ligdk-3-0.dll, libatk-1.0-dll, libgobject-2.0-0.dll, libintl-8.dll, libcairo-gobject-2.dll, libcairo-2.dll, libfontconfig-1.0.dll, libfreetype-6.dll, libpixman-1-0.dll, libpng16-16.dll, zlib1.dll, libgdk-pixbuf-2.0-0.dll, libgio-2.0-0.dll, libgmodule-2.0-0.dll, libpango-1.0-0.dll, libpangocairo-1.0-0.dll, libpangowin32-1.0-0.dll, libpangoft2-1.0-0.dll, libharfbuzz-0.dll, libfribidi-0.dll, libiconv-2.dll, libwinpthread-1.dll, libsystre-0.dll, libxml2-2.dll, libxslt-1.dll, libboost_regex-mt.dll, libicuuc57.dll, libicudt57.dll, libtre-5.dll, libffi-6.dll, libgmp-10.dll, libltdl-7.dll
;; AQBanking: libgcrypt-20.dll, libgnutls-30.dll, libwinpthread-1.0.dll, libgmp-10.dll, libhogweed-4.dll, libidn-11.dll, libintl-8.dll, libnettle-6.dll, libp11-kit-0.dll, libtasn1-6.dll, zlib1.dll, libgpg-error-0.dll, libiconv-2.dll, libintl-8.dll, libgtk-win32-2.0-0.dll
;; libwebkit: libenchant.dll, libgeoclue-0.dll, libgstapp-1.0-0.dll, libgstaudio-1.0-0.dll, libgstbase-1.0-0.dll, libgstfft-1.0-0.dll, libgstpbutils-1.0-0.dll, libgstpbutils-1.0-0.dll, libgstreamer-1.0-0.dll, libgstvideo-1.0-0.dll, libharfbuzz-icu-0.dll, liborc-0.4-0.dll, libgsttag-1.0-0.dll, libgraphite2.dll, libicuin57.dll, liicuuc57.dll, libicudt57.dll, libsoup-2.4-1.dll, libsqlite3-0.dll, libwebp-7.dll
;;lib/dbd/libdbdmysql.dll: mariadb.dll, libeay32.dll, ssleay32.dll
@@ -136,6 +136,7 @@ Source: "@MINGW_DIR@\bin\libexpat-1.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libffi-6.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libfontconfig-1.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libfreetype-6.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libfribidi-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libgcrypt-20.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libgdk-3-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libgdk-win32-2.0-0.dll"; DestDir: "{app}\bin"; Components: main
commit 58e7db7b83f42e66d87567912d3c49537110eeff
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Apr 16 14:57:25 2018 -0700
Add -DSWIG_DIR to cmake args to work around broken FindSWIG.
diff --git a/jhbuildrc.in b/jhbuildrc.in
index 79ab3a2..27a84cf 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -80,6 +80,7 @@ _gtk_ldflags= _popen("pkg-config --libs gtk+-3.0")
append_autogenargs("libofx", "--with-opensp-includes=" + prefix + "/include/OpenSP --with-opensp-libs=" + prefix + "/lib")
append_autogenargs("libdbi-drivers","--with-dbi-incdir=" + prefix + "/include --with-dbi-libdir=" + prefix + "/lib")
module_makeargs["aqbanking"]="-j 1"
+module_cmakeargs["gnucash-git"]="-DSWIG_DIR=" + os.path.join(_mingw_base, 'share', 'swig', '3.0.12')
module_makeargs["gnucash"]="-j 1"
module_makeargs["gnucash-git"]="-j 1"
commit 2a6f00eb573615fe30475823a17918d9489004e4
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Apr 15 17:48:22 2018 -0700
Fix the bundle file to match the script name.
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index e4f8d0c..8be5ab3 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -21,7 +21,7 @@ Compression=lzma
MinVersion=5.0
PrivilegesRequired=poweruser
OutputDir=.
-OutputBaseFilename=@PACKAGE at -@PACKAGE_VERSION at -setup
+OutputBaseFilename=@PACKAGE at -@PACKAGE_VERSION at .setup
UninstallFilesDir={app}\uninstall\@PACKAGE@
InfoAfterFile=@INST_DIR@\share\doc\@PACKAGE@\README.win32-bin.txt
SetupIconFile=@INST_DIR@\share\@PACKAGE@\pixmaps\gnucash-icon.ico
commit 8ba08c0e72393682c3dcda861c9d87bb6c4c87f0
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Apr 15 17:47:51 2018 -0700
COMPILE_GSCHEMAS, not COMPILE_SCHEMAS.
diff --git a/gnucash.modules b/gnucash.modules
index bd5e23f..cb88f69 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -282,7 +282,7 @@
</cmake>
<cmake id="gnucash"
- cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DCOMPILE_SCHEMAS=OFF"
+ cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DCOMPILE_GSCHEMAS=OFF"
use-ninja="False">
<branch repo="sourceforge" module="gnucash/stable/gnucash-3.0.tar.bz2"
version="3.0"/>
@@ -300,7 +300,7 @@
</cmake>
<cmake id="gnucash-git"
- cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DCOMPILE_SCHEMAS=OFF"
+ cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DCOMPILE_GSCHEMAS=OFF"
use-ninja="False">
<branch repo="github" module="Gnucash/gnucash.git" revision="master"
checkoutdir="gnucash-git"/>
commit b9f3a81e752a7732c62ae989453ba50db4f44604
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Apr 15 17:44:15 2018 -0700
Build GnuCash -j1, don't try to clean.
CMake makes a bad make clean target that emits an error about
"target pattern contains no '%'". Parallel build works OK in a
clean directory but if the libraries are already in place make
gets ahead of itself and the libraries can't be built because the
old ones are busy.
diff --git a/jhbuildrc.in b/jhbuildrc.in
index 44f1425..79ab3a2 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -54,7 +54,6 @@ environ_append('CPPFLAGS', '-I%s -I%s' % (_mingw_includes, _usr_include))
environ_append('LDFLAGS', '-L%s -L%s' % (_mingw_libs, _usr_lib))
add_to_path_var('PKG_CONFIG_PATH', os.path.join(_mingw_libs, 'pkgconfig'))
add_to_path_var('PATH', os.path.join(_mingw_base, 'bin'))
-makeclean = True
os.environ['SRCROOT'] = checkoutroot
os.environ['PREFIX'] = prefix
@@ -81,6 +80,8 @@ _gtk_ldflags= _popen("pkg-config --libs gtk+-3.0")
append_autogenargs("libofx", "--with-opensp-includes=" + prefix + "/include/OpenSP --with-opensp-libs=" + prefix + "/lib")
append_autogenargs("libdbi-drivers","--with-dbi-incdir=" + prefix + "/include --with-dbi-libdir=" + prefix + "/lib")
module_makeargs["aqbanking"]="-j 1"
+module_makeargs["gnucash"]="-j 1"
+module_makeargs["gnucash-git"]="-j 1"
module_extra_env["gnucash"]={'ACLOCAL_FLAGS':'-I' + os.path.join(_mingw_base, 'share', 'aclocal')}
module_extra_env["gwenhywfar"]={'CFLAGS': _gtk_cflags, 'LDFLAGS': _gtk_ldflags}
commit 3285c4a398cb2ddb337c9c993d72c3a41dc29715
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Apr 15 15:47:18 2018 -0700
Disable compiling schemas.
It breaks because CMake can't see jhbuild's destdir and inserts a semicolon
at the beginning of the path.
diff --git a/gnucash.modules b/gnucash.modules
index dd03315..bd5e23f 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -282,7 +282,7 @@
</cmake>
<cmake id="gnucash"
- cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock"
+ cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DCOMPILE_SCHEMAS=OFF"
use-ninja="False">
<branch repo="sourceforge" module="gnucash/stable/gnucash-3.0.tar.bz2"
version="3.0"/>
@@ -300,7 +300,7 @@
</cmake>
<cmake id="gnucash-git"
- cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock"
+ cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DCOMPILE_SCHEMAS=OFF"
use-ninja="False">
<branch repo="github" module="Gnucash/gnucash.git" revision="master"
checkoutdir="gnucash-git"/>
commit 63b2e1aaa65fb91f1182afaaa07485632cc93bef
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Apr 15 15:31:39 2018 -0700
Further changes to support maint git builds.
diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index 491eb1f..a24d516 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -130,7 +130,7 @@ bash-command -command "jhbuild --no-interact -f $script_unix/jhbuildrc build > >
$new_file = test-path -path $target_dir\$package\$branch\inst\bin\gnucash.exe -NewerThan $time_stamp
if ($new_file) {
#Build the installer
- $is_git = ($branch.CompareTo("master") -eq 0) -or ($branch.CompareTo("unstable") -eq 0)
+ $is_git = ($branch.CompareTo("releases") -ne 0)
bash-command -command "echo 'Creating GnuCash installer.' > >(tee -a $log_unix)"
$setup_file = & $script_dir\bundle-mingw64.ps1 -root_dir $target_dir -target_dir $target_dir\$package\$branch -package $package -git_build $is_git 2>&1 | Tee-Object -FilePath $log_file -Append
$setup_file = make-unixpath -path $setup_file
diff --git a/jhbuildrc.in b/jhbuildrc.in
index 69caf67..44f1425 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -70,11 +70,11 @@ else:
#autogenargs = 'CPPFLAGS="-I%s"' % _sys_includes
-if _branch in ('master', 'unstable'):
+if _branch == 'releases':
+ modules = ["meta-gnucash"]
+else:
modules = ["meta-gnucash-git"]
branches['gnucash-git'] = (None, _branch)
-else:
- modules = ["meta-gnucash"]
_gtk_cflags = _popen("pkg-config --cflags gtk+-3.0")
_gtk_ldflags= _popen("pkg-config --libs gtk+-3.0")
commit 7fc6d2967d7aad59c0552f141ca01522eb068ef6
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Apr 15 13:30:26 2018 -0700
Add branch maint to build_package options.
diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index fa15ace..491eb1f 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -49,7 +49,7 @@ Optional. A ssh compatible server specification (which means [user@]hostname:bas
[CmdletBinding()]
Param(
[Parameter(Mandatory=$true)]
- [validatePattern("(master|unstable|releases)")][string]$branch,
+ [validatePattern("(maint|master|unstable|releases)")][string]$branch,
[Parameter()] [string]$target_dir,
[Parameter()] [string]$hostname
)
commit 9fbc80525f1fe16f6358fad276c6c4b9b0facf1b
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Apr 15 13:29:58 2018 -0700
Clean builddir before building.
Attempting to fix build failures because target library is busy being used by\nanother build command.
diff --git a/jhbuildrc.in b/jhbuildrc.in
index c753a6e..69caf67 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -54,6 +54,7 @@ environ_append('CPPFLAGS', '-I%s -I%s' % (_mingw_includes, _usr_include))
environ_append('LDFLAGS', '-L%s -L%s' % (_mingw_libs, _usr_lib))
add_to_path_var('PKG_CONFIG_PATH', os.path.join(_mingw_libs, 'pkgconfig'))
add_to_path_var('PATH', os.path.join(_mingw_base, 'bin'))
+makeclean = True
os.environ['SRCROOT'] = checkoutroot
os.environ['PREFIX'] = prefix
commit c48e09dce27b83b199911cf9ca3817ba1e2de48e
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Apr 15 13:28:26 2018 -0700
Update gnucash-docs to 3.0.
diff --git a/gnucash.modules b/gnucash.modules
index 859157b..dd03315 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -330,8 +330,8 @@
<autotools id="gnucash-docs"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
makeargs="chm" makeinstallargs="install-chm" >
- <branch module="gnucash/gnucash-docs/gnucash-docs-2.7.0.tar.gz"
- version="2.7.0" repo="sourceforge"/>
+ <branch module="gnucash/gnucash-docs/gnucash-docs-3.0.tar.gz"
+ version="3.0" repo="sourceforge"/>
</autotools>
<metamodule id="meta-gnucash-git">
commit 8c36cd56868ace10b2cc002de20a6b269b7c921d
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Apr 15 11:52:14 2018 -0700
Bug 793461 - Transaction matcher window blank when importing QFX
Bob Fewell's patch for Mingw-w64's misbehaving mkstemp.
diff --git a/gnucash.modules b/gnucash.modules
index d81c8b5..859157b 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -223,7 +223,9 @@
<autotools id="libofx" autogen-sh='autoreconf'>
<branch repo="sourceforge" module="libofx/libofx-0.9.10.tar.gz"
- version="0.9.10"/>
+ version="0.9.10">
+ <patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/patches/libofx-tempfile.patch" strip='1'/>
+ </branch>
<dependencies>
<dep package="OpenSP"/>
</dependencies>
diff --git a/patches/libofx-tempfile.patch b/patches/libofx-tempfile.patch
new file mode 100644
index 0000000..c67198b
--- /dev/null
+++ b/patches/libofx-tempfile.patch
@@ -0,0 +1,60 @@
+--- a/lib/ofx_preproc.cpp 2013-04-17 20:09:11 +0000
++++ b/lib/ofx_preproc.cpp 2013-10-14 09:00:31 +0000
+@@ -109,11 +109,15 @@ int ofx_proc_file(LibofxContextPtr ctx, const char * p_filename)
+ }
+
+ mkTempFileName("libofxtmpXXXXXX", tmp_filename, sizeof(tmp_filename));
+
+ message_out(DEBUG, "ofx_proc_file(): Creating temp file: " + string(tmp_filename));
++#ifdef OS_WIN32
++ tmp_file_fd = mkstemp_win32(tmp_filename);
++#else
+ tmp_file_fd = mkstemp(tmp_filename);
++#endif
+ if (tmp_file_fd)
+ {
+ tmp_file.open(tmp_filename);
+ if (!tmp_file)
+ {
+@@ -308,11 +312,11 @@ int ofx_proc_file(LibofxContextPtr ctx, const char * p_filename)
+ #ifdef HAVE_ICONV
+ size_t inbytesleft = strlen(s_buffer.c_str());
+ size_t outbytesleft = inbytesleft * 2 - 1;
+ iconv_buffer = (char*) malloc (inbytesleft * 2);
+ memset(iconv_buffer, 0, inbytesleft * 2);
+-#if defined(OS_WIN32) || defined(__sun)
++#if defined(__sun)
+ const char * inchar = (const char *)s_buffer.c_str();
+ #else
+ char * inchar = (char *)s_buffer.c_str();
+ #endif
+ char * outchar = iconv_buffer;
+--- a/lib/win32.cpp Wed Mar 30 15:30:50 2011
++++ b/lib/win32.cpp Sun Mar 29 15:07:27 2015
+@@ -25,11 +25,11 @@
+
+
+
+ #ifdef OS_WIN32
+
+-int mkstemp(char *tmpl)
++int mkstemp_win32(char *tmpl)
+ {
+ int fd = -1;
+ int len;
+ char *nf;
+ int i;
+--- a/lib/win32.hh Wed Mar 30 15:30:50 2011
++++ b/lib/win32.hh Sun Mar 29 16:26:58 2015
+@@ -21,11 +21,11 @@
+ #endif
+
+
+ #ifdef OS_WIN32
+
+-int mkstemp(char *tmpl);
++int mkstemp_win32(char *tmpl);
+
+
+ #endif
+
commit a95d39fd8766453d9a7e163cd8a2468cd894b09f
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Apr 15 11:28:51 2018 -0700
Only bundle the gtk30 and iso_4217 message catalogs from mingw32.
The others aren't needed.
diff --git a/bundle-mingw64.ps1 b/bundle-mingw64.ps1
index bac7a5f..bc9616e 100644
--- a/bundle-mingw64.ps1
+++ b/bundle-mingw64.ps1
@@ -147,6 +147,21 @@ $target_schema_unix = make-unixpath -path $target_schema_dir
$schema_compiler = make-unixpath -path "$mingw_dir\bin\glib-compile-schemas"
bash-command("$schema_compiler $target_schema_unix")
+
+# Inno-setup isn't able to easily pick out particular message catalogs from $mingw_dir/share/locale, so copy the ones we want to $inst_dir\share\locale.
+
+$source_locale_dir = "$mingw_dir\share\locale\"
+$inst_locale_dir = "$inst_dir\share\locale"
+foreach ($msgcat in "gtk30.mo","iso_4217.mo") {
+ foreach ($dir in get-childitem -Directory $source_locale_dir) {
+ $source_path = "$source_locale_dir\$dir\LC_MESSAGES"
+ $inst_path = "$inst_locale_dir\$dir\LC_MESSAGES"
+ if ((test-path $source_path) -and (test-path "$source_path\$msgcat") -and (test-path $inst_path)) {
+ copy-item "$source_path\$msgcat" -Destination $inst_path -recurse
+ }
+ }
+}
+
write-host "Running Inno Setup to create $final_file."
if (test-path -path $setup_result) {
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 0c137ce..e4f8d0c 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -209,7 +209,6 @@ Source: "@MINGW_DIR@\lib\postgresql\*.dll"; DestDir: "{app}\lib\postgreql"; Comp
Source: "@MINGW_DIR@\lib\sqlite3.21.0\sqlite3210.dll"; DestDir: "{app}\lib\sqlite3.21.0"; Components: main
Source: "@MINGW_DIR@\share\icons\*"; DestDir: "{app}\share\icons"; Flags: recursesubdirs; Components: main
-Source: "@MINGW_DIR@\share\locale\*"; Destdir: "{app}\share\locale"; Flags: recursesubdirs; Components: main
Source: "@MINGW_DIR@\share\themes\*"; DestDir: "{app}\share\themes"; Flags: recursesubdirs; Components: main
Source: "@MINGW_DIR@\share\xml\iso-codes\*"; DestDir: "{app}\share\xml\iso-codes"; Flags: recursesubdirs; Components: main
Source: "@MINGW_DIR@\share\xml\fontconfig\*"; DestDir: "{app}\share\xml\fontconfig"; Flags: recursesubdirs; Components: main
commit be60b1bfdd243d9a1b95d6c13a82325a7ab57b28
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Apr 6 16:16:01 2018 -0700
Fix bundle script for two-part version numbers.
diff --git a/bundle-mingw64.ps1 b/bundle-mingw64.ps1
index 8c40c16..bac7a5f 100644
--- a/bundle-mingw64.ps1
+++ b/bundle-mingw64.ps1
@@ -99,8 +99,7 @@ $gnc_config_h = "$target_dir\build\$gnucash\common\config.h"
$major_version = version_item -tag "GNUCASH_MAJOR_VERSION" -path $gnc_config_h
$minor_version = version_item -tag "GNUCASH_MINOR_VERSION" -path $gnc_config_h
-$micro_version = version_item -tag "GNUCASH_MICRO_VERSION" -path $gnc_config_h
-$package_version = "$major_version.$minor_version.$micro_version"
+$package_version = "$major_version.$minor_version"
$inst_dir = "$target_dir\inst"
$mingw_ver = bitness("$inst_dir\bin\gnucash.exe")
$aqb_dir = version_item -tag "SO_EFFECTIVE "-path "$inst_dir\include\aqbanking5\aqbanking\version.h"
@@ -129,15 +128,15 @@ $proc = bash-command("sed < $issue_in > $issue_out \
-e ""s#@GC_WIN_REPOS_DIR@#$script#g"" ")
$date = get-date -format "yyyy-MM-dd"
-$setup_result = "$target_dir\gnucash-$package_version-setup.exe"
+$setup_result = "$target_dir\gnucash-$package_version.setup.exe"
$final_file = ""
if ($git_build) {
$gnc_vcsinfo_h = "$target_dir\build\gnucash-git\libgnucash\core-utils\gnc-vcs-info.h"
$vcs_rev = version_item -tag "GNC_VCS_REV" -path $gnc_vcsinfo_h | %{$_ -replace """", ""}
- $final_file = "$target_dir\gnucash-$package_version-$date-git-$vcs_rev-setup.exe"
+ $final_file = "$target_dir\gnucash-$package_version-$date-git-$vcs_rev.setup.exe"
}
else {
- $final_file = "$target_dir\gnucash-$package_version-setup.exe"
+ $final_file = "$target_dir\gnucash-$package_version.setup.exe"
}
$mingw_dir = "$root_dir\msys2\mingw$mingw_ver"
commit 4af9fb7f9c042153f76146145bdb90ca992db598
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Apr 1 21:51:15 2018 -0700
Adjust bundle for 2-part version number.
diff --git a/bundle-mingw64.ps1 b/bundle-mingw64.ps1
index 310941e..8c40c16 100644
--- a/bundle-mingw64.ps1
+++ b/bundle-mingw64.ps1
@@ -126,7 +126,6 @@ $proc = bash-command("sed < $issue_in > $issue_out \
-e ""s#@PACKAGE@#$package#g"" \
-e ""s#@GNUCASH_MAJOR_VERSION@#$major_version#g"" \
-e ""s#@GNUCASH_MINOR_VERSION@#$minor_version#g"" \
- -e ""s#@GNUCASH_MICRO_VERSION@#$micro_version#g"" \
-e ""s#@GC_WIN_REPOS_DIR@#$script#g"" ")
$date = get-date -format "yyyy-MM-dd"
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 4dde8e7..0c137ce 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -245,7 +245,6 @@ Root: HKLM; Subkey: "Software\GnuCash\Version"; ValueType: none; Flags: uninsdel
Root: HKLM; Subkey: "Software\GnuCash\Version"; ValueType: string; ValueName: "Version"; ValueData: "@PACKAGE_VERSION@"; Flags: uninsdeletevalue
Root: HKLM; Subkey: "Software\GnuCash\Version"; ValueType: dword; ValueName: "VersionMajor"; ValueData: "@GNUCASH_MAJOR_VERSION@"; Flags: uninsdeletevalue
Root: HKLM; Subkey: "Software\GnuCash\Version"; ValueType: dword; ValueName: "VersionMinor"; ValueData: "@GNUCASH_MINOR_VERSION@"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\GnuCash\Version"; ValueType: dword; ValueName: "VersionMicro"; ValueData: "@GNUCASH_MICRO_VERSION@"; Flags: uninsdeletevalue
; Additionally, we have to install the paths for gwenhywfar
Root: HKLM; Subkey: "Software\Gwenhywfar"; ValueType: none; Flags: uninsdeletekeyifempty
commit 6c241ecbfe481ee9964172ba835fe475224c4668
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Apr 1 16:01:23 2018 -0700
Release GnuCash 3.0
diff --git a/gnucash.modules b/gnucash.modules
index aebcddf..d81c8b5 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -146,7 +146,6 @@
<autotools id="gwenhywfar" autogen-sh="configure"
autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc --disable-ssl">
<branch module="download.php?package=01&release=208&file=02&dummy=gwenhywfar-4.20.0.tar.gz" version="4.20.0" repo="aqbanking" checkoutdir="gwenhywfar-4.20.0">
- <patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/patches/Fix-signature-mismatch-in-abgui.c.patch" strip='1'/>
</branch>
<dependencies>
<dep package="gcrypt"/>
@@ -180,6 +179,7 @@
<autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
autogenargs="--enable-local-install">
<branch module="download.php?package=03&release=217&file=02&dummy=aqbanking-5.7.8.tar.gz" repo="aqbanking" version="5.7.8" checkoutdir="aqbanking-5.7.8">
+ <patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/patches/Fix-signature-mismatch-in-abgui.c.patch" strip='1'/>
</branch>
<dependencies>
<dep package="gwenhywfar"/>
@@ -282,8 +282,8 @@
<cmake id="gnucash"
cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock"
use-ninja="False">
- <branch repo="sourceforge" module="gnucash/unstable/gnucash-2.7.8.tar.bz2"
- version="2.7.8"/>
+ <branch repo="sourceforge" module="gnucash/stable/gnucash-3.0.tar.bz2"
+ version="3.0"/>
<dependencies>
<dep package="libofx"/>
<dep package="aqbanking"/>
commit 00b43f1033d115be479eca0dd870140f7f5b6d4a
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Mar 30 16:14:13 2018 -0700
Work around aqbanking 5.7.8 build failure.
diff --git a/gnucash.modules b/gnucash.modules
index eb5a838..aebcddf 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -146,6 +146,7 @@
<autotools id="gwenhywfar" autogen-sh="configure"
autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc --disable-ssl">
<branch module="download.php?package=01&release=208&file=02&dummy=gwenhywfar-4.20.0.tar.gz" version="4.20.0" repo="aqbanking" checkoutdir="gwenhywfar-4.20.0">
+ <patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/patches/Fix-signature-mismatch-in-abgui.c.patch" strip='1'/>
</branch>
<dependencies>
<dep package="gcrypt"/>
diff --git a/patches/Fix-signature-mismatch-in-abgui.c.patch b/patches/Fix-signature-mismatch-in-abgui.c.patch
new file mode 100644
index 0000000..78f3391
--- /dev/null
+++ b/patches/Fix-signature-mismatch-in-abgui.c.patch
@@ -0,0 +1,44 @@
+From d3870968869c022b4af18f45198d2a6d2296fac9 Mon Sep 17 00:00:00 2001
+From: John Ralls <jralls at ceridwen.us>
+Date: Sun, 25 Mar 2018 14:45:55 -0700
+Subject: [PATCH] Fix signature mismatch in abgui.c.
+
+---
+ src/libs/aqbanking/gui/abgui.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/libs/aqbanking/gui/abgui.c b/src/libs/aqbanking/gui/abgui.c
+index f4a4407..aa51cb2 100644
+--- a/src/libs/aqbanking/gui/abgui.c
++++ b/src/libs/aqbanking/gui/abgui.c
+@@ -238,10 +238,10 @@ int AB_Gui_CheckCert(GWEN_GUI *gui,
+
+
+
+-int AB_Gui_ReadDialogPrefs(GWEN_GUI *gui,
+- const char *groupName,
+- const char *altName,
+- GWEN_DB_NODE **pDb) {
++int GWENHYWFAR_CB AB_Gui_ReadDialogPrefs(GWEN_GUI *gui,
++ const char *groupName,
++ const char *altName,
++ GWEN_DB_NODE **pDb) {
+ AB_GUI *xgui;
+
+ assert(gui);
+@@ -282,9 +282,9 @@ int AB_Gui_ReadDialogPrefs(GWEN_GUI *gui,
+
+
+
+-int AB_Gui_WriteDialogPrefs(GWEN_GUI *gui,
+- const char *groupName,
+- GWEN_DB_NODE *db) {
++int GWENHYWFAR_CB AB_Gui_WriteDialogPrefs(GWEN_GUI *gui,
++ const char *groupName,
++ GWEN_DB_NODE *db) {
+ AB_GUI *xgui;
+
+ assert(gui);
+--
+2.2.2
+
commit cdc5f48e5df6d155679de7424c77a3360c862958
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Mar 25 12:13:08 2018 -0700
Release 2.7.8
diff --git a/gnucash.modules b/gnucash.modules
index e5bc92f..eb5a838 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -281,8 +281,8 @@
<cmake id="gnucash"
cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock"
use-ninja="False">
- <branch repo="sourceforge" module="gnucash/unstable/gnucash-2.7.7.tar.bz2"
- version="2.7.7"/>
+ <branch repo="sourceforge" module="gnucash/unstable/gnucash-2.7.8.tar.bz2"
+ version="2.7.8"/>
<dependencies>
<dep package="libofx"/>
<dep package="aqbanking"/>
commit 15b496062b46bb37602749f0803f4fd12843c5ba
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Mar 25 12:05:25 2018 -0700
Modify gwenhywfar environment for gwen 4.20.
Fixes the optimization bug, yea!
diff --git a/jhbuildrc.in b/jhbuildrc.in
index c165ee3..c753a6e 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -74,10 +74,13 @@ if _branch in ('master', 'unstable'):
branches['gnucash-git'] = (None, _branch)
else:
modules = ["meta-gnucash"]
+
+_gtk_cflags = _popen("pkg-config --cflags gtk+-3.0")
+_gtk_ldflags= _popen("pkg-config --libs gtk+-3.0")
append_autogenargs("libofx", "--with-opensp-includes=" + prefix + "/include/OpenSP --with-opensp-libs=" + prefix + "/lib")
append_autogenargs("libdbi-drivers","--with-dbi-incdir=" + prefix + "/include --with-dbi-libdir=" + prefix + "/lib")
module_makeargs["aqbanking"]="-j 1"
module_extra_env["gnucash"]={'ACLOCAL_FLAGS':'-I' + os.path.join(_mingw_base, 'share', 'aclocal')}
-module_extra_env["gwenhywfar"]={'CFLAGS':'-O0'}
+module_extra_env["gwenhywfar"]={'CFLAGS': _gtk_cflags, 'LDFLAGS': _gtk_ldflags}
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 389c85e..c8a8323 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -270,8 +270,8 @@ if (!(test-path -path "$target_dir\\src\\gnucash-on-windows.git")) {
exit
}
-bash-command -command "/usr/bin/patch -d/ -p0 -i $target_unix/src/gnucash-on-windows.git/patches/jhbuild.patch"
-bash-command -command "/usr/bin/patch -d/ -p0 -i $target_unix/src/gnucash-on-windows.git/patches/FindSWIG.patch"
+bash-command -command "/usr/bin/patch -t -d/ -p0 -i $target_unix/src/gnucash-on-windows.git/patches/jhbuild.patch"
+bash-command -command "/usr/bin/patch -t -d/ -p0 -i $target_unix/src/gnucash-on-windows.git/patches/FindSWIG.patch"
$jhbuildrc = get-content "$target_dir\\src\\gnucash-on-windows.git\\jhbuildrc.in" |
%{$_ -replace "@-BASE_DIR-@", "$target_unix"} |
commit 65cd11a0307308942142a54b7c5e8c0622788871
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Mar 18 14:14:12 2018 -0700
Update AQBanking and Gwenhywfar to the latest stable releases.
Download directly from aquamaniac.de instead of via \nsourceforge/gnucash/dependencies and update svn to git while we're at it.
diff --git a/gnucash.modules b/gnucash.modules
index 9782c1e..e5bc92f 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -15,8 +15,10 @@
href="http://www.gnucash.org/pub/gnucash/sources/"/>
<repository type="git" name="git.gnucash.org"
href="http://git.gnucash.org/"/>
- <repository type="svn" name="aquamaniac"
- href="http://devel.aqbanking.de/svn/"/>
+ <repository type="git" name="aquamaniac"
+ href="https://git.aquamaniac.de/git/"/>
+ <repository type="tarball" name="aqbanking"
+ href="https://www.aquamaniac.de/sites/download/"/>
<repository type="git" name="github"
href="git://github.com/"/>
<repository type="tarball" name="github-tar"
@@ -142,9 +144,8 @@
</autotools>
<autotools id="gwenhywfar" autogen-sh="configure"
- autogenargs="--with-guis='' --enable-local-install --disable-binreloc --disable-ssl">
- <branch module="gnucash/Dependencies/gwenhywfar-4.18.0.tar.gz" version="4.18.0"
- repo="sourceforge">
+ autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc --disable-ssl">
+ <branch module="download.php?package=01&release=208&file=02&dummy=gwenhywfar-4.20.0.tar.gz" version="4.20.0" repo="aqbanking" checkoutdir="gwenhywfar-4.20.0">
</branch>
<dependencies>
<dep package="gcrypt"/>
@@ -152,7 +153,7 @@
</dependencies>
</autotools>
- <autotools id="gwenhywfar-svn" autogen-template="make -fMakefile.cvs && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
+ <autotools id="gwenhywfar-git" autogen-template="make -fMakefile.cvs && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
autogenargs="--with-guis='' --enable-local-install --disable-binreloc --disable-ssl">
<branch module="gwenhywfar" repo="aquamaniac"/>
<dependencies>
@@ -177,8 +178,7 @@
<autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
autogenargs="--enable-local-install">
- <branch module="gnucash/Dependencies/aqbanking-5.6.12.tar.gz" version="5.6.12"
- repo="sourceforge">
+ <branch module="download.php?package=03&release=217&file=02&dummy=aqbanking-5.7.8.tar.gz" repo="aqbanking" version="5.7.8" checkoutdir="aqbanking-5.7.8">
</branch>
<dependencies>
<dep package="gwenhywfar"/>
@@ -189,7 +189,7 @@
</dependencies>
</autotools>
- <autotools id="aqbanking-svn"
+ <autotools id="aqbanking-git"
autogenargs='--enable-local-install"'
autogen-template="make -fMakefile.cvs && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s" >
<branch module="aqbanking" repo="aquamaniac" >
commit e562143ab1e85a094fa6c537cf3c251aace1f2f5
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Mar 18 13:06:45 2018 -0700
Release GnuCash 2.7.7
diff --git a/gnucash.modules b/gnucash.modules
index 263b318..9782c1e 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -281,8 +281,8 @@
<cmake id="gnucash"
cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock"
use-ninja="False">
- <branch repo="sourceforge" module="gnucash/unstable/gnucash-2.7.6.tar.bz2"
- version="2.7.6"/>
+ <branch repo="sourceforge" module="gnucash/unstable/gnucash-2.7.7.tar.bz2"
+ version="2.7.7"/>
<dependencies>
<dep package="libofx"/>
<dep package="aqbanking"/>
commit f48594c7bdb741de32265745919b192d2f2c8002
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Mar 13 18:14:07 2018 -0700
Bug 794310 - There is no Chinese interface at window 10.
Uncomment the lines adding the translations and account templates.
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 39cccad..4dde8e7 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -33,8 +33,8 @@ Name: "custom"; Description: "{cm:CustomInstall}"; Flags: iscustom
[Components]
Name: "main"; Description: "{cm:MainFiles}"; Types: full custom; Flags: fixed
-;Name: "translations"; Description: "{cm:TranslFiles}"; Types: full
-;Name: "templates"; Description: "{cm:TemplFiles}"; Types: full
+Name: "translations"; Description: "{cm:TranslFiles}"; Types: full
+Name: "templates"; Description: "{cm:TemplFiles}"; Types: full
[Tasks]
Name: desktopicon; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"
@@ -88,10 +88,10 @@ Source: "@INST_DIR@\share\icons\hicolor\*"; DestDir: "{app}\share\icons\hicolor"
Source: "@INST_DIR@\share\glib-2.0\schemas\*"; DestDir: "{app}\share\glib-2.0\schemas"; Flags: recursesubdirs; Components: main
;; The translations
-;Source: "@INST_DIR@\share\locale\*"; DestDir: "{app}\share\locale"; Flags: recursesubdirs; Components: translations
+Source: "@INST_DIR@\share\locale\*"; DestDir: "{app}\share\locale"; Flags: recursesubdirs; Components: translations
;
;; The account templates
-;Source: "@INST_DIR@\share\@PACKAGE@\accounts\*"; DestDir: "{app}\share\@PACKAGE@\accounts"; Flags: recursesubdirs; Components: templates
+Source: "@INST_DIR@\share\@PACKAGE@\accounts\*"; DestDir: "{app}\share\@PACKAGE@\accounts"; Flags: recursesubdirs; Components: templates
; And all the @PACKAGE@ documentation
Source: "@INST_DIR@\share\doc\@PACKAGE@\README"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
commit 459bcbdc062e00dc391045b21f192e3710422b81
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Mar 12 14:42:30 2018 -0700
Add libcroco to the bundle.
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 4428102..39cccad 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -126,6 +126,7 @@ Source: "@MINGW_DIR@\bin\libboost_thread-mt.dll"; DestDir: "{app}\bin"; Componen
Source: "@MINGW_DIR@\bin\libbz2-1.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libcairo-2.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libcairo-gobject-2.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libcroco-0.6-3.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libdbus-1-3.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libdbus-glib-1-2.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libeay32.dll"; DestDir: "{app}\bin"; Components: main
commit be98f9a125fdeb2f61753f7cb6a795bf8fa3779f
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Mar 12 14:20:20 2018 -0700
Add librsvg to the bundle.
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 436cd9d..4428102 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -184,6 +184,7 @@ Source: "@MINGW_DIR@\bin\libpixman-1-0.dll"; DestDir: "{app}\bin"; Components: m
Source: "@MINGW_DIR@\bin\libpcre-1.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libpng16-16.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libpq.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\librsvg-2-2.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libsoup-2.4-1.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libsqlite3-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libsystre-0.dll"; DestDir: "{app}\bin"; Components: main
commit 575fdaffbad80b7377a378bb5476897f90803009
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Mar 12 14:16:58 2018 -0700
Fix typo.
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 1d61afd..436cd9d 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -202,7 +202,7 @@ Source: "@MINGW_DIR@\bin\gspawn-win32-helper.exe"; DestDir: "{app}\bin"; Compone
Source: "@MINGW_DIR@\bin\gspawn-win32-helper-console.exe"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\lib\gdk-pixbuf-2.0\2.10.0\loaders\*.dll"; DestDir: "{app}\lib\gdk-pixbuf-2.0\2.10.0\loaders"; Components: main
-Source: "@MINGW_DIR@\lib\gdk-pixbuf-2.0\2.10.0\loaders.cache"; DestDir: "{app}\lib\gdk-pixbuf\2.10.0\"; Components: main
+Source: "@MINGW_DIR@\lib\gdk-pixbuf-2.0\2.10.0\loaders.cache"; DestDir: "{app}\lib\gdk-pixbuf-2.0\2.10.0\"; Components: main
Source: "@MINGW_DIR@\lib\postgresql\*.dll"; DestDir: "{app}\lib\postgreql"; Components: main
Source: "@MINGW_DIR@\lib\sqlite3.21.0\sqlite3210.dll"; DestDir: "{app}\lib\sqlite3.21.0"; Components: main
commit fe0ed4d7251aa22591a9515e656aa0a75e7e723d
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Mar 12 13:59:23 2018 -0700
Include gdk-pixbuf's loaders in the bundle to fix crash on Win7.
Also include loadable modules for postgresql and sqlite3.
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 3e22103..1d61afd 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -201,6 +201,11 @@ Source: "@MINGW_DIR@\bin\zlib1.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\gspawn-win32-helper.exe"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\gspawn-win32-helper-console.exe"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\lib\gdk-pixbuf-2.0\2.10.0\loaders\*.dll"; DestDir: "{app}\lib\gdk-pixbuf-2.0\2.10.0\loaders"; Components: main
+Source: "@MINGW_DIR@\lib\gdk-pixbuf-2.0\2.10.0\loaders.cache"; DestDir: "{app}\lib\gdk-pixbuf\2.10.0\"; Components: main
+Source: "@MINGW_DIR@\lib\postgresql\*.dll"; DestDir: "{app}\lib\postgreql"; Components: main
+Source: "@MINGW_DIR@\lib\sqlite3.21.0\sqlite3210.dll"; DestDir: "{app}\lib\sqlite3.21.0"; Components: main
+
Source: "@MINGW_DIR@\share\icons\*"; DestDir: "{app}\share\icons"; Flags: recursesubdirs; Components: main
Source: "@MINGW_DIR@\share\locale\*"; Destdir: "{app}\share\locale"; Flags: recursesubdirs; Components: main
Source: "@MINGW_DIR@\share\themes\*"; DestDir: "{app}\share\themes"; Flags: recursesubdirs; Components: main
commit 9719c53226fbebad0dabf58a2e0675147eb4654a
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Mar 11 10:43:40 2018 -0700
Release GnuCash 2.7.6.
diff --git a/gnucash.modules b/gnucash.modules
index 7518a1a..263b318 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -281,8 +281,8 @@
<cmake id="gnucash"
cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock"
use-ninja="False">
- <branch repo="sourceforge" module="gnucash/unstable/gnucash-2.7.5.tar.bz2"
- version="2.7.5"/>
+ <branch repo="sourceforge" module="gnucash/unstable/gnucash-2.7.6.tar.bz2"
+ version="2.7.6"/>
<dependencies>
<dep package="libofx"/>
<dep package="aqbanking"/>
commit 6d54a36857c0b623801441da455fa48a4d3b3e5d
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Mar 8 15:54:58 2018 -0800
Don't need to single-thread gnucash builds any more.
diff --git a/jhbuildrc.in b/jhbuildrc.in
index b820687..c165ee3 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -77,8 +77,6 @@ else:
append_autogenargs("libofx", "--with-opensp-includes=" + prefix + "/include/OpenSP --with-opensp-libs=" + prefix + "/lib")
append_autogenargs("libdbi-drivers","--with-dbi-incdir=" + prefix + "/include --with-dbi-libdir=" + prefix + "/lib")
module_makeargs["aqbanking"]="-j 1"
-module_makeargs["gnucash"]="-j 1"
-module_makeargs["gnucash-git"]="-j 1"
module_extra_env["gnucash"]={'ACLOCAL_FLAGS':'-I' + os.path.join(_mingw_base, 'share', 'aclocal')}
module_extra_env["gwenhywfar"]={'CFLAGS':'-O0'}
commit d2f417abb711a40b00be7ffc1595f20fb4845d05
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Mar 8 15:54:20 2018 -0800
Spelling error. Also fix up setting _mingw_base and use it more.
diff --git a/jhbuildrc.in b/jhbuildrc.in
index c1ed1bf..b820687 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -45,28 +45,22 @@ checkoutroot = os.path.join(_projectdir, 'src')
buildroot = os.path.join(_projectdir, 'build')
tarballdir = os.path.join(_download_dir)
moduleset = os.path.join(_config_dir, 'gnucash.modules')
-
-_mingw_includes = os.path.join(_basedir, 'msys2', _arch, 'include')
-_mingw_libs = os.path.join(_basedir, 'msys2', _arch, 'lib')
+_mingw_base = os.path.join(_basedir, 'msys2', _arch)
+_mingw_includes = os.path.join(_mingw_base, 'include')
+_mingw_libs = os.path.join(_mingw_base, 'lib')
_usr_include = os.path.join('/usr', 'include')
_usr_lib = os.path.join('/usr', 'lib')
environ_append('CPPFLAGS', '-I%s -I%s' % (_mingw_includes, _usr_include))
environ_append('LDFLAGS', '-L%s -L%s' % (_mingw_libs, _usr_lib))
add_to_path_var('PKG_CONFIG_PATH', os.path.join(_mingw_libs, 'pkgconfig'))
-add_to_path_var('PATH', os.path.join(_basedir, 'msys2', _arch, 'bin'))
-
-
-if _arch == 'mingw32':
- _mingw_base='/mingw32'
-else:
- _mingw_base='/mingw64'
+add_to_path_var('PATH', os.path.join(_mingw_base, 'bin'))
os.environ['SRCROOT'] = checkoutroot
os.environ['PREFIX'] = prefix
os.environ['MSYS2ROOT'] = os.path.join(_basedir, 'msys2')
#os.environ['GUILE_LOAD_PATH'] = os.path.join(prefix, 'share', 'guile', '2.0')
#os.environ['GUILE_LOAD_BINARY_PATH'] = os.path.join(prefix, 'lib', 'guile', '2.0', 'ccache')
-os.environ['GETTEXTDATADIRS'] = os.path.join(_mingw_base, 'share', 'gettext')
+os.environ['GETTEXTDATADIR'] = os.path.join(_mingw_base, 'share', 'gettext')
if _arch == 'mingw32':
autogenargs = "--build=i686-w64-mingw32"
commit e3555ff7070185025d94071e7051c9a4e5da91b5
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Mar 8 10:29:47 2018 -0800
Work around xmlsec build failure and upgrade it to same version used on Mac.
diff --git a/gnucash.modules b/gnucash.modules
index 5bb457d..7518a1a 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -166,10 +166,10 @@
repo="sourceforge"/>
</autotools>
- <autotools id="xmlsec">
- <branch module="lsh123/xmlsec/archive/xmlsec-1_2_20.tar.gz"
- repo="github-tar" version="1.2.20"
- checkoutdir="xmlsec-xmlsec-1_2_20"/>
+ <autotools id="xmlsec" autogenargs="--disable-x509">
+ <branch module="lsh123/xmlsec/archive/xmlsec-1_2_25.tar.gz"
+ repo="github-tar" version="1.2.25"
+ checkoutdir="xmlsec-xmlsec-1_2_25"/>
<dependencies>
<dep package="openssl"/>
</dependencies>
commit 6ba18441ac2923378698f82779c7f7ed7a2e18f1
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Mar 6 15:20:01 2018 -0800
Uninstall GnuCash before building.
To prevent linking from an old build screwing up the current one.
Also remove the jhbuild info and manifest on a releases build to
force rebuilding if the release is the same.
diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index 473bf8b..fa15ace 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -105,6 +105,24 @@ if ($hostname) {
# Update MinGW-w64
bash-command -command "pacman -Su --noconfirm > >(tee -a $log_unix) 2>&1"
+#GnuCash build still behaves badly if it finds its old build products. Clean them out.
+if ($branch -eq "releases") {
+ $module = get-childitem -path $target_dir\$package\$branch\build -filter gnucash-* -exclude gnucash-docs* -name -directory | sort-object -descending | select -f 1
+ $install_manifest = "$target_dir\$package\$branch\build\$module\install_manifest.txt"
+}
+else {
+ $install_manifest = "$target_dir\$package\$branch\build\gnucash-git\install_manifest.txt"
+}
+
+if (test-path -path $install_manifest) {
+ get-content $install_manifest | remove-item
+ remove-item $install_manifest
+ if ($branch -eq "releases") { # Force a release build even if nothing has changed.
+ remove-item $target_dir\$package\$branch\inst\_jhbuild\info\gnucash
+ remove-item $target_dir\$package\$branch\inst\_jhbuild\manifests\gnucash
+ }
+}
+
# Update the gnucash-on-windows repository
#bash-command -command "cd $script_unix && git reset --hard && git pull --rebase"
# Build the latest GnuCash and all dependencies not installed via mingw64
commit cfd8b4bfb0359f41f88d41ee180cef0fc7d0f167
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Mar 6 13:43:08 2018 -0800
Fix msgfmt can't find its rules for appdata.xml.in.
Also fix a jhbuild snivel about unknown variable mingw_base.
diff --git a/jhbuildrc.in b/jhbuildrc.in
index 6249cbc..c1ed1bf 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -57,16 +57,16 @@ add_to_path_var('PATH', os.path.join(_basedir, 'msys2', _arch, 'bin'))
if _arch == 'mingw32':
- mingw_base='/mingw32'
+ _mingw_base='/mingw32'
else:
- mingw_base='/mingw64'
+ _mingw_base='/mingw64'
os.environ['SRCROOT'] = checkoutroot
os.environ['PREFIX'] = prefix
os.environ['MSYS2ROOT'] = os.path.join(_basedir, 'msys2')
#os.environ['GUILE_LOAD_PATH'] = os.path.join(prefix, 'share', 'guile', '2.0')
#os.environ['GUILE_LOAD_BINARY_PATH'] = os.path.join(prefix, 'lib', 'guile', '2.0', 'ccache')
-os.environ['XDG_DATA_DIRS'] = '/usr/local/share:/usr/share:' + mingw_base + '/share'
+os.environ['GETTEXTDATADIRS'] = os.path.join(_mingw_base, 'share', 'gettext')
if _arch == 'mingw32':
autogenargs = "--build=i686-w64-mingw32"
@@ -86,6 +86,6 @@ module_makeargs["aqbanking"]="-j 1"
module_makeargs["gnucash"]="-j 1"
module_makeargs["gnucash-git"]="-j 1"
-module_extra_env["gnucash"]={'ACLOCAL_FLAGS':'-I' + os.path.join(mingw_base, 'share', 'aclocal')}
+module_extra_env["gnucash"]={'ACLOCAL_FLAGS':'-I' + os.path.join(_mingw_base, 'share', 'aclocal')}
module_extra_env["gwenhywfar"]={'CFLAGS':'-O0'}
commit c68c7bee8953d8316c043187a6289742fbde4586
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Mar 6 11:29:31 2018 -0800
Use correct shell and specific target directory in the final message.
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index b30efcb..389c85e 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -282,7 +282,7 @@ $jhbuildrc = get-content "$target_dir\\src\\gnucash-on-windows.git\\jhbuildrc.in
Write-Host @"
-Your build environment is now ready to use. Open an MSys2/Mingw32 shell from the start menu, cd to your target directory, and run
+Your build environment is now ready to use. Open an MSys2/$arch shell from the start menu, cd to $target_unix, and run
jhbuild -f src/gnucash-on-windows.git/jhbuildrc build
Note that the build will not work with the plain MSys2 shell!
commit dbb4861067b93c97dbc0f5ee7294ab34144fb509
Author: Geert Janssens <geert at kobaltwit.be>
Date: Mon Mar 5 19:52:12 2018 +0100
Adjust FindSWIG patch for cmake 3.10
diff --git a/patches/FindSWIG.patch b/patches/FindSWIG.patch
index 81043ae..4278502 100644
--- a/patches/FindSWIG.patch
+++ b/patches/FindSWIG.patch
@@ -1,6 +1,6 @@
- diff -u /mingw32/share/cmake-3.9/Modules/FindSWIG.cmake~ /mingw32/share/cmake-3.9/Modules/FindSWIG.cmake
---- /mingw32/share/cmake-3.9/Modules/FindSWIG.cmake~ 2017-08-10 06:36:32.000000000 -0700
-+++ /mingw32/share/cmake-3.9/Modules/FindSWIG.cmake 2017-09-05 10:34:59.692229400 -0700
+ diff -u /mingw32/share/cmake-3.10/Modules/FindSWIG.cmake~ /mingw32/share/cmake-3.10/Modules/FindSWIG.cmake
+--- /mingw32/share/cmake-3.10/Modules/FindSWIG.cmake~ 2017-08-10 06:36:32.000000000 -0700
++++ /mingw32/share/cmake-3.10/Modules/FindSWIG.cmake 2017-09-05 10:34:59.692229400 -0700
@@ -41,7 +41,7 @@
endif()
else()
commit db54a133539fe81b9ee4684a33841f94d711fa6a
Author: Geert Janssens <geert at kobaltwit.be>
Date: Mon Mar 5 19:26:42 2018 +0100
update XDG_DATA_DIRS at build time to include /mingw(32/64)/share
Gettext requires this or it will fail to find it's its rules and hence
fail to process appdata and other xml based source files
diff --git a/jhbuildrc.in b/jhbuildrc.in
index b0c1725..6249cbc 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -55,11 +55,19 @@ environ_append('LDFLAGS', '-L%s -L%s' % (_mingw_libs, _usr_lib))
add_to_path_var('PKG_CONFIG_PATH', os.path.join(_mingw_libs, 'pkgconfig'))
add_to_path_var('PATH', os.path.join(_basedir, 'msys2', _arch, 'bin'))
+
+if _arch == 'mingw32':
+ mingw_base='/mingw32'
+else:
+ mingw_base='/mingw64'
+
os.environ['SRCROOT'] = checkoutroot
os.environ['PREFIX'] = prefix
os.environ['MSYS2ROOT'] = os.path.join(_basedir, 'msys2')
#os.environ['GUILE_LOAD_PATH'] = os.path.join(prefix, 'share', 'guile', '2.0')
#os.environ['GUILE_LOAD_BINARY_PATH'] = os.path.join(prefix, 'lib', 'guile', '2.0', 'ccache')
+os.environ['XDG_DATA_DIRS'] = '/usr/local/share:/usr/share:' + mingw_base + '/share'
+
if _arch == 'mingw32':
autogenargs = "--build=i686-w64-mingw32"
else:
@@ -78,6 +86,6 @@ module_makeargs["aqbanking"]="-j 1"
module_makeargs["gnucash"]="-j 1"
module_makeargs["gnucash-git"]="-j 1"
-module_extra_env["gnucash"]={'ACLOCAL_FLAGS':'-I' + os.path.join('/mingw32', 'share', 'aclocal')}
+module_extra_env["gnucash"]={'ACLOCAL_FLAGS':'-I' + os.path.join(mingw_base, 'share', 'aclocal')}
module_extra_env["gwenhywfar"]={'CFLAGS':'-O0'}
commit c6131129557ba54982bae2e6ad1b4ecd5cc5bfa2
Author: Geert Janssens <geert at kobaltwit.be>
Date: Mon Mar 5 19:16:08 2018 +0100
Drop obsolete dependency
diff --git a/cmake/defaults.cmake b/cmake/defaults.cmake
index 6335fa8..d1b02f0 100644
--- a/cmake/defaults.cmake
+++ b/cmake/defaults.cmake
@@ -259,8 +259,6 @@ set (LIBFFI_VERSION "3.2.1")
set (LIBFFI_URL "ftp://sourceware.org/pub/libffi/libffi-${LIBFFI_VERSION}.tar.gz")
set (LIBART_LGPL_URL "${GNOME_WIN32_URL}/libart_lgpl/2.3/libart-lgpl_2.3.21-1_win32.zip")
set (LIBART_LGPL_DEV_URL "${GNOME_WIN32_URL}/libart_lgpl/2.3/libart-lgpl-dev_2.3.21-1_win32.zip")
-set (LIBGNOMECANVAS_URL "${GNOME_WIN32_URL}/libgnomecanvas/2.30/libgnomecanvas_2.30.1-1_win32.zip")
-set (LIBGNOMECANVAS_DEV_URL "${GNOME_WIN32_URL}/libgnomecanvas/2.30/libgnomecanvas-dev_2.30.1-1_win32.zip")
set (LIBICONV_URL "${GNOME_WIN32_DEPS_URL}/libiconv-1.9.1.bin.woe32.zip")
set (LIBPNG_URL "${GNOME_WIN32_DEPS_URL}/libpng_1.4.3-1_win32.zip")
set (LIBPNG_DEV_URL "${GNOME_WIN32_DEPS_URL}/libpng-dev_1.4.3-1_win32.zip")
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index fa32e3c..b30efcb 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -216,7 +216,7 @@ $toolchain = "binutils cmake crt-git gcc gcc-libs gdb headers-git libmangle-git
# Note that webkitgtk3 will pull in gtk3 automatically.
-$deps = "webkitgtk3 boost iso-codes shared-mime-info libmariadbclient postgresql libgnomecanvas ninja ncurses"
+$deps = "webkitgtk3 boost iso-codes shared-mime-info libmariadbclient postgresql ninja ncurses"
Write-Host @"
commit 2b133fa2473f734aedff9f8a1c043ee52db77a1d
Author: Geert Janssens <geert at kobaltwit.be>
Date: Mon Mar 5 18:28:39 2018 +0100
Add libboost_date_time-mt.dll in the installer.
Discovered and fixed by Robert Fewell
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index e5f032b..3e22103 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -117,6 +117,7 @@ Source: "@INST_DIR@\share\doc\@PACKAGE at -docs\*.hhmap"; DestDir: "{app}\share\@PA
;;lib/dbd/libdbdpgsql.dll: libpq.dll, ssleay32.dll, libeay32.dll
Source: "@MINGW_DIR@\bin\libatk-1.0-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libboost_date_time-mt.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libboost_locale-mt.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libboost_regex-mt.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libboost_system-mt.dll"; DestDir: "{app}\bin"; Components: main
commit 424991fac01d699a5fda458f18aa24eae8b2f220
Author: Geert Janssens <geert at kobaltwit.be>
Date: Mon Mar 5 10:18:30 2018 +0100
Revert "Update 2.6 series to most recent versions of gwenhywfar and aqbanking"
This reverts commit 1b29db233caefc63f74a12047d86006ac275b0d1.
The newer versions fail to build in Windows on an incompatible pointer type:
https://code.gnucash.org/builds/win32/build-logs/build-maint-2018-03-05.log
Reverted to the previous versions until this is sorted out.
diff --git a/defaults.sh b/defaults.sh
index 7701861..3d00fa6 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -348,20 +348,20 @@ set_default LIBOFX_DIR $GLOBAL_DIR\\libofx
set_default LIBOFX_PATCH `pwd`/libofx-0.9.8.patch
## online banking: gwenhywfar+aqbanking
-GWENHYWFAR_VERSION="4.20.0"
+GWENHYWFAR_VERSION="4.18.0"
## NB: Dummy means dummy! The important value in the following url is
## the release number, not the file name at the end!
-set_default GWENHYWFAR_URL "https://www.aquamaniac.de/sites/download/download.php?package=01&release=208&file=02&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
+set_default GWENHYWFAR_URL "https://www.aquamaniac.de/sites/download/download.php?package=01&release=206&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
KTOBLZCHECK_VERSION="1.49"
set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-${KTOBLZCHECK_VERSION}.tar.gz"
# ktoblzcheck is being installed into GWENHYWFAR_DIR
-AQBANKING_VERSION="5.7.8"
+AQBANKING_VERSION="5.7.6beta"
## NB: Dummy means dummy! The important value in the following url is
## the release number, not the file name at the end!
-set_default AQBANKING_URL "https://www.aquamaniac.de/sites/download/download.php?package=03&release=217&file=02&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
+set_default AQBANKING_URL "https://www.aquamaniac.de/sites/download/download.php?package=03&release=215&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
set_default AQB_PATCH ""
commit 1b29db233caefc63f74a12047d86006ac275b0d1
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sun Mar 4 21:05:55 2018 +0100
Update 2.6 series to most recent versions of gwenhywfar and aqbanking
diff --git a/defaults.sh b/defaults.sh
index 3d00fa6..7701861 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -348,20 +348,20 @@ set_default LIBOFX_DIR $GLOBAL_DIR\\libofx
set_default LIBOFX_PATCH `pwd`/libofx-0.9.8.patch
## online banking: gwenhywfar+aqbanking
-GWENHYWFAR_VERSION="4.18.0"
+GWENHYWFAR_VERSION="4.20.0"
## NB: Dummy means dummy! The important value in the following url is
## the release number, not the file name at the end!
-set_default GWENHYWFAR_URL "https://www.aquamaniac.de/sites/download/download.php?package=01&release=206&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
+set_default GWENHYWFAR_URL "https://www.aquamaniac.de/sites/download/download.php?package=01&release=208&file=02&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
KTOBLZCHECK_VERSION="1.49"
set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-${KTOBLZCHECK_VERSION}.tar.gz"
# ktoblzcheck is being installed into GWENHYWFAR_DIR
-AQBANKING_VERSION="5.7.6beta"
+AQBANKING_VERSION="5.7.8"
## NB: Dummy means dummy! The important value in the following url is
## the release number, not the file name at the end!
-set_default AQBANKING_URL "https://www.aquamaniac.de/sites/download/download.php?package=03&release=215&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
+set_default AQBANKING_URL "https://www.aquamaniac.de/sites/download/download.php?package=03&release=217&file=02&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
set_default AQB_PATCH ""
commit 27f16f78e2a8d9379b30fec6c1f4a5e47469a88d
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sun Mar 4 19:54:14 2018 +0100
Skip certificate check on aquamaniac's website.
Mingw's wget isn't smart enough to discover www.aquamaniacs.de is covered by
the git.aquamaniacs.de certificate.
diff --git a/install-impl.sh b/install-impl.sh
index de9fe0c..f688d16 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -280,6 +280,9 @@ function inst_aqbanking() {
then
echo "AqBanking ${AQBANKING_VERSION} already installed in $_AQBANKING_UDIR. skipping."
else
+ # Mingw's wget isn't clever enough to find alternative dns names in certificates
+ # So it won't find that git.aquamaniacs.de (the cert CN) is equivalent to www.aquamaniacs.de
+ WGET_EXTRA_OPTIONS="--no-check-certificate"
wget_unpacked $AQBANKING_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/aqbanking-*
qpushd $TMP_UDIR/aqbanking-*
@@ -647,6 +650,9 @@ function inst_gwenhywfar() {
# INSTALLED_GWEN=`${PKG_CONFIG} --modversion gwenhywfar`
# echo "GWENHYWFAR installed version ${INSTALLED_GWEN} doesn't match required version ${GWENHYWFAR_VERSION}"
# exit
+ # Mingw's wget isn't clever enough to find alternative dns names in certificates
+ # So it won't find that git.aquamaniacs.de (the cert CN) is equivalent to www.aquamaniacs.de
+ WGET_EXTRA_OPTIONS="--no-check-certificate"
wget_unpacked $GWENHYWFAR_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/gwenhywfar-*
qpushd $TMP_UDIR/gwenhywfar-*
commit 3834d0a077a39097942ccf03b86977a1113f54f5
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Feb 24 16:01:02 2018 -0800
Release GnuCash 2.7.5
diff --git a/gnucash.modules b/gnucash.modules
index 63e93e9..5bb457d 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -281,8 +281,8 @@
<cmake id="gnucash"
cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock"
use-ninja="False">
- <branch repo="sourceforge" module="gnucash/unstable/gnucash-2.7.4.tar.bz2"
- version="2.7.4"/>
+ <branch repo="sourceforge" module="gnucash/unstable/gnucash-2.7.5.tar.bz2"
+ version="2.7.5"/>
<dependencies>
<dep package="libofx"/>
<dep package="aqbanking"/>
commit bbbe9d38e6f9c64a8df8bfbd085c899fc87b4d06
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Feb 13 13:46:44 2018 -0800
Build GnuCash version 2.7.4
diff --git a/gnucash.modules b/gnucash.modules
index 9ac4db6..63e93e9 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -281,8 +281,8 @@
<cmake id="gnucash"
cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock"
use-ninja="False">
- <branch repo="sourceforge" module="gnucash/unstable/gnucash-2.7.3.tar.bz2"
- version="2.7.3"/>
+ <branch repo="sourceforge" module="gnucash/unstable/gnucash-2.7.4.tar.bz2"
+ version="2.7.4"/>
<dependencies>
<dep package="libofx"/>
<dep package="aqbanking"/>
commit 79691184928b81d18298d1d5745e7eeec008a10b
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Feb 13 13:43:58 2018 -0800
Bug 793163 - 2.7.2+: Could not spawn perl
gspawn-helper wasn't in the bundle.
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 8738faf..e5f032b 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -197,6 +197,9 @@ Source: "@MINGW_DIR@\bin\mariadb.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\ssleay32.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\zlib1.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\gspawn-win32-helper.exe"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\gspawn-win32-helper-console.exe"; DestDir: "{app}\bin"; Components: main
+
Source: "@MINGW_DIR@\share\icons\*"; DestDir: "{app}\share\icons"; Flags: recursesubdirs; Components: main
Source: "@MINGW_DIR@\share\locale\*"; Destdir: "{app}\share\locale"; Flags: recursesubdirs; Components: main
Source: "@MINGW_DIR@\share\themes\*"; DestDir: "{app}\share\themes"; Flags: recursesubdirs; Components: main
@@ -206,6 +209,10 @@ Source: "@MINGW_DIR@\share\xml\fontconfig\*"; DestDir: "{app}\share\xml\fontconf
Source: "@MINGW_DIR@\etc\gtk-2.0\*"; Destdir: "{app}\etc\gtk-2.0"; Flags: recursesubdirs; Components: main
Source: "@MINGW_DIR@\etc\gtk-3.0\*"; Destdir: "{app}\etc\gtk-3.0"; Flags: recursesubdirs; Components: main
Source: "@MINGW_DIR@\etc\fonts\*"; DestDir: "{app}\etc\fonts"; Flags: recursesubdirs; Components: main
+
+;;; Finally we have three files in the extra_dist directory to put in bin:
+Source: "@GC_WIN_REPOS_DIR@\extra_dist\*"; DestDir: "{app}\bin"; Flags: recursesubdirs; Components: main
+
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Define the registry keys Setup should create (HKLM = HKEY_LOCAL_MACHINE)
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
commit e56a0ce206c61bd5090e2ba3a432ecee24de4dfd
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Jan 11 09:49:00 2018 -0800
Fix AQBanking setup crash.
Gcc-7.2 generates bad code that sets a bad stack pointer when returning from call
in GWEN_Gui_ReadDialogPrefs. Work around by disabling optimization when
building gwenhywfar.
diff --git a/jhbuildrc.in b/jhbuildrc.in
index 1f149bf..b0c1725 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -79,4 +79,5 @@ module_makeargs["gnucash"]="-j 1"
module_makeargs["gnucash-git"]="-j 1"
module_extra_env["gnucash"]={'ACLOCAL_FLAGS':'-I' + os.path.join('/mingw32', 'share', 'aclocal')}
+module_extra_env["gwenhywfar"]={'CFLAGS':'-O0'}
commit b6bc66fbd927b5d67969c0e95b540d1522664e5a
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Jan 11 09:46:08 2018 -0800
Upgrade Gwenhywfar to latest release and don't build libgwengui-gtk2.
diff --git a/gnucash.modules b/gnucash.modules
index 81e345e..9ac4db6 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -142,8 +142,8 @@
</autotools>
<autotools id="gwenhywfar" autogen-sh="configure"
- autogenargs="--with-guis=gtk2 --enable-local-install --disable-binreloc --disable-ssl">
- <branch module="gnucash/Dependencies/gwenhywfar-4.17.0.tar.gz" version="4.17.0"
+ autogenargs="--with-guis='' --enable-local-install --disable-binreloc --disable-ssl">
+ <branch module="gnucash/Dependencies/gwenhywfar-4.18.0.tar.gz" version="4.18.0"
repo="sourceforge">
</branch>
<dependencies>
@@ -153,7 +153,7 @@
</autotools>
<autotools id="gwenhywfar-svn" autogen-template="make -fMakefile.cvs && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
- autogenargs="--with-guis=gtk2 --enable-local-install --disable-binreloc --disable-ssl">
+ autogenargs="--with-guis='' --enable-local-install --disable-binreloc --disable-ssl">
<branch module="gwenhywfar" repo="aquamaniac"/>
<dependencies>
<dep package="gcrypt"/>
diff --git a/jhbuildrc.in b/jhbuildrc.in
index f7973aa..1f149bf 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -78,6 +78,5 @@ module_makeargs["aqbanking"]="-j 1"
module_makeargs["gnucash"]="-j 1"
module_makeargs["gnucash-git"]="-j 1"
-module_extra_env["gwenhywfar"]={'CPPFLAGS':_popen('pkg-config --cflags gtk+-2.0'), 'LDFLAGS':_popen('pkg-config --libs gtk+-2.0')}
module_extra_env["gnucash"]={'ACLOCAL_FLAGS':'-I' + os.path.join('/mingw32', 'share', 'aclocal')}
commit 4829dc0497ec08f0508bf8f100b3b3dba002b50b
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Jan 11 09:41:52 2018 -0800
Change COPYING to LICENSE, reflecting file actually distributed in the tarball.
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index a8e3495..8738faf 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -16,7 +16,7 @@ AppUpdatesURL=http://www.gnucash.org
VersionInfoVersion=@PACKAGE_VERSION@
DefaultDirName={pf}\@PACKAGE@
DefaultGroupName=GnuCash
-LicenseFile=@INST_DIR@\share\doc\@PACKAGE@\COPYING
+LicenseFile=@INST_DIR@\share\doc\@PACKAGE@\LICENSE
Compression=lzma
MinVersion=5.0
PrivilegesRequired=poweruser
@@ -102,7 +102,7 @@ Source: "@INST_DIR@\share\doc\@PACKAGE@\README-fr.win32-bin.txt"; DestDir: "{app
Source: "@INST_DIR@\share\doc\@PACKAGE@\README-it.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
Source: "@INST_DIR@\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
Source: "@INST_DIR@\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@INST_DIR@\share\doc\@PACKAGE@\COPYING"; DestDir: "{app}\doc\@PACKAGE@"; Flags: ignoreversion; Components: main
+Source: "@INST_DIR@\share\doc\@PACKAGE@\LICENSE"; DestDir: "{app}\doc\@PACKAGE@"; Flags: ignoreversion; Components: main
Source: "@INST_DIR@\share\doc\@PACKAGE@\AUTHORS"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
Source: "@INST_DIR@\share\doc\@PACKAGE@\ChangeLog"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
Source: "@INST_DIR@\share\doc\@PACKAGE at -docs\*.chm"; DestDir: "{app}\share\@PACKAGE@\help"; Flags: recursesubdirs; Components: main
commit 6e35c76b503f8fd24b11f0f4831019080a55baff
Author: Christian Stimming <christian at cstimming.de>
Date: Sun Jan 7 22:16:17 2018 +0100
Update versions of gwen and aqbanking to latest releases, unfortunately still many months old.
diff --git a/defaults.sh b/defaults.sh
index 159738c..3d00fa6 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -348,20 +348,20 @@ set_default LIBOFX_DIR $GLOBAL_DIR\\libofx
set_default LIBOFX_PATCH `pwd`/libofx-0.9.8.patch
## online banking: gwenhywfar+aqbanking
-GWENHYWFAR_VERSION="4.17.0"
+GWENHYWFAR_VERSION="4.18.0"
## NB: Dummy means dummy! The important value in the following url is
## the release number, not the file name at the end!
-set_default GWENHYWFAR_URL "https://www.aquamaniac.de/sites/download/download.php?package=01&release=205&file=01&dummy=gwenhywfar-4.17.0.tar.gz"
+set_default GWENHYWFAR_URL "https://www.aquamaniac.de/sites/download/download.php?package=01&release=206&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
-KTOBLZCHECK_VERSION="1.48"
+KTOBLZCHECK_VERSION="1.49"
set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-${KTOBLZCHECK_VERSION}.tar.gz"
# ktoblzcheck is being installed into GWENHYWFAR_DIR
-AQBANKING_VERSION="5.6.12"
+AQBANKING_VERSION="5.7.6beta"
## NB: Dummy means dummy! The important value in the following url is
## the release number, not the file name at the end!
-set_default AQBANKING_URL "https://www.aquamaniac.de/sites/download/download.php?package=03&release=208&file=01&dummy=aqbanking-5.6.12.tar.gz"
+set_default AQBANKING_URL "https://www.aquamaniac.de/sites/download/download.php?package=03&release=215&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
set_default AQB_PATCH ""
commit c13d6ddfdfe67c87b68b455d0e4649e74b2529a1
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Dec 30 15:57:53 2017 -0800
Release 2.7.3
diff --git a/gnucash.modules b/gnucash.modules
index e5a8a87..81e345e 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -281,8 +281,8 @@
<cmake id="gnucash"
cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock"
use-ninja="False">
- <branch repo="sourceforge" module="gnucash/unstable/gnucash-2.7.2.tar.bz2"
- version="2.7.2"/>
+ <branch repo="sourceforge" module="gnucash/unstable/gnucash-2.7.3.tar.bz2"
+ version="2.7.3"/>
<dependencies>
<dep package="libofx"/>
<dep package="aqbanking"/>
commit d76f9adb3a49731cc4740fd82006432e521f779a
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Dec 30 15:54:16 2017 -0800
Bug 791823 - Select GnuCash Theme shortcut points to a non-existing component
Unfortunately no replacement, so the bug is renamed instead of closed.
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 3b73a58..a8e3495 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -46,7 +46,6 @@ Name: "{group}\{cm:IconName_README}"; Filename: "{app}\doc\@PACKAGE@\{cm:IconFil
Name: "{group}\{cm:IconName_FAQ}"; Filename: "http://wiki.gnucash.org/wiki/FAQ"; Tasks: menuicon
Name: "{group}\{cm:IconName_Bugzilla}"; Filename: "http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash"; Tasks: menuicon
Name: "{group}\{cm:IconName_InstallFQ}"; Filename: "{app}\bin\install-fq-mods.cmd"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_InstallFQ}"; Tasks: menuicon
-Name: "{group}\{cm:IconName_Theme}"; Filename: "{app}\bin\gtk2_prefs.exe"; WorkingDir: "{app}\bin"; Tasks: menuicon
Name: "{group}\{cm:IconName_Uninstall}"; Filename: "{uninstallexe}"; Comment: "{cm:IconComment_Uninstall}"; Tasks: menuicon
Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "{code:GetDocPath}"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: desktopicon
commit c7669b055f356d95bfdebc43c3df89aafd07eeb3
Author: Jannick <thirdedition at gmx.net>
Date: Mon Dec 25 22:30:39 2017 +0100
added optional argument of setup_mingw64.ps1 to existing MSys2 environment
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 8838341..fa32e3c 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -20,7 +20,8 @@
<#
.SYNOPSIS
-Prepares a MinGW-w64 development environment from scratch.
+Prepares a MinGW-w64 development environment from scratch
+or enhances one already existing on the system.
.DESCRIPTION
@@ -43,6 +44,11 @@ none is provided the environment will be created at C:\gcdev64.
Optional. A path to which to download installers. Defaults to
target_dir\downloads.
+.PARAMETER msys2_root
+
+Optional. The root path of an already installed MSys2 environment.
+E.g. C:\msys64.
+
.PARAMETER x86_64
Optional. A switch value.If true the toolchain will build x86_64
@@ -54,9 +60,12 @@ binaries; if false it will build i686 binaries. Defaults to false.
Param(
[Parameter()] [string]$target_dir = "c:\\gcdev64",
[Parameter()] [string]$download_dir = "$target_dir\\downloads",
+ [Parameter()] [string]$msys2_root = "$target_dir\\msys2",
[Parameter()] [switch]$x86_64
)
+$bash_path = "$msys2_root\\usr\\bin\\bash.exe"
+
$progressPreference = 'silentlyContinue'
if ($x86_64) {
$mingw_prefix = "mingw64/mingw-w64-x86_64-"
@@ -104,12 +113,12 @@ function Install-Package([string]$url, [string]$download_file,
function bash-command() {
param ([string]$command = "")
- if (!(test-path -path $target_dir\msys2\usr\bin\bash.exe)) {
+ if (!(test-path -path $bash_path)) {
write-host "Shell program not found, aborting."
return
}
#write-host "Running bash command ""$command"""
- Start-Process -FilePath "$target_dir\msys2\usr\bin\bash.exe" -ArgumentList "-c ""export PATH=/usr/bin; $command""" -NoNewWindow -Wait
+ Start-Process -FilePath "$bash_path" -ArgumentList "-c ""export PATH=/usr/bin; $command""" -NoNewWindow -Wait
}
function make-unixpath([string]$path) {
@@ -118,7 +127,7 @@ function make-unixpath([string]$path) {
# Install MSYS2 for the current machine's architechture.
-if (!(test-path -path $target_dir\msys2\usr\bin\bash.exe)) {
+if (!(test-path -path $bash_path)) {
$mingw64_installer32 = "http://repo.msys2.org/distrib/i686/msys2-i686-20161025.exe"
$mingw64_installer64 = "http://repo.msys2.org/distrib/x86_64/msys2-x86_64-20161025.exe"
@@ -147,10 +156,10 @@ Controller.prototype.FinishedPageCallback = function() {
$setup_script = "$target_dir\input.qs"
set-content -path $setup_script -value $msys_setup_args | out-null
- install-package -url $mingw64_installer -download_file $mingw64_installer_file -install_dir "$target_dir/msys2" -setup_cmd "msys2.exe" -setup_args "--script $setup_script"
+ install-package -url $mingw64_installer -download_file $mingw64_installer_file -install_dir "$msys2_root" -setup_cmd "msys2.exe" -setup_args "--script $setup_script"
# remove-item $setup_script
}
-if (!(test-path -path $target_dir\msys2\usr\bin\bash.exe)) {
+if (!(test-path -path $bash_path)) {
write-host "Failed to install MSys2, aborting."
exit
}
@@ -182,7 +191,7 @@ if (!(test-path -path ${env:ProgramFiles(x86)}\inno)) {
}
#if MSys2 isn't already installed, install it.
-if (!(test-path -path $target_dir\msys2\usr\bin\bash.exe)) {
+if (!(test-path -path $bash_path)) {
Write-Host @"
Updating the new installation. A bash window will open. In that window accept the proposed installation and close the window when the update completes.
@@ -230,7 +239,8 @@ Write-Host @"
Next we'll install the HTML Help Workshop includes and libraries into our MinGW directory.
"@
-if (!(test-path -path "$target_dir/msys2/$mingw_path/include/htmlhelp.h")) {
+$htmlhelp_h = "$msys2_root/$mingw_path/include/htmlhelp.h"
+if (!(test-path -path $htmlhelp_h)) {
if (!$installed_hh) {
$installed_hh = get-item -path "hkcu:\SOFTWARE\Microsoft\HTML Help Workshop" | foreach-object{$_.GetValue("InstallDir")}
}
@@ -239,7 +249,7 @@ if (!(test-path -path "$target_dir/msys2/$mingw_path/include/htmlhelp.h")) {
bash-command -command "$mingw_bin/gendef $hhctrl_ocx - > $mingw_path/lib/htmlhelp.def"
bash-command -command "$mingw_bin/dlltool -k -d $mingw_path/lib/htmlhelp.def -l $mingw_path/lib/libhtmlhelp.a"
- if (!(test-path -path "$target_dir/msys2/$mingw_path/include/htmlhelp.h")) {
+ if (!(test-path -path $htmlhelp_h)) {
Write-Host "HTML Help Workshop isn't correctly installed."
exit
}
@@ -270,6 +280,8 @@ $jhbuildrc = get-content "$target_dir\\src\\gnucash-on-windows.git\\jhbuildrc.in
[IO.File]::WriteAllLines("$target_dir\\src\\gnucash-on-windows.git\\jhbuildrc", $jhbuildrc)
Write-Host @"
+
+
Your build environment is now ready to use. Open an MSys2/Mingw32 shell from the start menu, cd to your target directory, and run
jhbuild -f src/gnucash-on-windows.git/jhbuildrc build
commit 4e8154477c96950aa336b5e61b6c8b37bea914fa
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu Nov 30 10:20:57 2017 +0100
Fix bootstrap script's parameter handling when not run immediately under cscript
diff --git a/bootstrap_win_dev.vbs b/bootstrap_win_dev.vbs
index f886072..7bd2915 100644
--- a/bootstrap_win_dev.vbs
+++ b/bootstrap_win_dev.vbs
@@ -482,20 +482,20 @@ End Function
' Make sure we run in a console (so output is visible)
-' Based on a code snipped found here
-' http://ask.metafilter.com/79481/vbscript-printing-to-command-line
+' Blatantly copied from
+' https://stackoverflow.com/questions/4692542/force-a-vbs-to-run-using-cscript-instead-of-wscript
Sub CheckStartMode
- ' Returns the running executable as upper case from the last \ symbol
- strStartExe = UCase( Mid( wscript.fullname, instrRev(wscript.fullname, "\") + 1 ) )
-
- If Not strStartExe = "CSCRIPT.EXE" Then
- ' This wasn't launched with cscript.exe, so relaunch using cscript.exe explicitly!
- ' wscript.scriptfullname is the full path to the actual script
-
- set oSh = CreateObject("wscript.shell")
- oSh.Run "cscript.exe """ & wscript.scriptfullname & """"
- wscript.quit
-
+ Dim Arg, Str
+ If Not LCase( Right( WScript.FullName, 12 ) ) = "\cscript.exe" Then
+ For Each Arg In WScript.Arguments
+ If InStr( Arg, " " ) Then Arg = """" & Arg & """"
+ Str = Str & " " & Arg
+ Next
+ CreateObject( "WScript.Shell" ).Run _
+ "cscript //nologo """ & _
+ WScript.ScriptFullName & _
+ """ " & Str
+ WScript.Quit
End If
End Sub
commit 69fd6b4be3f52c123d8182236a1a82af7fb1669d
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Nov 26 10:40:41 2017 -0800
Release 2.7.2
diff --git a/gnucash.modules b/gnucash.modules
index e884cbe..e5a8a87 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -281,8 +281,8 @@
<cmake id="gnucash"
cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock"
use-ninja="False">
- <branch repo="sourceforge" module="gnucash/unstable/gnucash-2.7.1.tar.bz2"
- version="2.7.1"/>
+ <branch repo="sourceforge" module="gnucash/unstable/gnucash-2.7.2.tar.bz2"
+ version="2.7.2"/>
<dependencies>
<dep package="libofx"/>
<dep package="aqbanking"/>
commit 585edfb3b634c02e8e12e846554b7abd96d06a0c
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Oct 29 14:18:18 2017 -0700
Release 2.7.1.
diff --git a/gnucash.modules b/gnucash.modules
index 1ecbe57..e884cbe 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -281,8 +281,8 @@
<cmake id="gnucash"
cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock"
use-ninja="False">
- <branch repo="sourceforge" module="gnucash/unstable/gnucash-2.7.0.tar.bz2"
- version="2.7.0"/>
+ <branch repo="sourceforge" module="gnucash/unstable/gnucash-2.7.1.tar.bz2"
+ version="2.7.1"/>
<dependencies>
<dep package="libofx"/>
<dep package="aqbanking"/>
commit 741143086ffaa0c6b1522bc68f1f321f9282dcf7
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Oct 19 16:57:40 2017 -0700
Change the other location where guile was set to 1.8.
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 18e9931..3b73a58 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -462,7 +462,7 @@ begin
{ Adapt GUILE_LOAD_PATH parameter and prevent cygwin interference in SCHEME_LIBRARY_PATH }
if (Pos('GUILE_LOAD_PATH', EnvStrList[iLineCounter]) = 1) then
begin
- StringChangeEx(EnvStrList[iLineCounter], '{GUILE_LOAD_PATH}', '{GNC_HOME}/share/guile/1.8;{GUILE_LOAD_PATH}', True);
+ StringChangeEx(EnvStrList[iLineCounter], '{GUILE_LOAD_PATH}', '{GNC_HOME}/share/guile/2.0;{GUILE_LOAD_PATH}', True);
EnvStrList[iLineCounter] := EnvStrList[iLineCounter] + #13#10 + '# Clear SCHEME_LIBRARY_PATH to prevent interference from other guile installations (like cygwin)' + #13#10;
EnvStrList[iLineCounter] := EnvStrList[iLineCounter] + 'SCHEME_LIBRARY_PATH=' + #13#10;
commit 827e0c828aea0fd8b0b8867b45c9aabc8df1b02d
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Oct 19 16:37:49 2017 -0700
Actually set the default Powershell encoding.
diff --git a/bundle-mingw64.ps1 b/bundle-mingw64.ps1
index 2f26ad0..310941e 100644
--- a/bundle-mingw64.ps1
+++ b/bundle-mingw64.ps1
@@ -91,6 +91,10 @@ else {
$gnucash = get-childitem -path $target_dir\build | where-object {$_.Name -match "gnucash-[0-9.]+"} | select-object -last 1
}
+if ($PSVersionTable.PSVersion.Major -ge 3) {
+ $PSDefaultParameterValues['*:Encoding'] = 'utf8'
+ }
+
$gnc_config_h = "$target_dir\build\$gnucash\common\config.h"
$major_version = version_item -tag "GNUCASH_MAJOR_VERSION" -path $gnc_config_h
commit ee81e2ec7d09d8e42183ac35555db80fa4e059f9
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Oct 19 14:44:09 2017 -0700
Set GUILE_LOAD_PATH version to 2.0 in MSYS2 build.
Fixes bundle crash.
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index e3ad0e5..18e9931 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -417,7 +417,7 @@ begin
{ Create the guile.cmd file; #10 is the linefeed character and #13 CR }
FileName := appdir + '\bin\guile.cmd' ;
- FileString := 'set GUILE_LOAD_PATH=' + pkgdatadir + '\scm;' + appdir + '\share\guile\1.8;%GUILE_LOAD_PATH%'#13#10 ;
+ FileString := 'set GUILE_LOAD_PATH=' + pkgdatadir + '\scm;' + appdir + '\share\guile\2.0;%GUILE_LOAD_PATH%'#13#10 ;
FileString := FileString + 'start guile.exe %*'#13#10 ;
{ Save the final file }
commit 58616b7fc4493e1cad616b907457343ebddf7c56
Merge: f118eac 2577cc5
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Oct 19 11:57:40 2017 -0700
Set Powershell's output encoding to UTF8.
So that Inno Setup's output in the build log is intelligible.
diff --cc buildserver/build_package.ps1
index d74ecd1,d74ecd1..473bf8b
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@@ -66,6 -66,6 +66,10 @@@ $env:MSYSTEM = 'MINGW32
$env:TERM = 'dumb' #Prevent escape codes in the log.
$env:TARGET = "$package-$branch"
++if ($PSVersionTable.PSVersion.Major -ge 3) {
++ $PSDefaultParameterValues['*:Encoding'] = 'utf8'
++ }
++
function bash-command() {
param ([string]$command = "")
if (!(test-path -path $target_dir\msys2\usr\bin\bash.exe)) {
commit f118eaca662169f31591444b37d590e114d56522
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Oct 19 11:27:50 2017 -0700
Turn off debugging output from bash-command function.
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index fe4f884..8838341 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -108,7 +108,7 @@ function bash-command() {
write-host "Shell program not found, aborting."
return
}
- write-host "Running bash command ""$command"""
+ #write-host "Running bash command ""$command"""
Start-Process -FilePath "$target_dir\msys2\usr\bin\bash.exe" -ArgumentList "-c ""export PATH=/usr/bin; $command""" -NoNewWindow -Wait
}
commit 2a61fd4bdbd9ecc3eedc7b05e99eb8c03d3005a3
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Oct 19 11:19:04 2017 -0700
Use system.net.downloadfile instead of invoke-webrequest.
Fixes bug 787177.
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index eef3451..fe4f884 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -90,7 +90,7 @@ function Install-Package([string]$url, [string]$download_file,
{
if (!(test-path -path $download_file)) {
write-host "Downloading $download_file from $url"
- invoke-webrequest -uri $url -outfile $download_file
+ (New-Object System.Net.WebClient).DownloadFile($url, $download_file)
}
write-host "Installing $download_dir\$setup_cmd $setup_args"
commit 2577cc5c0a4717de5f0ad15801e939ce5675a150
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Oct 19 10:14:54 2017 -0700
Turn off building master with mingw, it doesn't work any more.
diff --git a/buildserver/build_periodic.bat b/buildserver/build_periodic.bat
index 529bf63..a0256e0 100644
--- a/buildserver/build_periodic.bat
+++ b/buildserver/build_periodic.bat
@@ -11,4 +11,4 @@ c:\gcdev\mingw\msys\1.0\bin\sh.exe --login c:\gcdev\gnucash-on-windows.git\build
rem maintenance branch build (daily)
c:\gcdev-maint\mingw\msys\1.0\bin\sh.exe --login c:\gcdev-maint\gnucash-on-windows.git\buildserver\build_periodic.sh
rem Development build (daily)
-c:\gcdev\mingw\msys\1.0\bin\sh.exe --login c:\gcdev\gnucash-on-windows.git\buildserver\build_periodic.sh
+rem This doesn't work any more. c:\gcdev\mingw\msys\1.0\bin\sh.exe --login c:\gcdev\gnucash-on-windows.git\buildserver\build_periodic.sh
commit df4a3ea04a8f52bedf5982ab1a9b2b8984cf867e
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Oct 16 15:01:09 2017 -0700
Copy the gtk settings schemas to target_dir and recompile.
Schemas are required by GtkFileSelector, crashes if they're not in the bundle.
diff --git a/bundle-mingw64.ps1 b/bundle-mingw64.ps1
index f3f039a..2f26ad0 100644
--- a/bundle-mingw64.ps1
+++ b/bundle-mingw64.ps1
@@ -125,7 +125,6 @@ $proc = bash-command("sed < $issue_in > $issue_out \
-e ""s#@GNUCASH_MICRO_VERSION@#$micro_version#g"" \
-e ""s#@GC_WIN_REPOS_DIR@#$script#g"" ")
-
$date = get-date -format "yyyy-MM-dd"
$setup_result = "$target_dir\gnucash-$package_version-setup.exe"
$final_file = ""
@@ -138,6 +137,14 @@ else {
$final_file = "$target_dir\gnucash-$package_version-setup.exe"
}
+$mingw_dir = "$root_dir\msys2\mingw$mingw_ver"
+$schema_dir = "share\glib-2.0\schemas"
+$target_schema_dir = "$target_dir\inst\$schema_dir"
+copy-item $mingw_dir\$schema_dir\org.gtk.Settings.* $target_schema_dir
+$target_schema_unix = make-unixpath -path $target_schema_dir
+$schema_compiler = make-unixpath -path "$mingw_dir\bin\glib-compile-schemas"
+bash-command("$schema_compiler $target_schema_unix")
+
write-host "Running Inno Setup to create $final_file."
if (test-path -path $setup_result) {
commit 72d6443ab9daf1b7b2277253cb22f15166f85c6b
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Oct 16 12:36:38 2017 -0700
Add some missing stuff to the bundle.
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 54b171f..e3ad0e5 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -85,6 +85,8 @@ Source: "@INST_DIR@\share\guile\*"; DestDir: "{app}\share\guile"; Flags: recurse
Source: "@INST_DIR@\share\glib-2.0\*"; DestDir: "{app}\share\glib-2.0"; Flags: recursesubdirs; Components: main
Source: "@INST_DIR@\share\libofx\*"; DestDir: "{app}\share\libofx"; Flags: recursesubdirs; Components: main
Source: "@INST_DIR@\share\OpenSP\*"; DestDir: "{app}\share\OpenSP"; Flags: recursesubdirs; Components: main
+Source: "@INST_DIR@\share\icons\hicolor\*"; DestDir: "{app}\share\icons\hicolor"; Flags: recursesubdirs; Components: main
+Source: "@INST_DIR@\share\glib-2.0\schemas\*"; DestDir: "{app}\share\glib-2.0\schemas"; Flags: recursesubdirs; Components: main
;; The translations
;Source: "@INST_DIR@\share\locale\*"; DestDir: "{app}\share\locale"; Flags: recursesubdirs; Components: translations
@@ -104,7 +106,8 @@ Source: "@INST_DIR@\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"; DestDir: "{
Source: "@INST_DIR@\share\doc\@PACKAGE@\COPYING"; DestDir: "{app}\doc\@PACKAGE@"; Flags: ignoreversion; Components: main
Source: "@INST_DIR@\share\doc\@PACKAGE@\AUTHORS"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
Source: "@INST_DIR@\share\doc\@PACKAGE@\ChangeLog"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@INST_DIR@\share\doc\@PACKAGE at -docs\*"; DestDir: "{app}\share\@PACKAGE@\help"; Flags: recursesubdirs; Components: main
+Source: "@INST_DIR@\share\doc\@PACKAGE at -docs\*.chm"; DestDir: "{app}\share\@PACKAGE@\help"; Flags: recursesubdirs; Components: main
+Source: "@INST_DIR@\share\doc\@PACKAGE at -docs\*.hhmap"; DestDir: "{app}\share\@PACKAGE@\help"; Flags: recursesubdirs; Components: main
;;;; The second section retrieves the dependencies that we need from MinGW.
;; Required DLLs
@@ -164,6 +167,7 @@ Source: "@MINGW_DIR@\bin\libicudt*.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libicuin*.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libicuuc*.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libidn-11.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libidn2-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libintl-8.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libjavascriptcoregtk-3.0-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libjpeg-8.dll"; DestDir: "{app}\bin"; Components: main
commit 08b2ab9eb587ece2a138b90ea182a5085e8aa9cc
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Oct 16 12:36:22 2017 -0700
Make version_item tag match changes in Gnucash.
diff --git a/bundle-mingw64.ps1 b/bundle-mingw64.ps1
index 046794c..f3f039a 100644
--- a/bundle-mingw64.ps1
+++ b/bundle-mingw64.ps1
@@ -131,7 +131,7 @@ $setup_result = "$target_dir\gnucash-$package_version-setup.exe"
$final_file = ""
if ($git_build) {
$gnc_vcsinfo_h = "$target_dir\build\gnucash-git\libgnucash\core-utils\gnc-vcs-info.h"
- $vcs_rev = version_item -tag "GNUCASH_SCM_REV" -path $gnc_vcsinfo_h | %{$_ -replace """", ""}
+ $vcs_rev = version_item -tag "GNC_VCS_REV" -path $gnc_vcsinfo_h | %{$_ -replace """", ""}
$final_file = "$target_dir\gnucash-$package_version-$date-git-$vcs_rev-setup.exe"
}
else {
commit d219c3e6c11c63bc8b922209236d2c73204019ab
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Oct 16 12:34:51 2017 -0700
Remove --disable-scrollkeeper from gnucash-docs, use gnucash-docs-git for all builds.
diff --git a/gnucash.modules b/gnucash.modules
index f41867e..1ecbe57 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -314,7 +314,7 @@
</dependencies>
</cmake>
- <autotools id="gnucash-docs-git" autogenargs="--disable-scrollkeeper"
+ <autotools id="gnucash-docs-git"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
makeargs="chm" makeinstallargs="install-chm" >
<branch repo="github" module="Gnucash/gnucash-docs.git" revision="master"
@@ -324,7 +324,7 @@
</dependencies>
</autotools>
- <autotools id="gnucash-docs" autogenargs="--disable-scrollkeeper"
+ <autotools id="gnucash-docs"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
makeargs="chm" makeinstallargs="install-chm" >
<branch module="gnucash/gnucash-docs/gnucash-docs-2.7.0.tar.gz"
@@ -341,7 +341,7 @@
<metamodule id="meta-gnucash">
<dependencies>
<dep package="gnucash"/>
- <dep package="gnucash-docs"/>
+ <dep package="gnucash-docs-git"/>
</dependencies>
</metamodule>
commit 3077b9f73e430cb3f56bcc0f00dc542909846b16
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Oct 3 15:58:27 2017 -0700
Add /etc/fonts to the bundle.
Fixes display of reports. Thanks to Geert for finding it!
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 7ad12c9..54b171f 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -202,6 +202,7 @@ Source: "@MINGW_DIR@\share\xml\fontconfig\*"; DestDir: "{app}\share\xml\fontconf
Source: "@MINGW_DIR@\etc\gtk-2.0\*"; Destdir: "{app}\etc\gtk-2.0"; Flags: recursesubdirs; Components: main
Source: "@MINGW_DIR@\etc\gtk-3.0\*"; Destdir: "{app}\etc\gtk-3.0"; Flags: recursesubdirs; Components: main
+Source: "@MINGW_DIR@\etc\fonts\*"; DestDir: "{app}\etc\fonts"; Flags: recursesubdirs; Components: main
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Define the registry keys Setup should create (HKLM = HKEY_LOCAL_MACHINE)
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
commit 6e3655087a4483f52a0d473619e0e6c0010b4297
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu Oct 5 19:26:19 2017 +0200
Remove the now unused HTTPDownload function
diff --git a/bootstrap_win_dev.vbs b/bootstrap_win_dev.vbs
index 8626947..f886072 100644
--- a/bootstrap_win_dev.vbs
+++ b/bootstrap_win_dev.vbs
@@ -417,49 +417,6 @@ Sub Welcome
End Sub
-' Download a file over http
-Sub HTTPDownload( myURL, myPath )
-' This Sub downloads the FILE specified in myURL to the path specified in myPath.
-'
-' myURL must always end with a file name
-' myPath may be a directory or a file name; in either case the directory must exist
-'
-' Based on a script written by Rob van der Woude
-' http://www.robvanderwoude.com
-
- ' Standard housekeeping
- Dim i, objFile, objHTTP, strFile, strMsg
-
- ' Check if the specified target file or folder exists,
- ' and build the fully qualified path of the target file
- If objFso.FolderExists( myPath ) Then
- strFile = objFso.BuildPath( myPath, Mid( myURL, InStrRev( myURL, "/" ) + 1 ) )
- ElseIf objFso.FolderExists( Left( myPath, InStrRev( myPath, "\" ) - 1 ) ) Then
- strFile = myPath
- Else
- stdout.WriteLine "ERROR: Target folder not found."
- AbortScript
- End If
-
- ' Create or open the target file
- Set objFile = objFso.OpenTextFile( strFile, ForWriting, True )
-
- ' Create an HTTP object
- Set objHTTP = CreateObject( "MSXML2.ServerXMLHTTP" )
-
- ' Download the specified URL
- objHTTP.Open "GET", myURL, False
- objHTTP.Send
-
- ' Write the downloaded byte stream to the target file
- For i = 1 To LenB( objHTTP.ResponseBody )
- objFile.Write Chr( AscB( MidB( objHTTP.ResponseBody, i, 1 ) ) )
- Next
-
- ' Close the target file
- objFile.Close( )
-End Sub
-
' Download a binary type file over http
Sub HTTPDownloadBinaryFile( myURL, myPath )
' This Sub downloads the FILE specified in myURL to the path specified in myPath.
commit 9b30fa5d12c9eccef4a69a6ef1a1ee6939b03c73
Merge: 211beda c82d18e
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu Oct 5 19:19:36 2017 +0200
Merge branch 'master' of https://github.com/wonhoseo/gnucash-on-windows
commit 211beda712ed847cb93dde7df52173e05052ddc3
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Sep 30 11:29:55 2017 -0700
Fix missing pipe in jhbuildrc.in transformation.
Fixes bug 788372.
diff --git a/gnucash.modules b/gnucash.modules
index aa5e7c3..f41867e 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -341,7 +341,7 @@
<metamodule id="meta-gnucash">
<dependencies>
<dep package="gnucash"/>
- <dep package="gnucash-docs-git"/>
+ <dep package="gnucash-docs"/>
</dependencies>
</metamodule>
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 8091fcc..eef3451 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -265,7 +265,7 @@ bash-command -command "/usr/bin/patch -d/ -p0 -i $target_unix/src/gnucash-on-win
$jhbuildrc = get-content "$target_dir\\src\\gnucash-on-windows.git\\jhbuildrc.in" |
%{$_ -replace "@-BASE_DIR-@", "$target_unix"} |
- %{$_ -replace "@-DOWNLOAD_DIR-@", "$download_unix"}
+ %{$_ -replace "@-DOWNLOAD_DIR-@", "$download_unix"} |
%{$_ -replace "@-ARCH-@", "$arch"}
[IO.File]::WriteAllLines("$target_dir\\src\\gnucash-on-windows.git\\jhbuildrc", $jhbuildrc)
commit 33cb4b1a29d9797ef50ed723288df75675034511
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Sep 30 10:53:26 2017 -0700
Pass target_unix to git, it loses dos-style path separators.
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index e00764a..8091fcc 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -253,7 +253,7 @@ if (!(test-path -path "$target_dir\\src")) {
New-Item $target_dir\\src -type directory
}
if (!(test-path -path "$target_dir\\src\\gnucash-on-windows.git")) {
- bash-command -command "git clone https://github.com/gnucash/gnucash-on-windows.git $target_dir/src/gnucash-on-windows.git"
+ bash-command -command "git clone https://github.com/gnucash/gnucash-on-windows.git $target_unix/src/gnucash-on-windows.git"
}
if (!(test-path -path "$target_dir\\src\\gnucash-on-windows.git")) {
write-host "Failed to clone the gnucash-on-windows repo, exiting."
commit 8b300c512d9f2096ee8ce2855eb25d18ce11b308
Author: Josep-Maria Prat <jpftgn at gmail.com>
Date: Tue Sep 26 15:17:09 2017 +0200
Added and updated files to show installer in Catalan
diff --git a/inno_setup/Catalan.isl b/inno_setup/Catalan.isl
new file mode 100644
index 0000000..5a91e2c
--- /dev/null
+++ b/inno_setup/Catalan.isl
@@ -0,0 +1,319 @@
+; *** Inno Setup version 5.5.3+ Catalan messages ***
+;
+; Translated by Carles Millan (email: carles at carlesmillan.cat)
+
+[LangOptions]
+
+LanguageName=Catal<00E0>
+LanguageID=$0403
+LanguageCodePage=1252
+
+[Messages]
+
+; *** Application titles
+SetupAppTitle=Instal·lació
+SetupWindowTitle=Instal·lació - %1
+UninstallAppTitle=Desinstal·lació
+UninstallAppFullTitle=Desinstal·la %1
+
+; *** Misc. common
+InformationTitle=Informació
+ConfirmTitle=Confirmació
+ErrorTitle=Error
+
+; *** SetupLdr messages
+SetupLdrStartupMessage=Aquest programa instal·larà %1. Voleu continuar?
+LdrCannotCreateTemp=No s'ha pogut crear un fitxer temporal. Instal·lació cancel·lada
+LdrCannotExecTemp=No s'ha pogut executar el fitxer a la carpeta temporal. Instal·lació cancel·lada
+
+; *** Startup error messages
+LastErrorMessage=%1.%n%nError %2: %3
+SetupFileMissing=El fitxer %1 no es troba a la carpeta d'instal·lació. Resoleu el problema o obteniu una nova còpia del programa.
+SetupFileCorrupt=Els fitxers d'instal·lació estan corromputs. Obteniu una nova còpia del programa.
+SetupFileCorruptOrWrongVer=Els fitxers d'instal·lació estan espatllats, o són incompatibles amb aquesta versió del programa. Resoleu el problema o obteniu una nova còpia del programa.
+InvalidParameter=Un paràmetre invàlid ha estat passat a la línia de comanda:%n%n%1
+SetupAlreadyRunning=La instal·lació ja està en curs.
+WindowsVersionNotSupported=Aquest programa no suporta la versió de Windows instal·lada al vostre ordinador.
+WindowsServicePackRequired=Aquest programa necessita %1 Service Pack %2 o posterior.
+NotOnThisPlatform=Aquest programa no funcionarà sota %1.
+OnlyOnThisPlatform=Aquest programa només pot ser executat sota %1.
+OnlyOnTheseArchitectures=Aquest programa només pot ser instal·lat en versions de Windows dissenyades per a les següents arquitectures de processador:%n%n%1
+MissingWOW64APIs=Aquesta versió de Windows no conté la funcionalitat necessària per a realitzar una instal·lació de 64 bits. Per tal de corregir aquest problema instal·leu el Service Pack %1.
+WinVersionTooLowError=Aquest programa requereix %1 versió %2 o posterior.
+WinVersionTooHighError=Aquest programa no pot ser instal·lat sota %1 versió %2 o posterior.
+AdminPrivilegesRequired=Cal que tingueu privilegis d'administrador per poder instal·lar aquest programa.
+PowerUserPrivilegesRequired=Cal que accediu com a administrador o com a membre del grup Power Users en instal·lar aquest programa.
+SetupAppRunningError=El programa d'instal·lació ha detectat que %1 s'està executant actualment.%n%nTanqueu el programa i premeu Accepta per a continuar o Cancel·la per a sortir.
+UninstallAppRunningError=El programa de desinstal·lació ha detectat que %1 s'està executant en aquest moment.%n%nTanqueu el programa i premeu Accepta per a continuar o Cancel·la per a sortir.
+
+; *** Misc. errors
+ErrorCreatingDir=El programa d'instal·lació no ha pogut crear la carpeta "%1"
+ErrorTooManyFilesInDir=No s'ha pogut crear un fitxer a la carpeta "%1" perquè conté massa fitxers
+
+; *** Setup common messages
+ExitSetupTitle=Surt
+ExitSetupMessage=La instal·lació no s'ha completat. Si sortiu ara, el programa no serà instal·lat.%n%nPer a completar-la podreu tornar a executar el programa d'instal·lació quan vulgueu.%n%nVoleu sortir-ne?
+AboutSetupMenuItem=&Sobre la instal·lació...
+AboutSetupTitle=Sobre la instal·lació
+AboutSetupMessage=%1 versió %2%n%3%n%nPàgina web de %1:%n%4
+AboutSetupNote=
+TranslatorNote=Catalan translation by Carles Millan (carles at carlesmillan.cat)
+
+; *** Buttons
+ButtonBack=< &Enrere
+ButtonNext=&Següent >
+ButtonInstall=&Instal·la
+ButtonOK=Accepta
+ButtonCancel=Cancel·la
+ButtonYes=&Sí
+ButtonYesToAll=Sí a &tot
+ButtonNo=&No
+ButtonNoToAll=N&o a tot
+ButtonFinish=&Finalitza
+ButtonBrowse=&Explora...
+ButtonWizardBrowse=&Cerca...
+ButtonNewFolder=Crea &nova carpeta
+
+; *** "Select Language" dialog messages
+SelectLanguageTitle=Trieu idioma
+SelectLanguageLabel=Trieu idioma a emprar durant la instal·lació:
+
+; *** Common wizard text
+ClickNext=Premeu Següent per a continuar o Cancel·la per a abandonar la instal·lació.
+BeveledLabel=
+BrowseDialogTitle=Trieu una carpeta
+BrowseDialogLabel=Trieu la carpeta de destinació i premeu Accepta.
+NewFolderName=Nova carpeta
+
+; *** "Welcome" wizard page
+WelcomeLabel1=Benvingut a l'assistent d'instal·lació de [name]
+WelcomeLabel2=Aquest programa instal·larà [name/ver] al vostre ordinador.%n%nÉs molt recomanable que abans de continuar tanqueu tots els altres programes oberts, per tal d'evitar conflictes durant el procés d'instal·lació.
+
+; *** "Password" wizard page
+WizardPassword=Contrasenya
+PasswordLabel1=Aquesta instal·lació està protegida amb una contrasenya.
+PasswordLabel3=Indiqueu la contrasenya i premeu Següent per a continuar. Aquesta contrasenya distingeix entre majúscules i minúscules.
+PasswordEditLabel=&Contrasenya:
+IncorrectPassword=La contrasenya introduïda no és correcta. Torneu-ho a intentar.
+
+; *** "License Agreement" wizard page
+WizardLicense=Acord de Llicència
+LicenseLabel=Cal que llegiu aquesta informació abans de continuar.
+LicenseLabel3=Cal que llegiu l'Acord de Llicència següent. Cal que n'accepteu els termes abans de continuar amb la instal·lació.
+LicenseAccepted=&Accepto l'acord
+LicenseNotAccepted=&No accepto l'acord
+
+; *** "Information" wizard pages
+WizardInfoBefore=Informació
+InfoBeforeLabel=Llegiu la informació següent abans de continuar.
+InfoBeforeClickLabel=Quan estigueu preparat per a continuar, premeu Següent.
+WizardInfoAfter=Informació
+InfoAfterLabel=Llegiu la informació següent abans de continuar.
+InfoAfterClickLabel=Quan estigueu preparat per a continuar, premeu Següent
+
+; *** "User Information" wizard page
+WizardUserInfo=Informació sobre l'usuari
+UserInfoDesc=Introduïu la vostra informació.
+UserInfoName=&Nom de l'usuari:
+UserInfoOrg=&Organització
+UserInfoSerial=&Número de sèrie:
+UserInfoNameRequired=Cal que hi introduïu un nom
+
+; *** "Select Destination Location" wizard page
+WizardSelectDir=Trieu Carpeta de Destinació
+SelectDirDesc=On s'ha d'instal·lar [name]?
+SelectDirLabel3=El programa d'instal·lació instal·larà [name] a la carpeta següent.
+SelectDirBrowseLabel=Per a continuar, premeu Següent. Si desitgeu triar una altra capeta, premeu Cerca.
+DiskSpaceMBLabel=Aquest programa necessita un mínim de [mb] MB d'espai a disc.
+CannotInstallToNetworkDrive=La instal·lació no es pot fer en un disc de xarxa.
+CannotInstallToUNCPath=La instal·lació no es pot fer a una ruta UNC.
+InvalidPath=Cal donar una ruta completa amb lletra d'unitat, per exemple:%n%nC:\Aplicació%n%no bé una ruta UNC en la forma:%n%n\\servidor\compartit
+InvalidDrive=El disc o ruta de xarxa seleccionat no existeix, trieu-ne un altre.
+DiskSpaceWarningTitle=No hi ha prou espai al disc
+DiskSpaceWarning=El programa d'instal·lació necessita com a mínim %1 KB d'espai lliure, però el disc seleccionat només té %2 KB disponibles.%n%nTot i amb això, desitgeu continuar?
+DirNameTooLong=El nom de la carpeta o de la ruta és massa llarg.
+InvalidDirName=El nom de la carpeta no és vàlid.
+BadDirName32=Un nom de carpeta no pot contenir cap dels caràcters següents:%n%n%1
+DirExistsTitle=La carpeta existeix
+DirExists=La carpeta:%n%n%1%n%nja existeix. Voleu instal·lar igualment el programa en aquesta carpeta?
+DirDoesntExistTitle=La Carpeta No Existeix
+DirDoesntExist=La carpeta:%n%n%1%n%nno existeix. Voleu que sigui creada?
+
+; *** "Select Program Group" wizard page
+WizardSelectComponents=Trieu Components
+SelectComponentsDesc=Quins components cal instal·lar?
+SelectComponentsLabel2=Trieu els components que voleu instal·lar; elimineu els components que no voleu instal·lar. Premeu Següent per a continuar.
+FullInstallation=Instal·lació completa
+; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
+CompactInstallation=Instal·lació compacta
+CustomInstallation=Instal·lació personalitzada
+NoUninstallWarningTitle=Els components Existeixen
+NoUninstallWarning=El programa d'instal·lació ha detectat que els components següents ja es troben al vostre ordinador:%n%n%1%n%nSi no estan seleccionats no seran desinstal·lats.%n%nVoleu continuar igualment?
+ComponentSize1=%1 Kb
+ComponentSize2=%1 Mb
+ComponentsDiskSpaceMBLabel=Aquesta selecció requereix un mínim de [mb] Mb d'espai al disc.
+
+; *** "Select Additional Tasks" wizard page
+WizardSelectTasks=Trieu tasques addicionals
+SelectTasksDesc=Quines tasques addicionals cal executar?
+SelectTasksLabel2=Trieu les tasques addicionals que voleu que siguin executades mentre s'instal·la [name], i després premeu Següent.
+
+; *** "Select Start Menu Folder" wizard page
+WizardSelectProgramGroup=Trieu la carpeta del Menú Inici
+SelectStartMenuFolderDesc=On cal situar els enllaços del programa?
+SelectStartMenuFolderLabel3=El programa d'instal·lació crearà l'accés directe al programa a la següent carpeta del menú d'Inici.
+SelectStartMenuFolderBrowseLabel=Per a continuar, premeu Següent. Si desitgeu triar una altra carpeta, premeu Cerca.
+MustEnterGroupName=Cal que hi introduïu un nom de carpeta.
+GroupNameTooLong=El nom de la carpeta o de la ruta és massa llarg.
+InvalidGroupName=El nom de la carpeta no és vàlid.
+BadGroupName=El nom del grup no pot contenir cap dels caràcters següents:%n%n%1
+NoProgramGroupCheck2=&No creïs una carpeta al Menú Inici
+
+; *** "Ready to Install" wizard page
+WizardReady=Preparat per a instal·lar
+ReadyLabel1=El programa d'instal·lació està preparat per a iniciar la instal·lació de [name] al vostre ordinador.
+ReadyLabel2a=Premeu Instal·la per a continuar amb la instal·lació, o Enrere si voleu revisar o modificar les opcions d'instal·lació.
+ReadyLabel2b=Premeu Instal·la per a continuar amb la instal·lació.
+ReadyMemoUserInfo=Informació de l'usuari:
+ReadyMemoDir=Carpeta de destinació:
+ReadyMemoType=Tipus d'instal·lació:
+ReadyMemoComponents=Components seleccionats:
+ReadyMemoGroup=Carpeta del Menú Inici:
+ReadyMemoTasks=Tasques addicionals:
+
+; *** "Preparing to Install" wizard page
+WizardPreparing=Preparant la instal·lació
+PreparingDesc=Preparant la instal·lació de [name] al vostre ordinador.
+PreviousInstallNotCompleted=La instal·lació o desinstal·lació anterior no s'ha dut a terme. Caldrà que reinicieu l'ordinador per a finalitzar aquesta instal·lació.%n%nDesprés de reiniciar l'ordinador, executeu aquest programa de nou per completar la instal·lació de [name].
+CannotContinue=La instal·lació no pot continuar. Premeu Cancel·la per a sortir.
+ApplicationsFound=Les següents aplicacions estan fent servir fitxers que necessiten ser actualitzats per la instal·lació. Es recomana que permeteu a la instal·lació tancar automàticament aquestes aplicacions.
+ApplicationsFound2=Les següents aplicacions estan fent servir fitxers que necessiten ser actualitzats per la instal·lació. Es recomana que permeteu a la instal·lació tancar automàticament aquestes aplicacions. Després de completar la instal·lació s'intentarà reiniciar les aplicacions.
+CloseApplications=&Tanca automàticament les aplicacions
+DontCloseApplications=&No tanquis les aplicacions
+ErrorCloseApplications=El programa d'instal·lació no ha pogut tancar automàticament totes les aplicacions. Es recomana que abans de continuar tanqueu totes les aplicacions que estan usant fitxers que han de ser actualitzats pel programa d'instal·lació.
+
+; *** "Installing" wizard page
+WizardInstalling=Instal·lant
+InstallingLabel=Espereu mentre s'instal·la [name] al vostre ordinador.
+
+; *** "Setup Completed" wizard page
+FinishedHeadingLabel=Completant l'assistent d'instal·lació de [name]
+FinishedLabelNoIcons=El programa ha finalitzat la instal·lació de [name] al vostre ordinador.
+FinishedLabel=El programa ha finalitzat la instal·lació de [name] al vostre ordinador. L'aplicació pot ser iniciada seleccionant les icones instal·lades.
+ClickFinish=Premeu Finalitza per a sortir de la instal·lació.
+FinishedRestartLabel=Per a completar la instal·lació de [name] cal reiniciar l'ordinador. Voleu fer-ho ara?
+FinishedRestartMessage=Per a completar la instal·lació de [name] cal reiniciar l'ordinador. Voleu fer-ho ara?
+ShowReadmeCheck=Sí, vull visualitzar el fitxer LLEGIUME.TXT
+YesRadio=&Sí, reiniciar l'ordinador ara
+NoRadio=&No, reiniciaré l'ordinador més tard
+; used for example as 'Run MyProg.exe'
+RunEntryExec=Executa %1
+; used for example as 'View Readme.txt'
+RunEntryShellExec=Visualitza %1
+
+; *** "Setup Needs the Next Disk" stuff
+ChangeDiskTitle=El programa d'instal·lació necessita el disc següent
+SelectDiskLabel2=Introduiu el disc %1 i premeu Continua.%n%nSi els fitxers d'aquest disc es poden trobar en una carpeta diferent de la indicada tot seguit, introduïu-ne la ruta correcta o bé premeu Explora.
+PathLabel=&Ruta:
+FileNotInDir2=El fitxer "%1" no s'ha pogut trobar a "%2". Introduïu el disc correcte o trieu una altra carpeta.
+SelectDirectoryLabel=Indiqueu on es troba el disc següent.
+
+; *** Installation phase messages
+SetupAborted=La instal·lació no s'ha completat.%n%n%Resoleu el problema i executeu de nou el programa d'instal·lació.
+EntryAbortRetryIgnore=Premeu Reintenta per a intentar-ho de nou, Ignora per a continuar igualment, o Abandona per a abandonar la instal·lació.
+
+; *** Installation status messages
+StatusClosingApplications=Tancant aplicacions...
+StatusCreateDirs=Creant carpetes...
+StatusExtractFiles=Extraient fitxers...
+StatusCreateIcons=Creant enllaços del programa...
+StatusCreateIniEntries=Creant entrades al fitxer INI...
+StatusCreateRegistryEntries=Creant entrades de registre...
+StatusRegisterFiles=Registrant fitxers...
+StatusSavingUninstall=Desant informació de desinstal·lació...
+StatusRunProgram=Finalitzant la instal·lació...
+StatusRestartingApplications=Reiniciant aplicacions...
+StatusRollback=Desfent els canvis...
+
+; *** Misc. errors
+ErrorInternal2=Error intern: %1
+ErrorFunctionFailedNoCode=%1 ha fallat
+ErrorFunctionFailed=%1 ha fallat; codi %2
+ErrorFunctionFailedWithMessage=%1 ha fallat; codi %2.%n%3
+ErrorExecutingProgram=No es pot executar el fitxer:%n%1
+
+; *** Registry errors
+ErrorRegOpenKey=Error en obrir la clau de registre:%n%1\%2
+ErrorRegCreateKey=Error en crear la clau de registre:%n%1\%2
+ErrorRegWriteKey=Error en escriure a la clau de registre:%n%1\%2
+
+; *** INI errors
+ErrorIniEntry=Error en crear l'entrada INI al fitxer "%1".
+
+; *** File copying errors
+FileAbortRetryIgnore=Premeu Reintenta per a intentar-ho de nou, Ignora per a saltar-se aquest fitxer (no recomanat), o Abandona per a abandonar la instal·lació.
+FileAbortRetryIgnore2=Premeu Reintenta per a intentar-ho de nou, Ignora per a continuar igualment (no recomanat), o Abandona per a abandonar la instal·lació.
+SourceIsCorrupted=El fitxer d'origen està corromput
+SourceDoesntExist=El fitxer d'origen "%1" no existeix
+ExistingFileReadOnly=El fitxer és de només lectura.%n%nPremeu Reintenta per a treure-li l'atribut de només lectura i tornar-ho a intentar, Ignora per a saltar-se'l (no recomanat), o Abandona per a abandonar la instal·lació.
+ErrorReadingExistingDest=S'ha produït un error en llegir el fitxer:
+FileExists=El fitxer ja existeix.%n%nVoleu que sigui sobre-escrit?
+ExistingFileNewer=El fitxer existent és més nou que el que s'intenta instal·lar. Es recomana mantenir el fitxer existent.%n%nVoleu mantenir-lo?
+ErrorChangingAttr=Hi ha hagut un error en canviar els atributs del fitxer:
+ErrorCreatingTemp=Hi ha hagut un error en crear un fitxer a la carpeta de destinació:
+ErrorReadingSource=Hi ha hagut un error en llegir el fitxer d'origen:
+ErrorCopying=Hi ha hagut un error en copiar un fitxer:
+ErrorReplacingExistingFile=Hi ha hagut un error en reemplaçar el fitxer existent:
+ErrorRestartReplace=Ha fallat reemplaçar:
+ErrorRenamingTemp=Hi ha hagut un error en reanomenar un fitxer a la carpeta de destinació:
+ErrorRegisterServer=No s'ha pogut registrar el DLL/OCX: %1
+ErrorRegSvr32Failed=Ha fallat RegSvr32 amb el codi de sortida %1
+ErrorRegisterTypeLib=No s'ha pogut registrar la biblioteca de tipus: %1
+
+; *** Post-installation errors
+ErrorOpeningReadme=Hi ha hagut un error en obrir el fitxer LLEGIUME.TXT.
+ErrorRestartingComputer=El programa d'instal·lació no ha pogut reiniciar l'ordinador. Cal que ho feu manualment.
+
+; *** Uninstaller messages
+UninstallNotFound=El fitxer "%1" no existeix. No es pot desinstal·lar.
+UninstallOpenError=El fitxer "%1" no pot ser obert. No es pot desinstal·lar
+UninstallUnsupportedVer=El fitxer de desinstal·lació "%1" està en un format no reconegut per aquesta versió del desinstal·lador. No es pot desinstal·lar
+UninstallUnknownEntry=S'ha trobat una entrada desconeguda (%1) al fitxer de desinstal·lació.
+ConfirmUninstall=Esteu segur de voler eliminar completament %1 i tots els seus components?
+UninstallOnlyOnWin64=Aquest programa només pot ser desinstal·lat en Windows de 64 bits.
+OnlyAdminCanUninstall=Aquest programa només pot ser desinstal·lat per un usuari amb privilegis d'administrador.
+UninstallStatusLabel=Espereu mentre s'elimina %1 del vostre ordinador.
+UninstalledAll=%1 ha estat desinstal·lat correctament del vostre ordinador.
+UninstalledMost=Desinstal·lació de %1 completada.%n%nAlguns elements no s'han pogut eliminar. Poden ser eliminats manualment.
+UninstalledAndNeedsRestart=Per completar la instal·lació de %1, cal reiniciar el vostre ordinador.%n%nVoleu fer-ho ara?
+UninstallDataCorrupted=El fitxer "%1" està corromput. No es pot desinstal·lar.
+
+; *** Uninstallation phase messages
+ConfirmDeleteSharedFileTitle=Eliminar fitxer compartit?
+ConfirmDeleteSharedFile2=El sistema indica que el fitxer compartit següent ja no és emprat per cap altre programa. Voleu que la desinstal·lació elimini aquest fitxer?%n%nSi algun programa encara el fa servir i és eliminat, podria no funcionar correctament. Si no n'esteu segur, trieu No. Deixar el fitxer al sistema no farà cap mal.
+SharedFileNameLabel=Nom del fitxer:
+SharedFileLocationLabel=Localització:
+WizardUninstalling=Estat de la desinstal·lació
+StatusUninstalling=Desinstal·lant %1...
+
+; *** Shutdown block reasons
+ShutdownBlockReasonInstallingApp=Instal·lant %1.
+ShutdownBlockReasonUninstallingApp=Desinstal·lant %1.
+
+; The custom messages below aren't used by Setup itself, but if you make
+; use of them in your scripts, you'll want to translate them.
+
+[CustomMessages]
+
+NameAndVersion=%1 versió %2
+AdditionalIcons=Icones addicionals:
+CreateDesktopIcon=Crea una icona a l'&Escriptori
+CreateQuickLaunchIcon=Crea una icona a la &Barra de tasques
+ProgramOnTheWeb=%1 a Internet
+UninstallProgram=Desinstal·la %1
+LaunchProgram=Obre %1
+AssocFileExtension=&Associa %1 amb l'extensió de fitxer %2
+AssocingFileExtension=Associant %1 amb l'extensió de fitxer %2...
+AutoStartProgramGroupDescription=Inici:
+AutoStartProgram=Inicia automàticament %1
+AddonHostProgramNotFound=%1 no ha pogut ser trobat a la carpeta seleccionada.%n%nVoleu continuar igualment?
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index f49ffaf..7ad12c9 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -95,6 +95,7 @@ Source: "@INST_DIR@\share\OpenSP\*"; DestDir: "{app}\share\OpenSP"; Flags: recur
; And all the @PACKAGE@ documentation
Source: "@INST_DIR@\share\doc\@PACKAGE@\README"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
Source: "@INST_DIR@\share\doc\@PACKAGE@\README.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@INST_DIR@\share\doc\@PACKAGE@\README-ca.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
Source: "@INST_DIR@\share\doc\@PACKAGE@\README-de.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
Source: "@INST_DIR@\share\doc\@PACKAGE@\README-fr.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
Source: "@INST_DIR@\share\doc\@PACKAGE@\README-it.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
@@ -505,6 +506,7 @@ end;
[Languages]
Name: "en"; MessagesFile: "compiler:Default.isl"
+Name: "ca"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Catalan.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-ca.win32-bin.txt"
Name: "de"; MessagesFile: "compiler:Languages\German.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-de.win32-bin.txt"
Name: "el"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Greek-4-5.1.11.isl"
Name: "fr"; MessagesFile: "compiler:Languages\French.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-fr.win32-bin.txt"
@@ -559,6 +561,7 @@ IconComment_Uninstall=Uninstall the Finance Manager GnuCash
;; List of Code pages, used in gnucash.cmd
LanguageCodePage=1252
+ca.LanguageCodePage=1252
de.LanguageCodePage=1252
el.LanguageCodePage=1253
fr.LanguageCodePage=1252
@@ -569,6 +572,38 @@ pt_BR.LanguageCodePage=1252
zh_CN.LanguageCodePage=936
zh_TW.LanguageCodePage=950
+;; ;;;;;;;;;;;;;;;;;;;;;
+;; Catalan translation
+
+ca.FullInstall=Instal·lació completa
+ca.CustomInstall=Instal·lació personalitzada
+ca.CreateDesktopIcon=Crear una icona a l'escriptori
+ca.CreateMenuLink=Crear una drecera al menú d'inici
+ca.RunPrg=Executar el GnuCash ara
+ca.AdditionalIcons=Crear les següents icones
+ca.StatusMsgFirewall=Instal·lació de les regles del tallafocs de Windows
+
+ca.MainFiles=Programa GnuCash
+ca.TranslFiles=Traducció catalana
+ca.TemplFiles=Model d'estructura de comptes
+
+ca.IconComment_GnuCash=GnuCash, el gestor de finances OpenSource
+ca.IconName_README=Mostra el LLEGIU-ME del GnuCash
+ca.IconComment_README=Mostra el fitxer LLEGIU-ME
+ca.IconFilename_README=README-ca.win32-bin.txt
+ca.IconName_FAQ=GnuCash FAQ - Preguntes freqüents (en lÃnia, en anglès)
+ca.IconName_Bugzilla=Informar d'un error al GnuCash (en lÃnia, en anglès)
+ca.IconName_InstallFQ=Instal·lar les cotitzacions en lÃnia per al GnuCash
+ca.IconComment_InstallFQ=Instal·leu el mòdul perl necessari Finance-Quote per a la recuperació de preus en lÃnia. Requereix ActivePerl o Strawberry Perl 5.8 o posterior
+ca.IconName_Theme=Selecció del tema GnuCash
+ca.IconName_Uninstall=Desinstal·lar GnuCash
+ca.IconComment_Uninstall=Desinstal·lar el gestor de finances GnuCash
+
+ca.AIWP_Title=S'ha trobat una altra instal·lació
+ca.AIWP_Description=%1 actualment està instal·lat en aquesta computadora
+ca.AIWP_Message=Aquesta instal·lació anterior s'ha d'eliminar abans de continuar.%n%nSi no voleu això, feu clic a »Cancel·la« ara per cancel·lar la instal·lació actual.%n%nFeu clic a »Següent« per eliminar %1 i continuar amb la instal·lació.%n%nNota: Només es retirarà el programa, no les vostres dades financeres.
+
+
;; ;;;;;;;;;;;;;;;;;;;;
;; German translation
diff --git a/inno_setup/gnucash.iss b/inno_setup/gnucash.iss
index 6496f25..e224d56 100644
--- a/inno_setup/gnucash.iss
+++ b/inno_setup/gnucash.iss
@@ -81,6 +81,7 @@ Source: "@DIST_DIR@\share\*"; DestDir: "{app}\share"; Flags: recursesubdirs; Com
; And all the documentation
Source: "@DIST_DIR@\share\doc\@PACKAGE@\README"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
Source: "@DIST_DIR@\share\doc\@PACKAGE@\README.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@DIST_DIR@\share\doc\@PACKAGE@\README-ca.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
Source: "@DIST_DIR@\share\doc\@PACKAGE@\README-de.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
Source: "@DIST_DIR@\share\doc\@PACKAGE@\README-fr.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
Source: "@DIST_DIR@\share\doc\@PACKAGE@\README-it.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
@@ -395,6 +396,7 @@ end;
[Languages]
Name: "en"; MessagesFile: "compiler:Default.isl"
+Name: "ca"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Catalan.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-ca.win32-bin.txt"
Name: "de"; MessagesFile: "compiler:Languages\German.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-de.win32-bin.txt"
Name: "el"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Greek-4-5.1.11.isl"
Name: "fr"; MessagesFile: "compiler:Languages\French.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-fr.win32-bin.txt"
@@ -449,6 +451,7 @@ IconComment_Uninstall=Uninstall the Finance Manager GnuCash
;; List of Code pages, used in gnucash.cmd
LanguageCodePage=1252
+ca.LanguageCodePage=1252
de.LanguageCodePage=1252
el.LanguageCodePage=1253
fr.LanguageCodePage=1252
@@ -459,6 +462,38 @@ pt_BR.LanguageCodePage=1252
zh_CN.LanguageCodePage=936
zh_TW.LanguageCodePage=950
+;; ;;;;;;;;;;;;;;;;;;;;;
+;; Catalan translation
+
+ca.FullInstall=Instal·lació completa
+ca.CustomInstall=Instal·lació personalitzada
+ca.CreateDesktopIcon=Crear una icona a l'escriptori
+ca.CreateMenuLink=Crear una drecera al menú d'inici
+ca.RunPrg=Executar el GnuCash ara
+ca.AdditionalIcons=Crear les següents icones
+ca.StatusMsgFirewall=Instal·lació de les regles del tallafocs de Windows
+
+ca.MainFiles=Programa GnuCash
+ca.TranslFiles=Traducció catalana
+ca.TemplFiles=Model d'estructura de comptes
+
+ca.IconComment_GnuCash=GnuCash, el gestor de finances OpenSource
+ca.IconName_README=Mostra el LLEGIU-ME del GnuCash
+ca.IconComment_README=Mostra el fitxer LLEGIU-ME
+ca.IconFilename_README=README-ca.win32-bin.txt
+ca.IconName_FAQ=GnuCash FAQ - Preguntes freqüents (en lÃnia, en anglès)
+ca.IconName_Bugzilla=Informar d'un error al GnuCash (en lÃnia, en anglès)
+ca.IconName_InstallFQ=Instal·lar les cotitzacions en lÃnia per al GnuCash
+ca.IconComment_InstallFQ=Instal·leu el mòdul perl necessari Finance-Quote per a la recuperació de preus en lÃnia. Requereix ActivePerl o Strawberry Perl 5.8 o posterior
+ca.IconName_Theme=Selecció del tema GnuCash
+ca.IconName_Uninstall=Desinstal·lar GnuCash
+ca.IconComment_Uninstall=Desinstal·lar el gestor de finances GnuCash
+
+ca.AIWP_Title=S'ha trobat una altra instal·lació
+ca.AIWP_Description=%1 actualment està instal·lat en aquesta computadora
+ca.AIWP_Message=Aquesta instal·lació anterior s'ha d'eliminar abans de continuar.%n%nSi no voleu això, feu clic a »Cancel·la« ara per cancel·lar la instal·lació actual.%n%nFeu clic a »Següent« per eliminar %1 i continuar amb la instal·lació.%n%nNota: Només es retirarà el programa, no les vostres dades financeres.
+
+
;; ;;;;;;;;;;;;;;;;;;;;
;; German translation
commit 5e9b7c7ec1fcc5918ea4e5aa833ad52840638fa3
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Sep 25 15:01:09 2017 -0700
Bug 788148 - Online Setup and Actions are missing.
Ensure that AQBanking is built with CMake.
diff --git a/install-impl.sh b/install-impl.sh
index bb40a28..de9fe0c 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1437,6 +1437,7 @@ function inst_gnucash_using_cmake() {
-D CMAKE_PREFIX_PATH=${_GLOBAL_UDIR} \
-D PERL_EXECUTABLE=${_MSYS_UDIR}/bin/perl \
-D CMAKE_MAKE_PROGRAM=${_CMAKE_MAKE_PROGRAM} \
+ -D WITH_AQBANKING=ON \
-D GNC_DBD_DIR=${_LIBDBI_DRIVERS_UDIR}/lib/dbd \
-D HTMLHELP_DIR=${_HH_UDIR} \
-D GIT_EXECUTABLE=${GIT_DIR}/bin/git.exe \
commit 61047be10c05608de032055c0ff052b33b80b08b
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Sep 17 22:01:10 2017 -0700
Add libboost_filesystem-mt to Inno Setup file.
Required by recent gnc-filesystem changes.
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 194bbae..f49ffaf 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -117,6 +117,7 @@ Source: "@MINGW_DIR@\bin\libatk-1.0-0.dll"; DestDir: "{app}\bin"; Components: ma
Source: "@MINGW_DIR@\bin\libboost_locale-mt.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libboost_regex-mt.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libboost_system-mt.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libboost_filesystem-mt.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libboost_thread-mt.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libbz2-1.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libcairo-2.dll"; DestDir: "{app}\bin"; Components: main
commit 3a46e1e6edc51e2a5d7c597b18f545e63105178e
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Sep 17 17:57:54 2017 -0700
Fix up bundling to handle non-git builds.
diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index 710c0ed..d74ecd1 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -49,7 +49,7 @@ Optional. A ssh compatible server specification (which means [user@]hostname:bas
[CmdletBinding()]
Param(
[Parameter(Mandatory=$true)]
- [validatePattern("(master|unstable|release)")][string]$branch,
+ [validatePattern("(master|unstable|releases)")][string]$branch,
[Parameter()] [string]$target_dir,
[Parameter()] [string]$hostname
)
@@ -108,14 +108,13 @@ bash-command -command "jhbuild --no-interact -f $script_unix/jhbuildrc build > >
$new_file = test-path -path $target_dir\$package\$branch\inst\bin\gnucash.exe -NewerThan $time_stamp
if ($new_file) {
#Build the installer
- $is_git = ($branch.CompareTo("master") -or $branch.CompareTo("unstable"))
+ $is_git = ($branch.CompareTo("master") -eq 0) -or ($branch.CompareTo("unstable") -eq 0)
bash-command -command "echo 'Creating GnuCash installer.' > >(tee -a $log_unix)"
$setup_file = & $script_dir\bundle-mingw64.ps1 -root_dir $target_dir -target_dir $target_dir\$package\$branch -package $package -git_build $is_git 2>&1 | Tee-Object -FilePath $log_file -Append
$setup_file = make-unixpath -path $setup_file
+ write-host "Created GnuCash Setup File $setup_file"
}
-write-host "Created GnuCash Setup File $setup_file"
-
$time_stamp = get-date -format "yyyy-MM-dd HH:mm:ss"
bash-command -command "echo Build Ended $time_stamp >> $log_unix"
@@ -123,6 +122,6 @@ bash-command -command "echo Build Ended $time_stamp >> $log_unix"
if ($hostname) {
bash-command -command "scp -p $log_unix $hostname/$log_dir/"
if ($new_file) {
- bash-command -command "scp -p $setup_file $hostname/master"
+ bash-command -command "scp -p $setup_file $hostname/$branch"
}
}
diff --git a/bundle-mingw64.ps1 b/bundle-mingw64.ps1
index 27f280b..046794c 100644
--- a/bundle-mingw64.ps1
+++ b/bundle-mingw64.ps1
@@ -84,8 +84,14 @@ function make-unixpath([string]$path) {
$path -replace "^([A-Z]):", '/$1' -replace "\\", '/'
}
-$gnc_config_h = "$target_dir\build\gnucash-git\common\config.h"
-$gnc_vcsinfo_h = "$target_dir\build\gnucash-git\libgnucash\core-utils\gnc-vcs-info.h"
+if ($git_build) {
+ $gnucash = "gnucash-git"
+}
+else {
+ $gnucash = get-childitem -path $target_dir\build | where-object {$_.Name -match "gnucash-[0-9.]+"} | select-object -last 1
+}
+
+$gnc_config_h = "$target_dir\build\$gnucash\common\config.h"
$major_version = version_item -tag "GNUCASH_MAJOR_VERSION" -path $gnc_config_h
$minor_version = version_item -tag "GNUCASH_MINOR_VERSION" -path $gnc_config_h
@@ -119,12 +125,13 @@ $proc = bash-command("sed < $issue_in > $issue_out \
-e ""s#@GNUCASH_MICRO_VERSION@#$micro_version#g"" \
-e ""s#@GC_WIN_REPOS_DIR@#$script#g"" ")
-$vcs_rev = version_item -tag "GNUCASH_SCM_REV" -path $gnc_vcsinfo_h | %{$_ -replace """", ""}
$date = get-date -format "yyyy-MM-dd"
$setup_result = "$target_dir\gnucash-$package_version-setup.exe"
$final_file = ""
if ($git_build) {
+ $gnc_vcsinfo_h = "$target_dir\build\gnucash-git\libgnucash\core-utils\gnc-vcs-info.h"
+ $vcs_rev = version_item -tag "GNUCASH_SCM_REV" -path $gnc_vcsinfo_h | %{$_ -replace """", ""}
$final_file = "$target_dir\gnucash-$package_version-$date-git-$vcs_rev-setup.exe"
}
else {
@@ -138,8 +145,10 @@ if (test-path -path $setup_result) {
}
& ${env:ProgramFiles(x86)}\inno\iscc /Q $target_dir\gnucash.iss
-if ((test-path -path $setup_result) -and (test-path -path $final_file)) {
+if ($git_build) {
+ if ((test-path -path $setup_result) -and (test-path -path $final_file)) {
remove-item $final_file
+ }
+ rename-item -path $setup_result $final_file
}
-rename-item -path $setup_result $final_file
return $final_file
\ No newline at end of file
diff --git a/gnucash.modules b/gnucash.modules
index f41867e..aa5e7c3 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -341,7 +341,7 @@
<metamodule id="meta-gnucash">
<dependencies>
<dep package="gnucash"/>
- <dep package="gnucash-docs"/>
+ <dep package="gnucash-docs-git"/>
</dependencies>
</metamodule>
commit 378415849d097757eb84345965671930bfebf4f7
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Sep 16 04:44:37 2017 -0700
Force update of gnucash-on-windows.git at the beginning of build_package.
diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index 8093a86..710c0ed 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -90,6 +90,8 @@ $time_stamp = get-date -format "yyyy-MM-dd-HH-mm-ss"
$log_file = "$target_dir\build-$branch-$time_stamp.log"
$log_unix = make-unixpath -path $log_file
$time_stamp = get-date -format "yyyy-MM-dd HH:mm:ss"
+
+bash-command -command "cd $script_unix && git pull"
bash-command -command "echo Build Started $time_stamp > $log_unix"
#copy the file to the download server so that everyone can see we've started
if ($hostname) {
commit fd98e1272247dec3c9963367dea3d0ca16cfcf6f
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Sep 16 04:02:22 2017 -0700
Fix can't find git error in Gnucash Build.
Tell Cmake that it's in .
diff --git a/install-impl.sh b/install-impl.sh
index 0136413..bb40a28 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1439,6 +1439,7 @@ function inst_gnucash_using_cmake() {
-D CMAKE_MAKE_PROGRAM=${_CMAKE_MAKE_PROGRAM} \
-D GNC_DBD_DIR=${_LIBDBI_DRIVERS_UDIR}/lib/dbd \
-D HTMLHELP_DIR=${_HH_UDIR} \
+ -D GIT_EXECUTABLE=${GIT_DIR}/bin/git.exe \
${_REPOS_UDIR}
${_CMAKE_MAKE_PROGRAM} install
qpopd
commit 9c476b3ece8d9362aab189597b7e06cc66706514
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Sep 15 17:06:20 2017 -0700
Fix gnucash-mingw64.iss to ensure that all required items from share are included.
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 5f7c2cf..194bbae 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -65,7 +65,7 @@ Filename: "{app}\bin\guile.cmd"; Flags: runhidden
Source: "@INST_DIR@\bin\*"; DestDir: "{app}\bin"; Flags: recursesubdirs ignoreversion; Components: main
Source: "@INST_DIR@\etc\*"; DestDir: "{app}\etc"; Flags: recursesubdirs; Components: main
Source: "@INST_DIR@\etc\@PACKAGE@\environment"; DestDir: "{app}\etc\@PACKAGE@"; Components: main; AfterInstall: MyAfterInstallEnvironment()
-; Note: The above AfterInstall function will adapt the
+; Note: The above AfterInstall function will adapt the
; environment config file on-the-fly by the Pascal script below.
Source: "@INST_DIR@\lib\*"; DestDir: "{app}\lib"; Flags: recursesubdirs; Components: main
Source: "@INST_DIR@\lib\gnucash\scm\ccache\2.0\*"; DestDir: "{app}\lib\gnucash\scm\ccache\2.0"; Flags: recursesubdirs; Components: main
@@ -75,7 +75,16 @@ Source: "@INST_DIR@\lib\aqbanking\*"; DestDir: "{app}\lib\aqbanking"; Excludes:
Source: "@INST_DIR@\lib\gwenhywfar\*"; DestDir: "{app}\lib\gwenhywfar"; Excludes: "*.dll.a"; Flags: recursesubdirs; Components: main
;; We don't have anything in libexec anymore at the moment
;Source: "@INST_DIR@\libexec\*"; DestDir: "{app}\libexec"; Flags: recursesubdirs; Components: main
-Source: "@INST_DIR@\share\*"; DestDir: "{app}\share"; Flags: recursesubdirs; Components: main
+;; Retrieve all of the share directories for the package and its dependencies
+Source: "@INST_DIR@\share\@PACKAGE@\*"; DestDir: "{app}\share\@PACKAGE@"; Flags: recursesubdirs; Components: main
+Source: "@INST_DIR@\share\aqbanking\*"; DestDir: "{app}\share\aqbanking"; Flags: recursesubdirs; Components: main
+Source: "@INST_DIR@\share\gwenhywfar\*"; DestDir: "{app}\share\gwenhywfar"; Flags: recursesubdirs; Components: main
+Source: "@INST_DIR@\share\chipcard\*"; DestDir: "{app}\share\chipcard"; Flags: recursesubdirs; Components: main
+Source: "@INST_DIR@\share\ktoblzcheck\*"; DestDir: "{app}\share\ktoblzcheck"; Flags: recursesubdirs; Components: main
+Source: "@INST_DIR@\share\guile\*"; DestDir: "{app}\share\guile"; Flags: recursesubdirs; Components: main
+Source: "@INST_DIR@\share\glib-2.0\*"; DestDir: "{app}\share\glib-2.0"; Flags: recursesubdirs; Components: main
+Source: "@INST_DIR@\share\libofx\*"; DestDir: "{app}\share\libofx"; Flags: recursesubdirs; Components: main
+Source: "@INST_DIR@\share\OpenSP\*"; DestDir: "{app}\share\OpenSP"; Flags: recursesubdirs; Components: main
;; The translations
;Source: "@INST_DIR@\share\locale\*"; DestDir: "{app}\share\locale"; Flags: recursesubdirs; Components: translations
@@ -83,7 +92,7 @@ Source: "@INST_DIR@\share\*"; DestDir: "{app}\share"; Flags: recursesubdirs; Com
;; The account templates
;Source: "@INST_DIR@\share\@PACKAGE@\accounts\*"; DestDir: "{app}\share\@PACKAGE@\accounts"; Flags: recursesubdirs; Components: templates
-; And all the documentation
+; And all the @PACKAGE@ documentation
Source: "@INST_DIR@\share\doc\@PACKAGE@\README"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
Source: "@INST_DIR@\share\doc\@PACKAGE@\README.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
Source: "@INST_DIR@\share\doc\@PACKAGE@\README-de.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
@@ -94,6 +103,7 @@ Source: "@INST_DIR@\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"; DestDir: "{
Source: "@INST_DIR@\share\doc\@PACKAGE@\COPYING"; DestDir: "{app}\doc\@PACKAGE@"; Flags: ignoreversion; Components: main
Source: "@INST_DIR@\share\doc\@PACKAGE@\AUTHORS"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
Source: "@INST_DIR@\share\doc\@PACKAGE@\ChangeLog"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@INST_DIR@\share\doc\@PACKAGE at -docs\*"; DestDir: "{app}\share\@PACKAGE@\help"; Flags: recursesubdirs; Components: main
;;;; The second section retrieves the dependencies that we need from MinGW.
;; Required DLLs
@@ -184,6 +194,10 @@ Source: "@MINGW_DIR@\bin\zlib1.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\share\icons\*"; DestDir: "{app}\share\icons"; Flags: recursesubdirs; Components: main
Source: "@MINGW_DIR@\share\locale\*"; Destdir: "{app}\share\locale"; Flags: recursesubdirs; Components: main
+Source: "@MINGW_DIR@\share\themes\*"; DestDir: "{app}\share\themes"; Flags: recursesubdirs; Components: main
+Source: "@MINGW_DIR@\share\xml\iso-codes\*"; DestDir: "{app}\share\xml\iso-codes"; Flags: recursesubdirs; Components: main
+Source: "@MINGW_DIR@\share\xml\fontconfig\*"; DestDir: "{app}\share\xml\fontconfig"; Flags: recursesubdirs; Components: main
+
Source: "@MINGW_DIR@\etc\gtk-2.0\*"; Destdir: "{app}\etc\gtk-2.0"; Flags: recursesubdirs; Components: main
Source: "@MINGW_DIR@\etc\gtk-3.0\*"; Destdir: "{app}\etc\gtk-3.0"; Flags: recursesubdirs; Components: main
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
commit c636052b3ba6ebbb1f1ef1c2b11ef2a7f63906b9
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Sep 15 17:05:17 2017 -0700
Change make and install targets on gnucash-docs for Windows.
diff --git a/gnucash.modules b/gnucash.modules
index eb87441..f41867e 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -316,7 +316,7 @@
<autotools id="gnucash-docs-git" autogenargs="--disable-scrollkeeper"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
- makeargs=" html" makeinstallargs="install-html" >
+ makeargs="chm" makeinstallargs="install-chm" >
<branch repo="github" module="Gnucash/gnucash-docs.git" revision="master"
checkoutdir="gnucash-docs-git"/>
<dependencies>
@@ -326,7 +326,7 @@
<autotools id="gnucash-docs" autogenargs="--disable-scrollkeeper"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
- makeargs=" html" makeinstallargs="install-html" >
+ makeargs="chm" makeinstallargs="install-chm" >
<branch module="gnucash/gnucash-docs/gnucash-docs-2.7.0.tar.gz"
version="2.7.0" repo="sourceforge"/>
</autotools>
commit 8df2983a0ffa20381ae09226a1484f67e964d7d6
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Sep 11 16:24:29 2017 -0700
Use the final file name from bundle-mingw64.ps1 for the upload file operation.
diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index f3f5522..8093a86 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -108,8 +108,12 @@ if ($new_file) {
#Build the installer
$is_git = ($branch.CompareTo("master") -or $branch.CompareTo("unstable"))
bash-command -command "echo 'Creating GnuCash installer.' > >(tee -a $log_unix)"
- & $script_dir\bundle-mingw64.ps1 -root_dir $target_dir -target_dir $target_dir\$package\$branch -package $package -git_build $is_git 2>&1 | Tee-Object -FilePath $log_file -Append
+ $setup_file = & $script_dir\bundle-mingw64.ps1 -root_dir $target_dir -target_dir $target_dir\$package\$branch -package $package -git_build $is_git 2>&1 | Tee-Object -FilePath $log_file -Append
+ $setup_file = make-unixpath -path $setup_file
}
+
+write-host "Created GnuCash Setup File $setup_file"
+
$time_stamp = get-date -format "yyyy-MM-dd HH:mm:ss"
bash-command -command "echo Build Ended $time_stamp >> $log_unix"
@@ -117,6 +121,6 @@ bash-command -command "echo Build Ended $time_stamp >> $log_unix"
if ($hostname) {
bash-command -command "scp -p $log_unix $hostname/$log_dir/"
if ($new_file) {
- bash-command -command "scp -p $target_unix/gnucash*setup.exe $hostname/master"
+ bash-command -command "scp -p $setup_file $hostname/master"
}
}
diff --git a/bundle-mingw64.ps1 b/bundle-mingw64.ps1
index b4d77e1..27f280b 100644
--- a/bundle-mingw64.ps1
+++ b/bundle-mingw64.ps1
@@ -142,3 +142,4 @@ if ((test-path -path $setup_result) -and (test-path -path $final_file)) {
remove-item $final_file
}
rename-item -path $setup_result $final_file
+return $final_file
\ No newline at end of file
commit dade554a045281ae6f4cefb7feab84e33cbc2180
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Sep 10 15:36:26 2017 -0700
Commit updates to jhbuildrc.in for multiple branch usage.
diff --git a/jhbuildrc.in b/jhbuildrc.in
index 384a2eb..f7973aa 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -34,47 +34,49 @@ _basedir = "@-BASE_DIR-@"
_download_dir = "@-DOWNLOAD_DIR-@"
_arch = "@-ARCH-@"
if os.environ.has_key('TARGET'):
- (project, branch) = os.environ['TARGET'].split('-')
- _basedir = os.path.join(_basedir, project)
+ (_project, _branch) = os.environ['TARGET'].split('-')
else:
- branch = 'master'
-
+ _project = 'gnucash'
+ _branch = 'master'
+_projectdir = os.path.join(_basedir, _project, _branch)
_config_dir = os.path.dirname(os.path.realpath(__file__))
-prefix = os.path.join(_basedir, 'inst')
-checkoutroot = os.path.join(_basedir, 'src')
-buildroot = os.path.join(_basedir, 'build')
+prefix = os.path.join(_projectdir, 'inst')
+checkoutroot = os.path.join(_projectdir, 'src')
+buildroot = os.path.join(_projectdir, 'build')
tarballdir = os.path.join(_download_dir)
moduleset = os.path.join(_config_dir, 'gnucash.modules')
-_mingw_includes = os.path.join(_basedir, 'msys2', $_arch, 'include')
-_mingw_libs = os.path.join(_basedir, 'msys2', $_arch, 'lib')
+_mingw_includes = os.path.join(_basedir, 'msys2', _arch, 'include')
+_mingw_libs = os.path.join(_basedir, 'msys2', _arch, 'lib')
_usr_include = os.path.join('/usr', 'include')
_usr_lib = os.path.join('/usr', 'lib')
environ_append('CPPFLAGS', '-I%s -I%s' % (_mingw_includes, _usr_include))
environ_append('LDFLAGS', '-L%s -L%s' % (_mingw_libs, _usr_lib))
add_to_path_var('PKG_CONFIG_PATH', os.path.join(_mingw_libs, 'pkgconfig'))
-add_to_path_var('PATH', os.path.join(_basedir, 'msys2', $_arch, 'bin'))
+add_to_path_var('PATH', os.path.join(_basedir, 'msys2', _arch, 'bin'))
os.environ['SRCROOT'] = checkoutroot
os.environ['PREFIX'] = prefix
os.environ['MSYS2ROOT'] = os.path.join(_basedir, 'msys2')
#os.environ['GUILE_LOAD_PATH'] = os.path.join(prefix, 'share', 'guile', '2.0')
#os.environ['GUILE_LOAD_BINARY_PATH'] = os.path.join(prefix, 'lib', 'guile', '2.0', 'ccache')
-if ($_arch == 'mingw32':
+if _arch == 'mingw32':
autogenargs = "--build=i686-w64-mingw32"
else:
autogenargs = "--build=x86_64-w64-mingw64"
#autogenargs = 'CPPFLAGS="-I%s"' % _sys_includes
-if $branch in ('master', 'unstable'):
- modules = ["meta-gnucash"]
- branches['gnucash'] = (None, $branch)
+if _branch in ('master', 'unstable'):
+ modules = ["meta-gnucash-git"]
+ branches['gnucash-git'] = (None, _branch)
else:
modules = ["meta-gnucash"]
append_autogenargs("libofx", "--with-opensp-includes=" + prefix + "/include/OpenSP --with-opensp-libs=" + prefix + "/lib")
append_autogenargs("libdbi-drivers","--with-dbi-incdir=" + prefix + "/include --with-dbi-libdir=" + prefix + "/lib")
-module_makeargs["aqbanking"]="-j1"
+module_makeargs["aqbanking"]="-j 1"
+module_makeargs["gnucash"]="-j 1"
+module_makeargs["gnucash-git"]="-j 1"
module_extra_env["gwenhywfar"]={'CPPFLAGS':_popen('pkg-config --cflags gtk+-2.0'), 'LDFLAGS':_popen('pkg-config --libs gtk+-2.0')}
module_extra_env["gnucash"]={'ACLOCAL_FLAGS':'-I' + os.path.join('/mingw32', 'share', 'aclocal')}
commit 69df1e6b91b19b3de283d6ee80e42c0ed609ae76
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Sep 10 15:14:28 2017 -0700
Separate the root and target directories passed to bundle-mingw64.ps1
diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index c120c81..f3f5522 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -108,7 +108,7 @@ if ($new_file) {
#Build the installer
$is_git = ($branch.CompareTo("master") -or $branch.CompareTo("unstable"))
bash-command -command "echo 'Creating GnuCash installer.' > >(tee -a $log_unix)"
- & $script_dir\bundle-mingw64.ps1 -target_dir $target_dir\$package\$branch -git_build $is_git 2>&1 | Tee-Object -FilePath $log_file -Append
+ & $script_dir\bundle-mingw64.ps1 -root_dir $target_dir -target_dir $target_dir\$package\$branch -package $package -git_build $is_git 2>&1 | Tee-Object -FilePath $log_file -Append
}
$time_stamp = get-date -format "yyyy-MM-dd HH:mm:ss"
bash-command -command "echo Build Ended $time_stamp >> $log_unix"
diff --git a/bundle-mingw64.ps1 b/bundle-mingw64.ps1
index 169916a..b4d77e1 100644
--- a/bundle-mingw64.ps1
+++ b/bundle-mingw64.ps1
@@ -40,16 +40,13 @@ Optional. The root path to the build environment. Defaults to the root of the sc
[CmdletBinding()]
Param(
- [Parameter()] [string]$target_dir,
- [Parameter()] [bool]$git_build
+ [Parameter(Mandatory=$true)] [string]$root_dir,
+ [Parameter(Mandatory=$true)] [string]$target_dir,
+ [Parameter(Mandatory=$true)] [string]$package,
+ [Parameter(Mandatory=$true)] [bool]$git_build
)
$script_dir = Split-Path $script:MyInvocation.MyCommand.Path
-$root_dir = Split-Path $script_dir | Split-Path
-$package = "gnucash"
-if (!$target_dir) {
- $target_dir = $root_dir
-}
$progressPreference = 'silentlyContinue'
@@ -75,12 +72,12 @@ function version_item([string]$tag, [string]$path) {
function bash-command() {
param ([string]$command = "")
- if (!(test-path -path $target_dir\msys2\usr\bin\bash.exe)) {
+ if (!(test-path -path $root_dir\msys2\usr\bin\bash.exe)) {
write-host "Shell program not found, aborting."
- return
+ exit
}
#write-host "Running bash command ""$command"""
- Start-Process -FilePath "$target_dir\msys2\usr\bin\bash.exe" -ArgumentList "-c ""export PATH=/usr/bin; $command""" -NoNewWindow -Wait
+ Start-Process -FilePath "$root_dir\msys2\usr\bin\bash.exe" -ArgumentList "-c ""export PATH=/usr/bin; $command""" -NoNewWindow -Wait
}
function make-unixpath([string]$path) {
@@ -105,13 +102,13 @@ $gwen_dir = version_item -tag "SO_EFFECTIVE " -path "$inst_dir\include\gwenhywfa
# of backslashes is due to bash and sed eating them. It results in a
# single backslash in the output file. Inno Setup doesn't understand
# forward slashes as path delimiters.
-
+$root = %{$root_dir -replace "\\", "\\\\\\\\"}
$target = %{$target_dir -replace "\\", "\\\\\\\\"}
$script = %{$script_dir -replace "\\", "\\\\\\\\"}
$issue_in = make-unixpath -path $script_dir\inno_setup\gnucash-mingw64.iss
$issue_out = make-unixpath -path $target_dir\gnucash.iss
$proc = bash-command("sed < $issue_in > $issue_out \
- -e ""s#@MINGW_DIR@#$target\\\\\\\\msys2\\\\\\\\mingw$mingw_ver#g"" \
+ -e ""s#@MINGW_DIR@#$root\\\\\\\\msys2\\\\\\\\mingw$mingw_ver#g"" \
-e ""s#@INST_DIR@#$target\\\\\\\\inst#g"" \
-e ""s#@-gwenhywfar_so_effective-@#$gwen_ver#g"" \
-e ""s#@-aqbanking_so_effective-@#$aqb_Dir#g"" \
commit 928d26e966b5c99e0aaaef4b5d9c3f496d397fea
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Sep 10 12:39:42 2017 -0700
Rename the log files to indicate branch, matching the old scheme.
diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index 196b30e..c120c81 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -87,7 +87,7 @@ $log_dir = "build-logs"
#Make sure that there's no running transcript, then start one:
$time_stamp = get-date -format "yyyy-MM-dd-HH-mm-ss"
-$log_file = "$target_dir\gnucash-build-log-$time_stamp.log"
+$log_file = "$target_dir\build-$branch-$time_stamp.log"
$log_unix = make-unixpath -path $log_file
$time_stamp = get-date -format "yyyy-MM-dd HH:mm:ss"
bash-command -command "echo Build Started $time_stamp > $log_unix"
commit 9002a89051f72daa0b777498579526e35f8d61b9
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Sep 10 11:01:03 2017 -0700
Make and transmit the setup file only if there's a new gnucash.exe present.
diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index 2d7a86d..196b30e 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -103,14 +103,20 @@ bash-command -command "pacman -Su --noconfirm > >(tee -a $log_unix) 2>&1"
#bash-command -command "cd $script_unix && git reset --hard && git pull --rebase"
# Build the latest GnuCash and all dependencies not installed via mingw64
bash-command -command "jhbuild --no-interact -f $script_unix/jhbuildrc build > >(tee -a $log_unix) 2> >(tee -a $log_unix)"
+$new_file = test-path -path $target_dir\$package\$branch\inst\bin\gnucash.exe -NewerThan $time_stamp
+if ($new_file) {
#Build the installer
-$is_git = ($branch.CompareTo("master") -or $branch.CompareTo("unstable"))
-bash-command -command "echo 'Creating GnuCash installer.' > >(tee -a $log_unix)"
-& $script_dir\bundle-mingw64.ps1 -target_dir $target_dir\$package\$branch -git_build $is_git 2>&1 | Tee-Object -FilePath $log_file -Append
+ $is_git = ($branch.CompareTo("master") -or $branch.CompareTo("unstable"))
+ bash-command -command "echo 'Creating GnuCash installer.' > >(tee -a $log_unix)"
+ & $script_dir\bundle-mingw64.ps1 -target_dir $target_dir\$package\$branch -git_build $is_git 2>&1 | Tee-Object -FilePath $log_file -Append
+}
$time_stamp = get-date -format "yyyy-MM-dd HH:mm:ss"
bash-command -command "echo Build Ended $time_stamp >> $log_unix"
+
# Copy the transcript and installer to the download server and delete them.
if ($hostname) {
- bash-command -command "scp -p $log_unix $hostname/$log_dir/"
- bash-command -command "scp -p $target_unix/gnucash*setup.exe $hostname/master"
+ bash-command -command "scp -p $log_unix $hostname/$log_dir/"
+ if ($new_file) {
+ bash-command -command "scp -p $target_unix/gnucash*setup.exe $hostname/master"
+ }
}
commit 22433a06ae4295555cd1b313666754ba2840e4d8
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Sep 10 10:44:19 2017 -0700
Setup builds for master, unstable, and release packages.
The first two being git branches, the last builds GnuCash from a tarball.
diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index 108f157..2d7a86d 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -48,6 +48,8 @@ Optional. A ssh compatible server specification (which means [user@]hostname:bas
[CmdletBinding()]
Param(
+ [Parameter(Mandatory=$true)]
+ [validatePattern("(master|unstable|release)")][string]$branch,
[Parameter()] [string]$target_dir,
[Parameter()] [string]$hostname
)
@@ -62,6 +64,8 @@ if (!$target_dir) {
$progressPreference = 'silentlyContinue'
$env:MSYSTEM = 'MINGW32'
$env:TERM = 'dumb' #Prevent escape codes in the log.
+$env:TARGET = "$package-$branch"
+
function bash-command() {
param ([string]$command = "")
if (!(test-path -path $target_dir\msys2\usr\bin\bash.exe)) {
@@ -98,9 +102,11 @@ bash-command -command "pacman -Su --noconfirm > >(tee -a $log_unix) 2>&1"
# Update the gnucash-on-windows repository
#bash-command -command "cd $script_unix && git reset --hard && git pull --rebase"
# Build the latest GnuCash and all dependencies not installed via mingw64
-bash-command -command "jhbuild --no-interact -f $script_unix/jhbuildrc build gnucash > >(tee -a $log_unix) 2>&1"
+bash-command -command "jhbuild --no-interact -f $script_unix/jhbuildrc build > >(tee -a $log_unix) 2> >(tee -a $log_unix)"
#Build the installer
-& $script_dir\bundle-mingw64.ps1 -target_dir $target_dir 2>&1 | Out-File -FilePath $log_file -Append -Encoding UTF8
+$is_git = ($branch.CompareTo("master") -or $branch.CompareTo("unstable"))
+bash-command -command "echo 'Creating GnuCash installer.' > >(tee -a $log_unix)"
+& $script_dir\bundle-mingw64.ps1 -target_dir $target_dir\$package\$branch -git_build $is_git 2>&1 | Tee-Object -FilePath $log_file -Append
$time_stamp = get-date -format "yyyy-MM-dd HH:mm:ss"
bash-command -command "echo Build Ended $time_stamp >> $log_unix"
# Copy the transcript and installer to the download server and delete them.
diff --git a/bundle-mingw64.ps1 b/bundle-mingw64.ps1
index 2cb3830..169916a 100644
--- a/bundle-mingw64.ps1
+++ b/bundle-mingw64.ps1
@@ -39,7 +39,10 @@ Optional. The root path to the build environment. Defaults to the root of the sc
#>
[CmdletBinding()]
-Param([Parameter()] [string]$target_dir)
+Param(
+ [Parameter()] [string]$target_dir,
+ [Parameter()] [bool]$git_build
+)
$script_dir = Split-Path $script:MyInvocation.MyCommand.Path
$root_dir = Split-Path $script_dir | Split-Path
@@ -123,7 +126,16 @@ $vcs_rev = version_item -tag "GNUCASH_SCM_REV" -path $gnc_vcsinfo_h | %{$_ -repl
$date = get-date -format "yyyy-MM-dd"
$setup_result = "$target_dir\gnucash-$package_version-setup.exe"
-$final_file = "$target_dir\gnucash-$package_version-$date-git-$vcs_rev-setup.exe"
+$final_file = ""
+if ($git_build) {
+ $final_file = "$target_dir\gnucash-$package_version-$date-git-$vcs_rev-setup.exe"
+ }
+else {
+ $final_file = "$target_dir\gnucash-$package_version-setup.exe"
+}
+
+write-host "Running Inno Setup to create $final_file."
+
if (test-path -path $setup_result) {
remove-item -path $setup_result
}
diff --git a/gnucash.modules b/gnucash.modules
index 2708be2..eb87441 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -278,12 +278,27 @@
<branch module="google/googletest" repo="github" tag="release-1.8.0"/>
</cmake>
- <!--autotools id="gnucash"
- autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure -\-prefix %(prefix)s %(autogenargs)s"
- autogenargs="-\-enable-ofx -\-enable-aqbanking -\-enable-binreloc -\-enable-dbi -\-with-dbi-dbd-dir=$PREFIX/lib/dbd"-->
<cmake id="gnucash"
cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock"
use-ninja="False">
+ <branch repo="sourceforge" module="gnucash/unstable/gnucash-2.7.0.tar.bz2"
+ version="2.7.0"/>
+ <dependencies>
+ <dep package="libofx"/>
+ <dep package="aqbanking"/>
+ <dep package="libdbi-drivers"/>
+ <!--dep package="shared-mime-info"/-->
+ <!--dep package="iso-codes"/-->
+ <dep package="guile2"/>
+ <!--dep package="swig"/-->
+ <dep package="boost"/>
+ <dep package="googletest"/>
+ </dependencies>
+ </cmake>
+
+ <cmake id="gnucash-git"
+ cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock"
+ use-ninja="False">
<branch repo="github" module="Gnucash/gnucash.git" revision="master"
checkoutdir="gnucash-git"/>
<dependencies>
@@ -297,7 +312,6 @@
<dep package="boost"/>
<dep package="googletest"/>
</dependencies>
- <!--/autotools-->
</cmake>
<autotools id="gnucash-docs-git" autogenargs="--disable-scrollkeeper"
@@ -313,10 +327,17 @@
<autotools id="gnucash-docs" autogenargs="--disable-scrollkeeper"
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
makeargs=" html" makeinstallargs="install-html" >
- <branch module="gnucash/gnucash-docs/gnucash-docs-2.6.16.tar.gz"
- version="2.6.16" repo="sourceforge"/>
+ <branch module="gnucash/gnucash-docs/gnucash-docs-2.7.0.tar.gz"
+ version="2.7.0" repo="sourceforge"/>
</autotools>
+ <metamodule id="meta-gnucash-git">
+ <dependencies>
+ <dep package="gnucash-git"/>
+ <dep package="gnucash-docs-git"/>
+ </dependencies>
+ </metamodule>
+
<metamodule id="meta-gnucash">
<dependencies>
<dep package="gnucash"/>
diff --git a/jhbuildrc.in b/jhbuildrc.in
index bde6c6b..384a2eb 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -33,6 +33,11 @@ def add_to_path_var(var, path):
_basedir = "@-BASE_DIR-@"
_download_dir = "@-DOWNLOAD_DIR-@"
_arch = "@-ARCH-@"
+if os.environ.has_key('TARGET'):
+ (project, branch) = os.environ['TARGET'].split('-')
+ _basedir = os.path.join(_basedir, project)
+else:
+ branch = 'master'
_config_dir = os.path.dirname(os.path.realpath(__file__))
prefix = os.path.join(_basedir, 'inst')
@@ -40,7 +45,6 @@ checkoutroot = os.path.join(_basedir, 'src')
buildroot = os.path.join(_basedir, 'build')
tarballdir = os.path.join(_download_dir)
moduleset = os.path.join(_config_dir, 'gnucash.modules')
-modules = ["meta-gnucash"]
_mingw_includes = os.path.join(_basedir, 'msys2', $_arch, 'include')
_mingw_libs = os.path.join(_basedir, 'msys2', $_arch, 'lib')
@@ -63,6 +67,11 @@ else:
#autogenargs = 'CPPFLAGS="-I%s"' % _sys_includes
+if $branch in ('master', 'unstable'):
+ modules = ["meta-gnucash"]
+ branches['gnucash'] = (None, $branch)
+else:
+ modules = ["meta-gnucash"]
append_autogenargs("libofx", "--with-opensp-includes=" + prefix + "/include/OpenSP --with-opensp-libs=" + prefix + "/lib")
append_autogenargs("libdbi-drivers","--with-dbi-incdir=" + prefix + "/include --with-dbi-libdir=" + prefix + "/lib")
module_makeargs["aqbanking"]="-j1"
commit 5b3d16839a1c8bbf6b541a838bea9f73a4a2a3c1
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Sep 9 13:01:15 2017 -0700
Fix single architecture bits of jhbuildrc.
diff --git a/jhbuildrc.in b/jhbuildrc.in
index 422c999..bde6c6b 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -32,6 +32,8 @@ def add_to_path_var(var, path):
_basedir = "@-BASE_DIR-@"
_download_dir = "@-DOWNLOAD_DIR-@"
+_arch = "@-ARCH-@"
+
_config_dir = os.path.dirname(os.path.realpath(__file__))
prefix = os.path.join(_basedir, 'inst')
checkoutroot = os.path.join(_basedir, 'src')
@@ -40,21 +42,25 @@ tarballdir = os.path.join(_download_dir)
moduleset = os.path.join(_config_dir, 'gnucash.modules')
modules = ["meta-gnucash"]
-_mingw_includes = os.path.join(_basedir, 'msys2', 'mingw32', 'include')
-_mingw_libs = os.path.join(_basedir, 'msys2', 'mingw32', 'lib')
+_mingw_includes = os.path.join(_basedir, 'msys2', $_arch, 'include')
+_mingw_libs = os.path.join(_basedir, 'msys2', $_arch, 'lib')
_usr_include = os.path.join('/usr', 'include')
_usr_lib = os.path.join('/usr', 'lib')
environ_append('CPPFLAGS', '-I%s -I%s' % (_mingw_includes, _usr_include))
environ_append('LDFLAGS', '-L%s -L%s' % (_mingw_libs, _usr_lib))
add_to_path_var('PKG_CONFIG_PATH', os.path.join(_mingw_libs, 'pkgconfig'))
-add_to_path_var('PATH', os.path.join(_basedir, 'msys2', 'mingw32', 'bin'))
+add_to_path_var('PATH', os.path.join(_basedir, 'msys2', $_arch, 'bin'))
os.environ['SRCROOT'] = checkoutroot
os.environ['PREFIX'] = prefix
os.environ['MSYS2ROOT'] = os.path.join(_basedir, 'msys2')
#os.environ['GUILE_LOAD_PATH'] = os.path.join(prefix, 'share', 'guile', '2.0')
#os.environ['GUILE_LOAD_BINARY_PATH'] = os.path.join(prefix, 'lib', 'guile', '2.0', 'ccache')
-autogenargs = "--build=i686-w64-mingw32"
+if ($_arch == 'mingw32':
+ autogenargs = "--build=i686-w64-mingw32"
+else:
+ autogenargs = "--build=x86_64-w64-mingw64"
+
#autogenargs = 'CPPFLAGS="-I%s"' % _sys_includes
append_autogenargs("libofx", "--with-opensp-includes=" + prefix + "/include/OpenSP --with-opensp-libs=" + prefix + "/lib")
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index ce0ab10..e00764a 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -63,12 +63,14 @@ if ($x86_64) {
$mingw_path = "/mingw64"
$mingw_bin = "/mingw64/bin"
$env:MSYSTEM = "MINGW64"
+ $arch = "mingw64"
}
else {
$mingw_prefix = "mingw32/mingw-w64-i686-"
$mingw_path = "/mingw32"
$mingw_bin = "/mingw32/bin"
$env:MSYSTEM = "MINGW32"
+ $arch = "mingw32"
}
if (!(test-path -path $target_dir)) {
@@ -264,6 +266,7 @@ bash-command -command "/usr/bin/patch -d/ -p0 -i $target_unix/src/gnucash-on-win
$jhbuildrc = get-content "$target_dir\\src\\gnucash-on-windows.git\\jhbuildrc.in" |
%{$_ -replace "@-BASE_DIR-@", "$target_unix"} |
%{$_ -replace "@-DOWNLOAD_DIR-@", "$download_unix"}
+ %{$_ -replace "@-ARCH-@", "$arch"}
[IO.File]::WriteAllLines("$target_dir\\src\\gnucash-on-windows.git\\jhbuildrc", $jhbuildrc)
Write-Host @"
commit 767d75395e11878f84f1a96d89ce03e2e4f6aea6
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Sep 8 16:32:41 2017 -0700
Set xterm to dumb.
So that jhbuild and make don't insert ansi escapes into the build log.
diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index be764a7..108f157 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -61,7 +61,7 @@ if (!$target_dir) {
$progressPreference = 'silentlyContinue'
$env:MSYSTEM = 'MINGW32'
-
+$env:TERM = 'dumb' #Prevent escape codes in the log.
function bash-command() {
param ([string]$command = "")
if (!(test-path -path $target_dir\msys2\usr\bin\bash.exe)) {
commit 8c88c9ffe1e884dfa4e4e460714cd3f260fb73dc
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Sep 8 12:27:06 2017 -0700
Preserve permissions on uploads to code.
Should permit overwrites.
diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index 5613d34..be764a7 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -89,7 +89,7 @@ $time_stamp = get-date -format "yyyy-MM-dd HH:mm:ss"
bash-command -command "echo Build Started $time_stamp > $log_unix"
#copy the file to the download server so that everyone can see we've started
if ($hostname) {
- bash-command -command "scp $log_unix $hostname/$log_dir/"
+ bash-command -command "scp -p $log_unix $hostname/$log_dir/"
}
# Update MinGW-w64
@@ -105,6 +105,6 @@ $time_stamp = get-date -format "yyyy-MM-dd HH:mm:ss"
bash-command -command "echo Build Ended $time_stamp >> $log_unix"
# Copy the transcript and installer to the download server and delete them.
if ($hostname) {
- bash-command -command "scp $log_unix $hostname/$log_dir/"
- bash-command -command "scp $target_unix/gnucash*setup.exe $hostname/master"
+ bash-command -command "scp -p $log_unix $hostname/$log_dir/"
+ bash-command -command "scp -p $target_unix/gnucash*setup.exe $hostname/master"
}
commit e809040888a59531bef4318ea00ad5ddc6f6bb97
Author: Geert Janssens <geert at kobaltwit.be>
Date: Fri Sep 8 19:22:01 2017 +0200
Split 'Build Started/Ended' from time_stamp to prevent that text from being parsed by get-time
Since the difference between start_time and time_stamp now is minimal,
just use the save variable (time_stamp) everywhere.
diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index f028dac..5613d34 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -82,11 +82,11 @@ $target_unix = make-unixpath -path $target_dir
$log_dir = "build-logs"
#Make sure that there's no running transcript, then start one:
-$start_time = get-date -format "yyyy-MM-dd-HH-mm-ss"
-$time_stamp = get-date -format "Build Begun yyyy-MM-dd HH:mm:ss"
-$log_file = "$target_dir\gnucash-build-log-$start_time.log"
+$time_stamp = get-date -format "yyyy-MM-dd-HH-mm-ss"
+$log_file = "$target_dir\gnucash-build-log-$time_stamp.log"
$log_unix = make-unixpath -path $log_file
-bash-command -command "echo $time_stamp > $log_unix"
+$time_stamp = get-date -format "yyyy-MM-dd HH:mm:ss"
+bash-command -command "echo Build Started $time_stamp > $log_unix"
#copy the file to the download server so that everyone can see we've started
if ($hostname) {
bash-command -command "scp $log_unix $hostname/$log_dir/"
@@ -101,8 +101,8 @@ bash-command -command "pacman -Su --noconfirm > >(tee -a $log_unix) 2>&1"
bash-command -command "jhbuild --no-interact -f $script_unix/jhbuildrc build gnucash > >(tee -a $log_unix) 2>&1"
#Build the installer
& $script_dir\bundle-mingw64.ps1 -target_dir $target_dir 2>&1 | Out-File -FilePath $log_file -Append -Encoding UTF8
-$time_stamp = get-date -format "Build Ended yyyy-MM-dd HH:mm:ss"
-bash-command -command "echo $time_stamp >> $log_unix"
+$time_stamp = get-date -format "yyyy-MM-dd HH:mm:ss"
+bash-command -command "echo Build Ended $time_stamp >> $log_unix"
# Copy the transcript and installer to the download server and delete them.
if ($hostname) {
bash-command -command "scp $log_unix $hostname/$log_dir/"
commit 05994d75f96a3b81352133e923f5347f35e62d1e
Author: Geert Janssens <geert at kobaltwit.be>
Date: Fri Sep 8 18:57:14 2017 +0200
Use correct path to log file
diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index c383e4f..f028dac 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -89,7 +89,7 @@ $log_unix = make-unixpath -path $log_file
bash-command -command "echo $time_stamp > $log_unix"
#copy the file to the download server so that everyone can see we've started
if ($hostname) {
- bash-command -command "scp $target_unix/$log_file $hostname/$log_dir/"
+ bash-command -command "scp $log_unix $hostname/$log_dir/"
}
# Update MinGW-w64
commit c9753c3db49baf9d1a9aa808857b25c4a533b123
Author: Geert Janssens <geert at kobaltwit.be>
Date: Fri Sep 8 18:31:55 2017 +0200
Fix typo
diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index b5ce5a8..c383e4f 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -48,7 +48,7 @@ Optional. A ssh compatible server specification (which means [user@]hostname:bas
[CmdletBinding()]
Param(
- [Parameter()] [string]$target_dir
+ [Parameter()] [string]$target_dir,
[Parameter()] [string]$hostname
)
commit 12cae808f4211b91982447b9929a8a9b96afdf69
Author: Geert Janssens <geert at kobaltwit.be>
Date: Fri Sep 8 18:24:40 2017 +0200
Enable uploading based on a command line parameter
diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index 0052351..b5ce5a8 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -40,10 +40,17 @@ Administrator privileges.
Optional. The root path to the build environment. Defaults to the root of the script's path, e.g. if the script's path is C:\gcdev64\src\gnucash-on-windows.git\bundle-mingw64.ps1 the default target_dir will be C:\gcdev64.
+.PARAMETER hostname
+
+Optional. A ssh compatible server specification (which means [user@]hostname:basedirectory) to which the build artifacts will be uploaded. If omitted no upload will be attempted. Note for this to work you must be able to connect to the given hostname.
+
#>
[CmdletBinding()]
-Param([Parameter()] [string]$target_dir)
+Param(
+ [Parameter()] [string]$target_dir
+ [Parameter()] [string]$hostname
+)
$script_dir = Split-Path $script:MyInvocation.MyCommand.Path | Split-Path
$root_dir = Split-Path $script_dir | Split-Path
@@ -71,7 +78,7 @@ function make-unixpath([string]$path) {
$script_unix = make-unixpath -path $script_dir
$target_unix = make-unixpath -path $target_dir
-$hostname = "upload at code.gnucash.org:public_html/win32"
+#$hostname = "upload at code.gnucash.org:public_html/win32"
$log_dir = "build-logs"
#Make sure that there's no running transcript, then start one:
@@ -81,7 +88,9 @@ $log_file = "$target_dir\gnucash-build-log-$start_time.log"
$log_unix = make-unixpath -path $log_file
bash-command -command "echo $time_stamp > $log_unix"
#copy the file to the download server so that everyone can see we've started
-#bash-command -command "scp $target_unix/$log_file $hostname/$log_dir/"
+if ($hostname) {
+ bash-command -command "scp $target_unix/$log_file $hostname/$log_dir/"
+}
# Update MinGW-w64
bash-command -command "pacman -Su --noconfirm > >(tee -a $log_unix) 2>&1"
@@ -95,5 +104,7 @@ bash-command -command "jhbuild --no-interact -f $script_unix/jhbuildrc build gnu
$time_stamp = get-date -format "Build Ended yyyy-MM-dd HH:mm:ss"
bash-command -command "echo $time_stamp >> $log_unix"
# Copy the transcript and installer to the download server and delete them.
-#bash-command "scp $log_unix $hostname/$log_dir/"
-#bash-command "scp $target_unix/gnucash*setup.exe $hostname/master"
\ No newline at end of file
+if ($hostname) {
+ bash-command -command "scp $log_unix $hostname/$log_dir/"
+ bash-command -command "scp $target_unix/gnucash*setup.exe $hostname/master"
+}
commit 024b1e6c944c0a89222a34822db31a3d9b7b2171
Author: John Ralls <jralls at ceridwen.us>
Date: Wed Sep 6 22:15:11 2017 -0700
Redirect build command output to tee instead of directly to file.
So that the build can be monitored from the terminal.
diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index 4c0790d..0052351 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -84,12 +84,12 @@ bash-command -command "echo $time_stamp > $log_unix"
#bash-command -command "scp $target_unix/$log_file $hostname/$log_dir/"
# Update MinGW-w64
-bash-command -command "pacman -Su --noconfirm >> $log_unix 2>&1"
+bash-command -command "pacman -Su --noconfirm > >(tee -a $log_unix) 2>&1"
# Update the gnucash-on-windows repository
#bash-command -command "cd $script_unix && git reset --hard && git pull --rebase"
# Build the latest GnuCash and all dependencies not installed via mingw64
-bash-command -command "jhbuild -f $script_unix/jhbuildrc build gnucash >> $log_unix 2>&1"
+bash-command -command "jhbuild --no-interact -f $script_unix/jhbuildrc build gnucash > >(tee -a $log_unix) 2>&1"
#Build the installer
& $script_dir\bundle-mingw64.ps1 -target_dir $target_dir 2>&1 | Out-File -FilePath $log_file -Append -Encoding UTF8
$time_stamp = get-date -format "Build Ended yyyy-MM-dd HH:mm:ss"
commit fe96d14096bd67cd96bce0d630fa42f255234e25
Author: John Ralls <jralls at ceridwen.us>
Date: Wed Sep 6 22:14:05 2017 -0700
Use 24-hour time in build_package logfile timestamps.
diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index f21482a..4c0790d 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -75,8 +75,8 @@ $hostname = "upload at code.gnucash.org:public_html/win32"
$log_dir = "build-logs"
#Make sure that there's no running transcript, then start one:
-$start_time = get-date -format "yyyy-MM-dd-hh-mm-ss"
-$time_stamp = get-date -format "Build Begun yyyy-MM-dd hh:mm:ss"
+$start_time = get-date -format "yyyy-MM-dd-HH-mm-ss"
+$time_stamp = get-date -format "Build Begun yyyy-MM-dd HH:mm:ss"
$log_file = "$target_dir\gnucash-build-log-$start_time.log"
$log_unix = make-unixpath -path $log_file
bash-command -command "echo $time_stamp > $log_unix"
@@ -92,7 +92,7 @@ bash-command -command "pacman -Su --noconfirm >> $log_unix 2>&1"
bash-command -command "jhbuild -f $script_unix/jhbuildrc build gnucash >> $log_unix 2>&1"
#Build the installer
& $script_dir\bundle-mingw64.ps1 -target_dir $target_dir 2>&1 | Out-File -FilePath $log_file -Append -Encoding UTF8
-$time_stamp = get-date -format "Build Ended yyyy-MM-dd hh:mm:ss"
+$time_stamp = get-date -format "Build Ended yyyy-MM-dd HH:mm:ss"
bash-command -command "echo $time_stamp >> $log_unix"
# Copy the transcript and installer to the download server and delete them.
#bash-command "scp $log_unix $hostname/$log_dir/"
commit 316b07cd9074f3d61ae04e96f02c4a385f78b586
Author: John Ralls <jralls at ceridwen.us>
Date: Wed Sep 6 22:10:21 2017 -0700
Set MSYSTEM=MINGW32 so that Mingw64 bash sets its environment correctly.
diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index c7363ab..f21482a 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -53,6 +53,7 @@ if (!$target_dir) {
}
$progressPreference = 'silentlyContinue'
+$env:MSYSTEM = 'MINGW32'
function bash-command() {
param ([string]$command = "")
@@ -61,7 +62,7 @@ function bash-command() {
return
}
#write-host "Running bash command ""$command"""
- Start-Process -FilePath "$target_dir\msys2\usr\bin\bash.exe" -ArgumentList "-c ""export PATH=/usr/bin; $command""" -NoNewWindow -Wait
+ Start-Process -FilePath "$target_dir\msys2\usr\bin\bash.exe" -ArgumentList "-lc ""$command""" -NoNewWindow -Wait
}
function make-unixpath([string]$path) {
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 265e633..ce0ab10 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -62,11 +62,13 @@ if ($x86_64) {
$mingw_prefix = "mingw64/mingw-w64-x86_64-"
$mingw_path = "/mingw64"
$mingw_bin = "/mingw64/bin"
+ $env:MSYSTEM = "MINGW64"
}
else {
$mingw_prefix = "mingw32/mingw-w64-i686-"
$mingw_path = "/mingw32"
$mingw_bin = "/mingw32/bin"
+ $env:MSYSTEM = "MINGW32"
}
if (!(test-path -path $target_dir)) {
commit b40cb32f90797be2fb0f8a8a814df85b8be9df1c
Author: John Ralls <jralls at ceridwen.us>
Date: Wed Sep 6 11:47:07 2017 -0700
Adjust paths to config.h and gnc-vcs-info.h after rearrangement in gnucash.git.
diff --git a/bundle-mingw64.ps1 b/bundle-mingw64.ps1
index d2bd9e5..2cb3830 100644
--- a/bundle-mingw64.ps1
+++ b/bundle-mingw64.ps1
@@ -84,8 +84,8 @@ function make-unixpath([string]$path) {
$path -replace "^([A-Z]):", '/$1' -replace "\\", '/'
}
-$gnc_config_h = "$target_dir\build\gnucash-git\src\config.h"
-$gnc_vcsinfo_h = "$target_dir\build\gnucash-git\src\core-utils\gnc-vcs-info.h"
+$gnc_config_h = "$target_dir\build\gnucash-git\common\config.h"
+$gnc_vcsinfo_h = "$target_dir\build\gnucash-git\libgnucash\core-utils\gnc-vcs-info.h"
$major_version = version_item -tag "GNUCASH_MAJOR_VERSION" -path $gnc_config_h
$minor_version = version_item -tag "GNUCASH_MINOR_VERSION" -path $gnc_config_h
commit 490f5be0e8ad5fe22743dce40dbee3511de63a2c
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Sep 5 17:52:41 2017 -0700
New jhbuild patch with a bit more finesse.
The install no completes and records in the packagedb.
diff --git a/patches/jhbuild.patch b/patches/jhbuild.patch
index 137b879..542a896 100644
--- a/patches/jhbuild.patch
+++ b/patches/jhbuild.patch
@@ -1,6 +1,6 @@
---- /usr/lib/python2.7/site-packages/jhbuild/modtypes/cmake.py 2017-06-01 12:26:10.000000000 -0700
-+++ /usr/lib/python2.7/site-packages/jhbuild/modtypes/cmake.py 2017-08-31 10:46:42.719250200 -0700
-@@ -159,11 +159,9 @@
+--- /usr/lib/python2.7/site-packages/jhbuild/modtypes/cmake.py~ 2017-09-05 16:58:18.206528300 -0700
++++ /usr/lib/python2.7/site-packages/jhbuild/modtypes/cmake.py 2017-09-05 16:59:24.172738500 -0700
+@@ -159,10 +159,9 @@
if self.use_ninja:
self.ensure_ninja_binary()
extra_env = self.extra_env or {}
@@ -8,21 +8,37 @@
buildscript.execute(self.ninja_binary + ' install', cwd=builddir, extra_env=extra_env)
else:
- self.make(buildscript, 'install DESTDIR={}'.format(destdir))
-- self.process_install(buildscript, self.get_revision())
+ self.make(buildscript, 'install')
+ self.process_install(buildscript, self.get_revision())
do_install.depends = [PHASE_BUILD]
- def xml_tag_and_attrs(self):
---- /usr/lib/python2.7/site-packages/jhbuild/modtypes/autotools.py 2017-06-01 12:26:10.000000000 -0700
-+++ /usr/lib/python2.7/site-packages/jhbuild/modtypes/autotools.py 2017-08-31 11:00:39.148673100 -0700
-@@ -309,9 +309,7 @@
- packagedb.uninstall(self.name)
+--- /usr/lib/python2.7/site-packages/jhbuild/modtypes/__init__.py~ 2017-06-01 12:15:14.000000000 -0700
++++ /usr/lib/python2.7/site-packages/jhbuild/modtypes/__init__.py 2017-09-05 17:44:27.556524900 -0700
+@@ -313,14 +313,16 @@
+ save_broken_tree = False
+ broken_name = destdir + '-broken'
+ destdir_prefix = os.path.join(destdir, stripped_prefix)
+- new_contents = fileutils.accumulate_dirtree_contents(destdir_prefix)
++ new_contents = []
+ errors = []
++ num_copied = 0
+ if os.path.isdir(destdir_prefix):
+ destdir_install = True
+ logging.info(_('Moving temporary DESTDIR %r into build prefix') % (destdir, ))
+ num_copied = self._process_install_files(destdir, destdir_prefix,
+ buildscript.config.prefix,
+ errors)
++ new_contents = fileutils.accumulate_dirtree_contents(destdir_prefix)
- buildscript.set_action(_('Installing'), self)
-- destdir = self.prepare_installroot(buildscript)
-- self.make(buildscript, self.makeinstallargs or 'install', makeargs='DESTDIR={}'.format(destdir))
-- self.process_install(buildscript, self.get_revision())
-+ self.make(buildscript, self.makeinstallargs or 'install')
+ # Now the destdir should have a series of empty directories:
+ # $JHBUILD_PREFIX/_jhbuild/root-foo/$JHBUILD_PREFIX
+@@ -345,7 +347,8 @@
+ # Even if there are some files outside the DESTDIR, count that as success for now; we just warn
+ install_succeeded = True
+ else:
+- save_broken_tree = True
++ install_succeeded = True
++# save_broken_tree = True
- do_install.depends = [PHASE_BUILD]
- do_install.error_phases = [PHASE_CONFIGURE]
+ if save_broken_tree:
+ if os.path.exists(broken_name):
commit 9f6a00e7321b6aaaa09c455f9da88e0ee299dae8
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Sep 5 16:12:53 2017 -0700
Use target_unix for paths to patch files so that bash can use them.
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 7d25aa7..265e633 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -218,6 +218,9 @@ bash-command -command "pacman -S $msys_devel --noconfirm --needed"
bash-command -command "pacman -S $mingw_toolchain --noconfirm --needed"
bash-command -command "pacman -S $mingw_deps --noconfirm --needed"
+$target_unix = make-unixpath $target_dir
+$download_unix = make-unixpath $download_dir
+
Write-Host @"
Next we'll install the HTML Help Workshop includes and libraries into our MinGW directory.
@@ -227,7 +230,6 @@ if (!(test-path -path "$target_dir/msys2/$mingw_path/include/htmlhelp.h")) {
if (!$installed_hh) {
$installed_hh = get-item -path "hkcu:\SOFTWARE\Microsoft\HTML Help Workshop" | foreach-object{$_.GetValue("InstallDir")}
}
- $target_unix = make-unixpath -path $target_dir
$installed_hh = make-unixpath -path $installed_hh
bash-command -command "cp $installed_hh/include/htmlhelp.h $mingw_path/include"
@@ -254,11 +256,8 @@ if (!(test-path -path "$target_dir\\src\\gnucash-on-windows.git")) {
exit
}
-bash-command -command "/usr/bin/patch -d/ -p0 -i $target_dir/src/gnucash-on-windows.git/patches/jhbuild.patch"
-bash-command -command "/usr/bin/patch -d/ -p0 -i $target_dir/src/gnucash-on-windows.git/patches/FindSWIG.patch"
-
-$target_unix = make-unixpath $target_dir
-$download_unix = make-unixpath $download_dir
+bash-command -command "/usr/bin/patch -d/ -p0 -i $target_unix/src/gnucash-on-windows.git/patches/jhbuild.patch"
+bash-command -command "/usr/bin/patch -d/ -p0 -i $target_unix/src/gnucash-on-windows.git/patches/FindSWIG.patch"
$jhbuildrc = get-content "$target_dir\\src\\gnucash-on-windows.git\\jhbuildrc.in" |
%{$_ -replace "@-BASE_DIR-@", "$target_unix"} |
commit 7b3107b69d2617352da5173d5b4a782bb9b1e176
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Sep 5 15:53:38 2017 -0700
Switch xmlsec to tarball.
So that it doesn't need to re-clone every build.
diff --git a/gnucash.modules b/gnucash.modules
index 130e1bd..2708be2 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -19,6 +19,8 @@
href="http://devel.aqbanking.de/svn/"/>
<repository type="git" name="github"
href="git://github.com/"/>
+ <repository type="tarball" name="github-tar"
+ href="https://github.com/"/>
<repository type="system" name="system"/>
<systemmodule id="webkitgtk-3.0">
@@ -165,7 +167,9 @@
</autotools>
<autotools id="xmlsec">
- <branch module="lsh123/xmlsec" repo="github" tag="xmlsec-1_2_20"/>
+ <branch module="lsh123/xmlsec/archive/xmlsec-1_2_20.tar.gz"
+ repo="github-tar" version="1.2.20"
+ checkoutdir="xmlsec-xmlsec-1_2_20"/>
<dependencies>
<dep package="openssl"/>
</dependencies>
commit bb0233353011d5dad046745ef53dff308ffe001c
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Sep 5 16:03:25 2017 -0700
Call patch with the right path and -d/.
The latter so that it won't fail because of patching a subdir of /usr.
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 908d5aa..7d25aa7 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -254,8 +254,8 @@ if (!(test-path -path "$target_dir\\src\\gnucash-on-windows.git")) {
exit
}
-bash-command -command "$mingw_bin/patch -i $target_dir/src/gnucash-on-windows.git/patches/jhbuild.patch"
-bash-command -command "$mingw_bin/patch -i $target_dir/src/gnucash-on-windows.git/patches/FindSWIG.patch"
+bash-command -command "/usr/bin/patch -d/ -p0 -i $target_dir/src/gnucash-on-windows.git/patches/jhbuild.patch"
+bash-command -command "/usr/bin/patch -d/ -p0 -i $target_dir/src/gnucash-on-windows.git/patches/FindSWIG.patch"
$target_unix = make-unixpath $target_dir
$download_unix = make-unixpath $download_dir
commit 2aa0df87913a840682d08ab3af42ba470abff805
Author: Geert Janssens <geert at kobaltwit.be>
Date: Wed Sep 6 00:17:39 2017 +0200
Add quotes around litteral string
diff --git a/jhbuildrc.in b/jhbuildrc.in
index 83796f7..422c999 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -51,7 +51,7 @@ add_to_path_var('PATH', os.path.join(_basedir, 'msys2', 'mingw32', 'bin'))
os.environ['SRCROOT'] = checkoutroot
os.environ['PREFIX'] = prefix
-os.environ['MSYS2ROOT'] = os.path.join(_basedir, msys2)
+os.environ['MSYS2ROOT'] = os.path.join(_basedir, 'msys2')
#os.environ['GUILE_LOAD_PATH'] = os.path.join(prefix, 'share', 'guile', '2.0')
#os.environ['GUILE_LOAD_BINARY_PATH'] = os.path.join(prefix, 'lib', 'guile', '2.0', 'ccache')
autogenargs = "--build=i686-w64-mingw32"
commit b81ed717e8d21464e7083ed442f67f8a06519ab4
Author: Geert Janssens <geert at kobaltwit.be>
Date: Tue Sep 5 23:46:28 2017 +0200
Fix googletest build/install errors
- the way the jhbuild module was configured it ran cmake with both -G Ninja and
-G 'Msys Makefiles'. Cmake apparently then only created makefiles but jhbuild
still attempted to run ninja on it. Fixed by adding 'use-ninja=False'
- The install step still failed after that. I have chosen to just disable installing
as we're just inserting the source files in our tests rather than linking a lib
diff --git a/gnucash.modules b/gnucash.modules
index d070b7d..130e1bd 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -267,7 +267,10 @@
</dependencies>
</autotools>
- <cmake id="googletest" cmakeargs="-G 'MSYS Makefiles' -DBUILD_GMOCK=OFF">
+ <cmake id="googletest"
+ cmakeargs="-G 'MSYS Makefiles' -DBUILD_GMOCK=OFF"
+ skip-install="True"
+ use-ninja="False">
<branch module="google/googletest" repo="github" tag="release-1.8.0"/>
</cmake>
commit bd1eaef37abdcb773e8f6e88a570a9a6596e47f3
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Sep 5 11:57:46 2017 -0700
Replace hard-coded 'c:/gcdev64/msys2' with .
diff --git a/gnucash.modules b/gnucash.modules
index e6f2906..d070b7d 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -275,7 +275,7 @@
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure -\-prefix %(prefix)s %(autogenargs)s"
autogenargs="-\-enable-ofx -\-enable-aqbanking -\-enable-binreloc -\-enable-dbi -\-with-dbi-dbd-dir=$PREFIX/lib/dbd"-->
<cmake id="gnucash"
- cmakeargs="-G 'MSYS Makefiles' -DCMAKE_PREFIX_PATH=c:/gcdev64/msys2 -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock"
+ cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock"
use-ninja="False">
<branch repo="github" module="Gnucash/gnucash.git" revision="master"
checkoutdir="gnucash-git"/>
diff --git a/jhbuildrc.in b/jhbuildrc.in
index 2135ac3..83796f7 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -51,6 +51,7 @@ add_to_path_var('PATH', os.path.join(_basedir, 'msys2', 'mingw32', 'bin'))
os.environ['SRCROOT'] = checkoutroot
os.environ['PREFIX'] = prefix
+os.environ['MSYS2ROOT'] = os.path.join(_basedir, msys2)
#os.environ['GUILE_LOAD_PATH'] = os.path.join(prefix, 'share', 'guile', '2.0')
#os.environ['GUILE_LOAD_BINARY_PATH'] = os.path.join(prefix, 'lib', 'guile', '2.0', 'ccache')
autogenargs = "--build=i686-w64-mingw32"
commit 00f68689bad5972ec2e24502309997fbdec4e026
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Sep 5 11:51:48 2017 -0700
Patch CMake's FindSWIG.cmake to allow us to set a search prefix.
diff --git a/patches/FindSWIG.patch b/patches/FindSWIG.patch
new file mode 100644
index 0000000..81043ae
--- /dev/null
+++ b/patches/FindSWIG.patch
@@ -0,0 +1,12 @@
+ diff -u /mingw32/share/cmake-3.9/Modules/FindSWIG.cmake~ /mingw32/share/cmake-3.9/Modules/FindSWIG.cmake
+--- /mingw32/share/cmake-3.9/Modules/FindSWIG.cmake~ 2017-08-10 06:36:32.000000000 -0700
++++ /mingw32/share/cmake-3.9/Modules/FindSWIG.cmake 2017-09-05 10:34:59.692229400 -0700
+@@ -41,7 +41,7 @@
+ endif()
+ else()
+ string(REGEX REPLACE "[\n\r]+" ";" SWIG_swiglib_output ${SWIG_swiglib_output})
+- find_path(SWIG_DIR swig.swg PATHS ${SWIG_swiglib_output} NO_CMAKE_FIND_ROOT_PATH)
++ find_path(SWIG_DIR swig.swg PATHS ${SWIG_swiglib_output})
+ if(SWIG_DIR)
+ set(SWIG_USE_FILE ${CMAKE_CURRENT_LIST_DIR}/UseSWIG.cmake)
+ execute_process(COMMAND ${SWIG_EXECUTABLE} -version
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index bc9ae5e..908d5aa 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -104,12 +104,12 @@ function bash-command() {
write-host "Shell program not found, aborting."
return
}
-# write-host "Running bash command ""$command"""
+ write-host "Running bash command ""$command"""
Start-Process -FilePath "$target_dir\msys2\usr\bin\bash.exe" -ArgumentList "-c ""export PATH=/usr/bin; $command""" -NoNewWindow -Wait
}
function make-unixpath([string]$path) {
- $path -replace "^([A-Z]):", '/$1' -replace "\\", '/'
+ $path -replace "^([A-Z]):", '/$1' -replace "\\", '/' -replace "//", '/' -replace "\(", '\(' -replace "\)", '\)' -replace " ", '\ '
}
# Install MSYS2 for the current machine's architechture.
@@ -223,15 +223,21 @@ Write-Host @"
Next we'll install the HTML Help Workshop includes and libraries into our MinGW directory.
"@
-if (!$installed_hh) {
- $installed_hh = get-item -path "hkcu:\SOFTWARE\Microsoft\HTML Help Workshop" | foreach-object{$_.GetValue("InstallDir")}
+if (!(test-path -path "$target_dir/msys2/$mingw_path/include/htmlhelp.h")) {
+ if (!$installed_hh) {
+ $installed_hh = get-item -path "hkcu:\SOFTWARE\Microsoft\HTML Help Workshop" | foreach-object{$_.GetValue("InstallDir")}
+ }
+ $target_unix = make-unixpath -path $target_dir
+ $installed_hh = make-unixpath -path $installed_hh
+ bash-command -command "cp $installed_hh/include/htmlhelp.h $mingw_path/include"
+
+ bash-command -command "$mingw_bin/gendef $hhctrl_ocx - > $mingw_path/lib/htmlhelp.def"
+ bash-command -command "$mingw_bin/dlltool -k -d $mingw_path/lib/htmlhelp.def -l $mingw_path/lib/libhtmlhelp.a"
+ if (!(test-path -path "$target_dir/msys2/$mingw_path/include/htmlhelp.h")) {
+ Write-Host "HTML Help Workshop isn't correctly installed."
+ exit
+ }
}
-$installed_hh = make-unixpath -path $installed_hh
-bash-command -command "cp '$installed_hh/include/htmlhelp.h' '$mingw_path/include'"
-
-bash-command -command "$mingw_bin/gendef $hhctrl_ocx - > $mingw_path/lib/htmlhelp.def 2>> /errors"
-bash-command -command "$mingw_bin/dlltool -k -d $mingw_path/lib/htmlhelp.def -l $mingw_path/lib/libhtmlhelp.a >> /errors 2>&1"
-
Write-Host @"
Clone the gnucash-on-windows repository into the target source directory, patch jhbuild to disable its DESTDIR dance and set up jhbuildrc with our prefixes.
@@ -248,7 +254,8 @@ if (!(test-path -path "$target_dir\\src\\gnucash-on-windows.git")) {
exit
}
-bash-command -command "$mingw_bin/patch < $target_dir/src/gnucash-on-windows.git/patches/jhbuild.patch"
+bash-command -command "$mingw_bin/patch -i $target_dir/src/gnucash-on-windows.git/patches/jhbuild.patch"
+bash-command -command "$mingw_bin/patch -i $target_dir/src/gnucash-on-windows.git/patches/FindSWIG.patch"
$target_unix = make-unixpath $target_dir
$download_unix = make-unixpath $download_dir
commit b28c08b333a8e2f451bc3f6caefd8881a77736a0
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Sep 1 11:26:16 2017 -0700
Change gnucash mdoule branch to master.
diff --git a/gnucash.modules b/gnucash.modules
index 7f91c3d..e6f2906 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -277,7 +277,7 @@
<cmake id="gnucash"
cmakeargs="-G 'MSYS Makefiles' -DCMAKE_PREFIX_PATH=c:/gcdev64/msys2 -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock"
use-ninja="False">
- <branch repo="github" module="Gnucash/gnucash.git" revision="dodge-boost-filesystem"
+ <branch repo="github" module="Gnucash/gnucash.git" revision="master"
checkoutdir="gnucash-git"/>
<dependencies>
<dep package="libofx"/>
commit 9592645df5c1416b4c48426a6a83e52836571128
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Aug 31 11:53:03 2017 -0700
Patch jhbuild to not use DESTDIR on automake or cmake.
It tends not to work because of the mismatch between DOS-style and
MinGW style drive paths, and it's anyway not useful for our purposes.
diff --git a/patches/jhbuild.patch b/patches/jhbuild.patch
new file mode 100644
index 0000000..137b879
--- /dev/null
+++ b/patches/jhbuild.patch
@@ -0,0 +1,28 @@
+--- /usr/lib/python2.7/site-packages/jhbuild/modtypes/cmake.py 2017-06-01 12:26:10.000000000 -0700
++++ /usr/lib/python2.7/site-packages/jhbuild/modtypes/cmake.py 2017-08-31 10:46:42.719250200 -0700
+@@ -159,11 +159,9 @@
+ if self.use_ninja:
+ self.ensure_ninja_binary()
+ extra_env = self.extra_env or {}
+- extra_env['DESTDIR'] = destdir
+ buildscript.execute(self.ninja_binary + ' install', cwd=builddir, extra_env=extra_env)
+ else:
+- self.make(buildscript, 'install DESTDIR={}'.format(destdir))
+- self.process_install(buildscript, self.get_revision())
++ self.make(buildscript, 'install')
+ do_install.depends = [PHASE_BUILD]
+
+ def xml_tag_and_attrs(self):
+--- /usr/lib/python2.7/site-packages/jhbuild/modtypes/autotools.py 2017-06-01 12:26:10.000000000 -0700
++++ /usr/lib/python2.7/site-packages/jhbuild/modtypes/autotools.py 2017-08-31 11:00:39.148673100 -0700
+@@ -309,9 +309,7 @@
+ packagedb.uninstall(self.name)
+
+ buildscript.set_action(_('Installing'), self)
+- destdir = self.prepare_installroot(buildscript)
+- self.make(buildscript, self.makeinstallargs or 'install', makeargs='DESTDIR={}'.format(destdir))
+- self.process_install(buildscript, self.get_revision())
++ self.make(buildscript, self.makeinstallargs or 'install')
+
+ do_install.depends = [PHASE_BUILD]
+ do_install.error_phases = [PHASE_CONFIGURE]
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 632d777..bc9ae5e 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -234,7 +234,7 @@ bash-command -command "$mingw_bin/dlltool -k -d $mingw_path/lib/htmlhelp.def -l
Write-Host @"
-Finally we'll clone the gnucash-on-windows repository into target-dir/src and you'll be ready to build GnuCash.
+Clone the gnucash-on-windows repository into the target source directory, patch jhbuild to disable its DESTDIR dance and set up jhbuildrc with our prefixes.
"@
if (!(test-path -path "$target_dir\\src")) {
@@ -247,6 +247,9 @@ if (!(test-path -path "$target_dir\\src\\gnucash-on-windows.git")) {
write-host "Failed to clone the gnucash-on-windows repo, exiting."
exit
}
+
+bash-command -command "$mingw_bin/patch < $target_dir/src/gnucash-on-windows.git/patches/jhbuild.patch"
+
$target_unix = make-unixpath $target_dir
$download_unix = make-unixpath $download_dir
commit d95d3d7fb663566179d24caceef5568b731448d5
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Aug 27 18:00:01 2017 -0700
Declare use-ninja false and use the MSYS Makefiles generator.
diff --git a/gnucash.modules b/gnucash.modules
index ee15e88..7f91c3d 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -275,8 +275,9 @@
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure -\-prefix %(prefix)s %(autogenargs)s"
autogenargs="-\-enable-ofx -\-enable-aqbanking -\-enable-binreloc -\-enable-dbi -\-with-dbi-dbd-dir=$PREFIX/lib/dbd"-->
<cmake id="gnucash"
- cmakeargs="-DCMAKE_PREFIX_PATH=c:/gcdev64/msys2 -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock">
- <branch repo="github" module="Gnucash/gnucash.git" revision="master"
+ cmakeargs="-G 'MSYS Makefiles' -DCMAKE_PREFIX_PATH=c:/gcdev64/msys2 -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock"
+ use-ninja="False">
+ <branch repo="github" module="Gnucash/gnucash.git" revision="dodge-boost-filesystem"
checkoutdir="gnucash-git"/>
<dependencies>
<dep package="libofx"/>
commit 1f64de470390285bedd625f549dd18d422d2c50f
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Aug 27 17:13:30 2017 -0700
Change the mingw_path to be the regular package directory rather than the toolchain directory.
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index f2ab88b..632d777 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -60,12 +60,12 @@ Param(
$progressPreference = 'silentlyContinue'
if ($x86_64) {
$mingw_prefix = "mingw64/mingw-w64-x86_64-"
- $mingw_path = "/mingw64/x86_64-w64-mingw64"
+ $mingw_path = "/mingw64"
$mingw_bin = "/mingw64/bin"
}
else {
$mingw_prefix = "mingw32/mingw-w64-i686-"
- $mingw_path = "/mingw32/i686-w64-mingw32"
+ $mingw_path = "/mingw32"
$mingw_bin = "/mingw32/bin"
}
commit 106b66a0049c8eb79fe5a5426259f8a17d47bfda
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Aug 27 14:00:07 2017 -0700
Some setup-mingw64.ps1 fixes and changes required by Mingw64 updates.
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index ba3cec3..f2ab88b 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -73,6 +73,10 @@ if (!(test-path -path $target_dir)) {
new-item "$target_dir" -type directory
}
+if (!(test-path -path $download_dir)) {
+ new-item "$download_dir" -type directory
+}
+
function make-pkgnames ([string]$prefix, [string]$items) {
$items.split(" ") | foreach-object {"$prefix$_"}
}
@@ -193,14 +197,13 @@ bash-command -command "pacman -Syuu --noconfirm"
# Set up aliases for the parts of msys-devtools and mingw-w64-toolchain that
# we need:
-$devel = "asciidoc autoconf autoconf2.13 autogen automake-wrapper automake1.10 automake1.11 automake1.12 automake1.13 automake1.14 automake1.15 automake1.6 automake1.7 automake1.8 automake1.9 bison cmake diffstat diffutils dos2unix file flex gawk gettext gettext-devel gperf grep groff intltool m4 make man-db pacman pactoys-git patch patchutils perl pkg-config sed swig texinfo texinfo-tex wget xmlto git jhbuild-git texinfo"
+$devel = "asciidoc autoconf autoconf2.13 autogen automake-wrapper automake1.10 automake1.11 automake1.12 automake1.13 automake1.14 automake1.15 automake1.6 automake1.7 automake1.8 automake1.9 bison diffstat diffutils dos2unix file flex gawk gettext gettext-devel gperf grep groff intltool libtool m4 make man-db pacman pactoys-git patch patchutils perl pkg-config sed swig texinfo texinfo-tex wget xmlto git jhbuild-git texinfo"
-$toolchain = "binutils crt-git gcc gcc-libs gdb headers-git libmangle-git libtool libwinpthread-git make pkg-config tools-git winpthreads-git"
+$toolchain = "binutils cmake crt-git gcc gcc-libs gdb headers-git libmangle-git libtool libwinpthread-git make pkg-config tools-git winpthreads-git"
-# Note that webkitgtk3 will pull in gtk3 automatically; we need gtk2 as well to
-# support AQBanking.
-$deps = "webkitgtk3 gtk2 boost iso-codes shared-mime-info libmariadbclient postgresql libgnomecanvas ninja ncurses"
+# Note that webkitgtk3 will pull in gtk3 automatically.
+$deps = "webkitgtk3 boost iso-codes shared-mime-info libmariadbclient postgresql libgnomecanvas ninja ncurses"
Write-Host @"
@@ -238,7 +241,7 @@ if (!(test-path -path "$target_dir\\src")) {
New-Item $target_dir\\src -type directory
}
if (!(test-path -path "$target_dir\\src\\gnucash-on-windows.git")) {
- bash-command -command "git clone -b mingw64 https://github.com/gnucash/gnucash-on-windows.git $target_dir/src/gnucash-on-windows.git"
+ bash-command -command "git clone https://github.com/gnucash/gnucash-on-windows.git $target_dir/src/gnucash-on-windows.git"
}
if (!(test-path -path "$target_dir\\src\\gnucash-on-windows.git")) {
write-host "Failed to clone the gnucash-on-windows repo, exiting."
@@ -253,6 +256,8 @@ $jhbuildrc = get-content "$target_dir\\src\\gnucash-on-windows.git\\jhbuildrc.in
[IO.File]::WriteAllLines("$target_dir\\src\\gnucash-on-windows.git\\jhbuildrc", $jhbuildrc)
Write-Host @"
-Your build environment is now ready to use. Open an MSys2 shell from the start menu, cd to your target directory, and run
-jhbuild -f gnucash-on-windows.git/jhbuildrc build
+Your build environment is now ready to use. Open an MSys2/Mingw32 shell from the start menu, cd to your target directory, and run
+jhbuild -f src/gnucash-on-windows.git/jhbuildrc build
+
+Note that the build will not work with the plain MSys2 shell!
"@
commit 4c6403eac410b589d8b5b83ab0c229c3732c8285
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Aug 27 13:57:30 2017 -0700
Remove generator. JHbuild uses Ninja by default and that now works on Mingw64 with CMake-3.9.1.
diff --git a/gnucash.modules b/gnucash.modules
index c8cf010..ee15e88 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -275,7 +275,7 @@
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure -\-prefix %(prefix)s %(autogenargs)s"
autogenargs="-\-enable-ofx -\-enable-aqbanking -\-enable-binreloc -\-enable-dbi -\-with-dbi-dbd-dir=$PREFIX/lib/dbd"-->
<cmake id="gnucash"
- cmakeargs="-G 'MSYS Makefiles' -DCMAKE_PREFIX_PATH=c:/gcdev64/msys2 -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock">
+ cmakeargs="-DCMAKE_PREFIX_PATH=c:/gcdev64/msys2 -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock">
<branch repo="github" module="Gnucash/gnucash.git" revision="master"
checkoutdir="gnucash-git"/>
<dependencies>
commit 2332da639116c626b2ae0e566914591e6c171e14
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Aug 27 13:56:08 2017 -0700
Fix path to libdbi-drivers-linkage.patch
diff --git a/gnucash.modules b/gnucash.modules
index 34fc2d5..c8cf010 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -260,7 +260,7 @@
<branch repo="sourceforge" version="0.8.3"
module="libdbi-drivers/libdbi-drivers-0.8.3-1.tar.gz">
<patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/libdbi-drivers-errno.patch" strip="1"/>
- <patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/libdbi-drivers-linkage.patch" strip="1"/>
+ <patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/patches/libdbi-drivers-linkage.patch" strip="1"/>
</branch>
<dependencies>
<dep package="libdbi"/>
commit a0d50a2e98a1d4dacdf4d970ab2d8606c205723e
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Aug 27 13:50:15 2017 -0700
Update Guile patches.
Originals were for guile master, plus fix spelling error in moduleset.
diff --git a/gnucash.modules b/gnucash.modules
index 368210f..34fc2d5 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -118,7 +118,8 @@
<autotools id="guile2" autogen-sh="autoreconf" autogenargs="--without-threads">
<branch repo="ftp.gnu.org" module="guile/guile-2.0.14.tar.gz"
version="2.0.14">
- <patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/patches/guile-2.0.14-mingw64-fixup.patch" strip="1"/>
+ <patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/patches/guile-2.0.14-mingw64-fixups.patch" strip="1"/>
+ <patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/patches/guile-2.0.14-Fix-mktime-test.patch" strip="1"/>
</branch>
<dependencies>
<dep package="libunistring"/>
diff --git a/patches/guile-2.0.14-Fix-mktime-test.patch b/patches/guile-2.0.14-Fix-mktime-test.patch
new file mode 100644
index 0000000..a2c71dc
--- /dev/null
+++ b/patches/guile-2.0.14-Fix-mktime-test.patch
@@ -0,0 +1,33 @@
+From ba984ee511178fdf1f547931fff213db76ab3eee Mon Sep 17 00:00:00 2001
+From: John Ralls <jralls at ceridwen.us>
+Date: Sun, 23 Jul 2017 14:08:28 -0700
+Subject: [PATCH 3/3] Test for HAVE_MKTIME and NEED_REPLACE_MKTIME before
+ HAVE_MKTIME_INTERNAL
+
+So that if the latter is true and the former aren't they don't overwrite REPLACE_MKTIME.
+---
+ m4/gnulib-comp.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4
+index 9380120e7..824afaf2c 100644
+--- a/m4/gnulib-comp.m4
++++ b/m4/gnulib-comp.m4
+@@ -998,13 +998,13 @@ AC_SUBST([LTALLOCA])
+ func_gl_gnulib_m4code_5264294aa0a5557541b53c8c741f7f31 ()
+ {
+ if ! $gl_gnulib_enabled_5264294aa0a5557541b53c8c741f7f31; then
++ func_gl_gnulib_m4code_mktime
+ gl_FUNC_MKTIME_INTERNAL
+ if test $REPLACE_MKTIME = 1; then
+ AC_LIBOBJ([mktime])
+ gl_PREREQ_MKTIME
+ fi
+ gl_gnulib_enabled_5264294aa0a5557541b53c8c741f7f31=true
+- func_gl_gnulib_m4code_mktime
+ fi
+ }
+ func_gl_gnulib_m4code_f691f076f650964c9f5598c3ee487616 ()
+--
+2.12.1
+
diff --git a/patches/guile-2.0.14-mingw64-fixups.patch b/patches/guile-2.0.14-mingw64-fixups.patch
index a0fb3a4..baad5e5 100644
--- a/patches/guile-2.0.14-mingw64-fixups.patch
+++ b/patches/guile-2.0.14-mingw64-fixups.patch
@@ -162,6 +162,36 @@ index 7a139747f..7e4b7dfe3 100644
/* You see, FreeBSD defines _POSIX_CPUTIME but not
CLOCK_PROCESS_CPUTIME_ID. */
#define HAVE_POSIX_CPUTIME 1
---
-2.12.1
-
+@@ -830,12 +830,7 @@ scm_init_stime()
+
+ #ifdef HAVE_POSIX_CPUTIME
+ {
+- clockid_t dummy;
+-
+- /* Only use the _POSIX_CPUTIME clock if it's going to work across
+- CPUs. */
+- if (clock_getcpuclockid (0, &dummy) == 0 &&
+- clock_gettime (CLOCK_PROCESS_CPUTIME_ID, &posix_run_time_base) == 0)
++ if (clock_gettime (CLOCK_PROCESS_CPUTIME_ID, &posix_run_time_base) == 0)
+ get_internal_run_time = get_internal_run_time_posix_timer;
+ else
+ errno = 0;
+diff --git a/lib/intprops.h~ b/lib/intprops.h
+index feb02c3..84de8ee 100644
+--- a/lib/intprops.h~
++++ b/lib/intprops.h
+@@ -230,11 +230,11 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX);
+ (e.g., A and B) have the same type as MIN and MAX. Instead, they assume
+ that the result (e.g., A + B) has that type. */
+ #if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL
+-# define _GL_ADD_OVERFLOW(a, b, min, max)
++# define _GL_ADD_OVERFLOW(a, b, min, max) \
+ __builtin_add_overflow (a, b, (__typeof__ ((a) + (b)) *) 0)
+-# define _GL_SUBTRACT_OVERFLOW(a, b, min, max)
++# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) \
+ __builtin_sub_overflow (a, b, (__typeof__ ((a) - (b)) *) 0)
+-# define _GL_MULTIPLY_OVERFLOW(a, b, min, max)
++# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) \
+ __builtin_mul_overflow (a, b, (__typeof__ ((a) * (b)) *) 0)
+ #else
+ # define _GL_ADD_OVERFLOW(a, b, min, max) \
commit 13536fb122c1a0f2fb671a5d537e7df17aba8b75
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Aug 13 22:34:14 2017 +0300
Install mingw-libtool instead of msys-libtool because the latter lacks libltdl.
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index fdad0a9..ba3cec3 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -193,9 +193,9 @@ bash-command -command "pacman -Syuu --noconfirm"
# Set up aliases for the parts of msys-devtools and mingw-w64-toolchain that
# we need:
-$devel = "asciidoc autoconf autoconf2.13 autogen automake-wrapper automake1.10 automake1.11 automake1.12 automake1.13 automake1.14 automake1.15 automake1.6 automake1.7 automake1.8 automake1.9 bison cmake diffstat diffutils dos2unix file flex gawk gettext gettext-devel gperf grep groff intltool libtool m4 make man-db pacman pactoys-git patch patchutils perl pkg-config sed swig texinfo texinfo-tex wget xmlto git jhbuild-git texinfo"
+$devel = "asciidoc autoconf autoconf2.13 autogen automake-wrapper automake1.10 automake1.11 automake1.12 automake1.13 automake1.14 automake1.15 automake1.6 automake1.7 automake1.8 automake1.9 bison cmake diffstat diffutils dos2unix file flex gawk gettext gettext-devel gperf grep groff intltool m4 make man-db pacman pactoys-git patch patchutils perl pkg-config sed swig texinfo texinfo-tex wget xmlto git jhbuild-git texinfo"
-$toolchain = "binutils crt-git gcc gcc-libs gdb headers-git libmangle-git libwinpthread-git make pkg-config tools-git winpthreads-git"
+$toolchain = "binutils crt-git gcc gcc-libs gdb headers-git libmangle-git libtool libwinpthread-git make pkg-config tools-git winpthreads-git"
# Note that webkitgtk3 will pull in gtk3 automatically; we need gtk2 as well to
commit c82d18e0162ac3dca987fa90bf82e93bb282d6f5
Author: Wonho Seo <cforgeleader at gmail.com>
Date: Sat Aug 12 17:46:23 2017 +0900
Update bootstrap_win_dev.vbs
bug fix oStream.SaveToFile strFile
diff --git a/bootstrap_win_dev.vbs b/bootstrap_win_dev.vbs
index b9fbc3b..8626947 100644
--- a/bootstrap_win_dev.vbs
+++ b/bootstrap_win_dev.vbs
@@ -461,7 +461,7 @@ Sub HTTPDownload( myURL, myPath )
End Sub
' Download a binary type file over http
-Sub HTTPDownloadBinaryFile( myURL, myPath )
+Sub HTTPDownloadBinaryFile( myURL, myPath )
' This Sub downloads the FILE specified in myURL to the path specified in myPath.
'
' myURL must always end with a file name
@@ -469,12 +469,11 @@ Sub HTTPDownloadBinaryFile( myURL, myPath )
'
' Based on a script written by Rob van der Woude
' http://www.robvanderwoude.com
-' Ref: https://stackoverflow.com/questions/29367130/downloading-a-file-in-vba-and-storing-it
+' Ref: https://stackoverflow.com/questions/29367130/downloading-a-file-in-vba-and-storing-it
' Standard housekeeping
Dim i, objFile, objHTTP, strFile, strMsg
-
Const adSaveCreateOverWrite = 2, adSaveCreateNotExist = 1
Const adTypeBinary = 1
@@ -489,9 +488,6 @@ Sub HTTPDownloadBinaryFile( myURL, myPath )
AbortScript
End If
- ' Create or open the target file
- 'Set objFile = objFso.OpenTextFile( strFile, ForWriting, True )
-
' Create an HTTP object
Set objHTTP = CreateObject( "MSXML2.ServerXMLHTTP" )
@@ -501,19 +497,17 @@ Sub HTTPDownloadBinaryFile( myURL, myPath )
' Write the downloaded byte stream to the target file
If objHTTP.Status = 200 Then
- ' Create the target stream
- Set oStream = CreateObject("ADODB.Stream")
- oStream.Open
- oStream.Type = adTypeBinary
- oStream.Write objHTTP.responseBody
- oStream.SaveToFile filePath, adSaveCreateOverWrite ' 1 = no overwrite, 2 = overwrite
- ' Close the target file
- oStream.Close
- End If
-
+ ' Create the target stream
+ Set oStream = WScript.CreateObject( "ADODB.Stream" )
+ oStream.Open
+ oStream.Type = adTypeBinary
+ oStream.Write objHTTP.responseBody
+ oStream.SaveToFile strFile, adSaveCreateOverWrite ' 1 = no overwrite, 2 = overwrite
+ ' Close the target file
+ oStream.Close
+ End If
End Sub
-
' Extract a zip file strZipFile into strFolder
Function ExtractAll(strZipFile, strFolder)
Set objShell = CreateObject("Shell.Application")
commit 8b7638b6014ecf31b43321c5eabc68fcddfccdbe
Author: Wonho Seo <cforgeleader at gmail.com>
Date: Sat Aug 12 17:10:32 2017 +0900
Update bootstrap_win_dev.vbs
add sub procedure HTTPDownloadBinaryFile for download mingw-get.zip file(bug fix)
diff --git a/bootstrap_win_dev.vbs b/bootstrap_win_dev.vbs
index 00feb3f..b9fbc3b 100644
--- a/bootstrap_win_dev.vbs
+++ b/bootstrap_win_dev.vbs
@@ -163,7 +163,7 @@ Else
If Not objFso.FileExists(strMingwGetZip) Then
stdout.Write "Downloading mingw-get.zip (slow!)... "
strMingwGetZipUrl = "https://github.com/Gnucash/gnucash-on-windows/raw/master/mingw-get.zip"
- HTTPDownload strMingwGetZipUrl, strMingwGetZip
+ HTTPDownloadBinaryFile strMingwGetZipUrl, strMingwGetZip
stdout.WriteLine "Success"
End If
@@ -460,7 +460,60 @@ Sub HTTPDownload( myURL, myPath )
objFile.Close( )
End Sub
+' Download a binary type file over http
+Sub HTTPDownloadBinaryFile( myURL, myPath )
+' This Sub downloads the FILE specified in myURL to the path specified in myPath.
+'
+' myURL must always end with a file name
+' myPath may be a directory or a file name; in either case the directory must exist
+'
+' Based on a script written by Rob van der Woude
+' http://www.robvanderwoude.com
+' Ref: https://stackoverflow.com/questions/29367130/downloading-a-file-in-vba-and-storing-it
+
+ ' Standard housekeeping
+ Dim i, objFile, objHTTP, strFile, strMsg
+
+
+ Const adSaveCreateOverWrite = 2, adSaveCreateNotExist = 1
+ Const adTypeBinary = 1
+
+ ' Check if the specified target file or folder exists,
+ ' and build the fully qualified path of the target file
+ If objFso.FolderExists( myPath ) Then
+ strFile = objFso.BuildPath( myPath, Mid( myURL, InStrRev( myURL, "/" ) + 1 ) )
+ ElseIf objFso.FolderExists( Left( myPath, InStrRev( myPath, "\" ) - 1 ) ) Then
+ strFile = myPath
+ Else
+ stdout.WriteLine "ERROR: Target folder not found."
+ AbortScript
+ End If
+
+ ' Create or open the target file
+ 'Set objFile = objFso.OpenTextFile( strFile, ForWriting, True )
+
+ ' Create an HTTP object
+ Set objHTTP = CreateObject( "MSXML2.ServerXMLHTTP" )
+
+ ' Download the specified URL
+ objHTTP.Open "GET", myURL, False
+ objHTTP.Send
+
+ ' Write the downloaded byte stream to the target file
+ If objHTTP.Status = 200 Then
+ ' Create the target stream
+ Set oStream = CreateObject("ADODB.Stream")
+ oStream.Open
+ oStream.Type = adTypeBinary
+ oStream.Write objHTTP.responseBody
+ oStream.SaveToFile filePath, adSaveCreateOverWrite ' 1 = no overwrite, 2 = overwrite
+ ' Close the target file
+ oStream.Close
+ End If
+
+End Sub
+
' Extract a zip file strZipFile into strFolder
Function ExtractAll(strZipFile, strFolder)
Set objShell = CreateObject("Shell.Application")
commit 3f25ce7d7f9633af0e79dfb9cabeacb4b4c38834
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jul 29 14:19:35 2017 -0700
Some setup fixes resulting from setting up on the build server.
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index abf4f88..fdad0a9 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -101,10 +101,7 @@ function bash-command() {
return
}
# write-host "Running bash command ""$command"""
- $psi = new-object "Diagnostics.ProcessStartInfo"
- $psi.Filename = "$target_dir\msys2\usr\bin\bash.exe"
- $psi.Arguments = "-c ""export PATH=/usr/bin; $command"""
- [Diagnostics.Process]::Start($psi)
+ Start-Process -FilePath "$target_dir\msys2\usr\bin\bash.exe" -ArgumentList "-c ""export PATH=/usr/bin; $command""" -NoNewWindow -Wait
}
function make-unixpath([string]$path) {
@@ -183,8 +180,7 @@ Updating the new installation. A bash window will open. In that window accept th
There will be a second update.
"@
- $proc = bash-command -command "pacman -Syuu"
- $proc.WaitForExit()
+ bash-command -command "pacman -Syuu --noconfirm"
}
#Update the system.
@@ -193,12 +189,11 @@ Write-Host @"
Updating the installation. Accept the proposed changes. If the window doesn't close on its own then close it and re-run the script when it finishes.
"@
-$proc = bash-command -command "pacman -Syuu"
-$proc.WaitForExit()
+bash-command -command "pacman -Syuu --noconfirm"
# Set up aliases for the parts of msys-devtools and mingw-w64-toolchain that
# we need:
-$devel = "asciidoc autoconf autoconf2.13 autogen automake-wrapper automake1.10 automake1.11 automake1.12 automake1.13 automake1.14 automake1.15 automake1.6 automake1.7 automake1.8 automake1.9 bison diffstat diffutils dos2unix file flex gawk gettext gettext-devel gperf grep groff intltool libtool m4 make man-db pacman pactoys-git patch patchutils perl pkg-config sed swig texinfo texinfo-tex wget xmlto git jhbuild-git texinfo"
+$devel = "asciidoc autoconf autoconf2.13 autogen automake-wrapper automake1.10 automake1.11 automake1.12 automake1.13 automake1.14 automake1.15 automake1.6 automake1.7 automake1.8 automake1.9 bison cmake diffstat diffutils dos2unix file flex gawk gettext gettext-devel gperf grep groff intltool libtool m4 make man-db pacman pactoys-git patch patchutils perl pkg-config sed swig texinfo texinfo-tex wget xmlto git jhbuild-git texinfo"
$toolchain = "binutils crt-git gcc gcc-libs gdb headers-git libmangle-git libwinpthread-git make pkg-config tools-git winpthreads-git"
@@ -216,12 +211,9 @@ $msys_devel = make-pkgnames -prefix "msys/" -items $devel
$mingw_toolchain = make-pkgnames -prefix $mingw_prefix -items $toolchain
$mingw_deps = make-pkgnames -prefix $mingw_prefix -items $deps
-$proc = bash-command -command "pacman -S $msys_devel"
-$proc.waitForExit()
-$proc = bash-command -command "pacman -S $mingw_toolchain"
-$proc.waitForExit()
-$proc = bash-command -command "pacman -S $mingw_deps"
-$proc.waitForExit()
+bash-command -command "pacman -S $msys_devel --noconfirm --needed"
+bash-command -command "pacman -S $mingw_toolchain --noconfirm --needed"
+bash-command -command "pacman -S $mingw_deps --noconfirm --needed"
Write-Host @"
@@ -232,13 +224,10 @@ if (!$installed_hh) {
$installed_hh = get-item -path "hkcu:\SOFTWARE\Microsoft\HTML Help Workshop" | foreach-object{$_.GetValue("InstallDir")}
}
$installed_hh = make-unixpath -path $installed_hh
-$proc = bash-command -command "cp $installed_hh/include/htmlhelp.h $mingw_path/include"
-$proc.waitForExit()
+bash-command -command "cp '$installed_hh/include/htmlhelp.h' '$mingw_path/include'"
-$proc = bash-command -command "$mingw_bin/gendef $hhctrl_ocx - > $mingw_path/lib/htmlhelp.def 2>> /errors"
-$proc.waitForExit()
-$proc = bash-command -command "$mingw_bin/dlltool -k -d $mingw_path/lib/htmlhelp.def -l $mingw_path/lib/libhtmlhelp.a >> /errors 2>&1"
-$proc.waitForExit()
+bash-command -command "$mingw_bin/gendef $hhctrl_ocx - > $mingw_path/lib/htmlhelp.def 2>> /errors"
+bash-command -command "$mingw_bin/dlltool -k -d $mingw_path/lib/htmlhelp.def -l $mingw_path/lib/libhtmlhelp.a >> /errors 2>&1"
Write-Host @"
@@ -249,13 +238,19 @@ if (!(test-path -path "$target_dir\\src")) {
New-Item $target_dir\\src -type directory
}
if (!(test-path -path "$target_dir\\src\\gnucash-on-windows.git")) {
- $proc = bash-command -command "git clone -b mingw64 https://github.com/gnucash/gnucash-on-windows.git $target_dir/src/gnucash-on-windows.git"
- $proc.waitForExit()
+ bash-command -command "git clone -b mingw64 https://github.com/gnucash/gnucash-on-windows.git $target_dir/src/gnucash-on-windows.git"
}
+if (!(test-path -path "$target_dir\\src\\gnucash-on-windows.git")) {
+ write-host "Failed to clone the gnucash-on-windows repo, exiting."
+ exit
+}
+$target_unix = make-unixpath $target_dir
+$download_unix = make-unixpath $download_dir
-cat $target_dir\\src\\gnucash-on-windows.git\\jhbuildrc.in |
- %{$_ -replace "@-BASE_DIR-@", "$target_dir"} |
- %{$_ -replace "@-DOWNLOAD_DIR-@", "$download_dir"} > $target_dir\\src\\gnucash-on-windows.git\\jhbuildrc
+$jhbuildrc = get-content "$target_dir\\src\\gnucash-on-windows.git\\jhbuildrc.in" |
+ %{$_ -replace "@-BASE_DIR-@", "$target_unix"} |
+ %{$_ -replace "@-DOWNLOAD_DIR-@", "$download_unix"}
+ [IO.File]::WriteAllLines("$target_dir\\src\\gnucash-on-windows.git\\jhbuildrc", $jhbuildrc)
Write-Host @"
Your build environment is now ready to use. Open an MSys2 shell from the start menu, cd to your target directory, and run
commit 6a52186450c6367d6d2640eab6dde12d56c3ddb8
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jul 29 11:55:22 2017 -0700
Package build script.
This is the one to put in scheduled tasks.
Note that the transfer instructions to code are disabled.
diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
new file mode 100644
index 0000000..c7363ab
--- /dev/null
+++ b/buildserver/build_package.ps1
@@ -0,0 +1,98 @@
+# build_package.ps1: Powershell Script to build gnucash with MinGW64
+# Copyright 2017 John Ralls <jralls at ceridwen.us>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, contact:
+# Free Software Foundation Voice: +1-617-542-5942
+# 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652
+# Boston, MA 02110-1301, USA gnu at gnu.org
+
+<#
+.SYNOPSIS
+
+Builds a gnucash installer and copies it to code.gnucash.org.
+
+.DESCRIPTION
+
+Updates gnucash-on-windows from origin, updates the MinGW-w64
+installation, builds gnucash and dependencies with jhbuild, makes an
+installer with bundle-mingw64.ps1, and secure-copies the installer and
+session transcript to the download server.
+
+This script must not be moved from the gnucash-on-windows.git working
+directory.
+
+You may need to allow running scripts on your computer and depending
+on where the target_dir is you may need to run the script with
+Administrator privileges.
+
+.PARAMETER target_dir
+
+Optional. The root path to the build environment. Defaults to the root of the script's path, e.g. if the script's path is C:\gcdev64\src\gnucash-on-windows.git\bundle-mingw64.ps1 the default target_dir will be C:\gcdev64.
+
+#>
+
+[CmdletBinding()]
+Param([Parameter()] [string]$target_dir)
+
+$script_dir = Split-Path $script:MyInvocation.MyCommand.Path | Split-Path
+$root_dir = Split-Path $script_dir | Split-Path
+$package = "gnucash"
+if (!$target_dir) {
+ $target_dir = $root_dir
+}
+
+$progressPreference = 'silentlyContinue'
+
+function bash-command() {
+ param ([string]$command = "")
+ if (!(test-path -path $target_dir\msys2\usr\bin\bash.exe)) {
+ write-host "Shell program not found, aborting."
+ return
+ }
+ #write-host "Running bash command ""$command"""
+ Start-Process -FilePath "$target_dir\msys2\usr\bin\bash.exe" -ArgumentList "-c ""export PATH=/usr/bin; $command""" -NoNewWindow -Wait
+}
+
+function make-unixpath([string]$path) {
+ $path -replace "^([A-Z]):", '/$1' -replace "\\", '/'
+}
+$script_unix = make-unixpath -path $script_dir
+$target_unix = make-unixpath -path $target_dir
+
+$hostname = "upload at code.gnucash.org:public_html/win32"
+$log_dir = "build-logs"
+
+#Make sure that there's no running transcript, then start one:
+$start_time = get-date -format "yyyy-MM-dd-hh-mm-ss"
+$time_stamp = get-date -format "Build Begun yyyy-MM-dd hh:mm:ss"
+$log_file = "$target_dir\gnucash-build-log-$start_time.log"
+$log_unix = make-unixpath -path $log_file
+bash-command -command "echo $time_stamp > $log_unix"
+#copy the file to the download server so that everyone can see we've started
+#bash-command -command "scp $target_unix/$log_file $hostname/$log_dir/"
+
+# Update MinGW-w64
+bash-command -command "pacman -Su --noconfirm >> $log_unix 2>&1"
+
+# Update the gnucash-on-windows repository
+#bash-command -command "cd $script_unix && git reset --hard && git pull --rebase"
+# Build the latest GnuCash and all dependencies not installed via mingw64
+bash-command -command "jhbuild -f $script_unix/jhbuildrc build gnucash >> $log_unix 2>&1"
+#Build the installer
+& $script_dir\bundle-mingw64.ps1 -target_dir $target_dir 2>&1 | Out-File -FilePath $log_file -Append -Encoding UTF8
+$time_stamp = get-date -format "Build Ended yyyy-MM-dd hh:mm:ss"
+bash-command -command "echo $time_stamp >> $log_unix"
+# Copy the transcript and installer to the download server and delete them.
+#bash-command "scp $log_unix $hostname/$log_dir/"
+#bash-command "scp $target_unix/gnucash*setup.exe $hostname/master"
\ No newline at end of file
commit 0959f5627f3c221a364dfe14b0fc219ab325d674
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jul 29 11:53:10 2017 -0700
Use jhbuildrc's current directory to find gnucash.modules.
diff --git a/jhbuildrc.in b/jhbuildrc.in
index 316e496..2135ac3 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -31,8 +31,8 @@ def add_to_path_var(var, path):
os.environ[var] = os.environ[var] + ":" + path
_basedir = "@-BASE_DIR-@"
-_downloaddir = "@-DOWNLOAD_DIR-@"
-_config_dir = os.path.join(_basedir, 'src', 'gnucash-on-windows.git')
+_download_dir = "@-DOWNLOAD_DIR-@"
+_config_dir = os.path.dirname(os.path.realpath(__file__))
prefix = os.path.join(_basedir, 'inst')
checkoutroot = os.path.join(_basedir, 'src')
buildroot = os.path.join(_basedir, 'build')
commit c3f1da3ee613aa0546490e1c80336a6533de0bfa
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jul 29 10:20:52 2017 -0700
Generalize libicu version to avoid problems when MinGW64 updates to new version.
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index b49a30a..5f7c2cf 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -148,9 +148,9 @@ Source: "@MINGW_DIR@\bin\libharfbuzz-0.dll"; DestDir: "{app}\bin"; Components: m
Source: "@MINGW_DIR@\bin\libharfbuzz-icu-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libhogweed-4.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libiconv-2.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\libicudt57.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\libicuin57.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\libicuuc57.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libicudt*.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libicuin*.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libicuuc*.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libidn-11.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libintl-8.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libjavascriptcoregtk-3.0-0.dll"; DestDir: "{app}\bin"; Components: main
commit c2e01c1fc89a8b489da50b31a992230e12eb221f
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Jul 28 12:41:31 2017 -0700
Add jhbuildrc to .gitignore.
diff --git a/.gitignore b/.gitignore
index ddafeed..0be45ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
custom.sh
+jhbuildrc
*~
commit 38cea9a5a9058adedce3e6ab39fca05f792c8527
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Jul 28 12:39:43 2017 -0700
Add script and inno .iss file for bundling gnucash built under mingw64.
diff --git a/bundle-mingw64.ps1 b/bundle-mingw64.ps1
new file mode 100644
index 0000000..d2bd9e5
--- /dev/null
+++ b/bundle-mingw64.ps1
@@ -0,0 +1,135 @@
+# bundle-mingw64.ps1: Powershell Script to create gnucash-setup.exe on MinGW64.
+# Copyright 2017 John Ralls <jralls at ceridwen.us>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, contact:
+# Free Software Foundation Voice: +1-617-542-5942
+# 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652
+# Boston, MA 02110-1301, USA gnu at gnu.org
+
+<#
+.SYNOPSIS
+
+Runs Inno-Setup to create a gnucash installer program.
+
+.DESCRIPTION
+
+Creates a gnucash installer program from a GnuCash build environment created with setup-mingw64.ps1 in which GnuCash has been built with jhbuild using the jhbuildrc and gnucash.modules from gnucash-on-windows.git.
+
+This script must not be moved from the gnucash-on-windows.git working directory.
+
+You may need to allow running scripts on your computer and depending
+on where the target_dir is you may need to run the script with
+Administrator privileges.
+
+.PARAMETER target_dir
+
+Optional. The root path to the build environment. Defaults to the root of the script's path, e.g. if the script's path is C:\gcdev64\src\gnucash-on-windows.git\bundle-mingw64.ps1 the default target_dir will be C:\gcdev64.
+
+#>
+
+[CmdletBinding()]
+Param([Parameter()] [string]$target_dir)
+
+$script_dir = Split-Path $script:MyInvocation.MyCommand.Path
+$root_dir = Split-Path $script_dir | Split-Path
+$package = "gnucash"
+if (!$target_dir) {
+ $target_dir = $root_dir
+}
+
+$progressPreference = 'silentlyContinue'
+
+try {
+ $signature =
+ ' [DllImport("kernel32.dll")]
+ public static extern bool GetBinaryType(string lpApplicationName,
+ ref int lpBinaryType);'
+ add-type -MemberDefinition $signature -Name BinaryType -Namespace Win32Utils
+}
+catch {} #type already loaded, ignore problem.
+
+function bitness([string]$path) {
+ $type = -1
+ $result = [Win32Utils.BinaryType]::GetBinaryType($path, [ref]$type)
+ if ($type -eq 6) { 64 } else { 32 }
+}
+
+function version_item([string]$tag, [string]$path) {
+ $splits = select-string -pattern $tag -path $path | %{$_ -split "\s+"}
+ $splits[2]
+}
+
+function bash-command() {
+ param ([string]$command = "")
+ if (!(test-path -path $target_dir\msys2\usr\bin\bash.exe)) {
+ write-host "Shell program not found, aborting."
+ return
+ }
+ #write-host "Running bash command ""$command"""
+ Start-Process -FilePath "$target_dir\msys2\usr\bin\bash.exe" -ArgumentList "-c ""export PATH=/usr/bin; $command""" -NoNewWindow -Wait
+}
+
+function make-unixpath([string]$path) {
+ $path -replace "^([A-Z]):", '/$1' -replace "\\", '/'
+}
+
+$gnc_config_h = "$target_dir\build\gnucash-git\src\config.h"
+$gnc_vcsinfo_h = "$target_dir\build\gnucash-git\src\core-utils\gnc-vcs-info.h"
+
+$major_version = version_item -tag "GNUCASH_MAJOR_VERSION" -path $gnc_config_h
+$minor_version = version_item -tag "GNUCASH_MINOR_VERSION" -path $gnc_config_h
+$micro_version = version_item -tag "GNUCASH_MICRO_VERSION" -path $gnc_config_h
+$package_version = "$major_version.$minor_version.$micro_version"
+$inst_dir = "$target_dir\inst"
+$mingw_ver = bitness("$inst_dir\bin\gnucash.exe")
+$aqb_dir = version_item -tag "SO_EFFECTIVE "-path "$inst_dir\include\aqbanking5\aqbanking\version.h"
+$gwen_dir = version_item -tag "SO_EFFECTIVE " -path "$inst_dir\include\gwenhywfar4\gwenhywfar\version.h"
+
+# We must use sed under bash in order to preserve the UTF-8 encoding
+# with Unix line endings; PowerShell wants to re-code the output as
+# UTF-16 and Inno Setup finds that indigestible. The ridiculous number
+# of backslashes is due to bash and sed eating them. It results in a
+# single backslash in the output file. Inno Setup doesn't understand
+# forward slashes as path delimiters.
+
+$target = %{$target_dir -replace "\\", "\\\\\\\\"}
+$script = %{$script_dir -replace "\\", "\\\\\\\\"}
+$issue_in = make-unixpath -path $script_dir\inno_setup\gnucash-mingw64.iss
+$issue_out = make-unixpath -path $target_dir\gnucash.iss
+$proc = bash-command("sed < $issue_in > $issue_out \
+ -e ""s#@MINGW_DIR@#$target\\\\\\\\msys2\\\\\\\\mingw$mingw_ver#g"" \
+ -e ""s#@INST_DIR@#$target\\\\\\\\inst#g"" \
+ -e ""s#@-gwenhywfar_so_effective-@#$gwen_ver#g"" \
+ -e ""s#@-aqbanking_so_effective-@#$aqb_Dir#g"" \
+ -e ""s#@PACKAGE_VERSION@#$package_version#g"" \
+ -e ""s#@PACKAGE@#$package#g"" \
+ -e ""s#@GNUCASH_MAJOR_VERSION@#$major_version#g"" \
+ -e ""s#@GNUCASH_MINOR_VERSION@#$minor_version#g"" \
+ -e ""s#@GNUCASH_MICRO_VERSION@#$micro_version#g"" \
+ -e ""s#@GC_WIN_REPOS_DIR@#$script#g"" ")
+
+$vcs_rev = version_item -tag "GNUCASH_SCM_REV" -path $gnc_vcsinfo_h | %{$_ -replace """", ""}
+
+$date = get-date -format "yyyy-MM-dd"
+$setup_result = "$target_dir\gnucash-$package_version-setup.exe"
+$final_file = "$target_dir\gnucash-$package_version-$date-git-$vcs_rev-setup.exe"
+if (test-path -path $setup_result) {
+ remove-item -path $setup_result
+}
+& ${env:ProgramFiles(x86)}\inno\iscc /Q $target_dir\gnucash.iss
+
+if ((test-path -path $setup_result) -and (test-path -path $final_file)) {
+ remove-item $final_file
+}
+rename-item -path $setup_result $final_file
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
new file mode 100644
index 0000000..b49a30a
--- /dev/null
+++ b/inno_setup/gnucash-mingw64.iss
@@ -0,0 +1,861 @@
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Input configuration for the Inno Setup Compiler
+; Copyright (c) 2004-2005 Christian Stimming <stimming at tuhh.de>
+; Copyright 2017 John Ralls <jralls at ceridwen.us>
+; Inno Setup Compiler: See http://www.jrsoftware.org/isdl.php
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[Setup]
+; Using the name here directly because we want it capitalized
+AppName=GnuCash
+AppVerName=GnuCash @PACKAGE_VERSION@
+AppPublisher=GnuCash Development Team
+AppPublisherURL=http://www.gnucash.org
+AppSupportURL=http://www.gnucash.org
+AppUpdatesURL=http://www.gnucash.org
+VersionInfoVersion=@PACKAGE_VERSION@
+DefaultDirName={pf}\@PACKAGE@
+DefaultGroupName=GnuCash
+LicenseFile=@INST_DIR@\share\doc\@PACKAGE@\COPYING
+Compression=lzma
+MinVersion=5.0
+PrivilegesRequired=poweruser
+OutputDir=.
+OutputBaseFilename=@PACKAGE at -@PACKAGE_VERSION at -setup
+UninstallFilesDir={app}\uninstall\@PACKAGE@
+InfoAfterFile=@INST_DIR@\share\doc\@PACKAGE@\README.win32-bin.txt
+SetupIconFile=@INST_DIR@\share\@PACKAGE@\pixmaps\gnucash-icon.ico
+WizardSmallImageFile=@INST_DIR@\share\@PACKAGE@\pixmaps\gnucash-icon-48x48.bmp
+
+[Types]
+Name: "full"; Description: "{cm:FullInstall}"
+Name: "custom"; Description: "{cm:CustomInstall}"; Flags: iscustom
+
+[Components]
+Name: "main"; Description: "{cm:MainFiles}"; Types: full custom; Flags: fixed
+;Name: "translations"; Description: "{cm:TranslFiles}"; Types: full
+;Name: "templates"; Description: "{cm:TemplFiles}"; Types: full
+
+[Tasks]
+Name: desktopicon; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"
+Name: menuicon; Description: "{cm:CreateMenuLink}"; GroupDescription: "{cm:AdditionalIcons}"
+
+[Icons]
+Name: "{group}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "{code:GetDocPath}"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: menuicon
+Name: "{group}\{cm:IconName_README}"; Filename: "{app}\doc\@PACKAGE@\{cm:IconFilename_README}"; Comment: "{cm:IconComment_README}"; Tasks: menuicon
+Name: "{group}\{cm:IconName_FAQ}"; Filename: "http://wiki.gnucash.org/wiki/FAQ"; Tasks: menuicon
+Name: "{group}\{cm:IconName_Bugzilla}"; Filename: "http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash"; Tasks: menuicon
+Name: "{group}\{cm:IconName_InstallFQ}"; Filename: "{app}\bin\install-fq-mods.cmd"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_InstallFQ}"; Tasks: menuicon
+Name: "{group}\{cm:IconName_Theme}"; Filename: "{app}\bin\gtk2_prefs.exe"; WorkingDir: "{app}\bin"; Tasks: menuicon
+Name: "{group}\{cm:IconName_Uninstall}"; Filename: "{uninstallexe}"; Comment: "{cm:IconComment_Uninstall}"; Tasks: menuicon
+
+Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "{code:GetDocPath}"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: desktopicon
+
+[Run]
+Filename: "{app}\bin\@PACKAGE at .exe"; Description: "{cm:RunPrg}"; WorkingDir: "{code:GetDocPath}"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent
+Filename: "{app}\bin\guile.cmd"; Flags: runhidden
+
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Here we configure the included files and the place of their
+; installation
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+[Files]
+;;;; The first section retrieves files built with jhbuild from the prefix directory.
+; The main executables and DLLs
+Source: "@INST_DIR@\bin\*"; DestDir: "{app}\bin"; Flags: recursesubdirs ignoreversion; Components: main
+Source: "@INST_DIR@\etc\*"; DestDir: "{app}\etc"; Flags: recursesubdirs; Components: main
+Source: "@INST_DIR@\etc\@PACKAGE@\environment"; DestDir: "{app}\etc\@PACKAGE@"; Components: main; AfterInstall: MyAfterInstallEnvironment()
+; Note: The above AfterInstall function will adapt the
+; environment config file on-the-fly by the Pascal script below.
+Source: "@INST_DIR@\lib\*"; DestDir: "{app}\lib"; Flags: recursesubdirs; Components: main
+Source: "@INST_DIR@\lib\gnucash\scm\ccache\2.0\*"; DestDir: "{app}\lib\gnucash\scm\ccache\2.0"; Flags: recursesubdirs; Components: main
+Source: "@INST_DIR@\lib\guile\2.0\ccache\*"; DestDir: "{app}\lib\guile\2.0\ccache"; Flags: recursesubdirs; Components: main
+Source: "@INST_DIR@\lib\dbd\*.dll"; DestDir: "{app}\lib"; Components: main
+Source: "@INST_DIR@\lib\aqbanking\*"; DestDir: "{app}\lib\aqbanking"; Excludes: "*.dll.a"; Flags: recursesubdirs; Components: main
+Source: "@INST_DIR@\lib\gwenhywfar\*"; DestDir: "{app}\lib\gwenhywfar"; Excludes: "*.dll.a"; Flags: recursesubdirs; Components: main
+;; We don't have anything in libexec anymore at the moment
+;Source: "@INST_DIR@\libexec\*"; DestDir: "{app}\libexec"; Flags: recursesubdirs; Components: main
+Source: "@INST_DIR@\share\*"; DestDir: "{app}\share"; Flags: recursesubdirs; Components: main
+
+;; The translations
+;Source: "@INST_DIR@\share\locale\*"; DestDir: "{app}\share\locale"; Flags: recursesubdirs; Components: translations
+;
+;; The account templates
+;Source: "@INST_DIR@\share\@PACKAGE@\accounts\*"; DestDir: "{app}\share\@PACKAGE@\accounts"; Flags: recursesubdirs; Components: templates
+
+; And all the documentation
+Source: "@INST_DIR@\share\doc\@PACKAGE@\README"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@INST_DIR@\share\doc\@PACKAGE@\README.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@INST_DIR@\share\doc\@PACKAGE@\README-de.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@INST_DIR@\share\doc\@PACKAGE@\README-fr.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@INST_DIR@\share\doc\@PACKAGE@\README-it.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@INST_DIR@\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@INST_DIR@\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@INST_DIR@\share\doc\@PACKAGE@\COPYING"; DestDir: "{app}\doc\@PACKAGE@"; Flags: ignoreversion; Components: main
+Source: "@INST_DIR@\share\doc\@PACKAGE@\AUTHORS"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@INST_DIR@\share\doc\@PACKAGE@\ChangeLog"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+
+;;;; The second section retrieves the dependencies that we need from MinGW.
+;; Required DLLs
+;; gnucash.exe: libglib-2.0-0.dll, libgtk-3-0.dll, ligdk-3-0.dll, libatk-1.0-dll, libgobject-2.0-0.dll, libintl-8.dll, libcairo-gobject-2.dll, libcairo-2.dll, libfontconfig-1.0.dll, libfreetype-6.dll, libpixman-1-0.dll, libpng16-16.dll, zlib1.dll, libgdk-pixbuf-2.0-0.dll, libgio-2.0-0.dll, libgmodule-2.0-0.dll, libpango-1.0-0.dll, libpangocairo-1.0-0.dll, libpangowin32-1.0-0.dll, libpangoft2-1.0-0.dll, libharfbuzz-0.dll, libiconv-2.dll, libwinpthread-1.dll, libsystre-0.dll, libxml2-2.dll, libxslt-1.dll, libboost_regex-mt.dll, libicuuc57.dll, libicudt57.dll, libtre-5.dll, libffi-6.dll, libgmp-10.dll, libltdl-7.dll
+;; AQBanking: libgcrypt-20.dll, libgnutls-30.dll, libwinpthread-1.0.dll, libgmp-10.dll, libhogweed-4.dll, libidn-11.dll, libintl-8.dll, libnettle-6.dll, libp11-kit-0.dll, libtasn1-6.dll, zlib1.dll, libgpg-error-0.dll, libiconv-2.dll, libintl-8.dll, libgtk-win32-2.0-0.dll
+;; libwebkit: libenchant.dll, libgeoclue-0.dll, libgstapp-1.0-0.dll, libgstaudio-1.0-0.dll, libgstbase-1.0-0.dll, libgstfft-1.0-0.dll, libgstpbutils-1.0-0.dll, libgstpbutils-1.0-0.dll, libgstreamer-1.0-0.dll, libgstvideo-1.0-0.dll, libharfbuzz-icu-0.dll, liborc-0.4-0.dll, libgsttag-1.0-0.dll, libgraphite2.dll, libicuin57.dll, liicuuc57.dll, libicudt57.dll, libsoup-2.4-1.dll, libsqlite3-0.dll, libwebp-7.dll
+;;lib/dbd/libdbdmysql.dll: mariadb.dll, libeay32.dll, ssleay32.dll
+;;lib/dbd/libdbdpgsql.dll: libpq.dll, ssleay32.dll, libeay32.dll
+
+Source: "@MINGW_DIR@\bin\libatk-1.0-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libboost_locale-mt.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libboost_regex-mt.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libboost_system-mt.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libboost_thread-mt.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libbz2-1.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libcairo-2.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libcairo-gobject-2.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libdbus-1-3.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libdbus-glib-1-2.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libeay32.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libenchant.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libepoxy-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libexpat-1.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libffi-6.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libfontconfig-1.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libfreetype-6.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libgcrypt-20.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libgdk-3-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libgdk-win32-2.0-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libgdk_pixbuf-2.0-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libgeoclue-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libgio-2.0-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libglib-2.0-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libgmodule-2.0-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libgmp-10.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libgnutls-30.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libgobject-2.0-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libgpg-error-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libgraphite2.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libgstapp-1.0-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libgstaudio-1.0-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libgstbase-1.0-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libgstfft-1.0-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libgstpbutils-1.0-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libgstpbutils-1.0-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libgstreamer-1.0-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libgsttag-1.0-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libgstvideo-1.0-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libgtk-3-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libgtk-win32-2.0-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libharfbuzz-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libharfbuzz-icu-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libhogweed-4.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libiconv-2.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libicudt57.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libicuin57.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libicuuc57.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libidn-11.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libintl-8.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libjavascriptcoregtk-3.0-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libjpeg-8.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libltdl-7.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\liblzma-5.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libnettle-6.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\liborc-0.4-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libp11-kit-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libpango-1.0-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libpangocairo-1.0-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libpangoft2-1.0-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libpangowin32-1.0-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libpixman-1-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libpcre-1.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libpng16-16.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libpq.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libsoup-2.4-1.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libsqlite3-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libsystre-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libtasn1-6.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libtre-5.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libwebp-7.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libwebkitgtk-3.0-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libwinpthread-1.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libxml2-2.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libxslt-1.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\mariadb.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\ssleay32.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\zlib1.dll"; DestDir: "{app}\bin"; Components: main
+
+Source: "@MINGW_DIR@\share\icons\*"; DestDir: "{app}\share\icons"; Flags: recursesubdirs; Components: main
+Source: "@MINGW_DIR@\share\locale\*"; Destdir: "{app}\share\locale"; Flags: recursesubdirs; Components: main
+Source: "@MINGW_DIR@\etc\gtk-2.0\*"; Destdir: "{app}\etc\gtk-2.0"; Flags: recursesubdirs; Components: main
+Source: "@MINGW_DIR@\etc\gtk-3.0\*"; Destdir: "{app}\etc\gtk-3.0"; Flags: recursesubdirs; Components: main
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Define the registry keys Setup should create (HKLM = HKEY_LOCAL_MACHINE)
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+[Registry]
+Root: HKCR; Subkey: ".gnucash"; ValueType: string; ValueName: ""; ValueData: "GnuCash.Financial.Data"; Flags: uninsdeletevalue
+Root: HKCR; Subkey: ".gnucash"; ValueType: string; ValueName: "Content Type"; ValueData: "application/x-gnucash"; Flags: uninsdeletevalue
+Root: HKCR; Subkey: "GnuCash.Financial.Data"; ValueType: string; ValueName: ""; ValueData: "GnuCash Financial Data"; Flags: uninsdeletevalue
+Root: HKCR; Subkey: "GnuCash.Financial.Data\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico,0"
+Root: HKCR; Subkey: "GnuCash.Financial.Data\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\bin\@PACKAGE at .exe"" ""%1"""
+
+Root: HKLM; Subkey: "Software\GnuCash"; ValueType: none; Flags: uninsdeletekeyifempty
+Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: none; Flags: uninsdeletekeyifempty
+Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "prefix"; ValueData: "{app}"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\GnuCash"; ValueType: string; ValueName: "InstallationDirectory"; ValueData: "{app}"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "libdir"; ValueData: "{app}\lib"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "pkglibdir"; ValueData: "{app}\lib\@PACKAGE@"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "sysconfdir"; ValueData: "{app}\etc"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "localedir"; ValueData: "{app}\share\locale"; Flags: uninsdeletevalue
+
+; Store the version information
+Root: HKLM; Subkey: "Software\GnuCash\Version"; ValueType: none; Flags: uninsdeletekeyifempty
+Root: HKLM; Subkey: "Software\GnuCash\Version"; ValueType: string; ValueName: "Version"; ValueData: "@PACKAGE_VERSION@"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\GnuCash\Version"; ValueType: dword; ValueName: "VersionMajor"; ValueData: "@GNUCASH_MAJOR_VERSION@"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\GnuCash\Version"; ValueType: dword; ValueName: "VersionMinor"; ValueData: "@GNUCASH_MINOR_VERSION@"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\GnuCash\Version"; ValueType: dword; ValueName: "VersionMicro"; ValueData: "@GNUCASH_MICRO_VERSION@"; Flags: uninsdeletevalue
+
+; Additionally, we have to install the paths for gwenhywfar
+Root: HKLM; Subkey: "Software\Gwenhywfar"; ValueType: none; Flags: uninsdeletekeyifempty
+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\@-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
+
+; And we also need some registry keys for aqbanking
+Root: HKLM; Subkey: "Software\Aqbanking"; ValueType: none; Flags: uninsdeletekeyifempty
+Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: none; Flags: uninsdeletekeyifempty
+Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "providerdir"; ValueData: "{app}\lib\aqbanking\plugins\@-aqbanking_so_effective-@\providers"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "bankinfodir"; ValueData: "{app}\lib\aqbanking\plugins\@-aqbanking_so_effective-@\bankinfo"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "importerdir"; ValueData: "{app}\lib\aqbanking\plugins\@-aqbanking_so_effective-@\imexporters"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "wizarddir"; ValueData: "{app}\lib\aqbanking\plugins\@-aqbanking_so_effective-@\wizards"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "pkgdatadir"; ValueData: "{app}\share\aqbanking"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "sysconfdir"; ValueData: "{app}\etc"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "localedir"; ValueData: "{app}\share\locale"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\AqBanking\Paths"; ValueType: string; ValueName: "xmldatadir"; ValueData: "{app}\share\aqhbci\xml"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\AqBanking\Paths"; ValueType: string; ValueName: "cfgmoduledir"; ValueData: "{app}\lib\aqbanking\plugins\@-aqbanking_so_effective-@\frontends\qbanking\cfgmodules"; Flags: uninsdeletevalue
+
+
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Delete the created config script on uninstall
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+[UninstallDelete]
+Type: files; Name: "{app}\bin\guile.cmd"
+Type: files; Name: "{app}\etc\@PACKAGE@\environment"
+Type: filesandordirs; Name: "{app}\share\guile"
+Type: dirifempty; Name: "{app}\etc\@PACKAGE@"
+Type: dirifempty; Name: "{app}\etc"
+
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Perform some additional actions in code that can't be done
+; by the installer by default. The code snippets below hook
+; into the installer code at specific events. See
+; http://www.jrsoftware.org/ishelp/index.php?topic=scriptintro
+; for more information on iss scription and a syntax reference.
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+[Code]
+var
+ PrevInstDetectedPage : TOutputMsgWizardPage;
+ PrevAppName, PrevUninstallString : String;
+ PrevVersionMajor, PrevVersionMinor, PrevVersionMicro : Cardinal;
+ Uninstallrequired : Boolean;
+
+// ----------------------------------------------------------------
+// Sometimes it's not possible to install a newer version of
+// GnuCash over an older one on Windows. This happens for example
+// when libraries or reports are moved around in the newer version.
+// The code below will detect an existing GnuCash installation
+// and will remove it (if the user accepts) before installing
+// the version the user has selected.
+// ----------------------------------------------------------------
+
+{ Lookup the registry information on a previous installation }
+procedure GetPrevInstallInfo();
+var
+ sUnInstPath, sAppVersionPath: String;
+ rootKey : Integer;
+begin
+ sAppVersionPath := 'Software\GnuCash\Version';
+ sUnInstPath := 'Software\Microsoft\Windows\CurrentVersion\Uninstall\GnuCash_is1';
+
+ PrevAppName := '';
+ PrevUninstallString := '';
+ PrevVersionMajor := 0;
+ PrevVersionMinor := 0;
+ PrevVersionMicro := 0;
+
+ if RegKeyExists(HKLM, sUnInstPath) then
+ rootKey := HKLM
+ else
+ rootKey := HKCU;
+
+ RegQueryStringValue(rootKey, sUnInstPath, 'UninstallString', PrevUninstallString);
+ RegQueryStringValue(rootKey, sUnInstPath, 'DisplayName', PrevAppName);
+ RegQueryDwordValue(rootKey, sAppVersionPath, 'VersionMajor', PrevVersionMajor);
+ RegQueryDwordValue(rootKey, sAppVersionPath, 'VersionMinor', PrevVersionMinor);
+ RegQueryDwordValue(rootKey, sAppVersionPath, 'VersionMicro', PrevVersionMicro);
+end;
+
+{ Check if there is another GnuCash currently installed }
+{ If so, the user will be prompted if it can be uninstalled first. }
+{ If the user doesn't allow uninstall, the installation will be aborted. }
+procedure CheckUninstallRequired();
+begin
+ UninstallRequired := True;
+ GetPrevInstallInfo;
+
+ if (PrevUninstallString = '') then
+ UninstallRequired := False
+// We used to check on major-minor versions to determine the uninstall requirement,
+// but this is not always sufficient. So the following code won't be used until
+// refined.
+// else if (PrevVersionMajor = @GNUCASH_MAJOR_VERSION@) and (PrevVersionMinor = @GNUCASH_MINOR_VERSION@) then
+// UninstallRequired := False;
+end;
+
+{ Uninstall the current installation }
+function UnInstallOldVersion(): Integer;
+var
+ sUnInstallString: String;
+ iResultCode: Integer;
+begin
+// Return Values:
+// 1 - uninstall string is empty
+// 2 - error executing the UnInstallString
+// 3 - successfully executed the UnInstallString
+
+ // default return value
+ Result := 0;
+
+ if PrevUninstallString <> '' then begin
+ sUnInstallString := RemoveQuotes(PrevUninstallString);
+ if Exec(sUnInstallString, '/SILENT /NORESTART /SUPPRESSMSGBOXES','', SW_HIDE, ewWaitUntilTerminated, iResultCode) then
+ Result := 3
+ else
+ Result := 2;
+ end else
+ Result := 1;
+end;
+
+function GetPrevAppName(Param: String): String;
+begin
+ Result := PrevAppName;
+end;
+
+{ Setup a page to display if a previous (incompatible) GnuCash installation is found }
+procedure InitializeWizard;
+begin
+ CheckUninstallRequired;
+ PrevInstDetectedPage := CreateOutputMsgPage(wpReady,
+ ExpandConstant('{cm:AIWP_Title}'),
+ ExpandConstant('{cm:AIWP_Description,{code:GetPrevAppName}}'),
+ ExpandConstant('{cm:AIWP_Message,{code:GetPrevAppName}}'));
+end;
+
+{ Determine whether the previous installation page should be displayed or not }
+function ShouldSkipPage(PageID: Integer): Boolean;
+begin
+ Result := False
+ if (PageID = PrevInstDetectedPage.ID) and (not UninstallRequired) then
+ Result := True;
+end;
+
+{ If a previous (incompatible) installation is present start the installation }
+{ process with deleting this old installation }
+procedure CurStepChanged(CurStep: TSetupStep);
+begin
+ if (CurStep=ssInstall) and (UninstallRequired) then
+ UnInstallOldVersion();
+end;
+
+// ------------------------------------------------------------
+// The GnuCash environment file contains paths that have to be
+// adapted at install time. The code below does that.
+// ------------------------------------------------------------
+function MingwBacksl(const S: String): String;
+begin
+ { Modify the path name S so that it can be used by MinGW }
+ if Length(ExtractFileDrive(S)) = 0 then
+ Result := S
+ else begin
+ Result := '/'+S;
+ StringChange(Result, ':\', '\');
+ end;
+ StringChange(Result, '\', '/');
+end;
+
+procedure MyAfterInstallConfig();
+var
+ FileName, FileString, appdir, libdir, pkglibdir, pkgdatadir: String;
+ Res: Boolean;
+begin
+
+ { Get the installation-specific paths }
+ appdir := ExpandConstant('{app}');
+ pkgdatadir := appdir + '\share\@PACKAGE@';
+
+ { Create the guile.cmd file; #10 is the linefeed character and #13 CR }
+
+ FileName := appdir + '\bin\guile.cmd' ;
+ FileString := 'set GUILE_LOAD_PATH=' + pkgdatadir + '\scm;' + appdir + '\share\guile\1.8;%GUILE_LOAD_PATH%'#13#10 ;
+ FileString := FileString + 'start guile.exe %*'#13#10 ;
+
+ { Save the final file }
+
+ Res := SaveStringToFile(FileName, FileString, False);
+ if Res = False then
+ MsgBox('Error on saving '+FileName+' for completing the installation', mbInformation, MB_OK);
+
+end;
+
+function BackslashPath(const S: String): String;
+begin
+ { Convert c:\soft to c:/soft }
+ Result := S;
+ StringChange(Result, '\', '/');
+end;
+
+procedure MyAfterInstallEnvironment();
+var
+ EnvFile, EtcDir: String;
+ iLineCounter, iSize : Integer;
+ EnvStrList: TArrayOfString;
+ Res: Boolean;
+begin
+ { Make some Windows-only changes to the etc/@PACKAGE@/environment file }
+ { If you make any changes here, you should probably also change the equivalent sections }
+ { in install.sh }
+ { A new line is stared with #13#10 - #10 is the linefeed character and #13 CR }
+
+ { Get the installation-specific paths }
+ EnvFile := ExpandConstant(CurrentFileName);
+ EtcDir := ExtractFileDir(EnvFile);
+
+ { Load the current contents of the environment file }
+ Res := LoadStringsFromFile(EnvFile, EnvStrList);
+ if Res = False then
+ MsgBox('Error on reading ' + EnvFile + ' for completing the installation', mbInformation, MB_OK);
+
+ iSize := GetArrayLength(EnvStrList);
+ for iLineCounter := 0 to iSize-1 do
+ begin
+ { Adapt GUILE_LOAD_PATH parameter and prevent cygwin interference in SCHEME_LIBRARY_PATH }
+ if (Pos('GUILE_LOAD_PATH', EnvStrList[iLineCounter]) = 1) then
+ begin
+ StringChangeEx(EnvStrList[iLineCounter], '{GUILE_LOAD_PATH}', '{GNC_HOME}/share/guile/1.8;{GUILE_LOAD_PATH}', True);
+
+ EnvStrList[iLineCounter] := EnvStrList[iLineCounter] + #13#10 + '# Clear SCHEME_LIBRARY_PATH to prevent interference from other guile installations (like cygwin)' + #13#10;
+ EnvStrList[iLineCounter] := EnvStrList[iLineCounter] + 'SCHEME_LIBRARY_PATH=' + #13#10;
+ end;
+ { Adapt GNC_DBD_DIR parameter }
+ if (Pos('GNC_DBD_DIR', EnvStrList[iLineCounter]) > 0) then
+ EnvStrList[iLineCounter] := 'GNC_DBD_DIR={GNC_HOME}/lib/dbd';
+ { Adapt XDG_DATA_DIRS parameter }
+ if (Pos('XDG_DATA_DIRS=', EnvStrList[iLineCounter]) > 0) then
+ EnvStrList[iLineCounter] := 'XDG_DATA_DIRS={GNC_HOME}/share;{XDG_DATA_DIRS};/usr/local/share;/usr/share';
+ end;
+
+ { Save the final file }
+ Res := ForceDirectories(EtcDir);
+ if Res = False then
+ MsgBox('Error on creating ' + EtcDir + ' for completing the installation', mbInformation, MB_OK);
+
+ Res := SaveStringsToFile(EnvFile, EnvStrList, False);
+ if Res = False then
+ MsgBox('Error on saving ' + EnvFile + ' for completing the installation', mbInformation, MB_OK);
+end;
+
+// Sometimes a user either doesn't have a CSIDL_PERSONAL setting or
+// it's invalid. This function tests is and if that's the case returns
+// CSIDL_COMMON_DOCUMENTS. Code lifted from
+// http://stackoverflow.com/questions/28635548/avoiding-failed-to-expand-shell-folder-constant-userdocs-errors-in-inno-setup.
+
+function GetDocPath(Param: string): string;
+var Folder: string;
+begin
+ try
+ // first try to expand the {userdocs} folder; if this raises that
+ // internal exception, you'll fall down to the except block where
+ // you expand the {allusersprofile}
+ Folder := ExpandConstant('{userdocs}');
+ // the {userdocs} folder expanding succeded, so let's test if the
+ // folder exists and if not, expand {allusersprofile}
+ if not DirExists(Folder) then
+ Folder := ExpandConstant('{allusersprofile}');
+ except
+ Folder := ExpandConstant('{allusersprofile}');
+ end;
+ // return the result
+ Result := Folder;
+end;
+
+[Languages]
+Name: "en"; MessagesFile: "compiler:Default.isl"
+Name: "de"; MessagesFile: "compiler:Languages\German.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-de.win32-bin.txt"
+Name: "el"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Greek-4-5.1.11.isl"
+Name: "fr"; MessagesFile: "compiler:Languages\French.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-fr.win32-bin.txt"
+Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-it.win32-bin.txt"
+Name: "ja"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Japanese-5-5.1.11.isl"
+Name: "lv"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Latvian-1-5.1.11.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-lv.win32-bin.txt"
+Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-nl.win32-bin.txt"
+Name: "pt_BR"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
+Name: "zh_CN"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\ChineseSimp-12-5.1.11.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"
+Name: "zh_TW"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\ChineseTrad-2-5.1.11.isl"; InfoAfterFile: "@INST_DIR@\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"
+
+;; The following language files are available as well, in alphabetical
+;; order: Basque, BrazilianPortuguese, Catalan, Czech, Danish, Dutch,
+;; Finnish, Hungarian, Italian, Norwegian, Polish, Portuguese,
+;; Russian, Slovak, Slovenian, Spanish
+
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; These are only for improved text messages
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+[Messages]
+
+[CustomMessages]
+; *** "Select Components" wizard page
+FullInstall=Full installation
+CustomInstall=Custom installation
+CreateDesktopIcon=Create a &desktop icon
+CreateMenuLink=Create a start menu link
+RunPrg=Run GnuCash now
+AdditionalIcons=Create these icons:
+StatusMsgFirewall=Installing Windows firewall rules...
+; *** "Another install" wizard page
+; %1 in the following messages will be replaced with the application name and version, like "GnuCash 2.3.15"
+AIWP_Title=Another installation has been found
+AIWP_Description=%1 is currently installed on this computer
+AIWP_Message=This earlier installation has to be removed before continuing.%n%nIf you don't want that, click Cancel now to abort the current installation.%n%nClick Next to remove %1 and continue with the installation.%n%nNote: Only the program will be removed, not your financial data.
+
+MainFiles=GnuCash Program
+TranslFiles=Translation Files
+TemplFiles=Account Template Files
+
+IconComment_GnuCash=GnuCash Free Finance Manager
+IconName_README=Show GnuCash README
+IconComment_README=Show the README file
+IconFilename_README=README.win32-bin.txt
+IconName_FAQ=GnuCash FAQ (Online)
+IconName_Bugzilla=Report a GnuCash Bug (Online)
+IconName_InstallFQ=Install Online Price Retrieval for GnuCash
+IconComment_InstallFQ=Install the necessary perl module Finance-Quote for online retrieval of prices. Requires ActivePerl or Strawberry Perl 5.8 or later
+IconName_Theme=Select GnuCash Theme
+IconName_Uninstall=Uninstall GnuCash
+IconComment_Uninstall=Uninstall the Finance Manager GnuCash
+
+;; List of Code pages, used in gnucash.cmd
+LanguageCodePage=1252
+de.LanguageCodePage=1252
+el.LanguageCodePage=1253
+fr.LanguageCodePage=1252
+it.LanguageCodePage=1252
+ja.LanguageCodePage=932
+nl.LanguageCodePage=1252
+pt_BR.LanguageCodePage=1252
+zh_CN.LanguageCodePage=936
+zh_TW.LanguageCodePage=950
+
+;; ;;;;;;;;;;;;;;;;;;;;
+;; German translation
+
+de.FullInstall=Komplett-Installation
+de.CustomInstall=Benutzerdefiniert
+de.CreateDesktopIcon=Ein Icon auf dem Desktop erstellen
+de.CreateMenuLink=Eine Verknüpfung im Startmenü erstellen
+de.RunPrg=GnuCash jetzt starten
+de.AdditionalIcons=Folgende Icons erstellen:
+de.StatusMsgFirewall=Windows Firewall für GnuCash automatisch Anpassen (empfohlen)...
+
+de.MainFiles=GnuCash Hauptprogramm
+de.TranslFiles=Deutsche Ãœbersetzung
+de.TemplFiles=Beispiel-Kontenrahmen
+
+de.IconComment_GnuCash=GnuCash OpenSource-Finanzverwaltung
+de.IconName_README=GnuCash README anzeigen
+de.IconComment_README=Die Informationsdatei (README) anzeigen
+de.IconFilename_README=README-de.win32-bin.txt
+de.IconName_FAQ=GnuCash Häufige Fragen (online, engl.)
+de.IconName_Bugzilla=Fehlerbericht einsenden für GnuCash (online, engl.)
+de.IconName_InstallFQ=Erweiterung um Wechselkurse mit GnuCash online abzurufen
+de.IconComment_InstallFQ=Aktien- und Devisenkurse online abrufen (optionales Modul Finance-Quote: Achtung! Erfordert das Programm ActivePerl oder Strawberry Perl 5.8 oder neuer)
+de.IconName_Theme=GnuCash's Erscheinungsbild (GTK-Thema) auswählen
+de.IconName_Uninstall=Deinstallieren von GnuCash
+de.IconComment_Uninstall=Die OpenSource-Finanzverwaltung GnuCash wieder deinstallieren und vom Computer löschen
+
+de.AIWP_Title=Frühere Version gefunden
+de.AIWP_Description=%1 ist momentan auf diesem Computer installiert
+de.AIWP_Message=Diese frühere Version muss vor der neuen Installation entfernt werden. %n%nFalls Sie das nicht möchten, klicken Sie jetzt auf »Abbrechen«.%n%nKlicken Sie auf »Fortsetzen«, um %1 zu entfernen und die neue Version zu installieren.%n%nHinweis: Lediglich die Programmversion wird entfernt, aber nicht Ihre finanziellen Daten.
+
+
+;; ;;;;;;;;;;;;;;;;;;;
+;; Greek translation
+
+el.FullInstall=ΠλήÏης εγκατάσταση
+el.CustomInstall=Î ÏοσαÏμοσμÎνη εγκατάσταση
+el.CreateDesktopIcon=ΔημιουÏγία εικονιδίου στην επιφάνεια εÏγασίας
+el.CreateMenuLink=Î Ïοσθήκη στο Î¼ÎµÎ½Î¿Ï ÎˆÎ½Î±Ïξη
+el.RunPrg=ΕκτÎλεση του GnuCash Ï„ÏŽÏα
+el.AdditionalIcons=ΔημιουÏγία εικονιδίων:
+el.StatusMsgFirewall=Εγκατάσταση κανόνων για το τοίχος Ï€Ïοστασίας των Windows...
+
+el.MainFiles=Î ÏόγÏαμμα GnuCash
+el.TranslFiles=ΑÏχεία μετάφÏασεων
+el.TemplFiles=ΑÏχεία με Ï€Ïότυπα λογαÏιασμών
+
+el.IconComment_GnuCash=GnuCash Ï€ÏόγÏαμμα διαχ. οικονομικών
+el.IconName_README=GnuCash - Εμφάνιση του README
+el.IconComment_README=Εμφάνιση του αÏχείου README
+el.IconFilename_README=README.win32-bin.txt
+el.IconName_FAQ=GnuCash - ΣυχνÎÏ‚ εÏωτήσεις (Online)
+el.IconName_Bugzilla=GnuCash - ΑναφοÏά σφάλματος (Online)
+el.IconName_InstallFQ=GnuCash - Εγκατάσταση λήψης τιμών (online)
+el.IconComment_InstallFQ=Εγκατάσταση του perl module Finance-Quote για λήψη τιμών online. Απαιτεί ActivePerl/Strawberry Perl 5.8+
+el.IconName_Uninstall=Απεγκατάσταση GnuCash
+el.IconComment_Uninstall=Απεγκατάσταση του διαχειÏιστή οικονομικών GnuCash
+
+
+;; ;;;;;;;;;;;;;;;;;;;;
+;; French translation
+
+fr.FullInstall=Installation complète
+fr.CustomInstall=Installation personnalisée
+fr.CreateDesktopIcon=Créer un icône sur le bureau
+fr.CreateMenuLink=Créer un lien dans le menu de démarrage
+fr.RunPrg=Démarrer GnuCash maintenant
+fr.AdditionalIcons=Créer les icônes suivants:
+fr.StatusMsgFirewall=Installation des règles de pare-feu de Windows
+
+fr.MainFiles=Programme GnuCash
+fr.TranslFiles=Traduction française
+fr.TemplFiles=Modèle de plan comptable
+
+fr.IconComment_GnuCash=GnuCash, le gestionnaire financier OpenSource
+fr.IconName_README=Afficher le GnuCash LISEZMOI
+fr.IconComment_README=Afficher le fichier LISEZMOI
+fr.IconFilename_README=README-fr.win32-bin.txt
+fr.IconName_FAQ=GnuCash FAQ (En ligne, en anglais)
+fr.IconName_Bugzilla=Envoyer un rapport d'erreur pour GnuCash (En ligne, en anglais)
+fr.IconName_InstallFQ=Installer les quotations en ligne pour GnuCash
+fr.IconComment_InstallFQ=Installation du module Finance-Quote requis pour le téléchargement du cours des devises et actions. Le programme ActivePerl 5.8 ou plus récent est aussi requis
+fr.IconName_Theme=Selection du style GnuCash
+fr.IconName_Uninstall=Dé-installer GnuCash
+fr.IconComment_Uninstall=Désinstalle le gestionnaire financier GnuCash
+
+
+;; ;;;;;;;;;;;;;;;;;;;;;
+;; Italian translation
+
+; *** Pagina di "Selezione dei componenti"
+it.FullInstall=Installazione completa
+it.CustomInstall=Installazione personalizzata
+it.CreateDesktopIcon=Crea un'icona sul desktop
+it.CreateMenuLink=Crea un collegamento nel menu "Start"
+it.RunPrg=Avvia GnuCash
+it.AdditionalIcons=Crea queste icone:
+it.StatusMsgFirewall=Installazione delle regole per il firewall di Windows...
+; *** Pagina di "Altra installazione"
+; nel messaggio seguente la stringa %1 sarà sostituita dal nome e dalla versione dell'applicazione, ad esempio "GnuCash 2.3.15"
+it.AIWP_Title=È stata trovata un'altra installazione
+it.AIWP_Description=%1 è installato in questo computer
+it.AIWP_Message=Questa precedente installazione deve essere rimossa prima di continuare.%n%nSe non si intende rimuoverla, fare clic su «Annulla» per terminare l'installazione.%n%nFare invece clic su «Avanti» per rimuovere %1 e continuare con l'installazione.%n%nNota: verrà rimosso solo il programma, non i propri dati finanziari.
+
+it.MainFiles=File del programma GnuCash
+it.TranslFiles=Traduzione Italiana
+it.TemplFiles=Modelli di strutture dei conti
+
+it.IconComment_GnuCash=GnuCash: gestore di finanze libero
+it.IconName_README=Mostra il file GnuCash LEGGIMI
+it.IconComment_README=Mostra il file LEGGIMI
+it.IconFilename_README=README-it.win32-bin.txt
+it.IconName_FAQ=GnuCash FAQ (online, in Inglese)
+it.IconName_Bugzilla=Segnalare un bug en GnuCash (online, in Inglese)
+it.IconName_InstallFQ=Installa la funzione di ricerca delle quotazioni online per GnuCash
+it.IconComment_InstallFQ=Installa il modulo di perl Finance-Quote necessario per ricevere le quotazioni online. Richiede ActivePerl 5.8+
+it.IconName_Theme=Selezione del tema GnuCash
+it.IconName_Uninstall=Disinstalla GnuCash
+it.IconComment_Uninstall=Disinstalla il programma di gestione delle finanze GnuCash
+
+
+;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Japanese translation
+
+ja.FullInstall=完全インストール
+ja.CustomInstall=カスタムインストール
+ja.CreateDesktopIcon=デスクトップã«ã‚¢ã‚¤ã‚³ãƒ³ã‚’作æˆ(&D)
+ja.CreateMenuLink=スタートメニューã«ãƒªãƒ³ã‚¯ã‚’作æˆ
+ja.RunPrg=GnuCashã‚’ã™ãã«å®Ÿè¡Œ
+ja.AdditionalIcons=作æˆã•ã‚ŒãŸã‚¢ã‚¤ã‚³ãƒ³:
+ja.StatusMsgFirewall=ファイアウォール定義をインストールä¸
+; *** "Another install" wizard page
+; %1 in the following messages will be replaced with the application name and version, like "GnuCash 2.3.15"
+ja.AIWP_Title=ä»–ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã™
+ja.AIWP_Description=ã“ã®ã‚³ãƒ³ãƒ”ュータã«ã¯ %1 ãŒç¾åœ¨ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã™
+ja.AIWP_Message=インストールを継続ã™ã‚‹å‰ã«å‰ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¯ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¾ã™ã€‚%n%nã‚‚ã—ã“ã®å‹•ä½œã‚’望ã¾ãªã„ãªã‚‰ã€Œã‚ャンセルã€ã‚’クリックã—ã¦ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’ä¸æ¢ã—ã¦ãã ã•ã„。%n%n%1 を削除ã—ã¦ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’継続ã™ã‚‹å ´åˆã¯ã€Œæ¬¡ã¸ã€ã‚’クリックã—ã¦ãã ã•ã„。%n%n備考: 作æˆã—ãŸè²¡å‹™ãƒ‡ãƒ¼ã‚¿ã¯å‰Šé™¤ã•ã‚Œã¾ã›ã‚“。プãƒã‚°ãƒ©ãƒ ã®ã¿ãŒå‰Šé™¤ã•ã‚Œã¾ã™ã€‚
+
+ja.MainFiles=GnuCashプãƒã‚°ãƒ©ãƒ
+ja.TranslFiles=翻訳ファイル
+ja.TemplFiles=勘定科目テンプレートファイル
+
+ja.IconComment_GnuCash=GnuCash フリーã®è²¡å‹™ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢
+ja.IconName_README=GnuCash - READMEを表示
+ja.IconComment_README=READMEファイルを表示ã—ã¾ã™
+ja.IconFilename_README=README.win32-bin.txt
+ja.IconName_FAQ=GnuCash - FAQ (オンライン)
+ja.IconName_Bugzilla=GnuCash - ãƒã‚°ã‚’å ±å‘Š (オンライン)
+ja.IconName_InstallFQ=GnuCash - ã‚ªãƒ³ãƒ©ã‚¤ãƒ³ç›¸å ´è¡¨å–得ツールをインストール
+ja.IconComment_InstallFQ=ã‚ªãƒ³ãƒ©ã‚¤ãƒ³ç›¸å ´è¡¨ã‚’å–å¾—ã™ã‚‹ãŸã‚ã«Finance-Quote perl モジュールをインストールã—ã¾ã™ã€‚ActivePerl5.8ã¾ãŸã¯5.10ãŒå¿…è¦ã§ã™
+ja.IconName_Theme=GnuCash テーマã®é¸æŠž
+ja.IconName_Uninstall=GnuCashをアンインストール
+ja.IconComment_Uninstall=財務ソフトウェアGnuCashをアンインストールã—ã¾ã™
+
+
+;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Latvian translation
+
+; *** "Select Components" wizard page
+lv.FullInstall=Pilna uzstÄdÄ«Å¡ana
+lv.CustomInstall=IzvÄ“les uzstÄdÄ«Å¡ana
+lv.CreateDesktopIcon=Izveidot &darbvirsmas ikonu
+lv.CreateMenuLink=Izveidot starta izvēlnes saiti
+lv.RunPrg=Palaist GnuCash tagad
+lv.AdditionalIcons=Izveidot sekojošas ikonas:
+lv.StatusMsgFirewall=UzstÄda Windows ugunssienas likumus...
+
+; *** "Another install" wizard page
+; %1 in the following messages will be replaced with the application name and version, like "GnuCash 2.3.15"
+lv.AIWP_Title=Ir atrasta cita programmas versija
+lv.AIWP_Description=Uz Å¡Ä« datora jau ir uzstÄdÄ«t %1 versija
+lv.AIWP_Message=Pirms turpinÄt, ir nepiecieÅ¡ams noņemt iepriekÅ¡ uzstÄdÄ«to versiju.%n%nJa nevÄ“laties to darÄ«t, spiediet Atcelt pogu, un Å¡Ä« uzstÄdÄ«Å¡ana tiks atcelta.%n%nSpiediet TurpinÄt, lai noņemtu %1 un turpinÄtu jaunÄs versijas uzstÄdÄ«Å¡anu.%n%nNote: Tiks noņemta tikai iepriekÅ¡Ä“jÄs programmas versija. JÅ«su finanÅ¡u dati aiztikti netiks.
+
+lv.MainFiles=GnuCash Programma
+lv.TranslFiles=Tulkojumu faili
+lv.TemplFiles=Kontu sagatavju faili
+
+lv.IconComment_GnuCash=GnuCash grÄmatvedÄ«bas programma
+lv.IconName_README=GnuCash - ParÄdÄ«t README
+lv.IconComment_README=ParÄda README failu
+lv.IconFilename_README=README-lv.win32-bin.txt
+lv.IconName_FAQ=GnuCash - BUJ (tiešsaistē)
+lv.IconName_Bugzilla=GnuCash - Ziņot par kļūdu (tiešsaistē)
+lv.IconName_InstallFQ=GnuCash - UzstÄdÄ«t tieÅ¡saistes kursu iegÅ«Å¡anu
+lv.IconComment_InstallFQ=UzstÄdÄ«t nepiecieÅ¡amos Perl moduļus valÅ«tas kursu iegÅ«Å¡anai. NepiecieÅ¡ams ActivePerl 5.8+
+lv.IconName_Theme=Izvēlieties tēmu GnuCash
+lv.IconName_Uninstall=Noņemt GnuCash
+lv.IconComment_Uninstall=Noņemt GnuCash grÄmatvedÄ«bas programmu
+
+
+;; ;;;;;;;;;;;;;;;;;
+;; Dutch translation
+
+nl.FullInstall=Volledige installatie
+nl.CustomInstall=Aangepaste installatie
+nl.CreateDesktopIcon=Een icoon op het Bureaublad plaatsen
+nl.CreateMenuLink=Een koppeling in menu Start plaatsen
+nl.RunPrg=GnuCash nu starten
+nl.AdditionalIcons=Deze iconen aanmaken:
+nl.StatusMsgFirewall=Windows Firewall-regels installeren...
+
+nl.MainFiles=Programmabestanden voor GnuCash
+nl.TranslFiles=Vertalingsbestanden
+nl.TemplFiles=Grootboekrekeningssjablonen
+
+nl.IconComment_GnuCash=GnuCash vrije boekhoudsoftware
+nl.IconName_README=GnuCash LEESMIJ tonen
+nl.IconComment_README=Het LEESMIJ-bestand weergeven
+nl.IconFilename_README=README-nl.win32-bin.txt
+nl.IconName_FAQ=GnuCash FAQ (online)
+nl.IconName_Bugzilla=Een bug melden in GnuCash (online)
+nl.IconName_InstallFQ=Online koersinformatie installeren voor GnuCash
+nl.IconComment_InstallFQ=De Perl-module Finance-Quote installeren om online koersen op te vragen. Hiervoor is ActivePerl or Strawberry Perl 5.8 of recenter nodig.
+nl.IconName_Theme=Thema voor GnuCash selecteren
+nl.IconName_Uninstall=GnuCash verwijderen
+nl.IconComment_Uninstall=De vrije boekhoudsoftware GnuCash verwijderen
+nl.AIWP_Title=Een eerdere installatie werd gevonden
+nl.AIWP_Description=%1 is momenteel op deze computer geïnstalleerd
+nl.AIWP_Message=Deze eerdere installatie moet verwijderd worden alvorens verder te gaan.%n%nAls u dat niet wil, klik dan nu op Annuleren om de huidige installatie af te breken.%n%nKlik op Volgende om %1 te verwijderen en de installatie te vervolgen.%n%nOpmerking: alleen het programma zal verwijderd worden, niet je financiële gegevens.
+
+
+;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Brazilian Portuguese translation
+
+pt_BR.FullInstall=Instalação Completa
+pt_BR.CustomInstall=Instalação Personalizada
+pt_BR.CreateDesktopIcon=Criar um Ãcone na Ãrea de Trabalho
+pt_BR.CreateMenuLink=Criar um link no menu Iniciar
+pt_BR.RunPrg=Executar o GnuCash agora
+pt_BR.AdditionalIcons=Criar estes Ãcones:
+pt_BR.StatusMsgFirewall=Instalando as regras de firewall do Windows...
+
+pt_BR.MainFiles=Programa GnuCash
+pt_BR.TranslFiles=Tradução
+pt_BR.TemplFiles=Modelos de Conta
+
+pt_BR.IconComment_GnuCash=Gerenciador Financeiro Livre GnuCash
+pt_BR.IconName_README=GnuCash - Mostrar LEIA-ME (README)
+pt_BR.IconComment_README=Mostra o arquivo LEIA-ME (README)
+pt_BR.IconFilename_README=LEIA-ME.win32-bin.txt
+pt_BR.IconName_FAQ=GnuCash - Perguntas Freqüentes (online, inglês)
+pt_BR.IconName_Bugzilla=GnuCash - Relatar um erro (online, inglês)
+pt_BR.IconName_InstallFQ=GnuCash - Instalar a Consulta de Preços Online
+pt_BR.IconComment_InstallFQ=Instala o módulo perl Finance-Quote, necessário para a busca de preços online. Requer ActivePerl 5.8+.
+pt_BR.IconName_Uninstall=Desinstalar o GnuCash
+pt_BR.IconComment_Uninstall=Desinstala o Gerenciador Financeiro GnuCash
+
+
+;; ;;;;;;;;;;;;;;;;;
+;; Simplified Chinese translation
+
+zh_CN.FullInstall=完全安装
+zh_CN.CustomInstall=自定义安装
+zh_CN.CreateDesktopIcon=创建桌é¢å›¾æ ‡
+zh_CN.CreateMenuLink=创建开始èœå•é“¾æŽ¥
+zh_CN.RunPrg=现在开始è¿è¡Œ GnuCash
+zh_CN.AdditionalIcons=åˆ›å»ºè¿™äº›å›¾æ ‡
+zh_CN.StatusMsgFirewall=æ£åœ¨å®‰è£… Windows 防ç«å¢™è§„则...
+
+zh_CN.MainFiles=GnuCash 程åº
+zh_CN.TranslFiles=翻译文件
+zh_CN.TemplFiles=会计科目模æ¿æ–‡ä»¶
+
+zh_CN.IconComment_GnuCash=GnuCash å…费财务管ç†
+zh_CN.IconName_README=GnuCash - 显示自述文件
+zh_CN.IconComment_README=显示自述文件
+zh_CN.IconFilename_README=README-zh_CN.win32-bin.txt
+zh_CN.IconName_FAQ=GnuCash - 常è§é—®é¢˜ (在线)
+zh_CN.IconName_Bugzilla=GnuCash - 报告软件 Bug (在线)
+zh_CN.IconName_InstallFQ=GnuCash - å®‰è£…åœ¨çº¿ä»·æ ¼æ£€ç´¢åŠŸèƒ½
+zh_CN.IconComment_InstallFQ=å®‰è£…åœ¨çº¿ä»·æ ¼æ£€ç´¢æ‰€å¿…éœ€çš„ Perl Finance-Quote模å—ã€‚éœ€è¦ ActivePerl 5.8 或 5.10
+zh_CN.IconName_Uninstall=å¸è½½ GnuCash
+zh_CN.IconComment_Uninstall=å¸è½½è´¢åŠ¡ç®¡ç†è½¯ä»¶ GnuCash
+
+;; ;;;;;;;;;;;;;;;;;
+;; Traditional Chinese translation
+
+; *** "Select Components" wizard page
+zh_TW.FullInstall=完整安è£
+zh_TW.CustomInstall=自訂安è£
+zh_TW.CreateDesktopIcon=產生桌é¢åœ–示
+zh_TW.CreateMenuLink=產生開始功能表圖示
+zh_TW.RunPrg=ç¾åœ¨é–‹å§‹åŸ·è¡Œ GnuCash
+zh_TW.AdditionalIcons=建立這些圖示:
+zh_TW.StatusMsgFirewall=æ£åœ¨å®‰è£ Windows 防ç«ç‰†è¦å‰‡...
+; *** "Another install" wizard page
+; %1 in the following messages will be replaced with the application name and version, like "GnuCash 2.3.15"
+zh_TW.AIWP_Title=發ç¾å·²å®‰è£éŽ
+zh_TW.AIWP_Description=%1 已經安è£æ–¼ç³»çµ±ä¸
+zh_TW.AIWP_Message=èˆŠç‰ˆå¿…é ˆå…ˆç§»é™¤æ‰èƒ½ç¹¼çºŒã€‚%n%n若您ä¸æƒ³ç§»é™¤ï¼Œç¾åœ¨å°±é»žé¸ã€Œå–消ã€ä¸æ–·å®‰è£ã€‚%n%n點é¸ã€Œä¸‹ä¸€æ¥ã€æœƒç§»é™¤ %1 並繼續安è£ã€‚%n%n注æ„: åªæœ‰ç¨‹å¼æœƒè¢«ç§»é™¤ï¼Œä¸æœƒå½±éŸ¿åˆ°æ‚¨çš„財務資料å˜æª”。
+
+zh_TW.MainFiles=GnuCash 程å¼
+zh_TW.TranslFiles=ç¿»è¯æª”
+zh_TW.TemplFiles=會計科目範本檔
+
+zh_TW.IconComment_GnuCash=GnuCash 自由財務管ç†
+zh_TW.IconName_README=GnuCash - 顯示 README
+zh_TW.IconComment_README=顯示 README 檔
+zh_TW.IconFilename_README=README-zh_TW.win32-bin.txt
+zh_TW.IconName_FAQ=GnuCash - 常見å•é¡Œ (線上)
+zh_TW.IconName_Bugzilla=GnuCash - å›žå ±ç¨‹å¼ Bug (線上)
+zh_TW.IconName_InstallFQ=GnuCash - 安è£ç¶²è·¯å ±åƒ¹æˆªå–功能
+zh_TW.IconComment_InstallFQ=安è£æˆªå–ç¶²è·¯å ±åƒ¹æ‰€éœ€çš„ Perl Finance-Quote æ¨¡çµ„ã€‚éœ€è¦ ActivePerl 5.8 或 5.10
+zh_TW.IconName_Theme=é¸æ“‡ä»‹é¢é¢¨æ ¼ GnuCash
+zh_TW.IconName_Uninstall=åå®‰è£ GnuCash
+zh_TW.IconComment_Uninstall=å安è£è²¡å‹™ç®¡ç†å“¡ GnuCash
commit 4081f1b970a034f7b9704b5760f88024ec97e8d3
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Jul 28 12:35:40 2017 -0700
Fix typo.
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 984d888..abf4f88 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -31,7 +31,7 @@ needed scripts is cloned into the target.
You may need to allow running scripts on your computer and depending
on where the target_dir is you may need to run the script with
-Administrator priviledges.
+Administrator privileges.
.PARAMETER target_dir
commit 70f887083e7eba4a26c2859b5609b222abe45568
Merge: e21e9e3 7f03c23
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Jul 23 17:37:51 2017 -0700
Merge branch 'mingw64'
commit 7f03c23aba4dbe31ca179eee489f9d923220f4dd
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Jul 23 15:56:54 2017 -0700
Parameterize jhbuildrc.in to create jhbuildrc with _basedir and _downloaddir set.
diff --git a/jhbuildrc.in b/jhbuildrc.in
index 3ac25aa..316e496 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -30,13 +30,15 @@ def add_to_path_var(var, path):
else:
os.environ[var] = os.environ[var] + ":" + path
-_config_dir = os.path.join('/c', 'gcdev64', 'src', 'gnucash-on-windows.git')
-_basedir = os.path.join('/c', 'gcdev64')
+_basedir = "@-BASE_DIR-@"
+_downloaddir = "@-DOWNLOAD_DIR-@"
+_config_dir = os.path.join(_basedir, 'src', 'gnucash-on-windows.git')
prefix = os.path.join(_basedir, 'inst')
checkoutroot = os.path.join(_basedir, 'src')
buildroot = os.path.join(_basedir, 'build')
-tarballdir = os.path.join('/c', 'gcdev', 'downloads')
+tarballdir = os.path.join(_download_dir)
moduleset = os.path.join(_config_dir, 'gnucash.modules')
+modules = ["meta-gnucash"]
_mingw_includes = os.path.join(_basedir, 'msys2', 'mingw32', 'include')
_mingw_libs = os.path.join(_basedir, 'msys2', 'mingw32', 'lib')
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index a8fbcff..984d888 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -252,3 +252,12 @@ if (!(test-path -path "$target_dir\\src\\gnucash-on-windows.git")) {
$proc = bash-command -command "git clone -b mingw64 https://github.com/gnucash/gnucash-on-windows.git $target_dir/src/gnucash-on-windows.git"
$proc.waitForExit()
}
+
+cat $target_dir\\src\\gnucash-on-windows.git\\jhbuildrc.in |
+ %{$_ -replace "@-BASE_DIR-@", "$target_dir"} |
+ %{$_ -replace "@-DOWNLOAD_DIR-@", "$download_dir"} > $target_dir\\src\\gnucash-on-windows.git\\jhbuildrc
+
+Write-Host @"
+Your build environment is now ready to use. Open an MSys2 shell from the start menu, cd to your target directory, and run
+jhbuild -f gnucash-on-windows.git/jhbuildrc build
+"@
commit 1aef8740c7aafe3246b74a8c9af00b5652882fa7
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Jul 23 15:27:19 2017 -0700
A few more dependencies...
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 0b33374..a8fbcff 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -198,14 +198,14 @@ $proc.WaitForExit()
# Set up aliases for the parts of msys-devtools and mingw-w64-toolchain that
# we need:
-$devel = "asciidoc autoconf autoconf2.13 autogen automake-wrapper automake1.10 automake1.11 automake1.12 automake1.13 automake1.14 automake1.15 automake1.6 automake1.7 automake1.8 automake1.9 bison diffstat diffutils dos2unix file flex gawk gettext gettext-devel gperf grep groff intltool libtool m4 make man-db pacman pactoys-git patch patchutils perl pkg-config sed swig texinfo texinfo-tex wget xmlto git jhbuild-git"
+$devel = "asciidoc autoconf autoconf2.13 autogen automake-wrapper automake1.10 automake1.11 automake1.12 automake1.13 automake1.14 automake1.15 automake1.6 automake1.7 automake1.8 automake1.9 bison diffstat diffutils dos2unix file flex gawk gettext gettext-devel gperf grep groff intltool libtool m4 make man-db pacman pactoys-git patch patchutils perl pkg-config sed swig texinfo texinfo-tex wget xmlto git jhbuild-git texinfo"
$toolchain = "binutils crt-git gcc gcc-libs gdb headers-git libmangle-git libwinpthread-git make pkg-config tools-git winpthreads-git"
# Note that webkitgtk3 will pull in gtk3 automatically; we need gtk2 as well to
# support AQBanking.
-$deps = "webkitgtk3 gtk2 boost iso-codes shared-mime-info libmariadbclient postgresql libgnomecanvas ninja"
+$deps = "webkitgtk3 gtk2 boost iso-codes shared-mime-info libmariadbclient postgresql libgnomecanvas ninja ncurses"
Write-Host @"
commit 955753fc96a51ce192fbe3233208ebfdbddcae93
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Jul 23 15:26:13 2017 -0700
Add patches necessary for building on mingw64.
diff --git a/gnucash.modules b/gnucash.modules
index 7c6b005..368210f 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -91,13 +91,14 @@
</autotools>
<autotools id="libatomic-ops"
- autogen-template="/bin/bash -c 'pushd %(srcdir)s && ./%(autogen-sh)s && popd && %(srcdir)s/configure --prefix=%(prefix)s> %(autogenargs)s'">
+ autogen-template="/bin/bash -c 'pushd %(srcdir)s && ./%(autogen-sh)s && popd && %(srcdir)s/configure --prefix=%(prefix)s> %(autogenargs)s'"
+ autogenargs="--enable-shared --disable-static">
<branch repo="github" module="ivmai/libatomic_ops"
revision="libatomic_ops-7_4_4"/>
</autotools>
<autotools id="bdw-gc" autogen-template="/bin/bash -c 'pushd %(srcdir)s && ./autogen.sh && automake -ac && popd && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s'"
- autogenargs="--enable-threads=pthreads">
+ autogenargs="--enable-threads=pthreads --enable-shared --disable-static">
<branch repo="github" module="ivmai/bdwgc" revision="gc7_6_0" />
<dependencies>
<dep package="libatomic-ops"/>
@@ -114,10 +115,10 @@
</autotools>
<!-- Unfortunately in addition to needing a few patches this hangs when it tries to compile Scheme. -->
- <autotools id="guile2" autogen-sh="autoreconf">
- <branch repo="ftp.gnu.org" module="guile/guile-2.0.12.tar.gz"
- version="2.0.12">
- <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/guile-clocktime.patch" strip="1"/>
+ <autotools id="guile2" autogen-sh="autoreconf" autogenargs="--without-threads">
+ <branch repo="ftp.gnu.org" module="guile/guile-2.0.14.tar.gz"
+ version="2.0.14">
+ <patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/patches/guile-2.0.14-mingw64-fixup.patch" strip="1"/>
</branch>
<dependencies>
<dep package="libunistring"/>
@@ -209,7 +210,8 @@
autogen-template='/bin/bash -c "pushd %(srcdir)s && ./autoinit.sh && popd && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"'>
<branch repo="sourceforge" module="openjade/OpenSP-1.5.2.tar.gz"
version='1.5.2'>
- <patch file="/c/gcdev/gnucash-on-windows.git/opensp-1.5.2.patch" strip='1'/>
+ <patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/opensp-1.5.2.patch" strip='1'/>
+ <patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/patches/OpenSP-1.5.2-non-posix-functions.patch" strip='1'/>
</branch>
</autotools>
@@ -254,17 +256,17 @@
<autotools id="libdbi-drivers" autogen-sh='autoreconf'
autogenargs='--disable-docs --with-sqlite3 --with-sqlite3-dir="/mingw32" --with-pgsql --with-pgsql-dir="/mingw32" --with-mysql --with-mysql-dir="/mingw32" '>
- <branch repo="sourceforge" version="0.8.3-1"
+ <branch repo="sourceforge" version="0.8.3"
module="libdbi-drivers/libdbi-drivers-0.8.3-1.tar.gz">
<patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/libdbi-drivers-errno.patch" strip="1"/>
+ <patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/libdbi-drivers-linkage.patch" strip="1"/>
</branch>
<dependencies>
<dep package="libdbi"/>
</dependencies>
</autotools>
- <cmake id="googletest" cmakeargs="-DBUILD_GMOCK=OFF" skip-autogen="yes"
- skip-install="yes">
+ <cmake id="googletest" cmakeargs="-G 'MSYS Makefiles' -DBUILD_GMOCK=OFF">
<branch module="google/googletest" repo="github" tag="release-1.8.0"/>
</cmake>
@@ -272,7 +274,7 @@
autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure -\-prefix %(prefix)s %(autogenargs)s"
autogenargs="-\-enable-ofx -\-enable-aqbanking -\-enable-binreloc -\-enable-dbi -\-with-dbi-dbd-dir=$PREFIX/lib/dbd"-->
<cmake id="gnucash"
- cmakeargs="-G 'MSYS Makefiles' -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_PREFIX_PATH=c:/gcdev64/msys2 -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock">
+ cmakeargs="-G 'MSYS Makefiles' -DCMAKE_PREFIX_PATH=c:/gcdev64/msys2 -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock">
<branch repo="github" module="Gnucash/gnucash.git" revision="master"
checkoutdir="gnucash-git"/>
<dependencies>
@@ -281,7 +283,7 @@
<dep package="libdbi-drivers"/>
<!--dep package="shared-mime-info"/-->
<!--dep package="iso-codes"/-->
- <dep package="guile"/>
+ <dep package="guile2"/>
<!--dep package="swig"/-->
<dep package="boost"/>
<dep package="googletest"/>
diff --git a/jhbuildrc b/jhbuildrc.in
similarity index 100%
rename from jhbuildrc
rename to jhbuildrc.in
diff --git a/patches/OpenSP-1.5.2-non-posix-functions.patch b/patches/OpenSP-1.5.2-non-posix-functions.patch
new file mode 100644
index 0000000..2d73dcb
--- /dev/null
+++ b/patches/OpenSP-1.5.2-non-posix-functions.patch
@@ -0,0 +1,33 @@
+diff --git a/sx/XmlOutputEventHandler.cxx~ b/sx/XmlOutputEventHandler.cxx
+index 387af89..d03fe5b 100644
+--- a/sx/XmlOutputEventHandler.cxx~
++++ b/sx/XmlOutputEventHandler.cxx
+@@ -1202,7 +1202,9 @@ void XmlOutputEventHandler::inputOpened(InputSource *in)
+ char realDirs[MAXPATHLEN];
+ char realOutputDir[MAXPATHLEN];
+ char *outputDir = strdup(outputDir_);
+-
++#ifdef __MINGW32__
++#define realpath(N,R) _fullpath((R),(N),_MAX_PATH)
++#endif
+ realpath((const char *)dirname(dirs), realDirs);
+ realpath((const char *)dirname(outputDir), realOutputDir);
+
+@@ -1469,7 +1471,7 @@ int XmlOutputEventHandler::maybeCreateDirectories (char *path)
+ *pp = '/';
+ }
+
+-#ifndef _MSC_VER
++#if ! defined (_MSC_VER) && ! defined (__MINGW32__)
+ struct stat statbuf;
+ pp = strrchr(path, '/');
+
+@@ -1483,6 +1485,8 @@ int XmlOutputEventHandler::maybeCreateDirectories (char *path)
+ }
+
+ ret = mkdir(path, statbuf.st_mode);
++#elif defined (__MINGW32__)
++ ret = mkdir(path);
+ #else
+ ret=_mkdir(path);
+ #endif
diff --git a/patches/guile-2.0.14-mingw64-fixups.patch b/patches/guile-2.0.14-mingw64-fixups.patch
new file mode 100644
index 0000000..a0fb3a4
--- /dev/null
+++ b/patches/guile-2.0.14-mingw64-fixups.patch
@@ -0,0 +1,167 @@
+From aeebdcf73377d1682b508828db5de55cffe1870f Mon Sep 17 00:00:00 2001
+From: John Ralls <jralls at ceridwen.us>
+Date: Sun, 23 Jul 2017 14:05:48 -0700
+Subject: [PATCH 2/3] guile-2.0.14 mingw64 fixups.
+
+---
+ libguile/deprecated.h | 2 ++
+ libguile/iselect.h | 4 ++--
+ libguile/load.c | 39 +++++++++++++++++++++++++++++++++++----
+ libguile/null-threads.h | 3 ++-
+ libguile/posix-w32.h | 1 +
+ libguile/stime.c | 2 +-
+ 6 files changed, 43 insertions(+), 8 deletions(-)
+
+diff --git a/libguile/deprecated.h b/libguile/deprecated.h
+index 4d7819761..2d6f71c7d 100644
+--- a/libguile/deprecated.h
++++ b/libguile/deprecated.h
+@@ -742,11 +742,13 @@ SCM_DEPRECATED SCM scm_c_make_keyword (const char *s);
+
+ SCM_DEPRECATED unsigned int scm_thread_sleep (unsigned int);
+ SCM_DEPRECATED unsigned long scm_thread_usleep (unsigned long);
++#if HAVE_PTHREAD_SIGMASK
+ SCM_DEPRECATED int scm_internal_select (int fds,
+ fd_set *rfds,
+ fd_set *wfds,
+ fd_set *efds,
+ struct timeval *timeout);
++#endif
+
+ /* Deprecated because the cuserid call is deprecated.
+ */
+diff --git a/libguile/iselect.h b/libguile/iselect.h
+index 1272b8d27..c99ae8e85 100644
+--- a/libguile/iselect.h
++++ b/libguile/iselect.h
+@@ -27,7 +27,7 @@
+
+ /* Needed for FD_SET on some systems. */
+ #include <sys/types.h>
+-
++#if HAVE_PTHREAD_SIGMASK
+ #include <sys/select.h>
+
+ SCM_API int scm_std_select (int fds,
+@@ -37,7 +37,7 @@ SCM_API int scm_std_select (int fds,
+ struct timeval *timeout);
+
+ #define SELECT_TYPE fd_set
+-
++#endif
+ #endif /* SCM_ISELECT_H */
+
+ /*
+diff --git a/libguile/load.c b/libguile/load.c
+index c2ee5093a..de9efeb7f 100644
+--- a/libguile/load.c
++++ b/libguile/load.c
+@@ -535,6 +535,19 @@ is_absolute_file_name (SCM filename)
+ #endif
+ )
+ return 1;
++#ifdef __MINGW32__
++ /* MSys passes paths around with e.g. C: replaced with /c. Guile finds
++ that indigestible, so check for it and if it's the case rewrite
++ it. */
++ if (filename_len >=3
++ && is_file_name_separator (scm_c_string_ref (filename, 0))
++ && is_drive_letter (scm_c_string_ref (filename, 1))
++ && is_file_name_separator (scm_c_string_ref (filename, 2)))
++ {
++ scm_c_string_set_x (filename, 0, scm_c_string_ref(filename, 1));
++ scm_c_string_set_x (filename, 1, SCM_MAKE_CHAR (':'));
++ }
++#endif
+ if (filename_len >= 3
+ && is_drive_letter (scm_c_string_ref (filename, 0))
+ && scm_is_eq (scm_c_string_ref (filename, 1), SCM_MAKE_CHAR (':'))
+@@ -723,9 +736,18 @@ load_thunk_from_path (SCM filename, SCM source_file_name,
+
+ buf.ptr = buf.buf;
+ stringbuf_cat_locale_string (&buf, dir);
+-
++#ifdef __MINGW32__
++ /* Fiddle the drive letter if necessary */
++ if (is_file_name_separator (SCM_MAKE_CHAR (buf.buf[0]))
++ && is_drive_letter (SCM_MAKE_CHAR (buf.buf[1]))
++ && is_file_name_separator (SCM_MAKE_CHAR (buf.buf[2])))
++ {
++ buf.buf[0] = buf.buf[1];
++ buf.buf[1] = ':';
++ }
++#endif
+ /* Concatenate the path name and the filename. */
+-
++
+ if (buf.ptr > buf.buf
+ && !is_file_name_separator (SCM_MAKE_CHAR (buf.ptr[-1])))
+ stringbuf_cat (&buf, FILE_NAME_SEPARATOR_STRING);
+@@ -877,9 +899,18 @@ search_path (SCM path, SCM filename, SCM extensions, SCM require_exts,
+
+ buf.ptr = buf.buf;
+ stringbuf_cat_locale_string (&buf, dir);
+-
++#ifdef __MINGW32__
++ /* Fiddle the drive letter if necessary */
++ if (is_file_name_separator (SCM_MAKE_CHAR (buf.buf[0]))
++ && is_drive_letter (SCM_MAKE_CHAR (buf.buf[1]))
++ && is_file_name_separator (SCM_MAKE_CHAR (buf.buf[2])))
++ {
++ buf.buf[0] = buf.buf[1];
++ buf.buf[1] = ':';
++ }
++#endif
+ /* Concatenate the path name and the filename. */
+-
++
+ if (buf.ptr > buf.buf
+ && !is_file_name_separator (SCM_MAKE_CHAR (buf.ptr[-1])))
+ stringbuf_cat (&buf, FILE_NAME_SEPARATOR_STRING);
+diff --git a/libguile/null-threads.h b/libguile/null-threads.h
+index dcb14e6a7..cfe06bbb5 100644
+--- a/libguile/null-threads.h
++++ b/libguile/null-threads.h
+@@ -82,12 +82,13 @@ scm_i_sched_yield (void)
+
+ /* Signals
+ */
++#if HAVE_PTHREAD_SIGMASK
+ static inline int
+ scm_i_pthread_sigmask (int how, const sigset_t *set, sigset_t *oldset)
+ {
+ return sigprocmask (how, set, oldset);
+ }
+-
++#endif
+ /* Mutexes
+ */
+ typedef enum {
+diff --git a/libguile/posix-w32.h b/libguile/posix-w32.h
+index f11a25e49..6040e05c8 100644
+--- a/libguile/posix-w32.h
++++ b/libguile/posix-w32.h
+@@ -21,6 +21,7 @@
+ * 02110-1301 USA
+ */
+
++#include <windows.h>
+ #include <string.h>
+
+ #define _UTSNAME_LENGTH 65
+diff --git a/libguile/stime.c b/libguile/stime.c
+index 7a139747f..7e4b7dfe3 100644
+--- a/libguile/stime.c
++++ b/libguile/stime.c
+@@ -122,7 +122,7 @@ get_internal_real_time_posix_timer (void)
+ ts.tv_nsec - posix_real_time_base.tv_nsec);
+ }
+
+-#if defined _POSIX_CPUTIME && defined CLOCK_PROCESS_CPUTIME_ID
++#if defined _POSIX_CPUTIME && defined CLOCK_PROCESS_CPUTIME_ID && !defined(WINPTHREAD_API)
+ /* You see, FreeBSD defines _POSIX_CPUTIME but not
+ CLOCK_PROCESS_CPUTIME_ID. */
+ #define HAVE_POSIX_CPUTIME 1
+--
+2.12.1
+
diff --git a/patches/libdbi-0.9.0-mingw64.patch b/patches/libdbi-0.9.0-mingw64.patch
new file mode 100644
index 0000000..79a3239
--- /dev/null
+++ b/patches/libdbi-0.9.0-mingw64.patch
@@ -0,0 +1,64 @@
+diff --git a/src/dbd_helper.c~ b/src/dbd_helper.c
+index e783847..156fc34 100644
+--- a/src/dbd_helper.c~
++++ b/src/dbd_helper.c
+@@ -24,6 +24,10 @@
+ #include <config.h>
+ #endif
+
++#ifdef __MINGW32__
++#define _POSIX_
++#endif
++
+ #include <sys/types.h>
+ #include <dirent.h>
+ #include <stddef.h>
+diff --git a/src/dbi_main.c~ b/src/dbi_main.c
+index 07b959b..348d114 100644
+--- a/src/dbi_main.c~
++++ b/src/dbi_main.c
+@@ -199,11 +199,18 @@ int dbi_initialize_r(const char *driverdir, dbi_inst *pInst) {
+
+ status = 0;
+ while (42) { /* yes, we all admire Douglas Adams */
++#ifdef HAVE_READDIR_R
+ driver_dirent = NULL;
+ status = readdir_r (dir, buffer, &driver_dirent);
+ if (status != 0 || driver_dirent == NULL) {
+ break;
+ }
++#else
++ driver_dirent = readdir (dir);
++ if (driver_dirent == NULL)
++ break;
++ memcpy (buffer, driver_dirent, buffer_size);
++#endif
+
+ driver = NULL;
+ snprintf(fullpath, FILENAME_MAX, "%s%s%s", effective_driverdir, DBI_PATH_SEPARATOR, driver_dirent->d_name);
+diff --git a/src/timegm.c~ b/src/timegm.c
+index a7d1bc0..f13f788 100644
+--- a/src/timegm.c~
++++ b/src/timegm.c
+@@ -25,6 +25,7 @@
+ #endif
+
+ #include <time.h>
++#include <string.h>
+
+ #ifndef HAVE_TIMEGM
+
+@@ -39,7 +40,13 @@ time_t timegm(struct tm *tm) {
+ temp_ltime = mktime(tm);
+ }
+
++#ifdef HAVE_GMTIME_R
+ gmtime_r(&temp_ltime, &temp_gm);
++#else
++ /* We're done with tm, might as well reuse it... */
++ tm = gmtime(&temp_ltime);
++ memcpy (&temp_gm, tm, sizeof(struct tm));
++#endif
+
+ return (time_t)(temp_ltime + (temp_ltime - mktime(&temp_gm)));
+ }
diff --git a/patches/libdbi-drivers-linkage.patch b/patches/libdbi-drivers-linkage.patch
new file mode 100644
index 0000000..8ae5f4b
--- /dev/null
+++ b/patches/libdbi-drivers-linkage.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.in~ b/configure.in
+index 16bbf49..fa56dfe 100644
+--- a/configure.in~
++++ b/configure.in
+@@ -184,7 +184,7 @@ if test "$ac_libdbi" = "YES"; then
+ fi
+
+ AC_MSG_RESULT([yes: libs in $ac_dbi_libdir])
+- LIBADD_LIBDBI="$LIBADD_LIBDBI -L$ac_dbi_libdir"
++ LIBADD_LIBDBI="-no-undefined $LIBADD_LIBDBI -L$ac_dbi_libdir"
+
+ AC_SUBST(LIBADD_LIBDBI)
+
commit 49eaaddb59585f50ab942dfecf01a6d8ce3c7805
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Jul 20 09:28:15 2017 -0700
Rewrite setup-mingw64.ps1 to completely and correctly prepare the environment.
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 4ffbe32..0b33374 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -1,65 +1,189 @@
+# setup-mingw64.ps1: Powershell Script to create a MinGW64 Build Environment.
+# Copyright 2017 John Ralls <jralls at ceridwen.us>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, contact:
+# Free Software Foundation Voice: +1-617-542-5942
+# 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652
+# Boston, MA 02110-1301, USA gnu at gnu.org
-Param([string]$target_dir = "c:\\gcdev64")
+<#
+.SYNOPSIS
+
+Prepares a MinGW-w64 development environment from scratch.
+
+.DESCRIPTION
+
+Prepares a development environment for building GnuCash with jhbuild
+in a MinGW-w64 (a.k.a. MSys2) environment. All required packages are
+installed and the gnucash-on-windows repository containing the other
+needed scripts is cloned into the target.
+
+You may need to allow running scripts on your computer and depending
+on where the target_dir is you may need to run the script with
+Administrator priviledges.
+
+.PARAMETER target_dir
+
+Optional. The path at which you wish to create the environment. If
+none is provided the environment will be created at C:\gcdev64.
+
+.PARAMETER download_dir
+
+Optional. A path to which to download installers. Defaults to
+target_dir\downloads.
+
+.PARAMETER x86_64
+
+Optional. A switch value.If true the toolchain will build x86_64
+binaries; if false it will build i686 binaries. Defaults to false.
+
+#>
+
+[CmdletBinding()]
+Param(
+ [Parameter()] [string]$target_dir = "c:\\gcdev64",
+ [Parameter()] [string]$download_dir = "$target_dir\\downloads",
+ [Parameter()] [switch]$x86_64
+)
$progressPreference = 'silentlyContinue'
-$installer32 = "http://repo.msys2.org/distrib/i686/msys2-i686-20161025.exe"
-$archive32 = "http://repo.msys2.org/distrib/i686/msys2-base-i686-20161025.tar.xz"
-$installer64 = "http://repo.msys2.org/distrib/x86_64/msys2-x86_64-20161025.exe"
-$archive64 = "http://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20161025.tar.xz"
+if ($x86_64) {
+ $mingw_prefix = "mingw64/mingw-w64-x86_64-"
+ $mingw_path = "/mingw64/x86_64-w64-mingw64"
+ $mingw_bin = "/mingw64/bin"
+}
+else {
+ $mingw_prefix = "mingw32/mingw-w64-i686-"
+ $mingw_path = "/mingw32/i686-w64-mingw32"
+ $mingw_bin = "/mingw32/bin"
+}
+
+if (!(test-path -path $target_dir)) {
+ new-item "$target_dir" -type directory
+}
+
+function make-pkgnames ([string]$prefix, [string]$items) {
+ $items.split(" ") | foreach-object {"$prefix$_"}
+}
+
+function Install-Package([string]$url, [string]$download_file,
+ [string]$install_dir, [string]$setup_cmd, [string]$setup_args)
+{
+ if (!(test-path -path $download_file)) {
+ write-host "Downloading $download_file from $url"
+ invoke-webrequest -uri $url -outfile $download_file
+ }
+
+ write-host "Installing $download_dir\$setup_cmd $setup_args"
+ $psi = new-object "Diagnostics.ProcessStartInfo"
+ $psi.Filename = "$download_dir\$setup_cmd"
+ $psi.Arguments = "$setup_args"
+ $proc = [Diagnostics.Process]::Start($psi)
+ $proc.waitForExit()
+}
+
+
+function bash-command() {
+ param ([string]$command = "")
+ if (!(test-path -path $target_dir\msys2\usr\bin\bash.exe)) {
+ write-host "Shell program not found, aborting."
+ return
+ }
+# write-host "Running bash command ""$command"""
+ $psi = new-object "Diagnostics.ProcessStartInfo"
+ $psi.Filename = "$target_dir\msys2\usr\bin\bash.exe"
+ $psi.Arguments = "-c ""export PATH=/usr/bin; $command"""
+ [Diagnostics.Process]::Start($psi)
+}
+
+function make-unixpath([string]$path) {
+ $path -replace "^([A-Z]):", '/$1' -replace "\\", '/'
+}
+
+# Install MSYS2 for the current machine's architechture.
-$download_dir = "c:\\gcdev\\downloads"
-$installer_file = "$download_dir\\msys2.exe"
-$archive_file = "$download_dir\\msys2-base.tar.xz"
-$installer = If ([IntPtr]::size -eq 4) {$installer32} Else {$installer64}
+if (!(test-path -path $target_dir\msys2\usr\bin\bash.exe)) {
+ $mingw64_installer32 = "http://repo.msys2.org/distrib/i686/msys2-i686-20161025.exe"
+ $mingw64_installer64 = "http://repo.msys2.org/distrib/x86_64/msys2-x86_64-20161025.exe"
-$mingw_setup = @"
+ $mingw64_installer_file = "$download_dir\msys2.exe"
+ $mingw64_installer = If ([IntPtr]::size -eq 4) {$mingw64_installer32} Else {$mingw64_installer64}
+ $msys_install_dir = (join-path $target_dir "msys2") -replace "\\", '/'
+ $msys_setup_args = @"
function Controller() {}
Controller.prototype.IntroductionPageCallback = function() {
gui.clickButton(buttons.NextButton);
}
Controller.prototype.TargetDirectoryPageCallback = function() {
var page = gui.pageWidgetByObjectName("TargetDirectoryPage");
- page.TargetDirectoryLineEdit.setText("$target_dir\\msys2");
+ page.TargetDirectoryLineEdit.setText("$msys_install_dir");
gui.clickButton(buttons.NextButton);
}
Controller.prototype.StartMenuDirectoryPageCallback = function() {
gui.clickButton(buttons.NextButton);
}
Controller.prototype.FinishedPageCallback = function() {
- var page = gui.pageWidgetByObjectName("FinishedPage");
- page.RunItCheckBox.checked = false;
- gui.clickButton(buttons.FinishButton);
+ var page = gui.pageWidgetByObjectName("FinishedPage");
+ page.RunItCheckBox.checked = false;
+ gui.clickButton(buttons.FinishButton);
}
"@
-if (!(test-path -path $installer_file)) {
- Write-Host "Downloading $installer_file from $installer"
- Invoke-WebRequest -URI $installer -OutFile $installer_file
+ $setup_script = "$target_dir\input.qs"
+ set-content -path $setup_script -value $msys_setup_args | out-null
+ install-package -url $mingw64_installer -download_file $mingw64_installer_file -install_dir "$target_dir/msys2" -setup_cmd "msys2.exe" -setup_args "--script $setup_script"
+# remove-item $setup_script
}
-if (!(test-path -path $target_dir)) {
- New-Item $target_dir -type directory
+if (!(test-path -path $target_dir\msys2\usr\bin\bash.exe)) {
+ write-host "Failed to install MSys2, aborting."
+ exit
}
-Set-Content -Path $target_dir\mingw64-setup.qs -Value $mingw_setup | Out-Null
-Set-Location -Path $target_dir
+# Install Html Help Workshop
-function bash-command() {
- param ([string]$command = "")
- $psi = new-object "Diagnostics.ProcessStartInfo"
- $psi.Filename = "$target_dir\msys2\usr\bin\bash.exe"
- $psi.Arguments = "-c ""export PATH=/usr/bin; $command"""
- return [Diagnostics.Process]::Start($psi)
+$html_help_workshop_url = "http://download.microsoft.com/download/0/a/9/0a939ef6-e31c-430f-a3df-dfae7960d564/htmlhelp.exe"
+$html_help_workshop_installer = "htmlhelp.exe"
+
+$installed_hh = get-item -path "hkcu:\SOFTWARE\Microsoft\HTML Help Workshop" | foreach-object{$_.GetValue("InstallDir")}
+
+if (! (($installed_hh) -and (test-path -path $installed_hh))) {
+ install-package -url $html_help_workshop_url -download_file "$download_dir\\$html_help_workshop_installer" -install_dir ${env:ProgramFiles(x86)} -setup_cmd $html_help_installer
+}
+$hhctrl_ocx = "c:\Windows\System32\hhctrl.ocx"
+if (!(test-path -path $hhctrl_ocx)) {
+ write-host "Something's wrong with HTML Help Workshop, couldn't find $hhctrl_ocx."
+ exit
+}
+$hhctrl_ocx = make-unixpath -path $hhctrl_ocx
+
+
+# Install Inno Setup
+if (!(test-path -path ${env:ProgramFiles(x86)}\inno)) {
+ $inno_setup_url = "http://files.jrsoftware.org/is/5/innosetup-5.5.9-unicode.exe"
+ $inno_setup_installer = "innosetup-5.5.9-unicode.exe"
+ $inno_setup_args = " /verysilent /suppressmsgboxes /nocancel /norestart /dir=""${env:ProgramFiles(x86)}\inno"""
+ install-package -url $inno_setup_url -download_file "$download_dir\$inno_setup_installer" -install_dir ${env:ProgramFiles(x86)} -setup_cmd $inno_setup_installer -setup_args $inno_setup_args
}
#if MSys2 isn't already installed, install it.
if (!(test-path -path $target_dir\msys2\usr\bin\bash.exe)) {
- & $installer_file --script $target_dir\mingw64-setup.qs | Out-Null
Write-Host @"
Updating the new installation. A bash window will open. In that window accept the proposed installation and close the window when the update completes.
There will be a second update.
"@
- $proc = bash-command("pacman -Syuu")
+ $proc = bash-command -command "pacman -Syuu"
$proc.WaitForExit()
}
@@ -69,25 +193,51 @@ Write-Host @"
Updating the installation. Accept the proposed changes. If the window doesn't close on its own then close it and re-run the script when it finishes.
"@
-$proc = bash-command("pacman -Syuu")
+$proc = bash-command -command "pacman -Syuu"
$proc.WaitForExit()
# Set up aliases for the parts of msys-devtools and mingw-w64-toolchain that
# we need:
-$msys_devel = "msys/asciidoc msys/autoconf msys/autoconf2.13 msys/autogen msys/automake-wrapper msys/automake1.10 msys/automake1.11 msys/automake1.12 msys/automake1.13 msys/automake1.14 msys/automake1.15 msys/automake1.6 msys/automake1.7 msys/automake1.8 msys/automake1.9 msys/bison msys/diffstat msys/diffutils msys/dos2unix msys/file msys/flex msys/gawk msys/gdb msys/gettext msys/gettext-devel msys/gperf msys/grep msys/groff msys/intltool msys/libtool msys/m4 msys/make msys/man-db msys/pacman msys/pactoys-git msys/patch msys/patchutils msys/perl msys/pkg-config msys/sed msys/swig msys/texinfo msys/texinfo-tex msys/wget msys/xmlto"
+$devel = "asciidoc autoconf autoconf2.13 autogen automake-wrapper automake1.10 automake1.11 automake1.12 automake1.13 automake1.14 automake1.15 automake1.6 automake1.7 automake1.8 automake1.9 bison diffstat diffutils dos2unix file flex gawk gettext gettext-devel gperf grep groff intltool libtool m4 make man-db pacman pactoys-git patch patchutils perl pkg-config sed swig texinfo texinfo-tex wget xmlto git jhbuild-git"
-$mingw32_toolchain = "mingw32/mingw-w64-i686-binutils mingw32/mingw-w64-i686-crt-git mingw32/mingw-w64-i686-gcc mingw32/mingw-w64-i686-gcc-libs mingw32/mingw-w64-i686-gdb mingw32/mingw-w64-i686-headers-git mingw32/mingw-w64-i686-libmangle-git mingw32/mingw-w64-i686-libwinpthread-git mingw32/mingw-w64-i686-make mingw32/mingw-w64-i686-pkg-config mingw32/mingw-w64-i686-tools-git mingw32/mingw-w64-i686-winpthreads-git"
+$toolchain = "binutils crt-git gcc gcc-libs gdb headers-git libmangle-git libwinpthread-git make pkg-config tools-git winpthreads-git"
-# Aliases to collect the other dependencies:
-$other_msys = "msys/git msys/jhbuild-git"
-$other_mingw = "mingw32/mingw-w64-i686-webkitgtk2 mingw32/mingw-w64-i686-boost mingw32/mingw-w64-i686-iso-codes mingw32/mingw-w64-i686-shared-mime-info mingw32/mingw-w64-i686-libmariaclient mingw32/mingw-w64-i686-postgresql mingw32/mingw-w64-i686-libgnomecanvas mingw32/mingw-w64-i686-ninja"
+# Note that webkitgtk3 will pull in gtk3 automatically; we need gtk2 as well to
+# support AQBanking.
+$deps = "webkitgtk3 gtk2 boost iso-codes shared-mime-info libmariadbclient postgresql libgnomecanvas ninja"
Write-Host @"
-Now we'll install the dependencies. Accept the installation as usual. About half-way through it will stop with a message about fontconfig. Just type "Return" at it and it will resume and complete the installation.
+Now we'll install the dependencies. Accept the installation as usual. About half-way through it will stop with a message about fontconfig. Just type "Return" at it and it will resume after a minute or two (be patient!) and complete the installation.
"@
-$proc = bash-command("pacman -S $msys_devel $mingw32_toolchain $other_msys $other_mingw")
+
+$msys_devel = make-pkgnames -prefix "msys/" -items $devel
+$mingw_toolchain = make-pkgnames -prefix $mingw_prefix -items $toolchain
+$mingw_deps = make-pkgnames -prefix $mingw_prefix -items $deps
+
+$proc = bash-command -command "pacman -S $msys_devel"
+$proc.waitForExit()
+$proc = bash-command -command "pacman -S $mingw_toolchain"
+$proc.waitForExit()
+$proc = bash-command -command "pacman -S $mingw_deps"
+$proc.waitForExit()
+
+Write-Host @"
+
+Next we'll install the HTML Help Workshop includes and libraries into our MinGW directory.
+"@
+
+if (!$installed_hh) {
+ $installed_hh = get-item -path "hkcu:\SOFTWARE\Microsoft\HTML Help Workshop" | foreach-object{$_.GetValue("InstallDir")}
+}
+$installed_hh = make-unixpath -path $installed_hh
+$proc = bash-command -command "cp $installed_hh/include/htmlhelp.h $mingw_path/include"
+$proc.waitForExit()
+
+$proc = bash-command -command "$mingw_bin/gendef $hhctrl_ocx - > $mingw_path/lib/htmlhelp.def 2>> /errors"
+$proc.waitForExit()
+$proc = bash-command -command "$mingw_bin/dlltool -k -d $mingw_path/lib/htmlhelp.def -l $mingw_path/lib/libhtmlhelp.a >> /errors 2>&1"
$proc.waitForExit()
Write-Host @"
@@ -99,6 +249,6 @@ if (!(test-path -path "$target_dir\\src")) {
New-Item $target_dir\\src -type directory
}
if (!(test-path -path "$target_dir\\src\\gnucash-on-windows.git")) {
- $proc = bash-command("git clone -b mingw64 https://github.com/gnucash/gnucash-on-windows.git $target_dir/src/gnucash-on-windows.git")
+ $proc = bash-command -command "git clone -b mingw64 https://github.com/gnucash/gnucash-on-windows.git $target_dir/src/gnucash-on-windows.git"
$proc.waitForExit()
}
commit de6a0669e55dfd7cd586674a926fe37b5ebe5256
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Jul 20 09:26:43 2017 -0700
Add guile path variables to jhbuild environment.
diff --git a/jhbuildrc b/jhbuildrc
index efe14a6..3ac25aa 100644
--- a/jhbuildrc
+++ b/jhbuildrc
@@ -49,6 +49,8 @@ add_to_path_var('PATH', os.path.join(_basedir, 'msys2', 'mingw32', 'bin'))
os.environ['SRCROOT'] = checkoutroot
os.environ['PREFIX'] = prefix
+#os.environ['GUILE_LOAD_PATH'] = os.path.join(prefix, 'share', 'guile', '2.0')
+#os.environ['GUILE_LOAD_BINARY_PATH'] = os.path.join(prefix, 'lib', 'guile', '2.0', 'ccache')
autogenargs = "--build=i686-w64-mingw32"
#autogenargs = 'CPPFLAGS="-I%s"' % _sys_includes
commit bfd98fa8b0ac022c3e1cee37b786912a8688fb37
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Jul 20 09:25:49 2017 -0700
Remove two emacs backup files.
diff --git a/libsoup-2.48.0-bad-symbol.patch~ b/libsoup-2.48.0-bad-symbol.patch~
deleted file mode 100644
index ab18c51..0000000
--- a/libsoup-2.48.0-bad-symbol.patch~
+++ /dev/null
@@ -1,10 +0,0 @@
---- libsoup/libsoup-2.4.sym 2014-10-29 22:37:54 -0700
-+++ libsoup/libsoup-2.4.sym~ 2014-06-18 07:42:51 -0700
-@@ -348,6 +348,7 @@
- soup_server_get_async_context
- soup_server_get_listener
- soup_server_get_listeners
-+soup_server_get_gsocket
- soup_server_get_port
- soup_server_get_type
- soup_server_get_uris
diff --git a/libsoup-2.48.0-soup-server-reserved-word.patch~ b/libsoup-2.48.0-soup-server-reserved-word.patch~
deleted file mode 100644
index c0afe73..0000000
--- a/libsoup-2.48.0-soup-server-reserved-word.patch~
+++ /dev/null
@@ -1,11 +0,0 @@
---- libsoup/include/libsoup-2.4/libsoup/soup-server.h~ 2014-10-29 22:51:10 -0700
-+++ libsoup/include/libsoup-2.4/libsoup/soup-server.h 2014-10-30 12:27:08 -0700
-@@ -80,7 +80,7 @@
-
- SOUP_AVAILABLE_IN_2_48
- gboolean soup_server_listen (SoupServer *server,
-- GSocketAddress *interface,
-+ GSocketAddress *iface,
- SoupServerListenOptions options,
- GError **error);
- SOUP_AVAILABLE_IN_2_48
commit e21e9e3efd5bb0c46917c44a864c5a6bc60a2e1f
Author: Geert Janssens <geert at kobaltwit.be>
Date: Mon Jul 3 18:48:25 2017 +0200
Add icu dir to devrc as well
diff --git a/devrc.sh b/devrc.sh
index 70c20e6..d211368 100644
--- a/devrc.sh
+++ b/devrc.sh
@@ -48,6 +48,7 @@ GNUCASH_UDIR=$GLOBAL_UDIR/gnucash/inst
GNUTLS_UDIR=$GLOBAL_UDIR/gnutls
GOFFICE_UDIR=$GLOBAL_UDIR/goffice
GUILE_UDIR=$GLOBAL_UDIR/guile
+ICU4C_DIR=$GLOBAL_UDIR/icu-mingw32
LIBDBI_UDIR=$GLOBAL_UDIR/libdbi
LIBGSF_UDIR=$GLOBAL_UDIR/libgsf
LIBOFX_UDIR=$GLOBAL_UDIR/libofx
@@ -64,7 +65,7 @@ SWIG_UDIR=$GLOBAL_UDIR/swig
WEBKIT_UDIR=$GLOBAL_UDIR/webkit
BOOST_UDIR=$GLOBAL_UDIR/boost
-PATH=$AQBANKING_UDIR/bin:$CMAKE_UDIR/bin:$GWENHYWFAR_UDIR/bin:$ENCHANT_UDIR/bin:$GNOME_UDIR/bin:$GNUCASH_UDIR/bin:$GNUCASH_UDIR/lib:$GNUTLS_UDIR/bin:$GOFFICE_UDIR/bin:$GUILE_UDIR/bin:$LIBDBI_UDIR/bin:$LIBGSF_UDIR/bin:$LIBOFX_UDIR/bin:$LIBSOUP_UDIR/bin:$LIBXSLT_UDIR/bin:$MYSQL_UDIR/bin:$MYSQL_UDIR/lib:$NINJA_UDIR:$OPENSP_UDIR/bin:$PCRE_UDIR/bin:$PGSQL_UDIR/bin:$PGSQL_UDIR/lib:$REGEX_UDIR/bin:$SQLITE3_UDIR/bin:$SWIG_UDIR:$WEBKIT_UDIR/bin:$BOOST_UDIR/lib
+PATH=$AQBANKING_UDIR/bin:$CMAKE_UDIR/bin:$GWENHYWFAR_UDIR/bin:$ENCHANT_UDIR/bin:$GNOME_UDIR/bin:$GNUCASH_UDIR/bin:$GNUCASH_UDIR/lib:$GNUTLS_UDIR/bin:$GOFFICE_UDIR/bin:$GUILE_UDIR/bin:$ICU4C_DIR/lib:$LIBDBI_UDIR/bin:$LIBGSF_UDIR/bin:$LIBOFX_UDIR/bin:$LIBSOUP_UDIR/bin:$LIBXSLT_UDIR/bin:$MYSQL_UDIR/bin:$MYSQL_UDIR/lib:$NINJA_UDIR:$OPENSP_UDIR/bin:$PCRE_UDIR/bin:$PGSQL_UDIR/bin:$PGSQL_UDIR/lib:$REGEX_UDIR/bin:$SQLITE3_UDIR/bin:$SWIG_UDIR:$WEBKIT_UDIR/bin:$BOOST_UDIR/lib
PATH=$PATH:$OLDPATH
commit 6f221976d4c3ebc6c6080a14edda328277c25e3a
Merge: 15c983d 2200481
Author: Geert Janssens <geert at kobaltwit.be>
Date: Mon Jul 3 18:21:36 2017 +0200
Merge branch 'fix-icu-lib' of https://github.com/kcwu/gnucash-on-windows
commit 2200481c51ba475b7d55cec294765da740301276
Author: Kuang-che Wu <kcwu at csie.org>
Date: Mon Jun 26 22:44:34 2017 +0800
Add icu lib to path of launcher
diff --git a/install-impl.sh b/install-impl.sh
index acfac61..8d11d11 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1572,6 +1572,7 @@ set PATH=$LIBSOUP_DIR\\bin;%PATH%
set PATH=$LIBSOUP_DIR\\lib;%PATH%
set PATH=$LIBXSLT_DIR\\bin;%PATH%
set PATH=$LIBXSLT_DIR\\lib;%PATH%
+set PATH=$ICU4C_DIR\\lib;%PATH%
set LTDL_LIBRARY_PATH=${INSTALL_DIR}\\lib
commit 15c983d76ccd17f78264984b7260e989718aedc0
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jun 24 17:39:29 2017 -0700
Bug 781476 - Online Banking Wizard Crashes for Windows
gcc 4.6+ (tested up to 6.3) will optimize away the frame pointer which
corrupts the stack when compiling Gwenhywfar. Telling it not to with
-fno-omit-frame-pointer fixes the crash.
diff --git a/install-impl.sh b/install-impl.sh
index acfac61..304969e 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -663,6 +663,7 @@ function inst_gwenhywfar() {
--prefix=$_GWENHYWFAR_UDIR \
--with-guis=gtk2 \
CPPFLAGS="${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS} `pkg-config --cflags gtk+-2.0`" \
+ CFLAGS="-g -O2 -fno-omit-frame-pointer" \
LDFLAGS="${GNOME_LDFLAGS} ${GNUTLS_LDFLAGS} -lintl"
make
# [ "$CROSS_COMPILE" != "yes" ] && make check
commit 74c4dbce3d28006951a164adbf1a9a14ca694477
Author: John Ralls <jralls at ceridwen.us>
Date: Fri May 26 14:30:36 2017 -0700
Initial commit of mingw64 installation scripts.
This installs or builds all dependencies except HTML Help Workshop, and builds the mingw64 branch of GnuCash.
diff --git a/.gitattributes b/.gitattributes
index d679374..345d215 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -23,12 +23,15 @@
*.sh text eol=lf
*.svg text eol=lf
*.xsl text eol=lf
+*.modules text eol=lf
+jhbuildrc text eol=lf
# Files that should use CRLF at all times
*.bat text eol=crlf
*.cmd text eol=crlf
*.isl text eol=crlf
*.vbs text eol=crlf
+*.ps1 text eol=crlf
gnucash.iss text eol=crlf
gnucash.rc.in text eol=crlf
diff --git a/gnucash.modules b/gnucash.modules
new file mode 100644
index 0000000..7c6b005
--- /dev/null
+++ b/gnucash.modules
@@ -0,0 +1,316 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE moduleset SYSTEM "moduleset.dtd">
+<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
+<moduleset>
+
+ <repository type='tarball' name='ftp.gnu.org'
+ href="ftp://ftp.gnu.org/gnu/"/>
+ <repository type='tarball' name='sourceforge'
+ href="http://downloads.sourceforge.net/"/>
+ <repository type="tarball" name="csail"
+ href="http://groups.csail.mit.edu/mac/ftpdir/"/>
+ <repository type="tarball" name="csclub"
+ href="http://mirror.csclub.uwaterloo.ca/mysql/Downloads/"/>
+ <repository type="tarball" name="gnucash.org"
+ href="http://www.gnucash.org/pub/gnucash/sources/"/>
+ <repository type="git" name="git.gnucash.org"
+ href="http://git.gnucash.org/"/>
+ <repository type="svn" name="aquamaniac"
+ href="http://devel.aqbanking.de/svn/"/>
+ <repository type="git" name="github"
+ href="git://github.com/"/>
+ <repository type="system" name="system"/>
+
+ <systemmodule id="webkitgtk-3.0">
+ <pkg-config>webkitgtk-3.0.pc</pkg-config>
+ <branch repo="system" version="2.4.11" />
+ </systemmodule>
+
+ <systemmodule id="shared-mime-info">
+ <pkg-config>shared-mime-info.pc</pkg-config>
+ <branch repo="system" version="1.4" />
+ </systemmodule>
+
+ <systemmodule id="gnutls">
+ <pkg-config>gnutls.pc</pkg-config>
+ <branch repo="system" version="3.5.10" />
+ </systemmodule>
+
+ <systemmodule id="openssl">
+ <pkg-config>openssl.pc</pkg-config>
+ <branch repo="system" version="1.0.2k" />
+ </systemmodule>
+
+ <systemmodule id="libffi">
+ <pkg-config>libffi.pc</pkg-config>
+ <branch repo="system" version="3.2.1" />
+ </systemmodule>
+
+ <systemmodule id="gmp">
+ <systemdependencies>
+ <dep type="c_include" name="gmp.h" />
+ </systemdependencies>
+ <branch repo="system" />
+ </systemmodule>
+
+ <systemmodule id="gcrypt">
+ <systemdependencies>
+ <dep type="c_include" name="gcrypt.h" />
+ </systemdependencies>
+ <branch repo="system" />
+ </systemmodule>
+
+ <systemmodule id="ltdl">
+ <systemdependencies>
+ <dep type="c_include" name="ltdl.h" />
+ </systemdependencies>
+ <branch repo="system" />
+ </systemmodule>
+
+ <systemmodule id="icu">
+ <pkg-config>icu-i18n.pc</pkg-config>
+ <branch repo="system" version="57.1" />
+ </systemmodule>
+
+ <systemmodule id="iso-codes">
+ <pkg-config>iso-codes.pc</pkg-config>
+ <branch repo="system" version="3.74" />
+ </systemmodule>
+
+ <systemmodule id="boost">
+ <systemdependencies>
+ <dep type="c_include" name="boost/regex.h" />
+ </systemdependencies>
+ <branch repo="system" />
+ </systemmodule>
+
+ <autotools id="libunistring" autogen-sh="configure">
+ <branch repo="ftp.gnu.org" module="libunistring/libunistring-0.9.7.tar.gz"
+ version="0.9.7">
+ </branch>
+ </autotools>
+
+ <autotools id="libatomic-ops"
+ autogen-template="/bin/bash -c 'pushd %(srcdir)s && ./%(autogen-sh)s && popd && %(srcdir)s/configure --prefix=%(prefix)s> %(autogenargs)s'">
+ <branch repo="github" module="ivmai/libatomic_ops"
+ revision="libatomic_ops-7_4_4"/>
+ </autotools>
+
+ <autotools id="bdw-gc" autogen-template="/bin/bash -c 'pushd %(srcdir)s && ./autogen.sh && automake -ac && popd && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s'"
+ autogenargs="--enable-threads=pthreads">
+ <branch repo="github" module="ivmai/bdwgc" revision="gc7_6_0" />
+ <dependencies>
+ <dep package="libatomic-ops"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="guile" autogen-sh="configure"
+ autogenargs="--disable-error-on-warning">
+ <branch repo="ftp.gnu.org" module="guile/guile-1.8.8.tar.gz"
+ version="1.8.8"/>
+ <dependencies>
+ <dep package="gmp"/>
+ </dependencies>
+ </autotools>
+
+ <!-- Unfortunately in addition to needing a few patches this hangs when it tries to compile Scheme. -->
+ <autotools id="guile2" autogen-sh="autoreconf">
+ <branch repo="ftp.gnu.org" module="guile/guile-2.0.12.tar.gz"
+ version="2.0.12">
+ <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/guile-clocktime.patch" strip="1"/>
+ </branch>
+ <dependencies>
+ <dep package="libunistring"/>
+ <dep package="gmp"/>
+ <dep package="libffi"/>
+ <dep package="bdw-gc"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="libchipcard" autogen-sh="configure" autogenargs="--enable-local-install">
+ <branch module="gnucash/Dependencies/libchipcard-5.0.4.tar.gz" version="5.0.4"
+ repo="sourceforge">
+ </branch>
+ <dependencies>
+ <dep package="gcrypt"/>
+ <dep package="gnutls"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="gwenhywfar" autogen-sh="configure"
+ autogenargs="--with-guis=gtk2 --enable-local-install --disable-binreloc --disable-ssl">
+ <branch module="gnucash/Dependencies/gwenhywfar-4.17.0.tar.gz" version="4.17.0"
+ repo="sourceforge">
+ </branch>
+ <dependencies>
+ <dep package="gcrypt"/>
+ <dep package="gnutls"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="gwenhywfar-svn" autogen-template="make -fMakefile.cvs && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
+ autogenargs="--with-guis=gtk2 --enable-local-install --disable-binreloc --disable-ssl">
+ <branch module="gwenhywfar" repo="aquamaniac"/>
+ <dependencies>
+ <dep package="gcrypt"/>
+ <dep package="gnutls"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="ktoblzcheck" autogen-sh="configure">
+ <branch module="ktoblzcheck/ktoblzcheck-1.47.tar.gz" version="1.47"
+ repo="sourceforge"/>
+ </autotools>
+
+ <autotools id="xmlsec">
+ <branch module="lsh123/xmlsec" repo="github" tag="xmlsec-1_2_20"/>
+ <dependencies>
+ <dep package="openssl"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
+ autogenargs="--enable-local-install">
+ <branch module="gnucash/Dependencies/aqbanking-5.6.12.tar.gz" version="5.6.12"
+ repo="sourceforge">
+ </branch>
+ <dependencies>
+ <dep package="gwenhywfar"/>
+ <dep package="gmp"/>
+ <dep package="ktoblzcheck"/>
+ <dep package="xmlsec"/>
+ <dep package="libchipcard"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="aqbanking-svn"
+ autogenargs='--enable-local-install"'
+ autogen-template="make -fMakefile.cvs && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s" >
+ <branch module="aqbanking" repo="aquamaniac" >
+ </branch>
+ <dependencies>
+ <dep package="libofx"/>
+ <dep package="gwenhywfar-svn"/>
+ <dep package="gmp"/>
+ <dep package="ktoblzcheck"/>
+ <dep package="xmlsec"/>
+ <dep package="libchipcard"/>
+ </dependencies>
+ </autotools>
+
+<!-- Note for cross-compilation: libtool, for reasons known only to
+ itself, ignores the CFLAGS and links libosp.5.0.0.la with the
+ native architecture. When jhbuild stops, start a shell and go
+ back and find the link step, copy and paste it, adding the
+ architecture flags, and fire away. Then you can exit the shell
+ and rerun build and it will work OK. -->
+ <autotools id="OpenSP"
+ autogenargs="--disable-static --enable-shared --disable-doc-build --disable-nls"
+ autogen-template='/bin/bash -c "pushd %(srcdir)s && ./autoinit.sh && popd && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"'>
+ <branch repo="sourceforge" module="openjade/OpenSP-1.5.2.tar.gz"
+ version='1.5.2'>
+ <patch file="/c/gcdev/gnucash-on-windows.git/opensp-1.5.2.patch" strip='1'/>
+ </branch>
+ </autotools>
+
+ <autotools id="libofx" autogen-sh='autoreconf'>
+ <branch repo="sourceforge" module="libofx/libofx-0.9.10.tar.gz"
+ version="0.9.10"/>
+ <dependencies>
+ <dep package="OpenSP"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="pcre" autogenargs="--enable-unicode-properties"
+ autogen-sh="configure">
+ <branch repo="sourceforge" module="pcre/pcre-8.32.tar.bz2"
+ version="8.32"/>
+ </autotools>
+
+ <autotools id="swig" autogen-sh="configure">
+ <branch repo="sourceforge" module="swig/swig-2.0.11.tar.gz"
+ version="2.0.11"/>
+ <dependencies>
+ <dep package="pcre"/>
+ </dependencies>
+ </autotools>
+
+
+ <cmake id="mysql">
+ <branch repo="csclub" module="Connector-C/mysql-connector-c-6.0.2.tar.gz"
+ version="6.0.2" >
+ </branch>
+ <dependencies>
+ <dep package="cmake"/>
+ </dependencies>
+ </cmake>
+
+ <autotools id="libdbi" autogen-sh="autoreconf" autogenargs="--disable-docs">
+ <branch repo="sourceforge" module="libdbi/libdbi-0.8.4.tar.gz"
+ version="0.8.4">
+ <patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/libdbi-0.8.3.patch" strip="1"/>
+ </branch>
+ </autotools>
+
+ <autotools id="libdbi-drivers" autogen-sh='autoreconf'
+ autogenargs='--disable-docs --with-sqlite3 --with-sqlite3-dir="/mingw32" --with-pgsql --with-pgsql-dir="/mingw32" --with-mysql --with-mysql-dir="/mingw32" '>
+ <branch repo="sourceforge" version="0.8.3-1"
+ module="libdbi-drivers/libdbi-drivers-0.8.3-1.tar.gz">
+ <patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/libdbi-drivers-errno.patch" strip="1"/>
+ </branch>
+ <dependencies>
+ <dep package="libdbi"/>
+ </dependencies>
+ </autotools>
+
+ <cmake id="googletest" cmakeargs="-DBUILD_GMOCK=OFF" skip-autogen="yes"
+ skip-install="yes">
+ <branch module="google/googletest" repo="github" tag="release-1.8.0"/>
+ </cmake>
+
+ <!--autotools id="gnucash"
+ autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure -\-prefix %(prefix)s %(autogenargs)s"
+ autogenargs="-\-enable-ofx -\-enable-aqbanking -\-enable-binreloc -\-enable-dbi -\-with-dbi-dbd-dir=$PREFIX/lib/dbd"-->
+ <cmake id="gnucash"
+ cmakeargs="-G 'MSYS Makefiles' -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_PREFIX_PATH=c:/gcdev64/msys2 -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock">
+ <branch repo="github" module="Gnucash/gnucash.git" revision="master"
+ checkoutdir="gnucash-git"/>
+ <dependencies>
+ <dep package="libofx"/>
+ <dep package="aqbanking"/>
+ <dep package="libdbi-drivers"/>
+ <!--dep package="shared-mime-info"/-->
+ <!--dep package="iso-codes"/-->
+ <dep package="guile"/>
+ <!--dep package="swig"/-->
+ <dep package="boost"/>
+ <dep package="googletest"/>
+ </dependencies>
+ <!--/autotools-->
+ </cmake>
+
+ <autotools id="gnucash-docs-git" autogenargs="--disable-scrollkeeper"
+ autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
+ makeargs=" html" makeinstallargs="install-html" >
+ <branch repo="github" module="Gnucash/gnucash-docs.git" revision="master"
+ checkoutdir="gnucash-docs-git"/>
+ <dependencies>
+ <!-- dep package="scrollkeeper"/ -->
+ </dependencies>
+ </autotools>
+
+ <autotools id="gnucash-docs" autogenargs="--disable-scrollkeeper"
+ autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
+ makeargs=" html" makeinstallargs="install-html" >
+ <branch module="gnucash/gnucash-docs/gnucash-docs-2.6.16.tar.gz"
+ version="2.6.16" repo="sourceforge"/>
+ </autotools>
+
+ <metamodule id="meta-gnucash">
+ <dependencies>
+ <dep package="gnucash"/>
+ <dep package="gnucash-docs"/>
+ </dependencies>
+ </metamodule>
+
+</moduleset>
diff --git a/jhbuildrc b/jhbuildrc
new file mode 100644
index 0000000..efe14a6
--- /dev/null
+++ b/jhbuildrc
@@ -0,0 +1,61 @@
+#-*- mode: python -*-
+def _popen(cmd_arg):
+ from subprocess import Popen, PIPE
+ devnull = open('/dev/null')
+ cmd = Popen(cmd_arg, stdout=PIPE, stderr=devnull, shell=True)
+ retval = cmd.stdout.read().strip()
+ err = cmd.wait()
+ cmd.stdout.close()
+ devnull.close()
+ if err:
+ raise RuntimeError, "Failed to close %s stream" % cmd_arg
+ return retval
+
+def environ_append(key, value, separator=' '):
+ old_value = os.environ.get(key)
+ if old_value is not None:
+ value = old_value + separator + value
+ os.environ[key] = value
+
+def append_autogenargs(module, args):
+ old_value = module_autogenargs.get(module, autogenargs)
+ module_autogenargs[module] = old_value + " " + args
+
+def remove_autogenargs(module, args):
+ arg_string = module_autogenargs.get(module, autogenargs)
+ module_autogenargs[module] = arg_string.replace(args, "")
+def add_to_path_var(var, path):
+ if not var in os.environ:
+ os.environ[var] = path
+ else:
+ os.environ[var] = os.environ[var] + ":" + path
+
+_config_dir = os.path.join('/c', 'gcdev64', 'src', 'gnucash-on-windows.git')
+_basedir = os.path.join('/c', 'gcdev64')
+prefix = os.path.join(_basedir, 'inst')
+checkoutroot = os.path.join(_basedir, 'src')
+buildroot = os.path.join(_basedir, 'build')
+tarballdir = os.path.join('/c', 'gcdev', 'downloads')
+moduleset = os.path.join(_config_dir, 'gnucash.modules')
+
+_mingw_includes = os.path.join(_basedir, 'msys2', 'mingw32', 'include')
+_mingw_libs = os.path.join(_basedir, 'msys2', 'mingw32', 'lib')
+_usr_include = os.path.join('/usr', 'include')
+_usr_lib = os.path.join('/usr', 'lib')
+environ_append('CPPFLAGS', '-I%s -I%s' % (_mingw_includes, _usr_include))
+environ_append('LDFLAGS', '-L%s -L%s' % (_mingw_libs, _usr_lib))
+add_to_path_var('PKG_CONFIG_PATH', os.path.join(_mingw_libs, 'pkgconfig'))
+add_to_path_var('PATH', os.path.join(_basedir, 'msys2', 'mingw32', 'bin'))
+
+os.environ['SRCROOT'] = checkoutroot
+os.environ['PREFIX'] = prefix
+autogenargs = "--build=i686-w64-mingw32"
+#autogenargs = 'CPPFLAGS="-I%s"' % _sys_includes
+
+append_autogenargs("libofx", "--with-opensp-includes=" + prefix + "/include/OpenSP --with-opensp-libs=" + prefix + "/lib")
+append_autogenargs("libdbi-drivers","--with-dbi-incdir=" + prefix + "/include --with-dbi-libdir=" + prefix + "/lib")
+module_makeargs["aqbanking"]="-j1"
+
+module_extra_env["gwenhywfar"]={'CPPFLAGS':_popen('pkg-config --cflags gtk+-2.0'), 'LDFLAGS':_popen('pkg-config --libs gtk+-2.0')}
+module_extra_env["gnucash"]={'ACLOCAL_FLAGS':'-I' + os.path.join('/mingw32', 'share', 'aclocal')}
+
diff --git a/opensp-1.5.2.patch b/opensp-1.5.2.patch
index 5a5ac6d..3271365 100644
--- a/opensp-1.5.2.patch
+++ b/opensp-1.5.2.patch
@@ -1,5 +1,5 @@
---- lib/Makefile.am~ Thu Dec 15 13:13:16 2005
-+++ lib/Makefile.am Tue Feb 6 10:57:58 2007
+--- a/lib/Makefile.am Thu Dec 15 13:13:16 2005
++++ b/lib/Makefile.am Tue Feb 6 10:57:58 2007
@@ -76,7 +76,9 @@
splibpch.h token.h app_inst.cxx arc_inst.cxx entmgr_inst.cxx \
parser_inst.cxx xentmgr_inst.cxx SubstTable.cxx \
@@ -11,3 +11,30 @@
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/generic
+--- a/lib/MessageReporter.cxx 2005-07-21 07:05:17.000000000 -0700
++++ b/lib/MessageReporter.cxx 2017-05-06 11:51:04.348011200 -0700
+@@ -13,7 +13,8 @@
+ #include "macros.h"
+
+ #include <string.h>
+-
++#include <iostream>
++#include <sstream>
+
+ #ifdef SP_NAMESPACE
+ namespace SP_NAMESPACE {
+@@ -123,8 +124,12 @@
+ os() << ':';
+ }
+ if (options_ & messageNumbers)
+- os() << (unsigned long)message.type->module() << "."
++ {
++ std::ostringstream ss;
++ ss << (void*)message.type->module();
++ os() << ss.str().c_str() << "."
+ << (unsigned long)message.type->number() << ":";
++ }
+ switch (message.type->severity()) {
+ case MessageType::info:
+ formatFragment(MessageReporterMessages::infoTag, os());
+
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
new file mode 100644
index 0000000..4ffbe32
--- /dev/null
+++ b/setup-mingw64.ps1
@@ -0,0 +1,104 @@
+
+Param([string]$target_dir = "c:\\gcdev64")
+
+$progressPreference = 'silentlyContinue'
+$installer32 = "http://repo.msys2.org/distrib/i686/msys2-i686-20161025.exe"
+$archive32 = "http://repo.msys2.org/distrib/i686/msys2-base-i686-20161025.tar.xz"
+$installer64 = "http://repo.msys2.org/distrib/x86_64/msys2-x86_64-20161025.exe"
+$archive64 = "http://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20161025.tar.xz"
+
+$download_dir = "c:\\gcdev\\downloads"
+$installer_file = "$download_dir\\msys2.exe"
+$archive_file = "$download_dir\\msys2-base.tar.xz"
+$installer = If ([IntPtr]::size -eq 4) {$installer32} Else {$installer64}
+
+$mingw_setup = @"
+function Controller() {}
+Controller.prototype.IntroductionPageCallback = function() {
+ gui.clickButton(buttons.NextButton);
+}
+Controller.prototype.TargetDirectoryPageCallback = function() {
+ var page = gui.pageWidgetByObjectName("TargetDirectoryPage");
+ page.TargetDirectoryLineEdit.setText("$target_dir\\msys2");
+ gui.clickButton(buttons.NextButton);
+}
+Controller.prototype.StartMenuDirectoryPageCallback = function() {
+ gui.clickButton(buttons.NextButton);
+}
+Controller.prototype.FinishedPageCallback = function() {
+ var page = gui.pageWidgetByObjectName("FinishedPage");
+ page.RunItCheckBox.checked = false;
+ gui.clickButton(buttons.FinishButton);
+}
+"@
+
+if (!(test-path -path $installer_file)) {
+ Write-Host "Downloading $installer_file from $installer"
+ Invoke-WebRequest -URI $installer -OutFile $installer_file
+}
+if (!(test-path -path $target_dir)) {
+ New-Item $target_dir -type directory
+}
+
+Set-Content -Path $target_dir\mingw64-setup.qs -Value $mingw_setup | Out-Null
+Set-Location -Path $target_dir
+
+function bash-command() {
+ param ([string]$command = "")
+ $psi = new-object "Diagnostics.ProcessStartInfo"
+ $psi.Filename = "$target_dir\msys2\usr\bin\bash.exe"
+ $psi.Arguments = "-c ""export PATH=/usr/bin; $command"""
+ return [Diagnostics.Process]::Start($psi)
+}
+
+#if MSys2 isn't already installed, install it.
+if (!(test-path -path $target_dir\msys2\usr\bin\bash.exe)) {
+ & $installer_file --script $target_dir\mingw64-setup.qs | Out-Null
+ Write-Host @"
+Updating the new installation. A bash window will open. In that window accept the proposed installation and close the window when the update completes.
+
+There will be a second update.
+"@
+ $proc = bash-command("pacman -Syuu")
+ $proc.WaitForExit()
+}
+
+#Update the system.
+Write-Host @"
+
+Updating the installation. Accept the proposed changes. If the window doesn't close on its own then close it and re-run the script when it finishes.
+"@
+
+$proc = bash-command("pacman -Syuu")
+$proc.WaitForExit()
+
+# Set up aliases for the parts of msys-devtools and mingw-w64-toolchain that
+# we need:
+$msys_devel = "msys/asciidoc msys/autoconf msys/autoconf2.13 msys/autogen msys/automake-wrapper msys/automake1.10 msys/automake1.11 msys/automake1.12 msys/automake1.13 msys/automake1.14 msys/automake1.15 msys/automake1.6 msys/automake1.7 msys/automake1.8 msys/automake1.9 msys/bison msys/diffstat msys/diffutils msys/dos2unix msys/file msys/flex msys/gawk msys/gdb msys/gettext msys/gettext-devel msys/gperf msys/grep msys/groff msys/intltool msys/libtool msys/m4 msys/make msys/man-db msys/pacman msys/pactoys-git msys/patch msys/patchutils msys/perl msys/pkg-config msys/sed msys/swig msys/texinfo msys/texinfo-tex msys/wget msys/xmlto"
+
+$mingw32_toolchain = "mingw32/mingw-w64-i686-binutils mingw32/mingw-w64-i686-crt-git mingw32/mingw-w64-i686-gcc mingw32/mingw-w64-i686-gcc-libs mingw32/mingw-w64-i686-gdb mingw32/mingw-w64-i686-headers-git mingw32/mingw-w64-i686-libmangle-git mingw32/mingw-w64-i686-libwinpthread-git mingw32/mingw-w64-i686-make mingw32/mingw-w64-i686-pkg-config mingw32/mingw-w64-i686-tools-git mingw32/mingw-w64-i686-winpthreads-git"
+
+# Aliases to collect the other dependencies:
+$other_msys = "msys/git msys/jhbuild-git"
+
+$other_mingw = "mingw32/mingw-w64-i686-webkitgtk2 mingw32/mingw-w64-i686-boost mingw32/mingw-w64-i686-iso-codes mingw32/mingw-w64-i686-shared-mime-info mingw32/mingw-w64-i686-libmariaclient mingw32/mingw-w64-i686-postgresql mingw32/mingw-w64-i686-libgnomecanvas mingw32/mingw-w64-i686-ninja"
+
+Write-Host @"
+
+Now we'll install the dependencies. Accept the installation as usual. About half-way through it will stop with a message about fontconfig. Just type "Return" at it and it will resume and complete the installation.
+"@
+$proc = bash-command("pacman -S $msys_devel $mingw32_toolchain $other_msys $other_mingw")
+$proc.waitForExit()
+
+Write-Host @"
+
+Finally we'll clone the gnucash-on-windows repository into target-dir/src and you'll be ready to build GnuCash.
+"@
+
+if (!(test-path -path "$target_dir\\src")) {
+ New-Item $target_dir\\src -type directory
+}
+if (!(test-path -path "$target_dir\\src\\gnucash-on-windows.git")) {
+ $proc = bash-command("git clone -b mingw64 https://github.com/gnucash/gnucash-on-windows.git $target_dir/src/gnucash-on-windows.git")
+ $proc.waitForExit()
+}
commit f807b4f534a8299c5ce0f22b09991ab9b2d7d46a
Author: John Ralls <jralls at ceridwen.us>
Date: Sat May 20 13:48:33 2017 -0700
Fix slightly incorrect download URL.
diff --git a/defaults.sh b/defaults.sh
index 585e41d..159738c 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -365,7 +365,7 @@ set_default AQBANKING_URL "https://www.aquamaniac.de/sites/download/download.php
set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
set_default AQB_PATCH ""
-set_default SQLITE3_URL "https://sqlite.org/2017/sqlite-autotools-3180000.tar.gz"
+set_default SQLITE3_URL "https://sqlite.org/2017/sqlite-autoconf-3180000.tar.gz"
set_default SQLITE3_DIR $GLOBAL_DIR\\sqlite3
set_default MYSQL_LIB_URL "http://mirror.csclub.uwaterloo.ca/mysql/Downloads/Connector-C/mysql-connector-c-noinstall-6.0.1-win32.zip"
set_default MYSQL_LIB_DIR $GLOBAL_DIR\\mysql
commit ad44d64e4aa0def23d310aeb4e7690b3e72a06df
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat May 20 17:40:51 2017 +0200
Update sqlite version
diff --git a/defaults.sh b/defaults.sh
index ea2a8ec..585e41d 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -365,7 +365,7 @@ set_default AQBANKING_URL "https://www.aquamaniac.de/sites/download/download.php
set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
set_default AQB_PATCH ""
-set_default SQLITE3_URL "http://sqlite.org/sqlite-amalgamation-3.6.1.tar.gz"
+set_default SQLITE3_URL "https://sqlite.org/2017/sqlite-autotools-3180000.tar.gz"
set_default SQLITE3_DIR $GLOBAL_DIR\\sqlite3
set_default MYSQL_LIB_URL "http://mirror.csclub.uwaterloo.ca/mysql/Downloads/Connector-C/mysql-connector-c-noinstall-6.0.1-win32.zip"
set_default MYSQL_LIB_DIR $GLOBAL_DIR\\mysql
commit 30bba34a41ec58220e881567b9bc9ccf3a194b68
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu May 4 16:28:56 2017 +0200
The recent webkit rebuild now depends on icu
diff --git a/dist-impl.sh b/dist-impl.sh
index 0a8f5cf..240dafb 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -241,11 +241,6 @@ function dist_webkit() {
function dist_icu4c() {
setup icu4c
get_major_minor "$GNUCASH_SCM_REV"
- if [ "$GNUCASH_SCM_REV" != "master" ] &&
- (( $major_minor <= 206 )); then
- echo "Skipping. ICU is only needed for the master branch or future 2.7.x and up versions of gnucash."
- return
- fi
cp -a ${_ICU4C_UDIR}/lib/*.dll ${_DIST_UDIR}/bin
}
diff --git a/install-impl.sh b/install-impl.sh
index 3134218..acfac61 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1264,12 +1264,6 @@ function inst_hh() {
function inst_icu4c() {
setup icu4c
- get_major_minor "$GNUCASH_SCM_REV"
- if [ "$GNUCASH_SCM_REV" != "master" ] &&
- (( $major_minor <= 206 )); then
- echo "Skipping. ICU is only needed for the master branch or future 2.7.x and up versions of gnucash."
- return
- fi
_ICU4C_UDIR=`unix_path $ICU4C_DIR`
if [ -f "$_ICU4C_UDIR/lib/libicuuc.dll.a" ]
then
diff --git a/install.sh b/install.sh
index c1a1e57..883ad44 100644
--- a/install.sh
+++ b/install.sh
@@ -95,12 +95,12 @@ add_step inst_ktoblzcheck
add_step inst_aqbanking
add_step inst_libdbi
-# libsoup and enchant needed by webkit
+# icu, libsoup and enchant needed by webkit
+add_step inst_icu4c
add_step inst_libsoup
add_step inst_enchant
add_step inst_webkit
-#icu, boost, and gtest now needed for C++ on master only
-add_step inst_icu4c
+# boost, and gtest now needed for C++ on master only
add_step inst_boost
add_step inst_gtest
commit 9974359d0450da9058aa41ca142f5b7d5fa5e667
Author: Geert Janssens <geert at kobaltwit.be>
Date: Tue Apr 18 23:39:20 2017 +0200
Make devrc.sh less picky about where it's called from
You can now source it from anywhere as long as
- devrc.sh is still in gnucash-on-windows.git
- gnucash-on-windows.git is where the bootstrap script originally created it
devrc.sh makes some assumptions about other directory locations. If you overrode any
of these in custom.sh, this will currently not be picked up and hence devrc.sh
will not set up the environment properly for direct development.
diff --git a/devrc.sh b/devrc.sh
index 1cb5c91..70c20e6 100644
--- a/devrc.sh
+++ b/devrc.sh
@@ -26,10 +26,15 @@
export OLDPATH=$PATH
-_currdir=`pwd`
-_dirname=`basename $_currdir`
+
+_savedir="$(pwd)"
+cd "$(dirname ${BASH_SOURCE[0]})"
+_currdir="$(pwd)"
+cd "$_savedir"
+
+_dirname="$(basename $_currdir)"
if [ $(expr $_dirname : gnucash-on-windows.*) -ne 0 ]; then
- GLOBAL_UDIR=`dirname $_currdir`
+ GLOBAL_UDIR="$(dirname $_currdir)"
else
echo "Source me in gnucash-on-windows so that I can set the right directory."
return
commit 27491ec2c079adcecd1a83ec8151fbc989fef35a
Author: Geert Janssens <geert at kobaltwit.be>
Date: Tue Apr 18 22:40:16 2017 +0200
Don't kill the running shell if sourced from the wrong directory
By exiting from a source file, one exits the calling shell
and hence the invoker never sees the error message
diff --git a/devrc.sh b/devrc.sh
index 3ed718a..1cb5c91 100644
--- a/devrc.sh
+++ b/devrc.sh
@@ -32,7 +32,7 @@ if [ $(expr $_dirname : gnucash-on-windows.*) -ne 0 ]; then
GLOBAL_UDIR=`dirname $_currdir`
else
echo "Source me in gnucash-on-windows so that I can set the right directory."
- exit
+ return
fi
AQBANKING_UDIR=$GLOBAL_UDIR/aqbanking
CMAKE_UDIR=$GLOBAL_UDIR/cmake
commit 9ba53a2091348b41bf033a8508f069d68200a46a
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Apr 16 12:36:11 2017 -0700
Make GLIB_VERSION match the glib installation.
diff --git a/defaults.sh b/defaults.sh
index a74a448..ea2a8ec 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -212,7 +212,7 @@ set_default GUILE_PATCH `pwd`/guile-1.8.patch
set_default OPENSSL_URL "http://www.openssl.org/source/openssl-0.9.8j.tar.gz"
set_default OPENSSL_DIR $GLOBAL_DIR\\openssl
-GLIB_VERSION="2.38.2"
+GLIB_VERSION="2.42.2"
GNUTLS_VERSION="3.2.19"
set_default BUILD_GNUTLS_FROM_SOURCE "no"
set_default GNUTLS_URL "$GC_DEPS_URL/gnutls-3.2.19-minGW.tgz"
commit 9f524789a7ca6d08ba8f35644db0fd2ba2262853
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Apr 15 13:35:42 2017 -0700
Revert "Temporary kluge to get nightlies building until WebKit is rebuilt."
This reverts commit cff2538da1634fedb98cf8e284f781bfb16eae76.
diff --git a/defaults.sh b/defaults.sh
index 3d8662c..a74a448 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -310,9 +310,8 @@ set_default HH_DIR $GLOBAL_DIR\\hh
set_default BUILD_WEBKIT_FROM_SOURCE no
set_default WEBKIT_VERSION "1.8.3"
-set_default WEBKIT_URL "$SF_MIRROR/gnucash/webkit-${WEBKIT_VERSION}-minGW.tgz"
+set_default WEBKIT_URL "$SF_MIRROR/gnucash/webkit-${WEBKIT_VERSION}-minGW-1.tgz"
set_default WEBKIT_DEV_URL "$SF_MIRROR/gnucash/webkit-${WEBKIT_VERSION}-dev-minGW.tgz"
-set_default PTHREADGC2_URL "$GC_DEPS_URL/pthreadGC2.dll"
set_default WEBKIT_DIR $GLOBAL_DIR\\webkit
#NB: The Fedora project maintains a source version that has been patched for building in a Fedora-MinGW cross-compiler. This isn't quite good enough to build in MinGW itself, but it's a lot closer and less work than starting with a tarball direct from the WebKitGtk project.
set_default WEBKIT_SRC_URL "https://pkgs.fedoraproject.org/repo/pkgs/mingw-webkitgtk/webkit-1.8.3.tar.xz/dcbf9d5e2e6391f857c29a57528b32a6/webkit-1.8.3.tar.xz"
diff --git a/dist-impl.sh b/dist-impl.sh
index 1aa62d6..0a8f5cf 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -236,7 +236,6 @@ function dist_webkit() {
cp -a ${_LIBXSLT_UDIR}/bin/* ${_DIST_UDIR}/bin
cp -a ${_ENCHANT_UDIR}/bin/* ${_DIST_UDIR}/bin
cp -a ${_WEBKIT_UDIR}/bin/* ${_DIST_UDIR}/bin
- cp -a ${_MINGW_UDIR}/bin/pthreadGC2.dll ${_DIST_UDIR}/bin
}
function dist_icu4c() {
diff --git a/install-impl.sh b/install-impl.sh
index 7320bb3..3134218 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1167,10 +1167,8 @@ function inst_webkit() {
qpopd
else
mkdir -p $_WEBKIT_UDIR
- _MINGW_UDIR=`unix_path $MINGW_DIR`
wget_unpacked $WEBKIT_URL $DOWNLOAD_DIR $WEBKIT_DIR
wget_unpacked $WEBKIT_DEV_URL $DOWNLOAD_DIR $WEBKIT_DIR
- smart_wget $PTHREADGC2_URL $_MINGW_UDIR/bin
fix_libtool_files ${_WEBKIT_UDIR}
fi
quiet ${PKG_CONFIG} --exists webkit-1.0 || die "webkit not installed correctly"
commit 8d412fa8112b2a39f6a91cfdb8895a91f55db1e1
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Apr 15 12:30:12 2017 -0700
Add info about building other branches and using cmake + ninja.
diff --git a/README b/README
index 4a34f92..a85a63c 100644
--- a/README
+++ b/README
@@ -87,6 +87,13 @@ The default values will all be found in 'defaults.sh'. You can
override any of these in 'custom.sh'. The boostrap script you ran in
step b. already created an initial version of this file.
+Some particular additions you may want to make to custom.sh are:
+GNUCASH_SCM_REV=maint
+will switch the branch of GnuCash that the script builds from 'master' to 'maint'.
+WITH_CMAKE=yes
+WITH_NINJA=yes
+Will use CMake and ninja instead of autotools and make to configure and build GnuCash (and only GnuCash, it has no effect on any of the dependencies). If you leave off WITH_NINJA it will configure with CMake and build with make. CMake + ninja builds are substantially faster than autotools ones.
+
c. Open an Msys shell window. You do this by running
c:\gcdev\mingw\msys\1.0\msys.bat
Unless you chose to install mingw/msys in another directory of course.
commit cff2538da1634fedb98cf8e284f781bfb16eae76
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Apr 14 16:43:04 2017 -0700
Temporary kluge to get nightlies building until WebKit is rebuilt.
diff --git a/defaults.sh b/defaults.sh
index eaa454f..3d8662c 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -312,6 +312,7 @@ set_default BUILD_WEBKIT_FROM_SOURCE no
set_default WEBKIT_VERSION "1.8.3"
set_default WEBKIT_URL "$SF_MIRROR/gnucash/webkit-${WEBKIT_VERSION}-minGW.tgz"
set_default WEBKIT_DEV_URL "$SF_MIRROR/gnucash/webkit-${WEBKIT_VERSION}-dev-minGW.tgz"
+set_default PTHREADGC2_URL "$GC_DEPS_URL/pthreadGC2.dll"
set_default WEBKIT_DIR $GLOBAL_DIR\\webkit
#NB: The Fedora project maintains a source version that has been patched for building in a Fedora-MinGW cross-compiler. This isn't quite good enough to build in MinGW itself, but it's a lot closer and less work than starting with a tarball direct from the WebKitGtk project.
set_default WEBKIT_SRC_URL "https://pkgs.fedoraproject.org/repo/pkgs/mingw-webkitgtk/webkit-1.8.3.tar.xz/dcbf9d5e2e6391f857c29a57528b32a6/webkit-1.8.3.tar.xz"
diff --git a/dist-impl.sh b/dist-impl.sh
index 0a8f5cf..1aa62d6 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -236,6 +236,7 @@ function dist_webkit() {
cp -a ${_LIBXSLT_UDIR}/bin/* ${_DIST_UDIR}/bin
cp -a ${_ENCHANT_UDIR}/bin/* ${_DIST_UDIR}/bin
cp -a ${_WEBKIT_UDIR}/bin/* ${_DIST_UDIR}/bin
+ cp -a ${_MINGW_UDIR}/bin/pthreadGC2.dll ${_DIST_UDIR}/bin
}
function dist_icu4c() {
diff --git a/install-impl.sh b/install-impl.sh
index 3134218..7320bb3 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1167,8 +1167,10 @@ function inst_webkit() {
qpopd
else
mkdir -p $_WEBKIT_UDIR
+ _MINGW_UDIR=`unix_path $MINGW_DIR`
wget_unpacked $WEBKIT_URL $DOWNLOAD_DIR $WEBKIT_DIR
wget_unpacked $WEBKIT_DEV_URL $DOWNLOAD_DIR $WEBKIT_DIR
+ smart_wget $PTHREADGC2_URL $_MINGW_UDIR/bin
fix_libtool_files ${_WEBKIT_UDIR}
fi
quiet ${PKG_CONFIG} --exists webkit-1.0 || die "webkit not installed correctly"
commit 3460ba4fb2e5a013f719d68eef3c89b1d2fdf860
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Apr 14 13:12:28 2017 -0700
Distribute all of the libboost dlls.
imp-csv requires libboost-local and that drags in a bunch of others. It's
easier to just distribute all of them than to cherry-pick.
diff --git a/dist-impl.sh b/dist-impl.sh
index dec6bb5..0a8f5cf 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -95,9 +95,7 @@ function dist_boost() {
return
fi
- cp -a ${_BOOST_UDIR}/lib/libboost_chrono.dll ${_DIST_UDIR}/bin
- cp -a ${_BOOST_UDIR}/lib/libboost_date_time.dll ${_DIST_UDIR}/bin
- cp -a ${_BOOST_UDIR}/lib/libboost_regex.dll ${_DIST_UDIR}/bin
+ cp -a ${_BOOST_UDIR}/lib/*.dll ${_DIST_UDIR}/bin
}
function dist_gnome() {
commit 1fc3db3ae7b60dabbe55ccb6011df07a03e8c12b
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Apr 14 13:11:01 2017 -0700
Fix ICU dist.
diff --git a/dist-impl.sh b/dist-impl.sh
index c33a8fd..dec6bb5 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -248,7 +248,7 @@ function dist_icu4c() {
echo "Skipping. ICU is only needed for the master branch or future 2.7.x and up versions of gnucash."
return
fi
- cp -a ${_ICU4C_UDIR}/bin/* ${_DIST_UDIR}/bin
+ cp -a ${_ICU4C_UDIR}/lib/*.dll ${_DIST_UDIR}/bin
}
function dist_gnucash() {
commit 92b1cb2ac6f08066aed07ebe03fd6812d75a5adf
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Apr 14 11:51:35 2017 -0700
Add ICU to the distribution.
diff --git a/dist-impl.sh b/dist-impl.sh
index 9d95fd8..c33a8fd 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -41,6 +41,7 @@ function dist_prepare() {
_INSTALL_UDIR=`unix_path $INSTALL_DIR`
_INNO_UDIR=`unix_path $INNO_DIR`
_WEBKIT_UDIR=`unix_path $WEBKIT_DIR`
+ _ICU4C_UDIR=`unix_path $ICU4C_DIR`
_ISOCODES_UDIR=`unix_path $ISOCODES_DIR`
_MINGW_WFSDIR=`win_fs_path $MINGW_DIR`
add_to_env $_UNZIP_UDIR/bin PATH # unzip
@@ -239,6 +240,17 @@ function dist_webkit() {
cp -a ${_WEBKIT_UDIR}/bin/* ${_DIST_UDIR}/bin
}
+function dist_icu4c() {
+ setup icu4c
+ get_major_minor "$GNUCASH_SCM_REV"
+ if [ "$GNUCASH_SCM_REV" != "master" ] &&
+ (( $major_minor <= 206 )); then
+ echo "Skipping. ICU is only needed for the master branch or future 2.7.x and up versions of gnucash."
+ return
+ fi
+ cp -a ${_ICU4C_UDIR}/bin/* ${_DIST_UDIR}/bin
+}
+
function dist_gnucash() {
setup GnuCash
mkdir -p $_DIST_UDIR/bin
diff --git a/dist.sh b/dist.sh
index d440f00..b4886f6 100755
--- a/dist.sh
+++ b/dist.sh
@@ -38,6 +38,7 @@ add_step dist_ktoblzcheck
add_step dist_aqbanking
add_step dist_libdbi
add_step dist_webkit
+add_step dist_icu4c
add_step dist_boost
add_step dist_gnucash
add_step dist_finish
commit b40e5f32ca7c273529c79e9c84379df471cc26c8
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Mar 13 11:35:29 2017 -0700
Clean up after testing html help workshop.
diff --git a/install-impl.sh b/install-impl.sh
index 5830738..3134218 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1205,6 +1205,7 @@ int main(int argc, char **argv) {
}
EOF
gcc -shared -o ofile.dll ofile.c "$HH_CPPFLAGS" "$HH_LDFLAGS" -lhtmlhelp || return 1
+ rm ofile*
qpopd
}
commit 9c495dc476cc2da439e6d9ac94b104916baf9a3c
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Mar 12 10:55:01 2017 -0700
Add ICU and boost::locale to build.
Required by csv_imp_cpp branch.
diff --git a/defaults.sh b/defaults.sh
index 10afcf1..eaa454f 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -330,9 +330,9 @@ set_default LIBSOUP_SRC_URL "$GNOME_MIRROR/sources/libsoup/2.48/libsoup-${LIBSOU
set_default LIBSOUP_BAD_SYMBOL_PATCH `pwd`/libsoup-2.48.0-bad-symbol.patch
set_default LIBSOUP_RESERVED_WORD_PATCH `pwd`/libsoup-2.48.0-soup-server-reserved-word.patch
set_default ICU4C_URL "http://download.icu-project.org/files/icu4c/4.4.1/icu4c-4_4_1-Win32-msvc9.zip"
-set_default ICU4C_SRC_URL "http://download.icu-project.org/files/icu4c/4.4.1/icu4c-4_4_1-src.tgz"
+set_default ICU4C_SRC_URL "http://download.icu-project.org/files/icu4c/57.1/icu4c-57_1-src.tgz"
set_default ICU4C_DIR $GLOBAL_DIR\\icu-mingw32
-set_default ICU4C_PATCH `pwd`/icu-crossmingw.patch
+set_default ICU4C_PATCH ""
set_default GIT_URL "https://github.com/msysgit/msysgit/releases/download/Git-1.9.4-preview20140611/Git-1.9.4-preview20140611.exe"
set_default GIT_DIR $GLOBAL_DIR\\git-1.9.4
@@ -400,6 +400,10 @@ set_default ISOCODES_DIR $GLOBAL_DIR\\isocodes
set_default BOOST_URL "$SF_MIRROR/boost/boost/boost_1_55_0.tar.bz2"
set_default BOOST_DIR $GLOBAL_DIR\\boost
+# Limit the built libraries to what we think we'll need. Note
+# that the python and context libraries depend on Python and
+# Visual Studio respectively to build, so don't add them.
+set_default BOOST_LIBS "atomic,chrono,date_time,filesystem,locale,log,program_options,regex,signals,system,test"
set_default GTEST_REPO "https://github.com/google/googletest"
set_default GTEST_VERSION "master"
diff --git a/install-impl.sh b/install-impl.sh
index 0f10e09..5830738 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1260,6 +1260,48 @@ function inst_hh() {
fi
}
+
+function inst_icu4c() {
+ setup icu4c
+ get_major_minor "$GNUCASH_SCM_REV"
+ if [ "$GNUCASH_SCM_REV" != "master" ] &&
+ (( $major_minor <= 206 )); then
+ echo "Skipping. ICU is only needed for the master branch or future 2.7.x and up versions of gnucash."
+ return
+ fi
+ _ICU4C_UDIR=`unix_path $ICU4C_DIR`
+ if [ -f "$_ICU4C_UDIR/lib/libicuuc.dll.a" ]
+ then
+ echo "icu4c already installed. Skipping."
+ else
+ wget_unpacked $ICU4C_SRC_URL $DOWNLOAD_DIR $TMP_DIR
+# qpushd $TMP_UDIR/icu
+# patch -p1 < $ICU4C_PATCH
+ # qpopd
+ mkdir $TMP_UDIR/icu/build
+ qpushd $TMP_UDIR/icu/build
+ ../source/configure --prefix ${_ICU4C_UDIR} \
+ --disable-strict \
+ --disable-extras \
+ --disable-layout \
+ --disable-layoutex \
+ --disable-tests \
+ --disable-samples \
+ CPPFLAGS="${CPPFLAGS} -DU_CHARSET_IS_UTF8=1 -DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1 -DU_USING_ICU_NAMESPACE=0" \
+ CXXFLAGS="${CXXFLAGS} -std=gnu++11"
+
+ make V=0
+ make install V=0
+ ln ${_ICU4C_UDIR}/lib/libicudt.dll.a ${_ICU4C_UDIR}/lib/libicudata.dll.a
+ ln ${_ICU4C_UDIR}/lib/libicuin.dll.a ${_ICU4C_UDIR}/lib/libicui18n.dll.a
+ qpopd
+ # cleanup
+ rm -rf $TMP_UDIR/icu*
+ fi
+ add_to_env ${_ICU4C_UDIR}/lib PATH
+ add_to_env ${_ICU4C_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
+}
+
function inst_boost() {
setup Boost
get_major_minor "$GNUCASH_SCM_REV"
@@ -1268,8 +1310,8 @@ function inst_boost() {
echo "Skipping. Boost is only needed for the master branch or future 2.7.x and up versions of gnucash."
return
fi
-
_BOOST_UDIR=`unix_path ${BOOST_DIR}`
+ _ICU4C_WDIR=`win_fs_path ${ICU4C_DIR}`
# The boost m4 macro included with gnucash looks for boost in either
# $BOOST_ROOT/staging (useless here) or $ac_boost_path, while the cmake build
# looks in $BOOST_ROOT. So we set both to support both build systems.
@@ -1284,17 +1326,15 @@ function inst_boost() {
wget_unpacked $BOOST_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/boost_*
qpushd $TMP_UDIR/boost_*
- if test ! -f ${_BOOST_UDIR}/bin/b2
- then
- qpushd tools/build/v2
- ./bootstrap.sh --with-toolset=mingw
- ./b2 install toolset=gcc --prefix=${_BOOST_UDIR}
- qpopd
- fi
- # Limit the built libraries to what we think we'll need. Note
- # that the python and context libraries depend on Python and
- # Visual Studio respectively to build, so don't add them.
- ${_BOOST_UDIR}/bin/b2 install-proper --prefix=${_BOOST_UDIR} --with-atomic --with-chrono --with-date_time --with-filesystem --with-log --with-program_options --with-regex --with-signals --with-system --with-test link=shared variant=release toolset=gcc --layout=tagged
+ ./bootstrap.sh --with-toolset=mingw \
+ --prefix=${_BOOST_UDIR} \
+ --with-icu=${_ICU4C_WDIR} \
+ --with-libraries=${BOOST_LIBS}
+ sed -i"" "s/mingw /gcc /" project-config.jam
+ ./b2 --prefix=${_BOOST_UDIR} --layout=system \
+ link=shared variant=release \
+ -sICU_PATH=${_ICU4C_WDIR} \
+ install
qpopd
test -f ${_BOOST_UDIR}/lib/libboost_date_time.dll || die "Boost not installed correctly"
rm -rf $TMP_UDIR/boost_*
diff --git a/install.sh b/install.sh
index 77bfab3..c1a1e57 100644
--- a/install.sh
+++ b/install.sh
@@ -99,7 +99,8 @@ add_step inst_libdbi
add_step inst_libsoup
add_step inst_enchant
add_step inst_webkit
-#boost and gtest now needed for C++ on master only
+#icu, boost, and gtest now needed for C++ on master only
+add_step inst_icu4c
add_step inst_boost
add_step inst_gtest
commit 25e36b02224f039c19941dbab36828ab9d0b6edf
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Mar 12 10:54:18 2017 -0700
Upgrade MinGW Runtime and Win32 API to latest stable.
Needed to fix bug in math.h.
diff --git a/defaults.sh b/defaults.sh
index 67db24f..10afcf1 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -116,9 +116,9 @@ set_default MINGW_MPC_VERSION "1.0.1-2"
set_default MINGW_MPFR_VERSION "3.1.2-2"
set_default MINGW_PEXPORTS_VERSION "0.46"
set_default MINGW_PTHREAD_W32_VERSION "2.10-pre-20160821"
-set_default MINGW_RT_VERSION "3.21"
+set_default MINGW_RT_VERSION "3.22.4"
set_default MINGW_ZLIB_VERSION "1.2.8-1"
-set_default MINGW_W32API_VERSION "3.17-2"
+set_default MINGW_W32API_VERSION "3.18.2"
set_default MINGW_MAKE_VERSION "3.82-5"
if [ "$CROSS_COMPILE" != yes ]; then
commit a52eb57177f5809990107e23f5fd92ce844bcc2e
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Mar 12 10:50:05 2017 -0700
Remove swift patch from AQB.
Already in new version.
diff --git a/defaults.sh b/defaults.sh
index 0bcd79b..67db24f 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -363,7 +363,7 @@ AQBANKING_VERSION="5.6.12"
## the release number, not the file name at the end!
set_default AQBANKING_URL "https://www.aquamaniac.de/sites/download/download.php?package=03&release=208&file=01&dummy=aqbanking-5.6.12.tar.gz"
set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
-set_default AQB_PATCH `pwd`/swift940-strndup.patch
+set_default AQB_PATCH ""
set_default SQLITE3_URL "http://sqlite.org/sqlite-amalgamation-3.6.1.tar.gz"
set_default SQLITE3_DIR $GLOBAL_DIR\\sqlite3
commit b80f5aa9d1cdb3a9acf5194b32fa648050a7fe30
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Mar 9 12:23:30 2017 -0800
Bug 750787 - Can't install - can't expand "userdocs"
Fall back on CSIDL_COMMON_DOCUMENTS if CSIDL_PERSONAL is empty or
invalid.
diff --git a/inno_setup/gnucash.iss b/inno_setup/gnucash.iss
index a930438..6496f25 100644
--- a/inno_setup/gnucash.iss
+++ b/inno_setup/gnucash.iss
@@ -41,7 +41,7 @@ Name: desktopicon; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm
Name: menuicon; Description: "{cm:CreateMenuLink}"; GroupDescription: "{cm:AdditionalIcons}"
[Icons]
-Name: "{group}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "{userdocs}"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: menuicon
+Name: "{group}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "{code:GetDocPath}"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: menuicon
Name: "{group}\{cm:IconName_README}"; Filename: "{app}\doc\@PACKAGE@\{cm:IconFilename_README}"; Comment: "{cm:IconComment_README}"; Tasks: menuicon
Name: "{group}\{cm:IconName_FAQ}"; Filename: "http://wiki.gnucash.org/wiki/FAQ"; Tasks: menuicon
Name: "{group}\{cm:IconName_Bugzilla}"; Filename: "http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash"; Tasks: menuicon
@@ -49,11 +49,11 @@ Name: "{group}\{cm:IconName_InstallFQ}"; Filename: "{app}\bin\install-fq-mods.cm
Name: "{group}\{cm:IconName_Theme}"; Filename: "{app}\bin\gtk2_prefs.exe"; WorkingDir: "{app}\bin"; Tasks: menuicon
Name: "{group}\{cm:IconName_Uninstall}"; Filename: "{uninstallexe}"; Comment: "{cm:IconComment_Uninstall}"; Tasks: menuicon
-Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "{userdocs}"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: desktopicon
+Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "{code:GetDocPath}"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: desktopicon
[Run]
Filename: "{app}\bin\pango-querymodules.exe"; Parameters: " --system --update-cache"; Flags: runhidden
-Filename: "{app}\bin\@PACKAGE at .exe"; Description: "{cm:RunPrg}"; WorkingDir: "{userdocs}"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent
+Filename: "{app}\bin\@PACKAGE at .exe"; Description: "{cm:RunPrg}"; WorkingDir: "{code:GetDocPath}"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent
Filename: "{app}\bin\guile.cmd"; Flags: runhidden
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -369,6 +369,30 @@ begin
MsgBox('Error on saving ' + EnvFile + ' for completing the installation', mbInformation, MB_OK);
end;
+// Sometimes a user either doesn't have a CSIDL_PERSONAL setting or
+// it's invalid. This function tests is and if that's the case returns
+// CSIDL_COMMON_DOCUMENTS. Code lifted from
+// http://stackoverflow.com/questions/28635548/avoiding-failed-to-expand-shell-folder-constant-userdocs-errors-in-inno-setup.
+
+function GetDocPath(Param: string): string;
+var Folder: string;
+begin
+ try
+ // first try to expand the {userdocs} folder; if this raises that
+ // internal exception, you'll fall down to the except block where
+ // you expand the {allusersprofile}
+ Folder := ExpandConstant('{userdocs}');
+ // the {userdocs} folder expanding succeded, so let's test if the
+ // folder exists and if not, expand {allusersprofile}
+ if not DirExists(Folder) then
+ Folder := ExpandConstant('{allusersprofile}');
+ except
+ Folder := ExpandConstant('{allusersprofile}');
+ end;
+ // return the result
+ Result := Folder;
+end;
+
[Languages]
Name: "en"; MessagesFile: "compiler:Default.isl"
Name: "de"; MessagesFile: "compiler:Languages\German.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-de.win32-bin.txt"
commit aaa5d6d7042601a3f9db87667e0ee00e8e8f1db6
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Mar 5 18:22:11 2017 -0800
Update AQB and Gwen to new releases.
diff --git a/defaults.sh b/defaults.sh
index bd3a311..0bcd79b 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -348,20 +348,20 @@ set_default LIBOFX_DIR $GLOBAL_DIR\\libofx
set_default LIBOFX_PATCH `pwd`/libofx-0.9.8.patch
## online banking: gwenhywfar+aqbanking
-GWENHYWFAR_VERSION="4.15.3"
+GWENHYWFAR_VERSION="4.17.0"
## NB: Dummy means dummy! The important value in the following url is
## the release number, not the file name at the end!
-set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=201&file=01&dummy=gwenhywfar-4.15.3.tar.gz"
+set_default GWENHYWFAR_URL "https://www.aquamaniac.de/sites/download/download.php?package=01&release=205&file=01&dummy=gwenhywfar-4.17.0.tar.gz"
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
KTOBLZCHECK_VERSION="1.48"
set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-${KTOBLZCHECK_VERSION}.tar.gz"
# ktoblzcheck is being installed into GWENHYWFAR_DIR
-AQBANKING_VERSION="5.6.10"
+AQBANKING_VERSION="5.6.12"
## NB: Dummy means dummy! The important value in the following url is
## the release number, not the file name at the end!
-set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=206&file=01&dummy=aqbanking-5.6.10.tar.gz"
+set_default AQBANKING_URL "https://www.aquamaniac.de/sites/download/download.php?package=03&release=208&file=01&dummy=aqbanking-5.6.12.tar.gz"
set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
set_default AQB_PATCH `pwd`/swift940-strndup.patch
commit a8f77b099a834da5185b18cb2c17348c85642418
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Feb 16 11:01:20 2017 -0800
Fix git command in new Google Test module.
diff --git a/install-impl.sh b/install-impl.sh
index 843b539..0f10e09 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1302,7 +1302,7 @@ function inst_boost() {
}
function inst_gtest() {
- setup Googe Test Framework
+ setup Google Test Framework
get_major_minor "$GNUCASH_SCM_REV"
if [ "$GNUCASH_SCM_REV" != "master" ] &&
(( $major_minor <= 206 )); then
@@ -1322,7 +1322,7 @@ function inst_gtest() {
echo "Google test framework already installed in ${_GTEST_UDIR}. skipping."
else
rm -fr ${_GTEST_UDIR}
- git clone $GTEST_REPO -b $GTEST_VERSION ${_GTEST_UDIR}
+ $GIT_CMD clone $GTEST_REPO -b $GTEST_VERSION ${_GTEST_UDIR}
([ -f ${GTEST_ROOT}/src/gtest-all.cc ] &&
[ -f ${GTEST_ROOT}/include/gtest/gtest.h ] &&
commit fdf048d0dc234089b0dae40248c9198718d1fc13
Author: Geert Janssens <geert at kobaltwit.be>
Date: Wed Feb 8 11:50:29 2017 +0100
Fix boost detection with autotools
Turns out when BOOST_DIR is set in the environment
the m4 macro looks for boost in BOOST_DIR/staging.
Not what I expected. To have it look in the root
of the installed directory, we need ac_boost_dir. However
our cmake files do look in BOOST_DIR. So I'm simply
setting both here.
diff --git a/install-impl.sh b/install-impl.sh
index 1fd5f5c..843b539 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1270,8 +1270,12 @@ function inst_boost() {
fi
_BOOST_UDIR=`unix_path ${BOOST_DIR}`
+ # The boost m4 macro included with gnucash looks for boost in either
+ # $BOOST_ROOT/staging (useless here) or $ac_boost_path, while the cmake build
+ # looks in $BOOST_ROOT. So we set both to support both build systems.
set_env ${_BOOST_UDIR} BOOST_ROOT
- export BOOST_ROOT
+ set_env ${_BOOST_UDIR} ac_boost_path
+ export BOOST_ROOT ac_boost_path
add_to_env ${_BOOST_UDIR}/lib PATH
if test -f ${_BOOST_UDIR}/lib/libboost_date_time.dll
then
commit 5de8f8bee7e446eae99d981519b2e79ff9190914
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu Feb 2 18:04:57 2017 +0100
Make gtest work on Windows
There is a PR that got merged after release-1.8 that's needed for mingw.
diff --git a/defaults.sh b/defaults.sh
index 9ecc30e..bd3a311 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -402,7 +402,7 @@ set_default BOOST_URL "$SF_MIRROR/boost/boost/boost_1_55_0.tar.bz2"
set_default BOOST_DIR $GLOBAL_DIR\\boost
set_default GTEST_REPO "https://github.com/google/googletest"
-set_default GTEST_VERSION "release-1.8.0"
+set_default GTEST_VERSION "master"
set_default GTEST_DIR $GLOBAL_DIR\\gtest
set_default WGET_EXTRA_OPTIONS "--no-check-certificate"
commit 0bc21bc8d8b23420a233bf1b289b593e16d6419c
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu Feb 2 15:28:39 2017 +0100
Install gtest/gmock
GTest based tests are said to fail still on Windows, but
with this GTest can be made a mandatory build dependency for gnucash.
Just don't run any tests on Windows...
diff --git a/defaults.sh b/defaults.sh
index 854fa90..9ecc30e 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -401,6 +401,10 @@ set_default ISOCODES_DIR $GLOBAL_DIR\\isocodes
set_default BOOST_URL "$SF_MIRROR/boost/boost/boost_1_55_0.tar.bz2"
set_default BOOST_DIR $GLOBAL_DIR\\boost
+set_default GTEST_REPO "https://github.com/google/googletest"
+set_default GTEST_VERSION "release-1.8.0"
+set_default GTEST_DIR $GLOBAL_DIR\\gtest
+
set_default WGET_EXTRA_OPTIONS "--no-check-certificate"
### Local Variables: ***
### sh-basic-offset: 4 ***
diff --git a/install-impl.sh b/install-impl.sh
index befa6aa..1fd5f5c 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1297,6 +1297,36 @@ function inst_boost() {
fi
}
+function inst_gtest() {
+ setup Googe Test Framework
+ get_major_minor "$GNUCASH_SCM_REV"
+ if [ "$GNUCASH_SCM_REV" != "master" ] &&
+ (( $major_minor <= 206 )); then
+ echo "Skipping. The Google test framework is only needed for the master branch or future 2.7.x and up versions of gnucash."
+ return
+ fi
+
+ _GTEST_UDIR=`unix_path ${GTEST_DIR}`
+ set_env ${_GTEST_UDIR}/googletest GTEST_ROOT
+ set_env ${_GTEST_UDIR}/googlemock GMOCK_ROOT
+ export GTEST_ROOT GMOCK_ROOT
+ if [ -f ${GTEST_ROOT}/src/gtest-all.cc ] &&
+ [ -f ${GTEST_ROOT}/include/gtest/gtest.h ] &&
+ [ -f ${GMOCK_ROOT}/src/gmock-all.cc ] &&
+ [ -f ${GMOCK_ROOT}/include/gmock/gmock.h ]
+ then
+ echo "Google test framework already installed in ${_GTEST_UDIR}. skipping."
+ else
+ rm -fr ${_GTEST_UDIR}
+ git clone $GTEST_REPO -b $GTEST_VERSION ${_GTEST_UDIR}
+
+ ([ -f ${GTEST_ROOT}/src/gtest-all.cc ] &&
+ [ -f ${GTEST_ROOT}/include/gtest/gtest.h ] &&
+ [ -f ${GMOCK_ROOT}/src/gmock-all.cc ] &&
+ [ -f ${GMOCK_ROOT}/include/gmock/gmock.h ]) || die "Google test framework not installed correctly"
+ fi
+}
+
function inst_cutecash() {
setup Cutecash
_BUILD_UDIR=`unix_path $CUTECASH_BUILD_DIR`
diff --git a/install.sh b/install.sh
index 354c2ac..77bfab3 100644
--- a/install.sh
+++ b/install.sh
@@ -99,8 +99,9 @@ add_step inst_libdbi
add_step inst_libsoup
add_step inst_enchant
add_step inst_webkit
-#boost now needed for C++ on master only
+#boost and gtest now needed for C++ on master only
add_step inst_boost
+add_step inst_gtest
##
if [ "$WITH_CUTECASH" = "yes" ]; then
commit caab4a16bb605556ac37fb9baa13a7cbade4f94c
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu Feb 2 15:25:59 2017 +0100
Find boost library via the BOOST_ROOT environment variable
Note this currently only works for the autotools based build path.
The cmake configuration has this hard-coded at the time of this commit.
I will change that in a future update.
diff --git a/install-impl.sh b/install-impl.sh
index 67929e0..befa6aa 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1271,6 +1271,7 @@ function inst_boost() {
_BOOST_UDIR=`unix_path ${BOOST_DIR}`
set_env ${_BOOST_UDIR} BOOST_ROOT
+ export BOOST_ROOT
add_to_env ${_BOOST_UDIR}/lib PATH
if test -f ${_BOOST_UDIR}/lib/libboost_date_time.dll
then
@@ -1393,14 +1394,6 @@ function inst_gnucash() {
qpopd
fi
- # Check for options that may not be available in all versions we can build
- _CONFIG_HELP=$($_REPOS_UDIR/configure --help)
- if [ -n "$(grep -- '--with-boost' <<< "$_CONFIG_HELP")" ]; then
- _EXTRA_OPTIONS="--with-boost=${BOOST_ROOT}"
- else
- _EXTRA_OPTIONS=""
- fi
-
qpushd $_BUILD_UDIR
$_REPOS_UDIR/configure ${HOST_XCOMPILE} \
--prefix=$_INSTALL_WFSDIR \
@@ -1411,7 +1404,6 @@ function inst_gnucash() {
${AQBANKING_OPTIONS} \
--enable-binreloc \
--enable-locale-specific-tax \
- ${_EXTRA_OPTIONS} \
CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GUILE_CPPFLAGS} ${LIBDBI_CPPFLAGS} ${KTOBLZCHECK_CPPFLAGS} ${HH_CPPFLAGS} ${LIBSOUP_CPPFLAGS} -D_WIN32 ${EXTRA_CFLAGS}" \
LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} ${HH_LDFLAGS} -L${_SQLITE3_UDIR}/lib -L${_ENCHANT_UDIR}/lib -L${_LIBXSLT_UDIR}/lib" \
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
commit 53ee6621dfbc01d9f8ab2a01290433f23c3dcbe3
Author: Geert Janssens <geert at kobaltwit.be>
Date: Fri Jan 27 17:08:43 2017 +0100
Drop unused dependency from gwenhywfar
diff --git a/install-impl.sh b/install-impl.sh
index 5ac5b76..67929e0 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -662,8 +662,8 @@ function inst_gwenhywfar() {
--disable-ssl \
--prefix=$_GWENHYWFAR_UDIR \
--with-guis=gtk2 \
- CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS} `pkg-config --cflags gtk+-2.0`" \
- LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GNUTLS_LDFLAGS} -lintl"
+ CPPFLAGS="${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS} `pkg-config --cflags gtk+-2.0`" \
+ LDFLAGS="${GNOME_LDFLAGS} ${GNUTLS_LDFLAGS} -lintl"
make
# [ "$CROSS_COMPILE" != "yes" ] && make check
rm -rf ${_GWENHYWFAR_UDIR}
commit 265e47b2d18ba2816e5cda919a866ba9e49f7143
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Dec 30 11:56:01 2016 -0800
Update pthreads dll name to match updated version.
diff --git a/dist-impl.sh b/dist-impl.sh
index e244fb8..9d95fd8 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -242,7 +242,7 @@ function dist_webkit() {
function dist_gnucash() {
setup GnuCash
mkdir -p $_DIST_UDIR/bin
- cp $_MINGW_UDIR/bin/pthreadGC2.dll $_DIST_UDIR/bin
+ cp $_MINGW_UDIR/bin/pthreadGC-3.dll $_DIST_UDIR/bin
cp -a $_INSTALL_UDIR/bin/* $_DIST_UDIR/bin
mkdir -p $_DIST_UDIR/etc/gnucash
cp -a $_INSTALL_UDIR/etc/gnucash/* $_DIST_UDIR/etc/gnucash
commit d9f248daa62ce042c32e8f807a1bfe2de9603061
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Dec 27 13:25:24 2016 -0800
Update MINGW_PTHREAD_W32_VERSION to 2.10-pre-20160821.
Earlier versions of mingw32-libpthread-dll have been removed from the repository, breaking installation.
diff --git a/defaults.sh b/defaults.sh
index ee39f3f..854fa90 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -115,7 +115,7 @@ set_default MINGW_LIBTOOL_VERSION "2.4-1"
set_default MINGW_MPC_VERSION "1.0.1-2"
set_default MINGW_MPFR_VERSION "3.1.2-2"
set_default MINGW_PEXPORTS_VERSION "0.46"
-set_default MINGW_PTHREAD_W32_VERSION "2.9.1-1"
+set_default MINGW_PTHREAD_W32_VERSION "2.10-pre-20160821"
set_default MINGW_RT_VERSION "3.21"
set_default MINGW_ZLIB_VERSION "1.2.8-1"
set_default MINGW_W32API_VERSION "3.17-2"
commit da91860f8ae79b06be8a762e26612a9145643aa8
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Nov 7 13:03:14 2016 -0800
Bump GCC version to 4.9.3.
Where they seem to have left off the define that breaks stoi and to_string.
diff --git a/defaults.sh b/defaults.sh
index 32118b5..ee39f3f 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -105,7 +105,7 @@ set_default MINGW_AUTOMAKE14_VERSION "1.4p6-1"
set_default MINGW_AUTOMAKE_VERSION "4-1"
set_default MINGW_BINUTILS_VERSION "2.23.1-1"
set_default MINGW_BINUTILS_VERSION "2.23.1-1"
-set_default MINGW_GCC_VERSION "4.8.1-3"
+set_default MINGW_GCC_VERSION "4.9.3-1"
set_default MINGW_GETTEXT_VERSION "0.18.1.1-2"
set_default MINGW_GMP_VERSION "5.1.2-1"
set_default MINGW_LIBEXPAT_VERSION "2.1.0-1"
commit 53dde4030405fffb761f74363fd65ce8a460f3f0
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Oct 22 16:50:29 2016 -0700
Remove CMakeCache.txt before building with Cmake.
To ensure that any changes in CMakeLists.txt are picked up by the build.
diff --git a/install-impl.sh b/install-impl.sh
index 59f25f9..5ac5b76 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1358,6 +1358,9 @@ function inst_gnucash_using_cmake() {
_CMAKE_MAKE_PROGRAM=$_NINJA_UDIR/ninja.exe
fi
qpushd $_BUILD_UDIR
+ if [ -f CMakeCache.txt ]; then
+ rm CMakeCache.txt
+ fi
cmake -G "$CMAKE_GENERATOR" \
-D CMAKE_INSTALL_PREFIX=${_INSTALL_UDIR} \
-D CMAKE_PREFIX_PATH=${_GLOBAL_UDIR} \
commit 855a19d334a00aca9a40f682d7017c53b2be7f30
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Oct 22 16:49:13 2016 -0700
Patch GOffice so that libtool will build shared libraries.
This hasn't been a problem before but building failed on Windows 10.
diff --git a/defaults.sh b/defaults.sh
index bae73ed..32118b5 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -297,7 +297,7 @@ set_default LIBGSF_DIR $GLOBAL_DIR\\libgsf
GOFFICE_VERSION="0.8.17"
set_default GOFFICE_URL "$GNOME_MIRROR/sources/goffice/0.8/goffice-${GOFFICE_VERSION}.tar.bz2"
set_default GOFFICE_DIR $GLOBAL_DIR\\goffice
-#set_default GOFFICE_PATCH `pwd`/goffice-x.x.x.patch
+set_default GOFFICE_PATCH `pwd`/goffice-enable-shared.patch
set_default GLADE_URL "$GNOME_MIRROR/sources/glade3/3.0/glade3-3.1.2.tar.bz2"
set_default GLADE_DIR $GLOBAL_DIR\\glade
diff --git a/goffice-enable-shared.patch b/goffice-enable-shared.patch
new file mode 100644
index 0000000..0ce48a6
--- /dev/null
+++ b/goffice-enable-shared.patch
@@ -0,0 +1,11 @@
+--- a/configure.in 2011-06-16 16:46:53 -0700
++++ b/configure.in 2016-10-22 15:29:49 -0700
+@@ -69,7 +69,7 @@
+ AC_PROG_YACC
+ AM_PROG_LEX
+ AC_PROG_LN_S
+-AM_PROG_LIBTOOL
++LT_INIT([win32-dll])
+ DOLT
+ AC_STDC_HEADERS
+ AC_SYS_LARGEFILE
commit 15020f998a9febef3fd4055da04d85c77fb408e4
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Oct 22 14:56:33 2016 -0700
Tell wget not to check certificates.
Because Martin Preuss has changed aquamaniac.de to https only
and getting certificates set up on MinGW is somewhere between
difficult and impossible.
diff --git a/defaults.sh b/defaults.sh
index 66275a2..bae73ed 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -401,6 +401,7 @@ set_default ISOCODES_DIR $GLOBAL_DIR\\isocodes
set_default BOOST_URL "$SF_MIRROR/boost/boost/boost_1_55_0.tar.bz2"
set_default BOOST_DIR $GLOBAL_DIR\\boost
+set_default WGET_EXTRA_OPTIONS "--no-check-certificate"
### Local Variables: ***
### sh-basic-offset: 4 ***
### indent-tabs-mode: nil ***
commit 023108e7d4340b13af3c95c8dc9977feae194d7d
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Aug 18 19:21:18 2016 +0000
Add libboost-regex.dll, required now for master.
diff --git a/dist-impl.sh b/dist-impl.sh
index eacbec7..e244fb8 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -96,6 +96,7 @@ function dist_boost() {
cp -a ${_BOOST_UDIR}/lib/libboost_chrono.dll ${_DIST_UDIR}/bin
cp -a ${_BOOST_UDIR}/lib/libboost_date_time.dll ${_DIST_UDIR}/bin
+ cp -a ${_BOOST_UDIR}/lib/libboost_regex.dll ${_DIST_UDIR}/bin
}
function dist_gnome() {
commit 57290a2ae8b98ac7f4d1878585137a569295fb98
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jul 16 20:08:55 2016 +0000
Ensure GIT_CMD is defined even when build_package is called directly.
diff --git a/buildserver/build_package.sh b/buildserver/build_package.sh
index 93e1fbf..5a0b6dd 100644
--- a/buildserver/build_package.sh
+++ b/buildserver/build_package.sh
@@ -4,7 +4,10 @@
# This assumes we're in the "gnucash-on-windows" directory for the correct build.
# It could be for tag build environment, or it could
# be the top-level daily-build gnucash-on-windows directory.
-# Note: GIT_CMD below should have been set by a calling script.
+# For this script to work, git must have been setup before
+# in a way that doesn't conflict with the GnuCash build.
+# The easiest way to do so is to run the build once manually
+# with a properly set up custom.sh.
#
set -o pipefail
@@ -26,6 +29,9 @@ GC_WIN_DIR="$BUILDSERVER_DIR/.."
. ./defaults.sh
. ./custom.sh
+_GIT_UDIR=`unix_path $GIT_DIR`
+set_env "$_GIT_UDIR/bin/git" GIT_CMD
+export GIT_CMD
tag="${1:-$GNUCASH_SCM_REV}"
# Determine where to upload to
commit 34f50a339268b2e29f4cc2173a790e43b3e37064
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jul 16 20:08:23 2016 +0000
Fix error in config.h location.
This *finally* fixes copying built packages to code.
diff --git a/buildserver/build_package.sh b/buildserver/build_package.sh
index f19f39d..93e1fbf 100644
--- a/buildserver/build_package.sh
+++ b/buildserver/build_package.sh
@@ -88,7 +88,7 @@ _GNUCASH_CONFIG_H=${_BUILD_UDIR}/config.h
if [ "$WITH_CMAKE" == "yes" ]; then
_GNUCASH_CONFIG_H=${_BUILD_UDIR}/src/config.h
fi
-PKG_VERSION=`grep PACKAGE_VERSION ${_GNUCASH_CONFIG_H}/config.h | cut -d" " -f3 | cut -d\" -f2 `
+PKG_VERSION=`grep PACKAGE_VERSION ${_GNUCASH_CONFIG_H} | cut -d" " -f3 | cut -d\" -f2 `
REVISION=`grep GNUCASH_SCM_REV ${_BUILD_UDIR}/src/core-utils/gnc-vcs-info.h | cut -d" " -f3 | cut -d\" -f2 `
if [ "$BUILD_FROM_TARBALL" = "no" ]; then
commit 45bd108b596414bebddeb2359080f31b69f9ce1e
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Jul 15 22:05:41 2016 +0000
Dependency build: Add more descriptive/instructive comments.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 33c20d2..451e553 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,11 @@
+# Edit cmake/custom.cmake with overrides for the variables set in cmake/defaults.cmake.
# Call cmake defining the variables you need to build the modules you want and set -G "MSYS Makefile".
+# Important variables are
+# GNC_BUILD_GLIB Specifies GLib, Harfbuzz, and their dependencies.
+# GNC_BUILD_DEPS Specifies all dependencies.
+# "Specified" dependencies will be built into ${GLOBAL_DEP_BUILD_DIR}.
+# GNC_INSTALL_DEPS Installs the dependencies into ${GLOBAL_DIR}.
+# GNC_MAKE_TARBALLS Makes the distribution tarballs for upload to SourceForge from the specified dependencies.
cmake_minimum_required (VERSION 3.3.2)
include (cmake/defaults.cmake)
include (cmake/custom.cmake)
commit b72bc095bc5d70bb42851dedc49021b13c65a07e
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Jul 15 22:04:50 2016 +0000
Build GnuCash with Ninja in build_tag.sh.
diff --git a/buildserver/build_tags.sh b/buildserver/build_tags.sh
index c1d6826..a5f0f8d 100644
--- a/buildserver/build_tags.sh
+++ b/buildserver/build_tags.sh
@@ -132,6 +132,9 @@ for tag_rev in $tags ; do
# Inform the build scripts of the tag we're building.
echo "GNUCASH_SCM_REV=$tag" >> ${_TAG_WIN_REPOS_UDIR}/custom.sh
+ #Set up CMAKE and NINJA build:
+ echo "WITH_CMAKE=yes" >> ${_TAG_WIN_REPOS_UDIR}/custom.sh
+ echo "WITH_NINJA=yes" >> ${_TAG_WIN_REPOS_UDIR}/custom.sh
# Now build the tag! (this will upload it too)
# Use the build_package script from master (cwd), not from the tag
commit a5dea5ebe41671e7323dc5e7c308f89609732fc0
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Jul 15 22:03:11 2016 +0000
Fix zlib.pc paths.
diff --git a/cmake/glib.cmake b/cmake/glib.cmake
index 4a3e776..dc50b3e 100644
--- a/cmake/glib.cmake
+++ b/cmake/glib.cmake
@@ -1,5 +1,6 @@
set_property (GLOBAL PROPERTY EP_BASE ${GLOBAL_DEP_BUILD_DIR})
set (INSTALL_DIR ${GLOBAL_DEP_BUILD_DIR}/glib-install)
+set (CMAKE_INSTALL_PREFIX ${INSTALL_DIR})
ExternalProject_Add(pkgconfig
URL ${PKG_CONFIG_SRC_URL}
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix ${INSTALL_DIR} --with-internal-glib
@@ -12,7 +13,7 @@ ExternalProject_Add(zlib
CONFIGURE_COMMAND sed -i s/SHARED_MODE=0/SHARED_MODE=1/ <SOURCE_DIR>/win32/Makefile.gcc
BUILD_COMMAND make -f <SOURCE_DIR>/win32/Makefile.gcc
BUILD_IN_SOURCE 1
- INSTALL_COMMAND INCLUDE_PATH=${INSTALL_DIR}/include LIBRARY_PATH=${INSTALL_DIR}/lib BINARY_PATH=${INSTALL_DIR}/bin make -f <SOURCE_DIR>/win32/Makefile.gcc install
+ INSTALL_COMMAND prefix=${INSTALL_DIR} INCLUDE_PATH=${INSTALL_DIR}/include LIBRARY_PATH=${INSTALL_DIR}/lib BINARY_PATH=${INSTALL_DIR}/bin make -f <SOURCE_DIR>/win32/Makefile.gcc install
INSTALL_DIR ${INSTALL_DIR}
)
ExternalProject_Add(intltool
@@ -24,7 +25,7 @@ ExternalProject_Add(intltool
)
ExternalProject_Add(freetype
URL ${FREETYPE_URL}
- CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix ${INSTALL_DIR} --without-bzip2
+ CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix ${INSTALL_DIR} --without-bzip2 --without-png
BUILD_COMMAND make
INSTALL_COMMAND make install
INSTALL_DIR ${INSTALL_DIR}
@@ -70,17 +71,10 @@ ExternalProject_Add(harfbuzz
)
# harfbuzz has a dependency on glib for three unicode functions, so we
# need to build it again after building glib.
-#ExternalProject_Add(harfbuzz2
-# URL ${HARFBUZZ_URL}
-# CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix ${INSTALL_DIR}
-# BUILD_COMMAND make
-# INSTALL_DIR ${INSTALL_DIR}
-# DEPENDS glib
-# )
ExternalProject_Add_Step(harfbuzz fix-pkgconfig-prefix
COMMAND sh -c "chmod -R o+w ${INSTALL_DIR}"
COMMAND sh -c "sed -i 's at prefix *= *${INSTALL_DIR}@prefix = c:/gcdev@' ${INSTALL_DIR}/lib/pkgconfig/*.pc"
- COMMAND sh -c "sed -i s@${INSTALL_DIR}@\${prefix}@ ${INSTALL_DIR}/lib/pkgconfig/*.pc"
+ COMMAND sh -c "sed -i s@${INSTALL_DIR}@\\$\\{prefix\\}@ ${INSTALL_DIR}/lib/pkgconfig/*.pc"
DEPENDEES install
)
if (GNC_MAKE_TARBALLS)
commit 89fc72e231eca02afbd90ec5cb393c4d0b10d341
Author: Rob Gowin <robgowin at gmail.com>
Date: Thu Jul 14 21:11:24 2016 -0500
Pass HH_DIR to CMake via command line
diff --git a/install-impl.sh b/install-impl.sh
index 9a00e3d..59f25f9 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1334,6 +1334,7 @@ function inst_gnucash_using_cmake() {
_REPOS_UDIR=`unix_path $REPOS_DIR`
_NINJA_UDIR=`unix_path $NINJA_DIR`
_MSYS_UDIR=`unix_path $MSYS_DIR`
+ _HH_UDIR=`unix_path $HH_DIR`
_LIBDBI_DRIVERS_UDIR=`unix_path ${LIBDBI_DRIVERS_DIR}`
mkdir -p $_BUILD_UDIR
@@ -1363,6 +1364,7 @@ function inst_gnucash_using_cmake() {
-D PERL_EXECUTABLE=${_MSYS_UDIR}/bin/perl \
-D CMAKE_MAKE_PROGRAM=${_CMAKE_MAKE_PROGRAM} \
-D GNC_DBD_DIR=${_LIBDBI_DRIVERS_UDIR}/lib/dbd \
+ -D HTMLHELP_DIR=${_HH_UDIR} \
${_REPOS_UDIR}
${_CMAKE_MAKE_PROGRAM} install
qpopd
commit a64dca9e0855fc761f6f660191bf7ac850086487
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Jul 15 00:22:28 2016 +0000
Update libgsf to 1.14.39
Builds successfully with newer versions of glib.
diff --git a/defaults.sh b/defaults.sh
index 27155c4..66275a2 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -290,8 +290,8 @@ set_default PCRE_BIN_URL "$SF_MIRROR/gnuwin32/pcre-7.0-bin.zip"
set_default PCRE_LIB_URL "$SF_MIRROR/gnuwin32/pcre-7.0-lib.zip"
set_default PCRE_DIR $GLOBAL_DIR\\pcre
-LIBGSF_VERSION="1.14.21"
-set_default LIBGSF_URL "$GNOME_MIRROR/sources/libgsf/1.14/libgsf-${LIBGSF_VERSION}.tar.bz2"
+LIBGSF_VERSION="1.14.39"
+set_default LIBGSF_URL "$GNOME_MIRROR/sources/libgsf/1.14/libgsf-${LIBGSF_VERSION}.tar.xz"
set_default LIBGSF_DIR $GLOBAL_DIR\\libgsf
GOFFICE_VERSION="0.8.17"
commit 60de79c2fd14d083c226f90bdd1df62a33b113c0
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Jul 11 23:32:38 2016 +0000
Adjust the location of config.h for cmake builds.
diff --git a/buildserver/build_package.sh b/buildserver/build_package.sh
index 2a0718c..f19f39d 100644
--- a/buildserver/build_package.sh
+++ b/buildserver/build_package.sh
@@ -24,6 +24,7 @@ BUILDSERVER_DIR="$(dirname "$0")"
GC_WIN_DIR="$BUILDSERVER_DIR/.."
. "$GC_WIN_DIR/functions.sh"
. ./defaults.sh
+. ./custom.sh
tag="${1:-$GNUCASH_SCM_REV}"
@@ -83,7 +84,11 @@ $_GC_WIN_REPOS_UDIR/dist.sh 2>&1 | tee -a ${LOGFILE}
# Make sure this logic matches the logic in dist.sh!
_BUILD_UDIR=`unix_path $BUILD_DIR`
_GNUCASH_UDIR=`unix_path $GNUCASH_DIR`
-PKG_VERSION=`grep PACKAGE_VERSION ${_BUILD_UDIR}/config.h | cut -d" " -f3 | cut -d\" -f2 `
+_GNUCASH_CONFIG_H=${_BUILD_UDIR}/config.h
+if [ "$WITH_CMAKE" == "yes" ]; then
+ _GNUCASH_CONFIG_H=${_BUILD_UDIR}/src/config.h
+fi
+PKG_VERSION=`grep PACKAGE_VERSION ${_GNUCASH_CONFIG_H}/config.h | cut -d" " -f3 | cut -d\" -f2 `
REVISION=`grep GNUCASH_SCM_REV ${_BUILD_UDIR}/src/core-utils/gnc-vcs-info.h | cut -d" " -f3 | cut -d\" -f2 `
if [ "$BUILD_FROM_TARBALL" = "no" ]; then
commit 03fd0779cc3f485a4ba5b4a83946c14ab910d7a9
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Jul 11 23:04:18 2016 +0000
Begin a CMake project to prebuild dependencies.
This first commit builds GLib and Harbuzz with their dependencies.
It will optionally create a pair of tarballs or install the results
into the current ${GLOBAL_DIR}/gnome.
Note that it has modified copies of custom.sh and defaults.sh converted
into cmake as custom.cmake and defaults.cmake. Be sure that those are in
sync with the originals before you use it.
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..33c20d2
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Call cmake defining the variables you need to build the modules you want and set -G "MSYS Makefile".
+cmake_minimum_required (VERSION 3.3.2)
+include (cmake/defaults.cmake)
+include (cmake/custom.cmake)
+include (ExternalProject)
+# We can't set up any environment here so we must call make with some
+# enviroment variables set on the command line. Note that Python >=
+# 2.5 is required to install glib in order to create
+# glib-codegen. It's not needed, but that doesn't seem to matter.
+# PATH=$PATH:<INSTALL_DIR>/bin:<INSTALL_DIR>/lib PKG_CONFIG_PATH=<INSTALL_DIR>/lib/pkgconfig CXXFLAGS="$CXXFLAGS -std=gnu++11" PYTHON=/path/to/python.exe make
+# Note especially that -std=g++11; if it's not set then icu will set
+# it to -std=c++0x which breaks building harfbuzz because it uses
+# strdup which is a GCC extention.
+if (GNC_BUILD_DEPS OR GNC_BUILD_GLIB)
+include (cmake/glib.cmake)
+endif()
diff --git a/cmake/custom.cmake b/cmake/custom.cmake
new file mode 100644
index 0000000..7d2452c
--- /dev/null
+++ b/cmake/custom.cmake
@@ -0,0 +1,23 @@
+# Note: All directories must be without spaces!
+#
+# set (REPOS_URL "git at github.com:Gnucash/gnucash.git")
+# set (SF_MIRROR "http://switch.dl.sourceforge.net/sourceforge")
+# set (DISABLE_OPTIMIZATIONS yes)
+set (GLOBAL_DIR /c/gcdev) # all directories will use this
+# set (WGET_RATE 50k) #limit download bandwith to 50KB/s
+# set (NO_SAVE_PROFILE yes) # don't save env settings to /etc/profile.d
+# set (QTDIR c:/Qt/4.2.3)
+# set (CROSS_COMPILE yes)
+#EXTRA_CFLAGS="-fno-builtin-dgettext -fno-builtin-towupper -fno-builtin-iswlower"
+set (GLOBAL_BUILD_DIR /c/gcdev)
+set (MINGW_DIR=${GLOBAL_BUILD_DIR}/mingw)
+set (MSYS_DIR ${MINGW_DIR}/msys/1.0)
+set (TMP_DIR c:/gcdev/tmp)
+set (DOWNLOAD_DIR=${GLOBAL_DIR}/downloads)
+set (GIT_DIR ${GLOBAL_DIR}/git-1.9.4)
+set (REPOS_TYPE git)
+set (GC_WIN_REPOS_URL ssh://code.gnucash.org/gnucash-on-windows)
+set (GC_WIN_REPOS_DIR ${GLOBAL_BUILD_DIR}/gnucash-on-windows)
+set (REPOS_URL ssh://code.gnucash.org/gnucash)
+set (REPOS_DIR ${GLOBAL_BUILD_DIR}/gnucash.git)
+
diff --git a/cmake/defaults.cmake b/cmake/defaults.cmake
new file mode 100644
index 0000000..6335fa8
--- /dev/null
+++ b/cmake/defaults.cmake
@@ -0,0 +1,405 @@
+# Note: All directories must be without spaces!
+#
+
+set (GLOBAL_DIR c:/gcdev)
+set (GLOBAL_BUILD_DIR c:/gcdev)
+set (GLOBAL_DEP_BUILD_DIR ${GLOBAL_DIR}/dependencies)
+set (TMP_DIR ${GLOBAL_DIR}/tmp)
+set (DOWNLOAD_DIR ${GLOBAL_DIR}/downloads)
+
+if ($ENV{BUILD_FROM_TARBALL})
+ if (-f "../../src/swig-runtime.h")
+ set (BUILD_FROM_TARBALL yes)
+ else()
+ set (BUILD_FROM_TARBALL no)
+ endif()
+endif()
+
+set (GC_WIN_REPOS_DIR ${GLOBAL_DIR}/gnucash-on-windows.git)
+set (REPOS_DIR ${GLOBAL_DIR}/gnucash.git)
+if (${BUILD_FROM_TARBALL})
+ set (GNUCASH_DIR ${REPOS_DIR})
+ # keep this pointing from BUILD_DIR to REPOS_DIR
+ set (REL_REPOS_DIR ..)
+else()
+ set (GNUCASH_DIR ${GLOBAL_DIR}/gnucash)
+ # keep this pointing from BUILD_DIR to REPOS_DIR
+ set (REL_REPOS_DIR ../../gnucash.git)
+
+ set (REPOS_TYPE "git")
+ set (GNUCASH_SCM_REV "master")
+ set (REPOS_URL "git://github.com/Gnucash/gnucash.git")
+endif()
+set (BUILD_DIR ${GNUCASH_DIR}/build)
+if (${WITH_CMAKE})
+ set (BUILD_DIR ${GNUCASH_DIR}/cmake-build)
+endif()
+set (INSTALL_DIR ${GNUCASH_DIR}/inst)
+
+set (DIST_DIR ${GNUCASH_DIR}/dist)
+
+set (WITH_CUTECASH no)
+set (WITH_CMAKE no)
+set (WITH_NINJA no)
+set (CUTECASH_BUILD_DIR ${GNUCASH_DIR}/build-cutecash)
+
+
+
+####
+# For cross-compiling, change this to "yes"
+set (CROSS_COMPILE "no")
+
+# If "yes", build without optimizations (-O0) and ease debugging
+set (DISABLE_OPTIMIZATIONS no)
+
+set (MINGW_DIR ${GLOBAL_DIR}/mingw)
+set (MSYS_DIR ${MINGW_DIR}/msys)
+
+# tools here means binaries runnable without other DLLs or data files
+set (TOOLS_DIR ${GLOBAL_DIR}/tools)
+set (MSYS_BISON_VERSION "2.4.2-1")
+set (MSYS_FLEX_VERSION "2.5.35-2")
+set (MSYS_M4_VERSION "1.4.16-2")
+set (MSYS_PATCH_VERSION "2.6.1-1")
+set (MSYS_PERL_VERSION "5.8.8-1")
+set (MSYS_UNZIP_VERSION "6.0-1")
+set (MSYS_WGET_VERSION "1.12-1")
+
+set (SF_MIRROR "http://downloads.sf.net")
+set (GTK_MIRROR "ftp.gtk.org/pub")
+set (GNOME_MIRROR "http://ftp.gnome.org/pub/gnome")
+set (FREEDESKTOP_MIRROR "http://www.freedesktop.org/software")
+set (GNOME_SRC_MIRROR ${GNOME_MIRROR}/sources)
+set (GNOME_WIN32_URL "${GNOME_MIRROR}/binaries/win32")
+set (GNOME_WIN32_DEPS_URL "${GNOME_WIN32_URL}/dependencies")
+set (GC_DEPS_URL "${SF_MIRROR}/gnucash/Dependencies")
+
+
+# Mingw toolchain
+
+set (MINGW_AUTOCONF_VERSION "10-1")
+set (MINGW_AUTOCONF21_VERSION "2.13-4")
+set (MINGW_AUTOCONF25_VERSION "2.68-1")
+set (MINGW_AUTOMAKE111_VERSION "1.11.1-1")
+set (MINGW_AUTOMAKE110_VERSION "1.10.2-1")
+set (MINGW_AUTOMAKE19_VERSION "1.9.6-3")
+set (MINGW_AUTOMAKE18_VERSION "1.8.5-1")
+set (MINGW_AUTOMAKE17_VERSION "1.7.9-1")
+set (MINGW_AUTOMAKE16_VERSION "1.6.3-1")
+set (MINGW_AUTOMAKE15_VERSION "1.5-1")
+set (MINGW_AUTOMAKE14_VERSION "1.4p6-1")
+set (MINGW_AUTOMAKE_VERSION "4-1")
+set (MINGW_BINUTILS_VERSION "2.23.1-1")
+set (MINGW_BINUTILS_VERSION "2.23.1-1")
+set (MINGW_GCC_VERSION "4.8.1-3")
+set (MINGW_GETTEXT_VERSION "0.18.1.1-2")
+set (MINGW_GMP_VERSION "5.1.2-1")
+set (MINGW_LIBEXPAT_VERSION "2.1.0-1")
+set (MINGW_LIBICONV_VERSION "1.14-2")
+set (MINGW_LIBLTDL_VERSION "2.4-1")
+set (MINGW_LIBTOOL_VERSION "2.4-1")
+set (MINGW_MPC_VERSION "1.0.1-2")
+set (MINGW_MPFR_VERSION "3.1.2-2")
+set (MINGW_PEXPORTS_VERSION "0.46")
+set (MINGW_PTHREAD_W32_VERSION "2.9.1-1")
+set (MINGW_RT_VERSION "3.21")
+set (MINGW_ZLIB_VERSION "1.2.8-1")
+set (MINGW_W32API_VERSION "3.17-2")
+set (MINGW_MAKE_VERSION "3.82-5")
+
+if (${CROSS_COMPILE})
+ # Use native toolchain
+ set (LD ld)
+ set (CC gcc)
+ set (DLLTOOL dlltool)
+ set (RANLIB ranlib)
+
+ # For native build on Windows we can use the precompiled binaries
+ # defined above
+
+else()
+ # What flavor of GCC cross-compiler are we building?
+ set (TARGET "mingw32")
+
+ # Insert your cross-compiler mingw32 bin-directories here
+ set (HOST_XCOMPILE "--host=${TARGET}")
+
+ # Where does the cross-compiler go?
+ # This should be the directory into which your cross-compiler
+ # will be installed. Remember that if you set this to a directory
+ # that only root has write access to, you will need to run this
+ # script as root.
+ set (PREFIX `unix_path ${MINGW_DIR}`)
+
+ # Use native toolchain
+ set (LD ${TARGET}-ld)
+ set (CC ${TARGET}-gcc)
+ set (DLLTOOL ${TARGET}-dlltool)
+ set (RANLIB ${TARGET}-ranlib)
+
+ # For cross compilation we need to build our own toolchain
+ set (BINUTILS_SRC_URL "${SF_MIRROR}/mingw/binutils-2.20.1-src.tar.gz")
+ set (GCC_CORE_SRC_URL "${SF_MIRROR}/mingw/gcc-core-3.4.5-20060117-2-src.tar.gz")
+ set (GCC_GPP_SRC_URL "${SF_MIRROR}/mingw/gcc-g++-3.4.5-20060117-2-src.tar.gz")
+ # Not required for GnuCash
+ #set (GCC_G77_SRC_URL "${SF_MIRROR}/mingw/gcc-g77-3.4.5-20060117-2-src.tar.gz")
+ #set (GCC_OBJC_SRC_URL "${SF_MIRROR}/mingw/gcc-objc-3.4.5-20060117-2-src.tar.gz")
+ #set (GCC_JAVA_SRC_URL "${SF_MIRROR}/mingw/gcc-java-3.4.5-20060117-2-src.tar.gz")
+ #set (GCC_ADA_SRC_URL "${SF_MIRROR}/mingw/gcc-ada-3.4.5-20060117-2-src.tar.gz")
+
+ # What directory will the cross-compiler be built in?
+ # This is the directory into which source archives will
+ # be downloaded, expanded, compiled, etc. You need to
+ # have write-access to this directory. If you leave it
+ # blank, it defaults to the current directory.
+ set (XC_BUILD_DIR `unix_path ${TMP_DIR}`)
+
+ # Purge anything and everything already in the ${PREFIX}
+ #(also known as the destination or installation) directory?
+ # Set to "yes" to purge, any other value omits the purge step.
+ set (PURGE_DIR "no")
+
+ # If you wish to apply a patch to GCC, put it in the SRC_DIR
+ # and add its filename here.
+ set (GCC_PATCH "")
+
+ # These are the files from the SDL website
+ # These are optional, set them to "" if you don't want them
+ #set (SDL_URL "http://www.libsdl.org/extras/win32/common")
+ #set (OPENGL_URL "${SDL_URL}/opengl-devel.tar.gz")
+ #set (DIRECTX_URL "${SDL_URL}/directx-devel.tar.gz")
+endif()
+
+set (CROSS_GCC_SRC_URL "${SF_MIRROR}/mingw/gcc-4.4.0-src.tar.bz2")
+set (CROSS_GCC_SRC2_URL "${SF_MIRROR}/mingw/gcc-4.4.0-mingw32-src-2.tar.gz")
+#set (CROSS_GCC_SRC_URL "${SF_MIRROR}/mingw/gcc-4.5.0-1-mingw32-src.tar.lzma")
+set (CROSS_BINUTILS_SRC_URL "${SF_MIRROR}/mingw/binutils-2.20.1-src.tar.gz")
+
+# do not use regex-gnu or regex-spencer v3.8.g3, see bug #382852
+set (REGEX_URL "${GNOME_WIN32_DEPS_URL}/libgnurx-2.5.zip")
+set (REGEX_DEV_URL "${GNOME_WIN32_DEPS_URL}/libgnurx-dev-2.5.zip")
+set (REGEX_DIR ${GLOBAL_DIR}/regex)
+
+set (READLINE_BIN_URL "${SF_MIRROR}/gnuwin32/readline-5.0-1-bin.zip")
+set (READLINE_LIB_URL "${SF_MIRROR}/gnuwin32/readline-5.0-1-lib.zip")
+set (READLINE_DIR ${GLOBAL_DIR}/readline)
+
+set (GMP_URL "ftp://ftp.gnu.org/gnu/gmp/gmp-4.3.1.tar.bz2")
+set (GMP_ABI 32)
+set (GMP_DIR ${GLOBAL_DIR}/gmp)
+set (GMP5_BIN_URL "${SF_MIRROR}/mingw/libgmp-5.0.1-1-mingw32-dll-10.tar.lzma")
+set (GMP5_DEV_URL "${SF_MIRROR}/mingw/gmp-5.0.1-1-mingw32-dev.tar.lzma")
+
+SET (GUILE_VERSION "1.8.8")
+set (GUILE_URL "http://ftp.gnu.org/pub/gnu/guile/guile-${GUILE_VERSION}.tar.gz")
+set (GUILE_DIR ${GLOBAL_DIR}/guile)
+set (GUILE_PATCH ${CMAKE_SOURCE_DIR}/guile-1.8.patch)
+
+set (OPENSSL_URL "http://www.openssl.org/source/openssl-0.9.8j.tar.gz")
+set (OPENSSL_DIR ${GLOBAL_DIR}/openssl)
+
+SET (ZLIB_VERSION "1.2.8")
+SET (ZLIB_SRC_URL ${SF_MIRROR}/libpng/zlib-${ZLIB_VERSION}.tar.xz)
+# This is the last version of GLib that supports Windows XP.
+SET (GLIB_MINOR_VERSION "2.42")
+SET (GLIB_MICRO_VERSION "2")
+set (GLIB_VERSION ${GLIB_MINOR_VERSION}.${GLIB_MICRO_VERSION})
+SET (GLIB_SRC_URL ${GNOME_SRC_MIRROR}/glib/${GLIB_MINOR_VERSION}/glib-${GLIB_VERSION}.tar.xz)
+SET (GNUTLS_VERSION "3.2.19")
+set (BUILD_GNUTLS_FROM_SOURCE "no")
+set (GNUTLS_URL "${GC_DEPS_URL}/gnutls-3.2.19-minGW.tgz")
+set (GNUTLS_DEV_URL "${GC_DEPS_URL}/gnutls-3.2.19-dev-minGW.tgz")
+set (GNUTLS_PKG_URL "ftp://ftp.gnutls.org/gcrypt/gnutls/w32/gnutls-${GNUTLS_VERSION}-w32.zip")
+SET (GCRYPT_VERSION "1.6.2")
+set (GCRYPT_SRC_URL "ftp://ftp.gnutls.org/gcrypt/libgcrypt/libgcrypt-${GCRYPT_VERSION}.tar.bz2")
+SET (GPG_ERROR_VERSION "1.17")
+set (GPG_ERROR_SRC_URL "ftp://ftp.gnutls.org/gcrypt/libgpg-error/libgpg-error-${GPG_ERROR_VERSION}.tar.bz2")
+set (GLIB_NETWORKING_SRC_URL "${GNOME_MIRROR}/sources/glib-networking/2.38/glib-networking-${GLIB_VERSION}.tar.xz")
+set (GNUTLS_DIR ${GLOBAL_DIR}/gnutls)
+
+set (MINGW_UTILS_URL "${SF_MIRROR}/mingw/mingw-utils-0.3.tar.gz")
+set (MINGW_UTILS_DIR ${TOOLS_DIR})
+
+set (EXETYPE_SCRIPT ${CMAKE_SOURCE_DIR}/exetype.pl)
+set (EXETYPE_DIR ${TOOLS_DIR})
+
+set (XMLSOFT_URL "http://xmlsoft.org/sources/win32")
+set (XSLT_BASE_URL "http://ftp.acc.umu.se/pub/GNOME/sources/libxslt/1.1")
+set (XML2_BASE_URL "ftp://xmlsoft.org/libxml2")
+SET (LIBXSLT_VERSION "1.1.28")
+set (LIBXSLT_SRC_URL "${XML2_BASE_URL}/libxslt-${LIBXSLT_VERSION}.tar.gz")
+#set (LIBXSLT_MAKEFILE_PATCH "${CMAKE_SOURCE_DIR}/libxslt-1.1.22.Makefile.in.patch")
+SET (LIBXML2_VERSION "2.9.0")
+set (LIBXML2_SRC_URL "${XML2_BASE_URL}/libxml2-${LIBXML2_VERSION}.tar.gz")
+set (LIBXSLT_ICONV_URL "${XMLSOFT_URL}/iconv-1.9.2.win32.zip")
+set (LIBXSLT_ZLIB_URL "${XMLSOFT_URL}/zlib-1.2.3.win32.zip")
+set (LIBXSLT_DIR ${GLOBAL_DIR}/libxslt)
+
+set (EXPAT_URL "${GNOME_WIN32_DEPS_URL}/expat_2.0.1-1_win32.zip")
+set (EXPAT_DEV_URL "${GNOME_WIN32_DEPS_URL}/expat-dev_2.0.1-1_win32.zip")
+set (FREETYPE_VERSION "2.6.4")
+set (FREETYPE_URL "${SF_MIRROR}/freetype/freetype-${FREETYPE_VERSION}.tar.bz2")
+set (FONTCONFIG_VERSION "2.12.0")
+set (FONTCONFIG_URL ${FREEDESKTOP_MIRROR}/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2)
+set (HARFBUZZ_VERSION "1.2.7")
+set (HARFBUZZ_URL ${FREEDESKTOP_MIRROR}/harfbuzz/release/harfbuzz-${HARFBUZZ_VERSION}.tar.bz2)
+set (GAIL_URL "${GNOME_WIN32_URL}/gail/1.22/gail-1.22.0.zip")
+set (GAIL_DEV_URL "${GNOME_WIN32_URL}/gail/1.22/gail-dev-1.22.0.zip")
+set (GETTEXT_RUNTIME_URL "${GNOME_WIN32_DEPS_URL}/gettext-runtime_0.18.1.1-2_win32.zip")
+set (GETTEXT_RUNTIME_DEV_URL "${GNOME_WIN32_DEPS_URL}/gettext-runtime-dev_0.18.1.1-2_win32.zip")
+set (GETTEXT_TOOLS_URL "${GNOME_WIN32_DEPS_URL}/gettext-tools-dev_0.18.1.1-2_win32.zip")
+set (GTK_DOC_URL "${GNOME_MIRROR}/sources/gtk-doc/1.13/gtk-doc-1.13.tar.bz2")
+set (GTK_PREFS_URL "${SF_MIRROR}/gtk-win/gtk2_prefs-0.4.1.bin-gtk2.10-win32.zip")
+set (GTK_THEME_URL "${SF_MIRROR}/gtk-win/gtk2-themes-2009-09-07-win32_bin.zip")
+set (ICU_VERSION "55.1")
+set (ICU_USCORE_VERSION "55_1")
+set (ICU_URL "http://download.icu-project.org/files/icu4c/${ICU_VERSION}/icu4c-${ICU_USCORE_VERSION}-src.tgz")
+set (INTLTOOL_URL "${GNOME_WIN32_URL}/intltool/0.40/intltool_0.40.4-1_win32.zip")
+set (LIBFFI_VERSION "3.2.1")
+set (LIBFFI_URL "ftp://sourceware.org/pub/libffi/libffi-${LIBFFI_VERSION}.tar.gz")
+set (LIBART_LGPL_URL "${GNOME_WIN32_URL}/libart_lgpl/2.3/libart-lgpl_2.3.21-1_win32.zip")
+set (LIBART_LGPL_DEV_URL "${GNOME_WIN32_URL}/libart_lgpl/2.3/libart-lgpl-dev_2.3.21-1_win32.zip")
+set (LIBGNOMECANVAS_URL "${GNOME_WIN32_URL}/libgnomecanvas/2.30/libgnomecanvas_2.30.1-1_win32.zip")
+set (LIBGNOMECANVAS_DEV_URL "${GNOME_WIN32_URL}/libgnomecanvas/2.30/libgnomecanvas-dev_2.30.1-1_win32.zip")
+set (LIBICONV_URL "${GNOME_WIN32_DEPS_URL}/libiconv-1.9.1.bin.woe32.zip")
+set (LIBPNG_URL "${GNOME_WIN32_DEPS_URL}/libpng_1.4.3-1_win32.zip")
+set (LIBPNG_DEV_URL "${GNOME_WIN32_DEPS_URL}/libpng-dev_1.4.3-1_win32.zip")
+set (LIBTIFF_URL "${GC_DEPS_URL}/tiff-4.0.3-mingw.tgz")
+set (LIBTIFF_DEV_URL "${GC_DEPS_URL}/tiff-4.0.3-dev-mingw.tgz")
+set (LIBXML2_URL "${GNOME_WIN32_DEPS_URL}/libxml2_2.7.7-1_win32.zip")
+set (LIBXML2_DEV_URL "${GNOME_WIN32_DEPS_URL}/libxml2-dev_2.7.7-1_win32.zip")
+set (PKG_CONFIG_VER "0.29.1")
+set (PKG_CONFIG_MIRROR https://pkg-config.freedesktop.org/releases/)
+set (PKG_CONFIG_SRC_URL ${PKG_CONFIG_MIRROR}/pkg-config-${PKG_CONFIG_VER}.tar.gz)
+set (PKG_CONFIG_URL "${GNOME_WIN32_DEPS_URL}/pkg-config_0.25-1_win32.zip")
+set (PKG_CONFIG_DEV_URL "${GNOME_WIN32_DEPS_URL}/pkg-config-dev_0.25-1_win32.zip")
+set (GLIB_URL "${GC_DEPS_URL}/glib-${GLIB_VERSION}-2-minGW.tgz")
+set (GLIB_DEV_URL "${GC_DEPS_URL}/glib-${GLIB_VERSION}-2-dev-minGW.tgz")
+set (CAIRO_VERSION "1.10.2")
+set (CAIRO_URL "${GC_DEPS_URL}/cairo-1.10.2-minGW.tgz")
+set (CAIRO_DEV_URL "${GC_DEPS_URL}/cairo-1.10.2-dev-minGW.tgz")
+set (GTK_VERSION "2.24.24")
+set (GTK_URL "${GC_DEPS_URL}/gtk+-2.24.24-minGW.tgz")
+set (GTK_DEV_URL "${GC_DEPS_URL}/gtk+-2.24.24-dev-minGW.tgz")
+set (ZLIB_URL "${GNOME_WIN32_DEPS_URL}/zlib_1.2.5-2_win32.zip")
+set (ZLIB_DEV_URL "${GNOME_WIN32_DEPS_URL}/zlib-dev_1.2.5-2_win32.zip")
+
+set (GNOME_DIR ${GLOBAL_DIR}/gnome)
+
+set (SWIG_URL "${SF_MIRROR}/swig/swigwin-2.0.11.zip")
+set (SWIG_DIR ${GLOBAL_DIR}/swig)
+
+set (PCRE_BIN_URL "${SF_MIRROR}/gnuwin32/pcre-7.0-bin.zip")
+set (PCRE_LIB_URL "${SF_MIRROR}/gnuwin32/pcre-7.0-lib.zip")
+set (PCRE_DIR ${GLOBAL_DIR}/pcre)
+
+SET (LIBGSF_VERSION "1.14.21")
+set (LIBGSF_URL "${GNOME_MIRROR}/sources/libgsf/1.14/libgsf-${LIBGSF_VERSION}.tar.bz2")
+set (LIBGSF_DIR ${GLOBAL_DIR}/libgsf)
+
+SET (GOFFICE_VERSION "0.8.17")
+set (GOFFICE_URL "${GNOME_MIRROR}/sources/goffice/0.8/goffice-${GOFFICE_VERSION}.tar.bz2")
+set (GOFFICE_DIR ${GLOBAL_DIR}/goffice)
+#set (GOFFICE_PATCH ${CMAKE_SOURCE_DIR}/goffice-x.x.x.patch)
+
+set (GLADE_URL "${GNOME_MIRROR}/sources/glade3/3.0/glade3-3.1.2.tar.bz2")
+set (GLADE_DIR ${GLOBAL_DIR}/glade)
+
+set (INNO_URL "http://files.jrsoftware.org/is/5/isetup-5.3.9-unicode.exe")
+set (INNO_DIR ${GLOBAL_DIR}/inno)
+
+set (HH_URL "http://download.microsoft.com/download/0/a/9/0a939ef6-e31c-430f-a3df-dfae7960d564/htmlhelp.exe")
+set (HH_DIR ${GLOBAL_DIR}/hh)
+
+set (BUILD_WEBKIT_FROM_SOURCE no)
+set (WEBKIT_VERSION "1.8.3")
+set (WEBKIT_URL "${SF_MIRROR}/gnucash/webkit-${WEBKIT_VERSION}-minGW.tgz")
+set (WEBKIT_DEV_URL "${SF_MIRROR}/gnucash/webkit-${WEBKIT_VERSION}-dev-minGW.tgz")
+set (WEBKIT_DIR ${GLOBAL_DIR}/webkit)
+#NB: The Fedora project maintains a source version that has been patched for building in a Fedora-MinGW cross-compiler. This isn't quite good enough to build in MinGW itself, but it's a lot closer and less work than starting with a tarball direct from the WebKitGtk project.
+set (WEBKIT_SRC_URL "https://pkgs.fedoraproject.org/repo/pkgs/mingw-webkitgtk/webkit-1.8.3.tar.xz/dcbf9d5e2e6391f857c29a57528b32a6/webkit-1.8.3.tar.xz")
+set (WEBKIT_MINGW_PATCH_1 ${CMAKE_SOURCE_DIR}/0001-Fix-various-issues-when-compiling-natively-on-MinGW.patch)
+set (WEBKIT_MINGW_PATCH_2 ${CMAKE_SOURCE_DIR}/0002-webkit-second-minGW.patch)
+set (ENCHANT_VERSION "1.5.0")
+set (ENCHANT_URL "${GNOME_WIN32_URL}/dependencies/enchant_${ENCHANT_VERSION}-2_win32.zip")
+set (ENCHANT_DEV_URL "${GNOME_WIN32_URL}/dependencies/enchant-dev_${ENCHANT_VERSION}-2_win32.zip")
+set (ENCHANT_DIR ${GLOBAL_DIR}/enchant)
+set (BUILD_LIBSOUP_FROM_SOURCE no)
+set (LIBSOUP_VERSION "2.48.0")
+set (LIBSOUP_URL "${SF_MIRROR}/gnucash/libsoup-${LIBSOUP_VERSION}-minGW.tgz")
+set (LIBSOUP_DEV_URL "${SF_MIRROR}/gnucash/libsoup-${LIBSOUP_VERSION}-dev-minGW.tgz")
+set (LIBSOUP_DIR ${GLOBAL_DIR}/libsoup)
+set (LIBSOUP_SRC_URL "${GNOME_MIRROR}/sources/libsoup/2.48/libsoup-${LIBSOUP_VERSION}.tar.xz")
+set (LIBSOUP_BAD_SYMBOL_PATCH ${CMAKE_SOURCE_DIR}/libsoup-2.48.0-bad-symbol.patch)
+set (LIBSOUP_RESERVED_WORD_PATCH ${CMAKE_SOURCE_DIR}/libsoup-2.48.0-soup-server-reserved-word.patch)
+set (ICU4C_URL "http://download.icu-project.org/files/icu4c/4.4.1/icu4c-4_4_1-Win32-msvc9.zip")
+set (ICU4C_SRC_URL "http://download.icu-project.org/files/icu4c/4.4.1/icu4c-4_4_1-src.tgz")
+set (ICU4C_DIR ${GLOBAL_DIR}/icu-mingw32)
+set (ICU4C_PATCH ${CMAKE_SOURCE_DIR}/icu-crossmingw.patch)
+
+set (GIT_URL "https://github.com/msysgit/msysgit/releases/download/Git-1.9.4-preview20140611/Git-1.9.4-preview20140611.exe")
+set (GIT_DIR ${GLOBAL_DIR}/git-1.9.4)
+
+# OFX import in gnucash and ofx directconnect support for aqbanking
+set (OPENSP_URL "${SF_MIRROR}/openjade/OpenSP-1.5.2.tar.gz")
+set (OPENSP_DIR ${GLOBAL_DIR}/opensp)
+set (OPENSP_PATCH ${CMAKE_SOURCE_DIR}/opensp-1.5.2.patch)
+
+SET (LIBOFX_VERSION "0.9.9")
+set (LIBOFX_URL "${SF_MIRROR}/libofx/libofx-${LIBOFX_VERSION}.tar.gz")
+set (LIBOFX_DIR ${GLOBAL_DIR}/libofx)
+set (LIBOFX_PATCH ${CMAKE_SOURCE_DIR}/libofx-0.9.8.patch)
+
+## online banking: gwenhywfar+aqbanking
+SET (GWENHYWFAR_VERSION "4.15.3")
+## NB: Dummy means dummy! The important value in the following url is
+## the release number, not the file name at the end!
+set (GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=201&file=01&dummy gwenhywfar-4.15.3.tar.gz")
+set (GWENHYWFAR_DIR ${GLOBAL_DIR}/gwenhywfar)
+
+SET (KTOBLZCHECK_VERSION "1.48")
+set (KTOBLZCHECK_URL "${SF_MIRROR}/ktoblzcheck/ktoblzcheck-${KTOBLZCHECK_VERSION}.tar.gz")
+# ktoblzcheck is being installed into GWENHYWFAR_DIR
+
+SET (AQBANKING_VERSION "5.6.10")
+## NB: Dummy means dummy! The important value in the following url is
+## the release number, not the file name at the end!
+set (AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=206&file=01&dummy aqbanking-5.6.10.tar.gz")
+set (AQBANKING_DIR ${GLOBAL_DIR}/aqbanking)
+set (AQB_PATCH ${CMAKE_SOURCE_DIR}/swift940-strndup.patch)
+
+set (SQLITE3_URL "http://sqlite.org/sqlite-amalgamation-3.6.1.tar.gz")
+set (SQLITE3_DIR ${GLOBAL_DIR}/sqlite3)
+set (MYSQL_LIB_URL "http://mirror.csclub.uwaterloo.ca/mysql/Downloads/Connector-C/mysql-connector-c-noinstall-6.0.1-win32.zip")
+set (MYSQL_LIB_DIR ${GLOBAL_DIR}/mysql)
+set (LIBMYSQL_DEF ${CMAKE_SOURCE_DIR}/libmysql.def)
+set (PGSQL_LIB_URL "${SF_MIRROR}/gnucash/pgsql-win32-2.tar.gz")
+set (PGSQL_DIR ${GLOBAL_DIR}/pgsql)
+set (LIBDBI_URL "${SF_MIRROR}/libdbi/libdbi-0.8.4.tar.gz")
+set (LIBDBI_DIR ${GLOBAL_DIR}/libdbi)
+set (LIBDBI_PATCH ${CMAKE_SOURCE_DIR}/libdbi-0.8.3.patch)
+set (LIBDBI_DRIVERS_URL "${SF_MIRROR}/libdbi-drivers/libdbi-drivers-0.8.3-1.tar.gz")
+set (LIBDBI_DRIVERS_DIR ${GLOBAL_DIR}/libdbi-drivers)
+set (LIBDBI_DRIVERS_PATCH ${CMAKE_SOURCE_DIR}/libdbi-drivers-errno.patch)
+
+set (CMAKE_URL "https://cmake.org/files/v3.3/cmake-3.3.2-win32-x86.zip")
+set (CMAKE_DIR ${GLOBAL_DIR}/cmake)
+
+set (NINJA_URL "http://github.com/ninja-build/ninja/releases/download/v1.6.0/ninja-win.zip")
+set (NINJA_DIR ${GLOBAL_DIR}/ninja)
+
+set (DOCBOOK_XSL_URL "${SF_MIRROR}/docbook/docbook-xsl-1.76.1.zip")
+set (DOCBOOK_DTD_URL "http://www.oasis-open.org/docbook/xml/4.1.2/docbkx412.zip")
+if (REPOS_TYPE STREQUAL "git")
+ set (DOCS_SCM_REV "master")
+ set (DOCS_URL "git://github.com/Gnucash/gnucash-docs.git")
+endif()
+set (UPDATE_DOCS yes)
+set (DOCS_DIR ${GLOBAL_DIR}/gnucash-docs)
+set (XSLTPROCFLAGS "")
+
+set (ISOCODES_URL "http://pkg-isocodes.alioth.debian.org/downloads/iso-codes-3.49.tar.xz")
+set (ISOCODES_DIR ${GLOBAL_DIR}/isocodes)
+
+set (BOOST_URL "${SF_MIRROR}/boost/boost/boost_1_55_0.tar.bz2")
+set (BOOST_DIR ${GLOBAL_DIR}/boost)
diff --git a/cmake/glib.cmake b/cmake/glib.cmake
new file mode 100644
index 0000000..4a3e776
--- /dev/null
+++ b/cmake/glib.cmake
@@ -0,0 +1,109 @@
+set_property (GLOBAL PROPERTY EP_BASE ${GLOBAL_DEP_BUILD_DIR})
+set (INSTALL_DIR ${GLOBAL_DEP_BUILD_DIR}/glib-install)
+ExternalProject_Add(pkgconfig
+ URL ${PKG_CONFIG_SRC_URL}
+ CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix ${INSTALL_DIR} --with-internal-glib
+ BUILD_COMMAND make
+ INSTALL_COMMAND make install
+ INSTALL_DIR ${INSTALL_DIR}
+ )
+ExternalProject_Add(zlib
+ URL ${ZLIB_SRC_URL}
+ CONFIGURE_COMMAND sed -i s/SHARED_MODE=0/SHARED_MODE=1/ <SOURCE_DIR>/win32/Makefile.gcc
+ BUILD_COMMAND make -f <SOURCE_DIR>/win32/Makefile.gcc
+ BUILD_IN_SOURCE 1
+ INSTALL_COMMAND INCLUDE_PATH=${INSTALL_DIR}/include LIBRARY_PATH=${INSTALL_DIR}/lib BINARY_PATH=${INSTALL_DIR}/bin make -f <SOURCE_DIR>/win32/Makefile.gcc install
+ INSTALL_DIR ${INSTALL_DIR}
+ )
+ExternalProject_Add(intltool
+ URL ${INTLTOOL_URL}
+ SOURCE_DIR ${INSTALL_DIR}
+ CONFIGURE_COMMAND ""
+ BUILD_COMMAND ""
+ INSTALL_COMMAND ""
+ )
+ExternalProject_Add(freetype
+ URL ${FREETYPE_URL}
+ CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix ${INSTALL_DIR} --without-bzip2
+ BUILD_COMMAND make
+ INSTALL_COMMAND make install
+ INSTALL_DIR ${INSTALL_DIR}
+ DEPENDS intltool
+ )
+ExternalProject_Get_Property(freetype source_dir)
+ExternalProject_Add_Step(freetype export-fix
+ COMMAND sh -c "rm include/freetype/ftmac.h"
+ WORKING_DIRECTORY ${source_dir}
+ DEPENDEES configure
+ DEPENDERS build
+)
+ExternalProject_Add(fontconfig
+ URL ${FONTCONFIG_URL}
+ CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix ${INSTALL_DIR} --disable-docs
+ BUILD_COMMAND make
+ INSTALL_COMMAND make install
+ INSTALL_DIR ${INSTALL_DIR}
+ DEPENDS freetype;pkgconfig
+ )
+ExternalProject_Add(libffi
+ URL ${LIBFFI_URL}
+ CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix ${INSTALL_DIR}
+ BUILD_COMMAND make
+ INSTALL_COMMAND make install
+ INSTALL_DIR ${INSTALL_DIR}
+ )
+ExternalProject_Add(glib
+ URL ${GLIB_SRC_URL}
+ CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix ${INSTALL_DIR} --with-pcre=internal
+ PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/glib-timezone.patch
+ BUILD_COMMAND make
+ INSTALL_COMMAND make install
+ INSTALL_DIR ${INSTALL_DIR}
+ DEPENDS libffi;zlib
+ )
+ExternalProject_Add(harfbuzz
+ URL ${HARFBUZZ_URL}
+ CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix ${INSTALL_DIR}
+ BUILD_COMMAND make
+ INSTALL_DIR ${INSTALL_DIR}
+ DEPENDS fontconfig;glib
+ )
+# harfbuzz has a dependency on glib for three unicode functions, so we
+# need to build it again after building glib.
+#ExternalProject_Add(harfbuzz2
+# URL ${HARFBUZZ_URL}
+# CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix ${INSTALL_DIR}
+# BUILD_COMMAND make
+# INSTALL_DIR ${INSTALL_DIR}
+# DEPENDS glib
+# )
+ExternalProject_Add_Step(harfbuzz fix-pkgconfig-prefix
+ COMMAND sh -c "chmod -R o+w ${INSTALL_DIR}"
+ COMMAND sh -c "sed -i 's at prefix *= *${INSTALL_DIR}@prefix = c:/gcdev@' ${INSTALL_DIR}/lib/pkgconfig/*.pc"
+ COMMAND sh -c "sed -i s@${INSTALL_DIR}@\${prefix}@ ${INSTALL_DIR}/lib/pkgconfig/*.pc"
+ DEPENDEES install
+ )
+if (GNC_MAKE_TARBALLS)
+ set (TARBALL_DIR ${GLOBAL_DIR}/dependencies)
+ ExternalProject_Add_Step(harfbuzz tarballs
+ COMMAND sh -c "tar cjf ${TARBALL_DIR}/glib-${GLIB_VERSION}-MinGW-bin.tar.bz2 bin etc share"
+ COMMAND sh -c "tar cjf ${TARBALL_DIR}/glib-${GLIB_VERSION}-MinGW-dev.tar.bz2 include lib/pkgconfig lib/glib-2.0 lib/libffi-${LIBFFI_VERSION} lib/*.a"
+ BYPRODUCTS ${TARBALL_DIR}/glib-${GLIB_VERSION}-MinGW-bin.tar.bz2 ${TARBALL_DIR}/glib-${GLIB_VERSION}-MinGW-dev.tar.bz2
+ WORKING_DIRECTORY ${INSTALL_DIR}
+ DEPENDEES fix-pkgconfig-prefix
+ )
+endif()
+
+if (GNC_INSTALL_DEPS OR GNC_INSTALL_GLIB)
+ ExternalProject_Add_Step(harfbuzz final_install
+ COMMAND sh -c "cp ${INSTALL_DIR}/bin/* ${GLOBAL_DIR}/gnome/bin"
+ COMMAND sh -c "cp ${INSTALL_DIR}/lib/*.a ${GLOBAL_DIR}/gnome/lib"
+ COMMAND sh -c "cp ${INSTALL_DIR}/lib/pkgconfig/* ${GLOBAL_DIR}/gnome/lib/pkgconfig"
+ COMMAND sh -c "cp -r ${INSTALL_DIR}/lib/glib-2.0 ${GLOBAL_DIR}/gnome/lib/"
+ COMMAND sh -c "cp -r ${INSTALL_DIR}/lib/libffi-${LIBFFI_VERSION} ${GLOBAL_DIR}/gnome/lib/"
+ COMMAND sh -c "cp -r ${INSTALL_DIR}/etc ${GLOBAL_DIR}/gnome/"
+ COMMAND sh -c "cp -r ${INSTALL_DIR}/share ${GLOBAL_DIR}/gnome/"
+ ALWAYS 1
+ DEPENDEES fix-pkgconfig-prefix
+ )
+endif()
diff --git a/cmake/webkit.cmake b/cmake/webkit.cmake
new file mode 100644
index 0000000..c76e554
--- /dev/null
+++ b/cmake/webkit.cmake
@@ -0,0 +1,7 @@
+ExternalProject_Add(icu
+ URL ${ICU_URL}
+ CONFIGURE_COMMAND <SOURCE_DIR>/source/configure --prefix ${INSTALL_DIR}
+ BUILD_COMMAND make
+ INSTALL_COMMAND make install COMMAND sh -c "pushd ${INSTALL_DIR}/lib && for i in icu\*.dll$<SEMICOLON> do mv $i ../bin/lib$i$<SEMICOLON> done && popd" COMMAND sh -c "sed -i -e 's/libdir = \${exec_prefix}\\/lib/libdir = \${exec_prefix}\\/bin/' ${INSTALL_DIR}/lib/pkgconfig/icu*.pc"
+ INSTALL_DIR ${INSTALL_DIR}
+ )
diff --git a/glib-timezone.patch b/glib-timezone.patch
new file mode 100644
index 0000000..f28b867
--- /dev/null
+++ b/glib-timezone.patch
@@ -0,0 +1,13 @@
+diff --git a/glib/gtimezone.c b/glib/gtimezone.c
+index b61529f..2e2369c 100644
+--- a/glib/gtimezone.c
++++ b/glib/gtimezone.c
+@@ -893,7 +893,7 @@ init_zone_from_rules (GTimeZone *gtz,
+ ++info_index;
+ skip_first_std_trans = TRUE;
+ }
+- else if (rules[ri].std_offset || rules[ri].dlt_offset)
++ else
+ {
+ const guint start_year = rules[ri].start_year;
+ const guint end_year = rules[ri + 1].start_year;
commit 6a665cf863fceb059ff70997b3e3bfc520c3e793
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Jul 11 23:02:59 2016 +0000
Upgraded glib tarballs with fix to bug 767824.
diff --git a/defaults.sh b/defaults.sh
index c5298f0..27155c4 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -270,8 +270,8 @@ set_default LIBXML2_URL "$GNOME_WIN32_DEPS_URL/libxml2_2.7.7-1_win32
set_default LIBXML2_DEV_URL "$GNOME_WIN32_DEPS_URL/libxml2-dev_2.7.7-1_win32.zip"
set_default PKG_CONFIG_URL "$GNOME_WIN32_DEPS_URL/pkg-config_0.25-1_win32.zip"
set_default PKG_CONFIG_DEV_URL "$GNOME_WIN32_DEPS_URL/pkg-config-dev_0.25-1_win32.zip"
-set_default GLIB_URL "$GC_DEPS_URL/glib-$GLIB_VERSION-2-minGW.tgz"
-set_default GLIB_DEV_URL "$GC_DEPS_URL/glib-$GLIB_VERSION-2-dev-minGW.tgz"
+set_default GLIB_URL "$GC_DEPS_URL/glib-2.42.2-MinGW-bin.tar.bz2"
+set_default GLIB_DEV_URL "$GC_DEPS_URL/glib-2.42.2-MinGW-dev.tar.bz2"
set_default CAIRO_VERSION="1.10.2"
set_default CAIRO_URL "$GC_DEPS_URL/cairo-1.10.2-minGW.tgz"
set_default CAIRO_DEV_URL "$GC_DEPS_URL/cairo-1.10.2-dev-minGW.tgz"
commit 1377fe4af61c33be0e93434906947b5797a89f85
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Jun 21 15:34:27 2016 -0700
Another bump in glib tarballs.
This one fixes the lib and include paths in zlib.pc which caused cmake
builds to fail in gcdev-maint. It also brings back some libraries that
got left out of glib-2.38.2-2-minGW.tar.gz.
diff --git a/defaults.sh b/defaults.sh
index 866628e..c5298f0 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -270,8 +270,8 @@ set_default LIBXML2_URL "$GNOME_WIN32_DEPS_URL/libxml2_2.7.7-1_win32
set_default LIBXML2_DEV_URL "$GNOME_WIN32_DEPS_URL/libxml2-dev_2.7.7-1_win32.zip"
set_default PKG_CONFIG_URL "$GNOME_WIN32_DEPS_URL/pkg-config_0.25-1_win32.zip"
set_default PKG_CONFIG_DEV_URL "$GNOME_WIN32_DEPS_URL/pkg-config-dev_0.25-1_win32.zip"
-set_default GLIB_URL "$GC_DEPS_URL/glib-$GLIB_VERSION-2-minGW.tar.gz"
-set_default GLIB_DEV_URL "$GC_DEPS_URL/glib-$GLIB_VERSION-dev-minGW.tgz"
+set_default GLIB_URL "$GC_DEPS_URL/glib-$GLIB_VERSION-2-minGW.tgz"
+set_default GLIB_DEV_URL "$GC_DEPS_URL/glib-$GLIB_VERSION-2-dev-minGW.tgz"
set_default CAIRO_VERSION="1.10.2"
set_default CAIRO_URL "$GC_DEPS_URL/cairo-1.10.2-minGW.tgz"
set_default CAIRO_DEV_URL "$GC_DEPS_URL/cairo-1.10.2-dev-minGW.tgz"
commit 98d036670ac31831841053643b24595dcec92c75
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Jun 21 12:57:59 2016 -0700
Use correct URLs for new Gwen and AQB, patch AQB.
Patch required because MinGW doesn't provide strndup.
diff --git a/defaults.sh b/defaults.sh
index 333ca41..866628e 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -349,17 +349,21 @@ set_default LIBOFX_PATCH `pwd`/libofx-0.9.8.patch
## online banking: gwenhywfar+aqbanking
GWENHYWFAR_VERSION="4.15.3"
-set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=78&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
+## NB: Dummy means dummy! The important value in the following url is
+## the release number, not the file name at the end!
+set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=201&file=01&dummy=gwenhywfar-4.15.3.tar.gz"
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
-set_default GWEN_PATCH `pwd`/gwen-4.13.1.patch
KTOBLZCHECK_VERSION="1.48"
set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-${KTOBLZCHECK_VERSION}.tar.gz"
# ktoblzcheck is being installed into GWENHYWFAR_DIR
AQBANKING_VERSION="5.6.10"
-set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=118&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
+## NB: Dummy means dummy! The important value in the following url is
+## the release number, not the file name at the end!
+set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=206&file=01&dummy=aqbanking-5.6.10.tar.gz"
set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
+set_default AQB_PATCH `pwd`/swift940-strndup.patch
set_default SQLITE3_URL "http://sqlite.org/sqlite-amalgamation-3.6.1.tar.gz"
set_default SQLITE3_DIR $GLOBAL_DIR\\sqlite3
diff --git a/install-impl.sh b/install-impl.sh
index 654e2d9..9a00e3d 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -283,6 +283,10 @@ function inst_aqbanking() {
wget_unpacked $AQBANKING_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/aqbanking-*
qpushd $TMP_UDIR/aqbanking-*
+ if [ -n "$AQB_PATCH" -a -f "$AQB_PATCH" ]; then
+ patch -p1 < $AQB_PATCH
+ fi
+
_AQ_CPPFLAGS="-I${_LIBOFX_UDIR}/include ${KTOBLZCHECK_CPPFLAGS} ${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS} -I${_GWENHYWFAR_UDIR}/include/gwenhywfar4"
_AQ_LDFLAGS="-L${_LIBOFX_UDIR}/lib ${KTOBLZCHECK_LDFLAGS} ${GNOME_LDFLAGS} ${GNUTLS_LDFLAGS}"
if test x$CROSS_COMPILE = xyes; then
@@ -640,6 +644,9 @@ function inst_gwenhywfar() {
then
echo "Gwenhywfar ${GWENHYWFAR_VERSION} already installed in $_GWENHYWFAR_UDIR. skipping."
else
+# INSTALLED_GWEN=`${PKG_CONFIG} --modversion gwenhywfar`
+# echo "GWENHYWFAR installed version ${INSTALLED_GWEN} doesn't match required version ${GWENHYWFAR_VERSION}"
+# exit
wget_unpacked $GWENHYWFAR_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/gwenhywfar-*
qpushd $TMP_UDIR/gwenhywfar-*
diff --git a/swift940-strndup.patch b/swift940-strndup.patch
new file mode 100644
index 0000000..0132853
--- /dev/null
+++ b/swift940-strndup.patch
@@ -0,0 +1,32 @@
+--- a/src/plugins/parsers/swift/swift940.c 2015-06-01 10:16:28.000000000 -0700
++++ b/src/plugins/parsers/swift/swift940.c 2016-06-20 16:45:18.000000000 -0700
+@@ -31,9 +31,18 @@
+
+
+ /* #define ENABLE_FULL_SEPA_LOG */
++inline char* strndup_impl(char* instr, size_t len)
++{
++ char *outstr = malloc(len +1);
++ if (outstr)
++ {
++ memset(outstr, 0, len);
++ memcpy(outstr, instr, len);
++ }
++ return outstr;
++}
+
+-
+-
++#define strndup(str, len) strndup_impl(str, len)
+ #define CENTURY_CUTOFF_YEAR 79
+
+
+@@ -266,7 +277,7 @@
+
+ /* found begin of the next SEPA field or end of buffer */
+ if (s > sLastTagStart) {
+- int tagLen;
++ size_t tagLen;
+
+ /* we currently have a field, close that first */
+ tagLen=s-sLastTagStart;
commit 484109bce2d42bee00a608f94cc41f031e4b271b
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Jun 19 15:45:47 2016 -0700
Bug 767824 - Some UTC Timezones incorrectly recognized on Windows 7
This was actually a bug in GLib which I patched in our build archive.
This change just points to the new build archive.
diff --git a/defaults.sh b/defaults.sh
index 0701d51..333ca41 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -270,7 +270,7 @@ set_default LIBXML2_URL "$GNOME_WIN32_DEPS_URL/libxml2_2.7.7-1_win32
set_default LIBXML2_DEV_URL "$GNOME_WIN32_DEPS_URL/libxml2-dev_2.7.7-1_win32.zip"
set_default PKG_CONFIG_URL "$GNOME_WIN32_DEPS_URL/pkg-config_0.25-1_win32.zip"
set_default PKG_CONFIG_DEV_URL "$GNOME_WIN32_DEPS_URL/pkg-config-dev_0.25-1_win32.zip"
-set_default GLIB_URL "$GC_DEPS_URL/glib-$GLIB_VERSION-minGW.tgz"
+set_default GLIB_URL "$GC_DEPS_URL/glib-$GLIB_VERSION-2-minGW.tar.gz"
set_default GLIB_DEV_URL "$GC_DEPS_URL/glib-$GLIB_VERSION-dev-minGW.tgz"
set_default CAIRO_VERSION="1.10.2"
set_default CAIRO_URL "$GC_DEPS_URL/cairo-1.10.2-minGW.tgz"
commit 4b892565dbb78a3532acc0513e2ee0e33f031ed0
Author: John Ralls <jralls at ceridwen.us>
Date: Sun May 1 11:30:31 2016 -0700
Update AQBanking and Gwenhywfar to new release.
diff --git a/defaults.sh b/defaults.sh
index 0a8631a..0701d51 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -348,7 +348,7 @@ set_default LIBOFX_DIR $GLOBAL_DIR\\libofx
set_default LIBOFX_PATCH `pwd`/libofx-0.9.8.patch
## online banking: gwenhywfar+aqbanking
-GWENHYWFAR_VERSION="4.13.1"
+GWENHYWFAR_VERSION="4.15.3"
set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=78&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
set_default GWEN_PATCH `pwd`/gwen-4.13.1.patch
@@ -357,7 +357,7 @@ KTOBLZCHECK_VERSION="1.48"
set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-${KTOBLZCHECK_VERSION}.tar.gz"
# ktoblzcheck is being installed into GWENHYWFAR_DIR
-AQBANKING_VERSION="5.5.1"
+AQBANKING_VERSION="5.6.10"
set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=118&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
commit 3924a2fa0e15bc24c03cb82e671559eb56b5c08a
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Apr 23 19:35:28 2016 +0000
Change for cmake instead of defining .
Removes need for some other checks.
diff --git a/defaults.sh b/defaults.sh
index f109293..0a8631a 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -47,6 +47,9 @@ else
fi
fi
set_default BUILD_DIR $GNUCASH_DIR\\build
+if [ x"$WITH_CMAKE" = xyes ]; then
+ set_default BUILD_DIR $GNUCASH_DIR\\cmake-build
+fi
set_default INSTALL_DIR $GNUCASH_DIR\\inst
set_default DIST_DIR $GNUCASH_DIR\\dist
@@ -55,7 +58,7 @@ set_default WITH_CUTECASH no
set_default WITH_CMAKE no
set_default WITH_NINJA no
set_default CUTECASH_BUILD_DIR $GNUCASH_DIR\\build-cutecash
-set_default GNUCASH_CMAKE_BUILD_DIR $GNUCASH_DIR\\build-cmake
+
####
diff --git a/dist-impl.sh b/dist-impl.sh
index a41f13e..eacbec7 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -36,7 +36,6 @@ function dist_prepare() {
_GC_WIN_REPOS_UDIR=`unix_path $GC_WIN_REPOS_DIR`
_REPOS_UDIR=`unix_path $REPOS_DIR`
_BUILD_UDIR=`unix_path $BUILD_DIR`
- _GNUCASH_CMAKE_BUILD_UDIR=`unix_path $GNUCASH_CMAKE_BUILD_DIR`
_DIST_UDIR=`unix_path $DIST_DIR`
_MINGW_UDIR=`unix_path $MINGW_DIR`
_INSTALL_UDIR=`unix_path $INSTALL_DIR`
@@ -262,7 +261,7 @@ function dist_gnucash() {
GWENHYWFAR_VERSION_H=${_GWENHYWFAR_UDIR}/include/gwenhywfar4/gwenhywfar/version.h
GNUCASH_CONFIG_H=${_BUILD_UDIR}/config.h
if [ "$WITH_CMAKE" == "yes" ]; then
- GNUCASH_CONFIG_H=${_GNUCASH_CMAKE_BUILD_UDIR}/src/config.h
+ GNUCASH_CONFIG_H=${_BUILD_UDIR}/src/config.h
fi
_AQBANKING_SO_EFFECTIVE=$(awk '/AQBANKING_SO_EFFECTIVE / { print $3 }' ${AQBANKING_VERSION_H} )
diff --git a/install-impl.sh b/install-impl.sh
index 88f0e46..654e2d9 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1322,7 +1322,7 @@ function inst_cutecash() {
function inst_gnucash_using_cmake() {
setup "Gnucash (using cmake)"
_INSTALL_UDIR=`unix_path $INSTALL_DIR`
- _BUILD_UDIR=`unix_path $GNUCASH_CMAKE_BUILD_DIR`
+ _BUILD_UDIR=`unix_path $BUILD_DIR`
_GLOBAL_UDIR=`unix_path $GLOBAL_DIR`
_REPOS_UDIR=`unix_path $REPOS_DIR`
_NINJA_UDIR=`unix_path $NINJA_DIR`
commit 833d3c777e16b874d2b3ec446c9b7a89376c8390
Author: Rob Gowin <robgowin at gmail.com>
Date: Sat Apr 23 09:25:36 2016 -0500
Get correct path to config.h when building with CMake
diff --git a/dist-impl.sh b/dist-impl.sh
index 116bc3d..a41f13e 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -36,6 +36,7 @@ function dist_prepare() {
_GC_WIN_REPOS_UDIR=`unix_path $GC_WIN_REPOS_DIR`
_REPOS_UDIR=`unix_path $REPOS_DIR`
_BUILD_UDIR=`unix_path $BUILD_DIR`
+ _GNUCASH_CMAKE_BUILD_UDIR=`unix_path $GNUCASH_CMAKE_BUILD_DIR`
_DIST_UDIR=`unix_path $DIST_DIR`
_MINGW_UDIR=`unix_path $MINGW_DIR`
_INSTALL_UDIR=`unix_path $INSTALL_DIR`
@@ -260,6 +261,9 @@ function dist_gnucash() {
AQBANKING_VERSION_H=${_AQBANKING_UDIR}/include/aqbanking5/aqbanking/version.h
GWENHYWFAR_VERSION_H=${_GWENHYWFAR_UDIR}/include/gwenhywfar4/gwenhywfar/version.h
GNUCASH_CONFIG_H=${_BUILD_UDIR}/config.h
+ if [ "$WITH_CMAKE" == "yes" ]; then
+ GNUCASH_CONFIG_H=${_GNUCASH_CMAKE_BUILD_UDIR}/src/config.h
+ fi
_AQBANKING_SO_EFFECTIVE=$(awk '/AQBANKING_SO_EFFECTIVE / { print $3 }' ${AQBANKING_VERSION_H} )
_GWENHYWFAR_SO_EFFECTIVE=$(awk '/GWENHYWFAR_SO_EFFECTIVE / { print $3 }' ${GWENHYWFAR_VERSION_H} )
@@ -300,7 +304,7 @@ function dist_finish() {
if [ "$BUILD_FROM_TARBALL" = "no" ]; then
# And changing output filename
- PKG_VERSION=`grep PACKAGE_VERSION ${_BUILD_UDIR}/config.h | cut -d" " -f3 | cut -d\" -f2 `
+ PKG_VERSION=`grep PACKAGE_VERSION ${GNUCASH_CONFIG_H} | cut -d" " -f3 | cut -d\" -f2 `
REVISION=`grep GNUCASH_SCM_REV ${_BUILD_UDIR}/src/core-utils/gnc-vcs-info.h | cut -d" " -f3 | cut -d\" -f2 `
SETUP_FILENAME="gnucash-${PKG_VERSION}-$(date +'%Y-%m-%d')-${REPOS_TYPE}-${REVISION}-setup.exe"
qpushd ${_GNUCASH_UDIR}
commit 58aa9094b23807d3c20b18691d5c7644a6d661b6
Author: Rob Gowin <robgowin at gmail.com>
Date: Fri Apr 22 15:17:14 2016 -0500
Fixes to build package under CMake
* install-impl.sh: remove existing $_INSTALL_UDIR directory (e.g.
/c/gcdev/gnucash/inst)
* dist-impl.sh: when using CMake, skip stuff that deals with *.la files,
which are autotools specific.
diff --git a/dist-impl.sh b/dist-impl.sh
index f37d324..116bc3d 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -245,7 +245,12 @@ function dist_gnucash() {
cp -a $_INSTALL_UDIR/bin/* $_DIST_UDIR/bin
mkdir -p $_DIST_UDIR/etc/gnucash
cp -a $_INSTALL_UDIR/etc/gnucash/* $_DIST_UDIR/etc/gnucash
- cp -a $_INSTALL_UDIR/lib/lib*.la $_DIST_UDIR/bin
+
+ # For CMake builds, there are no lib*.la files, so skip.
+ if [ "$WITH_CMAKE" != "yes" ]; then
+ cp -a $_INSTALL_UDIR/lib/lib*.la $_DIST_UDIR/bin
+ fi
+
mkdir -p $_DIST_UDIR/share
cp -a $_INSTALL_UDIR/share/{doc,gnucash,locale,glib-2.0} $_DIST_UDIR/share
cp -a $_GC_WIN_REPOS_UDIR/extra_dist/{getperl.vbs,gnc-path-check,install-fq-mods.cmd} $_DIST_UDIR/bin
@@ -280,11 +285,15 @@ function dist_gnucash() {
}
function dist_finish() {
- # Strip redirections in distributed libtool .la files
- for file in $_DIST_UDIR/bin/*.la; do
- cat $file | sed 's,^libdir=,#libdir=,' > $file.new
- mv $file.new $file
- done
+ if [ "$WITH_CMAKE" != "yes" ]; then
+ # Strip redirections in distributed libtool .la files.
+ # Skip this for CMake builds, which don't generate *.la files.
+
+ for file in $_DIST_UDIR/bin/*.la; do
+ cat $file | sed 's,^libdir=,#libdir=,' > $file.new
+ mv $file.new $file
+ done
+ fi;
echo "Now running the Inno Setup Compiler for creating the setup.exe"
${_INNO_UDIR}/iscc //Q ${_GNUCASH_UDIR}/gnucash.iss
diff --git a/install-impl.sh b/install-impl.sh
index 81fa9a7..88f0e46 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1330,6 +1330,13 @@ function inst_gnucash_using_cmake() {
_LIBDBI_DRIVERS_UDIR=`unix_path ${LIBDBI_DRIVERS_DIR}`
mkdir -p $_BUILD_UDIR
+
+ # Remove existing INSTALL_UDIR
+ if [ -x $_INSTALL_UDIR ]; then
+ echo Removing previous inst dir $_INSTALL_UDIR ...
+ rm -rf "$_INSTALL_UDIR"
+ fi;
+
add_to_env $_INSTALL_UDIR/bin PATH
if [ "$BUILD_FROM_TARBALL" != "yes" ]; then
commit d6568fe7bb989e0e27f72a092b75b1f975b60a4b
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Jan 10 13:06:59 2016 -0800
Build the tags first to avoid delaying releases.
diff --git a/buildserver/build_periodic.bat b/buildserver/build_periodic.bat
index b139886..529bf63 100644
--- a/buildserver/build_periodic.bat
+++ b/buildserver/build_periodic.bat
@@ -6,9 +6,9 @@ rem On the GnuCash build server this timed command is run daily which the commen
cd c:\gcdev\gnucash-on-windows.git\
-rem maintenance branch build (daily)
-c:\gcdev-maint\mingw\msys\1.0\bin\sh.exe --login c:\gcdev-maint\gnucash-on-windows.git\buildserver\build_periodic.sh
rem Tags build for 2.6.1 and newer (daily -- only tags that weren't built yet)
c:\gcdev\mingw\msys\1.0\bin\sh.exe --login c:\gcdev\gnucash-on-windows.git\buildserver\build_tags.sh
+rem maintenance branch build (daily)
+c:\gcdev-maint\mingw\msys\1.0\bin\sh.exe --login c:\gcdev-maint\gnucash-on-windows.git\buildserver\build_periodic.sh
rem Development build (daily)
c:\gcdev\mingw\msys\1.0\bin\sh.exe --login c:\gcdev\gnucash-on-windows.git\buildserver\build_periodic.sh
commit b1a8dfcaa515ddbe1ccba15563c0cb92c24434d2
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Dec 31 10:25:01 2015 -0800
Ensure that devrc.sh is sourced in gnucash-on-windows.
diff --git a/devrc.sh b/devrc.sh
index b1bdcda..3ed718a 100644
--- a/devrc.sh
+++ b/devrc.sh
@@ -26,7 +26,14 @@
export OLDPATH=$PATH
-GLOBAL_UDIR="/c/gcdev"
+_currdir=`pwd`
+_dirname=`basename $_currdir`
+if [ $(expr $_dirname : gnucash-on-windows.*) -ne 0 ]; then
+ GLOBAL_UDIR=`dirname $_currdir`
+else
+ echo "Source me in gnucash-on-windows so that I can set the right directory."
+ exit
+fi
AQBANKING_UDIR=$GLOBAL_UDIR/aqbanking
CMAKE_UDIR=$GLOBAL_UDIR/cmake
GWENHYWFAR_UDIR=$GLOBAL_UDIR/gwenhywfar
commit f028f410c5c3d1f8e6ac25f47a298f8bf62fec23
Author: Rob Gowin <robgowin at gmail.com>
Date: Mon Dec 7 09:55:35 2015 -0600
undo previous perl path commit; do not use seperate cmake install dir
diff --git a/defaults.sh b/defaults.sh
index dfd7edf..f109293 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -48,7 +48,7 @@ else
fi
set_default BUILD_DIR $GNUCASH_DIR\\build
set_default INSTALL_DIR $GNUCASH_DIR\\inst
-set_default INSTALL_DIR_CMAKE $GNUCASH_DIR\\inst-cmake
+
set_default DIST_DIR $GNUCASH_DIR\\dist
set_default WITH_CUTECASH no
diff --git a/install-impl.sh b/install-impl.sh
index a0e7ebb..81fa9a7 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1321,13 +1321,14 @@ function inst_cutecash() {
function inst_gnucash_using_cmake() {
setup "Gnucash (using cmake)"
- _INSTALL_UDIR=`unix_path $INSTALL_DIR_CMAKE`
+ _INSTALL_UDIR=`unix_path $INSTALL_DIR`
_BUILD_UDIR=`unix_path $GNUCASH_CMAKE_BUILD_DIR`
_GLOBAL_UDIR=`unix_path $GLOBAL_DIR`
_REPOS_UDIR=`unix_path $REPOS_DIR`
_NINJA_UDIR=`unix_path $NINJA_DIR`
_MSYS_UDIR=`unix_path $MSYS_DIR`
-
+ _LIBDBI_DRIVERS_UDIR=`unix_path ${LIBDBI_DRIVERS_DIR}`
+
mkdir -p $_BUILD_UDIR
add_to_env $_INSTALL_UDIR/bin PATH
@@ -1345,8 +1346,9 @@ function inst_gnucash_using_cmake() {
cmake -G "$CMAKE_GENERATOR" \
-D CMAKE_INSTALL_PREFIX=${_INSTALL_UDIR} \
-D CMAKE_PREFIX_PATH=${_GLOBAL_UDIR} \
- -D PERL_EXECUTABLE=${_MSYS_UDIR}/1.0/bin/perl \
+ -D PERL_EXECUTABLE=${_MSYS_UDIR}/bin/perl \
-D CMAKE_MAKE_PROGRAM=${_CMAKE_MAKE_PROGRAM} \
+ -D GNC_DBD_DIR=${_LIBDBI_DRIVERS_UDIR}/lib/dbd \
${_REPOS_UDIR}
${_CMAKE_MAKE_PROGRAM} install
qpopd
commit 8c75a428bed23dd1b51ffa7612ef075bf8377199
Author: Rob Gowin <robgowin at gmail.com>
Date: Mon Nov 30 10:04:19 2015 -0600
Oops. Got the path to perl wrong on cmake build
diff --git a/install-impl.sh b/install-impl.sh
index 4a37856..a0e7ebb 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1345,7 +1345,7 @@ function inst_gnucash_using_cmake() {
cmake -G "$CMAKE_GENERATOR" \
-D CMAKE_INSTALL_PREFIX=${_INSTALL_UDIR} \
-D CMAKE_PREFIX_PATH=${_GLOBAL_UDIR} \
- -D PERL_EXECUTABLE=${_MSYS_UDIR}/bin/perl \
+ -D PERL_EXECUTABLE=${_MSYS_UDIR}/1.0/bin/perl \
-D CMAKE_MAKE_PROGRAM=${_CMAKE_MAKE_PROGRAM} \
${_REPOS_UDIR}
${_CMAKE_MAKE_PROGRAM} install
commit 3648da5bac28ab370d996ff11a331de3115306c7
Author: RobGowin <robgowin at gmail.com>
Date: Sun Nov 29 20:19:45 2015 -0600
Add support for building Gnucash using CMake and Ninja, disabled by default.
This commit adds in infrastructure necessary for building GnuCash using
CMake and Ninja. It is disabled by default with WITH_CMAKE=no and
WITH_NINJA=no.
File changes:
defaults.sh:
* add separate build and install directories for CMake build
* add WITH_CMAKE and WITH_NINJA defaults, set to no.
* update CMake version to 3.3.2
* add URL and directory for ninja.
devrc.sh:
* add CMAKE_DIR to point to CMake install
* add NINJA_DIR to point to Ninja install
* add above to PATH
install-impl.sh
* CMake download uses HTTPS, so need --no-check-certificate on wget
* Change directory handling to reflect use of version 3 of Cmake
* add function to download and install ninja
* add function to build gnucash using CMake and, optionally, ninja.
install.sh
* if WITH_CMAKE=yes, add step to install cmake
* if also WITH_NINJA=yes, add step to install ninja
* IF WITH_CMAKE=yes, install gnucash using CMake. Use
MSYS Makefiles it not using ninja.
diff --git a/defaults.sh b/defaults.sh
index 5c927ae..dfd7edf 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -48,10 +48,14 @@ else
fi
set_default BUILD_DIR $GNUCASH_DIR\\build
set_default INSTALL_DIR $GNUCASH_DIR\\inst
+set_default INSTALL_DIR_CMAKE $GNUCASH_DIR\\inst-cmake
set_default DIST_DIR $GNUCASH_DIR\\dist
set_default WITH_CUTECASH no
+set_default WITH_CMAKE no
+set_default WITH_NINJA no
set_default CUTECASH_BUILD_DIR $GNUCASH_DIR\\build-cutecash
+set_default GNUCASH_CMAKE_BUILD_DIR $GNUCASH_DIR\\build-cmake
####
@@ -368,9 +372,12 @@ set_default LIBDBI_DRIVERS_URL "$SF_MIRROR/libdbi-drivers/libdbi-drivers-0.8.3-1
set_default LIBDBI_DRIVERS_DIR $GLOBAL_DIR\\libdbi-drivers
set_default LIBDBI_DRIVERS_PATCH `pwd`/libdbi-drivers-errno.patch
-set_default CMAKE_URL "http://www.cmake.org/files/v2.8/cmake-2.8.0-win32-x86.zip"
+set_default CMAKE_URL "https://cmake.org/files/v3.3/cmake-3.3.2-win32-x86.zip"
set_default CMAKE_DIR $GLOBAL_DIR\\cmake
+set_default NINJA_URL "http://github.com/ninja-build/ninja/releases/download/v1.6.0/ninja-win.zip"
+set_default NINJA_DIR $GLOBAL_DIR\\ninja
+
set_default DOCBOOK_XSL_URL "$SF_MIRROR/docbook/docbook-xsl-1.76.1.zip"
set_default DOCBOOK_DTD_URL "http://www.oasis-open.org/docbook/xml/4.1.2/docbkx412.zip"
if [ "$REPOS_TYPE" = "git" ]; then
diff --git a/devrc.sh b/devrc.sh
index 73468d5..b1bdcda 100644
--- a/devrc.sh
+++ b/devrc.sh
@@ -28,6 +28,7 @@ export OLDPATH=$PATH
GLOBAL_UDIR="/c/gcdev"
AQBANKING_UDIR=$GLOBAL_UDIR/aqbanking
+CMAKE_UDIR=$GLOBAL_UDIR/cmake
GWENHYWFAR_UDIR=$GLOBAL_UDIR/gwenhywfar
ENCHANT_UDIR=$GLOBAL_UDIR/enchant
GNOME_UDIR=$GLOBAL_UDIR/gnome
@@ -41,6 +42,7 @@ LIBOFX_UDIR=$GLOBAL_UDIR/libofx
LIBSOUP_UDIR=$GLOBAL_UDIR/libsoup
LIBXSLT_UDIR=$GLOBAL_UDIR/libxslt
MYSQL_UDIR=$GLOBAL_UDIR/mysql
+NINJA_UDIR=$GLOBAL_UDIR/ninja
OPENSP_UDIR=$GLOBAL_UDIR/opensp
PCRE_UDIR=$GLOBAL_UDIR/pcre
PGSQL_UDIR=$GLOBAL_UDIR/pgsql
@@ -50,7 +52,7 @@ SWIG_UDIR=$GLOBAL_UDIR/swig
WEBKIT_UDIR=$GLOBAL_UDIR/webkit
BOOST_UDIR=$GLOBAL_UDIR/boost
-PATH=$AQBANKING_UDIR/bin:$GWENHYWFAR_UDIR/bin:$ENCHANT_UDIR/bin:$GNOME_UDIR/bin:$GNUCASH_UDIR/bin:$GNUCASH_UDIR/lib:$GNUTLS_UDIR/bin:$GOFFICE_UDIR/bin:$GUILE_UDIR/bin:$LIBDBI_UDIR/bin:$LIBGSF_UDIR/bin:$LIBOFX_UDIR/bin:$LIBSOUP_UDIR/bin:$LIBXSLT_UDIR/bin:$MYSQL_UDIR/bin:$MYSQL_UDIR/lib:$OPENSP_UDIR/bin:$PCRE_UDIR/bin:$PGSQL_UDIR/bin:$PGSQL_UDIR/lib:$REGEX_UDIR/bin:$SQLITE3_UDIR/bin:$SWIG_UDIR:$WEBKIT_UDIR/bin:$BOOST_UDIR/lib
+PATH=$AQBANKING_UDIR/bin:$CMAKE_UDIR/bin:$GWENHYWFAR_UDIR/bin:$ENCHANT_UDIR/bin:$GNOME_UDIR/bin:$GNUCASH_UDIR/bin:$GNUCASH_UDIR/lib:$GNUTLS_UDIR/bin:$GOFFICE_UDIR/bin:$GUILE_UDIR/bin:$LIBDBI_UDIR/bin:$LIBGSF_UDIR/bin:$LIBOFX_UDIR/bin:$LIBSOUP_UDIR/bin:$LIBXSLT_UDIR/bin:$MYSQL_UDIR/bin:$MYSQL_UDIR/lib:$NINJA_UDIR:$OPENSP_UDIR/bin:$PCRE_UDIR/bin:$PGSQL_UDIR/bin:$PGSQL_UDIR/lib:$REGEX_UDIR/bin:$SQLITE3_UDIR/bin:$SWIG_UDIR:$WEBKIT_UDIR/bin:$BOOST_UDIR/lib
PATH=$PATH:$OLDPATH
diff --git a/install-impl.sh b/install-impl.sh
index e61266b..4a37856 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -95,16 +95,33 @@ function inst_cmake() {
then
echo "cmake already installed in $_CMAKE_UDIR. skipping."
else
+ WGET_EXTRA_OPTIONS="--no-check-certificate"
wget_unpacked $CMAKE_URL $DOWNLOAD_DIR $CMAKE_DIR
-
- assert_one_dir ${_CMAKE_UDIR}/cmake-2*
- mv ${_CMAKE_UDIR}/cmake-2*/* ${_CMAKE_UDIR}
- rm -rf ${_CMAKE_UDIR}/cmake-2*
+ unset WGET_EXTRA_OPTIONS
+ assert_one_dir ${_CMAKE_UDIR}/cmake-3*
+ mv ${_CMAKE_UDIR}/cmake-3*/* ${_CMAKE_UDIR}
+ rm -rf ${_CMAKE_UDIR}/cmake-3*
[ -f ${_CMAKE_UDIR}/bin/cmake.exe ] || die "cmake not installed correctly"
fi
}
+function inst_ninja() {
+ setup Ninja
+ _NINJA_UDIR=`unix_path ${NINJA_DIR}`
+ add_to_env ${_NINJA_UDIR} PATH
+ if [ -f ${_NINJA_UDIR}/ninja.exe ]
+ then
+ echo "ninja already install in $_NINJA_UDIR. skipping."
+ else
+ WGET_EXTRA_OPTIONS="--no-check-certificate -O $TMP_DIR\\$(basename $NINJA_URL)"
+ wget_unpacked $NINJA_URL $DOWNLOAD_DIR $NINJA_DIR
+ unset WGET_EXTRA_OPTIONS
+
+ [ -f ${_NINJA_UDIR}/ninja.exe ] || die "ninja not installed correctly"
+ fi
+}
+
function inst_exetype() {
setup exetype
_EXETYPE_UDIR=`unix_path $EXETYPE_DIR`
@@ -1302,6 +1319,39 @@ function inst_cutecash() {
qpopd
}
+function inst_gnucash_using_cmake() {
+ setup "Gnucash (using cmake)"
+ _INSTALL_UDIR=`unix_path $INSTALL_DIR_CMAKE`
+ _BUILD_UDIR=`unix_path $GNUCASH_CMAKE_BUILD_DIR`
+ _GLOBAL_UDIR=`unix_path $GLOBAL_DIR`
+ _REPOS_UDIR=`unix_path $REPOS_DIR`
+ _NINJA_UDIR=`unix_path $NINJA_DIR`
+ _MSYS_UDIR=`unix_path $MSYS_DIR`
+
+ mkdir -p $_BUILD_UDIR
+ add_to_env $_INSTALL_UDIR/bin PATH
+
+ if [ "$BUILD_FROM_TARBALL" != "yes" ]; then
+ qpushd $REPOS_DIR
+ $GIT_CMD checkout $GNUCASH_SCM_REV
+ qpopd
+ fi
+
+ _CMAKE_MAKE_PROGRAM=$_MSYS_UDIR/bin/make
+ if [ "$CMAKE_GENERATOR" = "Ninja" ]; then
+ _CMAKE_MAKE_PROGRAM=$_NINJA_UDIR/ninja.exe
+ fi
+ qpushd $_BUILD_UDIR
+ cmake -G "$CMAKE_GENERATOR" \
+ -D CMAKE_INSTALL_PREFIX=${_INSTALL_UDIR} \
+ -D CMAKE_PREFIX_PATH=${_GLOBAL_UDIR} \
+ -D PERL_EXECUTABLE=${_MSYS_UDIR}/bin/perl \
+ -D CMAKE_MAKE_PROGRAM=${_CMAKE_MAKE_PROGRAM} \
+ ${_REPOS_UDIR}
+ ${_CMAKE_MAKE_PROGRAM} install
+ qpopd
+}
+
function inst_gnucash() {
setup GnuCash
_INSTALL_WFSDIR=`win_fs_path $INSTALL_DIR`
diff --git a/install.sh b/install.sh
index 0208432..354c2ac 100644
--- a/install.sh
+++ b/install.sh
@@ -107,7 +107,19 @@ if [ "$WITH_CUTECASH" = "yes" ]; then
add_step inst_cmake
add_step inst_cutecash
fi
-add_step inst_gnucash
+
+if [ "$WITH_CMAKE" = "yes" ]; then
+ add_step inst_cmake
+ CMAKE_GENERATOR="MSYS Makefiles"
+ if [ "$WITH_NINJA" = "yes" ]; then
+ add_step inst_ninja
+ CMAKE_GENERATOR="Ninja"
+ fi
+ add_step inst_gnucash_using_cmake
+else
+ add_step inst_gnucash
+fi
+
if [ "$CROSS_COMPILE" != "yes" ]; then
add_step inst_inno
fi
commit 7746c346fd55cc3144f652a8c25c8c13f6029c4a
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Sep 24 14:13:49 2015 -0700
Bug 724721 - Win32: use cpan instead of ppm to get finance-quote
Plus related cleanup.
diff --git a/extra_dist/install-fq-mods.cmd b/extra_dist/install-fq-mods.cmd
index da44975..f7ce2c0 100644
--- a/extra_dist/install-fq-mods.cmd
+++ b/extra_dist/install-fq-mods.cmd
@@ -69,16 +69,16 @@ set _perlminor=%errorlevel%
if %_perlmajor% equ 5 (
if %_perlminor% geq 10 (
set _perlversion=5.10
- goto pchk
+ goto install
)
if %_perlminor% equ 8 (
set _perlversion=5.8
- goto pchk
+ goto install
)
REM Note: GnuCash no longer "officially" supports perl 5.6, but as long as it works it will be allowed...
if %_perlminor% equ 6 (
set _perlversion=5.6
- goto pchk
+ goto install
)
)
echo.
@@ -98,38 +98,14 @@ REM perl -w gnc-path-check
REM if %errorlevel% neq 0 goto error
REM ----------------------------------------------------------------------------
-echo.
-echo * Determine which Perl flavour we have found
-echo.
-perl -e "use Win32;if(defined &Win32::BuildNumber){exit 2;}else{exit 3;};"
-REM echo status = %errorlevel%
-if %errorlevel% equ 2 (
- echo - ActivePerl
- goto inst_mod_as
-) else if %errorlevel% equ 3 (
- echo - Other, probably Strawberry perl ?
- goto inst_mod_oth
-) else if %errorlevel% neq 0 goto error
-
-REM ----------------------------------------------------------------------------
-:inst_mod_oth
+:install
echo.
echo * Install required perl modules
echo.
perl -w gnc-fq-update
if %errorlevel% neq 0 goto error
-goto fqchk
-
-REM ----------------------------------------------------------------------------
-:inst_mod_as
-echo.
-echo * Install Finance-Quote
-echo.
-perl -x -S ppm install Finance-Quote
-if %errorlevel% neq 0 goto error
REM ----------------------------------------------------------------------------
-:fqchk
echo.
echo * Run gnc-fq-check
echo.
commit ba67ee5df03d7de3abfce02632267a9e259886f3
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Sep 27 13:27:32 2015 -0700
Don't try to distribute Boost libs on 2.6.
diff --git a/dist-impl.sh b/dist-impl.sh
index 9f3fd3f..f37d324 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -86,9 +86,16 @@ function dist_aqbanking() {
}
function dist_boost() {
- setup Boost
- cp -a ${_BOOST_UDIR}/lib/libboost_chrono.dll ${_DIST_UDIR}/bin
- cp -a ${_BOOST_UDIR}/lib/libboost_date_time.dll ${_DIST_UDIR}/bin
+ setup Boost
+ get_major_minor "$GNUCASH_SCM_REV"
+ if [ "$GNUCASH_SCM_REV" != "master" ] &&
+ (( $major_minor <= 206 )); then
+ echo "Skipping. Boost is only needed for the master branch or future 2.7.x and up versions of gnucash."
+ return
+ fi
+
+ cp -a ${_BOOST_UDIR}/lib/libboost_chrono.dll ${_DIST_UDIR}/bin
+ cp -a ${_BOOST_UDIR}/lib/libboost_date_time.dll ${_DIST_UDIR}/bin
}
function dist_gnome() {
commit b710b30b0c717c3846c1fb912c4c2d5469231add
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Jul 27 19:51:28 2015 +0000
Put the boost libs in the right place.
diff --git a/dist-impl.sh b/dist-impl.sh
index 4eab6b5..9f3fd3f 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -87,8 +87,8 @@ function dist_aqbanking() {
function dist_boost() {
setup Boost
- cp -a ${_BOOST_UDIR}/lib/libboost_chrono.dll ${_DIST_UDIR}/lib
- cp -a ${_BOOST_UDIR}/lib/libboost_date_time.dll ${_DIST_UDIR}/lib
+ cp -a ${_BOOST_UDIR}/lib/libboost_chrono.dll ${_DIST_UDIR}/bin
+ cp -a ${_BOOST_UDIR}/lib/libboost_date_time.dll ${_DIST_UDIR}/bin
}
function dist_gnome() {
commit b5b5568b6317f3e8536795f6c82e2589c2d7a13e
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Jul 20 12:13:20 2015 -0700
Add boost to dist and gnucash-launcher.
diff --git a/dist-impl.sh b/dist-impl.sh
index ccf7ea2..4eab6b5 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -14,6 +14,7 @@ function dist_prepare() {
_WIN_UDIR=`unix_path $WINDIR`
_EXETYPE_UDIR=`unix_path $EXETYPE_DIR`
_GNOME_UDIR=`unix_path $GNOME_DIR`
+ _BOOST_UDIR=`unix_path $BOOST_DIR`
_PCRE_UDIR=`unix_path $PCRE_DIR`
_LIBSOUP_UDIR=`unix_path $LIBSOUP_DIR`
_ENCHANT_UDIR=`unix_path $ENCHANT_DIR`
@@ -84,6 +85,12 @@ function dist_aqbanking() {
cp -a ${_AQBANKING_UDIR}/share/locale ${_DIST_UDIR}/share
}
+function dist_boost() {
+ setup Boost
+ cp -a ${_BOOST_UDIR}/lib/libboost_chrono.dll ${_DIST_UDIR}/lib
+ cp -a ${_BOOST_UDIR}/lib/libboost_date_time.dll ${_DIST_UDIR}/lib
+}
+
function dist_gnome() {
setup Gnome platform
wget_unpacked $CAIRO_URL $DOWNLOAD_DIR $DIST_DIR
diff --git a/dist.sh b/dist.sh
index f2576df..d440f00 100755
--- a/dist.sh
+++ b/dist.sh
@@ -38,6 +38,7 @@ add_step dist_ktoblzcheck
add_step dist_aqbanking
add_step dist_libdbi
add_step dist_webkit
+add_step dist_boost
add_step dist_gnucash
add_step dist_finish
diff --git a/install-impl.sh b/install-impl.sh
index 95b6262..e61266b 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1416,6 +1416,7 @@ setlocal
set PATH=$INSTALL_DIR\\bin;%PATH%
set PATH=$INSTALL_DIR\\lib;%PATH%
set PATH=$INSTALL_DIR\\lib\\gnucash;%PATH%
+set PATH=$BOOST_DIR\\lib;%PATH%
set PATH=$GNUTLS_DIR\\bin;%PATH%
set PATH=$MINGW_DIR\\bin;%PATH%
set PATH=$GOFFICE_DIR\\bin;%PATH%
commit ae8a391a89edcb78b7cfc44e1adb4ca7be10de16
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri May 22 15:49:49 2015 +0200
Fix filename references after Frank's global rename of scm to vcs
diff --git a/buildserver/build_package.sh b/buildserver/build_package.sh
index 9054f7d..2a0718c 100644
--- a/buildserver/build_package.sh
+++ b/buildserver/build_package.sh
@@ -84,7 +84,7 @@ $_GC_WIN_REPOS_UDIR/dist.sh 2>&1 | tee -a ${LOGFILE}
_BUILD_UDIR=`unix_path $BUILD_DIR`
_GNUCASH_UDIR=`unix_path $GNUCASH_DIR`
PKG_VERSION=`grep PACKAGE_VERSION ${_BUILD_UDIR}/config.h | cut -d" " -f3 | cut -d\" -f2 `
-REVISION=`grep GNUCASH_SCM_REV ${_BUILD_UDIR}/src/core-utils/gnc-scm-info.h | cut -d" " -f3 | cut -d\" -f2 `
+REVISION=`grep GNUCASH_SCM_REV ${_BUILD_UDIR}/src/core-utils/gnc-vcs-info.h | cut -d" " -f3 | cut -d\" -f2 `
if [ "$BUILD_FROM_TARBALL" = "no" ]; then
SETUP_FILENAME="gnucash-${PKG_VERSION}-$(date +'%Y-%m-%d')-git-${REVISION}-setup.exe"
diff --git a/dist-impl.sh b/dist-impl.sh
index f762c88..ccf7ea2 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -278,7 +278,7 @@ function dist_finish() {
if [ "$BUILD_FROM_TARBALL" = "no" ]; then
# And changing output filename
PKG_VERSION=`grep PACKAGE_VERSION ${_BUILD_UDIR}/config.h | cut -d" " -f3 | cut -d\" -f2 `
- REVISION=`grep GNUCASH_SCM_REV ${_BUILD_UDIR}/src/core-utils/gnc-scm-info.h | cut -d" " -f3 | cut -d\" -f2 `
+ REVISION=`grep GNUCASH_SCM_REV ${_BUILD_UDIR}/src/core-utils/gnc-vcs-info.h | cut -d" " -f3 | cut -d\" -f2 `
SETUP_FILENAME="gnucash-${PKG_VERSION}-$(date +'%Y-%m-%d')-${REPOS_TYPE}-${REVISION}-setup.exe"
qpushd ${_GNUCASH_UDIR}
mv gnucash-${PKG_VERSION}-setup.exe ${SETUP_FILENAME}
commit 235204759e0bbbdc1f3abd0868fe3f69904c849e
Merge: fbd785f 164c992
Author: John Ralls <jralls at ceridwen.us>
Date: Fri May 22 06:35:21 2015 -0700
Merge branch 'gwen_fix_stdcall' from PR 5.
commit 164c992eccb036210163d941541999770146b1cc
Author: Holger Brunn <hbrunn at therp.nl>
Date: Thu May 7 22:52:57 2015 +0200
[FIX] segfault when using HBCI with keyfile
diff --git a/gwen-4.13.1.patch b/gwen-4.13.1.patch
index b31e211..03ee295 100644
--- a/gwen-4.13.1.patch
+++ b/gwen-4.13.1.patch
@@ -63,3 +63,69 @@
#include <unistd.h>
+--- a/src/crypt3/cryptkey_be.h 2014-10-12 15:12:22 +0200
++++ b/src/crypt3/cryptkey_be.h 2015-05-07 20:51:40 +0200
+@@ -18,22 +18,22 @@
+
+
+
+-typedef int (*GWEN_CRYPT_KEY_SIGN_FN)(GWEN_CRYPT_KEY *k,
++typedef GWENHYWFAR_CB int (*GWEN_CRYPT_KEY_SIGN_FN)(GWEN_CRYPT_KEY *k,
+ const uint8_t *pInData,
+ uint32_t inLen,
+ uint8_t *pSignatureData,
+ uint32_t *pSignatureLen);
+-typedef int (*GWEN_CRYPT_KEY_VERIFY_FN)(GWEN_CRYPT_KEY *k,
++typedef GWENHYWFAR_CB int (*GWEN_CRYPT_KEY_VERIFY_FN)(GWEN_CRYPT_KEY *k,
+ const uint8_t *pInData,
+ uint32_t inLen,
+ const uint8_t *pSignatureData,
+ uint32_t signatureLen);
+-typedef int (*GWEN_CRYPT_KEY_ENCIPHER_FN)(GWEN_CRYPT_KEY *k,
++typedef GWENHYWFAR_CB int (*GWEN_CRYPT_KEY_ENCIPHER_FN)(GWEN_CRYPT_KEY *k,
+ const uint8_t *pInData,
+ uint32_t inLen,
+ uint8_t *pOutData,
+ uint32_t *pOutLen);
+-typedef int (*GWEN_CRYPT_KEY_DECIPHER_FN)(GWEN_CRYPT_KEY *k,
++typedef GWENHYWFAR_CB int (*GWEN_CRYPT_KEY_DECIPHER_FN)(GWEN_CRYPT_KEY *k,
+ const uint8_t *pInData,
+ uint32_t inLen,
+ uint8_t *pOutData,
+--- a/src/crypt3/cryptkeysym.c 2014-10-12 15:12:22 +0200
++++ b/src/crypt3/cryptkeysym.c 2015-05-07 20:51:04 +0200
+@@ -29,7 +29,7 @@
+
+
+
+-int GWEN_Crypt_KeySym_Encipher(GWEN_CRYPT_KEY *k,
++GWENHYWFAR_CB int GWEN_Crypt_KeySym_Encipher(GWEN_CRYPT_KEY *k,
+ const uint8_t *pInData,
+ uint32_t inLen,
+ uint8_t *pOutData,
+@@ -53,7 +53,7 @@
+
+
+
+-int GWEN_Crypt_KeySym_Decipher(GWEN_CRYPT_KEY *k,
++GWENHYWFAR_CB int GWEN_Crypt_KeySym_Decipher(GWEN_CRYPT_KEY *k,
+ const uint8_t *pInData,
+ uint32_t inLen,
+ uint8_t *pOutData,
+--- a/src/crypt3/cryptkeysym_p.h 2014-10-12 15:12:22 +0200
++++ b/src/crypt3/cryptkeysym_p.h 2015-05-07 20:50:41 +0200
+@@ -29,12 +29,12 @@
+
+ static GWENHYWFAR_CB void GWEN_Crypt_KeySym_freeData(void *bp, void *p);
+
+-static int GWEN_Crypt_KeySym_Encipher(GWEN_CRYPT_KEY *k,
++static GWENHYWFAR_CB int GWEN_Crypt_KeySym_Encipher(GWEN_CRYPT_KEY *k,
+ const uint8_t *pInData,
+ uint32_t inLen,
+ uint8_t *pOutData,
+ uint32_t *pOutLen);
+-static int GWEN_Crypt_KeySym_Decipher(GWEN_CRYPT_KEY *k,
++static GWENHYWFAR_CB int GWEN_Crypt_KeySym_Decipher(GWEN_CRYPT_KEY *k,
+ const uint8_t *pInData,
+ uint32_t inLen,
+ uint8_t *pOutData,
commit fbd785fb0a4f582d93ca4ff41863d78163575518
Author: John Ralls <jralls at ceridwen.us>
Date: Thu May 7 06:59:10 2015 -0700
Revert changes to custom.sh.sample in 82da9e34a7.
Inadvertently made when committing from gcdev-maint on the build VM.
diff --git a/custom.sh.sample b/custom.sh.sample
index 8bf996b..d78fc8f 100644
--- a/custom.sh.sample
+++ b/custom.sh.sample
@@ -1,19 +1,20 @@
#! /bin/bash
-"
-GLOBAL_DIR=c:\\gcdev-maint
-MINGW_DIR=c:\\gcdev-maint\\mingw
-MSYS_DIR=c:\\gcdev-maint\\mingw\\msys\\1.0
-TMP_DIR=c:\\gcdev-maint\\tmp
-DOWNLOAD_DIR=c:\\gcdev\\downloads
-GIT_DIR=c:\\gcdev\\git-1.9.4
-REPOS_TYPE=git
-GC_WIN_REPOS_URL=git://github.com/Gnucash/gnucash-on-windows.git
-GC_WIN_REPOS_DIR=c:\\gcdev-maint\\gnucash-on-windows.git
-REPOS_URL=git://github.com/Gnucash/gnucash.git
-REPOS_DIR=c:\\gcdev-maint\\gnucash.git
-GNUCASH_SCM_REV=maint
-
-HH_DIR=c:\\soft\\hh
-
-# Don't save the profile settings
-NO_SAVE_PROFILE=yes
\ No newline at end of file
+# This is an example custom.sh file. Copy this file to custom.sh and
+# edit it.
+#
+# Note: All directories must be without spaces!
+#
+# REPOS_URL="git at github.com:Gnucash/gnucash.git"
+# SF_MIRROR="http://switch.dl.sourceforge.net/sourceforge"
+# DISABLE_OPTIMIZATIONS=yes
+# GLOBAL_DIR=Z:\\mydir # all directories will use this
+# WGET_RATE=50k #limit download bandwith to 50KB/s
+# NO_SAVE_PROFILE=yes # don't save env settings to /etc/profile.d
+# late_eval 'INSTALL_DIR=$GNUCASH_DIR\\myinst' # no need to define GNUCASH_DIR
+# block_step inst_docs
+# late_eval 'add_step greetings'
+# function greetings() { setup Greetings; }
+# QTDIR=c:\\Qt\\4.2.3
+# CROSS_COMPILE=yes
+#Uncomment this for building on Win7 (and maybe Vista):
+#EXTRA_CFLAGS="-fno-builtin-dgettext -fno-builtin-towupper -fno-builtin-iswlower"
commit cf72c11e94df3ce812f8c6a95c5b812c246d2152
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed May 6 19:16:25 2015 +0200
Update mingw-get catalogs on each run
Without it existing installations won't find new/updated mingw-get packages
diff --git a/install-impl.sh b/install-impl.sh
index 8dc5947..95b6262 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -60,7 +60,7 @@ function inst_msys() {
# The bootstrap script already set some of this up
# It will be set up again here to catch version updates of any of these packages
- #mingw-get update
+ mingw-get update
mingw-get upgrade mingw-get
# Note: msys-base can't be upgraded by this script
commit ce5f39c3d0d7c61106f37e7a75fd7bf4ca33f633
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed May 6 17:05:47 2015 +0200
Remove some commented out setup steps
They were leftovers from before the migration to mingw-get
and haven't been missed since.
diff --git a/install-impl.sh b/install-impl.sh
index 358b5dd..8dc5947 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -190,14 +190,7 @@ function inst_mingw() {
if [ "$CROSS_COMPILE" != "yes" ]; then
mingw_smart_get mingw32-pexports ${MINGW_PEXPORTS_VERSION}
- # Some additional steps, only for native (non-cross-compile)
- #cp ${_MINGW_UDIR}/bin/libpthread-2.dll ${_MINGW_UDIR}/bin/pthreadGC2.dll
- echo "Skipping lpthread copying for now, let's see if this is still needed..."
- #mingw_smart_get mingw32-make ${MINGW_MAKE_VERSION}
- echo "Skipping mingw32-make installation for now, let's see if this is still needed..."
quiet which pexports || die "mingw-utils not installed correctly (pexports)"
- # FIXME which library uses reimp ?
- # quiet which reimp || die "mingw-utils not installed correctly (reimp)"
# Hack to make Gnome's pkg-config happy (without having to rebuild it)
cp "${_MINGW_UDIR}"/bin/libintl*.dll "${_MINGW_UDIR}/bin/intl.dll"
else
commit fceb5ccfbab3c0e99a03777829149ec5eb268331
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed May 6 16:43:04 2015 +0200
Move boost requirement in inst_boost instead of during step addition
During the step addition phase perl is not installed yet.
However perl is required to check the gnucash version being
built and hence also to check whether boost is needed or not.
diff --git a/install-impl.sh b/install-impl.sh
index 8ae9798..358b5dd 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1245,6 +1245,13 @@ function inst_hh() {
function inst_boost() {
setup Boost
+ get_major_minor "$GNUCASH_SCM_REV"
+ if [ "$GNUCASH_SCM_REV" != "master" ] &&
+ (( $major_minor <= 206 )); then
+ echo "Skipping. Boost is only needed for the master branch or future 2.7.x and up versions of gnucash."
+ return
+ fi
+
_BOOST_UDIR=`unix_path ${BOOST_DIR}`
set_env ${_BOOST_UDIR} BOOST_ROOT
add_to_env ${_BOOST_UDIR}/lib PATH
diff --git a/install.sh b/install.sh
index 8aff08b..0208432 100644
--- a/install.sh
+++ b/install.sh
@@ -100,11 +100,7 @@ add_step inst_libsoup
add_step inst_enchant
add_step inst_webkit
#boost now needed for C++ on master only
-get_major_minor "$GNUCASH_SCM_REV"
-if [ "$GNUCASH_SCM_REV" = "master" ] ||
- (( $major_minor > 206 )); then
- add_step inst_boost
-fi
+add_step inst_boost
##
if [ "$WITH_CUTECASH" = "yes" ]; then
commit 90df81e96fa76635b977427cf3c8368f920bd281
Author: John Ralls <jralls at ceridwen.us>
Date: Wed May 6 06:43:48 2015 -0700
Revert "Add as a first step to install either Strawberry Perl or ActivePerl."
This reverts commit e5430701af83bf1cf82d21702454c5bb832abc97.
diff --git a/README b/README
index e369565..4a34f92 100644
--- a/README
+++ b/README
@@ -51,15 +51,11 @@ The steps
On to building GnuCash now. The scripts have been set up to require as little
manual actions as possible. The following should get you going:
-a. Download and install either Strawberry Perl
- (http://strawberryperl.com/) or AcivePerl
- (http://www.activestate.com/activeperl/downloads).
-
-b. Download bootstrap_win_dev.vbs from the gnucash-on-windows
+a. Download bootstrap_win_dev.vbs from the gnucash-on-windows
repository on Github. Direct url:
https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/bootstrap_win_dev.vbs
-c. Run this script by double-clicking it and follow the instructions.
+b. Run this script by double-clicking it and follow the instructions.
If the script's output window closes before you get to a "Happy hacking"
message then something went wrong. To figure out what you can instead
open a Windows command prompt (cmd.exe) and run the script as
@@ -91,7 +87,7 @@ The default values will all be found in 'defaults.sh'. You can
override any of these in 'custom.sh'. The boostrap script you ran in
step b. already created an initial version of this file.
-d. Open an Msys shell window. You do this by running
+c. Open an Msys shell window. You do this by running
c:\gcdev\mingw\msys\1.0\msys.bat
Unless you chose to install mingw/msys in another directory of course.
Let the automated build begin by:
@@ -102,7 +98,7 @@ d. Open an Msys shell window. You do this by running
If you chose to set up the build environment in a different location adjust
the path accordingly.
-e. To generate a self-installing setup.exe file that contains *everything* run
+d. To generate a self-installing setup.exe file that contains *everything* run
the following command after install.sh has completed:
./dist.sh
commit e32702240160f44bb0833995a59b7b050d30387f
Author: John Ralls <jralls at ceridwen.us>
Date: Tue May 5 15:53:40 2015 -0700
Reflow paragraphs with lines > 80 characters long.
diff --git a/README b/README
index 3bc2925..e369565 100644
--- a/README
+++ b/README
@@ -79,16 +79,17 @@ Note: if you intend to use the buildserver scripts (see separate directory)
there are some restrictions to the paths you can/should alter.
For more detail please check README.txt in the buildserver directory.
-You are now ready to build gnucash for the first time. The build is fully parameterized.
-That means which versions of libraries and tools to install, where to install them,
-which branch to build and so on can all be defined. If not set explicitly some default
-values will be used. If you're already familiar with the Windows build you may want to
-customize some of these parameters. If not sure - don't. The build should run just fine
-without it.
-
-The default values will all be found in 'defaults.sh'. You can override any of these
-in 'custom.sh'. The boostrap script you ran in step b. already created an initial
-version of this file.
+You are now ready to build gnucash for the first time. The build is
+fully parameterized. That means which versions of libraries and tools
+to install, where to install them, which branch to build and so on can
+all be defined. If not set explicitly some default values will be
+used. If you're already familiar with the Windows build you may want
+to customize some of these parameters. If not sure - don't. The build
+should run just fine without it.
+
+The default values will all be found in 'defaults.sh'. You can
+override any of these in 'custom.sh'. The boostrap script you ran in
+step b. already created an initial version of this file.
d. Open an Msys shell window. You do this by running
c:\gcdev\mingw\msys\1.0\msys.bat
@@ -146,14 +147,19 @@ scripts (2014-05-07).
Known Issues/Things to improve
------------------------------
-* It appears that installing html help on Windows systems more recent than
- Windows XP can fail. It looks like the installer triggers a Windows authorization
- dialog. For some reason this dialog can't be displayed when the installer is started
- from an msys shell.
+
+* It appears that installing html help on Windows systems more recent
+ than Windows XP can fail. It looks like the installer triggers a
+ Windows authorization dialog. For some reason this dialog can't be
+ displayed when the installer is started from an msys shell.
+
The workaround is a bit awkward currently and consists of
- 1. install html help directly by double-clicking it. Remember to install it where
- the gnucash build scripts expect it ! That is c:\gcdev\hh by default.
- 2. Inside your msys shell window enter these commands:
+
+ 1. install html help directly by double-clicking it. Remember to
+ install it where the gnucash build scripts expect it ! That is
+ c:\gcdev\hh by default.
+ 2. Inside your msys shell window enter
+ these commands:
pushd /c/gcdev/hh
_HHCTRL_OCX=$(which hhctrl.ocx || true)
@@ -165,7 +171,8 @@ Known Issues/Things to improve
popd
popd
- 3. You can now rerun install.sh which should get past the html help installation step
+ 3. You can now rerun install.sh which should get past the html help
+ installation step
(Reference: http://lists.gnucash.org/pipermail/gnucash-devel/2014-May/037561.html
and following messages)
@@ -177,8 +184,11 @@ Known Issues/Things to improve
64-bit integers.
To work around this you can add a line in custom.sh:
EXTRA_CFLAGS=" -D__USE_MINGW_ANSI_STDIO"
- The same list message mentioned a couple of additional flags to set but these were
- not explained. For completeness the complete line was:
+
+ The same list message mentioned a couple of additional flags to set
+ but these were not explained. For completeness the complete line
+ was:
+
EXTRA_CFLAGS=" -Wall -Werror -fno-builtin-dgettext -fno-builtin-towupper -fno-builtin-iswlower -ggdb3 -D__USE_MINGW_ANSI_STDIO"
Adjust as you see fit.
@@ -208,7 +218,7 @@ These steps need to be performed:
on your Linux installation.
(It is strongly recommended to choose a prefix different
from your normal compiler tool chain in order to distinguish
- your native vs. cross compiler more easily.)
+ your native vs. cross compiler more easily.)
2. Then run the script create_cross_mingw.sh - it will
download, compile, and install a mingw32 tool chain.
@@ -221,7 +231,7 @@ These steps need to be performed:
4. Call install.sh, which will read the directory settings from
defaults.sh/custom.sh. It should download, compile, and install everything
automatically. Eventually the windows gnucash is installed into
- $GNUCASH_DIR.
+ $GNUCASH_DIR.
5. The content of $GNUCASH_DIR (as well as all the other binary
packages) should then be copied to a windows machine. The paths
commit e5430701af83bf1cf82d21702454c5bb832abc97
Author: John Ralls <jralls at ceridwen.us>
Date: Tue May 5 15:53:12 2015 -0700
Add as a first step to install either Strawberry Perl or ActivePerl.
diff --git a/README b/README
index 71fb0ab..3bc2925 100644
--- a/README
+++ b/README
@@ -51,11 +51,15 @@ The steps
On to building GnuCash now. The scripts have been set up to require as little
manual actions as possible. The following should get you going:
-a. Download bootstrap_win_dev.vbs from the gnucash-on-windows
+a. Download and install either Strawberry Perl
+ (http://strawberryperl.com/) or AcivePerl
+ (http://www.activestate.com/activeperl/downloads).
+
+b. Download bootstrap_win_dev.vbs from the gnucash-on-windows
repository on Github. Direct url:
https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/bootstrap_win_dev.vbs
-b. Run this script by double-clicking it and follow the instructions.
+c. Run this script by double-clicking it and follow the instructions.
If the script's output window closes before you get to a "Happy hacking"
message then something went wrong. To figure out what you can instead
open a Windows command prompt (cmd.exe) and run the script as
@@ -86,7 +90,7 @@ The default values will all be found in 'defaults.sh'. You can override any of t
in 'custom.sh'. The boostrap script you ran in step b. already created an initial
version of this file.
-c. Open an Msys shell window. You do this by running
+d. Open an Msys shell window. You do this by running
c:\gcdev\mingw\msys\1.0\msys.bat
Unless you chose to install mingw/msys in another directory of course.
Let the automated build begin by:
@@ -97,7 +101,7 @@ c. Open an Msys shell window. You do this by running
If you chose to set up the build environment in a different location adjust
the path accordingly.
-d. To generate a self-installing setup.exe file that contains *everything* run
+e. To generate a self-installing setup.exe file that contains *everything* run
the following command after install.sh has completed:
./dist.sh
commit 8abd7ec1ea5583200a799d0e4d01dbcbec2ca711
Author: John Ralls <jralls at ceridwen.us>
Date: Tue May 5 14:00:43 2015 -0700
Point GLOBAL_DIR at the right directory.
Inadvertently changed when I pushed from gcdev-maint on the build VM.
diff --git a/bootstrap_win_dev.vbs b/bootstrap_win_dev.vbs
index f169e38..00feb3f 100644
--- a/bootstrap_win_dev.vbs
+++ b/bootstrap_win_dev.vbs
@@ -47,7 +47,7 @@ myRegExp.Pattern = "/"
If WScript.Arguments.Named.Exists("GLOBAL_DIR") Then
GLOBAL_DIR = myRegExp.Replace (WScript.Arguments.Named.Item("GLOBAL_DIR"), "\")
Else
- GLOBAL_DIR = "c:\gcdev-maint"
+ GLOBAL_DIR = "c:\gcdev"
End If
If WScript.Arguments.Named.Exists("MINGW_DIR") Then
MINGW_DIR = myRegExp.Replace (WScript.Arguments.Named.Item("MINGW_DIR"), "\")
commit 1b6bce59053cf114f8e60f962b452248d52d0811
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Fri Apr 3 17:05:31 2015 +0200
Add missing de.IconName_Theme to gnucash.iss
diff --git a/inno_setup/gnucash.iss b/inno_setup/gnucash.iss
index 4257862..a930438 100644
--- a/inno_setup/gnucash.iss
+++ b/inno_setup/gnucash.iss
@@ -458,6 +458,7 @@ de.IconName_FAQ=GnuCash Häufige Fragen (online, engl.)
de.IconName_Bugzilla=Fehlerbericht einsenden für GnuCash (online, engl.)
de.IconName_InstallFQ=Erweiterung um Wechselkurse mit GnuCash online abzurufen
de.IconComment_InstallFQ=Aktien- und Devisenkurse online abrufen (optionales Modul Finance-Quote: Achtung! Erfordert das Programm ActivePerl oder Strawberry Perl 5.8 oder neuer)
+de.IconName_Theme=GnuCash's Erscheinungsbild (GTK-Thema) auswählen
de.IconName_Uninstall=Deinstallieren von GnuCash
de.IconComment_Uninstall=Die OpenSource-Finanzverwaltung GnuCash wieder deinstallieren und vom Computer löschen
commit 82da9e34a7fcdb26266ceb15bb238c658c60334d
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Mar 30 09:56:04 2015 -0700
Update mingw-rt-dev to new version 3.21 and fix the problems it introduced.
Necessary because the previous version is disabled in mingw-get.
diff --git a/bootstrap_win_dev.vbs b/bootstrap_win_dev.vbs
index 00feb3f..f169e38 100644
--- a/bootstrap_win_dev.vbs
+++ b/bootstrap_win_dev.vbs
@@ -47,7 +47,7 @@ myRegExp.Pattern = "/"
If WScript.Arguments.Named.Exists("GLOBAL_DIR") Then
GLOBAL_DIR = myRegExp.Replace (WScript.Arguments.Named.Item("GLOBAL_DIR"), "\")
Else
- GLOBAL_DIR = "c:\gcdev"
+ GLOBAL_DIR = "c:\gcdev-maint"
End If
If WScript.Arguments.Named.Exists("MINGW_DIR") Then
MINGW_DIR = myRegExp.Replace (WScript.Arguments.Named.Item("MINGW_DIR"), "\")
diff --git a/custom.sh.sample b/custom.sh.sample
index d78fc8f..8bf996b 100644
--- a/custom.sh.sample
+++ b/custom.sh.sample
@@ -1,20 +1,19 @@
#! /bin/bash
-# This is an example custom.sh file. Copy this file to custom.sh and
-# edit it.
-#
-# Note: All directories must be without spaces!
-#
-# REPOS_URL="git at github.com:Gnucash/gnucash.git"
-# SF_MIRROR="http://switch.dl.sourceforge.net/sourceforge"
-# DISABLE_OPTIMIZATIONS=yes
-# GLOBAL_DIR=Z:\\mydir # all directories will use this
-# WGET_RATE=50k #limit download bandwith to 50KB/s
-# NO_SAVE_PROFILE=yes # don't save env settings to /etc/profile.d
-# late_eval 'INSTALL_DIR=$GNUCASH_DIR\\myinst' # no need to define GNUCASH_DIR
-# block_step inst_docs
-# late_eval 'add_step greetings'
-# function greetings() { setup Greetings; }
-# QTDIR=c:\\Qt\\4.2.3
-# CROSS_COMPILE=yes
-#Uncomment this for building on Win7 (and maybe Vista):
-#EXTRA_CFLAGS="-fno-builtin-dgettext -fno-builtin-towupper -fno-builtin-iswlower"
+"
+GLOBAL_DIR=c:\\gcdev-maint
+MINGW_DIR=c:\\gcdev-maint\\mingw
+MSYS_DIR=c:\\gcdev-maint\\mingw\\msys\\1.0
+TMP_DIR=c:\\gcdev-maint\\tmp
+DOWNLOAD_DIR=c:\\gcdev\\downloads
+GIT_DIR=c:\\gcdev\\git-1.9.4
+REPOS_TYPE=git
+GC_WIN_REPOS_URL=git://github.com/Gnucash/gnucash-on-windows.git
+GC_WIN_REPOS_DIR=c:\\gcdev-maint\\gnucash-on-windows.git
+REPOS_URL=git://github.com/Gnucash/gnucash.git
+REPOS_DIR=c:\\gcdev-maint\\gnucash.git
+GNUCASH_SCM_REV=maint
+
+HH_DIR=c:\\soft\\hh
+
+# Don't save the profile settings
+NO_SAVE_PROFILE=yes
\ No newline at end of file
diff --git a/defaults.sh b/defaults.sh
index 8667392..5c927ae 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -109,7 +109,7 @@ set_default MINGW_MPC_VERSION "1.0.1-2"
set_default MINGW_MPFR_VERSION "3.1.2-2"
set_default MINGW_PEXPORTS_VERSION "0.46"
set_default MINGW_PTHREAD_W32_VERSION "2.9.1-1"
-set_default MINGW_RT_VERSION "3.20-2"
+set_default MINGW_RT_VERSION "3.21"
set_default MINGW_ZLIB_VERSION "1.2.8-1"
set_default MINGW_W32API_VERSION "3.17-2"
set_default MINGW_MAKE_VERSION "3.82-5"
@@ -344,6 +344,7 @@ set_default LIBOFX_PATCH `pwd`/libofx-0.9.8.patch
GWENHYWFAR_VERSION="4.13.1"
set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=78&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
+set_default GWEN_PATCH `pwd`/gwen-4.13.1.patch
KTOBLZCHECK_VERSION="1.48"
set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-${KTOBLZCHECK_VERSION}.tar.gz"
diff --git a/functions.sh b/functions.sh
index a194f03..02c7b77 100644
--- a/functions.sh
+++ b/functions.sh
@@ -235,6 +235,8 @@ function mingw_smart_get () {
PACKAGE=$1
VERSION=$2
+ echo "Attempting to install $PACKAGE-$VERSION"
+
# Check if a sensible package name has been given
[ "$PACKAGE" ] || return
@@ -254,6 +256,7 @@ function mingw_smart_get () {
# different versions of the tool (or more precisely different
# configurations for the tool).
+ echo "Checking package status..."
COMPONENTS="$(mingw-get show "$PACKAGE" | awk '/Components:/')"
if [ -n "$COMPONENTS" ]
then
@@ -265,13 +268,15 @@ function mingw_smart_get () {
# This assumption may lead to a situation where manulal
# intervention is needed in case of errors during mingw-get calls
# Let's hope that such errors are the exception
+ echo "Found the package to have components."
COMPONENT="${COMPONENTS#Components: }"
COMPONENT="${COMPONENT%%,*}"
SUBPACKAGE="$PACKAGE-$COMPONENT"
else
+ echo "No components, proceding to check package status"
SUBPACKAGE="$PACKAGE"
fi
-
+ echo "Checking $SUBPACKAGE versions"
INSTVERSION="$(mingw-get show "$SUBPACKAGE" | awk '/Installed Version:/')"
INSTVERSION="${INSTVERSION#Installed Version: }"
REPOVERSION="$(mingw-get show "$SUBPACKAGE" | awk '/Repository Version:/')"
@@ -283,18 +288,22 @@ function mingw_smart_get () {
if [ -z "$INSTVERSION" ]
then
# Unknown package
+ echo "Package $PACKAGE is unknown by mingw."
die "Package $PACKAGE is unknown by mingw."
elif [ "$INSTVERSION" == "none" ]
then
# Package not yet installed
+ echo "installing $PACKAGE"
mingw-get install ${PACKAGE}
elif [ -n "$VERSION" ] && [ -z "$(echo "$INSTVERSION" | awk "/$VERSION/")" ]
then
# Requested version differs from installed version
+ echo "upgrading $PACKAGE from $INSTVERSION to $VERSION"
mingw-get upgrade ${PACKAGE}
elif [ -z "$VERSION" ] && [ "$INSTVERSION" != "$REPOVERSION" ]
then
# No version requested, but installed version differs from version in repo
+ echo "upgrading because installed doesn't match repo $PACKAGE"
mingw-get upgrade ${PACKAGE}
else
echo "Package $PACKAGE is up to date"
diff --git a/guile-1.8.patch b/guile-1.8.patch
index 3a2d8a6..a8d082d 100644
--- a/guile-1.8.patch
+++ b/guile-1.8.patch
@@ -24,3 +24,23 @@
srfidir = $(datadir)/guile/$(GUILE_EFFECTIVE_VERSION)/srfi
srfi_DATA = srfi-1.scm \
+--- a/libguile/pthread-threads.h 2010-12-13 09:24:40 -0800
++++ b/libguile/pthread-threads.h 2015-03-30 11:38:56 -0700
+@@ -24,10 +24,16 @@
+
+ /* The pthreads-threads implementation. This is a direct mapping.
+ */
++#if !defined(_TIMESPEC_DEFINED) && defined(__struct_timespec_defined)
++#define _TIMESPEC_DEFINED 1
++#endif
+
+ #include <pthread.h>
+ #include <sched.h>
+
++#if !defined(__struct_timespec_defined) && defined(_TIMESPEC_DEFINED)
++#define __struct_timespec_defined 1
++#endif
+ /* Threads
+ */
+ #define scm_i_pthread_t pthread_t
+
diff --git a/gwen-4.13.1.patch b/gwen-4.13.1.patch
new file mode 100644
index 0000000..b31e211
--- /dev/null
+++ b/gwen-4.13.1.patch
@@ -0,0 +1,65 @@
+--- a/src/sar/sar.c Wed Dec 31 05:29:02 2014
++++ b/src/sar/sar.c Sun Mar 29 18:40:06 2015
+@@ -614,7 +614,8 @@
+
+
+ int GWEN_Sar_AddAndDigestFileLink(GWEN_SAR *sr, const GWEN_SAR_FILEHEADER *fh, GWEN_MDIGEST *md) {
+-#if _BSD_SOURCE || _XOPEN_SOURCE >= 500 || (_XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED) || _POSIX_C_SOURCE >= 200112L || defined(OS_DARWIN)
++#if ((_BSD_SOURCE || _XOPEN_SOURCE >= 500 || (_XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED) || _POSIX_C_SOURCE >= 200112L) && !defined(__MINGW32__)) || defined(OS_DARWIN)
++
+ int rv;
+ const char *fname;
+ GWEN_BUFFER *hbuf;
+@@ -1352,7 +1353,7 @@
+
+
+ int GWEN_Sar_ExtractAndDigestFileLink(GWEN_SAR *sr, const GWEN_SAR_FILEHEADER *fh, int checkOnly) {
+-#if _BSD_SOURCE || _XOPEN_SOURCE >= 500 || (_XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED) || _POSIX_C_SOURCE >= 200112L || defined(OS_DARWIN)
++#if ((_BSD_SOURCE || _XOPEN_SOURCE >= 500 || (_XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED) || _POSIX_C_SOURCE >= 200112L) && !defined(__MINGW32__)) || defined(OS_DARWIN)
+ int rv;
+ const char *fname;
+ uint32_t perms;
+
+--- a/gui/testdialogs/dlg_test.c Sun Oct 12 06:12:22 2014
++++ b/gui/testdialogs/dlg_test.c Sun Mar 29 19:11:48 2015
+@@ -18,11 +18,6 @@
+ #include <gwenhywfar/pathmanager.h>
+
+
+-#ifdef OS_WIN32
+-# include <windows.h>
+-# define sleep(x) Sleep(x)
+-#endif
+-
+ #include <unistd.h>
+
+
+--- a/gui/testdialogs/dlg_test2.c Sun Oct 12 06:12:22 2014
++++ b/gui/testdialogs/dlg_test2.c Sun Mar 29 19:11:48 2015
+@@ -16,11 +16,6 @@
+ #include <gwenhywfar/pathmanager.h>
+
+
+-#ifdef OS_WIN32
+-# include <windows.h>
+-# define sleep(x) Sleep(x)
+-#endif
+-
+ #include <unistd.h>
+
+
+--- a/gui/gtk2/libtest.c Sun Oct 12 06:12:22 2014
++++ b/gui/gtk2/libtest.c Mon Mar 30 06:32:34 2015
+@@ -19,12 +19,6 @@
+ #include <gwenhywfar/dialog.h>
+ #include <gwenhywfar/debug.h>
+
+-
+-#ifdef OS_WIN32
+-# include <windows.h>
+-# define sleep(x) Sleep(x)
+-#endif
+-
+ #include <unistd.h>
+
+
diff --git a/install-impl.sh b/install-impl.sh
index 2bf866f..8ae9798 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -633,6 +633,10 @@ function inst_gwenhywfar() {
wget_unpacked $GWENHYWFAR_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/gwenhywfar-*
qpushd $TMP_UDIR/gwenhywfar-*
+
+ if [ -n "$GWEN_PATCH" -a -f "$GWEN_PATCH" ]; then
+ patch -p1 < $GWEN_PATCH
+ fi
# circumvent binreloc bug, http://trac.autopackage.org/ticket/28
# Note: gwenhywfar-3.x and higher don't use openssl anymore.
./configure ${HOST_XCOMPILE} \
diff --git a/libofx-0.9.8.patch b/libofx-0.9.8.patch
index d7c823e..7942b06 100644
--- a/libofx-0.9.8.patch
+++ b/libofx-0.9.8.patch
@@ -9,3 +9,26 @@
const char * inchar = (const char *)s_buffer.c_str();
#else
char * inchar = (char *)s_buffer.c_str();
+--- a/lib/win32.cpp Wed Mar 30 15:30:50 2011
++++ b/lib/win32.cpp Sun Mar 29 15:07:27 2015
+@@ -25,7 +25,7 @@
+
+
+
+-#ifdef OS_WIN32
++#if defined(OS_WIN32) && !defined(__MINGW32__)
+
+ int mkstemp(char *tmpl)
+ {
+
+--- a/lib/win32.hh Wed Mar 30 15:30:50 2011
++++ b/lib/win32.hh Sun Mar 29 16:26:58 2015
+@@ -21,7 +21,7 @@
+ #endif
+
+
+-#ifdef OS_WIN32
++#if defined(OS_WIN32) && !defined(__MINGW32__)
+
+ int mkstemp(char *tmpl);
+
commit 1e6c16d75f5cdd3e45d072985879fe4f0c58d527
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Mar 30 10:08:54 2015 -0700
Checkout GNUCASH_SCM_REV before building from git.
Otherwise it builds whatever was originally checked out, which may fail.
diff --git a/install-impl.sh b/install-impl.sh
index f211174..2bf866f 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1313,6 +1313,7 @@ function inst_gnucash() {
if [ "$BUILD_FROM_TARBALL" != "yes" ]; then
qpushd $REPOS_DIR
+ $GIT_CMD checkout $GNUCASH_SCM_REV
./autogen.sh
qpopd
fi
commit 97a596422770996957dfda4ab64500057c7908bb
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri Mar 27 17:44:07 2015 +0100
Update Remainder of the translations of the Windows Start menu options and the Installer
For those languages I didn't receive an update I have added 'GnuCash -'
in front of the Windows start menu item names.
diff --git a/inno_setup/gnucash.iss b/inno_setup/gnucash.iss
index 3cfd647..4257862 100644
--- a/inno_setup/gnucash.iss
+++ b/inno_setup/gnucash.iss
@@ -482,13 +482,13 @@ el.TranslFiles=ΑÏχεία μετάφÏασεων
el.TemplFiles=ΑÏχεία με Ï€Ïότυπα λογαÏιασμών
el.IconComment_GnuCash=GnuCash Ï€ÏόγÏαμμα διαχ. οικονομικών
-el.IconName_README=Εμφάνιση του README
+el.IconName_README=GnuCash - Εμφάνιση του README
el.IconComment_README=Εμφάνιση του αÏχείου README
el.IconFilename_README=README.win32-bin.txt
-el.IconName_FAQ=ΣυχνÎÏ‚ εÏωτήσεις (Online)
-el.IconName_Bugzilla=ΑναφοÏά σφάλματος (Online)
-el.IconName_InstallFQ=Εγκατάσταση λήψης τιμών (online)
-el.IconComment_InstallFQ=Εγκατάσταση του perl module Finance-Quote για λήψη τιμών online. Απαιτεί ActivePerl 5.8+
+el.IconName_FAQ=GnuCash - ΣυχνÎÏ‚ εÏωτήσεις (Online)
+el.IconName_Bugzilla=GnuCash - ΑναφοÏά σφάλματος (Online)
+el.IconName_InstallFQ=GnuCash - Εγκατάσταση λήψης τιμών (online)
+el.IconComment_InstallFQ=Εγκατάσταση του perl module Finance-Quote για λήψη τιμών online. Απαιτεί ActivePerl/Strawberry Perl 5.8+
el.IconName_Uninstall=Απεγκατάσταση GnuCash
el.IconComment_Uninstall=Απεγκατάσταση του διαχειÏιστή οικονομικών GnuCash
@@ -576,12 +576,12 @@ ja.TranslFiles=翻訳ファイル
ja.TemplFiles=勘定科目テンプレートファイル
ja.IconComment_GnuCash=GnuCash フリーã®è²¡å‹™ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢
-ja.IconName_README=READMEを表示
+ja.IconName_README=GnuCash - READMEを表示
ja.IconComment_README=READMEファイルを表示ã—ã¾ã™
ja.IconFilename_README=README.win32-bin.txt
-ja.IconName_FAQ=FAQ (オンライン)
-ja.IconName_Bugzilla=ãƒã‚°ã‚’å ±å‘Š (オンライン)
-ja.IconName_InstallFQ=ã‚ªãƒ³ãƒ©ã‚¤ãƒ³ç›¸å ´è¡¨å–得ツールをインストール
+ja.IconName_FAQ=GnuCash - FAQ (オンライン)
+ja.IconName_Bugzilla=GnuCash - ãƒã‚°ã‚’å ±å‘Š (オンライン)
+ja.IconName_InstallFQ=GnuCash - ã‚ªãƒ³ãƒ©ã‚¤ãƒ³ç›¸å ´è¡¨å–得ツールをインストール
ja.IconComment_InstallFQ=ã‚ªãƒ³ãƒ©ã‚¤ãƒ³ç›¸å ´è¡¨ã‚’å–å¾—ã™ã‚‹ãŸã‚ã«Finance-Quote perl モジュールをインストールã—ã¾ã™ã€‚ActivePerl5.8ã¾ãŸã¯5.10ãŒå¿…è¦ã§ã™
ja.IconName_Theme=GnuCash テーマã®é¸æŠž
ja.IconName_Uninstall=GnuCashをアンインストール
@@ -611,12 +611,12 @@ lv.TranslFiles=Tulkojumu faili
lv.TemplFiles=Kontu sagatavju faili
lv.IconComment_GnuCash=GnuCash grÄmatvedÄ«bas programma
-lv.IconName_README=ParÄdÄ«t README
+lv.IconName_README=GnuCash - ParÄdÄ«t README
lv.IconComment_README=ParÄda README failu
lv.IconFilename_README=README-lv.win32-bin.txt
-lv.IconName_FAQ=BUJ (tiešsaistē)
-lv.IconName_Bugzilla=Ziņot par kļūdu (tiešsaistē)
-lv.IconName_InstallFQ=UzstÄdÄ«t tieÅ¡saistes kursu iegÅ«Å¡anu
+lv.IconName_FAQ=GnuCash - BUJ (tiešsaistē)
+lv.IconName_Bugzilla=GnuCash - Ziņot par kļūdu (tiešsaistē)
+lv.IconName_InstallFQ=GnuCash - UzstÄdÄ«t tieÅ¡saistes kursu iegÅ«Å¡anu
lv.IconComment_InstallFQ=UzstÄdÄ«t nepiecieÅ¡amos Perl moduļus valÅ«tas kursu iegÅ«Å¡anai. NepiecieÅ¡ams ActivePerl 5.8+
lv.IconName_Theme=Izvēlieties tēmu GnuCash
lv.IconName_Uninstall=Noņemt GnuCash
@@ -670,12 +670,12 @@ pt_BR.TranslFiles=Tradução
pt_BR.TemplFiles=Modelos de Conta
pt_BR.IconComment_GnuCash=Gerenciador Financeiro Livre GnuCash
-pt_BR.IconName_README=Mostrar LEIA-ME (README)
+pt_BR.IconName_README=GnuCash - Mostrar LEIA-ME (README)
pt_BR.IconComment_README=Mostra o arquivo LEIA-ME (README)
pt_BR.IconFilename_README=LEIA-ME.win32-bin.txt
-pt_BR.IconName_FAQ=Perguntas Freqüentes (online, inglês)
-pt_BR.IconName_Bugzilla=Relatar um erro (online, inglês)
-pt_BR.IconName_InstallFQ=Instalar a Consulta de Preços Online
+pt_BR.IconName_FAQ=GnuCash - Perguntas Freqüentes (online, inglês)
+pt_BR.IconName_Bugzilla=GnuCash - Relatar um erro (online, inglês)
+pt_BR.IconName_InstallFQ=GnuCash - Instalar a Consulta de Preços Online
pt_BR.IconComment_InstallFQ=Instala o módulo perl Finance-Quote, necessário para a busca de preços online. Requer ActivePerl 5.8+.
pt_BR.IconName_Uninstall=Desinstalar o GnuCash
pt_BR.IconComment_Uninstall=Desinstala o Gerenciador Financeiro GnuCash
@@ -697,12 +697,12 @@ zh_CN.TranslFiles=翻译文件
zh_CN.TemplFiles=会计科目模æ¿æ–‡ä»¶
zh_CN.IconComment_GnuCash=GnuCash å…费财务管ç†
-zh_CN.IconName_README=显示自述文件
+zh_CN.IconName_README=GnuCash - 显示自述文件
zh_CN.IconComment_README=显示自述文件
zh_CN.IconFilename_README=README-zh_CN.win32-bin.txt
-zh_CN.IconName_FAQ=常è§é—®é¢˜ (在线)
-zh_CN.IconName_Bugzilla=报告软件 Bug (在线)
-zh_CN.IconName_InstallFQ=å®‰è£…åœ¨çº¿ä»·æ ¼æ£€ç´¢åŠŸèƒ½
+zh_CN.IconName_FAQ=GnuCash - 常è§é—®é¢˜ (在线)
+zh_CN.IconName_Bugzilla=GnuCash - 报告软件 Bug (在线)
+zh_CN.IconName_InstallFQ=GnuCash - å®‰è£…åœ¨çº¿ä»·æ ¼æ£€ç´¢åŠŸèƒ½
zh_CN.IconComment_InstallFQ=å®‰è£…åœ¨çº¿ä»·æ ¼æ£€ç´¢æ‰€å¿…éœ€çš„ Perl Finance-Quote模å—ã€‚éœ€è¦ ActivePerl 5.8 或 5.10
zh_CN.IconName_Uninstall=å¸è½½ GnuCash
zh_CN.IconComment_Uninstall=å¸è½½è´¢åŠ¡ç®¡ç†è½¯ä»¶ GnuCash
@@ -729,12 +729,12 @@ zh_TW.TranslFiles=ç¿»è¯æª”
zh_TW.TemplFiles=會計科目範本檔
zh_TW.IconComment_GnuCash=GnuCash 自由財務管ç†
-zh_TW.IconName_README=顯示 README
+zh_TW.IconName_README=GnuCash - 顯示 README
zh_TW.IconComment_README=顯示 README 檔
zh_TW.IconFilename_README=README-zh_TW.win32-bin.txt
-zh_TW.IconName_FAQ=常見å•é¡Œ (線上)
-zh_TW.IconName_Bugzilla=å›žå ±ç¨‹å¼ Bug (線上)
-zh_TW.IconName_InstallFQ=安è£ç¶²è·¯å ±åƒ¹æˆªå–功能
+zh_TW.IconName_FAQ=GnuCash - 常見å•é¡Œ (線上)
+zh_TW.IconName_Bugzilla=GnuCash - å›žå ±ç¨‹å¼ Bug (線上)
+zh_TW.IconName_InstallFQ=GnuCash - 安è£ç¶²è·¯å ±åƒ¹æˆªå–功能
zh_TW.IconComment_InstallFQ=安è£æˆªå–ç¶²è·¯å ±åƒ¹æ‰€éœ€çš„ Perl Finance-Quote æ¨¡çµ„ã€‚éœ€è¦ ActivePerl 5.8 或 5.10
zh_TW.IconName_Theme=é¸æ“‡ä»‹é¢é¢¨æ ¼ GnuCash
zh_TW.IconName_Uninstall=åå®‰è£ GnuCash
commit aa42c1ebdeb9b394579504089e242dc5e0e073a7
Author: Marcus Wellnitz <marcus at wellnitzfamily.de>
Date: Fri Mar 27 17:38:07 2015 +0100
Update German translation of the Windows Start menu options and the Installer
diff --git a/inno_setup/gnucash.iss b/inno_setup/gnucash.iss
index 626d90c..3cfd647 100644
--- a/inno_setup/gnucash.iss
+++ b/inno_setup/gnucash.iss
@@ -444,7 +444,7 @@ de.CreateDesktopIcon=Ein Icon auf dem Desktop erstellen
de.CreateMenuLink=Eine Verknüpfung im Startmenü erstellen
de.RunPrg=GnuCash jetzt starten
de.AdditionalIcons=Folgende Icons erstellen:
-de.StatusMsgFirewall=Ausnahmen für Windows-Firewall installieren...
+de.StatusMsgFirewall=Windows Firewall für GnuCash automatisch Anpassen (empfohlen)...
de.MainFiles=GnuCash Hauptprogramm
de.TranslFiles=Deutsche Ãœbersetzung
@@ -456,8 +456,8 @@ de.IconComment_README=Die Informationsdatei (README) anzeigen
de.IconFilename_README=README-de.win32-bin.txt
de.IconName_FAQ=GnuCash Häufige Fragen (online, engl.)
de.IconName_Bugzilla=Fehlerbericht einsenden für GnuCash (online, engl.)
-de.IconName_InstallFQ=Online Kursabruf installieren für GnuCash
-de.IconComment_InstallFQ=Das zusätzliche Modul Finance-Quote installieren, um online Aktien- und Devisenkurse abrufen zu können. Dazu ist das Programm ActivePerl 5.8 oder neuer erforderlich.
+de.IconName_InstallFQ=Erweiterung um Wechselkurse mit GnuCash online abzurufen
+de.IconComment_InstallFQ=Aktien- und Devisenkurse online abrufen (optionales Modul Finance-Quote: Achtung! Erfordert das Programm ActivePerl oder Strawberry Perl 5.8 oder neuer)
de.IconName_Uninstall=Deinstallieren von GnuCash
de.IconComment_Uninstall=Die OpenSource-Finanzverwaltung GnuCash wieder deinstallieren und vom Computer löschen
commit 988f9b50fabe87eea04f8ecabd4e70da0af39aa3
Author: Mark Haanen <i18n at haanen.net>
Date: Tue Mar 24 17:16:16 2015 +0100
Update Dutch translation of the Windows Start menu options and the Installer
diff --git a/inno_setup/gnucash.iss b/inno_setup/gnucash.iss
index 89ab61d..626d90c 100644
--- a/inno_setup/gnucash.iss
+++ b/inno_setup/gnucash.iss
@@ -627,32 +627,31 @@ lv.IconComment_Uninstall=Noņemt GnuCash grÄmatvedÄ«bas programmu
;; Dutch translation
nl.FullInstall=Volledige installatie
-nl.CustomInstall=Aangepaste installatiie
-nl.CreateDesktopIcon=Een &bureablad icoon aanmaken
-nl.CreateMenuLink=Een verwijzing in het start menu aanmaken
+nl.CustomInstall=Aangepaste installatie
+nl.CreateDesktopIcon=Een icoon op het Bureaublad plaatsen
+nl.CreateMenuLink=Een koppeling in menu Start plaatsen
nl.RunPrg=GnuCash nu starten
nl.AdditionalIcons=Deze iconen aanmaken:
-nl.StatusMsgFirewall=Windows firewall regels installeren...
+nl.StatusMsgFirewall=Windows Firewall-regels installeren...
-nl.MainFiles=GnuCash Programma
+nl.MainFiles=Programmabestanden voor GnuCash
nl.TranslFiles=Vertalingsbestanden
nl.TemplFiles=Grootboekrekeningssjablonen
-nl.IconComment_GnuCash=GnuCash Vrij Financieel Beheer
-nl.IconName_README=GnuCash LEESMIJ Tonen
-nl.IconComment_README=Het LEESMIJ bestand tonen
+nl.IconComment_GnuCash=GnuCash vrije boekhoudsoftware
+nl.IconName_README=GnuCash LEESMIJ tonen
+nl.IconComment_README=Het LEESMIJ-bestand weergeven
nl.IconFilename_README=README-nl.win32-bin.txt
-nl.IconName_FAQ=GnuCash FAQ (Online)
-nl.IconName_Bugzilla=Een bug melden in GnuCash (Online)
-nl.IconName_InstallFQ=Online Koersen Opvragen installeren voor GnuCash
-nl.IconComment_InstallFQ=De benodigde perl module Finance Quote om online koersen op te vragen installeren. Hiervoor is ActivePerl 5.8 of recenter nodig.
-nl.IconName_Theme=GnuCash stijl selecteren
+nl.IconName_FAQ=GnuCash FAQ (online)
+nl.IconName_Bugzilla=Een bug melden in GnuCash (online)
+nl.IconName_InstallFQ=Online koersinformatie installeren voor GnuCash
+nl.IconComment_InstallFQ=De Perl-module Finance-Quote installeren om online koersen op te vragen. Hiervoor is ActivePerl or Strawberry Perl 5.8 of recenter nodig.
+nl.IconName_Theme=Thema voor GnuCash selecteren
nl.IconName_Uninstall=GnuCash verwijderen
-nl.IconComment_Uninstall=Het financieel beheersprogramma GnuCash verwijderen
-
+nl.IconComment_Uninstall=De vrije boekhoudsoftware GnuCash verwijderen
nl.AIWP_Title=Een eerdere installatie werd gevonden
nl.AIWP_Description=%1 is momenteel op deze computer geïnstalleerd
-nl.AIWP_Message=Deze eerdere installatie moet verwijderd worden alvorens verder te gaan.%n%nAls je dat niet wil, klik dan nu op Annuleren om de huidige installatie af te breken.%n%nKlik op Volgende om %1 te verwijderen en de installatie te vervolgen.%n%nOpmerking: enkel het programma zal verwijderd worden, niet je financiële data.
+nl.AIWP_Message=Deze eerdere installatie moet verwijderd worden alvorens verder te gaan.%n%nAls u dat niet wil, klik dan nu op Annuleren om de huidige installatie af te breken.%n%nKlik op Volgende om %1 te verwijderen en de installatie te vervolgen.%n%nOpmerking: alleen het programma zal verwijderd worden, niet je financiële gegevens.
;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
commit db353791b98d693103c18a0b27434a6bc250c216
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Mar 24 17:15:43 2015 +0100
Inform users that both ActivePerl or Strawberry Perl are supported.
diff --git a/inno_setup/gnucash.iss b/inno_setup/gnucash.iss
index 133beb9..89ab61d 100644
--- a/inno_setup/gnucash.iss
+++ b/inno_setup/gnucash.iss
@@ -418,7 +418,7 @@ IconFilename_README=README.win32-bin.txt
IconName_FAQ=GnuCash FAQ (Online)
IconName_Bugzilla=Report a GnuCash Bug (Online)
IconName_InstallFQ=Install Online Price Retrieval for GnuCash
-IconComment_InstallFQ=Install the necessary perl module Finance-Quote for online retrieval of prices. Requires ActivePerl 5.8 or later
+IconComment_InstallFQ=Install the necessary perl module Finance-Quote for online retrieval of prices. Requires ActivePerl or Strawberry Perl 5.8 or later
IconName_Theme=Select GnuCash Theme
IconName_Uninstall=Uninstall GnuCash
IconComment_Uninstall=Uninstall the Finance Manager GnuCash
commit 950d1787ceb372465ef389fe89d803cd90b77f5a
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat Mar 21 18:45:58 2015 +0100
Restore label that got accidentally removed
It's needed for the installation of F::Q for Active Perl
diff --git a/extra_dist/install-fq-mods.cmd b/extra_dist/install-fq-mods.cmd
index 9e79f39..da44975 100644
--- a/extra_dist/install-fq-mods.cmd
+++ b/extra_dist/install-fq-mods.cmd
@@ -121,6 +121,7 @@ if %errorlevel% neq 0 goto error
goto fqchk
REM ----------------------------------------------------------------------------
+:inst_mod_as
echo.
echo * Install Finance-Quote
echo.
commit 15b363adc07f900e73a7f97ddf68c56204df90ca
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri Mar 20 14:38:05 2015 +0100
Bug 722678 - Add GnuCash in the names of the items that get installed in the Windows Start menu
This commit adds GnuCash to all English menu items
and for other languages if I could more or less guess
the proper translation (Dutch, French).
In other languages, translators will need to complete the strings.
diff --git a/inno_setup/gnucash.iss b/inno_setup/gnucash.iss
index 56eaf72..133beb9 100644
--- a/inno_setup/gnucash.iss
+++ b/inno_setup/gnucash.iss
@@ -412,14 +412,14 @@ TranslFiles=Translation Files
TemplFiles=Account Template Files
IconComment_GnuCash=GnuCash Free Finance Manager
-IconName_README=Show README
+IconName_README=Show GnuCash README
IconComment_README=Show the README file
IconFilename_README=README.win32-bin.txt
-IconName_FAQ=FAQ (Online)
-IconName_Bugzilla=Report a Bug (Online)
-IconName_InstallFQ=Install Online Price Retrieval
+IconName_FAQ=GnuCash FAQ (Online)
+IconName_Bugzilla=Report a GnuCash Bug (Online)
+IconName_InstallFQ=Install Online Price Retrieval for GnuCash
IconComment_InstallFQ=Install the necessary perl module Finance-Quote for online retrieval of prices. Requires ActivePerl 5.8 or later
-IconName_Theme=Select Theme
+IconName_Theme=Select GnuCash Theme
IconName_Uninstall=Uninstall GnuCash
IconComment_Uninstall=Uninstall the Finance Manager GnuCash
@@ -451,12 +451,12 @@ de.TranslFiles=Deutsche Ãœbersetzung
de.TemplFiles=Beispiel-Kontenrahmen
de.IconComment_GnuCash=GnuCash OpenSource-Finanzverwaltung
-de.IconName_README=README anzeigen
+de.IconName_README=GnuCash README anzeigen
de.IconComment_README=Die Informationsdatei (README) anzeigen
de.IconFilename_README=README-de.win32-bin.txt
-de.IconName_FAQ=Häufige Fragen (online, engl.)
-de.IconName_Bugzilla=Fehlerbericht einsenden (online, engl.)
-de.IconName_InstallFQ=Online Kursabruf installieren
+de.IconName_FAQ=GnuCash Häufige Fragen (online, engl.)
+de.IconName_Bugzilla=Fehlerbericht einsenden für GnuCash (online, engl.)
+de.IconName_InstallFQ=Online Kursabruf installieren für GnuCash
de.IconComment_InstallFQ=Das zusätzliche Modul Finance-Quote installieren, um online Aktien- und Devisenkurse abrufen zu können. Dazu ist das Programm ActivePerl 5.8 oder neuer erforderlich.
de.IconName_Uninstall=Deinstallieren von GnuCash
de.IconComment_Uninstall=Die OpenSource-Finanzverwaltung GnuCash wieder deinstallieren und vom Computer löschen
@@ -509,13 +509,14 @@ fr.TranslFiles=Traduction française
fr.TemplFiles=Modèle de plan comptable
fr.IconComment_GnuCash=GnuCash, le gestionnaire financier OpenSource
-fr.IconName_README=Afficher le LISEZMOI
+fr.IconName_README=Afficher le GnuCash LISEZMOI
fr.IconComment_README=Afficher le fichier LISEZMOI
fr.IconFilename_README=README-fr.win32-bin.txt
-fr.IconName_FAQ=FAQ (En ligne, en anglais)
-fr.IconName_Bugzilla=Envoyer un rapport d'erreur (En ligne, en anglais)
-fr.IconName_InstallFQ=Installer les quotations en ligne
+fr.IconName_FAQ=GnuCash FAQ (En ligne, en anglais)
+fr.IconName_Bugzilla=Envoyer un rapport d'erreur pour GnuCash (En ligne, en anglais)
+fr.IconName_InstallFQ=Installer les quotations en ligne pour GnuCash
fr.IconComment_InstallFQ=Installation du module Finance-Quote requis pour le téléchargement du cours des devises et actions. Le programme ActivePerl 5.8 ou plus récent est aussi requis
+fr.IconName_Theme=Selection du style GnuCash
fr.IconName_Uninstall=Dé-installer GnuCash
fr.IconComment_Uninstall=Désinstalle le gestionnaire financier GnuCash
@@ -542,14 +543,14 @@ it.TranslFiles=Traduzione Italiana
it.TemplFiles=Modelli di strutture dei conti
it.IconComment_GnuCash=GnuCash: gestore di finanze libero
-it.IconName_README=Mostra il file LEGGIMI
+it.IconName_README=Mostra il file GnuCash LEGGIMI
it.IconComment_README=Mostra il file LEGGIMI
it.IconFilename_README=README-it.win32-bin.txt
-it.IconName_FAQ=FAQ (online, in Inglese)
-it.IconName_Bugzilla=Segnalare un bug (online, in Inglese)
-it.IconName_InstallFQ=Installa la funzione di ricerca delle quotazioni online
+it.IconName_FAQ=GnuCash FAQ (online, in Inglese)
+it.IconName_Bugzilla=Segnalare un bug en GnuCash (online, in Inglese)
+it.IconName_InstallFQ=Installa la funzione di ricerca delle quotazioni online per GnuCash
it.IconComment_InstallFQ=Installa il modulo di perl Finance-Quote necessario per ricevere le quotazioni online. Richiede ActivePerl 5.8+
-it.IconName_Theme=Selezione del tema
+it.IconName_Theme=Selezione del tema GnuCash
it.IconName_Uninstall=Disinstalla GnuCash
it.IconComment_Uninstall=Disinstalla il programma di gestione delle finanze GnuCash
@@ -582,7 +583,7 @@ ja.IconName_FAQ=FAQ (オンライン)
ja.IconName_Bugzilla=ãƒã‚°ã‚’å ±å‘Š (オンライン)
ja.IconName_InstallFQ=ã‚ªãƒ³ãƒ©ã‚¤ãƒ³ç›¸å ´è¡¨å–得ツールをインストール
ja.IconComment_InstallFQ=ã‚ªãƒ³ãƒ©ã‚¤ãƒ³ç›¸å ´è¡¨ã‚’å–å¾—ã™ã‚‹ãŸã‚ã«Finance-Quote perl モジュールをインストールã—ã¾ã™ã€‚ActivePerl5.8ã¾ãŸã¯5.10ãŒå¿…è¦ã§ã™
-ja.IconName_Theme=テーマã®é¸æŠž
+ja.IconName_Theme=GnuCash テーマã®é¸æŠž
ja.IconName_Uninstall=GnuCashをアンインストール
ja.IconComment_Uninstall=財務ソフトウェアGnuCashをアンインストールã—ã¾ã™
@@ -617,7 +618,7 @@ lv.IconName_FAQ=BUJ (tiešsaistē)
lv.IconName_Bugzilla=Ziņot par kļūdu (tiešsaistē)
lv.IconName_InstallFQ=UzstÄdÄ«t tieÅ¡saistes kursu iegÅ«Å¡anu
lv.IconComment_InstallFQ=UzstÄdÄ«t nepiecieÅ¡amos Perl moduļus valÅ«tas kursu iegÅ«Å¡anai. NepiecieÅ¡ams ActivePerl 5.8+
-lv.IconName_Theme=Izvēlieties tēmu
+lv.IconName_Theme=Izvēlieties tēmu GnuCash
lv.IconName_Uninstall=Noņemt GnuCash
lv.IconComment_Uninstall=Noņemt GnuCash grÄmatvedÄ«bas programmu
@@ -638,13 +639,14 @@ nl.TranslFiles=Vertalingsbestanden
nl.TemplFiles=Grootboekrekeningssjablonen
nl.IconComment_GnuCash=GnuCash Vrij Financieel Beheer
-nl.IconName_README=LEESMIJ Tonen
+nl.IconName_README=GnuCash LEESMIJ Tonen
nl.IconComment_README=Het LEESMIJ bestand tonen
nl.IconFilename_README=README-nl.win32-bin.txt
-nl.IconName_FAQ=FAQ (Online)
-nl.IconName_Bugzilla=Een Bug Melden (Online)
-nl.IconName_InstallFQ=Online Koersen Opvragen installeren
+nl.IconName_FAQ=GnuCash FAQ (Online)
+nl.IconName_Bugzilla=Een bug melden in GnuCash (Online)
+nl.IconName_InstallFQ=Online Koersen Opvragen installeren voor GnuCash
nl.IconComment_InstallFQ=De benodigde perl module Finance Quote om online koersen op te vragen installeren. Hiervoor is ActivePerl 5.8 of recenter nodig.
+nl.IconName_Theme=GnuCash stijl selecteren
nl.IconName_Uninstall=GnuCash verwijderen
nl.IconComment_Uninstall=Het financieel beheersprogramma GnuCash verwijderen
@@ -735,6 +737,6 @@ zh_TW.IconName_FAQ=常見å•é¡Œ (線上)
zh_TW.IconName_Bugzilla=å›žå ±ç¨‹å¼ Bug (線上)
zh_TW.IconName_InstallFQ=安è£ç¶²è·¯å ±åƒ¹æˆªå–功能
zh_TW.IconComment_InstallFQ=安è£æˆªå–ç¶²è·¯å ±åƒ¹æ‰€éœ€çš„ Perl Finance-Quote æ¨¡çµ„ã€‚éœ€è¦ ActivePerl 5.8 或 5.10
-zh_TW.IconName_Theme=é¸æ“‡ä»‹é¢é¢¨æ ¼
+zh_TW.IconName_Theme=é¸æ“‡ä»‹é¢é¢¨æ ¼ GnuCash
zh_TW.IconName_Uninstall=åå®‰è£ GnuCash
zh_TW.IconComment_Uninstall=å安è£è²¡å‹™ç®¡ç†å“¡ GnuCash
commit 62f62cca17e98dc3876a619c927f5529254f9cff
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Feb 9 10:00:46 2015 -0800
Remove explicit Finance::Quote dependencies from ActiveState branch.
ActiveState's ppm is quite capable of resolving dependencies on it's
own, and these two are obsolete anyway.
diff --git a/extra_dist/install-fq-mods.cmd b/extra_dist/install-fq-mods.cmd
index dec3b33..9e79f39 100644
--- a/extra_dist/install-fq-mods.cmd
+++ b/extra_dist/install-fq-mods.cmd
@@ -120,34 +120,6 @@ perl -w gnc-fq-update
if %errorlevel% neq 0 goto error
goto fqchk
-REM ----------------------------------------------------------------------------
-:inst_mod_as
-echo * Install DateManip
-echo.
-perl -x -S ppm install Date-Manip
-if %errorlevel% neq 0 (
- perl -x -S ppm install DateManip
- if %errorlevel% neq 0 goto error
-)
-
-REM ----------------------------------------------------------------------------
-echo.
-echo * Install Crypt-SSLeay
-echo.
-
-set OLDPATH=%PATH%
-set PATH=%CD%;%PATH%
-if %_perlversion% == 5.6 (
- perl -x -S ppm install http://theoryx5.uwinnipeg.ca/ppmpackages/Crypt-SSLeay.ppd
-) else if %_perlversion% == 5.8 (
- echo anything | perl -x -S ppm install http://theoryx5.uwinnipeg.ca/ppms/Crypt-SSLeay.ppd
-) else (
- perl -x -S ppm install Crypt-SSLeay
-)
-set errlvlbak=%errorlevel%
-set PATH=%OLDPATH%
-if "%errlvlbak%" neq "0" goto error
-
REM ----------------------------------------------------------------------------
echo.
echo * Install Finance-Quote
commit 520492e2ec3c6623c49c217fa6b0097611b6274b
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Feb 2 11:02:12 2015 -0800
Fix ACLOCAL_FLAGS, add boost to /c/Users/john/bin:.:/usr/local/bin:/mingw/bin:/bin:/c/Windows/system32:/c/Windows:/c/Windows/System32/Wbem:/c/Program Files/TortoiseSVN/bin:/c/Windows/System32/WindowsPowerShell/v1.0/:/c/Windows/System32/WindowsPowerShell/v1.0/:/c/Program Files (x86)/QuickTime/QTSystem/:/c/strawberry/c/bin:/c/strawberry/perl/site/bin:/c/strawberry/perl/bin:/c/Program Files (x86)/Oracle/Berkeley DB 11gR2 5.1.29/bin:/c/Program Files/Microsoft SQL Server/110/Tools/Binn/:/c/Program Files/TortoiseGit/bin:/c/Program Files (x86)/Windows Kits/8.1/Windows Performance Toolkit/:/c/Program Files (x86)/Oracle/Berkeley DB 4.8.30/bin:/c/Program Files (x86)/Oracle/Berkeley DB 4.8.30/bin/debug:/c/Program Files/Mercurial in devrc.sh.
diff --git a/devrc.sh b/devrc.sh
index 307b961..73468d5 100644
--- a/devrc.sh
+++ b/devrc.sh
@@ -48,8 +48,9 @@ REGEX_UDIR=$GLOBAL_UDIR/regex
SQLITE3_UDIR=$GLOBAL_UDIR/sqlite3
SWIG_UDIR=$GLOBAL_UDIR/swig
WEBKIT_UDIR=$GLOBAL_UDIR/webkit
+BOOST_UDIR=$GLOBAL_UDIR/boost
-PATH=$AQBANKING_UDIR/bin:$GWENHYWFAR_UDIR/bin:$ENCHANT_UDIR/bin:$GNOME_UDIR/bin:$GNUCASH_UDIR/bin:$GNUCASH_UDIR/lib:$GNUTLS_UDIR/bin:$GOFFICE_UDIR/bin:$GUILE_UDIR/bin:$LIBDBI_UDIR/bin:$LIBGSF_UDIR/bin:$LIBOFX_UDIR/bin:$LIBSOUP_UDIR/bin:$LIBXSLT_UDIR/bin:$MYSQL_UDIR/bin:$MYSQL_UDIR/lib:$OPENSP_UDIR/bin:$PCRE_UDIR/bin:$PGSQL_UDIR/bin:$PGSQL_UDIR/lib:$REGEX_UDIR/bin:$SQLITE3_UDIR/bin:$WEBKIT_UDIR/bin
+PATH=$AQBANKING_UDIR/bin:$GWENHYWFAR_UDIR/bin:$ENCHANT_UDIR/bin:$GNOME_UDIR/bin:$GNUCASH_UDIR/bin:$GNUCASH_UDIR/lib:$GNUTLS_UDIR/bin:$GOFFICE_UDIR/bin:$GUILE_UDIR/bin:$LIBDBI_UDIR/bin:$LIBGSF_UDIR/bin:$LIBOFX_UDIR/bin:$LIBSOUP_UDIR/bin:$LIBXSLT_UDIR/bin:$MYSQL_UDIR/bin:$MYSQL_UDIR/lib:$OPENSP_UDIR/bin:$PCRE_UDIR/bin:$PGSQL_UDIR/bin:$PGSQL_UDIR/lib:$REGEX_UDIR/bin:$SQLITE3_UDIR/bin:$SWIG_UDIR:$WEBKIT_UDIR/bin:$BOOST_UDIR/lib
PATH=$PATH:$OLDPATH
@@ -57,12 +58,12 @@ export PATH
export LTDL_LIBRARY_PATH=$GNUCASH_UDIR/lib
export GNOME2_PATH=$GNOME_UDIR
-export ACLOCAL_FLAGS="-I $GNOME_UDIR/share/aclocal -I GUILE_UDIR/share/aclocal"
+export ACLOCAL_FLAGS="-I $GNOME_UDIR/share/aclocal -I $GUILE_UDIR/share/aclocal"
export PKG_CONFIG_PATH="$AQBANKING_UDIR/lib/pkgconfig:$ENCHANT_UDIR/lib/pkgconfig:$GOFFICE_UDIR/lib/pkgconfig:$GNOME_UDIR/lib/pkgconfig:$GNUTLS_UDIR/lib/pkgconfig:$GUILE_UDIR/lib/pkgconfig:$GWENHYWFAR_UDIR/lib/pkgconfig:$GLOBAL_UDIR/isocodes/share/pkgconfig:$LIBGSF_UDIR/lib/pkgconfig:$LIBOFX_UDIR/lib/pkgconfig:$LIBSOUP_UDIR/lib/pkgconfig:$LIBXSLT_UDIR/lib/pkgconfig:$PCRE_UDIR/lib/pkgconfig:$WEBKIT_UDIR/lib/pkgconfig"
export CPPFLAGS="-I$AQBANKING_UDIR/include -I$ENCHANT_UDIR/include -I$GOFFICE_UDIR/include -I$GNOME_UDIR/include -I$GNOME_UDIR/include/glib-2.0 -I$GNOME_UDIR/lib/glib-2.0/include -I$GNUTLS_UDIR/include -I$GUILE_UDIR/include -I$GWENHYWFAR_UDIR/include -I$GLOBAL_UDIR/isocodes/include -I$LIBGSF_UDIR/include -I$LIBOFX_UDIR/include -I$LIBSOUP_UDIR/include -I$LIBXSLT_UDIR/include -I$PCRE_UDIR/include -I$WEBKIT_UDIR/pkgconfig -I$LIBDBI_UDIR/include -D__USE_MINGW_ANSI_STDIO"
-export LDFLAGS="-L$AQBANKING_UDIR/lib -L$ENCHANT_UDIR/lib -L$GOFFICE_UDIR/lib -L$GNOME_UDIR/lib -L$GNUTLS_UDIR/lib -L$GUILE_UDIR/lib -L$GWENHYWFAR_UDIR/lib -L$GLOBAL_UDIR/isocodes/lib -L$LIBGSF_UDIR/lib -L$LIBOFX_UDIR/lib -L$LIBSOUP_UDIR/lib -L$LIBXSLT_UDIR/lib -L$PCRE_UDIR/lib -L$WEBKIT_UDIR/lib -L$LIBDBI_UDIR/lib -L$GLOBAL_UDIR/hh/lib"
+export LDFLAGS="-L$AQBANKING_UDIR/lib -L$ENCHANT_UDIR/lib -L$GOFFICE_UDIR/lib -L$GNOME_UDIR/lib -L$GNUTLS_UDIR/lib -L$GUILE_UDIR/lib -L$GWENHYWFAR_UDIR/lib -L$GLOBAL_UDIR/isocodes/lib -L$LIBGSF_UDIR/lib -L$LIBOFX_UDIR/lib -L$LIBSOUP_UDIR/lib -L$LIBXSLT_UDIR/lib -L$PCRE_UDIR/lib -L$WEBKIT_UDIR/lib -L$LIBDBI_UDIR/lib -L$GLOBAL_UDIR/hh/lib -L$REGEX_UDIR/lib -L$BOOST_UDIR/lib"
export GIT_CMD=$GLOBAL_UDIR/git/git.exe
commit 516ede1ff2517d7434f81ffc4abbb813cd5648cc
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Feb 2 10:59:27 2015 -0800
Change default working directory to the user's Documents folder.
From the binary installation directory, the wrong place to save data files.
diff --git a/inno_setup/gnucash.iss b/inno_setup/gnucash.iss
index 4c40bb6..56eaf72 100644
--- a/inno_setup/gnucash.iss
+++ b/inno_setup/gnucash.iss
@@ -41,7 +41,7 @@ Name: desktopicon; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm
Name: menuicon; Description: "{cm:CreateMenuLink}"; GroupDescription: "{cm:AdditionalIcons}"
[Icons]
-Name: "{group}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: menuicon
+Name: "{group}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "{userdocs}"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: menuicon
Name: "{group}\{cm:IconName_README}"; Filename: "{app}\doc\@PACKAGE@\{cm:IconFilename_README}"; Comment: "{cm:IconComment_README}"; Tasks: menuicon
Name: "{group}\{cm:IconName_FAQ}"; Filename: "http://wiki.gnucash.org/wiki/FAQ"; Tasks: menuicon
Name: "{group}\{cm:IconName_Bugzilla}"; Filename: "http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash"; Tasks: menuicon
@@ -49,11 +49,11 @@ Name: "{group}\{cm:IconName_InstallFQ}"; Filename: "{app}\bin\install-fq-mods.cm
Name: "{group}\{cm:IconName_Theme}"; Filename: "{app}\bin\gtk2_prefs.exe"; WorkingDir: "{app}\bin"; Tasks: menuicon
Name: "{group}\{cm:IconName_Uninstall}"; Filename: "{uninstallexe}"; Comment: "{cm:IconComment_Uninstall}"; Tasks: menuicon
-Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: desktopicon
+Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "{userdocs}"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: desktopicon
[Run]
Filename: "{app}\bin\pango-querymodules.exe"; Parameters: " --system --update-cache"; Flags: runhidden
-Filename: "{app}\bin\@PACKAGE at .exe"; Description: "{cm:RunPrg}"; WorkingDir: "{app}\bin"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent
+Filename: "{app}\bin\@PACKAGE at .exe"; Description: "{cm:RunPrg}"; WorkingDir: "{userdocs}"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent
Filename: "{app}\bin\guile.cmd"; Flags: runhidden
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
commit 802ada5d14b921b85240366e82845cd794006756
Author: Christian Stimming <christian at cstimming.de>
Date: Sat Jan 3 21:57:42 2015 +0100
Add gitignore.
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ddafeed
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+custom.sh
+*~
commit d8fe261c588705138c42b8702091d5b032cf87f1
Author: Christian Stimming <christian at cstimming.de>
Date: Sun Jan 4 09:35:24 2015 +0100
Update aqbanking version to current release.
diff --git a/defaults.sh b/defaults.sh
index f4b7742..8667392 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -341,16 +341,16 @@ set_default LIBOFX_DIR $GLOBAL_DIR\\libofx
set_default LIBOFX_PATCH `pwd`/libofx-0.9.8.patch
## online banking: gwenhywfar+aqbanking
-GWENHYWFAR_VERSION="4.10.0beta"
-set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=73&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
+GWENHYWFAR_VERSION="4.13.1"
+set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=78&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
-KTOBLZCHECK_VERSION="1.45"
+KTOBLZCHECK_VERSION="1.48"
set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-${KTOBLZCHECK_VERSION}.tar.gz"
# ktoblzcheck is being installed into GWENHYWFAR_DIR
-AQBANKING_VERSION="5.4.2beta"
-set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=114&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
+AQBANKING_VERSION="5.5.1"
+set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=118&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
set_default SQLITE3_URL "http://sqlite.org/sqlite-amalgamation-3.6.1.tar.gz"
commit 7d6a08420536e8edd24ba24cca3c851bd7d914f7
Author: Christian Stimming <christian at cstimming.de>
Date: Sat Jan 3 21:56:53 2015 +0100
Minor improvement: Add version number output for online banking libraries.
Also, fix missing rm -f option in cross-compile directive.
diff --git a/install-impl.sh b/install-impl.sh
index eabba22..f211174 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -268,7 +268,7 @@ function inst_aqbanking() {
add_to_env ${_AQBANKING_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
if quiet ${PKG_CONFIG} --exact-version=${AQBANKING_VERSION} aqbanking
then
- echo "AqBanking already installed in $_AQBANKING_UDIR. skipping."
+ echo "AqBanking ${AQBANKING_VERSION} already installed in $_AQBANKING_UDIR. skipping."
else
wget_unpacked $AQBANKING_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/aqbanking-*
@@ -628,7 +628,7 @@ function inst_gwenhywfar() {
add_to_env ${_GWENHYWFAR_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
if quiet ${PKG_CONFIG} --exact-version=${GWENHYWFAR_VERSION} gwenhywfar
then
- echo "Gwenhywfar already installed in $_GWENHYWFAR_UDIR. skipping."
+ echo "Gwenhywfar ${GWENHYWFAR_VERSION} already installed in $_GWENHYWFAR_UDIR. skipping."
else
wget_unpacked $GWENHYWFAR_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/gwenhywfar-*
@@ -684,7 +684,7 @@ function inst_ktoblzcheck() {
add_to_env "-L${_GWENHYWFAR_UDIR}/lib" KTOBLZCHECK_LDFLAGS
if quiet ${PKG_CONFIG} --exact-version=${KTOBLZCHECK_VERSION} ktoblzcheck
then
- echo "Ktoblzcheck already installed in $_GWENHYWFAR_UDIR. skipping."
+ echo "Ktoblzcheck ${KTOBLZCHECK_VERSION} already installed in $_GWENHYWFAR_UDIR. skipping."
else
wget_unpacked $KTOBLZCHECK_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/ktoblzcheck-*
@@ -767,7 +767,7 @@ function inst_libdbi() {
patch -p1 < $LIBDBI_PATCH
fi
if [ "$CROSS_COMPILE" = "yes" ]; then
- rm ltmain.sh aclocal.m4
+ rm -f ltmain.sh aclocal.m4
libtoolize --force
aclocal
autoheader
commit 107481c3be8f1eca848d53092c380fee5f58684e
Author: Christian Stimming <christian at cstimming.de>
Date: Sat Dec 13 20:26:17 2014 +0100
Reduce gwenhywfar version to avoid bug#741161 that crashes on windows.
This partially reverts 361f7428ae93cf5089a2ea4a755eaaeb9fe00f75.
diff --git a/defaults.sh b/defaults.sh
index 81056a2..f4b7742 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -341,8 +341,8 @@ set_default LIBOFX_DIR $GLOBAL_DIR\\libofx
set_default LIBOFX_PATCH `pwd`/libofx-0.9.8.patch
## online banking: gwenhywfar+aqbanking
-GWENHYWFAR_VERSION="4.11.1beta"
-set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=75&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
+GWENHYWFAR_VERSION="4.10.0beta"
+set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=73&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
KTOBLZCHECK_VERSION="1.45"
commit 441e5069d1668dbb8c03ddbb6ba478e072230b49
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Dec 19 13:55:27 2014 -0800
Help compilation in release directories.
Something about a long LDFLAGS string causes the shell to barf when
invoking gcc so that the shell crashes. This isn't a problem when
the root path is /c/gcdev, but it is when the path is
/c/gcdev/gnucash-2.6.x. Leaving off -L/mingw/lib shortens the string just
enough that it's able to run without crashing.
-L/mingw/lib isn't necessary anyway, since it's part of the system link
path.
diff --git a/install-impl.sh b/install-impl.sh
index bcba8ed..eabba22 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1337,7 +1337,7 @@ function inst_gnucash() {
--enable-locale-specific-tax \
${_EXTRA_OPTIONS} \
CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GUILE_CPPFLAGS} ${LIBDBI_CPPFLAGS} ${KTOBLZCHECK_CPPFLAGS} ${HH_CPPFLAGS} ${LIBSOUP_CPPFLAGS} -D_WIN32 ${EXTRA_CFLAGS}" \
- LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} ${HH_LDFLAGS} -L${_SQLITE3_UDIR}/lib -L${_ENCHANT_UDIR}/lib -L${_LIBXSLT_UDIR}/lib -L${_MINGW_LDDIR}" \
+ LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} ${HH_LDFLAGS} -L${_SQLITE3_UDIR}/lib -L${_ENCHANT_UDIR}/lib -L${_LIBXSLT_UDIR}/lib" \
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
make
commit 2e076aa07f32f0ba53c33edab1ddac5820ce9f95
Author: John Ralls <jralls at ceridwen.us>
Date: Wed Dec 17 09:32:44 2014 -0800
Move the gnome .la and .pc adjustment to before building libxml2.
Libtool will do the right thing when building.
diff --git a/install-impl.sh b/install-impl.sh
index b649312..bcba8ed 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -412,6 +412,12 @@ function inst_gnome() {
done
qpopd
+ qpushd $_GNOME_UDIR/lib/pkgconfig
+ perl -pi.bak -e"s!^prefix=.*\$!prefix=$_GNOME_UDIR!" *.pc
+ #perl -pi.bak -e's!^Libs: !Libs: -L\${prefix}/bin !' *.pc
+ qpopd
+ fix_libtool_files ${_GNOME_UDIR}
+
if quiet ${PKG_CONFIG} --exact-version=${LIBXML2_VERSION} libxml-2.0 ; then
echo "Libxml2 already compiled + installed"
else
@@ -430,12 +436,6 @@ function inst_gnome() {
rm -rf ${TMP_UDIR}/libxml2-*
fi
- qpushd $_GNOME_UDIR/lib/pkgconfig
- perl -pi.bak -e"s!^prefix=.*\$!prefix=$_GNOME_UDIR!" *.pc
- #perl -pi.bak -e's!^Libs: !Libs: -L\${prefix}/bin !' *.pc
- qpopd
- fix_libtool_files ${_GNOME_UDIR}
-
quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-2.0 || die "gnome not installed correctly: no gtk+-2.0 with atleast-version=${GTK_VERSION}"
quiet ${PKG_CONFIG} --atleast-version=${CAIRO_VERSION} cairo || die "gnome not installed correctly: no cairo with atleast-version=${CAIRO_VERSION}"
quiet ${PKG_CONFIG} --exact-version=${LIBXML2_VERSION} libxml-2.0 || die "gnome not installed correctly: no libxml-2.0 with exact-version=${LIBXML2_VERSION}"
commit 860a61fd2b67c505053c41c01ff923ced07c5b1a
Author: John Ralls <jralls at ceridwen.us>
Date: Wed Dec 17 09:31:05 2014 -0800
Stop fix_lt_file() from duplicating the tag-build subdir in the libdir line.
diff --git a/functions.sh b/functions.sh
index d047811..a194f03 100644
--- a/functions.sh
+++ b/functions.sh
@@ -322,8 +322,8 @@ function fix_lt_file () {
perl -pi.bak \
-e"s{-L$orig_dir}{-L$target_dir}g;" \
-e"s{([/a-z0-9A-Z:_-]+)/lib([a-zA-Z0-9._-]+)\.la}{-L\1 -l\2}g;" \
- -e"s{^libdir=.*$}{libdir='$target_dir'};" \
- -e"s{(/c|c:)/gcdev/}{$global_udir/}g" \
+ -e"s{(/c|c:)/gcdev/}{$global_udir/}g;" \
+ -e"s{^libdir=.*$}{libdir='$target_dir'}" \
$filename
}
commit 2b5f3de711e0dfa12c7573d97c376be31b15f2cd
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Dec 1 16:29:50 2014 -0800
Change order of daily builds.
From master-maint-tag to tag-maint-master.
diff --git a/buildserver/build_periodic.bat b/buildserver/build_periodic.bat
index 26e0ff6..b139886 100644
--- a/buildserver/build_periodic.bat
+++ b/buildserver/build_periodic.bat
@@ -6,9 +6,9 @@ rem On the GnuCash build server this timed command is run daily which the commen
cd c:\gcdev\gnucash-on-windows.git\
-rem Development build (daily)
-c:\gcdev\mingw\msys\1.0\bin\sh.exe --login c:\gcdev\gnucash-on-windows.git\buildserver\build_periodic.sh
+rem maintenance branch build (daily)
+c:\gcdev-maint\mingw\msys\1.0\bin\sh.exe --login c:\gcdev-maint\gnucash-on-windows.git\buildserver\build_periodic.sh
rem Tags build for 2.6.1 and newer (daily -- only tags that weren't built yet)
c:\gcdev\mingw\msys\1.0\bin\sh.exe --login c:\gcdev\gnucash-on-windows.git\buildserver\build_tags.sh
-rem maintenance branch build (daily)
-c:\gcdev-maint\mingw\msys\1.0\bin\sh.exe --login c:\gcdev-maint\gnucash-on-windows.git\buildserver\build_periodic.sh
\ No newline at end of file
+rem Development build (daily)
+c:\gcdev\mingw\msys\1.0\bin\sh.exe --login c:\gcdev\gnucash-on-windows.git\buildserver\build_periodic.sh
commit e38983321b87f676b855a57033fd740a8f1ec286
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Nov 23 09:04:20 2014 -0800
Add note to WebKit build comment.
diff --git a/install-impl.sh b/install-impl.sh
index 6f4f7af..b649312 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1099,6 +1099,7 @@ function inst_regex() {
#c:\Programs\GnuWin32.
#You also need python 2.6+ and ICU 50+
#Setting $PYTHON isn't sufficient, it must be on the path.
+#Make sure that $CC is set, otherwise the perl modules will try to use /usr/bin/gcc which doesn't exist.
#Build ICU and install it in /c/gcdev/webkit. Symlink icu*.dll to libicu*.dll.
#
#After building and before installing, make the following changes to
commit 1b19cf6cfdb642c1209c43268e20de6707bd4afd
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sun Nov 16 18:43:24 2014 +0100
Update guile load path after guile modules were moved in the gnucash source tree
diff --git a/inno_setup/gnucash.iss b/inno_setup/gnucash.iss
index 8e434c0..4c40bb6 100644
--- a/inno_setup/gnucash.iss
+++ b/inno_setup/gnucash.iss
@@ -301,7 +301,7 @@ begin
{ Create the guile.cmd file; #10 is the linefeed character and #13 CR }
FileName := appdir + '\bin\guile.cmd' ;
- FileString := 'set GUILE_LOAD_PATH=' + pkgdatadir + '\guile-modules;' + pkgdatadir + '\scm;' + appdir + '\share\guile\1.8;%GUILE_LOAD_PATH%'#13#10 ;
+ FileString := 'set GUILE_LOAD_PATH=' + pkgdatadir + '\scm;' + appdir + '\share\guile\1.8;%GUILE_LOAD_PATH%'#13#10 ;
FileString := FileString + 'start guile.exe %*'#13#10 ;
{ Save the final file }
commit 1336053aae54266c0a99970cfab17313c21bbab6
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Nov 13 14:53:15 2014 -0800
Switch sed for perl in libtool-archive cleanup.
diff --git a/functions.sh b/functions.sh
index 620b40b..d047811 100644
--- a/functions.sh
+++ b/functions.sh
@@ -319,11 +319,11 @@ function fix_lt_file () {
target_dir="$1"/`echo $(dirname "$filename") | sed -e"s;$1/;;"`
global_udir=`unix_path ${GLOBAL_DIR}`
- sed -i'.bak' -E \
- -e"s;-L$orig_dir;-L$target_dir;g" \
- -e"s;([/a-z0-9A-Z:_-]+)/lib([a-zA-Z0-9._-]+)\.la;-L\1 -l\2;g" \
- -e"s;^libdir=.*$;libdir='$target_dir';" \
- -e"s;(/c|c:)/gcdev/;$global_udir/;g" \
+ perl -pi.bak \
+ -e"s{-L$orig_dir}{-L$target_dir}g;" \
+ -e"s{([/a-z0-9A-Z:_-]+)/lib([a-zA-Z0-9._-]+)\.la}{-L\1 -l\2}g;" \
+ -e"s{^libdir=.*$}{libdir='$target_dir'};" \
+ -e"s{(/c|c:)/gcdev/}{$global_udir/}g" \
$filename
}
commit cc7e9ac9d8ad941d89cb9db2d453315733137ae4
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Nov 9 18:17:49 2014 -0800
Add libtiff and libjpeg to the collection of precompiled packages
We were using precompiled packages of these before from the Gnome binary
collection, but that libtiff had an obsolete link request to
libjpeg-uchar-boolean-8.dll. These editions are compiled from the latest
sources and should avoid the bad rpath.
diff --git a/defaults.sh b/defaults.sh
index f8ce978..81056a2 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -255,12 +255,10 @@ set_default LIBART_LGPL_DEV_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart-lgp
set_default LIBGNOMECANVAS_URL "$GNOME_WIN32_URL/libgnomecanvas/2.30/libgnomecanvas_2.30.1-1_win32.zip"
set_default LIBGNOMECANVAS_DEV_URL "$GNOME_WIN32_URL/libgnomecanvas/2.30/libgnomecanvas-dev_2.30.1-1_win32.zip"
set_default LIBICONV_URL "$GNOME_WIN32_DEPS_URL/libiconv-1.9.1.bin.woe32.zip"
-set_default LIBJPEG_URL "$SF_MIRROR/gnucash/jpeg_7-1-fixed-win32.zip"
-set_default LIBJPEG_DEV_URL "$GNOME_WIN32_DEPS_URL/jpeg-dev_7-1_win32.zip"
set_default LIBPNG_URL "$GNOME_WIN32_DEPS_URL/libpng_1.4.3-1_win32.zip"
set_default LIBPNG_DEV_URL "$GNOME_WIN32_DEPS_URL/libpng-dev_1.4.3-1_win32.zip"
-set_default LIBTIFF_URL "$GNOME_WIN32_DEPS_URL/libtiff_3.9.2-1_win32.zip"
-set_default LIBTIFF_DEV_URL "$GNOME_WIN32_DEPS_URL/libtiff-dev_3.9.2-1_win32.zip"
+set_default LIBTIFF_URL "$GC_DEPS_URL/tiff-4.0.3-mingw.tgz"
+set_default LIBTIFF_DEV_URL "$GC_DEPS_URL/tiff-4.0.3-dev-mingw.tgz"
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 PKG_CONFIG_URL "$GNOME_WIN32_DEPS_URL/pkg-config_0.25-1_win32.zip"
diff --git a/dist-impl.sh b/dist-impl.sh
index f4fe538..f762c88 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -97,7 +97,6 @@ function dist_gnome() {
wget_unpacked $LIBGNOMECANVAS_URL $DOWNLOAD_DIR $DIST_DIR
smart_wget $LIBICONV_URL $DOWNLOAD_DIR
unzip -q $LAST_FILE bin/iconv.dll -d $DIST_DIR
- wget_unpacked $LIBJPEG_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBPNG_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBTIFF_URL $DOWNLOAD_DIR $DIST_DIR
#wget_unpacked $LIBXML2_URL $DOWNLOAD_DIR $DIST_DIR
diff --git a/install-impl.sh b/install-impl.sh
index 32236f7..6f4f7af 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -378,8 +378,6 @@ function inst_gnome() {
wget_unpacked $LIBART_LGPL_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBGNOMECANVAS_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBGNOMECANVAS_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBJPEG_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBJPEG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBPNG_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBPNG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBTIFF_URL $DOWNLOAD_DIR $GNOME_DIR
commit 5997773ecde99e5e7caf6efa0571020e9d72fc1e
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Nov 9 14:38:19 2014 -0800
Rewrite /c/gcdev/ to $GLOBAL_DIR in targeted libtool archives.
* Ensures all directly-linked libtool archives in "dependency_libs" are
linked from the right directory
* Reduces the number of "appears to have been moved" warnings.
diff --git a/functions.sh b/functions.sh
index 4502268..620b40b 100644
--- a/functions.sh
+++ b/functions.sh
@@ -317,8 +317,14 @@ function fix_lt_file () {
orig_dir=`grep ^libdir= $filename | cut -d "'" -f 2`
orig_dir=`dirname $orig_dir`
target_dir="$1"/`echo $(dirname "$filename") | sed -e"s;$1/;;"`
-
- sed -i'.bak' -E -e"s;-L$orig_dir;-L$target_dir;g" -e"s;([/a-z0-9A-Z:_-]+)/lib([a-zA-Z0-9._-]+)\.la;-L\1 -l\2;g" -e"s;^libdir=.*$;libdir='$target_dir';" $filename
+ global_udir=`unix_path ${GLOBAL_DIR}`
+
+ sed -i'.bak' -E \
+ -e"s;-L$orig_dir;-L$target_dir;g" \
+ -e"s;([/a-z0-9A-Z:_-]+)/lib([a-zA-Z0-9._-]+)\.la;-L\1 -l\2;g" \
+ -e"s;^libdir=.*$;libdir='$target_dir';" \
+ -e"s;(/c|c:)/gcdev/;$global_udir/;g" \
+ $filename
}
function fix_libtool_files () {
diff --git a/install-impl.sh b/install-impl.sh
index d71338b..32236f7 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1149,6 +1149,7 @@ function inst_webkit() {
mkdir -p $_WEBKIT_UDIR
wget_unpacked $WEBKIT_URL $DOWNLOAD_DIR $WEBKIT_DIR
wget_unpacked $WEBKIT_DEV_URL $DOWNLOAD_DIR $WEBKIT_DIR
+ fix_libtool_files ${_WEBKIT_UDIR}
fi
quiet ${PKG_CONFIG} --exists webkit-1.0 || die "webkit not installed correctly"
rm -rf ${TMP_UDIR}/webkit-*
commit 78737c6181429ffa13173ef6d604dbcb91d9d2dd
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Nov 7 15:23:11 2014 -0800
Rewrite libtool link files (libfoo.la) for certain cached-build directories.
To always point to the current installation directory.
* Ensures that build targets linking those files always have a valid and
correct path.
* Reduces the number of "appears to have moved" warnings.
diff --git a/functions.sh b/functions.sh
index 859b92f..4502268 100644
--- a/functions.sh
+++ b/functions.sh
@@ -312,6 +312,26 @@ function get_major_minor () {
major_minor=$(perl -e '($maj,$min,$rest) = <> =~ /([0-9]*)[.]([0-9]*)(.*)/; print $maj*100+$min;' <<< $version)
}
+function fix_lt_file () {
+ filename="$2";
+ orig_dir=`grep ^libdir= $filename | cut -d "'" -f 2`
+ orig_dir=`dirname $orig_dir`
+ target_dir="$1"/`echo $(dirname "$filename") | sed -e"s;$1/;;"`
+
+ sed -i'.bak' -E -e"s;-L$orig_dir;-L$target_dir;g" -e"s;([/a-z0-9A-Z:_-]+)/lib([a-zA-Z0-9._-]+)\.la;-L\1 -l\2;g" -e"s;^libdir=.*$;libdir='$target_dir';" $filename
+}
+
+function fix_libtool_files () {
+if test -n "$1" -a -d "$1"; then
+ for i in `find "$1" -name *.la`; do
+ fix_lt_file $1 $i
+ done
+else
+ echo "Can't find directory $1"
+ exit 1
+fi
+}
+
### Local Variables: ***
### mode: shell-script ***
### sh-basic-offset: 4 ***
diff --git a/install-impl.sh b/install-impl.sh
index 07ab6c6..d71338b 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -412,9 +412,6 @@ function inst_gnome() {
sed '1s,!.*perl,!'"perl"',;s,/opt/gnu/bin/iconv,iconv,' $file > tmp
mv tmp $file
done
-
- # remove *.la files. They are hindering the build
- rm -f lib/*.la
qpopd
if quiet ${PKG_CONFIG} --exact-version=${LIBXML2_VERSION} libxml-2.0 ; then
@@ -439,6 +436,7 @@ function inst_gnome() {
perl -pi.bak -e"s!^prefix=.*\$!prefix=$_GNOME_UDIR!" *.pc
#perl -pi.bak -e's!^Libs: !Libs: -L\${prefix}/bin !' *.pc
qpopd
+ fix_libtool_files ${_GNOME_UDIR}
quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-2.0 || die "gnome not installed correctly: no gtk+-2.0 with atleast-version=${GTK_VERSION}"
quiet ${PKG_CONFIG} --atleast-version=${CAIRO_VERSION} cairo || die "gnome not installed correctly: no cairo with atleast-version=${CAIRO_VERSION}"
@@ -500,6 +498,7 @@ function inst_gnutls() {
mkdir -p $_GNUTLS_UDIR
wget_unpacked $GNUTLS_URL $DOWNLOAD_DIR $GNUTLS_DIR
wget_unpacked $GNUTLS_DEV_URL $DOWNLOAD_DIR $GNUTLS_DIR
+ fix_libtool_files ${_GNUTLS_UDIR}
fi
quiet ${PKG_CONFIG} --exists gnutls || die "GNUTLS not installed correctly"
fi
@@ -651,6 +650,7 @@ function inst_gwenhywfar() {
rm -rf ${_GWENHYWFAR_UDIR}
make install
qpopd
+# fix_libtool_files ${_GWENHYWFAR_UDIR}
${PKG_CONFIG} --exists gwenhywfar || die "Gwenhywfar not installed correctly"
rm -rf ${TMP_UDIR}/gwenhywfar-*
fi
@@ -912,10 +912,11 @@ function inst_libsoup() {
make
make install
qpopd
- else
+ else
mkdir -p $_LIBSOUP_UDIR
wget_unpacked $LIBSOUP_URL $DOWNLOAD_DIR $LIBSOUP_DIR
wget_unpacked $LIBSOUP_DEV_URL $DOWNLOAD_DIR $LIBSOUP_DIR
+ fix_libtool_files ${_LIBSOUP_UDIR}
fi
quiet ${PKG_CONFIG} --exists libsoup-2.4 || die "libsoup not installed correctly"
rm -rf ${TMP_UDIR}/libsoup-*
commit d3c86ed81ff624f598771eb38f7f6e581136eeb7
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Nov 2 15:58:52 2014 -0800
Get rid of some of the libfoo.la has moved warnings.
The warning is caused by finding the libtool-lib on a different path than
the one encoded in its libdir statement; it's a purely lexical check,
so if the mingw version, /c/gcdev is given in the -L directive and c:/gcdev
is in the libdir statement, libtool will issue the warning.
The only one remaining is libintl, which is usually found with /c/gcdev/mingw/lib
but whose libdir=/mingw.
Unfortunately just about every other library links to this so it's issued
a lot.
diff --git a/functions.sh b/functions.sh
index a633073..859b92f 100644
--- a/functions.sh
+++ b/functions.sh
@@ -41,6 +41,7 @@ function qpushd() { pushd "$@" >/dev/null; }
function qpopd() { popd >/dev/null; }
function win_fs_path() { echo "$*" | sed 's,\\,/,g'; }
function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
+function unix_ldpath() { echo "$*" | sed 's,\\,/,g'; }
# usage: wpwd [rel]
# rel can be any relative path
diff --git a/install-impl.sh b/install-impl.sh
index a1d3d30..07ab6c6 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -53,6 +53,7 @@ function inst_prepare() {
function inst_msys() {
setup MSys
_MINGW_UDIR=`unix_path $MINGW_DIR`
+ _MINGW_LDDIR=/mingw/lib
_MSYS_UDIR=`unix_path $MSYS_DIR`
add_to_env $_MINGW_UDIR/bin PATH
add_to_env $_MSYS_UDIR/bin PATH
@@ -543,9 +544,10 @@ function inst_guile() {
setup Guile
_GUILE_WFSDIR=`win_fs_path $GUILE_DIR`
_GUILE_UDIR=`unix_path $GUILE_DIR`
+ _GUILE_LDDIR=`unix_ldpath $GUILE_DIR`
_WIN_UDIR=`unix_path $WINDIR`
add_to_env -I$_GUILE_UDIR/include GUILE_CPPFLAGS
- add_to_env -L$_GUILE_UDIR/lib GUILE_LDFLAGS
+ add_to_env -L$_GUILE_LDDIR/lib GUILE_LDFLAGS
add_to_env $_GUILE_UDIR/bin PATH
add_to_env ${_GUILE_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
if quiet guile -c '(use-modules (srfi srfi-39))' &&
@@ -1334,7 +1336,7 @@ function inst_gnucash() {
--enable-locale-specific-tax \
${_EXTRA_OPTIONS} \
CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GUILE_CPPFLAGS} ${LIBDBI_CPPFLAGS} ${KTOBLZCHECK_CPPFLAGS} ${HH_CPPFLAGS} ${LIBSOUP_CPPFLAGS} -D_WIN32 ${EXTRA_CFLAGS}" \
- LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} ${HH_LDFLAGS} -L${_SQLITE3_UDIR}/lib -L${_ENCHANT_UDIR}/lib -L${_LIBXSLT_UDIR}/lib -L${_MINGW_UDIR}/lib" \
+ LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} ${HH_LDFLAGS} -L${_SQLITE3_UDIR}/lib -L${_ENCHANT_UDIR}/lib -L${_LIBXSLT_UDIR}/lib -L${_MINGW_LDDIR}" \
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
make
commit ee916ce5fc94e95c297f3c7de545ae7b3cc5960d
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Nov 2 09:44:12 2014 -0800
Fix up libgnutls installation when building from source.
We don't actually build libgnutls from source, so we need to create the
directory for it. The .la files it provides contain the builder's paths
which screws up libtool later, so delete them.
diff --git a/defaults.sh b/defaults.sh
index dad724c..f8ce978 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -210,7 +210,7 @@ GNUTLS_VERSION="3.2.19"
set_default BUILD_GNUTLS_FROM_SOURCE "no"
set_default GNUTLS_URL "$GC_DEPS_URL/gnutls-3.2.19-minGW.tgz"
set_default GNUTLS_DEV_URL "$GC_DEPS_URL/gnutls-3.2.19-dev-minGW.tgz"
-set_default GNUTLS_SRC_URL "ftp://ftp.gnutls.org/gcrypt/gnutls/w32/gnutls-${GNUTLS_VERSION}-w32.zip"
+set_default GNUTLS_PKG_URL "ftp://ftp.gnutls.org/gcrypt/gnutls/w32/gnutls-${GNUTLS_VERSION}-w32.zip"
GCRYPT_VERSION="1.6.2"
set_default GCRYPT_SRC_URL "ftp://ftp.gnutls.org/gcrypt/libgcrypt/libgcrypt-${GCRYPT_VERSION}.tar.bz2"
GPG_ERROR_VERSION="1.17"
diff --git a/install-impl.sh b/install-impl.sh
index cbe1bcd..a1d3d30 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -459,10 +459,12 @@ function inst_gnutls() {
echo "GNUTLS already installed in $_GNUTLS_UDIR. skipping."
else
if [ "$BUILD_GNUTLS_FROM_SOURCE" = "yes" ]; then
- wget_unpacked $GNUTLS_URL $DOWNLOAD_DIR $GNUTLS_DIR
+ mkdir -p $_GNUTLS_UDIR
+ wget_unpacked $GNUTLS_PKG_URL $DOWNLOAD_DIR $GNUTLS_DIR
wget_unpacked $GCRYPT_SRC_URL $DOWNLOAD_DIR $TMP_DIR
wget_unpacked $GPG_ERROR_SRC_URL $DOWNLOAD_DIR $TMP_DIR
wget_unpacked $GLIB_NETWORKING_SRC_URL $DOWNLOAD_DIR $TMP_DIR
+ rm $_GNUTLS_UDIR/lib/*.la
assert_one_dir $TMP_UDIR/libgcrypt-*
assert_one_dir $TMP_UDIR/libgpg-error-*
assert_one_dir $TMP_UDIR/glib-networking-*
commit 78f4b59eb732258f3504ff5de6c71c43ba7be5f0
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Nov 2 09:41:12 2014 -0800
Build glib-networking (required by libsoup) in gnutls.
Ensure that its version is coordinated with glib's by using new variable
GLIB_VERSION for both.
diff --git a/defaults.sh b/defaults.sh
index b8f090d..dad724c 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -205,6 +205,7 @@ set_default GUILE_PATCH `pwd`/guile-1.8.patch
set_default OPENSSL_URL "http://www.openssl.org/source/openssl-0.9.8j.tar.gz"
set_default OPENSSL_DIR $GLOBAL_DIR\\openssl
+GLIB_VERSION="2.38.2"
GNUTLS_VERSION="3.2.19"
set_default BUILD_GNUTLS_FROM_SOURCE "no"
set_default GNUTLS_URL "$GC_DEPS_URL/gnutls-3.2.19-minGW.tgz"
@@ -214,6 +215,7 @@ GCRYPT_VERSION="1.6.2"
set_default GCRYPT_SRC_URL "ftp://ftp.gnutls.org/gcrypt/libgcrypt/libgcrypt-${GCRYPT_VERSION}.tar.bz2"
GPG_ERROR_VERSION="1.17"
set_default GPG_ERROR_SRC_URL "ftp://ftp.gnutls.org/gcrypt/libgpg-error/libgpg-error-${GPG_ERROR_VERSION}.tar.bz2"
+set_default GLIB_NETWORKING_SRC_URL "$GNOME_MIRROR/sources/glib-networking/2.38/glib-networking-${GLIB_VERSION}.tar.xz"
set_default GNUTLS_DIR $GLOBAL_DIR\\gnutls
set_default MINGW_UTILS_URL "$SF_MIRROR/mingw/mingw-utils-0.3.tar.gz"
@@ -263,8 +265,8 @@ set_default LIBXML2_URL "$GNOME_WIN32_DEPS_URL/libxml2_2.7.7-1_win32
set_default LIBXML2_DEV_URL "$GNOME_WIN32_DEPS_URL/libxml2-dev_2.7.7-1_win32.zip"
set_default PKG_CONFIG_URL "$GNOME_WIN32_DEPS_URL/pkg-config_0.25-1_win32.zip"
set_default PKG_CONFIG_DEV_URL "$GNOME_WIN32_DEPS_URL/pkg-config-dev_0.25-1_win32.zip"
-set_default GLIB_URL "$GC_DEPS_URL/glib-2.38.2-minGW.tgz"
-set_default GLIB_DEV_URL "$GC_DEPS_URL/glib-2.38.2-dev-minGW.tgz"
+set_default GLIB_URL "$GC_DEPS_URL/glib-$GLIB_VERSION-minGW.tgz"
+set_default GLIB_DEV_URL "$GC_DEPS_URL/glib-$GLIB_VERSION-dev-minGW.tgz"
set_default CAIRO_VERSION="1.10.2"
set_default CAIRO_URL "$GC_DEPS_URL/cairo-1.10.2-minGW.tgz"
set_default CAIRO_DEV_URL "$GC_DEPS_URL/cairo-1.10.2-dev-minGW.tgz"
diff --git a/install-impl.sh b/install-impl.sh
index cd2d831..cbe1bcd 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -462,9 +462,10 @@ function inst_gnutls() {
wget_unpacked $GNUTLS_URL $DOWNLOAD_DIR $GNUTLS_DIR
wget_unpacked $GCRYPT_SRC_URL $DOWNLOAD_DIR $TMP_DIR
wget_unpacked $GPG_ERROR_SRC_URL $DOWNLOAD_DIR $TMP_DIR
- mydir=`pwd`
+ wget_unpacked $GLIB_NETWORKING_SRC_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/libgcrypt-*
assert_one_dir $TMP_UDIR/libgpg-error-*
+ assert_one_dir $TMP_UDIR/glib-networking-*
qpushd $TMP_UDIR/libgpg-error-*
sed -i'' s/ro// po/LINGUAS #Converting ro.po to UTF8 hangs
./configure ${HOST_XCOMPILE} --prefix=$_GNUTLS_UDIR --disable-nls \
@@ -481,6 +482,16 @@ function inst_gnutls() {
make
make install
qpopd
+ qpushd $TMP_UDIR/glib-networking-*
+ ./configure ${HOST_XCOMPILE} --prefix=$_GNUTLS_UDIR \
+ --with-ca-certificates=no \
+ --with-pkcs11=no \
+ CPPFLAGS="${GNOME_CPPFLAGS}" \
+ LDFLAGS="${GNOME_LDFLAGS}"
+ make
+ make install
+ qpopd
+
rm -f $_GNUTLS_UDIR/lib/*.la
else
mkdir -p $_GNUTLS_UDIR
commit 35930b69123304195109db89b35ab749c1e56d6a
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Nov 2 09:36:23 2014 -0800
Fix hang when building libgpg-error.
diff --git a/install-impl.sh b/install-impl.sh
index 426286f..cd2d831 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -466,6 +466,7 @@ function inst_gnutls() {
assert_one_dir $TMP_UDIR/libgcrypt-*
assert_one_dir $TMP_UDIR/libgpg-error-*
qpushd $TMP_UDIR/libgpg-error-*
+ sed -i'' s/ro// po/LINGUAS #Converting ro.po to UTF8 hangs
./configure ${HOST_XCOMPILE} --prefix=$_GNUTLS_UDIR --disable-nls \
--disable-languages \
CPPFLAGS="${GNOME_CPPFLAGS}" \
commit 8fd8089355ea852314be3c2b41ee87a5f01c71e2
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Nov 1 12:05:44 2014 -0700
Install GnuTLS from prebuilt tarballs, optionally build from source.
NB: Building from source requires manual intervention as libgpg-error's
ro.po requires conversion from ISO8859-2 to UTF8, which causes a hang.
diff --git a/defaults.sh b/defaults.sh
index 7dbb2fb..b8f090d 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -206,7 +206,10 @@ set_default OPENSSL_URL "http://www.openssl.org/source/openssl-0.9.8j.tar.gz"
set_default OPENSSL_DIR $GLOBAL_DIR\\openssl
GNUTLS_VERSION="3.2.19"
-set_default GNUTLS_URL "ftp://ftp.gnutls.org/gcrypt/gnutls/w32/gnutls-${GNUTLS_VERSION}-w32.zip"
+set_default BUILD_GNUTLS_FROM_SOURCE "no"
+set_default GNUTLS_URL "$GC_DEPS_URL/gnutls-3.2.19-minGW.tgz"
+set_default GNUTLS_DEV_URL "$GC_DEPS_URL/gnutls-3.2.19-dev-minGW.tgz"
+set_default GNUTLS_SRC_URL "ftp://ftp.gnutls.org/gcrypt/gnutls/w32/gnutls-${GNUTLS_VERSION}-w32.zip"
GCRYPT_VERSION="1.6.2"
set_default GCRYPT_SRC_URL "ftp://ftp.gnutls.org/gcrypt/libgcrypt/libgcrypt-${GCRYPT_VERSION}.tar.bz2"
GPG_ERROR_VERSION="1.17"
diff --git a/install-impl.sh b/install-impl.sh
index 0b9676b..426286f 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -458,28 +458,34 @@ function inst_gnutls() {
then
echo "GNUTLS already installed in $_GNUTLS_UDIR. skipping."
else
- wget_unpacked $GNUTLS_URL $DOWNLOAD_DIR $GNUTLS_DIR
- wget_unpacked $GCRYPT_SRC_URL $DOWNLOAD_DIR $TMP_DIR
- wget_unpacked $GPG_ERROR_SRC_URL $DOWNLOAD_DIR $TMP_DIR
- mydir=`pwd`
- assert_one_dir $TMP_UDIR/libgcrypt-*
- assert_one_dir $TMP_UDIR/libgpg-error-*
- qpushd $TMP_UDIR/libgpg-error-*
- ./configure ${HOST_XCOMPILE} --prefix=$_GNUTLS_UDIR --disable-nls \
- --disable-languages \
- CPPFLAGS="${GNOME_CPPFLAGS}" \
- LDFLAGS="${GNOME_LDFLAGS}"
- make
- make install
- qpopd
- qpushd $TMP_UDIR/libgcrypt-*
- ./configure ${HOST_XCOMPILE} --prefix=$_GNUTLS_UDIR \
- CPPFLAGS="${GNOME_CPPFLAGS}" \
- LDFLAGS="${GNOME_LDFLAGS}"
- make
- make install
- qpopd
- rm -f $_GNUTLS_UDIR/lib/*.la
+ if [ "$BUILD_GNUTLS_FROM_SOURCE" = "yes" ]; then
+ wget_unpacked $GNUTLS_URL $DOWNLOAD_DIR $GNUTLS_DIR
+ wget_unpacked $GCRYPT_SRC_URL $DOWNLOAD_DIR $TMP_DIR
+ wget_unpacked $GPG_ERROR_SRC_URL $DOWNLOAD_DIR $TMP_DIR
+ mydir=`pwd`
+ assert_one_dir $TMP_UDIR/libgcrypt-*
+ assert_one_dir $TMP_UDIR/libgpg-error-*
+ qpushd $TMP_UDIR/libgpg-error-*
+ ./configure ${HOST_XCOMPILE} --prefix=$_GNUTLS_UDIR --disable-nls \
+ --disable-languages \
+ CPPFLAGS="${GNOME_CPPFLAGS}" \
+ LDFLAGS="${GNOME_LDFLAGS}"
+ make
+ make install
+ qpopd
+ qpushd $TMP_UDIR/libgcrypt-*
+ ./configure ${HOST_XCOMPILE} --prefix=$_GNUTLS_UDIR \
+ CPPFLAGS="${GNOME_CPPFLAGS}" \
+ LDFLAGS="${GNOME_LDFLAGS}"
+ make
+ make install
+ qpopd
+ rm -f $_GNUTLS_UDIR/lib/*.la
+ else
+ mkdir -p $_GNUTLS_UDIR
+ wget_unpacked $GNUTLS_URL $DOWNLOAD_DIR $GNUTLS_DIR
+ wget_unpacked $GNUTLS_DEV_URL $DOWNLOAD_DIR $GNUTLS_DIR
+ fi
quiet ${PKG_CONFIG} --exists gnutls || die "GNUTLS not installed correctly"
fi
[ ! -d $_GNUTLS_UDIR/share/aclocal ] || add_to_env "-I $_GNUTLS_UDIR/share/aclocal" ACLOCAL_FLAGS
@@ -876,20 +882,20 @@ function inst_libsoup() {
echo "libsoup already installed in $_LIBSOUP_UDIR. skipping."
else
if [ "$BUILD_LIBSOUP_FROM_SOURCE" = "yes" ]; then
- wget_unpacked $LIBSOUP_SRC_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/libsoup-*
- qpushd $TMP_UDIR/libsoup-*
- patch -p1 < $LIBSOUP_BAD_SYMBOL_PATCH
+ wget_unpacked $LIBSOUP_SRC_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/libsoup-*
+ qpushd $TMP_UDIR/libsoup-*
+ patch -p1 < $LIBSOUP_BAD_SYMBOL_PATCH
patch -p1 < $LIBSOUP_RESERVED_WORD_PATCH
- ./configure ${HOST_XCOMPILE} \
- --prefix=${_LIBSOUP_UDIR} \
- --disable-gtk-doc \
- --without-gnome \
- CPPFLAGS=-I${_GNOME_UDIR}/include \
- LDFLAGS="-L${_GNOME_UDIR}/lib -Wl,-s -lz"
- make
- make install
- qpopd
+ ./configure ${HOST_XCOMPILE} \
+ --prefix=${_LIBSOUP_UDIR} \
+ --disable-gtk-doc \
+ --without-gnome \
+ CPPFLAGS=-I${_GNOME_UDIR}/include \
+ LDFLAGS="-L${_GNOME_UDIR}/lib -Wl,-s -lz"
+ make
+ make install
+ qpopd
else
mkdir -p $_LIBSOUP_UDIR
wget_unpacked $LIBSOUP_URL $DOWNLOAD_DIR $LIBSOUP_DIR
commit d5ec7463af40ce393e1fab36da70c826c67e27a3
Author: John Ralls <jralls at ceridwen.us>
Date: Wed Oct 29 22:55:00 2014 -0700
Update LibSoup version for new WebKit and fix build.
Includes:
* Providing for downloading prebuilt Libsoup instead of building
* Patches for Libsoup bugs
* adjusting the SQLITE_CFLAGS and SQLITE_LIBS to match what LibSoup's
configure looks for.
* Second WebKit patch and some comments about what's needed to build it.
diff --git a/0002-webkit-second-MinGW.patch b/0002-webkit-second-MinGW.patch
new file mode 100644
index 0000000..9a4df0f
--- /dev/null
+++ b/0002-webkit-second-MinGW.patch
@@ -0,0 +1,77 @@
+From 71465d31b0531f79c74964b47521adeb25f9b462 Mon Sep 17 00:00:00 2001
+From: John Ralls <jralls at ceridwen.us>
+Date: Sat, 1 Nov 2014 11:59:24 -0700
+Subject: [PATCH 2/2] webkit second MinGW
+
+Adds some minor fixes that escaped the first patch
+---
+ .../platform/image-decoders/jpeg/JPEGImageDecoder.cpp | 3 +++
+ .../WebKit/gtk/WebCoreSupport/TextCheckerClientGtk.cpp | 2 +-
+ Source/WebKit/gtk/webkit/webkitspellcheckerenchant.cpp | 16 ++++++++--------
+ 3 files changed, 12 insertions(+), 9 deletions(-)
+
+diff --git a/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp b/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
+index f0fbe44..7eddeaf 100644
+--- a/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
++++ b/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
+@@ -56,6 +56,9 @@
+ #endif
+
+ extern "C" {
++#ifdef __MINGW32__
++#define HAVE_BOOLEAN
++#endif
+ #include "jpeglib.h"
+ #if USE(ICCJPEG)
+ #include "iccjpeg.h"
+diff --git a/Source/WebKit/gtk/WebCoreSupport/TextCheckerClientGtk.cpp b/Source/WebKit/gtk/WebCoreSupport/TextCheckerClientGtk.cpp
+index 6dbb48f..cecb20e 100644
+--- a/Source/WebKit/gtk/WebCoreSupport/TextCheckerClientGtk.cpp
++++ b/Source/WebKit/gtk/WebCoreSupport/TextCheckerClientGtk.cpp
+@@ -56,7 +56,7 @@ void TextCheckerClientGtk::learnWord(const String& text)
+
+ void TextCheckerClientGtk::checkSpellingOfString(const UChar* text, int length, int* misspellingLocation, int* misspellingLength)
+ {
+- GOwnPtr<gchar> utf8Text(g_utf16_to_utf8(const_cast<gunichar2*>(text), length, 0, 0, 0));
++ GOwnPtr<gchar> utf8Text(g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(text), length, 0, 0, 0));
+ webkit_spell_checker_check_spelling_of_string(m_spellChecker.get(), utf8Text.get(), misspellingLocation, misspellingLength);
+ }
+
+diff --git a/Source/WebKit/gtk/webkit/webkitspellcheckerenchant.cpp b/Source/WebKit/gtk/webkit/webkitspellcheckerenchant.cpp
+index 6a08c44..5488bb5 100644
+--- a/Source/WebKit/gtk/webkit/webkitspellcheckerenchant.cpp
++++ b/Source/WebKit/gtk/webkit/webkitspellcheckerenchant.cpp
+@@ -41,7 +41,7 @@ struct _WebKitSpellCheckerEnchantPrivate {
+ GSList* enchantDicts;
+ };
+
+-static void webkit_spell_checker_enchant_spell_checker_interface_init(WebKitSpellCheckerInterface* interface);
++static void webkit_spell_checker_enchant_spell_checker_interface_init(WebKitSpellCheckerInterface* iface);
+
+ G_DEFINE_TYPE_WITH_CODE(WebKitSpellCheckerEnchant, webkit_spell_checker_enchant, G_TYPE_OBJECT,
+ G_IMPLEMENT_INTERFACE(WEBKIT_TYPE_SPELL_CHECKER,
+@@ -259,14 +259,14 @@ static void ignoreWord(WebKitSpellChecker* checker, const char* word)
+ }
+ }
+
+-static void webkit_spell_checker_enchant_spell_checker_interface_init(WebKitSpellCheckerInterface* interface)
++static void webkit_spell_checker_enchant_spell_checker_interface_init(WebKitSpellCheckerInterface* iface)
+ {
+- interface->check_spelling_of_string = checkSpellingOfString;
+- interface->get_guesses_for_word = getGuessesForWord;
+- interface->update_spell_checking_languages = updateSpellCheckingLanguages;
+- interface->get_autocorrect_suggestions_for_misspelled_word = getAutocorrectSuggestionsForMisspelledWord;
+- interface->learn_word = learnWord;
+- interface->ignore_word = ignoreWord;
++ iface->check_spelling_of_string = checkSpellingOfString;
++ iface->get_guesses_for_word = getGuessesForWord;
++ iface->update_spell_checking_languages = updateSpellCheckingLanguages;
++ iface->get_autocorrect_suggestions_for_misspelled_word = getAutocorrectSuggestionsForMisspelledWord;
++ iface->learn_word = learnWord;
++ iface->ignore_word = ignoreWord;
+ }
+
+ #endif /* ENABLE(SPELLCHECK) */
+--
+1.9.4.msysgit.0
+
diff --git a/defaults.sh b/defaults.sh
index 6022607..7dbb2fb 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -305,16 +305,20 @@ set_default WEBKIT_DEV_URL "$SF_MIRROR/gnucash/webkit-${WEBKIT_VERSION}-dev-minG
set_default WEBKIT_DIR $GLOBAL_DIR\\webkit
#NB: The Fedora project maintains a source version that has been patched for building in a Fedora-MinGW cross-compiler. This isn't quite good enough to build in MinGW itself, but it's a lot closer and less work than starting with a tarball direct from the WebKitGtk project.
set_default WEBKIT_SRC_URL "https://pkgs.fedoraproject.org/repo/pkgs/mingw-webkitgtk/webkit-1.8.3.tar.xz/dcbf9d5e2e6391f857c29a57528b32a6/webkit-1.8.3.tar.xz"
-set_default WEBKIT_MINGW_PATCH=`pwd`/0001-Fix-various-issues-when-compiling-natively-on-MinGW.patch
+set_default WEBKIT_MINGW_PATCH_1=`pwd`/0001-Fix-various-issues-when-compiling-natively-on-MinGW.patch
+set_default WEBKIT_MINGW_PATCH_2=`pwd`/0002-webkit-second-minGW.patch
set_default ENCHANT_VERSION "1.5.0"
set_default ENCHANT_URL "$GNOME_WIN32_URL/dependencies/enchant_${ENCHANT_VERSION}-2_win32.zip"
set_default ENCHANT_DEV_URL "$GNOME_WIN32_URL/dependencies/enchant-dev_${ENCHANT_VERSION}-2_win32.zip"
set_default ENCHANT_DIR $GLOBAL_DIR\\enchant
-set_default LIBSOUP_VERSION "2.34.3"
-set_default LIBSOUP_URL "$GNOME_WIN32_URL/libsoup/2.34/libsoup-${LIBSOUP_VERSION}-1_win32.zip"
-set_default LIBSOUP_DEV_URL "$GNOME_WIN32_URL/libsoup/2.34/libsoup-dev-${LIBSOUP_VERSION}-1_win32.zip"
+set_default BUILD_LIBSOUP_FROM_SOURCE no
+set_default LIBSOUP_VERSION "2.48.0"
+set_default LIBSOUP_URL "$SF_MIRROR/gnucash/libsoup-${LIBSOUP_VERSION}-minGW.tgz"
+set_default LIBSOUP_DEV_URL "$SF_MIRROR/gnucash/libsoup-${LIBSOUP_VERSION}-dev-minGW.tgz"
set_default LIBSOUP_DIR $GLOBAL_DIR\\libsoup
-set_default LIBSOUP_SRC_URL "$GNOME_MIRROR/sources/libsoup/2.34/libsoup-${LIBSOUP_VERSION}.tar.bz2"
+set_default LIBSOUP_SRC_URL "$GNOME_MIRROR/sources/libsoup/2.48/libsoup-${LIBSOUP_VERSION}.tar.xz"
+set_default LIBSOUP_BAD_SYMBOL_PATCH `pwd`/libsoup-2.48.0-bad-symbol.patch
+set_default LIBSOUP_RESERVED_WORD_PATCH `pwd`/libsoup-2.48.0-soup-server-reserved-word.patch
set_default ICU4C_URL "http://download.icu-project.org/files/icu4c/4.4.1/icu4c-4_4_1-Win32-msvc9.zip"
set_default ICU4C_SRC_URL "http://download.icu-project.org/files/icu4c/4.4.1/icu4c-4_4_1-src.tgz"
set_default ICU4C_DIR $GLOBAL_DIR\\icu-mingw32
diff --git a/install-impl.sh b/install-impl.sh
index 1a9c210..0b9676b 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -692,8 +692,8 @@ function inst_libdbi() {
_LIBDBI_DRIVERS_UDIR=`unix_path ${LIBDBI_DRIVERS_DIR}`
add_to_env -I$_LIBDBI_UDIR/include LIBDBI_CPPFLAGS
add_to_env -L$_LIBDBI_UDIR/lib LIBDBI_LDFLAGS
- add_to_env -I${_SQLITE3_UDIR}/include SQLITE3_CFLAGS
- add_to_env -L${_SQLITE3_UDIR}/lib SQLITE3_LDFLAGS
+ add_to_env -I${_SQLITE3_UDIR}/include SQLITE_CFLAGS
+ add_to_env "-L${_SQLITE3_UDIR}/lib -lsqlite3" SQLITE_LIBS
if test -f ${_SQLITE3_UDIR}/bin/libsqlite3-0.dll
then
echo "SQLite3 already installed in $_SQLITE3_UDIR. skipping."
@@ -866,6 +866,7 @@ function inst_libofx() {
fi
}
+#Building LibSoup requires python. Setting $PYTHON isn't sufficient, it must be on the path.
function inst_libsoup() {
setup libsoup
_LIBSOUP_UDIR=`unix_path $LIBSOUP_DIR`
@@ -874,19 +875,26 @@ function inst_libsoup() {
then
echo "libsoup already installed in $_LIBSOUP_UDIR. skipping."
else
+ if [ "$BUILD_LIBSOUP_FROM_SOURCE" = "yes" ]; then
wget_unpacked $LIBSOUP_SRC_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/libsoup-*
qpushd $TMP_UDIR/libsoup-*
+ patch -p1 < $LIBSOUP_BAD_SYMBOL_PATCH
+ patch -p1 < $LIBSOUP_RESERVED_WORD_PATCH
./configure ${HOST_XCOMPILE} \
--prefix=${_LIBSOUP_UDIR} \
--disable-gtk-doc \
--without-gnome \
- --disable-ssl \
CPPFLAGS=-I${_GNOME_UDIR}/include \
LDFLAGS="-L${_GNOME_UDIR}/lib -Wl,-s -lz"
make
make install
qpopd
+ else
+ mkdir -p $_LIBSOUP_UDIR
+ wget_unpacked $LIBSOUP_URL $DOWNLOAD_DIR $LIBSOUP_DIR
+ wget_unpacked $LIBSOUP_DEV_URL $DOWNLOAD_DIR $LIBSOUP_DIR
+ fi
quiet ${PKG_CONFIG} --exists libsoup-2.4 || die "libsoup not installed correctly"
rm -rf ${TMP_UDIR}/libsoup-*
fi
@@ -1068,7 +1076,15 @@ function inst_regex() {
#can most easily get it from
#http://gnuwin32.sourceforge.net/packages.html; install it in
#c:\Programs\GnuWin32.
-#You also need python and ICU.
+#You also need python 2.6+ and ICU 50+
+#Setting $PYTHON isn't sufficient, it must be on the path.
+#Build ICU and install it in /c/gcdev/webkit. Symlink icu*.dll to libicu*.dll.
+#
+#After building and before installing, make the following changes to
+#$(top_builddir)/Source/WebKit/gtk/webkit-1.0.pc:
+#${prefix}/lib -> ${prefix}/bin
+#Libs: ${libdir} -lwebkitgtk-1.0 -> Libs: ${libdir} -lwebkitgtk-1.0-0
+#
function inst_webkit() {
setup WebKit
_WEBKIT_UDIR=`unix_path ${WEBKIT_DIR}`
@@ -1087,16 +1103,18 @@ function inst_webkit() {
add_to_env ${_ACTIVE_PERL_BASE_DIR}/bin PATH
export PERL5LIB=${_ACTIVE_PERL_BASE_DIR}/lib
- patch -p1 -u < $WEBKIT_MINGW_PATCH
+ patch -p1 -u < $WEBKIT_MINGW_PATCH_1
+ patch -p1 -u < $WEBKIT_MINGW_PATCH_2
autoreconf -fis -ISource/autotools -I$GNOME_DIR/share/aclocal
./configure \
--prefix=${_WEBKIT_UDIR} \
--with-target=win32 \
- --with-unicode-backend=glib \
+ --with-gtk=2.0 \
+ --disable-geolocation \
--enable-web-sockets \
--disable-video \
- CPPFLAGS="${GNOME_CPPFLAGS} ${SQLITE3_CFLAGS}" \
- LDFLAGS="${GNOME_LDFLAGS} ${SQLITE3_LDFLAGS} -lsqlite3" \
+ CPPFLAGS="${GNOME_CPPFLAGS} ${SQLITE_CFLAGS}" \
+ LDFLAGS="${GNOME_LDFLAGS} ${SQLITE_LIBS}" \
PERL="${_ACTIVE_PERL_BASE_DIR}/bin/perl"
cp $WEBKIT_WEBKITENUMTYPES_CPP DerivedSources
cp $WEBKIT_WEBKITENUMTYPES_H Webkit/gtk/webkit
diff --git a/install.sh b/install.sh
index 97e0cfe..8aff08b 100644
--- a/install.sh
+++ b/install.sh
@@ -53,8 +53,8 @@ register_env_var READLINE_CPPFLAGS " "
register_env_var READLINE_LDFLAGS " "
register_env_var REGEX_CPPFLAGS " "
register_env_var REGEX_LDFLAGS " "
-register_env_var SQLITE3_CFLAGS " "
-register_env_var SQLITE3_LDFLAGS " "
+register_env_var SQLITE_CFLAGS " "
+register_env_var SQLITE_LIBS " "
# steps
# There is no reason to ever need to comment these out!
diff --git a/libsoup-2.48.0-bad-symbol.patch b/libsoup-2.48.0-bad-symbol.patch
new file mode 100644
index 0000000..052b8de
--- /dev/null
+++ b/libsoup-2.48.0-bad-symbol.patch
@@ -0,0 +1,10 @@
+--- a/libsoup/libsoup-2.4.sym 2014-10-29 22:37:54 -0700
++++ b/libsoup/libsoup-2.4.sym 2014-06-18 07:42:51 -0700
+@@ -348,7 +348,6 @@
+ soup_server_get_async_context
+ soup_server_get_listener
+ soup_server_get_listeners
+-soup_server_get_gsocket
+ soup_server_get_port
+ soup_server_get_type
+ soup_server_get_uris
diff --git a/libsoup-2.48.0-bad-symbol.patch~ b/libsoup-2.48.0-bad-symbol.patch~
new file mode 100644
index 0000000..ab18c51
--- /dev/null
+++ b/libsoup-2.48.0-bad-symbol.patch~
@@ -0,0 +1,10 @@
+--- libsoup/libsoup-2.4.sym 2014-10-29 22:37:54 -0700
++++ libsoup/libsoup-2.4.sym~ 2014-06-18 07:42:51 -0700
+@@ -348,6 +348,7 @@
+ soup_server_get_async_context
+ soup_server_get_listener
+ soup_server_get_listeners
++soup_server_get_gsocket
+ soup_server_get_port
+ soup_server_get_type
+ soup_server_get_uris
diff --git a/libsoup-2.48.0-soup-server-reserved-word.patch b/libsoup-2.48.0-soup-server-reserved-word.patch
new file mode 100644
index 0000000..c7c0adc
--- /dev/null
+++ b/libsoup-2.48.0-soup-server-reserved-word.patch
@@ -0,0 +1,11 @@
+--- a/libsoup/soup-server.h 2014-10-29 22:51:10 -0700
++++ b/libsoup/soup-server.h 2014-10-30 12:27:08 -0700
+@@ -80,7 +80,7 @@
+
+ SOUP_AVAILABLE_IN_2_48
+ gboolean soup_server_listen (SoupServer *server,
+- GSocketAddress *interface,
++ GSocketAddress *iface,
+ SoupServerListenOptions options,
+ GError **error);
+ SOUP_AVAILABLE_IN_2_48
diff --git a/libsoup-2.48.0-soup-server-reserved-word.patch~ b/libsoup-2.48.0-soup-server-reserved-word.patch~
new file mode 100644
index 0000000..c0afe73
--- /dev/null
+++ b/libsoup-2.48.0-soup-server-reserved-word.patch~
@@ -0,0 +1,11 @@
+--- libsoup/include/libsoup-2.4/libsoup/soup-server.h~ 2014-10-29 22:51:10 -0700
++++ libsoup/include/libsoup-2.4/libsoup/soup-server.h 2014-10-30 12:27:08 -0700
+@@ -80,7 +80,7 @@
+
+ SOUP_AVAILABLE_IN_2_48
+ gboolean soup_server_listen (SoupServer *server,
+- GSocketAddress *interface,
++ GSocketAddress *iface,
+ SoupServerListenOptions options,
+ GError **error);
+ SOUP_AVAILABLE_IN_2_48
commit 177cb4c4da50ef1976fdc7b734334ab915ff0aba
Author: John Ralls <jralls at ceridwen.us>
Date: Wed Oct 29 12:46:04 2014 -0700
Must make the webkit dir before unpacking into it.
diff --git a/install-impl.sh b/install-impl.sh
index b232862..1a9c210 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1105,6 +1105,7 @@ function inst_webkit() {
PATH=$SAVED_PATH
qpopd
else
+ mkdir -p $_WEBKIT_UDIR
wget_unpacked $WEBKIT_URL $DOWNLOAD_DIR $WEBKIT_DIR
wget_unpacked $WEBKIT_DEV_URL $DOWNLOAD_DIR $WEBKIT_DIR
fi
commit befc8f3afdd3b0174661a88560cab320f5512a83
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Oct 27 13:25:17 2014 -0700
Restore libgcrypt to gnutls; included in older binary, not in new one.
diff --git a/defaults.sh b/defaults.sh
index a52165b..6022607 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -207,6 +207,10 @@ set_default OPENSSL_DIR $GLOBAL_DIR\\openssl
GNUTLS_VERSION="3.2.19"
set_default GNUTLS_URL "ftp://ftp.gnutls.org/gcrypt/gnutls/w32/gnutls-${GNUTLS_VERSION}-w32.zip"
+GCRYPT_VERSION="1.6.2"
+set_default GCRYPT_SRC_URL "ftp://ftp.gnutls.org/gcrypt/libgcrypt/libgcrypt-${GCRYPT_VERSION}.tar.bz2"
+GPG_ERROR_VERSION="1.17"
+set_default GPG_ERROR_SRC_URL "ftp://ftp.gnutls.org/gcrypt/libgpg-error/libgpg-error-${GPG_ERROR_VERSION}.tar.bz2"
set_default GNUTLS_DIR $GLOBAL_DIR\\gnutls
set_default MINGW_UTILS_URL "$SF_MIRROR/mingw/mingw-utils-0.3.tar.gz"
diff --git a/install-impl.sh b/install-impl.sh
index 3699109..b232862 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -459,6 +459,26 @@ function inst_gnutls() {
echo "GNUTLS already installed in $_GNUTLS_UDIR. skipping."
else
wget_unpacked $GNUTLS_URL $DOWNLOAD_DIR $GNUTLS_DIR
+ wget_unpacked $GCRYPT_SRC_URL $DOWNLOAD_DIR $TMP_DIR
+ wget_unpacked $GPG_ERROR_SRC_URL $DOWNLOAD_DIR $TMP_DIR
+ mydir=`pwd`
+ assert_one_dir $TMP_UDIR/libgcrypt-*
+ assert_one_dir $TMP_UDIR/libgpg-error-*
+ qpushd $TMP_UDIR/libgpg-error-*
+ ./configure ${HOST_XCOMPILE} --prefix=$_GNUTLS_UDIR --disable-nls \
+ --disable-languages \
+ CPPFLAGS="${GNOME_CPPFLAGS}" \
+ LDFLAGS="${GNOME_LDFLAGS}"
+ make
+ make install
+ qpopd
+ qpushd $TMP_UDIR/libgcrypt-*
+ ./configure ${HOST_XCOMPILE} --prefix=$_GNUTLS_UDIR \
+ CPPFLAGS="${GNOME_CPPFLAGS}" \
+ LDFLAGS="${GNOME_LDFLAGS}"
+ make
+ make install
+ qpopd
rm -f $_GNUTLS_UDIR/lib/*.la
quiet ${PKG_CONFIG} --exists gnutls || die "GNUTLS not installed correctly"
fi
commit 36ba1083dce3977e0113e01823dd550fdbb908b2
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Oct 26 15:58:53 2014 -0700
Update WebKitGtk to a new one built with the current MinGW toolchain.
Provide new patch, URLs, dependencies, etc.
diff --git a/0001-Fix-various-issues-when-compiling-natively-on-MinGW.patch b/0001-Fix-various-issues-when-compiling-natively-on-MinGW.patch
new file mode 100644
index 0000000..8dfad03
--- /dev/null
+++ b/0001-Fix-various-issues-when-compiling-natively-on-MinGW.patch
@@ -0,0 +1,474 @@
+From bf808730aad08b1052db9d2b91fdf79713886db4 Mon Sep 17 00:00:00 2001
+From: John Ralls <jralls at ceridwen.us>
+Date: Sun, 26 Oct 2014 15:39:21 -0700
+Subject: [PATCH] Fix various issues when compiling natively on MinGW.
+
+* On Windows, utf8.h and UTF8.h are the same, so #include <utf8.h> gets
+UTF8.h. Rename the latter to WTF-UTF8.h
+* Like Solaris, Windows needs to include either sys/time.h or time.h.
+* The ICU I18N library is called libicuin instead of libicu18n.
+* DumpRenderTree refused to link until the LDADD and LDFLAGS parameters
+were removed from the makefile. Don't understand why, it just happened
+to work when I was trying to get an error message.
+---
+ Source/JavaScriptCore/API/JSClassRef.cpp | 2 +-
+ Source/JavaScriptCore/API/JSStringRef.cpp | 2 +-
+ .../runtime/JSGlobalObjectFunctions.cpp | 2 +-
+ Source/JavaScriptCore/runtime/UString.cpp | 2 +-
+ Source/JavaScriptCore/tools/CodeProfiling.cpp | 2 +-
+ Source/JavaScriptCore/wtf/text/AtomicString.cpp | 2 +-
+ Source/JavaScriptCore/wtf/text/WTFString.cpp | 2 +-
+ Source/JavaScriptCore/wtf/unicode/UTF8.cpp | 2 +-
+ Source/JavaScriptCore/wtf/unicode/UTF8.h | 84 ----------------------
+ Source/JavaScriptCore/wtf/unicode/WTF-UTF8.h | 84 ++++++++++++++++++++++
+ .../wtf/unicode/glib/UnicodeGLib.cpp | 2 +-
+ Source/WebCore/loader/icon/IconRecord.h | 2 +-
+ Source/WebCore/page/Page.h | 2 +-
+ .../platform/network/ResourceResponseBase.h | 2 +-
+ Source/WebCore/platform/text/String.cpp | 2 +-
+ Source/WebCore/xml/XSLTProcessorLibxslt.cpp | 2 +-
+ Source/WebKit2/Shared/WebString.h | 2 +-
+ Tools/GNUmakefile.am | 34 ++++-----
+ configure.ac | 4 +-
+ 19 files changed, 118 insertions(+), 118 deletions(-)
+ delete mode 100644 Source/JavaScriptCore/wtf/unicode/UTF8.h
+ create mode 100644 Source/JavaScriptCore/wtf/unicode/WTF-UTF8.h
+
+diff --git a/Source/JavaScriptCore/API/JSClassRef.cpp b/Source/JavaScriptCore/API/JSClassRef.cpp
+index 298c734..d375a9d 100644
+--- a/Source/JavaScriptCore/API/JSClassRef.cpp
++++ b/Source/JavaScriptCore/API/JSClassRef.cpp
+@@ -34,7 +34,7 @@
+ #include <runtime/ObjectPrototype.h>
+ #include <runtime/Identifier.h>
+ #include <wtf/text/StringHash.h>
+-#include <wtf/unicode/UTF8.h>
++#include <wtf/unicode/WTF-UTF8.h>
+
+ using namespace std;
+ using namespace JSC;
+diff --git a/Source/JavaScriptCore/API/JSStringRef.cpp b/Source/JavaScriptCore/API/JSStringRef.cpp
+index ea31da6..1acb197 100644
+--- a/Source/JavaScriptCore/API/JSStringRef.cpp
++++ b/Source/JavaScriptCore/API/JSStringRef.cpp
+@@ -28,7 +28,7 @@
+
+ #include "InitializeThreading.h"
+ #include "OpaqueJSString.h"
+-#include <wtf/unicode/UTF8.h>
++#include <wtf/unicode/WTF-UTF8.h>
+
+ using namespace JSC;
+ using namespace WTF::Unicode;
+diff --git a/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp b/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp
+index 204144c..ade2997 100644
+--- a/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp
++++ b/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp
+@@ -42,7 +42,7 @@
+ #include <wtf/Assertions.h>
+ #include <wtf/MathExtras.h>
+ #include <wtf/StringExtras.h>
+-#include <wtf/unicode/UTF8.h>
++#include <wtf/unicode/WTF-UTF8.h>
+
+ using namespace WTF;
+ using namespace Unicode;
+diff --git a/Source/JavaScriptCore/runtime/UString.cpp b/Source/JavaScriptCore/runtime/UString.cpp
+index 5b1e9a0..52e697e 100644
+--- a/Source/JavaScriptCore/runtime/UString.cpp
++++ b/Source/JavaScriptCore/runtime/UString.cpp
+@@ -39,7 +39,7 @@
+ #include <wtf/StringExtras.h>
+ #include <wtf/Vector.h>
+ #include <wtf/dtoa.h>
+-#include <wtf/unicode/UTF8.h>
++#include <wtf/unicode/WTF-UTF8.h>
+
+ #if HAVE(STRINGS_H)
+ #include <strings.h>
+diff --git a/Source/JavaScriptCore/tools/CodeProfiling.cpp b/Source/JavaScriptCore/tools/CodeProfiling.cpp
+index f116038..1017caf 100644
+--- a/Source/JavaScriptCore/tools/CodeProfiling.cpp
++++ b/Source/JavaScriptCore/tools/CodeProfiling.cpp
+@@ -33,7 +33,7 @@
+ #include <signal.h>
+ #endif
+
+-#if OS(LINUX)
++#if OS(LINUX) || defined(__MINGW32__)
+ #include <sys/time.h>
+ #endif
+
+diff --git a/Source/JavaScriptCore/wtf/text/AtomicString.cpp b/Source/JavaScriptCore/wtf/text/AtomicString.cpp
+index d775e7b..f2ef1ab 100644
+--- a/Source/JavaScriptCore/wtf/text/AtomicString.cpp
++++ b/Source/JavaScriptCore/wtf/text/AtomicString.cpp
+@@ -28,7 +28,7 @@
+ #include <wtf/HashSet.h>
+ #include <wtf/Threading.h>
+ #include <wtf/WTFThreadData.h>
+-#include <wtf/unicode/UTF8.h>
++#include <wtf/unicode/WTF-UTF8.h>
+
+ namespace WTF {
+
+diff --git a/Source/JavaScriptCore/wtf/text/WTFString.cpp b/Source/JavaScriptCore/wtf/text/WTFString.cpp
+index 04c970a..2c1eba5 100644
+--- a/Source/JavaScriptCore/wtf/text/WTFString.cpp
++++ b/Source/JavaScriptCore/wtf/text/WTFString.cpp
+@@ -30,7 +30,7 @@
+ #include <wtf/StringExtras.h>
+ #include <wtf/Vector.h>
+ #include <wtf/dtoa.h>
+-#include <wtf/unicode/UTF8.h>
++#include <wtf/unicode/WTF-UTF8.h>
+ #include <wtf/unicode/Unicode.h>
+
+ using namespace std;
+diff --git a/Source/JavaScriptCore/wtf/unicode/UTF8.cpp b/Source/JavaScriptCore/wtf/unicode/UTF8.cpp
+index 8ea5c69..e0366da 100644
+--- a/Source/JavaScriptCore/wtf/unicode/UTF8.cpp
++++ b/Source/JavaScriptCore/wtf/unicode/UTF8.cpp
+@@ -25,7 +25,7 @@
+ */
+
+ #include "config.h"
+-#include "UTF8.h"
++#include "WTF-UTF8.h"
+
+ #include "ASCIICType.h"
+ #include <wtf/StringHasher.h>
+diff --git a/Source/JavaScriptCore/wtf/unicode/UTF8.h b/Source/JavaScriptCore/wtf/unicode/UTF8.h
+deleted file mode 100644
+index bc2497b..0000000
+--- a/Source/JavaScriptCore/wtf/unicode/UTF8.h
++++ /dev/null
+@@ -1,84 +0,0 @@
+-/*
+- * Copyright (C) 2007 Apple Inc. All rights reserved.
+- *
+- * Redistribution and use in source and binary forms, with or without
+- * modification, are permitted provided that the following conditions
+- * are met:
+- * 1. Redistributions of source code must retain the above copyright
+- * notice, this list of conditions and the following disclaimer.
+- * 2. Redistributions in binary form must reproduce the above copyright
+- * notice, this list of conditions and the following disclaimer in the
+- * documentation and/or other materials provided with the distribution.
+- *
+- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+- */
+-
+-#ifndef WTF_UTF8_h
+-#define WTF_UTF8_h
+-
+-#include "Unicode.h"
+-
+-namespace WTF {
+-namespace Unicode {
+-
+- // Given a first byte, gives the length of the UTF-8 sequence it begins.
+- // Returns 0 for bytes that are not legal starts of UTF-8 sequences.
+- // Only allows sequences of up to 4 bytes, since that works for all Unicode characters (U-00000000 to U-0010FFFF).
+- int UTF8SequenceLength(char);
+-
+- // Takes a null-terminated C-style string with a UTF-8 sequence in it and converts it to a character.
+- // Only allows Unicode characters (U-00000000 to U-0010FFFF).
+- // Returns -1 if the sequence is not valid (including presence of extra bytes).
+- int decodeUTF8Sequence(const char*);
+-
+- typedef enum {
+- conversionOK, // conversion successful
+- sourceExhausted, // partial character in source, but hit end
+- targetExhausted, // insuff. room in target for conversion
+- sourceIllegal // source sequence is illegal/malformed
+- } ConversionResult;
+-
+- // These conversion functions take a "strict" argument. When this
+- // flag is set to strict, both irregular sequences and isolated surrogates
+- // will cause an error. When the flag is set to lenient, both irregular
+- // sequences and isolated surrogates are converted.
+- //
+- // Whether the flag is strict or lenient, all illegal sequences will cause
+- // an error return. This includes sequences such as: <F4 90 80 80>, <C0 80>,
+- // or <A0> in UTF-8, and values above 0x10FFFF in UTF-32. Conformant code
+- // must check for illegal sequences.
+- //
+- // When the flag is set to lenient, characters over 0x10FFFF are converted
+- // to the replacement character; otherwise (when the flag is set to strict)
+- // they constitute an error.
+-
+- WTF_EXPORT_PRIVATE ConversionResult convertUTF8ToUTF16(
+- const char** sourceStart, const char* sourceEnd,
+- UChar** targetStart, UChar* targetEnd, bool strict = true);
+-
+- ConversionResult convertLatin1ToUTF8(
+- const LChar** sourceStart, const LChar* sourceEnd,
+- char** targetStart, char* targetEnd);
+-
+- WTF_EXPORT_PRIVATE ConversionResult convertUTF16ToUTF8(
+- const UChar** sourceStart, const UChar* sourceEnd,
+- char** targetStart, char* targetEnd, bool strict = true);
+-
+- unsigned calculateStringHashAndLengthFromUTF8(const char* data, const char* dataEnd, unsigned& dataLength, unsigned& utf16Length);
+-
+- bool equalUTF16WithUTF8(const UChar* a, const UChar* aEnd, const char* b, const char* bEnd);
+-
+-} // namespace Unicode
+-} // namespace WTF
+-
+-#endif // WTF_UTF8_h
+diff --git a/Source/JavaScriptCore/wtf/unicode/WTF-UTF8.h b/Source/JavaScriptCore/wtf/unicode/WTF-UTF8.h
+new file mode 100644
+index 0000000..bc2497b
+--- /dev/null
++++ b/Source/JavaScriptCore/wtf/unicode/WTF-UTF8.h
+@@ -0,0 +1,84 @@
++/*
++ * Copyright (C) 2007 Apple Inc. All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ * notice, this list of conditions and the following disclaimer in the
++ * documentation and/or other materials provided with the distribution.
++ *
++ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
++ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
++ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
++ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ */
++
++#ifndef WTF_UTF8_h
++#define WTF_UTF8_h
++
++#include "Unicode.h"
++
++namespace WTF {
++namespace Unicode {
++
++ // Given a first byte, gives the length of the UTF-8 sequence it begins.
++ // Returns 0 for bytes that are not legal starts of UTF-8 sequences.
++ // Only allows sequences of up to 4 bytes, since that works for all Unicode characters (U-00000000 to U-0010FFFF).
++ int UTF8SequenceLength(char);
++
++ // Takes a null-terminated C-style string with a UTF-8 sequence in it and converts it to a character.
++ // Only allows Unicode characters (U-00000000 to U-0010FFFF).
++ // Returns -1 if the sequence is not valid (including presence of extra bytes).
++ int decodeUTF8Sequence(const char*);
++
++ typedef enum {
++ conversionOK, // conversion successful
++ sourceExhausted, // partial character in source, but hit end
++ targetExhausted, // insuff. room in target for conversion
++ sourceIllegal // source sequence is illegal/malformed
++ } ConversionResult;
++
++ // These conversion functions take a "strict" argument. When this
++ // flag is set to strict, both irregular sequences and isolated surrogates
++ // will cause an error. When the flag is set to lenient, both irregular
++ // sequences and isolated surrogates are converted.
++ //
++ // Whether the flag is strict or lenient, all illegal sequences will cause
++ // an error return. This includes sequences such as: <F4 90 80 80>, <C0 80>,
++ // or <A0> in UTF-8, and values above 0x10FFFF in UTF-32. Conformant code
++ // must check for illegal sequences.
++ //
++ // When the flag is set to lenient, characters over 0x10FFFF are converted
++ // to the replacement character; otherwise (when the flag is set to strict)
++ // they constitute an error.
++
++ WTF_EXPORT_PRIVATE ConversionResult convertUTF8ToUTF16(
++ const char** sourceStart, const char* sourceEnd,
++ UChar** targetStart, UChar* targetEnd, bool strict = true);
++
++ ConversionResult convertLatin1ToUTF8(
++ const LChar** sourceStart, const LChar* sourceEnd,
++ char** targetStart, char* targetEnd);
++
++ WTF_EXPORT_PRIVATE ConversionResult convertUTF16ToUTF8(
++ const UChar** sourceStart, const UChar* sourceEnd,
++ char** targetStart, char* targetEnd, bool strict = true);
++
++ unsigned calculateStringHashAndLengthFromUTF8(const char* data, const char* dataEnd, unsigned& dataLength, unsigned& utf16Length);
++
++ bool equalUTF16WithUTF8(const UChar* a, const UChar* aEnd, const char* b, const char* bEnd);
++
++} // namespace Unicode
++} // namespace WTF
++
++#endif // WTF_UTF8_h
+diff --git a/Source/JavaScriptCore/wtf/unicode/glib/UnicodeGLib.cpp b/Source/JavaScriptCore/wtf/unicode/glib/UnicodeGLib.cpp
+index a01c3ee..a99cefb 100644
+--- a/Source/JavaScriptCore/wtf/unicode/glib/UnicodeGLib.cpp
++++ b/Source/JavaScriptCore/wtf/unicode/glib/UnicodeGLib.cpp
+@@ -24,7 +24,7 @@
+ #include "UnicodeGLib.h"
+
+ #include <wtf/Vector.h>
+-#include <wtf/unicode/UTF8.h>
++#include <wtf/unicode/WTF-UTF8.h>
+
+ #define UTF8_IS_SURROGATE(character) (character >= 0x10000 && character <= 0x10FFFF)
+
+diff --git a/Source/WebCore/loader/icon/IconRecord.h b/Source/WebCore/loader/icon/IconRecord.h
+index 50ef7f7..a4d7c20 100644
+--- a/Source/WebCore/loader/icon/IconRecord.h
++++ b/Source/WebCore/loader/icon/IconRecord.h
+@@ -38,7 +38,7 @@
+ #include <wtf/OwnPtr.h>
+ #include <wtf/text/StringHash.h>
+
+-#if OS(SOLARIS)
++#if OS(SOLARIS) || defined (__MINGW32__)
+ #include <sys/types.h> // For time_t structure.
+ #endif
+
+diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h
+index 090b42c..eba7ca1 100644
+--- a/Source/WebCore/page/Page.h
++++ b/Source/WebCore/page/Page.h
+@@ -34,7 +34,7 @@
+ #include <wtf/HashSet.h>
+ #include <wtf/Noncopyable.h>
+
+-#if OS(SOLARIS)
++#if OS(SOLARIS) || defined (__MINGW32__)
+ #include <sys/time.h> // For time_t structure.
+ #endif
+
+diff --git a/Source/WebCore/platform/network/ResourceResponseBase.h b/Source/WebCore/platform/network/ResourceResponseBase.h
+index 3c61666..5e76d17 100644
+--- a/Source/WebCore/platform/network/ResourceResponseBase.h
++++ b/Source/WebCore/platform/network/ResourceResponseBase.h
+@@ -35,7 +35,7 @@
+ #include <wtf/PassOwnPtr.h>
+ #include <wtf/RefPtr.h>
+
+-#if OS(SOLARIS)
++#if OS(SOLARIS) || defined (__MINGW32__)
+ #include <sys/time.h> // For time_t structure.
+ #endif
+
+diff --git a/Source/WebCore/platform/text/String.cpp b/Source/WebCore/platform/text/String.cpp
+index f2f8d2e..78905ec 100644
+--- a/Source/WebCore/platform/text/String.cpp
++++ b/Source/WebCore/platform/text/String.cpp
+@@ -24,7 +24,7 @@
+
+ #include "SharedBuffer.h"
+ #include "TextBreakIterator.h"
+-#include <wtf/unicode/UTF8.h>
++#include <wtf/unicode/WTF-UTF8.h>
+ #include <wtf/unicode/Unicode.h>
+
+ using namespace WTF;
+diff --git a/Source/WebCore/xml/XSLTProcessorLibxslt.cpp b/Source/WebCore/xml/XSLTProcessorLibxslt.cpp
+index 076a852..fe5787a 100644
+--- a/Source/WebCore/xml/XSLTProcessorLibxslt.cpp
++++ b/Source/WebCore/xml/XSLTProcessorLibxslt.cpp
+@@ -50,7 +50,7 @@
+ #include <wtf/Vector.h>
+ #include <wtf/text/CString.h>
+ #include <wtf/text/StringBuffer.h>
+-#include <wtf/unicode/UTF8.h>
++#include <wtf/unicode/WTF-UTF8.h>
+
+ #if PLATFORM(MAC)
+ #include "SoftLinking.h"
+diff --git a/Source/WebKit2/Shared/WebString.h b/Source/WebKit2/Shared/WebString.h
+index 18b3fc8..0f04d70 100644
+--- a/Source/WebKit2/Shared/WebString.h
++++ b/Source/WebKit2/Shared/WebString.h
+@@ -30,7 +30,7 @@
+ #include <JavaScriptCore/JSStringRef.h>
+ #include <wtf/PassRefPtr.h>
+ #include <wtf/text/WTFString.h>
+-#include <wtf/unicode/UTF8.h>
++#include <wtf/unicode/WTF-UTF8.h>
+
+ namespace WebKit {
+
+diff --git a/Tools/GNUmakefile.am b/Tools/GNUmakefile.am
+index fe7a1ce..8b56ee0 100644
+--- a/Tools/GNUmakefile.am
++++ b/Tools/GNUmakefile.am
+@@ -156,23 +156,23 @@ Programs_DumpRenderTree_CFLAGS = \
+ $(GTK_CFLAGS) \
+ $(LIBSOUP_CFLAGS)
+
+-Programs_DumpRenderTree_LDADD = \
+- libjavascriptcoregtk- at WEBKITGTK_API_MAJOR_VERSION@. at WEBKITGTK_API_MINOR_VERSION@.la \
+- libwebkitgtk- at WEBKITGTK_API_MAJOR_VERSION@. at WEBKITGTK_API_MINOR_VERSION@.la \
+- libWebCoreInternals.la \
+- $(GLOBALDEPS_LIBS) \
+- $(CAIRO_LIBS) \
+- $(GTK_LIBS) \
+- $(GLIB_LIBS) \
+- $(LIBSOUP_LIBS) \
+- $(FREETYPE_LIBS) \
+- $(WINMM_LIBS) \
+- $(XRENDER_LIBS) \
+- $(XT_LIBS)
+-
+-Programs_DumpRenderTree_LDFLAGS = \
+- -no-fast-install \
+- -no-install
++#Programs_DumpRenderTree_LDADD = \
++# libjavascriptcoregtk- at WEBKITGTK_API_MAJOR_VERSION@. at WEBKITGTK_API_MINOR_VERSION@.la \
++# libwebkitgtk- at WEBKITGTK_API_MAJOR_VERSION@. at WEBKITGTK_API_MINOR_VERSION@.la \
++# libWebCoreInternals.la \
++# $(GLOBALDEPS_LIBS) \
++# $(CAIRO_LIBS) \
++# $(GTK_LIBS) \
++# $(GLIB_LIBS) \
++# $(LIBSOUP_LIBS) \
++# $(FREETYPE_LIBS) \
++# $(WINMM_LIBS) \
++# $(XRENDER_LIBS) \
++# $(XT_LIBS)
++
++#Programs_DumpRenderTree_LDFLAGS = \
++# -no-fast-install \
++# -no-install
+
+ # clean target
+ CLEANFILES += \
+diff --git a/configure.ac b/configure.ac
+index 126ca85..99beb38 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -419,8 +419,8 @@ if test "$with_unicode_backend" = "icu"; then
+ UNICODE_LIBS="-licucore"
+ ;;
+ *-*-mingw*)
+- UNICODE_CFLAGS=""
+- UNICODE_LIBS="-licui18n -licuuc"
++ UNICODE_CFLAGS="-I/c/gcdev/webkit/include"
++ UNICODE_LIBS="-licuin -licuuc"
+ ;;
+ *)
+ AC_PATH_PROG(icu_config, icu-config, no)
+--
+1.9.4.msysgit.0
+
diff --git a/defaults.sh b/defaults.sh
index 098b65e..a52165b 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -205,8 +205,8 @@ set_default GUILE_PATCH `pwd`/guile-1.8.patch
set_default OPENSSL_URL "http://www.openssl.org/source/openssl-0.9.8j.tar.gz"
set_default OPENSSL_DIR $GLOBAL_DIR\\openssl
-GNUTLS_VERSION="2.10.1"
-set_default GNUTLS_URL "http://josefsson.org/gnutls4win/gnutls-${GNUTLS_VERSION}.zip"
+GNUTLS_VERSION="3.2.19"
+set_default GNUTLS_URL "ftp://ftp.gnutls.org/gcrypt/gnutls/w32/gnutls-${GNUTLS_VERSION}-w32.zip"
set_default GNUTLS_DIR $GLOBAL_DIR\\gnutls
set_default MINGW_UTILS_URL "$SF_MIRROR/mingw/mingw-utils-0.3.tar.gz"
@@ -295,29 +295,22 @@ set_default HH_URL "http://download.microsoft.com/download/0/a/9/0a939ef6-e31c-4
set_default HH_DIR $GLOBAL_DIR\\hh
set_default BUILD_WEBKIT_FROM_SOURCE no
-set_default WEBKIT_VERSION "1.2.7"
-set_default WEBKIT_URL "$SF_MIRROR/gnucash/webkit-${WEBKIT_VERSION}-win32.zip"
+set_default WEBKIT_VERSION "1.8.3"
+set_default WEBKIT_URL "$SF_MIRROR/gnucash/webkit-${WEBKIT_VERSION}-minGW.tgz"
+set_default WEBKIT_DEV_URL "$SF_MIRROR/gnucash/webkit-${WEBKIT_VERSION}-dev-minGW.tgz"
set_default WEBKIT_DIR $GLOBAL_DIR\\webkit
-set_default WEBKIT_SRC_URL "http://www.webkitgtk.org/webkit-1.2.7.tar.gz"
-set_default WEBKIT_PATCH `pwd`/webkit-1.2.7-time.patch
-set_default WEBKIT_PATCH2 `pwd`/webkit-1.2.7-vasprintf.patch
-set_default WEBKIT_CONFIGURE_PATCH `pwd`/webkit-1.2.7-configure.patch
-set_default WEBKIT_DATADIR_PATCH `pwd`/webkit-1.2.7-datadir.patch
-set_default WEBKIT_GCCPATH_PATCH `pwd`/webkit-1.2.7-gccpath.patch
-set_default WEBKIT_MAKEFILE_PATCH `pwd`/webkit-1.2.7-makefile.patch
-set_default WEBKIT_MINGW32_PATCH `pwd`/webkit-1.2.7-mingw32.patch
-set_default WEBKIT_NOSVG_PATCH `pwd`/webkit-1.2.7-nosvg.patch
-set_default WEBKIT_WEBKITENUMTYPES_CPP `pwd`/webkitenumtypes.cpp
-set_default WEBKIT_WEBKITENUMTYPES_H `pwd`/webkitenumtypes.h
+#NB: The Fedora project maintains a source version that has been patched for building in a Fedora-MinGW cross-compiler. This isn't quite good enough to build in MinGW itself, but it's a lot closer and less work than starting with a tarball direct from the WebKitGtk project.
+set_default WEBKIT_SRC_URL "https://pkgs.fedoraproject.org/repo/pkgs/mingw-webkitgtk/webkit-1.8.3.tar.xz/dcbf9d5e2e6391f857c29a57528b32a6/webkit-1.8.3.tar.xz"
+set_default WEBKIT_MINGW_PATCH=`pwd`/0001-Fix-various-issues-when-compiling-natively-on-MinGW.patch
set_default ENCHANT_VERSION "1.5.0"
set_default ENCHANT_URL "$GNOME_WIN32_URL/dependencies/enchant_${ENCHANT_VERSION}-2_win32.zip"
set_default ENCHANT_DEV_URL "$GNOME_WIN32_URL/dependencies/enchant-dev_${ENCHANT_VERSION}-2_win32.zip"
set_default ENCHANT_DIR $GLOBAL_DIR\\enchant
-set_default LIBSOUP_VERSION "2.28.2"
-set_default LIBSOUP_URL "$GNOME_WIN32_URL/libsoup/2.26/libsoup-${LIBSOUP_VERSION}-1_win32.zip"
-set_default LIBSOUP_DEV_URL "$GNOME_WIN32_URL/libsoup/2.26/libsoup-dev-${LIBSOUP_VERSION}-1_win32.zip"
+set_default LIBSOUP_VERSION "2.34.3"
+set_default LIBSOUP_URL "$GNOME_WIN32_URL/libsoup/2.34/libsoup-${LIBSOUP_VERSION}-1_win32.zip"
+set_default LIBSOUP_DEV_URL "$GNOME_WIN32_URL/libsoup/2.34/libsoup-dev-${LIBSOUP_VERSION}-1_win32.zip"
set_default LIBSOUP_DIR $GLOBAL_DIR\\libsoup
-set_default LIBSOUP_SRC_URL "$GNOME_MIRROR/sources/libsoup/2.28/libsoup-${LIBSOUP_VERSION}.tar.bz2"
+set_default LIBSOUP_SRC_URL "$GNOME_MIRROR/sources/libsoup/2.34/libsoup-${LIBSOUP_VERSION}.tar.bz2"
set_default ICU4C_URL "http://download.icu-project.org/files/icu4c/4.4.1/icu4c-4_4_1-Win32-msvc9.zip"
set_default ICU4C_SRC_URL "http://download.icu-project.org/files/icu4c/4.4.1/icu4c-4_4_1-src.tgz"
set_default ICU4C_DIR $GLOBAL_DIR\\icu-mingw32
diff --git a/install-impl.sh b/install-impl.sh
index 00bfbb3..3699109 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1044,6 +1044,11 @@ function inst_regex() {
fi
}
+#To build webkit from source you need an extra dependency, gperf. You
+#can most easily get it from
+#http://gnuwin32.sourceforge.net/packages.html; install it in
+#c:\Programs\GnuWin32.
+#You also need python and ICU.
function inst_webkit() {
setup WebKit
_WEBKIT_UDIR=`unix_path ${WEBKIT_DIR}`
@@ -1062,22 +1067,17 @@ function inst_webkit() {
add_to_env ${_ACTIVE_PERL_BASE_DIR}/bin PATH
export PERL5LIB=${_ACTIVE_PERL_BASE_DIR}/lib
- patch -p0 -u < $WEBKIT_CONFIGURE_PATCH
- CPPFLAGS="${GNOME_CPPFLAGS} ${SQLITE3_CFLAGS}" \
- LDFLAGS="${GNOME_LDFLAGS} ${SQLITE3_LDFLAGS} -lsqlite3" \
- PERL="${_ACTIVE_PERL_BASE_DIR}/bin/perl" \
+ patch -p1 -u < $WEBKIT_MINGW_PATCH
+ autoreconf -fis -ISource/autotools -I$GNOME_DIR/share/aclocal
./configure \
--prefix=${_WEBKIT_UDIR} \
--with-target=win32 \
--with-unicode-backend=glib \
--enable-web-sockets \
- --enable-3D-transforms \
- --disable-video
- patch -p0 -u < $WEBKIT_DATADIR_PATCH
- patch -p0 -u < $WEBKIT_GCCPATH_PATCH
- patch -p0 -u < $WEBKIT_MAKEFILE_PATCH
- patch -p0 -u < $WEBKIT_MINGW32_PATCH
- patch -p0 -u < $WEBKIT_NOSVG_PATCH
+ --disable-video \
+ CPPFLAGS="${GNOME_CPPFLAGS} ${SQLITE3_CFLAGS}" \
+ LDFLAGS="${GNOME_LDFLAGS} ${SQLITE3_LDFLAGS} -lsqlite3" \
+ PERL="${_ACTIVE_PERL_BASE_DIR}/bin/perl"
cp $WEBKIT_WEBKITENUMTYPES_CPP DerivedSources
cp $WEBKIT_WEBKITENUMTYPES_H Webkit/gtk/webkit
make
@@ -1086,6 +1086,7 @@ function inst_webkit() {
qpopd
else
wget_unpacked $WEBKIT_URL $DOWNLOAD_DIR $WEBKIT_DIR
+ wget_unpacked $WEBKIT_DEV_URL $DOWNLOAD_DIR $WEBKIT_DIR
fi
quiet ${PKG_CONFIG} --exists webkit-1.0 || die "webkit not installed correctly"
rm -rf ${TMP_UDIR}/webkit-*
diff --git a/webkit-1.2.7-configure.patch b/webkit-1.2.7-configure.patch
deleted file mode 100755
index ad7b55a..0000000
--- a/webkit-1.2.7-configure.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- configure Tue Oct 05 06:02:37 2010
-+++ configure Tue Jan 11 07:28:51 2011
-@@ -1077,6 +1077,7 @@
- enable_icon_database
- enable_datalist
- enable_ruby
-+enable_sandbox
- enable_video
- enable_xhtmlmp
- enable_xpath
-@@ -19020,9 +19021,9 @@
- # check whether to enable HTML5 sandbox iframe support
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable HTML5 sandboxed iframe support" >&5
- $as_echo_n "checking whether to enable HTML5 sandboxed iframe support... " >&6; }
--# Check whether --enable-ruby was given.
--if test "${enable_ruby+set}" = set; then :
-- enableval=$enable_ruby;
-+# Check whether --enable-sandbox was given.
-+if test "${enable_sandbox+set}" = set; then :
-+ enableval=$enable_sandbox;
- else
- enable_sandbox="yes"
- fi
diff --git a/webkit-1.2.7-datadir.patch b/webkit-1.2.7-datadir.patch
deleted file mode 100755
index 0a49cf0..0000000
--- a/webkit-1.2.7-datadir.patch
+++ /dev/null
@@ -1,143 +0,0 @@
---- WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp Fri Sep 10 20:20:33 2010
-+++ WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp Tue Jan 11 12:47:14 2011
-@@ -71,6 +71,30 @@
- #include <glib/gi18n-lib.h>
- #include <stdio.h>
-
-+#ifdef _WIN32
-+/* search for data relative to where we are installed */
-+#include <shlobj.h>
-+#include <assert.h>
-+
-+static HMODULE GetThisDllHandle()
-+{
-+ MEMORY_BASIC_INFORMATION info;
-+ size_t len = VirtualQueryEx(GetCurrentProcess(), (void*)GetThisDllHandle, &info, sizeof(info));
-+ assert(len == sizeof(info));
-+ return len ? (HMODULE)info.AllocationBase : NULL;
-+}
-+
-+const gchar *
-+get_webkit_datadir(void)
-+{
-+ gchar *retval;
-+ retval = g_build_filename (g_win32_get_package_installation_directory_of_module (GetThisDllHandle()), "/share", NULL);
-+ return retval;
-+}
-+#undef DATA_DIR
-+#define DATA_DIR get_webkit_datadir ()
-+#endif
-+
- using namespace WebCore;
-
- namespace WebKit {
-@@ -989,7 +1013,13 @@
-
- String content;
- gchar* fileContent = 0;
-+#ifdef _WIN32
-+ gchar* errorPath = g_build_filename (DATA_DIR, "/webkit-1.0/resources/error.html", NULL);
-+ gchar* errorURI = g_filename_to_uri(errorPath, NULL, NULL);
-+ g_free(errorPath);
-+#else
- gchar* errorURI = g_filename_to_uri(DATA_DIR"/webkit-1.0/resources/error.html", NULL, NULL);
-+#endif
- GFile* errorFile = g_file_new_for_uri(errorURI);
- g_free(errorURI);
-
---- WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp Fri Sep 10 20:20:33 2010
-+++ WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp Mon Jan 17 07:42:35 2011
-@@ -27,6 +27,31 @@
- #include "NotImplemented.h"
- #include "PlatformString.h"
-
-+#ifdef _WIN32
-+/* search for data relative to where we are installed */
-+# include <shlobj.h>
-+# include <assert.h>
-+
-+static HMODULE GetThisDllHandle()
-+{
-+ MEMORY_BASIC_INFORMATION info;
-+ size_t len = VirtualQueryEx(GetCurrentProcess(), (void*)GetThisDllHandle, &info, sizeof(info));
-+ assert(len == sizeof(info));
-+ return len ? (HMODULE)info.AllocationBase : NULL;
-+}
-+
-+const gchar *
-+get_webkit_path(void)
-+{
-+ gchar *retval;
-+ retval = g_build_filename (g_win32_get_package_installation_directory_of_module (GetThisDllHandle()), "/share", NULL);
-+ return retval;
-+}
-+#undef DATA_DIR
-+#define DATA_DIR get_webkit_path ()
-+#endif
-+
-+
- using namespace WebCore;
-
- namespace WebKit {
-@@ -67,21 +92,30 @@
- webkit_web_inspector_set_web_view(webInspector, inspectorWebView);
-
- GOwnPtr<gchar> inspectorURI;
--
-+#ifdef _WIN32
-+ gchar* inspectorPath = g_build_filename (DATA_DIR, "/webkit-1.0/webinspector/inspector.html", NULL);
-+#endif
- // Make the Web Inspector work when running tests
- if (g_file_test("WebCore/inspector/front-end/inspector.html", G_FILE_TEST_EXISTS)) {
- GOwnPtr<gchar> currentDirectory(g_get_current_dir());
- GOwnPtr<gchar> fullPath(g_strdup_printf("%s/WebCore/inspector/front-end/inspector.html", currentDirectory.get()));
- inspectorURI.set(g_filename_to_uri(fullPath.get(), NULL, NULL));
- } else
-+#ifdef _WIN32
-+ inspectorURI.set(g_filename_to_uri(inspectorPath, NULL, NULL));
-+#else
- inspectorURI.set(g_filename_to_uri(DATA_DIR"/webkit-1.0/webinspector/inspector.html", NULL, NULL));
--
-+#endif
- webkit_web_view_load_uri(inspectorWebView, inspectorURI.get());
-
- gtk_widget_show(GTK_WIDGET(inspectorWebView));
-
- Page* inspectorPage = core(inspectorWebView);
- inspectorPage->inspectorController()->setInspectorFrontendClient(new InspectorFrontendClient(m_inspectedWebView, inspectorWebView, webInspector, inspectorPage));
-+
-+#ifdef _WIN32
-+ g_free(inspectorPath);
-+#endif
- }
-
- void InspectorClient::highlight(Node* node)
-@@ -145,6 +179,10 @@
- String InspectorFrontendClient::localizedStringsURL()
- {
- GOwnPtr<gchar> URL;
-+
-+#ifdef _WIN32
-+ gchar* localizedPath = g_build_filename (DATA_DIR, "/webkit-1.0/webinspector/localizedStrings.js", NULL);
-+#endif
-
- // Make the Web Inspector work when running tests
- if (g_file_test("WebCore/English.lproj/localizedStrings.js", G_FILE_TEST_EXISTS)) {
-@@ -152,10 +190,16 @@
- GOwnPtr<gchar> fullPath(g_strdup_printf("%s/WebCore/English.lproj/localizedStrings.js", currentDirectory.get()));
- URL.set(g_filename_to_uri(fullPath.get(), NULL, NULL));
- } else
-+#ifdef _WIN32
-+ URL.set(g_filename_to_uri(localizedPath, NULL, NULL));
-+#else
- URL.set(g_filename_to_uri(DATA_DIR"/webkit-1.0/webinspector/localizedStrings.js", NULL, NULL));
--
-+#endif
- // FIXME: support l10n of localizedStrings.js
- return String::fromUTF8(URL.get());
-+#ifdef _WIN32
-+ g_free(localizedPath);
-+#endif
- }
-
- String InspectorFrontendClient::hiddenPanels()
diff --git a/webkit-1.2.7-gccpath.patch b/webkit-1.2.7-gccpath.patch
deleted file mode 100755
index 89d8498..0000000
--- a/webkit-1.2.7-gccpath.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- WebCore/bindings/scripts/IDLParser.pm Thu Jan 15 16:14:12 1970
-+++ WebCore/bindings/scripts/IDLParser.pm Thu Jan 15 16:14:12 1970
-@@ -69,7 +69,7 @@
- if (($Config::Config{'osname'}) =~ /solaris/i) {
- $gccLocation = "/usr/sfw/bin/gcc";
- } else {
-- $gccLocation = "/usr/bin/gcc";
-+ $gccLocation = "gcc";
- }
- $preprocessor = $gccLocation . " -E -P -x c++";
- }
---- WebCore/css/make-css-file-arrays.pl Thu Jan 15 16:14:12 1970
-+++ WebCore/css/make-css-file-arrays.pl Thu Jan 15 16:14:12 1970
-@@ -33,7 +33,7 @@
- if (($Config::Config{'osname'}) =~ /solaris/i) {
- $gccLocation = "/usr/sfw/bin/gcc";
- } else {
-- $gccLocation = "/usr/bin/gcc";
-+ $gccLocation = "gcc";
- }
- $preprocessor = $gccLocation . " -E -P -x c++";
- }
---- WebCore/dom/make_names.pl Thu Jan 15 16:14:12 1970
-+++ WebCore/dom/make_names.pl Thu Jan 15 16:14:12 1970
-@@ -52,7 +52,7 @@
- if (($Config::Config{'osname'}) =~ /solaris/i) {
- $gccLocation = "/usr/sfw/bin/gcc";
- } else {
-- $gccLocation = "/usr/bin/gcc";
-+ $gccLocation = "gcc";
- }
- my $preprocessor = $gccLocation . " -E -P -x c++";
-
diff --git a/webkit-1.2.7-makefile.patch b/webkit-1.2.7-makefile.patch
deleted file mode 100755
index bbc9bd4..0000000
--- a/webkit-1.2.7-makefile.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- GNUmakefile Mon Jan 17 09:32:30 2011
-+++ GNUmakefile Mon Jan 17 09:44:19 2011
-@@ -6411,3 +6411,4 @@
- STRIP = strip
--SYMBOL_VISIBILITY = -fvisibility=hidden
--SYMBOL_VISIBILITY_INLINES = -fvisibility-inlines-hidden
-+SYMBOL_VISIBILITY =
-+SYMBOL_VISIBILITY_INLINES =
-+PTHREAD_LIBS = -lpthread
-@@ -8967,7 +8967,7 @@
- # It breaks the build on other platforms, so we use it conditionally
- no_undefined = -no-undefined
- #version_script = -Wl,--version-script,$(srcdir)/autotools/symbols.filter
--version_script = -export-symbols-regex "^(webkit_|JS).*"
-+version_script = -export-symbols-regex "^(webkit_|k?JS).*"
-
- # Shared libraries
- lib_LTLIBRARIES = \
-@@ -8987,7 +8987,7 @@
- libJavaScriptCore_la_LIBADD = \
- $(UNICODE_LIBS) \
- $(GLIB_LIBS) \
-- -lpthread
-+ $(PTHREAD_LIBS)
-
- libJavaScriptCore_la_CXXFLAGS = \
- $(global_cxxflags) \
-@@ -9042,7 +9042,6 @@
- $(no_undefined)
-
- libwebkit_1_0_la_LIBADD = \
-- -lpthread \
- libJavaScriptCore.la \
- libWebCoreJS.la \
- $(webcore_ldflags) \
-@@ -9064,7 +9063,8 @@
- $(PNG_LIBS) \
- $(SQLITE3_LIBS) \
- $(UNICODE_LIBS) \
-- $(XT_LIBS)
-+ $(PTHREAD_LIBS) \
-+ $(XT_LIBS) -lwinmm -lshlwapi -lole32
-
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = WebKit/gtk/webkit-1.0.pc
-@@ -9104,7 +9104,7 @@
- Programs_minidom_LDADD = \
- libJavaScriptCore.la \
- -lm \
-- -lstdc++
-+ -lstdc++ -lwinmm
-
- Programs_minidom_LDFLAGS = \
- -no-install \
-@@ -9127,7 +9127,7 @@
- $(UNICODE_CFLAGS)
-
- Programs_jsc_LDADD = \
-- libJavaScriptCore.la
-+ libJavaScriptCore.la -lwinmm
-
- WebCore := $(srcdir)/WebCore
-
-@@ -9263,7 +9263,7 @@
- Programs_GtkLauncher_LDADD = \
- libwebkit-1.0.la \
- $(GTK_LIBS) \
-- $(GLIB_LIBS)
-+ $(GLIB_LIBS) -lwinmm
-
- Programs_GtkLauncher_LDFLAGS = \
- -no-fast-install \
-@@ -9326,7 +9326,7 @@
- $(GTK_LIBS) \
- $(GLIB_LIBS) \
- $(LIBSOUP_LIBS) \
-- $(FREETYPE_LIBS)
-+ $(FREETYPE_LIBS) -lwinmm
-
- Programs_DumpRenderTree_LDFLAGS = \
- -no-fast-install \
diff --git a/webkit-1.2.7-mingw32.patch b/webkit-1.2.7-mingw32.patch
deleted file mode 100755
index e7278fc..0000000
--- a/webkit-1.2.7-mingw32.patch
+++ /dev/null
@@ -1,592 +0,0 @@
---- JavaScriptCore/jit/ExecutableAllocator.h 2010-05-07 16:09:08.000000000 +0200
-+++ JavaScriptCore/jit/ExecutableAllocator.h 2010-05-17 22:33:16.000000000 +0200
-@@ -285,7 +285,7 @@
- inline ExecutablePool::ExecutablePool(size_t n)
- {
- size_t allocSize = roundUpAllocationSize(n, JIT_ALLOCATOR_PAGE_SIZE);
-- Allocation mem = systemAlloc(allocSize);
-+ const Allocation mem = systemAlloc(allocSize);
- m_pools.append(mem);
- m_freePtr = mem.pages;
- if (!m_freePtr)
---- JavaScriptCore/runtime/Collector.cpp (revision 63307)
-+++ JavaScriptCore/runtime/Collector.cpp (working copy)
-@@ -91,6 +91,13 @@
-
- #define COLLECT_ON_EVERY_ALLOCATION 0
-
-+#if COMPILER(MINGW64)
-+extern "C" {
-+void * __mingw_aligned_malloc (size_t, size_t);
-+void __mingw_aligned_free (void *);
-+}
-+#endif
-+
- using std::max;
-
- namespace JSC {
-@@ -201,7 +208,7 @@
- #elif OS(WINCE)
- void* address = VirtualAlloc(NULL, BLOCK_SIZE, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
- #elif OS(WINDOWS)
--#if COMPILER(MINGW) && !COMPILER(MINGW64)
-+#if COMPILER(MINGW)
- void* address = __mingw_aligned_malloc(BLOCK_SIZE, BLOCK_SIZE);
- #else
- void* address = _aligned_malloc(BLOCK_SIZE, BLOCK_SIZE);
-@@ -292,7 +299,7 @@
- #elif OS(WINCE)
- VirtualFree(block, 0, MEM_RELEASE);
- #elif OS(WINDOWS)
--#if COMPILER(MINGW) && !COMPILER(MINGW64)
-+#if COMPILER(MINGW)
- __mingw_aligned_free(block);
- #else
- _aligned_free(block);
---- JavaScriptCore/wtf/TCSpinLock.h 2010-03-19 16:20:53.000000000 +0100
-+++ JavaScriptCore/wtf/TCSpinLock.h 2010-05-17 22:33:16.000000000 +0200
-@@ -37,8 +37,6 @@
-
- #include <time.h> /* For nanosleep() */
-
--#include <sched.h> /* For sched_yield() */
--
- #if HAVE(STDINT_H)
- #include <stdint.h>
- #elif HAVE(INTTYPES_H)
-@@ -134,7 +132,7 @@
- #define SPINLOCK_INITIALIZER { 0 }
-
- static void TCMalloc_SlowLock(volatile unsigned int* lockword) {
-- sched_yield(); // Yield immediately since fast path failed
-+ Sleep(0); // Yield immediately since fast path failed
- while (true) {
- int r;
- #if COMPILER(GCC)
---- JavaScriptCore/wtf/unicode/glib/UnicodeGLib.cpp 2010-03-19 16:20:53.000000000 +0100
-+++ JavaScriptCore/wtf/unicode/glib/UnicodeGLib.cpp 2010-05-17 22:33:16.000000000 +0200
-@@ -49,7 +49,7 @@
- GOwnPtr<GError> gerror;
-
- GOwnPtr<char> utf8src;
-- utf8src.set(g_utf16_to_utf8(src, srcLength, 0, 0, &gerror.outPtr()));
-+ utf8src.set(g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(src), srcLength, 0, 0, &gerror.outPtr()));
- if (gerror) {
- *error = true;
- return -1;
-@@ -60,7 +60,7 @@
-
- long utf16resultLength = -1;
- GOwnPtr<UChar> utf16result;
-- utf16result.set(g_utf8_to_utf16(utf8result.get(), -1, 0, &utf16resultLength, &gerror.outPtr()));
-+ utf16result.set(reinterpret_cast<UChar*>(g_utf8_to_utf16(utf8result.get(), -1, 0, &utf16resultLength, &gerror.outPtr())));
- if (gerror) {
- *error = true;
- return -1;
-@@ -81,7 +81,7 @@
- GOwnPtr<GError> gerror;
-
- GOwnPtr<char> utf8src;
-- utf8src.set(g_utf16_to_utf8(src, srcLength, 0, 0, &gerror.outPtr()));
-+ utf8src.set(g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(src), srcLength, 0, 0, &gerror.outPtr()));
- if (gerror) {
- *error = true;
- return -1;
-@@ -92,7 +92,7 @@
-
- long utf16resultLength = -1;
- GOwnPtr<UChar> utf16result;
-- utf16result.set(g_utf8_to_utf16(utf8result.get(), -1, 0, &utf16resultLength, &gerror.outPtr()));
-+ utf16result.set(reinterpret_cast<UChar*>(g_utf8_to_utf16(utf8result.get(), -1, 0, &utf16resultLength, &gerror.outPtr())));
- if (gerror) {
- *error = true;
- return -1;
-@@ -113,7 +113,7 @@
- GOwnPtr<GError> gerror;
-
- GOwnPtr<char> utf8src;
-- utf8src.set(g_utf16_to_utf8(src, srcLength, 0, 0, &gerror.outPtr()));
-+ utf8src.set(g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(src), srcLength, 0, 0, &gerror.outPtr()));
- if (gerror) {
- *error = true;
- return -1;
-@@ -124,7 +124,7 @@
-
- long utf16resultLength = -1;
- GOwnPtr<UChar> utf16result;
-- utf16result.set(g_utf8_to_utf16(utf8result.get(), -1, 0, &utf16resultLength, &gerror.outPtr()));
-+ utf16result.set(reinterpret_cast<UChar*>(g_utf8_to_utf16(utf8result.get(), -1, 0, &utf16resultLength, &gerror.outPtr())));
- if (gerror) {
- *error = true;
- return -1;
-@@ -189,8 +189,8 @@
- GOwnPtr<char> utf8a;
- GOwnPtr<char> utf8b;
-
-- utf8a.set(g_utf16_to_utf8(a, len, 0, 0, 0));
-- utf8b.set(g_utf16_to_utf8(b, len, 0, 0, 0));
-+ utf8a.set(g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(a), len, 0, 0, 0));
-+ utf8b.set(g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(b), len, 0, 0, 0));
-
- GOwnPtr<char> foldedA;
- GOwnPtr<char> foldedB;
---- JavaScriptCore/wtf/unicode/glib/UnicodeGLib.h 2010-03-19 16:20:53.000000000 +0100
-+++ JavaScriptCore/wtf/unicode/glib/UnicodeGLib.h 2010-05-17 22:33:16.000000000 +0200
-@@ -34,7 +34,12 @@
- #include <stdlib.h>
- #include <string.h>
-
--typedef uint16_t UChar;
-+#if !defined(WIN32) && !defined(_WIN32) && !defined(__WINSCW__) \
-+ && !(defined(__CC_ARM) || defined(__ARMCC__)) /* RVCT */
-+ typedef unsigned short UChar;
-+#else
-+ typedef wchar_t UChar;
-+#endif
- typedef int32_t UChar32;
-
- namespace WTF {
---- WebCore/bindings/js/ScriptObject.cpp 2010-05-07 16:09:09.000000000 +0200
-+++ WebCore/bindings/js/ScriptObject.cpp 2010-05-17 22:33:16.000000000 +0200
-@@ -136,6 +136,14 @@
- return handleException(m_scriptState);
- }
-
-+bool ScriptObject::set(const char* name, unsigned long long value)
-+{
-+ JSLock lock(SilenceAssertionsOnly);
-+ PutPropertySlot slot;
-+ jsObject()->put(m_scriptState, Identifier(m_scriptState, name), jsNumber(m_scriptState, value), slot);
-+ return handleException(m_scriptState);
-+}
-+
- bool ScriptObject::set(const char* name, bool value)
- {
- JSLock lock(SilenceAssertionsOnly);
---- WebCore/bindings/js/ScriptObject.h 2010-03-19 16:20:54.000000000 +0100
-+++ WebCore/bindings/js/ScriptObject.h 2010-05-17 22:33:16.000000000 +0200
-@@ -59,6 +59,7 @@
- bool set(const char* name, unsigned);
- bool set(const char* name, unsigned long);
- bool set(const char* name, bool);
-+ bool set(const char* name, unsigned long long);
-
- static ScriptObject createNew(ScriptState*);
-
---- WebCore/dom/XMLTokenizerLibxml2.cpp 2010-05-07 16:09:09.000000000 +0200
-+++ WebCore/dom/XMLTokenizerLibxml2.cpp 2010-05-17 22:33:16.000000000 +0200
-@@ -908,7 +908,7 @@
- if (m_parserStopped)
- return;
-
--#if COMPILER(MSVC) || COMPILER(RVCT)
-+#if OS(WINDOWS) || COMPILER(RVCT)
- char m[1024];
- vsnprintf(m, sizeof(m) - 1, message, args);
- #else
-@@ -922,7 +922,7 @@
- else
- handleError(type, m, lineNumber(), columnNumber());
-
--#if !COMPILER(MSVC) && !COMPILER(RVCT)
-+#if !OS(WINDOWS) && !COMPILER(RVCT)
- free(m);
- #endif
- }
---- WebCore/platform/FileSystem.h 2010-05-07 16:09:09.000000000 +0200
-+++ WebCore/platform/FileSystem.h 2010-05-17 22:33:16.000000000 +0200
-@@ -64,7 +64,7 @@
- class CString;
-
- // PlatformModule
--#if OS(WINDOWS)
-+#if OS(WINDOWS) && !PLATFORM(GTK)
- typedef HMODULE PlatformModule;
- #elif PLATFORM(QT)
- #if defined(Q_WS_MAC)
-@@ -107,7 +107,7 @@
- #if PLATFORM(QT)
- typedef QFile* PlatformFileHandle;
- const PlatformFileHandle invalidPlatformFileHandle = 0;
--#elif OS(WINDOWS)
-+#elif OS(WINDOWS) && !PLATFORM(GTK)
- typedef HANDLE PlatformFileHandle;
- // FIXME: -1 is INVALID_HANDLE_VALUE, defined in <winbase.h>. Chromium tries to
- // avoid using Windows headers in headers. We'd rather move this into the .cpp.
-@@ -142,7 +142,7 @@
- // Methods for dealing with loadable modules
- bool unloadModule(PlatformModule);
-
--#if PLATFORM(WIN)
-+#if PLATFORM(WIN) && !PLATFORM(GTK)
- String localUserSpecificStorageDirectory();
- String roamingUserSpecificStorageDirectory();
-
---- WebCore/platform/gtk/GeolocationServiceGtk.cpp 2010-05-07 16:09:09.000000000 +0200
-+++ WebCore/platform/gtk/GeolocationServiceGtk.cpp 2010-05-17 22:33:16.000000000 +0200
-@@ -18,6 +18,11 @@
- */
-
- #include "config.h"
-+
-+#ifdef interface
-+#undef interface
-+#endif
-+
- #include "GeolocationServiceGtk.h"
-
- #include "CString.h"
---- WebCore/platform/gtk/GeolocationServiceGtk.h 2010-03-19 16:20:54.000000000 +0100
-+++ WebCore/platform/gtk/GeolocationServiceGtk.h 2010-05-17 22:33:16.000000000 +0200
-@@ -25,6 +25,10 @@
- #include "PositionError.h"
- #include "RefPtr.h"
-
-+#ifdef interface
-+#undef interface
-+#endif
-+
- #include <geoclue/geoclue-master.h>
- #include <geoclue/geoclue-position.h>
-
---- WebCore/platform/KURL.cpp 2010-05-07 16:09:09.000000000 +0200
-+++ WebCore/platform/KURL.cpp 2010-05-17 22:33:16.000000000 +0200
-@@ -1425,7 +1425,7 @@
- #elif USE(GLIB_UNICODE)
- GOwnPtr<gchar> utf8Hostname;
- GOwnPtr<GError> utf8Err;
-- utf8Hostname.set(g_utf16_to_utf8(str, strLen, 0, 0, &utf8Err.outPtr()));
-+ utf8Hostname.set(g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(str), strLen, 0, 0, &utf8Err.outPtr()));
- if (utf8Err)
- return;
-
---- WebCore/platform/network/soup/ResourceHandleSoup.cpp (revision 60658)
-+++ WebCore/platform/network/soup/ResourceHandleSoup.cpp (working copy)
-@@ -856,7 +856,11 @@
- return;
- }
-
-+#if OS(WINDOWS)
-+ response.setMimeType(g_content_type_get_mime_type(g_file_info_get_content_type(info)));
-+#else
- response.setMimeType(g_file_info_get_content_type(info));
-+#endif
- response.setExpectedContentLength(g_file_info_get_size(info));
-
- GTimeVal tv;
---- WebCore/platform/text/gtk/TextBreakIteratorGtk.cpp 2010-03-19 16:20:54.000000000 +0100
-+++ WebCore/platform/text/gtk/TextBreakIteratorGtk.cpp 2010-05-17 22:33:16.000000000 +0200
-@@ -59,7 +59,7 @@
-
- long utf8len;
- GOwnPtr<char> utf8;
-- utf8.set(g_utf16_to_utf8(string, length, 0, &utf8len, 0));
-+ utf8.set(g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(string), length, 0, &utf8len, 0));
-
- // FIXME: assumes no surrogate pairs
-
---- WebCore/platform/text/TextEncoding.cpp 2010-05-07 16:09:09.000000000 +0200
-+++ WebCore/platform/text/TextEncoding.cpp 2010-05-17 22:33:16.000000000 +0200
-@@ -119,14 +119,14 @@
- return newTextCodec(*this)->encode(reinterpret_cast<const UChar *>(str.utf16()), str.length(), handling);
- #elif USE(GLIB_UNICODE)
- GOwnPtr<char> UTF8Source;
-- UTF8Source.set(g_utf16_to_utf8(characters, length, 0, 0, 0));
-+ UTF8Source.set(g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(characters), length, 0, 0, 0));
-
- GOwnPtr<char> UTF8Normalized;
- UTF8Normalized.set(g_utf8_normalize(UTF8Source.get(), -1, G_NORMALIZE_NFC));
-
- long UTF16Length;
- GOwnPtr<UChar> UTF16Normalized;
-- UTF16Normalized.set(g_utf8_to_utf16(UTF8Normalized.get(), -1, 0, &UTF16Length, 0));
-+ UTF16Normalized.set(reinterpret_cast<UChar*>(g_utf8_to_utf16(UTF8Normalized.get(), -1, 0, &UTF16Length, 0)));
-
- return newTextCodec(*this)->encode(UTF16Normalized.get(), UTF16Length, handling);
- #elif OS(WINCE)
---- WebCore/plugins/gtk/PluginViewGtk.cpp 2010-05-07 16:09:09.000000000 +0200
-+++ WebCore/plugins/gtk/PluginViewGtk.cpp 2010-05-17 22:33:16.000000000 +0200
-@@ -45,6 +45,7 @@
- #include "Image.h"
- #include "KeyboardEvent.h"
- #include "MouseEvent.h"
-+#include "NotImplemented.h"
- #include "Page.h"
- #include "PlatformKeyboardEvent.h"
- #include "PlatformMouseEvent.h"
-@@ -71,7 +72,7 @@
- #include <cairo/cairo-xlib.h>
- #include <gdk/gdkx.h>
- #elif defined(GDK_WINDOWING_WIN32)
--#include "PluginMessageThrottlerWin.h"
-+#include "win/PluginMessageThrottlerWin.h"
- #include <gdk/gdkwin32.h>
- #endif
-
-@@ -706,6 +707,7 @@
- gtk_widget_queue_draw(m_parentFrame->view()->hostWindow()->platformPageClient());
- }
-
-+#ifndef GDK_WINDOWING_WIN32
- static Display* getPluginDisplay()
- {
- // The plugin toolkit might have a different X connection open. Since we're
-@@ -719,6 +721,7 @@
- return 0;
- #endif
- }
-+#endif
-
- #if defined(XP_UNIX)
- static void getVisualAndColormap(int depth, Visual** visual, Colormap* colormap)
-@@ -788,15 +791,16 @@
- PluginView::setCurrentPluginView(this);
- JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
- setCallingPlugin(true);
-+#if defined(XP_UNIX)
- m_plugin->pluginFuncs()->getvalue(m_instance, NPPVpluginNeedsXEmbed, &m_needsXEmbed);
-+#endif
- setCallingPlugin(false);
- PluginView::setCurrentPluginView(0);
- }
-
- if (m_isWindowed) {
--#if defined(XP_UNIX)
- GtkWidget* pageClient = m_parentFrame->view()->hostWindow()->platformPageClient();
--
-+#if defined(XP_UNIX)
- if (m_needsXEmbed) {
- // If our parent is not anchored the startup process will
- // fail miserably for XEmbed plugins a bit later on when
-@@ -817,7 +821,9 @@
- #endif
- } else {
- setPlatformWidget(0);
-+#if defined(XP_UNIX)
- m_pluginDisplay = getPluginDisplay();
-+#endif
- }
-
- show();
---- WebCore/plugins/PluginView.cpp 2010-05-07 16:09:09.000000000 +0200
-+++ WebCore/plugins/PluginView.cpp 2010-05-17 22:33:16.000000000 +0200
-@@ -68,7 +68,7 @@
- #include <wtf/ASCIICType.h>
-
- #if OS(WINDOWS) && ENABLE(NETSCAPE_PLUGIN_API)
--#include "PluginMessageThrottlerWin.h"
-+#include "win/PluginMessageThrottlerWin.h"
- #endif
-
- using JSC::ExecState;
-@@ -333,7 +333,7 @@
- JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
-
- #if ENABLE(NETSCAPE_PLUGIN_API)
--#ifdef XP_WIN
-+#if defined(XP_WIN) && !PLATFORM(GTK)
- // Unsubclass the window
- if (m_isWindowed) {
- #if OS(WINCE)
---- WebCore/plugins/PluginView.h 2010-05-07 16:09:09.000000000 +0200
-+++ WebCore/plugins/PluginView.h 2010-05-17 22:33:16.000000000 +0200
-@@ -313,7 +313,7 @@
- bool m_haveInitialized;
- bool m_isWaitingToStart;
-
--#if defined(XP_UNIX)
-+#if defined(XP_UNIX) || PLATFORM(GTK)
- bool m_needsXEmbed;
- #endif
-
-@@ -341,7 +341,7 @@
-
- private:
-
--#if defined(XP_UNIX) || OS(SYMBIAN)
-+#if defined(XP_UNIX) || OS(SYMBIAN) || PLATFORM(GTK)
- void setNPWindowIfNeeded();
- #elif defined(XP_MACOSX)
- NP_CGContext m_npCgContext;
---- WebCore/plugins/win/PluginDatabaseWin.cpp 2010-03-19 16:20:54.000000000 +0100
-+++ WebCore/plugins/win/PluginDatabaseWin.cpp 2010-05-17 22:33:16.000000000 +0200
-@@ -34,7 +34,7 @@
- #include <windows.h>
- #include <shlwapi.h>
-
--#if COMPILER(MINGW)
-+#if COMPILER(MINGW) && !COMPILER(MINGW64)
- #define _countof(x) (sizeof(x)/sizeof(x[0]))
- #endif
-
-@@ -104,7 +104,7 @@
- DWORD pathStrSize = sizeof(pathStr);
- DWORD type;
-
-- result = SHGetValue(key, name, TEXT("Path"), &type, (LPBYTE)pathStr, &pathStrSize);
-+ result = SHGetValueW(key, name, L"Path", &type, (LPBYTE)pathStr, &pathStrSize);
- if (result != ERROR_SUCCESS || type != REG_SZ)
- continue;
-
-@@ -212,7 +212,7 @@
- HKEY key;
- LONG result;
-
-- result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT("Software\\Mozilla"), 0, KEY_READ, &key);
-+ result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Mozilla", 0, KEY_READ, &key);
- if (result == ERROR_SUCCESS) {
- WCHAR name[128];
- FILETIME lastModified;
-@@ -229,7 +229,7 @@
- HKEY extensionsKey;
-
- // Try opening the key
-- result = RegOpenKeyEx(key, extensionsPath.charactersWithNullTermination(), 0, KEY_READ, &extensionsKey);
-+ result = RegOpenKeyExW(key, extensionsPath.charactersWithNullTermination(), 0, KEY_READ, &extensionsKey);
-
- if (result == ERROR_SUCCESS) {
- // Now get the plugins directory
-@@ -237,7 +237,7 @@
- DWORD pluginsDirectorySize = sizeof(pluginsDirectoryStr);
- DWORD type;
-
-- result = RegQueryValueEx(extensionsKey, TEXT("Plugins"), 0, &type, (LPBYTE)&pluginsDirectoryStr, &pluginsDirectorySize);
-+ result = RegQueryValueExW(extensionsKey, L"Plugins", 0, &type, (LPBYTE)&pluginsDirectoryStr, &pluginsDirectorySize);
-
- if (result == ERROR_SUCCESS && type == REG_SZ)
- directories.append(String(pluginsDirectoryStr, pluginsDirectorySize / sizeof(WCHAR) - 1));
-@@ -255,7 +255,7 @@
- #if !OS(WINCE)
- // The new WMP Firefox plugin is installed in \PFiles\Plugins if it can't find any Firefox installs
- WCHAR pluginDirectoryStr[_MAX_PATH + 1];
-- DWORD pluginDirectorySize = ::ExpandEnvironmentStringsW(TEXT("%SYSTEMDRIVE%\\PFiles\\Plugins"), pluginDirectoryStr, _countof(pluginDirectoryStr));
-+ DWORD pluginDirectorySize = ::ExpandEnvironmentStringsW(L"%SYSTEMDRIVE%\\PFiles\\Plugins", pluginDirectoryStr, _countof(pluginDirectoryStr));
-
- if (pluginDirectorySize > 0 && pluginDirectorySize <= _countof(pluginDirectoryStr))
- directories.append(String(pluginDirectoryStr, pluginDirectorySize - 1));
-@@ -265,7 +265,7 @@
- WCHAR installationDirectoryStr[_MAX_PATH];
- DWORD installationDirectorySize = sizeof(installationDirectoryStr);
-
-- HRESULT result = SHGetValue(HKEY_LOCAL_MACHINE, TEXT("Software\\Microsoft\\MediaPlayer"), TEXT("Installation Directory"), &type, (LPBYTE)&installationDirectoryStr, &installationDirectorySize);
-+ HRESULT result = SHGetValueW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\MediaPlayer", L"Installation Directory", &type, (LPBYTE)&installationDirectoryStr, &installationDirectorySize);
-
- if (result == ERROR_SUCCESS && type == REG_SZ)
- directories.append(String(installationDirectoryStr, installationDirectorySize / sizeof(WCHAR) - 1));
-@@ -277,7 +277,7 @@
- WCHAR installationDirectoryStr[_MAX_PATH];
- DWORD installationDirectorySize = sizeof(installationDirectoryStr);
-
-- HRESULT result = SHGetValue(HKEY_LOCAL_MACHINE, TEXT("Software\\Apple Computer, Inc.\\QuickTime"), TEXT("InstallDir"), &type, (LPBYTE)&installationDirectoryStr, &installationDirectorySize);
-+ HRESULT result = SHGetValueW(HKEY_LOCAL_MACHINE, L"Software\\Apple Computer, Inc.\\QuickTime", L"InstallDir", &type, (LPBYTE)&installationDirectoryStr, &installationDirectorySize);
-
- if (result == ERROR_SUCCESS && type == REG_SZ) {
- String pluginDir = String(installationDirectoryStr, installationDirectorySize / sizeof(WCHAR) - 1) + "\\plugins";
-@@ -288,7 +288,7 @@
- static inline void addAdobeAcrobatPluginDirectory(Vector<String>& directories)
- {
- HKEY key;
-- HRESULT result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT("Software\\Adobe\\Acrobat Reader"), 0, KEY_READ, &key);
-+ HRESULT result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Adobe\\Acrobat Reader", 0, KEY_READ, &key);
- if (result != ERROR_SUCCESS)
- return;
-
-@@ -319,7 +319,7 @@
- DWORD acrobatInstallPathSize = sizeof(acrobatInstallPathStr);
-
- String acrobatPluginKeyPath = "Software\\Adobe\\Acrobat Reader\\" + latestAcrobatVersionString + "\\InstallPath";
-- result = SHGetValue(HKEY_LOCAL_MACHINE, acrobatPluginKeyPath.charactersWithNullTermination(), 0, &type, (LPBYTE)acrobatInstallPathStr, &acrobatInstallPathSize);
-+ result = SHGetValueW(HKEY_LOCAL_MACHINE, acrobatPluginKeyPath.charactersWithNullTermination(), 0, &type, (LPBYTE)acrobatInstallPathStr, &acrobatInstallPathSize);
-
- if (result == ERROR_SUCCESS) {
- String acrobatPluginDirectory = String(acrobatInstallPathStr, acrobatInstallPathSize / sizeof(WCHAR) - 1) + "\\browser";
-@@ -339,12 +339,12 @@
- if (!cachedPluginDirectory) {
- cachedPluginDirectory = true;
-
-- int moduleFileNameLen = GetModuleFileName(0, moduleFileNameStr, _MAX_PATH);
-+ int moduleFileNameLen = GetModuleFileNameW(0, moduleFileNameStr, _MAX_PATH);
-
- if (!moduleFileNameLen || moduleFileNameLen == _MAX_PATH)
- goto exit;
-
-- if (!PathRemoveFileSpec(moduleFileNameStr))
-+ if (!PathRemoveFileSpecW(moduleFileNameStr))
- goto exit;
-
- pluginsDirectory = String(moduleFileNameStr) + "\\Plugins";
-@@ -358,15 +358,15 @@
- #if !OS(WINCE)
- WCHAR systemDirectoryStr[MAX_PATH];
-
-- if (GetSystemDirectory(systemDirectoryStr, _countof(systemDirectoryStr)) == 0)
-+ if (GetSystemDirectoryW(systemDirectoryStr, _countof(systemDirectoryStr)) == 0)
- return;
-
- WCHAR macromediaDirectoryStr[MAX_PATH];
-
-- PathCombine(macromediaDirectoryStr, systemDirectoryStr, TEXT("macromed\\Flash"));
-+ PathCombineW(macromediaDirectoryStr, systemDirectoryStr, L"macromed\\Flash");
- directories.append(macromediaDirectoryStr);
-
-- PathCombine(macromediaDirectoryStr, systemDirectoryStr, TEXT("macromed\\Shockwave 10"));
-+ PathCombineW(macromediaDirectoryStr, systemDirectoryStr, L"macromed\\Shockwave 10");
- directories.append(macromediaDirectoryStr);
- #endif
- }
---- WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp 2010-05-07 16:09:09.000000000 +0200
-+++ WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp 2010-05-17 22:33:16.000000000 +0200
-@@ -660,7 +660,7 @@
- if (!dicts)
- return;
-
-- gchar* ctext = g_utf16_to_utf8(const_cast<gunichar2*>(text), length, 0, 0, 0);
-+ gchar* ctext = g_utf16_to_utf8(const_cast<gunichar2*>(reinterpret_cast<const gunichar2*>(text)), length, 0, 0, 0);
- int utflen = g_utf8_strlen(ctext, -1);
-
- PangoLanguage* language = pango_language_get_default();
---- WebCore/platform/Arena.h 2010-05-18 18:02:56.000000000 +0200
-+++ WebCore/platform/Arena.h 2010-05-18 18:03:33.000000000 +0200
-@@ -44,7 +44,7 @@
-
- namespace WebCore {
-
--typedef unsigned long uword;
-+typedef uintptr_t uword;
-
- struct Arena {
- Arena* next; // next arena
---- WebCore/platform/text/TextStream.cpp 2010-05-07 16:09:09.000000000 +0200
-+++ WebCore/platform/text/TextStream.cpp 2010-05-18 23:12:39.000000000 +0200
-@@ -90,7 +90,7 @@
- return *this;
- }
-
--TextStream& TextStream::operator<<(void* p)
-+TextStream& TextStream::operator<<(const void* p)
- {
- char buffer[printBufferSize];
- snprintf(buffer, sizeof(buffer) - 1, "%p", p);
-@@ -108,7 +108,7 @@
- return String::adopt(m_text);
- }
-
--#if OS(WINDOWS) && PLATFORM(X86_64) && COMPILER(MSVC)
-+#if OS(WINDOWS) && CPU(X86_64)
- TextStream& TextStream::operator<<(__int64 i)
- {
- char buffer[printBufferSize];
---- WebCore/platform/text/TextStream.h 2010-05-07 16:09:09.000000000 +0200
-+++ WebCore/platform/text/TextStream.h 2010-05-18 23:12:39.000000000 +0200
-@@ -43,9 +43,9 @@
- TextStream& operator<<(float);
- TextStream& operator<<(double);
- TextStream& operator<<(const char*);
-- TextStream& operator<<(void*);
-+ TextStream& operator<<(const void*);
- TextStream& operator<<(const String&);
--#if OS(WINDOWS) && PLATFORM(X86_64) && COMPILER(MSVC)
-+#if OS(WINDOWS) && CPU(X86_64)
- TextStream& operator<<(unsigned __int64);
- TextStream& operator<<(__int64);
- #endif
diff --git a/webkit-1.2.7-nosvg.patch b/webkit-1.2.7-nosvg.patch
deleted file mode 100755
index 8e4bee0..0000000
--- a/webkit-1.2.7-nosvg.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- WebCore/bindings/js/JSNodeCustom.cpp.ori Sun Jan 23 11:38:08 2011
-+++ WebCore/bindings/js/JSNodeCustom.cpp Sun Jan 23 11:37:57 2011
-@@ -34,6 +34,7 @@
- #include "DocumentType.h"
- #include "Entity.h"
- #include "EntityReference.h"
-+#include "ExceptionCode.h"
- #include "HTMLElement.h"
- #include "JSAttr.h"
- #include "JSCDATASection.h"
diff --git a/webkit-1.2.7-time.patch b/webkit-1.2.7-time.patch
deleted file mode 100644
index 68c6b44..0000000
--- a/webkit-1.2.7-time.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ur -x '*.lo' -x '*.o' webkit-1.1.90-orig/WebCore/platform/network/ResourceResponseBase.h webkit-1.1.90/WebCore/platform/network/ResourceResponseBase.h
---- webkit-1.1.90-orig/WebCore/platform/network/ResourceResponseBase.h 2010-02-22 17:36:04.000000000 +0100
-+++ webkit-1.1.90/WebCore/platform/network/ResourceResponseBase.h 2011-03-12 22:11:06.720211214 +0100
-@@ -31,6 +31,7 @@
- #include "KURL.h"
-
- #include <wtf/PassOwnPtr.h>
-+#include <ctime>
-
- namespace WebCore {
-
-diff -ur webkit-1.2.7-orig/WebCore/page/Page.h webkit-1.2.7/WebCore/page/Page.h
---- webkit-1.2.7-orig/WebCore/page/Page.h 2010-09-10 15:20:33.000000000 +0200
-+++ webkit-1.2.7/WebCore/page/Page.h 2011-03-12 23:25:35.670211006 +0100
-@@ -26,6 +26,7 @@
- #include <wtf/Forward.h>
- #include <wtf/HashSet.h>
- #include <wtf/Noncopyable.h>
-+#include <ctime>
-
- #if PLATFORM(MAC)
- #include "SchedulePair.h"
diff --git a/webkit-1.2.7-vasprintf.patch b/webkit-1.2.7-vasprintf.patch
deleted file mode 100644
index f739658..0000000
--- a/webkit-1.2.7-vasprintf.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ur webkit-1.2.7-orig/WebCore/dom/XMLTokenizerLibxml2.cpp webkit-1.2.7/WebCore/dom/XMLTokenizerLibxml2.cpp
---- webkit-1.2.7-orig/WebCore/dom/XMLTokenizerLibxml2.cpp 2010-09-10 15:20:33.000000000 +0200
-+++ webkit-1.2.7/WebCore/dom/XMLTokenizerLibxml2.cpp 2011-03-12 23:13:39.521370554 +0100
-@@ -23,6 +23,9 @@
- * Boston, MA 02110-1301, USA.
- */
-
-+#define _GNU_SOURCE
-+#include <cstdio>
-+
- #include "config.h"
- #include "XMLTokenizer.h"
-
-@@ -908,7 +911,7 @@
- if (m_parserStopped)
- return;
-
--#if COMPILER(MSVC) || COMPILER(RVCT)
-+#if 1
- char m[1024];
- vsnprintf(m, sizeof(m) - 1, message, args);
- #else
commit 88e47e5a204e337a7489346879231b4252285d52
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Oct 26 16:00:21 2014 -0700
Register some environment variables.
These variables weren't added to the register list when they were added
to install-impl.sh.
diff --git a/install.sh b/install.sh
index 8a1d3fa..97e0cfe 100644
--- a/install.sh
+++ b/install.sh
@@ -28,6 +28,7 @@ qpushd "$GC_WIN_DIR"
# variables
register_env_var ACLOCAL_FLAGS " "
+register_env_var ENCHANT_LDFLAGS " "
register_env_var GNOME_CPPFLAGS " "
register_env_var GNOME_LDFLAGS " "
register_env_var GNUTLS_CPPFLAGS " "
@@ -40,6 +41,7 @@ register_env_var HH_LDFLAGS " "
register_env_var INTLTOOL_PERL " "
register_env_var LIBDBI_CPPFLAGS " "
register_env_var LIBDBI_LDFLAGS " "
+register_env_var LIBXSLT_LDFLAGS " "
register_env_var KTOBLZCHECK_CPPFLAGS " "
register_env_var KTOBLZCHECK_LDFLAGS " "
register_env_var PATH ":"
@@ -52,7 +54,7 @@ register_env_var READLINE_LDFLAGS " "
register_env_var REGEX_CPPFLAGS " "
register_env_var REGEX_LDFLAGS " "
register_env_var SQLITE3_CFLAGS " "
-register_env_var SQLITE3_LIBS " "
+register_env_var SQLITE3_LDFLAGS " "
# steps
# There is no reason to ever need to comment these out!
commit 91804439adffd6717360b918a0dbe03f2d0e8401
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Oct 14 14:39:58 2014 -0700
Add devrc.sh which makes it easy to set the environment for hand-building
diff --git a/devrc.sh b/devrc.sh
new file mode 100644
index 0000000..307b961
--- /dev/null
+++ b/devrc.sh
@@ -0,0 +1,68 @@
+# devrc.sh: Sets the paths for building and running programs with the
+# gnucash-on-windows environment.
+# Copyright 2014 John Ralls <jralls at ceridwen.fremont.ca.us
+# This is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, see <http://www.gnu.org/licenses/>.
+#
+# Usage: In a MinGW shell
+# . /c/gcdev/gnucash-on-windows.git/devrc.sh
+# To restore the environment
+# export PATH=$OLDPATH
+# unset PKG_CONFIG_PATH
+# unset CPPFLAGS
+# unset LDFLAGS
+# unset GIT_CMD
+# Do NOT try to run install.sh or dist.sh within the devrc.sh environment.
+
+export OLDPATH=$PATH
+
+GLOBAL_UDIR="/c/gcdev"
+AQBANKING_UDIR=$GLOBAL_UDIR/aqbanking
+GWENHYWFAR_UDIR=$GLOBAL_UDIR/gwenhywfar
+ENCHANT_UDIR=$GLOBAL_UDIR/enchant
+GNOME_UDIR=$GLOBAL_UDIR/gnome
+GNUCASH_UDIR=$GLOBAL_UDIR/gnucash/inst
+GNUTLS_UDIR=$GLOBAL_UDIR/gnutls
+GOFFICE_UDIR=$GLOBAL_UDIR/goffice
+GUILE_UDIR=$GLOBAL_UDIR/guile
+LIBDBI_UDIR=$GLOBAL_UDIR/libdbi
+LIBGSF_UDIR=$GLOBAL_UDIR/libgsf
+LIBOFX_UDIR=$GLOBAL_UDIR/libofx
+LIBSOUP_UDIR=$GLOBAL_UDIR/libsoup
+LIBXSLT_UDIR=$GLOBAL_UDIR/libxslt
+MYSQL_UDIR=$GLOBAL_UDIR/mysql
+OPENSP_UDIR=$GLOBAL_UDIR/opensp
+PCRE_UDIR=$GLOBAL_UDIR/pcre
+PGSQL_UDIR=$GLOBAL_UDIR/pgsql
+REGEX_UDIR=$GLOBAL_UDIR/regex
+SQLITE3_UDIR=$GLOBAL_UDIR/sqlite3
+SWIG_UDIR=$GLOBAL_UDIR/swig
+WEBKIT_UDIR=$GLOBAL_UDIR/webkit
+
+PATH=$AQBANKING_UDIR/bin:$GWENHYWFAR_UDIR/bin:$ENCHANT_UDIR/bin:$GNOME_UDIR/bin:$GNUCASH_UDIR/bin:$GNUCASH_UDIR/lib:$GNUTLS_UDIR/bin:$GOFFICE_UDIR/bin:$GUILE_UDIR/bin:$LIBDBI_UDIR/bin:$LIBGSF_UDIR/bin:$LIBOFX_UDIR/bin:$LIBSOUP_UDIR/bin:$LIBXSLT_UDIR/bin:$MYSQL_UDIR/bin:$MYSQL_UDIR/lib:$OPENSP_UDIR/bin:$PCRE_UDIR/bin:$PGSQL_UDIR/bin:$PGSQL_UDIR/lib:$REGEX_UDIR/bin:$SQLITE3_UDIR/bin:$WEBKIT_UDIR/bin
+
+PATH=$PATH:$OLDPATH
+
+export PATH
+
+export LTDL_LIBRARY_PATH=$GNUCASH_UDIR/lib
+export GNOME2_PATH=$GNOME_UDIR
+export ACLOCAL_FLAGS="-I $GNOME_UDIR/share/aclocal -I GUILE_UDIR/share/aclocal"
+
+export PKG_CONFIG_PATH="$AQBANKING_UDIR/lib/pkgconfig:$ENCHANT_UDIR/lib/pkgconfig:$GOFFICE_UDIR/lib/pkgconfig:$GNOME_UDIR/lib/pkgconfig:$GNUTLS_UDIR/lib/pkgconfig:$GUILE_UDIR/lib/pkgconfig:$GWENHYWFAR_UDIR/lib/pkgconfig:$GLOBAL_UDIR/isocodes/share/pkgconfig:$LIBGSF_UDIR/lib/pkgconfig:$LIBOFX_UDIR/lib/pkgconfig:$LIBSOUP_UDIR/lib/pkgconfig:$LIBXSLT_UDIR/lib/pkgconfig:$PCRE_UDIR/lib/pkgconfig:$WEBKIT_UDIR/lib/pkgconfig"
+
+export CPPFLAGS="-I$AQBANKING_UDIR/include -I$ENCHANT_UDIR/include -I$GOFFICE_UDIR/include -I$GNOME_UDIR/include -I$GNOME_UDIR/include/glib-2.0 -I$GNOME_UDIR/lib/glib-2.0/include -I$GNUTLS_UDIR/include -I$GUILE_UDIR/include -I$GWENHYWFAR_UDIR/include -I$GLOBAL_UDIR/isocodes/include -I$LIBGSF_UDIR/include -I$LIBOFX_UDIR/include -I$LIBSOUP_UDIR/include -I$LIBXSLT_UDIR/include -I$PCRE_UDIR/include -I$WEBKIT_UDIR/pkgconfig -I$LIBDBI_UDIR/include -D__USE_MINGW_ANSI_STDIO"
+
+export LDFLAGS="-L$AQBANKING_UDIR/lib -L$ENCHANT_UDIR/lib -L$GOFFICE_UDIR/lib -L$GNOME_UDIR/lib -L$GNUTLS_UDIR/lib -L$GUILE_UDIR/lib -L$GWENHYWFAR_UDIR/lib -L$GLOBAL_UDIR/isocodes/lib -L$LIBGSF_UDIR/lib -L$LIBOFX_UDIR/lib -L$LIBSOUP_UDIR/lib -L$LIBXSLT_UDIR/lib -L$PCRE_UDIR/lib -L$WEBKIT_UDIR/lib -L$LIBDBI_UDIR/lib -L$GLOBAL_UDIR/hh/lib"
+
+export GIT_CMD=$GLOBAL_UDIR/git/git.exe
commit 929cbf79c18029d464f92601960c0ea85f02244e
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat Oct 11 15:47:29 2014 +0200
Remove pre-existing dist dir instead of aborting a dist build
diff --git a/dist-impl.sh b/dist-impl.sh
index 7c012ad..f4fe538 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -6,7 +6,8 @@
function dist_prepare() {
TMP_UDIR=`unix_path $TMP_DIR`
if [ -x $DIST_DIR ]; then
- die "Please remove ${DIST_DIR} first"
+ echo "Removing previous DIST_DIR ${DIST_DIR}"
+ rm -fr "${DIST_DIR}"
fi
_UNZIP_UDIR=`unix_path $UNZIP_DIR`
_GUILE_UDIR=`unix_path $GUILE_DIR`
commit a12f11a95425fc109f4848f1efcb1e2085df4c0f
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat Oct 11 14:34:11 2014 +0200
Run pango-querymodules.exe at the end of the installation
diff --git a/inno_setup/gnucash.iss b/inno_setup/gnucash.iss
index 84d7362..8e434c0 100644
--- a/inno_setup/gnucash.iss
+++ b/inno_setup/gnucash.iss
@@ -52,6 +52,7 @@ Name: "{group}\{cm:IconName_Uninstall}"; Filename: "{uninstallexe}"; Comment: "{
Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: desktopicon
[Run]
+Filename: "{app}\bin\pango-querymodules.exe"; Parameters: " --system --update-cache"; Flags: runhidden
Filename: "{app}\bin\@PACKAGE at .exe"; Description: "{cm:RunPrg}"; WorkingDir: "{app}\bin"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent
Filename: "{app}\bin\guile.cmd"; Flags: runhidden
commit a958ea112251a9610b15cc61f8c0bcdd140296e1
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri Oct 10 16:16:23 2014 +0200
GOffice requires bison and flex
diff --git a/defaults.sh b/defaults.sh
index dc23f3f..098b65e 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -66,11 +66,13 @@ set_default MSYS_DIR $MINGW_DIR\\msys
# tools here means binaries runnable without other DLLs or data files
set_default TOOLS_DIR $GLOBAL_DIR\\tools
-set_default MSYS_WGET_VERSION "1.12-1"
+set_default MSYS_BISON_VERSION "2.4.2-1"
+set_default MSYS_FLEX_VERSION "2.5.35-2"
set_default MSYS_M4_VERSION "1.4.16-2"
set_default MSYS_PATCH_VERSION "2.6.1-1"
set_default MSYS_PERL_VERSION "5.8.8-1"
set_default MSYS_UNZIP_VERSION "6.0-1"
+set_default MSYS_WGET_VERSION "1.12-1"
set_default SF_MIRROR "http://downloads.sf.net"
set_default GTK_MIRROR "ftp.gtk.org/pub"
diff --git a/install-impl.sh b/install-impl.sh
index 9bd9b5c..00bfbb3 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -78,6 +78,8 @@ function inst_msys() {
mingw_smart_get msys-patch ${MSYS_PATCH_VERSION}
mingw_smart_get msys-perl ${MSYS_PERL_VERSION}
mingw_smart_get msys-unzip ${MSYS_UNZIP_VERSION}
+ mingw_smart_get msys-bison ${MSYS_BISON_VERSION}
+ mingw_smart_get msys-flex ${MSYS_FLEX_VERSION}
quiet perl --help || die "perl not installed correctly"
quiet wget --version || die "wget unavailable"
commit d1a065b4ddd43d35a29e1122263e0c361f4ca34d
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu Oct 9 11:00:50 2014 +0200
Delete gnome's .la files. They are causing a build failure
diff --git a/install-impl.sh b/install-impl.sh
index f075ba5..9bd9b5c 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -409,6 +409,9 @@ function inst_gnome() {
sed '1s,!.*perl,!'"perl"',;s,/opt/gnu/bin/iconv,iconv,' $file > tmp
mv tmp $file
done
+
+ # remove *.la files. They are hindering the build
+ rm -f lib/*.la
qpopd
if quiet ${PKG_CONFIG} --exact-version=${LIBXML2_VERSION} libxml-2.0 ; then
commit a309568959a11f1d18cb29b9253172329e01a45e
Author: John Ralls <jralls at ceridwen.us>
Date: Wed Oct 8 22:16:35 2014 -0700
Add missing dev in CAIRO_DEV_URL
diff --git a/defaults.sh b/defaults.sh
index c595c50..dc23f3f 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -258,7 +258,7 @@ set_default GLIB_URL "$GC_DEPS_URL/glib-2.38.2-minGW.tgz"
set_default GLIB_DEV_URL "$GC_DEPS_URL/glib-2.38.2-dev-minGW.tgz"
set_default CAIRO_VERSION="1.10.2"
set_default CAIRO_URL "$GC_DEPS_URL/cairo-1.10.2-minGW.tgz"
-set_default CAIRO_DEV_URL "$GC_DEPS_URL/cairo-1.10.2-minGW.tgz"
+set_default CAIRO_DEV_URL "$GC_DEPS_URL/cairo-1.10.2-dev-minGW.tgz"
set_default GTK_VERSION="2.24.24"
set_default GTK_URL "$GC_DEPS_URL/gtk+-2.24.24-minGW.tgz"
set_default GTK_DEV_URL "$GC_DEPS_URL/gtk+-2.24.24-dev-minGW.tgz"
commit b0a113c8993d55e269e4ed7e10582a43fcafa0c2
Author: John Ralls <jralls at ceridwen.us>
Date: Wed Oct 8 17:25:44 2014 -0700
Roll Cairo version back to 2.10.2, split out dev tarballs.
Themes don't work right with Cairo-2.12, and the app doesn't need
headers, libtool files, or pkgconfig files, they are needed to build
with.
diff --git a/defaults.sh b/defaults.sh
index e62df89..c595c50 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -255,10 +255,13 @@ set_default LIBXML2_DEV_URL "$GNOME_WIN32_DEPS_URL/libxml2-dev_2.7.7-1_w
set_default PKG_CONFIG_URL "$GNOME_WIN32_DEPS_URL/pkg-config_0.25-1_win32.zip"
set_default PKG_CONFIG_DEV_URL "$GNOME_WIN32_DEPS_URL/pkg-config-dev_0.25-1_win32.zip"
set_default GLIB_URL "$GC_DEPS_URL/glib-2.38.2-minGW.tgz"
-set_default CAIRO_VERSION="1.12.2"
-set_default CAIRO_URL "$GC_DEPS_URL/cairo-1.12.16-minGW.tgz"
+set_default GLIB_DEV_URL "$GC_DEPS_URL/glib-2.38.2-dev-minGW.tgz"
+set_default CAIRO_VERSION="1.10.2"
+set_default CAIRO_URL "$GC_DEPS_URL/cairo-1.10.2-minGW.tgz"
+set_default CAIRO_DEV_URL "$GC_DEPS_URL/cairo-1.10.2-minGW.tgz"
set_default GTK_VERSION="2.24.24"
set_default GTK_URL "$GC_DEPS_URL/gtk+-2.24.24-minGW.tgz"
+set_default GTK_DEV_URL "$GC_DEPS_URL/gtk+-2.24.24-dev-minGW.tgz"
set_default ZLIB_URL "$GNOME_WIN32_DEPS_URL/zlib_1.2.5-2_win32.zip"
set_default ZLIB_DEV_URL "$GNOME_WIN32_DEPS_URL/zlib-dev_1.2.5-2_win32.zip"
diff --git a/install-impl.sh b/install-impl.sh
index 4e584a8..f075ba5 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -359,6 +359,7 @@ function inst_gnome() {
else
mkdir -p $_GNOME_UDIR
wget_unpacked $CAIRO_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $CAIRO_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $EXPAT_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $EXPAT_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $FREETYPE_URL $DOWNLOAD_DIR $GNOME_DIR
@@ -366,7 +367,9 @@ function inst_gnome() {
wget_unpacked $GAIL_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GAIL_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GLIB_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $GLIB_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GTK_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $GTK_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $INTLTOOL_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBART_LGPL_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBART_LGPL_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
commit 409efbd7d4cb47a3ed18c9ec509c90c35ffcbcfb
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed Oct 8 13:51:48 2014 +0200
Handle more tag variations correctly in major_minor function
diff --git a/functions.sh b/functions.sh
index 2e1618d..a633073 100644
--- a/functions.sh
+++ b/functions.sh
@@ -307,12 +307,8 @@ function mingw_smart_get () {
# If the version entered is not a version in the expected format
# 0 will be returned.
function get_major_minor () {
- local version=${1//[!0-9.-]/}
-
- local -i version_major=${version%%.*}
- local version_tmp=${version#*.}
- local -i version_minor=${version_tmp%%.*}
- major_minor=$(( $version_major*100 + $version_minor ))
+ version=$1
+ major_minor=$(perl -e '($maj,$min,$rest) = <> =~ /([0-9]*)[.]([0-9]*)(.*)/; print $maj*100+$min;' <<< $version)
}
### Local Variables: ***
commit 9f2d0f087978705d133500115a7abae0de0e5bb1
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Oct 7 22:39:31 2014 +0200
Build server: some more logging
diff --git a/buildserver/build_periodic.sh b/buildserver/build_periodic.sh
index 20e14fe..3336b7d 100644
--- a/buildserver/build_periodic.sh
+++ b/buildserver/build_periodic.sh
@@ -48,6 +48,7 @@ set_env "$_GIT_UDIR/bin/git" GIT_CMD
export GIT_CMD
# Update the gnucash-on-windows build scripts
+echo "Pulling latest changes from gnucash-on-windows..."
_GC_WIN_REPOS_UDIR=`unix_path $GC_WIN_REPOS_DIR`
qpushd "$_GC_WIN_REPOS_UDIR"
$GIT_CMD pull
@@ -60,6 +61,7 @@ _REPOS_UDIR=`unix_path $REPOS_DIR`
qpushd "$_REPOS_UDIR"
# Update the gnucash repository
+echo "Pulling latest changes from gnucash.git..."
$GIT_CMD pull
# If we don't have a rev file then start from 'now' and force a build
revfile=$_GC_WIN_REPOS_UDIR/last_rev_periodic
diff --git a/buildserver/build_tags.sh b/buildserver/build_tags.sh
index b89b9d8..c1d6826 100644
--- a/buildserver/build_tags.sh
+++ b/buildserver/build_tags.sh
@@ -90,11 +90,13 @@ for tag_rev in $tags ; do
tag_hash=${tag_rev#*/}
tag=${tag_rev%/*}
+ echo "Building tag $tag"
+
# Git builds are only supported from 2.5 up
get_major_minor $tag
if (( $major_minor < 205 ))
then
- echo "Skipping build of tag $tag (reason: older than 2.5)"
+ echo " *** Tag $tag is older than 2.5 or not a release tag. Skipping."
else
TAG_GLOBAL_DIR="c:\\gcdev\\gnucash-${tag}"
commit 576134d4b637ec35f40608174d26119ab4f0c639
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Oct 7 17:36:36 2014 +0200
Build server: also mark deliberately skipped tags as built
diff --git a/buildserver/build_tags.sh b/buildserver/build_tags.sh
index cee4697..b89b9d8 100644
--- a/buildserver/build_tags.sh
+++ b/buildserver/build_tags.sh
@@ -95,51 +95,52 @@ for tag_rev in $tags ; do
if (( $major_minor < 205 ))
then
echo "Skipping build of tag $tag (reason: older than 2.5)"
- continue
- fi
+ else
- TAG_GLOBAL_DIR="c:\\gcdev\\gnucash-${tag}"
- _TAG_GLOBAL_UDIR=$(unix_path "$TAG_GLOBAL_DIR")
- rm -fr $_TAG_GLOBAL_UDIR
-
- # Set up a clean build environment for this tag
- # This will automatically create a custom.sh with
- # several parameters correctly pre-set like
- # GLOBAL_DIR, DOWNLOAD_DIR,...
- cscript.exe $_GC_WIN_REPOS_UDIR/bootstrap_win_dev.vbs /silent:yes /GLOBAL_DIR:$TAG_GLOBAL_DIR /DOWNLOAD_DIR:$DOWNLOAD_DIR /GIT_DIR:$GIT_DIR
-
- # Check out the tag and setup custom.sh
- echo "Checking out tag $tag"
- TAG_REPOS_DIR="${TAG_GLOBAL_DIR}\\gnucash.git"
- _TAG_REPOS_UDIR=$(unix_path "$TAG_REPOS_DIR")
- qpushd $TAG_REPOS_DIR
- $GIT_CMD checkout $tag
- qpopd
-
- TAG_WIN_REPOS_DIR="${TAG_GLOBAL_DIR}\\gnucash-on-windows.git"
- _TAG_WIN_REPOS_UDIR=$(unix_path "$TAG_WIN_REPOS_DIR")
-
- # BUILD_FROM_TARBALL is special:
- # in install.sh place we check !=yes, in defaults.sh =yes, in dist.sh =no
- # We want it to look like 'no' in install and defaults, but yes in dist
- # so this hack works!
- echo "BUILD_FROM_TARBALL=maybe" >> ${_TAG_WIN_REPOS_UDIR}/custom.sh
-
- # Point HH_DIR at the global installation because we don't need to redo it
- echo -n "HH_DIR=" >> ${_TAG_WIN_REPOS_UDIR}/custom.sh
- echo "${GLOBAL_DIR}\\hh" | sed -e 's/\\/\\\\/g' >> ${_TAG_WIN_REPOS_UDIR}/custom.sh
-
- # Inform the build scripts of the tag we're building.
- echo "GNUCASH_SCM_REV=$tag" >> ${_TAG_WIN_REPOS_UDIR}/custom.sh
-
- # Now build the tag! (this will upload it too)
- # Use the build_package script from master (cwd), not from the tag
- qpushd ${_TAG_WIN_REPOS_UDIR}
- ${BUILDSERVER_DIR}/build_package.sh ${tag}
- qpopd
+ TAG_GLOBAL_DIR="c:\\gcdev\\gnucash-${tag}"
+ _TAG_GLOBAL_UDIR=$(unix_path "$TAG_GLOBAL_DIR")
+ rm -fr $_TAG_GLOBAL_UDIR
+
+ # Set up a clean build environment for this tag
+ # This will automatically create a custom.sh with
+ # several parameters correctly pre-set like
+ # GLOBAL_DIR, DOWNLOAD_DIR,...
+ cscript.exe $_GC_WIN_REPOS_UDIR/bootstrap_win_dev.vbs /silent:yes /GLOBAL_DIR:$TAG_GLOBAL_DIR /DOWNLOAD_DIR:$DOWNLOAD_DIR /GIT_DIR:$GIT_DIR
+
+ # Check out the tag and setup custom.sh
+ echo "Checking out tag $tag"
+ TAG_REPOS_DIR="${TAG_GLOBAL_DIR}\\gnucash.git"
+ _TAG_REPOS_UDIR=$(unix_path "$TAG_REPOS_DIR")
+ qpushd $TAG_REPOS_DIR
+ $GIT_CMD checkout $tag
+ qpopd
+
+ TAG_WIN_REPOS_DIR="${TAG_GLOBAL_DIR}\\gnucash-on-windows.git"
+ _TAG_WIN_REPOS_UDIR=$(unix_path "$TAG_WIN_REPOS_DIR")
+
+ # BUILD_FROM_TARBALL is special:
+ # in install.sh place we check !=yes, in defaults.sh =yes, in dist.sh =no
+ # We want it to look like 'no' in install and defaults, but yes in dist
+ # so this hack works!
+ echo "BUILD_FROM_TARBALL=maybe" >> ${_TAG_WIN_REPOS_UDIR}/custom.sh
+
+ # Point HH_DIR at the global installation because we don't need to redo it
+ echo -n "HH_DIR=" >> ${_TAG_WIN_REPOS_UDIR}/custom.sh
+ echo "${GLOBAL_DIR}\\hh" | sed -e 's/\\/\\\\/g' >> ${_TAG_WIN_REPOS_UDIR}/custom.sh
+
+ # Inform the build scripts of the tag we're building.
+ echo "GNUCASH_SCM_REV=$tag" >> ${_TAG_WIN_REPOS_UDIR}/custom.sh
+
+ # Now build the tag! (this will upload it too)
+ # Use the build_package script from master (cwd), not from the tag
+ qpushd ${_TAG_WIN_REPOS_UDIR}
+ ${BUILDSERVER_DIR}/build_package.sh ${tag}
+ qpopd
+ fi
+
# Successful build of one tag. We may be in a loop to build several tags.
- # So mark this one as done to prevent it from being rebuilt if a subsequent
+ # So mark this one as done to prevent it from being restarted if a subsequent
# build fails.
built_tags="${built_tags}${tag_rev}"$'\n'
echo "${built_tags}" | sort | grep -v '^$' > ${tagfile}
commit 042af15ae565e6264464227660753ae247ef36b3
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Oct 7 16:38:41 2014 +0200
Build server: rework test to find which tags to build
Less intermediate file accesses
More robust with regards to line endings
Don't mark a tag as built when the tag build script failed for some reason
diff --git a/buildserver/build_tags.sh b/buildserver/build_tags.sh
index c33fd61..cee4697 100644
--- a/buildserver/build_tags.sh
+++ b/buildserver/build_tags.sh
@@ -60,31 +60,35 @@ if [ ! -f ${tagfile} ] ; then
for one_tag in $($GIT_CMD tag)
do
tag_hash=$($GIT_CMD rev-parse ${one_tag})
- echo ${tag_hash}/${one_tag} >> ${tagfile}
+ echo ${one_tag}/${tag_hash} >> ${tagfile}
done
fi
# Figure out the new set of tags
+prev_built_tags="$(cat "${tagfile}")"
+built_tags=
+tags=
rm -f ${tagfile}.new
for one_tag in $($GIT_CMD tag)
do
tag_hash=$($GIT_CMD rev-parse ${one_tag})
- echo ${tag_hash}/${one_tag} >> ${tagfile}.new
+ if [ -n "$(grep ${one_tag}/${tag_hash} <<< "${prev_built_tags}")" ]
+ then
+ built_tags="${built_tags}${one_tag}/${tag_hash}"$'\n'
+ else
+ tags="${tags}${one_tag}/${tag_hash}"$'\n'
+ fi
done
-tags="`diff --suppress-common-lines ${tagfile} ${tagfile}.new | grep '^> ' | sed -e 's/^> //g'`"
qpopd
-# move the new file into place
-mv -f ${tagfile}.new ${tagfile}
-
qpopd # return to directory the script was invoked from (not necessarily the directory this script resides in)
################################################################
# Now iterate over all the new tags (if any) and build a package
for tag_rev in $tags ; do
- tag=${tag_rev#*/}
- tag=${tag%/*}
+ tag_hash=${tag_rev#*/}
+ tag=${tag_rev%/*}
# Git builds are only supported from 2.5 up
get_major_minor $tag
@@ -133,4 +137,10 @@ for tag_rev in $tags ; do
qpushd ${_TAG_WIN_REPOS_UDIR}
${BUILDSERVER_DIR}/build_package.sh ${tag}
qpopd
+
+ # Successful build of one tag. We may be in a loop to build several tags.
+ # So mark this one as done to prevent it from being rebuilt if a subsequent
+ # build fails.
+ built_tags="${built_tags}${tag_rev}"$'\n'
+ echo "${built_tags}" | sort | grep -v '^$' > ${tagfile}
done
commit f46b85cbca6e75bdfd602f7d3533086b8a6c43bf
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Oct 7 14:38:28 2014 +0200
Refactor function usage to avoid code duplication
diff --git a/buildserver/build_package.sh b/buildserver/build_package.sh
index 0168772..9054f7d 100644
--- a/buildserver/build_package.sh
+++ b/buildserver/build_package.sh
@@ -20,11 +20,9 @@ function on_error() {
exit
}
-function qpushd() { pushd "$@" >/dev/null; }
-function qpopd() { popd >/dev/null; }
-function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
-
-. ./functions.sh
+BUILDSERVER_DIR="$(dirname "$0")"
+GC_WIN_DIR="$BUILDSERVER_DIR/.."
+. "$GC_WIN_DIR/functions.sh"
. ./defaults.sh
tag="${1:-$GNUCASH_SCM_REV}"
diff --git a/buildserver/build_periodic.sh b/buildserver/build_periodic.sh
index f503cc0..20e14fe 100644
--- a/buildserver/build_periodic.sh
+++ b/buildserver/build_periodic.sh
@@ -11,6 +11,11 @@
# won't allow to change a file that is "in use". So in the rare
# situation this script needs to be updated, you will need to
# run the git pull once yourself.
+#
+# 3. This script assumes it's called with a full absolute path.
+# eg: c:\\gcdev\\gnucash-on-windows.git\\buildserver\\build_periodic.sh
+# or /c/gcdev/gnucash-on-windows.git/buildserver/build_periodic.sh
+# Failing to do so will break the build.
set -e
@@ -30,13 +35,11 @@ then
fi
fi
-function qpushd() { pushd "$@" >/dev/null; }
-function qpopd() { popd >/dev/null; }
-function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
+BUILDSERVER_DIR="$(dirname "$0")"
+GC_WIN_DIR="$BUILDSERVER_DIR/.."
+. "$GC_WIN_DIR/functions.sh"
-_BUILDSERVER_UDIR="$(dirname $(unix_path "$0"))"
-qpushd "$_BUILDSERVER_UDIR/.."
-. ./functions.sh
+qpushd "$GC_WIN_DIR"
. ./defaults.sh
# Variables
@@ -69,7 +72,7 @@ newrev=$($GIT_CMD rev-parse HEAD)
qpopd # leave gnucash repository
if [[ "${oldrev}" != "${newrev}" ]]; then
- $_BUILDSERVER_UDIR/build_package.sh
+ $BUILDSERVER_DIR/build_package.sh
fi
# move the new file into place, will only happen if the build was successful
diff --git a/buildserver/build_tags.sh b/buildserver/build_tags.sh
index bb3c8b7..c33fd61 100644
--- a/buildserver/build_tags.sh
+++ b/buildserver/build_tags.sh
@@ -11,20 +11,22 @@
# won't allow to change a file that is "in use". So in the rare
# situation this script needs to be updated, you will need to
# run the git pull once yourself.
+#
+# 3. This script assumes it's called with a full absolute path.
+# eg: c:\\gcdev\\gnucash-on-windows.git\\buildserver\\build_tags.sh
+# or /c/gcdev/gnucash-on-windows.git/buildserver/build_tags.sh
+# Failing to do so will break the build.
set -e
-function qpushd() { pushd "$@" >/dev/null; }
-function qpopd() { popd >/dev/null; }
-function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
-
################################################################
# Setup our environment (we need the DOWNLOAD_DIR)
-_BUILDSERVER_UDIR="$(dirname $(unix_path "$0"))"
-qpushd "$_BUILDSERVER_UDIR/.."
-pkgdir="`pwd`"
-. ./functions.sh
+BUILDSERVER_DIR="$(dirname "$0")"
+GC_WIN_DIR="$BUILDSERVER_DIR/.."
+. "$GC_WIN_DIR/functions.sh"
+
+qpushd "$GC_WIN_DIR"
. ./defaults.sh
# Variables
@@ -129,6 +131,6 @@ for tag_rev in $tags ; do
# Now build the tag! (this will upload it too)
# Use the build_package script from master (cwd), not from the tag
qpushd ${_TAG_WIN_REPOS_UDIR}
- ${_BUILDSERVER_UDIR}/build_package.sh ${tag}
+ ${BUILDSERVER_DIR}/build_package.sh ${tag}
qpopd
done
diff --git a/create_cross_mingw.sh b/create_cross_mingw.sh
index 7cda3b4..1291a30 100755
--- a/create_cross_mingw.sh
+++ b/create_cross_mingw.sh
@@ -1,11 +1,9 @@
#! /bin/bash
-function qpushd() { pushd "$@" >/dev/null; }
-function qpopd() { popd >/dev/null; }
-function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
+GC_WIN_DIR="$(dirname "$0")"
+. "$GC_WIN_DIR/functions.sh"
-qpushd "$(dirname "$0")"
-. functions.sh
+qpushd "$GC_WIN_DIR"
. defaults.sh
#
diff --git a/crossbuild_webkit.sh b/crossbuild_webkit.sh
index e983948..a1e51dc 100755
--- a/crossbuild_webkit.sh
+++ b/crossbuild_webkit.sh
@@ -7,12 +7,10 @@ set -e
echo -n "Build Starting at "
date
-function qpushd() { pushd "$@" >/dev/null; }
-function qpopd() { popd >/dev/null; }
-function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
+GC_WIN_DIR="$(dirname "$0")"
+. "$GC_WIN_DIR/functions.sh"
-qpushd "$(dirname $(unix_path "$0"))"
-. functions.sh
+qpushd "$GC_WIN_DIR"
. defaults.sh
register_env_var ACLOCAL_FLAGS " "
diff --git a/dist.sh b/dist.sh
index 61cf7ad..f2576df 100755
--- a/dist.sh
+++ b/dist.sh
@@ -11,12 +11,10 @@ trap on_error ERR
echo -n "Build (dist) Starting at "
date
-function qpushd() { pushd "$@" >/dev/null; }
-function qpopd() { popd >/dev/null; }
-function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
+GC_WIN_DIR="$(dirname "$0")"
+. "$GC_WIN_DIR/functions.sh"
-qpushd "$(dirname $(unix_path "$0"))"
-. functions.sh
+qpushd "$GC_WIN_DIR"
. defaults.sh
. dist-impl.sh
diff --git a/functions.sh b/functions.sh
index c13ebc9..2e1618d 100644
--- a/functions.sh
+++ b/functions.sh
@@ -37,7 +37,10 @@ function eval_now() {
function quiet() { "$@" &>/dev/null; }
# c:/dir/sub
+function qpushd() { pushd "$@" >/dev/null; }
+function qpopd() { popd >/dev/null; }
function win_fs_path() { echo "$*" | sed 's,\\,/,g'; }
+function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
# usage: wpwd [rel]
# rel can be any relative path
diff --git a/install.sh b/install.sh
index 42e70dd..8a1d3fa 100644
--- a/install.sh
+++ b/install.sh
@@ -19,12 +19,10 @@ trap on_error ERR
echo -n "Build Starting at "
date
-function qpushd() { pushd "$@" >/dev/null; }
-function qpopd() { popd >/dev/null; }
-function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
+GC_WIN_DIR="$(dirname "$0")"
+. "$GC_WIN_DIR/functions.sh"
-qpushd "$(dirname $(unix_path "$0"))"
-. ./functions.sh
+qpushd "$GC_WIN_DIR"
. ./defaults.sh
. ./install-impl.sh
diff --git a/make_install.sh b/make_install.sh
index cd3b79b..9c3dbaa 100644
--- a/make_install.sh
+++ b/make_install.sh
@@ -2,12 +2,10 @@
set -e
-function qpushd() { pushd "$@" >/dev/null; }
-function qpopd() { popd >/dev/null; }
-function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
+GC_WIN_DIR="$(dirname "$0")"
+. "$GC_WIN_DIR/functions.sh"
-qpushd "$(dirname $(unix_path "$0"))"
-. functions.sh
+qpushd "$GC_WIN_DIR"
. defaults.sh
reset_steps
. install.sh
diff --git a/reset.sh b/reset.sh
index aea1315..86cdb36 100644
--- a/reset.sh
+++ b/reset.sh
@@ -4,12 +4,10 @@ set -e
#### Load defaults.sh
-function qpushd() { pushd "$@" >/dev/null; }
-function qpopd() { popd >/dev/null; }
-function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
+GC_WIN_DIR="$(dirname "$0")"
+. "$GC_WIN_DIR/functions.sh"
-qpushd "$(dirname $(unix_path "$0"))"
-. functions.sh
+qpushd "$GC_WIN_DIR"
. defaults.sh
## too bad, bash 2.04 has no real support for arrays
commit 9d19d0c0124e9e36fa7396f1c557db56d73d27c4
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Oct 7 16:37:34 2014 +0200
Quote variable to preserve newlines
diff --git a/install-impl.sh b/install-impl.sh
index 942b90d..4e584a8 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1248,7 +1248,7 @@ function inst_gnucash() {
# Check for options that may not be available in all versions we can build
_CONFIG_HELP=$($_REPOS_UDIR/configure --help)
- if [ -n "$(grep -- '--with-boost' <<< $_CONFIG_HELP)" ]; then
+ if [ -n "$(grep -- '--with-boost' <<< "$_CONFIG_HELP")" ]; then
_EXTRA_OPTIONS="--with-boost=${BOOST_ROOT}"
else
_EXTRA_OPTIONS=""
commit a5f58d1a57be957ebcfe58c00e487d84eb2cc3da
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Oct 7 12:20:25 2014 +0200
Refine check whether to build boost or not
diff --git a/buildserver/build_tags.sh b/buildserver/build_tags.sh
index b86eef9..bb3c8b7 100644
--- a/buildserver/build_tags.sh
+++ b/buildserver/build_tags.sh
@@ -85,10 +85,7 @@ for tag_rev in $tags ; do
tag=${tag%/*}
# Git builds are only supported from 2.5 up
- tag_major=${tag%%.*}
- tag_tmp=${tag#*.}
- tag_minor=${tag_tmp%%.*}
- major_minor=$(( $tag_major*100 + $tag_minor ))
+ get_major_minor $tag
if (( $major_minor < 205 ))
then
echo "Skipping build of tag $tag (reason: older than 2.5)"
diff --git a/functions.sh b/functions.sh
index 96c450a..c13ebc9 100644
--- a/functions.sh
+++ b/functions.sh
@@ -297,6 +297,21 @@ function mingw_smart_get () {
fi
}
+# Take a version number in the form M.m.µ-b
+# and return the major (M) and minor (m) component in numeric form
+# as follows: major*100 + minor
+# for example: 2.4.8-1 would yield 204
+# If the version entered is not a version in the expected format
+# 0 will be returned.
+function get_major_minor () {
+ local version=${1//[!0-9.-]/}
+
+ local -i version_major=${version%%.*}
+ local version_tmp=${version#*.}
+ local -i version_minor=${version_tmp%%.*}
+ major_minor=$(( $version_major*100 + $version_minor ))
+}
+
### Local Variables: ***
### mode: shell-script ***
### sh-basic-offset: 4 ***
diff --git a/install-impl.sh b/install-impl.sh
index 09faff2..942b90d 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1235,11 +1235,6 @@ function inst_gnucash() {
_REPOS_UDIR=`unix_path $REPOS_DIR`
mkdir -p $_BUILD_UDIR
add_to_env $_INSTALL_UDIR/bin PATH
- if [ "$GNUCASH_SCM_REV" = "master" ]; then
- _MASTER_OPTIONS="--with-boost=${BOOST_ROOT}"
- else
- _MASTER_OPTIONS=""
- fi
AQBANKING_OPTIONS="--enable-aqbanking"
AQBANKING_UPATH="${_OPENSSL_UDIR}/bin:${_GWENHYWFAR_UDIR}/bin:${_AQBANKING_UDIR}/bin"
@@ -1251,6 +1246,14 @@ function inst_gnucash() {
qpopd
fi
+ # Check for options that may not be available in all versions we can build
+ _CONFIG_HELP=$($_REPOS_UDIR/configure --help)
+ if [ -n "$(grep -- '--with-boost' <<< $_CONFIG_HELP)" ]; then
+ _EXTRA_OPTIONS="--with-boost=${BOOST_ROOT}"
+ else
+ _EXTRA_OPTIONS=""
+ fi
+
qpushd $_BUILD_UDIR
$_REPOS_UDIR/configure ${HOST_XCOMPILE} \
--prefix=$_INSTALL_WFSDIR \
@@ -1261,7 +1264,7 @@ function inst_gnucash() {
${AQBANKING_OPTIONS} \
--enable-binreloc \
--enable-locale-specific-tax \
- ${_MASTER_OPTIONS} \
+ ${_EXTRA_OPTIONS} \
CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GUILE_CPPFLAGS} ${LIBDBI_CPPFLAGS} ${KTOBLZCHECK_CPPFLAGS} ${HH_CPPFLAGS} ${LIBSOUP_CPPFLAGS} -D_WIN32 ${EXTRA_CFLAGS}" \
LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} ${HH_LDFLAGS} -L${_SQLITE3_UDIR}/lib -L${_ENCHANT_UDIR}/lib -L${_LIBXSLT_UDIR}/lib -L${_MINGW_UDIR}/lib" \
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
diff --git a/install.sh b/install.sh
index adab052..42e70dd 100644
--- a/install.sh
+++ b/install.sh
@@ -100,7 +100,9 @@ add_step inst_libsoup
add_step inst_enchant
add_step inst_webkit
#boost now needed for C++ on master only
-if [ "$GNUCASH_SCM_REV" = "master" ]; then
+get_major_minor "$GNUCASH_SCM_REV"
+if [ "$GNUCASH_SCM_REV" = "master" ] ||
+ (( $major_minor > 206 )); then
add_step inst_boost
fi
commit e4036f4adef21f894d287b607dc8079de398bdc7
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Oct 7 11:01:39 2014 +0200
Buildserver: set GNUCASH_SCM_REV when building a tag
The buildscripts use this variable to make build decisions.
diff --git a/buildserver/build_tags.sh b/buildserver/build_tags.sh
index a227b06..b86eef9 100644
--- a/buildserver/build_tags.sh
+++ b/buildserver/build_tags.sh
@@ -126,6 +126,9 @@ for tag_rev in $tags ; do
echo -n "HH_DIR=" >> ${_TAG_WIN_REPOS_UDIR}/custom.sh
echo "${GLOBAL_DIR}\\hh" | sed -e 's/\\/\\\\/g' >> ${_TAG_WIN_REPOS_UDIR}/custom.sh
+ # Inform the build scripts of the tag we're building.
+ echo "GNUCASH_SCM_REV=$tag" >> ${_TAG_WIN_REPOS_UDIR}/custom.sh
+
# Now build the tag! (this will upload it too)
# Use the build_package script from master (cwd), not from the tag
qpushd ${_TAG_WIN_REPOS_UDIR}
commit 64b884014fcadc02bf8271fd069147d67ef6da0a
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Oct 7 10:58:57 2014 +0200
Make the tag build preparation a little more verbose
diff --git a/buildserver/build_tags.sh b/buildserver/build_tags.sh
index 2609ec1..a227b06 100644
--- a/buildserver/build_tags.sh
+++ b/buildserver/build_tags.sh
@@ -33,6 +33,7 @@ set_env "$_GIT_UDIR/bin/git" GIT_CMD
export GIT_CMD
# Update the gnucash-on-windows build scripts
+echo "Pulling latest changes from gnucash-on-windows..."
_GC_WIN_REPOS_UDIR=`unix_path $GC_WIN_REPOS_DIR`
qpushd "$_GC_WIN_REPOS_UDIR"
$GIT_CMD pull
@@ -48,6 +49,7 @@ _REPOS_UDIR=`unix_path $REPOS_DIR`
qpushd "$_REPOS_UDIR"
# Update the gnucash repository
+echo "Fetching new tags from upstream repository..."
$GIT_CMD fetch -t
# If we don't have a tagfile then start from 'now'
@@ -89,6 +91,7 @@ for tag_rev in $tags ; do
major_minor=$(( $tag_major*100 + $tag_minor ))
if (( $major_minor < 205 ))
then
+ echo "Skipping build of tag $tag (reason: older than 2.5)"
continue
fi
@@ -103,6 +106,7 @@ for tag_rev in $tags ; do
cscript.exe $_GC_WIN_REPOS_UDIR/bootstrap_win_dev.vbs /silent:yes /GLOBAL_DIR:$TAG_GLOBAL_DIR /DOWNLOAD_DIR:$DOWNLOAD_DIR /GIT_DIR:$GIT_DIR
# Check out the tag and setup custom.sh
+ echo "Checking out tag $tag"
TAG_REPOS_DIR="${TAG_GLOBAL_DIR}\\gnucash.git"
_TAG_REPOS_UDIR=$(unix_path "$TAG_REPOS_DIR")
qpushd $TAG_REPOS_DIR
commit 1333d13f8786cbc8b62a18a93150e62fe05a66ae
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Oct 7 10:58:15 2014 +0200
Some whitespace cleanup
Includes removal of commented code
diff --git a/buildserver/build_periodic.sh b/buildserver/build_periodic.sh
index 5f44ac5..f503cc0 100644
--- a/buildserver/build_periodic.sh
+++ b/buildserver/build_periodic.sh
@@ -25,7 +25,7 @@ if [ x$periodicity = xweekly ]
then
## Only run this script on Monday night (first day of the week)
if [ `date +%u` != 1 ]
- then
+ then
exit
fi
fi
diff --git a/buildserver/build_tags.sh b/buildserver/build_tags.sh
index 42464aa..2609ec1 100644
--- a/buildserver/build_tags.sh
+++ b/buildserver/build_tags.sh
@@ -81,7 +81,7 @@ qpopd # return to directory the script was invoked from (not necessarily the dir
for tag_rev in $tags ; do
tag=${tag_rev#*/}
tag=${tag%/*}
-
+
# Git builds are only supported from 2.5 up
tag_major=${tag%%.*}
tag_tmp=${tag#*.}
@@ -91,11 +91,11 @@ for tag_rev in $tags ; do
then
continue
fi
-
+
TAG_GLOBAL_DIR="c:\\gcdev\\gnucash-${tag}"
_TAG_GLOBAL_UDIR=$(unix_path "$TAG_GLOBAL_DIR")
rm -fr $_TAG_GLOBAL_UDIR
-
+
# Set up a clean build environment for this tag
# This will automatically create a custom.sh with
# several parameters correctly pre-set like
@@ -108,10 +108,9 @@ for tag_rev in $tags ; do
qpushd $TAG_REPOS_DIR
$GIT_CMD checkout $tag
qpopd
-
+
TAG_WIN_REPOS_DIR="${TAG_GLOBAL_DIR}\\gnucash-on-windows.git"
_TAG_WIN_REPOS_UDIR=$(unix_path "$TAG_WIN_REPOS_DIR")
- #cp -p "${pkgdir}/custom.sh" ${_TAG_WIN_REPOS_UDIR}/custom.sh
# BUILD_FROM_TARBALL is special:
# in install.sh place we check !=yes, in defaults.sh =yes, in dist.sh =no
diff --git a/dist-impl.sh b/dist-impl.sh
index a2ff7fe..7c012ad 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -1,7 +1,7 @@
#!/bin/sh
#
# GnuCash shellscript functions for dist.sh
-#
+#
function dist_prepare() {
TMP_UDIR=`unix_path $TMP_DIR`
diff --git a/install-impl.sh b/install-impl.sh
index 29b50e6..09faff2 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1,7 +1,7 @@
#!/bin/sh
#
# GnuCash shellscript functions for install.sh
-#
+#
function inst_prepare() {
# Necessary so that intltoolize doesn't come up with some
@@ -683,7 +683,7 @@ function inst_libdbi() {
rm -rf ${TMP_UDIR}/sqlite-*
fi
if test -f ${_MYSQL_LIB_UDIR}/lib/libmysql.dll -a \
- -f ${_MYSQL_LIB_UDIR}/lib/libmysqlclient.a
+ -f ${_MYSQL_LIB_UDIR}/lib/libmysqlclient.a
then
echo "MySQL library already installed in $_MYSQL_LIB_UDIR. skipping."
else
@@ -851,11 +851,11 @@ function inst_libsoup() {
qpushd $TMP_UDIR/libsoup-*
./configure ${HOST_XCOMPILE} \
--prefix=${_LIBSOUP_UDIR} \
- --disable-gtk-doc \
- --without-gnome \
- --disable-ssl \
- CPPFLAGS=-I${_GNOME_UDIR}/include \
- LDFLAGS="-L${_GNOME_UDIR}/lib -Wl,-s -lz"
+ --disable-gtk-doc \
+ --without-gnome \
+ --disable-ssl \
+ CPPFLAGS=-I${_GNOME_UDIR}/include \
+ LDFLAGS="-L${_GNOME_UDIR}/lib -Wl,-s -lz"
make
make install
qpopd
@@ -928,7 +928,7 @@ function inst_opensp() {
make -i install
qpopd
test -f ${_OPENSP_UDIR}/bin/libosp-5.dll || die "OpenSP not installed correctly"
- rm -rf $TMP_UDIR/OpenSP-*
+ rm -rf $TMP_UDIR/OpenSP-*
fi
}
@@ -1049,38 +1049,38 @@ function inst_webkit() {
wget_unpacked $WEBKIT_SRC_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir ${TMP_UDIR}/webkit-*
qpushd $TMP_UDIR/webkit-*
- add_to_env /c/Programs/GnuWin32/bin PATH
- SAVED_PATH=$PATH
- add_to_env ${_ACTIVE_PERL_BASE_DIR}/bin PATH
- export PERL5LIB=${_ACTIVE_PERL_BASE_DIR}/lib
-
- patch -p0 -u < $WEBKIT_CONFIGURE_PATCH
- CPPFLAGS="${GNOME_CPPFLAGS} ${SQLITE3_CFLAGS}" \
+ add_to_env /c/Programs/GnuWin32/bin PATH
+ SAVED_PATH=$PATH
+ add_to_env ${_ACTIVE_PERL_BASE_DIR}/bin PATH
+ export PERL5LIB=${_ACTIVE_PERL_BASE_DIR}/lib
+
+ patch -p0 -u < $WEBKIT_CONFIGURE_PATCH
+ CPPFLAGS="${GNOME_CPPFLAGS} ${SQLITE3_CFLAGS}" \
LDFLAGS="${GNOME_LDFLAGS} ${SQLITE3_LDFLAGS} -lsqlite3" \
- PERL="${_ACTIVE_PERL_BASE_DIR}/bin/perl" \
- ./configure \
- --prefix=${_WEBKIT_UDIR} \
- --with-target=win32 \
- --with-unicode-backend=glib \
- --enable-web-sockets \
- --enable-3D-transforms \
- --disable-video
+ PERL="${_ACTIVE_PERL_BASE_DIR}/bin/perl" \
+ ./configure \
+ --prefix=${_WEBKIT_UDIR} \
+ --with-target=win32 \
+ --with-unicode-backend=glib \
+ --enable-web-sockets \
+ --enable-3D-transforms \
+ --disable-video
patch -p0 -u < $WEBKIT_DATADIR_PATCH
patch -p0 -u < $WEBKIT_GCCPATH_PATCH
patch -p0 -u < $WEBKIT_MAKEFILE_PATCH
patch -p0 -u < $WEBKIT_MINGW32_PATCH
patch -p0 -u < $WEBKIT_NOSVG_PATCH
- cp $WEBKIT_WEBKITENUMTYPES_CPP DerivedSources
- cp $WEBKIT_WEBKITENUMTYPES_H Webkit/gtk/webkit
- make
- make install
- PATH=$SAVED_PATH
- qpopd
- else
+ cp $WEBKIT_WEBKITENUMTYPES_CPP DerivedSources
+ cp $WEBKIT_WEBKITENUMTYPES_H Webkit/gtk/webkit
+ make
+ make install
+ PATH=$SAVED_PATH
+ qpopd
+ else
wget_unpacked $WEBKIT_URL $DOWNLOAD_DIR $WEBKIT_DIR
- fi
+ fi
quiet ${PKG_CONFIG} --exists webkit-1.0 || die "webkit not installed correctly"
- rm -rf ${TMP_UDIR}/webkit-*
+ rm -rf ${TMP_UDIR}/webkit-*
qpushd $_WEBKIT_UDIR/lib/pkgconfig
perl -pi.bak -e"s!^prefix=.*\$!prefix=$_WEBKIT_UDIR!" *.pc
@@ -1193,7 +1193,7 @@ function inst_boost() {
${_BOOST_UDIR}/bin/b2 install-proper --prefix=${_BOOST_UDIR} --with-atomic --with-chrono --with-date_time --with-filesystem --with-log --with-program_options --with-regex --with-signals --with-system --with-test link=shared variant=release toolset=gcc --layout=tagged
qpopd
test -f ${_BOOST_UDIR}/lib/libboost_date_time.dll || die "Boost not installed correctly"
- rm -rf $TMP_UDIR/boost_*
+ rm -rf $TMP_UDIR/boost_*
fi
}
@@ -1331,7 +1331,7 @@ function make_install() {
# the equivalent sections in inno_setup/gnucash.iss, and
# (in the gnucash source repository) src/bin/environment*.in
qpushd $_INSTALL_UDIR/bin
- cat > gnucash-launcher.cmd <<EOF
+ cat > gnucash-launcher.cmd <<EOF
@echo off
setlocal
set PATH=$INSTALL_DIR\\bin;%PATH%
@@ -1360,7 +1360,7 @@ set PATH=$LIBSOUP_DIR\\bin;%PATH%
set PATH=$LIBSOUP_DIR\\lib;%PATH%
set PATH=$LIBXSLT_DIR\\bin;%PATH%
set PATH=$LIBXSLT_DIR\\lib;%PATH%
-
+
set LTDL_LIBRARY_PATH=${INSTALL_DIR}\\lib
start gnucash %*
@@ -1370,7 +1370,7 @@ EOF
}
function checkupd_docs_git() {
-
+
if [ "$UPDATE_DOCS" = "yes" ]; then
if [ -x .git ]; then
setup "Docs - Update repository (git)"
commit 1b02f6c598d2eac14683c4f4953c1451fbde7cb1
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Oct 6 20:45:19 2014 +0200
Reuse installed git for tag builds
Reinstalling it over and over again messes up Windows' ability
to uninstall the other versions
diff --git a/buildserver/build_tags.sh b/buildserver/build_tags.sh
index 68d4b9e..42464aa 100644
--- a/buildserver/build_tags.sh
+++ b/buildserver/build_tags.sh
@@ -100,7 +100,7 @@ for tag_rev in $tags ; do
# This will automatically create a custom.sh with
# several parameters correctly pre-set like
# GLOBAL_DIR, DOWNLOAD_DIR,...
- cscript.exe $_GC_WIN_REPOS_UDIR/bootstrap_win_dev.vbs /silent:yes /GLOBAL_DIR:$TAG_GLOBAL_DIR /DOWNLOAD_DIR:$DOWNLOAD_DIR
+ cscript.exe $_GC_WIN_REPOS_UDIR/bootstrap_win_dev.vbs /silent:yes /GLOBAL_DIR:$TAG_GLOBAL_DIR /DOWNLOAD_DIR:$DOWNLOAD_DIR /GIT_DIR:$GIT_DIR
# Check out the tag and setup custom.sh
TAG_REPOS_DIR="${TAG_GLOBAL_DIR}\\gnucash.git"
commit 76c0806012c77d00fffca5d7da343b3a09fa8932
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Oct 6 18:29:37 2014 +0200
Fix missing functions
diff --git a/buildserver/build_package.sh b/buildserver/build_package.sh
index a3fe840..0168772 100644
--- a/buildserver/build_package.sh
+++ b/buildserver/build_package.sh
@@ -20,6 +20,8 @@ function on_error() {
exit
}
+function qpushd() { pushd "$@" >/dev/null; }
+function qpopd() { popd >/dev/null; }
function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
. ./functions.sh
commit 20b9a77d95712b9378bdaf20eeb82e13f51ddf25
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Oct 6 17:39:18 2014 +0200
Check for tags in the proper git repository
diff --git a/buildserver/build_package.sh b/buildserver/build_package.sh
index 31c3d0b..a3fe840 100644
--- a/buildserver/build_package.sh
+++ b/buildserver/build_package.sh
@@ -31,6 +31,8 @@ tag="${1:-$GNUCASH_SCM_REV}"
# NOTE: this assumes "tag" to be either a tag or a branch, not a
# commit hash. It will probably work with a hash as well,
# but will create a directory for the hash
+_REPOS_UDIR=`unix_path $REPOS_DIR`
+qpushd "$_REPOS_UDIR"
if [ -n "$($GIT_CMD tag -l $tag)" ]; then
TARGET_DIR=releases
LOG_TAG=$tag
@@ -38,6 +40,7 @@ else
TARGET_DIR=$tag
LOG_TAG=$TARGET_DIR
fi
+qpopd
set_default OUTPUT_DIR $GLOBAL_DIR\\output
LOGFILENAME=build-${LOG_TAG}-`date +'%Y-%m-%d'`.log
commit 418b95a4de770438682535eedfee8c660ef611a8
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Oct 5 15:55:40 2014 -0700
Don't build boost except when building "master".
diff --git a/install-impl.sh b/install-impl.sh
index 56cd39b..29b50e6 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1235,6 +1235,11 @@ function inst_gnucash() {
_REPOS_UDIR=`unix_path $REPOS_DIR`
mkdir -p $_BUILD_UDIR
add_to_env $_INSTALL_UDIR/bin PATH
+ if [ "$GNUCASH_SCM_REV" = "master" ]; then
+ _MASTER_OPTIONS="--with-boost=${BOOST_ROOT}"
+ else
+ _MASTER_OPTIONS=""
+ fi
AQBANKING_OPTIONS="--enable-aqbanking"
AQBANKING_UPATH="${_OPENSSL_UDIR}/bin:${_GWENHYWFAR_UDIR}/bin:${_AQBANKING_UDIR}/bin"
@@ -1256,7 +1261,7 @@ function inst_gnucash() {
${AQBANKING_OPTIONS} \
--enable-binreloc \
--enable-locale-specific-tax \
- --with-boost=${BOOST_ROOT} \
+ ${_MASTER_OPTIONS} \
CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GUILE_CPPFLAGS} ${LIBDBI_CPPFLAGS} ${KTOBLZCHECK_CPPFLAGS} ${HH_CPPFLAGS} ${LIBSOUP_CPPFLAGS} -D_WIN32 ${EXTRA_CFLAGS}" \
LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} ${HH_LDFLAGS} -L${_SQLITE3_UDIR}/lib -L${_ENCHANT_UDIR}/lib -L${_LIBXSLT_UDIR}/lib -L${_MINGW_UDIR}/lib" \
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
diff --git a/install.sh b/install.sh
index ec5065e..adab052 100644
--- a/install.sh
+++ b/install.sh
@@ -99,8 +99,10 @@ add_step inst_libdbi
add_step inst_libsoup
add_step inst_enchant
add_step inst_webkit
-#boost now needed for C++
-add_step inst_boost
+#boost now needed for C++ on master only
+if [ "$GNUCASH_SCM_REV" = "master" ]; then
+ add_step inst_boost
+fi
##
if [ "$WITH_CUTECASH" = "yes" ]; then
commit 31e9820132264540ec481b737ffd5a8919a359ae
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Oct 5 15:54:51 2014 -0700
Some fixups for building with the new gtk stack.
diff --git a/defaults.sh b/defaults.sh
index 85008b7..e62df89 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -228,8 +228,6 @@ set_default LIBXSLT_DIR $GLOBAL_DIR\\libxslt
set_default EXPAT_URL "$GNOME_WIN32_DEPS_URL/expat_2.0.1-1_win32.zip"
set_default EXPAT_DEV_URL "$GNOME_WIN32_DEPS_URL/expat-dev_2.0.1-1_win32.zip"
-set_default FONTCONFIG_URL "$GNOME_WIN32_DEPS_URL/fontconfig_2.8.0-2_win32.zip"
-set_default FONTCONFIG_DEV_URL "$GNOME_WIN32_DEPS_URL/fontconfig-dev_2.8.0-2_win32.zip"
set_default FREETYPE_URL "$GNOME_WIN32_DEPS_URL/freetype_2.4.4-1_win32.zip"
set_default FREETYPE_DEV_URL "$GNOME_WIN32_DEPS_URL/freetype-dev_2.4.4-1_win32.zip"
set_default GAIL_URL "$GNOME_WIN32_URL/gail/1.22/gail-1.22.0.zip"
@@ -261,6 +259,8 @@ set_default CAIRO_VERSION="1.12.2"
set_default CAIRO_URL "$GC_DEPS_URL/cairo-1.12.16-minGW.tgz"
set_default GTK_VERSION="2.24.24"
set_default GTK_URL "$GC_DEPS_URL/gtk+-2.24.24-minGW.tgz"
+set_default ZLIB_URL "$GNOME_WIN32_DEPS_URL/zlib_1.2.5-2_win32.zip"
+set_default ZLIB_DEV_URL "$GNOME_WIN32_DEPS_URL/zlib-dev_1.2.5-2_win32.zip"
set_default GNOME_DIR $GLOBAL_DIR\\gnome
diff --git a/dist-impl.sh b/dist-impl.sh
index b6e1a9f..a2ff7fe 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -87,7 +87,6 @@ function dist_gnome() {
setup Gnome platform
wget_unpacked $CAIRO_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $EXPAT_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $FONTCONFIG_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $FREETYPE_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GAIL_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GETTEXT_RUNTIME_URL $DOWNLOAD_DIR $DIST_DIR
diff --git a/install-impl.sh b/install-impl.sh
index e5de149..56cd39b 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -361,8 +361,6 @@ function inst_gnome() {
wget_unpacked $CAIRO_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $EXPAT_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $EXPAT_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $FONTCONFIG_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $FONTCONFIG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $FREETYPE_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $FREETYPE_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GAIL_URL $DOWNLOAD_DIR $GNOME_DIR
@@ -382,7 +380,8 @@ function inst_gnome() {
wget_unpacked $LIBTIFF_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $PKG_CONFIG_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $PKG_CONFIG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
-
+ wget_unpacked $ZLIB_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $ZLIB_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
echo 'gtk-theme-name = "Nimbus"' > ${_GNOME_UDIR}/etc/gtk-2.0/gtkrc
wget_unpacked $GTK_THEME_URL $DOWNLOAD_DIR $TMP_DIR
commit 22cb89a34220e957ebec780244424a6aa9943ef6
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Oct 4 15:48:23 2014 -0700
Use new built gtk stack from GnuCash's SF downloads area.
diff --git a/defaults.sh b/defaults.sh
index 60e1b7f..85008b7 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -77,6 +77,7 @@ set_default GTK_MIRROR "ftp.gtk.org/pub"
set_default GNOME_MIRROR "ftp.gnome.org/pub/gnome"
set_default GNOME_WIN32_URL "$GNOME_MIRROR/binaries/win32"
set_default GNOME_WIN32_DEPS_URL "$GNOME_WIN32_URL/dependencies"
+set_default GC_DEPS_URL "$SF_MIRROR/gnucash/Dependencies"
# Mingw toolchain
@@ -225,11 +226,6 @@ set_default LIBXSLT_ICONV_URL "${XMLSOFT_URL}/iconv-1.9.2.win32.zip"
set_default LIBXSLT_ZLIB_URL "${XMLSOFT_URL}/zlib-1.2.3.win32.zip"
set_default LIBXSLT_DIR $GLOBAL_DIR\\libxslt
-set_default ATK_URL "$GNOME_WIN32_URL/atk/1.32/atk_1.32.0-2_win32.zip"
-set_default ATK_DEV_URL "$GNOME_WIN32_URL/atk/1.32/atk-dev_1.32.0-2_win32.zip"
-CAIRO_VERSION="1.10.2"
-set_default CAIRO_URL "$GNOME_WIN32_DEPS_URL/cairo_${CAIRO_VERSION}-2_win32.zip"
-set_default CAIRO_DEV_URL "$GNOME_WIN32_DEPS_URL/cairo-dev_${CAIRO_VERSION}-2_win32.zip"
set_default EXPAT_URL "$GNOME_WIN32_DEPS_URL/expat_2.0.1-1_win32.zip"
set_default EXPAT_DEV_URL "$GNOME_WIN32_DEPS_URL/expat-dev_2.0.1-1_win32.zip"
set_default FONTCONFIG_URL "$GNOME_WIN32_DEPS_URL/fontconfig_2.8.0-2_win32.zip"
@@ -238,17 +234,9 @@ set_default FREETYPE_URL "$GNOME_WIN32_DEPS_URL/freetype_2.4.4-1_win3
set_default FREETYPE_DEV_URL "$GNOME_WIN32_DEPS_URL/freetype-dev_2.4.4-1_win32.zip"
set_default GAIL_URL "$GNOME_WIN32_URL/gail/1.22/gail-1.22.0.zip"
set_default GAIL_DEV_URL "$GNOME_WIN32_URL/gail/1.22/gail-dev-1.22.0.zip"
-GDK_PIXBUF_VERSION=2.24.0
-set_default GDK_PIXBUF_URL "$GNOME_WIN32_URL/gdk-pixbuf/2.24/gdk-pixbuf_${GDK_PIXBUF_VERSION}-1_win32.zip"
-set_default GDK_PIXBUF_DEV_URL "$GNOME_WIN32_URL/gdk-pixbuf/2.24/gdk-pixbuf-dev_${GDK_PIXBUF_VERSION}-1_win32.zip"
set_default GETTEXT_RUNTIME_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime_0.18.1.1-2_win32.zip"
set_default GETTEXT_RUNTIME_DEV_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime-dev_0.18.1.1-2_win32.zip"
set_default GETTEXT_TOOLS_URL "$GNOME_WIN32_DEPS_URL/gettext-tools-dev_0.18.1.1-2_win32.zip"
-set_default GLIB_URL "$GNOME_WIN32_URL/glib/2.28/glib_2.28.8-1_win32.zip"
-set_default GLIB_DEV_URL "$GNOME_WIN32_URL/glib/2.28/glib-dev_2.28.8-1_win32.zip"
-GTK_VERSION="2.24.10"
-set_default GTK_URL "$GNOME_WIN32_URL/gtk+/2.24/gtk+_${GTK_VERSION}-1_win32.zip"
-set_default GTK_DEV_URL "$GNOME_WIN32_URL/gtk+/2.24/gtk+-dev_${GTK_VERSION}-1_win32.zip"
set_default GTK_DOC_URL "$GNOME_MIRROR/sources/gtk-doc/1.13/gtk-doc-1.13.tar.bz2"
set_default GTK_PREFS_URL "$SF_MIRROR/gtk-win/gtk2_prefs-0.4.1.bin-gtk2.10-win32.zip"
set_default GTK_THEME_URL "$SF_MIRROR/gtk-win/gtk2-themes-2009-09-07-win32_bin.zip"
@@ -266,12 +254,14 @@ 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 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"
set_default PKG_CONFIG_DEV_URL "$GNOME_WIN32_DEPS_URL/pkg-config-dev_0.25-1_win32.zip"
-set_default ZLIB_URL "$GNOME_WIN32_DEPS_URL/zlib_1.2.5-2_win32.zip"
-set_default ZLIB_DEV_URL "$GNOME_WIN32_DEPS_URL/zlib-dev_1.2.5-2_win32.zip"
+set_default GLIB_URL "$GC_DEPS_URL/glib-2.38.2-minGW.tgz"
+set_default CAIRO_VERSION="1.12.2"
+set_default CAIRO_URL "$GC_DEPS_URL/cairo-1.12.16-minGW.tgz"
+set_default GTK_VERSION="2.24.24"
+set_default GTK_URL "$GC_DEPS_URL/gtk+-2.24.24-minGW.tgz"
+
set_default GNOME_DIR $GLOBAL_DIR\\gnome
set_default SWIG_URL "$SF_MIRROR/swig/swigwin-2.0.11.zip"
diff --git a/dist-impl.sh b/dist-impl.sh
index 3617d2c..b6e1a9f 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -85,13 +85,11 @@ function dist_aqbanking() {
function dist_gnome() {
setup Gnome platform
- wget_unpacked $ATK_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $CAIRO_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $EXPAT_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $FONTCONFIG_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $FREETYPE_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GAIL_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $GDK_PIXBUF_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GETTEXT_RUNTIME_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GLIB_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GTK_URL $DOWNLOAD_DIR $DIST_DIR
@@ -103,8 +101,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 $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
wget_unpacked $GTK_THEME_URL $DOWNLOAD_DIR $TMP_DIR
diff --git a/install-impl.sh b/install-impl.sh
index 8dd16a6..e5de149 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -358,10 +358,7 @@ function inst_gnome() {
echo "gnome packages installed in $_GNOME_UDIR. skipping."
else
mkdir -p $_GNOME_UDIR
- wget_unpacked $ATK_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $ATK_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $CAIRO_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $CAIRO_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $EXPAT_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $EXPAT_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $FONTCONFIG_URL $DOWNLOAD_DIR $GNOME_DIR
@@ -370,12 +367,8 @@ function inst_gnome() {
wget_unpacked $FREETYPE_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GAIL_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GAIL_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GDK_PIXBUF_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GDK_PIXBUF_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GLIB_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GLIB_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GTK_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GTK_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $INTLTOOL_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBART_LGPL_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBART_LGPL_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
@@ -387,12 +380,9 @@ function inst_gnome() {
wget_unpacked $LIBPNG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBTIFF_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBTIFF_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
wget_unpacked $PKG_CONFIG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $ZLIB_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $ZLIB_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+
echo 'gtk-theme-name = "Nimbus"' > ${_GNOME_UDIR}/etc/gtk-2.0/gtkrc
wget_unpacked $GTK_THEME_URL $DOWNLOAD_DIR $TMP_DIR
commit f4124796444f7e550f6053763ab694bab6c8a0cc
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Sep 15 21:32:26 2014 +0200
Change automated build frequency for maint branch
From now on check for changes nightly and rebuild if there was a change.
This is just like the master branch. The weekly restriction was a left over
from the subversion era, where each change in trunk would als trigger a build
in the stable branch. This is no longer the case in git.
diff --git a/buildserver/build_periodic.bat b/buildserver/build_periodic.bat
index 9b3ad46..26e0ff6 100644
--- a/buildserver/build_periodic.bat
+++ b/buildserver/build_periodic.bat
@@ -8,7 +8,7 @@ cd c:\gcdev\gnucash-on-windows.git\
rem Development build (daily)
c:\gcdev\mingw\msys\1.0\bin\sh.exe --login c:\gcdev\gnucash-on-windows.git\buildserver\build_periodic.sh
-rem Tags build for 2.6.99 and newer (daily -- only tags that weren't built yet)
+rem Tags build for 2.6.1 and newer (daily -- only tags that weren't built yet)
c:\gcdev\mingw\msys\1.0\bin\sh.exe --login c:\gcdev\gnucash-on-windows.git\buildserver\build_tags.sh
-rem maintenance branch build (weekly)
-c:\gcdev-maint\mingw\msys\1.0\bin\sh.exe --login c:\gcdev-maint\gnucash-on-windows.git\buildserver\build_periodic.sh weekly
\ No newline at end of file
+rem maintenance branch build (daily)
+c:\gcdev-maint\mingw\msys\1.0\bin\sh.exe --login c:\gcdev-maint\gnucash-on-windows.git\buildserver\build_periodic.sh
\ No newline at end of file
commit 1e0ce34d5a7846903822d3243e60f2987966fbe6
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Sep 15 20:12:19 2014 +0200
Update strawberry perl to latest version
diff --git a/extra_dist/getperl.vbs b/extra_dist/getperl.vbs
index d058245..07ceaa0 100644
--- a/extra_dist/getperl.vbs
+++ b/extra_dist/getperl.vbs
@@ -11,7 +11,7 @@ Dim tempFolder: tempFolder = fso.GetSpecialFolder(TemporaryFolder)
strHDLocation = Wscript.Arguments.Item(0)
' Set your settings
- strFileURL = "https://strawberry-perl.googlecode.com/files/strawberry-perl-5.18.1.1-32bit.msi"
+ strFileURL = "http://strawberryperl.com/download/5.18.2.2/strawberry-perl-5.18.2.2-32bit.msi"
Wscript.Echo " copying " & strFileURL
Wscript.Echo " to " & strHDLocation
commit 74ab194501da7259c1fd01a998c11097e4983666
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Sep 15 19:48:47 2014 +0200
Avoid > in echo statements
This is interpreted as redirect to file.
diff --git a/extra_dist/install-fq-mods.cmd b/extra_dist/install-fq-mods.cmd
index cad7e51..dec3b33 100644
--- a/extra_dist/install-fq-mods.cmd
+++ b/extra_dist/install-fq-mods.cmd
@@ -104,10 +104,10 @@ echo.
perl -e "use Win32;if(defined &Win32::BuildNumber){exit 2;}else{exit 3;};"
REM echo status = %errorlevel%
if %errorlevel% equ 2 (
- echo => ActivePerl
+ echo - ActivePerl
goto inst_mod_as
) else if %errorlevel% equ 3 (
- echo => Other, probably Strawberry perl ?
+ echo - Other, probably Strawberry perl ?
goto inst_mod_oth
) else if %errorlevel% neq 0 goto error
commit 0ff66de1056e2470283733b955085bb6f2b558dc
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Sep 15 19:47:56 2014 +0200
Use full path to perl right after installation
At this point perl is normally not in the PATH yet.
diff --git a/extra_dist/install-fq-mods.cmd b/extra_dist/install-fq-mods.cmd
index 5fb1c0b..cad7e51 100644
--- a/extra_dist/install-fq-mods.cmd
+++ b/extra_dist/install-fq-mods.cmd
@@ -45,7 +45,7 @@ if %errorlevel% neq 0 (
del %TEMP%\Perl.msi
goto error
)
-perl -v
+%SystemDrive%\strawberry\perl\bin\perl -v
del %TEMP%\Perl.msi
REM ----------------------------------------------------------------------------
commit e67f94d527749816e7f7539764fa49d73eb1359e
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Sep 9 23:36:52 2014 +0200
Revert to lower versions of mingwrt and w32api as per mingw recommendations
Attention: you should remove the installed versions of both packages
before rerunning the installer script the next time !
you can do so with these commands in your msys shell:
mingw-get.exe remove mingwrt
mingw-get.exe remove w32api
diff --git a/defaults.sh b/defaults.sh
index 0c42df5..60e1b7f 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -106,8 +106,9 @@ set_default MINGW_MPC_VERSION "1.0.1-2"
set_default MINGW_MPFR_VERSION "3.1.2-2"
set_default MINGW_PEXPORTS_VERSION "0.46"
set_default MINGW_PTHREAD_W32_VERSION "2.9.1-1"
-set_default MINGW_RT_VERSION "4.0.3-1"
+set_default MINGW_RT_VERSION "3.20-2"
set_default MINGW_ZLIB_VERSION "1.2.8-1"
+set_default MINGW_W32API_VERSION "3.17-2"
set_default MINGW_MAKE_VERSION "3.82-5"
if [ "$CROSS_COMPILE" != yes ]; then
diff --git a/install-impl.sh b/install-impl.sh
index 1707ef5..8dd16a6 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -149,7 +149,7 @@ function inst_mingw() {
# Win32 runtime and api
mingw_smart_get mingw32-mingwrt-dev ${MINGW_RT_VERSION}
- mingw_smart_get mingw32-w32api-dev ${MINGW_RT_VERSION}
+ mingw_smart_get mingw32-w32api-dev ${MINGW_W32API_VERSION}
# GCC/G++ dependencies
mingw_smart_get mingw32-libgmp-dll ${MINGW_GMP_VERSION}
mingw_smart_get mingw32-libmpfr-dll ${MINGW_MPFR_VERSION}
commit 92295754a4ecc1f939a05763499b4f3fe756c098
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Jul 7 12:54:41 2014 +0200
msysgit has migrated to github
Adjust scripts to fetch git from the new location.
diff --git a/bootstrap_win_dev.vbs b/bootstrap_win_dev.vbs
index efca557..00feb3f 100644
--- a/bootstrap_win_dev.vbs
+++ b/bootstrap_win_dev.vbs
@@ -67,22 +67,22 @@ End If
If WScript.Arguments.Named.Exists("GIT_PKG") Then
GIT_PKG = WScript.Arguments.Named.Item("GIT_PKG")
Else
- GIT_PKG = "Git-1.7.10-preview20120409.exe"
+ GIT_PKG = "Git-1.9.4-preview20140611"
End If
If WScript.Arguments.Named.Exists("strGitBaseUrl") Then
strGitBaseUrl = WScript.Arguments.Named.Item("strGitBaseUrl")
Else
- strGitBaseUrl = "http://msysgit.googlecode.com/files/"
+ strGitBaseUrl = "https://github.com/msysgit/msysgit/releases/download/"
End If
If WScript.Arguments.Named.Exists("GIT_URL") Then
GIT_URL = WScript.Arguments.Named.Item("GIT_URL")
Else
- GIT_URL = strGitBaseUrl & GIT_PKG
+ GIT_URL = strGitBaseUrl & GIT_PKG & "/" & GIT_PKG & ".exe"
End If
If WScript.Arguments.Named.Exists("GIT_DIR") Then
GIT_DIR = myRegExp.Replace (WScript.Arguments.Named.Item("GIT_DIR"), "\")
Else
- GIT_DIR = GLOBAL_DIR & "\git-1.7.10"
+ GIT_DIR = GLOBAL_DIR & "\git-1.9.4"
End If
If WScript.Arguments.Named.Exists("GC_WIN_REPOS_URL") Then
GC_WIN_REPOS_URL = WScript.Arguments.Named.Item("GC_WIN_REPOS_URL")
@@ -218,10 +218,10 @@ If objFso.FileExists(strGit) Then
Else
stdout.WriteLine "Not found, will be installed"
- strGitPkg = DOWNLOAD_DIR & "\" & GIT_PKG
+ strGitPkg = DOWNLOAD_DIR & "\" & GIT_PKG & ".exe"
If Not objFso.FileExists(strGitPkg) Then
stdout.Write "Downloading git installer... "
- objWsh.Run strWget & " -P" & DOWNLOAD_DIR & " " & GIT_URL, 1, true
+ objWsh.Run strWget & " -O" & strGitPkg & " --no-check-certificate " & GIT_URL, 1, true
If Not objFso.FileExists(strGitPkg) Then
stdout.WriteLine "Failed"
diff --git a/defaults.sh b/defaults.sh
index 1b8527d..0c42df5 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -327,8 +327,8 @@ set_default ICU4C_SRC_URL "http://download.icu-project.org/files/icu4c/4.4.1/icu
set_default ICU4C_DIR $GLOBAL_DIR\\icu-mingw32
set_default ICU4C_PATCH `pwd`/icu-crossmingw.patch
-set_default GIT_URL "http://msysgit.googlecode.com/files/Git-1.7.10-preview20120409.exe"
-set_default GIT_DIR $GLOBAL_DIR\\git-1.7.10
+set_default GIT_URL "https://github.com/msysgit/msysgit/releases/download/Git-1.9.4-preview20140611/Git-1.9.4-preview20140611.exe"
+set_default GIT_DIR $GLOBAL_DIR\\git-1.9.4
# OFX import in gnucash and ofx directconnect support for aqbanking
set_default OPENSP_URL "$SF_MIRROR/openjade/OpenSP-1.5.2.tar.gz"
diff --git a/functions.sh b/functions.sh
index 83800a6..96c450a 100644
--- a/functions.sh
+++ b/functions.sh
@@ -61,9 +61,9 @@ function smart_wget() {
if [ ! -f $_DLD/$_UFILE ] ; then
# If WGET_RATE is set (in bytes/sec), limit download bandwith
if [ ! -z "$WGET_RATE" ] ; then
- wget --passive-ftp -c $1 -P $TMP_UDIR --limit-rate=$WGET_RATE
+ wget --passive-ftp -c $1 -P $TMP_UDIR --limit-rate=$WGET_RATE $WGET_EXTRA_OPTIONS
else
- wget --passive-ftp -c $1 -P $TMP_UDIR
+ wget --passive-ftp -c $1 -P $TMP_UDIR $WGET_EXTRA_OPTIONS
fi
mv $TMP_UDIR/$_FILE $_DLD/$_UFILE
fi
diff --git a/install-impl.sh b/install-impl.sh
index 30a65af..1707ef5 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -247,9 +247,11 @@ function inst_git() {
echo "git already installed in $_GIT_UDIR. skipping."
set_env "$_GIT_UDIR/bin/git" GIT_CMD
else
- smart_wget $GIT_URL $DOWNLOAD_DIR
+ WGET_EXTRA_OPTIONS="--no-check-certificate -O$TMP_DIR\\$(basename $GIT_URL)" # github certificate can't be verified on WinXP
+ smart_wget $GIT_URL $DOWNLOAD_DIR $(basename $GIT_URL)
$LAST_FILE //SP- //SILENT //DIR="$GIT_DIR"
set_env "$_GIT_UDIR/bin/git" GIT_CMD
+ unset WGET_EXTRA_OPTIONS
quiet "$GIT_CMD" --help || die "git unavailable"
fi
# Make sure GIT_CMD is available to subshells if it is set
commit 71d5711a472a70012be6418e68d0157f2574c5dc
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Jul 1 16:04:19 2014 +0200
Try a more generic url for the SF_MIRROR parameter
diff --git a/defaults.sh b/defaults.sh
index 9480006..1b8527d 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -72,7 +72,7 @@ set_default MSYS_PATCH_VERSION "2.6.1-1"
set_default MSYS_PERL_VERSION "5.8.8-1"
set_default MSYS_UNZIP_VERSION "6.0-1"
-set_default SF_MIRROR "http://heanet.dl.sourceforge.net/sourceforge"
+set_default SF_MIRROR "http://downloads.sf.net"
set_default GTK_MIRROR "ftp.gtk.org/pub"
set_default GNOME_MIRROR "ftp.gnome.org/pub/gnome"
set_default GNOME_WIN32_URL "$GNOME_MIRROR/binaries/win32"
commit 0619dcfc1ef76500c763b70cf54e78f76edb770d
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Jun 30 20:28:21 2014 +0200
Use standard sourceforge mirror for boost package
diff --git a/defaults.sh b/defaults.sh
index 18b9983..9480006 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -383,7 +383,7 @@ set_default XSLTPROCFLAGS ""
set_default ISOCODES_URL "http://pkg-isocodes.alioth.debian.org/downloads/iso-codes-3.49.tar.xz"
set_default ISOCODES_DIR $GLOBAL_DIR\\isocodes
-set_default BOOST_URL "http://downloads.sf.net/boost/boost/boost_1_55_0.tar.bz2"
+set_default BOOST_URL "$SF_MIRROR/boost/boost/boost_1_55_0.tar.bz2"
set_default BOOST_DIR $GLOBAL_DIR\\boost
### Local Variables: ***
commit 2695c31caf8f40321eec6a5182dbff45a9034fd6
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Jun 30 20:25:00 2014 +0200
Restore sourceforge mirror url
diff --git a/defaults.sh b/defaults.sh
index 003595d..18b9983 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -72,7 +72,7 @@ set_default MSYS_PATCH_VERSION "2.6.1-1"
set_default MSYS_PERL_VERSION "5.8.8-1"
set_default MSYS_UNZIP_VERSION "6.0-1"
-set_default SF_MIRROR "http://heanet.sourceforge.net/sourceforge"
+set_default SF_MIRROR "http://heanet.dl.sourceforge.net/sourceforge"
set_default GTK_MIRROR "ftp.gtk.org/pub"
set_default GNOME_MIRROR "ftp.gnome.org/pub/gnome"
set_default GNOME_WIN32_URL "$GNOME_MIRROR/binaries/win32"
commit f541965a843553f3b5cc582f5366f4dd6efbfefb
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Jun 30 20:20:52 2014 +0200
Fix hhc not found error
diff --git a/install-impl.sh b/install-impl.sh
index 289c27c..30a65af 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1158,7 +1158,7 @@ function inst_hh() {
add_to_env -I$_HH_UDIR/include HH_CPPFLAGS
add_to_env -L$_HH_UDIR/lib HH_LDFLAGS
- add_to_env $_HH_UDIR PATH
+ add_to_env "$_HH_SYS_UDIR" PATH
if quiet test_for_hh
then
echo "html help workshop already installed in $_HH_UDIR. skipping."
commit 822ea7181e9bac07870e23c46be1dc36e84e568f
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Jun 30 20:20:36 2014 +0200
Remove debugging message
diff --git a/install-impl.sh b/install-impl.sh
index 5b5863b..289c27c 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1238,7 +1238,6 @@ function inst_cutecash() {
function inst_gnucash() {
setup GnuCash
- echo $BOOST_ROOT
_INSTALL_WFSDIR=`win_fs_path $INSTALL_DIR`
_INSTALL_UDIR=`unix_path $INSTALL_DIR`
_BUILD_UDIR=`unix_path $BUILD_DIR`
commit 7f59327a93add485986b7391503f3f001b104c2e
Author: Geert Janssens <geert at kobaltwit.be>
Date: Tue Jun 17 23:13:41 2014 +0200
Avoid spaces in html help include path by copying the header file to the global dir
diff --git a/install-impl.sh b/install-impl.sh
index 7e43dfb..5b5863b 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1156,23 +1156,24 @@ function inst_hh() {
_HH_UDIR="$_HH_UDIR/mingw"
fi
- add_to_env "-I$_HH_SYS_UDIR/include" HH_CPPFLAGS
+ add_to_env -I$_HH_UDIR/include HH_CPPFLAGS
add_to_env -L$_HH_UDIR/lib HH_LDFLAGS
add_to_env $_HH_UDIR PATH
if quiet test_for_hh
then
echo "html help workshop already installed in $_HH_UDIR. skipping."
else
- mkdir -p $_HH_UDIR/lib
+ mkdir -p $_HH_UDIR/{include,lib}
_HHCTRL_OCX=$(which hhctrl.ocx || true)
[ "$_HHCTRL_OCX" ] || die "Did not find hhctrl.ocx"
- qpushd "$_HH_SYS_UDIR"
+ cp "$_HH_SYS_UDIR/include/htmlhelp.h" $_HH_UDIR/include
+ qpushd "$_HH_UDIR"
pexports -h include/htmlhelp.h $_HHCTRL_OCX > $_HH_UDIR/lib/htmlhelp.def
qpopd
qpushd $_HH_UDIR/lib
${DLLTOOL} -k -d htmlhelp.def -l libhtmlhelp.a
qpopd
- quiet test_for_hh || die "HTML Help Workshop not installed correctly (link test failed)"
+ test_for_hh || die "HTML Help Workshop not installed correctly (link test failed)"
fi
}
@@ -1266,8 +1267,8 @@ function inst_gnucash() {
--enable-binreloc \
--enable-locale-specific-tax \
--with-boost=${BOOST_ROOT} \
- CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GUILE_CPPFLAGS} ${LIBDBI_CPPFLAGS} ${KTOBLZCHECK_CPPFLAGS} "${HH_CPPFLAGS}" ${LIBSOUP_CPPFLAGS} -D_WIN32 ${EXTRA_CFLAGS}" \
- LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} "${HH_LDFLAGS}" -L${_SQLITE3_UDIR}/lib -L${_ENCHANT_UDIR}/lib -L${_LIBXSLT_UDIR}/lib -L${_MINGW_UDIR}/lib" \
+ CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GUILE_CPPFLAGS} ${LIBDBI_CPPFLAGS} ${KTOBLZCHECK_CPPFLAGS} ${HH_CPPFLAGS} ${LIBSOUP_CPPFLAGS} -D_WIN32 ${EXTRA_CFLAGS}" \
+ LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} ${HH_LDFLAGS} -L${_SQLITE3_UDIR}/lib -L${_ENCHANT_UDIR}/lib -L${_LIBXSLT_UDIR}/lib -L${_MINGW_UDIR}/lib" \
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
make
commit dd26006577618469400718bec3c51a14886df79b
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Jun 17 17:54:42 2014 +0200
Don't exit with error code - that will end install.sh
diff --git a/get-install-path.vbs b/get-install-path.vbs
index 4f6e58d..3022963 100755
--- a/get-install-path.vbs
+++ b/get-install-path.vbs
@@ -30,6 +30,4 @@ For Each strSubkey In arrSubkeys
WScript.Echo strInstallDir
WScript.Quit 0
End If
-Next
-
-WScript.Quit 1
\ No newline at end of file
+Next
\ No newline at end of file
commit d053bf20dd1c6af13c3975120a8c604eb369db16
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Jun 17 17:40:17 2014 +0200
Install HTML Help Workshop with elevated privileges starting from Windows Vista
diff --git a/install-impl.sh b/install-impl.sh
index 3c90d63..7e43dfb 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1135,7 +1135,8 @@ function inst_hh() {
echo "!!! Contray to older installation scripts the HtmlHelp Workshop should !!!"
echo "!!! no longer be installed in $HH_DIR !!!"
echo "!!! When asked for an installation path, DO NOT specify $HH_DIR !!!"
- $LAST_FILE
+ CMD=$(basename "$LAST_FILE")
+ cscript //nologo run-as-admin.vbs $CMD "" "$DOWNLOAD_DIR"
HH_SYS_DIR=$(cscript //nologo get-install-path.vbs)
if [ -z "$HH_SYS_DIR" ]; then
die "HTML Help Workshop not installed correctly (Windows installer failed for some reason)"
diff --git a/run-as-admin.vbs b/run-as-admin.vbs
new file mode 100644
index 0000000..3817432
--- /dev/null
+++ b/run-as-admin.vbs
@@ -0,0 +1,77 @@
+' Attempt to run the command passed with administrator privileges
+' on Windows versions starting from Vista
+' On Windows XP it will just run the command with current privileges
+
+' Note: this script uses ShellExecute to elevate privileges when
+' necessary. This command however is asynchronous but we want to
+' wait for it to finish.
+' There is no good universal way to do this. I have chosen to
+' read the running processes list and wait for as long as the name of the requested
+' command is still in the list. This as limitations:
+' - if the started command immediatly starts another command and then quits
+' this test will fail and run-as admin.vbs script will exit too soon
+' - if a command appears with a different name in the process list than what is
+' passed as argument, this will fail as well
+' - if more than one instance of the command are running, run-as-admin.vbs will
+' only quit if all instances have exited.
+' For our limited purposes this is ok for now (we only wait for a windows installer
+' to finish)
+
+' Parameters:
+' - strInstFile: name of the command to run, without path
+' - strInstParms: parameters to pass to the command
+' - strInstPath: directory in which the command is stored if not in the system path
+' Note: if you don't have any parameters to add to the command call, you still need
+' to set strInstParms to the empty string ("")
+
+strInstFile = WScript.Arguments (0)
+strInstPath = WScript.Arguments (1)
+strInstPath = WScript.Arguments (2)
+
+' Read OS version number
+strComputer = "."
+Set objWMIService = GetObject("winmgmts:" _
+ & "{impersonationLevel=impersonate}!\\" _
+ & strComputer & "\root\cimv2")
+Set colOperatingSystems = objWMIService.ExecQuery _
+ ("Select * from Win32_OperatingSystem")
+For Each objOperatingSystem in colOperatingSystems
+ strVersion = objOperatingSystem.Version
+Next
+
+' Parse only major version.
+' Windows Vista is version 6.0 so any Windows version with a major
+' version >= 6 needs elevated privileges
+' Note this ignores various Windows server editions between XP and Vista
+' assuming those are not used for gnucash development
+Set objRegExp = new RegExp
+objRegExp.Global = True
+objRegExp.Pattern = "\..*"
+strMajor = objRegExp.Replace (strVersion, "")
+
+If cint (strMajor = 5) Then
+ ' Windows XP - just execute without any extras
+ strCommand = "open"
+Else
+ ' Windows Vista or up - run with elevated privileges
+ strCommand = "runas"
+End If
+
+
+set objShell = CreateObject("shell.application")
+objShell.ShellExecute strInstFile, strInstParms, strInstPath, strCommand, 1
+
+WScript.Sleep 100
+Set objShell2 = WScript.CreateObject("WScript.Shell")
+Set objExecObject = objShell2.Exec("cscript //nologo get-install-path.vbs")
+
+Do
+ WScript.Sleep 100
+ bStillRunning = False
+ For Each objProcess In objWMIService.InstancesOf("Win32_process")
+ If objProcess.Name = strInstFile Then
+ bStillRunning = True
+ Exit For
+ End If
+ Next
+Loop While bStillRunning = True
\ No newline at end of file
commit 914b8640fbfc8419ad81a1ed18424b63ce5d9737
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Jun 16 23:00:34 2014 +0200
Issue warning if html help workshop is installed on HH_DIR
And explain how to fix it for the future
diff --git a/install-impl.sh b/install-impl.sh
index b33db87..3c90d63 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1141,9 +1141,20 @@ function inst_hh() {
die "HTML Help Workshop not installed correctly (Windows installer failed for some reason)"
fi
fi
-
+
_HH_UDIR=`unix_path $HH_DIR`
_HH_SYS_UDIR="`unix_path $HH_SYS_DIR`"
+ if [ "$_HH_UDIR" = "$_HH_SYS_UDIR" ]; then
+ echo "Warning: Installing HTML Help Workshop inside the gnucash development directory is no longer recommended."
+ echo " The script will proceed in $HH_DIR\\mingw for now."
+ echo " To fix this for future safety, you should"
+ echo " - uninstall HTML Help Workshop"
+ echo " - delete directory $HH_DIR and all of its remaining content"
+ echo " - rerun install.sh"
+ echo
+ _HH_UDIR="$_HH_UDIR/mingw"
+ fi
+
add_to_env "-I$_HH_SYS_UDIR/include" HH_CPPFLAGS
add_to_env -L$_HH_UDIR/lib HH_LDFLAGS
add_to_env $_HH_UDIR PATH
commit f1b560a0dbb74cdf0fae0abba1e949c5252e84d0
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Jun 16 22:48:03 2014 +0200
Introduce vbscript to check if/where HTML Help is installed
This allows htmlhelp to be installed anywhere on the system
and be shared by multiple build trees as well.
Note: it should *not* be installed anymore in HH_DIR !
diff --git a/get-install-path.vbs b/get-install-path.vbs
new file mode 100755
index 0000000..4f6e58d
--- /dev/null
+++ b/get-install-path.vbs
@@ -0,0 +1,35 @@
+' This helper script will try to determine the installation directory
+' for HTML Help Workshop. If found it will be returned on stdout
+'
+' Exit codes:
+' 0 if program was found to be installed
+' 1 if program was not found to be installed
+
+' Note: the script works as follows
+' - it will query the Uninstall information in the Windows registry
+' - when it finds uninstall information for HTML Help Workshop it will read the uninstall string
+' - and will extract the installation path from this string
+
+Const HKLM = &H80000002 'HKEY_LOCAL_MACHINE
+
+strKey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\"
+strDisplayName = "DisplayName"
+strUninstallString = "UninstallString"
+
+Set objReg = GetObject("winmgmts://./root/default:StdRegProv")
+objReg.EnumKey HKLM, strKey, arrSubkeys
+
+For Each strSubkey In arrSubkeys
+ intRet1 = objReg.GetStringValue(HKLM, strKey & strSubkey, strDisplayName, strValue)
+ If strValue = "HTML Help Workshop" Then
+ intRet1 = objReg.GetStringValue(HKLM, strKey & strSubkey, strUninstallString, strValue)
+ Set myRegExp = new RegExp
+ myRegExp.Global = True
+ myRegExp.Pattern = "\\setup.exe.*"
+ strInstallDir = myRegExp.Replace (strValue, "")
+ WScript.Echo strInstallDir
+ WScript.Quit 0
+ End If
+Next
+
+WScript.Quit 1
\ No newline at end of file
diff --git a/install-impl.sh b/install-impl.sh
index db7200c..b33db87 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1121,35 +1121,46 @@ int main(int argc, char **argv) {
return 0;
}
EOF
- gcc -shared -o ofile.dll ofile.c $HH_CPPFLAGS $HH_LDFLAGS -lhtmlhelp || return 1
+ gcc -shared -o ofile.dll ofile.c "$HH_CPPFLAGS" "$HH_LDFLAGS" -lhtmlhelp || return 1
qpopd
}
function inst_hh() {
setup HTML Help Workshop
+ HH_SYS_DIR=$(cscript //nologo get-install-path.vbs)
+ if [ -z "$HH_SYS_DIR" ]; then
+ smart_wget $HH_URL $DOWNLOAD_DIR
+ echo "!!! Attention !!!"
+ echo "!!! This is the only installation step that requires your direct input !!!"
+ echo "!!! Contray to older installation scripts the HtmlHelp Workshop should !!!"
+ echo "!!! no longer be installed in $HH_DIR !!!"
+ echo "!!! When asked for an installation path, DO NOT specify $HH_DIR !!!"
+ $LAST_FILE
+ HH_SYS_DIR=$(cscript //nologo get-install-path.vbs)
+ if [ -z "$HH_SYS_DIR" ]; then
+ die "HTML Help Workshop not installed correctly (Windows installer failed for some reason)"
+ fi
+ fi
+
_HH_UDIR=`unix_path $HH_DIR`
- add_to_env -I$_HH_UDIR/include HH_CPPFLAGS
+ _HH_SYS_UDIR="`unix_path $HH_SYS_DIR`"
+ add_to_env "-I$_HH_SYS_UDIR/include" HH_CPPFLAGS
add_to_env -L$_HH_UDIR/lib HH_LDFLAGS
add_to_env $_HH_UDIR PATH
if quiet test_for_hh
then
echo "html help workshop already installed in $_HH_UDIR. skipping."
else
- smart_wget $HH_URL $DOWNLOAD_DIR
- echo "!!! Attention !!!"
- echo "!!! This is the only installation step that requires your direct input !!!"
- echo "!!! When asked for an installation path, specify $HH_DIR !!!"
- $LAST_FILE
- qpushd $HH_DIR
- _HHCTRL_OCX=$(which hhctrl.ocx || true)
- [ "$_HHCTRL_OCX" ] || die "Did not find hhctrl.ocx"
- pexports -h include/htmlhelp.h $_HHCTRL_OCX > lib/htmlhelp.def
- qpushd lib
- ${DLLTOOL} -k -d htmlhelp.def -l libhtmlhelp.a
- mv htmlhelp.lib htmlhelp.lib.bak
- qpopd
+ mkdir -p $_HH_UDIR/lib
+ _HHCTRL_OCX=$(which hhctrl.ocx || true)
+ [ "$_HHCTRL_OCX" ] || die "Did not find hhctrl.ocx"
+ qpushd "$_HH_SYS_UDIR"
+ pexports -h include/htmlhelp.h $_HHCTRL_OCX > $_HH_UDIR/lib/htmlhelp.def
+ qpopd
+ qpushd $_HH_UDIR/lib
+ ${DLLTOOL} -k -d htmlhelp.def -l libhtmlhelp.a
qpopd
- quiet test_for_hh || die "html help workshop not installed correctly"
+ quiet test_for_hh || die "HTML Help Workshop not installed correctly (link test failed)"
fi
}
@@ -1243,8 +1254,8 @@ function inst_gnucash() {
--enable-binreloc \
--enable-locale-specific-tax \
--with-boost=${BOOST_ROOT} \
- CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GUILE_CPPFLAGS} ${LIBDBI_CPPFLAGS} ${KTOBLZCHECK_CPPFLAGS} ${HH_CPPFLAGS} ${LIBSOUP_CPPFLAGS} -D_WIN32 ${EXTRA_CFLAGS}" \
- LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} ${HH_LDFLAGS} -L${_SQLITE3_UDIR}/lib -L${_ENCHANT_UDIR}/lib -L${_LIBXSLT_UDIR}/lib -L${_MINGW_UDIR}/lib" \
+ CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GUILE_CPPFLAGS} ${LIBDBI_CPPFLAGS} ${KTOBLZCHECK_CPPFLAGS} "${HH_CPPFLAGS}" ${LIBSOUP_CPPFLAGS} -D_WIN32 ${EXTRA_CFLAGS}" \
+ LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} "${HH_LDFLAGS}" -L${_SQLITE3_UDIR}/lib -L${_ENCHANT_UDIR}/lib -L${_LIBXSLT_UDIR}/lib -L${_MINGW_UDIR}/lib" \
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
make
commit 83afafeabbe5608ad93030d4762fc8bbf3fde1f4
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Jun 16 22:47:15 2014 +0200
Move extra distributables into subdirectory
diff --git a/dist-impl.sh b/dist-impl.sh
index e97c131..3617d2c 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -239,7 +239,7 @@ function dist_gnucash() {
cp -a $_INSTALL_UDIR/lib/lib*.la $_DIST_UDIR/bin
mkdir -p $_DIST_UDIR/share
cp -a $_INSTALL_UDIR/share/{doc,gnucash,locale,glib-2.0} $_DIST_UDIR/share
- cp -a $_GC_WIN_REPOS_UDIR/{getperl.vbs,gnc-path-check,install-fq-mods.cmd} $_DIST_UDIR/bin
+ cp -a $_GC_WIN_REPOS_UDIR/extra_dist/{getperl.vbs,gnc-path-check,install-fq-mods.cmd} $_DIST_UDIR/bin
_QTDIR_WIN=$(unix_path $QTDIR | sed 's,^/\([A-Za-z]\)/,\1:/,g' )
# aqbanking >= 5.0.0
diff --git a/getperl.vbs b/extra_dist/getperl.vbs
similarity index 100%
rename from getperl.vbs
rename to extra_dist/getperl.vbs
diff --git a/gnc-path-check b/extra_dist/gnc-path-check
similarity index 100%
rename from gnc-path-check
rename to extra_dist/gnc-path-check
diff --git a/install-fq-mods.cmd b/extra_dist/install-fq-mods.cmd
similarity index 100%
rename from install-fq-mods.cmd
rename to extra_dist/install-fq-mods.cmd
commit 3afabee2bb0005d9e7b9ba99f11c33e56f166c6f
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri Jun 6 17:26:27 2014 +0200
Fix PKG_CONFIG environment variable setup
diff --git a/install.sh b/install.sh
index 3481981..ec5065e 100644
--- a/install.sh
+++ b/install.sh
@@ -47,7 +47,7 @@ register_env_var KTOBLZCHECK_LDFLAGS " "
register_env_var PATH ":"
register_env_var PCRE_CPPFLAGS " "
register_env_var PCRE_LDFLAGS " "
-register_env_var PKG_CONFIG ":" ""
+register_env_var PKG_CONFIG " "
register_env_var PKG_CONFIG_PATH ":"
register_env_var READLINE_CPPFLAGS " "
register_env_var READLINE_LDFLAGS " "
commit 4e043a86bb2ea7cf6c1e0ac2a075c9706cb6659d
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Jun 16 08:17:50 2014 -0700
Restore build of html-help workshop
diff --git a/install-impl.sh b/install-impl.sh
index 7c0dcae..db7200c 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1139,7 +1139,7 @@ function inst_hh() {
echo "!!! Attention !!!"
echo "!!! This is the only installation step that requires your direct input !!!"
echo "!!! When asked for an installation path, specify $HH_DIR !!!"
-# $LAST_FILE
+ $LAST_FILE
qpushd $HH_DIR
_HHCTRL_OCX=$(which hhctrl.ocx || true)
[ "$_HHCTRL_OCX" ] || die "Did not find hhctrl.ocx"
commit 0eafec0bc588ce4816f77d1bab501c73ae2e6aa6
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jun 14 15:50:30 2014 -0700
Build Boost for C++
diff --git a/defaults.sh b/defaults.sh
index 7604280..003595d 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -72,7 +72,7 @@ set_default MSYS_PATCH_VERSION "2.6.1-1"
set_default MSYS_PERL_VERSION "5.8.8-1"
set_default MSYS_UNZIP_VERSION "6.0-1"
-set_default SF_MIRROR "http://heanet.dl.sourceforge.net/sourceforge"
+set_default SF_MIRROR "http://heanet.sourceforge.net/sourceforge"
set_default GTK_MIRROR "ftp.gtk.org/pub"
set_default GNOME_MIRROR "ftp.gnome.org/pub/gnome"
set_default GNOME_WIN32_URL "$GNOME_MIRROR/binaries/win32"
@@ -383,6 +383,9 @@ set_default XSLTPROCFLAGS ""
set_default ISOCODES_URL "http://pkg-isocodes.alioth.debian.org/downloads/iso-codes-3.49.tar.xz"
set_default ISOCODES_DIR $GLOBAL_DIR\\isocodes
+set_default BOOST_URL "http://downloads.sf.net/boost/boost/boost_1_55_0.tar.bz2"
+set_default BOOST_DIR $GLOBAL_DIR\\boost
+
### Local Variables: ***
### sh-basic-offset: 4 ***
### indent-tabs-mode: nil ***
diff --git a/install-impl.sh b/install-impl.sh
index ccc4423..7c0dcae 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1139,7 +1139,7 @@ function inst_hh() {
echo "!!! Attention !!!"
echo "!!! This is the only installation step that requires your direct input !!!"
echo "!!! When asked for an installation path, specify $HH_DIR !!!"
- $LAST_FILE
+# $LAST_FILE
qpushd $HH_DIR
_HHCTRL_OCX=$(which hhctrl.ocx || true)
[ "$_HHCTRL_OCX" ] || die "Did not find hhctrl.ocx"
@@ -1153,6 +1153,35 @@ function inst_hh() {
fi
}
+function inst_boost() {
+ setup Boost
+ _BOOST_UDIR=`unix_path ${BOOST_DIR}`
+ set_env ${_BOOST_UDIR} BOOST_ROOT
+ add_to_env ${_BOOST_UDIR}/lib PATH
+ if test -f ${_BOOST_UDIR}/lib/libboost_date_time.dll
+ then
+ echo "Boost already installed in $_BOOST_UDIR. skipping."
+ else
+ wget_unpacked $BOOST_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/boost_*
+ qpushd $TMP_UDIR/boost_*
+ if test ! -f ${_BOOST_UDIR}/bin/b2
+ then
+ qpushd tools/build/v2
+ ./bootstrap.sh --with-toolset=mingw
+ ./b2 install toolset=gcc --prefix=${_BOOST_UDIR}
+ qpopd
+ fi
+ # Limit the built libraries to what we think we'll need. Note
+ # that the python and context libraries depend on Python and
+ # Visual Studio respectively to build, so don't add them.
+ ${_BOOST_UDIR}/bin/b2 install-proper --prefix=${_BOOST_UDIR} --with-atomic --with-chrono --with-date_time --with-filesystem --with-log --with-program_options --with-regex --with-signals --with-system --with-test link=shared variant=release toolset=gcc --layout=tagged
+ qpopd
+ test -f ${_BOOST_UDIR}/lib/libboost_date_time.dll || die "Boost not installed correctly"
+ rm -rf $TMP_UDIR/boost_*
+ fi
+}
+
function inst_cutecash() {
setup Cutecash
_BUILD_UDIR=`unix_path $CUTECASH_BUILD_DIR`
@@ -1185,6 +1214,7 @@ function inst_cutecash() {
function inst_gnucash() {
setup GnuCash
+ echo $BOOST_ROOT
_INSTALL_WFSDIR=`win_fs_path $INSTALL_DIR`
_INSTALL_UDIR=`unix_path $INSTALL_DIR`
_BUILD_UDIR=`unix_path $BUILD_DIR`
@@ -1212,6 +1242,7 @@ function inst_gnucash() {
${AQBANKING_OPTIONS} \
--enable-binreloc \
--enable-locale-specific-tax \
+ --with-boost=${BOOST_ROOT} \
CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GUILE_CPPFLAGS} ${LIBDBI_CPPFLAGS} ${KTOBLZCHECK_CPPFLAGS} ${HH_CPPFLAGS} ${LIBSOUP_CPPFLAGS} -D_WIN32 ${EXTRA_CFLAGS}" \
LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} ${HH_LDFLAGS} -L${_SQLITE3_UDIR}/lib -L${_ENCHANT_UDIR}/lib -L${_LIBXSLT_UDIR}/lib -L${_MINGW_UDIR}/lib" \
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
diff --git a/install.sh b/install.sh
index 603a0de..3481981 100644
--- a/install.sh
+++ b/install.sh
@@ -99,6 +99,8 @@ add_step inst_libdbi
add_step inst_libsoup
add_step inst_enchant
add_step inst_webkit
+#boost now needed for C++
+add_step inst_boost
##
if [ "$WITH_CUTECASH" = "yes" ]; then
commit 9922bf5c7ab4d8c5aa972bf4b56d1d1d4a07e9e9
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed May 21 16:55:45 2014 +0200
Fix build command
diff --git a/buildserver/build_periodic.bat b/buildserver/build_periodic.bat
index 120ed60..9b3ad46 100644
--- a/buildserver/build_periodic.bat
+++ b/buildserver/build_periodic.bat
@@ -11,4 +11,4 @@ c:\gcdev\mingw\msys\1.0\bin\sh.exe --login c:\gcdev\gnucash-on-windows.git\build
rem Tags build for 2.6.99 and newer (daily -- only tags that weren't built yet)
c:\gcdev\mingw\msys\1.0\bin\sh.exe --login c:\gcdev\gnucash-on-windows.git\buildserver\build_tags.sh
rem maintenance branch build (weekly)
-c:\gcdev-maint\mingw\msys\1.0\bin\sh.exe --login c:\gcdev-maint\gnucash-on-windows.git\buildserver\periodic_build.sh weekly
\ No newline at end of file
+c:\gcdev-maint\mingw\msys\1.0\bin\sh.exe --login c:\gcdev-maint\gnucash-on-windows.git\buildserver\build_periodic.sh weekly
\ No newline at end of file
commit 717c7db03faac6dad54aed1bbcb327c7199f409d
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed May 21 16:20:37 2014 +0200
Enable weekly builds for maint now that maint and master have diverged
diff --git a/buildserver/build_periodic.bat b/buildserver/build_periodic.bat
index 4fdb2bd..120ed60 100644
--- a/buildserver/build_periodic.bat
+++ b/buildserver/build_periodic.bat
@@ -11,4 +11,4 @@ c:\gcdev\mingw\msys\1.0\bin\sh.exe --login c:\gcdev\gnucash-on-windows.git\build
rem Tags build for 2.6.99 and newer (daily -- only tags that weren't built yet)
c:\gcdev\mingw\msys\1.0\bin\sh.exe --login c:\gcdev\gnucash-on-windows.git\buildserver\build_tags.sh
rem maintenance branch build (weekly)
-rem c:\gcdev-maint\mingw\msys\1.0\bin\sh.exe --login c:\gcdev-maint\gnucash-on-windows.git\buildserver\periodic_build.sh weekly
\ No newline at end of file
+c:\gcdev-maint\mingw\msys\1.0\bin\sh.exe --login c:\gcdev-maint\gnucash-on-windows.git\buildserver\periodic_build.sh weekly
\ No newline at end of file
commit 1bc7597f5c37c160ab67f63b029b973c56e9bb3a
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat May 10 11:08:53 2014 +0200
Remove obsolete configure options
diff --git a/install-impl.sh b/install-impl.sh
index 5612f6a..ccc4423 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1194,7 +1194,7 @@ function inst_gnucash() {
AQBANKING_OPTIONS="--enable-aqbanking"
AQBANKING_UPATH="${_OPENSSL_UDIR}/bin:${_GWENHYWFAR_UDIR}/bin:${_AQBANKING_UDIR}/bin"
- LIBOFX_OPTIONS="--enable-ofx --with-ofx-prefix=${_LIBOFX_UDIR}"
+ LIBOFX_OPTIONS="--enable-ofx"
if [ "$BUILD_FROM_TARBALL" != "yes" ]; then
qpushd $REPOS_DIR
@@ -1206,7 +1206,6 @@ function inst_gnucash() {
$_REPOS_UDIR/configure ${HOST_XCOMPILE} \
--prefix=$_INSTALL_WFSDIR \
--enable-debug \
- --enable-schemas-install=no \
--enable-dbi \
--with-dbi-dbd-dir=$( echo ${_LIBDBI_DRIVERS_UDIR} | sed 's,^/\([A-Za-z]\)/,\1:/,g' )/lib/dbd \
${LIBOFX_OPTIONS} \
commit 35369a1fda66260ca28f976112179cb987869b8e
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed May 7 16:28:19 2014 +0200
Add section on what to do after building gnucash for the first time
diff --git a/README b/README
index e3a6f1a..71fb0ab 100644
--- a/README
+++ b/README
@@ -102,7 +102,43 @@ d. To generate a self-installing setup.exe file that contains *everything* run
./dist.sh
-More information is collected on http://wiki.gnucash.org/wiki/Windows
+
+And next ?
+----------
+If you got here without errors then congratulations ! You have just completed
+your first successful GnuCash Build. To use this version you can launch the
+Windows GnuCash Installer you just built in step d. You can find this installer
+in c:\gcdev\gnucash\. It works just like any other installer for a piece of
+Windows software: you double-click it and follow the instructions that are
+displayed.
+
+At some point you may want to build GnuCash again to get updates. To do so you
+should start with updating the GnuCash source files as well as the scripts
+used to build GnuCash on Windows.
+
+The former are stored in c:\gcdev\gnucash.git
+The latter in c:\gcdev\gnucash-on-windows.git
+
+As the name suggests both are managed by a tool called git. Below is only a
+minimal explanation on how to update these directories.
+- Open a Windows Explorer
+- Right-click on the gnucash-on-windows.git directory
+- Select Git Bash. This will open a command prompt.
+- Enter one command: git pull
+- Close the command prompt again
+This example shows how to update gnucash-on-windows.git but the same steps
+apply as well for gnucash.git.
+
+If you want to do more advanced things such as modifying code or building
+from a git branch other than the default 'master' branch you will need to
+familiarize yourself with git more intimately. A good starting point is
+http://wiki.gnucash.org/wiki/Git
+
+In general more information with regards to building GnuCash on Windows is
+collected on http://wiki.gnucash.org/wiki/Windows/Development
+
+At the time of this writing it should still be adapted to the new build
+scripts (2014-05-07).
Known Issues/Things to improve
------------------------------
commit c4a3866553fc65c6601afb3a2bc2a171f556a752
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed May 7 14:46:23 2014 +0200
Update documentation to explain new build procedure
diff --git a/README b/README
index 8a77712..e3a6f1a 100644
--- a/README
+++ b/README
@@ -1,106 +1,159 @@
-These scripts try to download and install a Windows/mingw32 build
-environment for GnuCash on Windows.
+These scripts will provide a build environment to build GnuCash on Windows.
+The scripts will take care of building/installing all the dependencies needed
+to build an run GnuCash on Windows.
-Note: The mingw homepage is http://www.mingw.org. You can read more
- about mingw over there. The packages to download are all
- on sourceforge however, so the direct links are given here.
+Note: this build system depends on the mingw project which provides the gcc compiler
+ in a Windows environment. You can read more about mingw on its homepage:
+ http://www.mingw.org/
These scripts support two ways to build a Windows/mingw32 version of GnuCash:
- directly on a Windows PC
-- via cross-compilation on Linux
+- via cross-compilation on Linux (Note 2014-05-07: the scripts have been under
+ heavy modification recently. The cross-compilation may no longer work.)
+-----------------------------------------
1. Build GnuCash directly on a Windows PC
-----------------------------------------
-Before you start with the automated build, you have to complete these
-steps manually. The directory variables are set in `defaults.sh' and optionally
-`custom.sh'.
-
-Note: when installing software as asked below, avoid using paths
- with spaces. Some parts of the build system don't cope well
- with spaces. So don't install in c:\Program Files. The build
- system by default assumes c:\soft as base directory
- called $GLOBAL_DIR from now on).
-
-* Download and install git for windows from http://git-scm.com/downloads.
- This will install some git related items in the Windows Explorer
- context menus (you can access them via right-click in any directory)
-
-* Choose a spot where you want to store a copy of the GnuCash repository.
- The default path is $GLOBAL_DIR\gnucash\repos.
- Reminder: avoid pathnames with spaces in it.
-
-* Create all directories in the path except the last one. For the example,
- make sure $GLOBAL_DIR\gnucash exists
-
-* Open a Windows explorer and go to $GLOBAL_DIR\gnucash (or your chosen location)
-
-* Right-click. In the popup select git bash. This will open a command prompt.
-
-* Enter: git clone git://github.com/Gnucash/gnucash.git repos
- The last part should be what you chose the call the directory to store the
- copy of the GnuCash repository.
-
-* Download MSYS from
- https://sourceforge.net/projects/mingw/files/MSYS%20Base%20System/msys-1.0.11/MSYS-1.0.11.exe/download
- to $DOWNLOAD_DIR
- Note: there may be a more recent version available when you read this, use
- whatever version that is available. BUT: be sure to use MSYS-xyz.exe
- (ie the MSYS installer) and not the *bin.tar.lzma. I got confused
- the first time I tried, because directory msys-1.0.12 existed on
- sourceforge, but it didn't have the windows installer. You should
- use the installer, not try to unpack the -bin.tar.lzma files. So
- choose whatever version that has got an installer.
-
-* Install MSYS into $MSYS_DIR.
-
-* Download mingwPORT's wget from
- https://sourceforge.net/projects/mingw/files/mingwPORT/Current%20Releases/wget-1.9.1-mingwPORT.tar.bz2/download
- to $DOWNLOAD_DIR
- Note: the version number may have changed when you try this. Use whatever version
- that is available
-
-* Via Windows Explorer go to <your-repos-dir>\packaging\win32
-
-* Look at defaults.sh and create a file named custom.sh to specify adapted directory
- variables.
-
- - If you used a path to your GnuCash repository other than the default
- $GLOBAL_DIR\gnucash\repos, you should at least specify REPOS_DIR in here.
- - Also if you want the build system to reuse git you have just installed,
- you can specify the path to git's installation location via GIT_DIR
- - If you want verbose output of any script step, add "set -x" to that file.
-
-* (No Qt is needed. In earlier versions of libaqbanking, qt was needed
- for the aqbanking setup wizard, but in aqbanking-5.x this is no
- longer the case.)
-
-Start/Enter any MSYS shell window. Let the automated build begin by:
-
- $INSTALLER_DIR/install.sh
-
-Good luck!
-
-To generate a self-installing setup.exe file that contains
-*everything*, run the following command after install.sh has
-completed:
-
- $INSTALLER_DIR/dist.sh
-
-
- Note: if you didn't download and install Qt earlier, this command will fail
- regardless of whether you disabled AQ_BANKING_WITH_QT or not. This is
- a bug in the configuration script for the installer builder (issc).
+Building GnuCash directly on a Windows PC requires you to enter commands
+directly on a command line. Several command line interfaces exist. To
+build GnuCash you will need to use two:
+
+1. The Windows built-in command prompt (cmd.exe)
+2. The Msys shell (will be installed automatically)
+
+This is mentioned here because both command lines have a completely different
+set of commands available so it will matter which command line to start from
+for certain steps. In principle the instruction below will always specify
+which command line to use.
+
+Some notes on path names to begin:
+----------------------------------
+* Avoid using paths with spaces. Some parts of the build system don't cope well
+ with spaces. So don't install in c:\Program Files. The build system by
+ default assumes c:\gcdev as base directory called $GLOBAL_DIR from now on).
+
+* Windows and mingw/msys use a slightly different notation for paths. When
+ working in an msys shell window you are advised to always use the msys notation.
+ Outside the msys shell window you should use the Windows notation. Here is an
+ example to show the difference:
+ Windows: c:\gcdev\gnucash-on-windows.git
+ Msys : /c/gcdev/gnucash-on-windows.git
+ The difference is in the direction of the slashes and that c: is replaced with /c
+ Note for completeness that in msys you can also use the Windows notation. However
+ msys interprets a '\' as an escape character. So to use back slashes you will have
+ to escape them. So the below will also work in msys:
+ Msys (alternate): c:\\gcdev\\gnucash-on-windows.git
+
+
+The steps
+---------
+On to building GnuCash now. The scripts have been set up to require as little
+manual actions as possible. The following should get you going:
+
+a. Download bootstrap_win_dev.vbs from the gnucash-on-windows
+ repository on Github. Direct url:
+ https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/bootstrap_win_dev.vbs
+
+b. Run this script by double-clicking it and follow the instructions.
+ If the script's output window closes before you get to a "Happy hacking"
+ message then something went wrong. To figure out what you can instead
+ open a Windows command prompt (cmd.exe) and run the script as
+ cscript.exe <path\to>\bootstrap_win_dev.vbs
+ Be sure to replace <path\to> with the correct path.
+
+Note: by default everything will be installed inside c:\gcdev\
+ You could alter this location by passing some parameters
+ to bootstrap_win_dev.vbs. There are a couple of other parameters
+ you can set to influence what is installed where. Please read the
+ bootstrap script to learn which ones. If you want to pass
+ parameters you will have to run the script from the command line
+ of course instead of double-clicking it.
+
+Note: if you intend to use the buildserver scripts (see separate directory)
+ to have a fully automated build that runs at regular intervals
+ there are some restrictions to the paths you can/should alter.
+ For more detail please check README.txt in the buildserver directory.
+
+You are now ready to build gnucash for the first time. The build is fully parameterized.
+That means which versions of libraries and tools to install, where to install them,
+which branch to build and so on can all be defined. If not set explicitly some default
+values will be used. If you're already familiar with the Windows build you may want to
+customize some of these parameters. If not sure - don't. The build should run just fine
+without it.
+
+The default values will all be found in 'defaults.sh'. You can override any of these
+in 'custom.sh'. The boostrap script you ran in step b. already created an initial
+version of this file.
+
+c. Open an Msys shell window. You do this by running
+ c:\gcdev\mingw\msys\1.0\msys.bat
+ Unless you chose to install mingw/msys in another directory of course.
+ Let the automated build begin by:
+
+ cd /c/gcdev/gnucash-on-windows.git
+ ./install.sh
+
+ If you chose to set up the build environment in a different location adjust
+ the path accordingly.
+
+d. To generate a self-installing setup.exe file that contains *everything* run
+ the following command after install.sh has completed:
+
+ ./dist.sh
More information is collected on http://wiki.gnucash.org/wiki/Windows
+Known Issues/Things to improve
+------------------------------
+* It appears that installing html help on Windows systems more recent than
+ Windows XP can fail. It looks like the installer triggers a Windows authorization
+ dialog. For some reason this dialog can't be displayed when the installer is started
+ from an msys shell.
+ The workaround is a bit awkward currently and consists of
+ 1. install html help directly by double-clicking it. Remember to install it where
+ the gnucash build scripts expect it ! That is c:\gcdev\hh by default.
+ 2. Inside your msys shell window enter these commands:
+
+ pushd /c/gcdev/hh
+ _HHCTRL_OCX=$(which hhctrl.ocx || true)
+ [ "$_HHCTRL_OCX" ] || die "Did not find hhctrl.ocx"
+ pexports -h include/htmlhelp.h $_HHCTRL_OCX > lib/htmlhelp.def
+ pushd lib
+ dlltool -k -d htmlhelp.def -l libhtmlhelp.a
+ mv htmlhelp.lib htmlhelp.lib.bak
+ popd
+ popd
+
+ 3. You can now rerun install.sh which should get past the html help installation step
+
+ (Reference: http://lists.gnucash.org/pipermail/gnucash-devel/2014-May/037561.html
+ and following messages)
+
+* Error: unrecognized “l†format
+ This seems to happen on more recent Windows systems as well, perhaps only
+ on 64-bit systems. The cause seems to be that mingw is using a very old
+ version of msvcrt.dll which doen't know about the %lld modifier to print
+ 64-bit integers.
+ To work around this you can add a line in custom.sh:
+ EXTRA_CFLAGS=" -D__USE_MINGW_ANSI_STDIO"
+ The same list message mentioned a couple of additional flags to set but these were
+ not explained. For completeness the complete line was:
+ EXTRA_CFLAGS=" -Wall -Werror -fno-builtin-dgettext -fno-builtin-towupper -fno-builtin-iswlower -ggdb3 -D__USE_MINGW_ANSI_STDIO"
+ Adjust as you see fit.
+
+ (Reference: http://lists.gnucash.org/pipermail/gnucash-devel/2014-May/037561.html
+ and following messages)
+--------------------------------------------
2. Cross-compile GnuCash/win32 on a linux PC
--------------------------------------------
-
Cross-compiling a Windows/mingw32 executable of GnuCash on a Linux
-host system. (Note: This used to work unchangedly in Sept'2006 but
-probably not any longer.)
+host system.
+
+Note: as mentioned earlier this part is probably no longer accurate due to
+ the heavy changes to the build system in April 2014. It is kept here
+ as a reminder to update it and fix any issues encountered.
These steps need to be performed:
diff --git a/buildserver/README.txt b/buildserver/README.txt
index b392408..341c1e8 100644
--- a/buildserver/README.txt
+++ b/buildserver/README.txt
@@ -34,10 +34,12 @@ Note: if you have already set up a gnucash build environment using
Be sure to replace <path\to> with the correct path.
Note: by default everything will be installed inside c:\gcdev\
- In theory you could alter this location by passing some parameters
- to bootstrap_win_dev.vbs. However the build server scripts expect
- to find at least msys in this default location so changing it
- will likely lead to a malfunctioning build server script.
+ You could alter this location and some other paths by passing
+ some parameters to bootstrap_win_dev.vbs. Which parameters exist can
+ be read in the bootstrap script itself. You should take care however that
+ mingw/msys and the gnucash-on-windows git repository will be installed
+ where the build_periodic.bat script expects them. If not your buildserver
+ will fail to work.
3. If this has run successfully open an msys (bash) console. Unless
you have altered the default paths, you will find this in
diff --git a/inno_setup/gnucash.iss b/inno_setup/gnucash.iss
index 96982c8..84d7362 100644
--- a/inno_setup/gnucash.iss
+++ b/inno_setup/gnucash.iss
@@ -327,7 +327,7 @@ var
begin
{ Make some Windows-only changes to the etc/@PACKAGE@/environment file }
{ If you make any changes here, you should probably also change the equivalent sections }
- { in packaging/win32/install.sh }
+ { in install.sh }
{ A new line is stared with #13#10 - #10 is the linefeed character and #13 CR }
{ Get the installation-specific paths }
diff --git a/install-impl.sh b/install-impl.sh
index 68e3ca1..5612f6a 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1279,8 +1279,8 @@ function make_install() {
if [ -z $_skip_scripts ]; then
# Create a startup script that works without the msys shell
# If you make any changes here, you should probably also change
- # the equivalent sections in packaging/win32/gnucash.iss.in, and
- # src/bin/environment*.in
+ # the equivalent sections in inno_setup/gnucash.iss, and
+ # (in the gnucash source repository) src/bin/environment*.in
qpushd $_INSTALL_UDIR/bin
cat > gnucash-launcher.cmd <<EOF
@echo off
commit b3f917a6c61e7916c88b43712ebe81c836f3f8ad
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed May 7 11:31:01 2014 +0200
Remove obsolete source code
diff --git a/redirect.c b/redirect.c
deleted file mode 100644
index c9a495b..0000000
--- a/redirect.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * redirect.c --
- * Copyright (C) 2007 Andreas Koehler <andi5.py at gmx.net>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, contact:
- *
- * Free Software Foundation Voice: +1-617-542-5942
- * 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652
- * Boston, MA 02110-1301, USA gnu at gnu.org
- */
-
-#include "config.h"
-#include <glib.h>
-#include <windows.h>
-
-/* This program will search for an existing file in
- * .\bin\$i
- * ..\bin\$i
- * ..\..\bin\$i
- * and so on, where $i is the base name of argv[0]. Once found, that
- * program is spawned synchronously with the same parameters and its
- * exit status will be the one of this program as well.
- * To avoid recursion, do not use it in a directory ending on "bin".
- */
-
-/* __wgetmainargs() is an undocumented function to get the program's
- * argv in wide char format.
- */
-typedef struct {
- int newmode;
-} _startupinfo;
-
-extern void __wgetmainargs(int *argc,
- wchar_t ***wargv,
- wchar_t ***wenviron,
- int expand_wildcards,
- _startupinfo *startupinfo);
-
-static gboolean
-wcharv_to_utf8_charv(wchar_t **wcharv,
- gchar ***utf8_charv,
- gint *error_index)
-{
- gchar **retval = NULL;
-
- *utf8_charv = NULL;
- if (wcharv != NULL) {
- int n = 0, i;
-
- while (wcharv[n])
- n++;
- retval = g_new(gchar *, n + 1);
-
- for (i = 0; i < n; i++) {
- retval[i] = g_utf16_to_utf8 (wcharv[i], -1, NULL, NULL, NULL);
- if (retval[i] == NULL) {
- if (error_index)
- *error_index = i;
- while (i)
- g_free(retval[--i]);
- g_free (retval);
- return FALSE;
- }
- }
-
- retval[n] = NULL;
- }
- *utf8_charv = retval;
- return TRUE;
-}
-
-static gboolean
-redirect_program(gchar **argv)
-{
- gchar *orig_path, *orig_base, *dir, *path;
- gchar *index;
- gboolean retval = FALSE;
-
- g_return_val_if_fail(*argv, FALSE);
- if (g_path_is_absolute(*argv)) {
- orig_path = g_strdup(*argv);
- } else {
- gchar *cd = g_get_current_dir();
- orig_path = g_build_filename(cd, *argv, (gchar*) NULL);
- g_free(cd);
- }
-
- orig_base = g_path_get_basename(orig_path);
- dir = g_strdup(orig_path);
- while (((index = strrchr(dir, '\\')) != NULL)
- || ((index = strrchr(dir, '/')) != NULL)) {
- *index = '\0';
- path = g_build_filename(dir, "bin", orig_base, (gchar*) NULL);
- g_debug("Testing %s", path);
- if (g_file_test(path, G_FILE_TEST_EXISTS)) {
- g_free(orig_path);
- *argv = path;
- retval = TRUE;
- break;
- }
- g_free(path);
- }
-
- g_free(dir);
- g_free(orig_base);
- g_free(orig_path);
-
- return retval;
-}
-
-#ifdef __GNUC__
-# ifndef _stdcall
-# define _stdcall __attribute__((stdcall))
-# endif
-#endif
-
-int _stdcall
-WinMain(struct HINSTANCE__ *hInstance,
- struct HINSTANCE__ *hPrevInstance,
- char *lpszCmdLine,
- int nCmdShow)
-{
- int argc;
- wchar_t **wargv, **wenvp;
- _startupinfo si = { 0 };
- gint index, status;
- gchar **utf8_argv;
- GError *error = NULL;
-
- __wgetmainargs(&argc, &wargv, &wenvp, 0, &si);
- g_assert(argc == __argc);
-
- if (!wcharv_to_utf8_charv(wargv, &utf8_argv, &index)) {
- g_warning("Invalid argument at position %d", index);
- return -1;
- }
-
- if (!redirect_program(utf8_argv)) {
- g_warning("Could not find destination for %s", *utf8_argv);
- g_strfreev(utf8_argv);
- return -1;
- }
-
- if (!g_spawn_sync(NULL, utf8_argv, NULL,
- G_SPAWN_LEAVE_DESCRIPTORS_OPEN
- | G_SPAWN_CHILD_INHERITS_STDIN,
- NULL, NULL, NULL, NULL, &status, &error)) {
- g_warning("Could not spawn program: %s", error->message);
- g_error_free(error);
- g_strfreev(utf8_argv);
- return -1;
- }
-
- return status;
-}
commit bf9b1c9a9ab63450d2266f6745169004d5bc6b59
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed May 7 11:07:45 2014 +0200
Isolate inno related files
diff --git a/dist-impl.sh b/dist-impl.sh
index b8c3444..e97c131 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -239,7 +239,7 @@ function dist_gnucash() {
cp -a $_INSTALL_UDIR/lib/lib*.la $_DIST_UDIR/bin
mkdir -p $_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
+ cp -a $_GC_WIN_REPOS_UDIR/{getperl.vbs,gnc-path-check,install-fq-mods.cmd} $_DIST_UDIR/bin
_QTDIR_WIN=$(unix_path $QTDIR | sed 's,^/\([A-Za-z]\)/,\1:/,g' )
# aqbanking >= 5.0.0
@@ -255,7 +255,8 @@ function dist_gnucash() {
GNUCASH_MINOR_VERSION=$(awk '/ GNUCASH_MINOR_VERSION / { print $3 }' ${GNUCASH_CONFIG_H} )
GNUCASH_MICRO_VERSION=$(awk '/ GNUCASH_MICRO_VERSION / { print $3 }' ${GNUCASH_CONFIG_H} )
DIST_WFSDIR=$(echo $DIST_DIR | sed -e 's#\\#\\\\#g')
- sed < $_GC_WIN_REPOS_UDIR/gnucash.iss \
+ GC_WIN_REPOS_WFSDIR=$(echo $GC_WIN_REPOS_DIR | sed -e 's#\\#\\\\#g')
+ sed < $_GC_WIN_REPOS_UDIR/inno_setup/gnucash.iss \
> $_GNUCASH_UDIR/gnucash.iss \
-e "s#@-qtbindir-@#${_QTDIR_WIN}/bin#g" \
-e "s#@-gwenhywfar_so_effective-@#${_GWENHYWFAR_SO_EFFECTIVE}#g" \
@@ -265,7 +266,8 @@ function dist_gnucash() {
-e "s#@GNUCASH_MAJOR_VERSION@#${GNUCASH_MAJOR_VERSION}#g" \
-e "s#@GNUCASH_MINOR_VERSION@#${GNUCASH_MINOR_VERSION}#g" \
-e "s#@GNUCASH_MICRO_VERSION@#${GNUCASH_MICRO_VERSION}#g" \
- -e "s#@DIST_DIR@#${DIST_WFSDIR}#g"
+ -e "s#@DIST_DIR@#${DIST_WFSDIR}#g" \
+ -e "s#@GC_WIN_REPOS_DIR@#${GC_WIN_REPOS_WFSDIR}#g"
}
function dist_finish() {
diff --git a/ChineseSimp-12-5.1.11.isl b/inno_setup/ChineseSimp-12-5.1.11.isl
similarity index 100%
rename from ChineseSimp-12-5.1.11.isl
rename to inno_setup/ChineseSimp-12-5.1.11.isl
diff --git a/ChineseTrad-2-5.1.11.isl b/inno_setup/ChineseTrad-2-5.1.11.isl
similarity index 100%
rename from ChineseTrad-2-5.1.11.isl
rename to inno_setup/ChineseTrad-2-5.1.11.isl
diff --git a/Greek-4-5.1.11.isl b/inno_setup/Greek-4-5.1.11.isl
similarity index 100%
rename from Greek-4-5.1.11.isl
rename to inno_setup/Greek-4-5.1.11.isl
diff --git a/Japanese-5-5.1.11.isl b/inno_setup/Japanese-5-5.1.11.isl
similarity index 100%
rename from Japanese-5-5.1.11.isl
rename to inno_setup/Japanese-5-5.1.11.isl
diff --git a/Latvian-1-5.1.11.isl b/inno_setup/Latvian-1-5.1.11.isl
similarity index 100%
rename from Latvian-1-5.1.11.isl
rename to inno_setup/Latvian-1-5.1.11.isl
diff --git a/gnucash.iss b/inno_setup/gnucash.iss
similarity index 98%
rename from gnucash.iss
rename to inno_setup/gnucash.iss
index e408467..96982c8 100644
--- a/gnucash.iss
+++ b/inno_setup/gnucash.iss
@@ -371,15 +371,15 @@ end;
[Languages]
Name: "en"; MessagesFile: "compiler:Default.isl"
Name: "de"; MessagesFile: "compiler:Languages\German.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-de.win32-bin.txt"
-Name: "el"; MessagesFile: "@DIST_DIR@\share\@PACKAGE@\Greek-4-5.1.11.isl"
+Name: "el"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Greek-4-5.1.11.isl"
Name: "fr"; MessagesFile: "compiler:Languages\French.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-fr.win32-bin.txt"
Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-it.win32-bin.txt"
-Name: "ja"; MessagesFile: "@DIST_DIR@\share\@PACKAGE@\Japanese-5-5.1.11.isl"
-Name: "lv"; MessagesFile: "@DIST_DIR@\share\@PACKAGE@\Latvian-1-5.1.11.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-lv.win32-bin.txt"
+Name: "ja"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Japanese-5-5.1.11.isl"
+Name: "lv"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Latvian-1-5.1.11.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-lv.win32-bin.txt"
Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-nl.win32-bin.txt"
Name: "pt_BR"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
-Name: "zh_CN"; MessagesFile: "@DIST_DIR@\share\@PACKAGE@\ChineseSimp-12-5.1.11.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"
-Name: "zh_TW"; MessagesFile: "@DIST_DIR@\share\@PACKAGE@\ChineseTrad-2-5.1.11.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"
+Name: "zh_CN"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\ChineseSimp-12-5.1.11.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"
+Name: "zh_TW"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\ChineseTrad-2-5.1.11.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"
;; The following language files are available as well, in alphabetical
;; order: Basque, BrazilianPortuguese, Catalan, Czech, Danish, Dutch,
commit d5b73c58194b6b30ef2aeffaf0efb88f2d0f428c
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed May 7 10:40:16 2014 +0200
Handle backslashes properly in path substitution
diff --git a/dist-impl.sh b/dist-impl.sh
index c1e1880..b8c3444 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -254,6 +254,7 @@ function dist_gnucash() {
GNUCASH_MAJOR_VERSION=$(awk '/ GNUCASH_MAJOR_VERSION / { print $3 }' ${GNUCASH_CONFIG_H} )
GNUCASH_MINOR_VERSION=$(awk '/ GNUCASH_MINOR_VERSION / { print $3 }' ${GNUCASH_CONFIG_H} )
GNUCASH_MICRO_VERSION=$(awk '/ GNUCASH_MICRO_VERSION / { print $3 }' ${GNUCASH_CONFIG_H} )
+ DIST_WFSDIR=$(echo $DIST_DIR | sed -e 's#\\#\\\\#g')
sed < $_GC_WIN_REPOS_UDIR/gnucash.iss \
> $_GNUCASH_UDIR/gnucash.iss \
-e "s#@-qtbindir-@#${_QTDIR_WIN}/bin#g" \
@@ -264,7 +265,7 @@ function dist_gnucash() {
-e "s#@GNUCASH_MAJOR_VERSION@#${GNUCASH_MAJOR_VERSION}#g" \
-e "s#@GNUCASH_MINOR_VERSION@#${GNUCASH_MINOR_VERSION}#g" \
-e "s#@GNUCASH_MICRO_VERSION@#${GNUCASH_MICRO_VERSION}#g" \
- -e "s#@DIST_DIR@#${DIST_DIR}#g"
+ -e "s#@DIST_DIR@#${DIST_WFSDIR}#g"
}
function dist_finish() {
commit de3614c0d5d0275efa58eebf6088a01f97af82be
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed May 7 10:18:35 2014 +0200
Correct some bad parameter subsitutions
diff --git a/dist-impl.sh b/dist-impl.sh
index ec8773b..c1e1880 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -264,8 +264,6 @@ function dist_gnucash() {
-e "s#@GNUCASH_MAJOR_VERSION@#${GNUCASH_MAJOR_VERSION}#g" \
-e "s#@GNUCASH_MINOR_VERSION@#${GNUCASH_MINOR_VERSION}#g" \
-e "s#@GNUCASH_MICRO_VERSION@#${GNUCASH_MICRO_VERSION}#g" \
- -e "s#@GC_WIN_REPOS_DIR@#${GC_WIN_REPOS_DIR}#g" \
- -e "s#@INSTALL_DIR@#${INSTALL_DIR}#g" \
-e "s#@DIST_DIR@#${DIST_DIR}#g"
}
diff --git a/gnucash.iss b/gnucash.iss
index de2b83b..e408467 100644
--- a/gnucash.iss
+++ b/gnucash.iss
@@ -8,24 +8,24 @@
[Setup]
; Using the name here directly because we want it capitalized
AppName=GnuCash
-AppVerName=GnuCash @VERSION@
+AppVerName=GnuCash @PACKAGE_VERSION@
AppPublisher=GnuCash Development Team
AppPublisherURL=http://www.gnucash.org
AppSupportURL=http://www.gnucash.org
AppUpdatesURL=http://www.gnucash.org
-VersionInfoVersion=@VERSION@
+VersionInfoVersion=@PACKAGE_VERSION@
DefaultDirName={pf}\@PACKAGE@
DefaultGroupName=GnuCash
-LicenseFile=@DIST_DIR\share\doc\@PACKAGE@\COPYING
+LicenseFile=@DIST_DIR@\share\doc\@PACKAGE@\COPYING
Compression=lzma
MinVersion=5.0,5.0
PrivilegesRequired=poweruser
OutputDir=.
-OutputBaseFilename=@PACKAGE at -@VERSION at -setup
+OutputBaseFilename=@PACKAGE at -@PACKAGE_VERSION at -setup
UninstallFilesDir={app}\uninstall\@PACKAGE@
-InfoAfterFile=@DIST_DIR\share\doc\@PACKAGE@\README.win32-bin.txt
-SetupIconFile=@DIST_DIR\share\@PACKAGE@\pixmaps\gnucash-icon.ico
-WizardSmallImageFile=@DIST_DIR\share\@PACKAGE@\pixmaps\gnucash-icon-48x48.bmp
+InfoAfterFile=@DIST_DIR@\share\doc\@PACKAGE@\README.win32-bin.txt
+SetupIconFile=@DIST_DIR@\share\@PACKAGE@\pixmaps\gnucash-icon.ico
+WizardSmallImageFile=@DIST_DIR@\share\@PACKAGE@\pixmaps\gnucash-icon-48x48.bmp
[Types]
Name: "full"; Description: "{cm:FullInstall}"
@@ -61,33 +61,33 @@ Filename: "{app}\bin\guile.cmd"; Flags: runhidden
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
[Files]
; The main executables and DLLs
-Source: "@DIST_DIR\bin\*"; DestDir: "{app}\bin"; Flags: recursesubdirs ignoreversion; Components: main
-Source: "@DIST_DIR\etc\*"; DestDir: "{app}\etc"; Flags: recursesubdirs; Components: main
-Source: "@DIST_DIR\etc\@PACKAGE@\environment"; DestDir: "{app}\etc\@PACKAGE@"; Components: main; AfterInstall: MyAfterInstallEnvironment()
+Source: "@DIST_DIR@\bin\*"; DestDir: "{app}\bin"; Flags: recursesubdirs ignoreversion; Components: main
+Source: "@DIST_DIR@\etc\*"; DestDir: "{app}\etc"; Flags: recursesubdirs; Components: main
+Source: "@DIST_DIR@\etc\@PACKAGE@\environment"; DestDir: "{app}\etc\@PACKAGE@"; Components: main; AfterInstall: MyAfterInstallEnvironment()
; Note: The above AfterInstall function will adapt the
; environment config file on-the-fly by the Pascal script below.
-Source: "@DIST_DIR\lib\*"; DestDir: "{app}\lib"; Flags: recursesubdirs; Components: main
+Source: "@DIST_DIR@\lib\*"; DestDir: "{app}\lib"; Flags: recursesubdirs; Components: main
;; We don't have anything in libexec anymore at the moment
-;Source: "@DIST_DIR\libexec\*"; DestDir: "{app}\libexec"; Flags: recursesubdirs; Components: main
-Source: "@DIST_DIR\share\*"; DestDir: "{app}\share"; Flags: recursesubdirs; Components: main
+;Source: "@DIST_DIR@\libexec\*"; DestDir: "{app}\libexec"; Flags: recursesubdirs; Components: main
+Source: "@DIST_DIR@\share\*"; DestDir: "{app}\share"; Flags: recursesubdirs; Components: main
;; The translations
-;Source: "@DIST_DIR\share\locale\*"; DestDir: "{app}\share\locale"; Flags: recursesubdirs; Components: translations
+;Source: "@DIST_DIR@\share\locale\*"; DestDir: "{app}\share\locale"; Flags: recursesubdirs; Components: translations
;
;; The account templates
-;Source: "@DIST_DIR\share\@PACKAGE@\accounts\*"; DestDir: "{app}\share\@PACKAGE@\accounts"; Flags: recursesubdirs; Components: templates
+;Source: "@DIST_DIR@\share\@PACKAGE@\accounts\*"; DestDir: "{app}\share\@PACKAGE@\accounts"; Flags: recursesubdirs; Components: templates
; And all the documentation
-Source: "@DIST_DIR\share\doc\@PACKAGE@\README"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@DIST_DIR\share\doc\@PACKAGE@\README.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@DIST_DIR\share\doc\@PACKAGE@\README-de.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@DIST_DIR\share\doc\@PACKAGE@\README-fr.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@DIST_DIR\share\doc\@PACKAGE@\README-it.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@DIST_DIR\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@DIST_DIR\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@DIST_DIR\share\doc\@PACKAGE@\COPYING"; DestDir: "{app}\doc\@PACKAGE@"; Flags: ignoreversion; Components: main
-Source: "@DIST_DIR\share\doc\@PACKAGE@\AUTHORS"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@DIST_DIR\share\doc\@PACKAGE@\ChangeLog"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@DIST_DIR@\share\doc\@PACKAGE@\README"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@DIST_DIR@\share\doc\@PACKAGE@\README.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@DIST_DIR@\share\doc\@PACKAGE@\README-de.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@DIST_DIR@\share\doc\@PACKAGE@\README-fr.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@DIST_DIR@\share\doc\@PACKAGE@\README-it.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@DIST_DIR@\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@DIST_DIR@\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@DIST_DIR@\share\doc\@PACKAGE@\COPYING"; DestDir: "{app}\doc\@PACKAGE@"; Flags: ignoreversion; Components: main
+Source: "@DIST_DIR@\share\doc\@PACKAGE@\AUTHORS"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@DIST_DIR@\share\doc\@PACKAGE@\ChangeLog"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -370,16 +370,16 @@ end;
[Languages]
Name: "en"; MessagesFile: "compiler:Default.isl"
-Name: "de"; MessagesFile: "compiler:Languages\German.isl"; InfoAfterFile: "@INSTALL_DIR@\share\doc\@PACKAGE@\README-de.win32-bin.txt"
-Name: "el"; MessagesFile: "@GC_WIN_REPOS_DIR@\Greek-4-5.1.11.isl"
-Name: "fr"; MessagesFile: "compiler:Languages\French.isl"; InfoAfterFile: "@INSTALL_DIR@\share\doc\@PACKAGE@\README-fr.win32-bin.txt"
-Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"; InfoAfterFile: "@INSTALL_DIR@\share\doc\@PACKAGE@\README-it.win32-bin.txt"
-Name: "ja"; MessagesFile: "@GC_WIN_REPOS_DIR@\Japanese-5-5.1.11.isl"
-Name: "lv"; MessagesFile: "@GC_WIN_REPOS_DIR@\Latvian-1-5.1.11.isl"; InfoAfterFile: "@INSTALL_DIR@\share\doc\@PACKAGE@\README-lv.win32-bin.txt"
-Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"; InfoAfterFile: "@INSTALL_DIR@\share\doc\@PACKAGE@\README-nl.win32-bin.txt"
+Name: "de"; MessagesFile: "compiler:Languages\German.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-de.win32-bin.txt"
+Name: "el"; MessagesFile: "@DIST_DIR@\share\@PACKAGE@\Greek-4-5.1.11.isl"
+Name: "fr"; MessagesFile: "compiler:Languages\French.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-fr.win32-bin.txt"
+Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-it.win32-bin.txt"
+Name: "ja"; MessagesFile: "@DIST_DIR@\share\@PACKAGE@\Japanese-5-5.1.11.isl"
+Name: "lv"; MessagesFile: "@DIST_DIR@\share\@PACKAGE@\Latvian-1-5.1.11.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-lv.win32-bin.txt"
+Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-nl.win32-bin.txt"
Name: "pt_BR"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
-Name: "zh_CN"; MessagesFile: "@GC_WIN_REPOS_DIR@\ChineseSimp-12-5.1.11.isl"; InfoAfterFile: "@INSTALL_DIR@\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"
-Name: "zh_TW"; MessagesFile: "@GC_WIN_REPOS_DIR@\ChineseTrad-2-5.1.11.isl"; InfoAfterFile: "@INSTALL_DIR@\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"
+Name: "zh_CN"; MessagesFile: "@DIST_DIR@\share\@PACKAGE@\ChineseSimp-12-5.1.11.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"
+Name: "zh_TW"; MessagesFile: "@DIST_DIR@\share\@PACKAGE@\ChineseTrad-2-5.1.11.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"
;; The following language files are available as well, in alphabetical
;; order: Basque, BrazilianPortuguese, Catalan, Czech, Danish, Dutch,
commit cfdce452ff7421ae0adafb6a7a31c152501262ff
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue May 6 22:42:53 2014 +0200
Use dist script to replace parameters in gnucash.iss
This use to be partly handled by gnucash' configure but gnucash.iss
will be removed from the gnucash repository.
diff --git a/.gitattributes b/.gitattributes
index 551dda8..d679374 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -30,6 +30,6 @@
*.isl text eol=crlf
*.vbs text eol=crlf
-gnucash.iss.in text eol=crlf
+gnucash.iss text eol=crlf
gnucash.rc.in text eol=crlf
README*win32-bin.txt text eol=crlf
diff --git a/defaults.sh b/defaults.sh
index 8730364..7604280 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -48,6 +48,7 @@ else
fi
set_default BUILD_DIR $GNUCASH_DIR\\build
set_default INSTALL_DIR $GNUCASH_DIR\\inst
+set_default DIST_DIR $GNUCASH_DIR\\dist
set_default WITH_CUTECASH no
set_default CUTECASH_BUILD_DIR $GNUCASH_DIR\\build-cutecash
diff --git a/dist-impl.sh b/dist-impl.sh
index f1605ce..ec8773b 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -4,10 +4,6 @@
#
function dist_prepare() {
- # this directory is hardcoded in gnucash.iss.in
- DIST_DIR=${INSTALL_DIR}\\..\\dist
- DIST_UDIR=`unix_path $DIST_DIR`
- DIST_WFSDIR=`win_fs_path $DIST_DIR`
TMP_UDIR=`unix_path $TMP_DIR`
if [ -x $DIST_DIR ]; then
die "Please remove ${DIST_DIR} first"
@@ -35,8 +31,10 @@ function dist_prepare() {
_LIBDBI_DRIVERS_UDIR=`unix_path ${LIBDBI_DRIVERS_DIR}`
_LIBGDA_UDIR=`unix_path $LIBGDA_DIR`
_GNUCASH_UDIR=`unix_path $GNUCASH_DIR`
+ _GC_WIN_REPOS_UDIR=`unix_path $GC_WIN_REPOS_DIR`
_REPOS_UDIR=`unix_path $REPOS_DIR`
_BUILD_UDIR=`unix_path $BUILD_DIR`
+ _DIST_UDIR=`unix_path $DIST_DIR`
_MINGW_UDIR=`unix_path $MINGW_DIR`
_INSTALL_UDIR=`unix_path $INSTALL_DIR`
_INNO_UDIR=`unix_path $INNO_DIR`
@@ -78,11 +76,11 @@ function dist_mingw() {
function dist_aqbanking() {
setup aqbanking
- cp -a ${_AQBANKING_UDIR}/bin/*.exe ${DIST_UDIR}/bin
- cp -a ${_AQBANKING_UDIR}/bin/*.dll ${DIST_UDIR}/bin
- cp -a ${_AQBANKING_UDIR}/lib/aqbanking ${DIST_UDIR}/lib
- cp -a ${_AQBANKING_UDIR}/share/aqbanking ${DIST_UDIR}/share
- cp -a ${_AQBANKING_UDIR}/share/locale ${DIST_UDIR}/share
+ cp -a ${_AQBANKING_UDIR}/bin/*.exe ${_DIST_UDIR}/bin
+ cp -a ${_AQBANKING_UDIR}/bin/*.dll ${_DIST_UDIR}/bin
+ cp -a ${_AQBANKING_UDIR}/lib/aqbanking ${_DIST_UDIR}/lib
+ cp -a ${_AQBANKING_UDIR}/share/aqbanking ${_DIST_UDIR}/share
+ cp -a ${_AQBANKING_UDIR}/share/locale ${_DIST_UDIR}/share
}
function dist_gnome() {
@@ -122,99 +120,99 @@ function dist_gnome() {
cp -a $_GNOME_UDIR/bin/libxml*.dll $DIST_DIR/bin
- if [ -d $DIST_UDIR/lib/locale ] ; then
+ if [ -d $_DIST_UDIR/lib/locale ] ; then
# Huh, is this removed in newer gtk?
- cp -a $DIST_UDIR/lib/locale $DIST_UDIR/share
- rm -rf $DIST_UDIR/lib/locale
+ cp -a $_DIST_UDIR/lib/locale $_DIST_UDIR/share
+ rm -rf $_DIST_UDIR/lib/locale
fi
}
function dist_gnutls() {
setup gnutls
- cp -a ${_GNUTLS_UDIR}/bin/*.dll ${DIST_UDIR}/bin
- cp -a ${_GNUTLS_UDIR}/bin/*.exe ${DIST_UDIR}/bin
+ cp -a ${_GNUTLS_UDIR}/bin/*.dll ${_DIST_UDIR}/bin
+ cp -a ${_GNUTLS_UDIR}/bin/*.exe ${_DIST_UDIR}/bin
}
function dist_goffice() {
setup GOffice
- mkdir -p $DIST_UDIR/bin
- cp -a $_GOFFICE_UDIR/bin/libgoffice*.dll $DIST_UDIR/bin
- mkdir -p $DIST_UDIR/lib
- cp -a $_GOFFICE_UDIR/lib/goffice $DIST_UDIR/lib
- mkdir -p $DIST_UDIR/share
- cp -a $_GOFFICE_UDIR/share/{goffice,locale,pixmaps} $DIST_UDIR/share
+ mkdir -p $_DIST_UDIR/bin
+ cp -a $_GOFFICE_UDIR/bin/libgoffice*.dll $_DIST_UDIR/bin
+ mkdir -p $_DIST_UDIR/lib
+ cp -a $_GOFFICE_UDIR/lib/goffice $_DIST_UDIR/lib
+ mkdir -p $_DIST_UDIR/share
+ cp -a $_GOFFICE_UDIR/share/{goffice,locale,pixmaps} $_DIST_UDIR/share
}
function dist_guile() {
setup Guile
- mkdir -p $DIST_UDIR/bin
- cp -a $_GUILE_UDIR/bin/libguile*.dll $DIST_UDIR/bin
- cp -a $_GUILE_UDIR/bin/guile.exe $DIST_UDIR/bin
- mkdir -p $DIST_UDIR/share
- cp -a $_GUILE_UDIR/share/guile $DIST_UDIR/share
+ mkdir -p $_DIST_UDIR/bin
+ cp -a $_GUILE_UDIR/bin/libguile*.dll $_DIST_UDIR/bin
+ cp -a $_GUILE_UDIR/bin/guile.exe $_DIST_UDIR/bin
+ mkdir -p $_DIST_UDIR/share
+ cp -a $_GUILE_UDIR/share/guile $_DIST_UDIR/share
}
function dist_gwenhywfar() {
setup gwenhywfar
- cp -a ${_GWENHYWFAR_UDIR}/bin/*.dll ${DIST_UDIR}/bin
- mkdir -p ${DIST_UDIR}/etc
- cp -a ${_GWENHYWFAR_UDIR}/lib/gwenhywfar ${DIST_UDIR}/lib
- mkdir -p ${DIST_UDIR}/share
- cp -a ${_GWENHYWFAR_UDIR}/share/gwenhywfar ${DIST_UDIR}/share
+ cp -a ${_GWENHYWFAR_UDIR}/bin/*.dll ${_DIST_UDIR}/bin
+ mkdir -p ${_DIST_UDIR}/etc
+ cp -a ${_GWENHYWFAR_UDIR}/lib/gwenhywfar ${_DIST_UDIR}/lib
+ mkdir -p ${_DIST_UDIR}/share
+ cp -a ${_GWENHYWFAR_UDIR}/share/gwenhywfar ${_DIST_UDIR}/share
}
function dist_isocodes() {
setup isocodes
- mkdir -p $DIST_UDIR/share
- cp -a $_ISOCODES_UDIR/share/{locale,xml} $DIST_UDIR/share
+ mkdir -p $_DIST_UDIR/share
+ cp -a $_ISOCODES_UDIR/share/{locale,xml} $_DIST_UDIR/share
}
function dist_ktoblzcheck() {
setup ktoblzcheck
# dll is already copied in dist_gwenhywfar
- cp -a ${_GWENHYWFAR_UDIR}/share/ktoblzcheck ${DIST_UDIR}/share
+ cp -a ${_GWENHYWFAR_UDIR}/share/ktoblzcheck ${_DIST_UDIR}/share
}
function dist_libdbi() {
setup LibDBI
- cp -a ${_SQLITE3_UDIR}/bin/* ${DIST_UDIR}/bin
- cp -a ${_MYSQL_LIB_UDIR}/bin/*.{dll,manifest} ${DIST_UDIR}/bin
- cp -a ${_MYSQL_LIB_UDIR}/lib/*.dll ${DIST_UDIR}/bin
- cp -a ${_PGSQL_UDIR}/bin/* ${DIST_UDIR}/bin
- cp -a ${_PGSQL_UDIR}/lib/*.dll ${DIST_UDIR}/bin
- cp -a ${_LIBDBI_UDIR}/bin/* ${DIST_UDIR}/bin
- mkdir ${DIST_UDIR}/lib/dbd
- cp -a ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/*.dll ${DIST_UDIR}/lib/dbd
+ cp -a ${_SQLITE3_UDIR}/bin/* ${_DIST_UDIR}/bin
+ cp -a ${_MYSQL_LIB_UDIR}/bin/*.{dll,manifest} ${_DIST_UDIR}/bin
+ cp -a ${_MYSQL_LIB_UDIR}/lib/*.dll ${_DIST_UDIR}/bin
+ cp -a ${_PGSQL_UDIR}/bin/* ${_DIST_UDIR}/bin
+ cp -a ${_PGSQL_UDIR}/lib/*.dll ${_DIST_UDIR}/bin
+ cp -a ${_LIBDBI_UDIR}/bin/* ${_DIST_UDIR}/bin
+ mkdir ${_DIST_UDIR}/lib/dbd
+ cp -a ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/*.dll ${_DIST_UDIR}/lib/dbd
}
function dist_libgsf() {
setup libGSF
- mkdir -p $DIST_UDIR/bin
- cp -a $_LIBGSF_UDIR/bin/libgsf*.dll $DIST_UDIR/bin
- mkdir -p $DIST_UDIR/share
- cp -a $_LIBGSF_UDIR/share/locale $DIST_UDIR/share
+ mkdir -p $_DIST_UDIR/bin
+ cp -a $_LIBGSF_UDIR/bin/libgsf*.dll $_DIST_UDIR/bin
+ mkdir -p $_DIST_UDIR/share
+ cp -a $_LIBGSF_UDIR/share/locale $_DIST_UDIR/share
}
function dist_libofx() {
setup OpenSP and LibOFX
- cp -a ${_OPENSP_UDIR}/bin/*.dll ${DIST_UDIR}/bin
- cp -a ${_OPENSP_UDIR}/share/OpenSP ${DIST_UDIR}/share
- cp -a ${_LIBOFX_UDIR}/bin/*.dll ${DIST_UDIR}/bin
- cp -a ${_LIBOFX_UDIR}/bin/*.exe ${DIST_UDIR}/bin
- cp -a ${_LIBOFX_UDIR}/share/libofx ${DIST_UDIR}/share
+ cp -a ${_OPENSP_UDIR}/bin/*.dll ${_DIST_UDIR}/bin
+ cp -a ${_OPENSP_UDIR}/share/OpenSP ${_DIST_UDIR}/share
+ cp -a ${_LIBOFX_UDIR}/bin/*.dll ${_DIST_UDIR}/bin
+ cp -a ${_LIBOFX_UDIR}/bin/*.exe ${_DIST_UDIR}/bin
+ cp -a ${_LIBOFX_UDIR}/share/libofx ${_DIST_UDIR}/share
}
function dist_openssl() {
setup OpenSSL
_OPENSSL_UDIR=`unix_path $OPENSSL_DIR`
- mkdir -p $DIST_UDIR/bin
- cp -a $_OPENSSL_UDIR/bin/*.dll $DIST_UDIR/bin
+ mkdir -p $_DIST_UDIR/bin
+ cp -a $_OPENSSL_UDIR/bin/*.dll $_DIST_UDIR/bin
}
function dist_pcre() {
setup pcre
- mkdir -p $DIST_UDIR/bin
- cp -a $_PCRE_UDIR/bin/pcre3.dll $DIST_UDIR/bin
+ mkdir -p $_DIST_UDIR/bin
+ cp -a $_PCRE_UDIR/bin/pcre3.dll $_DIST_UDIR/bin
}
function dist_regex() {
@@ -225,41 +223,55 @@ function dist_regex() {
function dist_webkit() {
setup WebKit
- cp -a ${_LIBSOUP_UDIR}/bin/* ${DIST_UDIR}/bin
- cp -a ${_LIBXSLT_UDIR}/bin/* ${DIST_UDIR}/bin
- cp -a ${_ENCHANT_UDIR}/bin/* ${DIST_UDIR}/bin
- cp -a ${_WEBKIT_UDIR}/bin/* ${DIST_UDIR}/bin
+ cp -a ${_LIBSOUP_UDIR}/bin/* ${_DIST_UDIR}/bin
+ cp -a ${_LIBXSLT_UDIR}/bin/* ${_DIST_UDIR}/bin
+ cp -a ${_ENCHANT_UDIR}/bin/* ${_DIST_UDIR}/bin
+ cp -a ${_WEBKIT_UDIR}/bin/* ${_DIST_UDIR}/bin
}
function dist_gnucash() {
setup GnuCash
- mkdir -p $DIST_UDIR/bin
- cp $_MINGW_UDIR/bin/pthreadGC2.dll $DIST_UDIR/bin
- cp -a $_INSTALL_UDIR/bin/* $DIST_UDIR/bin
- mkdir -p $DIST_UDIR/etc/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,glib-2.0} $DIST_UDIR/share
- cp -a $_REPOS_UDIR/packaging/win32/{getperl.vbs,gnc-path-check,install-fq-mods.cmd} $DIST_UDIR/bin
+ mkdir -p $_DIST_UDIR/bin
+ cp $_MINGW_UDIR/bin/pthreadGC2.dll $_DIST_UDIR/bin
+ cp -a $_INSTALL_UDIR/bin/* $_DIST_UDIR/bin
+ mkdir -p $_DIST_UDIR/etc/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,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' )
# aqbanking >= 5.0.0
AQBANKING_VERSION_H=${_AQBANKING_UDIR}/include/aqbanking5/aqbanking/version.h
GWENHYWFAR_VERSION_H=${_GWENHYWFAR_UDIR}/include/gwenhywfar4/gwenhywfar/version.h
+ GNUCASH_CONFIG_H=${_BUILD_UDIR}/config.h
_AQBANKING_SO_EFFECTIVE=$(awk '/AQBANKING_SO_EFFECTIVE / { print $3 }' ${AQBANKING_VERSION_H} )
_GWENHYWFAR_SO_EFFECTIVE=$(awk '/GWENHYWFAR_SO_EFFECTIVE / { print $3 }' ${GWENHYWFAR_VERSION_H} )
- sed < $_BUILD_UDIR/packaging/win32/gnucash.iss \
+ PACKAGE_VERSION=$(awk '/ PACKAGE_VERSION / { print $3 }' ${GNUCASH_CONFIG_H} | cut -d\" -f2 )
+ PACKAGE=$(awk '/ PACKAGE / { print $3 }' ${GNUCASH_CONFIG_H} | cut -d\" -f2 )
+ GNUCASH_MAJOR_VERSION=$(awk '/ GNUCASH_MAJOR_VERSION / { print $3 }' ${GNUCASH_CONFIG_H} )
+ GNUCASH_MINOR_VERSION=$(awk '/ GNUCASH_MINOR_VERSION / { print $3 }' ${GNUCASH_CONFIG_H} )
+ GNUCASH_MICRO_VERSION=$(awk '/ GNUCASH_MICRO_VERSION / { print $3 }' ${GNUCASH_CONFIG_H} )
+ sed < $_GC_WIN_REPOS_UDIR/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"
+ -e "s#@-gwenhywfar_so_effective-@#${_GWENHYWFAR_SO_EFFECTIVE}#g" \
+ -e "s#@-aqbanking_so_effective-@#${_AQBANKING_SO_EFFECTIVE}#g" \
+ -e "s#@PACKAGE_VERSION@#${PACKAGE_VERSION}#g" \
+ -e "s#@PACKAGE@#${PACKAGE}#g" \
+ -e "s#@GNUCASH_MAJOR_VERSION@#${GNUCASH_MAJOR_VERSION}#g" \
+ -e "s#@GNUCASH_MINOR_VERSION@#${GNUCASH_MINOR_VERSION}#g" \
+ -e "s#@GNUCASH_MICRO_VERSION@#${GNUCASH_MICRO_VERSION}#g" \
+ -e "s#@GC_WIN_REPOS_DIR@#${GC_WIN_REPOS_DIR}#g" \
+ -e "s#@INSTALL_DIR@#${INSTALL_DIR}#g" \
+ -e "s#@DIST_DIR@#${DIST_DIR}#g"
}
function dist_finish() {
# Strip redirections in distributed libtool .la files
- for file in $DIST_UDIR/bin/*.la; do
+ for file in $_DIST_UDIR/bin/*.la; do
cat $file | sed 's,^libdir=,#libdir=,' > $file.new
mv $file.new $file
done
diff --git a/gnucash.iss.in b/gnucash.iss
similarity index 91%
rename from gnucash.iss.in
rename to gnucash.iss
index 784da42..de2b83b 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss
@@ -16,16 +16,16 @@ AppUpdatesURL=http://www.gnucash.org
VersionInfoVersion=@VERSION@
DefaultDirName={pf}\@PACKAGE@
DefaultGroupName=GnuCash
-LicenseFile=@prefix@\..\dist\share\doc\@PACKAGE@\COPYING
+LicenseFile=@DIST_DIR\share\doc\@PACKAGE@\COPYING
Compression=lzma
MinVersion=5.0,5.0
PrivilegesRequired=poweruser
OutputDir=.
OutputBaseFilename=@PACKAGE at -@VERSION at -setup
UninstallFilesDir={app}\uninstall\@PACKAGE@
-InfoAfterFile=@prefix@\..\dist\share\doc\@PACKAGE@\README.win32-bin.txt
-SetupIconFile=@prefix@\..\dist\share\@PACKAGE@\pixmaps\gnucash-icon.ico
-WizardSmallImageFile=@prefix@\..\dist\share\@PACKAGE@\pixmaps\gnucash-icon-48x48.bmp
+InfoAfterFile=@DIST_DIR\share\doc\@PACKAGE@\README.win32-bin.txt
+SetupIconFile=@DIST_DIR\share\@PACKAGE@\pixmaps\gnucash-icon.ico
+WizardSmallImageFile=@DIST_DIR\share\@PACKAGE@\pixmaps\gnucash-icon-48x48.bmp
[Types]
Name: "full"; Description: "{cm:FullInstall}"
@@ -61,33 +61,33 @@ Filename: "{app}\bin\guile.cmd"; Flags: runhidden
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
[Files]
; The main executables and DLLs
-Source: "@prefix@\..\dist\bin\*"; DestDir: "{app}\bin"; Flags: recursesubdirs ignoreversion; Components: main
-Source: "@prefix@\..\dist\etc\*"; DestDir: "{app}\etc"; Flags: recursesubdirs; Components: main
-Source: "@prefix@\..\dist\etc\@PACKAGE@\environment"; DestDir: "{app}\etc\@PACKAGE@"; Components: main; AfterInstall: MyAfterInstallEnvironment()
+Source: "@DIST_DIR\bin\*"; DestDir: "{app}\bin"; Flags: recursesubdirs ignoreversion; Components: main
+Source: "@DIST_DIR\etc\*"; DestDir: "{app}\etc"; Flags: recursesubdirs; Components: main
+Source: "@DIST_DIR\etc\@PACKAGE@\environment"; DestDir: "{app}\etc\@PACKAGE@"; Components: main; AfterInstall: MyAfterInstallEnvironment()
; 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: "@DIST_DIR\lib\*"; DestDir: "{app}\lib"; 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
+;Source: "@DIST_DIR\libexec\*"; DestDir: "{app}\libexec"; Flags: recursesubdirs; Components: main
+Source: "@DIST_DIR\share\*"; DestDir: "{app}\share"; Flags: recursesubdirs; Components: main
;; The translations
-;Source: "@prefix@\..\dist\share\locale\*"; DestDir: "{app}\share\locale"; Flags: recursesubdirs; Components: translations
+;Source: "@DIST_DIR\share\locale\*"; DestDir: "{app}\share\locale"; Flags: recursesubdirs; Components: translations
;
;; The account templates
-;Source: "@prefix@\..\dist\share\@PACKAGE@\accounts\*"; DestDir: "{app}\share\@PACKAGE@\accounts"; Flags: recursesubdirs; Components: templates
+;Source: "@DIST_DIR\share\@PACKAGE@\accounts\*"; DestDir: "{app}\share\@PACKAGE@\accounts"; Flags: recursesubdirs; Components: templates
; And all the documentation
-Source: "@prefix@\..\dist\share\doc\@PACKAGE@\README"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@prefix@\..\dist\share\doc\@PACKAGE@\README.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@prefix@\..\dist\share\doc\@PACKAGE@\README-de.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@prefix@\..\dist\share\doc\@PACKAGE@\README-fr.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@prefix@\..\dist\share\doc\@PACKAGE@\README-it.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@prefix@\..\dist\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@prefix@\..\dist\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@prefix@\..\dist\share\doc\@PACKAGE@\COPYING"; DestDir: "{app}\doc\@PACKAGE@"; Flags: ignoreversion; Components: main
-Source: "@prefix@\..\dist\share\doc\@PACKAGE@\AUTHORS"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@prefix@\..\dist\share\doc\@PACKAGE@\ChangeLog"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@DIST_DIR\share\doc\@PACKAGE@\README"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@DIST_DIR\share\doc\@PACKAGE@\README.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@DIST_DIR\share\doc\@PACKAGE@\README-de.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@DIST_DIR\share\doc\@PACKAGE@\README-fr.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@DIST_DIR\share\doc\@PACKAGE@\README-it.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@DIST_DIR\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@DIST_DIR\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@DIST_DIR\share\doc\@PACKAGE@\COPYING"; DestDir: "{app}\doc\@PACKAGE@"; Flags: ignoreversion; Components: main
+Source: "@DIST_DIR\share\doc\@PACKAGE@\AUTHORS"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@DIST_DIR\share\doc\@PACKAGE@\ChangeLog"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -370,16 +370,16 @@ end;
[Languages]
Name: "en"; MessagesFile: "compiler:Default.isl"
-Name: "de"; MessagesFile: "compiler:Languages\German.isl"; InfoAfterFile: "@prefix@\share\doc\@PACKAGE@\README-de.win32-bin.txt"
-Name: "el"; MessagesFile: "@prefix@\share\@PACKAGE@\Greek-4-5.1.11.isl"
-Name: "fr"; MessagesFile: "compiler:Languages\French.isl"; InfoAfterFile: "@prefix@\share\doc\@PACKAGE@\README-fr.win32-bin.txt"
-Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"; InfoAfterFile: "@prefix@\share\doc\@PACKAGE@\README-it.win32-bin.txt"
-Name: "ja"; MessagesFile: "@prefix@\share\@PACKAGE@\Japanese-5-5.1.11.isl"
-Name: "lv"; MessagesFile: "@prefix@\share\@PACKAGE@\Latvian-1-5.1.11.isl"; InfoAfterFile: "@prefix@\share\doc\@PACKAGE@\README-lv.win32-bin.txt"
-Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"; InfoAfterFile: "@prefix@\share\doc\@PACKAGE@\README-nl.win32-bin.txt"
+Name: "de"; MessagesFile: "compiler:Languages\German.isl"; InfoAfterFile: "@INSTALL_DIR@\share\doc\@PACKAGE@\README-de.win32-bin.txt"
+Name: "el"; MessagesFile: "@GC_WIN_REPOS_DIR@\Greek-4-5.1.11.isl"
+Name: "fr"; MessagesFile: "compiler:Languages\French.isl"; InfoAfterFile: "@INSTALL_DIR@\share\doc\@PACKAGE@\README-fr.win32-bin.txt"
+Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"; InfoAfterFile: "@INSTALL_DIR@\share\doc\@PACKAGE@\README-it.win32-bin.txt"
+Name: "ja"; MessagesFile: "@GC_WIN_REPOS_DIR@\Japanese-5-5.1.11.isl"
+Name: "lv"; MessagesFile: "@GC_WIN_REPOS_DIR@\Latvian-1-5.1.11.isl"; InfoAfterFile: "@INSTALL_DIR@\share\doc\@PACKAGE@\README-lv.win32-bin.txt"
+Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"; InfoAfterFile: "@INSTALL_DIR@\share\doc\@PACKAGE@\README-nl.win32-bin.txt"
Name: "pt_BR"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
-Name: "zh_CN"; MessagesFile: "@prefix@\share\@PACKAGE@\ChineseSimp-12-5.1.11.isl"; InfoAfterFile: "@prefix@\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"
-Name: "zh_TW"; MessagesFile: "@prefix@\share\@PACKAGE@\ChineseTrad-2-5.1.11.isl"; InfoAfterFile: "@prefix@\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"
+Name: "zh_CN"; MessagesFile: "@GC_WIN_REPOS_DIR@\ChineseSimp-12-5.1.11.isl"; InfoAfterFile: "@INSTALL_DIR@\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"
+Name: "zh_TW"; MessagesFile: "@GC_WIN_REPOS_DIR@\ChineseTrad-2-5.1.11.isl"; InfoAfterFile: "@INSTALL_DIR@\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"
;; The following language files are available as well, in alphabetical
;; order: Basque, BrazilianPortuguese, Catalan, Czech, Danish, Dutch,
commit 4133679229a2bb3612e1c03944cafb8fc18b764f
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue May 6 22:40:56 2014 +0200
Use more straightforward way to define variable
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index b246e1e..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-EXTRA_DIST = \
- README \
- aqbanking-4.2.4-r2132.patch \
- defaults.sh \
- dist.sh \
- exetype.pl \
- functions.sh \
- getperl.vbs \
- gnc-path-check \
- install.sh \
- install-fq-mods.cmd \
- libmysql.def \
- opensp-1.5.2.patch \
- pi.sh \
- ChineseSimp-12-5.1.11.isl \
- ChineseTrad-2-5.1.11.isl \
- Greek-4-5.1.11.isl \
- Japanese-5-5.1.11.isl \
- Latvian-1-5.1.11.isl \
- reset.sh
-
-if OS_WIN32
- bin_PROGRAMS = redirect
- redirect_SOURCES = redirect.c
- redirect_LDADD = $(GLIB_LIBS)
- AM_CPPFLAGS = $(GLIB_CFLAGS)
- pkgdata_DATA = ChineseSimp-12-5.1.11.isl
- pkgdata_DATA += ChineseTrad-2-5.1.11.isl
- pkgdata_DATA += Greek-4-5.1.11.isl
- pkgdata_DATA += Japanese-5-5.1.11.isl
- pkgdata_DATA += Latvian-1-5.1.11.isl
-else
- EXTRA_DIST += redirect.c
-endif
diff --git a/dist-impl.sh b/dist-impl.sh
index 3eaae1e..f1605ce 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -53,7 +53,7 @@ function dist_mingw() {
setup mingw
# Prepare mingw-get to install to alternative location
- MINGWGET_DIST_DIR=${INSTALL_DIR}\\..\\mingw-get-dist
+ MINGWGET_DIST_DIR=${GNUCASH_DIR}\\mingw-get-dist
MINGWGET_DIST_UDIR=`unix_path $MINGWGET_DIST_DIR`
mkdir -p $MINGWGET_DIST_UDIR/{bin,libexec,var/lib/mingw-get/data}
cp $_MINGW_UDIR/bin/mingw-get.exe $MINGWGET_DIST_UDIR/bin/
commit 39b07cdda8effd4bc7f4274370e89ace94872549
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue May 6 14:53:51 2014 +0200
Add some documentation to buildserver scripts
diff --git a/buildserver/README.txt b/buildserver/README.txt
new file mode 100644
index 0000000..b392408
--- /dev/null
+++ b/buildserver/README.txt
@@ -0,0 +1,92 @@
+*- Buildserver -*
+-----------------
+
+The build server is a set of scripts written to allow
+a Windows pc to repeatedly build the Gnucash
+Windows installer starting from the GnuCash sources.
+
+It is meant to set up some nightly builds system and is
+currently configured to
+- build the gnucash master (development) branch
+- build any new release tag
+- optionally build the gnucash maint (stable) branch
+
+Note: whether these scripts really run 'nightly' or at
+ another interval depends on how the build server
+ is configured (see below).
+
+
+Setup
+-----
+
+Note: if you have already set up a gnucash build environment using
+ bootstrap_win_dev.vbs and install.sh you can skip to step 5.
+
+1. Download bootstrap_win_dev.vbs from the gnucash-on-windows
+ repository on Github. Direct url:
+ https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/bootstrap_win_dev.vbs
+
+2. Run this script by double-clicking it and follow the instructions.
+ If the script's output window closes before you get to a "Happy hacking"
+ message then something went wrong. To figure out what you can instead
+ open a Windows command prompt (cmd.exe) and run the script as
+ cscript.exe <path\to>\bootstrap_win_dev.vbs
+ Be sure to replace <path\to> with the correct path.
+
+Note: by default everything will be installed inside c:\gcdev\
+ In theory you could alter this location by passing some parameters
+ to bootstrap_win_dev.vbs. However the build server scripts expect
+ to find at least msys in this default location so changing it
+ will likely lead to a malfunctioning build server script.
+
+3. If this has run successfully open an msys (bash) console. Unless
+ you have altered the default paths, you will find this in
+ c:\gcdev\mingw\msys\1.0\msys.bat
+
+4. Let's run the script to build gnucash and its dependencies once manually.
+ This is mainly necessary to get html help installed which requires human
+ interaction. To do so enter the following commands in msys:
+ cd /c/gcdev/gnucash-on-windows.git
+ ./install.sh
+
+ You can interrupt install.sh after html help is installed if you like.
+
+5. (Optional) The build server scripts have the option to upload the
+ Gnucash Windows installer and build log to a remote server. For this
+ to work it requires the scp.exe tool to be installed. To do so run
+ this command in the msys console:
+ mingw-get install msys-openssh
+
+Note: the feature to upload the installer and log are currently still
+ using some hard coded parameters:
+ - it will only attempt to upload if the build machine is called
+ 'gnucash-win32'
+ - it will always upload to code.gnucash.org:public_html/win32
+ as user 'upload'
+ So it's currently only useful on the primary build server.
+
+6. The next step is to tell Windows to run the buildserver scripts at
+ regular intervals. For this you can set up a "Scheduled Task" via
+ the Windows Control Panel. Configure the task as follows:
+ - Run: c:\gcdev\gnucash-on-windows.git\buildserver\build_periodic.bat
+ - Start in: c:\gcdev\gnucash-on-windows.git
+ - Choose a schedule. For nightly builds schedule it to run every day.
+ You are free to select other intervals as you see fit.
+
+7. Wait until the next scheduled time has passed and check how it went.
+ Note that the first time the build can take a long time. The current
+ primary build server takes about 5-6 hours. This is a virtual machine
+ running Windows XP. While the build is still running you should see
+ a windows console in which the build output is printed as the
+ build proceeds. This window closes automatically when the build finishes.
+
+ Upon a succesfull build you should find the newly created Gnucash
+ Windows installer in c:\gcdev\output along with the build log.
+
+ If that is not the case you can check the build log to learn what went
+ wrong. If there is even no build log that means the build encountered
+ an error pretty early in the process (before logging has started). To
+ learn what this was you can open a Windows command prompt (cmd.exe) and
+ manually run
+ c:\gcdev\gnucash-on-windows.git\buildserver\build_periodic.bat
+ That should give some indication of what is failing.
commit 689ce21fc3f7cfd03af077e06efb3b01ee3c8805
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon May 5 23:05:35 2014 +0200
Point github urls at Gnucash team instead of gjanssens personal repos
diff --git a/bootstrap_win_dev.vbs b/bootstrap_win_dev.vbs
index 14671a7..efca557 100644
--- a/bootstrap_win_dev.vbs
+++ b/bootstrap_win_dev.vbs
@@ -87,7 +87,7 @@ End If
If WScript.Arguments.Named.Exists("GC_WIN_REPOS_URL") Then
GC_WIN_REPOS_URL = WScript.Arguments.Named.Item("GC_WIN_REPOS_URL")
Else
- GC_WIN_REPOS_URL = "git://github.com/gjanssens/gnucash-on-windows.git"
+ GC_WIN_REPOS_URL = "git://github.com/Gnucash/gnucash-on-windows.git"
End If
If WScript.Arguments.Named.Exists("GC_WIN_REPOS_DIR") Then
GC_WIN_REPOS_DIR = myRegExp.Replace (WScript.Arguments.Named.Item("GC_WIN_REPOS_DIR"), "\")
@@ -162,7 +162,7 @@ Else
strMingwGetZip = DOWNLOAD_DIR & "\mingw-get.zip"
If Not objFso.FileExists(strMingwGetZip) Then
stdout.Write "Downloading mingw-get.zip (slow!)... "
- strMingwGetZipUrl = "https://github.com/gjanssens/gnucash-on-windows/raw/master/mingw-get.zip"
+ strMingwGetZipUrl = "https://github.com/Gnucash/gnucash-on-windows/raw/master/mingw-get.zip"
HTTPDownload strMingwGetZipUrl, strMingwGetZip
stdout.WriteLine "Success"
End If
commit 86746dd0dea8c308e08daaec286a935ea586bd21
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon May 5 23:01:49 2014 +0200
Minor change to test github sync
diff --git a/bootstrap_win_dev.vbs b/bootstrap_win_dev.vbs
index ecf0930..14671a7 100644
--- a/bootstrap_win_dev.vbs
+++ b/bootstrap_win_dev.vbs
@@ -35,7 +35,7 @@ myRegExp.Pattern = "/"
' Parameters than can be overridden on the command line
' -----------------------------------------------------
-' All of the above will be installed in the base directory specified below.
+' Everything will be installed in the base directory specified below.
' If this path doesn't suit you, you can specify another path as a named
' variable on the command line like so:
' bootstrap_win_dev.vbs /GLOBAL_DIR:c:\soft
commit 5a1b73b87c842008a1bd0436b161d65797200b40
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon May 5 22:28:07 2014 +0200
Build server: enable tag builds
diff --git a/buildserver/build_periodic.bat b/buildserver/build_periodic.bat
index f2575f3..4fdb2bd 100644
--- a/buildserver/build_periodic.bat
+++ b/buildserver/build_periodic.bat
@@ -9,7 +9,6 @@ cd c:\gcdev\gnucash-on-windows.git\
rem Development build (daily)
c:\gcdev\mingw\msys\1.0\bin\sh.exe --login c:\gcdev\gnucash-on-windows.git\buildserver\build_periodic.sh
rem Tags build for 2.6.99 and newer (daily -- only tags that weren't built yet)
-rem FIXME Disable tag builds until build_tags.sh has been adapted to work in the new environment
-rem c:\gcdev\mingw\msys\1.0\bin\sh.exe --login c:\gcdev\gnucash-on-windows.git\buildserver\build_tags.sh
+c:\gcdev\mingw\msys\1.0\bin\sh.exe --login c:\gcdev\gnucash-on-windows.git\buildserver\build_tags.sh
rem maintenance branch build (weekly)
rem c:\gcdev-maint\mingw\msys\1.0\bin\sh.exe --login c:\gcdev-maint\gnucash-on-windows.git\buildserver\periodic_build.sh weekly
\ No newline at end of file
commit 6d2f0d2a41c0461ab5c82f6d771e4047d9426ed6
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri May 2 21:35:16 2014 +0200
Fix script location
diff --git a/buildserver/build_tags.sh b/buildserver/build_tags.sh
index 79c8e1f..68d4b9e 100644
--- a/buildserver/build_tags.sh
+++ b/buildserver/build_tags.sh
@@ -126,6 +126,6 @@ for tag_rev in $tags ; do
# Now build the tag! (this will upload it too)
# Use the build_package script from master (cwd), not from the tag
qpushd ${_TAG_WIN_REPOS_UDIR}
- ${pkgdir}/build_package.sh ${tag}
+ ${_BUILDSERVER_UDIR}/build_package.sh ${tag}
qpopd
done
commit 5c52ca32a41a5d30bfece62eddea92f839de17e9
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri May 2 20:30:04 2014 +0200
Fix variable assignment
diff --git a/buildserver/build_tags.sh b/buildserver/build_tags.sh
index ed9741e..79c8e1f 100644
--- a/buildserver/build_tags.sh
+++ b/buildserver/build_tags.sh
@@ -109,8 +109,8 @@ for tag_rev in $tags ; do
$GIT_CMD checkout $tag
qpopd
- $TAG_WIN_REPOS_DIR="${TAG_GLOBAL_DIR}\\gnucash-on-windows.git"
- $_TAG_WIN_REPOS_UDIR=$(unix_path "$TAG_WIN_REPOS_DIR")
+ TAG_WIN_REPOS_DIR="${TAG_GLOBAL_DIR}\\gnucash-on-windows.git"
+ _TAG_WIN_REPOS_UDIR=$(unix_path "$TAG_WIN_REPOS_DIR")
#cp -p "${pkgdir}/custom.sh" ${_TAG_WIN_REPOS_UDIR}/custom.sh
# BUILD_FROM_TARBALL is special:
commit 485956e03d0d7d5996dd8da19210c6c10c8a703a
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri May 2 20:07:09 2014 +0200
Tweak bootstrap paths so it can be called from within an msys environment as well
diff --git a/bootstrap_win_dev.vbs b/bootstrap_win_dev.vbs
index 7ddc5d4..ecf0930 100644
--- a/bootstrap_win_dev.vbs
+++ b/bootstrap_win_dev.vbs
@@ -26,6 +26,13 @@
' Ensure we have a visible console to display output
CheckStartMode
+' This regexp is used to "Windoize" path names when this script is called
+' from inside an msys environment (like from the build_tags.sh script)
+' It should be a noop when the script is called from a pure Windows cmd prompt
+Set myRegExp = New RegExp
+myRegExp.Global = True
+myRegExp.Pattern = "/"
+
' Parameters than can be overridden on the command line
' -----------------------------------------------------
' All of the above will be installed in the base directory specified below.
@@ -38,22 +45,22 @@ CheckStartMode
' Any of the parameters set up below can be overridden in this way.
If WScript.Arguments.Named.Exists("GLOBAL_DIR") Then
- GLOBAL_DIR = WScript.Arguments.Named.Item("GLOBAL_DIR")
+ GLOBAL_DIR = myRegExp.Replace (WScript.Arguments.Named.Item("GLOBAL_DIR"), "\")
Else
GLOBAL_DIR = "c:\gcdev"
End If
If WScript.Arguments.Named.Exists("MINGW_DIR") Then
- MINGW_DIR = WScript.Arguments.Named.Item("MINGW_DIR")
+ MINGW_DIR = myRegExp.Replace (WScript.Arguments.Named.Item("MINGW_DIR"), "\")
Else
MINGW_DIR = GLOBAL_DIR & "\mingw"
End If
If WScript.Arguments.Named.Exists("TMP_DIR") Then
- TMP_DIR = WScript.Arguments.Named.Item("TMP_DIR")
+ TMP_DIR = myRegExp.Replace (WScript.Arguments.Named.Item("TMP_DIR"), "\")
Else
TMP_DIR= GLOBAL_DIR & "\tmp"
End If
If WScript.Arguments.Named.Exists("DOWNLOAD_DIR") Then
- DOWNLOAD_DIR = WScript.Arguments.Named.Item("DOWNLOAD_DIR")
+ DOWNLOAD_DIR = myRegExp.Replace (WScript.Arguments.Named.Item("DOWNLOAD_DIR"), "\")
Else
DOWNLOAD_DIR= GLOBAL_DIR & "\downloads"
End If
@@ -73,7 +80,7 @@ Else
GIT_URL = strGitBaseUrl & GIT_PKG
End If
If WScript.Arguments.Named.Exists("GIT_DIR") Then
- GIT_DIR = WScript.Arguments.Named.Item("GIT_DIR")
+ GIT_DIR = myRegExp.Replace (WScript.Arguments.Named.Item("GIT_DIR"), "\")
Else
GIT_DIR = GLOBAL_DIR & "\git-1.7.10"
End If
@@ -83,7 +90,7 @@ Else
GC_WIN_REPOS_URL = "git://github.com/gjanssens/gnucash-on-windows.git"
End If
If WScript.Arguments.Named.Exists("GC_WIN_REPOS_DIR") Then
- GC_WIN_REPOS_DIR = WScript.Arguments.Named.Item("GC_WIN_REPOS_DIR")
+ GC_WIN_REPOS_DIR = myRegExp.Replace (WScript.Arguments.Named.Item("GC_WIN_REPOS_DIR"), "\")
Else
GC_WIN_REPOS_DIR = GLOBAL_DIR & "\gnucash-on-windows.git"
End If
@@ -93,7 +100,7 @@ Else
REPOS_URL = "git://github.com/Gnucash/gnucash.git"
End If
If WScript.Arguments.Named.Exists("REPOS_DIR") Then
- REPOS_DIR = WScript.Arguments.Named.Item("REPOS_DIR")
+ REPOS_DIR = myRegExp.Replace (WScript.Arguments.Named.Item("REPOS_DIR"), "\")
Else
REPOS_DIR = GLOBAL_DIR & "\gnucash.git"
End If
commit 38fc3f89ba14f573ea0720c7af17b109cdd5209d
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri May 2 19:12:12 2014 +0200
More bootstrap's silent mode fixes
diff --git a/bootstrap_win_dev.vbs b/bootstrap_win_dev.vbs
index 9c70c59..7ddc5d4 100644
--- a/bootstrap_win_dev.vbs
+++ b/bootstrap_win_dev.vbs
@@ -101,8 +101,8 @@ End If
' If you want the script to run without prompting the user,
' add the /silent:yes switch to the command line
' It will still print output though to help in locating errors
+silent = False
If WScript.Arguments.Named.Exists("silent") Then
- stdout.WriteLine "Going into silent mode"
silent = True
End If
commit 8cbbd7c29524b0ac94ea3fb30d510e49553acd42
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri May 2 19:10:19 2014 +0200
Fix bootstrap's silent mode
diff --git a/bootstrap_win_dev.vbs b/bootstrap_win_dev.vbs
index 81bbafd..9c70c59 100644
--- a/bootstrap_win_dev.vbs
+++ b/bootstrap_win_dev.vbs
@@ -99,7 +99,7 @@ Else
End If
' If you want the script to run without prompting the user,
-' add the /s switch to the command line
+' add the /silent:yes switch to the command line
' It will still print output though to help in locating errors
If WScript.Arguments.Named.Exists("silent") Then
stdout.WriteLine "Going into silent mode"
diff --git a/buildserver/build_tags.sh b/buildserver/build_tags.sh
index ad89a0e..ed9741e 100644
--- a/buildserver/build_tags.sh
+++ b/buildserver/build_tags.sh
@@ -100,7 +100,7 @@ for tag_rev in $tags ; do
# This will automatically create a custom.sh with
# several parameters correctly pre-set like
# GLOBAL_DIR, DOWNLOAD_DIR,...
- cscript.exe $_GC_WIN_REPOS_UDIR/bootstrap_win_dev.vbs /silent /GLOBAL_DIR:$TAG_GLOBAL_DIR /DOWNLOAD_DIR:$DOWNLOAD_DIR
+ cscript.exe $_GC_WIN_REPOS_UDIR/bootstrap_win_dev.vbs /silent:yes /GLOBAL_DIR:$TAG_GLOBAL_DIR /DOWNLOAD_DIR:$DOWNLOAD_DIR
# Check out the tag and setup custom.sh
TAG_REPOS_DIR="${TAG_GLOBAL_DIR}\\gnucash.git"
commit 75de3c82f16c2ace2b02515077625adb15c8f55e
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri May 2 19:07:19 2014 +0200
Set bootstrap parameters that were passed on the command line
diff --git a/bootstrap_win_dev.vbs b/bootstrap_win_dev.vbs
index fc1d076..81bbafd 100644
--- a/bootstrap_win_dev.vbs
+++ b/bootstrap_win_dev.vbs
@@ -37,47 +37,72 @@ CheckStartMode
' these can confuse msys/mingw or some of the tools depending on them.
' Any of the parameters set up below can be overridden in this way.
-If WScript.Arguments.Named.Item("GLOBAL_DIR") = "" Then
+If WScript.Arguments.Named.Exists("GLOBAL_DIR") Then
+ GLOBAL_DIR = WScript.Arguments.Named.Item("GLOBAL_DIR")
+Else
GLOBAL_DIR = "c:\gcdev"
End If
-If WScript.Arguments.Named.Item("MINGW_DIR") = "" Then
+If WScript.Arguments.Named.Exists("MINGW_DIR") Then
+ MINGW_DIR = WScript.Arguments.Named.Item("MINGW_DIR")
+Else
MINGW_DIR = GLOBAL_DIR & "\mingw"
End If
-If WScript.Arguments.Named.Item("TMP_DIR") = "" Then
+If WScript.Arguments.Named.Exists("TMP_DIR") Then
+ TMP_DIR = WScript.Arguments.Named.Item("TMP_DIR")
+Else
TMP_DIR= GLOBAL_DIR & "\tmp"
End If
-If WScript.Arguments.Named.Item("DOWNLOAD_DIR") = "" Then
+If WScript.Arguments.Named.Exists("DOWNLOAD_DIR") Then
+ DOWNLOAD_DIR = WScript.Arguments.Named.Item("DOWNLOAD_DIR")
+Else
DOWNLOAD_DIR= GLOBAL_DIR & "\downloads"
End If
-If WScript.Arguments.Named.Item("GIT_PKG") = "" Then
+If WScript.Arguments.Named.Exists("GIT_PKG") Then
+ GIT_PKG = WScript.Arguments.Named.Item("GIT_PKG")
+Else
GIT_PKG = "Git-1.7.10-preview20120409.exe"
End If
-If WScript.Arguments.Named.Item("strGitBaseUrl") = "" Then
+If WScript.Arguments.Named.Exists("strGitBaseUrl") Then
+ strGitBaseUrl = WScript.Arguments.Named.Item("strGitBaseUrl")
+Else
strGitBaseUrl = "http://msysgit.googlecode.com/files/"
End If
-If WScript.Arguments.Named.Item("GIT_URL") = "" Then
+If WScript.Arguments.Named.Exists("GIT_URL") Then
+ GIT_URL = WScript.Arguments.Named.Item("GIT_URL")
+Else
GIT_URL = strGitBaseUrl & GIT_PKG
End If
-If WScript.Arguments.Named.Item("GIT_DIR") = "" Then
+If WScript.Arguments.Named.Exists("GIT_DIR") Then
+ GIT_DIR = WScript.Arguments.Named.Item("GIT_DIR")
+Else
GIT_DIR = GLOBAL_DIR & "\git-1.7.10"
End If
-If WScript.Arguments.Named.Item("GC_WIN_REPOS_URL") = "" Then
+If WScript.Arguments.Named.Exists("GC_WIN_REPOS_URL") Then
+ GC_WIN_REPOS_URL = WScript.Arguments.Named.Item("GC_WIN_REPOS_URL")
+Else
GC_WIN_REPOS_URL = "git://github.com/gjanssens/gnucash-on-windows.git"
End If
-If WScript.Arguments.Named.Item("GC_WIN_REPOS_DIR") = "" Then
+If WScript.Arguments.Named.Exists("GC_WIN_REPOS_DIR") Then
+ GC_WIN_REPOS_DIR = WScript.Arguments.Named.Item("GC_WIN_REPOS_DIR")
+Else
GC_WIN_REPOS_DIR = GLOBAL_DIR & "\gnucash-on-windows.git"
End If
-If WScript.Arguments.Named.Item("REPOS_URL") = "" Then
+If WScript.Arguments.Named.Exists("REPOS_URL") Then
+ REPOS_URL = WScript.Arguments.Named.Item("REPOS_URL")
+Else
REPOS_URL = "git://github.com/Gnucash/gnucash.git"
End If
-If WScript.Arguments.Named.Item("REPOS_DIR") = "" Then
+If WScript.Arguments.Named.Exists("REPOS_DIR") Then
+ REPOS_DIR = WScript.Arguments.Named.Item("REPOS_DIR")
+Else
REPOS_DIR = GLOBAL_DIR & "\gnucash.git"
End If
' If you want the script to run without prompting the user,
' add the /s switch to the command line
' It will still print output though to help in locating errors
-If WScript.Arguments.Named.Exists("s") Then
+If WScript.Arguments.Named.Exists("silent") Then
+ stdout.WriteLine "Going into silent mode"
silent = True
End If
@@ -347,6 +372,7 @@ AbortScript
Sub Welcome
If silent then
' Don't interact with user if in silent mode
+ stdout.WriteLine "Skipping intro because silent mode was set"
Exit Sub
End If
diff --git a/buildserver/build_tags.sh b/buildserver/build_tags.sh
index 527d258..ad89a0e 100644
--- a/buildserver/build_tags.sh
+++ b/buildserver/build_tags.sh
@@ -100,7 +100,7 @@ for tag_rev in $tags ; do
# This will automatically create a custom.sh with
# several parameters correctly pre-set like
# GLOBAL_DIR, DOWNLOAD_DIR,...
- cscript.exe $_GC_WIN_REPOS_UDIR/bootstrap_win_dev.vbs /s /GLOBAL_DIR:$TAG_GLOBAL_DIR /DOWNLOAD_DIR:$DOWNLOAD_DIR
+ cscript.exe $_GC_WIN_REPOS_UDIR/bootstrap_win_dev.vbs /silent /GLOBAL_DIR:$TAG_GLOBAL_DIR /DOWNLOAD_DIR:$DOWNLOAD_DIR
# Check out the tag and setup custom.sh
TAG_REPOS_DIR="${TAG_GLOBAL_DIR}\\gnucash.git"
commit b2d2ad988eb89b547f141ece8806d3148c3536b0
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri May 2 18:54:09 2014 +0200
Comment out what was intended as a comment anyway...
diff --git a/bootstrap_win_dev.vbs b/bootstrap_win_dev.vbs
index 66336a5..fc1d076 100644
--- a/bootstrap_win_dev.vbs
+++ b/bootstrap_win_dev.vbs
@@ -31,7 +31,7 @@ CheckStartMode
' All of the above will be installed in the base directory specified below.
' If this path doesn't suit you, you can specify another path as a named
' variable on the command line like so:
- bootstrap_win_dev.vbs /GLOBAL_DIR:c:\soft
+' bootstrap_win_dev.vbs /GLOBAL_DIR:c:\soft
' Note: avoid paths with spaces or other special characters (like &).
' these can confuse msys/mingw or some of the tools depending on them.
commit cee7244d922081946304a4df223b111877248a10
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri May 2 18:50:43 2014 +0200
Wrap bootstrap script in order to run it from an msys environment
diff --git a/buildserver/build_tags.sh b/buildserver/build_tags.sh
index 906ee02..527d258 100644
--- a/buildserver/build_tags.sh
+++ b/buildserver/build_tags.sh
@@ -100,7 +100,7 @@ for tag_rev in $tags ; do
# This will automatically create a custom.sh with
# several parameters correctly pre-set like
# GLOBAL_DIR, DOWNLOAD_DIR,...
- $_GC_WIN_REPOS_UDIR/bootstrap_win_dev.vbs /s /GLOBAL_DIR:$TAG_GLOBAL_DIR /DOWNLOAD_DIR:$DOWNLOAD_DIR
+ cscript.exe $_GC_WIN_REPOS_UDIR/bootstrap_win_dev.vbs /s /GLOBAL_DIR:$TAG_GLOBAL_DIR /DOWNLOAD_DIR:$DOWNLOAD_DIR
# Check out the tag and setup custom.sh
TAG_REPOS_DIR="${TAG_GLOBAL_DIR}\\gnucash.git"
commit 3f668a9f9d5b7e417c436dd568c7937c522fa835
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri May 2 18:42:38 2014 +0200
Add missing 'then'
diff --git a/buildserver/build_periodic.sh b/buildserver/build_periodic.sh
index 0a26dd1..5f44ac5 100644
--- a/buildserver/build_periodic.sh
+++ b/buildserver/build_periodic.sh
@@ -22,6 +22,7 @@ set -e
# that script is run will effectively determine how regularly this script is run.
periodicity=$1
if [ x$periodicity = xweekly ]
+then
## Only run this script on Monday night (first day of the week)
if [ `date +%u` != 1 ]
then
commit d9723870177e7f24860978e60ec227cfe496f672
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri May 2 18:36:34 2014 +0200
Buildserver - rework scripts
- rename daily_build.* to build_periodic.* - none of the scripts can
actually enforce daily building. That's done by a timed command in Windows
- add command line parameter to build_periodic.sh. If set to weekly
only run the script on mondays.
- drop weekly_build.sh, periodicity is now added in build_periodic.sh
- rework build_tags.sh for the new build scheme
diff --git a/bootstrap_win_dev.vbs b/bootstrap_win_dev.vbs
index d760356..66336a5 100644
--- a/bootstrap_win_dev.vbs
+++ b/bootstrap_win_dev.vbs
@@ -74,6 +74,13 @@ If WScript.Arguments.Named.Item("REPOS_DIR") = "" Then
REPOS_DIR = GLOBAL_DIR & "\gnucash.git"
End If
+' If you want the script to run without prompting the user,
+' add the /s switch to the command line
+' It will still print output though to help in locating errors
+If WScript.Arguments.Named.Exists("s") Then
+ silent = True
+End If
+
' Parameters that can't/shouldn't be overridden
'----------------------------------------------
' Global parameters for visual basic
@@ -338,6 +345,11 @@ AbortScript
' ----------------------------
' Initial message to user
Sub Welcome
+ If silent then
+ ' Don't interact with user if in silent mode
+ Exit Sub
+ End If
+
stdout.WriteLine "Boostrap GnuCash Development on Windows"
stdout.WriteLine "---------------------------------------"
stdout.WriteLine "This script is intended for people that wish to develop GnuCash on Windows"
@@ -453,6 +465,11 @@ End Sub
' Abort the script
Sub AbortScript
+ If silent then
+ ' Don't interact with user if in silent mode
+ Exit Sub
+ End If
+
stdout.WriteBlankLines 1
stdout.Write "Pres enter to continue... "
chRead = stdin.Read (1)
diff --git a/buildserver/build_package.sh b/buildserver/build_package.sh
index b351341..31c3d0b 100644
--- a/buildserver/build_package.sh
+++ b/buildserver/build_package.sh
@@ -1,9 +1,9 @@
#!/bin/sh
#
-# This assumes we're in the "packaging" directory for the correct build.
-# It could be the packaging/win32 subdir of a tag checkout, or it could
-# be the top-level daily-build packaging directory.
+# This assumes we're in the "gnucash-on-windows" directory for the correct build.
+# It could be for tag build environment, or it could
+# be the top-level daily-build gnucash-on-windows directory.
# Note: GIT_CMD below should have been set by a calling script.
#
diff --git a/buildserver/daily_build.bat b/buildserver/build_periodic.bat
similarity index 60%
rename from buildserver/daily_build.bat
rename to buildserver/build_periodic.bat
index 33f77a5..f2575f3 100644
--- a/buildserver/daily_build.bat
+++ b/buildserver/build_periodic.bat
@@ -1,13 +1,15 @@
-rem This is the Windows Batch Script for the daily builds.
+rem This is the Windows Batch Script for the periodic builds.
rem It simply calls the actual MSYS Shell script to perform
-rem the daily build and then the tag builds.
+rem the periodic build and then the tag builds.
+rem Typically this is called from a timed command on Windows.
+rem On the GnuCash build server this timed command is run daily which the comments below suggest.
cd c:\gcdev\gnucash-on-windows.git\
rem Development build (daily)
-c:\gcdev\mingw\msys\1.0\bin\sh.exe --login c:\gcdev\gnucash-on-windows.git\buildserver\daily_build.sh
+c:\gcdev\mingw\msys\1.0\bin\sh.exe --login c:\gcdev\gnucash-on-windows.git\buildserver\build_periodic.sh
rem Tags build for 2.6.99 and newer (daily -- only tags that weren't built yet)
rem FIXME Disable tag builds until build_tags.sh has been adapted to work in the new environment
rem c:\gcdev\mingw\msys\1.0\bin\sh.exe --login c:\gcdev\gnucash-on-windows.git\buildserver\build_tags.sh
rem maintenance branch build (weekly)
-rem c:\gcdev-maint\mingw\msys\1.0\bin\sh.exe --login c:\gcdev-maint\gnucash-on-windows.git\buildserver\weekly_build.sh
\ No newline at end of file
+rem c:\gcdev-maint\mingw\msys\1.0\bin\sh.exe --login c:\gcdev-maint\gnucash-on-windows.git\buildserver\periodic_build.sh weekly
\ No newline at end of file
diff --git a/buildserver/daily_build.sh b/buildserver/build_periodic.sh
similarity index 76%
rename from buildserver/daily_build.sh
rename to buildserver/build_periodic.sh
index 64d4e02..0a26dd1 100644
--- a/buildserver/daily_build.sh
+++ b/buildserver/build_periodic.sh
@@ -14,6 +14,21 @@
set -e
+# Determine how frequently to run this script
+# Currently only 'weekly' restricts the run frequency
+# Any other periodicity will just run the script regardless of how long it has
+# been since the last run.
+# As this script is meant to be called from build_periodic.bat the frequency
+# that script is run will effectively determine how regularly this script is run.
+periodicity=$1
+if [ x$periodicity = xweekly ]
+ ## Only run this script on Monday night (first day of the week)
+ if [ `date +%u` != 1 ]
+ then
+ exit
+ fi
+fi
+
function qpushd() { pushd "$@" >/dev/null; }
function qpopd() { popd >/dev/null; }
function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
@@ -43,7 +58,7 @@ qpushd "$_REPOS_UDIR"
# Update the gnucash repository
$GIT_CMD pull
# If we don't have a rev file then start from 'now' and force a build
-revfile=$_GC_WIN_REPOS_UDIR/last_rev_daily
+revfile=$_GC_WIN_REPOS_UDIR/last_rev_periodic
if [ ! -f ${revfile} ] ; then
oldrev=a # definitely an invalid, so non-existing git rev
else
diff --git a/buildserver/build_tags.sh b/buildserver/build_tags.sh
index 8e2e7f8..906ee02 100644
--- a/buildserver/build_tags.sh
+++ b/buildserver/build_tags.sh
@@ -21,28 +21,37 @@ function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
################################################################
# Setup our environment (we need the DOWNLOAD_DIR)
-qpushd "$(dirname $(unix_path "$0"))"
+_BUILDSERVER_UDIR="$(dirname $(unix_path "$0"))"
+qpushd "$_BUILDSERVER_UDIR/.."
pkgdir="`pwd`"
-. functions.sh
-. defaults.sh
+. ./functions.sh
+. ./defaults.sh
# Variables
_GIT_UDIR=`unix_path $GIT_DIR`
set_env "$_GIT_UDIR/bin/git" GIT_CMD
export GIT_CMD
+# Update the gnucash-on-windows build scripts
+_GC_WIN_REPOS_UDIR=`unix_path $GC_WIN_REPOS_DIR`
+qpushd "$_GC_WIN_REPOS_UDIR"
$GIT_CMD pull
-. functions.sh
-. defaults.sh
+. ./functions.sh
+. ./defaults.sh
+qpopd
################################################################
# determine if there are any new tags since the last time we ran
#
+_REPOS_UDIR=`unix_path $REPOS_DIR`
+qpushd "$_REPOS_UDIR"
+
+# Update the gnucash repository
$GIT_CMD fetch -t
# If we don't have a tagfile then start from 'now'
-tagfile=tags_git
+tagfile=$_GC_WIN_REPOS_UDIR/tags
if [ ! -f ${tagfile} ] ; then
for one_tag in $($GIT_CMD tag)
do
@@ -59,10 +68,13 @@ do
echo ${tag_hash}/${one_tag} >> ${tagfile}.new
done
tags="`diff --suppress-common-lines ${tagfile} ${tagfile}.new | grep '^> ' | sed -e 's/^> //g'`"
+qpopd
# move the new file into place
mv -f ${tagfile}.new ${tagfile}
+qpopd # return to directory the script was invoked from (not necessarily the directory this script resides in)
+
################################################################
# Now iterate over all the new tags (if any) and build a package
@@ -80,49 +92,40 @@ for tag_rev in $tags ; do
continue
fi
- tagbasedir=/c/soft/gnucash-${tag}
- tagdir=${tagbasedir}/gnucash
- rm -fr $tagbasedir
- mkdir -p ${tagdir}
+ TAG_GLOBAL_DIR="c:\\gcdev\\gnucash-${tag}"
+ _TAG_GLOBAL_UDIR=$(unix_path "$TAG_GLOBAL_DIR")
+ rm -fr $_TAG_GLOBAL_UDIR
+
+ # Set up a clean build environment for this tag
+ # This will automatically create a custom.sh with
+ # several parameters correctly pre-set like
+ # GLOBAL_DIR, DOWNLOAD_DIR,...
+ $_GC_WIN_REPOS_UDIR/bootstrap_win_dev.vbs /s /GLOBAL_DIR:$TAG_GLOBAL_DIR /DOWNLOAD_DIR:$DOWNLOAD_DIR
# Check out the tag and setup custom.sh
- qpushd ${tagdir}
- $GIT_CMD clone ${REPOS_URL} repos
- qpushd repos
+ TAG_REPOS_DIR="${TAG_GLOBAL_DIR}\\gnucash.git"
+ _TAG_REPOS_UDIR=$(unix_path "$TAG_REPOS_DIR")
+ qpushd $TAG_REPOS_DIR
$GIT_CMD checkout $tag
qpopd
- qpopd
- w32pkg=${tagdir}/repos/packaging/win32
- cp -p "${pkgdir}/custom.sh" ${w32pkg}/custom.sh
-
- # Set the global directory to the tag build
- echo -n 'GLOBAL_DIR=c:\\soft\\gnucash-' >> ${w32pkg}/custom.sh
- echo "${tag}" >> ${w32pkg}/custom.sh
-
- # Point DOWNLOAD_DIR at the global installation so we can reuse
- # most of the already downloaded packages
- echo -n "DOWNLOAD_DIR=" >> ${w32pkg}/custom.sh
- echo "${DOWNLOAD_DIR}" | sed -e 's/\\/\\\\/g' >> ${w32pkg}/custom.sh
-
- # UPDATE_SOURCES is obsolete, but preserved here to allow the
- # current script to also build older tags, that may still
- # use this parameter.
- # No need to update the sources we just checked out
- echo "UPDATE_SOURCES=no" >> ${w32pkg}/custom.sh
+
+ $TAG_WIN_REPOS_DIR="${TAG_GLOBAL_DIR}\\gnucash-on-windows.git"
+ $_TAG_WIN_REPOS_UDIR=$(unix_path "$TAG_WIN_REPOS_DIR")
+ #cp -p "${pkgdir}/custom.sh" ${_TAG_WIN_REPOS_UDIR}/custom.sh
# BUILD_FROM_TARBALL is special:
# in install.sh place we check !=yes, in defaults.sh =yes, in dist.sh =no
# We want it to look like 'no' in install and defaults, but yes in dist
# so this hack works!
- echo "BUILD_FROM_TARBALL=maybe" >> ${w32pkg}/custom.sh
+ echo "BUILD_FROM_TARBALL=maybe" >> ${_TAG_WIN_REPOS_UDIR}/custom.sh
# Point HH_DIR at the global installation because we don't need to redo it
- echo -n "HH_DIR=" >> ${w32pkg}/custom.sh
- echo "${GLOBAL_DIR}\\hh" | sed -e 's/\\/\\\\/g' >> ${w32pkg}/custom.sh
+ echo -n "HH_DIR=" >> ${_TAG_WIN_REPOS_UDIR}/custom.sh
+ echo "${GLOBAL_DIR}\\hh" | sed -e 's/\\/\\\\/g' >> ${_TAG_WIN_REPOS_UDIR}/custom.sh
# Now build the tag! (this will upload it too)
- # Use the build_package script from trunk (cwd), not from the tag
- qpushd ${w32pkg}
+ # Use the build_package script from master (cwd), not from the tag
+ qpushd ${_TAG_WIN_REPOS_UDIR}
${pkgdir}/build_package.sh ${tag}
qpopd
done
diff --git a/buildserver/weekly_build.sh b/buildserver/weekly_build.sh
deleted file mode 100644
index 787b590..0000000
--- a/buildserver/weekly_build.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/sh
-#
-# Notes:
-# 1. for this script to work, git must have been setup before
-# in a way that doesn't conflict with the GnuCash build.
-# If you set up the build environment using the bootstrap script
-# this should have been taken care of automatically.
-#
-# 2. Should this script change in the source repository, then the
-# git pull below will fail due to a limitation in Windows that
-# won't allow to change a file that is "in use". So in the rare
-# situation this script needs to be updated, you will need to
-# run the git pull once yourself.
-
-set -e
-
-## Only run this script on Monday night (first day of the week)
-if [ `date +%u` != 1 ] ; then exit ; fi
-
-function qpushd() { pushd "$@" >/dev/null; }
-function qpopd() { popd >/dev/null; }
-function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
-
-qpushd "$(dirname $(unix_path "$0"))"
-. functions.sh
-. defaults.sh
-
-# Variables
-_GIT_UDIR=`unix_path $GIT_DIR`
-set_env "$_GIT_UDIR/bin/git" GIT_CMD
-export $GIT_CMD
-
-# Update the gnucash-on-windows build scripts
-_GC_WIN_REPOS_UDIR=`unix_path $GC_WIN_REPOS_DIR`
-qpushd "$_GC_WIN_REPOS_UDIR"
-$GIT_CMD pull
-qpopd
-
-# Update the gnucash repository
-_REPOS_UDIR=`unix_path $REPOS_DIR`
-qpushd "$_REPOS_UDIR"
-$GIT_CMD pull
-qpopd
-
-################################################################
-# determine if there are any new commits since the last time we ran
-#
-
-# If we don't have a rev file then start from 'now' and force a build
-revfile=last_rev_weekly
-if [ ! -f ${revfile} ] ; then
- echo $($GIT_CMD rev-parse HEAD) > ${revfile}
- oldrev=a # definitely an invalid, so non-existing git rev
-else
- oldrev=$(cat ${revfile})
-fi
-
-newrev=$($GIT_CMD rev-parse HEAD)
-if [[ "${oldrev}" != "${newrev}" ]]; then
- ./build_package.sh
-fi
-
-# move the new file into place, will only happen if the build was successful
-echo ${newrev} > ${revfile}
-
-qpopd
\ No newline at end of file
commit b75a8d63095f6673e8f11c86dc59fb6cb1300aaa
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri May 2 17:21:50 2014 +0200
Allow default paths to be overridden on bootstrap command line
diff --git a/bootstrap_win_dev.vbs b/bootstrap_win_dev.vbs
index 664eddd..d760356 100644
--- a/bootstrap_win_dev.vbs
+++ b/bootstrap_win_dev.vbs
@@ -26,26 +26,56 @@
' Ensure we have a visible console to display output
CheckStartMode
-' Parameters
-' ----------
+' Parameters than can be overridden on the command line
+' -----------------------------------------------------
' All of the above will be installed in the base directory specified below.
-' If this path doesn't suit you, please feel free to modify it before
-' running this bootstrap script.
+' If this path doesn't suit you, you can specify another path as a named
+' variable on the command line like so:
+ bootstrap_win_dev.vbs /GLOBAL_DIR:c:\soft
+
' Note: avoid paths with spaces or other special characters (like &).
' these can confuse msys/mingw or some of the tools depending on them.
-GLOBAL_DIR = "c:\gcdev"
-MINGW_DIR = GLOBAL_DIR & "\mingw"
-TMP_DIR= GLOBAL_DIR & "\tmp"
-DOWNLOAD_DIR= GLOBAL_DIR & "\downloads"
-GIT_PKG = "Git-1.7.10-preview20120409.exe"
-strGitBaseUrl = "http://msysgit.googlecode.com/files/"
-GIT_URL = strGitBaseUrl & GIT_PKG
-GIT_DIR = GLOBAL_DIR & "\git-1.7.10"
-GC_WIN_REPOS_URL = "git://github.com/gjanssens/gnucash-on-windows.git"
-GC_WIN_REPOS_DIR = GLOBAL_DIR & "\gnucash-on-windows.git"
-REPOS_URL = "git://github.com/Gnucash/gnucash.git"
-REPOS_DIR = GLOBAL_DIR & "\gnucash.git"
+' Any of the parameters set up below can be overridden in this way.
+If WScript.Arguments.Named.Item("GLOBAL_DIR") = "" Then
+ GLOBAL_DIR = "c:\gcdev"
+End If
+If WScript.Arguments.Named.Item("MINGW_DIR") = "" Then
+ MINGW_DIR = GLOBAL_DIR & "\mingw"
+End If
+If WScript.Arguments.Named.Item("TMP_DIR") = "" Then
+ TMP_DIR= GLOBAL_DIR & "\tmp"
+End If
+If WScript.Arguments.Named.Item("DOWNLOAD_DIR") = "" Then
+ DOWNLOAD_DIR= GLOBAL_DIR & "\downloads"
+End If
+If WScript.Arguments.Named.Item("GIT_PKG") = "" Then
+ GIT_PKG = "Git-1.7.10-preview20120409.exe"
+End If
+If WScript.Arguments.Named.Item("strGitBaseUrl") = "" Then
+ strGitBaseUrl = "http://msysgit.googlecode.com/files/"
+End If
+If WScript.Arguments.Named.Item("GIT_URL") = "" Then
+ GIT_URL = strGitBaseUrl & GIT_PKG
+End If
+If WScript.Arguments.Named.Item("GIT_DIR") = "" Then
+ GIT_DIR = GLOBAL_DIR & "\git-1.7.10"
+End If
+If WScript.Arguments.Named.Item("GC_WIN_REPOS_URL") = "" Then
+ GC_WIN_REPOS_URL = "git://github.com/gjanssens/gnucash-on-windows.git"
+End If
+If WScript.Arguments.Named.Item("GC_WIN_REPOS_DIR") = "" Then
+ GC_WIN_REPOS_DIR = GLOBAL_DIR & "\gnucash-on-windows.git"
+End If
+If WScript.Arguments.Named.Item("REPOS_URL") = "" Then
+ REPOS_URL = "git://github.com/Gnucash/gnucash.git"
+End If
+If WScript.Arguments.Named.Item("REPOS_DIR") = "" Then
+ REPOS_DIR = GLOBAL_DIR & "\gnucash.git"
+End If
+
+' Parameters that can't/shouldn't be overridden
+'----------------------------------------------
' Global parameters for visual basic
Set objFso = CreateObject("Scripting.FileSystemObject")
Set stdout = objFso.GetStandardStream(1)
@@ -328,8 +358,10 @@ Sub Welcome
stdout.WriteLine " won't be touched. Instead the available versions"
stdout.WriteLine " will be used in that case."
stdout.WriteLine "* If the proposed locations don't suit you, you can"
- stdout.WriteLine " customize them before running this script."
- stdout.WriteLine " All of them are located at the beginning of this file."
+ stdout.WriteLine " pass alternate locations as named parameters to this script."
+ stdout.WriteLine " For example to use c:\soft as base directory you can run this script as"
+ stdout.WriteLine " bootstrap_win_dev.vbs /GLOBAL_DIR:c:\soft"
+ stdout.WriteLine " Which parameters you can modify can be found near the beginning of this script."
stdout.WriteBlankLines 1
stdout.Write "Continue with the set up (Y/N) ? "
chRead = stdin.ReadLine
commit 55e51c68bd600bd919cf4291cde0d77e07215e14
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu May 1 18:58:02 2014 +0200
Correction - html help install requires pexports
So it can only be installed after mingw
diff --git a/install.sh b/install.sh
index acd9717..603a0de 100644
--- a/install.sh
+++ b/install.sh
@@ -60,16 +60,17 @@ register_env_var SQLITE3_LIBS " "
# There is no reason to ever need to comment these out!
# * commented out glade, as it is not needed to run gnucash
add_step inst_prepare
-# Install html help first. It's the only step requiring
-# human interaction, so better do it at the beginning
-# so the user doesn't need to wait all the time.
-if [ "$CROSS_COMPILE" != "yes" ]; then
- add_step inst_hh
-fi
if [ "$CROSS_COMPILE" != "yes" ]; then
add_step inst_msys
fi
add_step inst_mingw
+# Install html help as soon as possible.
+# It's the only step requiring human
+# interaction, so better do it at the beginning
+# so the user doesn't need to wait all the time.
+if [ "$CROSS_COMPILE" != "yes" ]; then
+ add_step inst_hh
+fi
add_step inst_regex
add_step inst_readline
add_step inst_exetype
commit d5dee0bf1a01f9c5d4dbf4627c3ff711c9cd0291
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu May 1 18:53:50 2014 +0200
Move installation of html help to the start of the install process
It's the only step requiring human intervention.
Better do it when the human is still paying attention...
diff --git a/install-impl.sh b/install-impl.sh
index c6a8421..68e3ca1 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1136,6 +1136,8 @@ function inst_hh() {
echo "html help workshop already installed in $_HH_UDIR. skipping."
else
smart_wget $HH_URL $DOWNLOAD_DIR
+ echo "!!! Attention !!!"
+ echo "!!! This is the only installation step that requires your direct input !!!"
echo "!!! When asked for an installation path, specify $HH_DIR !!!"
$LAST_FILE
qpushd $HH_DIR
diff --git a/install.sh b/install.sh
index be57755..acd9717 100644
--- a/install.sh
+++ b/install.sh
@@ -60,6 +60,12 @@ register_env_var SQLITE3_LIBS " "
# There is no reason to ever need to comment these out!
# * commented out glade, as it is not needed to run gnucash
add_step inst_prepare
+# Install html help first. It's the only step requiring
+# human interaction, so better do it at the beginning
+# so the user doesn't need to wait all the time.
+if [ "$CROSS_COMPILE" != "yes" ]; then
+ add_step inst_hh
+fi
if [ "$CROSS_COMPILE" != "yes" ]; then
add_step inst_msys
fi
@@ -78,9 +84,6 @@ add_step inst_isocodes
add_step inst_swig
add_step inst_pcre
add_step inst_libgsf
-if [ "$CROSS_COMPILE" != "yes" ]; then
- add_step inst_hh
-fi
add_step inst_goffice
#add_step inst_glade
add_step inst_opensp
commit c400f27d57ec639def894e5a6967abc7f3ada60c
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Apr 29 16:15:36 2014 +0200
Remove svn step from install script
diff --git a/custom.sh.sample b/custom.sh.sample
index 9c1796d..d78fc8f 100644
--- a/custom.sh.sample
+++ b/custom.sh.sample
@@ -4,7 +4,7 @@
#
# Note: All directories must be without spaces!
#
-# REPOS_URL="svn+ssh://<dev>@svn.gnucash.org/repo/gnucash/trunk"
+# REPOS_URL="git at github.com:Gnucash/gnucash.git"
# SF_MIRROR="http://switch.dl.sourceforge.net/sourceforge"
# DISABLE_OPTIMIZATIONS=yes
# GLOBAL_DIR=Z:\\mydir # all directories will use this
diff --git a/defaults.sh b/defaults.sh
index 0282fe8..8730364 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -42,12 +42,8 @@ else
set_default REPOS_TYPE "git"
if [ "$REPOS_TYPE" = "git" ]; then
- set_default GNUCASH_SCM_REV "trunk"
+ set_default GNUCASH_SCM_REV "master"
set_default REPOS_URL "git://github.com/Gnucash/gnucash.git"
- elif [ "$REPOS_TYPE" = "svn" ]; then
- # latest revision that should compile, use HEAD or vwxyz
- set_default GNUCASH_SCM_REV "HEAD"
- set_default REPOS_URL "http://svn.gnucash.org/repo/gnucash/trunk"
fi
fi
set_default BUILD_DIR $GNUCASH_DIR\\build
@@ -330,9 +326,6 @@ set_default ICU4C_SRC_URL "http://download.icu-project.org/files/icu4c/4.4.1/icu
set_default ICU4C_DIR $GLOBAL_DIR\\icu-mingw32
set_default ICU4C_PATCH `pwd`/icu-crossmingw.patch
-set_default SVN_URL "http://subversion.tigris.org/files/documents/15/47914/svn-win32-1.6.6.zip"
-set_default SVN_DIR $GLOBAL_DIR\\svn
-
set_default GIT_URL "http://msysgit.googlecode.com/files/Git-1.7.10-preview20120409.exe"
set_default GIT_DIR $GLOBAL_DIR\\git-1.7.10
@@ -379,12 +372,8 @@ set_default CMAKE_DIR $GLOBAL_DIR\\cmake
set_default DOCBOOK_XSL_URL "$SF_MIRROR/docbook/docbook-xsl-1.76.1.zip"
set_default DOCBOOK_DTD_URL "http://www.oasis-open.org/docbook/xml/4.1.2/docbkx412.zip"
if [ "$REPOS_TYPE" = "git" ]; then
- set_default DOCS_SCM_REV "trunk"
+ set_default DOCS_SCM_REV "master"
set_default DOCS_URL "git://github.com/Gnucash/gnucash-docs.git"
-elif [ "$REPOS_TYPE" = "svn" ]; then
- # latest revision that should compile, use HEAD or vwxyz
- set_default DOCS_SCM_REV "HEAD"
- set_default DOCS_URL "http://svn.gnucash.org/repo/gnucash-docs/trunk"
fi
set_default UPDATE_DOCS yes
set_default DOCS_DIR $GLOBAL_DIR\\gnucash-docs
diff --git a/dist-impl.sh b/dist-impl.sh
index 0c7aa02..3eaae1e 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -271,11 +271,7 @@ function dist_finish() {
# And changing output filename
PKG_VERSION=`grep PACKAGE_VERSION ${_BUILD_UDIR}/config.h | cut -d" " -f3 | cut -d\" -f2 `
REVISION=`grep GNUCASH_SCM_REV ${_BUILD_UDIR}/src/core-utils/gnc-scm-info.h | cut -d" " -f3 | cut -d\" -f2 `
- if [ "$REPOS_TYPE" = "svn" ]; then
- SETUP_FILENAME="gnucash-${PKG_VERSION}-${REPOS_TYPE}-r${REVISION}-setup.exe"
- else
- SETUP_FILENAME="gnucash-${PKG_VERSION}-$(date +'%Y-%m-%d')-${REPOS_TYPE}-${REVISION}-setup.exe"
- fi
+ SETUP_FILENAME="gnucash-${PKG_VERSION}-$(date +'%Y-%m-%d')-${REPOS_TYPE}-${REVISION}-setup.exe"
qpushd ${_GNUCASH_UDIR}
mv gnucash-${PKG_VERSION}-setup.exe ${SETUP_FILENAME}
qpopd
diff --git a/install-impl.sh b/install-impl.sh
index 7c51a17..c6a8421 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -212,24 +212,6 @@ function inst_mingw() {
#[ ! -d $_AUTOTOOLS_UDIR/share/aclocal ] || add_to_env "-I $_AUTOTOOLS_UDIR/share/aclocal" ACLOCAL_FLAGS
}
-function inst_svn() {
- setup Subversion
- _SVN_UDIR=`unix_path $SVN_DIR`
- add_to_env $_SVN_UDIR/bin PATH
- if quiet $_SVN_UDIR/bin/svn --version
- then
- echo "subversion already installed in $_SVN_UDIR. skipping."
- else
- wget_unpacked $SVN_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/svn-win32-*
- rm -rf $SVN_DIR
- mkdir -p $SVN_DIR
- cp -a $TMP_UDIR/svn-win32-*/* $SVN_DIR
- rm -rf $TMP_UDIR/svn-win32-*
- quiet $_SVN_UDIR/bin/svn --version || die "svn not installed correctly"
- fi
-}
-
function inst_swig() {
setup Swig
_SWIG_UDIR=`unix_path $SWIG_DIR`
@@ -1007,7 +989,7 @@ function inst_openssl() {
die "Did not find libeay32.dll in your PATH, why that?"
fi
if [ "$_eay32dll" != "$_OPENSSL_UDIR/bin/libeay32.dll" ] ; then
- die "Found $_eay32dll in PATH. If you have added $_OPENSSL_UDIR/bin to your PATH before, make sure it is listed before paths from other packages shipping SSL libraries, like SVN. In particular, check $_MINGW_UDIR/etc/profile.d/installer.sh."
+ die "Found $_eay32dll in PATH. If you have added $_OPENSSL_UDIR/bin to your PATH before, make sure it is listed before paths from other packages shipping SSL libraries. In particular, check $_MINGW_UDIR/etc/profile.d/installer.sh."
fi
}
@@ -1336,18 +1318,6 @@ EOF
fi
}
-function checkupd_docs_svn() {
- if [ "$UPDATE_DOCS" = "yes" ]; then
- if [ -x .svn ]; then
- setup "Docs - Update repository (svn)"
- svn up -r $DOCS_SCM_REV
- else
- setup "Docs - Checkout repository (svn)"
- svn co -r $DOCS_SCM_REV $DOCS_URL .
- fi
- fi
-}
-
function checkupd_docs_git() {
if [ "$UPDATE_DOCS" = "yes" ]; then
@@ -1417,11 +1387,7 @@ function inst_docs() {
mkdir -p $_DOCS_UDIR/repos
qpushd $_DOCS_UDIR/repos
- if [ "$REPOS_TYPE" = "svn" ]; then
- checkupd_docs_svn
- else
- checkupd_docs_git
- fi
+ checkupd_docs_git
setup docs
_DOCS_INST_UDIR=`unix_path $INSTALL_DIR`/share/gnucash/help
mkdir -p $_DOCS_INST_UDIR/{C,de,it,ja}
diff --git a/install.sh b/install.sh
index 70a0eb9..be57755 100644
--- a/install.sh
+++ b/install.sh
@@ -70,7 +70,6 @@ add_step inst_exetype
add_step inst_gnome
add_step inst_guile
if [ "$CROSS_COMPILE" != "yes" ]; then
- add_step inst_svn
add_step inst_git
fi
add_step inst_gnutls
diff --git a/reset.sh b/reset.sh
index b0b5ca1..aea1315 100644
--- a/reset.sh
+++ b/reset.sh
@@ -25,7 +25,6 @@ function add_precious_path() {
add_precious_path msys $MSYS_DIR
add_precious_path wget $WGET_DIR
-add_precious_path svn $SVN_DIR
add_precious_path git $GIT_DIR
add_precious_path repos $REPOS_DIR
add_precious_path hh $HH_DIR
commit f35940840244f7d15333dbb004b9ecc6f6f2866a
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Apr 29 12:11:46 2014 +0200
Buildserver: reorder some comments and inform user of final installer location
diff --git a/buildserver/build_package.sh b/buildserver/build_package.sh
index 2eb4ea1..b351341 100644
--- a/buildserver/build_package.sh
+++ b/buildserver/build_package.sh
@@ -76,20 +76,22 @@ rm -rf ${_DIST_UDIR}
# Create the installer
$_GC_WIN_REPOS_UDIR/dist.sh 2>&1 | tee -a ${LOGFILE}
-# Copy the resulting installer into the output directory
+# Choose the output filename based on our "build_from_tarball" setting
+# Make sure this logic matches the logic in dist.sh!
_BUILD_UDIR=`unix_path $BUILD_DIR`
_GNUCASH_UDIR=`unix_path $GNUCASH_DIR`
PKG_VERSION=`grep PACKAGE_VERSION ${_BUILD_UDIR}/config.h | cut -d" " -f3 | cut -d\" -f2 `
REVISION=`grep GNUCASH_SCM_REV ${_BUILD_UDIR}/src/core-utils/gnc-scm-info.h | cut -d" " -f3 | cut -d\" -f2 `
-# Choose the output filename based on our "build_from_tarball" setting
-# Make sure this logic matches the logic in dist.sh!
if [ "$BUILD_FROM_TARBALL" = "no" ]; then
SETUP_FILENAME="gnucash-${PKG_VERSION}-$(date +'%Y-%m-%d')-git-${REVISION}-setup.exe"
else
SETUP_FILENAME="gnucash-${PKG_VERSION}-setup.exe"
fi
+# Copy the resulting installer into the output directory
mv ${_GNUCASH_UDIR}/${SETUP_FILENAME} ${_OUTPUT_DIR}
+echo "Buildserver has moved final installer to"
+echo ${_OUTPUT_DIR}/${SETUP_FILENAME}
#
# Verify that PKG_VERSION == $tag, and add to the build log if it's not.
commit c2ac76abac6441f5894012f88b5587bd3bc51aa8
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Apr 29 12:10:49 2014 +0200
Buildserver: only cache built rev after it is actually built
diff --git a/buildserver/daily_build.sh b/buildserver/daily_build.sh
index c165523..64d4e02 100644
--- a/buildserver/daily_build.sh
+++ b/buildserver/daily_build.sh
@@ -45,7 +45,6 @@ $GIT_CMD pull
# If we don't have a rev file then start from 'now' and force a build
revfile=$_GC_WIN_REPOS_UDIR/last_rev_daily
if [ ! -f ${revfile} ] ; then
- echo $($GIT_CMD rev-parse HEAD) > ${revfile}
oldrev=a # definitely an invalid, so non-existing git rev
else
oldrev=$(cat ${revfile})
commit 1164455d590e1408529ca57a0739d23453211015
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Apr 29 12:09:55 2014 +0200
Fix typo in bootstrap script
diff --git a/bootstrap_win_dev.vbs b/bootstrap_win_dev.vbs
index 6374bfb..664eddd 100644
--- a/bootstrap_win_dev.vbs
+++ b/bootstrap_win_dev.vbs
@@ -278,7 +278,7 @@ Else
objCustomSh.WriteLine "GIT_DIR=" & strGitDir
objCustomSh.WriteLine "REPOS_TYPE=git" ' Bootstrap only works with a git repo
objCustomSh.WriteLine "GC_WIN_REPOS_URL=" & GC_WIN_REPOS_URL
- objCustomSh.WriteLine "GC_WIN_REPOS_DIR=" & strReposDir
+ objCustomSh.WriteLine "GC_WIN_REPOS_DIR=" & strGCWinReposDir
objCustomSh.WriteLine "REPOS_URL=" & REPOS_URL
objCustomSh.WriteLine "REPOS_DIR=" & strReposDir
objCustomSh.Close
commit f2cf2c5ef455ccc124994f2cee201c2d22560186
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Apr 29 09:59:52 2014 +0200
More path fixes
diff --git a/buildserver/build_package.sh b/buildserver/build_package.sh
index 774b70b..2eb4ea1 100644
--- a/buildserver/build_package.sh
+++ b/buildserver/build_package.sh
@@ -22,8 +22,8 @@ function on_error() {
function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
-. ../functions.sh
-. ../defaults.sh
+. ./functions.sh
+. ./defaults.sh
tag="${1:-$GNUCASH_SCM_REV}"
diff --git a/buildserver/daily_build.sh b/buildserver/daily_build.sh
index 7a529fc..c165523 100644
--- a/buildserver/daily_build.sh
+++ b/buildserver/daily_build.sh
@@ -50,8 +50,9 @@ if [ ! -f ${revfile} ] ; then
else
oldrev=$(cat ${revfile})
fi
-
newrev=$($GIT_CMD rev-parse HEAD)
+qpopd # leave gnucash repository
+
if [[ "${oldrev}" != "${newrev}" ]]; then
$_BUILDSERVER_UDIR/build_package.sh
fi
@@ -59,5 +60,4 @@ fi
# move the new file into place, will only happen if the build was successful
echo ${newrev} > ${revfile}
-qpopd # leave gnucash repository
qpopd # return to directory the script was invoked from (not necessarily the directory this script resides in)
diff --git a/defaults.sh b/defaults.sh
index 90fa1d2..0282fe8 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -17,7 +17,7 @@ __SOURCED_DEFAULTS=1
[ -f "./custom.sh" ] && . ./custom.sh || true
-set_default GLOBAL_DIR c:\\soft
+set_default GLOBAL_DIR c:\\gcdev
set_default TMP_DIR $GLOBAL_DIR\\tmp
set_default DOWNLOAD_DIR $GLOBAL_DIR\\downloads
commit c8483aded62d082c8d45815df9fd43c8548351a9
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Apr 29 09:54:37 2014 +0200
Fix invalid path assumptions in daily_build.sh
diff --git a/buildserver/daily_build.sh b/buildserver/daily_build.sh
index 49cd838..7a529fc 100644
--- a/buildserver/daily_build.sh
+++ b/buildserver/daily_build.sh
@@ -18,9 +18,10 @@ function qpushd() { pushd "$@" >/dev/null; }
function qpopd() { popd >/dev/null; }
function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
-qpushd "$(dirname $(unix_path "$0"))"
-. ../functions.sh
-. ../defaults.sh
+_BUILDSERVER_UDIR="$(dirname $(unix_path "$0"))"
+qpushd "$_BUILDSERVER_UDIR/.."
+. ./functions.sh
+. ./defaults.sh
# Variables
_GIT_UDIR=`unix_path $GIT_DIR`
@@ -33,18 +34,16 @@ qpushd "$_GC_WIN_REPOS_UDIR"
$GIT_CMD pull
qpopd
-# Update the gnucash repository
-_REPOS_UDIR=`unix_path $REPOS_DIR`
-qpushd "$_REPOS_UDIR"
-$GIT_CMD pull
-qpopd
-
################################################################
# determine if there are any new commits since the last time we ran
#
+_REPOS_UDIR=`unix_path $REPOS_DIR`
+qpushd "$_REPOS_UDIR"
+# Update the gnucash repository
+$GIT_CMD pull
# If we don't have a rev file then start from 'now' and force a build
-revfile=last_rev_daily
+revfile=$_GC_WIN_REPOS_UDIR/last_rev_daily
if [ ! -f ${revfile} ] ; then
echo $($GIT_CMD rev-parse HEAD) > ${revfile}
oldrev=a # definitely an invalid, so non-existing git rev
@@ -54,10 +53,11 @@ fi
newrev=$($GIT_CMD rev-parse HEAD)
if [[ "${oldrev}" != "${newrev}" ]]; then
- ./build_package.sh
+ $_BUILDSERVER_UDIR/build_package.sh
fi
# move the new file into place, will only happen if the build was successful
echo ${newrev} > ${revfile}
-qpopd
+qpopd # leave gnucash repository
+qpopd # return to directory the script was invoked from (not necessarily the directory this script resides in)
commit e484224d859f0d592cc85df12b8e6ddd0a88b471
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Apr 29 09:31:26 2014 +0200
Disable tag builds in the build server until build_tags.sh is adapted to the new environment
diff --git a/buildserver/daily_build.bat b/buildserver/daily_build.bat
index bf81a7d..33f77a5 100644
--- a/buildserver/daily_build.bat
+++ b/buildserver/daily_build.bat
@@ -7,6 +7,7 @@ cd c:\gcdev\gnucash-on-windows.git\
rem Development build (daily)
c:\gcdev\mingw\msys\1.0\bin\sh.exe --login c:\gcdev\gnucash-on-windows.git\buildserver\daily_build.sh
rem Tags build for 2.6.99 and newer (daily -- only tags that weren't built yet)
-c:\gcdev\mingw\msys\1.0\bin\sh.exe --login c:\gcdev\gnucash-on-windows.git\buildserver\build_tags.sh
+rem FIXME Disable tag builds until build_tags.sh has been adapted to work in the new environment
+rem c:\gcdev\mingw\msys\1.0\bin\sh.exe --login c:\gcdev\gnucash-on-windows.git\buildserver\build_tags.sh
rem maintenance branch build (weekly)
rem c:\gcdev-maint\mingw\msys\1.0\bin\sh.exe --login c:\gcdev-maint\gnucash-on-windows.git\buildserver\weekly_build.sh
\ No newline at end of file
commit 50a374670e87febc52ba391c215ae77f6bedc6dd
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Apr 28 21:21:42 2014 +0200
Yet another fix in the libdbi-drivers patch
diff --git a/libdbi-drivers-errno.patch b/libdbi-drivers-errno.patch
index d9944d0..9de25a5 100644
--- a/libdbi-drivers-errno.patch
+++ b/libdbi-drivers-errno.patch
@@ -22,34 +22,34 @@ index 2a24764..9f57d85 100644
@@ -733,10 +733,10 @@ const char *dbd_select_db(dbi_conn_t * conn, const char *db)
return (char *) db;
}
-
--int dbd_geterror(dbi_conn_t * conn, int *errno, char **errstr)
+
+-int dbd_geterror(dbi_conn_t * conn, int *errno, char **errstr)
+int dbd_geterror(dbi_conn_t * conn, int *err_no, char **errstr)
{
/* put error number into errno, error string into errstr
- * return 0 if error, 1 if errno filled, 2 if errstr filled, 3 if both errno and errstr filled */
+ * return 0 if error, 1 if err_no filled, 2 if errstr filled, 3 if both err_no and errstr filled */
-
+
/* We havn't functions for read error types in freetds */
return -1;
diff --git a/drivers/msql/dbd_msql.c b/drivers/msql/dbd_msql.c
index bdf270e..cef20a8 100644
--- a/drivers/msql/dbd_msql.c
+++ b/drivers/msql/dbd_msql.c
-@@ -277,12 +277,12 @@ const char *dbd_select_db(dbi_conn_t *conn, const char *db)
- return db;
+@@ -277,12 +277,12 @@
+ return db;
}
-
--int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr)
-+int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr)
+
+-int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr)
++int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr)
{
- if(!msqlErrMsg)
- return -1;
-
+ if(!msqlErrMsg)
+ return -1;
+
- *errno = 0;
+ *err_no = 0;
- *errstr = strdup(msqlErrMsg);
- return 2;
+ *errstr = strdup(msqlErrMsg);
+ return 2;
}
diff --git a/drivers/mysql/dbd_mysql.c b/drivers/mysql/dbd_mysql.c
index 7d06f62..237506c 100644
@@ -82,7 +82,7 @@ index 1f38094..d220a9e 100755
@@ -400,12 +400,12 @@ const char *dbd_select_db(dbi_conn_t *conn, const char *db)
return NULL; /* Oracle can't do that .... */
}
-
+
-int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr)
+int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr)
{
@@ -91,18 +91,18 @@ index 1f38094..d220a9e 100755
Oraconn *Oconn = conn->connection;
- *errno = 0;
+ *err_no = 0;
-
+
if (!conn->connection) {
*errstr = strdup("Unable to connect to database.");
@@ -414,7 +414,7 @@ int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr)
- OCIErrorGet((dvoid *)Oconn->err, (ub4) 1, (text *) NULL, &errcode, errbuf,
- (ub4) sizeof(errbuf), OCI_HTYPE_ERROR);
- *errstr = strdup(errbuf);
+ OCIErrorGet((dvoid *)Oconn->err, (ub4) 1, (text *) NULL, &errcode, errbuf,
+ (ub4) sizeof(errbuf), OCI_HTYPE_ERROR);
+ *errstr = strdup(errbuf);
- *errno = errcode;
+ *err_no = errcode;
}
- return 3;
+ return 3;
diff --git a/drivers/pgsql/dbd_pgsql.c b/drivers/pgsql/dbd_pgsql.c
index 0433550..c097dac 100644
--- a/drivers/pgsql/dbd_pgsql.c
commit f8d2352e69272fc76c31dadad7a697c447a442ba
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Apr 28 20:52:11 2014 +0200
Revert automatic whitespace fixes in libdbi-drivers patch
diff --git a/libdbi-drivers-errno.patch b/libdbi-drivers-errno.patch
index 31097d7..d9944d0 100644
--- a/libdbi-drivers-errno.patch
+++ b/libdbi-drivers-errno.patch
@@ -3,10 +3,10 @@ index 4a1f30d..035479e 100755
--- a/drivers/firebird/dbd_firebird.c
+++ b/drivers/firebird/dbd_firebird.c
@@ -524,10 +524,10 @@ const char *dbd_select_db(dbi_conn_t *conn, const char *db)
- return db;
+ return db;
}
--int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr)
+-int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr)
+int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr)
{
/* error_message and error_number were already set by calls to _dbd_internal_error_handler */
@@ -23,7 +23,7 @@ index 2a24764..9f57d85 100644
return (char *) db;
}
--int dbd_geterror(dbi_conn_t * conn, int *errno, char **errstr)
+-int dbd_geterror(dbi_conn_t * conn, int *errno, char **errstr)
+int dbd_geterror(dbi_conn_t * conn, int *err_no, char **errstr)
{
/* put error number into errno, error string into errstr
@@ -69,7 +69,7 @@ index 7d06f62..237506c 100644
if (strcmp("",mysql_error((MYSQL *)conn->connection)) == 0) {
return -1;
}
-
+
- *errno = mysql_errno((MYSQL *)conn->connection);
+ *err_no = mysql_errno((MYSQL *)conn->connection);
*errstr = strdup(mysql_error((MYSQL *)conn->connection));
@@ -83,7 +83,7 @@ index 1f38094..d220a9e 100755
return NULL; /* Oracle can't do that .... */
}
--int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr)
+-int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr)
+int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr)
{
char errbuf[1024];
@@ -101,7 +101,7 @@ index 1f38094..d220a9e 100755
- *errno = errcode;
+ *err_no = errcode;
}
-
+
return 3;
diff --git a/drivers/pgsql/dbd_pgsql.c b/drivers/pgsql/dbd_pgsql.c
index 0433550..c097dac 100644
@@ -117,17 +117,17 @@ index 0433550..c097dac 100644
+int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr) {
+ /* put error number into err_no, error string into errstr
+ * return 0 if error, 1 if err_no filled, 2 if errstr filled, 3 if both err_no and errstr filled */
-
+
- *errno = 0;
+ *err_no = 0;
*errstr = strdup(PQerrorMessage((PGconn *)conn->connection));
-
+
return 2;
diff --git a/drivers/sqlite/dbd_sqlite.c b/drivers/sqlite/dbd_sqlite.c
index 94dacc0..aeadfa5 100644
--- a/drivers/sqlite/dbd_sqlite.c
+++ b/drivers/sqlite/dbd_sqlite.c
-@@ -913,13 +913,13 @@ const char *dbd_select_db(dbi_conn_t *conn, const char *db) {
+@@ -911,13 +911,13 @@ const char *dbd_select_db(dbi_conn_t *conn, const char *db) {
return db;
}
commit 2f51429d0b5936bee77f7ea64ec7661a3b660486
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Apr 28 20:39:21 2014 +0200
First batch of buildserver fixes for new mingw environment
diff --git a/buildserver/build_package.sh b/buildserver/build_package.sh
index 9ca857e..774b70b 100644
--- a/buildserver/build_package.sh
+++ b/buildserver/build_package.sh
@@ -22,8 +22,8 @@ function on_error() {
function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
-. functions.sh
-. defaults.sh
+. ../functions.sh
+. ../defaults.sh
tag="${1:-$GNUCASH_SCM_REV}"
@@ -65,7 +65,8 @@ set +e
trap on_error ERR
# Run the compile
-./install.sh 2>&1 | tee ${LOGFILE}
+_GC_WIN_REPOS_UDIR=`unix_path $GC_WIN_REPOS_DIR`
+$_GC_WIN_REPOS_UDIR/install.sh 2>&1 | tee ${LOGFILE}
# This directory needs to be removed before calling dist.sh
DIST_DIR=${INSTALL_DIR}\\..\\dist
@@ -73,7 +74,7 @@ _DIST_UDIR=`unix_path $DIST_DIR`
rm -rf ${_DIST_UDIR}
# Create the installer
-./dist.sh 2>&1 | tee -a ${LOGFILE}
+$_GC_WIN_REPOS_UDIR/dist.sh 2>&1 | tee -a ${LOGFILE}
# Copy the resulting installer into the output directory
_BUILD_UDIR=`unix_path $BUILD_DIR`
diff --git a/buildserver/daily_build.bat b/buildserver/daily_build.bat
index c38bec7..bf81a7d 100644
--- a/buildserver/daily_build.bat
+++ b/buildserver/daily_build.bat
@@ -2,12 +2,11 @@ rem This is the Windows Batch Script for the daily builds.
rem It simply calls the actual MSYS Shell script to perform
rem the daily build and then the tag builds.
-cd c:\soft\gnucash\repos\packaging\win32\
+cd c:\gcdev\gnucash-on-windows.git\
rem Development build (daily)
-c:\msys\1.0\bin\sh.exe --login c:\soft\gnucash\repos\packaging\win32\daily_build.sh
-rem Tags build for 2.5 and newer (daily -- only tags that weren't built yet)
-c:\msys\1.0\bin\sh.exe --login c:\soft\gnucash\repos\packaging\win32\build_tags.sh
+c:\gcdev\mingw\msys\1.0\bin\sh.exe --login c:\gcdev\gnucash-on-windows.git\buildserver\daily_build.sh
+rem Tags build for 2.6.99 and newer (daily -- only tags that weren't built yet)
+c:\gcdev\mingw\msys\1.0\bin\sh.exe --login c:\gcdev\gnucash-on-windows.git\buildserver\build_tags.sh
rem maintenance branch build (weekly)
-rem There's no 2.6 branch yet. Hence the line below is commented out
-rem c:\msys\1.0\bin\sh.exe --login c:\soft-maint\gnucash\repos\packaging\weekly_build.sh
\ No newline at end of file
+rem c:\gcdev-maint\mingw\msys\1.0\bin\sh.exe --login c:\gcdev-maint\gnucash-on-windows.git\buildserver\weekly_build.sh
\ No newline at end of file
diff --git a/buildserver/daily_build.sh b/buildserver/daily_build.sh
index e1e8f83..49cd838 100644
--- a/buildserver/daily_build.sh
+++ b/buildserver/daily_build.sh
@@ -3,8 +3,8 @@
# Notes:
# 1. for this script to work, git must have been setup before
# in a way that doesn't conflict with the GnuCash build.
-# The easiest way to do so is to run the build once manually
-# with a properly set up custom.sh.
+# If you set up the build environment using the bootstrap script
+# this should have been taken care of automatically.
#
# 2. Should this script change in the source repository, then the
# git pull below will fail due to a limitation in Windows that
@@ -19,15 +19,25 @@ function qpopd() { popd >/dev/null; }
function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
qpushd "$(dirname $(unix_path "$0"))"
-. functions.sh
-. defaults.sh
+. ../functions.sh
+. ../defaults.sh
# Variables
_GIT_UDIR=`unix_path $GIT_DIR`
set_env "$_GIT_UDIR/bin/git" GIT_CMD
export GIT_CMD
+# Update the gnucash-on-windows build scripts
+_GC_WIN_REPOS_UDIR=`unix_path $GC_WIN_REPOS_DIR`
+qpushd "$_GC_WIN_REPOS_UDIR"
$GIT_CMD pull
+qpopd
+
+# Update the gnucash repository
+_REPOS_UDIR=`unix_path $REPOS_DIR`
+qpushd "$_REPOS_UDIR"
+$GIT_CMD pull
+qpopd
################################################################
# determine if there are any new commits since the last time we ran
diff --git a/buildserver/weekly_build.sh b/buildserver/weekly_build.sh
index 16ca9ce..787b590 100644
--- a/buildserver/weekly_build.sh
+++ b/buildserver/weekly_build.sh
@@ -3,8 +3,8 @@
# Notes:
# 1. for this script to work, git must have been setup before
# in a way that doesn't conflict with the GnuCash build.
-# The easiest way to do so is to run the build once manually
-# with a properly set up custom.sh.
+# If you set up the build environment using the bootstrap script
+# this should have been taken care of automatically.
#
# 2. Should this script change in the source repository, then the
# git pull below will fail due to a limitation in Windows that
@@ -30,7 +30,17 @@ _GIT_UDIR=`unix_path $GIT_DIR`
set_env "$_GIT_UDIR/bin/git" GIT_CMD
export $GIT_CMD
+# Update the gnucash-on-windows build scripts
+_GC_WIN_REPOS_UDIR=`unix_path $GC_WIN_REPOS_DIR`
+qpushd "$_GC_WIN_REPOS_UDIR"
$GIT_CMD pull
+qpopd
+
+# Update the gnucash repository
+_REPOS_UDIR=`unix_path $REPOS_DIR`
+qpushd "$_REPOS_UDIR"
+$GIT_CMD pull
+qpopd
################################################################
# determine if there are any new commits since the last time we ran
commit 4ab6f4450caf8c47c124ab570fecaeeba41531f6
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Apr 28 20:25:20 2014 +0200
Match defaults in defaults.sh with parameters chosen in bootstrap script
diff --git a/bootstrap_win_dev.vbs b/bootstrap_win_dev.vbs
index d98223c..6374bfb 100644
--- a/bootstrap_win_dev.vbs
+++ b/bootstrap_win_dev.vbs
@@ -254,7 +254,7 @@ Else
strTmpDir = myRegExp.Replace (TMP_DIR, "\\")
strDownloadDir = myRegExp.Replace (DOWNLOAD_DIR, "\\")
strGitDir = myRegExp.Replace (GIT_DIR, "\\")
- strGCWinReposDir = myRegExp.Replace (REPOS_DIR, "\\")
+ strGCWinReposDir = myRegExp.Replace (GC_WIN_REPOS_DIR, "\\")
strReposDir = myRegExp.Replace (REPOS_DIR, "\\")
Set objCustomSh = objFso.OpenTextFile( strCustomSh, ForWriting, True )
diff --git a/defaults.sh b/defaults.sh
index 39f3e12..90fa1d2 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -29,16 +29,16 @@ if [ -z "$BUILD_FROM_TARBALL" ]; then
fi
fi
+set_default GC_WIN_REPOS_DIR $GLOBAL_DIR\\gnucash-on-windows.git
+set_default REPOS_DIR $GLOBAL_DIR\\gnucash.git
if [ "$BUILD_FROM_TARBALL" = "yes" ]; then
- set_default GNUCASH_DIR "$(wpwd ..\\..)"
- set_default REPOS_DIR $GNUCASH_DIR
+ set_default GNUCASH_DIR $REPOS_DIR
# keep this pointing from BUILD_DIR to REPOS_DIR
set_default REL_REPOS_DIR ..
else
set_default GNUCASH_DIR $GLOBAL_DIR\\gnucash
- set_default REPOS_DIR $GNUCASH_DIR\\repos
# keep this pointing from BUILD_DIR to REPOS_DIR
- set_default REL_REPOS_DIR ..\\repos
+ set_default REL_REPOS_DIR ..\\..\\gnucash.git
set_default REPOS_TYPE "git"
if [ "$REPOS_TYPE" = "git" ]; then
@@ -64,7 +64,8 @@ set_default CROSS_COMPILE "no"
# If "yes", build without optimizations (-O0) and ease debugging
set_default DISABLE_OPTIMIZATIONS no
-set_default MSYS_DIR $GLOBAL_DIR\\msys
+set_default MINGW_DIR $GLOBAL_DIR\\mingw
+set_default MSYS_DIR $MINGW_DIR\\msys
# tools here means binaries runnable without other DLLs or data files
set_default TOOLS_DIR $GLOBAL_DIR\\tools
@@ -80,7 +81,6 @@ set_default GNOME_MIRROR "ftp.gnome.org/pub/gnome"
set_default GNOME_WIN32_URL "$GNOME_MIRROR/binaries/win32"
set_default GNOME_WIN32_DEPS_URL "$GNOME_WIN32_URL/dependencies"
-set_default MINGW_DIR $GLOBAL_DIR\\mingw
# Mingw toolchain
commit 73c130ac1e0e62d0e1dccfa17eaa2cfbaf1a1373
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Apr 28 20:16:05 2014 +0200
Fix libdbi patch
git stripped the relevant whitespace at some point
diff --git a/libdbi-0.8.3.patch b/libdbi-0.8.3.patch
index fefa5b1..5291902 100644
--- a/libdbi-0.8.3.patch
+++ b/libdbi-0.8.3.patch
@@ -22,9 +22,9 @@ diff -Nur libdbi-0.8.3-old/include/dbi/dbd.h libdbi-0.8.3/include/dbi/dbd.h
--- libdbi-0.8.3/src/dbd_helper.c.orig Sun Sep 13 16:34:39 2009
+++ libdbi-0.8.3/src/dbd_helper.c Sun Sep 13 16:35:02 2009
@@ -145,7 +145,7 @@
- return len;
+ return len;
}
-
+
-void _dbd_internal_error_handler(dbi_conn_t *conn, const char *errmsg, const int errno) {
+void _dbd_internal_error_handler(dbi_conn_t *conn, const char *errmsg, const int err_no) {
int my_errno = DBI_ERROR_NONE;
@@ -33,12 +33,12 @@ diff -Nur libdbi-0.8.3-old/include/dbi/dbd.h libdbi-0.8.3/include/dbi/dbd.h
@@ -154,7 +154,7 @@
free(conn->error_message);
}
-
+
- if (errno == DBI_ERROR_DBD) {
+ if (err_no == DBI_ERROR_DBD) {
/* translate into a client-library specific error number */
errstatus = conn->driver->functions->geterror(conn, &my_errno, &my_errmsg);
-
+
@@ -171,8 +171,8 @@
}
}
@@ -48,7 +48,7 @@ diff -Nur libdbi-0.8.3-old/include/dbi/dbd.h libdbi-0.8.3/include/dbi/dbd.h
+ conn->error_flag = err_no; /* legacy code may rely on this */
+ conn->error_number = err_no;
conn->error_message = strdup(errmsg);
-
+
if (conn->error_handler != NULL) {
@@ -181,7 +181,7 @@
}
@@ -57,5 +57,5 @@ diff -Nur libdbi-0.8.3-old/include/dbi/dbd.h libdbi-0.8.3/include/dbi/dbd.h
- _error_handler(conn, errno);
+ _error_handler(conn, err_no);
}
-
+
}
commit 4e918be385efba70c732e3d09a8e80af0c01bfb8
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Apr 28 19:13:40 2014 +0200
Reorganization: move build server scripts in separate directory
diff --git a/build_package.sh b/buildserver/build_package.sh
similarity index 100%
rename from build_package.sh
rename to buildserver/build_package.sh
diff --git a/build_tags.sh b/buildserver/build_tags.sh
similarity index 100%
rename from build_tags.sh
rename to buildserver/build_tags.sh
diff --git a/daily_build.bat b/buildserver/daily_build.bat
similarity index 100%
rename from daily_build.bat
rename to buildserver/daily_build.bat
diff --git a/daily_build.sh b/buildserver/daily_build.sh
similarity index 100%
rename from daily_build.sh
rename to buildserver/daily_build.sh
diff --git a/weekly_build.sh b/buildserver/weekly_build.sh
similarity index 100%
rename from weekly_build.sh
rename to buildserver/weekly_build.sh
commit 0763c1ee740a93d3661a643dcaf09ca6cf7081e0
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat Apr 26 22:07:42 2014 +0200
Win32: fix guile dist
diff --git a/dist-impl.sh b/dist-impl.sh
index f1ef2f3..0c7aa02 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -148,7 +148,7 @@ function dist_goffice() {
function dist_guile() {
setup Guile
mkdir -p $DIST_UDIR/bin
- cp -a $_GUILE_UDIR/bin/libguile{.,-srfi}*dll $DIST_UDIR/bin
+ cp -a $_GUILE_UDIR/bin/libguile*.dll $DIST_UDIR/bin
cp -a $_GUILE_UDIR/bin/guile.exe $DIST_UDIR/bin
mkdir -p $DIST_UDIR/share
cp -a $_GUILE_UDIR/share/guile $DIST_UDIR/share
commit 2d631de157c32ad66067fd7cd4907310ab63e165
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat Apr 26 22:58:23 2014 +0200
Win32: clean up mingw-get's installation cache for each dist run
diff --git a/dist-impl.sh b/dist-impl.sh
index 2900428..f1ef2f3 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -60,6 +60,7 @@ function dist_mingw() {
cp -a $_MINGW_UDIR/libexec/mingw-get/ $MINGWGET_DIST_UDIR/libexec/
cp -a $_MINGW_UDIR/var/lib/mingw-get/data/defaults.xml $MINGWGET_DIST_UDIR/var/lib/mingw-get/data/profile.xml
perl -pi.bak -e 's!.*subsystem="mingw32".*! <sysroot subsystem="mingw32" path="%R/../dist" />!' $MINGWGET_DIST_UDIR/var/lib/mingw-get/data/profile.xml
+ rm -f $MINGWGET_DIST_UDIR/var/lib/mingw-get/data/{manifest,sysroot}*
configure_msys "$_PID" "$_MINGW_WFSDIR"
commit d42a788b117a5bf8b376eea07185a332c5600887
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat Apr 26 21:45:27 2014 +0200
Win32: update dist script for the new mingw environment
diff --git a/dist-impl.sh b/dist-impl.sh
index 0a9b3d9..2900428 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -47,7 +47,32 @@ function dist_prepare() {
add_to_env $_EXETYPE_UDIR/bin PATH # exetype
_PID=$$
+}
+
+function dist_mingw() {
+ setup mingw
+
+ # Prepare mingw-get to install to alternative location
+ MINGWGET_DIST_DIR=${INSTALL_DIR}\\..\\mingw-get-dist
+ MINGWGET_DIST_UDIR=`unix_path $MINGWGET_DIST_DIR`
+ mkdir -p $MINGWGET_DIST_UDIR/{bin,libexec,var/lib/mingw-get/data}
+ cp $_MINGW_UDIR/bin/mingw-get.exe $MINGWGET_DIST_UDIR/bin/
+ cp -a $_MINGW_UDIR/libexec/mingw-get/ $MINGWGET_DIST_UDIR/libexec/
+ cp -a $_MINGW_UDIR/var/lib/mingw-get/data/defaults.xml $MINGWGET_DIST_UDIR/var/lib/mingw-get/data/profile.xml
+ perl -pi.bak -e 's!.*subsystem="mingw32".*! <sysroot subsystem="mingw32" path="%R/../dist" />!' $MINGWGET_DIST_UDIR/var/lib/mingw-get/data/profile.xml
+
configure_msys "$_PID" "$_MINGW_WFSDIR"
+
+ add_to_env $_MINGW_UDIR/bin PATH
+ add_to_env $MINGWGET_DIST_UDIR/bin/ PATH
+
+ mingw_smart_get mingw32-libgmp-dll ${MINGW_GMP_VERSION}
+ mingw_smart_get mingw32-libpthread-dll ${MINGW_PTHREAD_W32_VERSION}
+ mingw_smart_get mingw32-libz-dll ${MINGW_ZLIB_VERSION}
+ mingw_smart_get mingw32-libgcc-dll ${MINGW_GCC_VERSION}
+ mingw_smart_get mingw32-libiconv-dll ${MINGW_LIBICONV_VERSION}
+ mingw_smart_get mingw32-libintl-dll ${MINGW_GETTEXT_VERSION}
+ mingw_smart_get mingw32-libltdl-dll ${MINGW_LIBLTDL_VERSION}
}
function dist_aqbanking() {
diff --git a/dist.sh b/dist.sh
index 1ad7f55..61cf7ad 100755
--- a/dist.sh
+++ b/dist.sh
@@ -25,6 +25,7 @@ register_env_var PATH ":"
# steps
add_step dist_prepare
+add_step dist_mingw
add_step dist_regex
add_step dist_guile
add_step dist_gnome
diff --git a/functions.sh b/functions.sh
index dd8e99d..83800a6 100644
--- a/functions.sh
+++ b/functions.sh
@@ -245,6 +245,10 @@ function mingw_smart_get () {
# can return without a result. Grep exists with a non-zero
# exit value in that case, which will cause the script to
# abort (due to set -e being set). Awk does not.
+ # Note: mingw-get is deliberately called without a fixed path
+ # this allows the install and dist scripts to use
+ # different versions of the tool (or more precisely different
+ # configurations for the tool).
COMPONENTS="$(mingw-get show "$PACKAGE" | awk '/Components:/')"
if [ -n "$COMPONENTS" ]
@@ -279,15 +283,15 @@ function mingw_smart_get () {
elif [ "$INSTVERSION" == "none" ]
then
# Package not yet installed
- $_MINGW_UDIR/bin/mingw-get install ${PACKAGE}
+ mingw-get install ${PACKAGE}
elif [ -n "$VERSION" ] && [ -z "$(echo "$INSTVERSION" | awk "/$VERSION/")" ]
then
# Requested version differs from installed version
- $_MINGW_UDIR/bin/mingw-get upgrade ${PACKAGE}
+ mingw-get upgrade ${PACKAGE}
elif [ -z "$VERSION" ] && [ "$INSTVERSION" != "$REPOVERSION" ]
then
# No version requested, but installed version differs from version in repo
- $_MINGW_UDIR/bin/mingw-get upgrade ${PACKAGE}
+ mingw-get upgrade ${PACKAGE}
else
echo "Package $PACKAGE is up to date"
fi
commit 01f97b41e049819c2539581c6ba0c49e63312af9
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat Jan 18 19:48:27 2014 +0100
Win32: use absolute path to configure script
diff --git a/install-impl.sh b/install-impl.sh
index 9b8438f..7c51a17 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1204,7 +1204,7 @@ function inst_gnucash() {
_INSTALL_WFSDIR=`win_fs_path $INSTALL_DIR`
_INSTALL_UDIR=`unix_path $INSTALL_DIR`
_BUILD_UDIR=`unix_path $BUILD_DIR`
- _REL_REPOS_UDIR=`unix_path $REL_REPOS_DIR`
+ _REPOS_UDIR=`unix_path $REPOS_DIR`
mkdir -p $_BUILD_UDIR
add_to_env $_INSTALL_UDIR/bin PATH
@@ -1219,7 +1219,7 @@ function inst_gnucash() {
fi
qpushd $_BUILD_UDIR
- $_REL_REPOS_UDIR/configure ${HOST_XCOMPILE} \
+ $_REPOS_UDIR/configure ${HOST_XCOMPILE} \
--prefix=$_INSTALL_WFSDIR \
--enable-debug \
--enable-schemas-install=no \
commit 3cba7acac534bfea3593b45a996bff0f01427715
Author: Gary Bilkus <mail at gary.bilkus.com>
Date: Fri Jan 17 13:52:19 2014 +0000
Win32: Add missing install directories to gnucash-launcher.cmd
diff --git a/install-impl.sh b/install-impl.sh
index 9fe6af3..9b8438f 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1321,7 +1321,13 @@ set PATH=$SQLITE3_DIR\\bin;%PATH%
set PATH=$MYSQL_LIB_DIR\\lib;%PATH%
set PATH=$PGSQL_DIR\\bin;%PATH%
set PATH=$PGSQL_DIR\\lib;%PATH%
-
+set PATH=$ENCHANT_DIR\\bin;%PATH%
+set PATH=$ENCHANT_DIR\\lib;%PATH%
+set PATH=$LIBSOUP_DIR\\bin;%PATH%
+set PATH=$LIBSOUP_DIR\\lib;%PATH%
+set PATH=$LIBXSLT_DIR\\bin;%PATH%
+set PATH=$LIBXSLT_DIR\\lib;%PATH%
+
set LTDL_LIBRARY_PATH=${INSTALL_DIR}\\lib
start gnucash %*
commit af239186252b88d6256fec0353d224cce79393de
Author: Gary Bilkus <mail at gary.bilkus.com>
Date: Fri Jan 17 13:20:45 2014 +0000
Win32: Download patch program as part of initial bootstrap
diff --git a/bootstrap_win_dev.vbs b/bootstrap_win_dev.vbs
index 802cd00..d98223c 100644
--- a/bootstrap_win_dev.vbs
+++ b/bootstrap_win_dev.vbs
@@ -124,7 +124,7 @@ End If
stdout.Write "Installing msys and wget... "
strMingwGet = MINGW_DIR & "\bin\mingw-get.exe"
-objWsh.Run strMingwGet & " install mingw-get msys-base msys-wget", 1, True
+objWsh.Run strMingwGet & " install mingw-get msys-base msys-wget msys-patch", 1, True
'Set objExec = objWsh.Exec (strMingwGet & " install msys-base msys-wget")
strWget = MINGW_DIR & "\msys\1.0\bin\wget.exe"
commit 5ffcc6db5365a913bd488acb15fb896439ac48b5
Author: Gary Bilkus <mail at gary.bilkus.com>
Date: Tue Dec 24 11:36:58 2013 +0100
Win32: add code to extract XZ compressed archives
Patch by Gary Bilkus
diff --git a/functions.sh b/functions.sh
index 27a3354..dd8e99d 100644
--- a/functions.sh
+++ b/functions.sh
@@ -89,6 +89,10 @@ function wget_unpacked() {
tar -xjpf $LAST_FILE -C $_EXTRACT_UDIR
_PACK_DIR=$(tar -jtf $LAST_FILE 2>/dev/null | head -1)
;;
+ *.tar.xz)
+ tar -xJpf $LAST_FILE -C $_EXTRACT_UDIR
+ _PACK_DIR=$(tar -Jtf $LAST_FILE 2>/dev/null | head -1)
+ ;;
*.tar.lzma)
lzma -dc $LAST_FILE |tar xpf - -C $_EXTRACT_UDIR
_PACK_DIR=$(lzma -dc $LAST_FILE |tar -tf - 2>/dev/null | head -1)
commit 699653c42460200b729b94e43ce722940bd519a5
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Dec 24 11:31:26 2013 +0100
Win32: update isocodes package version
diff --git a/defaults.sh b/defaults.sh
index f189066..39f3e12 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -390,7 +390,7 @@ set_default UPDATE_DOCS yes
set_default DOCS_DIR $GLOBAL_DIR\\gnucash-docs
set_default XSLTPROCFLAGS ""
-set_default ISOCODES_URL "http://pkg-isocodes.alioth.debian.org/downloads/iso-codes-3.34.tar.bz2"
+set_default ISOCODES_URL "http://pkg-isocodes.alioth.debian.org/downloads/iso-codes-3.49.tar.xz"
set_default ISOCODES_DIR $GLOBAL_DIR\\isocodes
### Local Variables: ***
commit 9afca00f629f6c836a40b360a14badb004968d8a
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri Nov 15 17:58:55 2013 +0100
Win32: fix libdbi build in new mingw environment
diff --git a/defaults.sh b/defaults.sh
index 5221f7b..f189066 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -366,16 +366,12 @@ set_default MYSQL_LIB_DIR $GLOBAL_DIR\\mysql
set_default LIBMYSQL_DEF `pwd`/libmysql.def
set_default PGSQL_LIB_URL "$SF_MIRROR/gnucash/pgsql-win32-2.tar.gz"
set_default PGSQL_DIR $GLOBAL_DIR\\pgsql
-set_default LIBDBI_URL "$SF_MIRROR/libdbi/libdbi-0.8.3.tar.gz"
+set_default LIBDBI_URL "$SF_MIRROR/libdbi/libdbi-0.8.4.tar.gz"
set_default LIBDBI_DIR $GLOBAL_DIR\\libdbi
set_default LIBDBI_PATCH `pwd`/libdbi-0.8.3.patch
-set_default LIBDBI_PATCH2 `pwd`/libdbi-dbd_helper.c.patch
set_default LIBDBI_DRIVERS_URL "$SF_MIRROR/libdbi-drivers/libdbi-drivers-0.8.3-1.tar.gz"
set_default LIBDBI_DRIVERS_DIR $GLOBAL_DIR\\libdbi-drivers
-set_default LIBDBI_DRIVERS_PATCH `pwd`/libdbi-drivers-dbd_sqlite3.c.patch
-set_default LIBDBI_DRIVERS_PATCH2 `pwd`/libdbi-drivers-Makefile.in.patch
-set_default LIBDBI_DRIVERS_PATCH3 `pwd`/libdbi-drivers-dbd_mysql.c.patch
-set_default LIBDBI_DRIVERS_PATCH4 `pwd`/libdbi-drivers-dbd_pgsql.c.patch
+set_default LIBDBI_DRIVERS_PATCH `pwd`/libdbi-drivers-errno.patch
set_default CMAKE_URL "http://www.cmake.org/files/v2.8/cmake-2.8.0-win32-x86.zip"
set_default CMAKE_DIR $GLOBAL_DIR\\cmake
diff --git a/install-impl.sh b/install-impl.sh
index ef48a51..9fe6af3 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -700,6 +700,7 @@ function inst_libdbi() {
wget_unpacked $SQLITE3_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/sqlite-*
qpushd $TMP_UDIR/sqlite-*
+ autoreconf -if
./configure ${HOST_XCOMPILE} \
--prefix=${_SQLITE3_UDIR}
make
@@ -734,7 +735,7 @@ function inst_libdbi() {
rm -rf ${TMP_UDIR}/pgsql*
test -f ${_PGSQL_UDIR}/lib/libpq.dll || die "libpq not installed correctly"
fi
- if test -f ${_LIBDBI_UDIR}/bin/libdbi-0.dll
+ if test -f ${_LIBDBI_UDIR}/bin/libdbi-1.dll
then
echo "libdbi already installed in $_LIBDBI_UDIR. skipping."
else
@@ -743,10 +744,6 @@ function inst_libdbi() {
qpushd $TMP_UDIR/libdbi-0*
if [ -n "$LIBDBI_PATCH" -a -f "$LIBDBI_PATCH" ]; then
patch -p1 < $LIBDBI_PATCH
- ./autogen.sh
- fi
- if [ -n "$LIBDBI_PATCH2" -a -f "$LIBDBI_PATCH2" ]; then
- patch -p1 < $LIBDBI_PATCH2
fi
if [ "$CROSS_COMPILE" = "yes" ]; then
rm ltmain.sh aclocal.m4
@@ -765,11 +762,11 @@ function inst_libdbi() {
qpushd ${_LIBDBI_UDIR}
if [ x"$(which pexports.exe > /dev/null 2>&1)" != x ]
then
- pexports bin/libdbi-0.dll > lib/libdbi.def
- ${DLLTOOL} -d lib/libdbi.def -D bin/libdbi-0.dll -l lib/libdbi.lib
+ pexports bin/libdbi-1.dll > lib/libdbi.def
+ ${DLLTOOL} -d lib/libdbi.def -D bin/libdbi-1.dll -l lib/libdbi.lib
fi
qpopd
- test -f ${_LIBDBI_UDIR}/bin/libdbi-0.dll || die "libdbi not installed correctly"
+ test -f ${_LIBDBI_UDIR}/bin/libdbi-1.dll || die "libdbi not installed correctly"
rm -rf ${TMP_UDIR}/libdbi-0*
fi
if test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdsqlite3.dll -a \
@@ -782,14 +779,8 @@ function inst_libdbi() {
assert_one_dir $TMP_UDIR/libdbi-drivers-*
qpushd $TMP_UDIR/libdbi-drivers*
[ -n "$LIBDBI_DRIVERS_PATCH" -a -f "$LIBDBI_DRIVERS_PATCH" ] && \
- patch -p0 < $LIBDBI_DRIVERS_PATCH
- [ -n "$LIBDBI_DRIVERS_PATCH2" -a -f "$LIBDBI_DRIVERS_PATCH2" ] && \
- patch -p0 < $LIBDBI_DRIVERS_PATCH2
- [ -n "$LIBDBI_DRIVERS_PATCH3" -a -f "$LIBDBI_DRIVERS_PATCH3" ] && \
- patch -p0 < $LIBDBI_DRIVERS_PATCH3
- [ -n "$LIBDBI_DRIVERS_PATCH4" -a -f "$LIBDBI_DRIVERS_PATCH4" ] && \
- patch -p0 < $LIBDBI_DRIVERS_PATCH4
- LDFLAGS=-no-undefined ./configure ${HOST_XCOMPILE} \
+ patch -p1 < $LIBDBI_DRIVERS_PATCH
+ ./configure ${HOST_XCOMPILE} \
--disable-docs \
--with-dbi-incdir=${_LIBDBI_UDIR}/include \
--with-dbi-libdir=${_LIBDBI_UDIR}/lib \
@@ -800,7 +791,7 @@ function inst_libdbi() {
--with-pgsql \
--with-pgsql-dir=${_PGSQL_UDIR} \
--prefix=${_LIBDBI_DRIVERS_UDIR}
- make
+ make LDFLAGS="$LDFLAGS -no-undefined"
make install
qpopd
test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdsqlite3.dll || die "libdbi sqlite3 driver not installed correctly"
diff --git a/libdbi-0.8.3.patch b/libdbi-0.8.3.patch
index 8f982ae..fefa5b1 100644
--- a/libdbi-0.8.3.patch
+++ b/libdbi-0.8.3.patch
@@ -1,14 +1,3 @@
-diff -Nur libdbi-0.8.3-old/configure.in libdbi-0.8.3/configure.in
---- libdbi-0.8.3-old/configure.in 2008-02-06 17:03:27.000000000 +0100
-+++ libdbi-0.8.3/configure.in 2008-10-05 15:56:55.677983028 +0200
-@@ -26,6 +26,7 @@
- AC_PROG_CPP
- AC_PROG_LD
- AC_PROG_INSTALL
-+AC_LIBTOOL_WIN32_DLL
- AC_PROG_LIBTOOL
- AC_SUBST(LIBTOOL)
- dnl ====================================
diff -Nur libdbi-0.8.3-old/include/dbi/dbd.h libdbi-0.8.3/include/dbi/dbd.h
--- libdbi-0.8.3-old/include/dbi/dbd.h 2005-08-15 21:18:18.000000000 +0200
+++ libdbi-0.8.3/include/dbi/dbd.h 2008-10-05 15:57:24.889982668 +0200
@@ -30,3 +19,43 @@ diff -Nur libdbi-0.8.3-old/include/dbi/dbd.h libdbi-0.8.3/include/dbi/dbd.h
dbi_result_t *_dbd_result_create_from_stringarray(dbi_conn_t *conn, unsigned long long numrows_matched, const char **stringarray);
void _dbd_register_driver_cap(dbi_driver_t *driver, const char *capname, int value);
void _dbd_register_conn_cap(dbi_conn_t *conn, const char *capname, int value);
+--- libdbi-0.8.3/src/dbd_helper.c.orig Sun Sep 13 16:34:39 2009
++++ libdbi-0.8.3/src/dbd_helper.c Sun Sep 13 16:35:02 2009
+@@ -145,7 +145,7 @@
+ return len;
+ }
+
+-void _dbd_internal_error_handler(dbi_conn_t *conn, const char *errmsg, const int errno) {
++void _dbd_internal_error_handler(dbi_conn_t *conn, const char *errmsg, const int err_no) {
+ int my_errno = DBI_ERROR_NONE;
+ int errstatus;
+ char *my_errmsg = NULL;
+@@ -154,7 +154,7 @@
+ free(conn->error_message);
+ }
+
+- if (errno == DBI_ERROR_DBD) {
++ if (err_no == DBI_ERROR_DBD) {
+ /* translate into a client-library specific error number */
+ errstatus = conn->driver->functions->geterror(conn, &my_errno, &my_errmsg);
+
+@@ -171,8 +171,8 @@
+ }
+ }
+ else if (errmsg) {
+- conn->error_flag = errno; /* legacy code may rely on this */
+- conn->error_number = errno;
++ conn->error_flag = err_no; /* legacy code may rely on this */
++ conn->error_number = err_no;
+ conn->error_message = strdup(errmsg);
+
+ if (conn->error_handler != NULL) {
+@@ -181,7 +181,7 @@
+ }
+ else {
+ /* pass internal errors to the internal libdbi handler */
+- _error_handler(conn, errno);
++ _error_handler(conn, err_no);
+ }
+
+ }
diff --git a/libdbi-dbd_helper.c.patch b/libdbi-dbd_helper.c.patch
deleted file mode 100644
index 439a293..0000000
--- a/libdbi-dbd_helper.c.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- libdbi-0.8.3/src/dbd_helper.c.orig Sun Sep 13 16:34:39 2009
-+++ libdbi-0.8.3/src/dbd_helper.c Sun Sep 13 16:35:02 2009
-@@ -145,7 +145,7 @@
- return len;
- }
-
--void _dbd_internal_error_handler(dbi_conn_t *conn, const char *errmsg, const int errno) {
-+void _dbd_internal_error_handler(dbi_conn_t *conn, const char *errmsg, const int err_no) {
- int my_errno = DBI_ERROR_NONE;
- int errstatus;
- char *my_errmsg = NULL;
-@@ -154,7 +154,7 @@
- free(conn->error_message);
- }
-
-- if (errno == DBI_ERROR_DBD) {
-+ if (err_no == DBI_ERROR_DBD) {
- /* translate into a client-library specific error number */
- errstatus = conn->driver->functions->geterror(conn, &my_errno, &my_errmsg);
-
-@@ -171,8 +171,8 @@
- }
- }
- else if (errmsg) {
-- conn->error_flag = errno; /* legacy code may rely on this */
-- conn->error_number = errno;
-+ conn->error_flag = err_no; /* legacy code may rely on this */
-+ conn->error_number = err_no;
- conn->error_message = strdup(errmsg);
-
- if (conn->error_handler != NULL) {
-@@ -181,7 +181,7 @@
- }
- else {
- /* pass internal errors to the internal libdbi handler */
-- _error_handler(conn, errno);
-+ _error_handler(conn, err_no);
- }
-
- }
diff --git a/libdbi-drivers-Makefile.in.patch b/libdbi-drivers-Makefile.in.patch
deleted file mode 100644
index 0ed49ab..0000000
--- a/libdbi-drivers-Makefile.in.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- drivers/sqlite3/Makefile.in.save Mon Mar 3 12:41:56 2008
-+++ drivers/sqlite3/Makefile.in Sat Aug 16 17:10:11 2008
-@@ -264,7 +264,7 @@
- @HAVE_SQLITE3_TRUE at sqlite3_sources = dbd_sqlite3.c
- INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include @DBI_INCLUDE@ @SQLITE3_INCLUDE@
- lib_LTLIBRARIES = $(sqlite3_ltlibs)
--libdbdsqlite3_la_LDFLAGS = $(sqlite3_ldflags) @SQLITE3_LDFLAGS@ @SQLITE3_LIBS@ @LIBADD_LIBDBI@
-+libdbdsqlite3_la_LDFLAGS = $(sqlite3_ldflags) @SQLITE3_LDFLAGS@ @SQLITE3_LIBS@ @LIBADD_LIBDBI@ -no-undefined
- libdbdsqlite3_la_SOURCES = $(sqlite3_sources)
- libdbdsqlite3_la_DEPENDENCIES = dbd_sqlite3.h
- EXTRA_DIST = dbd_sqlite3.c dbd_sqlite3.h AUTHORS TODO README dbd_sqlite3.sgml dbd_sqlite3.pdf dbd_sqlite3/*
diff --git a/libdbi-drivers-dbd_mysql.c.patch b/libdbi-drivers-dbd_mysql.c.patch
deleted file mode 100644
index a8636fe..0000000
--- a/libdbi-drivers-dbd_mysql.c.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: dbd_mysql.c
-===================================================================
-RCS file: /cvsroot/libdbi-drivers/libdbi-drivers/drivers/mysql/dbd_mysql.c,v
-retrieving revision 1.31
-diff -u -r1.31 dbd_mysql.c
---- drivers/mysql/dbd_mysql.c 13 Aug 2008 22:56:03 -0000 1.31
-+++ drivers/mysql/dbd_mysql.c 16 Aug 2008 20:23:23 -0000
-@@ -553,15 +553,15 @@
- return db;
- }
-
--int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr) {
-- /* put error number into errno, error string into errstr
-- * return 0 if error, 1 if errno filled, 2 if errstr filled, 3 if both errno and errstr filled */
-+int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr) {
-+ /* put error number into err_no, error string into errstr
-+ * return 0 if error, 1 if err_no filled, 2 if errstr filled, 3 if both err_no and errstr filled */
-
- if (strcmp("",mysql_error((MYSQL *)conn->connection)) == 0) {
- return -1;
- }
-
-- *errno = mysql_errno((MYSQL *)conn->connection);
-+ *err_no = mysql_errno((MYSQL *)conn->connection);
- *errstr = strdup(mysql_error((MYSQL *)conn->connection));
- return 3;
- }
diff --git a/libdbi-drivers-dbd_pgsql.c.patch b/libdbi-drivers-dbd_pgsql.c.patch
deleted file mode 100644
index 948bab1..0000000
--- a/libdbi-drivers-dbd_pgsql.c.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- drivers/pgsql/dbd_pgsql.c Sat Jan 26 12:39:50 2008
-+++ drivers/pgsql/dbd_pgsql.c.new Tue Jun 9 21:06:14 2009
-@@ -520,11 +520,11 @@
- return db;
- }
-
--int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr) {
-- /* put error number into errno, error string into errstr
-- * return 0 if error, 1 if errno filled, 2 if errstr filled, 3 if both errno and errstr filled */
-+int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr) {
-+ /* put error number into err_no, error string into errstr
-+ * return 0 if error, 1 if err_no filled, 2 if errstr filled, 3 if both err_no and errstr filled */
-
-- *errno = 0;
-+ *err_no = 0;
- *errstr = strdup(PQerrorMessage((PGconn *)conn->connection));
-
- return 2;
diff --git a/libdbi-drivers-dbd_sqlite3.c.patch b/libdbi-drivers-dbd_sqlite3.c.patch
deleted file mode 100644
index 99481cb..0000000
--- a/libdbi-drivers-dbd_sqlite3.c.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: dbd_sqlite3.c
-===================================================================
-RCS file: /cvsroot/libdbi-drivers/libdbi-drivers/drivers/sqlite3/dbd_sqlite3.c,v
-retrieving revision 1.31
-diff -u -r1.31 dbd_sqlite3.c
---- drivers/sqlite3/dbd_sqlite3.c 13 Aug 2008 22:56:03 -0000 1.31
-+++ drivers/sqlite3/dbd_sqlite3.c 16 Aug 2008 20:23:23 -0000
-@@ -1369,11 +1369,11 @@
- return db;
- }
-
--int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr) {
-- /* put error number into errno, error string into errstr
-- * return 0 if error, 1 if errno filled, 2 if errstr filled, 3 if both errno and errstr filled */
-+int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr) {
-+ /* put error number into err_no, error string into errstr
-+ * return 0 if error, 1 if err_no filled, 2 if errstr filled, 3 if both err_no and errstr filled */
-
-- *errno = sqlite3_errcode((sqlite3 *)conn->connection);
-+ *err_no = sqlite3_errcode((sqlite3 *)conn->connection);
- *errstr = strdup((char*)sqlite3_errmsg((sqlite3 *)conn->connection));
- return 3;
- }
-
diff --git a/libdbi-drivers-errno.patch b/libdbi-drivers-errno.patch
new file mode 100644
index 0000000..31097d7
--- /dev/null
+++ b/libdbi-drivers-errno.patch
@@ -0,0 +1,167 @@
+diff --git a/drivers/firebird/dbd_firebird.c b/drivers/firebird/dbd_firebird.c
+index 4a1f30d..035479e 100755
+--- a/drivers/firebird/dbd_firebird.c
++++ b/drivers/firebird/dbd_firebird.c
+@@ -524,10 +524,10 @@ const char *dbd_select_db(dbi_conn_t *conn, const char *db)
+ return db;
+ }
+
+-int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr)
++int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr)
+ {
+ /* error_message and error_number were already set by calls to _dbd_internal_error_handler */
+- *errno = conn->error_number;
++ *err_no = conn->error_number;
+ *errstr = (conn->error_message) ? strdup(conn->error_message):NULL;
+ return 1;
+ }
+diff --git a/drivers/freetds/dbd_freetds.c b/drivers/freetds/dbd_freetds.c
+index 2a24764..9f57d85 100644
+--- a/drivers/freetds/dbd_freetds.c
++++ b/drivers/freetds/dbd_freetds.c
+@@ -733,10 +733,10 @@ const char *dbd_select_db(dbi_conn_t * conn, const char *db)
+ return (char *) db;
+ }
+
+-int dbd_geterror(dbi_conn_t * conn, int *errno, char **errstr)
++int dbd_geterror(dbi_conn_t * conn, int *err_no, char **errstr)
+ {
+ /* put error number into errno, error string into errstr
+- * return 0 if error, 1 if errno filled, 2 if errstr filled, 3 if both errno and errstr filled */
++ * return 0 if error, 1 if err_no filled, 2 if errstr filled, 3 if both err_no and errstr filled */
+
+ /* We havn't functions for read error types in freetds */
+ return -1;
+diff --git a/drivers/msql/dbd_msql.c b/drivers/msql/dbd_msql.c
+index bdf270e..cef20a8 100644
+--- a/drivers/msql/dbd_msql.c
++++ b/drivers/msql/dbd_msql.c
+@@ -277,12 +277,12 @@ const char *dbd_select_db(dbi_conn_t *conn, const char *db)
+ return db;
+ }
+
+-int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr)
++int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr)
+ {
+ if(!msqlErrMsg)
+ return -1;
+
+- *errno = 0;
++ *err_no = 0;
+ *errstr = strdup(msqlErrMsg);
+ return 2;
+ }
+diff --git a/drivers/mysql/dbd_mysql.c b/drivers/mysql/dbd_mysql.c
+index 7d06f62..237506c 100644
+--- a/drivers/mysql/dbd_mysql.c
++++ b/drivers/mysql/dbd_mysql.c
+@@ -553,15 +553,15 @@ const char *dbd_select_db(dbi_conn_t *conn, const char *db) {
+ return db;
+ }
+
+-int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr) {
+- /* put error number into errno, error string into errstr
+- * return 0 if error, 1 if errno filled, 2 if errstr filled, 3 if both errno and errstr filled */
++int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr) {
++ /* put error number into err_no, error string into errstr
++ * return 0 if error, 1 if err_no filled, 2 if errstr filled, 3 if both err_no and errstr filled */
+
+ if (strcmp("",mysql_error((MYSQL *)conn->connection)) == 0) {
+ return -1;
+ }
+
+- *errno = mysql_errno((MYSQL *)conn->connection);
++ *err_no = mysql_errno((MYSQL *)conn->connection);
+ *errstr = strdup(mysql_error((MYSQL *)conn->connection));
+ return 3;
+ }
+diff --git a/drivers/oracle/dbd_oracle.c b/drivers/oracle/dbd_oracle.c
+index 1f38094..d220a9e 100755
+--- a/drivers/oracle/dbd_oracle.c
++++ b/drivers/oracle/dbd_oracle.c
+@@ -400,12 +400,12 @@ const char *dbd_select_db(dbi_conn_t *conn, const char *db)
+ return NULL; /* Oracle can't do that .... */
+ }
+
+-int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr)
++int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr)
+ {
+ char errbuf[1024];
+ int errcode = 0;
+ Oraconn *Oconn = conn->connection;
+- *errno = 0;
++ *err_no = 0;
+
+ if (!conn->connection) {
+ *errstr = strdup("Unable to connect to database.");
+@@ -414,7 +414,7 @@ int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr)
+ OCIErrorGet((dvoid *)Oconn->err, (ub4) 1, (text *) NULL, &errcode, errbuf,
+ (ub4) sizeof(errbuf), OCI_HTYPE_ERROR);
+ *errstr = strdup(errbuf);
+- *errno = errcode;
++ *err_no = errcode;
+ }
+
+ return 3;
+diff --git a/drivers/pgsql/dbd_pgsql.c b/drivers/pgsql/dbd_pgsql.c
+index 0433550..c097dac 100644
+--- a/drivers/pgsql/dbd_pgsql.c
++++ b/drivers/pgsql/dbd_pgsql.c
+@@ -520,11 +520,11 @@ const char *dbd_select_db(dbi_conn_t *conn, const char *db) {
+ return db;
+ }
+
+-int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr) {
+- /* put error number into errno, error string into errstr
+- * return 0 if error, 1 if errno filled, 2 if errstr filled, 3 if both errno and errstr filled */
++int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr) {
++ /* put error number into err_no, error string into errstr
++ * return 0 if error, 1 if err_no filled, 2 if errstr filled, 3 if both err_no and errstr filled */
+
+- *errno = 0;
++ *err_no = 0;
+ *errstr = strdup(PQerrorMessage((PGconn *)conn->connection));
+
+ return 2;
+diff --git a/drivers/sqlite/dbd_sqlite.c b/drivers/sqlite/dbd_sqlite.c
+index 94dacc0..aeadfa5 100644
+--- a/drivers/sqlite/dbd_sqlite.c
++++ b/drivers/sqlite/dbd_sqlite.c
+@@ -913,13 +913,13 @@ const char *dbd_select_db(dbi_conn_t *conn, const char *db) {
+ return db;
+ }
+
+-int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr) {
+- /* put error number into errno, error string into errstr
+- * return 0 if error, 1 if errno filled, 2 if errstr filled, 3 if both errno and errstr filled */
++int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr) {
++ /* put error number into err_no, error string into errstr
++ * return 0 if error, 1 if err_no filled, 2 if errstr filled, 3 if both err_no and errstr filled */
+ int result = 0;
+
+ if (conn->error_number) {
+- *errno = conn->error_number;
++ *err_no = conn->error_number;
+ result++;
+ }
+ if (conn->error_message) {
+diff --git a/drivers/sqlite3/dbd_sqlite3.c b/drivers/sqlite3/dbd_sqlite3.c
+index dc85465..3360c27 100644
+--- a/drivers/sqlite3/dbd_sqlite3.c
++++ b/drivers/sqlite3/dbd_sqlite3.c
+@@ -880,11 +880,11 @@ const char *dbd_select_db(dbi_conn_t *conn, const char *db) {
+ return db;
+ }
+
+-int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr) {
+- /* put error number into errno, error string into errstr
+- * return 0 if error, 1 if errno filled, 2 if errstr filled, 3 if both errno and errstr filled */
++int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr) {
++ /* put error number into err_no, error string into errstr
++ * return 0 if error, 1 if err_no filled, 2 if errstr filled, 3 if both err_no and errstr filled */
+
+- *errno = sqlite3_errcode((sqlite3 *)conn->connection);
++ *err_no = sqlite3_errcode((sqlite3 *)conn->connection);
+ *errstr = strdup((char*)sqlite3_errmsg((sqlite3 *)conn->connection));
+ return 3;
+ }
commit 4910f06f0a8407644363dcd9ac3395100754b700
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Oct 14 11:58:03 2013 +0200
Win32: fix libofx build for new mingw environment
diff --git a/defaults.sh b/defaults.sh
index cd5ec70..5221f7b 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -344,7 +344,7 @@ set_default OPENSP_PATCH `pwd`/opensp-1.5.2.patch
LIBOFX_VERSION="0.9.9"
set_default LIBOFX_URL "$SF_MIRROR/libofx/libofx-${LIBOFX_VERSION}.tar.gz"
set_default LIBOFX_DIR $GLOBAL_DIR\\libofx
-#set_default LIBOFX_PATCH `pwd`/libofx-x.x.x.patch
+set_default LIBOFX_PATCH `pwd`/libofx-0.9.8.patch
## online banking: gwenhywfar+aqbanking
GWENHYWFAR_VERSION="4.11.1beta"
diff --git a/libofx-0.9.8.patch b/libofx-0.9.8.patch
new file mode 100644
index 0000000..d7c823e
--- /dev/null
+++ b/libofx-0.9.8.patch
@@ -0,0 +1,11 @@
+--- a/lib/ofx_preproc.cpp 2013-04-17 20:09:11 +0000
++++ b/lib/ofx_preproc.cpp 2013-10-14 09:00:31 +0000
+@@ -310,7 +310,7 @@
+ size_t outbytesleft = inbytesleft * 2 - 1;
+ iconv_buffer = (char*) malloc (inbytesleft * 2);
+ memset(iconv_buffer, 0, inbytesleft * 2);
+-#if defined(OS_WIN32) || defined(__sun)
++#if defined(__sun)
+ const char * inchar = (const char *)s_buffer.c_str();
+ #else
+ char * inchar = (char *)s_buffer.c_str();
commit 99ac192c0bfe2c6c97c360bbfcb0d5636476d6dd
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sun Apr 27 11:19:44 2014 +0200
Win32: fix guile's srfi module detection
diff --git a/defaults.sh b/defaults.sh
index 2f74031..cd5ec70 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -199,6 +199,7 @@ set_default GMP5_DEV_URL "$SF_MIRROR/mingw/gmp-5.0.1-1-mingw32-dev.tar.lzma"
GUILE_VERSION="1.8.8"
set_default GUILE_URL "http://ftp.gnu.org/pub/gnu/guile/guile-${GUILE_VERSION}.tar.gz"
set_default GUILE_DIR $GLOBAL_DIR\\guile
+set_default GUILE_PATCH `pwd`/guile-1.8.patch
set_default OPENSSL_URL "http://www.openssl.org/source/openssl-0.9.8j.tar.gz"
set_default OPENSSL_DIR $GLOBAL_DIR\\openssl
diff --git a/guile-1.8.patch b/guile-1.8.patch
new file mode 100644
index 0000000..3a2d8a6
--- /dev/null
+++ b/guile-1.8.patch
@@ -0,0 +1,26 @@
+--- guile-1.8.8.old/srfi/Makefile.am 2010-12-13 18:24:40.000000000 +0100
++++ guile-1.8.8.new/srfi/Makefile.am 2014-04-27 16:42:24.000000000 +0200
+@@ -43,19 +43,19 @@
+
+ libguile_srfi_srfi_1_v_ at LIBGUILE_SRFI_SRFI_1_MAJOR@_la_SOURCES = srfi-1.x srfi-1.c
+ libguile_srfi_srfi_1_v_ at LIBGUILE_SRFI_SRFI_1_MAJOR@_la_LIBADD = ../libguile/libguile.la
+-libguile_srfi_srfi_1_v_ at LIBGUILE_SRFI_SRFI_1_MAJOR@_la_LDFLAGS = -no-undefined -export-dynamic -version-info @LIBGUILE_SRFI_SRFI_1_INTERFACE@
++libguile_srfi_srfi_1_v_ at LIBGUILE_SRFI_SRFI_1_MAJOR@_la_LDFLAGS = -no-undefined -export-dynamic -avoid-version
+
+ libguile_srfi_srfi_4_v_ at LIBGUILE_SRFI_SRFI_4_MAJOR@_la_SOURCES = srfi-4.x srfi-4.c
+ libguile_srfi_srfi_4_v_ at LIBGUILE_SRFI_SRFI_4_MAJOR@_la_LIBADD = ../libguile/libguile.la
+-libguile_srfi_srfi_4_v_ at LIBGUILE_SRFI_SRFI_4_MAJOR@_la_LDFLAGS = -no-undefined -export-dynamic -version-info @LIBGUILE_SRFI_SRFI_4_INTERFACE@
++libguile_srfi_srfi_4_v_ at LIBGUILE_SRFI_SRFI_4_MAJOR@_la_LDFLAGS = -no-undefined -export-dynamic -avoid-version
+
+ libguile_srfi_srfi_13_14_v_ at LIBGUILE_SRFI_SRFI_13_14_MAJOR@_la_SOURCES = srfi-13.x srfi-13.c srfi-14.x srfi-14.c
+ libguile_srfi_srfi_13_14_v_ at LIBGUILE_SRFI_SRFI_13_14_MAJOR@_la_LIBADD = ../libguile/libguile.la
+-libguile_srfi_srfi_13_14_v_ at LIBGUILE_SRFI_SRFI_13_14_MAJOR@_la_LDFLAGS = -no-undefined -export-dynamic -version-info @LIBGUILE_SRFI_SRFI_13_14_INTERFACE@
++libguile_srfi_srfi_13_14_v_ at LIBGUILE_SRFI_SRFI_13_14_MAJOR@_la_LDFLAGS = -no-undefined -export-dynamic -avoid-version
+
+ libguile_srfi_srfi_60_v_ at LIBGUILE_SRFI_SRFI_60_MAJOR@_la_SOURCES = srfi-60.x srfi-60.c
+ libguile_srfi_srfi_60_v_ at LIBGUILE_SRFI_SRFI_60_MAJOR@_la_LIBADD = ../libguile/libguile.la
+-libguile_srfi_srfi_60_v_ at LIBGUILE_SRFI_SRFI_60_MAJOR@_la_LDFLAGS = -no-undefined -export-dynamic -version-info @LIBGUILE_SRFI_SRFI_60_INTERFACE@
++libguile_srfi_srfi_60_v_ at LIBGUILE_SRFI_SRFI_60_MAJOR@_la_LDFLAGS = -no-undefined -export-dynamic -avoid-version
+
+ srfidir = $(datadir)/guile/$(GUILE_EFFECTIVE_VERSION)/srfi
+ srfi_DATA = srfi-1.scm \
diff --git a/install-impl.sh b/install-impl.sh
index c9e5cf0..ef48a51 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -537,6 +537,10 @@ function inst_guile() {
tar -xzpf $_GUILE_BALL -C $TMP_UDIR
assert_one_dir $TMP_UDIR/guile-*
qpushd $TMP_UDIR/guile-*
+ if [ -n "$GUILE_PATCH" -a -f "$GUILE_PATCH" ]; then
+ patch -p1 < $GUILE_PATCH
+ fi
+
autoreconf -fvi
./configure ${HOST_XCOMPILE} -C \
--disable-elisp \
commit d0cac05f53fa60aca0a9837889d786d2c6b50edf
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat Apr 26 23:39:14 2014 +0200
Win32: fix guile's strncasecmp test on mingw
diff --git a/install-impl.sh b/install-impl.sh
index b4238f0..c9e5cf0 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -544,6 +544,7 @@ function inst_guile() {
--disable-dependency-tracking \
--prefix=$_GUILE_WFSDIR \
ac_cv_func_regcomp_rx=yes \
+ ac_cv_func_strncasecmp=yes \
CPPFLAGS="${READLINE_CPPFLAGS} ${REGEX_CPPFLAGS}" \
LDFLAGS="${READLINE_LDFLAGS} ${REGEX_LDFLAGS} -Wl,--enable-auto-import"
make
commit 8ed96dce650e516604a2b72bf950865ec329bcf7
Author: Gary Bilkus <mail at gary.bilkus.com>
Date: Sat Jan 18 17:56:32 2014 +0100
Win32: add flag to guile configure to fix broken test for regcomp_rx
diff --git a/install-impl.sh b/install-impl.sh
index 8b444a9..b4238f0 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -543,6 +543,7 @@ function inst_guile() {
--disable-error-on-warning \
--disable-dependency-tracking \
--prefix=$_GUILE_WFSDIR \
+ ac_cv_func_regcomp_rx=yes \
CPPFLAGS="${READLINE_CPPFLAGS} ${REGEX_CPPFLAGS}" \
LDFLAGS="${READLINE_LDFLAGS} ${REGEX_LDFLAGS} -Wl,--enable-auto-import"
make
commit 8c5465235a80a8af5938b46327b7f1f4cae6551e
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri Oct 11 17:05:04 2013 +0200
Win32: adapt inst_guile step to new mingw environment
diff --git a/defaults.sh b/defaults.sh
index 471cc8f..2f74031 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -199,7 +199,6 @@ set_default GMP5_DEV_URL "$SF_MIRROR/mingw/gmp-5.0.1-1-mingw32-dev.tar.lzma"
GUILE_VERSION="1.8.8"
set_default GUILE_URL "http://ftp.gnu.org/pub/gnu/guile/guile-${GUILE_VERSION}.tar.gz"
set_default GUILE_DIR $GLOBAL_DIR\\guile
-set_default GUILE_PATCH `pwd`/guile-1.8.8.patch
set_default OPENSSL_URL "http://www.openssl.org/source/openssl-0.9.8j.tar.gz"
set_default OPENSSL_DIR $GLOBAL_DIR\\openssl
diff --git a/guile-1.8.8.patch b/guile-1.8.8.patch
deleted file mode 100644
index ec92de5..0000000
--- a/guile-1.8.8.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -urN old.guile-1.8.7/configure.in new/guile-1.8.7/configure.in
---- old.guile-1.8.7/configure.in 2009-07-05 14:40:06.000000000 -0400
-+++ new.guile-1.8.7/configure.in 2009-08-26 15:33:43.996500000 -0400
-@@ -25,7 +25,7 @@
-
- ]])
-
--AC_PREREQ(2.61)
-+AC_PREREQ(2.63)
-
- dnl `patsubst' here deletes the newline which "echo" prints. We can't use
- dnl "echo -n" since -n is not portable (see autoconf manual "Limitations of
-@@ -41,7 +41,7 @@
- AC_CONFIG_MACRO_DIR([m4])
- AC_CONFIG_SRCDIR(GUILE-VERSION)
-
--AM_INIT_AUTOMAKE([gnu no-define check-news -Wall -Wno-override])
-+AM_INIT_AUTOMAKE([1.11 silent-rules gnu no-define check-news -Wall -Wno-override])
-
- AC_COPYRIGHT(GUILE_CONFIGURE_COPYRIGHT)
- AC_CONFIG_SRCDIR([GUILE-VERSION])
-@@ -68,8 +68,6 @@
-
- AB_INIT
-
--AC_LIBTOOL_WIN32_DLL
--
- AC_PROG_INSTALL
- AC_PROG_CC
- AC_PROG_CPP
-@@ -82,8 +80,7 @@
- # for per-target cflags in the libguile subdir
- AM_PROG_CC_C_O
-
--AC_LIBTOOL_DLOPEN
--AC_PROG_LIBTOOL
-+LT_INIT([win32-dll dlopen])
- AC_CHECK_LIB([ltdl], [lt_dlinit], ,
- [AC_MSG_ERROR([libltdl not found. See README.])])
- AC_CHECK_HEADER([ltdl.h], [],
-diff -urN old.guile-1.8.7/guile-readline/configure.in new/guile-1.8.7/guile-readline/configure.in
---- old.guile-1.8.7/guile-readline/configure.in 2009-07-03 18:19:22.000000000 -0400
-+++ new.guile-1.8.7/guile-readline/configure.in 2009-08-26 15:35:08.398500000 -0400
-@@ -1,4 +1,4 @@
--AC_PREREQ(2.50)
-+AC_PREREQ(2.63)
-
- dnl Don't use "echo -n", which is not portable (e.g., not available on
- dnl MacOS X). Instead, use `patsubst' to remove the newline.
-@@ -10,15 +10,14 @@
- AC_CONFIG_AUX_DIR([.])
- AC_CONFIG_SRCDIR(readline.c)
- AM_CONFIG_HEADER([guile-readline-config.h])
--AM_INIT_AUTOMAKE([foreign no-define])
-+AM_INIT_AUTOMAKE([1.11 silent-rules foreign no-define])
-
- . $srcdir/../GUILE-VERSION
-
- AC_PROG_INSTALL
- AC_PROG_CC
- AM_PROG_CC_STDC
--AC_LIBTOOL_WIN32_DLL
--AC_PROG_LIBTOOL
-+LT_INIT([win32-dll])
-
- dnl
- dnl Check for Winsock and other functionality on Win32 (*not* CygWin)
---- old.guile-1.8.7/pre-inst-guile.in 2010-05-30 09:38:50 +0000
-+++ new.guile-1.8.7/pre-inst-guile.in 2010-05-30 09:39:30 +0000
-@@ -87,7 +87,7 @@
- export DYLD_LIBRARY_PATH
-
- # set GUILE (clobber)
--GUILE=${top_builddir}/libguile/guile
-+GUILE=${top_builddir}/libguile/.libs/guile
- export GUILE
-
- # do it
-===================================================================
---- sid.orig/libguile/threads.h
-+++ sid/libguile/threads.h
-@@ -26,7 +26,6 @@
- #include "libguile/procs.h"
- #include "libguile/throw.h"
- #include "libguile/root.h"
--#include "libguile/iselect.h"
- #include "libguile/dynwind.h"
- #include "libguile/continuations.h"
-
diff --git a/install-impl.sh b/install-impl.sh
index 30f8741..8b444a9 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -183,6 +183,7 @@ function inst_mingw() {
mingw_smart_get mingw32-libiconv-bin ${MINGW_LIBICONV_VERSION}
# Build dependencies for gnucash and other self-built libraries
mingw_smart_get mingw32-gmp-dev ${MINGW_GMP_VERSION}
+ mingw_smart_get mingw32-pthreads-w32-dev ${MINGW_PTHREAD_W32_VERSION}
if [ "$CROSS_COMPILE" != "yes" ]; then
mingw_smart_get mingw32-pexports ${MINGW_PEXPORTS_VERSION}
@@ -536,20 +537,15 @@ function inst_guile() {
tar -xzpf $_GUILE_BALL -C $TMP_UDIR
assert_one_dir $TMP_UDIR/guile-*
qpushd $TMP_UDIR/guile-*
- if [ -n "$GUILE_PATCH" -a -f "$GUILE_PATCH" ]; then
- patch -p1 < $GUILE_PATCH
- fi
- ACLOCAL="aclocal $ACLOCAL_FLAGS" autoreconf -fvi $ACLOCAL_FLAGS
- ./configure ${HOST_XCOMPILE} \
- --disable-static \
+ autoreconf -fvi
+ ./configure ${HOST_XCOMPILE} -C \
--disable-elisp \
+ --disable-error-on-warning \
--disable-dependency-tracking \
- -C --prefix=$_GUILE_WFSDIR \
- ac_cv_func_regcomp_rx=yes \
- CFLAGS="-D__MINGW32__" \
- CPPFLAGS="${READLINE_CPPFLAGS} ${REGEX_CPPFLAGS} -D__MINGW32__" \
+ --prefix=$_GUILE_WFSDIR \
+ CPPFLAGS="${READLINE_CPPFLAGS} ${REGEX_CPPFLAGS}" \
LDFLAGS="${READLINE_LDFLAGS} ${REGEX_LDFLAGS} -Wl,--enable-auto-import"
- make LDFLAGS="${READLINE_LDFLAGS} ${REGEX_LDFLAGS} -Wl,--enable-auto-import -no-undefined -avoid-version"
+ make
make install
qpopd
guile -c '(use-modules (srfi srfi-39))' || die "guile not installed correctly"
commit 2c6edefafd9547174a91f9592af79e34b63c569e
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri Oct 11 12:14:05 2013 +0200
Win32: cleanup inst_gnome step for new mingw environment
- gettext and friends are provided by mingw, drop gnome versions
- fix "library not found" issue for pkg-config
- pkg-config no longer needs a wrapper to avoid weird output
- reorganize some installation steps
diff --git a/install-impl.sh b/install-impl.sh
index 5335004..30f8741 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -180,6 +180,7 @@ function inst_mingw() {
mingw_smart_get mingw32-automake ${MINGW_AUTOMAKE_VERSION}
mingw_smart_get mingw32-libtool ${MINGW_LIBTOOL_VERSION}
mingw_smart_get mingw32-libltdl ${MINGW_LIBLTDL_VERSION}
+ mingw_smart_get mingw32-libiconv-bin ${MINGW_LIBICONV_VERSION}
# Build dependencies for gnucash and other self-built libraries
mingw_smart_get mingw32-gmp-dev ${MINGW_GMP_VERSION}
@@ -193,6 +194,8 @@ function inst_mingw() {
quiet which pexports || die "mingw-utils not installed correctly (pexports)"
# FIXME which library uses reimp ?
# quiet which reimp || die "mingw-utils not installed correctly (reimp)"
+ # Hack to make Gnome's pkg-config happy (without having to rebuild it)
+ cp "${_MINGW_UDIR}"/bin/libintl*.dll "${_MINGW_UDIR}/bin/intl.dll"
else
./create_cross_mingw.sh
fi
@@ -361,11 +364,7 @@ function inst_gnome() {
add_to_env -L$_GNOME_UDIR/lib GNOME_LDFLAGS
add_to_env $_GNOME_UDIR/bin PATH
add_to_env $_GNOME_UDIR/lib/pkgconfig PKG_CONFIG_PATH
- if [ "$CROSS_COMPILE" != "yes" ]; then
- add_to_env $_GNOME_UDIR/bin/pkg-config-msys.sh PKG_CONFIG
- else
- add_to_env pkg-config PKG_CONFIG
- fi
+ add_to_env pkg-config PKG_CONFIG
if quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-2.0 &&
quiet ${PKG_CONFIG} --atleast-version=${CAIRO_VERSION} cairo &&
quiet ${PKG_CONFIG} --exact-version=${LIBXML2_VERSION} libxml-2.0 &&
@@ -388,9 +387,6 @@ function inst_gnome() {
wget_unpacked $GAIL_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GDK_PIXBUF_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GDK_PIXBUF_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GETTEXT_RUNTIME_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GETTEXT_RUNTIME_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GETTEXT_TOOLS_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GLIB_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GLIB_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GTK_URL $DOWNLOAD_DIR $GNOME_DIR
@@ -400,15 +396,12 @@ function inst_gnome() {
wget_unpacked $LIBART_LGPL_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBGNOMECANVAS_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBGNOMECANVAS_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBICONV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBJPEG_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBJPEG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBPNG_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBPNG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBTIFF_URL $DOWNLOAD_DIR $GNOME_DIR
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 $PANGO_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $PANGO_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $PKG_CONFIG_URL $DOWNLOAD_DIR $GNOME_DIR
@@ -429,26 +422,16 @@ function inst_gnome() {
rm -rf $TMP_UDIR/gtk2_prefs-*
wget_unpacked $GTK_DOC_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/gtk-doc-*
+ mv $TMP_UDIR/gtk-doc-*/gtk-doc.m4 $_GNOME_UDIR/share/aclocal
+ rm -rf $TMP_UDIR/gtk-doc-*
+
+ # Fix paths to tools used by gnome provided intltool scripts
qpushd $_GNOME_UDIR
- assert_one_dir $TMP_UDIR/gtk-doc-*
- mv $TMP_UDIR/gtk-doc-*/gtk-doc.m4 $_GNOME_UDIR/share/aclocal
for file in bin/intltool-*; do
- sed '1s,!.*perl,!'"$INTLTOOL_PERL"',;s,/opt/gnu/bin/iconv,iconv,' $file > tmp
+ sed '1s,!.*perl,!'"perl"',;s,/opt/gnu/bin/iconv,iconv,' $file > tmp
mv tmp $file
done
- # work around a bug in msys bash, adding 0x01 smilies
- cat > bin/pkg-config-msys.sh <<EOF
-#!/bin/sh
-PKG_CONFIG="\$(dirname \$0)/pkg-config"
-if \${PKG_CONFIG} "\$@" > /dev/null 2>&1 ; then
- res=true
-else
- res=false
-fi
-\${PKG_CONFIG} "\$@" | tr -d \\\\r && \$res
-EOF
- chmod +x bin/pkg-config{.exe,-msys.sh}
- rm -rf $TMP_UDIR/gtk-doc-*
qpopd
if quiet ${PKG_CONFIG} --exact-version=${LIBXML2_VERSION} libxml-2.0 ; then
commit b00ab2f106c0a7a47210adb0f288f6b5be88f2a8
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri Oct 11 12:04:58 2013 +0200
Win32: manage pexports installation with mingw-get
diff --git a/defaults.sh b/defaults.sh
index f6c9db2..471cc8f 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -107,6 +107,7 @@ set_default MINGW_LIBLTDL_VERSION "2.4-1"
set_default MINGW_LIBTOOL_VERSION "2.4-1"
set_default MINGW_MPC_VERSION "1.0.1-2"
set_default MINGW_MPFR_VERSION "3.1.2-2"
+set_default MINGW_PEXPORTS_VERSION "0.46"
set_default MINGW_PTHREAD_W32_VERSION "2.9.1-1"
set_default MINGW_RT_VERSION "4.0.3-1"
set_default MINGW_ZLIB_VERSION "1.2.8-1"
diff --git a/install-impl.sh b/install-impl.sh
index 7a2654e..5335004 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -184,11 +184,15 @@ function inst_mingw() {
mingw_smart_get mingw32-gmp-dev ${MINGW_GMP_VERSION}
if [ "$CROSS_COMPILE" != "yes" ]; then
+ mingw_smart_get mingw32-pexports ${MINGW_PEXPORTS_VERSION}
# Some additional steps, only for native (non-cross-compile)
#cp ${_MINGW_UDIR}/bin/libpthread-2.dll ${_MINGW_UDIR}/bin/pthreadGC2.dll
echo "Skipping lpthread copying for now, let's see if this is still needed..."
#mingw_smart_get mingw32-make ${MINGW_MAKE_VERSION}
echo "Skipping mingw32-make installation for now, let's see if this is still needed..."
+ quiet which pexports || die "mingw-utils not installed correctly (pexports)"
+ # FIXME which library uses reimp ?
+ # quiet which reimp || die "mingw-utils not installed correctly (reimp)"
else
./create_cross_mingw.sh
fi
@@ -204,20 +208,6 @@ function inst_mingw() {
#[ ! -d $_AUTOTOOLS_UDIR/share/aclocal ] || add_to_env "-I $_AUTOTOOLS_UDIR/share/aclocal" ACLOCAL_FLAGS
}
-function inst_mingwutils() {
- setup MinGW-Utils
- _MINGW_UTILS_UDIR=`unix_path $MINGW_UTILS_DIR`
- add_to_env $_MINGW_UTILS_UDIR/bin PATH
- if quiet which pexports && quiet which reimp
- then
- echo "mingw-utils already installed in $_MINGW_UTILS_UDIR. skipping."
- else
- wget_unpacked $MINGW_UTILS_URL $DOWNLOAD_DIR $MINGW_UTILS_DIR
- quiet which pexports || die "mingw-utils not installed correctly (pexports)"
- quiet which reimp || die "mingw-utils not installed correctly (reimp)"
- fi
-}
-
function inst_svn() {
setup Subversion
_SVN_UDIR=`unix_path $SVN_DIR`
diff --git a/install.sh b/install.sh
index 15cbd4c..70a0eb9 100644
--- a/install.sh
+++ b/install.sh
@@ -66,9 +66,6 @@ fi
add_step inst_mingw
add_step inst_regex
add_step inst_readline
-if [ "$CROSS_COMPILE" != "yes" ]; then
- add_step inst_mingwutils
-fi
add_step inst_exetype
add_step inst_gnome
add_step inst_guile
commit 175dcd67e503c4ccd071ba1cd712d9ad2351c1de
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri Oct 11 11:42:51 2013 +0200
Win32: keep mingw package versions more or less in alphabetical order
diff --git a/defaults.sh b/defaults.sh
index 31e33a0..f6c9db2 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -101,12 +101,12 @@ set_default MINGW_BINUTILS_VERSION "2.23.1-1"
set_default MINGW_GCC_VERSION "4.8.1-3"
set_default MINGW_GETTEXT_VERSION "0.18.1.1-2"
set_default MINGW_GMP_VERSION "5.1.2-1"
-set_default MINGW_MPC_VERSION "1.0.1-2"
-set_default MINGW_MPFR_VERSION "3.1.2-2"
set_default MINGW_LIBEXPAT_VERSION "2.1.0-1"
set_default MINGW_LIBICONV_VERSION "1.14-2"
set_default MINGW_LIBLTDL_VERSION "2.4-1"
set_default MINGW_LIBTOOL_VERSION "2.4-1"
+set_default MINGW_MPC_VERSION "1.0.1-2"
+set_default MINGW_MPFR_VERSION "3.1.2-2"
set_default MINGW_PTHREAD_W32_VERSION "2.9.1-1"
set_default MINGW_RT_VERSION "4.0.3-1"
set_default MINGW_ZLIB_VERSION "1.2.8-1"
commit 47a3e7da313d269c5c6e3ffb9fff5552c2481fcc
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri Oct 11 11:14:37 2013 +0200
Win32: manage gmp installation with mingw-get
diff --git a/dist-impl.sh b/dist-impl.sh
index 5f1ed36..0a9b3d9 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -25,7 +25,6 @@ function dist_prepare() {
_OPENSP_UDIR=`unix_path $OPENSP_DIR`
_LIBOFX_UDIR=`unix_path $LIBOFX_DIR`
_LIBXSLT_UDIR=`unix_path $LIBXSLT_DIR`
- _GMP_UDIR=`unix_path $GMP_DIR`
_GNUTLS_UDIR=`unix_path $GNUTLS_DIR`
_GWENHYWFAR_UDIR=`unix_path $GWENHYWFAR_DIR`
_AQBANKING_UDIR=`unix_path $AQBANKING_DIR`
@@ -60,11 +59,6 @@ function dist_aqbanking() {
cp -a ${_AQBANKING_UDIR}/share/locale ${DIST_UDIR}/share
}
-function dist_gmp() {
- setup gmp
- cp -a ${_GMP_UDIR}/bin/*.dll ${DIST_UDIR}/bin
-}
-
function dist_gnome() {
setup Gnome platform
wget_unpacked $ATK_URL $DOWNLOAD_DIR $DIST_DIR
diff --git a/dist.sh b/dist.sh
index 22c0725..1ad7f55 100755
--- a/dist.sh
+++ b/dist.sh
@@ -34,7 +34,6 @@ add_step dist_libgsf
add_step dist_goffice
add_step dist_libofx
add_step dist_gnutls
-add_step dist_gmp
add_step dist_gwenhywfar
add_step dist_ktoblzcheck
add_step dist_aqbanking
diff --git a/install-impl.sh b/install-impl.sh
index 213f2da..7a2654e 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -180,6 +180,8 @@ function inst_mingw() {
mingw_smart_get mingw32-automake ${MINGW_AUTOMAKE_VERSION}
mingw_smart_get mingw32-libtool ${MINGW_LIBTOOL_VERSION}
mingw_smart_get mingw32-libltdl ${MINGW_LIBLTDL_VERSION}
+ # Build dependencies for gnucash and other self-built libraries
+ mingw_smart_get mingw32-gmp-dev ${MINGW_GMP_VERSION}
if [ "$CROSS_COMPILE" != "yes" ]; then
# Some additional steps, only for native (non-cross-compile)
@@ -309,8 +311,8 @@ function inst_aqbanking() {
--with-xmlmerge=${XMLMERGE} \
--with-frontends="cbanking" \
--with-backends="${_AQ_BACKENDS}" \
- CPPFLAGS="${_AQ_CPPFLAGS} ${GMP_CPPFLAGS}" \
- LDFLAGS="${_AQ_LDFLAGS} ${GMP_LDFLAGS}" \
+ CPPFLAGS="${_AQ_CPPFLAGS}" \
+ LDFLAGS="${_AQ_LDFLAGS}" \
--prefix=${_AQBANKING_UDIR}
make
rm -rf ${_AQBANKING_UDIR}
@@ -362,32 +364,6 @@ function inst_glade() {
fi
}
-function inst_gmp() {
- setup Gmp
- _GMP_UDIR=`unix_path ${GMP_DIR}`
- add_to_env -I$_GMP_UDIR/include GMP_CPPFLAGS
- add_to_env -L$_GMP_UDIR/lib GMP_LDFLAGS
- add_to_env ${_GMP_UDIR}/bin PATH
- if quiet ${LD} $GMP_LDFLAGS -lgmp -o $TMP_UDIR/ofile
- then
- echo "Gmp already installed in ${_GMP_UDIR}. skipping."
- else
- wget_unpacked $GMP_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/gmp-*
- qpushd $TMP_UDIR/gmp-*
- ./configure ${HOST_XCOMPILE} \
- ABI=$GMP_ABI \
- --prefix=${_GMP_UDIR} \
- --disable-static --enable-shared
- make
-# [ "$CROSS_COMPILE" != "yes" ] && make check
- make install
- qpopd
- quiet ${LD} $GMP_LDFLAGS -lgmp -o $TMP_UDIR/ofile || die "Gmp not installed correctly"
- rm -rf ${TMP_UDIR}/gmp-*
- fi
-}
-
function inst_gnome() {
setup Gnome platform
_GNOME_UDIR=`unix_path $GNOME_DIR`
@@ -598,9 +574,9 @@ function inst_guile() {
-C --prefix=$_GUILE_WFSDIR \
ac_cv_func_regcomp_rx=yes \
CFLAGS="-D__MINGW32__" \
- CPPFLAGS="${READLINE_CPPFLAGS} ${REGEX_CPPFLAGS} ${GMP_CPPFLAGS} -D__MINGW32__" \
- LDFLAGS="${READLINE_LDFLAGS} ${REGEX_LDFLAGS} ${GMP_LDFLAGS} -Wl,--enable-auto-import"
- make LDFLAGS="${READLINE_LDFLAGS} ${REGEX_LDFLAGS} ${GMP_LDFLAGS} -Wl,--enable-auto-import -no-undefined -avoid-version"
+ CPPFLAGS="${READLINE_CPPFLAGS} ${REGEX_CPPFLAGS} -D__MINGW32__" \
+ LDFLAGS="${READLINE_LDFLAGS} ${REGEX_LDFLAGS} -Wl,--enable-auto-import"
+ make LDFLAGS="${READLINE_LDFLAGS} ${REGEX_LDFLAGS} -Wl,--enable-auto-import -no-undefined -avoid-version"
make install
qpopd
guile -c '(use-modules (srfi srfi-39))' || die "guile not installed correctly"
@@ -1287,8 +1263,8 @@ function inst_gnucash() {
${AQBANKING_OPTIONS} \
--enable-binreloc \
--enable-locale-specific-tax \
- CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GMP_CPPFLAGS} ${GUILE_CPPFLAGS} ${LIBDBI_CPPFLAGS} ${KTOBLZCHECK_CPPFLAGS} ${HH_CPPFLAGS} ${LIBSOUP_CPPFLAGS} -D_WIN32 ${EXTRA_CFLAGS}" \
- LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GMP_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} ${HH_LDFLAGS} -L${_SQLITE3_UDIR}/lib -L${_ENCHANT_UDIR}/lib -L${_LIBXSLT_UDIR}/lib -L${_MINGW_UDIR}/lib" \
+ CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GUILE_CPPFLAGS} ${LIBDBI_CPPFLAGS} ${KTOBLZCHECK_CPPFLAGS} ${HH_CPPFLAGS} ${LIBSOUP_CPPFLAGS} -D_WIN32 ${EXTRA_CFLAGS}" \
+ LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} ${HH_LDFLAGS} -L${_SQLITE3_UDIR}/lib -L${_ENCHANT_UDIR}/lib -L${_LIBXSLT_UDIR}/lib -L${_MINGW_UDIR}/lib" \
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
make
@@ -1364,7 +1340,6 @@ set PATH=$INSTALL_DIR\\lib;%PATH%
set PATH=$INSTALL_DIR\\lib\\gnucash;%PATH%
set PATH=$GNUTLS_DIR\\bin;%PATH%
set PATH=$MINGW_DIR\\bin;%PATH%
-set PATH=$GMP_DIR\\bin;%PATH%
set PATH=$GOFFICE_DIR\\bin;%PATH%
set PATH=$LIBGSF_DIR\\bin;%PATH%
set PATH=$PCRE_DIR\\bin;%PATH%
diff --git a/install.sh b/install.sh
index e96ac07..15cbd4c 100644
--- a/install.sh
+++ b/install.sh
@@ -30,8 +30,6 @@ qpushd "$(dirname $(unix_path "$0"))"
# variables
register_env_var ACLOCAL_FLAGS " "
-register_env_var GMP_CPPFLAGS " "
-register_env_var GMP_LDFLAGS " "
register_env_var GNOME_CPPFLAGS " "
register_env_var GNOME_LDFLAGS " "
register_env_var GNUTLS_CPPFLAGS " "
@@ -71,7 +69,6 @@ add_step inst_readline
if [ "$CROSS_COMPILE" != "yes" ]; then
add_step inst_mingwutils
fi
-add_step inst_gmp
add_step inst_exetype
add_step inst_gnome
add_step inst_guile
commit 67525f6a2823cff44e18c35ff921726d42797c9b
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu Oct 10 20:07:59 2013 +0200
gettext should be before binutils
diff --git a/install-impl.sh b/install-impl.sh
index ce349b0..213f2da 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -157,6 +157,10 @@ function inst_mingw() {
mingw_smart_get mingw32-libpthread-dll ${MINGW_PTHREAD_W32_VERSION}
mingw_smart_get mingw32-libz-dll ${MINGW_ZLIB_VERSION}
mingw_smart_get mingw32-libgcc-dll ${MINGW_GCC_VERSION}
+ # Gettext and friends - should come before binutils
+ mingw_smart_get mingw32-libiconv-dev ${MINGW_LIBICONV_VERSION}
+ mingw_smart_get mingw32-libexpat-dev ${MINGW_LIBEXPAT_VERSION}
+ mingw_smart_get mingw32-gettext-dev ${MINGW_GETTEXT_VERSION}
# Binutils and GCC/G++ binaries
mingw_smart_get mingw32-binutils-bin ${MINGW_BINUTILS_VERSION}
mingw_smart_get mingw32-gcc ${MINGW_GCC_VERSION}
@@ -176,10 +180,6 @@ function inst_mingw() {
mingw_smart_get mingw32-automake ${MINGW_AUTOMAKE_VERSION}
mingw_smart_get mingw32-libtool ${MINGW_LIBTOOL_VERSION}
mingw_smart_get mingw32-libltdl ${MINGW_LIBLTDL_VERSION}
- # Gettext and friends
- mingw_smart_get mingw32-libiconv-dev ${MINGW_LIBICONV_VERSION}
- mingw_smart_get mingw32-libexpat-dev ${MINGW_LIBEXPAT_VERSION}
- mingw_smart_get mingw32-gettext-dev ${MINGW_GETTEXT_VERSION}
if [ "$CROSS_COMPILE" != "yes" ]; then
# Some additional steps, only for native (non-cross-compile)
commit 06e6b011c9dc26206ca7b5d96c2ed308e30d3b66
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu Oct 10 17:17:07 2013 +0200
Win32: manage gettext installation via mingw-get
diff --git a/defaults.sh b/defaults.sh
index 4913af0..31e33a0 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -99,9 +99,12 @@ set_default MINGW_AUTOMAKE_VERSION "4-1"
set_default MINGW_BINUTILS_VERSION "2.23.1-1"
set_default MINGW_BINUTILS_VERSION "2.23.1-1"
set_default MINGW_GCC_VERSION "4.8.1-3"
+set_default MINGW_GETTEXT_VERSION "0.18.1.1-2"
set_default MINGW_GMP_VERSION "5.1.2-1"
set_default MINGW_MPC_VERSION "1.0.1-2"
set_default MINGW_MPFR_VERSION "3.1.2-2"
+set_default MINGW_LIBEXPAT_VERSION "2.1.0-1"
+set_default MINGW_LIBICONV_VERSION "1.14-2"
set_default MINGW_LIBLTDL_VERSION "2.4-1"
set_default MINGW_LIBTOOL_VERSION "2.4-1"
set_default MINGW_PTHREAD_W32_VERSION "2.9.1-1"
diff --git a/install-impl.sh b/install-impl.sh
index c7e7b49..ce349b0 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -157,6 +157,7 @@ function inst_mingw() {
mingw_smart_get mingw32-libpthread-dll ${MINGW_PTHREAD_W32_VERSION}
mingw_smart_get mingw32-libz-dll ${MINGW_ZLIB_VERSION}
mingw_smart_get mingw32-libgcc-dll ${MINGW_GCC_VERSION}
+ # Binutils and GCC/G++ binaries
mingw_smart_get mingw32-binutils-bin ${MINGW_BINUTILS_VERSION}
mingw_smart_get mingw32-gcc ${MINGW_GCC_VERSION}
mingw_smart_get mingw32-gcc-g++ ${MINGW_GCC_VERSION}
@@ -175,6 +176,10 @@ function inst_mingw() {
mingw_smart_get mingw32-automake ${MINGW_AUTOMAKE_VERSION}
mingw_smart_get mingw32-libtool ${MINGW_LIBTOOL_VERSION}
mingw_smart_get mingw32-libltdl ${MINGW_LIBLTDL_VERSION}
+ # Gettext and friends
+ mingw_smart_get mingw32-libiconv-dev ${MINGW_LIBICONV_VERSION}
+ mingw_smart_get mingw32-libexpat-dev ${MINGW_LIBEXPAT_VERSION}
+ mingw_smart_get mingw32-gettext-dev ${MINGW_GETTEXT_VERSION}
if [ "$CROSS_COMPILE" != "yes" ]; then
# Some additional steps, only for native (non-cross-compile)
commit 6c93d7b0addffb2c62c35d5cf112b97eb26c041f
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu Oct 10 17:09:08 2013 +0200
Disable updating mingw-get's package catalog for now
That allows me to manually correct a couple of packaging bugs
while waiting for an upstream fix
diff --git a/install-impl.sh b/install-impl.sh
index be864e3..c7e7b49 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -59,7 +59,7 @@ function inst_msys() {
# The bootstrap script already set some of this up
# It will be set up again here to catch version updates of any of these packages
- mingw-get update
+ #mingw-get update
mingw-get upgrade mingw-get
# Note: msys-base can't be upgraded by this script
commit 89aa1f9d07b17fe5d7f05ad8e232946ed6e11d4b
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu Oct 10 14:23:44 2013 +0200
Win32: manage autotools installation via mingw-get
diff --git a/defaults.sh b/defaults.sh
index 31fe633..4913af0 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -84,11 +84,26 @@ set_default MINGW_DIR $GLOBAL_DIR\\mingw
# Mingw toolchain
+set_default MINGW_AUTOCONF_VERSION "10-1"
+set_default MINGW_AUTOCONF21_VERSION "2.13-4"
+set_default MINGW_AUTOCONF25_VERSION "2.68-1"
+set_default MINGW_AUTOMAKE111_VERSION "1.11.1-1"
+set_default MINGW_AUTOMAKE110_VERSION "1.10.2-1"
+set_default MINGW_AUTOMAKE19_VERSION "1.9.6-3"
+set_default MINGW_AUTOMAKE18_VERSION "1.8.5-1"
+set_default MINGW_AUTOMAKE17_VERSION "1.7.9-1"
+set_default MINGW_AUTOMAKE16_VERSION "1.6.3-1"
+set_default MINGW_AUTOMAKE15_VERSION "1.5-1"
+set_default MINGW_AUTOMAKE14_VERSION "1.4p6-1"
+set_default MINGW_AUTOMAKE_VERSION "4-1"
+set_default MINGW_BINUTILS_VERSION "2.23.1-1"
set_default MINGW_BINUTILS_VERSION "2.23.1-1"
set_default MINGW_GCC_VERSION "4.8.1-3"
set_default MINGW_GMP_VERSION "5.1.2-1"
set_default MINGW_MPC_VERSION "1.0.1-2"
set_default MINGW_MPFR_VERSION "3.1.2-2"
+set_default MINGW_LIBLTDL_VERSION "2.4-1"
+set_default MINGW_LIBTOOL_VERSION "2.4-1"
set_default MINGW_PTHREAD_W32_VERSION "2.9.1-1"
set_default MINGW_RT_VERSION "4.0.3-1"
set_default MINGW_ZLIB_VERSION "1.2.8-1"
@@ -171,11 +186,6 @@ set_default READLINE_BIN_URL "$SF_MIRROR/gnuwin32/readline-5.0-1-bin.zip"
set_default READLINE_LIB_URL "$SF_MIRROR/gnuwin32/readline-5.0-1-lib.zip"
set_default READLINE_DIR $GLOBAL_DIR\\readline
-set_default AUTOCONF_URL "http://ftp.gnu.org/gnu/autoconf/autoconf-2.63.tar.bz2"
-set_default AUTOMAKE_URL "http://ftp.gnu.org/gnu/automake/automake-1.11.1.tar.bz2"
-set_default LIBTOOL_URL "http://ftp.gnu.org/gnu/libtool/libtool-2.2.6a.tar.gz"
-set_default AUTOTOOLS_DIR $GLOBAL_DIR\\autotools
-
set_default GMP_URL "ftp://ftp.gnu.org/gnu/gmp/gmp-4.3.1.tar.bz2"
set_default GMP_ABI 32
set_default GMP_DIR $GLOBAL_DIR\\gmp
diff --git a/dist-impl.sh b/dist-impl.sh
index 579c7f7..5f1ed36 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -13,7 +13,6 @@ function dist_prepare() {
die "Please remove ${DIST_DIR} first"
fi
_UNZIP_UDIR=`unix_path $UNZIP_DIR`
- _AUTOTOOLS_UDIR=`unix_path $AUTOTOOLS_DIR`
_GUILE_UDIR=`unix_path $GUILE_DIR`
_WIN_UDIR=`unix_path $WINDIR`
_EXETYPE_UDIR=`unix_path $EXETYPE_DIR`
@@ -61,12 +60,6 @@ function dist_aqbanking() {
cp -a ${_AQBANKING_UDIR}/share/locale ${DIST_UDIR}/share
}
-function dist_autotools() {
- setup Autotools
- mkdir -p $DIST_UDIR/bin
- cp -a $_AUTOTOOLS_UDIR/bin/*.dll $DIST_UDIR/bin
-}
-
function dist_gmp() {
setup gmp
cp -a ${_GMP_UDIR}/bin/*.dll ${DIST_UDIR}/bin
diff --git a/dist.sh b/dist.sh
index 807b03b..22c0725 100755
--- a/dist.sh
+++ b/dist.sh
@@ -26,7 +26,6 @@ register_env_var PATH ":"
# steps
add_step dist_prepare
add_step dist_regex
-add_step dist_autotools
add_step dist_guile
add_step dist_gnome
add_step dist_isocodes
diff --git a/install-impl.sh b/install-impl.sh
index 6fd86fa..be864e3 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -160,6 +160,21 @@ function inst_mingw() {
mingw_smart_get mingw32-binutils-bin ${MINGW_BINUTILS_VERSION}
mingw_smart_get mingw32-gcc ${MINGW_GCC_VERSION}
mingw_smart_get mingw32-gcc-g++ ${MINGW_GCC_VERSION}
+ # Autotools
+ mingw_smart_get mingw32-autoconf2.1 ${MINGW_AUTOCONF21_VERSION}
+ mingw_smart_get mingw32-autoconf2.5 ${MINGW_AUTOCONF25_VERSION}
+ mingw_smart_get mingw32-autoconf ${MINGW_AUTOCONF_VERSION}
+ mingw_smart_get mingw32-automake1.11 ${MINGW_AUTOMAKE111_VERSION}
+ mingw_smart_get mingw32-automake1.10 ${MINGW_AUTOMAKE110_VERSION}
+ mingw_smart_get mingw32-automake1.9 ${MINGW_AUTOMAKE19_VERSION}
+ mingw_smart_get mingw32-automake1.8 ${MINGW_AUTOMAKE18_VERSION}
+ mingw_smart_get mingw32-automake1.7 ${MINGW_AUTOMAKE17_VERSION}
+ mingw_smart_get mingw32-automake1.6 ${MINGW_AUTOMAKE16_VERSION}
+ mingw_smart_get mingw32-automake1.5 ${MINGW_AUTOMAKE15_VERSION}
+ mingw_smart_get mingw32-automake1.4 ${MINGW_AUTOMAKE14_VERSION}
+ mingw_smart_get mingw32-automake ${MINGW_AUTOMAKE_VERSION}
+ mingw_smart_get mingw32-libtool ${MINGW_LIBTOOL_VERSION}
+ mingw_smart_get mingw32-libltdl ${MINGW_LIBLTDL_VERSION}
if [ "$CROSS_COMPILE" != "yes" ]; then
# Some additional steps, only for native (non-cross-compile)
@@ -173,6 +188,13 @@ function inst_mingw() {
# Test if everything worked out correctly
quiet test_for_mingw || die "mingw not installed correctly"
+ quiet autoconf --help || die "autoconf not installed correctly"
+ quiet automake --help || die "automake not installed correctly"
+ quiet libtoolize --help && \
+ quiet ${LD} -lltdl -o $TMP_UDIR/ofile || die "libtool/libtoolize not installed correctly"
+
+ # Still needed ?
+ #[ ! -d $_AUTOTOOLS_UDIR/share/aclocal ] || add_to_env "-I $_AUTOTOOLS_UDIR/share/aclocal" ACLOCAL_FLAGS
}
function inst_mingwutils() {
@@ -299,56 +321,6 @@ function inst_aqbanking() {
[ ! -d $_AQBANKING_UDIR/share/aclocal ] || add_to_env "-I $_AQBANKING_UDIR/share/aclocal" ACLOCAL_FLAGS
}
-function inst_autotools() {
- setup Autotools
- _AUTOTOOLS_UDIR=`unix_path $AUTOTOOLS_DIR`
- add_to_env $_AUTOTOOLS_UDIR/bin PATH
- add_to_env -I$_AUTOTOOLS_UDIR/include AUTOTOOLS_CPPFLAGS
- add_to_env -L$_AUTOTOOLS_UDIR/lib AUTOTOOLS_LDFLAGS
- if quiet $_AUTOTOOLS_UDIR/bin/autoconf --help && quiet $_AUTOTOOLS_UDIR/bin/automake --help
- then
- echo "autoconf/automake already installed in $_AUTOTOOLS_UDIR. skipping."
- else
- wget_unpacked $AUTOCONF_URL $DOWNLOAD_DIR $TMP_DIR
- wget_unpacked $AUTOMAKE_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/autoconf-*
- qpushd $TMP_UDIR/autoconf-*
- echo "building autoconf..."
- ./configure --prefix=$_AUTOTOOLS_UDIR
- make
- make install
- qpopd
- assert_one_dir $TMP_UDIR/automake-*
- qpushd $TMP_UDIR/automake-*
- echo "building automake..."
- ./configure --prefix=$_AUTOTOOLS_UDIR
- make
- make install
- qpopd
- quiet autoconf --help || die "autoconf not installed correctly"
- quiet automake --help || die "automake not installed correctly"
- rm -rf ${TMP_UDIR}/autoconf-* ${TMP_UDIR}/automake-*
- fi
- if quiet libtoolize --help && \
- quiet ${LD} $AUTOTOOLS_LDFLAGS -lltdl -o $TMP_UDIR/ofile
- then
- echo "libtool/libtoolize already installed. skipping."
- else
- wget_unpacked $LIBTOOL_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/libtool-*
- qpushd $TMP_UDIR/libtool-*
- echo "building libtool..."
- ./configure ${HOST_XCOMPILE} --prefix=$_AUTOTOOLS_UDIR --disable-static
- make
- make install
- qpopd
- quiet libtoolize --help && \
- quiet ${LD} $AUTOTOOLS_LDFLAGS -lltdl -o $TMP_UDIR/ofile || die "libtool/libtoolize not installed correctly"
- rm -rf ${TMP_UDIR}/libtool-*
- fi
- [ ! -d $_AUTOTOOLS_UDIR/share/aclocal ] || add_to_env "-I $_AUTOTOOLS_UDIR/share/aclocal" ACLOCAL_FLAGS
-}
-
function inst_enchant() {
setup enchant
_ENCHANT_UDIR=`unix_path $ENCHANT_DIR`
@@ -621,9 +593,9 @@ function inst_guile() {
-C --prefix=$_GUILE_WFSDIR \
ac_cv_func_regcomp_rx=yes \
CFLAGS="-D__MINGW32__" \
- CPPFLAGS="${READLINE_CPPFLAGS} ${REGEX_CPPFLAGS} ${AUTOTOOLS_CPPFLAGS} ${GMP_CPPFLAGS} -D__MINGW32__" \
- LDFLAGS="${READLINE_LDFLAGS} ${REGEX_LDFLAGS} ${AUTOTOOLS_LDFLAGS} ${GMP_LDFLAGS} -Wl,--enable-auto-import"
- make LDFLAGS="${READLINE_LDFLAGS} ${REGEX_LDFLAGS} ${AUTOTOOLS_LDFLAGS} ${GMP_LDFLAGS} -Wl,--enable-auto-import -no-undefined -avoid-version"
+ CPPFLAGS="${READLINE_CPPFLAGS} ${REGEX_CPPFLAGS} ${GMP_CPPFLAGS} -D__MINGW32__" \
+ LDFLAGS="${READLINE_LDFLAGS} ${REGEX_LDFLAGS} ${GMP_LDFLAGS} -Wl,--enable-auto-import"
+ make LDFLAGS="${READLINE_LDFLAGS} ${REGEX_LDFLAGS} ${GMP_LDFLAGS} -Wl,--enable-auto-import -no-undefined -avoid-version"
make install
qpopd
guile -c '(use-modules (srfi srfi-39))' || die "guile not installed correctly"
@@ -823,7 +795,7 @@ function inst_libdbi() {
if [ "$CROSS_COMPILE" = "yes" ]; then
rm ltmain.sh aclocal.m4
libtoolize --force
- aclocal -I ${_AUTOTOOLS_UDIR}/share/aclocal
+ aclocal
autoheader
automake --add-missing
autoconf
@@ -929,7 +901,7 @@ function inst_libofx() {
# aclocal ${ACLOCAL_FLAGS}
# automake
# autoconf
-# ACLOCAL="aclocal $ACLOCAL_FLAGS" autoreconf -fvi $ACLOCAL_FLAGS -B $_AUTOTOOLS_UDIR/share/autoconf/autoconf
+# ACLOCAL="aclocal $ACLOCAL_FLAGS" autoreconf -fvi $ACLOCAL_FLAGS
fi
./configure ${HOST_XCOMPILE} \
--prefix=${_LIBOFX_UDIR} \
@@ -1310,8 +1282,8 @@ function inst_gnucash() {
${AQBANKING_OPTIONS} \
--enable-binreloc \
--enable-locale-specific-tax \
- CPPFLAGS="${AUTOTOOLS_CPPFLAGS} ${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GMP_CPPFLAGS} ${GUILE_CPPFLAGS} ${LIBDBI_CPPFLAGS} ${KTOBLZCHECK_CPPFLAGS} ${HH_CPPFLAGS} ${LIBSOUP_CPPFLAGS} -D_WIN32 ${EXTRA_CFLAGS}" \
- LDFLAGS="${AUTOTOOLS_LDFLAGS} ${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GMP_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} ${HH_LDFLAGS} -L${_SQLITE3_UDIR}/lib -L${_ENCHANT_UDIR}/lib -L${_LIBXSLT_UDIR}/lib -L${_MINGW_UDIR}/lib" \
+ CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GMP_CPPFLAGS} ${GUILE_CPPFLAGS} ${LIBDBI_CPPFLAGS} ${KTOBLZCHECK_CPPFLAGS} ${HH_CPPFLAGS} ${LIBSOUP_CPPFLAGS} -D_WIN32 ${EXTRA_CFLAGS}" \
+ LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GMP_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} ${HH_LDFLAGS} -L${_SQLITE3_UDIR}/lib -L${_ENCHANT_UDIR}/lib -L${_LIBXSLT_UDIR}/lib -L${_MINGW_UDIR}/lib" \
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
make
@@ -1332,7 +1304,6 @@ function make_install() {
_GNOME_UDIR=`unix_path $GNOME_DIR`
_GUILE_UDIR=`unix_path $GUILE_DIR`
_REGEX_UDIR=`unix_path $REGEX_DIR`
- _AUTOTOOLS_UDIR=`unix_path $AUTOTOOLS_DIR`
_OPENSSL_UDIR=`unix_path $OPENSSL_DIR`
_GWENHYWFAR_UDIR=`unix_path ${GWENHYWFAR_DIR}`
_AQBANKING_UDIR=`unix_path ${AQBANKING_DIR}`
@@ -1396,7 +1367,6 @@ set PATH=$GNOME_DIR\\bin;%PATH%
set PATH=$GUILE_DIR\\bin;%PATH%
set PATH=$WEBKIT_DIR\\bin;%PATH%
set PATH=$REGEX_DIR\\bin;%PATH%
-set PATH=$AUTOTOOLS_DIR\\bin;%PATH%
set PATH=$AQBANKING_PATH;%PATH%
set PATH=$LIBOFX_DIR\\bin;%PATH%
set PATH=$OPENSP_DIR\\bin;%PATH%
diff --git a/install.sh b/install.sh
index 17a7aa5..e96ac07 100644
--- a/install.sh
+++ b/install.sh
@@ -30,8 +30,6 @@ qpushd "$(dirname $(unix_path "$0"))"
# variables
register_env_var ACLOCAL_FLAGS " "
-register_env_var AUTOTOOLS_CPPFLAGS " "
-register_env_var AUTOTOOLS_LDFLAGS " "
register_env_var GMP_CPPFLAGS " "
register_env_var GMP_LDFLAGS " "
register_env_var GNOME_CPPFLAGS " "
@@ -73,7 +71,6 @@ add_step inst_readline
if [ "$CROSS_COMPILE" != "yes" ]; then
add_step inst_mingwutils
fi
-add_step inst_autotools
add_step inst_gmp
add_step inst_exetype
add_step inst_gnome
commit b2cab05f8a6033c8fc5fb0b7b969fbffece7d334
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu Oct 10 12:37:47 2013 +0200
Win32: manage mingw installation via mingw-get
diff --git a/defaults.sh b/defaults.sh
index e6285f8..31fe633 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -80,23 +80,19 @@ set_default GNOME_MIRROR "ftp.gnome.org/pub/gnome"
set_default GNOME_WIN32_URL "$GNOME_MIRROR/binaries/win32"
set_default GNOME_WIN32_DEPS_URL "$GNOME_WIN32_URL/dependencies"
-set_default MINGW_RT_URL "$SF_MIRROR/mingw/mingwrt-3.18-mingw32-dev.tar.gz"
-set_default MINGW_RT_DLL_URL "$SF_MIRROR/mingw/mingwrt-3.18-mingw32-dll.tar.gz"
-set_default W32API_URL "$SF_MIRROR/mingw/w32api-3.15-1-mingw32-dev.tar.lzma"
-set_default MINGW_MAKE_URL "$SF_MIRROR/mingw/mingw32-make-3.81-20080326-3.tar.gz"
set_default MINGW_DIR $GLOBAL_DIR\\mingw
-# The URLs for precompiled gcc/mingw binaries
-set_default BINUTILS_URL "$SF_MIRROR/mingw/binutils-2.21-2-mingw32-bin.tar.lzma"
-set_default GCC_CORE_URL "$SF_MIRROR/mingw/gcc-core-4.5.2-1-mingw32-bin.tar.lzma"
-set_default GCC_CORE_DLL_URL "$SF_MIRROR/mingw/libgcc-4.5.2-1-mingw32-dll-1.tar.lzma"
-set_default GCC_GPP_URL "$SF_MIRROR/mingw/gcc-c++-4.5.2-1-mingw32-bin.tar.lzma"
-set_default GCC_GPP_DLL_URL "$SF_MIRROR/mingw/libstdc++-4.5.2-1-mingw32-dll-6.tar.lzma"
-set_default GCC_GPP_PATCH "`pwd`/gcc-c++-4.4.0.patch"
-set_default GCC_MPC_URL "$SF_MIRROR/mingw/libmpc-0.8.1-1-mingw32-dll-2.tar.lzma"
-set_default GCC_MPFR_URL "$SF_MIRROR/mingw/libmpfr-2.4.1-1-mingw32-dll-1.tar.lzma"
-set_default GCC_GMP_URL "$SF_MIRROR/mingw/libgmp-5.0.1-1-mingw32-dll-10.tar.lzma"
-set_default GCC_PTHREADS_URL "$SF_MIRROR/mingw/libpthread-2.8.0-3-mingw32-dll-2.tar.lzma"
+# Mingw toolchain
+
+set_default MINGW_BINUTILS_VERSION "2.23.1-1"
+set_default MINGW_GCC_VERSION "4.8.1-3"
+set_default MINGW_GMP_VERSION "5.1.2-1"
+set_default MINGW_MPC_VERSION "1.0.1-2"
+set_default MINGW_MPFR_VERSION "3.1.2-2"
+set_default MINGW_PTHREAD_W32_VERSION "2.9.1-1"
+set_default MINGW_RT_VERSION "4.0.3-1"
+set_default MINGW_ZLIB_VERSION "1.2.8-1"
+set_default MINGW_MAKE_VERSION "3.82-5"
if [ "$CROSS_COMPILE" != yes ]; then
# Use native toolchain
diff --git a/install-impl.sh b/install-impl.sh
index ff0dfda..6fd86fa 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -121,7 +121,8 @@ function test_for_mingw() {
if [ "$CROSS_COMPILE" == "yes" ]; then
${CC} --version && ${LD} --help
else
- g++ --version && mingw32-make --help
+# g++ --version && mingw32-make --help
+ g++ --version
fi
}
@@ -133,39 +134,45 @@ function inst_mingw() {
configure_msys "$_PID" "$_MINGW_WFSDIR"
add_to_env $_MINGW_UDIR/bin PATH
- if quiet test_for_mingw
- then
- echo "mingw already installed in $_MINGW_UDIR. skipping."
- else
- mkdir -p $_MINGW_UDIR
-
- # Download the precompiled packages in any case to get their DLLs
- wget_unpacked $BINUTILS_URL $DOWNLOAD_DIR $MINGW_DIR
- wget_unpacked $GCC_CORE_URL $DOWNLOAD_DIR $MINGW_DIR
- wget_unpacked $GCC_CORE_DLL_URL $DOWNLOAD_DIR $MINGW_DIR
- wget_unpacked $GCC_GPP_URL $DOWNLOAD_DIR $MINGW_DIR
- wget_unpacked $GCC_GPP_DLL_URL $DOWNLOAD_DIR $MINGW_DIR
- wget_unpacked $GCC_GMP_URL $DOWNLOAD_DIR $MINGW_DIR
- wget_unpacked $GCC_MPC_URL $DOWNLOAD_DIR $MINGW_DIR
- wget_unpacked $GCC_MPFR_URL $DOWNLOAD_DIR $MINGW_DIR
- wget_unpacked $GCC_PTHREADS_URL $DOWNLOAD_DIR $MINGW_DIR
- wget_unpacked $MINGW_RT_URL $DOWNLOAD_DIR $MINGW_DIR
- wget_unpacked $MINGW_RT_DLL_URL $DOWNLOAD_DIR $MINGW_DIR
- wget_unpacked $W32API_URL $DOWNLOAD_DIR $MINGW_DIR
-
- if [ "$CROSS_COMPILE" != "yes" ]; then
- wget_unpacked $MINGW_MAKE_URL $DOWNLOAD_DIR $MINGW_DIR
- (echo "y"; echo "y"; echo "$_MINGW_WFSDIR"; echo "y") | sh pi.sh
- else
- ./create_cross_mingw.sh
- fi
- quiet test_for_mingw || die "mingw not installed correctly"
- fi
+ mkdir -p $_MINGW_UDIR
+
+ # Download the precompiled packages in any case to get their DLLs
+ # NOTE: installation order matters here - care should be taken
+ # that each call to mingw_smart_get really installs one package
+ # or group of packages that embody one entity such as gcc's subpackages)
+ # This is due to the very limited package management features
+ # of mingw-get (which is called by mingw_smart_get.
+ # If multiple packages are automatically installed in
+ # one command, it becomes virtually impossible to guarantee
+ # the predetermined versions of all packages will be installed
+ # (instead of the most recent one)
+
+ # Win32 runtime and api
+ mingw_smart_get mingw32-mingwrt-dev ${MINGW_RT_VERSION}
+ mingw_smart_get mingw32-w32api-dev ${MINGW_RT_VERSION}
+ # GCC/G++ dependencies
+ mingw_smart_get mingw32-libgmp-dll ${MINGW_GMP_VERSION}
+ mingw_smart_get mingw32-libmpfr-dll ${MINGW_MPFR_VERSION}
+ mingw_smart_get mingw32-libmpc-dll ${MINGW_MPC_VERSION}
+ mingw_smart_get mingw32-libpthread-dll ${MINGW_PTHREAD_W32_VERSION}
+ mingw_smart_get mingw32-libz-dll ${MINGW_ZLIB_VERSION}
+ mingw_smart_get mingw32-libgcc-dll ${MINGW_GCC_VERSION}
+ mingw_smart_get mingw32-binutils-bin ${MINGW_BINUTILS_VERSION}
+ mingw_smart_get mingw32-gcc ${MINGW_GCC_VERSION}
+ mingw_smart_get mingw32-gcc-g++ ${MINGW_GCC_VERSION}
if [ "$CROSS_COMPILE" != "yes" ]; then
- # Some preparation steps, only for native (non-cross-compile)
- cp ${_MINGW_UDIR}/bin/libpthread-2.dll ${_MINGW_UDIR}/bin/pthreadGC2.dll
+ # Some additional steps, only for native (non-cross-compile)
+ #cp ${_MINGW_UDIR}/bin/libpthread-2.dll ${_MINGW_UDIR}/bin/pthreadGC2.dll
+ echo "Skipping lpthread copying for now, let's see if this is still needed..."
+ #mingw_smart_get mingw32-make ${MINGW_MAKE_VERSION}
+ echo "Skipping mingw32-make installation for now, let's see if this is still needed..."
+ else
+ ./create_cross_mingw.sh
fi
+
+ # Test if everything worked out correctly
+ quiet test_for_mingw || die "mingw not installed correctly"
}
function inst_mingwutils() {
commit d642b67e2ca5abcf9b3fd5df284a13c14a5009b7
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu Oct 10 12:35:47 2013 +0200
Win32: manage msys installation via mingw-get
diff --git a/defaults.sh b/defaults.sh
index 96dac7b..e6285f8 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -68,8 +68,11 @@ set_default MSYS_DIR $GLOBAL_DIR\\msys
# tools here means binaries runnable without other DLLs or data files
set_default TOOLS_DIR $GLOBAL_DIR\\tools
-set_default WGET_DIR $TOOLS_DIR
-#WGET=
+set_default MSYS_WGET_VERSION "1.12-1"
+set_default MSYS_M4_VERSION "1.4.16-2"
+set_default MSYS_PATCH_VERSION "2.6.1-1"
+set_default MSYS_PERL_VERSION "5.8.8-1"
+set_default MSYS_UNZIP_VERSION "6.0-1"
set_default SF_MIRROR "http://heanet.dl.sourceforge.net/sourceforge"
set_default GTK_MIRROR "ftp.gtk.org/pub"
@@ -77,9 +80,6 @@ set_default GNOME_MIRROR "ftp.gnome.org/pub/gnome"
set_default GNOME_WIN32_URL "$GNOME_MIRROR/binaries/win32"
set_default GNOME_WIN32_DEPS_URL "$GNOME_WIN32_URL/dependencies"
-set_default DTK_URL "$SF_MIRROR/mingw/msysDTK-1.0.1.exe"
-set_default M4_URL "$SF_MIRROR/mingw/m4-1.4.7-MSYS.tar.bz2"
-
set_default MINGW_RT_URL "$SF_MIRROR/mingw/mingwrt-3.18-mingw32-dev.tar.gz"
set_default MINGW_RT_DLL_URL "$SF_MIRROR/mingw/mingwrt-3.18-mingw32-dll.tar.gz"
set_default W32API_URL "$SF_MIRROR/mingw/w32api-3.15-1-mingw32-dev.tar.lzma"
@@ -166,9 +166,6 @@ set_default CROSS_GCC_SRC2_URL "$SF_MIRROR/mingw/gcc-4.4.0-mingw32-src-2.tar.gz"
#set_default CROSS_GCC_SRC_URL "$SF_MIRROR/mingw/gcc-4.5.0-1-mingw32-src.tar.lzma"
set_default CROSS_BINUTILS_SRC_URL "$SF_MIRROR/mingw/binutils-2.20.1-src.tar.gz"
-set_default UNZIP_URL "$SF_MIRROR/gnuwin32/unzip-5.51-1.exe"
-set_default UNZIP_DIR $TOOLS_DIR
-
# do not use regex-gnu or regex-spencer v3.8.g3, see bug #382852
set_default REGEX_URL "$GNOME_WIN32_DEPS_URL/libgnurx-2.5.zip"
set_default REGEX_DEV_URL "$GNOME_WIN32_DEPS_URL/libgnurx-dev-2.5.zip"
@@ -178,9 +175,6 @@ set_default READLINE_BIN_URL "$SF_MIRROR/gnuwin32/readline-5.0-1-bin.zip"
set_default READLINE_LIB_URL "$SF_MIRROR/gnuwin32/readline-5.0-1-lib.zip"
set_default READLINE_DIR $GLOBAL_DIR\\readline
-set_default ACTIVE_PERL_URL "http://downloads.activestate.com/ActivePerl/releases/5.16.3.1603/ActivePerl-5.16.3.1603-MSWin32-x86-296746.zip"
-set_default ACTIVE_PERL_DIR $GLOBAL_DIR\\active-perl
-
set_default AUTOCONF_URL "http://ftp.gnu.org/gnu/autoconf/autoconf-2.63.tar.bz2"
set_default AUTOMAKE_URL "http://ftp.gnu.org/gnu/automake/automake-1.11.1.tar.bz2"
set_default LIBTOOL_URL "http://ftp.gnu.org/gnu/libtool/libtool-2.2.6a.tar.gz"
diff --git a/functions.sh b/functions.sh
index 14e14df..27a3354 100644
--- a/functions.sh
+++ b/functions.sh
@@ -207,6 +207,7 @@ function configure_msys() {
SUFFIX=$1
_MINGW_WFSDIR=$2
echo "configuring msys to use $_MINGW_WFSDIR."
+ touch /etc/fstab
cp /etc/fstab /etc/fstab.$SUFFIX
sed '\,/mingw$, d' /etc/fstab > tmp
echo "$_MINGW_WFSDIR /mingw" >> tmp
diff --git a/install-impl.sh b/install-impl.sh
index 9329a87..ff0dfda 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -50,29 +50,38 @@ function inst_prepare() {
_PID=$$
}
-function check_m4_version_ok() {
- v=`m4 --version | grep -e '[0-9]*\.[0-9]*\.[0-9]*' | sed -e 's/[mM]4//g' -e 's/[^\.0-9]//g'`
- if [ "$v" = "1.4.7" -o "$v" = "1.4.11" -o "$v" = "1.4.13" ];
- then
- return 1
- else
- return 0
- fi
-}
-
-function inst_wget() {
- setup Wget
- _WGET_UDIR=`unix_path $WGET_DIR`
- add_to_env $_WGET_UDIR/bin PATH
- if quiet $_WGET_UDIR/wget --version || quiet wget --version
- then
- echo "already installed in $_WGET_UDIR/bin. skipping."
- else
- mkdir -p $_WGET_UDIR/bin
- tar -xjpf $DOWNLOAD_UDIR/wget*.tar.bz2 -C $_WGET_UDIR
- cp $_WGET_UDIR/*/*/wget.exe $_WGET_UDIR/bin
- quiet wget --version || die "wget unavailable"
- fi
+function inst_msys() {
+ setup MSys
+ _MINGW_UDIR=`unix_path $MINGW_DIR`
+ _MSYS_UDIR=`unix_path $MSYS_DIR`
+ add_to_env $_MINGW_UDIR/bin PATH
+ add_to_env $_MSYS_UDIR/bin PATH
+
+ # The bootstrap script already set some of this up
+ # It will be set up again here to catch version updates of any of these packages
+ mingw-get update
+ mingw-get upgrade mingw-get
+
+ # Note: msys-base can't be upgraded by this script
+ # it potentially will want to upgrade bash
+ # which will fail because bash is running
+ # If you want to install a newer version
+ # of msys-base anyway, then
+ # - open a traditional windows command shell
+ # - cd into your MINGW's bin directory
+ # (Default: c:\soft\mingw\bin)
+ # - run mingw-get upgrade msys-base
+ # - or mingw-get upgrade msys-base=<new-version>
+ #mingw_smart_get upgrade msys-base
+ mingw_smart_get msys-wget ${MSYS_WGET_VERSION}
+ mingw_smart_get msys-m4 ${MSYS_M4_VERSION}
+ mingw_smart_get msys-patch ${MSYS_PATCH_VERSION}
+ mingw_smart_get msys-perl ${MSYS_PERL_VERSION}
+ mingw_smart_get msys-unzip ${MSYS_UNZIP_VERSION}
+
+ quiet perl --help || die "perl not installed correctly"
+ quiet wget --version || die "wget unavailable"
+ quiet unzip --help || die "unzip unavailable"
}
function inst_cmake() {
@@ -93,32 +102,6 @@ function inst_cmake() {
fi
}
-function inst_dtk() {
- setup MSYS DTK
- _MSYS_UDIR=`unix_path $MSYS_DIR`
- if quiet ${_MSYS_UDIR}/bin/perl --help && [ check_m4_version_ok ]
- then
- echo "msys dtk already installed in ${_MSYS_UDIR}. skipping."
- else
- smart_wget $DTK_URL $DOWNLOAD_DIR
- $LAST_FILE //SP- //SILENT //DIR="$MSYS_DIR"
- for file in \
- /bin/{aclocal*,auto*,ifnames,libtool*,guile*} \
- /share/{aclocal,aclocal-1.7,autoconf,autogen,automake-1.7,guile,libtool}
- do
- [ -f $file ] || continue
- [ "${file##*.bak}" ] || continue
- _dst_file=$file.bak
- while [ -e $_dst_file ]; do _dst_file=$_dst_file.bak; done
- mv $file $_dst_file
- done
- wget_unpacked $M4_URL $DOWNLOAD_DIR $TMP_DIR
- mv $TMP_UDIR/usr/bin/m4.exe /bin
- quiet ${_MSYS_UDIR}/bin/perl --help &&
- [ check_m4_version_ok ] || die "msys dtk not installed correctly"
- fi
-}
-
function inst_exetype() {
setup exetype
_EXETYPE_UDIR=`unix_path $EXETYPE_DIR`
@@ -237,20 +220,6 @@ function inst_swig() {
fi
}
-function inst_unzip() {
- setup Unzip
- _UNZIP_UDIR=`unix_path $UNZIP_DIR`
- add_to_env $_UNZIP_UDIR/bin PATH
- if quiet $_UNZIP_UDIR/bin/unzip --help || quiet unzip --help
- then
- echo "unzip already installed in $_UNZIP_UDIR. skipping."
- else
- smart_wget $UNZIP_URL $DOWNLOAD_DIR
- $LAST_FILE //SP- //SILENT //DIR="$UNZIP_DIR"
- quiet unzip --help || die "unzip unavailable"
- fi
-}
-
function inst_git() {
setup Git
_GIT_UDIR=`unix_path $GIT_DIR`
@@ -275,29 +244,6 @@ function inst_git() {
[ -n "$GIT_CMD" ] && export GIT_CMD
}
-# Functions before this point are basic build infrastructure functions or else they get pieces needed to build
-# gnucash but which are not part of the final product. Functions after this point are for components of the
-# final build. Please leave in alphabetical order so they are easier to find.
-
-function inst_active_perl() {
- setup ActivePerl \(intltool\)
- _ACTIVE_PERL_UDIR=`unix_path $ACTIVE_PERL_DIR`
- _ACTIVE_PERL_BASE_DIR=$_ACTIVE_PERL_UDIR/ActivePerl/Perl
- _ACTIVE_PERL_WFSDIR=`win_fs_path $ACTIVE_PERL_DIR`
- set_env_or_die $_ACTIVE_PERL_WFSDIR/ActivePerl/Perl/bin/perl INTLTOOL_PERL
- if quiet $INTLTOOL_PERL --help
- then
- echo "ActivePerl already installed IN $_ACTIVE_PERL_UDIR. skipping."
- else
- wget_unpacked $ACTIVE_PERL_URL $DOWNLOAD_DIR $ACTIVE_PERL_DIR
- qpushd $_ACTIVE_PERL_UDIR
- assert_one_dir ActivePerl-*
- mv ActivePerl-* ActivePerl
- qpopd
- quiet $INTLTOOL_PERL --help || die "ActivePerl not installed correctly"
- fi
-}
-
function inst_aqbanking() {
setup AqBanking
_AQBANKING_UDIR=`unix_path ${AQBANKING_DIR}`
diff --git a/install.sh b/install.sh
index bacc5fb..17a7aa5 100644
--- a/install.sh
+++ b/install.sh
@@ -65,15 +65,12 @@ register_env_var SQLITE3_LIBS " "
# * commented out glade, as it is not needed to run gnucash
add_step inst_prepare
if [ "$CROSS_COMPILE" != "yes" ]; then
- add_step inst_wget
- add_step inst_dtk
- add_step inst_unzip
+ add_step inst_msys
fi
add_step inst_mingw
add_step inst_regex
add_step inst_readline
if [ "$CROSS_COMPILE" != "yes" ]; then
- add_step inst_active_perl
add_step inst_mingwutils
fi
add_step inst_autotools
commit 203a558324f9905678911c5b002844c09f374fe0
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu Oct 10 12:22:15 2013 +0200
Win32: introduce a wrapper function around mingw-get
This function is to work around mingw-get's unfortunate refusal to
upgrade a package when calling mingw-get install on an already
installed one or mingw-get upgrade on a package that's not installed
diff --git a/functions.sh b/functions.sh
index b7142a9..14e14df 100644
--- a/functions.sh
+++ b/functions.sh
@@ -222,6 +222,72 @@ function restore_msys() {
fi
}
+function mingw_smart_get () {
+ PACKAGE=$1
+ VERSION=$2
+
+ # Check if a sensible package name has been given
+ [ "$PACKAGE" ] || return
+
+ _MINGW_UDIR=`unix_path $MINGW_DIR`
+
+ # Check if a package has already been installed or not. This is
+ # a workaround for mingw-get's unfortunate refusal to upgrade a
+ # package when calling mingw-get install on an already installed one
+ # or mingw-get upgrade on a package that's not installed
+
+ # Note: awk is used below instead of grep, because the tests
+ # can return without a result. Grep exists with a non-zero
+ # exit value in that case, which will cause the script to
+ # abort (due to set -e being set). Awk does not.
+
+ COMPONENTS="$(mingw-get show "$PACKAGE" | awk '/Components:/')"
+ if [ -n "$COMPONENTS" ]
+ then
+ # This package has subcomponents, we need to test
+ # the install status of the subcomponents instead
+ # Since we call mingw-get on the general package name
+ # all subcomponents normally get installed together
+ # so testing for only one subcomponent should be sufficient
+ # This assumption may lead to a situation where manulal
+ # intervention is needed in case of errors during mingw-get calls
+ # Let's hope that such errors are the exception
+ COMPONENT="${COMPONENTS#Components: }"
+ COMPONENT="${COMPONENT%%,*}"
+ SUBPACKAGE="$PACKAGE-$COMPONENT"
+ else
+ SUBPACKAGE="$PACKAGE"
+ fi
+
+ INSTVERSION="$(mingw-get show "$SUBPACKAGE" | awk '/Installed Version:/')"
+ INSTVERSION="${INSTVERSION#Installed Version: }"
+ REPOVERSION="$(mingw-get show "$SUBPACKAGE" | awk '/Repository Version:/')"
+ REPOVERSION="${REPOVERSION#Repository Version: }"
+
+ # If a version string is given add add it to the package name
+ [ -n "$VERSION" ] && PACKAGE="${PACKAGE}=${VERSION}"
+
+ if [ -z "$INSTVERSION" ]
+ then
+ # Unknown package
+ die "Package $PACKAGE is unknown by mingw."
+ elif [ "$INSTVERSION" == "none" ]
+ then
+ # Package not yet installed
+ $_MINGW_UDIR/bin/mingw-get install ${PACKAGE}
+ elif [ -n "$VERSION" ] && [ -z "$(echo "$INSTVERSION" | awk "/$VERSION/")" ]
+ then
+ # Requested version differs from installed version
+ $_MINGW_UDIR/bin/mingw-get upgrade ${PACKAGE}
+ elif [ -z "$VERSION" ] && [ "$INSTVERSION" != "$REPOVERSION" ]
+ then
+ # No version requested, but installed version differs from version in repo
+ $_MINGW_UDIR/bin/mingw-get upgrade ${PACKAGE}
+ else
+ echo "Package $PACKAGE is up to date"
+ fi
+}
+
### Local Variables: ***
### mode: shell-script ***
### sh-basic-offset: 4 ***
commit 4a0806ee47ca7e0697dd52e32afade918a3ab921
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu Oct 10 12:19:22 2013 +0200
Win32: some improvement to the bootstrap script
diff --git a/bootstrap_win_dev.vbs b/bootstrap_win_dev.vbs
index 2d2a195..802cd00 100644
--- a/bootstrap_win_dev.vbs
+++ b/bootstrap_win_dev.vbs
@@ -107,9 +107,11 @@ Else
If objFso.FolderExists(strMingwTmpDir) Then
objFso.DeleteFolder strMingwTmpDir , True
End If
- ExtractAll objFso.GetAbsolutePathName(".")& "\mingw-get.zip", strMingwTmpDir
+ ExtractAll DOWNLOAD_DIR & "\mingw-get.zip", strMingwTmpDir
objFso.CopyFolder strMingwTmpDir & "\*", MINGW_DIR, True
objFso.DeleteFolder strMingwTmpDir , True
+ ' Create a default profile for mingw-get to avoid constant warnings
+ objFso.CopyFile MINGW_DIR & "\var\lib\mingw-get\data\defaults.xml", MINGW_DIR & "\var\lib\mingw-get\data\profile.xml"
stdout.WriteLine "Success"
End If
@@ -122,7 +124,7 @@ End If
stdout.Write "Installing msys and wget... "
strMingwGet = MINGW_DIR & "\bin\mingw-get.exe"
-objWsh.Run strMingwGet & " install msys-base msys-wget", 1, True
+objWsh.Run strMingwGet & " install mingw-get msys-base msys-wget", 1, True
'Set objExec = objWsh.Exec (strMingwGet & " install msys-base msys-wget")
strWget = MINGW_DIR & "\msys\1.0\bin\wget.exe"
commit ca365f2424b8d44607b4682b2d582b0a731e185d
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Apr 28 10:05:42 2014 +0200
Update bootstrap script to work from separate repository
diff --git a/bootstrap_win_dev.vbs b/bootstrap_win_dev.vbs
index ca77552..2d2a195 100644
--- a/bootstrap_win_dev.vbs
+++ b/bootstrap_win_dev.vbs
@@ -33,7 +33,7 @@ CheckStartMode
' running this bootstrap script.
' Note: avoid paths with spaces or other special characters (like &).
' these can confuse msys/mingw or some of the tools depending on them.
-GLOBAL_DIR = "c:\soft"
+GLOBAL_DIR = "c:\gcdev"
MINGW_DIR = GLOBAL_DIR & "\mingw"
TMP_DIR= GLOBAL_DIR & "\tmp"
DOWNLOAD_DIR= GLOBAL_DIR & "\downloads"
@@ -41,6 +41,8 @@ GIT_PKG = "Git-1.7.10-preview20120409.exe"
strGitBaseUrl = "http://msysgit.googlecode.com/files/"
GIT_URL = strGitBaseUrl & GIT_PKG
GIT_DIR = GLOBAL_DIR & "\git-1.7.10"
+GC_WIN_REPOS_URL = "git://github.com/gjanssens/gnucash-on-windows.git"
+GC_WIN_REPOS_DIR = GLOBAL_DIR & "\gnucash-on-windows.git"
REPOS_URL = "git://github.com/Gnucash/gnucash.git"
REPOS_DIR = GLOBAL_DIR & "\gnucash.git"
@@ -178,19 +180,44 @@ Else
End If
-' Set up git repository
-' ---------------------
-strInstall = REPOS_DIR & "\packaging\win32\install.sh"
+' Set up gnucash-on-windows git repository
+' ----------------------------------------
+strBootstrap = GC_WIN_REPOS_DIR & "\bootstrap_win_dev.vbs"
+stdout.WriteLine "Checking if " & GC_WIN_REPOS_DIR
+stdout.Write " is a gnucash-on-windows git repository... "
+If objFso.FolderExists(GC_WIN_REPOS_DIR & "\.git") And objFso.FileExists(strBootstrap) Then
+ stdout.WriteLine "Most likely ok, won't clone"
+Else
+ stdout.WriteLine "Not found"
+ stdout.WriteLine "Set up gnucash-on-windows git repository... "
+ objWsh.Run strGit & " clone " & GC_WIN_REPOS_URL & " " & GC_WIN_REPOS_DIR, 1, true
+
+ If Not objFso.FileExists(strBootstrap) Then
+ stdout.WriteLine "Failed"
+ stdout.WriteBlankLines (1)
+ stdout.WriteLine "*** ERROR ***"
+ stdout.WriteLine "Failed to set up gnucash-on-windows git repository."
+ stdout.WriteBlankLines (1)
+ stdout.WriteLine "Cannot continue until this has been resolved."
+ AbortScript
+ End If
+ stdout.WriteLine "Ok"
+End If
+
+
+' Set up gnucash git repository
+' -----------------------------
+strGCbin = REPOS_DIR & "\src\bin\gnucash-bin.c"
stdout.WriteLine "Checking if " & REPOS_DIR
stdout.Write " is a GnuCash git repository... "
-If objFso.FolderExists(REPOS_DIR & "\.git") And objFso.FileExists(strInstall) Then
+If objFso.FolderExists(REPOS_DIR & "\.git") And objFso.FileExists(strGCbin) Then
stdout.WriteLine "Most likely ok, won't clone"
Else
stdout.WriteLine "Not found"
stdout.WriteLine "Set up GnuCash git repository... "
objWsh.Run strGit & " clone " & REPOS_URL & " " & REPOS_DIR, 1, true
- If Not objFso.FileExists(strInstall) Then
+ If Not objFso.FileExists(strGCbin) Then
stdout.WriteLine "Failed"
stdout.WriteBlankLines (1)
stdout.WriteLine "*** ERROR ***"
@@ -204,7 +231,7 @@ End If
' Create custom.sh
' ----------------
-strCustomSh = REPOS_DIR & "\packaging\win32\custom.sh"
+strCustomSh = GC_WIN_REPOS_DIR & "\custom.sh"
bExistingCustomSh = False
If objFso.FileExists(strCustomSh) Then
stdout.WriteLine "Found existing custom.sh file"
@@ -219,13 +246,14 @@ Else
myRegExp.Global = True
myRegExp.Pattern = "\\"
- strGlobalDir = myRegExp.Replace (GLOBAL_DIR, "\\")
- strMingwDir = myRegExp.Replace (MINGW_DIR, "\\")
- strMsysDir = myRegExp.Replace (MINGW_DIR & "\msys\1.0", "\\")
- strTmpDir = myRegExp.Replace (TMP_DIR, "\\")
- strDownloadDir = myRegExp.Replace (DOWNLOAD_DIR, "\\")
- strGitDir = myRegExp.Replace (GIT_DIR, "\\")
- strReposDir = myRegExp.Replace (REPOS_DIR, "\\")
+ strGlobalDir = myRegExp.Replace (GLOBAL_DIR, "\\")
+ strMingwDir = myRegExp.Replace (MINGW_DIR, "\\")
+ strMsysDir = myRegExp.Replace (MINGW_DIR & "\msys\1.0", "\\")
+ strTmpDir = myRegExp.Replace (TMP_DIR, "\\")
+ strDownloadDir = myRegExp.Replace (DOWNLOAD_DIR, "\\")
+ strGitDir = myRegExp.Replace (GIT_DIR, "\\")
+ strGCWinReposDir = myRegExp.Replace (REPOS_DIR, "\\")
+ strReposDir = myRegExp.Replace (REPOS_DIR, "\\")
Set objCustomSh = objFso.OpenTextFile( strCustomSh, ForWriting, True )
objCustomSh.WriteLine "# custom.sh, automatically created by bootstrap_win_dev.vbs"
@@ -247,6 +275,8 @@ Else
objCustomSh.WriteLine "DOWNLOAD_DIR=" & strDownloadDir
objCustomSh.WriteLine "GIT_DIR=" & strGitDir
objCustomSh.WriteLine "REPOS_TYPE=git" ' Bootstrap only works with a git repo
+ objCustomSh.WriteLine "GC_WIN_REPOS_URL=" & GC_WIN_REPOS_URL
+ objCustomSh.WriteLine "GC_WIN_REPOS_DIR=" & strReposDir
objCustomSh.WriteLine "REPOS_URL=" & REPOS_URL
objCustomSh.WriteLine "REPOS_DIR=" & strReposDir
objCustomSh.Close
@@ -260,8 +290,9 @@ stdout.WriteBlankLines 1
stdout.WriteLine "Bootstrap completed successfully !"
stdout.WriteBlankLines 1
stdout.WriteLine "You can now continue as follows"
+stdout.WriteLine "- Use git to checkout the desired branch/tag in " & REPOS_DIR
stdout.WriteLine "- Open the msys shell"
-stdout.WriteLine "- cd " & REPOS_DIR & "\packaging\win32"
+stdout.WriteLine "- cd " & GC_WIN_REPOS_DIR
stdout.WriteLine "- Properly configure a custom.sh"
stdout.WriteLine " (if you changed any default path in the bootstrap script)"
stdout.WriteLine "- Run install.sh"
@@ -283,6 +314,9 @@ Sub Welcome
stdout.WriteLine "It will install"
stdout.WriteLine "- mingw-get, an msys shell and wget in " & MINGW_DIR
stdout.WriteLine "- git in " & GIT_DIR
+ stdout.WriteLine "- a gnucash-on-windows git repository cloned from"
+ stdout.WriteLine " " & GC_WIN_REPOS_URL
+ stdout.WriteLine " into " & GC_WIN_REPOS_DIR
stdout.WriteLine "- a GnuCash git repository cloned from"
stdout.WriteLine " " & REPOS_URL
stdout.WriteLine " into " & REPOS_DIR
commit 44c29f72c91230b660f107b4e827d8cd942d4b2a
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sun Apr 27 19:53:47 2014 +0200
Add mingw-get.zip
This is an exact copy of mingw-get-0.5-mingw32-beta-20120426-1-bin.zip
found on Mingw's Source Forge download page at:
https://sourceforge.net/projects/mingw/files/Installer/mingw-get/mingw-get-0.5-beta-20120426-1/
(You can verify this by downloading both versions and
comparing their respective sha256sums if you like).
The reason I'm copying it here is simply that I haven't found a way
to download from Source Forge in a Windows script using only
pure Windows features (meaning without first having to install
some tool manually).
This strict requirement is necessary for a good bootstrap script
to get interested people into GnuCash development on Windows
with the least amount of hassle.
diff --git a/mingw-get.zip b/mingw-get.zip
new file mode 100755
index 0000000..0334dad
Binary files /dev/null and b/mingw-get.zip differ
commit 3be38048a9d0673a1ac4ca1089a8dd2bbd2517c5
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sun Apr 27 19:40:24 2014 +0200
Force proper line-endings
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..551dda8
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,35 @@
+# Default setting
+* text=auto
+
+# Files that should stay LF at all times
+*.am text eol=lf
+*.c text eol=lf
+*.chk text eol=lf
+*.cpp text eol=lf
+*.gnucash-xea text eol=lf
+*.h text eol=lf
+*.hpp text eol=lf
+*.html text eol=lf
+*.i text eol=lf
+*.in text eol=lf
+*.js text eol=lf
+*.m4 text eol=lf
+*.patch text eol=lf
+*.pl text eol=lf
+*.po text eol=lf
+*.py text eol=lf
+*.qif text eol=lf
+*.scm text eol=lf
+*.sh text eol=lf
+*.svg text eol=lf
+*.xsl text eol=lf
+
+# Files that should use CRLF at all times
+*.bat text eol=crlf
+*.cmd text eol=crlf
+*.isl text eol=crlf
+*.vbs text eol=crlf
+
+gnucash.iss.in text eol=crlf
+gnucash.rc.in text eol=crlf
+README*win32-bin.txt text eol=crlf
diff --git a/ChineseSimp-12-5.1.11.isl b/ChineseSimp-12-5.1.11.isl
index 2ef69e2..5f54e3e 100644
--- a/ChineseSimp-12-5.1.11.isl
+++ b/ChineseSimp-12-5.1.11.isl
@@ -1,320 +1,320 @@
-; *** Inno Setup version 5.1.11+ Simplified Chinese messages ***
-;
-; Based on previous version by Peng Bai
-; Update by Mack Zhang (hua_wuxin at 21cn.com) on Apr. 10, 2008
-;
-; To download user-contributed translations of this file, go to:
-; http://www.jrsoftware.org/files/istrans/
-;
-; Note: When translating this text, do not add periods (.) to the end of
-; messages that didn't have them already, because on those messages Inno
-; Setup adds the periods automatically (appending a period would result in
-; two periods being displayed).
-
-[LangOptions]
-; The following three entries are very important. Be sure to read and
-; understand the '[LangOptions] section' topic in the help file.
-LanguageName=Chinese(Simplified)
-LanguageID=$0804
-LanguageCodePage=936
-; If the language you are translating to requires special font faces or
-; sizes, uncomment any of the following entries and change them accordingly.
-DialogFontName=ËÎÌå
-DialogFontSize=9
-;WelcomeFontName=Verdana
-;WelcomeFontSize=12
-;TitleFontName=Arial
-;TitleFontSize=29
-;CopyrightFontName=Arial
-;CopyrightFontSize=8
-
-[Messages]
-
-; *** Application titles
-SetupAppTitle=°²×°Ïòµ¼
-SetupWindowTitle=°²×°Ïòµ¼ - %1
-UninstallAppTitle=жÔØÏòµ¼
-UninstallAppFullTitle=%1 жÔØÏòµ¼
-
-; *** Misc. common
-InformationTitle=ÐÅÏ¢
-ConfirmTitle=È·ÈÏ
-ErrorTitle=´íÎó
-
-; *** SetupLdr messages
-SetupLdrStartupMessage=°²×°Ïòµ¼½«ÔÚÄãµÄµçÄÔÉÏ°²×° %1¡£ÄãÈ·¶¨Òª¼ÌÐøÂð£¿
-LdrCannotCreateTemp=ÎÞ·¨´´½¨ÁÙʱÎļþ¡£°²×°ÖÐÖ¹
-LdrCannotExecTemp=ÎÞ·¨ÔËÐÐÁÙʱÎļþ¼ÐÖеÄÎļþ¡£°²×°ÖÐÖ¹
-
-; *** Startup error messages
-LastErrorMessage=%1.%n%n´íÎó %2£º%3
-SetupFileMissing=°²×°Îļþ¼ÐȱÉÙÎļþ %1¡£Çë¾ÀÕý´ËÎÊÌâ»òÕßË÷È¡Èí¼þµÄа汾¡£
-SetupFileCorrupt=°²×°ÎļþÒÑË𻵡£ÇëË÷È¡Èí¼þµÄа汾¡£
-SetupFileCorruptOrWrongVer=°²×°ÎļþÒÑË𻵣¬»òÕßÓë´Ë°²×°Ïòµ¼µÄ°æ±¾²»¼æÈÝ¡£Çë¾ÀÕý´ËÎÊÌâ»òÕßË÷È¡Èí¼þµÄа汾¡£
-NotOnThisPlatform=´Ë³ÌÐò²»ÄÜÔÚ %1 ÉÏÔËÐС£
-OnlyOnThisPlatform=´Ë³ÌÐò±ØÐëÔÚ %1 ÉÏÔËÐС£
-OnlyOnTheseArchitectures=´Ë³ÌÐòÖ»ÄÜ°²×°ÔÚΪÏÂÁд¦ÀíÆ÷¼Ü¹¹Éè¼ÆµÄ Windows °æ±¾ÖУº%n%n%1
-MissingWOW64APIs=µ±Ç°µÄ Windows °æ±¾Ã»Óаüº¬Ö´ÐÐ 64 λ°²×°Ïòµ¼ËùÐèµÄº¯Êý¡£ÈôÒª¾ÀÕý´ËÎÊÌ⣬Çë°²×° Service Pack %1¡£
-WinVersionTooLowError=´Ë³ÌÐòÐèÒª %1 v%2 »ò¸ü¸ß°æ±¾¡£
-WinVersionTooHighError=´Ë³ÌÐò²»ÄÜ°²×°ÔÚ %1 v%2 »ò¸ü¸ß°æ±¾ÉÏ¡£
-AdminPrivilegesRequired=°²×°´Ë³ÌÐòʱÄã±ØÐëÒÔ¹ÜÀíÔ±Éí·ÝµÇ¼¡£
-PowerUserPrivilegesRequired=°²×°´Ë³ÌÐòʱÄã±ØÐëÒÔ¹ÜÀíÔ±»ò Power Users ×é³ÉÔ±µÄÉí·ÝµÇ¼¡£
-SetupAppRunningError=°²×°Ïòµ¼·¢ÏÖ %1 ÕýÔÚÔËÐС£%n%nÇëÁ¢¼´¹Ø±ÕÆäËùÓÐʵÀý£¬È»ºóµ¥»÷¡°È·¶¨¡±¼ÌÐø£¬»òµ¥»÷¡°È¡Ïû¡±Í˳ö¡£
-UninstallAppRunningError=жÔسÌÐò·¢ÏÖ %1 ÕýÔÚÔËÐС£%n%nÇëÁ¢¼´¹Ø±ÕÆäËùÓÐʵÀý£¬È»ºóµ¥»÷¡°È·¶¨¡±¼ÌÐø£¬»òµ¥»÷¡°È¡Ïû¡±Í˳ö¡£
-
-; *** Misc. errors
-ErrorCreatingDir=°²×°Ïòµ¼ÎÞ·¨´´½¨Îļþ¼Ð¡°%1¡±
-ErrorTooManyFilesInDir=ÎÞ·¨ÔÚÎļþ¼Ð¡°%1¡±Öд´½¨Îļþ£¬ÒòΪËü°üº¬ÁËÌ«¶àÎļþ
-
-; *** Setup common messages
-ExitSetupTitle=Í˳ö°²×°
-ExitSetupMessage=°²×°ÉÐδÍê³É¡£Èç¹ûÄãÏÖÔÚÍ˳ö£¬Èí¼þ½«²»»á°²×°¡£%n%nÄã¿ÉÒÔÔÚÆäËüʱ¼äÖØÐÂÔËÐа²×°Ïòµ¼À´Íê³É°²×°¡£%n%nÏÖÔÚÍ˳ö°²×°Âð£¿
-AboutSetupMenuItem=¹ØÓÚ°²×°Ïòµ¼(&A)...
-AboutSetupTitle=¹ØÓÚ°²×°Ïòµ¼
-AboutSetupMessage=%1 °æ±¾ %2%n%3%n%n%1 Ö÷Ò³£º%n%4
-AboutSetupNote=
-TranslatorNote=
-
-; *** Buttons
-ButtonBack=< ÉÏÒ»²½(&B)
-ButtonNext=ÏÂÒ»²½(&N) >
-ButtonInstall=°²×°(&I)
-ButtonOK=È·¶¨
-ButtonCancel=È¡Ïû
-ButtonYes=ÊÇ(&Y)
-ButtonYesToAll=È«ÊÇ(&A)
-ButtonNo=·ñ(&N)
-ButtonNoToAll=È«·ñ(&O)
-ButtonFinish=Íê³É(&F)
-ButtonBrowse=ä¯ÀÀ(&B)...
-ButtonWizardBrowse=ä¯ÀÀ(&R)...
-ButtonNewFolder=´´½¨Îļþ¼Ð(&M)
-
-; *** "Select Language" dialog messages
-SelectLanguageTitle=Ñ¡Ôñ°²×°ÓïÑÔ
-SelectLanguageLabel=Ñ¡Ôñ°²×°ÆÚ¼äҪʹÓõÄÓïÑÔ£º
-
-; *** Common wizard text
-ClickNext=µ¥»÷¡°ÏÂÒ»²½¡±¼ÌÐø£¬»òµ¥»÷¡°È¡Ïû¡±Í˳ö°²×°¡£
-BeveledLabel=
-BrowseDialogTitle=ä¯ÀÀÎļþ¼Ð
-BrowseDialogLabel=Ñ¡ÔñÒ»¸öÎļþ¼Ð£¬È»ºóµ¥»÷¡°È·¶¨¡±¡£
-NewFolderName=н¨Îļþ¼Ð
-
-; *** "Welcome" wizard page
-WelcomeLabel1=»¶ÓʹÓà [name] °²×°Ïòµ¼
-WelcomeLabel2=°²×°Ïòµ¼½«ÔÚÄãµÄµçÄÔÉÏ°²×° [name/ver]¡£%n%n½¨ÒéÄãÔÚ¼ÌÐø֮ǰ¹Ø±ÕËùÓÐÆäËüÓ¦ÓóÌÐò¡£
-
-; *** "Password" wizard page
-WizardPassword=ÃÜÂë
-PasswordLabel1=´Ë°²×°Ïòµ¼ÓÐÃÜÂë±£»¤¡£
-PasswordLabel3=ÇëÊäÈëÃÜÂ룬Ȼºóµ¥»÷¡°ÏÂÒ»²½¡±½øÈëÏÂÒ»²½¡£ÃÜÂëÇø·Ö´óСд¡£
-PasswordEditLabel=ÃÜÂë(&P)£º
-IncorrectPassword=ÄãÊäÈëµÄÃÜÂë²»ÕýÈ·¡£ÇëÖØÊÔ¡£
-
-; *** "License Agreement" wizard page
-WizardLicense=Ðí¿ÉÐÒé
-LicenseLabel=ÇëÔÚ¼ÌÐø֮ǰÔĶÁÒÔÏÂÖØÒªÐÅÏ¢¡£
-LicenseLabel3=ÇëÔĶÁÒÔÏÂÐí¿ÉÐÒé¡£ÔÚ¼ÌÐø°²×°Ö®Ç°£¬Äã±ØÐë½ÓÊÜ´ËÐÒéµÄÌõ¿î¡£
-LicenseAccepted=ÎÒ½ÓÊÜÐÒé(&A)
-LicenseNotAccepted=ÎÒ²»½ÓÊÜÐÒé(&D)
-
-; *** "Information" wizard pages
-WizardInfoBefore=ÐÅÏ¢
-InfoBeforeLabel=ÇëÔÚ¼ÌÐø֮ǰÔĶÁÒÔÏÂÖØÒªÐÅÏ¢¡£
-InfoBeforeClickLabel=µ±Äã×¼±¸ºÃ¼ÌÐø°²×°ºó£¬Çëµ¥»÷¡°ÏÂÒ»²½¡±¡£
-WizardInfoAfter=ÐÅÏ¢
-InfoAfterLabel=ÇëÔÚ¼ÌÐø֮ǰÔĶÁÒÔÏÂÖØÒªÐÅÏ¢¡£
-InfoAfterClickLabel=µ±Äã×¼±¸ºÃ¼ÌÐø°²×°ºó£¬Çëµ¥»÷¡°ÏÂÒ»²½¡±¡£
-
-; *** "User Information" wizard page
-WizardUserInfo=Óû§ÐÅÏ¢
-UserInfoDesc=ÇëÊäÈëÄãµÄÐÅÏ¢¡£
-UserInfoName=Óû§Ãû(&U)£º
-UserInfoOrg=×éÖ¯(&O)£º
-UserInfoSerial=ÐòÁкÅ(&S)£º
-UserInfoNameRequired=±ØÐëÊäÈëÓû§Ãû¡£
-
-; *** "Select Destination Location" wizard page
-WizardSelectDir=Ñ¡ÔñÄ¿±êλÖÃ
-SelectDirDesc=½« [name] °²×°µ½ÄÄÀ
-SelectDirLabel3=°²×°Ïòµ¼½«°Ñ [name] °²×°µ½ÒÔÏÂÎļþ¼ÐÖС£
-SelectDirBrowseLabel=ÈôÒª¼ÌÐø£¬µ¥»÷¡°ÏÂÒ»²½¡±¡£Èç¹ûÄãҪѡÔñ²»Í¬µÄÎļþ¼Ð£¬Çëµ¥»÷¡°ä¯ÀÀ¡±¡£
-DiskSpaceMBLabel=ÖÁÉÙÐèÒª [mb] MB µÄ¿ÕÏдÅÅ̿ռ䡣
-ToUNCPathname=°²×°Ïòµ¼²»ÄÜ°²×°µ½ UNC ·¾¶¡£Èç¹ûÄãÊÇҪͨ¹ýÍøÂç°²×°£¬ÇëÓ³ÉäÍøÂçÇý¶¯Æ÷¡£
-InvalidPath=Äã±ØÐëÊäÈë´øÓÐÅÌ·ûµÄÍêÕû·¾¶¡£ÀýÈ磺%n%nC:\APP%n%n»òÕß UNC ·¾¶¸ñʽ£º%n%n\\server\share
-InvalidDrive=ÄãÑ¡ÔñµÄÇý¶¯Æ÷»ò UNC ¹²Ïí²»´æÔÚ»ò²»¿É·ÃÎÊ¡£ÇëÖØÐÂÑ¡Ôñ¡£
-DiskSpaceWarningTitle=ûÓÐ×ã¹»µÄ´ÅÅÌ¿Õ¼ä
-DiskSpaceWarning=°²×°Ïòµ¼ÖÁÉÙÐèÒª %1 KB µÄÊ£Óà¿Õ¼ä£¬µ«ÊÇËùÑ¡Çý¶¯Æ÷Ö»ÓÐ %2 KB ¿ÉÓá£%n%nÄãÎÞÂÛÈçºÎÒ²Òª¼ÌÐøÂð£¿
-DirNameTooLong=Îļþ¼ÐÃû³Æ»ò·¾¶Ì«³¤¡£
-InvalidDirName=Îļþ¼ÐÃû³ÆÎÞЧ¡£
-BadDirName32=Îļþ¼ÐÃû³Æ²»ÄÜ°üº¬ÏÂÁÐ×Ö·û£º%n%n%1
-DirExistsTitle=Îļþ¼ÐÒÑ´æÔÚ
-DirExists=Îļþ¼Ð£º%n%n%1%n%nÒÑ´æÔÚ¡£ÄãÈ·¶¨Òª°²×°µ½¸ÃÎļþ¼ÐÂð£¿
-DirDoesntExistTitle=Îļþ¼Ð²»´æÔÚ
-DirDoesntExist=Îļþ¼Ð£º%n%n%1%n%n²»´æÔÚ¡£´´½¨¸ÃÎļþ¼ÐÂð£¿
-
-; *** "Select Components" wizard page
-WizardSelectComponents=Ñ¡Ôñ×é¼þ
-SelectComponentsDesc=Òª°²×°ÄÄЩ×é¼þ£¿
-SelectComponentsLabel2=ÇëÑ¡ÔñÄãÒª°²×°µÄ×é¼þ£¬Çå³ýÄã²»Ïë°²×°µÄ×é¼þ¡£×¼±¸ºÃºóµã»÷¡°ÏÂÒ»²½¡±¡£
-FullInstallation=ÍêÕû°²×°
-; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
-CompactInstallation=¼ò½à°²×°
-CustomInstallation=¶¨ÖÆ°²×°
-NoUninstallWarningTitle=×é¼þÒÑ´æÔÚ
-NoUninstallWarning=°²×°Ïòµ¼·¢ÏÖÏÂÁÐ×é¼þÒѾ°²×°£º%n%n%1%n%nÈ¡ÏûÑ¡¶¨²»»áжÔØÕâЩ×é¼þ¡£%n%n¼ÌÐø°²×°Âð£¿
-ComponentSize1=%1 KB
-ComponentSize2=%1 MB
-ComponentsDiskSpaceMBLabel=µ±Ç°µÄÑ¡ÔñÖÁÉÙÐèÒª [mb] MB ´ÅÅ̿ռ䡣
-
-; *** "Select Additional Tasks" wizard page
-WizardSelectTasks=Ñ¡Ôñ¸½¼ÓÈÎÎñ
-SelectTasksDesc=ÒªÖ´ÐÐÄÄЩ¸½¼ÓÈÎÎñ£¿
-SelectTasksLabel2=ÇëÑ¡ÔñÔÚ°²×° [name] Æڼ䰲װÏòµ¼ÒªÖ´Ðеĸ½¼ÓÈÎÎñ£¬È»ºóµã»÷¡°ÏÂÒ»²½¡±¡£
-
-; *** "Select Start Menu Folder" wizard page
-WizardSelectProgramGroup=Ñ¡Ôñ¿ªÊ¼²Ëµ¥Îļþ¼Ð
-SelectStartMenuFolderDesc=°Ñ³ÌÐò¿ì½Ý·½Ê½·Åµ½ÄÄÀ
-SelectStartMenuFolderLabel3=°²×°Ïòµ¼½«ÔÚÒÔÏ¿ªÊ¼²Ëµ¥Îļþ¼ÐÖд´½¨³ÌÐò¿ì½Ý·½Ê½¡£
-SelectStartMenuFolderBrowseLabel=µã»÷¡°ÏÂÒ»²½¡±½øÈëÏÂÒ»²½¡£Èç¹ûÄãҪѡÔñ²»Í¬µÄÎļþ¼Ð£¬Çëµã»÷¡°ä¯ÀÀ¡±¡£
-MustEnterGroupName=Äã±ØÐëÊäÈëÎļþ¼ÐÃû³Æ
-GroupNameTooLong=Îļþ¼ÐÃû³Æ»ò·¾¶Ì«³¤
-InvalidGroupName=Îļþ¼ÐÃû³ÆÎÞЧ
-BadGroupName=Îļþ¼ÐÃû³Æ²»ÄÜ°üº¬ÏÂÁÐ×Ö·û£º%n%n%1
-NoProgramGroupCheck2=½ûÖ¹´´½¨¿ªÊ¼²Ëµ¥Îļþ¼Ð(&D)
-
-; *** "Ready to Install" wizard page
-WizardReady=×¼±¸°²×°
-ReadyLabel1=°²×°Ïòµ¼ÏÖÔÚ×¼±¸¿ªÊ¼°²×° [name]¡£
-ReadyLabel2a=µã»÷¡°°²×°¡±¼ÌÐø°²×°£¬Èç¹ûÄãÏëÒª²é¿´»òÕ߸ü¸ÄÉèÖÃÇëµã»÷¡°ÉÏÒ»²½¡±¡£
-ReadyLabel2b=µã»÷¡°°²×°¡±¼ÌÐø°²×°¡£
-ReadyMemoUserInfo=Óû§ÐÅÏ¢£º
-ReadyMemoDir=Ä¿±êλÖãº
-ReadyMemoType=°²×°ÀàÐÍ£º
-ReadyMemoComponents=ËùÑ¡×é¼þ£º
-ReadyMemoGroup=¿ªÊ¼²Ëµ¥Îļþ¼Ð£º
-ReadyMemoTasks=¸½¼ÓÈÎÎñ£º
-
-; *** "Preparing to Install" wizard page
-WizardPreparing=ÕýÔÚ×¼±¸°²×°
-PreparingDesc=°²×°Ïòµ¼ÕýÔÚ×¼±¸°²×° [name]¡£
-PreviousInstallNotCompleted=ÏÈÇ°³ÌÐòµÄ°²×°/жÔØÉÐδÍê³É¡£ÄãÐèÒªÖØÆôµçÄÔÀ´Íê³É°²×°¡£%n%nµçÄÔÖØÆôÖ®ºó£¬ÇëÖØÐÂÔËÐа²×°Ïòµ¼À´Íê³É [name] µÄ°²×°¡£
-CannotContinue=°²×°Ïòµ¼²»ÄܼÌÐø¡£Çëµã»÷¡°È¡Ïû¡±Í˳ö¡£
-
-; *** "Installing" wizard page
-WizardInstalling=ÕýÔÚ°²×°
-InstallingLabel=ÕýÔÚÄãµÄ¼ÆËã»úÖа²×° [name]£¬ÇëÉÔµÈ...
-
-; *** "Setup Completed" wizard page
-FinishedHeadingLabel=Íê³É [name] °²×°
-FinishedLabelNoIcons=°²×°Ïòµ¼ÒÑÍê³É [name] µÄ°²×°¡£
-FinishedLabel=°²×°Ïòµ¼ÒÑÍê³É [name] µÄ°²×°¡£¿ÉÒÔͨ¹ýÑ¡ÔñÒÑ°²×°µÄͼ±êÀ´ÔËÐÐÓ¦ÓóÌÐò¡£
-ClickFinish=µã»÷¡°Íê³É¡±Í˳ö°²×°¡£
-FinishedRestartLabel=ΪÁËÍê³É [name] µÄ°²×°£¬°²×°Ïòµ¼±ØÐëÖØÆôµçÄÔ¡£ÄãÒªÁ¢¼´ÖØÆôÂð£¿
-FinishedRestartMessage=ΪÁËÍê³É [name] µÄ°²×°£¬°²×°Ïòµ¼±ØÐëÖØÆôµçÄÔ¡£%n%nÄãÒªÁ¢¼´ÖØÆôÂð£¿
-ShowReadmeCheck=ÊÇ£¬ÎÒÒª²é¿´×ÔÊöÎļþ
-YesRadio=ÊÇ£¬Á¢¼´ÖØÆôµçÄÔ(&Y)
-NoRadio=·ñ£¬ÉÔºóÖØÆôµçÄÔ(&N)
-; used for example as 'Run MyProg.exe'
-RunEntryExec=ÔËÐÐ %1
-; used for example as 'View Readme.txt'
-RunEntryShellExec=²é¿´ %1
-
-; *** "Setup Needs the Next Disk" stuff
-ChangeDiskTitle=°²×°Ïòµ¼ÐèÒªÏÂÒ»¸ö´ÅÅÌ
-SelectDiskLabel2=Çë²åÈë´ÅÅÌ %1 ²¢µã»÷¡°È·¶¨¡±¡£%n%nÈç¹ûÔÚ³ýÁËÏÂÃæÏÔʾµÄÎļþ¼ÐÒÔÍâµÄÎļþ¼ÐÖÐÕÒ²»µ½¸Ã´ÅÅÌÉϵÄÎļþ£¬¾ÍÇëÊäÈëÕýÈ·µÄ·¾¶»òµã»÷¡°ä¯ÀÀ¡±¡£
-PathLabel=·¾¶(&P)£º
-FileNotInDir2=Îļþ¡°%1¡±²»ÔÚ¡°%2¡±ÖС£Çë²åÈëÕýÈ·µÄ´ÅÅÌ»òÑ¡ÔñÆäËûÎļþ¼Ð¡£
-SelectDirectoryLabel=ÇëÖ¸¶¨ÏÂÒ»¸ö´ÅÅ̵ÄλÖá£
-
-; *** Installation phase messages
-SetupAborted=°²×°ÉÐδÍê³É¡£%n%nÇë¾ÀÕýÎÊÌâ²¢ÖØÐÂÔËÐа²×°Ïòµ¼¡£
-EntryAbortRetryIgnore=µã»÷¡°ÖØÊÔ¡±ÖØг¢ÊÔ£¬µã»÷¡°ºöÂÔ¡±¼ÌÐø°²×°£¬»òµã»÷¡°ÖÐÖ¹¡±È¡Ïû°²×°¡£
-
-; *** Installation status messages
-StatusCreateDirs=ÕýÔÚ´´½¨Îļþ¼Ð...
-StatusExtractFiles=ÕýÔÚÌáÈ¡Îļþ...
-StatusCreateIcons=ÕýÔÚ´´½¨¿ì½Ý·½Ê½...
-StatusCreateIniEntries=ÕýÔÚ´´½¨ INI ÏîÄ¿...
-StatusCreateRegistryEntries=ÕýÔÚ´´½¨×¢²á±íÏîÄ¿...
-StatusRegisterFiles=ÕýÔÚ×¢²áÎļþ...
-StatusSavingUninstall=ÕýÔÚ±£´æжÔØÐÅÏ¢...
-StatusRunProgram=ÕýÔÚÍê³É°²×°...
-StatusRollback=ÕýÔڻعö¸ü¸Ä...
-
-; *** Misc. errors
-ErrorInternal2=ÄÚ²¿´íÎó£º%1
-ErrorFunctionFailedNoCode=%1 ʧ°Ü
-ErrorFunctionFailed=%1 ʧ°Ü¡£´úÂë %2
-ErrorFunctionFailedWithMessage=%1 ʧ°Ü¡£´úÂë %2¡£%n%3
-ErrorExecutingProgram=ÎÞ·¨Ö´ÐÐÎļþ£º%n%1
-
-; *** Registry errors
-ErrorRegOpenKey=´ò¿ª×¢²á±í¼üʱ³ö´í£º%n%1\%2
-ErrorRegCreateKey=´´½¨×¢²á±í¼üʱ³ö´í£º%n%1\%2
-ErrorRegWriteKey=дÈë×¢²á±í¼üʱ³ö´í£º%n%1\%2
-
-; *** INI errors
-ErrorIniEntry=ÔÚÎļþ¡°%1¡±Öд´½¨ INI ÏîĿʱ³ö´í¡£
-
-; *** File copying errors
-FileAbortRetryIgnore=µã»÷¡°ÖØÊÔ¡±ÖØг¢ÊÔ£¬µã»÷¡°ºöÂÔ¡±Ìø¹ý´ËÎļþ (²»ÍƼö)£¬»òµã»÷¡°ÖÐÖ¹¡±È¡Ïû°²×°¡£
-FileAbortRetryIgnore2=µã»÷¡°ÖØÊÔ¡±ÖØг¢ÊÔ£¬µã»÷¡°ºöÂÔ¡±¼ÌÐø°²×° (²»ÍƼö)£¬»òµã»÷¡°ÖÐÖ¹¡±È¡Ïû°²×°¡£
-SourceIsCorrupted=Ô´ÎļþÒÑËð»µ
-SourceDoesntExist=Ô´Îļþ¡°%1¡±²»´æÔÚ
-ExistingFileReadOnly=ÏÖÓÐÎļþΪֻ¶Á¡£%n%nµã»÷¡°ÖØÊÔ¡±ÒƳýÖ»¶ÁÊôÐÔ²¢ÖØÊÔ£¬µã»÷¡°ºöÂÔ¡±Ìø¹ý´ËÎļþ£¬»òµã»÷¡°ÖÐÖ¹¡±È¡Ïû°²×°¡£
-ErrorReadingExistingDest=¶ÁÈ¡ÏÖÓÐÎļþʱ·¢Éú´íÎó£º
-FileExists=ÎļþÒÑ´æÔÚ¡£%n%nÄãÒª¸²¸ÇËüÂð£¿
-ExistingFileNewer=ÏÖÓÐÎļþ±È°²×°Ïòµ¼Òª°²×°µÄ»¹Ð¡£½¨ÒéÄã±£ÁôÏÖÓÐÎļþ¡£%n%n±£ÁôÏÖÓÐÎļþÂð£¿
-ErrorChangingAttr=¸ü¸ÄÏÖÓÐÎļþµÄÊôÐÔʱ·¢Éú´íÎó£º
-ErrorCreatingTemp=ÔÚÄ¿±êÎļþ¼ÐÖд´½¨Îļþʱ·¢Éú´íÎó£º
-ErrorReadingSource=¶ÁÈ¡Ô´Îļþʱ·¢Éú´íÎó£º
-ErrorCopying=¸´ÖÆÎļþʱ·¢Éú´íÎó£º
-ErrorReplacingExistingFile=Ìæ»»ÏÖÓÐÎļþʱ·¢Éú´íÎó£º
-ErrorRestartReplace=ÖØÆôºóÌ滻ʧ°Ü£º
-ErrorRenamingTemp=ÖØÃüÃûÄ¿±êÎļþ¼ÐÖеÄÎļþʱ·¢Éú´íÎó£º
-ErrorRegisterServer=ÎÞ·¨×¢²á DLL/OCX£º%1
-ErrorRegSvr32Failed=RegSvr32 ʧ°Ü¡£·µ»ØÖµ£º%1
-ErrorRegisterTypeLib=ÎÞ·¨×¢²áÀàÐͿ⣺%1
-
-; *** Post-installation errors
-ErrorOpeningReadme=´ò¿ª×ÔÊöÎļþʱ·¢Éú´íÎó¡£
-ErrorRestartingComputer=°²×°Ïòµ¼ÎÞ·¨ÖØÆôµçÄÔ¡£ÇëÊÖ¶¯ÖØÆô¡£
-
-; *** Uninstaller messages
-UninstallNotFound=Îļþ¡°%1¡±²»´æÔÚ¡£²»ÄÜжÔØ¡£
-UninstallOpenError=Îļþ¡°%1¡±²»ÄÜ´ò¿ª¡£²»ÄÜжÔØ
-UninstallUnsupportedVer=жÔØÈÕÖ¾Îļþ¡°%1¡±µÄ¸ñʽ²»Äܱ»´Ë°æ±¾µÄжÔسÌÐòʶ±ð¡£²»ÄÜжÔØ
-UninstallUnknownEntry=жÔØÈÕÖ¾ÖÐÓöµ½Ò»¸öδ֪µÄÏîÄ¿ (%1)
-ConfirmUninstall=ÄãÊÇ·ñÈ·¶¨ÒªÍêȫɾ³ý %1 ¼°ÆäËùÓÐ×é¼þ£¿
-UninstallOnlyOnWin64=´Ë°²×°Ö»ÄÜÔÚ 64 λ Windows ÉÏжÔØ¡£
-OnlyAdminCanUninstall=´Ë°²×°Ö»ÄÜÓɾ߱¸¹ÜÀíԱȨÏÞµÄÓû§Ð¶ÔØ¡£
-UninstallStatusLabel=ÕýÔÚɾ³ý %1£¬ÇëÉÔµÈ...
-UninstalledAll=%1 Òѳɹ¦É¾³ý¡£
-UninstalledMost=%1 жÔØÍê³É¡£%n%nijЩÏîÄ¿²»ÄÜɾ³ý£¬¿ÉÒÔÊÖ¶¯É¾³ý¡£
-UninstalledAndNeedsRestart=ÈôÒªÍê³É %1 µÄжÔØ£¬±ØÐëÖØÆôµçÄÔ¡£%n%nÄãÒªÁ¢¼´ÖØÆôÂð£¿
-UninstallDataCorrupted=Îļþ¡°%1¡±ÒÑË𻵡£²»ÄÜжÔØ
-
-; *** Uninstallation phase messages
-ConfirmDeleteSharedFileTitle=ɾ³ý¹²ÏíÎļþÂð£¿
-ConfirmDeleteSharedFile2=ÏÂÁй²ÏíÎļþ²»ÔÙ±»ÈκγÌÐòʹÓá£ÄãҪɾ³ý¸Ã¹²ÏíÎļþÂð£¿%n%nÈç¹û»¹ÓгÌÐòʹÓøÃÎļþ¶øËüÒѱ»É¾³ý£¬ÕâЩ³ÌÐò¿ÉÄÜÎÞ·¨Õý³£ÔËÐС£Èç¹ûÄ㲻ȷ¶¨£¬¾ÍÇëÑ¡Ôñ¡°·ñ¡±¡£ÁôϸÃÎļþ²»»á¶ÔϵͳÔì³ÉÈκÎΣº¦¡£
-SharedFileNameLabel=ÎļþÃû£º
-SharedFileLocationLabel=λÖãº
-WizardUninstalling=жÔØ״̬
-StatusUninstalling=ÕýÔÚжÔØ %1...
-
-; The custom messages below aren't used by Setup itself, but if you make
-; use of them in your scripts, you'll want to translate them.
-
-[CustomMessages]
-
-NameAndVersion=%1 °æ±¾ %2
-AdditionalIcons=¸½¼Óͼ±ê£º
-CreateDesktopIcon=´´½¨×ÀÃæͼ±ê(&D)
-CreateQuickLaunchIcon=´´½¨¿ìËÙÆô¶¯À¸Í¼±ê(&Q)
-ProgramOnTheWeb=%1 ÍøÕ¾
-UninstallProgram=жÔØ %1
-LaunchProgram=ÔËÐÐ %1
-AssocFileExtension=½« %1 Óë %2 ÎļþÀ©Õ¹Ãû¹ØÁª(&A)
-AssocingFileExtension=ÕýÔÚ½« %1 Óë %2 ÎļþÀ©Õ¹Ãû¹ØÁª...
+; *** Inno Setup version 5.1.11+ Simplified Chinese messages ***
+;
+; Based on previous version by Peng Bai
+; Update by Mack Zhang (hua_wuxin at 21cn.com) on Apr. 10, 2008
+;
+; To download user-contributed translations of this file, go to:
+; http://www.jrsoftware.org/files/istrans/
+;
+; Note: When translating this text, do not add periods (.) to the end of
+; messages that didn't have them already, because on those messages Inno
+; Setup adds the periods automatically (appending a period would result in
+; two periods being displayed).
+
+[LangOptions]
+; The following three entries are very important. Be sure to read and
+; understand the '[LangOptions] section' topic in the help file.
+LanguageName=Chinese(Simplified)
+LanguageID=$0804
+LanguageCodePage=936
+; If the language you are translating to requires special font faces or
+; sizes, uncomment any of the following entries and change them accordingly.
+DialogFontName=ËÎÌå
+DialogFontSize=9
+;WelcomeFontName=Verdana
+;WelcomeFontSize=12
+;TitleFontName=Arial
+;TitleFontSize=29
+;CopyrightFontName=Arial
+;CopyrightFontSize=8
+
+[Messages]
+
+; *** Application titles
+SetupAppTitle=°²×°Ïòµ¼
+SetupWindowTitle=°²×°Ïòµ¼ - %1
+UninstallAppTitle=жÔØÏòµ¼
+UninstallAppFullTitle=%1 жÔØÏòµ¼
+
+; *** Misc. common
+InformationTitle=ÐÅÏ¢
+ConfirmTitle=È·ÈÏ
+ErrorTitle=´íÎó
+
+; *** SetupLdr messages
+SetupLdrStartupMessage=°²×°Ïòµ¼½«ÔÚÄãµÄµçÄÔÉÏ°²×° %1¡£ÄãÈ·¶¨Òª¼ÌÐøÂð£¿
+LdrCannotCreateTemp=ÎÞ·¨´´½¨ÁÙʱÎļþ¡£°²×°ÖÐÖ¹
+LdrCannotExecTemp=ÎÞ·¨ÔËÐÐÁÙʱÎļþ¼ÐÖеÄÎļþ¡£°²×°ÖÐÖ¹
+
+; *** Startup error messages
+LastErrorMessage=%1.%n%n´íÎó %2£º%3
+SetupFileMissing=°²×°Îļþ¼ÐȱÉÙÎļþ %1¡£Çë¾ÀÕý´ËÎÊÌâ»òÕßË÷È¡Èí¼þµÄа汾¡£
+SetupFileCorrupt=°²×°ÎļþÒÑË𻵡£ÇëË÷È¡Èí¼þµÄа汾¡£
+SetupFileCorruptOrWrongVer=°²×°ÎļþÒÑË𻵣¬»òÕßÓë´Ë°²×°Ïòµ¼µÄ°æ±¾²»¼æÈÝ¡£Çë¾ÀÕý´ËÎÊÌâ»òÕßË÷È¡Èí¼þµÄа汾¡£
+NotOnThisPlatform=´Ë³ÌÐò²»ÄÜÔÚ %1 ÉÏÔËÐС£
+OnlyOnThisPlatform=´Ë³ÌÐò±ØÐëÔÚ %1 ÉÏÔËÐС£
+OnlyOnTheseArchitectures=´Ë³ÌÐòÖ»ÄÜ°²×°ÔÚΪÏÂÁд¦ÀíÆ÷¼Ü¹¹Éè¼ÆµÄ Windows °æ±¾ÖУº%n%n%1
+MissingWOW64APIs=µ±Ç°µÄ Windows °æ±¾Ã»Óаüº¬Ö´ÐÐ 64 λ°²×°Ïòµ¼ËùÐèµÄº¯Êý¡£ÈôÒª¾ÀÕý´ËÎÊÌ⣬Çë°²×° Service Pack %1¡£
+WinVersionTooLowError=´Ë³ÌÐòÐèÒª %1 v%2 »ò¸ü¸ß°æ±¾¡£
+WinVersionTooHighError=´Ë³ÌÐò²»ÄÜ°²×°ÔÚ %1 v%2 »ò¸ü¸ß°æ±¾ÉÏ¡£
+AdminPrivilegesRequired=°²×°´Ë³ÌÐòʱÄã±ØÐëÒÔ¹ÜÀíÔ±Éí·ÝµÇ¼¡£
+PowerUserPrivilegesRequired=°²×°´Ë³ÌÐòʱÄã±ØÐëÒÔ¹ÜÀíÔ±»ò Power Users ×é³ÉÔ±µÄÉí·ÝµÇ¼¡£
+SetupAppRunningError=°²×°Ïòµ¼·¢ÏÖ %1 ÕýÔÚÔËÐС£%n%nÇëÁ¢¼´¹Ø±ÕÆäËùÓÐʵÀý£¬È»ºóµ¥»÷¡°È·¶¨¡±¼ÌÐø£¬»òµ¥»÷¡°È¡Ïû¡±Í˳ö¡£
+UninstallAppRunningError=жÔسÌÐò·¢ÏÖ %1 ÕýÔÚÔËÐС£%n%nÇëÁ¢¼´¹Ø±ÕÆäËùÓÐʵÀý£¬È»ºóµ¥»÷¡°È·¶¨¡±¼ÌÐø£¬»òµ¥»÷¡°È¡Ïû¡±Í˳ö¡£
+
+; *** Misc. errors
+ErrorCreatingDir=°²×°Ïòµ¼ÎÞ·¨´´½¨Îļþ¼Ð¡°%1¡±
+ErrorTooManyFilesInDir=ÎÞ·¨ÔÚÎļþ¼Ð¡°%1¡±Öд´½¨Îļþ£¬ÒòΪËü°üº¬ÁËÌ«¶àÎļþ
+
+; *** Setup common messages
+ExitSetupTitle=Í˳ö°²×°
+ExitSetupMessage=°²×°ÉÐδÍê³É¡£Èç¹ûÄãÏÖÔÚÍ˳ö£¬Èí¼þ½«²»»á°²×°¡£%n%nÄã¿ÉÒÔÔÚÆäËüʱ¼äÖØÐÂÔËÐа²×°Ïòµ¼À´Íê³É°²×°¡£%n%nÏÖÔÚÍ˳ö°²×°Âð£¿
+AboutSetupMenuItem=¹ØÓÚ°²×°Ïòµ¼(&A)...
+AboutSetupTitle=¹ØÓÚ°²×°Ïòµ¼
+AboutSetupMessage=%1 °æ±¾ %2%n%3%n%n%1 Ö÷Ò³£º%n%4
+AboutSetupNote=
+TranslatorNote=
+
+; *** Buttons
+ButtonBack=< ÉÏÒ»²½(&B)
+ButtonNext=ÏÂÒ»²½(&N) >
+ButtonInstall=°²×°(&I)
+ButtonOK=È·¶¨
+ButtonCancel=È¡Ïû
+ButtonYes=ÊÇ(&Y)
+ButtonYesToAll=È«ÊÇ(&A)
+ButtonNo=·ñ(&N)
+ButtonNoToAll=È«·ñ(&O)
+ButtonFinish=Íê³É(&F)
+ButtonBrowse=ä¯ÀÀ(&B)...
+ButtonWizardBrowse=ä¯ÀÀ(&R)...
+ButtonNewFolder=´´½¨Îļþ¼Ð(&M)
+
+; *** "Select Language" dialog messages
+SelectLanguageTitle=Ñ¡Ôñ°²×°ÓïÑÔ
+SelectLanguageLabel=Ñ¡Ôñ°²×°ÆÚ¼äҪʹÓõÄÓïÑÔ£º
+
+; *** Common wizard text
+ClickNext=µ¥»÷¡°ÏÂÒ»²½¡±¼ÌÐø£¬»òµ¥»÷¡°È¡Ïû¡±Í˳ö°²×°¡£
+BeveledLabel=
+BrowseDialogTitle=ä¯ÀÀÎļþ¼Ð
+BrowseDialogLabel=Ñ¡ÔñÒ»¸öÎļþ¼Ð£¬È»ºóµ¥»÷¡°È·¶¨¡±¡£
+NewFolderName=н¨Îļþ¼Ð
+
+; *** "Welcome" wizard page
+WelcomeLabel1=»¶ÓʹÓà [name] °²×°Ïòµ¼
+WelcomeLabel2=°²×°Ïòµ¼½«ÔÚÄãµÄµçÄÔÉÏ°²×° [name/ver]¡£%n%n½¨ÒéÄãÔÚ¼ÌÐø֮ǰ¹Ø±ÕËùÓÐÆäËüÓ¦ÓóÌÐò¡£
+
+; *** "Password" wizard page
+WizardPassword=ÃÜÂë
+PasswordLabel1=´Ë°²×°Ïòµ¼ÓÐÃÜÂë±£»¤¡£
+PasswordLabel3=ÇëÊäÈëÃÜÂ룬Ȼºóµ¥»÷¡°ÏÂÒ»²½¡±½øÈëÏÂÒ»²½¡£ÃÜÂëÇø·Ö´óСд¡£
+PasswordEditLabel=ÃÜÂë(&P)£º
+IncorrectPassword=ÄãÊäÈëµÄÃÜÂë²»ÕýÈ·¡£ÇëÖØÊÔ¡£
+
+; *** "License Agreement" wizard page
+WizardLicense=Ðí¿ÉÐÒé
+LicenseLabel=ÇëÔÚ¼ÌÐø֮ǰÔĶÁÒÔÏÂÖØÒªÐÅÏ¢¡£
+LicenseLabel3=ÇëÔĶÁÒÔÏÂÐí¿ÉÐÒé¡£ÔÚ¼ÌÐø°²×°Ö®Ç°£¬Äã±ØÐë½ÓÊÜ´ËÐÒéµÄÌõ¿î¡£
+LicenseAccepted=ÎÒ½ÓÊÜÐÒé(&A)
+LicenseNotAccepted=ÎÒ²»½ÓÊÜÐÒé(&D)
+
+; *** "Information" wizard pages
+WizardInfoBefore=ÐÅÏ¢
+InfoBeforeLabel=ÇëÔÚ¼ÌÐø֮ǰÔĶÁÒÔÏÂÖØÒªÐÅÏ¢¡£
+InfoBeforeClickLabel=µ±Äã×¼±¸ºÃ¼ÌÐø°²×°ºó£¬Çëµ¥»÷¡°ÏÂÒ»²½¡±¡£
+WizardInfoAfter=ÐÅÏ¢
+InfoAfterLabel=ÇëÔÚ¼ÌÐø֮ǰÔĶÁÒÔÏÂÖØÒªÐÅÏ¢¡£
+InfoAfterClickLabel=µ±Äã×¼±¸ºÃ¼ÌÐø°²×°ºó£¬Çëµ¥»÷¡°ÏÂÒ»²½¡±¡£
+
+; *** "User Information" wizard page
+WizardUserInfo=Óû§ÐÅÏ¢
+UserInfoDesc=ÇëÊäÈëÄãµÄÐÅÏ¢¡£
+UserInfoName=Óû§Ãû(&U)£º
+UserInfoOrg=×éÖ¯(&O)£º
+UserInfoSerial=ÐòÁкÅ(&S)£º
+UserInfoNameRequired=±ØÐëÊäÈëÓû§Ãû¡£
+
+; *** "Select Destination Location" wizard page
+WizardSelectDir=Ñ¡ÔñÄ¿±êλÖÃ
+SelectDirDesc=½« [name] °²×°µ½ÄÄÀ
+SelectDirLabel3=°²×°Ïòµ¼½«°Ñ [name] °²×°µ½ÒÔÏÂÎļþ¼ÐÖС£
+SelectDirBrowseLabel=ÈôÒª¼ÌÐø£¬µ¥»÷¡°ÏÂÒ»²½¡±¡£Èç¹ûÄãҪѡÔñ²»Í¬µÄÎļþ¼Ð£¬Çëµ¥»÷¡°ä¯ÀÀ¡±¡£
+DiskSpaceMBLabel=ÖÁÉÙÐèÒª [mb] MB µÄ¿ÕÏдÅÅ̿ռ䡣
+ToUNCPathname=°²×°Ïòµ¼²»ÄÜ°²×°µ½ UNC ·¾¶¡£Èç¹ûÄãÊÇҪͨ¹ýÍøÂç°²×°£¬ÇëÓ³ÉäÍøÂçÇý¶¯Æ÷¡£
+InvalidPath=Äã±ØÐëÊäÈë´øÓÐÅÌ·ûµÄÍêÕû·¾¶¡£ÀýÈ磺%n%nC:\APP%n%n»òÕß UNC ·¾¶¸ñʽ£º%n%n\\server\share
+InvalidDrive=ÄãÑ¡ÔñµÄÇý¶¯Æ÷»ò UNC ¹²Ïí²»´æÔÚ»ò²»¿É·ÃÎÊ¡£ÇëÖØÐÂÑ¡Ôñ¡£
+DiskSpaceWarningTitle=ûÓÐ×ã¹»µÄ´ÅÅÌ¿Õ¼ä
+DiskSpaceWarning=°²×°Ïòµ¼ÖÁÉÙÐèÒª %1 KB µÄÊ£Óà¿Õ¼ä£¬µ«ÊÇËùÑ¡Çý¶¯Æ÷Ö»ÓÐ %2 KB ¿ÉÓá£%n%nÄãÎÞÂÛÈçºÎÒ²Òª¼ÌÐøÂð£¿
+DirNameTooLong=Îļþ¼ÐÃû³Æ»ò·¾¶Ì«³¤¡£
+InvalidDirName=Îļþ¼ÐÃû³ÆÎÞЧ¡£
+BadDirName32=Îļþ¼ÐÃû³Æ²»ÄÜ°üº¬ÏÂÁÐ×Ö·û£º%n%n%1
+DirExistsTitle=Îļþ¼ÐÒÑ´æÔÚ
+DirExists=Îļþ¼Ð£º%n%n%1%n%nÒÑ´æÔÚ¡£ÄãÈ·¶¨Òª°²×°µ½¸ÃÎļþ¼ÐÂð£¿
+DirDoesntExistTitle=Îļþ¼Ð²»´æÔÚ
+DirDoesntExist=Îļþ¼Ð£º%n%n%1%n%n²»´æÔÚ¡£´´½¨¸ÃÎļþ¼ÐÂð£¿
+
+; *** "Select Components" wizard page
+WizardSelectComponents=Ñ¡Ôñ×é¼þ
+SelectComponentsDesc=Òª°²×°ÄÄЩ×é¼þ£¿
+SelectComponentsLabel2=ÇëÑ¡ÔñÄãÒª°²×°µÄ×é¼þ£¬Çå³ýÄã²»Ïë°²×°µÄ×é¼þ¡£×¼±¸ºÃºóµã»÷¡°ÏÂÒ»²½¡±¡£
+FullInstallation=ÍêÕû°²×°
+; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
+CompactInstallation=¼ò½à°²×°
+CustomInstallation=¶¨ÖÆ°²×°
+NoUninstallWarningTitle=×é¼þÒÑ´æÔÚ
+NoUninstallWarning=°²×°Ïòµ¼·¢ÏÖÏÂÁÐ×é¼þÒѾ°²×°£º%n%n%1%n%nÈ¡ÏûÑ¡¶¨²»»áжÔØÕâЩ×é¼þ¡£%n%n¼ÌÐø°²×°Âð£¿
+ComponentSize1=%1 KB
+ComponentSize2=%1 MB
+ComponentsDiskSpaceMBLabel=µ±Ç°µÄÑ¡ÔñÖÁÉÙÐèÒª [mb] MB ´ÅÅ̿ռ䡣
+
+; *** "Select Additional Tasks" wizard page
+WizardSelectTasks=Ñ¡Ôñ¸½¼ÓÈÎÎñ
+SelectTasksDesc=ÒªÖ´ÐÐÄÄЩ¸½¼ÓÈÎÎñ£¿
+SelectTasksLabel2=ÇëÑ¡ÔñÔÚ°²×° [name] Æڼ䰲װÏòµ¼ÒªÖ´Ðеĸ½¼ÓÈÎÎñ£¬È»ºóµã»÷¡°ÏÂÒ»²½¡±¡£
+
+; *** "Select Start Menu Folder" wizard page
+WizardSelectProgramGroup=Ñ¡Ôñ¿ªÊ¼²Ëµ¥Îļþ¼Ð
+SelectStartMenuFolderDesc=°Ñ³ÌÐò¿ì½Ý·½Ê½·Åµ½ÄÄÀ
+SelectStartMenuFolderLabel3=°²×°Ïòµ¼½«ÔÚÒÔÏ¿ªÊ¼²Ëµ¥Îļþ¼ÐÖд´½¨³ÌÐò¿ì½Ý·½Ê½¡£
+SelectStartMenuFolderBrowseLabel=µã»÷¡°ÏÂÒ»²½¡±½øÈëÏÂÒ»²½¡£Èç¹ûÄãҪѡÔñ²»Í¬µÄÎļþ¼Ð£¬Çëµã»÷¡°ä¯ÀÀ¡±¡£
+MustEnterGroupName=Äã±ØÐëÊäÈëÎļþ¼ÐÃû³Æ
+GroupNameTooLong=Îļþ¼ÐÃû³Æ»ò·¾¶Ì«³¤
+InvalidGroupName=Îļþ¼ÐÃû³ÆÎÞЧ
+BadGroupName=Îļþ¼ÐÃû³Æ²»ÄÜ°üº¬ÏÂÁÐ×Ö·û£º%n%n%1
+NoProgramGroupCheck2=½ûÖ¹´´½¨¿ªÊ¼²Ëµ¥Îļþ¼Ð(&D)
+
+; *** "Ready to Install" wizard page
+WizardReady=×¼±¸°²×°
+ReadyLabel1=°²×°Ïòµ¼ÏÖÔÚ×¼±¸¿ªÊ¼°²×° [name]¡£
+ReadyLabel2a=µã»÷¡°°²×°¡±¼ÌÐø°²×°£¬Èç¹ûÄãÏëÒª²é¿´»òÕ߸ü¸ÄÉèÖÃÇëµã»÷¡°ÉÏÒ»²½¡±¡£
+ReadyLabel2b=µã»÷¡°°²×°¡±¼ÌÐø°²×°¡£
+ReadyMemoUserInfo=Óû§ÐÅÏ¢£º
+ReadyMemoDir=Ä¿±êλÖãº
+ReadyMemoType=°²×°ÀàÐÍ£º
+ReadyMemoComponents=ËùÑ¡×é¼þ£º
+ReadyMemoGroup=¿ªÊ¼²Ëµ¥Îļþ¼Ð£º
+ReadyMemoTasks=¸½¼ÓÈÎÎñ£º
+
+; *** "Preparing to Install" wizard page
+WizardPreparing=ÕýÔÚ×¼±¸°²×°
+PreparingDesc=°²×°Ïòµ¼ÕýÔÚ×¼±¸°²×° [name]¡£
+PreviousInstallNotCompleted=ÏÈÇ°³ÌÐòµÄ°²×°/жÔØÉÐδÍê³É¡£ÄãÐèÒªÖØÆôµçÄÔÀ´Íê³É°²×°¡£%n%nµçÄÔÖØÆôÖ®ºó£¬ÇëÖØÐÂÔËÐа²×°Ïòµ¼À´Íê³É [name] µÄ°²×°¡£
+CannotContinue=°²×°Ïòµ¼²»ÄܼÌÐø¡£Çëµã»÷¡°È¡Ïû¡±Í˳ö¡£
+
+; *** "Installing" wizard page
+WizardInstalling=ÕýÔÚ°²×°
+InstallingLabel=ÕýÔÚÄãµÄ¼ÆËã»úÖа²×° [name]£¬ÇëÉÔµÈ...
+
+; *** "Setup Completed" wizard page
+FinishedHeadingLabel=Íê³É [name] °²×°
+FinishedLabelNoIcons=°²×°Ïòµ¼ÒÑÍê³É [name] µÄ°²×°¡£
+FinishedLabel=°²×°Ïòµ¼ÒÑÍê³É [name] µÄ°²×°¡£¿ÉÒÔͨ¹ýÑ¡ÔñÒÑ°²×°µÄͼ±êÀ´ÔËÐÐÓ¦ÓóÌÐò¡£
+ClickFinish=µã»÷¡°Íê³É¡±Í˳ö°²×°¡£
+FinishedRestartLabel=ΪÁËÍê³É [name] µÄ°²×°£¬°²×°Ïòµ¼±ØÐëÖØÆôµçÄÔ¡£ÄãÒªÁ¢¼´ÖØÆôÂð£¿
+FinishedRestartMessage=ΪÁËÍê³É [name] µÄ°²×°£¬°²×°Ïòµ¼±ØÐëÖØÆôµçÄÔ¡£%n%nÄãÒªÁ¢¼´ÖØÆôÂð£¿
+ShowReadmeCheck=ÊÇ£¬ÎÒÒª²é¿´×ÔÊöÎļþ
+YesRadio=ÊÇ£¬Á¢¼´ÖØÆôµçÄÔ(&Y)
+NoRadio=·ñ£¬ÉÔºóÖØÆôµçÄÔ(&N)
+; used for example as 'Run MyProg.exe'
+RunEntryExec=ÔËÐÐ %1
+; used for example as 'View Readme.txt'
+RunEntryShellExec=²é¿´ %1
+
+; *** "Setup Needs the Next Disk" stuff
+ChangeDiskTitle=°²×°Ïòµ¼ÐèÒªÏÂÒ»¸ö´ÅÅÌ
+SelectDiskLabel2=Çë²åÈë´ÅÅÌ %1 ²¢µã»÷¡°È·¶¨¡±¡£%n%nÈç¹ûÔÚ³ýÁËÏÂÃæÏÔʾµÄÎļþ¼ÐÒÔÍâµÄÎļþ¼ÐÖÐÕÒ²»µ½¸Ã´ÅÅÌÉϵÄÎļþ£¬¾ÍÇëÊäÈëÕýÈ·µÄ·¾¶»òµã»÷¡°ä¯ÀÀ¡±¡£
+PathLabel=·¾¶(&P)£º
+FileNotInDir2=Îļþ¡°%1¡±²»ÔÚ¡°%2¡±ÖС£Çë²åÈëÕýÈ·µÄ´ÅÅÌ»òÑ¡ÔñÆäËûÎļþ¼Ð¡£
+SelectDirectoryLabel=ÇëÖ¸¶¨ÏÂÒ»¸ö´ÅÅ̵ÄλÖá£
+
+; *** Installation phase messages
+SetupAborted=°²×°ÉÐδÍê³É¡£%n%nÇë¾ÀÕýÎÊÌâ²¢ÖØÐÂÔËÐа²×°Ïòµ¼¡£
+EntryAbortRetryIgnore=µã»÷¡°ÖØÊÔ¡±ÖØг¢ÊÔ£¬µã»÷¡°ºöÂÔ¡±¼ÌÐø°²×°£¬»òµã»÷¡°ÖÐÖ¹¡±È¡Ïû°²×°¡£
+
+; *** Installation status messages
+StatusCreateDirs=ÕýÔÚ´´½¨Îļþ¼Ð...
+StatusExtractFiles=ÕýÔÚÌáÈ¡Îļþ...
+StatusCreateIcons=ÕýÔÚ´´½¨¿ì½Ý·½Ê½...
+StatusCreateIniEntries=ÕýÔÚ´´½¨ INI ÏîÄ¿...
+StatusCreateRegistryEntries=ÕýÔÚ´´½¨×¢²á±íÏîÄ¿...
+StatusRegisterFiles=ÕýÔÚ×¢²áÎļþ...
+StatusSavingUninstall=ÕýÔÚ±£´æжÔØÐÅÏ¢...
+StatusRunProgram=ÕýÔÚÍê³É°²×°...
+StatusRollback=ÕýÔڻعö¸ü¸Ä...
+
+; *** Misc. errors
+ErrorInternal2=ÄÚ²¿´íÎó£º%1
+ErrorFunctionFailedNoCode=%1 ʧ°Ü
+ErrorFunctionFailed=%1 ʧ°Ü¡£´úÂë %2
+ErrorFunctionFailedWithMessage=%1 ʧ°Ü¡£´úÂë %2¡£%n%3
+ErrorExecutingProgram=ÎÞ·¨Ö´ÐÐÎļþ£º%n%1
+
+; *** Registry errors
+ErrorRegOpenKey=´ò¿ª×¢²á±í¼üʱ³ö´í£º%n%1\%2
+ErrorRegCreateKey=´´½¨×¢²á±í¼üʱ³ö´í£º%n%1\%2
+ErrorRegWriteKey=дÈë×¢²á±í¼üʱ³ö´í£º%n%1\%2
+
+; *** INI errors
+ErrorIniEntry=ÔÚÎļþ¡°%1¡±Öд´½¨ INI ÏîĿʱ³ö´í¡£
+
+; *** File copying errors
+FileAbortRetryIgnore=µã»÷¡°ÖØÊÔ¡±ÖØг¢ÊÔ£¬µã»÷¡°ºöÂÔ¡±Ìø¹ý´ËÎļþ (²»ÍƼö)£¬»òµã»÷¡°ÖÐÖ¹¡±È¡Ïû°²×°¡£
+FileAbortRetryIgnore2=µã»÷¡°ÖØÊÔ¡±ÖØг¢ÊÔ£¬µã»÷¡°ºöÂÔ¡±¼ÌÐø°²×° (²»ÍƼö)£¬»òµã»÷¡°ÖÐÖ¹¡±È¡Ïû°²×°¡£
+SourceIsCorrupted=Ô´ÎļþÒÑËð»µ
+SourceDoesntExist=Ô´Îļþ¡°%1¡±²»´æÔÚ
+ExistingFileReadOnly=ÏÖÓÐÎļþΪֻ¶Á¡£%n%nµã»÷¡°ÖØÊÔ¡±ÒƳýÖ»¶ÁÊôÐÔ²¢ÖØÊÔ£¬µã»÷¡°ºöÂÔ¡±Ìø¹ý´ËÎļþ£¬»òµã»÷¡°ÖÐÖ¹¡±È¡Ïû°²×°¡£
+ErrorReadingExistingDest=¶ÁÈ¡ÏÖÓÐÎļþʱ·¢Éú´íÎó£º
+FileExists=ÎļþÒÑ´æÔÚ¡£%n%nÄãÒª¸²¸ÇËüÂð£¿
+ExistingFileNewer=ÏÖÓÐÎļþ±È°²×°Ïòµ¼Òª°²×°µÄ»¹Ð¡£½¨ÒéÄã±£ÁôÏÖÓÐÎļþ¡£%n%n±£ÁôÏÖÓÐÎļþÂð£¿
+ErrorChangingAttr=¸ü¸ÄÏÖÓÐÎļþµÄÊôÐÔʱ·¢Éú´íÎó£º
+ErrorCreatingTemp=ÔÚÄ¿±êÎļþ¼ÐÖд´½¨Îļþʱ·¢Éú´íÎó£º
+ErrorReadingSource=¶ÁÈ¡Ô´Îļþʱ·¢Éú´íÎó£º
+ErrorCopying=¸´ÖÆÎļþʱ·¢Éú´íÎó£º
+ErrorReplacingExistingFile=Ìæ»»ÏÖÓÐÎļþʱ·¢Éú´íÎó£º
+ErrorRestartReplace=ÖØÆôºóÌ滻ʧ°Ü£º
+ErrorRenamingTemp=ÖØÃüÃûÄ¿±êÎļþ¼ÐÖеÄÎļþʱ·¢Éú´íÎó£º
+ErrorRegisterServer=ÎÞ·¨×¢²á DLL/OCX£º%1
+ErrorRegSvr32Failed=RegSvr32 ʧ°Ü¡£·µ»ØÖµ£º%1
+ErrorRegisterTypeLib=ÎÞ·¨×¢²áÀàÐͿ⣺%1
+
+; *** Post-installation errors
+ErrorOpeningReadme=´ò¿ª×ÔÊöÎļþʱ·¢Éú´íÎó¡£
+ErrorRestartingComputer=°²×°Ïòµ¼ÎÞ·¨ÖØÆôµçÄÔ¡£ÇëÊÖ¶¯ÖØÆô¡£
+
+; *** Uninstaller messages
+UninstallNotFound=Îļþ¡°%1¡±²»´æÔÚ¡£²»ÄÜжÔØ¡£
+UninstallOpenError=Îļþ¡°%1¡±²»ÄÜ´ò¿ª¡£²»ÄÜжÔØ
+UninstallUnsupportedVer=жÔØÈÕÖ¾Îļþ¡°%1¡±µÄ¸ñʽ²»Äܱ»´Ë°æ±¾µÄжÔسÌÐòʶ±ð¡£²»ÄÜжÔØ
+UninstallUnknownEntry=жÔØÈÕÖ¾ÖÐÓöµ½Ò»¸öδ֪µÄÏîÄ¿ (%1)
+ConfirmUninstall=ÄãÊÇ·ñÈ·¶¨ÒªÍêȫɾ³ý %1 ¼°ÆäËùÓÐ×é¼þ£¿
+UninstallOnlyOnWin64=´Ë°²×°Ö»ÄÜÔÚ 64 λ Windows ÉÏжÔØ¡£
+OnlyAdminCanUninstall=´Ë°²×°Ö»ÄÜÓɾ߱¸¹ÜÀíԱȨÏÞµÄÓû§Ð¶ÔØ¡£
+UninstallStatusLabel=ÕýÔÚɾ³ý %1£¬ÇëÉÔµÈ...
+UninstalledAll=%1 Òѳɹ¦É¾³ý¡£
+UninstalledMost=%1 жÔØÍê³É¡£%n%nijЩÏîÄ¿²»ÄÜɾ³ý£¬¿ÉÒÔÊÖ¶¯É¾³ý¡£
+UninstalledAndNeedsRestart=ÈôÒªÍê³É %1 µÄжÔØ£¬±ØÐëÖØÆôµçÄÔ¡£%n%nÄãÒªÁ¢¼´ÖØÆôÂð£¿
+UninstallDataCorrupted=Îļþ¡°%1¡±ÒÑË𻵡£²»ÄÜжÔØ
+
+; *** Uninstallation phase messages
+ConfirmDeleteSharedFileTitle=ɾ³ý¹²ÏíÎļþÂð£¿
+ConfirmDeleteSharedFile2=ÏÂÁй²ÏíÎļþ²»ÔÙ±»ÈκγÌÐòʹÓá£ÄãҪɾ³ý¸Ã¹²ÏíÎļþÂð£¿%n%nÈç¹û»¹ÓгÌÐòʹÓøÃÎļþ¶øËüÒѱ»É¾³ý£¬ÕâЩ³ÌÐò¿ÉÄÜÎÞ·¨Õý³£ÔËÐС£Èç¹ûÄ㲻ȷ¶¨£¬¾ÍÇëÑ¡Ôñ¡°·ñ¡±¡£ÁôϸÃÎļþ²»»á¶ÔϵͳÔì³ÉÈκÎΣº¦¡£
+SharedFileNameLabel=ÎļþÃû£º
+SharedFileLocationLabel=λÖãº
+WizardUninstalling=жÔØ״̬
+StatusUninstalling=ÕýÔÚжÔØ %1...
+
+; The custom messages below aren't used by Setup itself, but if you make
+; use of them in your scripts, you'll want to translate them.
+
+[CustomMessages]
+
+NameAndVersion=%1 °æ±¾ %2
+AdditionalIcons=¸½¼Óͼ±ê£º
+CreateDesktopIcon=´´½¨×ÀÃæͼ±ê(&D)
+CreateQuickLaunchIcon=´´½¨¿ìËÙÆô¶¯À¸Í¼±ê(&Q)
+ProgramOnTheWeb=%1 ÍøÕ¾
+UninstallProgram=жÔØ %1
+LaunchProgram=ÔËÐÐ %1
+AssocFileExtension=½« %1 Óë %2 ÎļþÀ©Õ¹Ãû¹ØÁª(&A)
+AssocingFileExtension=ÕýÔÚ½« %1 Óë %2 ÎļþÀ©Õ¹Ãû¹ØÁª...
diff --git a/ChineseTrad-2-5.1.11.isl b/ChineseTrad-2-5.1.11.isl
index 748442d..cc4f2a5 100644
--- a/ChineseTrad-2-5.1.11.isl
+++ b/ChineseTrad-2-5.1.11.isl
@@ -1,317 +1,317 @@
-; *** Inno Setup version 5.1.11+ Chinese (Traditional) messages ***
-;
-; To download user-contributed translations of this file, go to:
-; http://www.jrsoftware.org/is3rdparty.php
-;
-; Translated by: Patrick Pang (uncleleft at yahoo.com.hk)
-;
-; Note: When translating this text, do not add periods (.) to the end of
-; messages that didn't have them already, because on those messages Inno
-; Setup adds the periods automatically (appending a period would result in
-; two periods being displayed).
-
-[LangOptions]
-LanguageName=<7e41><9ad4><4e2d><6587>
-LanguageID=$0404
-LanguageCodepage=950
-; If the language you are translating to requires special font faces or
-; sizes, uncomment any of the following entries and change them accordingly.
-DialogFontName=·s²Ó©úÅé
-DialogFontSize=9
-TitleFontName=Arial
-TitleFontSize=28
-WelcomeFontName=·s²Ó©úÅé
-WelcomeFontSize=12
-CopyrightFontName=·s²Ó©úÅé
-CopyrightFontSize=9
-
-[Messages]
-
-; *** Application titles
-SetupAppTitle=¦w¸Ëµ{¦¡
-SetupWindowTitle=%1 ¦w¸Ëµ{¦¡
-UninstallAppTitle=¸Ñ°£¦w¸Ë
-UninstallAppFullTitle=¸Ñ°£¦w¸Ë %1
-
-; *** Misc. common
-InformationTitle=°T®§
-ConfirmTitle=½T»{
-ErrorTitle=¿ù»~
-
-; *** SetupLdr messages
-SetupLdrStartupMessage=³o±N·|¦w¸Ë %1¡C±z·QnÄ~Äò¶Ü?
-LdrCannotCreateTemp=µLªk«Ø¥ß¼È¦sÀɮסC¦w¸Ëµ{¦¡±N·|µ²§ô¡C
-LdrCannotExecTemp=µLªk°õ¦æ¼È¦sÀɮסC¦w¸Ëµ{¦¡±N·|µ²§ô¡C
-
-; *** Startup error messages
-LastErrorMessage=%1%n%n¿ù»~ %2: %3
-SetupFileMissing=¦w¸Ë¸ê®Æ§¨¤¤¿ò¥¢ÀÉ®× %1¡C½Ð×¥¿¦¹°ÝÃD©Î«·s¨ú±o¦¹³nÅé¡C
-SetupFileCorrupt=¦w¸ËÀɮפw¸g·l·´¡C½Ð«·s¨ú±o¦¹³nÅé¡C
-SetupFileCorruptOrWrongVer=¦w¸ËÀɮפw¸g·l·´¡A©Î»P¦w¸Ëµ{¦¡ªºª©¥»¤£²Å¡C½Ð«·s¨ú±o¦¹³nÅé¡C
-NotOnThisPlatform=³oÓµ{¦¡µLªk¦b %1 °õ¦æ¡C
-OnlyOnThisPlatform=³oÓµ{¦¡¥²¶·¦b %1 °õ¦æ¡C
-OnlyOnTheseArchitectures=³oÓµ{¦¡¥u¯à¦b±Mªù¬°¥H¤U³B²z¾¹¬[ºc¦Ó³]pªº Windows ¤W¦w¸Ë:%n%n%1
-MissingWOW64APIs=³oÓª©¥»ªº Windows ¤£¥]§t¦w¸Ëµ{¦¡°õ¦æ 64 ¦ì¤¸¦w¸Ë©Ò»Ýªº¥\¯à¡C½Ð¦w¸Ë Service Pack %1 ¥h×¥¿¦¹°ÝÃD¡C
-WinVersionTooLowError=³oÓµ{¦¡¥²¶·¦b %1 ª©¥» %2 ©Î¥H¤Wªº¨t²Î°õ¦æ¡C
-WinVersionTooHighError=³oÓµ{¦¡µLªk¦w¸Ë¦b %1 ª©¥» %2 ©Î¥H¤Wªº¨t²Î¡C
-AdminPrivilegesRequired=±z¥²¶·µn¤J¦¨¨t²ÎºÞ²zû¥H¦w¸Ë³oÓµ{¦¡¡C
-PowerUserPrivilegesRequired=±z¥²¶·µn¤J¦¨¨ã¦³¨t²ÎºÞ²zû©Î Power User Åvªº¨Ï¥ÎªÌ¥H¦w¸Ë³oÓµ{¦¡¡C
-SetupAppRunningError=¦w¸Ëµ{¦¡°»´ú¨ì %1 ¥¿¦b°õ¦æ¡C%n%n½ÐÃö³¬¸Óµ{¦¡«á«ö [½T©w] Ä~Äò¡A©Î«ö [¨ú®ø] Â÷¶}¡C
-UninstallAppRunningError=¸Ñ°£¦w¸Ëµ{¦¡°»´ú¨ì %1 ¥¿¦b°õ¦æ¡C%n%n½ÐÃö³¬¸Óµ{¦¡«á«ö [½T©w] Ä~Äò¡A©Î«ö [¨ú®ø] Â÷¶}¡C
-
-; *** Misc. errors
-ErrorCreatingDir=¦w¸Ëµ{¦¡µLªk«Ø¥ß¸ê®Æ§¨ "%1"¡C
-ErrorTooManyFilesInDir=µLªk¦b¸ê®Æ§¨ "%1" ¤º«Ø¥ßÀɮסA¦]¬°¸ê®Æ§¨¤º¦³¤Ó¦hªºÀɮסC
-
-; *** Setup common messages
-ExitSetupTitle=µ²§ô¦w¸Ëµ{¦¡
-ExitSetupMessage=¦w¸Ë©|¥¼§¹¦¨¡C¦pªG±z²{¦bµ²§ô¦w¸Ëµ{¦¡¡A³oÓµ{¦¡±N¤£·|³Q¦w¸Ë¡C%n%n±z¥i¥Hµy«á¦A°õ¦æ¦w¸Ëµ{¦¡¥H§¹¦¨¦w¸Ëµ{§Ç¡C±z²{¦bnµ²§ô¦w¸Ëµ{¦¡¶Ü?
-AboutSetupMenuItem=Ãö©ó¦w¸Ëµ{¦¡(&A)...
-AboutSetupTitle=Ãö©ó¦w¸Ëµ{¦¡
-AboutSetupMessage=%1 ª©¥» %2%n%3%n%n%1 ºô§}:%n%4
-AboutSetupNote=
-TranslatorNote=ÁcÅ餤¤å»y¨t¥Ñ Patrick Pang (uncleleft at yahoo.com.hk) ºûÅ@¡C
-
-; *** Buttons
-ButtonBack=< ¤W¤@¨B(&B)
-ButtonNext=¤U¤@¨B(&N) >
-ButtonInstall=¦w¸Ë(&I)
-ButtonOK=½T©w
-ButtonCancel=¨ú®ø
-ButtonYes=¬O(&Y)
-ButtonYesToAll=¥þ³¡¬Ò¬O(&A)
-ButtonNo=§_(&N)
-ButtonNoToAll=¥þ³¡¬Ò§_(&O)
-ButtonFinish=§¹¦¨(&F)
-ButtonBrowse=ÂsÄý(&B)...
-ButtonWizardBrowse=ÂsÄý(&R)...
-ButtonNewFolder=«Ø¥ß·s¸ê®Æ§¨(&M)
-
-; *** "Select Language" dialog messages
-SelectLanguageTitle=¿ï¾Ü¦w¸Ë»y¨¥
-SelectLanguageLabel=¿ï¾Ü¦b¦w¸Ë¹Lµ{¤¤¨Ï¥Îªº»y¨¥:
-
-; *** Common wizard text
-ClickNext=«ö [¤U¤@¨B] Ä~Äò¦w¸Ë¡A©Î«ö [¨ú®ø] µ²§ô¦w¸Ëµ{¦¡¡C
-BeveledLabel=
-BrowseDialogTitle=ÂsÄý¸ê®Æ§¨
-BrowseDialogLabel=¦b¤U±ªº¸ê®Æ§¨¦Cªí¤¤¿ï¾Ü¤@Ó¸ê®Æ§¨¡AµM«á«ö [½T©w]¡C
-NewFolderName=·s¸ê®Æ§¨
-
-; *** "Welcome" wizard page
-WelcomeLabel1=Åwªï¨Ï¥Î [name] ¦w¸Ëµ{¦¡
-WelcomeLabel2=³oÓ¦w¸Ëµ{¦¡±N·|¦w¸Ë [name/ver] ¨ì±zªº¹q¸£¡C%n%n§Ú̱j¯P«Øij±z¦b¦w¸Ë¹Lµ{¤¤Ãö³¬¨ä¥¦ªºÀ³¥Îµ{¦¡¡A¥HÁקK»P¦w¸Ëµ{¦¡µo¥Í½Ä¬ð¡C
-
-; *** "Password" wizard page
-WizardPassword=±K½X
-PasswordLabel1=³oÓ¦w¸Ëµ{¦¡¨ã¦³±K½X«OÅ@¡C
-PasswordLabel3=½Ð¿é¤J±K½X¡AµM«á«ö [¤U¤@¨B] Ä~Äò¡C±K½X¬O°Ï¤À¤j¤p¼gªº¡C
-PasswordEditLabel=±K½X(&P):
-IncorrectPassword=±z¿é¤Jªº±K½X¤£¥¿½T¡A½Ð«·s¿é¤J¡C
-
-; *** "License Agreement" wizard page
-WizardLicense=±ÂÅv¦X¬ù
-LicenseLabel=½Ð¾\Ū¥H¤U±ÂÅv¦X¬ù¡C
-LicenseLabel3=½Ð¾\Ū¥H¤U±ÂÅv¦X¬ù¡A±z¥²¶·±µ¨ü¦X¬ùªº¦U¶µ±ø´Ú¤~¯àÄ~Äò¦w¸Ë¡C
-LicenseAccepted=§Ú¦P·N(&A)
-LicenseNotAccepted=§Ú¤£¦P·N(&D)
-
-; *** "Information" wizard pages
-WizardInfoBefore=°T®§
-InfoBeforeLabel=¦bÄ~Äò¦w¸Ë¤§«e½Ð¾\Ū¥H¤U«n¸ê°T¡C
-InfoBeforeClickLabel=·í±z·Ç³Æ¦nÄ~Äò¦w¸Ë¡A½Ð«ö [¤U¤@¨B]¡C
-WizardInfoAfter=°T®§
-InfoAfterLabel=¦bÄ~Äò¦w¸Ë¤§«e½Ð¾\Ū¥H¤U«n¸ê°T¡C
-InfoAfterClickLabel=·í±z·Ç³Æ¦nÄ~Äò¦w¸Ë¡A½Ð«ö [¤U¤@¨B]¡C
-
-; *** "User Information" wizard page
-WizardUserInfo=¨Ï¥ÎªÌ¸ê°T
-UserInfoDesc=½Ð¿é¤J±zªº¸ê®Æ¡C
-UserInfoName=¨Ï¥ÎªÌ¦WºÙ(&U):
-UserInfoOrg=²Õ´(&O):
-UserInfoSerial=§Ç¸¹(&S):
-UserInfoNameRequired=±z¥²¶·¿é¤J±zªº¦WºÙ¡C
-
-; *** "Select Destination Location" wizard page
-WizardSelectDir=¿ï¾Ü¥Øªº¸ê®Æ§¨
-SelectDirDesc=¿ï¾Ü¦w¸Ëµ{¦¡¦w¸Ë [name] ªº¦ì¸m¡C
-SelectDirLabel3=¦w¸Ëµ{¦¡±N·|§â [name] ¦w¸Ë¨ì¤U±ªº¸ê®Æ§¨¡C
-SelectDirBrowseLabel=«ö [½T©w] Ä~Äò¡A¦pªG±z·Q¿ï¾Ü¥t¤@Ó¸ê®Æ§¨¡A½Ð«ö [ÂsÄý]¡C
-DiskSpaceMBLabel=³Ì¤Ö»Ýn [mb] MB ºÏºÐªÅ¶¡¡C
-ToUNCPathname=¦w¸Ëµ{¦¡µLªk¦w¸Ë©ó UNC ¸ô®|¦WºÙ¡C¦pªG±z§Æ±æ¦w¸Ë©óºô¸ô¤W¨ä¥L¹q¸£¤¤¡A±z¥²¶·«Ø¥ß¤@Ó©T©w³s±µªººô¸ôºÏºÐ¾÷¡C
-InvalidPath=±z¥²¶·¿é¤J§¹¾ãªº¸ô®|¦WºÙ¤ÎºÏºÐ¾÷¥N½X¡C%n%n¨Ò¦p C:\App ©Î UNC ¸ô®|®æ¦¡ \\¦øªA¾¹\¦@¥Î¸ê®Æ§¨¡C
-InvalidDrive=±z¿ï¨úªººÏºÐ¾÷©Î UNC ¦WºÙ¤£¦s¦b©ÎµLªk¦s¨ú¡A½Ð¿ï¾Ü¨ä¥Lªº¥Øªº¦a¡C
-DiskSpaceWarningTitle=ºÏºÐªÅ¶¡¤£¨¬
-DiskSpaceWarning=¦w¸Ëµ{¦¡»Ýn¦Ü¤Ö %1 KB ªººÏºÐªÅ¶¡¡A±z©Ò¿ï¨úªººÏºÐ¥u¦³ %2 KB ¥i¥ÎªÅ¶¡¡C%n%n±znÄ~Äò¦w¸Ë¶Ü?
-DirNameTooLong=¸ê®Æ§¨¦WºÙ©Î¸ô®|¤Óªø¡C
-InvalidDirName=¸ê®Æ§¨¦WºÙ¤£¥¿½T¡C
-BadDirName32=¸ê®Æ§¨¦WºÙ¤£±o¥]§t¥H¤U¯S®í¦r¤¸:%n%n%1
-DirExistsTitle=¸ê®Æ§¨¤w¸g¦s¦b
-DirExists=¸ê®Æ§¨ %1 ¤w¸g¦s¦b¡C%n%n±znÄ~Äò¦w¸Ë¨ì³oÓ¸ê®Æ§¨¶Ü?
-DirDoesntExistTitle=¸ê®Æ§¨¤£¦s¦b
-DirDoesntExist=¸ê®Æ§¨ %1 ¤£¦s¦b¡C%n%n±zn«Ø¥ß³oÓ¸ê®Æ§¨¶Ü?
-
-; *** "Select Components" wizard page
-WizardSelectComponents=¿ï¾Ü¤¸¥ó
-SelectComponentsDesc=¿ï¾Ü±N·|³Q¦w¸Ëªº¤¸¥ó¡C
-SelectComponentsLabel2=¿ï¾Ü±z·Qn¦w¸Ëªº¤¸¥ó¤Î²M°£±z¤£·Q¦w¸Ëªº¤¸¥ó¡AµM«á«ö [¤U¤@¨B] Ä~Äò¦w¸Ë¡C
-FullInstallation=§¹¾ã¦w¸Ë
-; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
-CompactInstallation=³Ì¤p¦w¸Ë
-CustomInstallation=¦Ûq¦w¸Ë
-NoUninstallWarningTitle=¤¸¥ó¤w¦s¦b
-NoUninstallWarning=¦w¸Ëµ{¦¡°»´ú¨ì¥H¤U¤¸¥ó¤w¸g¦w¸Ë¦b±zªº¹q¸£¤W:%n%n%1%n%n¨ú®ø¿ï¾Ü³o¨Ç¤¸¥ó±N¤£·|²¾°£¥¦Ì¡C%n%n±z¤´µMnÄ~Äò¶Ü?
-ComponentSize1=%1 KB
-ComponentSize2=%1 MB
-ComponentsDiskSpaceMBLabel=¥Ø«eªº¿ï¾Ü»Ýn¦Ü¤Ö [mb] MB ºÏºÐªÅ¶¡¡C
-
-; *** "Select Additional Tasks" wizard page
-WizardSelectTasks=¿ï¾Üªþ¥[ªº¤u§@
-SelectTasksDesc=¿ï¾Ün°õ¦æªºªþ¥[¤u§@¡C
-SelectTasksLabel2=¿ï¾Ü¦w¸Ëµ{¦¡¦b¦w¸Ë [name] ®Én°õ¦æªºªþ¥[¤u§@¡AµM«á«ö [¤U¤@¨B]¡C
-
-; *** "Select Start Menu Folder" wizard page
-WizardSelectProgramGroup=¿ï¾Ü¡u¶}©l¡v¥\¯àªíªº¸ê®Æ§¨
-SelectStartMenuFolderDesc=¿ï¾Ü¦w¸Ëµ{¦¡«Ø¥ßµ{¦¡ªº±¶®|ªº¦ì¸m¡C
-SelectStartMenuFolderLabel3=¦w¸Ëµ{¦¡±N·|§âµ{¦¡ªº±¶®|«Ø¥ß¦b¤U±ªº¡u¶}©l¡v¥\¯àªí¸ê®Æ§¨¡C
-SelectStartMenuFolderBrowseLabel=«ö [½T©w] Ä~Äò¡A¦pªG±z·Q¿ï¾Ü¥t¤@Ó¸ê®Æ§¨¡A½Ð«ö [ÂsÄý]¡C
-MustEnterGroupName=±z¥²¶·¿é¤J¤@Ó¸ê®Æ§¨ªº¦WºÙ¡C
-GroupNameTooLong=¸ê®Æ§¨¦WºÙ©Î¸ô®|¤Óªø¡C
-InvalidGroupName=¸ê®Æ§¨¦WºÙ¤£¥¿½T¡C
-BadGroupName=¸ê®Æ§¨¦WºÙ¤£±o¥]§t¤U¦C¦r¤¸:%n%n%1
-NoProgramGroupCheck2=¤£n¦b¡u¶}©l¡v¥\¯àªí¤¤«Ø¥ß¸ê®Æ§¨(&D)
-
-; *** "Ready to Install" wizard page
-WizardReady=·Ç³Æ¦w¸Ë
-ReadyLabel1=¦w¸Ëµ{¦¡±N¶}©l¦w¸Ë [name] ¨ì±zªº¹q¸£¤¤¡C
-ReadyLabel2a=«ö¤U [¦w¸Ë] Ä~Äò¦w¸Ë¡A©Î«ö [¤W¤@¨B] «·sÀ˵ø©Î³]©w¦U¿ï¶µªº¤º®e¡C
-ReadyLabel2b=«ö¤U [¦w¸Ë] Ä~Äò¦w¸Ë¡C
-ReadyMemoUserInfo=¨Ï¥ÎªÌ¸ê°T
-ReadyMemoDir=¥Øªº¸ê®Æ§¨:
-ReadyMemoType=¦w¸Ë«¬ºA:
-ReadyMemoComponents=¿ï¾Üªº¤¸¥ó:
-ReadyMemoGroup=¡u¶}©l¡v¥\¯àªí¸ê®Æ§¨:
-ReadyMemoTasks=ªþ¥[¤u§@:
-
-; *** "Preparing to Install" wizard page
-WizardPreparing=·Ç³Æ¦w¸Ëµ{¦¡
-PreparingDesc=¦w¸Ëµ{¦¡·Ç³Æ±N [name] ¦w¸Ë¨ì±zªº¹q¸£¤W¡C
-PreviousInstallNotCompleted=¥ý«eªº¦w¸Ë/ ¸Ñ°£¦w¸Ë©|¥¼§¹¦¨¡A±z¥²¶·«·s±Ò°Ê¹q¸£¥H§¹¦¨¸Ó¦w¸Ë¡C%n%n¦b«·s±Ò°Ê¹q¸£¤§«á¡A½Ð¦A°õ¦æ³oÓµ{¦¡¨Ó¦w¸Ë [name]¡C
-CannotContinue=¦w¸Ëµ{¦¡µLªkÄ~Äò¡C½Ð«ö [¨ú®ø] Â÷¶}¡C
-
-; *** "Installing" wizard page
-WizardInstalling=¥¿¦b¦w¸Ë
-InstallingLabel=½ÐµyÔ¡A¦w¸Ëµ{¦¡¥¿¦b±N [name] ¦w¸Ë¨ì±zªº¹q¸£¤W¡C
-
-; *** "Setup Completed" wizard page
-FinishedHeadingLabel=¦w¸Ë§¹¦¨
-FinishedLabelNoIcons=¦w¸Ëµ{¦¡¤w¸g±N [name] ¦w¸Ë¦b±zªº¹q¸£¤W¡C
-FinishedLabel=¦w¸Ëµ{¦¡¤w¸g±N [name] ¦w¸Ë¦b±zªº¹q¸£¤¤¡A±z¥i¥H¿ï¾Üµ{¦¡ªº¹Ï¥Ü¨Ó°õ¦æ¸ÓÀ³¥Îµ{¦¡¡C
-ClickFinish=«ö [§¹¦¨] ¥Hµ²§ô¦w¸Ëµ{¦¡¡C
-FinishedRestartLabel=n§¹¦¨ [name] ªº¦w¸Ë¡A¦w¸Ëµ{¦¡¥²¶·«·s±Ò°Ê±zªº¹q¸£¡C±z·Qn²{¦b«·s±Ò°Ê¹q¸£¶Ü?
-FinishedRestartMessage=n§¹¦¨ [name] ªº¦w¸Ë¡A¦w¸Ëµ{¦¡¥²¶·«·s±Ò°Ê±zªº¹q¸£¡C%n%n±z·Qn²{¦b«·s±Ò°Ê¹q¸£¶Ü?
-ShowReadmeCheck=¬O¡A§Ún¾\ŪŪ§ÚÀɮסC
-YesRadio=¬O¡A¥ß§Y«·s±Ò°Ê¹q¸£(&Y)
-NoRadio=§_¡A§Úµy«á«·s±Ò°Ê¹q¸£(&N)
-; used for example as 'Run MyProg.exe'
-RunEntryExec=°õ¦æ %1
-; used for example as 'View Readme.txt'
-RunEntryShellExec=À˵ø %1
-
-; *** "Setup Needs the Next Disk" stuff
-ChangeDiskTitle=¦w¸Ëµ{¦¡»Ýn¤U¤@±iºÏ¤ù
-SelectDiskLabel2=½Ð´¡¤JºÏ¤ù %1¡AµM«á«ö [½T©w]¡C%n%n¦pªGÀɮפ£¦b¥H¤U©ÒÅã¥Üªº¸ê®Æ§¨¤§¤¤¡A½Ð¿é¤J¥¿½Tªº¸ê®Æ§¨¦WºÙ©Î«ö [ÂsÄý] ¿ï¨ú¡C
-PathLabel=¸ô®|(&P):
-FileNotInDir2=ÀÉ®× "%1" µLªk¦b "%2" §ä¨ì¡C½Ð´¡¤J¥¿½TªººÏ¤ù©Î¿ï¾Ü¨ä¥¦ªº¸ê®Æ§¨¡C
-SelectDirectoryLabel=½Ð«ü©w¤U¤@±iºÏ¤ùªº¦ì¸m¡C
-
-; *** Installation phase messages
-SetupAborted=¦w¸Ë¨S¦³§¹¦¨¡C%n%n½Ð§ó¥¿°ÝÃD«á«·s¦w¸Ë¤@¦¸¡C
-EntryAbortRetryIgnore=«ö [«¸Õ] «¸Õ¤@¦¸¡A«ö¤U [²¤¹L] ¸õ¹L³oÓÀɮסA©Î«ö¤U [¤¤¤î] µ²§ô¦w¸Ë¡C
-
-; *** Installation status messages
-StatusCreateDirs=¥¿¦b«Ø¥ß¸ê®Æ§¨...
-StatusExtractFiles=¥¿¦b¸ÑÀ£ÁYÀÉ®×...
-StatusCreateIcons=¥¿¦b«Ø¥ßµ{¦¡¶°¹Ï¥Ü...
-StatusCreateIniEntries=¼g¤J INI Àɮתº¶µ¥Ø...
-StatusCreateRegistryEntries=¥¿¦b§ó·s¨t²Îµn¿ý...
-StatusRegisterFiles=¥¿¦bµn¿ýÀÉ®×...
-StatusSavingUninstall=Àx¦s¸Ñ°£¦w¸Ë¸ê°T...
-StatusRunProgram=¥¿¦b§¹¦¨¦w¸Ë...
-StatusRollback=¥¿¦b´_ìÅܧó...
-
-; *** Misc. errors
-ErrorInternal2=¤º³¡¿ù»~: %1¡C
-ErrorFunctionFailedNoCode=%1 ¥¢±Ñ¡C
-ErrorFunctionFailed=%1 ¥¢±Ñ¡C¥N½X %2¡C
-ErrorFunctionFailedWithMessage=%1 ¥¢±Ñ¡C¥N½X %2¡C%n%3
-ErrorExecutingProgram=µLªk°õ¦æÀÉ®×:%n%1
-
-; *** Registry errors
-ErrorRegOpenKey=µLªk¶}±Òµn¿ýÁä:%n%1\%2
-ErrorRegCreateKey=µLªk«Ø¥ßµn¿ý¶µ¥Ø:%n%1\%2
-ErrorRegWriteKey=µLªkÅܧóµn¿ý¶µ¥Ø:%n%1\%2
-
-; *** INI errors
-ErrorIniEntry=µLªk«Ø¥ß INI ¶µ¥Ø "%1"¡C
-
-; *** File copying errors
-FileAbortRetryIgnore=«ö [«¸Õ] ¦A¸Õ¤@¦¸¡A«ö [²¤¹L] ¸õ¹L³oÓÀɮס]¤£«Øij¡^¡A©Î«ö [¤¤¤î] µ²§ô¦w¸Ë¡C
-FileAbortRetryIgnore2=«ö [«¸Õ] ¦A¸Õ¤@¦¸¡A«ö [²¤¹L] Ä~Äò¶i¦æ¡]¤£«Øij¡^¡A©Î«ö [¤¤¤î] µ²§ô¦w¸Ë¡C
-SourceIsCorrupted=¨Ó·½Àɮפw¸g·l·´¡C
-SourceDoesntExist=¨Ó·½ÀÉ®× "%1" ¤£¦s¦b¡C
-ExistingFileReadOnly=ÀÉ®×Äݩʤw³]¬°°ßŪ¡C%n%n«ö [«¸Õ] ±N°ßŪÄݩʲ¾°£¨Ã¦A¸Õ¤@¦¸¡A«ö [²¤¹L] ¸õ¹L³oÓÀɮסA©Î«ö [¤¤¤î] µ²§ô¦w¸Ë¡C
-ErrorReadingExistingDest=Ū¨ú¤@Ó¤w¦s¦bªºÀɮ׮ɵo¥Í¿ù»~:
-FileExists=Àɮפw¸g¦s¦b¡C±zn¨ú¥N¥Ø«eªºÀɮ׶Ü?
-ExistingFileNewer=¦s¦bªºÀɮת©¥»¤ñ¸û·s¡A«Øij±z«O¯d¥Ø«e¤w¦s¦bªºÀɮסC%n%n±zn«O¯d¥Ø«e¤w¦s¦bªºÀɮ׶Ü?
-ErrorChangingAttr=¦bÅܧóÀÉ®×Äݩʮɵo¥Í¿ù»~:
-ErrorCreatingTemp=¦b¥Øªº¸ê®Æ§¨¤¤«Ø¥ßÀɮ׮ɵo¥Í¿ù»~:
-ErrorReadingSource=Ū¨úì©lÀɮ׮ɵo¥Í¿ù»~:
-ErrorCopying=½Æ»sÀɮ׮ɵo¥Í¿ù»~:
-ErrorReplacingExistingFile=¨ú¥NÀɮ׮ɵo¥Í¿ù»~:
-ErrorRestartReplace=«·s±Ò°Ê¹q¸£«á¨ú¥NÀÉ®×¥¢±Ñ:
-ErrorRenamingTemp=¦b¥Øªº¸ê®Æ§¨ÅܧóÀɮצWºÙ®Éµo¥Í¿ù»~:
-ErrorRegisterServer=µLªkµn¿ý DLL/OCX ÀÉ®×: %1¡C
-ErrorRegSvr32Failed=°õ¦æ RegSvr32 ¥¢±Ñ¡A¿ù»~½X¬° %1¡C
-ErrorRegisterTypeLib=µLªkµn¿ý Type Library: %1¡C
-
-; *** Post-installation errors
-ErrorOpeningReadme=¶}±ÒŪ§ÚÀɮ׮ɵo¥Í¿ù»~¡C
-ErrorRestartingComputer=¦w¸Ëµ{¦¡µLªk«·s±Ò°Ê¹q¸£¡A½Ð¥H¤â°Ê¤è¦¡¦Û¦æ«·s±Ò°Ê¹q¸£¡C
-
-; *** Uninstaller messages
-UninstallNotFound=ÀÉ®× "%1" ¤£¦s¦b¡AµLªk²¾°£µ{¦¡¡C
-UninstallOpenError=µLªk¶}±ÒÀÉ®× "%1"¡AµLªk²¾°£µ{¦¡¡C
-UninstallUnsupportedVer=³oÓª©¥»ªº¸Ñ°£¦w¸Ëµ{¦¡µLªk¿ëÃÑ°O¿ýÀÉ "%1" ¤§®æ¦¡¡AµLªk¸Ñ°£¦w¸Ë¡C
-UninstallUnknownEntry=¸Ñ°£¦w¸Ë°O¿ýÀɤ¤µo²{¥¼ª¾ªº°O¿ý (%1)¡C
-ConfirmUninstall=±z½T©wn§¹¥þ²¾°£ %1 ¤Î¨ä¬ÛÃöªºÀɮ׶Ü?
-UninstallOnlyOnWin64=³oÓµ{¦¡¥u¯à¦b 64 ¦ì¤¸ªº Windows ¤W¸Ñ°£¦w¸Ë¡C
-OnlyAdminCanUninstall=³oÓµ{¦¡n¨ã³Æ¨t²ÎºÞ²zûÅvªº¨Ï¥ÎªÌ¤è¥i¸Ñ°£¦w¸Ë¡C
-UninstallStatusLabel=¥¿¦b±q±zªº¹q¸£²¾°£ %1 ¤¤¡A½ÐµyÔ...
-UninstalledAll=%1 ¤w¸g¦¨¥\±q±zªº¹q¸£¤¤²¾°£¡C
-UninstalledMost=%1 ¸Ñ°£¦w¸Ë§¹¦¨¡C%n%n¬Y¨ÇÀɮפΤ¸¥óµLªk²¾°£¡A±z¥i¥H¦Û¦æ§R°£³o¨ÇÀɮסC
-UninstalledAndNeedsRestart=n§¹¦¨ %1 ªº¸Ñ°£¦w¸Ëµ{§Ç¡A±z¥²¶·«·s±Ò°Ê¹q¸£¡C%n%n±z·Qn²{¦b«·s±Ò°Ê¹q¸£¶Ü?
-UninstallDataCorrupted=ÀÉ®× "%1" ¤w¸g·l·´¡AµLªk¸Ñ°£¦w¸Ë¡C
-
-; *** Uninstallation phase messages
-ConfirmDeleteSharedFileTitle=²¾°£¦@¥ÎÀÉ®×
-ConfirmDeleteSharedFile2=¨t²ÎÅã¥Ü¤U¦C¦@¥ÎÀɮפw¤£¦A³Q¥ô¦óµ{¦¡©Ò¨Ï¥Î¡A±zn²¾°£³o¨ÇÀɮ׶Ü?%n%n%1%n%nÕY±z²¾°£¤F¥H¤WÀɮצý¤´¦³µ{¦¡»Ýn¨Ï¥Î¥¦Ì¡A±N³y¦¨³o¨Çµ{¦¡µLªk¥¿±`°õ¦æ¡A¦]¦¹±zYµLªk½T©w½Ð¿ï¾Ü [§_]¡C«O¯d³o¨ÇÀɮצb±zªº¨t²Î¤¤¤£·|³y¦¨¥ô¦ó·l®`¡C
-SharedFileNameLabel=ÀɮצWºÙ:
-SharedFileLocationLabel=¦ì¸m:
-WizardUninstalling=¸Ñ°£¦w¸Ëª¬ºA
-StatusUninstalling=¥¿¦b¸Ñ°£¦w¸Ë %1...
-
-; The custom messages below aren't used by Setup itself, but if you make
-; use of them in your scripts, you'll want to translate them.
-
-[CustomMessages]
-
-NameAndVersion=%1 ª©¥» %2
-AdditionalIcons=ªþ¥[¹Ï¥Ü:
-CreateDesktopIcon=«Ø¥ß®à±¹Ï¥Ü(&D)
-CreateQuickLaunchIcon=«Ø¥ß§Ö³t±Ò°Ê¹Ï¥Ü(&Q)
-ProgramOnTheWeb=%1 ªººô¯¸
-UninstallProgram=¸Ñ°£¦w¸Ë %1
-LaunchProgram=±Ò°Ê %1
-AssocFileExtension=±N %1 »PÀÉ®×°ÆÀɦW %2 ²£¥ÍÃöÁp(&A)
-AssocingFileExtension=¥¿¦b±N %1 »PÀÉ®×°ÆÀɦW %2 ²£¥ÍÃöÁp...
+; *** Inno Setup version 5.1.11+ Chinese (Traditional) messages ***
+;
+; To download user-contributed translations of this file, go to:
+; http://www.jrsoftware.org/is3rdparty.php
+;
+; Translated by: Patrick Pang (uncleleft at yahoo.com.hk)
+;
+; Note: When translating this text, do not add periods (.) to the end of
+; messages that didn't have them already, because on those messages Inno
+; Setup adds the periods automatically (appending a period would result in
+; two periods being displayed).
+
+[LangOptions]
+LanguageName=<7e41><9ad4><4e2d><6587>
+LanguageID=$0404
+LanguageCodepage=950
+; If the language you are translating to requires special font faces or
+; sizes, uncomment any of the following entries and change them accordingly.
+DialogFontName=·s²Ó©úÅé
+DialogFontSize=9
+TitleFontName=Arial
+TitleFontSize=28
+WelcomeFontName=·s²Ó©úÅé
+WelcomeFontSize=12
+CopyrightFontName=·s²Ó©úÅé
+CopyrightFontSize=9
+
+[Messages]
+
+; *** Application titles
+SetupAppTitle=¦w¸Ëµ{¦¡
+SetupWindowTitle=%1 ¦w¸Ëµ{¦¡
+UninstallAppTitle=¸Ñ°£¦w¸Ë
+UninstallAppFullTitle=¸Ñ°£¦w¸Ë %1
+
+; *** Misc. common
+InformationTitle=°T®§
+ConfirmTitle=½T»{
+ErrorTitle=¿ù»~
+
+; *** SetupLdr messages
+SetupLdrStartupMessage=³o±N·|¦w¸Ë %1¡C±z·QnÄ~Äò¶Ü?
+LdrCannotCreateTemp=µLªk«Ø¥ß¼È¦sÀɮסC¦w¸Ëµ{¦¡±N·|µ²§ô¡C
+LdrCannotExecTemp=µLªk°õ¦æ¼È¦sÀɮסC¦w¸Ëµ{¦¡±N·|µ²§ô¡C
+
+; *** Startup error messages
+LastErrorMessage=%1%n%n¿ù»~ %2: %3
+SetupFileMissing=¦w¸Ë¸ê®Æ§¨¤¤¿ò¥¢ÀÉ®× %1¡C½Ð×¥¿¦¹°ÝÃD©Î«·s¨ú±o¦¹³nÅé¡C
+SetupFileCorrupt=¦w¸ËÀɮפw¸g·l·´¡C½Ð«·s¨ú±o¦¹³nÅé¡C
+SetupFileCorruptOrWrongVer=¦w¸ËÀɮפw¸g·l·´¡A©Î»P¦w¸Ëµ{¦¡ªºª©¥»¤£²Å¡C½Ð«·s¨ú±o¦¹³nÅé¡C
+NotOnThisPlatform=³oÓµ{¦¡µLªk¦b %1 °õ¦æ¡C
+OnlyOnThisPlatform=³oÓµ{¦¡¥²¶·¦b %1 °õ¦æ¡C
+OnlyOnTheseArchitectures=³oÓµ{¦¡¥u¯à¦b±Mªù¬°¥H¤U³B²z¾¹¬[ºc¦Ó³]pªº Windows ¤W¦w¸Ë:%n%n%1
+MissingWOW64APIs=³oÓª©¥»ªº Windows ¤£¥]§t¦w¸Ëµ{¦¡°õ¦æ 64 ¦ì¤¸¦w¸Ë©Ò»Ýªº¥\¯à¡C½Ð¦w¸Ë Service Pack %1 ¥h×¥¿¦¹°ÝÃD¡C
+WinVersionTooLowError=³oÓµ{¦¡¥²¶·¦b %1 ª©¥» %2 ©Î¥H¤Wªº¨t²Î°õ¦æ¡C
+WinVersionTooHighError=³oÓµ{¦¡µLªk¦w¸Ë¦b %1 ª©¥» %2 ©Î¥H¤Wªº¨t²Î¡C
+AdminPrivilegesRequired=±z¥²¶·µn¤J¦¨¨t²ÎºÞ²zû¥H¦w¸Ë³oÓµ{¦¡¡C
+PowerUserPrivilegesRequired=±z¥²¶·µn¤J¦¨¨ã¦³¨t²ÎºÞ²zû©Î Power User Åvªº¨Ï¥ÎªÌ¥H¦w¸Ë³oÓµ{¦¡¡C
+SetupAppRunningError=¦w¸Ëµ{¦¡°»´ú¨ì %1 ¥¿¦b°õ¦æ¡C%n%n½ÐÃö³¬¸Óµ{¦¡«á«ö [½T©w] Ä~Äò¡A©Î«ö [¨ú®ø] Â÷¶}¡C
+UninstallAppRunningError=¸Ñ°£¦w¸Ëµ{¦¡°»´ú¨ì %1 ¥¿¦b°õ¦æ¡C%n%n½ÐÃö³¬¸Óµ{¦¡«á«ö [½T©w] Ä~Äò¡A©Î«ö [¨ú®ø] Â÷¶}¡C
+
+; *** Misc. errors
+ErrorCreatingDir=¦w¸Ëµ{¦¡µLªk«Ø¥ß¸ê®Æ§¨ "%1"¡C
+ErrorTooManyFilesInDir=µLªk¦b¸ê®Æ§¨ "%1" ¤º«Ø¥ßÀɮסA¦]¬°¸ê®Æ§¨¤º¦³¤Ó¦hªºÀɮסC
+
+; *** Setup common messages
+ExitSetupTitle=µ²§ô¦w¸Ëµ{¦¡
+ExitSetupMessage=¦w¸Ë©|¥¼§¹¦¨¡C¦pªG±z²{¦bµ²§ô¦w¸Ëµ{¦¡¡A³oÓµ{¦¡±N¤£·|³Q¦w¸Ë¡C%n%n±z¥i¥Hµy«á¦A°õ¦æ¦w¸Ëµ{¦¡¥H§¹¦¨¦w¸Ëµ{§Ç¡C±z²{¦bnµ²§ô¦w¸Ëµ{¦¡¶Ü?
+AboutSetupMenuItem=Ãö©ó¦w¸Ëµ{¦¡(&A)...
+AboutSetupTitle=Ãö©ó¦w¸Ëµ{¦¡
+AboutSetupMessage=%1 ª©¥» %2%n%3%n%n%1 ºô§}:%n%4
+AboutSetupNote=
+TranslatorNote=ÁcÅ餤¤å»y¨t¥Ñ Patrick Pang (uncleleft at yahoo.com.hk) ºûÅ@¡C
+
+; *** Buttons
+ButtonBack=< ¤W¤@¨B(&B)
+ButtonNext=¤U¤@¨B(&N) >
+ButtonInstall=¦w¸Ë(&I)
+ButtonOK=½T©w
+ButtonCancel=¨ú®ø
+ButtonYes=¬O(&Y)
+ButtonYesToAll=¥þ³¡¬Ò¬O(&A)
+ButtonNo=§_(&N)
+ButtonNoToAll=¥þ³¡¬Ò§_(&O)
+ButtonFinish=§¹¦¨(&F)
+ButtonBrowse=ÂsÄý(&B)...
+ButtonWizardBrowse=ÂsÄý(&R)...
+ButtonNewFolder=«Ø¥ß·s¸ê®Æ§¨(&M)
+
+; *** "Select Language" dialog messages
+SelectLanguageTitle=¿ï¾Ü¦w¸Ë»y¨¥
+SelectLanguageLabel=¿ï¾Ü¦b¦w¸Ë¹Lµ{¤¤¨Ï¥Îªº»y¨¥:
+
+; *** Common wizard text
+ClickNext=«ö [¤U¤@¨B] Ä~Äò¦w¸Ë¡A©Î«ö [¨ú®ø] µ²§ô¦w¸Ëµ{¦¡¡C
+BeveledLabel=
+BrowseDialogTitle=ÂsÄý¸ê®Æ§¨
+BrowseDialogLabel=¦b¤U±ªº¸ê®Æ§¨¦Cªí¤¤¿ï¾Ü¤@Ó¸ê®Æ§¨¡AµM«á«ö [½T©w]¡C
+NewFolderName=·s¸ê®Æ§¨
+
+; *** "Welcome" wizard page
+WelcomeLabel1=Åwªï¨Ï¥Î [name] ¦w¸Ëµ{¦¡
+WelcomeLabel2=³oÓ¦w¸Ëµ{¦¡±N·|¦w¸Ë [name/ver] ¨ì±zªº¹q¸£¡C%n%n§Ú̱j¯P«Øij±z¦b¦w¸Ë¹Lµ{¤¤Ãö³¬¨ä¥¦ªºÀ³¥Îµ{¦¡¡A¥HÁקK»P¦w¸Ëµ{¦¡µo¥Í½Ä¬ð¡C
+
+; *** "Password" wizard page
+WizardPassword=±K½X
+PasswordLabel1=³oÓ¦w¸Ëµ{¦¡¨ã¦³±K½X«OÅ@¡C
+PasswordLabel3=½Ð¿é¤J±K½X¡AµM«á«ö [¤U¤@¨B] Ä~Äò¡C±K½X¬O°Ï¤À¤j¤p¼gªº¡C
+PasswordEditLabel=±K½X(&P):
+IncorrectPassword=±z¿é¤Jªº±K½X¤£¥¿½T¡A½Ð«·s¿é¤J¡C
+
+; *** "License Agreement" wizard page
+WizardLicense=±ÂÅv¦X¬ù
+LicenseLabel=½Ð¾\Ū¥H¤U±ÂÅv¦X¬ù¡C
+LicenseLabel3=½Ð¾\Ū¥H¤U±ÂÅv¦X¬ù¡A±z¥²¶·±µ¨ü¦X¬ùªº¦U¶µ±ø´Ú¤~¯àÄ~Äò¦w¸Ë¡C
+LicenseAccepted=§Ú¦P·N(&A)
+LicenseNotAccepted=§Ú¤£¦P·N(&D)
+
+; *** "Information" wizard pages
+WizardInfoBefore=°T®§
+InfoBeforeLabel=¦bÄ~Äò¦w¸Ë¤§«e½Ð¾\Ū¥H¤U«n¸ê°T¡C
+InfoBeforeClickLabel=·í±z·Ç³Æ¦nÄ~Äò¦w¸Ë¡A½Ð«ö [¤U¤@¨B]¡C
+WizardInfoAfter=°T®§
+InfoAfterLabel=¦bÄ~Äò¦w¸Ë¤§«e½Ð¾\Ū¥H¤U«n¸ê°T¡C
+InfoAfterClickLabel=·í±z·Ç³Æ¦nÄ~Äò¦w¸Ë¡A½Ð«ö [¤U¤@¨B]¡C
+
+; *** "User Information" wizard page
+WizardUserInfo=¨Ï¥ÎªÌ¸ê°T
+UserInfoDesc=½Ð¿é¤J±zªº¸ê®Æ¡C
+UserInfoName=¨Ï¥ÎªÌ¦WºÙ(&U):
+UserInfoOrg=²Õ´(&O):
+UserInfoSerial=§Ç¸¹(&S):
+UserInfoNameRequired=±z¥²¶·¿é¤J±zªº¦WºÙ¡C
+
+; *** "Select Destination Location" wizard page
+WizardSelectDir=¿ï¾Ü¥Øªº¸ê®Æ§¨
+SelectDirDesc=¿ï¾Ü¦w¸Ëµ{¦¡¦w¸Ë [name] ªº¦ì¸m¡C
+SelectDirLabel3=¦w¸Ëµ{¦¡±N·|§â [name] ¦w¸Ë¨ì¤U±ªº¸ê®Æ§¨¡C
+SelectDirBrowseLabel=«ö [½T©w] Ä~Äò¡A¦pªG±z·Q¿ï¾Ü¥t¤@Ó¸ê®Æ§¨¡A½Ð«ö [ÂsÄý]¡C
+DiskSpaceMBLabel=³Ì¤Ö»Ýn [mb] MB ºÏºÐªÅ¶¡¡C
+ToUNCPathname=¦w¸Ëµ{¦¡µLªk¦w¸Ë©ó UNC ¸ô®|¦WºÙ¡C¦pªG±z§Æ±æ¦w¸Ë©óºô¸ô¤W¨ä¥L¹q¸£¤¤¡A±z¥²¶·«Ø¥ß¤@Ó©T©w³s±µªººô¸ôºÏºÐ¾÷¡C
+InvalidPath=±z¥²¶·¿é¤J§¹¾ãªº¸ô®|¦WºÙ¤ÎºÏºÐ¾÷¥N½X¡C%n%n¨Ò¦p C:\App ©Î UNC ¸ô®|®æ¦¡ \\¦øªA¾¹\¦@¥Î¸ê®Æ§¨¡C
+InvalidDrive=±z¿ï¨úªººÏºÐ¾÷©Î UNC ¦WºÙ¤£¦s¦b©ÎµLªk¦s¨ú¡A½Ð¿ï¾Ü¨ä¥Lªº¥Øªº¦a¡C
+DiskSpaceWarningTitle=ºÏºÐªÅ¶¡¤£¨¬
+DiskSpaceWarning=¦w¸Ëµ{¦¡»Ýn¦Ü¤Ö %1 KB ªººÏºÐªÅ¶¡¡A±z©Ò¿ï¨úªººÏºÐ¥u¦³ %2 KB ¥i¥ÎªÅ¶¡¡C%n%n±znÄ~Äò¦w¸Ë¶Ü?
+DirNameTooLong=¸ê®Æ§¨¦WºÙ©Î¸ô®|¤Óªø¡C
+InvalidDirName=¸ê®Æ§¨¦WºÙ¤£¥¿½T¡C
+BadDirName32=¸ê®Æ§¨¦WºÙ¤£±o¥]§t¥H¤U¯S®í¦r¤¸:%n%n%1
+DirExistsTitle=¸ê®Æ§¨¤w¸g¦s¦b
+DirExists=¸ê®Æ§¨ %1 ¤w¸g¦s¦b¡C%n%n±znÄ~Äò¦w¸Ë¨ì³oÓ¸ê®Æ§¨¶Ü?
+DirDoesntExistTitle=¸ê®Æ§¨¤£¦s¦b
+DirDoesntExist=¸ê®Æ§¨ %1 ¤£¦s¦b¡C%n%n±zn«Ø¥ß³oÓ¸ê®Æ§¨¶Ü?
+
+; *** "Select Components" wizard page
+WizardSelectComponents=¿ï¾Ü¤¸¥ó
+SelectComponentsDesc=¿ï¾Ü±N·|³Q¦w¸Ëªº¤¸¥ó¡C
+SelectComponentsLabel2=¿ï¾Ü±z·Qn¦w¸Ëªº¤¸¥ó¤Î²M°£±z¤£·Q¦w¸Ëªº¤¸¥ó¡AµM«á«ö [¤U¤@¨B] Ä~Äò¦w¸Ë¡C
+FullInstallation=§¹¾ã¦w¸Ë
+; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
+CompactInstallation=³Ì¤p¦w¸Ë
+CustomInstallation=¦Ûq¦w¸Ë
+NoUninstallWarningTitle=¤¸¥ó¤w¦s¦b
+NoUninstallWarning=¦w¸Ëµ{¦¡°»´ú¨ì¥H¤U¤¸¥ó¤w¸g¦w¸Ë¦b±zªº¹q¸£¤W:%n%n%1%n%n¨ú®ø¿ï¾Ü³o¨Ç¤¸¥ó±N¤£·|²¾°£¥¦Ì¡C%n%n±z¤´µMnÄ~Äò¶Ü?
+ComponentSize1=%1 KB
+ComponentSize2=%1 MB
+ComponentsDiskSpaceMBLabel=¥Ø«eªº¿ï¾Ü»Ýn¦Ü¤Ö [mb] MB ºÏºÐªÅ¶¡¡C
+
+; *** "Select Additional Tasks" wizard page
+WizardSelectTasks=¿ï¾Üªþ¥[ªº¤u§@
+SelectTasksDesc=¿ï¾Ün°õ¦æªºªþ¥[¤u§@¡C
+SelectTasksLabel2=¿ï¾Ü¦w¸Ëµ{¦¡¦b¦w¸Ë [name] ®Én°õ¦æªºªþ¥[¤u§@¡AµM«á«ö [¤U¤@¨B]¡C
+
+; *** "Select Start Menu Folder" wizard page
+WizardSelectProgramGroup=¿ï¾Ü¡u¶}©l¡v¥\¯àªíªº¸ê®Æ§¨
+SelectStartMenuFolderDesc=¿ï¾Ü¦w¸Ëµ{¦¡«Ø¥ßµ{¦¡ªº±¶®|ªº¦ì¸m¡C
+SelectStartMenuFolderLabel3=¦w¸Ëµ{¦¡±N·|§âµ{¦¡ªº±¶®|«Ø¥ß¦b¤U±ªº¡u¶}©l¡v¥\¯àªí¸ê®Æ§¨¡C
+SelectStartMenuFolderBrowseLabel=«ö [½T©w] Ä~Äò¡A¦pªG±z·Q¿ï¾Ü¥t¤@Ó¸ê®Æ§¨¡A½Ð«ö [ÂsÄý]¡C
+MustEnterGroupName=±z¥²¶·¿é¤J¤@Ó¸ê®Æ§¨ªº¦WºÙ¡C
+GroupNameTooLong=¸ê®Æ§¨¦WºÙ©Î¸ô®|¤Óªø¡C
+InvalidGroupName=¸ê®Æ§¨¦WºÙ¤£¥¿½T¡C
+BadGroupName=¸ê®Æ§¨¦WºÙ¤£±o¥]§t¤U¦C¦r¤¸:%n%n%1
+NoProgramGroupCheck2=¤£n¦b¡u¶}©l¡v¥\¯àªí¤¤«Ø¥ß¸ê®Æ§¨(&D)
+
+; *** "Ready to Install" wizard page
+WizardReady=·Ç³Æ¦w¸Ë
+ReadyLabel1=¦w¸Ëµ{¦¡±N¶}©l¦w¸Ë [name] ¨ì±zªº¹q¸£¤¤¡C
+ReadyLabel2a=«ö¤U [¦w¸Ë] Ä~Äò¦w¸Ë¡A©Î«ö [¤W¤@¨B] «·sÀ˵ø©Î³]©w¦U¿ï¶µªº¤º®e¡C
+ReadyLabel2b=«ö¤U [¦w¸Ë] Ä~Äò¦w¸Ë¡C
+ReadyMemoUserInfo=¨Ï¥ÎªÌ¸ê°T
+ReadyMemoDir=¥Øªº¸ê®Æ§¨:
+ReadyMemoType=¦w¸Ë«¬ºA:
+ReadyMemoComponents=¿ï¾Üªº¤¸¥ó:
+ReadyMemoGroup=¡u¶}©l¡v¥\¯àªí¸ê®Æ§¨:
+ReadyMemoTasks=ªþ¥[¤u§@:
+
+; *** "Preparing to Install" wizard page
+WizardPreparing=·Ç³Æ¦w¸Ëµ{¦¡
+PreparingDesc=¦w¸Ëµ{¦¡·Ç³Æ±N [name] ¦w¸Ë¨ì±zªº¹q¸£¤W¡C
+PreviousInstallNotCompleted=¥ý«eªº¦w¸Ë/ ¸Ñ°£¦w¸Ë©|¥¼§¹¦¨¡A±z¥²¶·«·s±Ò°Ê¹q¸£¥H§¹¦¨¸Ó¦w¸Ë¡C%n%n¦b«·s±Ò°Ê¹q¸£¤§«á¡A½Ð¦A°õ¦æ³oÓµ{¦¡¨Ó¦w¸Ë [name]¡C
+CannotContinue=¦w¸Ëµ{¦¡µLªkÄ~Äò¡C½Ð«ö [¨ú®ø] Â÷¶}¡C
+
+; *** "Installing" wizard page
+WizardInstalling=¥¿¦b¦w¸Ë
+InstallingLabel=½ÐµyÔ¡A¦w¸Ëµ{¦¡¥¿¦b±N [name] ¦w¸Ë¨ì±zªº¹q¸£¤W¡C
+
+; *** "Setup Completed" wizard page
+FinishedHeadingLabel=¦w¸Ë§¹¦¨
+FinishedLabelNoIcons=¦w¸Ëµ{¦¡¤w¸g±N [name] ¦w¸Ë¦b±zªº¹q¸£¤W¡C
+FinishedLabel=¦w¸Ëµ{¦¡¤w¸g±N [name] ¦w¸Ë¦b±zªº¹q¸£¤¤¡A±z¥i¥H¿ï¾Üµ{¦¡ªº¹Ï¥Ü¨Ó°õ¦æ¸ÓÀ³¥Îµ{¦¡¡C
+ClickFinish=«ö [§¹¦¨] ¥Hµ²§ô¦w¸Ëµ{¦¡¡C
+FinishedRestartLabel=n§¹¦¨ [name] ªº¦w¸Ë¡A¦w¸Ëµ{¦¡¥²¶·«·s±Ò°Ê±zªº¹q¸£¡C±z·Qn²{¦b«·s±Ò°Ê¹q¸£¶Ü?
+FinishedRestartMessage=n§¹¦¨ [name] ªº¦w¸Ë¡A¦w¸Ëµ{¦¡¥²¶·«·s±Ò°Ê±zªº¹q¸£¡C%n%n±z·Qn²{¦b«·s±Ò°Ê¹q¸£¶Ü?
+ShowReadmeCheck=¬O¡A§Ún¾\ŪŪ§ÚÀɮסC
+YesRadio=¬O¡A¥ß§Y«·s±Ò°Ê¹q¸£(&Y)
+NoRadio=§_¡A§Úµy«á«·s±Ò°Ê¹q¸£(&N)
+; used for example as 'Run MyProg.exe'
+RunEntryExec=°õ¦æ %1
+; used for example as 'View Readme.txt'
+RunEntryShellExec=À˵ø %1
+
+; *** "Setup Needs the Next Disk" stuff
+ChangeDiskTitle=¦w¸Ëµ{¦¡»Ýn¤U¤@±iºÏ¤ù
+SelectDiskLabel2=½Ð´¡¤JºÏ¤ù %1¡AµM«á«ö [½T©w]¡C%n%n¦pªGÀɮפ£¦b¥H¤U©ÒÅã¥Üªº¸ê®Æ§¨¤§¤¤¡A½Ð¿é¤J¥¿½Tªº¸ê®Æ§¨¦WºÙ©Î«ö [ÂsÄý] ¿ï¨ú¡C
+PathLabel=¸ô®|(&P):
+FileNotInDir2=ÀÉ®× "%1" µLªk¦b "%2" §ä¨ì¡C½Ð´¡¤J¥¿½TªººÏ¤ù©Î¿ï¾Ü¨ä¥¦ªº¸ê®Æ§¨¡C
+SelectDirectoryLabel=½Ð«ü©w¤U¤@±iºÏ¤ùªº¦ì¸m¡C
+
+; *** Installation phase messages
+SetupAborted=¦w¸Ë¨S¦³§¹¦¨¡C%n%n½Ð§ó¥¿°ÝÃD«á«·s¦w¸Ë¤@¦¸¡C
+EntryAbortRetryIgnore=«ö [«¸Õ] «¸Õ¤@¦¸¡A«ö¤U [²¤¹L] ¸õ¹L³oÓÀɮסA©Î«ö¤U [¤¤¤î] µ²§ô¦w¸Ë¡C
+
+; *** Installation status messages
+StatusCreateDirs=¥¿¦b«Ø¥ß¸ê®Æ§¨...
+StatusExtractFiles=¥¿¦b¸ÑÀ£ÁYÀÉ®×...
+StatusCreateIcons=¥¿¦b«Ø¥ßµ{¦¡¶°¹Ï¥Ü...
+StatusCreateIniEntries=¼g¤J INI Àɮתº¶µ¥Ø...
+StatusCreateRegistryEntries=¥¿¦b§ó·s¨t²Îµn¿ý...
+StatusRegisterFiles=¥¿¦bµn¿ýÀÉ®×...
+StatusSavingUninstall=Àx¦s¸Ñ°£¦w¸Ë¸ê°T...
+StatusRunProgram=¥¿¦b§¹¦¨¦w¸Ë...
+StatusRollback=¥¿¦b´_ìÅܧó...
+
+; *** Misc. errors
+ErrorInternal2=¤º³¡¿ù»~: %1¡C
+ErrorFunctionFailedNoCode=%1 ¥¢±Ñ¡C
+ErrorFunctionFailed=%1 ¥¢±Ñ¡C¥N½X %2¡C
+ErrorFunctionFailedWithMessage=%1 ¥¢±Ñ¡C¥N½X %2¡C%n%3
+ErrorExecutingProgram=µLªk°õ¦æÀÉ®×:%n%1
+
+; *** Registry errors
+ErrorRegOpenKey=µLªk¶}±Òµn¿ýÁä:%n%1\%2
+ErrorRegCreateKey=µLªk«Ø¥ßµn¿ý¶µ¥Ø:%n%1\%2
+ErrorRegWriteKey=µLªkÅܧóµn¿ý¶µ¥Ø:%n%1\%2
+
+; *** INI errors
+ErrorIniEntry=µLªk«Ø¥ß INI ¶µ¥Ø "%1"¡C
+
+; *** File copying errors
+FileAbortRetryIgnore=«ö [«¸Õ] ¦A¸Õ¤@¦¸¡A«ö [²¤¹L] ¸õ¹L³oÓÀɮס]¤£«Øij¡^¡A©Î«ö [¤¤¤î] µ²§ô¦w¸Ë¡C
+FileAbortRetryIgnore2=«ö [«¸Õ] ¦A¸Õ¤@¦¸¡A«ö [²¤¹L] Ä~Äò¶i¦æ¡]¤£«Øij¡^¡A©Î«ö [¤¤¤î] µ²§ô¦w¸Ë¡C
+SourceIsCorrupted=¨Ó·½Àɮפw¸g·l·´¡C
+SourceDoesntExist=¨Ó·½ÀÉ®× "%1" ¤£¦s¦b¡C
+ExistingFileReadOnly=ÀÉ®×Äݩʤw³]¬°°ßŪ¡C%n%n«ö [«¸Õ] ±N°ßŪÄݩʲ¾°£¨Ã¦A¸Õ¤@¦¸¡A«ö [²¤¹L] ¸õ¹L³oÓÀɮסA©Î«ö [¤¤¤î] µ²§ô¦w¸Ë¡C
+ErrorReadingExistingDest=Ū¨ú¤@Ó¤w¦s¦bªºÀɮ׮ɵo¥Í¿ù»~:
+FileExists=Àɮפw¸g¦s¦b¡C±zn¨ú¥N¥Ø«eªºÀɮ׶Ü?
+ExistingFileNewer=¦s¦bªºÀɮת©¥»¤ñ¸û·s¡A«Øij±z«O¯d¥Ø«e¤w¦s¦bªºÀɮסC%n%n±zn«O¯d¥Ø«e¤w¦s¦bªºÀɮ׶Ü?
+ErrorChangingAttr=¦bÅܧóÀÉ®×Äݩʮɵo¥Í¿ù»~:
+ErrorCreatingTemp=¦b¥Øªº¸ê®Æ§¨¤¤«Ø¥ßÀɮ׮ɵo¥Í¿ù»~:
+ErrorReadingSource=Ū¨úì©lÀɮ׮ɵo¥Í¿ù»~:
+ErrorCopying=½Æ»sÀɮ׮ɵo¥Í¿ù»~:
+ErrorReplacingExistingFile=¨ú¥NÀɮ׮ɵo¥Í¿ù»~:
+ErrorRestartReplace=«·s±Ò°Ê¹q¸£«á¨ú¥NÀÉ®×¥¢±Ñ:
+ErrorRenamingTemp=¦b¥Øªº¸ê®Æ§¨ÅܧóÀɮצWºÙ®Éµo¥Í¿ù»~:
+ErrorRegisterServer=µLªkµn¿ý DLL/OCX ÀÉ®×: %1¡C
+ErrorRegSvr32Failed=°õ¦æ RegSvr32 ¥¢±Ñ¡A¿ù»~½X¬° %1¡C
+ErrorRegisterTypeLib=µLªkµn¿ý Type Library: %1¡C
+
+; *** Post-installation errors
+ErrorOpeningReadme=¶}±ÒŪ§ÚÀɮ׮ɵo¥Í¿ù»~¡C
+ErrorRestartingComputer=¦w¸Ëµ{¦¡µLªk«·s±Ò°Ê¹q¸£¡A½Ð¥H¤â°Ê¤è¦¡¦Û¦æ«·s±Ò°Ê¹q¸£¡C
+
+; *** Uninstaller messages
+UninstallNotFound=ÀÉ®× "%1" ¤£¦s¦b¡AµLªk²¾°£µ{¦¡¡C
+UninstallOpenError=µLªk¶}±ÒÀÉ®× "%1"¡AµLªk²¾°£µ{¦¡¡C
+UninstallUnsupportedVer=³oÓª©¥»ªº¸Ñ°£¦w¸Ëµ{¦¡µLªk¿ëÃÑ°O¿ýÀÉ "%1" ¤§®æ¦¡¡AµLªk¸Ñ°£¦w¸Ë¡C
+UninstallUnknownEntry=¸Ñ°£¦w¸Ë°O¿ýÀɤ¤µo²{¥¼ª¾ªº°O¿ý (%1)¡C
+ConfirmUninstall=±z½T©wn§¹¥þ²¾°£ %1 ¤Î¨ä¬ÛÃöªºÀɮ׶Ü?
+UninstallOnlyOnWin64=³oÓµ{¦¡¥u¯à¦b 64 ¦ì¤¸ªº Windows ¤W¸Ñ°£¦w¸Ë¡C
+OnlyAdminCanUninstall=³oÓµ{¦¡n¨ã³Æ¨t²ÎºÞ²zûÅvªº¨Ï¥ÎªÌ¤è¥i¸Ñ°£¦w¸Ë¡C
+UninstallStatusLabel=¥¿¦b±q±zªº¹q¸£²¾°£ %1 ¤¤¡A½ÐµyÔ...
+UninstalledAll=%1 ¤w¸g¦¨¥\±q±zªº¹q¸£¤¤²¾°£¡C
+UninstalledMost=%1 ¸Ñ°£¦w¸Ë§¹¦¨¡C%n%n¬Y¨ÇÀɮפΤ¸¥óµLªk²¾°£¡A±z¥i¥H¦Û¦æ§R°£³o¨ÇÀɮסC
+UninstalledAndNeedsRestart=n§¹¦¨ %1 ªº¸Ñ°£¦w¸Ëµ{§Ç¡A±z¥²¶·«·s±Ò°Ê¹q¸£¡C%n%n±z·Qn²{¦b«·s±Ò°Ê¹q¸£¶Ü?
+UninstallDataCorrupted=ÀÉ®× "%1" ¤w¸g·l·´¡AµLªk¸Ñ°£¦w¸Ë¡C
+
+; *** Uninstallation phase messages
+ConfirmDeleteSharedFileTitle=²¾°£¦@¥ÎÀÉ®×
+ConfirmDeleteSharedFile2=¨t²ÎÅã¥Ü¤U¦C¦@¥ÎÀɮפw¤£¦A³Q¥ô¦óµ{¦¡©Ò¨Ï¥Î¡A±zn²¾°£³o¨ÇÀɮ׶Ü?%n%n%1%n%nÕY±z²¾°£¤F¥H¤WÀɮצý¤´¦³µ{¦¡»Ýn¨Ï¥Î¥¦Ì¡A±N³y¦¨³o¨Çµ{¦¡µLªk¥¿±`°õ¦æ¡A¦]¦¹±zYµLªk½T©w½Ð¿ï¾Ü [§_]¡C«O¯d³o¨ÇÀɮצb±zªº¨t²Î¤¤¤£·|³y¦¨¥ô¦ó·l®`¡C
+SharedFileNameLabel=ÀɮצWºÙ:
+SharedFileLocationLabel=¦ì¸m:
+WizardUninstalling=¸Ñ°£¦w¸Ëª¬ºA
+StatusUninstalling=¥¿¦b¸Ñ°£¦w¸Ë %1...
+
+; The custom messages below aren't used by Setup itself, but if you make
+; use of them in your scripts, you'll want to translate them.
+
+[CustomMessages]
+
+NameAndVersion=%1 ª©¥» %2
+AdditionalIcons=ªþ¥[¹Ï¥Ü:
+CreateDesktopIcon=«Ø¥ß®à±¹Ï¥Ü(&D)
+CreateQuickLaunchIcon=«Ø¥ß§Ö³t±Ò°Ê¹Ï¥Ü(&Q)
+ProgramOnTheWeb=%1 ªººô¯¸
+UninstallProgram=¸Ñ°£¦w¸Ë %1
+LaunchProgram=±Ò°Ê %1
+AssocFileExtension=±N %1 »PÀÉ®×°ÆÀɦW %2 ²£¥ÍÃöÁp(&A)
+AssocingFileExtension=¥¿¦b±N %1 »PÀÉ®×°ÆÀɦW %2 ²£¥ÍÃöÁp...
diff --git a/Greek-4-5.1.11.isl b/Greek-4-5.1.11.isl
index d25b3fb..9b20357 100644
--- a/Greek-4-5.1.11.isl
+++ b/Greek-4-5.1.11.isl
@@ -1,368 +1,368 @@
-; *** Inno Setup version 5.1.11+ Greek messages ***
-;
-; Note: When translating this text, do not add periods (.) to the end of
-; messages that didn't have them already, because on those messages Inno
-; Setup adds the periods automatically (appending a period would result in
-; two periods being displayed).
-;
-; Translated by Anastasis Chatzioglou
-; http://anasto.go.to
-; baldycom at hotmail.com
-;
-
-[LangOptions]
-LanguageName=Greek
-LanguageID=$408
-LanguageCodePage=1253
-; If the language you are translating to requires special font faces or
-; sizes, uncomment any of the following entries and change them accordingly.
-;DialogFontName=MS Shell Dlg
-;DialogFontSize=8
-;DialogFontStandardHeight=13
-;TitleFontName=Arial
-;TitleFontSize=29
-;WelcomeFontName=Verdana
-;WelcomeFontSize=12
-;CopyrightFontName=Arial
-;CopyrightFontSize=8
-DialogFontName=MS Shell Dlg
-DialogFontSize=8
-;4.1.4+
-;DialogFontStandardHeight=13
-TitleFontName=Arial
-TitleFontSize=29
-WelcomeFontName=Arial
-WelcomeFontSize=12
-CopyrightFontName=Arial
-CopyrightFontSize=8
-
-[Messages]
-; *** Application titles
-SetupAppTitle=ÅãêáôÜóôáóç
-SetupWindowTitle=ÅãêáôÜóôáóç -%1
-UninstallAppTitle=ÁðåãêáôÜóôáóç
-UninstallAppFullTitle=%1 ÁðåãêáôÜóôáóç
-; 2.0.x
-;DefaultUninstallIconName=ÁðåãêáôÜóôáóç %1
-
-; *** Misc. common
-InformationTitle=Ðëçñïöïñßåò
-ConfirmTitle=Åðéâåâáßùóç
-ErrorTitle=ÓöÜëìá
-
-; *** SetupLdr messages
-SetupLdrStartupMessage=Èá åêôåëåóôåß ç åãêáôÜóôáóç ôïõ %1. ÈÝëåôå íá óõíå÷ßóåôå;
-LdrCannotCreateTemp=ÓöÜëìá óôç äçìéïõñãßá ðñïóùñéíïý áñ÷åßïõ. Ç åãêáôÜóôáóç èá ôåñìáôéóôåß ôþñá.
-LdrCannotExecTemp=ÓöÜëìá óôçí åêôÝëåóç áñ÷åßïõ óôïí ðñïóùñéíü êáôÜëïãï. Ç åãêáôÜóôáóç ôåñìáôßæåôáé.
-
-; *** Startup error messages
-LastErrorMessage=%1.%n%nÓöÜëìá %2: %3
-SetupFileMissing=Äåí âñßóêåôáé ôï áñ÷åßï %1 óôïí êáôÜëïãï åãêáôÜóôáóçò. ºóùò ÷ñåéÜæåôáé íá ðñïìçèåõôåßôå Ýíá íÝï áíôßãñáöï ôïõ ðñïãñÜììáôïò.
-SetupFileCorrupt=Ôï áñ÷åßï åãêáôÜóôáóçò åßíáé êáôåóôñáììÝíï. ºóùò ÷ñåéÜæåôáé íá ðñïìçèåõôåßôå Ýíá íÝï áíôßãñáöï ôïõ ðñïãñÜììáôïò.
-SetupFileCorruptOrWrongVer=Ôï áñ÷åßï åãêáôÜóôáóçò åßíáé êáôåóôñáììÝíï ç åßíáé óå ëÜèïò Ýêäïóç. ºóùò ÷ñåéÜæåôáé íá ðñïìçèåõôåßôå Ýíá íÝï áíôßãñáöï ôïõ ðñïãñÜììáôïò.
-NotOnThisPlatform=Áõôü ôï ðñüãñáììá äåí ìðïñåß íá åêôåëåóôåß óå %1.
-OnlyOnThisPlatform=Áõôü ôï ðñüãñáììá åêôåëåßôáé ìüíï óå %1.
-; 5.1.0+
-OnlyOnTheseArchitectures=Áõôü ôï ðñüãñáììá ìðïñåß íá åãêáôáóôáèåß ìïíü óå Windows ó÷åäéáóìÝíá ãéá åðåîåñãáóôÝò ìå áñ÷éôåêôïíéêÞ:%n%n%1
-MissingWOW64APIs=Ç Ýêäïóç ôùí Windows ðïõ åêôåëåßôáé äåí äéáèÝôåé ëåéôïõñãéêüôçôá 64-bit. Ãéá íá äéïñèùèåß ôï ðñüâëçìá åãêáôÝóôçóå ôï Service Pack %1.
-WinVersionTooLowError=Áõôü ôï ðñüãñáììá áðáéôåß %1 Ýêäïóç ç íåüôåñç.
-WinVersionTooHighError=Áõôü ôï ðñüãñáììá äåí ìðïñåß íá åêôåëåóôåß óå %1 Ýêäïóç ç íåüôåñç.
-AdminPrivilegesRequired=ÐñÝðåé íá åßóôå ï Äéá÷åéñéóôÞò óõóôÞìáôïò ãéá íá åãêáôáóôÞóåôå áõôü ôï ðñüãñáììá.
-PowerUserPrivilegesRequired=ÐñÝðåé íá åßóôå ï Äéá÷åéñéóôÞò óõóôÞìáôïò Þ Power User ãéá íá åãêáôáóôÞóåôå áõôü ôï ðñüãñáììá.
-SetupAppRunningError=Ç åãêáôÜóôáóç åíôüðéóå üôé åêôåëåßôáé ç åöáñìïãÞ %1. Ðáñáêáëþ êëåßóôå ôçí åöáñìïãÞ ôþñá êáé ðáôÞóôå ÅíôÜîåé ãéá íá óõíå÷ßóåôå.
-UninstallAppRunningError=Ç áðåãêáôÜóôáóç åíôüðéóå üôé åêôåëåßôáé ç åöáñìïãÞ %1. Ðáñáêáëþ êëåßóôå ôçí åöáñìïãÞ ôþñá êáé ðáôÞóôå ÅíôÜîåé ãéá íá óõíå÷ßóåôå.
-
-; *** Misc. errors
-ErrorCreatingDir=Ç åãêáôÜóôáóç äåí ìðïñåß íá äçìéïõñãÞóåé ôïí êáôÜëïãï %1.
-ErrorTooManyFilesInDir=Äåí ìðïñåß íá äçìéïõñãçèåß Ýíá áñ÷åßï óôïí êáôÜëïãï "%1" åðåéäÞ Þäç ðåñéÝ÷åé ðïëëÜ áñ÷åßá.
-
-; *** Setup common messages
-ExitSetupTitle=ÔÝëïò ÅãêáôÜóôáóçò.
-ExitSetupMessage=Ç åãêáôÜóôáóç äåí Ý÷åé ôåëåéþóåé. Áí ôç óôáìáôÞóåôå ôþñá ôï ðñüãñáììá ðïõ ðñïóðáèÞóáôå íá åãêáôáóôÞóåôå äåí èá ëåéôïõñãåß.%n%nÌðïñåßôå íá åêôåëÝóåôå îáíÜ ôçí åãêáôÜóôáóç áñãüôåñá.
-AboutSetupMenuItem=&Ó÷åôéêÜ ìå ôçí ÅãêáôÜóôáóç...
-AboutSetupTitle=Ó÷åôéêÜ ìå ôçí ÅãêáôÜóôáóç.
-AboutSetupMessage=%1 Ýêäïóç %2%n%3%n%n%1 ðñïóùðéêÞ óåëßäá%n%4
-AboutSetupNote=Anasto
-; 5.1.0+
-TranslatorNote=Anastasis Chatzioglou - baldycom at hotmail.com
-
-; *** Buttons
-ButtonBack=< &Ðßóù
-ButtonNext=&Åðüìåíï >
-ButtonInstall=&ÅãêáôÜóôáóç
-ButtonOK=Å&íôÜîåé
-ButtonCancel=&Áêõñï
-ButtonYes=Í&áé
-ButtonYesToAll=Íáé óå &Ïëá
-ButtonNo=Ï&÷é
-ButtonNoToAll=Ï÷é &óå ïëá
-ButtonFinish=&ÔÝëïò
-ButtonBrowse=&ÁíáæÞôçóç...
-;4.1.3
-ButtonWizardBrowse=&Åýñåóç...
-ButtonNewFolder=&Äçìéïõñãßá íÝïõ öáêÝëïõ
-
-; *** "Select Language" dialog messages
-; 4.0.x
-SelectLanguageTitle=ÅðéëïãÞ ôçò ãëþóóáò åãêáôÜóôáóçò
-SelectLanguageLabel=ÅðéëïãÞ ôçò ãëþóóáò ãéá ÷ñÞóç êáôÜ ôçí äéÜñêåéá ôçò åãêáôÜóôáóçò:
-
-
-; *** Common wizard text
-ClickNext=ÐáôÞóôå Åðüìåíï ãéá íá óõíå÷ßóåôå Þ ¢êõñï ãéá íá ôåñìáôßóåôå ôçí åãêáôÜóôáóç.
-; 2.0.x
-;ClickNextModern=ÐáôÞóôå Åðüìåíï ãéá íá óõíå÷ßóåôå Þ ¢êõñï ãéá íá ôåñìáôßóåôå ôçí åãêáôÜóôáóç.
-;;; - anasto -
-BeveledLabel=anasto
-;4.1.3
-BrowseDialogTitle=Åýñåóç öáêÝëïõ
-BrowseDialogLabel=ÅðéëÝîôå öÜêåëï óôçí ëßóôá êáé ìåôÜ ðáôÞóôå OK.
-NewFolderName=ÍÝïò öÜêåëïò
-
-; *** "Welcome" wizard page
-WelcomeLabel1=Êáëùóïñßóáôå óôçí åãêáôÜóôáóç ôïõ [name].
-WelcomeLabel2=Èá ãßíåé åãêáôÜóôáóç ôïõ [name/ver] óôïí õðïëïãéóôÞ óáò.%n%nÐñéí óõíå÷ßóåôå óáò óõíéóôïýìå íá êëåßóåôå êÜèå Üëëç åöáñìïãÞ ðïõ ðéèáíüí åêôåëåßôå.
-
-; *** "Password" wizard page
-WizardPassword=ÅéóáãùãÞ Êùäéêïý
-PasswordLabel1=ÁõôÞ ç åãêáôÜóôáóç ÷ñåéÜæåôáé êùäéêü ãéá íá åêôåëåóôåß.
-PasswordLabel3=Ðáñáêáëþ äþóôå ôïí êùäéêü óáò êáé ðáôÞóôå Åðüìåíï ãéá íá óõíå÷ßóåôå.
-PasswordEditLabel=&Êùäéêüò:
-IncorrectPassword=Ï êùäéêüò ðïõ äþóáôå åßíáé ëÜèïò. ÎáíáðñïóðáèÞóôå.
-
-; *** "License Agreement" wizard page
-WizardLicense=Áäåéá ×ñÞóçò
-LicenseLabel=Ðáñáêáëþ äéáâÜóôå ðñïóåêôéêÜ ôéò ðáñáêÜôù ðëçñïöïñßåò ðñéí óõíå÷ßóåôå.
-; 2.0.x
-;LicenseLabel1=Ðáñáêáëþ äéáâÜóôå ðñïóåêôéêÜ ôéò ðáñáêÜôù ðëçñïöïñßåò ðñéí óõíå÷ßóåôå. ×ñçóéìïðïéÞóôå ôçí ìðÜñá êýëéóçò ãéá íá äåßôå üëï ôï êåßìåíï.
-;LicenseLabel2=ÁðïäÝ÷åóôå ôïõò üñïõò ôçò ¢äåéáò ×ñÞóçò; Áí åðéëÝîåôå ü÷é ç åãêáôÜóôáóç èá ôåñìáôéóôåß. Ãéá íá óõíå÷éóôåß ç åãêáôÜóôáóç ðñÝðåé íá áðïäÝ÷åóôå ôïõò üñïõò ôçò ¢äåéáò ×ñÞóçò.
-LicenseLabel3=Ðáñáêáëþ äéáâÜóôå ðñïóåêôéêÜ ôéò ðáñáêÜôù ðëçñïöïñßåò ðñéí óõíå÷ßóåôå. ÐñÝðåé íá áðïäÝ÷åóôå ôïõò üñïõò ôçò ¢äåéáò ×ñÞóçò ðñéí íá óõíå÷ßóåôå ôçí åãêáôÜóôáóç.
-LicenseAccepted=&ÄÝ÷ïìáé ôïõò üñïõò ôçò ¢äåéáò ×ñÞóçò
-LicenseNotAccepted=Äåí &áðïäÝ÷ïìáé ôïõò üñïõò ôçò ¢äåéáò ×ñÞóçò
-
-; *** "Information" wizard pages
-WizardInfoBefore=Ðëçñïöïñßåò
-InfoBeforeLabel=Ðáñáêáëþ äéáâÜóôå ðñïóåêôéêÜ ôéò ðáñáêÜôù ðëçñïöïñßåò ðñéí óõíå÷ßóåôå.
-InfoBeforeClickLabel=Áí åßóôå Ýôïéìïé íá óõíå÷ßóåôå ðáôÞóôå Åðüìåíï.
-WizardInfoAfter=Ðëçñïöïñßåò
-InfoAfterLabel=Ðáñáêáëþ äéáâÜóôå ðñïóåêôéêÜ ôéò ðáñáêÜôù ðëçñïöïñßåò ðñéí óõíå÷ßóåôå.
-InfoAfterClickLabel=Áí åßóôå Ýôïéìïé íá óõíå÷ßóåôå ðáôÞóôå Åðüìåíï.
-
-; *** "User Information" wizard page
-WizardUserInfo=Ðëçñïöïñßåò ãéá ôïí ×ñÞóôç
-UserInfoDesc=Ðáñáêáëþ äþóôå ôéò ðëçñïöïñßåò.
-UserInfoName=&Ïíïìá ×ñÞóôç:
-UserInfoOrg=&Åôáéñåßá:
-UserInfoSerial=&Óåéñéáêü Áñéèìü:
-UserInfoNameRequired=ÐñÝðåé íá äþóåôå üíïìá.
-
-; *** "Select Destination Location" wizard page
-; 4.0.x
-WizardSelectDir=ÅðéëÝîôå ôïí êáôÜëïãï ðïõ èá åãêáôáóôáèåß ôï ðñüãñáììá.
-SelectDirDesc=Ðïõ èá åãêáôáóôáèåß ôï [name];
-;SelectDirLabel=ÅðéëÝîôå ôïí êáôÜëïãï ðïõ èá åãêáôáóôáèåß ôï ðñüãñáììá. ÐáôÞóôå Åðüìåíï ãéá íá óõíå÷ßóåôå.
-DiskSpaceMBLabel=Áõôü ôï ðñüãñáììá ÷ñåéÜæåôáé [mb] MB ÷þñï óôïí äßóêï.
-ToUNCPathname=Ç åãêáôÜóôáóç äåí ìðïñåß íá ãßíåé óå äßóêï äéêôýïõ. Áí èÝëåôå íá ãßíåé ç åãêáôÜóôáóç óå äßóêï äéêôýïõ ðñÝðåé íá ïñßóåôå áõôüí ôï äßóêï.
-InvalidPath=Äþóôå ôçí ðëÞñç äéáäñïìÞ.%nðáñÜäåéãìá:%n%nC:\APP
-InvalidDrive=Ï ôïðéêüò äßóêïò ç ï äßóêïò äéêôýïõ ðïõ åðéëÝîáôå äåí õðÜñ÷åé ç äåí åßíáé ðñïóâÜóéìïò. ÅðéëÝîôå Üëëïí.
-DiskSpaceWarningTitle=Äåí õðÜñ÷åé áñêåôüò ÷þñïò óôï äßóêï.
-DiskSpaceWarning=Ç åãêáôÜóôáóç ÷ñåéÜæåôáé ôïõëÜ÷éóôïí %1 KB åëåýèåñï ÷þñï óôï äßóêï áëëÜ ï åðéëåãìÝíïò ïäçãüò äéáèÝôåé ìüíïí %2 KB.%n%nÈÝëåôå íá óõíå÷ßóåôå ïðùóäÞðïôå;
-BadDirName32=Ïíüìáôá êáôáëüãùí äåí ìðïñïýí íá ðåñéÝ÷ïõí êÜðïéïí áðü ôïõò ðáñáêÜôù ÷áñáêôÞñåò:%n%n%1
-DirExistsTitle=Ï êáôÜëïãïò õðÜñ÷åé.
-DirExists=Ï êáôÜëïãïò:%n%n%1%n%nõðÜñ÷åé Þäç. ÈÝëåôå íá ãßíåé ç åãêáôÜóôáóç óå áõôüí ôïí êáôÜëïãï;
-DirDoesntExistTitle=Ï êáôÜëïãïò äåí õðÜñ÷åé.
-DirDoesntExist=Ï êáôÜëïãïò:%n%n%1%n%näåí õðÜñ÷åé. ÈÝëåôå íá äçìéïõñãçèåß;
-;4.1.3
-InvalidDirName=ËÜèïò üíïìá öáêÝëïõ.
-;4.1.5
-DirNameTooLong=Ôï üíïìá ôïõ öáêÝëïõ åßíáé ðïëý ìåãÜëï.
-;4.1.8
-;SelectDirLabel2=Ôï [name] èá åãêáôáóôáèåß óôïí áêüëïõèï öÜêåëï.%n%nÃéá óõíÝ÷åéá ðáôÞóôå Åðüìåíï. Áí èÝëåôå Üëëï öÜêåëï, ðáôÞóôå Åýñåóç.
-SelectDirLabel3=Ôï [name] èá åãêáôáóôáèåß óôïí áêüëïõèï öÜêåëï.
-SelectDirBrowseLabel=Ãéá óõíÝ÷åéá ðáôÞóôå Åðüìåíï. Áí èÝëåôå Üëëï öÜêåëï, ðáôÞóôå Åýñåóç.
-
-; *** "Select Components" wizard page
-WizardSelectComponents=ÅðéëïãÞ Óõóôáôéêþí
-SelectComponentsDesc=Ðïéá óõóôáôéêÜ èÝëåôå íá åãêáôáóôáèïýí;
-SelectComponentsLabel2=ÅðéëÝîôå ôá óõóôáôéêÜ ðïõ èÝëåôå íá åãêáôáóôÞóåôå êáé ðáôÞóôå Åðüìåíï ãéá óõíÝ÷åéá ôçò åãêáôÜóôáóçò.
-FullInstallation=ÐëÞñçò ÅãêáôÜóôáóç.
-; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
-CompactInstallation=ÐåñéïñéóìÝíç ÅãêáôÜóôáóç.
-CustomInstallation=ÅðéëåãìÝíç ÅãêáôÜóôáóç.
-NoUninstallWarningTitle=Ôá óõóôáôéêÜ õðÜñ÷ïõí.
-NoUninstallWarning=Ç åãêáôÜóôáóç äéáðßóôùóå üôé ôá ðáñáêÜôù óõóôáôéêÜ åßíáé Þäç åãêáôåóôçìÝíá óôïí õðïëïãéóôÞ óáò:%n%n%1
-ComponentSize1=%1 KB
-ComponentSize2=%1 MB
-ComponentsDiskSpaceMBLabel=Ç óõãêåêñéìÝíç åðéëïãÞ áðáéôåß ôïõëÜ÷éóôïí [mb] MB åëåýèåñï ÷þñï óôïí äßóêï.
-
-; *** "Select Additional Tasks" wizard page
-WizardSelectTasks=ÅðéëïãÞ ÐåñáéôÝñù Åíåñãåéþí
-SelectTasksDesc=ÐïéÝò åðéðëÝïí åíÝñãåéåò èÝëåôå íá ãßíïõí;
-SelectTasksLabel2=ÅðéëÝîôå ôéò åðéðëÝïí åíÝñãåéåò ðïõ èÝëåôå íá ãßíïõí êáôÜ ôçí åãêáôÜóôáóç ôïõ [name] êáé ðáôÞóôå Åðüìåíï.
-
-; *** "Select Start Menu Folder" wizard page
-; 2.0.x
-;ReadyMemoTasks=ÅðéðëÝïí ÅíÝñãåéåò:
-WizardSelectProgramGroup=ÅðéëïãÞ Êáôáëüãïõ Óôï Ìåíïý Åêêßíçóç.
-SelectStartMenuFolderDesc=Ðïõ èá ôïðïèåôçèïýí ïé óõíôïìåýóåéò ôïõ ðñïãñÜììáôïò;
-; 4.0.x
-;SelectStartMenuFolderLabel=ÅðéëÝîôå ôïí êáôÜëïãï óôï ìåíïý åêêßíçóç óôïí ïðïßï èÝëåôå äçìéïõñãçèïýí ïé óõíôïìåýóåéò ôïõ ðñïãñÜììáôïò êáé ðáôÞóôå Åðüìåíï.
-; 5.1.0+
-;NoIconsCheck=&×ùñßò äçìéïõñãßá åéêïíéäßùí
-MustEnterGroupName=ÐñÝðåé íá äþóåôå ôï üíïìá åíüò êáôáëüãïõ.
-BadGroupName=Ïíüìáôá êáôáëüãùí äåí ìðïñïýí íá ðåñéÝ÷ïõí êÜðïéïí áðü ôïõò ðáñáêÜôù ÷áñáêôÞñåò:%n%n%1
-NoProgramGroupCheck2=&×ùñßò äçìéïõñãßá êáôáëüãïõ óôï ìåíïý åêêßíçóç.
-;4.1.3
-InvalidGroupName=Ôï üíïìá ôïõ group äåí åßíáé óùóôü.
-;4.1.4+
-GroupNameTooLong=Ôï üíïìá ôïõ group åéíáé ðïëý ìåãÜëï.
-;4.1.8
-;SelectStartMenuFolderLabel2=To setup èá äçìéïõñãÞóåé ôéò óõíôïìåýóåéò ôïõ ðñïãñÜììáôïò óôï áêüëïõèï group.%n%nÃéá óõíÝ÷åéá, ðáôÞóôå Åðüìåíï. Áí èÝëåôå Üëëï group, ðáôÞóôå åýñåóç.
-SelectStartMenuFolderLabel3=Ôï setup èá äçìéïõñãÞóåé ôéò óõíôïìåýóåéò ôïõ ðñïãñÜììáôïò óôï áêüëïõèï group.
-SelectStartMenuFolderBrowseLabel=Ãéá óõíÝ÷åéá, ðáôÞóôå Åðüìåíï. Áí èÝëåôå Üëëï group, ðáôÞóôå åýñåóç.
-
-
-; *** "Ready to Install" wizard page
-WizardReady=¸ôïéìïò ãéá åãêáôÜóôáóç
-ReadyLabel1=Ç åãêáôÜóôáóç ôïõ [name] åßíáé Ýôïéìç íá åêôåëåóôåß óôïí õðïëïãéóôÞ óáò.
-ReadyLabel2a=ÐáôÞóôå ÅãêáôÜóôáóç ãéá íá óõíå÷ßóåôå Þ Ðßóù áí èÝëåôå íá áëëÜîåôå êÜðïéåò ñõèìßóåéò.
-ReadyLabel2b=ÐáôÞóôå ÅãêáôÜóôáóç ãéá íá óõíå÷ßóåôå.
-ReadyMemoUserInfo=Ðëçñïöïñßåò ×ñÞóôç:
-ReadyMemoDir=ÊáôÜëïãïò ðñïïñéóìïý:
-ReadyMemoType=Åßäïò åãêáôÜóôáóçò:
-ReadyMemoComponents=ÅðéëåãìÝíá óõóôáôéêÜ:
-ReadyMemoGroup=ÊáôÜëïãïò óôï ìåíïý ÐñïãñÜììáôá:
-ReadyMemoTasks=ÅðéðëÝïí ÅíÝñãåéåò:
-
-; *** "Preparing to Install" wizard page
-WizardPreparing=Ðñïåôïéìáóßá ÅãêáôÜóôáóçò
-PreparingDesc=Ç åãêáôÜóôáóç ðñïåôïéìÜæåé ôï ðñüãñáììá [name] íá ôïðïèåôçèåß óôïí õðïëïãéóôÞ.
-PreviousInstallNotCompleted=The installation/removal of a previous program was not completed. You will need to restart your computer to complete that installation.%n%nAfter restarting your computer, run Setup again to complete the installation of [name].
-CannotContinue=Setup cannot continue. Please click Cancel to exit.
-
-; *** "Installing" wizard page
-WizardInstalling=Ðñüïäïò ÅãêáôÜóôáóçò
-InstallingLabel=Ðáñáêáëþ ðåñéìÝíåôå íá ïëïêëçñùèåß ç åãêáôÜóôáóç ôïõ [name] óôïí õðïëïãéóôÞ óáò.
-
-; *** "Setup Completed" wizard page
-; 2.0.x
-;WizardFinished=Ç ÅãêáôÜóôáóç Ïëïêëçñþèçêå
-FinishedHeadingLabel=Completing the [name] Setup Wizard
-FinishedLabelNoIcons=Ç åãêáôÜóôáóç ôïõ [name] óôïí õðïëïãéóôÞ óáò ôåëåßùóå ìå åðéôõ÷ßá.
-FinishedLabel=Ç åãêáôÜóôáóç ôïõ [name] óôïí õðïëïãéóôÞ óáò ôåëåßùóå ìå åðéôõ÷ßá. Ìðïñåßôå íá îåêéíÞóåôå ôï ðñüãñáììá åðéëÝãïíôáò ôï åéêïíßäéï ðïõ äçìéïõñãÞèçêå óôï ìåíïý åêêßíçóç.
-ClickFinish=ÐáôÞóôå ÔÝëïò ãéá íá ôåñìáôßóåôå ôï ðñüãñáììá åãêáôÜóôáóçò.
-FinishedRestartLabel=Ãéá íá ïëïêëçñùèåß ç åãêáôÜóôáóç ôïõ [name] ðñÝðåé íá ãßíåé åðáíåêêßíçóç ôïõ õðïëïãéóôÞ óáò. ÈÝëåôå íá ãßíåé ôþñá;
-FinishedRestartMessage=Ãéá íá ïëïêëçñùèåß ç åãêáôÜóôáóç ôïõ [name] ðñÝðåé íá ãßíåé åðáíåêêßíçóç ôïõ õðïëïãéóôÞ óáò.%n%nÈÝëåôå íá ãßíåé ôþñá;
-ShowReadmeCheck=Íáé èÝëù íá äéáâÜóù ôéò ðëçñïöïñßåò ôïõ ðñïãñÜììáôïò
-YesRadio=&Íáé íá ãßíåé åðáíåêêßíçóç ôþñá.
-NoRadio=&Ï÷é èá êÜíù åðáíåêêßíçóç áñãüôåñá.
-; used for example as 'Run MyProg.exe'
-RunEntryExec=Íá åêôåëåóôåß ôï ðñüãñáììá %1
-; used for example as 'View Readme.txt'
-RunEntryShellExec=Íá åêôåëåóôåß ôï %1
-
-; *** "Setup Needs the Next Disk" stuff
-ChangeDiskTitle=ÔïðïèåôÞóôå ôçí åðüìåíç äéóêÝôôá
-; 4.0.x
-;SelectDirectory=ÅðéëÝîôå êáôÜëïãï
-SelectDiskLabel2=ÔïðïèåôÞóôå ôçí äéóêÝôôá %1 êáé ðáôÞóôå ÅíôÜîåé.
-PathLabel=&ÄéáäñïìÞ
-FileNotInDir2=Ôï áñ÷åßï "%1" äåí âñßóêåôáé óôï "%2". ÔïðïèåôÞóôå ôç óùóôÞ äéóêÝôôá.
-SelectDirectoryLabel=Äþóôå ôçí ôïðïèåóßá ôçò åðüìåíçò äéóêÝôôáò.
-
-; *** Installation phase messages
-SetupAborted=Ç åãêáôÜóôáóç äåí ïëïêëçñþèçêå.%n%nÄéïñèþóôå ôï ðñüâëçìá êáé åêôåëÝóôå îáíÜ ôçí åãêáôÜóôáóç.
-EntryAbortRetryIgnore=ÐáôÞóôå Retry ãéá íá îáíáðñïóðáèÞóåôå, Ignore ãéá íá óõíå÷ßóåôå ç Abort ãéá íá ôåñìáôßóåôå ôçí åãêáôÜóôáóç.
-
-; *** Installation status messages
-StatusCreateDirs=Äçìéïõñãßá êáôáëüãùí...
-StatusExtractFiles=Áðïóõìðßåóç áñ÷åßùí...
-StatusCreateIcons=Äçìéïõñãßá åéêïíéäßùí...
-StatusCreateIniEntries=Êáôá÷þñçóç óôï ÉÍÉ áñ÷åßï óõóôÞìáôïò...
-StatusCreateRegistryEntries=Êáôá÷þñçóç óôï ìçôñþï óõóôÞìáôïò...
-StatusRegisterFiles=Êáôá÷þñçóç áñ÷åßùí
-StatusSavingUninstall=Ðëçñïöïñßåò áðåãêáôÜóôáóçò...
-StatusRunProgram=Ôåëåéþíïíôáò ôçí åãêáôÜóôáóç...
-StatusRollback=Rolling back changes...
-
-; *** Misc. errors
-; 2.0.x
-;ErrorInternal=ÓöÜëìá %1
-ErrorInternal2=ÓöÜëìá %1
-ErrorFunctionFailedNoCode=%1 ÓöÜëìá
-ErrorFunctionFailed=%1 ÓöÜëìá, êùä. %2
-ErrorFunctionFailedWithMessage=%1 ÓöÜëìá, êùä. %2%n%3
-ErrorExecutingProgram=Äåí ìðïñåß íá åêôåëåóôåß ôï áñ÷åßï:%n%1
-
-;2.0.x
-;ErrorDDEExecute=DDE: ÓöÜëìá êáôÜ ôçí åêôÝëåóç ôçò åíÝñãåéáò (code: %1)
-;ErrorDDECommandFailed=DDE: Ç åíôïëÞ áðÝôõ÷å.
-;ErrorDDERequest=DDE: ÓöÜëìá êáôÜ ôçí åêôÝëåóç ôçò åíÝñãåéáò (code: %1)
-
-; *** Registry errors
-ErrorRegOpenKey=Äåí ìðïñåß íá äéáâáóôåß ôï êëåéäß ìçôñþïõ óõóôÞìáôïò:%n%1\%2
-ErrorRegCreateKey=Äåí ìðïñåß íá äçìéïõñãçèåß ôï êëåéäß ìçôñþïõ óõóôÞìáôïò:%n%1\%2
-ErrorRegWriteKey=Äåí ìðïñåß íá ãßíåé êáôá÷þñçóç óôï êëåéäß ìçôñþïõ óõóôÞìáôïò:%n%1\%2
-
-; *** INI errors
-ErrorIniEntry=Äåí ìðïñåß íá ãßíåé êáôá÷þñçóç óôï ÉÍÉ áñ÷åßï óõóôÞìáôïò "%1".
-
-; *** File copying errors
-FileAbortRetryIgnore=ÐáôÞóôå Retry ãéá íá îáíáðñïóðáèÞóåôå, Ignore ãéá íá óõíå÷ßóåôå ç Abort ãéá íá ôåñìáôßóåôå ôçí åãêáôÜóôáóç.
-FileAbortRetryIgnore2=ÐáôÞóôå Retry ãéá íá îáíáðñïóðáèÞóåôå, Ignore ãéá íá óõíå÷ßóåôå ç Abort ãéá íá ôåñìáôßóåôå ôçí åãêáôÜóôáóç.
-SourceIsCorrupted=Ôï áñ÷åßï ðñïÝëåõóçò åßíáé êáôåóôñáììÝíï.
-SourceDoesntExist=Ôï áñ÷åßï ðñïÝëåõóçò "%1" äåí õðÜñ÷åé.
-ExistingFileReadOnly=Ôï áñ÷åßï åßíáé ìðáñêáñéóìÝíï ìüíï ãéá áíÜãíùóç.%n%nÐáôÞóôå Retry ãéá íá ôï îåìáñêÜñåôå êáé íá ðñïóðáèÞóåôå ðÜëé, Ignore ãéá íá ôï ðñïóðåñÜóåôå ç Abort ãéá íá ôåñìáôßóåôå ôçí åãêáôÜóôáóç.
-ErrorReadingExistingDest=ÐáñïõóéÜóôçêå óöÜëìá êáôÜ ôçí áíÜãíùóç ôïõ áñ÷åßïõ:
-FileExists=Ôï áñ÷åßï õðÜñ÷åé.%n%nÈÝëåôå íá îáíáãñáöôåß;
-ExistingFileNewer=Åíá áñ÷åßï ðïõ âñÝèçêå óôïí õðïëïãéóôÞ óáò åßíáé íåüôåñçò Ýêäïóçò áðï åêåßíï ôçò åãêáôÜóôáóçò. Ðñïôåßíåôáé íá êñáôÞóåôå ôï õðÜñ÷ïí áñ÷åßï.%n%nÈÝëåôå íá êñáôÞóåôå ôï õðÜñ÷ïí áñ÷åßï;
-ErrorChangingAttr=ÐñïÝêõøå óöÜëìá óôçí ðñïóðÜèåéá íá áëëá÷ôïýí ôá ÷áñáêôçñéóôéêÜ ôïõ áñ÷åßïõ:
-ErrorCreatingTemp=ÐñïÝêõøå óöÜëìá óôçí ðñïóðÜèåéá íá äçìéïõñãçèåß Ýíá áñ÷åßï óôïí êáôÜëïãï ðñïïñéóìïý:
-ErrorReadingSource=ÐñïÝêõøå óöÜëìá óôçí ðñïóðÜèåéá áíÜãíùóçò ôïõ áñ÷åßïõ ðñïÝëåõóçò:
-ErrorCopying=ÐñïÝêõøå óöÜëìá óôçí ðñïóðÜèåéá íá áíôéãñáöåß ôï áñ÷åßï:
-ErrorReplacingExistingFile=ÐñïÝêõøå óöÜëìá óôçí ðñïóðÜèåéá íá áíôéêáôáóôáèåß ôï õðÜñ÷ïí áñ÷åßï:
-ErrorRestartReplace=ÐñïÝêõøå óöÜëìá óôçí ðñïóðÜèåéá íá ãßíåé åðáíåêêßíçóç êáé áíôéêáôÜóôáóç áñ÷åßïõ:
-ErrorRenamingTemp=ÐñïÝêõøå óöÜëìá óôçí ðñïóðÜèåéá ìåôïíïìáóßáò åíüò áñ÷åßïõ óôïí êáôÜëïãï ðñïïñéóìïý:
-ErrorRegisterServer=ÐñïÝêõøå óöÜëìá óôçí ðñïóðÜèåéá êáôá÷þñçóçò DLL/OCX: %1
-ErrorRegSvr32Failed=RegSvr32 failed with exit code %1
-ErrorRegisterTypeLib=Unable to register the type library: %1
-
-; *** Post-installation errors
-ErrorOpeningReadme=ÐñïÝêõøå óöÜëìá óôçí ðñïóðÜèåéá íá öïñôùèåß ôï áñ÷åßï ðëçñïöïñéþí.
-ErrorRestartingComputer=ÐñïÝêõøå óöÜëìá óôçí ðñïóðÜèåéá åðáíåêêßíçóçò ôïõ õðïëïãéóôÞ.%nÐáñáêáëþ åðáíåêêéíÞóôå ôïí õðïëïãéóôÞ óáò.
-
-; *** Uninstaller messages
-UninstallNotFound=Ôï áñ÷åßï "%1" äåí âñÝèçêå. Ç áðåãêáôÜóôáóç äåí ìðïñåß íá ãßíåé
-; 4.0.x
-UninstallOpenError=Ôï áñ÷åßï "%1" äåí ìðüñåóå íá öïñôùèåß. Ç áðåãêáôÜóôáóç äåí ìðïñåß íá ãßíåé
-UninstallUnsupportedVer=Ôï áñ÷åßï "%1" äåí áíáãíùñßæåôáé áðü áõôÞ ôçí Ýêäïóç ôçò åãêáôÜóôáóçò, Ç áðåãêáôÜóôáóç äåí ìðïñåß íá åêôåëåóôåß
-UninstallUnknownEntry=Ôï áñ÷åßï "%1" äåí áíáãíùñßæåôáé áðü áõôÞ ôçí Ýêäïóç ôçò åãêáôÜóôáóçò, Ç áðåãêáôÜóôáóç äåí ìðïñåß íá åêôåëåóôåß
-ConfirmUninstall=Åßóôå óßãïõñïé üôé èÝëåôå íá äéáãñÜøåôå ôï %1 êáé üëá ôá óõóôáôéêÜ ôïõ;
-; 5.1.0+
-UninstallOnlyOnWin64=ÁõôÞ ç åöáñìïãÞ ìðïñåß íá áðåãêáôáóôáèåß ìüíï óå 64-bit Windows.
-OnlyAdminCanUninstall=Ç áðåãêáôÜóôáóç ìðïñåß íá åêôåëåóôåß ìüíï áðü ôïí Äéá÷åéñéóôÞ óõóôÞìáôïò
-UninstallStatusLabel=Ðáñáêáëþ ðåñéìÝíåôå üóï ôï %1 äéáãñÜöåôå áðü ôïí õðïëïãéóôÞ óáò
-UninstalledAll=Ç áðåãêáôÜóôáóç ôïõ %1 Ýãéíå ìå åðéôõ÷ßá.
-UninstalledMost=Ç áðåãêáôÜóôáóç ôïõ %1 Ýãéíå ìå åðéôõ÷ßá.%n%nÊÜðïéá óõóôáôéêÜ ðïõ ðáñÝìåéíáí óôïí õðïëïãéóôÞ óáò èá ðñÝðåé íá ôá äéáãñÜøåôå åóåßò.
-UninstalledAndNeedsRestart=To complete the uninstallation of %1, your computer must be restarted.%n%nWould you like to restart now?
-UninstallDataCorrupted="%1" Áõôü ôï áñ÷åßï åßíáé êáôåóôñáììÝíï. Äåí ìðïñåß íá ãßíåé áðåãêáôÜóôáóç.
-
-; *** Uninstallation phase messages
-ConfirmDeleteSharedFileTitle=ÈÝëåôå íá äéáãñáöïýí ôá êïéíÜ áñ÷åßá;
-ConfirmDeleteSharedFile2=Ôá êïéíÜ áñ÷åßá äåí ÷ñçóéìïðïéïýíôáé áðü êÜðïéï ðñüãñáììá. ÈÝëåôå íá äéáãñáöïýí;%n%nÁí êÜðïéï ðñüãñáììá ôá ÷ñçóéìïðïéåß ßóùò äåí åêôåëåßôáé óùóôÜ áí ôá äéáãñÜøåôå. Áí äåí åßóôå óßãïõñïé áöÞóôå ôá óôï óýóôçìá óáò äåí ðñïêáëïýí êÜðïéï ðñüâëçìá.
-SharedFileNameLabel=Ïíïìá Áñ÷åßïõ:
-SharedFileLocationLabel=Ôïðïèåóßá:
-WizardUninstalling=Ðñüïäïò ÁðåãêáôÜóôáóçò:
-StatusUninstalling=ÁðåãêáôÜóôáóç ôïõ %1...
-
-[CustomMessages]
-NameAndVersion=%1 Ýêäïóç %2
-AdditionalIcons=ÅðéðëÝïí åéêïíßäéá:
-CreateDesktopIcon=Äçìéïõñãßá åíüò &åéêïíéäßïõ óôçí åðéöÜíåéá åñãáóßáò
-CreateQuickLaunchIcon=Äçìéïõñãßá åíüò åéêïíéäßïõ óôç &ÃñÞãïñç Åêêßíçóç
-ProgramOnTheWeb=Ôï %1 óôï Internet
-UninstallProgram=ÁðåãêáôÜóôáóç ôïõ %1
-LaunchProgram=Åêêßíçóç ôïõ %1
-AssocFileExtension=%Áíôéóôïß÷éóç ôïõ %1 ìå ôçí %2 åðÝêôáóç áñ÷åßïõ
-AssocingFileExtension=Ãßíåôáé áíôéóôïß÷çóç ôïõ %1 ìå ôçí %2 åðÝêôáóç áñ÷åßïõ...
-
+; *** Inno Setup version 5.1.11+ Greek messages ***
+;
+; Note: When translating this text, do not add periods (.) to the end of
+; messages that didn't have them already, because on those messages Inno
+; Setup adds the periods automatically (appending a period would result in
+; two periods being displayed).
+;
+; Translated by Anastasis Chatzioglou
+; http://anasto.go.to
+; baldycom at hotmail.com
+;
+
+[LangOptions]
+LanguageName=Greek
+LanguageID=$408
+LanguageCodePage=1253
+; If the language you are translating to requires special font faces or
+; sizes, uncomment any of the following entries and change them accordingly.
+;DialogFontName=MS Shell Dlg
+;DialogFontSize=8
+;DialogFontStandardHeight=13
+;TitleFontName=Arial
+;TitleFontSize=29
+;WelcomeFontName=Verdana
+;WelcomeFontSize=12
+;CopyrightFontName=Arial
+;CopyrightFontSize=8
+DialogFontName=MS Shell Dlg
+DialogFontSize=8
+;4.1.4+
+;DialogFontStandardHeight=13
+TitleFontName=Arial
+TitleFontSize=29
+WelcomeFontName=Arial
+WelcomeFontSize=12
+CopyrightFontName=Arial
+CopyrightFontSize=8
+
+[Messages]
+; *** Application titles
+SetupAppTitle=ÅãêáôÜóôáóç
+SetupWindowTitle=ÅãêáôÜóôáóç -%1
+UninstallAppTitle=ÁðåãêáôÜóôáóç
+UninstallAppFullTitle=%1 ÁðåãêáôÜóôáóç
+; 2.0.x
+;DefaultUninstallIconName=ÁðåãêáôÜóôáóç %1
+
+; *** Misc. common
+InformationTitle=Ðëçñïöïñßåò
+ConfirmTitle=Åðéâåâáßùóç
+ErrorTitle=ÓöÜëìá
+
+; *** SetupLdr messages
+SetupLdrStartupMessage=Èá åêôåëåóôåß ç åãêáôÜóôáóç ôïõ %1. ÈÝëåôå íá óõíå÷ßóåôå;
+LdrCannotCreateTemp=ÓöÜëìá óôç äçìéïõñãßá ðñïóùñéíïý áñ÷åßïõ. Ç åãêáôÜóôáóç èá ôåñìáôéóôåß ôþñá.
+LdrCannotExecTemp=ÓöÜëìá óôçí åêôÝëåóç áñ÷åßïõ óôïí ðñïóùñéíü êáôÜëïãï. Ç åãêáôÜóôáóç ôåñìáôßæåôáé.
+
+; *** Startup error messages
+LastErrorMessage=%1.%n%nÓöÜëìá %2: %3
+SetupFileMissing=Äåí âñßóêåôáé ôï áñ÷åßï %1 óôïí êáôÜëïãï åãêáôÜóôáóçò. ºóùò ÷ñåéÜæåôáé íá ðñïìçèåõôåßôå Ýíá íÝï áíôßãñáöï ôïõ ðñïãñÜììáôïò.
+SetupFileCorrupt=Ôï áñ÷åßï åãêáôÜóôáóçò åßíáé êáôåóôñáììÝíï. ºóùò ÷ñåéÜæåôáé íá ðñïìçèåõôåßôå Ýíá íÝï áíôßãñáöï ôïõ ðñïãñÜììáôïò.
+SetupFileCorruptOrWrongVer=Ôï áñ÷åßï åãêáôÜóôáóçò åßíáé êáôåóôñáììÝíï ç åßíáé óå ëÜèïò Ýêäïóç. ºóùò ÷ñåéÜæåôáé íá ðñïìçèåõôåßôå Ýíá íÝï áíôßãñáöï ôïõ ðñïãñÜììáôïò.
+NotOnThisPlatform=Áõôü ôï ðñüãñáììá äåí ìðïñåß íá åêôåëåóôåß óå %1.
+OnlyOnThisPlatform=Áõôü ôï ðñüãñáììá åêôåëåßôáé ìüíï óå %1.
+; 5.1.0+
+OnlyOnTheseArchitectures=Áõôü ôï ðñüãñáììá ìðïñåß íá åãêáôáóôáèåß ìïíü óå Windows ó÷åäéáóìÝíá ãéá åðåîåñãáóôÝò ìå áñ÷éôåêôïíéêÞ:%n%n%1
+MissingWOW64APIs=Ç Ýêäïóç ôùí Windows ðïõ åêôåëåßôáé äåí äéáèÝôåé ëåéôïõñãéêüôçôá 64-bit. Ãéá íá äéïñèùèåß ôï ðñüâëçìá åãêáôÝóôçóå ôï Service Pack %1.
+WinVersionTooLowError=Áõôü ôï ðñüãñáììá áðáéôåß %1 Ýêäïóç ç íåüôåñç.
+WinVersionTooHighError=Áõôü ôï ðñüãñáììá äåí ìðïñåß íá åêôåëåóôåß óå %1 Ýêäïóç ç íåüôåñç.
+AdminPrivilegesRequired=ÐñÝðåé íá åßóôå ï Äéá÷åéñéóôÞò óõóôÞìáôïò ãéá íá åãêáôáóôÞóåôå áõôü ôï ðñüãñáììá.
+PowerUserPrivilegesRequired=ÐñÝðåé íá åßóôå ï Äéá÷åéñéóôÞò óõóôÞìáôïò Þ Power User ãéá íá åãêáôáóôÞóåôå áõôü ôï ðñüãñáììá.
+SetupAppRunningError=Ç åãêáôÜóôáóç åíôüðéóå üôé åêôåëåßôáé ç åöáñìïãÞ %1. Ðáñáêáëþ êëåßóôå ôçí åöáñìïãÞ ôþñá êáé ðáôÞóôå ÅíôÜîåé ãéá íá óõíå÷ßóåôå.
+UninstallAppRunningError=Ç áðåãêáôÜóôáóç åíôüðéóå üôé åêôåëåßôáé ç åöáñìïãÞ %1. Ðáñáêáëþ êëåßóôå ôçí åöáñìïãÞ ôþñá êáé ðáôÞóôå ÅíôÜîåé ãéá íá óõíå÷ßóåôå.
+
+; *** Misc. errors
+ErrorCreatingDir=Ç åãêáôÜóôáóç äåí ìðïñåß íá äçìéïõñãÞóåé ôïí êáôÜëïãï %1.
+ErrorTooManyFilesInDir=Äåí ìðïñåß íá äçìéïõñãçèåß Ýíá áñ÷åßï óôïí êáôÜëïãï "%1" åðåéäÞ Þäç ðåñéÝ÷åé ðïëëÜ áñ÷åßá.
+
+; *** Setup common messages
+ExitSetupTitle=ÔÝëïò ÅãêáôÜóôáóçò.
+ExitSetupMessage=Ç åãêáôÜóôáóç äåí Ý÷åé ôåëåéþóåé. Áí ôç óôáìáôÞóåôå ôþñá ôï ðñüãñáììá ðïõ ðñïóðáèÞóáôå íá åãêáôáóôÞóåôå äåí èá ëåéôïõñãåß.%n%nÌðïñåßôå íá åêôåëÝóåôå îáíÜ ôçí åãêáôÜóôáóç áñãüôåñá.
+AboutSetupMenuItem=&Ó÷åôéêÜ ìå ôçí ÅãêáôÜóôáóç...
+AboutSetupTitle=Ó÷åôéêÜ ìå ôçí ÅãêáôÜóôáóç.
+AboutSetupMessage=%1 Ýêäïóç %2%n%3%n%n%1 ðñïóùðéêÞ óåëßäá%n%4
+AboutSetupNote=Anasto
+; 5.1.0+
+TranslatorNote=Anastasis Chatzioglou - baldycom at hotmail.com
+
+; *** Buttons
+ButtonBack=< &Ðßóù
+ButtonNext=&Åðüìåíï >
+ButtonInstall=&ÅãêáôÜóôáóç
+ButtonOK=Å&íôÜîåé
+ButtonCancel=&Áêõñï
+ButtonYes=Í&áé
+ButtonYesToAll=Íáé óå &Ïëá
+ButtonNo=Ï&÷é
+ButtonNoToAll=Ï÷é &óå ïëá
+ButtonFinish=&ÔÝëïò
+ButtonBrowse=&ÁíáæÞôçóç...
+;4.1.3
+ButtonWizardBrowse=&Åýñåóç...
+ButtonNewFolder=&Äçìéïõñãßá íÝïõ öáêÝëïõ
+
+; *** "Select Language" dialog messages
+; 4.0.x
+SelectLanguageTitle=ÅðéëïãÞ ôçò ãëþóóáò åãêáôÜóôáóçò
+SelectLanguageLabel=ÅðéëïãÞ ôçò ãëþóóáò ãéá ÷ñÞóç êáôÜ ôçí äéÜñêåéá ôçò åãêáôÜóôáóçò:
+
+
+; *** Common wizard text
+ClickNext=ÐáôÞóôå Åðüìåíï ãéá íá óõíå÷ßóåôå Þ ¢êõñï ãéá íá ôåñìáôßóåôå ôçí åãêáôÜóôáóç.
+; 2.0.x
+;ClickNextModern=ÐáôÞóôå Åðüìåíï ãéá íá óõíå÷ßóåôå Þ ¢êõñï ãéá íá ôåñìáôßóåôå ôçí åãêáôÜóôáóç.
+;;; - anasto -
+BeveledLabel=anasto
+;4.1.3
+BrowseDialogTitle=Åýñåóç öáêÝëïõ
+BrowseDialogLabel=ÅðéëÝîôå öÜêåëï óôçí ëßóôá êáé ìåôÜ ðáôÞóôå OK.
+NewFolderName=ÍÝïò öÜêåëïò
+
+; *** "Welcome" wizard page
+WelcomeLabel1=Êáëùóïñßóáôå óôçí åãêáôÜóôáóç ôïõ [name].
+WelcomeLabel2=Èá ãßíåé åãêáôÜóôáóç ôïõ [name/ver] óôïí õðïëïãéóôÞ óáò.%n%nÐñéí óõíå÷ßóåôå óáò óõíéóôïýìå íá êëåßóåôå êÜèå Üëëç åöáñìïãÞ ðïõ ðéèáíüí åêôåëåßôå.
+
+; *** "Password" wizard page
+WizardPassword=ÅéóáãùãÞ Êùäéêïý
+PasswordLabel1=ÁõôÞ ç åãêáôÜóôáóç ÷ñåéÜæåôáé êùäéêü ãéá íá åêôåëåóôåß.
+PasswordLabel3=Ðáñáêáëþ äþóôå ôïí êùäéêü óáò êáé ðáôÞóôå Åðüìåíï ãéá íá óõíå÷ßóåôå.
+PasswordEditLabel=&Êùäéêüò:
+IncorrectPassword=Ï êùäéêüò ðïõ äþóáôå åßíáé ëÜèïò. ÎáíáðñïóðáèÞóôå.
+
+; *** "License Agreement" wizard page
+WizardLicense=Áäåéá ×ñÞóçò
+LicenseLabel=Ðáñáêáëþ äéáâÜóôå ðñïóåêôéêÜ ôéò ðáñáêÜôù ðëçñïöïñßåò ðñéí óõíå÷ßóåôå.
+; 2.0.x
+;LicenseLabel1=Ðáñáêáëþ äéáâÜóôå ðñïóåêôéêÜ ôéò ðáñáêÜôù ðëçñïöïñßåò ðñéí óõíå÷ßóåôå. ×ñçóéìïðïéÞóôå ôçí ìðÜñá êýëéóçò ãéá íá äåßôå üëï ôï êåßìåíï.
+;LicenseLabel2=ÁðïäÝ÷åóôå ôïõò üñïõò ôçò ¢äåéáò ×ñÞóçò; Áí åðéëÝîåôå ü÷é ç åãêáôÜóôáóç èá ôåñìáôéóôåß. Ãéá íá óõíå÷éóôåß ç åãêáôÜóôáóç ðñÝðåé íá áðïäÝ÷åóôå ôïõò üñïõò ôçò ¢äåéáò ×ñÞóçò.
+LicenseLabel3=Ðáñáêáëþ äéáâÜóôå ðñïóåêôéêÜ ôéò ðáñáêÜôù ðëçñïöïñßåò ðñéí óõíå÷ßóåôå. ÐñÝðåé íá áðïäÝ÷åóôå ôïõò üñïõò ôçò ¢äåéáò ×ñÞóçò ðñéí íá óõíå÷ßóåôå ôçí åãêáôÜóôáóç.
+LicenseAccepted=&ÄÝ÷ïìáé ôïõò üñïõò ôçò ¢äåéáò ×ñÞóçò
+LicenseNotAccepted=Äåí &áðïäÝ÷ïìáé ôïõò üñïõò ôçò ¢äåéáò ×ñÞóçò
+
+; *** "Information" wizard pages
+WizardInfoBefore=Ðëçñïöïñßåò
+InfoBeforeLabel=Ðáñáêáëþ äéáâÜóôå ðñïóåêôéêÜ ôéò ðáñáêÜôù ðëçñïöïñßåò ðñéí óõíå÷ßóåôå.
+InfoBeforeClickLabel=Áí åßóôå Ýôïéìïé íá óõíå÷ßóåôå ðáôÞóôå Åðüìåíï.
+WizardInfoAfter=Ðëçñïöïñßåò
+InfoAfterLabel=Ðáñáêáëþ äéáâÜóôå ðñïóåêôéêÜ ôéò ðáñáêÜôù ðëçñïöïñßåò ðñéí óõíå÷ßóåôå.
+InfoAfterClickLabel=Áí åßóôå Ýôïéìïé íá óõíå÷ßóåôå ðáôÞóôå Åðüìåíï.
+
+; *** "User Information" wizard page
+WizardUserInfo=Ðëçñïöïñßåò ãéá ôïí ×ñÞóôç
+UserInfoDesc=Ðáñáêáëþ äþóôå ôéò ðëçñïöïñßåò.
+UserInfoName=&Ïíïìá ×ñÞóôç:
+UserInfoOrg=&Åôáéñåßá:
+UserInfoSerial=&Óåéñéáêü Áñéèìü:
+UserInfoNameRequired=ÐñÝðåé íá äþóåôå üíïìá.
+
+; *** "Select Destination Location" wizard page
+; 4.0.x
+WizardSelectDir=ÅðéëÝîôå ôïí êáôÜëïãï ðïõ èá åãêáôáóôáèåß ôï ðñüãñáììá.
+SelectDirDesc=Ðïõ èá åãêáôáóôáèåß ôï [name];
+;SelectDirLabel=ÅðéëÝîôå ôïí êáôÜëïãï ðïõ èá åãêáôáóôáèåß ôï ðñüãñáììá. ÐáôÞóôå Åðüìåíï ãéá íá óõíå÷ßóåôå.
+DiskSpaceMBLabel=Áõôü ôï ðñüãñáììá ÷ñåéÜæåôáé [mb] MB ÷þñï óôïí äßóêï.
+ToUNCPathname=Ç åãêáôÜóôáóç äåí ìðïñåß íá ãßíåé óå äßóêï äéêôýïõ. Áí èÝëåôå íá ãßíåé ç åãêáôÜóôáóç óå äßóêï äéêôýïõ ðñÝðåé íá ïñßóåôå áõôüí ôï äßóêï.
+InvalidPath=Äþóôå ôçí ðëÞñç äéáäñïìÞ.%nðáñÜäåéãìá:%n%nC:\APP
+InvalidDrive=Ï ôïðéêüò äßóêïò ç ï äßóêïò äéêôýïõ ðïõ åðéëÝîáôå äåí õðÜñ÷åé ç äåí åßíáé ðñïóâÜóéìïò. ÅðéëÝîôå Üëëïí.
+DiskSpaceWarningTitle=Äåí õðÜñ÷åé áñêåôüò ÷þñïò óôï äßóêï.
+DiskSpaceWarning=Ç åãêáôÜóôáóç ÷ñåéÜæåôáé ôïõëÜ÷éóôïí %1 KB åëåýèåñï ÷þñï óôï äßóêï áëëÜ ï åðéëåãìÝíïò ïäçãüò äéáèÝôåé ìüíïí %2 KB.%n%nÈÝëåôå íá óõíå÷ßóåôå ïðùóäÞðïôå;
+BadDirName32=Ïíüìáôá êáôáëüãùí äåí ìðïñïýí íá ðåñéÝ÷ïõí êÜðïéïí áðü ôïõò ðáñáêÜôù ÷áñáêôÞñåò:%n%n%1
+DirExistsTitle=Ï êáôÜëïãïò õðÜñ÷åé.
+DirExists=Ï êáôÜëïãïò:%n%n%1%n%nõðÜñ÷åé Þäç. ÈÝëåôå íá ãßíåé ç åãêáôÜóôáóç óå áõôüí ôïí êáôÜëïãï;
+DirDoesntExistTitle=Ï êáôÜëïãïò äåí õðÜñ÷åé.
+DirDoesntExist=Ï êáôÜëïãïò:%n%n%1%n%näåí õðÜñ÷åé. ÈÝëåôå íá äçìéïõñãçèåß;
+;4.1.3
+InvalidDirName=ËÜèïò üíïìá öáêÝëïõ.
+;4.1.5
+DirNameTooLong=Ôï üíïìá ôïõ öáêÝëïõ åßíáé ðïëý ìåãÜëï.
+;4.1.8
+;SelectDirLabel2=Ôï [name] èá åãêáôáóôáèåß óôïí áêüëïõèï öÜêåëï.%n%nÃéá óõíÝ÷åéá ðáôÞóôå Åðüìåíï. Áí èÝëåôå Üëëï öÜêåëï, ðáôÞóôå Åýñåóç.
+SelectDirLabel3=Ôï [name] èá åãêáôáóôáèåß óôïí áêüëïõèï öÜêåëï.
+SelectDirBrowseLabel=Ãéá óõíÝ÷åéá ðáôÞóôå Åðüìåíï. Áí èÝëåôå Üëëï öÜêåëï, ðáôÞóôå Åýñåóç.
+
+; *** "Select Components" wizard page
+WizardSelectComponents=ÅðéëïãÞ Óõóôáôéêþí
+SelectComponentsDesc=Ðïéá óõóôáôéêÜ èÝëåôå íá åãêáôáóôáèïýí;
+SelectComponentsLabel2=ÅðéëÝîôå ôá óõóôáôéêÜ ðïõ èÝëåôå íá åãêáôáóôÞóåôå êáé ðáôÞóôå Åðüìåíï ãéá óõíÝ÷åéá ôçò åãêáôÜóôáóçò.
+FullInstallation=ÐëÞñçò ÅãêáôÜóôáóç.
+; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
+CompactInstallation=ÐåñéïñéóìÝíç ÅãêáôÜóôáóç.
+CustomInstallation=ÅðéëåãìÝíç ÅãêáôÜóôáóç.
+NoUninstallWarningTitle=Ôá óõóôáôéêÜ õðÜñ÷ïõí.
+NoUninstallWarning=Ç åãêáôÜóôáóç äéáðßóôùóå üôé ôá ðáñáêÜôù óõóôáôéêÜ åßíáé Þäç åãêáôåóôçìÝíá óôïí õðïëïãéóôÞ óáò:%n%n%1
+ComponentSize1=%1 KB
+ComponentSize2=%1 MB
+ComponentsDiskSpaceMBLabel=Ç óõãêåêñéìÝíç åðéëïãÞ áðáéôåß ôïõëÜ÷éóôïí [mb] MB åëåýèåñï ÷þñï óôïí äßóêï.
+
+; *** "Select Additional Tasks" wizard page
+WizardSelectTasks=ÅðéëïãÞ ÐåñáéôÝñù Åíåñãåéþí
+SelectTasksDesc=ÐïéÝò åðéðëÝïí åíÝñãåéåò èÝëåôå íá ãßíïõí;
+SelectTasksLabel2=ÅðéëÝîôå ôéò åðéðëÝïí åíÝñãåéåò ðïõ èÝëåôå íá ãßíïõí êáôÜ ôçí åãêáôÜóôáóç ôïõ [name] êáé ðáôÞóôå Åðüìåíï.
+
+; *** "Select Start Menu Folder" wizard page
+; 2.0.x
+;ReadyMemoTasks=ÅðéðëÝïí ÅíÝñãåéåò:
+WizardSelectProgramGroup=ÅðéëïãÞ Êáôáëüãïõ Óôï Ìåíïý Åêêßíçóç.
+SelectStartMenuFolderDesc=Ðïõ èá ôïðïèåôçèïýí ïé óõíôïìåýóåéò ôïõ ðñïãñÜììáôïò;
+; 4.0.x
+;SelectStartMenuFolderLabel=ÅðéëÝîôå ôïí êáôÜëïãï óôï ìåíïý åêêßíçóç óôïí ïðïßï èÝëåôå äçìéïõñãçèïýí ïé óõíôïìåýóåéò ôïõ ðñïãñÜììáôïò êáé ðáôÞóôå Åðüìåíï.
+; 5.1.0+
+;NoIconsCheck=&×ùñßò äçìéïõñãßá åéêïíéäßùí
+MustEnterGroupName=ÐñÝðåé íá äþóåôå ôï üíïìá åíüò êáôáëüãïõ.
+BadGroupName=Ïíüìáôá êáôáëüãùí äåí ìðïñïýí íá ðåñéÝ÷ïõí êÜðïéïí áðü ôïõò ðáñáêÜôù ÷áñáêôÞñåò:%n%n%1
+NoProgramGroupCheck2=&×ùñßò äçìéïõñãßá êáôáëüãïõ óôï ìåíïý åêêßíçóç.
+;4.1.3
+InvalidGroupName=Ôï üíïìá ôïõ group äåí åßíáé óùóôü.
+;4.1.4+
+GroupNameTooLong=Ôï üíïìá ôïõ group åéíáé ðïëý ìåãÜëï.
+;4.1.8
+;SelectStartMenuFolderLabel2=To setup èá äçìéïõñãÞóåé ôéò óõíôïìåýóåéò ôïõ ðñïãñÜììáôïò óôï áêüëïõèï group.%n%nÃéá óõíÝ÷åéá, ðáôÞóôå Åðüìåíï. Áí èÝëåôå Üëëï group, ðáôÞóôå åýñåóç.
+SelectStartMenuFolderLabel3=Ôï setup èá äçìéïõñãÞóåé ôéò óõíôïìåýóåéò ôïõ ðñïãñÜììáôïò óôï áêüëïõèï group.
+SelectStartMenuFolderBrowseLabel=Ãéá óõíÝ÷åéá, ðáôÞóôå Åðüìåíï. Áí èÝëåôå Üëëï group, ðáôÞóôå åýñåóç.
+
+
+; *** "Ready to Install" wizard page
+WizardReady=¸ôïéìïò ãéá åãêáôÜóôáóç
+ReadyLabel1=Ç åãêáôÜóôáóç ôïõ [name] åßíáé Ýôïéìç íá åêôåëåóôåß óôïí õðïëïãéóôÞ óáò.
+ReadyLabel2a=ÐáôÞóôå ÅãêáôÜóôáóç ãéá íá óõíå÷ßóåôå Þ Ðßóù áí èÝëåôå íá áëëÜîåôå êÜðïéåò ñõèìßóåéò.
+ReadyLabel2b=ÐáôÞóôå ÅãêáôÜóôáóç ãéá íá óõíå÷ßóåôå.
+ReadyMemoUserInfo=Ðëçñïöïñßåò ×ñÞóôç:
+ReadyMemoDir=ÊáôÜëïãïò ðñïïñéóìïý:
+ReadyMemoType=Åßäïò åãêáôÜóôáóçò:
+ReadyMemoComponents=ÅðéëåãìÝíá óõóôáôéêÜ:
+ReadyMemoGroup=ÊáôÜëïãïò óôï ìåíïý ÐñïãñÜììáôá:
+ReadyMemoTasks=ÅðéðëÝïí ÅíÝñãåéåò:
+
+; *** "Preparing to Install" wizard page
+WizardPreparing=Ðñïåôïéìáóßá ÅãêáôÜóôáóçò
+PreparingDesc=Ç åãêáôÜóôáóç ðñïåôïéìÜæåé ôï ðñüãñáììá [name] íá ôïðïèåôçèåß óôïí õðïëïãéóôÞ.
+PreviousInstallNotCompleted=The installation/removal of a previous program was not completed. You will need to restart your computer to complete that installation.%n%nAfter restarting your computer, run Setup again to complete the installation of [name].
+CannotContinue=Setup cannot continue. Please click Cancel to exit.
+
+; *** "Installing" wizard page
+WizardInstalling=Ðñüïäïò ÅãêáôÜóôáóçò
+InstallingLabel=Ðáñáêáëþ ðåñéìÝíåôå íá ïëïêëçñùèåß ç åãêáôÜóôáóç ôïõ [name] óôïí õðïëïãéóôÞ óáò.
+
+; *** "Setup Completed" wizard page
+; 2.0.x
+;WizardFinished=Ç ÅãêáôÜóôáóç Ïëïêëçñþèçêå
+FinishedHeadingLabel=Completing the [name] Setup Wizard
+FinishedLabelNoIcons=Ç åãêáôÜóôáóç ôïõ [name] óôïí õðïëïãéóôÞ óáò ôåëåßùóå ìå åðéôõ÷ßá.
+FinishedLabel=Ç åãêáôÜóôáóç ôïõ [name] óôïí õðïëïãéóôÞ óáò ôåëåßùóå ìå åðéôõ÷ßá. Ìðïñåßôå íá îåêéíÞóåôå ôï ðñüãñáììá åðéëÝãïíôáò ôï åéêïíßäéï ðïõ äçìéïõñãÞèçêå óôï ìåíïý åêêßíçóç.
+ClickFinish=ÐáôÞóôå ÔÝëïò ãéá íá ôåñìáôßóåôå ôï ðñüãñáììá åãêáôÜóôáóçò.
+FinishedRestartLabel=Ãéá íá ïëïêëçñùèåß ç åãêáôÜóôáóç ôïõ [name] ðñÝðåé íá ãßíåé åðáíåêêßíçóç ôïõ õðïëïãéóôÞ óáò. ÈÝëåôå íá ãßíåé ôþñá;
+FinishedRestartMessage=Ãéá íá ïëïêëçñùèåß ç åãêáôÜóôáóç ôïõ [name] ðñÝðåé íá ãßíåé åðáíåêêßíçóç ôïõ õðïëïãéóôÞ óáò.%n%nÈÝëåôå íá ãßíåé ôþñá;
+ShowReadmeCheck=Íáé èÝëù íá äéáâÜóù ôéò ðëçñïöïñßåò ôïõ ðñïãñÜììáôïò
+YesRadio=&Íáé íá ãßíåé åðáíåêêßíçóç ôþñá.
+NoRadio=&Ï÷é èá êÜíù åðáíåêêßíçóç áñãüôåñá.
+; used for example as 'Run MyProg.exe'
+RunEntryExec=Íá åêôåëåóôåß ôï ðñüãñáììá %1
+; used for example as 'View Readme.txt'
+RunEntryShellExec=Íá åêôåëåóôåß ôï %1
+
+; *** "Setup Needs the Next Disk" stuff
+ChangeDiskTitle=ÔïðïèåôÞóôå ôçí åðüìåíç äéóêÝôôá
+; 4.0.x
+;SelectDirectory=ÅðéëÝîôå êáôÜëïãï
+SelectDiskLabel2=ÔïðïèåôÞóôå ôçí äéóêÝôôá %1 êáé ðáôÞóôå ÅíôÜîåé.
+PathLabel=&ÄéáäñïìÞ
+FileNotInDir2=Ôï áñ÷åßï "%1" äåí âñßóêåôáé óôï "%2". ÔïðïèåôÞóôå ôç óùóôÞ äéóêÝôôá.
+SelectDirectoryLabel=Äþóôå ôçí ôïðïèåóßá ôçò åðüìåíçò äéóêÝôôáò.
+
+; *** Installation phase messages
+SetupAborted=Ç åãêáôÜóôáóç äåí ïëïêëçñþèçêå.%n%nÄéïñèþóôå ôï ðñüâëçìá êáé åêôåëÝóôå îáíÜ ôçí åãêáôÜóôáóç.
+EntryAbortRetryIgnore=ÐáôÞóôå Retry ãéá íá îáíáðñïóðáèÞóåôå, Ignore ãéá íá óõíå÷ßóåôå ç Abort ãéá íá ôåñìáôßóåôå ôçí åãêáôÜóôáóç.
+
+; *** Installation status messages
+StatusCreateDirs=Äçìéïõñãßá êáôáëüãùí...
+StatusExtractFiles=Áðïóõìðßåóç áñ÷åßùí...
+StatusCreateIcons=Äçìéïõñãßá åéêïíéäßùí...
+StatusCreateIniEntries=Êáôá÷þñçóç óôï ÉÍÉ áñ÷åßï óõóôÞìáôïò...
+StatusCreateRegistryEntries=Êáôá÷þñçóç óôï ìçôñþï óõóôÞìáôïò...
+StatusRegisterFiles=Êáôá÷þñçóç áñ÷åßùí
+StatusSavingUninstall=Ðëçñïöïñßåò áðåãêáôÜóôáóçò...
+StatusRunProgram=Ôåëåéþíïíôáò ôçí åãêáôÜóôáóç...
+StatusRollback=Rolling back changes...
+
+; *** Misc. errors
+; 2.0.x
+;ErrorInternal=ÓöÜëìá %1
+ErrorInternal2=ÓöÜëìá %1
+ErrorFunctionFailedNoCode=%1 ÓöÜëìá
+ErrorFunctionFailed=%1 ÓöÜëìá, êùä. %2
+ErrorFunctionFailedWithMessage=%1 ÓöÜëìá, êùä. %2%n%3
+ErrorExecutingProgram=Äåí ìðïñåß íá åêôåëåóôåß ôï áñ÷åßï:%n%1
+
+;2.0.x
+;ErrorDDEExecute=DDE: ÓöÜëìá êáôÜ ôçí åêôÝëåóç ôçò åíÝñãåéáò (code: %1)
+;ErrorDDECommandFailed=DDE: Ç åíôïëÞ áðÝôõ÷å.
+;ErrorDDERequest=DDE: ÓöÜëìá êáôÜ ôçí åêôÝëåóç ôçò åíÝñãåéáò (code: %1)
+
+; *** Registry errors
+ErrorRegOpenKey=Äåí ìðïñåß íá äéáâáóôåß ôï êëåéäß ìçôñþïõ óõóôÞìáôïò:%n%1\%2
+ErrorRegCreateKey=Äåí ìðïñåß íá äçìéïõñãçèåß ôï êëåéäß ìçôñþïõ óõóôÞìáôïò:%n%1\%2
+ErrorRegWriteKey=Äåí ìðïñåß íá ãßíåé êáôá÷þñçóç óôï êëåéäß ìçôñþïõ óõóôÞìáôïò:%n%1\%2
+
+; *** INI errors
+ErrorIniEntry=Äåí ìðïñåß íá ãßíåé êáôá÷þñçóç óôï ÉÍÉ áñ÷åßï óõóôÞìáôïò "%1".
+
+; *** File copying errors
+FileAbortRetryIgnore=ÐáôÞóôå Retry ãéá íá îáíáðñïóðáèÞóåôå, Ignore ãéá íá óõíå÷ßóåôå ç Abort ãéá íá ôåñìáôßóåôå ôçí åãêáôÜóôáóç.
+FileAbortRetryIgnore2=ÐáôÞóôå Retry ãéá íá îáíáðñïóðáèÞóåôå, Ignore ãéá íá óõíå÷ßóåôå ç Abort ãéá íá ôåñìáôßóåôå ôçí åãêáôÜóôáóç.
+SourceIsCorrupted=Ôï áñ÷åßï ðñïÝëåõóçò åßíáé êáôåóôñáììÝíï.
+SourceDoesntExist=Ôï áñ÷åßï ðñïÝëåõóçò "%1" äåí õðÜñ÷åé.
+ExistingFileReadOnly=Ôï áñ÷åßï åßíáé ìðáñêáñéóìÝíï ìüíï ãéá áíÜãíùóç.%n%nÐáôÞóôå Retry ãéá íá ôï îåìáñêÜñåôå êáé íá ðñïóðáèÞóåôå ðÜëé, Ignore ãéá íá ôï ðñïóðåñÜóåôå ç Abort ãéá íá ôåñìáôßóåôå ôçí åãêáôÜóôáóç.
+ErrorReadingExistingDest=ÐáñïõóéÜóôçêå óöÜëìá êáôÜ ôçí áíÜãíùóç ôïõ áñ÷åßïõ:
+FileExists=Ôï áñ÷åßï õðÜñ÷åé.%n%nÈÝëåôå íá îáíáãñáöôåß;
+ExistingFileNewer=Åíá áñ÷åßï ðïõ âñÝèçêå óôïí õðïëïãéóôÞ óáò åßíáé íåüôåñçò Ýêäïóçò áðï åêåßíï ôçò åãêáôÜóôáóçò. Ðñïôåßíåôáé íá êñáôÞóåôå ôï õðÜñ÷ïí áñ÷åßï.%n%nÈÝëåôå íá êñáôÞóåôå ôï õðÜñ÷ïí áñ÷åßï;
+ErrorChangingAttr=ÐñïÝêõøå óöÜëìá óôçí ðñïóðÜèåéá íá áëëá÷ôïýí ôá ÷áñáêôçñéóôéêÜ ôïõ áñ÷åßïõ:
+ErrorCreatingTemp=ÐñïÝêõøå óöÜëìá óôçí ðñïóðÜèåéá íá äçìéïõñãçèåß Ýíá áñ÷åßï óôïí êáôÜëïãï ðñïïñéóìïý:
+ErrorReadingSource=ÐñïÝêõøå óöÜëìá óôçí ðñïóðÜèåéá áíÜãíùóçò ôïõ áñ÷åßïõ ðñïÝëåõóçò:
+ErrorCopying=ÐñïÝêõøå óöÜëìá óôçí ðñïóðÜèåéá íá áíôéãñáöåß ôï áñ÷åßï:
+ErrorReplacingExistingFile=ÐñïÝêõøå óöÜëìá óôçí ðñïóðÜèåéá íá áíôéêáôáóôáèåß ôï õðÜñ÷ïí áñ÷åßï:
+ErrorRestartReplace=ÐñïÝêõøå óöÜëìá óôçí ðñïóðÜèåéá íá ãßíåé åðáíåêêßíçóç êáé áíôéêáôÜóôáóç áñ÷åßïõ:
+ErrorRenamingTemp=ÐñïÝêõøå óöÜëìá óôçí ðñïóðÜèåéá ìåôïíïìáóßáò åíüò áñ÷åßïõ óôïí êáôÜëïãï ðñïïñéóìïý:
+ErrorRegisterServer=ÐñïÝêõøå óöÜëìá óôçí ðñïóðÜèåéá êáôá÷þñçóçò DLL/OCX: %1
+ErrorRegSvr32Failed=RegSvr32 failed with exit code %1
+ErrorRegisterTypeLib=Unable to register the type library: %1
+
+; *** Post-installation errors
+ErrorOpeningReadme=ÐñïÝêõøå óöÜëìá óôçí ðñïóðÜèåéá íá öïñôùèåß ôï áñ÷åßï ðëçñïöïñéþí.
+ErrorRestartingComputer=ÐñïÝêõøå óöÜëìá óôçí ðñïóðÜèåéá åðáíåêêßíçóçò ôïõ õðïëïãéóôÞ.%nÐáñáêáëþ åðáíåêêéíÞóôå ôïí õðïëïãéóôÞ óáò.
+
+; *** Uninstaller messages
+UninstallNotFound=Ôï áñ÷åßï "%1" äåí âñÝèçêå. Ç áðåãêáôÜóôáóç äåí ìðïñåß íá ãßíåé
+; 4.0.x
+UninstallOpenError=Ôï áñ÷åßï "%1" äåí ìðüñåóå íá öïñôùèåß. Ç áðåãêáôÜóôáóç äåí ìðïñåß íá ãßíåé
+UninstallUnsupportedVer=Ôï áñ÷åßï "%1" äåí áíáãíùñßæåôáé áðü áõôÞ ôçí Ýêäïóç ôçò åãêáôÜóôáóçò, Ç áðåãêáôÜóôáóç äåí ìðïñåß íá åêôåëåóôåß
+UninstallUnknownEntry=Ôï áñ÷åßï "%1" äåí áíáãíùñßæåôáé áðü áõôÞ ôçí Ýêäïóç ôçò åãêáôÜóôáóçò, Ç áðåãêáôÜóôáóç äåí ìðïñåß íá åêôåëåóôåß
+ConfirmUninstall=Åßóôå óßãïõñïé üôé èÝëåôå íá äéáãñÜøåôå ôï %1 êáé üëá ôá óõóôáôéêÜ ôïõ;
+; 5.1.0+
+UninstallOnlyOnWin64=ÁõôÞ ç åöáñìïãÞ ìðïñåß íá áðåãêáôáóôáèåß ìüíï óå 64-bit Windows.
+OnlyAdminCanUninstall=Ç áðåãêáôÜóôáóç ìðïñåß íá åêôåëåóôåß ìüíï áðü ôïí Äéá÷åéñéóôÞ óõóôÞìáôïò
+UninstallStatusLabel=Ðáñáêáëþ ðåñéìÝíåôå üóï ôï %1 äéáãñÜöåôå áðü ôïí õðïëïãéóôÞ óáò
+UninstalledAll=Ç áðåãêáôÜóôáóç ôïõ %1 Ýãéíå ìå åðéôõ÷ßá.
+UninstalledMost=Ç áðåãêáôÜóôáóç ôïõ %1 Ýãéíå ìå åðéôõ÷ßá.%n%nÊÜðïéá óõóôáôéêÜ ðïõ ðáñÝìåéíáí óôïí õðïëïãéóôÞ óáò èá ðñÝðåé íá ôá äéáãñÜøåôå åóåßò.
+UninstalledAndNeedsRestart=To complete the uninstallation of %1, your computer must be restarted.%n%nWould you like to restart now?
+UninstallDataCorrupted="%1" Áõôü ôï áñ÷åßï åßíáé êáôåóôñáììÝíï. Äåí ìðïñåß íá ãßíåé áðåãêáôÜóôáóç.
+
+; *** Uninstallation phase messages
+ConfirmDeleteSharedFileTitle=ÈÝëåôå íá äéáãñáöïýí ôá êïéíÜ áñ÷åßá;
+ConfirmDeleteSharedFile2=Ôá êïéíÜ áñ÷åßá äåí ÷ñçóéìïðïéïýíôáé áðü êÜðïéï ðñüãñáììá. ÈÝëåôå íá äéáãñáöïýí;%n%nÁí êÜðïéï ðñüãñáììá ôá ÷ñçóéìïðïéåß ßóùò äåí åêôåëåßôáé óùóôÜ áí ôá äéáãñÜøåôå. Áí äåí åßóôå óßãïõñïé áöÞóôå ôá óôï óýóôçìá óáò äåí ðñïêáëïýí êÜðïéï ðñüâëçìá.
+SharedFileNameLabel=Ïíïìá Áñ÷åßïõ:
+SharedFileLocationLabel=Ôïðïèåóßá:
+WizardUninstalling=Ðñüïäïò ÁðåãêáôÜóôáóçò:
+StatusUninstalling=ÁðåãêáôÜóôáóç ôïõ %1...
+
+[CustomMessages]
+NameAndVersion=%1 Ýêäïóç %2
+AdditionalIcons=ÅðéðëÝïí åéêïíßäéá:
+CreateDesktopIcon=Äçìéïõñãßá åíüò &åéêïíéäßïõ óôçí åðéöÜíåéá åñãáóßáò
+CreateQuickLaunchIcon=Äçìéïõñãßá åíüò åéêïíéäßïõ óôç &ÃñÞãïñç Åêêßíçóç
+ProgramOnTheWeb=Ôï %1 óôï Internet
+UninstallProgram=ÁðåãêáôÜóôáóç ôïõ %1
+LaunchProgram=Åêêßíçóç ôïõ %1
+AssocFileExtension=%Áíôéóôïß÷éóç ôïõ %1 ìå ôçí %2 åðÝêôáóç áñ÷åßïõ
+AssocingFileExtension=Ãßíåôáé áíôéóôïß÷çóç ôïõ %1 ìå ôçí %2 åðÝêôáóç áñ÷åßïõ...
+
diff --git a/Japanese-5-5.1.11.isl b/Japanese-5-5.1.11.isl
index 6982bb9..a5772d3 100644
--- a/Japanese-5-5.1.11.isl
+++ b/Japanese-5-5.1.11.isl
@@ -1,312 +1,312 @@
-; *** Inno Setup version 5.1.11+ Japanese messages ***
-;
-; Translated by Ryou Minakami (ryou32jp at yahoo.co.jp)
-; Fixes and updates: Koichi Shirasuka (shirasuka at eugrid.co.jp)
-;
-; $jrsoftware: issrc/Files/Default.isl,v 1.66 2005/02/25 20:23:48 mlaan Exp $
-
-[LangOptions]
-LanguageName=Japanese
-LanguageID=$0411
-LanguageCodePage=932
-
-; If you don't need to support Windows 9x, commenting the following 4 lines gives better looking (banners not stretched).
-DialogFontName=‚l‚r ‚oƒSƒVƒbƒN
-DialogFontSize=9
-TitleFontName=‚l‚r ‚oƒSƒVƒbƒN
-TitleFontSize=29
-
-; Required for Win2K/older to display the welcome message with correct font.
-WelcomeFontName=‚l‚r ‚oƒSƒVƒbƒN
-WelcomeFontSize=12
-
-[Messages]
-
-; *** Application titles
-SetupAppTitle=ƒZƒbƒgƒAƒbƒv
-SetupWindowTitle=%1 ƒZƒbƒgƒAƒbƒv
-UninstallAppTitle=ƒAƒ“ƒCƒ“ƒXƒg[ƒ‹
-UninstallAppFullTitle=%1 ƒAƒ“ƒCƒ“ƒXƒg[ƒ‹
-
-; *** Misc. common
-InformationTitle=î•ñ
-ConfirmTitle=Šm”F
-ErrorTitle=ƒGƒ‰[
-
-; *** SetupLdr messages
-SetupLdrStartupMessage=%1 ‚ðƒCƒ“ƒXƒg[ƒ‹‚µ‚Ü‚·B‘±s‚µ‚Ü‚·‚©H
-LdrCannotCreateTemp=ˆêŽžƒtƒ@ƒCƒ‹‚ð쬂ł«‚Ü‚¹‚ñBƒZƒbƒgƒAƒbƒv‚𒆎~‚µ‚Ü‚·B
-LdrCannotExecTemp=ˆêŽžƒtƒHƒ‹ƒ_‚̃tƒ@ƒCƒ‹‚ðŽÀs‚Å‚«‚Ü‚¹‚ñBƒZƒbƒgƒAƒbƒv‚𒆎~‚µ‚Ü‚·B
-
-; *** Startup error messages
-LastErrorMessage=%1.%n%nƒGƒ‰[ %2: %3
-SetupFileMissing=ƒtƒ@ƒCƒ‹ %1 ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñB–â‘è‚ð‰ðŒˆ‚·‚é‚©V‚µ‚¢ƒZƒbƒgƒAƒbƒvƒvƒƒOƒ‰ƒ€‚ð“üŽè‚µ‚Ä‚‚¾‚³‚¢B
-SetupFileCorrupt=ƒZƒbƒgƒAƒbƒvƒtƒ@ƒCƒ‹‚ª‰ó‚ê‚Ä‚¢‚Ü‚·BV‚µ‚¢ƒZƒbƒgƒAƒbƒvƒvƒƒOƒ‰ƒ€‚ð“üŽè‚µ‚Ä‚‚¾‚³‚¢B
-SetupFileCorruptOrWrongVer=ƒZƒbƒgƒAƒbƒvƒtƒ@ƒCƒ‹‚ª‰ó‚ê‚Ä‚¢‚é‚©A‚±‚̃o[ƒWƒ‡ƒ“‚̃ZƒbƒgƒAƒbƒv‚ƌ݊·«‚ª‚ ‚è‚Ü‚¹‚ñB–â‘è‚ð‰ðŒˆ‚·‚é‚©V‚µ‚¢ƒZƒbƒgƒAƒbƒvƒvƒƒOƒ‰ƒ€‚ð“üŽè‚µ‚Ä‚‚¾‚³‚¢B
-NotOnThisPlatform=‚±‚̃vƒƒOƒ‰ƒ€‚Í %1 ‚Å‚Í“®ì‚µ‚Ü‚¹‚ñB
-OnlyOnThisPlatform=‚±‚̃vƒƒOƒ‰ƒ€‚ÌŽÀs‚É‚Í %1 ‚ª•K—v‚Å‚·B
-OnlyOnTheseArchitectures=‚±‚̃vƒƒOƒ‰ƒ€‚Í%n%n%1ƒvƒƒZƒbƒTŒü‚¯‚ÌWindows‚É‚µ‚©ƒCƒ“ƒXƒg[ƒ‹‚Å‚«‚Ü‚¹‚ñB
-MissingWOW64APIs=ŒäŽg—p’†‚Ì64-bit”ÅWindows‚É‚Í‚±‚̃vƒƒOƒ‰ƒ€‚ðƒCƒ“ƒXƒg[ƒ‹‚µA“®ì‚³‚¹‚éˆ×‚É•K—v‚È‹@”\‚ªŠÜ‚Ü‚ê‚Ä‚¢‚Ü‚¹‚ñB‚±‚Ì–â‘è‚ðC³‚·‚éˆ×‚ɂ̓T[ƒrƒXƒpƒbƒN%1‚ðƒCƒ“ƒXƒg[ƒ‹‚µ‚Ä‚‚¾‚³‚¢B
-WinVersionTooLowError=‚±‚̃vƒƒOƒ‰ƒ€‚ÌŽÀs‚É‚Í %1 %2 ˆÈ~‚ª•K—v‚Å‚·B
-WinVersionTooHighError=‚±‚̃vƒƒOƒ‰ƒ€‚Í %1 %2 ˆÈ~‚Å‚Í“®ì‚µ‚Ü‚¹‚ñB
-AdminPrivilegesRequired=‚±‚̃vƒƒOƒ‰ƒ€‚ðƒCƒ“ƒXƒg[ƒ‹‚·‚邽‚ß‚É‚ÍŠÇ—ŽÒ‚Æ‚µ‚ăƒOƒCƒ“‚·‚é•K—v‚ª‚ ‚è‚Ü‚·B
-PowerUserPrivilegesRequired=‚±‚̃vƒƒOƒ‰ƒ€‚ðƒCƒ“ƒXƒg[ƒ‹‚·‚邽‚ß‚É‚ÍŠÇ—ŽÒ‚Ü‚½‚̓pƒ[ƒ†[ƒU[‚Æ‚µ‚ăƒOƒCƒ“‚·‚é•K—v‚ª‚ ‚è‚Ü‚·B
-SetupAppRunningError=ƒZƒbƒgƒAƒbƒv‚ÍŽÀs’†‚Ì %1 ‚ðŒŸo‚µ‚Ü‚µ‚½B%n%nŠJ‚¢‚Ä‚¢‚éƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚ð‚·‚×‚Ä•Â‚¶‚Ä‚©‚çuOKv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢BuƒLƒƒƒ“ƒZƒ‹v‚ðƒNƒŠƒbƒN‚·‚é‚ÆAƒZƒbƒgƒAƒbƒv‚ðI—¹‚µ‚Ü‚·B
-UninstallAppRunningError=ƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚ÍŽÀs’†‚Ì %1 ‚ðŒŸo‚µ‚Ü‚µ‚½B%n%nŠJ‚¢‚Ä‚¢‚éƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚ð‚·‚×‚Ä•Â‚¶‚Ä‚©‚çuOKv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢BuƒLƒƒƒ“ƒZƒ‹v‚ðƒNƒŠƒbƒN‚·‚é‚ÆAƒZƒbƒgƒAƒbƒv‚ðI—¹‚µ‚Ü‚·B
-
-; *** Misc. errors
-ErrorCreatingDir=ƒfƒBƒŒƒNƒgƒŠ %1 ‚ð쬒†‚ɃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B
-ErrorTooManyFilesInDir=ƒfƒBƒŒƒNƒgƒŠ %1 ‚Ƀtƒ@ƒCƒ‹‚ð쬒†‚ɃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½Bƒtƒ@ƒCƒ‹‚Ì”‚ª‘½‚·‚¬‚Ü‚·B
-
-; *** Setup common messages
-ExitSetupTitle=ƒZƒbƒgƒAƒbƒvI—¹
-ExitSetupMessage=ƒZƒbƒgƒAƒbƒvì‹Æ‚ÍŠ®—¹‚µ‚Ä‚¢‚Ü‚¹‚ñB‚±‚±‚ŃZƒbƒgƒAƒbƒv‚𒆎~‚·‚é‚ƃvƒƒOƒ‰ƒ€‚̓Cƒ“ƒXƒg[ƒ‹‚³‚ê‚Ü‚¹‚ñB%n%n‰ü‚߂ăCƒ“ƒXƒg[ƒ‹‚·‚éꇂÍA‚à‚¤ˆê“xƒZƒbƒgƒAƒbƒv‚ðŽÀs‚µ‚Ä‚‚¾‚³‚¢B%n%nƒZƒbƒgƒAƒbƒv‚ðI—¹‚µ‚Ü‚·‚©H
-AboutSetupMenuItem=ƒZƒbƒgƒAƒbƒv‚ɂ‚¢‚Ä(&A)...
-AboutSetupTitle=ƒZƒbƒgƒAƒbƒv‚ɂ‚¢‚Ä
-AboutSetupMessage=%1 %2%n%3%n%n%1 ƒz[ƒ€ƒy[ƒW:%n%4
-AboutSetupNote=
-TranslatorNote=
-
-; *** Buttons
-ButtonBack=< –ß‚é(&B)
-ButtonNext=ŽŸ‚Ö(&N) >
-ButtonInstall=ƒCƒ“ƒXƒg[ƒ‹(&I)
-ButtonOK=OK
-ButtonCancel=ƒLƒƒƒ“ƒZƒ‹
-ButtonYes=‚Í‚¢(&Y)
-ButtonYesToAll=‚·‚ׂĂ͂¢(&A)
-ButtonNo=‚¢‚¢‚¦(&N)
-ButtonNoToAll=‚·‚ׂĂ¢‚¢‚¦(&O)
-ButtonFinish=Š®—¹(&F)
-ButtonBrowse=ŽQÆ(&B)...
-ButtonWizardBrowse=ŽQÆ(&r)
-ButtonNewFolder=V‚µ‚¢ƒtƒHƒ‹ƒ_(&M)
-
-; *** "Select Language" dialog messages
-SelectLanguageTitle=ƒZƒbƒgƒAƒbƒv‚ÉŽg—p‚·‚錾Œê‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B
-SelectLanguageLabel=ƒCƒ“ƒXƒg[ƒ‹’†‚É—˜—p‚·‚錾Œê‚ðï‚Ñ‚Ü‚·:
-
-; *** Common wizard text
-ClickNext=‘±s‚·‚é‚É‚ÍuŽŸ‚ÖvAƒZƒbƒgƒAƒbƒv‚ðI—¹‚·‚é‚É‚ÍuƒLƒƒƒ“ƒZƒ‹v‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
-BeveledLabel=
-BrowseDialogTitle=ƒtƒHƒ‹ƒ_ŽQÆ
-BrowseDialogLabel=ƒŠƒXƒg‚©‚çƒtƒHƒ‹ƒ_‚ð‘I‚ÑOK‚ð‰Ÿ‚µ‚Ä‚‚¾‚³‚¢B
-NewFolderName=V‚µ‚¢ƒtƒHƒ‹ƒ_
-
-; *** "Welcome" wizard page
-WelcomeLabel1=[name] ƒZƒbƒgƒAƒbƒvƒEƒBƒU[ƒh‚ÌŠJŽn
-WelcomeLabel2=‚±‚̃vƒƒOƒ‰ƒ€‚Í‚²Žg—p‚̃Rƒ“ƒsƒ…[ƒ^‚Ö [name/ver] ‚ðƒCƒ“ƒXƒg[ƒ‹‚µ‚Ü‚·B%n%n‘±s‚·‚é‘O‚É‘¼‚̃AƒvƒŠƒP[ƒVƒ‡ƒ“‚ð‚·‚×‚ÄI—¹‚µ‚Ä‚‚¾‚³‚¢B
-
-; *** "Password" wizard page
-WizardPassword=ƒpƒXƒ[ƒh
-PasswordLabel1=‚±‚̃Cƒ“ƒXƒg[ƒ‹ƒvƒƒOƒ‰ƒ€‚̓pƒXƒ[ƒh‚É‚æ‚Á‚ĕی삳‚ê‚Ä‚¢‚Ü‚·B
-PasswordLabel3=ƒpƒXƒ[ƒh‚ð“ü—Í‚µ‚ÄuŽŸ‚Öv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢BƒpƒXƒ[ƒh‚͑啶Žš‚Ƭ•¶Žš‚ª‹æ•Ê‚³‚ê‚Ü‚·B
-PasswordEditLabel=ƒpƒXƒ[ƒh(&P):
-IncorrectPassword=“ü—Í‚³‚ꂽƒpƒXƒ[ƒh‚ª³‚µ‚‚ ‚è‚Ü‚¹‚ñB‚à‚¤ˆê“x“ü—Í‚µ‚È‚¨‚µ‚Ä‚‚¾‚³‚¢B
-
-; *** "License Agreement" wizard page
-WizardLicense=Žg—p‹–‘øŒ_–ñ‘‚Ì“¯ˆÓ
-LicenseLabel=‘±s‚·‚é‘O‚Ɉȉº‚Ìd—v‚Èî•ñ‚ð‚¨“Ç‚Ý‚‚¾‚³‚¢B
-LicenseLabel3=ˆÈ‰º‚ÌŽg—p‹–‘øŒ_–ñ‘‚ð‚¨“Ç‚Ý‚‚¾‚³‚¢BƒCƒ“ƒXƒg[ƒ‹‚ð‘±s‚·‚é‚É‚Í‚±‚ÌŒ_–ñ‘‚É“¯ˆÓ‚·‚é•K—v‚ª‚ ‚è‚Ü‚·B
-LicenseAccepted=“¯ˆÓ‚·‚é(&A)
-LicenseNotAccepted=“¯ˆÓ‚µ‚È‚¢(&D)
-
-; *** "Information" wizard pages
-WizardInfoBefore=î•ñ
-InfoBeforeLabel=‘±s‚·‚é‘O‚Ɉȉº‚Ìd—v‚Èî•ñ‚ð‚¨“Ç‚Ý‚‚¾‚³‚¢B
-InfoBeforeClickLabel=ƒZƒbƒgƒAƒbƒv‚ð‘±s‚·‚é‚É‚ÍuŽŸ‚Öv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
-WizardInfoAfter=î•ñ
-InfoAfterLabel=‘±s‚·‚é‘O‚Ɉȉº‚Ìd—v‚Èî•ñ‚ð‚¨“Ç‚Ý‚‚¾‚³‚¢B
-InfoAfterClickLabel=ƒZƒbƒgƒAƒbƒv‚ð‘±s‚·‚é‚É‚ÍuŽŸ‚Öv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
-
-; *** "User Information" wizard page
-WizardUserInfo=ƒ†[ƒU[î•ñ
-UserInfoDesc=ƒ†[ƒU[î•ñ‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B
-UserInfoName=ƒ†[ƒU[–¼(&U):
-UserInfoOrg=‘gD(&O):
-UserInfoSerial=ƒVƒŠƒAƒ‹”Ô†(&S):
-UserInfoNameRequired=ƒ†[ƒU[–¼‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B
-
-; *** "Select Destination Location" wizard page
-WizardSelectDir=ƒCƒ“ƒXƒg[ƒ‹æ‚ÌŽw’è
-SelectDirDesc=[name] ‚̃Cƒ“ƒXƒg[ƒ‹æ‚ðŽw’肵‚Ä‚‚¾‚³‚¢B
-SelectDirLabel3=[name] ‚ðƒCƒ“ƒXƒg[ƒ‹‚·‚éƒtƒHƒ‹ƒ_‚ðŽw’肵‚ÄAuŽŸ‚Öv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
-SelectDirBrowseLabel=‘±‚¯‚é‚É‚ÍuŽŸ‚Öv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B•Ê‚̃tƒHƒ‹ƒ_‚ð‘I‘ð‚·‚é‚É‚ÍuŽQÆv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
-DiskSpaceMBLabel=‚±‚̃vƒƒOƒ‰ƒ€‚ÍÅ’á [mb] MB‚̃fƒBƒXƒN‹ó‚«—̈æ‚ð•K—v‚Æ‚µ‚Ü‚·B
-ToUNCPathname=ƒZƒbƒgƒAƒbƒv‚ÍUNCƒtƒHƒ‹ƒ_‚ɃCƒ“ƒXƒg[ƒ‹‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñBƒlƒbƒgƒ[ƒN‚ɃCƒ“ƒXƒg[ƒ‹‚·‚éꇂ̓lƒbƒgƒ[ƒNƒhƒ‰ƒCƒu‚ÉŠ„‚è“–‚Ä‚Ä‚‚¾‚³‚¢B
-InvalidPath=ƒhƒ‰ƒCƒu•¶Žš‚ðŠÜ‚ÞŠ®‘S‚ȃpƒX‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B%n%n—áFC:\APP%n%n‚Ü‚½‚ÍUNCŒ`Ž®‚̃pƒX‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B%n%n—áF\\server\share
-InvalidDrive=Žw’肵‚½ƒhƒ‰ƒCƒu‚Ü‚½‚ÍUNCƒpƒX‚ªŒ©‚‚©‚ç‚È‚¢‚©ƒAƒNƒZƒX‚Å‚«‚Ü‚¹‚ñB•Ê‚̃pƒX‚ðŽw’肵‚Ä‚‚¾‚³‚¢B
-DiskSpaceWarningTitle=ƒfƒBƒXƒN‹ó‚«—̈æ‚Ì•s‘«
-DiskSpaceWarning=ƒCƒ“ƒXƒg[ƒ‹‚É‚ÍÅ’á %1 KB‚̃fƒBƒXƒN‹ó‚«—̈悪•K—v‚Å‚·‚ªAŽw’肳‚ꂽƒhƒ‰ƒCƒu‚É‚Í %2 KB‚̋󂫗̈悵‚©‚ ‚è‚Ü‚¹‚ñB%n%n‚±‚Ì‚Ü‚Ü‘±s‚µ‚Ü‚·‚©H
-DirNameTooLong=ƒhƒ‰ƒCƒu–¼–”‚̓pƒX‚ª’·‰ß‚¬‚Ü‚·B
-InvalidDirName=ƒtƒHƒ‹ƒ_–¼‚ª–³Œø‚Å‚·B
-BadDirName32=ˆÈ‰º‚Ì•¶Žš‚ðŠÜ‚ÞƒtƒHƒ‹ƒ_–¼‚ÍŽw’è‚Å‚«‚Ü‚¹‚ñB:%n%n%1
-DirExistsTitle=Šù‘¶‚̃tƒHƒ‹ƒ_
-DirExists=ƒtƒHƒ‹ƒ_ %n%n%1%n%n‚ªŠù‚É‘¶Ý‚µ‚Ü‚·B‚±‚Ì‚Ü‚Ü‚±‚̃tƒHƒ‹ƒ_‚ÖƒCƒ“ƒXƒg[ƒ‹‚µ‚Ü‚·‚©H
-DirDoesntExistTitle=ƒtƒHƒ‹ƒ_‚ªŒ©‚‚©‚è‚Ü‚¹‚ñB
-DirDoesntExist=ƒtƒHƒ‹ƒ_ %n%n%1%n%n‚ªŒ©‚‚©‚è‚Ü‚¹‚ñBV‚µ‚¢ƒtƒHƒ‹ƒ_‚ð쬂µ‚Ü‚·‚©H
-
-; *** "Select Components" wizard page
-WizardSelectComponents=ƒRƒ“ƒ|[ƒlƒ“ƒg‚Ì‘I‘ð
-SelectComponentsDesc=ƒCƒ“ƒXƒg[ƒ‹ƒRƒ“ƒ|[ƒlƒ“ƒg‚ð‘I‘ð‚µ‚Ä‚‚¾‚³‚¢B
-SelectComponentsLabel2=ƒCƒ“ƒXƒg[ƒ‹‚·‚éƒRƒ“ƒ|[ƒlƒ“ƒg‚ð‘I‘ð‚µ‚Ä‚‚¾‚³‚¢BƒCƒ“ƒXƒg[ƒ‹‚·‚é•K—v‚Ì‚È‚¢ƒRƒ“ƒ|[ƒlƒ“ƒg‚̓`ƒFƒbƒN‚ðŠO‚µ‚Ä‚‚¾‚³‚¢B‘±s‚·‚é‚É‚ÍuŽŸ‚Öv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
-FullInstallation=ƒtƒ‹ƒCƒ“ƒXƒg[ƒ‹
-; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
-CompactInstallation=ƒRƒ“ƒpƒNƒgƒCƒ“ƒXƒg[ƒ‹
-CustomInstallation=ƒJƒXƒ^ƒ€ƒCƒ“ƒXƒg[ƒ‹
-NoUninstallWarningTitle=Šù‘¶‚̃Rƒ“ƒ|[ƒlƒ“ƒg
-NoUninstallWarning=ƒZƒbƒgƒAƒbƒv‚͈ȉº‚̃Rƒ“ƒ|[ƒlƒ“ƒg‚ªŠù‚ɃCƒ“ƒXƒg[ƒ‹‚³‚ê‚Ä‚¢‚邱‚Æ‚ðŒŸo‚µ‚Ü‚µ‚½B%n%n%1%n%n‚±‚ê‚ç‚̃Rƒ“ƒ|[ƒlƒ“ƒg‚Ì‘I‘ð‚ð‰ðœ‚µ‚Ä‚àƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚Í‚³‚ê‚Ü‚¹‚ñB%n%n‚±‚Ì‚Ü‚Ü‘±s‚µ‚Ü‚·‚©H
-ComponentSize1=%1 KB
-ComponentSize2=%1 MB
-ComponentsDiskSpaceMBLabel=Œ»Ý‚Ì‘I‘ð‚ÍÅ’á [mb] MB‚̃fƒBƒXƒN‹ó‚«—̈æ‚ð•K—v‚Æ‚µ‚Ü‚·B
-
-; *** "Select Additional Tasks" wizard page
-WizardSelectTasks=’ljÁƒ^ƒXƒN‚Ì‘I‘ð
-SelectTasksDesc=ŽÀs‚·‚é’ljÁƒ^ƒXƒN‚ð‘I‘ð‚µ‚Ä‚‚¾‚³‚¢B
-SelectTasksLabel2=[name] ƒCƒ“ƒXƒg[ƒ‹Žž‚ÉŽÀs‚·‚é’ljÁƒ^ƒXƒN‚ð‘I‘ð‚µ‚ÄAuŽŸ‚Öv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
-
-; *** "Select Start Menu Folder" wizard page
-WizardSelectProgramGroup=ƒvƒƒOƒ‰ƒ€ƒOƒ‹[ƒv‚ÌŽw’è
-SelectStartMenuFolderDesc=ƒvƒƒOƒ‰ƒ€ƒAƒCƒRƒ“‚ð쬂·‚éꊂðŽw’肵‚Ä‚‚¾‚³‚¢B
-SelectStartMenuFolderLabel3=ƒZƒbƒgƒAƒbƒv‚̓Xƒ^[ƒgƒƒjƒ…[‚ɃvƒƒOƒ‰ƒ€‚̃Vƒ‡[ƒgƒJƒbƒg‚ð쬂µ‚Ü‚·B
-SelectStartMenuFolderBrowseLabel=‘±‚¯‚é‚É‚ÍuŽŸ‚Öv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢Bˆá‚¤ƒfƒBƒŒƒNƒgƒŠ‚ð‘I‘ð‚·‚é‚É‚ÍuŽQÆv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
-MustEnterGroupName=ƒOƒ‹[ƒv–¼‚ðŽw’肵‚Ä‚‚¾‚³‚¢B
-GroupNameTooLong=ƒtƒHƒ‹ƒ_–¼–”‚̓pƒX‚ª’·‰ß‚¬‚Ü‚·B
-InvalidGroupName=ƒOƒ‹[ƒv–¼‚ª–³Œø‚Å‚·B
-BadGroupName=ˆÈ‰º‚Ì•¶Žš‚ðŠÜ‚ÞƒOƒ‹[ƒv–¼‚ÍŽw’è‚Å‚«‚Ü‚¹‚ñB:%n%n%1
-NoProgramGroupCheck2=ƒvƒƒOƒ‰ƒ€ƒOƒ‹[ƒv‚ð쬂µ‚È‚¢(&D)
-
-; *** "Ready to Install" wizard page
-WizardReady=ƒCƒ“ƒXƒg[ƒ‹€”õŠ®—¹
-ReadyLabel1=‚²Žg—p‚̃Rƒ“ƒsƒ…[ƒ^‚Ö [name] ‚ðƒCƒ“ƒXƒg[ƒ‹‚·‚途õ‚ª‚Å‚«‚Ü‚µ‚½B
-ReadyLabel2a=ƒCƒ“ƒXƒg[ƒ‹‚ð‘±s‚·‚é‚É‚ÍuƒCƒ“ƒXƒg[ƒ‹v‚ðAÝ’è‚ÌŠm”F‚â•ÏX‚ðs‚¤‚É‚Íu–ß‚év‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
-ReadyLabel2b=ƒCƒ“ƒXƒg[ƒ‹‚ð‘±s‚·‚é‚É‚ÍuƒCƒ“ƒXƒg[ƒ‹v‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
-ReadyMemoUserInfo=ƒ†[ƒU[î•ñ:
-ReadyMemoDir=ƒCƒ“ƒXƒg[ƒ‹æ:
-ReadyMemoType=ƒZƒbƒgƒAƒbƒv‚ÌŽí—Þ:
-ReadyMemoComponents=‘I‘ðƒRƒ“ƒ|[ƒlƒ“ƒg:
-ReadyMemoGroup=ƒvƒƒOƒ‰ƒ€ƒOƒ‹[ƒv:
-ReadyMemoTasks=’ljÁƒ^ƒXƒNˆê——:
-
-; *** "Preparing to Install" wizard page
-WizardPreparing=ƒCƒ“ƒXƒg[ƒ‹€”õ’†
-PreparingDesc=‚²Žg—p‚̃Rƒ“ƒsƒ…[ƒ^‚Ö [name] ‚ðƒCƒ“ƒXƒg[ƒ‹‚·‚途õ‚ð‚µ‚Ä‚¢‚Ü‚·B
-PreviousInstallNotCompleted=‘O‰ñs‚Á‚½ƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚̃Cƒ“ƒXƒg[ƒ‹‚Ü‚½‚Í휂ªŠ®—¹‚µ‚Ä‚¢‚Ü‚¹‚ñBŠ®—¹‚·‚é‚ɂ̓Rƒ“ƒsƒ…[ƒ^‚ðÄ‹N“®‚·‚é•K—v‚ª‚ ‚è‚Ü‚·B%n%n[name] ‚̃Cƒ“ƒXƒg[ƒ‹‚ðŠ®—¹‚·‚邽‚ß‚É‚ÍAÄ‹N“®Œã‚É‚à‚¤ˆê“xƒZƒbƒgƒAƒbƒv‚ðŽÀs‚µ‚Ä‚‚¾‚³‚¢B
-CannotContinue=ƒZƒbƒgƒAƒbƒv‚ð‘±s‚Å‚«‚Ü‚¹‚ñBuƒLƒƒƒ“ƒZƒ‹v‚ðƒNƒŠƒbƒN‚µ‚ăZƒbƒgƒAƒbƒv‚ðI—¹‚µ‚Ä‚‚¾‚³‚¢B
-
-; *** "Installing" wizard page
-WizardInstalling=ƒCƒ“ƒXƒg[ƒ‹ó‹µ
-InstallingLabel=‚²Žg—p‚̃Rƒ“ƒsƒ…[ƒ^‚É [name] ‚ðƒCƒ“ƒXƒg[ƒ‹‚µ‚Ä‚¢‚Ü‚·B‚µ‚΂炂¨‘Ò‚¿‚‚¾‚³‚¢B
-
-; *** "Setup Completed" wizard page
-FinishedHeadingLabel=[name] ƒZƒbƒgƒAƒbƒvƒEƒBƒU[ƒh‚ÌŠ®—¹
-FinishedLabelNoIcons=‚²Žg—p‚̃Rƒ“ƒsƒ…[ƒ^‚É [name] ‚ªƒZƒbƒgƒAƒbƒv‚³‚ê‚Ü‚µ‚½B
-FinishedLabel=‚²Žg—p‚̃Rƒ“ƒsƒ…[ƒ^‚É [name] ‚ªƒZƒbƒgƒAƒbƒv‚³‚ê‚Ü‚µ‚½BƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚ðŽÀs‚·‚é‚ɂ̓Cƒ“ƒXƒg[ƒ‹‚³‚ꂽƒAƒCƒRƒ“‚ð‘I‘ð‚µ‚Ä‚‚¾‚³‚¢B
-ClickFinish=ƒZƒbƒgƒAƒbƒv‚ðI—¹‚·‚é‚É‚ÍuŠ®—¹v‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
-FinishedRestartLabel=[name] ‚̃Cƒ“ƒXƒg[ƒ‹‚ðŠ®—¹‚·‚邽‚ß‚É‚ÍAƒRƒ“ƒsƒ…[ƒ^‚ðÄ‹N“®‚·‚é•K—v‚ª‚ ‚è‚Ü‚·B‚·‚®‚ÉÄ‹N“®‚µ‚Ü‚·‚©H
-FinishedRestartMessage=[name] ‚̃Cƒ“ƒXƒg[ƒ‹‚ðŠ®—¹‚·‚邽‚ß‚É‚ÍAƒRƒ“ƒsƒ…[ƒ^‚ðÄ‹N“®‚·‚é•K—v‚ª‚ ‚è‚Ü‚·B%n%n‚·‚®‚ÉÄ‹N“®‚µ‚Ü‚·‚©H
-ShowReadmeCheck=READMEƒtƒ@ƒCƒ‹‚ð•\Ž¦‚·‚éB
-YesRadio=‚·‚®Ä‹N“®(&Y)
-NoRadio=Œã‚ÅŽè“®‚ÅÄ‹N“®(&N)
-; used for example as 'Run MyProg.exe'
-RunEntryExec=%1 ‚ÌŽÀs
-; used for example as 'View Readme.txt'
-RunEntryShellExec=%1 ‚Ì•\Ž¦
-
-; *** "Setup Needs the Next Disk" stuff
-ChangeDiskTitle=ƒfƒBƒXƒN‚Ì‘}“ü
-SelectDiskLabel2=ƒfƒBƒXƒN %1 ‚ð‘}“ü‚µAuOKv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B%n%n‚±‚̃fƒBƒXƒN‚̃tƒ@ƒCƒ‹‚ª‰º‚É•\Ž¦‚³‚ê‚Ä‚¢‚éƒtƒHƒ‹ƒ_ˆÈŠO‚Ìꊂɂ ‚éꇂÍA³‚µ‚¢ƒpƒX‚ð“ü—Í‚·‚é‚©uŽQÆvƒ{ƒ^ƒ“‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
-PathLabel=ƒpƒX(&P):
-FileNotInDir2=ƒtƒ@ƒCƒ‹ %1 ‚ª %2 ‚ÉŒ©‚‚©‚è‚Ü‚¹‚ñB³‚µ‚¢ƒfƒBƒXƒN‚ð‘}“ü‚·‚é‚©A•Ê‚̃tƒHƒ‹ƒ_‚ðŽw’肵‚Ä‚‚¾‚³‚¢B
-SelectDirectoryLabel=ŽŸ‚̃fƒBƒXƒN‚Ì‚ ‚éꊂðŽw’肵‚Ä‚‚¾‚³‚¢B
-
-; *** Installation phase messages
-SetupAborted=ƒZƒbƒgƒAƒbƒv‚ÍŠ®—¹‚µ‚Ä‚¢‚Ü‚¹‚ñB%n%n–â‘è‚ð‰ðŒˆ‚µ‚Ä‚©‚çA‚à‚¤ˆê“xƒZƒbƒgƒAƒbƒv‚ðŽÀs‚µ‚Ä‚‚¾‚³‚¢B
-EntryAbortRetryIgnore=‚à‚¤ˆê“x‚â‚è‚È‚¨‚·‚É‚ÍuÄŽŽsvAƒGƒ‰[‚𖳎‹‚µ‚Ä‘±s‚·‚é‚É‚Íu–³Ž‹vAƒCƒ“ƒXƒg[ƒ‹‚𒆎~‚·‚é‚É‚Íu’†Ž~v‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
-
-; *** Installation status messages
-StatusCreateDirs=ƒtƒHƒ‹ƒ_‚ð쬂µ‚Ä‚¢‚Ü‚·...
-StatusExtractFiles=ƒtƒ@ƒCƒ‹‚ð“WŠJ‚µ‚Ä‚¢‚Ü‚·...
-StatusCreateIcons=ƒVƒ‡|ƒgƒJƒbƒg‚ð쬂µ‚Ä‚¢‚Ü‚·...
-StatusCreateIniEntries=INIƒtƒ@ƒCƒ‹‚ðݒ肵‚Ä‚¢‚Ü‚·...
-StatusCreateRegistryEntries=ƒŒƒWƒXƒgƒŠ‚ðݒ肵‚Ä‚¢‚Ü‚·...
-StatusRegisterFiles=ƒtƒ@ƒCƒ‹‚ð“o˜^‚µ‚Ä‚¢‚Ü‚·...
-StatusSavingUninstall=ƒAƒ“ƒCƒ“ƒXƒg[ƒ‹î•ñ‚ð•Û‘¶‚µ‚Ä‚¢‚Ü‚·...
-StatusRunProgram=ƒCƒ“ƒXƒg[ƒ‹‚ðŠ®—¹‚µ‚Ä‚¢‚Ü‚·...
-StatusRollback=•ÏX‚ðŒ³‚É–ß‚µ‚Ä‚¢‚Ü‚·...
-
-; *** Misc. errors
-ErrorInternal2=“à•”ƒGƒ‰[: %1
-ErrorFunctionFailedNoCode=%1 ƒGƒ‰[
-ErrorFunctionFailed=%1 ƒGƒ‰[: ƒR[ƒh %2
-ErrorFunctionFailedWithMessage=%1 ƒGƒ‰[: ƒR[ƒh %2.%n%3
-ErrorExecutingProgram=ƒtƒ@ƒCƒ‹ŽÀsƒGƒ‰[:%n%1
-
-; *** Registry errors
-ErrorRegOpenKey=ƒŒƒWƒXƒgƒŠƒL[ƒI[ƒvƒ“ƒGƒ‰[:%n%1\%2
-ErrorRegCreateKey=ƒŒƒWƒXƒgƒŠƒL[쬃Gƒ‰[:%n%1\%2
-ErrorRegWriteKey=ƒŒƒWƒXƒgƒŠƒL[‘‚«ž‚݃Gƒ‰[:%n%1\%2
-
-; *** INI errors
-ErrorIniEntry=INIƒtƒ@ƒCƒ‹ƒGƒ“ƒgƒŠì¬ƒGƒ‰[: ƒtƒ@ƒCƒ‹ %1
-
-; *** File copying errors
-FileAbortRetryIgnore=‚à‚¤ˆê“x‚â‚è‚È‚¨‚·‚É‚ÍuÄŽŽsvA‚±‚̃tƒ@ƒCƒ‹‚ðƒXƒLƒbƒv‚µ‚Ä‘±s‚·‚é‚É‚Íu–³Ž‹vi„§‚³‚ê‚Ü‚¹‚ñjAƒCƒ“ƒXƒg[ƒ‹‚𒆎~‚·‚é‚É‚Íu’†Ž~v‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
-FileAbortRetryIgnore2=‚à‚¤ˆê“x‚â‚è‚È‚¨‚·‚É‚ÍuÄŽŽsvA‚±‚̃tƒ@ƒCƒ‹‚ðƒXƒLƒbƒv‚µ‚Ä‘±s‚·‚é‚É‚Íu–³Ž‹vi„§‚³‚ê‚Ü‚¹‚ñjAƒCƒ“ƒXƒg[ƒ‹‚𒆎~‚·‚é‚É‚Íu’†Ž~v‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
-SourceIsCorrupted=ƒRƒs[Œ³‚̃tƒ@ƒCƒ‹‚ª‰ó‚ê‚Ä‚¢‚Ü‚·B
-SourceDoesntExist=ƒRƒs[Œ³‚̃tƒ@ƒCƒ‹ %1 ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñB
-ExistingFileReadOnly=Šù‘¶‚̃tƒ@ƒCƒ‹‚Í“Ç‚ÝŽæ‚èê—p‚Å‚·B%n%n“Ç‚ÝŽæ‚èê—p‘®«‚ð‰ðœ‚µ‚Ä‚à‚¤ˆê“x‚â‚è‚È‚¨‚·‚É‚ÍuÄŽŽsvA‚±‚̃tƒ@ƒCƒ‹‚ðƒXƒLƒbƒv‚µ‚Ä‘±s‚·‚é‚É‚Íu–³Ž‹vAƒCƒ“ƒXƒg[ƒ‹‚𒆎~‚·‚é‚É‚Íu’†Ž~v‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
-ErrorReadingExistingDest=Šù‘¶‚̃tƒ@ƒCƒ‹‚ð“Ç‚Ýž‚Ý’†‚ɃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B:
-FileExists=ƒtƒ@ƒCƒ‹‚ÍŠù‚É‘¶Ý‚µ‚Ü‚·B%n%nã‘‚«‚µ‚Ü‚·‚©H
-ExistingFileNewer=ƒCƒ“ƒXƒg[ƒ‹‚µ‚悤‚Æ‚µ‚Ä‚¢‚éƒtƒ@ƒCƒ‹‚æ‚è‚àV‚µ‚¢ƒtƒ@ƒCƒ‹‚ª‘¶Ý‚µ‚Ü‚·BŠù‘¶‚̃tƒ@ƒCƒ‹‚ðŽc‚·‚±‚Æ‚ð‚¨§‚ß‚µ‚Ü‚·B%n%nŠù‘¶‚̃tƒ@ƒCƒ‹‚ðŽc‚µ‚Ü‚·‚©B
-ErrorChangingAttr=Šù‘¶ƒtƒ@ƒCƒ‹‚Ì‘®«‚ð•ÏX’†‚ɃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B:
-ErrorCreatingTemp=ƒRƒs[æ‚̃tƒHƒ‹ƒ_‚Ƀtƒ@ƒCƒ‹‚ð쬒†‚ɃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B:
-ErrorReadingSource=ƒRƒs[Œ³‚̃tƒ@ƒCƒ‹‚ð“Ç‚Ýž‚Ý’†‚ɃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B:
-ErrorCopying=ƒtƒ@ƒCƒ‹‚ðƒRƒs[’†‚ɃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B:
-ErrorReplacingExistingFile=Šù‘¶ƒtƒ@ƒCƒ‹‚ð’u‚«Š·‚¦’†‚ɃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B:
-ErrorRestartReplace=’u‚«Š·‚¦ÄŠJ’†‚ɃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B:
-ErrorRenamingTemp=ƒRƒs[æƒtƒHƒ‹ƒ_‚̃tƒ@ƒCƒ‹–¼‚ð•ÏX’†‚ɃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B:
-ErrorRegisterServer=DLL/OCX‚Ì“o˜^‚ÉŽ¸”s‚µ‚Ü‚µ‚½B: %1
-ErrorRegSvr32Failed=RegSvr32‚̓Gƒ‰[ƒR[ƒh %1 ‚É‚æ‚莸”s‚µ‚Ü‚µ‚½B
-ErrorRegisterTypeLib=ƒ^ƒCƒvƒ‰ƒCƒuƒ‰ƒŠ‚Ö‚Ì“o˜^‚ÉŽ¸”s‚µ‚Ü‚µ‚½B: %1
-
-; *** Post-installation errors
-ErrorOpeningReadme=READMEƒtƒ@ƒCƒ‹‚̃I[ƒvƒ“‚ÉŽ¸”s‚µ‚Ü‚µ‚½B
-ErrorRestartingComputer=ƒRƒ“ƒsƒ…[ƒ^‚ÌÄ‹N“®‚ÉŽ¸”s‚µ‚Ü‚µ‚½BŽè“®‚ÅÄ‹N“®‚µ‚Ä‚‚¾‚³‚¢B
-
-; *** Uninstaller messages
-UninstallNotFound=ƒtƒ@ƒCƒ‹ %1 ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñBƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚ðŽÀs‚Å‚«‚Ü‚¹‚ñB
-UninstallOpenError=ƒtƒ@ƒCƒ‹ %1 ‚ðŠJ‚¯‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñBƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚ðŽÀs‚Å‚«‚Ü‚¹‚ñB
-UninstallUnsupportedVer=ƒAƒ“ƒCƒ“ƒXƒg[ƒ‹ƒƒOƒtƒ@ƒCƒ‹ %1 ‚ÍA‚±‚̃o[ƒWƒ‡ƒ“‚̃Aƒ“ƒCƒ“ƒXƒg[ƒ‹ƒvƒƒOƒ‰ƒ€‚ª”FŽ¯‚Å‚«‚È‚¢Œ`Ž®‚Å‚·BƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚ðŽÀs‚Å‚«‚Ü‚¹‚ñB
-UninstallUnknownEntry=ƒAƒ“ƒCƒ“ƒXƒg[ƒ‹ƒƒO‚É•s–¾‚̃Gƒ“ƒgƒŠ %1 ‚ªŒ©‚‚©‚è‚Ü‚µ‚½B
-ConfirmUninstall=%1 ‚Æ‚»‚ÌŠÖ˜AƒRƒ“ƒ|[ƒlƒ“ƒg‚ð‚·‚×‚Ä휂µ‚Ü‚·B‚æ‚낵‚¢‚Å‚·‚©H
-UninstallOnlyOnWin64=‚±‚̃vƒƒOƒ‰ƒ€‚Í64-bit”ÅWindowsã‚ł̂݃Aƒ“ƒCƒ“ƒXƒg[ƒ‹‚Å‚«‰Â”\‚Å‚·B
-OnlyAdminCanUninstall=ƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚·‚邽‚ß‚É‚ÍŠÇ—ŽÒŒ ŒÀ‚ª•K—v‚Å‚·B
-UninstallStatusLabel=‚²Žg—p‚̃Rƒ“ƒsƒ…[ƒ^‚©‚ç %1 ‚ð휂µ‚Ä‚¢‚Ü‚·B‚µ‚΂炂¨‘Ò‚¿‚‚¾‚³‚¢B
-UninstalledAll=%1 ‚Í‚²Žg—p‚̃Rƒ“ƒsƒ…[ƒ^‚©‚ç³í‚É휂³‚ê‚Ü‚µ‚½B
-UninstalledMost=%1 ‚̃Aƒ“ƒCƒ“ƒXƒg[ƒ‹‚ªŠ®—¹‚µ‚Ü‚µ‚½B%n%n‚¢‚‚‚©‚Ì€–Ú‚ªíœ‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½BŽè“®‚Å휂µ‚Ä‚‚¾‚³‚¢B
-UninstalledAndNeedsRestart=%1 ‚Ìíœ‚ðŠ®—¹‚·‚邽‚ß‚É‚ÍAƒRƒ“ƒsƒ…[ƒ^‚ðÄ‹N“®‚·‚é•K—v‚ª‚ ‚è‚Ü‚·B‚·‚®‚ÉÄ‹N“®‚µ‚Ü‚·‚©H
-UninstallDataCorrupted=ƒtƒ@ƒCƒ‹ "%1" ‚ª‰ó‚ê‚Ä‚¢‚Ü‚·BƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚ðŽÀs‚Å‚«‚Ü‚¹‚ñB
-
-; *** Uninstallation phase messages
-ConfirmDeleteSharedFileTitle=‹¤—Lƒtƒ@ƒCƒ‹‚Ìíœ
-ConfirmDeleteSharedFile2=ƒVƒXƒeƒ€ã‚ÅAŽŸ‚Ì‹¤—Lƒtƒ@ƒCƒ‹‚͂ǂ̃vƒƒOƒ‰ƒ€‚Å‚àŽg—p‚³‚ê‚Ä‚¢‚Ü‚¹‚ñB‚±‚Ì‹¤—Lƒtƒ@ƒCƒ‹‚ð휂µ‚Ü‚·‚©H%n%n‘¼‚̃vƒƒOƒ‰ƒ€‚ª‚Ü‚¾‚±‚̃tƒ@ƒCƒ‹‚ðŽg—p‚·‚éê‡A휂·‚é‚ƃvƒƒOƒ‰ƒ€‚ª“®ì‚µ‚È‚‚È‚é‹°‚ꂪ‚ ‚è‚Ü‚·B‚ ‚Ü‚èŠmŽÀ‚Å‚È‚¢ê‡‚Íu‚¢‚¢‚¦v‚ð‘I‘ð‚µ‚Ä‚‚¾‚³‚¢BƒVƒXƒeƒ€‚Ƀtƒ@ƒCƒ‹‚ðŽc‚µ‚Ä‚à–â‘è‚ðˆø‚«‹N‚±‚·‚±‚Æ‚Í‚ ‚è‚Ü‚¹‚ñB
-SharedFileNameLabel=ƒtƒ@ƒCƒ‹–¼:
-SharedFileLocationLabel=êŠ:
-WizardUninstalling=ƒAƒ“ƒCƒ“ƒXƒg[ƒ‹ó‹µ
-StatusUninstalling=%1 ‚ðƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚µ‚Ä‚¢‚Ü‚·...
-
-; The custom messages below aren't used by Setup itself, but if you make
-; use of them in your scripts, you'll want to translate them.
-
-[CustomMessages]
-
-NameAndVersion=%1 ƒo[ƒWƒ‡ƒ“ %2
-AdditionalIcons=ƒAƒCƒRƒ“‚ð’ljÁ‚·‚é:
-CreateDesktopIcon=ƒfƒXƒNƒgƒbƒvã‚ɃAƒCƒRƒ“‚ð쬂·‚é(&d)
-CreateQuickLaunchIcon=&Quick Launch ƒAƒCƒRƒ“‚ð쬂·‚é
-ProgramOnTheWeb=%1 on the Web
-UninstallProgram=%1 ‚ðƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚·‚é
-LaunchProgram=%1 ‚ðŽÀs‚·‚é
-AssocFileExtension=%2 ƒtƒ@ƒCƒ‹Šg’£‚É %1‚ðŠÖ˜A•t‚¯‚Ü‚·B
-AssocingFileExtension=%2 ‚É %1‚ðŠÖ˜A•t‚¯‚Ü‚·B
+; *** Inno Setup version 5.1.11+ Japanese messages ***
+;
+; Translated by Ryou Minakami (ryou32jp at yahoo.co.jp)
+; Fixes and updates: Koichi Shirasuka (shirasuka at eugrid.co.jp)
+;
+; $jrsoftware: issrc/Files/Default.isl,v 1.66 2005/02/25 20:23:48 mlaan Exp $
+
+[LangOptions]
+LanguageName=Japanese
+LanguageID=$0411
+LanguageCodePage=932
+
+; If you don't need to support Windows 9x, commenting the following 4 lines gives better looking (banners not stretched).
+DialogFontName=‚l‚r ‚oƒSƒVƒbƒN
+DialogFontSize=9
+TitleFontName=‚l‚r ‚oƒSƒVƒbƒN
+TitleFontSize=29
+
+; Required for Win2K/older to display the welcome message with correct font.
+WelcomeFontName=‚l‚r ‚oƒSƒVƒbƒN
+WelcomeFontSize=12
+
+[Messages]
+
+; *** Application titles
+SetupAppTitle=ƒZƒbƒgƒAƒbƒv
+SetupWindowTitle=%1 ƒZƒbƒgƒAƒbƒv
+UninstallAppTitle=ƒAƒ“ƒCƒ“ƒXƒg[ƒ‹
+UninstallAppFullTitle=%1 ƒAƒ“ƒCƒ“ƒXƒg[ƒ‹
+
+; *** Misc. common
+InformationTitle=î•ñ
+ConfirmTitle=Šm”F
+ErrorTitle=ƒGƒ‰[
+
+; *** SetupLdr messages
+SetupLdrStartupMessage=%1 ‚ðƒCƒ“ƒXƒg[ƒ‹‚µ‚Ü‚·B‘±s‚µ‚Ü‚·‚©H
+LdrCannotCreateTemp=ˆêŽžƒtƒ@ƒCƒ‹‚ð쬂ł«‚Ü‚¹‚ñBƒZƒbƒgƒAƒbƒv‚𒆎~‚µ‚Ü‚·B
+LdrCannotExecTemp=ˆêŽžƒtƒHƒ‹ƒ_‚̃tƒ@ƒCƒ‹‚ðŽÀs‚Å‚«‚Ü‚¹‚ñBƒZƒbƒgƒAƒbƒv‚𒆎~‚µ‚Ü‚·B
+
+; *** Startup error messages
+LastErrorMessage=%1.%n%nƒGƒ‰[ %2: %3
+SetupFileMissing=ƒtƒ@ƒCƒ‹ %1 ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñB–â‘è‚ð‰ðŒˆ‚·‚é‚©V‚µ‚¢ƒZƒbƒgƒAƒbƒvƒvƒƒOƒ‰ƒ€‚ð“üŽè‚µ‚Ä‚‚¾‚³‚¢B
+SetupFileCorrupt=ƒZƒbƒgƒAƒbƒvƒtƒ@ƒCƒ‹‚ª‰ó‚ê‚Ä‚¢‚Ü‚·BV‚µ‚¢ƒZƒbƒgƒAƒbƒvƒvƒƒOƒ‰ƒ€‚ð“üŽè‚µ‚Ä‚‚¾‚³‚¢B
+SetupFileCorruptOrWrongVer=ƒZƒbƒgƒAƒbƒvƒtƒ@ƒCƒ‹‚ª‰ó‚ê‚Ä‚¢‚é‚©A‚±‚̃o[ƒWƒ‡ƒ“‚̃ZƒbƒgƒAƒbƒv‚ƌ݊·«‚ª‚ ‚è‚Ü‚¹‚ñB–â‘è‚ð‰ðŒˆ‚·‚é‚©V‚µ‚¢ƒZƒbƒgƒAƒbƒvƒvƒƒOƒ‰ƒ€‚ð“üŽè‚µ‚Ä‚‚¾‚³‚¢B
+NotOnThisPlatform=‚±‚̃vƒƒOƒ‰ƒ€‚Í %1 ‚Å‚Í“®ì‚µ‚Ü‚¹‚ñB
+OnlyOnThisPlatform=‚±‚̃vƒƒOƒ‰ƒ€‚ÌŽÀs‚É‚Í %1 ‚ª•K—v‚Å‚·B
+OnlyOnTheseArchitectures=‚±‚̃vƒƒOƒ‰ƒ€‚Í%n%n%1ƒvƒƒZƒbƒTŒü‚¯‚ÌWindows‚É‚µ‚©ƒCƒ“ƒXƒg[ƒ‹‚Å‚«‚Ü‚¹‚ñB
+MissingWOW64APIs=ŒäŽg—p’†‚Ì64-bit”ÅWindows‚É‚Í‚±‚̃vƒƒOƒ‰ƒ€‚ðƒCƒ“ƒXƒg[ƒ‹‚µA“®ì‚³‚¹‚éˆ×‚É•K—v‚È‹@”\‚ªŠÜ‚Ü‚ê‚Ä‚¢‚Ü‚¹‚ñB‚±‚Ì–â‘è‚ðC³‚·‚éˆ×‚ɂ̓T[ƒrƒXƒpƒbƒN%1‚ðƒCƒ“ƒXƒg[ƒ‹‚µ‚Ä‚‚¾‚³‚¢B
+WinVersionTooLowError=‚±‚̃vƒƒOƒ‰ƒ€‚ÌŽÀs‚É‚Í %1 %2 ˆÈ~‚ª•K—v‚Å‚·B
+WinVersionTooHighError=‚±‚̃vƒƒOƒ‰ƒ€‚Í %1 %2 ˆÈ~‚Å‚Í“®ì‚µ‚Ü‚¹‚ñB
+AdminPrivilegesRequired=‚±‚̃vƒƒOƒ‰ƒ€‚ðƒCƒ“ƒXƒg[ƒ‹‚·‚邽‚ß‚É‚ÍŠÇ—ŽÒ‚Æ‚µ‚ăƒOƒCƒ“‚·‚é•K—v‚ª‚ ‚è‚Ü‚·B
+PowerUserPrivilegesRequired=‚±‚̃vƒƒOƒ‰ƒ€‚ðƒCƒ“ƒXƒg[ƒ‹‚·‚邽‚ß‚É‚ÍŠÇ—ŽÒ‚Ü‚½‚̓pƒ[ƒ†[ƒU[‚Æ‚µ‚ăƒOƒCƒ“‚·‚é•K—v‚ª‚ ‚è‚Ü‚·B
+SetupAppRunningError=ƒZƒbƒgƒAƒbƒv‚ÍŽÀs’†‚Ì %1 ‚ðŒŸo‚µ‚Ü‚µ‚½B%n%nŠJ‚¢‚Ä‚¢‚éƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚ð‚·‚×‚Ä•Â‚¶‚Ä‚©‚çuOKv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢BuƒLƒƒƒ“ƒZƒ‹v‚ðƒNƒŠƒbƒN‚·‚é‚ÆAƒZƒbƒgƒAƒbƒv‚ðI—¹‚µ‚Ü‚·B
+UninstallAppRunningError=ƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚ÍŽÀs’†‚Ì %1 ‚ðŒŸo‚µ‚Ü‚µ‚½B%n%nŠJ‚¢‚Ä‚¢‚éƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚ð‚·‚×‚Ä•Â‚¶‚Ä‚©‚çuOKv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢BuƒLƒƒƒ“ƒZƒ‹v‚ðƒNƒŠƒbƒN‚·‚é‚ÆAƒZƒbƒgƒAƒbƒv‚ðI—¹‚µ‚Ü‚·B
+
+; *** Misc. errors
+ErrorCreatingDir=ƒfƒBƒŒƒNƒgƒŠ %1 ‚ð쬒†‚ɃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B
+ErrorTooManyFilesInDir=ƒfƒBƒŒƒNƒgƒŠ %1 ‚Ƀtƒ@ƒCƒ‹‚ð쬒†‚ɃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½Bƒtƒ@ƒCƒ‹‚Ì”‚ª‘½‚·‚¬‚Ü‚·B
+
+; *** Setup common messages
+ExitSetupTitle=ƒZƒbƒgƒAƒbƒvI—¹
+ExitSetupMessage=ƒZƒbƒgƒAƒbƒvì‹Æ‚ÍŠ®—¹‚µ‚Ä‚¢‚Ü‚¹‚ñB‚±‚±‚ŃZƒbƒgƒAƒbƒv‚𒆎~‚·‚é‚ƃvƒƒOƒ‰ƒ€‚̓Cƒ“ƒXƒg[ƒ‹‚³‚ê‚Ü‚¹‚ñB%n%n‰ü‚߂ăCƒ“ƒXƒg[ƒ‹‚·‚éꇂÍA‚à‚¤ˆê“xƒZƒbƒgƒAƒbƒv‚ðŽÀs‚µ‚Ä‚‚¾‚³‚¢B%n%nƒZƒbƒgƒAƒbƒv‚ðI—¹‚µ‚Ü‚·‚©H
+AboutSetupMenuItem=ƒZƒbƒgƒAƒbƒv‚ɂ‚¢‚Ä(&A)...
+AboutSetupTitle=ƒZƒbƒgƒAƒbƒv‚ɂ‚¢‚Ä
+AboutSetupMessage=%1 %2%n%3%n%n%1 ƒz[ƒ€ƒy[ƒW:%n%4
+AboutSetupNote=
+TranslatorNote=
+
+; *** Buttons
+ButtonBack=< –ß‚é(&B)
+ButtonNext=ŽŸ‚Ö(&N) >
+ButtonInstall=ƒCƒ“ƒXƒg[ƒ‹(&I)
+ButtonOK=OK
+ButtonCancel=ƒLƒƒƒ“ƒZƒ‹
+ButtonYes=‚Í‚¢(&Y)
+ButtonYesToAll=‚·‚ׂĂ͂¢(&A)
+ButtonNo=‚¢‚¢‚¦(&N)
+ButtonNoToAll=‚·‚ׂĂ¢‚¢‚¦(&O)
+ButtonFinish=Š®—¹(&F)
+ButtonBrowse=ŽQÆ(&B)...
+ButtonWizardBrowse=ŽQÆ(&r)
+ButtonNewFolder=V‚µ‚¢ƒtƒHƒ‹ƒ_(&M)
+
+; *** "Select Language" dialog messages
+SelectLanguageTitle=ƒZƒbƒgƒAƒbƒv‚ÉŽg—p‚·‚錾Œê‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B
+SelectLanguageLabel=ƒCƒ“ƒXƒg[ƒ‹’†‚É—˜—p‚·‚錾Œê‚ðï‚Ñ‚Ü‚·:
+
+; *** Common wizard text
+ClickNext=‘±s‚·‚é‚É‚ÍuŽŸ‚ÖvAƒZƒbƒgƒAƒbƒv‚ðI—¹‚·‚é‚É‚ÍuƒLƒƒƒ“ƒZƒ‹v‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
+BeveledLabel=
+BrowseDialogTitle=ƒtƒHƒ‹ƒ_ŽQÆ
+BrowseDialogLabel=ƒŠƒXƒg‚©‚çƒtƒHƒ‹ƒ_‚ð‘I‚ÑOK‚ð‰Ÿ‚µ‚Ä‚‚¾‚³‚¢B
+NewFolderName=V‚µ‚¢ƒtƒHƒ‹ƒ_
+
+; *** "Welcome" wizard page
+WelcomeLabel1=[name] ƒZƒbƒgƒAƒbƒvƒEƒBƒU[ƒh‚ÌŠJŽn
+WelcomeLabel2=‚±‚̃vƒƒOƒ‰ƒ€‚Í‚²Žg—p‚̃Rƒ“ƒsƒ…[ƒ^‚Ö [name/ver] ‚ðƒCƒ“ƒXƒg[ƒ‹‚µ‚Ü‚·B%n%n‘±s‚·‚é‘O‚É‘¼‚̃AƒvƒŠƒP[ƒVƒ‡ƒ“‚ð‚·‚×‚ÄI—¹‚µ‚Ä‚‚¾‚³‚¢B
+
+; *** "Password" wizard page
+WizardPassword=ƒpƒXƒ[ƒh
+PasswordLabel1=‚±‚̃Cƒ“ƒXƒg[ƒ‹ƒvƒƒOƒ‰ƒ€‚̓pƒXƒ[ƒh‚É‚æ‚Á‚ĕی삳‚ê‚Ä‚¢‚Ü‚·B
+PasswordLabel3=ƒpƒXƒ[ƒh‚ð“ü—Í‚µ‚ÄuŽŸ‚Öv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢BƒpƒXƒ[ƒh‚͑啶Žš‚Ƭ•¶Žš‚ª‹æ•Ê‚³‚ê‚Ü‚·B
+PasswordEditLabel=ƒpƒXƒ[ƒh(&P):
+IncorrectPassword=“ü—Í‚³‚ꂽƒpƒXƒ[ƒh‚ª³‚µ‚‚ ‚è‚Ü‚¹‚ñB‚à‚¤ˆê“x“ü—Í‚µ‚È‚¨‚µ‚Ä‚‚¾‚³‚¢B
+
+; *** "License Agreement" wizard page
+WizardLicense=Žg—p‹–‘øŒ_–ñ‘‚Ì“¯ˆÓ
+LicenseLabel=‘±s‚·‚é‘O‚Ɉȉº‚Ìd—v‚Èî•ñ‚ð‚¨“Ç‚Ý‚‚¾‚³‚¢B
+LicenseLabel3=ˆÈ‰º‚ÌŽg—p‹–‘øŒ_–ñ‘‚ð‚¨“Ç‚Ý‚‚¾‚³‚¢BƒCƒ“ƒXƒg[ƒ‹‚ð‘±s‚·‚é‚É‚Í‚±‚ÌŒ_–ñ‘‚É“¯ˆÓ‚·‚é•K—v‚ª‚ ‚è‚Ü‚·B
+LicenseAccepted=“¯ˆÓ‚·‚é(&A)
+LicenseNotAccepted=“¯ˆÓ‚µ‚È‚¢(&D)
+
+; *** "Information" wizard pages
+WizardInfoBefore=î•ñ
+InfoBeforeLabel=‘±s‚·‚é‘O‚Ɉȉº‚Ìd—v‚Èî•ñ‚ð‚¨“Ç‚Ý‚‚¾‚³‚¢B
+InfoBeforeClickLabel=ƒZƒbƒgƒAƒbƒv‚ð‘±s‚·‚é‚É‚ÍuŽŸ‚Öv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
+WizardInfoAfter=î•ñ
+InfoAfterLabel=‘±s‚·‚é‘O‚Ɉȉº‚Ìd—v‚Èî•ñ‚ð‚¨“Ç‚Ý‚‚¾‚³‚¢B
+InfoAfterClickLabel=ƒZƒbƒgƒAƒbƒv‚ð‘±s‚·‚é‚É‚ÍuŽŸ‚Öv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
+
+; *** "User Information" wizard page
+WizardUserInfo=ƒ†[ƒU[î•ñ
+UserInfoDesc=ƒ†[ƒU[î•ñ‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B
+UserInfoName=ƒ†[ƒU[–¼(&U):
+UserInfoOrg=‘gD(&O):
+UserInfoSerial=ƒVƒŠƒAƒ‹”Ô†(&S):
+UserInfoNameRequired=ƒ†[ƒU[–¼‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B
+
+; *** "Select Destination Location" wizard page
+WizardSelectDir=ƒCƒ“ƒXƒg[ƒ‹æ‚ÌŽw’è
+SelectDirDesc=[name] ‚̃Cƒ“ƒXƒg[ƒ‹æ‚ðŽw’肵‚Ä‚‚¾‚³‚¢B
+SelectDirLabel3=[name] ‚ðƒCƒ“ƒXƒg[ƒ‹‚·‚éƒtƒHƒ‹ƒ_‚ðŽw’肵‚ÄAuŽŸ‚Öv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
+SelectDirBrowseLabel=‘±‚¯‚é‚É‚ÍuŽŸ‚Öv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B•Ê‚̃tƒHƒ‹ƒ_‚ð‘I‘ð‚·‚é‚É‚ÍuŽQÆv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
+DiskSpaceMBLabel=‚±‚̃vƒƒOƒ‰ƒ€‚ÍÅ’á [mb] MB‚̃fƒBƒXƒN‹ó‚«—̈æ‚ð•K—v‚Æ‚µ‚Ü‚·B
+ToUNCPathname=ƒZƒbƒgƒAƒbƒv‚ÍUNCƒtƒHƒ‹ƒ_‚ɃCƒ“ƒXƒg[ƒ‹‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñBƒlƒbƒgƒ[ƒN‚ɃCƒ“ƒXƒg[ƒ‹‚·‚éꇂ̓lƒbƒgƒ[ƒNƒhƒ‰ƒCƒu‚ÉŠ„‚è“–‚Ä‚Ä‚‚¾‚³‚¢B
+InvalidPath=ƒhƒ‰ƒCƒu•¶Žš‚ðŠÜ‚ÞŠ®‘S‚ȃpƒX‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B%n%n—áFC:\APP%n%n‚Ü‚½‚ÍUNCŒ`Ž®‚̃pƒX‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B%n%n—áF\\server\share
+InvalidDrive=Žw’肵‚½ƒhƒ‰ƒCƒu‚Ü‚½‚ÍUNCƒpƒX‚ªŒ©‚‚©‚ç‚È‚¢‚©ƒAƒNƒZƒX‚Å‚«‚Ü‚¹‚ñB•Ê‚̃pƒX‚ðŽw’肵‚Ä‚‚¾‚³‚¢B
+DiskSpaceWarningTitle=ƒfƒBƒXƒN‹ó‚«—̈æ‚Ì•s‘«
+DiskSpaceWarning=ƒCƒ“ƒXƒg[ƒ‹‚É‚ÍÅ’á %1 KB‚̃fƒBƒXƒN‹ó‚«—̈悪•K—v‚Å‚·‚ªAŽw’肳‚ꂽƒhƒ‰ƒCƒu‚É‚Í %2 KB‚̋󂫗̈悵‚©‚ ‚è‚Ü‚¹‚ñB%n%n‚±‚Ì‚Ü‚Ü‘±s‚µ‚Ü‚·‚©H
+DirNameTooLong=ƒhƒ‰ƒCƒu–¼–”‚̓pƒX‚ª’·‰ß‚¬‚Ü‚·B
+InvalidDirName=ƒtƒHƒ‹ƒ_–¼‚ª–³Œø‚Å‚·B
+BadDirName32=ˆÈ‰º‚Ì•¶Žš‚ðŠÜ‚ÞƒtƒHƒ‹ƒ_–¼‚ÍŽw’è‚Å‚«‚Ü‚¹‚ñB:%n%n%1
+DirExistsTitle=Šù‘¶‚̃tƒHƒ‹ƒ_
+DirExists=ƒtƒHƒ‹ƒ_ %n%n%1%n%n‚ªŠù‚É‘¶Ý‚µ‚Ü‚·B‚±‚Ì‚Ü‚Ü‚±‚̃tƒHƒ‹ƒ_‚ÖƒCƒ“ƒXƒg[ƒ‹‚µ‚Ü‚·‚©H
+DirDoesntExistTitle=ƒtƒHƒ‹ƒ_‚ªŒ©‚‚©‚è‚Ü‚¹‚ñB
+DirDoesntExist=ƒtƒHƒ‹ƒ_ %n%n%1%n%n‚ªŒ©‚‚©‚è‚Ü‚¹‚ñBV‚µ‚¢ƒtƒHƒ‹ƒ_‚ð쬂µ‚Ü‚·‚©H
+
+; *** "Select Components" wizard page
+WizardSelectComponents=ƒRƒ“ƒ|[ƒlƒ“ƒg‚Ì‘I‘ð
+SelectComponentsDesc=ƒCƒ“ƒXƒg[ƒ‹ƒRƒ“ƒ|[ƒlƒ“ƒg‚ð‘I‘ð‚µ‚Ä‚‚¾‚³‚¢B
+SelectComponentsLabel2=ƒCƒ“ƒXƒg[ƒ‹‚·‚éƒRƒ“ƒ|[ƒlƒ“ƒg‚ð‘I‘ð‚µ‚Ä‚‚¾‚³‚¢BƒCƒ“ƒXƒg[ƒ‹‚·‚é•K—v‚Ì‚È‚¢ƒRƒ“ƒ|[ƒlƒ“ƒg‚̓`ƒFƒbƒN‚ðŠO‚µ‚Ä‚‚¾‚³‚¢B‘±s‚·‚é‚É‚ÍuŽŸ‚Öv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
+FullInstallation=ƒtƒ‹ƒCƒ“ƒXƒg[ƒ‹
+; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
+CompactInstallation=ƒRƒ“ƒpƒNƒgƒCƒ“ƒXƒg[ƒ‹
+CustomInstallation=ƒJƒXƒ^ƒ€ƒCƒ“ƒXƒg[ƒ‹
+NoUninstallWarningTitle=Šù‘¶‚̃Rƒ“ƒ|[ƒlƒ“ƒg
+NoUninstallWarning=ƒZƒbƒgƒAƒbƒv‚͈ȉº‚̃Rƒ“ƒ|[ƒlƒ“ƒg‚ªŠù‚ɃCƒ“ƒXƒg[ƒ‹‚³‚ê‚Ä‚¢‚邱‚Æ‚ðŒŸo‚µ‚Ü‚µ‚½B%n%n%1%n%n‚±‚ê‚ç‚̃Rƒ“ƒ|[ƒlƒ“ƒg‚Ì‘I‘ð‚ð‰ðœ‚µ‚Ä‚àƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚Í‚³‚ê‚Ü‚¹‚ñB%n%n‚±‚Ì‚Ü‚Ü‘±s‚µ‚Ü‚·‚©H
+ComponentSize1=%1 KB
+ComponentSize2=%1 MB
+ComponentsDiskSpaceMBLabel=Œ»Ý‚Ì‘I‘ð‚ÍÅ’á [mb] MB‚̃fƒBƒXƒN‹ó‚«—̈æ‚ð•K—v‚Æ‚µ‚Ü‚·B
+
+; *** "Select Additional Tasks" wizard page
+WizardSelectTasks=’ljÁƒ^ƒXƒN‚Ì‘I‘ð
+SelectTasksDesc=ŽÀs‚·‚é’ljÁƒ^ƒXƒN‚ð‘I‘ð‚µ‚Ä‚‚¾‚³‚¢B
+SelectTasksLabel2=[name] ƒCƒ“ƒXƒg[ƒ‹Žž‚ÉŽÀs‚·‚é’ljÁƒ^ƒXƒN‚ð‘I‘ð‚µ‚ÄAuŽŸ‚Öv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
+
+; *** "Select Start Menu Folder" wizard page
+WizardSelectProgramGroup=ƒvƒƒOƒ‰ƒ€ƒOƒ‹[ƒv‚ÌŽw’è
+SelectStartMenuFolderDesc=ƒvƒƒOƒ‰ƒ€ƒAƒCƒRƒ“‚ð쬂·‚éꊂðŽw’肵‚Ä‚‚¾‚³‚¢B
+SelectStartMenuFolderLabel3=ƒZƒbƒgƒAƒbƒv‚̓Xƒ^[ƒgƒƒjƒ…[‚ɃvƒƒOƒ‰ƒ€‚̃Vƒ‡[ƒgƒJƒbƒg‚ð쬂µ‚Ü‚·B
+SelectStartMenuFolderBrowseLabel=‘±‚¯‚é‚É‚ÍuŽŸ‚Öv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢Bˆá‚¤ƒfƒBƒŒƒNƒgƒŠ‚ð‘I‘ð‚·‚é‚É‚ÍuŽQÆv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
+MustEnterGroupName=ƒOƒ‹[ƒv–¼‚ðŽw’肵‚Ä‚‚¾‚³‚¢B
+GroupNameTooLong=ƒtƒHƒ‹ƒ_–¼–”‚̓pƒX‚ª’·‰ß‚¬‚Ü‚·B
+InvalidGroupName=ƒOƒ‹[ƒv–¼‚ª–³Œø‚Å‚·B
+BadGroupName=ˆÈ‰º‚Ì•¶Žš‚ðŠÜ‚ÞƒOƒ‹[ƒv–¼‚ÍŽw’è‚Å‚«‚Ü‚¹‚ñB:%n%n%1
+NoProgramGroupCheck2=ƒvƒƒOƒ‰ƒ€ƒOƒ‹[ƒv‚ð쬂µ‚È‚¢(&D)
+
+; *** "Ready to Install" wizard page
+WizardReady=ƒCƒ“ƒXƒg[ƒ‹€”õŠ®—¹
+ReadyLabel1=‚²Žg—p‚̃Rƒ“ƒsƒ…[ƒ^‚Ö [name] ‚ðƒCƒ“ƒXƒg[ƒ‹‚·‚途õ‚ª‚Å‚«‚Ü‚µ‚½B
+ReadyLabel2a=ƒCƒ“ƒXƒg[ƒ‹‚ð‘±s‚·‚é‚É‚ÍuƒCƒ“ƒXƒg[ƒ‹v‚ðAÝ’è‚ÌŠm”F‚â•ÏX‚ðs‚¤‚É‚Íu–ß‚év‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
+ReadyLabel2b=ƒCƒ“ƒXƒg[ƒ‹‚ð‘±s‚·‚é‚É‚ÍuƒCƒ“ƒXƒg[ƒ‹v‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
+ReadyMemoUserInfo=ƒ†[ƒU[î•ñ:
+ReadyMemoDir=ƒCƒ“ƒXƒg[ƒ‹æ:
+ReadyMemoType=ƒZƒbƒgƒAƒbƒv‚ÌŽí—Þ:
+ReadyMemoComponents=‘I‘ðƒRƒ“ƒ|[ƒlƒ“ƒg:
+ReadyMemoGroup=ƒvƒƒOƒ‰ƒ€ƒOƒ‹[ƒv:
+ReadyMemoTasks=’ljÁƒ^ƒXƒNˆê——:
+
+; *** "Preparing to Install" wizard page
+WizardPreparing=ƒCƒ“ƒXƒg[ƒ‹€”õ’†
+PreparingDesc=‚²Žg—p‚̃Rƒ“ƒsƒ…[ƒ^‚Ö [name] ‚ðƒCƒ“ƒXƒg[ƒ‹‚·‚途õ‚ð‚µ‚Ä‚¢‚Ü‚·B
+PreviousInstallNotCompleted=‘O‰ñs‚Á‚½ƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚̃Cƒ“ƒXƒg[ƒ‹‚Ü‚½‚Í휂ªŠ®—¹‚µ‚Ä‚¢‚Ü‚¹‚ñBŠ®—¹‚·‚é‚ɂ̓Rƒ“ƒsƒ…[ƒ^‚ðÄ‹N“®‚·‚é•K—v‚ª‚ ‚è‚Ü‚·B%n%n[name] ‚̃Cƒ“ƒXƒg[ƒ‹‚ðŠ®—¹‚·‚邽‚ß‚É‚ÍAÄ‹N“®Œã‚É‚à‚¤ˆê“xƒZƒbƒgƒAƒbƒv‚ðŽÀs‚µ‚Ä‚‚¾‚³‚¢B
+CannotContinue=ƒZƒbƒgƒAƒbƒv‚ð‘±s‚Å‚«‚Ü‚¹‚ñBuƒLƒƒƒ“ƒZƒ‹v‚ðƒNƒŠƒbƒN‚µ‚ăZƒbƒgƒAƒbƒv‚ðI—¹‚µ‚Ä‚‚¾‚³‚¢B
+
+; *** "Installing" wizard page
+WizardInstalling=ƒCƒ“ƒXƒg[ƒ‹ó‹µ
+InstallingLabel=‚²Žg—p‚̃Rƒ“ƒsƒ…[ƒ^‚É [name] ‚ðƒCƒ“ƒXƒg[ƒ‹‚µ‚Ä‚¢‚Ü‚·B‚µ‚΂炂¨‘Ò‚¿‚‚¾‚³‚¢B
+
+; *** "Setup Completed" wizard page
+FinishedHeadingLabel=[name] ƒZƒbƒgƒAƒbƒvƒEƒBƒU[ƒh‚ÌŠ®—¹
+FinishedLabelNoIcons=‚²Žg—p‚̃Rƒ“ƒsƒ…[ƒ^‚É [name] ‚ªƒZƒbƒgƒAƒbƒv‚³‚ê‚Ü‚µ‚½B
+FinishedLabel=‚²Žg—p‚̃Rƒ“ƒsƒ…[ƒ^‚É [name] ‚ªƒZƒbƒgƒAƒbƒv‚³‚ê‚Ü‚µ‚½BƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚ðŽÀs‚·‚é‚ɂ̓Cƒ“ƒXƒg[ƒ‹‚³‚ꂽƒAƒCƒRƒ“‚ð‘I‘ð‚µ‚Ä‚‚¾‚³‚¢B
+ClickFinish=ƒZƒbƒgƒAƒbƒv‚ðI—¹‚·‚é‚É‚ÍuŠ®—¹v‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
+FinishedRestartLabel=[name] ‚̃Cƒ“ƒXƒg[ƒ‹‚ðŠ®—¹‚·‚邽‚ß‚É‚ÍAƒRƒ“ƒsƒ…[ƒ^‚ðÄ‹N“®‚·‚é•K—v‚ª‚ ‚è‚Ü‚·B‚·‚®‚ÉÄ‹N“®‚µ‚Ü‚·‚©H
+FinishedRestartMessage=[name] ‚̃Cƒ“ƒXƒg[ƒ‹‚ðŠ®—¹‚·‚邽‚ß‚É‚ÍAƒRƒ“ƒsƒ…[ƒ^‚ðÄ‹N“®‚·‚é•K—v‚ª‚ ‚è‚Ü‚·B%n%n‚·‚®‚ÉÄ‹N“®‚µ‚Ü‚·‚©H
+ShowReadmeCheck=READMEƒtƒ@ƒCƒ‹‚ð•\Ž¦‚·‚éB
+YesRadio=‚·‚®Ä‹N“®(&Y)
+NoRadio=Œã‚ÅŽè“®‚ÅÄ‹N“®(&N)
+; used for example as 'Run MyProg.exe'
+RunEntryExec=%1 ‚ÌŽÀs
+; used for example as 'View Readme.txt'
+RunEntryShellExec=%1 ‚Ì•\Ž¦
+
+; *** "Setup Needs the Next Disk" stuff
+ChangeDiskTitle=ƒfƒBƒXƒN‚Ì‘}“ü
+SelectDiskLabel2=ƒfƒBƒXƒN %1 ‚ð‘}“ü‚µAuOKv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B%n%n‚±‚̃fƒBƒXƒN‚̃tƒ@ƒCƒ‹‚ª‰º‚É•\Ž¦‚³‚ê‚Ä‚¢‚éƒtƒHƒ‹ƒ_ˆÈŠO‚Ìꊂɂ ‚éꇂÍA³‚µ‚¢ƒpƒX‚ð“ü—Í‚·‚é‚©uŽQÆvƒ{ƒ^ƒ“‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
+PathLabel=ƒpƒX(&P):
+FileNotInDir2=ƒtƒ@ƒCƒ‹ %1 ‚ª %2 ‚ÉŒ©‚‚©‚è‚Ü‚¹‚ñB³‚µ‚¢ƒfƒBƒXƒN‚ð‘}“ü‚·‚é‚©A•Ê‚̃tƒHƒ‹ƒ_‚ðŽw’肵‚Ä‚‚¾‚³‚¢B
+SelectDirectoryLabel=ŽŸ‚̃fƒBƒXƒN‚Ì‚ ‚éꊂðŽw’肵‚Ä‚‚¾‚³‚¢B
+
+; *** Installation phase messages
+SetupAborted=ƒZƒbƒgƒAƒbƒv‚ÍŠ®—¹‚µ‚Ä‚¢‚Ü‚¹‚ñB%n%n–â‘è‚ð‰ðŒˆ‚µ‚Ä‚©‚çA‚à‚¤ˆê“xƒZƒbƒgƒAƒbƒv‚ðŽÀs‚µ‚Ä‚‚¾‚³‚¢B
+EntryAbortRetryIgnore=‚à‚¤ˆê“x‚â‚è‚È‚¨‚·‚É‚ÍuÄŽŽsvAƒGƒ‰[‚𖳎‹‚µ‚Ä‘±s‚·‚é‚É‚Íu–³Ž‹vAƒCƒ“ƒXƒg[ƒ‹‚𒆎~‚·‚é‚É‚Íu’†Ž~v‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
+
+; *** Installation status messages
+StatusCreateDirs=ƒtƒHƒ‹ƒ_‚ð쬂µ‚Ä‚¢‚Ü‚·...
+StatusExtractFiles=ƒtƒ@ƒCƒ‹‚ð“WŠJ‚µ‚Ä‚¢‚Ü‚·...
+StatusCreateIcons=ƒVƒ‡|ƒgƒJƒbƒg‚ð쬂µ‚Ä‚¢‚Ü‚·...
+StatusCreateIniEntries=INIƒtƒ@ƒCƒ‹‚ðݒ肵‚Ä‚¢‚Ü‚·...
+StatusCreateRegistryEntries=ƒŒƒWƒXƒgƒŠ‚ðݒ肵‚Ä‚¢‚Ü‚·...
+StatusRegisterFiles=ƒtƒ@ƒCƒ‹‚ð“o˜^‚µ‚Ä‚¢‚Ü‚·...
+StatusSavingUninstall=ƒAƒ“ƒCƒ“ƒXƒg[ƒ‹î•ñ‚ð•Û‘¶‚µ‚Ä‚¢‚Ü‚·...
+StatusRunProgram=ƒCƒ“ƒXƒg[ƒ‹‚ðŠ®—¹‚µ‚Ä‚¢‚Ü‚·...
+StatusRollback=•ÏX‚ðŒ³‚É–ß‚µ‚Ä‚¢‚Ü‚·...
+
+; *** Misc. errors
+ErrorInternal2=“à•”ƒGƒ‰[: %1
+ErrorFunctionFailedNoCode=%1 ƒGƒ‰[
+ErrorFunctionFailed=%1 ƒGƒ‰[: ƒR[ƒh %2
+ErrorFunctionFailedWithMessage=%1 ƒGƒ‰[: ƒR[ƒh %2.%n%3
+ErrorExecutingProgram=ƒtƒ@ƒCƒ‹ŽÀsƒGƒ‰[:%n%1
+
+; *** Registry errors
+ErrorRegOpenKey=ƒŒƒWƒXƒgƒŠƒL[ƒI[ƒvƒ“ƒGƒ‰[:%n%1\%2
+ErrorRegCreateKey=ƒŒƒWƒXƒgƒŠƒL[쬃Gƒ‰[:%n%1\%2
+ErrorRegWriteKey=ƒŒƒWƒXƒgƒŠƒL[‘‚«ž‚݃Gƒ‰[:%n%1\%2
+
+; *** INI errors
+ErrorIniEntry=INIƒtƒ@ƒCƒ‹ƒGƒ“ƒgƒŠì¬ƒGƒ‰[: ƒtƒ@ƒCƒ‹ %1
+
+; *** File copying errors
+FileAbortRetryIgnore=‚à‚¤ˆê“x‚â‚è‚È‚¨‚·‚É‚ÍuÄŽŽsvA‚±‚̃tƒ@ƒCƒ‹‚ðƒXƒLƒbƒv‚µ‚Ä‘±s‚·‚é‚É‚Íu–³Ž‹vi„§‚³‚ê‚Ü‚¹‚ñjAƒCƒ“ƒXƒg[ƒ‹‚𒆎~‚·‚é‚É‚Íu’†Ž~v‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
+FileAbortRetryIgnore2=‚à‚¤ˆê“x‚â‚è‚È‚¨‚·‚É‚ÍuÄŽŽsvA‚±‚̃tƒ@ƒCƒ‹‚ðƒXƒLƒbƒv‚µ‚Ä‘±s‚·‚é‚É‚Íu–³Ž‹vi„§‚³‚ê‚Ü‚¹‚ñjAƒCƒ“ƒXƒg[ƒ‹‚𒆎~‚·‚é‚É‚Íu’†Ž~v‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
+SourceIsCorrupted=ƒRƒs[Œ³‚̃tƒ@ƒCƒ‹‚ª‰ó‚ê‚Ä‚¢‚Ü‚·B
+SourceDoesntExist=ƒRƒs[Œ³‚̃tƒ@ƒCƒ‹ %1 ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñB
+ExistingFileReadOnly=Šù‘¶‚̃tƒ@ƒCƒ‹‚Í“Ç‚ÝŽæ‚èê—p‚Å‚·B%n%n“Ç‚ÝŽæ‚èê—p‘®«‚ð‰ðœ‚µ‚Ä‚à‚¤ˆê“x‚â‚è‚È‚¨‚·‚É‚ÍuÄŽŽsvA‚±‚̃tƒ@ƒCƒ‹‚ðƒXƒLƒbƒv‚µ‚Ä‘±s‚·‚é‚É‚Íu–³Ž‹vAƒCƒ“ƒXƒg[ƒ‹‚𒆎~‚·‚é‚É‚Íu’†Ž~v‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
+ErrorReadingExistingDest=Šù‘¶‚̃tƒ@ƒCƒ‹‚ð“Ç‚Ýž‚Ý’†‚ɃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B:
+FileExists=ƒtƒ@ƒCƒ‹‚ÍŠù‚É‘¶Ý‚µ‚Ü‚·B%n%nã‘‚«‚µ‚Ü‚·‚©H
+ExistingFileNewer=ƒCƒ“ƒXƒg[ƒ‹‚µ‚悤‚Æ‚µ‚Ä‚¢‚éƒtƒ@ƒCƒ‹‚æ‚è‚àV‚µ‚¢ƒtƒ@ƒCƒ‹‚ª‘¶Ý‚µ‚Ü‚·BŠù‘¶‚̃tƒ@ƒCƒ‹‚ðŽc‚·‚±‚Æ‚ð‚¨§‚ß‚µ‚Ü‚·B%n%nŠù‘¶‚̃tƒ@ƒCƒ‹‚ðŽc‚µ‚Ü‚·‚©B
+ErrorChangingAttr=Šù‘¶ƒtƒ@ƒCƒ‹‚Ì‘®«‚ð•ÏX’†‚ɃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B:
+ErrorCreatingTemp=ƒRƒs[æ‚̃tƒHƒ‹ƒ_‚Ƀtƒ@ƒCƒ‹‚ð쬒†‚ɃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B:
+ErrorReadingSource=ƒRƒs[Œ³‚̃tƒ@ƒCƒ‹‚ð“Ç‚Ýž‚Ý’†‚ɃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B:
+ErrorCopying=ƒtƒ@ƒCƒ‹‚ðƒRƒs[’†‚ɃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B:
+ErrorReplacingExistingFile=Šù‘¶ƒtƒ@ƒCƒ‹‚ð’u‚«Š·‚¦’†‚ɃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B:
+ErrorRestartReplace=’u‚«Š·‚¦ÄŠJ’†‚ɃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B:
+ErrorRenamingTemp=ƒRƒs[æƒtƒHƒ‹ƒ_‚̃tƒ@ƒCƒ‹–¼‚ð•ÏX’†‚ɃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B:
+ErrorRegisterServer=DLL/OCX‚Ì“o˜^‚ÉŽ¸”s‚µ‚Ü‚µ‚½B: %1
+ErrorRegSvr32Failed=RegSvr32‚̓Gƒ‰[ƒR[ƒh %1 ‚É‚æ‚莸”s‚µ‚Ü‚µ‚½B
+ErrorRegisterTypeLib=ƒ^ƒCƒvƒ‰ƒCƒuƒ‰ƒŠ‚Ö‚Ì“o˜^‚ÉŽ¸”s‚µ‚Ü‚µ‚½B: %1
+
+; *** Post-installation errors
+ErrorOpeningReadme=READMEƒtƒ@ƒCƒ‹‚̃I[ƒvƒ“‚ÉŽ¸”s‚µ‚Ü‚µ‚½B
+ErrorRestartingComputer=ƒRƒ“ƒsƒ…[ƒ^‚ÌÄ‹N“®‚ÉŽ¸”s‚µ‚Ü‚µ‚½BŽè“®‚ÅÄ‹N“®‚µ‚Ä‚‚¾‚³‚¢B
+
+; *** Uninstaller messages
+UninstallNotFound=ƒtƒ@ƒCƒ‹ %1 ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñBƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚ðŽÀs‚Å‚«‚Ü‚¹‚ñB
+UninstallOpenError=ƒtƒ@ƒCƒ‹ %1 ‚ðŠJ‚¯‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñBƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚ðŽÀs‚Å‚«‚Ü‚¹‚ñB
+UninstallUnsupportedVer=ƒAƒ“ƒCƒ“ƒXƒg[ƒ‹ƒƒOƒtƒ@ƒCƒ‹ %1 ‚ÍA‚±‚̃o[ƒWƒ‡ƒ“‚̃Aƒ“ƒCƒ“ƒXƒg[ƒ‹ƒvƒƒOƒ‰ƒ€‚ª”FŽ¯‚Å‚«‚È‚¢Œ`Ž®‚Å‚·BƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚ðŽÀs‚Å‚«‚Ü‚¹‚ñB
+UninstallUnknownEntry=ƒAƒ“ƒCƒ“ƒXƒg[ƒ‹ƒƒO‚É•s–¾‚̃Gƒ“ƒgƒŠ %1 ‚ªŒ©‚‚©‚è‚Ü‚µ‚½B
+ConfirmUninstall=%1 ‚Æ‚»‚ÌŠÖ˜AƒRƒ“ƒ|[ƒlƒ“ƒg‚ð‚·‚×‚Ä휂µ‚Ü‚·B‚æ‚낵‚¢‚Å‚·‚©H
+UninstallOnlyOnWin64=‚±‚̃vƒƒOƒ‰ƒ€‚Í64-bit”ÅWindowsã‚ł̂݃Aƒ“ƒCƒ“ƒXƒg[ƒ‹‚Å‚«‰Â”\‚Å‚·B
+OnlyAdminCanUninstall=ƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚·‚邽‚ß‚É‚ÍŠÇ—ŽÒŒ ŒÀ‚ª•K—v‚Å‚·B
+UninstallStatusLabel=‚²Žg—p‚̃Rƒ“ƒsƒ…[ƒ^‚©‚ç %1 ‚ð휂µ‚Ä‚¢‚Ü‚·B‚µ‚΂炂¨‘Ò‚¿‚‚¾‚³‚¢B
+UninstalledAll=%1 ‚Í‚²Žg—p‚̃Rƒ“ƒsƒ…[ƒ^‚©‚ç³í‚É휂³‚ê‚Ü‚µ‚½B
+UninstalledMost=%1 ‚̃Aƒ“ƒCƒ“ƒXƒg[ƒ‹‚ªŠ®—¹‚µ‚Ü‚µ‚½B%n%n‚¢‚‚‚©‚Ì€–Ú‚ªíœ‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½BŽè“®‚Å휂µ‚Ä‚‚¾‚³‚¢B
+UninstalledAndNeedsRestart=%1 ‚Ìíœ‚ðŠ®—¹‚·‚邽‚ß‚É‚ÍAƒRƒ“ƒsƒ…[ƒ^‚ðÄ‹N“®‚·‚é•K—v‚ª‚ ‚è‚Ü‚·B‚·‚®‚ÉÄ‹N“®‚µ‚Ü‚·‚©H
+UninstallDataCorrupted=ƒtƒ@ƒCƒ‹ "%1" ‚ª‰ó‚ê‚Ä‚¢‚Ü‚·BƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚ðŽÀs‚Å‚«‚Ü‚¹‚ñB
+
+; *** Uninstallation phase messages
+ConfirmDeleteSharedFileTitle=‹¤—Lƒtƒ@ƒCƒ‹‚Ìíœ
+ConfirmDeleteSharedFile2=ƒVƒXƒeƒ€ã‚ÅAŽŸ‚Ì‹¤—Lƒtƒ@ƒCƒ‹‚͂ǂ̃vƒƒOƒ‰ƒ€‚Å‚àŽg—p‚³‚ê‚Ä‚¢‚Ü‚¹‚ñB‚±‚Ì‹¤—Lƒtƒ@ƒCƒ‹‚ð휂µ‚Ü‚·‚©H%n%n‘¼‚̃vƒƒOƒ‰ƒ€‚ª‚Ü‚¾‚±‚̃tƒ@ƒCƒ‹‚ðŽg—p‚·‚éê‡A휂·‚é‚ƃvƒƒOƒ‰ƒ€‚ª“®ì‚µ‚È‚‚È‚é‹°‚ꂪ‚ ‚è‚Ü‚·B‚ ‚Ü‚èŠmŽÀ‚Å‚È‚¢ê‡‚Íu‚¢‚¢‚¦v‚ð‘I‘ð‚µ‚Ä‚‚¾‚³‚¢BƒVƒXƒeƒ€‚Ƀtƒ@ƒCƒ‹‚ðŽc‚µ‚Ä‚à–â‘è‚ðˆø‚«‹N‚±‚·‚±‚Æ‚Í‚ ‚è‚Ü‚¹‚ñB
+SharedFileNameLabel=ƒtƒ@ƒCƒ‹–¼:
+SharedFileLocationLabel=êŠ:
+WizardUninstalling=ƒAƒ“ƒCƒ“ƒXƒg[ƒ‹ó‹µ
+StatusUninstalling=%1 ‚ðƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚µ‚Ä‚¢‚Ü‚·...
+
+; The custom messages below aren't used by Setup itself, but if you make
+; use of them in your scripts, you'll want to translate them.
+
+[CustomMessages]
+
+NameAndVersion=%1 ƒo[ƒWƒ‡ƒ“ %2
+AdditionalIcons=ƒAƒCƒRƒ“‚ð’ljÁ‚·‚é:
+CreateDesktopIcon=ƒfƒXƒNƒgƒbƒvã‚ɃAƒCƒRƒ“‚ð쬂·‚é(&d)
+CreateQuickLaunchIcon=&Quick Launch ƒAƒCƒRƒ“‚ð쬂·‚é
+ProgramOnTheWeb=%1 on the Web
+UninstallProgram=%1 ‚ðƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚·‚é
+LaunchProgram=%1 ‚ðŽÀs‚·‚é
+AssocFileExtension=%2 ƒtƒ@ƒCƒ‹Šg’£‚É %1‚ðŠÖ˜A•t‚¯‚Ü‚·B
+AssocingFileExtension=%2 ‚É %1‚ðŠÖ˜A•t‚¯‚Ü‚·B
diff --git a/webkit-1.2.7-configure.patch b/webkit-1.2.7-configure.patch
index 57f7ceb..ad7b55a 100755
--- a/webkit-1.2.7-configure.patch
+++ b/webkit-1.2.7-configure.patch
@@ -1,23 +1,23 @@
---- configure Tue Oct 05 06:02:37 2010
-+++ configure Tue Jan 11 07:28:51 2011
-@@ -1077,6 +1077,7 @@
- enable_icon_database
- enable_datalist
- enable_ruby
-+enable_sandbox
- enable_video
- enable_xhtmlmp
- enable_xpath
-@@ -19020,9 +19021,9 @@
- # check whether to enable HTML5 sandbox iframe support
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable HTML5 sandboxed iframe support" >&5
- $as_echo_n "checking whether to enable HTML5 sandboxed iframe support... " >&6; }
--# Check whether --enable-ruby was given.
--if test "${enable_ruby+set}" = set; then :
-- enableval=$enable_ruby;
-+# Check whether --enable-sandbox was given.
-+if test "${enable_sandbox+set}" = set; then :
-+ enableval=$enable_sandbox;
- else
- enable_sandbox="yes"
- fi
+--- configure Tue Oct 05 06:02:37 2010
++++ configure Tue Jan 11 07:28:51 2011
+@@ -1077,6 +1077,7 @@
+ enable_icon_database
+ enable_datalist
+ enable_ruby
++enable_sandbox
+ enable_video
+ enable_xhtmlmp
+ enable_xpath
+@@ -19020,9 +19021,9 @@
+ # check whether to enable HTML5 sandbox iframe support
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable HTML5 sandboxed iframe support" >&5
+ $as_echo_n "checking whether to enable HTML5 sandboxed iframe support... " >&6; }
+-# Check whether --enable-ruby was given.
+-if test "${enable_ruby+set}" = set; then :
+- enableval=$enable_ruby;
++# Check whether --enable-sandbox was given.
++if test "${enable_sandbox+set}" = set; then :
++ enableval=$enable_sandbox;
+ else
+ enable_sandbox="yes"
+ fi
diff --git a/webkit-1.2.7-datadir.patch b/webkit-1.2.7-datadir.patch
index 39db939..0a49cf0 100755
--- a/webkit-1.2.7-datadir.patch
+++ b/webkit-1.2.7-datadir.patch
@@ -1,143 +1,143 @@
---- WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp Fri Sep 10 20:20:33 2010
-+++ WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp Tue Jan 11 12:47:14 2011
-@@ -71,6 +71,30 @@
- #include <glib/gi18n-lib.h>
- #include <stdio.h>
-
-+#ifdef _WIN32
-+/* search for data relative to where we are installed */
-+#include <shlobj.h>
-+#include <assert.h>
-+
-+static HMODULE GetThisDllHandle()
-+{
-+ MEMORY_BASIC_INFORMATION info;
-+ size_t len = VirtualQueryEx(GetCurrentProcess(), (void*)GetThisDllHandle, &info, sizeof(info));
-+ assert(len == sizeof(info));
-+ return len ? (HMODULE)info.AllocationBase : NULL;
-+}
-+
-+const gchar *
-+get_webkit_datadir(void)
-+{
-+ gchar *retval;
-+ retval = g_build_filename (g_win32_get_package_installation_directory_of_module (GetThisDllHandle()), "/share", NULL);
-+ return retval;
-+}
-+#undef DATA_DIR
-+#define DATA_DIR get_webkit_datadir ()
-+#endif
-+
- using namespace WebCore;
-
- namespace WebKit {
-@@ -989,7 +1013,13 @@
-
- String content;
- gchar* fileContent = 0;
-+#ifdef _WIN32
-+ gchar* errorPath = g_build_filename (DATA_DIR, "/webkit-1.0/resources/error.html", NULL);
-+ gchar* errorURI = g_filename_to_uri(errorPath, NULL, NULL);
-+ g_free(errorPath);
-+#else
- gchar* errorURI = g_filename_to_uri(DATA_DIR"/webkit-1.0/resources/error.html", NULL, NULL);
-+#endif
- GFile* errorFile = g_file_new_for_uri(errorURI);
- g_free(errorURI);
-
---- WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp Fri Sep 10 20:20:33 2010
-+++ WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp Mon Jan 17 07:42:35 2011
-@@ -27,6 +27,31 @@
- #include "NotImplemented.h"
- #include "PlatformString.h"
-
-+#ifdef _WIN32
-+/* search for data relative to where we are installed */
-+# include <shlobj.h>
-+# include <assert.h>
-+
-+static HMODULE GetThisDllHandle()
-+{
-+ MEMORY_BASIC_INFORMATION info;
-+ size_t len = VirtualQueryEx(GetCurrentProcess(), (void*)GetThisDllHandle, &info, sizeof(info));
-+ assert(len == sizeof(info));
-+ return len ? (HMODULE)info.AllocationBase : NULL;
-+}
-+
-+const gchar *
-+get_webkit_path(void)
-+{
-+ gchar *retval;
-+ retval = g_build_filename (g_win32_get_package_installation_directory_of_module (GetThisDllHandle()), "/share", NULL);
-+ return retval;
-+}
-+#undef DATA_DIR
-+#define DATA_DIR get_webkit_path ()
-+#endif
-+
-+
- using namespace WebCore;
-
- namespace WebKit {
-@@ -67,21 +92,30 @@
- webkit_web_inspector_set_web_view(webInspector, inspectorWebView);
-
- GOwnPtr<gchar> inspectorURI;
--
-+#ifdef _WIN32
-+ gchar* inspectorPath = g_build_filename (DATA_DIR, "/webkit-1.0/webinspector/inspector.html", NULL);
-+#endif
- // Make the Web Inspector work when running tests
- if (g_file_test("WebCore/inspector/front-end/inspector.html", G_FILE_TEST_EXISTS)) {
- GOwnPtr<gchar> currentDirectory(g_get_current_dir());
- GOwnPtr<gchar> fullPath(g_strdup_printf("%s/WebCore/inspector/front-end/inspector.html", currentDirectory.get()));
- inspectorURI.set(g_filename_to_uri(fullPath.get(), NULL, NULL));
- } else
-+#ifdef _WIN32
-+ inspectorURI.set(g_filename_to_uri(inspectorPath, NULL, NULL));
-+#else
- inspectorURI.set(g_filename_to_uri(DATA_DIR"/webkit-1.0/webinspector/inspector.html", NULL, NULL));
--
-+#endif
- webkit_web_view_load_uri(inspectorWebView, inspectorURI.get());
-
- gtk_widget_show(GTK_WIDGET(inspectorWebView));
-
- Page* inspectorPage = core(inspectorWebView);
- inspectorPage->inspectorController()->setInspectorFrontendClient(new InspectorFrontendClient(m_inspectedWebView, inspectorWebView, webInspector, inspectorPage));
-+
-+#ifdef _WIN32
-+ g_free(inspectorPath);
-+#endif
- }
-
- void InspectorClient::highlight(Node* node)
-@@ -145,6 +179,10 @@
- String InspectorFrontendClient::localizedStringsURL()
- {
- GOwnPtr<gchar> URL;
-+
-+#ifdef _WIN32
-+ gchar* localizedPath = g_build_filename (DATA_DIR, "/webkit-1.0/webinspector/localizedStrings.js", NULL);
-+#endif
-
- // Make the Web Inspector work when running tests
- if (g_file_test("WebCore/English.lproj/localizedStrings.js", G_FILE_TEST_EXISTS)) {
-@@ -152,10 +190,16 @@
- GOwnPtr<gchar> fullPath(g_strdup_printf("%s/WebCore/English.lproj/localizedStrings.js", currentDirectory.get()));
- URL.set(g_filename_to_uri(fullPath.get(), NULL, NULL));
- } else
-+#ifdef _WIN32
-+ URL.set(g_filename_to_uri(localizedPath, NULL, NULL));
-+#else
- URL.set(g_filename_to_uri(DATA_DIR"/webkit-1.0/webinspector/localizedStrings.js", NULL, NULL));
--
-+#endif
- // FIXME: support l10n of localizedStrings.js
- return String::fromUTF8(URL.get());
-+#ifdef _WIN32
-+ g_free(localizedPath);
-+#endif
- }
-
- String InspectorFrontendClient::hiddenPanels()
+--- WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp Fri Sep 10 20:20:33 2010
++++ WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp Tue Jan 11 12:47:14 2011
+@@ -71,6 +71,30 @@
+ #include <glib/gi18n-lib.h>
+ #include <stdio.h>
+
++#ifdef _WIN32
++/* search for data relative to where we are installed */
++#include <shlobj.h>
++#include <assert.h>
++
++static HMODULE GetThisDllHandle()
++{
++ MEMORY_BASIC_INFORMATION info;
++ size_t len = VirtualQueryEx(GetCurrentProcess(), (void*)GetThisDllHandle, &info, sizeof(info));
++ assert(len == sizeof(info));
++ return len ? (HMODULE)info.AllocationBase : NULL;
++}
++
++const gchar *
++get_webkit_datadir(void)
++{
++ gchar *retval;
++ retval = g_build_filename (g_win32_get_package_installation_directory_of_module (GetThisDllHandle()), "/share", NULL);
++ return retval;
++}
++#undef DATA_DIR
++#define DATA_DIR get_webkit_datadir ()
++#endif
++
+ using namespace WebCore;
+
+ namespace WebKit {
+@@ -989,7 +1013,13 @@
+
+ String content;
+ gchar* fileContent = 0;
++#ifdef _WIN32
++ gchar* errorPath = g_build_filename (DATA_DIR, "/webkit-1.0/resources/error.html", NULL);
++ gchar* errorURI = g_filename_to_uri(errorPath, NULL, NULL);
++ g_free(errorPath);
++#else
+ gchar* errorURI = g_filename_to_uri(DATA_DIR"/webkit-1.0/resources/error.html", NULL, NULL);
++#endif
+ GFile* errorFile = g_file_new_for_uri(errorURI);
+ g_free(errorURI);
+
+--- WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp Fri Sep 10 20:20:33 2010
++++ WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp Mon Jan 17 07:42:35 2011
+@@ -27,6 +27,31 @@
+ #include "NotImplemented.h"
+ #include "PlatformString.h"
+
++#ifdef _WIN32
++/* search for data relative to where we are installed */
++# include <shlobj.h>
++# include <assert.h>
++
++static HMODULE GetThisDllHandle()
++{
++ MEMORY_BASIC_INFORMATION info;
++ size_t len = VirtualQueryEx(GetCurrentProcess(), (void*)GetThisDllHandle, &info, sizeof(info));
++ assert(len == sizeof(info));
++ return len ? (HMODULE)info.AllocationBase : NULL;
++}
++
++const gchar *
++get_webkit_path(void)
++{
++ gchar *retval;
++ retval = g_build_filename (g_win32_get_package_installation_directory_of_module (GetThisDllHandle()), "/share", NULL);
++ return retval;
++}
++#undef DATA_DIR
++#define DATA_DIR get_webkit_path ()
++#endif
++
++
+ using namespace WebCore;
+
+ namespace WebKit {
+@@ -67,21 +92,30 @@
+ webkit_web_inspector_set_web_view(webInspector, inspectorWebView);
+
+ GOwnPtr<gchar> inspectorURI;
+-
++#ifdef _WIN32
++ gchar* inspectorPath = g_build_filename (DATA_DIR, "/webkit-1.0/webinspector/inspector.html", NULL);
++#endif
+ // Make the Web Inspector work when running tests
+ if (g_file_test("WebCore/inspector/front-end/inspector.html", G_FILE_TEST_EXISTS)) {
+ GOwnPtr<gchar> currentDirectory(g_get_current_dir());
+ GOwnPtr<gchar> fullPath(g_strdup_printf("%s/WebCore/inspector/front-end/inspector.html", currentDirectory.get()));
+ inspectorURI.set(g_filename_to_uri(fullPath.get(), NULL, NULL));
+ } else
++#ifdef _WIN32
++ inspectorURI.set(g_filename_to_uri(inspectorPath, NULL, NULL));
++#else
+ inspectorURI.set(g_filename_to_uri(DATA_DIR"/webkit-1.0/webinspector/inspector.html", NULL, NULL));
+-
++#endif
+ webkit_web_view_load_uri(inspectorWebView, inspectorURI.get());
+
+ gtk_widget_show(GTK_WIDGET(inspectorWebView));
+
+ Page* inspectorPage = core(inspectorWebView);
+ inspectorPage->inspectorController()->setInspectorFrontendClient(new InspectorFrontendClient(m_inspectedWebView, inspectorWebView, webInspector, inspectorPage));
++
++#ifdef _WIN32
++ g_free(inspectorPath);
++#endif
+ }
+
+ void InspectorClient::highlight(Node* node)
+@@ -145,6 +179,10 @@
+ String InspectorFrontendClient::localizedStringsURL()
+ {
+ GOwnPtr<gchar> URL;
++
++#ifdef _WIN32
++ gchar* localizedPath = g_build_filename (DATA_DIR, "/webkit-1.0/webinspector/localizedStrings.js", NULL);
++#endif
+
+ // Make the Web Inspector work when running tests
+ if (g_file_test("WebCore/English.lproj/localizedStrings.js", G_FILE_TEST_EXISTS)) {
+@@ -152,10 +190,16 @@
+ GOwnPtr<gchar> fullPath(g_strdup_printf("%s/WebCore/English.lproj/localizedStrings.js", currentDirectory.get()));
+ URL.set(g_filename_to_uri(fullPath.get(), NULL, NULL));
+ } else
++#ifdef _WIN32
++ URL.set(g_filename_to_uri(localizedPath, NULL, NULL));
++#else
+ URL.set(g_filename_to_uri(DATA_DIR"/webkit-1.0/webinspector/localizedStrings.js", NULL, NULL));
+-
++#endif
+ // FIXME: support l10n of localizedStrings.js
+ return String::fromUTF8(URL.get());
++#ifdef _WIN32
++ g_free(localizedPath);
++#endif
+ }
+
+ String InspectorFrontendClient::hiddenPanels()
diff --git a/webkit-1.2.7-gccpath.patch b/webkit-1.2.7-gccpath.patch
index 2274f9d..89d8498 100755
--- a/webkit-1.2.7-gccpath.patch
+++ b/webkit-1.2.7-gccpath.patch
@@ -1,33 +1,33 @@
---- WebCore/bindings/scripts/IDLParser.pm Thu Jan 15 16:14:12 1970
-+++ WebCore/bindings/scripts/IDLParser.pm Thu Jan 15 16:14:12 1970
-@@ -69,7 +69,7 @@
- if (($Config::Config{'osname'}) =~ /solaris/i) {
- $gccLocation = "/usr/sfw/bin/gcc";
- } else {
-- $gccLocation = "/usr/bin/gcc";
-+ $gccLocation = "gcc";
- }
- $preprocessor = $gccLocation . " -E -P -x c++";
- }
---- WebCore/css/make-css-file-arrays.pl Thu Jan 15 16:14:12 1970
-+++ WebCore/css/make-css-file-arrays.pl Thu Jan 15 16:14:12 1970
-@@ -33,7 +33,7 @@
- if (($Config::Config{'osname'}) =~ /solaris/i) {
- $gccLocation = "/usr/sfw/bin/gcc";
- } else {
-- $gccLocation = "/usr/bin/gcc";
-+ $gccLocation = "gcc";
- }
- $preprocessor = $gccLocation . " -E -P -x c++";
- }
---- WebCore/dom/make_names.pl Thu Jan 15 16:14:12 1970
-+++ WebCore/dom/make_names.pl Thu Jan 15 16:14:12 1970
-@@ -52,7 +52,7 @@
- if (($Config::Config{'osname'}) =~ /solaris/i) {
- $gccLocation = "/usr/sfw/bin/gcc";
- } else {
-- $gccLocation = "/usr/bin/gcc";
-+ $gccLocation = "gcc";
- }
- my $preprocessor = $gccLocation . " -E -P -x c++";
-
+--- WebCore/bindings/scripts/IDLParser.pm Thu Jan 15 16:14:12 1970
++++ WebCore/bindings/scripts/IDLParser.pm Thu Jan 15 16:14:12 1970
+@@ -69,7 +69,7 @@
+ if (($Config::Config{'osname'}) =~ /solaris/i) {
+ $gccLocation = "/usr/sfw/bin/gcc";
+ } else {
+- $gccLocation = "/usr/bin/gcc";
++ $gccLocation = "gcc";
+ }
+ $preprocessor = $gccLocation . " -E -P -x c++";
+ }
+--- WebCore/css/make-css-file-arrays.pl Thu Jan 15 16:14:12 1970
++++ WebCore/css/make-css-file-arrays.pl Thu Jan 15 16:14:12 1970
+@@ -33,7 +33,7 @@
+ if (($Config::Config{'osname'}) =~ /solaris/i) {
+ $gccLocation = "/usr/sfw/bin/gcc";
+ } else {
+- $gccLocation = "/usr/bin/gcc";
++ $gccLocation = "gcc";
+ }
+ $preprocessor = $gccLocation . " -E -P -x c++";
+ }
+--- WebCore/dom/make_names.pl Thu Jan 15 16:14:12 1970
++++ WebCore/dom/make_names.pl Thu Jan 15 16:14:12 1970
+@@ -52,7 +52,7 @@
+ if (($Config::Config{'osname'}) =~ /solaris/i) {
+ $gccLocation = "/usr/sfw/bin/gcc";
+ } else {
+- $gccLocation = "/usr/bin/gcc";
++ $gccLocation = "gcc";
+ }
+ my $preprocessor = $gccLocation . " -E -P -x c++";
+
diff --git a/webkit-1.2.7-makefile.patch b/webkit-1.2.7-makefile.patch
index 6476ae1..bbc9bd4 100755
--- a/webkit-1.2.7-makefile.patch
+++ b/webkit-1.2.7-makefile.patch
@@ -1,81 +1,81 @@
---- GNUmakefile Mon Jan 17 09:32:30 2011
-+++ GNUmakefile Mon Jan 17 09:44:19 2011
-@@ -6411,3 +6411,4 @@
- STRIP = strip
--SYMBOL_VISIBILITY = -fvisibility=hidden
--SYMBOL_VISIBILITY_INLINES = -fvisibility-inlines-hidden
-+SYMBOL_VISIBILITY =
-+SYMBOL_VISIBILITY_INLINES =
-+PTHREAD_LIBS = -lpthread
-@@ -8967,7 +8967,7 @@
- # It breaks the build on other platforms, so we use it conditionally
- no_undefined = -no-undefined
- #version_script = -Wl,--version-script,$(srcdir)/autotools/symbols.filter
--version_script = -export-symbols-regex "^(webkit_|JS).*"
-+version_script = -export-symbols-regex "^(webkit_|k?JS).*"
-
- # Shared libraries
- lib_LTLIBRARIES = \
-@@ -8987,7 +8987,7 @@
- libJavaScriptCore_la_LIBADD = \
- $(UNICODE_LIBS) \
- $(GLIB_LIBS) \
-- -lpthread
-+ $(PTHREAD_LIBS)
-
- libJavaScriptCore_la_CXXFLAGS = \
- $(global_cxxflags) \
-@@ -9042,7 +9042,6 @@
- $(no_undefined)
-
- libwebkit_1_0_la_LIBADD = \
-- -lpthread \
- libJavaScriptCore.la \
- libWebCoreJS.la \
- $(webcore_ldflags) \
-@@ -9064,7 +9063,8 @@
- $(PNG_LIBS) \
- $(SQLITE3_LIBS) \
- $(UNICODE_LIBS) \
-- $(XT_LIBS)
-+ $(PTHREAD_LIBS) \
-+ $(XT_LIBS) -lwinmm -lshlwapi -lole32
-
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = WebKit/gtk/webkit-1.0.pc
-@@ -9104,7 +9104,7 @@
- Programs_minidom_LDADD = \
- libJavaScriptCore.la \
- -lm \
-- -lstdc++
-+ -lstdc++ -lwinmm
-
- Programs_minidom_LDFLAGS = \
- -no-install \
-@@ -9127,7 +9127,7 @@
- $(UNICODE_CFLAGS)
-
- Programs_jsc_LDADD = \
-- libJavaScriptCore.la
-+ libJavaScriptCore.la -lwinmm
-
- WebCore := $(srcdir)/WebCore
-
-@@ -9263,7 +9263,7 @@
- Programs_GtkLauncher_LDADD = \
- libwebkit-1.0.la \
- $(GTK_LIBS) \
-- $(GLIB_LIBS)
-+ $(GLIB_LIBS) -lwinmm
-
- Programs_GtkLauncher_LDFLAGS = \
- -no-fast-install \
-@@ -9326,7 +9326,7 @@
- $(GTK_LIBS) \
- $(GLIB_LIBS) \
- $(LIBSOUP_LIBS) \
-- $(FREETYPE_LIBS)
-+ $(FREETYPE_LIBS) -lwinmm
-
- Programs_DumpRenderTree_LDFLAGS = \
- -no-fast-install \
+--- GNUmakefile Mon Jan 17 09:32:30 2011
++++ GNUmakefile Mon Jan 17 09:44:19 2011
+@@ -6411,3 +6411,4 @@
+ STRIP = strip
+-SYMBOL_VISIBILITY = -fvisibility=hidden
+-SYMBOL_VISIBILITY_INLINES = -fvisibility-inlines-hidden
++SYMBOL_VISIBILITY =
++SYMBOL_VISIBILITY_INLINES =
++PTHREAD_LIBS = -lpthread
+@@ -8967,7 +8967,7 @@
+ # It breaks the build on other platforms, so we use it conditionally
+ no_undefined = -no-undefined
+ #version_script = -Wl,--version-script,$(srcdir)/autotools/symbols.filter
+-version_script = -export-symbols-regex "^(webkit_|JS).*"
++version_script = -export-symbols-regex "^(webkit_|k?JS).*"
+
+ # Shared libraries
+ lib_LTLIBRARIES = \
+@@ -8987,7 +8987,7 @@
+ libJavaScriptCore_la_LIBADD = \
+ $(UNICODE_LIBS) \
+ $(GLIB_LIBS) \
+- -lpthread
++ $(PTHREAD_LIBS)
+
+ libJavaScriptCore_la_CXXFLAGS = \
+ $(global_cxxflags) \
+@@ -9042,7 +9042,6 @@
+ $(no_undefined)
+
+ libwebkit_1_0_la_LIBADD = \
+- -lpthread \
+ libJavaScriptCore.la \
+ libWebCoreJS.la \
+ $(webcore_ldflags) \
+@@ -9064,7 +9063,8 @@
+ $(PNG_LIBS) \
+ $(SQLITE3_LIBS) \
+ $(UNICODE_LIBS) \
+- $(XT_LIBS)
++ $(PTHREAD_LIBS) \
++ $(XT_LIBS) -lwinmm -lshlwapi -lole32
+
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = WebKit/gtk/webkit-1.0.pc
+@@ -9104,7 +9104,7 @@
+ Programs_minidom_LDADD = \
+ libJavaScriptCore.la \
+ -lm \
+- -lstdc++
++ -lstdc++ -lwinmm
+
+ Programs_minidom_LDFLAGS = \
+ -no-install \
+@@ -9127,7 +9127,7 @@
+ $(UNICODE_CFLAGS)
+
+ Programs_jsc_LDADD = \
+- libJavaScriptCore.la
++ libJavaScriptCore.la -lwinmm
+
+ WebCore := $(srcdir)/WebCore
+
+@@ -9263,7 +9263,7 @@
+ Programs_GtkLauncher_LDADD = \
+ libwebkit-1.0.la \
+ $(GTK_LIBS) \
+- $(GLIB_LIBS)
++ $(GLIB_LIBS) -lwinmm
+
+ Programs_GtkLauncher_LDFLAGS = \
+ -no-fast-install \
+@@ -9326,7 +9326,7 @@
+ $(GTK_LIBS) \
+ $(GLIB_LIBS) \
+ $(LIBSOUP_LIBS) \
+- $(FREETYPE_LIBS)
++ $(FREETYPE_LIBS) -lwinmm
+
+ Programs_DumpRenderTree_LDFLAGS = \
+ -no-fast-install \
diff --git a/webkit-1.2.7-nosvg.patch b/webkit-1.2.7-nosvg.patch
index d634966..8e4bee0 100755
--- a/webkit-1.2.7-nosvg.patch
+++ b/webkit-1.2.7-nosvg.patch
@@ -1,10 +1,10 @@
---- WebCore/bindings/js/JSNodeCustom.cpp.ori Sun Jan 23 11:38:08 2011
-+++ WebCore/bindings/js/JSNodeCustom.cpp Sun Jan 23 11:37:57 2011
-@@ -34,6 +34,7 @@
- #include "DocumentType.h"
- #include "Entity.h"
- #include "EntityReference.h"
-+#include "ExceptionCode.h"
- #include "HTMLElement.h"
- #include "JSAttr.h"
- #include "JSCDATASection.h"
+--- WebCore/bindings/js/JSNodeCustom.cpp.ori Sun Jan 23 11:38:08 2011
++++ WebCore/bindings/js/JSNodeCustom.cpp Sun Jan 23 11:37:57 2011
+@@ -34,6 +34,7 @@
+ #include "DocumentType.h"
+ #include "Entity.h"
+ #include "EntityReference.h"
++#include "ExceptionCode.h"
+ #include "HTMLElement.h"
+ #include "JSAttr.h"
+ #include "JSCDATASection.h"
commit 361f7428ae93cf5089a2ea4a755eaaeb9fe00f75
Author: Christian Stimming <christian at cstimming.de>
Date: Mon Apr 7 20:55:49 2014 +0200
Win32 build: Update gwenhywfar version after it has been fixed for compiling with mingw.
diff --git a/defaults.sh b/defaults.sh
index 11ed99b..96dac7b 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -343,11 +343,11 @@ set_default LIBOFX_DIR $GLOBAL_DIR\\libofx
#set_default LIBOFX_PATCH `pwd`/libofx-x.x.x.patch
## online banking: gwenhywfar+aqbanking
-GWENHYWFAR_VERSION="4.10.0beta"
-set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=73&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
+GWENHYWFAR_VERSION="4.11.1beta"
+set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=75&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
-KTOBLZCHECK_VERSION="1.44"
+KTOBLZCHECK_VERSION="1.45"
set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-${KTOBLZCHECK_VERSION}.tar.gz"
# ktoblzcheck is being installed into GWENHYWFAR_DIR
commit ad40d7c638b558248f28f2ee4a31c1a9e5557ffa
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Apr 1 12:16:54 2014 -0700
Rename _git files to plain, fix links.
diff --git a/build_package_git.sh b/build_package.sh
similarity index 100%
rename from build_package_git.sh
rename to build_package.sh
diff --git a/build_tags_git.sh b/build_tags.sh
similarity index 98%
rename from build_tags_git.sh
rename to build_tags.sh
index b394b6f..8e2e7f8 100644
--- a/build_tags_git.sh
+++ b/build_tags.sh
@@ -123,6 +123,6 @@ for tag_rev in $tags ; do
# Now build the tag! (this will upload it too)
# Use the build_package script from trunk (cwd), not from the tag
qpushd ${w32pkg}
- ${pkgdir}/build_package_git.sh ${tag}
+ ${pkgdir}/build_package.sh ${tag}
qpopd
done
diff --git a/daily_build.bat b/daily_build.bat
index 3828eee..c38bec7 100644
--- a/daily_build.bat
+++ b/daily_build.bat
@@ -5,9 +5,9 @@ rem the daily build and then the tag builds.
cd c:\soft\gnucash\repos\packaging\win32\
rem Development build (daily)
-c:\msys\1.0\bin\sh.exe --login c:\soft\gnucash\repos\packaging\win32\daily_build_git.sh
+c:\msys\1.0\bin\sh.exe --login c:\soft\gnucash\repos\packaging\win32\daily_build.sh
rem Tags build for 2.5 and newer (daily -- only tags that weren't built yet)
-c:\msys\1.0\bin\sh.exe --login c:\soft\gnucash\repos\packaging\win32\build_tags_git.sh
-rem 2.6 branch build (weekly)
+c:\msys\1.0\bin\sh.exe --login c:\soft\gnucash\repos\packaging\win32\build_tags.sh
+rem maintenance branch build (weekly)
rem There's no 2.6 branch yet. Hence the line below is commented out
-rem c:\msys\1.0\bin\sh.exe --login c:\soft-2.6\gnucash\repos\packaging\weekly_build.sh
\ No newline at end of file
+rem c:\msys\1.0\bin\sh.exe --login c:\soft-maint\gnucash\repos\packaging\weekly_build.sh
\ No newline at end of file
diff --git a/daily_build_git.sh b/daily_build.sh
similarity index 98%
rename from daily_build_git.sh
rename to daily_build.sh
index 38aed10..e1e8f83 100644
--- a/daily_build_git.sh
+++ b/daily_build.sh
@@ -44,7 +44,7 @@ fi
newrev=$($GIT_CMD rev-parse HEAD)
if [[ "${oldrev}" != "${newrev}" ]]; then
- ./build_package_git.sh
+ ./build_package.sh
fi
# move the new file into place, will only happen if the build was successful
diff --git a/weekly_build_git.sh b/weekly_build.sh
similarity index 98%
rename from weekly_build_git.sh
rename to weekly_build.sh
index b3aef2d..16ca9ce 100644
--- a/weekly_build_git.sh
+++ b/weekly_build.sh
@@ -47,7 +47,7 @@ fi
newrev=$($GIT_CMD rev-parse HEAD)
if [[ "${oldrev}" != "${newrev}" ]]; then
- ./build_package_git.sh
+ ./build_package.sh
fi
# move the new file into place, will only happen if the build was successful
commit e1af006150c2ab0d940171e33c31ba5b3ea4e841
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Apr 1 12:04:22 2014 -0700
Remove svn-based build files
diff --git a/build_package.sh b/build_package.sh
deleted file mode 100644
index 179995c..0000000
--- a/build_package.sh
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/bin/sh
-
-#
-# This assumes we're in the "packaging" directory for the correct build.
-# It could be the packaging/win32 subdir of a tag checkout, or it could
-# be the top-level daily-build packaging directory.
-#
-
-set -o pipefail
-set -e
-LOG_DIR=build-logs
-
-function on_error() {
- if [ `hostname` = "gnucash-win32" ]; then
- scp -p ${LOGFILE} upload at code.gnucash.org:public_html/win32/$LOG_DIR
- fi
- exit
-}
-
-function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
-
-tag="$1"
-
-. functions.sh
-. defaults.sh
-
-# Determine where to upload to
-if $(echo $REPOS_URL | grep -q tags); then
- TARGET_DIR=releases
- LOG_TAG=$tag
-else
- TARGET_DIR=${REPOS_URL##*/}
- LOG_TAG=$TARGET_DIR
-fi
-
-set_default OUTPUT_DIR $GLOBAL_DIR\\output
-LOGFILENAME=build-${LOG_TAG}-`date +'%Y-%m-%d'`.log
-
-_OUTPUT_DIR=`unix_path $OUTPUT_DIR`
-LOGFILE=${_OUTPUT_DIR}/${LOGFILENAME}
-mkdir -p ${_OUTPUT_DIR}
-
-# Small hack to create $LOG_DIR on the webserver if it doesn't exist yet
-if [ `hostname` = "gnucash-win32" ]; then
- mkdir -p "$_OUTPUT_DIR/$LOG_DIR"
- scp -r "$_OUTPUT_DIR/$LOG_DIR" upload at code.gnucash.org:public_html/win32
- rmdir "$_OUTPUT_DIR/$LOG_DIR"
-fi
-
-# If we're running on the build server, copy a temporary logfile
-# content to the webserver to signal that the build is in progress
-if [ `hostname` = "gnucash-win32" ]; then
- _PWD=`pwd`
- echo "Build for tag \"${tag}\" is in progress (current working directory: ${_PWD}) ..." > ${LOGFILE}
- scp -p ${LOGFILE} upload at code.gnucash.org:public_html/win32/$LOG_DIR
-fi
-
-set +e
-trap on_error ERR
-
-# Run the compile
-./install.sh 2>&1 | tee ${LOGFILE}
-
-# This directory needs to be removed before calling dist.sh
-DIST_DIR=${INSTALL_DIR}\\..\\dist
-_DIST_UDIR=`unix_path $DIST_DIR`
-rm -rf ${_DIST_UDIR}
-
-# Create the installer
-./dist.sh 2>&1 | tee -a ${LOGFILE}
-
-# Copy the resulting installer into the output directory
-_BUILD_UDIR=`unix_path $BUILD_DIR`
-_GNUCASH_UDIR=`unix_path $GNUCASH_DIR`
-PKG_VERSION=`grep PACKAGE_VERSION ${_BUILD_UDIR}/config.h | cut -d" " -f3 | cut -d\" -f2 `
-GNUCASH_SCM_REV=`grep GNUCASH_SCM_REV ${_BUILD_UDIR}/src/core-utils/gnc-scm-info.h | cut -d" " -f3 | cut -d\" -f2 `
-
-# Choose the output filename based on our "build_from_tarball" setting
-# Make sure this logic matches the logic in dist.sh!
-if [ "$BUILD_FROM_TARBALL" = "no" ]; then
- SETUP_FILENAME="gnucash-${PKG_VERSION}-svn-r${GNUCASH_SCM_REV}-setup.exe"
-else
- SETUP_FILENAME="gnucash-${PKG_VERSION}-setup.exe"
-fi
-if [ ! -d ${_OUTPUT_DIR} ] ; then
- echo "Error: _OUTPUT_DIR=${_OUTPUT_DIR} does not exist" >> ${LOGFILE}
-fi
-if [ -f ${_GNUCASH_UDIR}/${SETUP_FILENAME} ] ; then
- echo "Successfully created ${SETUP_FILENAME} in ${_GNUCASH_UDIR}" >> ${LOGFILE}
-else
- echo "Error: File _GNUCASH_UDIR/SETUP_FILENAME = ${_GNUCASH_UDIR}/${SETUP_FILENAME} does not exist" >> ${LOGFILE}
- echo "Files in _GNUCASH_UDIR:" >> ${LOGFILE}
- ls ${_GNUCASH_UDIR}/* >> ${LOGFILE}
-fi
-mv ${_GNUCASH_UDIR}/${SETUP_FILENAME} ${_OUTPUT_DIR} >> ${LOGFILE} 2>&1
-
-#
-# Verify that PKG_VERSION == $tag, and add to the build log if it's not.
-# Note: only do this if tag exists and matches x.y.z
-#
-if [ -n "${tag}" ] ; then
- case "${tag}" in
- [0-9]*.[0-9]*.[0-9]*)
- if [ "${PKG_VERSION}" != "${tag}" ] ; then
- echo "" >> ${LOGFILE}
- echo " *** ERROR: Package Version ${PKG_VERSION} doesn't match Tag ${tag}" >> ${LOGFILE}
- echo "" >> ${LOGFILE}
- fi
- ;;
- esac
-fi
-
-# If we're running on the build server then upload the files
-if [ `hostname` = "gnucash-win32" ]; then
- # Small hack to create the $TARGET_DIR on the webserver if it doesn't exist yet
- mkdir -p "$_OUTPUT_DIR/$TARGET_DIR" >> ${LOGFILE} 2>&1
- scp -r "$_OUTPUT_DIR/$TARGET_DIR" upload at code.gnucash.org:public_html/win32 >> ${LOGFILE} 2>&1
- rmdir "$_OUTPUT_DIR/$TARGET_DIR" >> ${LOGFILE} 2>&1
- # Copy the files to the chosen target directory
- scp -p ${_OUTPUT_DIR}/${SETUP_FILENAME} upload at code.gnucash.org:public_html/win32/$TARGET_DIR >> ${LOGFILE} 2>&1
- scp -p ${LOGFILE} upload at code.gnucash.org:public_html/win32/$LOG_DIR
-fi
diff --git a/build_tags.sh b/build_tags.sh
deleted file mode 100644
index 155e5f3..0000000
--- a/build_tags.sh
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/sh
-#
-# Notes:
-# 1. for this script to work, you need to make sure bash can
-# find svn on your system. If it's not in the default
-# Windows path, you will have to add it yourself, for
-# example like this:
-# - create a file /etc/profile.d/svn.sh
-# - add this line: export PATH=/c/soft/svn/bin:$PATH
-# (Use the real path to your svn installation, obviously)
-#
-# 2. Should this script change in the source repository, then the
-# svn update below will fail due to a limitation in Windows that
-# won't allow to change a file that is "in use". So in the rare
-# situation this script needs to be updated, you will need to
-# run the svn update once yourself.
-
-set -e
-
-function qpushd() { pushd "$@" >/dev/null; }
-function qpopd() { popd >/dev/null; }
-function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
-
-TAG_URL=http://svn.gnucash.org/repo/gnucash/tags
-
-################################################################
-# Setup our environment (we need the DOWNLOAD_DIR)
-
-qpushd "$(dirname $(unix_path "$0"))"
-pkgdir="`pwd`"
-svn update
-. functions.sh
-. defaults.sh
-
-
-################################################################
-# determine if there are any new tags since the last time we ran
-#
-
-# If we don't have a tagfile then start from 'now'
-tagfile=tags
-if [ ! -f ${tagfile} ] ; then
- svn ls -v ${TAG_URL} | awk '/[^.]\// { print $1"/"$6 }' > ${tagfile}
-fi
-
-# Figure out the new set of tags
-svn ls -v ${TAG_URL} | awk '/[^.]\// { print $1"/"$6 }' > ${tagfile}.new
-tags="`diff --suppress-common-lines ${tagfile} ${tagfile}.new | grep '^> ' | sed -e 's/^> //g'`"
-
-# move the new file into place
-mv -f ${tagfile}.new ${tagfile}
-
-################################################################
-# Now iterate over all the new tags (if any) and build a package
-
-for tag_rev in $tags ; do
- tag=${tag_rev#*/}
- tag=${tag%/*}
-
- # From 2.5 and up, tags are built from git
- tag_major=${tag%%.*}
- tag_tmp=${tag#*.}
- tag_minor=${tag_tmp%%.*}
- major_minor=$(( $tag_major*100 + $tag_minor ))
- if (( $major_minor >= 205 ))
- then
- continue
- fi
-
- tagbasedir=/c/soft/gnucash-${tag}
- tagdir=${tagbasedir}/gnucash
- rm -fr $tagbasedir
- mkdir -p ${tagdir}
- echo "Building tag $tag in $tagbasedir."
-
- # Copy the downloads to save time
- mkdir -p ${tagbasedir}/downloads
- cp -p $(unix_path ${DOWNLOAD_DIR})/* ${tagbasedir}/downloads
- echo "Successfully copied the downloads dir to ${tagbasedir}/downloads"
-
- # Check out the tag and setup custom.sh
- svn co -q ${TAG_URL}/${tag} ${tagdir}/repos
- w32pkg=${tagdir}/repos/packaging/win32
- cp -p "${pkgdir}/custom.sh" ${w32pkg}/custom.sh
- echo "Successfully checked out the sources"
-
- # Set the global directory to the tag build
- echo -n 'GLOBAL_DIR=c:\\soft\\gnucash-' >> ${w32pkg}/custom.sh
- echo "${tag}" >> ${w32pkg}/custom.sh
-
- # No need to update the sources we just checked out
- echo "UPDATE_SOURCES=no" >> ${w32pkg}/custom.sh
-
- # But set the repos url to the current tag anyway, it will be used
- # to name the log file
- echo -n "REPOS_URL=" >> ${w32pkg}/custom.sh
- echo "${TAG_URL}/${tag}" >> ${w32pkg}/custom.sh
-
- # Use the proper branch for the documentation
- echo -n "DOCS_URL=" >> ${w32pkg}/custom.sh
- echo "http://svn.gnucash.org/repo/gnucash-docs/branches/${tag_major}.${tag_minor}" >> ${w32pkg}/custom.sh
-
- # BUILD_FROM_TARBALL is special:
- # in install.sh place we check !=yes, in defaults.sh =yes, in dist.sh =no
- # We want it to look like 'no' in install and defaults, but yes in dist
- # so this hack works!
- echo "BUILD_FROM_TARBALL=maybe" >> ${w32pkg}/custom.sh
-
- # Point HH_DIR at the global installation because we don't need to redo it
- echo -n "HH_DIR=" >> ${w32pkg}/custom.sh
- echo "${GLOBAL_DIR}\\hh" | sed -e 's/\\/\\\\/g' >> ${w32pkg}/custom.sh
-
- # Now build the tag! (this will upload it too)
- # Use the build_package script from trunk (cwd), not from the tag
- qpushd ${w32pkg}
- ${pkgdir}/build_package.sh ${tag}
- qpopd
-done
diff --git a/daily_build.sh b/daily_build.sh
deleted file mode 100755
index a2ce0e2..0000000
--- a/daily_build.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-#
-# Notes:
-# 1. for this script to work, you need to make sure bash can
-# find svn on your system. If it's not in the default
-# Windows path, you will have to add it yourself, for
-# example like this:
-# - create a file /etc/profile.d/svn.sh
-# - add this line: export PATH=/c/soft/svn/bin:$PATH
-# (Use the real path to your svn installation, obviously)
-#
-# 2. The recommended setup is to call this script from within the
-# source code repository (packaging/win32 directory). This is
-# different from before, where it was assumed to be called
-# from outside the source code repository. To remain some
-# compatibility with the old way, svn update is called twice
-# - once for the repository (to update all)
-# - once for the build scripts (to also update the build scripts
-# using the old way)
-# The second invocation is superfluous if this script was called
-# from within the source code repository.
-#
-# 3. Should this script change in the source repository, then the
-# svn update below will fail due to a limitation in Windows that
-# won't allow to change a file that is "in use". So in the rare
-# situation this script needs to be updated, you will need to
-# run the svn update once yourself.
-
-set -e
-
-function qpushd() { pushd "$@" >/dev/null; }
-function qpopd() { popd >/dev/null; }
-function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
-
-qpushd "$(dirname $(unix_path "$0"))"
-. functions.sh
-. defaults.sh
-
-qpushd "$REPOS_DIR"
-svn update
-qpopd
-
-svn update
-
-./build_package.sh
-qpopd
diff --git a/weekly_build.sh b/weekly_build.sh
deleted file mode 100644
index 250d310..0000000
--- a/weekly_build.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-#
-# Notes:
-# 1. for this script to work, you need to make sure bash can
-# find svn on your system. If it's not in the default
-# Windows path, you will have to add it yourself, for
-# example like this:
-# - create a file /etc/profile.d/svn.sh
-# - add this line: export PATH=/c/soft/svn/bin:$PATH
-# (Use the real path to your svn installation, obviously)
-#
-# 2. The recommended setup is to call this script from within the
-# source code repository (packaging/win32 directory). This is
-# different from before, where it was assumed to be called
-# from outside the source code repository. To remain some
-# compatibility with the old way, svn update is called twice
-# - once for the repository (to update all)
-# - once for the build scripts (to also update the build scripts
-# using the old way)
-# The second invocation is superfluous if this script was called
-# from within the source code repository.
-#
-# 3. Should this script change in the source repository, then the
-# svn update below will fail due to a limitation in Windows that
-# won't allow to change a file that is "in use". So in the rare
-# situation this script needs to be updated, you will need to
-# run the svn update once yourself.
-
-set -e
-
-## Only run this script on Monday night (first day of the week)
-if [ `date +%u` != 1 ] ; then exit ; fi
-
-function qpushd() { pushd "$@" >/dev/null; }
-function qpopd() { popd >/dev/null; }
-function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
-
-qpushd "$(dirname $(unix_path "$0"))"
-svn update
-./build_package.sh
-qpopd
commit 063aeba7080ed5a7f923e5f31d3db624850a90b4
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Apr 1 11:56:14 2014 -0700
Write a timestamp log file at the beginning of a build on the server.
So that we know when/if the build has started.
diff --git a/build_package_git.sh b/build_package_git.sh
index ea842f3..9ca857e 100644
--- a/build_package_git.sh
+++ b/build_package_git.sh
@@ -10,10 +10,12 @@
set -o pipefail
set -e
LOG_DIR=build-logs
+BUILD_HOST="gnucash-win32"
+LOG_HOST=upload at code.gnucash.org:public_html/win32
function on_error() {
- if [ `hostname` = "gnucash-win32" ]; then
- scp -p ${LOGFILE} upload at code.gnucash.org:public_html/win32/$LOG_DIR
+ if [ `hostname` = ${BUILD_HOST} ]; then
+ scp -p ${LOGFILE} ${LOG_HOST}/$LOG_DIR
fi
exit
}
@@ -45,12 +47,20 @@ LOGFILE=${_OUTPUT_DIR}/${LOGFILENAME}
mkdir -p ${_OUTPUT_DIR}
# Small hack to create $LOG_DIR on the webserver if it doesn't exist yet
-if [ `hostname` = "gnucash-win32" ]; then
+if [ `hostname` = ${BUILD_HOST} ]; then
mkdir -p "$_OUTPUT_DIR/$LOG_DIR"
- scp -r "$_OUTPUT_DIR/$LOG_DIR" upload at code.gnucash.org:public_html/win32
+ scp -r "$_OUTPUT_DIR/$LOG_DIR" ${LOG_HOST}
rmdir "$_OUTPUT_DIR/$LOG_DIR"
fi
+# If we're running on the build server, copy a temporary logfile
+# content to the webserver to signal that the build is in progress
+if [ `hostname` = ${BUILD_HOST} ]; then
+ _PWD=`pwd`
+ echo "Build for tag \"${tag}\" is in progress (current working directory: ${_PWD}) ..." > ${LOGFILE}
+ scp -p ${LOGFILE} ${LOG_HOST}/${LOG_DIR}
+fi
+
set +e
trap on_error ERR
@@ -97,12 +107,12 @@ if [ -n "${tag}" ] ; then
fi
# If we're running on the build server then upload the files
-if [ `hostname` = "gnucash-win32" ]; then
+if [ `hostname` = ${BUILD_HOST} ]; then
# Small hack to create the $TARGET_DIR on the webserver if it doesn't exist yet
mkdir -p "$_OUTPUT_DIR/$TARGET_DIR"
- scp -r "$_OUTPUT_DIR/$TARGET_DIR" upload at code.gnucash.org:public_html/win32
+ scp -r "$_OUTPUT_DIR/$TARGET_DIR" ${LOG_HOST}
rmdir "$_OUTPUT_DIR/$TARGET_DIR"
# Copy the files to the chosen target directory
- scp -p ${LOGFILE} upload at code.gnucash.org:public_html/win32/$LOG_DIR
- scp -p ${_OUTPUT_DIR}/${SETUP_FILENAME} upload at code.gnucash.org:public_html/win32/$TARGET_DIR
+ scp -p ${LOGFILE} ${LOG_HOST}/$LOG_DIR
+ scp -p ${_OUTPUT_DIR}/${SETUP_FILENAME} ${LOG_HOST}/$TARGET_DIR
fi
commit a75b760fd0bb1043ef7c0600355f4d912112c00c
Author: Christian Stimming <christian at cstimming.de>
Date: Mon Mar 31 22:44:02 2014 +0200
Win32: Update gwenhyhwfar/aqbanking again, but slightly more cautious (gwen-4.11.0 does not compile on win/mingw right now)
diff --git a/defaults.sh b/defaults.sh
index 50c2a04..11ed99b 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -343,16 +343,16 @@ set_default LIBOFX_DIR $GLOBAL_DIR\\libofx
#set_default LIBOFX_PATCH `pwd`/libofx-x.x.x.patch
## online banking: gwenhywfar+aqbanking
-GWENHYWFAR_VERSION="4.9.0beta"
-set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=72&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
+GWENHYWFAR_VERSION="4.10.0beta"
+set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=73&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
KTOBLZCHECK_VERSION="1.44"
set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-${KTOBLZCHECK_VERSION}.tar.gz"
# ktoblzcheck is being installed into GWENHYWFAR_DIR
-AQBANKING_VERSION="5.3.0beta"
-set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=105&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
+AQBANKING_VERSION="5.4.2beta"
+set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=114&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
set_default SQLITE3_URL "http://sqlite.org/sqlite-amalgamation-3.6.1.tar.gz"
commit be97abc145ee898a3cd6d8d9bb7df4009184d84b
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Mar 30 21:35:40 2014 -0700
Revert "Win32 build: Update aqbanking version numbers"
This reverts commit ae26a29fbd899272f4685b7d162932021ccb4ae7.
Gwen 4.10 and later breaks building GnuCash, and newer AQBanking
versions won't build with Gwen 4.9.
diff --git a/defaults.sh b/defaults.sh
index ba832cf..50c2a04 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -343,16 +343,16 @@ set_default LIBOFX_DIR $GLOBAL_DIR\\libofx
#set_default LIBOFX_PATCH `pwd`/libofx-x.x.x.patch
## online banking: gwenhywfar+aqbanking
-GWENHYWFAR_VERSION="4.11.0beta"
-set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=74&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
+GWENHYWFAR_VERSION="4.9.0beta"
+set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=72&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
KTOBLZCHECK_VERSION="1.44"
set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-${KTOBLZCHECK_VERSION}.tar.gz"
# ktoblzcheck is being installed into GWENHYWFAR_DIR
-AQBANKING_VERSION="5.4.1beta"
-set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=113&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
+AQBANKING_VERSION="5.3.0beta"
+set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=105&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
set_default SQLITE3_URL "http://sqlite.org/sqlite-amalgamation-3.6.1.tar.gz"
commit 1e68d3745367f7f6d452baade7e454f340332105
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Mar 30 21:31:18 2014 -0700
Revert "Win32: Roll back Gwenhywfar to 4.9.0 to resolve broken build."
This reverts commit 4e5e0621322147ff6ada9d72ace36e213dec61c7.
Preparing to revert its predecessor
diff --git a/defaults.sh b/defaults.sh
index 4816cb5..ba832cf 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -343,7 +343,7 @@ set_default LIBOFX_DIR $GLOBAL_DIR\\libofx
#set_default LIBOFX_PATCH `pwd`/libofx-x.x.x.patch
## online banking: gwenhywfar+aqbanking
-GWENHYWFAR_VERSION="4.9.0beta"
+GWENHYWFAR_VERSION="4.11.0beta"
set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=74&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
commit 2d45a51f3791c82c315854d2a518657d3cae81e4
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Mar 28 22:52:45 2014 -0700
Win32: Roll back Gwenhywfar to 4.9.0 to resolve broken build.
cc1.exe: warnings being treated as errors
In file included from c:/soft/aqbanking/include/aqbanking5/aqbanking/abgui.h:16:0,
from ../../../../repos/src/import-export/aqb/gnc-ab-utils.c:52:
c:/soft/gwenhywfar/include/gwenhywfar4/gwenhywfar/gui_be.h:60:10: error: 'libintl_printf' is an unrecognized format function type
make[5]: *** [gnc-ab-utils.lo] Error 1
diff --git a/defaults.sh b/defaults.sh
index ba832cf..4816cb5 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -343,7 +343,7 @@ set_default LIBOFX_DIR $GLOBAL_DIR\\libofx
#set_default LIBOFX_PATCH `pwd`/libofx-x.x.x.patch
## online banking: gwenhywfar+aqbanking
-GWENHYWFAR_VERSION="4.11.0beta"
+GWENHYWFAR_VERSION="4.9.0beta"
set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=74&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
commit 41e0dbb0989311f6a62e63f9ad3c71c34a6ed14b
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Mar 28 21:47:41 2014 -0700
Ensure that the autoconf and automake checked are the ones we install
rather than some random one installed elsewhere on the path.
diff --git a/install-impl.sh b/install-impl.sh
index f8a65e6..9329a87 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -352,7 +352,7 @@ function inst_autotools() {
add_to_env $_AUTOTOOLS_UDIR/bin PATH
add_to_env -I$_AUTOTOOLS_UDIR/include AUTOTOOLS_CPPFLAGS
add_to_env -L$_AUTOTOOLS_UDIR/lib AUTOTOOLS_LDFLAGS
- if quiet autoconf --help && quiet automake --help
+ if quiet $_AUTOTOOLS_UDIR/bin/autoconf --help && quiet $_AUTOTOOLS_UDIR/bin/automake --help
then
echo "autoconf/automake already installed in $_AUTOTOOLS_UDIR. skipping."
else
commit b03759a0733eadabc312436b60a77f63317a2d11
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Mar 28 21:46:26 2014 -0700
Update Active Perl version to the one current "community edition".
diff --git a/defaults.sh b/defaults.sh
index 4e77870..ba832cf 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -178,7 +178,7 @@ set_default READLINE_BIN_URL "$SF_MIRROR/gnuwin32/readline-5.0-1-bin.zip"
set_default READLINE_LIB_URL "$SF_MIRROR/gnuwin32/readline-5.0-1-lib.zip"
set_default READLINE_DIR $GLOBAL_DIR\\readline
-set_default ACTIVE_PERL_URL "http://downloads.activestate.com/ActivePerl/releases/5.14.4.1405/ActivePerl-5.14.4.1405-MSWin32-x86-296746.zip"
+set_default ACTIVE_PERL_URL "http://downloads.activestate.com/ActivePerl/releases/5.16.3.1603/ActivePerl-5.16.3.1603-MSWin32-x86-296746.zip"
set_default ACTIVE_PERL_DIR $GLOBAL_DIR\\active-perl
set_default AUTOCONF_URL "http://ftp.gnu.org/gnu/autoconf/autoconf-2.63.tar.bz2"
commit ad4b1beee1c271fa117e83571692250b896c5ade
Author: Christian Stimming <christian at cstimming.de>
Date: Thu Mar 6 22:35:28 2014 +0100
Win32 build: Update aqbanking version numbers
diff --git a/defaults.sh b/defaults.sh
index 39de60d..4e77870 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -343,16 +343,16 @@ set_default LIBOFX_DIR $GLOBAL_DIR\\libofx
#set_default LIBOFX_PATCH `pwd`/libofx-x.x.x.patch
## online banking: gwenhywfar+aqbanking
-GWENHYWFAR_VERSION="4.9.0beta"
-set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=72&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
+GWENHYWFAR_VERSION="4.11.0beta"
+set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=74&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
KTOBLZCHECK_VERSION="1.44"
set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-${KTOBLZCHECK_VERSION}.tar.gz"
# ktoblzcheck is being installed into GWENHYWFAR_DIR
-AQBANKING_VERSION="5.3.0beta"
-set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=105&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
+AQBANKING_VERSION="5.4.1beta"
+set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=113&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
set_default SQLITE3_URL "http://sqlite.org/sqlite-amalgamation-3.6.1.tar.gz"
commit a508042834977ac3fa85be6165130c71e4ae6da6
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sun Jan 26 19:11:44 2014 +0000
Win32: update daily_build.bat rules
Stop building svn based tags. Those were for 2.4 and older
Prepare to do weekly 2.6 builds once we that branch is created
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23775 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/daily_build.bat b/daily_build.bat
index 5a605b4..3828eee 100644
--- a/daily_build.bat
+++ b/daily_build.bat
@@ -6,9 +6,8 @@ cd c:\soft\gnucash\repos\packaging\win32\
rem Development build (daily)
c:\msys\1.0\bin\sh.exe --login c:\soft\gnucash\repos\packaging\win32\daily_build_git.sh
-rem Tags build for 2.4 and older (daily -- only tags that weren't built yet)
-c:\msys\1.0\bin\sh.exe --login c:\soft\packaging\build_tags.sh
rem Tags build for 2.5 and newer (daily -- only tags that weren't built yet)
c:\msys\1.0\bin\sh.exe --login c:\soft\gnucash\repos\packaging\win32\build_tags_git.sh
-rem 2.4 branch build (weekly)
-c:\msys\1.0\bin\sh.exe --login c:\soft-2.4\packaging\weekly_build.sh
\ No newline at end of file
+rem 2.6 branch build (weekly)
+rem There's no 2.6 branch yet. Hence the line below is commented out
+rem c:\msys\1.0\bin\sh.exe --login c:\soft-2.6\gnucash\repos\packaging\weekly_build.sh
\ No newline at end of file
commit 590004ad3d68047d54318665e94b07298df79382
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sun Jan 26 18:57:01 2014 +0000
Win32 tag builds: use existing download directory instead of copying it
This saves a lot on disk space
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23774 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_tags_git.sh b/build_tags_git.sh
index 8e6fced..b394b6f 100644
--- a/build_tags_git.sh
+++ b/build_tags_git.sh
@@ -85,10 +85,6 @@ for tag_rev in $tags ; do
rm -fr $tagbasedir
mkdir -p ${tagdir}
- # Copy the downloads to save time
- mkdir -p ${tagbasedir}/downloads
- cp -p $(unix_path ${DOWNLOAD_DIR})/* ${tagbasedir}/downloads
-
# Check out the tag and setup custom.sh
qpushd ${tagdir}
$GIT_CMD clone ${REPOS_URL} repos
@@ -103,6 +99,11 @@ for tag_rev in $tags ; do
echo -n 'GLOBAL_DIR=c:\\soft\\gnucash-' >> ${w32pkg}/custom.sh
echo "${tag}" >> ${w32pkg}/custom.sh
+ # Point DOWNLOAD_DIR at the global installation so we can reuse
+ # most of the already downloaded packages
+ echo -n "DOWNLOAD_DIR=" >> ${w32pkg}/custom.sh
+ echo "${DOWNLOAD_DIR}" | sed -e 's/\\/\\\\/g' >> ${w32pkg}/custom.sh
+
# UPDATE_SOURCES is obsolete, but preserved here to allow the
# current script to also build older tags, that may still
# use this parameter.
commit c079ba73dfa7b2cb043214b8a2f7c6ec2d7e034a
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sun Jan 19 20:52:46 2014 +0000
Win32: update swig to 2.0.11 to fix the build after commit 23702
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23719 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 3deff0a..39de60d 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -272,7 +272,7 @@ set_default ZLIB_URL "$GNOME_WIN32_DEPS_URL/zlib_1.2.5-2_win32.zi
set_default ZLIB_DEV_URL "$GNOME_WIN32_DEPS_URL/zlib-dev_1.2.5-2_win32.zip"
set_default GNOME_DIR $GLOBAL_DIR\\gnome
-set_default SWIG_URL "$SF_MIRROR/swig/swigwin-1.3.36.zip"
+set_default SWIG_URL "$SF_MIRROR/swig/swigwin-2.0.11.zip"
set_default SWIG_DIR $GLOBAL_DIR\\swig
set_default PCRE_BIN_URL "$SF_MIRROR/gnuwin32/pcre-7.0-bin.zip"
commit 8233931f14d8f3a466adf5458c4f89c094d304d6
Author: Christian Stimming <stimming at tuhh.de>
Date: Sun Jan 12 19:48:59 2014 +0000
Win32 build: Update aqbanking to most recent version 5.3.0
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23686 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index c89af89..3deff0a 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -351,8 +351,8 @@ KTOBLZCHECK_VERSION="1.44"
set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-${KTOBLZCHECK_VERSION}.tar.gz"
# ktoblzcheck is being installed into GWENHYWFAR_DIR
-AQBANKING_VERSION="5.2.0beta"
-set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=104&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
+AQBANKING_VERSION="5.3.0beta"
+set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=105&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
set_default SQLITE3_URL "http://sqlite.org/sqlite-amalgamation-3.6.1.tar.gz"
commit f851c936847bf691856b0b9b2ff4bdc1bf2067e4
Author: Christian Stimming <stimming at tuhh.de>
Date: Sun Jan 12 19:48:49 2014 +0000
Win32 build: Remove support for aqbanking < 5.x because 5.x has been released since 2010 by now.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23685 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/README b/README
index 825524f..8a77712 100644
--- a/README
+++ b/README
@@ -71,9 +71,9 @@ Note: when installing software as asked below, avoid using paths
you can specify the path to git's installation location via GIT_DIR
- If you want verbose output of any script step, add "set -x" to that file.
-* Either, 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"; or skip building
- the AqBanking Setup Wizard by specifying "AQBANKING_WITH_QT=no".
+* (No Qt is needed. In earlier versions of libaqbanking, qt was needed
+ for the aqbanking setup wizard, but in aqbanking-5.x this is no
+ longer the case.)
Start/Enter any MSYS shell window. Let the automated build begin by:
diff --git a/custom.sh.sample b/custom.sh.sample
index ce8bd30..9c1796d 100644
--- a/custom.sh.sample
+++ b/custom.sh.sample
@@ -7,7 +7,6 @@
# REPOS_URL="svn+ssh://<dev>@svn.gnucash.org/repo/gnucash/trunk"
# SF_MIRROR="http://switch.dl.sourceforge.net/sourceforge"
# DISABLE_OPTIMIZATIONS=yes
-# AQBANKING_WITH_QT=no
# GLOBAL_DIR=Z:\\mydir # all directories will use this
# WGET_RATE=50k #limit download bandwith to 50KB/s
# NO_SAVE_PROFILE=yes # don't save env settings to /etc/profile.d
@@ -18,4 +17,4 @@
# QTDIR=c:\\Qt\\4.2.3
# CROSS_COMPILE=yes
#Uncomment this for building on Win7 (and maybe Vista):
-#EXTRA_CFLAGS="-fno-builtin-dgettext -fno-builtin-towupper -fno-builtin-iswlower"
\ No newline at end of file
+#EXTRA_CFLAGS="-fno-builtin-dgettext -fno-builtin-towupper -fno-builtin-iswlower"
diff --git a/defaults.sh b/defaults.sh
index 003d278..c89af89 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -343,39 +343,17 @@ set_default LIBOFX_DIR $GLOBAL_DIR\\libofx
#set_default LIBOFX_PATCH `pwd`/libofx-x.x.x.patch
## online banking: gwenhywfar+aqbanking
-set_default AQBANKING5 yes
-# If sticking to aqbanking4, make sure to enable the QtCore4.dll et al
-# in gnucash.iss.in again because in aqbanking4 those DLLs are still
-# needed.
-
-if [ "$AQBANKING5" = "yes" ]; then
- GWENHYWFAR_VERSION="4.9.0beta"
- set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=72&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
-else
- GWENHYWFAR_VERSION="3.11.3"
- set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=31&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
- #set_default GWENHYWFAR_PATCH `pwd`/gwenhywfar-x.x.x.patch
-fi
+GWENHYWFAR_VERSION="4.9.0beta"
+set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=72&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
KTOBLZCHECK_VERSION="1.44"
set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-${KTOBLZCHECK_VERSION}.tar.gz"
# ktoblzcheck is being installed into GWENHYWFAR_DIR
-if [ "$AQBANKING5" = "yes" ]; then
- AQBANKING_VERSION="5.2.0beta"
- set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=104&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
- set_default AQBANKING_WITH_QT no
-else
- AQBANKING_VERSION="4.2.4"
- set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=50&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
- set_default AQBANKING_PATCH `pwd`/aqbanking-4.2.4-r2132.patch
- set_default AQBANKING_WITH_QT yes
-fi
+AQBANKING_VERSION="5.2.0beta"
+set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=104&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
-# 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 QT_WIN_SRC_URL "ftp://ftp.qt.nokia.com/qt/source/qt-all-opensource-src-4.5.3.zip"
set_default SQLITE3_URL "http://sqlite.org/sqlite-amalgamation-3.6.1.tar.gz"
set_default SQLITE3_DIR $GLOBAL_DIR\\sqlite3
diff --git a/dist-impl.sh b/dist-impl.sh
index 83190ad..579c7f7 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -12,12 +12,6 @@ function dist_prepare() {
if [ -x $DIST_DIR ]; then
die "Please remove ${DIST_DIR} first"
fi
- if [ "$AQBANKING5" != "yes" ] ; then
- if [ x$AQBANKING_WITH_QT != xyes ]; then
- die "The aqbanking wizard is required to create the Windows installer.
-Please set AQBANKING_WITH_QT to yes and rerun install.sh first."
- fi
- fi
_UNZIP_UDIR=`unix_path $UNZIP_DIR`
_AUTOTOOLS_UDIR=`unix_path $AUTOTOOLS_DIR`
_GUILE_UDIR=`unix_path $GUILE_DIR`
@@ -237,15 +231,9 @@ function dist_gnucash() {
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' )
- if [ "$AQBANKING5" != "yes" ] ; then
- # aqbanking < 5
- AQBANKING_VERSION_H=${_AQBANKING_UDIR}/include/aqbanking/version.h
- GWENHYWFAR_VERSION_H=${_GWENHYWFAR_UDIR}/include/gwenhywfar3/gwenhywfar/version.h
- else
- # aqbanking >= 5.0.0
- AQBANKING_VERSION_H=${_AQBANKING_UDIR}/include/aqbanking5/aqbanking/version.h
- GWENHYWFAR_VERSION_H=${_GWENHYWFAR_UDIR}/include/gwenhywfar4/gwenhywfar/version.h
- fi
+ # aqbanking >= 5.0.0
+ AQBANKING_VERSION_H=${_AQBANKING_UDIR}/include/aqbanking5/aqbanking/version.h
+ GWENHYWFAR_VERSION_H=${_GWENHYWFAR_UDIR}/include/gwenhywfar4/gwenhywfar/version.h
_AQBANKING_SO_EFFECTIVE=$(awk '/AQBANKING_SO_EFFECTIVE / { print $3 }' ${AQBANKING_VERSION_H} )
_GWENHYWFAR_SO_EFFECTIVE=$(awk '/GWENHYWFAR_SO_EFFECTIVE / { print $3 }' ${GWENHYWFAR_VERSION_H} )
@@ -257,13 +245,6 @@ function dist_gnucash() {
}
function dist_finish() {
- if [ "$AQBANKING_WITH_QT" = "yes" ]; then
- assert_one_dir ${DIST_UDIR}/lib/aqbanking/plugins/*/wizards
- _qt3_wizard_path=`ls ${DIST_UDIR}/lib/aqbanking/plugins/*/wizards/qt3-wizard.exe`
- mv ${_qt3_wizard_path} $DIST_UDIR/bin
- cp $_INSTALL_UDIR/bin/redirect.exe ${_qt3_wizard_path}
- fi
-
# Strip redirections in distributed libtool .la files
for file in $DIST_UDIR/bin/*.la; do
cat $file | sed 's,^libdir=,#libdir=,' > $file.new
diff --git a/gnucash.iss.in b/gnucash.iss.in
index 0f572f8..784da42 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -71,18 +71,6 @@ Source: "@prefix@\..\dist\lib\*"; DestDir: "{app}\lib"; Flags: recursesubdirs; C
;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!
-;; Additionally, we ship the Qt DLLs because the Online-Banking-Wizard
-;; lib/aqbanking/plugins/@-aqbanking_so_effective-@/wizards/qt3-wizard.exe needs them.
-;Source: "@-qtbindir-@\QtCore4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-;Source: "@-qtbindir-@\QtGui4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-;Source: "@-qtbindir-@\mingwm10.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-;;; The following are all needed by Qt3Support
-;Source: "@-qtbindir-@\Qt3Support4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-;Source: "@-qtbindir-@\QtXml4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-;Source: "@-qtbindir-@\QtSql4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-;Source: "@-qtbindir-@\QtNetwork4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-
;; The translations
;Source: "@prefix@\..\dist\share\locale\*"; DestDir: "{app}\share\locale"; Flags: recursesubdirs; Components: translations
;
diff --git a/install-impl.sh b/install-impl.sh
index b493af1..f8a65e6 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -317,60 +317,28 @@ function inst_aqbanking() {
else
XMLMERGE="${_GWENHYWFAR_UDIR}/bin/xmlmerge"
fi
- if [ "$AQBANKING5" != "yes" ] ; then
- _AQ_BACKENDS="aqhbci aqofxconnect"
- else
- # FIXME: Maybe also aqpaypal?
- _AQ_BACKENDS="aqhbci aqofxconnect"
- fi
- if test x$AQBANKING_WITH_QT = xyes; then
- inst_qt4
- if [ -n "$AQBANKING_PATCH" -a -f "$AQBANKING_PATCH" ] ; then
- patch -p1 < $AQBANKING_PATCH
- #automake
- #aclocal -I m4 ${ACLOCAL_FLAGS}
- #autoconf
- fi
- ./configure ${HOST_XCOMPILE} \
- --with-gwen-dir=${_GWENHYWFAR_UDIR} \
- --with-xmlmerge=${XMLMERGE} \
- --with-frontends="cbanking qbanking" \
- --with-backends="${_AQ_BACKENDS}" \
- CPPFLAGS="${_AQ_CPPFLAGS} ${GMP_CPPFLAGS}" \
- LDFLAGS="${_AQ_LDFLAGS} ${GMP_LDFLAGS}" \
- qt3_libs="-L${_QTDIR}/lib -L${_QTDIR}/bin -lQtCore4 -lQtGui4 -lQt3Support4" \
- qt3_includes="-I${_QTDIR}/include -I${_QTDIR}/include/Qt -I${_QTDIR}/include/QtCore -I${_QTDIR}/include/QtGui -I${_QTDIR}/include/Qt3Support" \
- --prefix=${_AQBANKING_UDIR}
- make qt4-port
- make clean
- else
- if [ -n "$AQBANKING_PATCH" -a -f "$AQBANKING_PATCH" ] ; then
- patch -p1 < $AQBANKING_PATCH
- #automake
- #aclocal -I m4 ${ACLOCAL_FLAGS}
- #autoconf
- fi
- ./configure ${HOST_XCOMPILE} \
- --with-gwen-dir=${_GWENHYWFAR_UDIR} \
- --with-xmlmerge=${XMLMERGE} \
- --with-frontends="cbanking" \
- --with-backends="${_AQ_BACKENDS}" \
- CPPFLAGS="${_AQ_CPPFLAGS} ${GMP_CPPFLAGS}" \
- LDFLAGS="${_AQ_LDFLAGS} ${GMP_LDFLAGS}" \
- --prefix=${_AQBANKING_UDIR}
+ _AQ_BACKENDS="aqhbci aqofxconnect"
+ if [ -n "$AQBANKING_PATCH" -a -f "$AQBANKING_PATCH" ] ; then
+ patch -p1 < $AQBANKING_PATCH
+ #automake
+ #aclocal -I m4 ${ACLOCAL_FLAGS}
+ #autoconf
fi
+ ./configure ${HOST_XCOMPILE} \
+ --with-gwen-dir=${_GWENHYWFAR_UDIR} \
+ --with-xmlmerge=${XMLMERGE} \
+ --with-frontends="cbanking" \
+ --with-backends="${_AQ_BACKENDS}" \
+ CPPFLAGS="${_AQ_CPPFLAGS} ${GMP_CPPFLAGS}" \
+ LDFLAGS="${_AQ_LDFLAGS} ${GMP_LDFLAGS}" \
+ --prefix=${_AQBANKING_UDIR}
make
rm -rf ${_AQBANKING_UDIR}
make install
qpopd
qpushd ${_AQBANKING_UDIR}/bin
- if [ "$AQBANKING5" = "yes" ]; then
- exetype aqbanking-cli.exe console
- exetype aqhbci-tool4.exe console
- else
- exetype aqbanking-cli.exe console
- exetype aqhbci-tool4.exe console
- fi
+ exetype aqbanking-cli.exe console
+ exetype aqhbci-tool4.exe console
qpopd
${PKG_CONFIG} --exists aqbanking || die "AqBanking not installed correctly"
rm -rf ${TMP_UDIR}/aqbanking-*
@@ -765,32 +733,15 @@ function inst_gwenhywfar() {
assert_one_dir $TMP_UDIR/gwenhywfar-*
qpushd $TMP_UDIR/gwenhywfar-*
# circumvent binreloc bug, http://trac.autopackage.org/ticket/28
- if [ "$AQBANKING5" = "yes" ]; then
- # Note: gwenhywfar-3.x and higher don't use openssl anymore.
- ./configure ${HOST_XCOMPILE} \
- --with-libgcrypt-prefix=$_GNUTLS_UDIR \
- --disable-binreloc \
- --disable-ssl \
- --prefix=$_GWENHYWFAR_UDIR \
- --with-guis=gtk2 \
- CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS} `pkg-config --cflags gtk+-2.0`" \
- LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GNUTLS_LDFLAGS} -lintl"
- else
- if [ -n "$GWENHYWFAR_PATCH" -a -f "$GWENHYWFAR_PATCH" ] ; then
- patch -p1 < $GWENHYWFAR_PATCH
- #aclocal -I m4 ${ACLOCAL_FLAGS}
- #automake
- #autoconf
- fi
- # Note: gwenhywfar-3.x and higher don't use openssl anymore.
- ./configure ${HOST_XCOMPILE} \
- --with-libgcrypt-prefix=$_GNUTLS_UDIR \
- --disable-binreloc \
- --disable-ssl \
- --prefix=$_GWENHYWFAR_UDIR \
- CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS}" \
- LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GNUTLS_LDFLAGS} -lintl"
- fi
+ # Note: gwenhywfar-3.x and higher don't use openssl anymore.
+ ./configure ${HOST_XCOMPILE} \
+ --with-libgcrypt-prefix=$_GNUTLS_UDIR \
+ --disable-binreloc \
+ --disable-ssl \
+ --prefix=$_GWENHYWFAR_UDIR \
+ --with-guis=gtk2 \
+ CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS} `pkg-config --cflags gtk+-2.0`" \
+ LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GNUTLS_LDFLAGS} -lintl"
make
# [ "$CROSS_COMPILE" != "yes" ] && make check
rm -rf ${_GWENHYWFAR_UDIR}
@@ -1205,34 +1156,6 @@ function inst_pcre() {
quiet ${LD} $PCRE_LDFLAGS -lpcre -o $TMP_UDIR/ofile || die "pcre not installed correctly"
}
-function inst_qt4() {
- # This section is not a full install, but the .la creation is
- # already useful in itself and that's why it has already been
- # added.
-
- [ "$QTDIR" ] || die "QTDIR is not set. Please install Qt and set that variable in custom.sh, or deactivate AQBANKING_WITH_QT"
- export QTDIR=`unix_path ${QTDIR}` # help configure of aqbanking
- _QTDIR=$QTDIR
- # This section creates .la files for the Qt-4 DLLs so that
- # libtool correctly links to the DLLs.
- if test ! -f ${_QTDIR}/lib/libQtCore4.la ; then
- qpushd ${_QTDIR}/lib
- for A in lib*.a; do
- LIBBASENAME=`basename ${A} .a`
- OUTFILE="${LIBBASENAME}.la"
- BASENAME=`echo ${LIBBASENAME} | sed -e"s/lib//" `
- DLLNAME="${BASENAME}.dll"
-
- # Create la file
- echo "# Generated by foo bar libtool" > $OUTFILE
- echo "dlname='../bin/${DLLNAME}'" >> $OUTFILE
- echo "library_names='${DLLNAME}'" >> $OUTFILE
- echo "libdir='${_QTDIR}/bin'" >> $OUTFILE
- done
- qpopd
- fi
-}
-
function inst_readline() {
setup Readline
_READLINE_UDIR=`unix_path $READLINE_DIR`
commit 21aa0845e062bdd7d85e22ac9aa0af810b5b292e
Author: Christian Stimming <stimming at tuhh.de>
Date: Tue Jan 7 10:30:24 2014 +0000
Win32 build: Update libofx version to use latest bugfixes there
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23671 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 931b780..003d278 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -337,7 +337,7 @@ set_default OPENSP_URL "$SF_MIRROR/openjade/OpenSP-1.5.2.tar.gz"
set_default OPENSP_DIR $GLOBAL_DIR\\opensp
set_default OPENSP_PATCH `pwd`/opensp-1.5.2.patch
-LIBOFX_VERSION="0.9.8"
+LIBOFX_VERSION="0.9.9"
set_default LIBOFX_URL "$SF_MIRROR/libofx/libofx-${LIBOFX_VERSION}.tar.gz"
set_default LIBOFX_DIR $GLOBAL_DIR\\libofx
#set_default LIBOFX_PATCH `pwd`/libofx-x.x.x.patch
commit 6da9383a1f9846a2d760ea7520d00a04bc4616cf
Author: Christian Stimming <stimming at tuhh.de>
Date: Thu Jan 2 21:52:45 2014 +0000
Win32: Update gwenhywfar/aqbanking/gnutls with recent versions.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23664 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 6129e04..931b780 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -200,7 +200,7 @@ set_default GUILE_PATCH `pwd`/guile-1.8.8.patch
set_default OPENSSL_URL "http://www.openssl.org/source/openssl-0.9.8j.tar.gz"
set_default OPENSSL_DIR $GLOBAL_DIR\\openssl
-GNUTLS_VERSION="2.8.6"
+GNUTLS_VERSION="2.10.1"
set_default GNUTLS_URL "http://josefsson.org/gnutls4win/gnutls-${GNUTLS_VERSION}.zip"
set_default GNUTLS_DIR $GLOBAL_DIR\\gnutls
@@ -349,8 +349,8 @@ set_default AQBANKING5 yes
# needed.
if [ "$AQBANKING5" = "yes" ]; then
- GWENHYWFAR_VERSION="4.8.0beta"
- set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=71&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
+ GWENHYWFAR_VERSION="4.9.0beta"
+ set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=72&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
else
GWENHYWFAR_VERSION="3.11.3"
set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=31&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
@@ -358,13 +358,13 @@ else
fi
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
-KTOBLZCHECK_VERSION="1.43"
+KTOBLZCHECK_VERSION="1.44"
set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-${KTOBLZCHECK_VERSION}.tar.gz"
# ktoblzcheck is being installed into GWENHYWFAR_DIR
if [ "$AQBANKING5" = "yes" ]; then
- AQBANKING_VERSION="5.1.0beta"
- set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=103&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
+ AQBANKING_VERSION="5.2.0beta"
+ set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=104&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
set_default AQBANKING_WITH_QT no
else
AQBANKING_VERSION="4.2.4"
commit b8fe448681db6017fc7416b1efb06486ed9759f7
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Dec 31 03:27:12 2013 +0000
Fix another broken build
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23659 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_tags.sh b/build_tags.sh
index c062382..155e5f3 100644
--- a/build_tags.sh
+++ b/build_tags.sh
@@ -98,7 +98,7 @@ for tag_rev in $tags ; do
# Use the proper branch for the documentation
echo -n "DOCS_URL=" >> ${w32pkg}/custom.sh
- echo "http://svn.gnucash.org/repo/gnucash-docs/${tag_major}.${tag_minor}" >> ${w32pkg}/custom.sh
+ echo "http://svn.gnucash.org/repo/gnucash-docs/branches/${tag_major}.${tag_minor}" >> ${w32pkg}/custom.sh
# BUILD_FROM_TARBALL is special:
# in install.sh place we check !=yes, in defaults.sh =yes, in dist.sh =no
commit d30a54aec7b07bda99b279fd888b1db786af2086
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Dec 20 22:53:03 2013 +0000
Fix up and update strawberry perl URIs
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23587 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/getperl.vbs b/getperl.vbs
index fc2dc29..d058245 100644
--- a/getperl.vbs
+++ b/getperl.vbs
@@ -11,7 +11,7 @@ Dim tempFolder: tempFolder = fso.GetSpecialFolder(TemporaryFolder)
strHDLocation = Wscript.Arguments.Item(0)
' Set your settings
- strFileURL = "https://strawberry-perl.googlecode.com/files/strawberry-perl-5.18.1.1-win32.msi"
+ strFileURL = "https://strawberry-perl.googlecode.com/files/strawberry-perl-5.18.1.1-32bit.msi"
Wscript.Echo " copying " & strFileURL
Wscript.Echo " to " & strHDLocation
diff --git a/install-fq-mods.cmd b/install-fq-mods.cmd
index 25a705f..5fb1c0b 100644
--- a/install-fq-mods.cmd
+++ b/install-fq-mods.cmd
@@ -85,7 +85,7 @@ echo.
echo Found perl version %_perlmajor%.%_perlminor%, but GnuCash requires at least version 5.8.
echo Please install version 5.8 or above of
echo * ActivePerl (http://www.activestate.com/store/activeperl) or
-echo * Strawberry Perl (http://strawberry-perl.googlecode.com/files/)
+echo * Strawberry Perl (http://code.google.com/p/strawberry-perl/downloads/)
echo and add the bin directory to your Path environment variable.
goto error
commit 5c4c77766f15be8e201865bd778e4af2dd205116
Author: Frank H. Ellenberger <f.ellenberger at online.de>
Date: Sun Dec 15 21:15:37 2013 +0000
[23570] there was still one "_JP" although currently commented out
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23573 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
index f92eb7c..b493af1 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1631,7 +1631,7 @@ function inst_docs() {
make_chm guide de
make_chm guide it
# Temporarily disabled because it makes hh
-# make_chm guide ja_JP "--stringparam chunker.output.encoding Shift_JIS --stringparam htmlhelp.encoding Shift_JIS"
+# make_chm guide ja "--stringparam chunker.output.encoding Shift_JIS --stringparam htmlhelp.encoding Shift_JIS"
make_chm help C
make_chm help de
# make_chm help it
commit 00e8996259b3f36f7ef73c04d3e591665af5db78
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Dec 15 19:30:55 2013 +0000
Change guide and help translation directories
To match gnucash-docs r23523
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23570 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
index fc8e146..f92eb7c 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1626,15 +1626,15 @@ function inst_docs() {
fi
setup docs
_DOCS_INST_UDIR=`unix_path $INSTALL_DIR`/share/gnucash/help
- mkdir -p $_DOCS_INST_UDIR/{C,de_DE,it_IT,ja_JP}
+ mkdir -p $_DOCS_INST_UDIR/{C,de,it,ja}
make_chm guide C
- make_chm guide de_DE
- make_chm guide it_IT
+ make_chm guide de
+ make_chm guide it
# Temporarily disabled because it makes hh
# make_chm guide ja_JP "--stringparam chunker.output.encoding Shift_JIS --stringparam htmlhelp.encoding Shift_JIS"
make_chm help C
- make_chm help de_DE
-# make_chm help it_IT
+ make_chm help de
+# make_chm help it
qpopd
}
commit 0064af0bf0a7464eb42ba7f28c6120811be7563b
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed Dec 11 17:43:37 2013 +0000
Build svn releases with documentation from a matching branch
This is a quick hack to get the last 2.4 gnucash build
use the 2.4 branch of the documentation.
This should be implemented properly for git as well still,
but may need some more thought.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23543 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_tags.sh b/build_tags.sh
index 0f03ca4..c062382 100644
--- a/build_tags.sh
+++ b/build_tags.sh
@@ -95,6 +95,10 @@ for tag_rev in $tags ; do
# to name the log file
echo -n "REPOS_URL=" >> ${w32pkg}/custom.sh
echo "${TAG_URL}/${tag}" >> ${w32pkg}/custom.sh
+
+ # Use the proper branch for the documentation
+ echo -n "DOCS_URL=" >> ${w32pkg}/custom.sh
+ echo "http://svn.gnucash.org/repo/gnucash-docs/${tag_major}.${tag_minor}" >> ${w32pkg}/custom.sh
# BUILD_FROM_TARBALL is special:
# in install.sh place we check !=yes, in defaults.sh =yes, in dist.sh =no
commit ff92686c536ee2f6ebeefded79bf1385dccaaa93
Author: Christian Stimming <stimming at tuhh.de>
Date: Thu Nov 28 09:45:34 2013 +0000
Win32: Update aqbanking versions
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23453 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index eacaba6..6129e04 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -349,8 +349,8 @@ set_default AQBANKING5 yes
# needed.
if [ "$AQBANKING5" = "yes" ]; then
- GWENHYWFAR_VERSION="4.7.0beta"
- set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=70&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
+ GWENHYWFAR_VERSION="4.8.0beta"
+ set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=71&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
else
GWENHYWFAR_VERSION="3.11.3"
set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=31&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
@@ -363,8 +363,8 @@ set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-${KTOBLZCHECK_VE
# ktoblzcheck is being installed into GWENHYWFAR_DIR
if [ "$AQBANKING5" = "yes" ]; then
- AQBANKING_VERSION="5.0.32beta"
- set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=102&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
+ AQBANKING_VERSION="5.1.0beta"
+ set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=103&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
set_default AQBANKING_WITH_QT no
else
AQBANKING_VERSION="4.2.4"
commit ddfd5a61bba23bf9b148c52bf8bc0a11fe03d0b6
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Nov 26 22:23:12 2013 +0000
Fix price quotes installation on Windows
The default perl version was too old for DateManip's dependencies
A couple of cosmetic tweaks
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23449 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/getperl.vbs b/getperl.vbs
index b67ff16..fc2dc29 100644
--- a/getperl.vbs
+++ b/getperl.vbs
@@ -11,7 +11,7 @@ Dim tempFolder: tempFolder = fso.GetSpecialFolder(TemporaryFolder)
strHDLocation = Wscript.Arguments.Item(0)
' Set your settings
- strFileURL = "http://strawberry-perl.googlecode.com/files/strawberry-perl-5.12.3.0.msi"
+ strFileURL = "https://strawberry-perl.googlecode.com/files/strawberry-perl-5.18.1.1-win32.msi"
Wscript.Echo " copying " & strFileURL
Wscript.Echo " to " & strHDLocation
diff --git a/install-fq-mods.cmd b/install-fq-mods.cmd
index b8282a9..25a705f 100644
--- a/install-fq-mods.cmd
+++ b/install-fq-mods.cmd
@@ -17,6 +17,7 @@ perl -v > NUL 2>&1
if %errorlevel% equ 0 goto chkver
echo.
echo No Perl executable found, attempt to install Strawberry Perl
+echo This may take a while depending on your network speed
REM ----------------------------------------------------------------------------
echo.
commit 6051ab2dc8158a642765b1030d3626344f3a8812
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Nov 26 22:23:03 2013 +0000
Fix line-ending styles on a few windows scripts
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23448 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/getperl.vbs b/getperl.vbs
index b2b5fe9..b67ff16 100644
--- a/getperl.vbs
+++ b/getperl.vbs
@@ -1,49 +1,49 @@
-' script to download perl install file and save on local disc
-' the location of which is provided by first argument
-
-
-Const WindowsFolder = 0
-Const SystemFolder = 1
-Const TemporaryFolder = 2
-Dim fso: Set fso = CreateObject("Scripting.FileSystemObject")
-Dim tempFolder: tempFolder = fso.GetSpecialFolder(TemporaryFolder)
-
-strHDLocation = Wscript.Arguments.Item(0)
-
-' Set your settings
- strFileURL = "http://strawberry-perl.googlecode.com/files/strawberry-perl-5.12.3.0.msi"
-
- Wscript.Echo " copying " & strFileURL
- Wscript.Echo " to " & strHDLocation
-
-
-' Fetch the file
- Set objXMLHTTP = CreateObject("MSXML2.XMLHTTP")
-
- objXMLHTTP.open "GET", strFileURL, false
- objXMLHTTP.send()
-
-If objXMLHTTP.Status = 200 Then
- Set objADOStream = CreateObject("ADODB.Stream")
- objADOStream.Open
- objADOStream.Type = 1 'adTypeBinary
-
- objADOStream.Write objXMLHTTP.ResponseBody
- objADOStream.Position = 0 'Set the stream position to the start
-
- Set objFSO = Createobject("Scripting.FileSystemObject")
- If objFSO.Fileexists(strHDLocation) Then objFSO.DeleteFile strHDLocation
-
- objADOStream.SaveToFile strHDLocation
- objADOStream.Close
- Set objADOStream = Nothing
- If objFSO.Fileexists(strHDLocation) Then
- Wscript.Echo " "
- Wscript.Echo " " & strHDLocation & " downloaded OK"
- Wscript.Echo " "
- Set objFSO = Nothing
- wscript.quit 0
- End if
-End if
-
-wscript.quit 1
+' script to download perl install file and save on local disc
+' the location of which is provided by first argument
+
+
+Const WindowsFolder = 0
+Const SystemFolder = 1
+Const TemporaryFolder = 2
+Dim fso: Set fso = CreateObject("Scripting.FileSystemObject")
+Dim tempFolder: tempFolder = fso.GetSpecialFolder(TemporaryFolder)
+
+strHDLocation = Wscript.Arguments.Item(0)
+
+' Set your settings
+ strFileURL = "http://strawberry-perl.googlecode.com/files/strawberry-perl-5.12.3.0.msi"
+
+ Wscript.Echo " copying " & strFileURL
+ Wscript.Echo " to " & strHDLocation
+
+
+' Fetch the file
+ Set objXMLHTTP = CreateObject("MSXML2.XMLHTTP")
+
+ objXMLHTTP.open "GET", strFileURL, false
+ objXMLHTTP.send()
+
+If objXMLHTTP.Status = 200 Then
+ Set objADOStream = CreateObject("ADODB.Stream")
+ objADOStream.Open
+ objADOStream.Type = 1 'adTypeBinary
+
+ objADOStream.Write objXMLHTTP.ResponseBody
+ objADOStream.Position = 0 'Set the stream position to the start
+
+ Set objFSO = Createobject("Scripting.FileSystemObject")
+ If objFSO.Fileexists(strHDLocation) Then objFSO.DeleteFile strHDLocation
+
+ objADOStream.SaveToFile strHDLocation
+ objADOStream.Close
+ Set objADOStream = Nothing
+ If objFSO.Fileexists(strHDLocation) Then
+ Wscript.Echo " "
+ Wscript.Echo " " & strHDLocation & " downloaded OK"
+ Wscript.Echo " "
+ Set objFSO = Nothing
+ wscript.quit 0
+ End if
+End if
+
+wscript.quit 1
diff --git a/install-fq-mods.cmd b/install-fq-mods.cmd
index ce45e97..b8282a9 100644
--- a/install-fq-mods.cmd
+++ b/install-fq-mods.cmd
@@ -1,188 +1,188 @@
- at echo off
-setlocal
-
-REM ----------------------------------------------------------------------------
-if not exist ssleay32.dll (
- echo.
- echo Did not find ssleay32.dll in current directory.
- echo Please start this cmd file in the bin directory created by the setup.exe.
- goto error
-)
-
-REM ----------------------------------------------------------------------------
-echo.
-echo * Check Perl
-echo.
-perl -v > NUL 2>&1
-if %errorlevel% equ 0 goto chkver
-echo.
-echo No Perl executable found, attempt to install Strawberry Perl
-
-REM ----------------------------------------------------------------------------
-echo.
-echo * Download Strawberry Perl package
-echo.
-call cscript//nologo getperl.vbs %TEMP%\Perl.msi
-if %errorlevel% neq 0 (
- echo Return Value: "%errorlevel%"
- echo.
- echo failed to download perl install file
- echo.
- goto error
-)
-
-REM ----------------------------------------------------------------------------
-echo.
-echo * Run automated Perl install
-echo.
-msiexec /qb /l* %TEMP%\perl-log.txt /i %TEMP%\Perl.msi PERL_PATH=Yes PERL_EXT=Yes
-if %errorlevel% neq 0 (
- echo Return Value: "%errorlevel%"
- echo.
- echo failed to install perl from %TEMP%\Perl.msi
- echo.
- del %TEMP%\Perl.msi
- goto error
-)
-perl -v
-del %TEMP%\Perl.msi
-
-REM ----------------------------------------------------------------------------
-echo.
-echo * Update PATH variable to include Perl
-echo.
-:: delims is a TAB followed by a space
-FOR /F "tokens=2* delims= " %%A IN ('REG QUERY "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment" /v Path') DO SET NewPath=%%B
-ECHO NewPath = %NewPath%
-set Path=%NewPath%
-
-REM ----------------------------------------------------------------------------
-:chkver
-echo.
-echo * Check Perl version
-echo.
-perl -e "exit(int($]));"
-set _perlmajor=%errorlevel%
-perl -e "$ver=1000*sprintf(\"%%.3f\", $]); exit(int($ver)-5000);"
-set _perlminor=%errorlevel%
-if %_perlmajor% equ 5 (
- if %_perlminor% geq 10 (
- set _perlversion=5.10
- goto pchk
- )
- if %_perlminor% equ 8 (
- set _perlversion=5.8
- goto pchk
- )
-REM Note: GnuCash no longer "officially" supports perl 5.6, but as long as it works it will be allowed...
- if %_perlminor% equ 6 (
- set _perlversion=5.6
- goto pchk
- )
-)
-echo.
-echo Found perl version %_perlmajor%.%_perlminor%, but GnuCash requires at least version 5.8.
-echo Please install version 5.8 or above of
-echo * ActivePerl (http://www.activestate.com/store/activeperl) or
-echo * Strawberry Perl (http://strawberry-perl.googlecode.com/files/)
-echo and add the bin directory to your Path environment variable.
-goto error
-
-REM ----------------------------------------------------------------------------
-:pchk
-REM echo.
-REM echo * Run gnc-path-check
-REM echo.
-REM perl -w gnc-path-check
-REM if %errorlevel% neq 0 goto error
-
-REM ----------------------------------------------------------------------------
-echo.
-echo * Determine which Perl flavour we have found
-echo.
-perl -e "use Win32;if(defined &Win32::BuildNumber){exit 2;}else{exit 3;};"
-REM echo status = %errorlevel%
-if %errorlevel% equ 2 (
- echo => ActivePerl
- goto inst_mod_as
-) else if %errorlevel% equ 3 (
- echo => Other, probably Strawberry perl ?
- goto inst_mod_oth
-) else if %errorlevel% neq 0 goto error
-
-REM ----------------------------------------------------------------------------
-:inst_mod_oth
-echo.
-echo * Install required perl modules
-echo.
-perl -w gnc-fq-update
-if %errorlevel% neq 0 goto error
-goto fqchk
-
-REM ----------------------------------------------------------------------------
-:inst_mod_as
-echo * Install DateManip
-echo.
-perl -x -S ppm install Date-Manip
-if %errorlevel% neq 0 (
- perl -x -S ppm install DateManip
- if %errorlevel% neq 0 goto error
-)
-
-REM ----------------------------------------------------------------------------
-echo.
-echo * Install Crypt-SSLeay
-echo.
-
-set OLDPATH=%PATH%
-set PATH=%CD%;%PATH%
-if %_perlversion% == 5.6 (
- perl -x -S ppm install http://theoryx5.uwinnipeg.ca/ppmpackages/Crypt-SSLeay.ppd
-) else if %_perlversion% == 5.8 (
- echo anything | perl -x -S ppm install http://theoryx5.uwinnipeg.ca/ppms/Crypt-SSLeay.ppd
-) else (
- perl -x -S ppm install Crypt-SSLeay
-)
-set errlvlbak=%errorlevel%
-set PATH=%OLDPATH%
-if "%errlvlbak%" neq "0" goto error
-
-REM ----------------------------------------------------------------------------
-echo.
-echo * Install Finance-Quote
-echo.
-perl -x -S ppm install Finance-Quote
-if %errorlevel% neq 0 goto error
-
-REM ----------------------------------------------------------------------------
-:fqchk
-echo.
-echo * Run gnc-fq-check
-echo.
-perl -w gnc-fq-check
-if %errorlevel% neq 0 goto error
-
-REM ----------------------------------------------------------------------------
-echo.
-echo * Run gnc-fq-helper
-echo.
-echo (yahoo "AMZN") | perl -w gnc-fq-helper
-if %errorlevel% neq 0 goto error
-
-REM ----------------------------------------------------------------------------
-:success
-echo.
-echo * Installation succeeded
-echo.
-goto end
-
-REM ----------------------------------------------------------------------------
-:error:
-echo.
-echo An error occurred, see above.
-echo.
-
-REM ----------------------------------------------------------------------------
-:end
-pause
-
+ at echo off
+setlocal
+
+REM ----------------------------------------------------------------------------
+if not exist ssleay32.dll (
+ echo.
+ echo Did not find ssleay32.dll in current directory.
+ echo Please start this cmd file in the bin directory created by the setup.exe.
+ goto error
+)
+
+REM ----------------------------------------------------------------------------
+echo.
+echo * Check Perl
+echo.
+perl -v > NUL 2>&1
+if %errorlevel% equ 0 goto chkver
+echo.
+echo No Perl executable found, attempt to install Strawberry Perl
+
+REM ----------------------------------------------------------------------------
+echo.
+echo * Download Strawberry Perl package
+echo.
+call cscript//nologo getperl.vbs %TEMP%\Perl.msi
+if %errorlevel% neq 0 (
+ echo Return Value: "%errorlevel%"
+ echo.
+ echo failed to download perl install file
+ echo.
+ goto error
+)
+
+REM ----------------------------------------------------------------------------
+echo.
+echo * Run automated Perl install
+echo.
+msiexec /qb /l* %TEMP%\perl-log.txt /i %TEMP%\Perl.msi PERL_PATH=Yes PERL_EXT=Yes
+if %errorlevel% neq 0 (
+ echo Return Value: "%errorlevel%"
+ echo.
+ echo failed to install perl from %TEMP%\Perl.msi
+ echo.
+ del %TEMP%\Perl.msi
+ goto error
+)
+perl -v
+del %TEMP%\Perl.msi
+
+REM ----------------------------------------------------------------------------
+echo.
+echo * Update PATH variable to include Perl
+echo.
+:: delims is a TAB followed by a space
+FOR /F "tokens=2* delims= " %%A IN ('REG QUERY "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment" /v Path') DO SET NewPath=%%B
+ECHO NewPath = %NewPath%
+set Path=%NewPath%
+
+REM ----------------------------------------------------------------------------
+:chkver
+echo.
+echo * Check Perl version
+echo.
+perl -e "exit(int($]));"
+set _perlmajor=%errorlevel%
+perl -e "$ver=1000*sprintf(\"%%.3f\", $]); exit(int($ver)-5000);"
+set _perlminor=%errorlevel%
+if %_perlmajor% equ 5 (
+ if %_perlminor% geq 10 (
+ set _perlversion=5.10
+ goto pchk
+ )
+ if %_perlminor% equ 8 (
+ set _perlversion=5.8
+ goto pchk
+ )
+REM Note: GnuCash no longer "officially" supports perl 5.6, but as long as it works it will be allowed...
+ if %_perlminor% equ 6 (
+ set _perlversion=5.6
+ goto pchk
+ )
+)
+echo.
+echo Found perl version %_perlmajor%.%_perlminor%, but GnuCash requires at least version 5.8.
+echo Please install version 5.8 or above of
+echo * ActivePerl (http://www.activestate.com/store/activeperl) or
+echo * Strawberry Perl (http://strawberry-perl.googlecode.com/files/)
+echo and add the bin directory to your Path environment variable.
+goto error
+
+REM ----------------------------------------------------------------------------
+:pchk
+REM echo.
+REM echo * Run gnc-path-check
+REM echo.
+REM perl -w gnc-path-check
+REM if %errorlevel% neq 0 goto error
+
+REM ----------------------------------------------------------------------------
+echo.
+echo * Determine which Perl flavour we have found
+echo.
+perl -e "use Win32;if(defined &Win32::BuildNumber){exit 2;}else{exit 3;};"
+REM echo status = %errorlevel%
+if %errorlevel% equ 2 (
+ echo => ActivePerl
+ goto inst_mod_as
+) else if %errorlevel% equ 3 (
+ echo => Other, probably Strawberry perl ?
+ goto inst_mod_oth
+) else if %errorlevel% neq 0 goto error
+
+REM ----------------------------------------------------------------------------
+:inst_mod_oth
+echo.
+echo * Install required perl modules
+echo.
+perl -w gnc-fq-update
+if %errorlevel% neq 0 goto error
+goto fqchk
+
+REM ----------------------------------------------------------------------------
+:inst_mod_as
+echo * Install DateManip
+echo.
+perl -x -S ppm install Date-Manip
+if %errorlevel% neq 0 (
+ perl -x -S ppm install DateManip
+ if %errorlevel% neq 0 goto error
+)
+
+REM ----------------------------------------------------------------------------
+echo.
+echo * Install Crypt-SSLeay
+echo.
+
+set OLDPATH=%PATH%
+set PATH=%CD%;%PATH%
+if %_perlversion% == 5.6 (
+ perl -x -S ppm install http://theoryx5.uwinnipeg.ca/ppmpackages/Crypt-SSLeay.ppd
+) else if %_perlversion% == 5.8 (
+ echo anything | perl -x -S ppm install http://theoryx5.uwinnipeg.ca/ppms/Crypt-SSLeay.ppd
+) else (
+ perl -x -S ppm install Crypt-SSLeay
+)
+set errlvlbak=%errorlevel%
+set PATH=%OLDPATH%
+if "%errlvlbak%" neq "0" goto error
+
+REM ----------------------------------------------------------------------------
+echo.
+echo * Install Finance-Quote
+echo.
+perl -x -S ppm install Finance-Quote
+if %errorlevel% neq 0 goto error
+
+REM ----------------------------------------------------------------------------
+:fqchk
+echo.
+echo * Run gnc-fq-check
+echo.
+perl -w gnc-fq-check
+if %errorlevel% neq 0 goto error
+
+REM ----------------------------------------------------------------------------
+echo.
+echo * Run gnc-fq-helper
+echo.
+echo (yahoo "AMZN") | perl -w gnc-fq-helper
+if %errorlevel% neq 0 goto error
+
+REM ----------------------------------------------------------------------------
+:success
+echo.
+echo * Installation succeeded
+echo.
+goto end
+
+REM ----------------------------------------------------------------------------
+:error:
+echo.
+echo An error occurred, see above.
+echo.
+
+REM ----------------------------------------------------------------------------
+:end
+pause
+
commit 612f0b974b92d762b00ff8ae9859a7dffaffb187
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri Nov 22 15:33:22 2013 +0000
Win32: more consistent use of @PACKAGE@ for gnucash package name in installer script
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23426 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/gnucash.iss.in b/gnucash.iss.in
index 5e55d37..0f572f8 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -41,18 +41,18 @@ Name: desktopicon; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm
Name: menuicon; Description: "{cm:CreateMenuLink}"; GroupDescription: "{cm:AdditionalIcons}"
[Icons]
-Name: "{group}\GnuCash"; Filename: "{app}\bin\gnucash.exe"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: menuicon
-Name: "{group}\{cm:IconName_README}"; Filename: "{app}\doc\gnucash\{cm:IconFilename_README}"; Comment: "{cm:IconComment_README}"; Tasks: menuicon
+Name: "{group}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: menuicon
+Name: "{group}\{cm:IconName_README}"; Filename: "{app}\doc\@PACKAGE@\{cm:IconFilename_README}"; Comment: "{cm:IconComment_README}"; Tasks: menuicon
Name: "{group}\{cm:IconName_FAQ}"; Filename: "http://wiki.gnucash.org/wiki/FAQ"; Tasks: menuicon
Name: "{group}\{cm:IconName_Bugzilla}"; Filename: "http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash"; Tasks: menuicon
Name: "{group}\{cm:IconName_InstallFQ}"; Filename: "{app}\bin\install-fq-mods.cmd"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_InstallFQ}"; Tasks: menuicon
Name: "{group}\{cm:IconName_Theme}"; Filename: "{app}\bin\gtk2_prefs.exe"; WorkingDir: "{app}\bin"; Tasks: menuicon
Name: "{group}\{cm:IconName_Uninstall}"; Filename: "{uninstallexe}"; Comment: "{cm:IconComment_Uninstall}"; Tasks: menuicon
-Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\gnucash.exe"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: desktopicon
+Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: desktopicon
[Run]
-Filename: "{app}\bin\gnucash.exe"; Description: "{cm:RunPrg}"; WorkingDir: "{app}\bin"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent
+Filename: "{app}\bin\@PACKAGE at .exe"; Description: "{cm:RunPrg}"; WorkingDir: "{app}\bin"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent
Filename: "{app}\bin\guile.cmd"; Flags: runhidden
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -109,8 +109,8 @@ Source: "@prefix@\..\dist\share\doc\@PACKAGE@\ChangeLog"; DestDir: "{app}\doc\@P
Root: HKCR; Subkey: ".gnucash"; ValueType: string; ValueName: ""; ValueData: "GnuCash.Financial.Data"; Flags: uninsdeletevalue
Root: HKCR; Subkey: ".gnucash"; ValueType: string; ValueName: "Content Type"; ValueData: "application/x-gnucash"; Flags: uninsdeletevalue
Root: HKCR; Subkey: "GnuCash.Financial.Data"; ValueType: string; ValueName: ""; ValueData: "GnuCash Financial Data"; Flags: uninsdeletevalue
-Root: HKCR; Subkey: "GnuCash.Financial.Data\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\share\gnucash\pixmaps\gnucash-icon.ico,0"
-Root: HKCR; Subkey: "GnuCash.Financial.Data\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\bin\gnucash.exe"" ""%1"""
+Root: HKCR; Subkey: "GnuCash.Financial.Data\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico,0"
+Root: HKCR; Subkey: "GnuCash.Financial.Data\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\bin\@PACKAGE at .exe"" ""%1"""
Root: HKLM; Subkey: "Software\GnuCash"; ValueType: none; Flags: uninsdeletekeyifempty
Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: none; Flags: uninsdeletekeyifempty
@@ -156,9 +156,9 @@ Root: HKLM; Subkey: "Software\AqBanking\Paths"; ValueType: string; ValueName: "c
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
[UninstallDelete]
Type: files; Name: "{app}\bin\guile.cmd"
-Type: files; Name: "{app}\etc\gnucash\environment"
+Type: files; Name: "{app}\etc\@PACKAGE@\environment"
Type: filesandordirs; Name: "{app}\share\guile"
-Type: dirifempty; Name: "{app}\etc\gnucash"
+Type: dirifempty; Name: "{app}\etc\@PACKAGE@"
Type: dirifempty; Name: "{app}\etc"
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -307,7 +307,7 @@ begin
{ Get the installation-specific paths }
appdir := ExpandConstant('{app}');
- pkgdatadir := appdir + '\share\gnucash';
+ pkgdatadir := appdir + '\share\@PACKAGE@';
{ Create the guile.cmd file; #10 is the linefeed character and #13 CR }
commit 98527daf60e8fcd78a9ecc0e5632ddb2033ffb5b
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri Nov 22 15:33:01 2013 +0000
Win32: remove gconf related settings from the installer script
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23425 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/gnucash.iss.in b/gnucash.iss.in
index ff89efc..5e55d37 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -54,14 +54,6 @@ Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\gnucash.exe"; WorkingDir:
[Run]
Filename: "{app}\bin\gnucash.exe"; Description: "{cm:RunPrg}"; WorkingDir: "{app}\bin"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent
Filename: "{app}\bin\guile.cmd"; Flags: runhidden
-;; The Windows firewall exceptions, see http://www.vincenzo.net/isxkb/index.php?title=Adding_a_rule_to_the_Windows_firewall
-Filename: "{sys}\netsh.exe"; Parameters: "firewall add allowedprogram ""{app}\bin\gnucash.exe"" ""GnuCash Free Finance Manager"" ENABLE ALL"; StatusMsg: "{cm:StatusMsgFirewall}"; Flags: runhidden; MinVersion: 0,5.01.2600sp2;
-Filename: "{sys}\netsh.exe"; Parameters: "firewall add allowedprogram ""{app}\bin\gconfd-2.exe"" ""GConf Settings Manager"" ENABLE ALL"; StatusMsg: "{cm:StatusMsgFirewall}"; Flags: runhidden; MinVersion: 0,5.01.2600sp2;
-
-[UninstallRun]
-Filename: "{app}\bin\gconftool-2.exe"; Parameters: "--shutdown"; Flags: runhidden
-Filename: "{sys}\netsh.exe"; Parameters: "firewall delete allowedprogram program=""{app}\bin\@PACKAGE at .exe"""; Flags: runhidden; MinVersion: 0,5.01.2600sp2
-Filename: "{sys}\netsh.exe"; Parameters: "firewall delete allowedprogram program=""{app}\bin\gconfd-2.exe"""; Flags: runhidden; MinVersion: 0,5.01.2600sp2
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Here we configure the included files and the place of their
@@ -166,7 +158,6 @@ Root: HKLM; Subkey: "Software\AqBanking\Paths"; ValueType: string; ValueName: "c
Type: files; Name: "{app}\bin\guile.cmd"
Type: files; Name: "{app}\etc\gnucash\environment"
Type: filesandordirs; Name: "{app}\share\guile"
-Type: filesandordirs; Name: "{app}\etc\gconf"
Type: dirifempty; Name: "{app}\etc\gnucash"
Type: dirifempty; Name: "{app}\etc"
commit 6c12637a36e4acf23e8ff4d9ec3cae8452e80832
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat Oct 26 08:56:26 2013 +0000
Small XDG_DATA_DIRS improvements
- win32: improve iss script to only replace the real XDG_DATA_DIRS path, not the comment
- use $(datadir) instead of $(prefix)/share, for the rare case someone configures with
--datadir=DIR
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23337 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/gnucash.iss.in b/gnucash.iss.in
index ad8e857..ff89efc 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -375,7 +375,7 @@ begin
if (Pos('GNC_DBD_DIR', EnvStrList[iLineCounter]) > 0) then
EnvStrList[iLineCounter] := 'GNC_DBD_DIR={GNC_HOME}/lib/dbd';
{ Adapt XDG_DATA_DIRS parameter }
- if (Pos('XDG_DATA_DIRS', EnvStrList[iLineCounter]) > 0) then
+ if (Pos('XDG_DATA_DIRS=', EnvStrList[iLineCounter]) > 0) then
EnvStrList[iLineCounter] := 'XDG_DATA_DIRS={GNC_HOME}/share;{XDG_DATA_DIRS};/usr/local/share;/usr/share';
end;
commit 29f9e65b5f934a2ee6a7182d686675182f8f2311
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Oct 22 16:30:02 2013 +0000
Win32: set XDG_DATA_DIRS when running the Windows installer
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23313 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/gnucash.iss.in b/gnucash.iss.in
index e6b670e..ad8e857 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -374,6 +374,9 @@ begin
{ Adapt GNC_DBD_DIR parameter }
if (Pos('GNC_DBD_DIR', EnvStrList[iLineCounter]) > 0) then
EnvStrList[iLineCounter] := 'GNC_DBD_DIR={GNC_HOME}/lib/dbd';
+ { Adapt XDG_DATA_DIRS parameter }
+ if (Pos('XDG_DATA_DIRS', EnvStrList[iLineCounter]) > 0) then
+ EnvStrList[iLineCounter] := 'XDG_DATA_DIRS={GNC_HOME}/share;{XDG_DATA_DIRS};/usr/local/share;/usr/share';
end;
{ Save the final file }
commit 83cc30d6fcdf695d6394dc34e126a6538d4b1a76
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Oct 7 14:31:22 2013 +0000
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
diff --git a/defaults.sh b/defaults.sh
index ba381d3..eacaba6 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -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"
diff --git a/dist-impl.sh b/dist-impl.sh
index e179f4b..83190ad 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -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' )
diff --git a/gnucash.iss.in b/gnucash.iss.in
index 6a21a7b..e6b670e 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -1,756 +1,757 @@
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Input configuration for the Inno Setup Compiler
-; Copyright (c) 2004-2005 Christian Stimming <stimming at tuhh.de>
-;
-; Inno Setup Compiler: See http://www.jrsoftware.org/isdl.php
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-[Setup]
-; Using the name here directly because we want it capitalized
-AppName=GnuCash
-AppVerName=GnuCash @VERSION@
-AppPublisher=GnuCash Development Team
-AppPublisherURL=http://www.gnucash.org
-AppSupportURL=http://www.gnucash.org
-AppUpdatesURL=http://www.gnucash.org
-VersionInfoVersion=@VERSION@
-DefaultDirName={pf}\@PACKAGE@
-DefaultGroupName=GnuCash
-LicenseFile=@prefix@\..\dist\share\doc\@PACKAGE@\COPYING
-Compression=lzma
-MinVersion=5.0,5.0
-PrivilegesRequired=poweruser
-OutputDir=.
-OutputBaseFilename=@PACKAGE at -@VERSION at -setup
-UninstallFilesDir={app}\uninstall\@PACKAGE@
-InfoAfterFile=@prefix@\..\dist\share\doc\@PACKAGE@\README.win32-bin.txt
-SetupIconFile=@prefix@\..\dist\share\@PACKAGE@\pixmaps\gnucash-icon.ico
-WizardSmallImageFile=@prefix@\..\dist\share\@PACKAGE@\pixmaps\gnucash-icon-48x48.bmp
-
-[Types]
-Name: "full"; Description: "{cm:FullInstall}"
-Name: "custom"; Description: "{cm:CustomInstall}"; Flags: iscustom
-
-[Components]
-Name: "main"; Description: "{cm:MainFiles}"; Types: full custom; Flags: fixed
-;Name: "translations"; Description: "{cm:TranslFiles}"; Types: full
-;Name: "templates"; Description: "{cm:TemplFiles}"; Types: full
-
-[Tasks]
-Name: desktopicon; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"
-Name: menuicon; Description: "{cm:CreateMenuLink}"; GroupDescription: "{cm:AdditionalIcons}"
-
-[Icons]
-Name: "{group}\GnuCash"; Filename: "{app}\bin\gnucash.exe"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: menuicon
-Name: "{group}\{cm:IconName_README}"; Filename: "{app}\doc\gnucash\{cm:IconFilename_README}"; Comment: "{cm:IconComment_README}"; Tasks: menuicon
-Name: "{group}\{cm:IconName_FAQ}"; Filename: "http://wiki.gnucash.org/wiki/FAQ"; Tasks: menuicon
-Name: "{group}\{cm:IconName_Bugzilla}"; Filename: "http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash"; Tasks: menuicon
-Name: "{group}\{cm:IconName_InstallFQ}"; Filename: "{app}\bin\install-fq-mods.cmd"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_InstallFQ}"; Tasks: menuicon
-Name: "{group}\{cm:IconName_Theme}"; Filename: "{app}\bin\gtk2_prefs.exe"; WorkingDir: "{app}\bin"; Tasks: menuicon
-Name: "{group}\{cm:IconName_Uninstall}"; Filename: "{uninstallexe}"; Comment: "{cm:IconComment_Uninstall}"; Tasks: menuicon
-
-Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\gnucash.exe"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: desktopicon
-
-[Run]
-Filename: "{app}\bin\gnucash.exe"; Description: "{cm:RunPrg}"; WorkingDir: "{app}\bin"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent
-Filename: "{app}\bin\guile.cmd"; Flags: runhidden
-;; The Windows firewall exceptions, see http://www.vincenzo.net/isxkb/index.php?title=Adding_a_rule_to_the_Windows_firewall
-Filename: "{sys}\netsh.exe"; Parameters: "firewall add allowedprogram ""{app}\bin\gnucash.exe"" ""GnuCash Free Finance Manager"" ENABLE ALL"; StatusMsg: "{cm:StatusMsgFirewall}"; Flags: runhidden; MinVersion: 0,5.01.2600sp2;
-Filename: "{sys}\netsh.exe"; Parameters: "firewall add allowedprogram ""{app}\bin\gconfd-2.exe"" ""GConf Settings Manager"" ENABLE ALL"; StatusMsg: "{cm:StatusMsgFirewall}"; Flags: runhidden; MinVersion: 0,5.01.2600sp2;
-
-[UninstallRun]
-Filename: "{app}\bin\gconftool-2.exe"; Parameters: "--shutdown"; Flags: runhidden
-Filename: "{sys}\netsh.exe"; Parameters: "firewall delete allowedprogram program=""{app}\bin\@PACKAGE at .exe"""; Flags: runhidden; MinVersion: 0,5.01.2600sp2
-Filename: "{sys}\netsh.exe"; Parameters: "firewall delete allowedprogram program=""{app}\bin\gconfd-2.exe"""; Flags: runhidden; MinVersion: 0,5.01.2600sp2
-
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Here we configure the included files and the place of their
-; installation
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-[Files]
-; The main executables and DLLs
-Source: "@prefix@\..\dist\bin\*"; DestDir: "{app}\bin"; Flags: recursesubdirs ignoreversion; Components: main
-Source: "@prefix@\..\dist\etc\*"; DestDir: "{app}\etc"; Flags: recursesubdirs; Components: main
-Source: "@prefix@\..\dist\etc\@PACKAGE@\environment"; DestDir: "{app}\etc\@PACKAGE@"; Components: main; AfterInstall: MyAfterInstallEnvironment()
-; 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
-Source: "@prefix@\..\dist\share\*"; DestDir: "{app}\share"; Flags: recursesubdirs; Components: main
-
-;;; Not needed with AQBANKING5!
-;; Additionally, we ship the Qt DLLs because the Online-Banking-Wizard
-;; lib/aqbanking/plugins/@-aqbanking_so_effective-@/wizards/qt3-wizard.exe needs them.
-;Source: "@-qtbindir-@\QtCore4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-;Source: "@-qtbindir-@\QtGui4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-;Source: "@-qtbindir-@\mingwm10.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-;;; The following are all needed by Qt3Support
-;Source: "@-qtbindir-@\Qt3Support4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-;Source: "@-qtbindir-@\QtXml4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-;Source: "@-qtbindir-@\QtSql4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-;Source: "@-qtbindir-@\QtNetwork4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-
-;; The translations
-;Source: "@prefix@\..\dist\share\locale\*"; DestDir: "{app}\share\locale"; Flags: recursesubdirs; Components: translations
-;
-;; The account templates
-;Source: "@prefix@\..\dist\share\@PACKAGE@\accounts\*"; DestDir: "{app}\share\@PACKAGE@\accounts"; Flags: recursesubdirs; Components: templates
-
-; And all the documentation
-Source: "@prefix@\..\dist\share\doc\@PACKAGE@\README"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@prefix@\..\dist\share\doc\@PACKAGE@\README.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@prefix@\..\dist\share\doc\@PACKAGE@\README-de.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@prefix@\..\dist\share\doc\@PACKAGE@\README-fr.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@prefix@\..\dist\share\doc\@PACKAGE@\README-it.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@prefix@\..\dist\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@prefix@\..\dist\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@prefix@\..\dist\share\doc\@PACKAGE@\COPYING"; DestDir: "{app}\doc\@PACKAGE@"; Flags: ignoreversion; Components: main
-Source: "@prefix@\..\dist\share\doc\@PACKAGE@\AUTHORS"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@prefix@\..\dist\share\doc\@PACKAGE@\ChangeLog"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-
-
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Define the registry keys Setup should create (HKLM = HKEY_LOCAL_MACHINE)
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-[Registry]
-Root: HKCR; Subkey: ".gnucash"; ValueType: string; ValueName: ""; ValueData: "GnuCash.Financial.Data"; Flags: uninsdeletevalue
-Root: HKCR; Subkey: ".gnucash"; ValueType: string; ValueName: "Content Type"; ValueData: "application/x-gnucash"; Flags: uninsdeletevalue
-Root: HKCR; Subkey: "GnuCash.Financial.Data"; ValueType: string; ValueName: ""; ValueData: "GnuCash Financial Data"; Flags: uninsdeletevalue
-Root: HKCR; Subkey: "GnuCash.Financial.Data\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\share\gnucash\pixmaps\gnucash-icon.ico,0"
-Root: HKCR; Subkey: "GnuCash.Financial.Data\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\bin\gnucash.exe"" ""%1"""
-
-Root: HKLM; Subkey: "Software\GnuCash"; ValueType: none; Flags: uninsdeletekeyifempty
-Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: none; Flags: uninsdeletekeyifempty
-Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "prefix"; ValueData: "{app}"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\GnuCash"; ValueType: string; ValueName: "InstallationDirectory"; ValueData: "{app}"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "libdir"; ValueData: "{app}\lib"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "pkglibdir"; ValueData: "{app}\lib\@PACKAGE@"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "sysconfdir"; ValueData: "{app}\etc"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "localedir"; ValueData: "{app}\share\locale"; Flags: uninsdeletevalue
-
-; Store the version information
-Root: HKLM; Subkey: "Software\GnuCash\Version"; ValueType: none; Flags: uninsdeletekeyifempty
-Root: HKLM; Subkey: "Software\GnuCash\Version"; ValueType: string; ValueName: "Version"; ValueData: "@PACKAGE_VERSION@"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\GnuCash\Version"; ValueType: dword; ValueName: "VersionMajor"; ValueData: "@GNUCASH_MAJOR_VERSION@"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\GnuCash\Version"; ValueType: dword; ValueName: "VersionMinor"; ValueData: "@GNUCASH_MINOR_VERSION@"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\GnuCash\Version"; ValueType: dword; ValueName: "VersionMicro"; ValueData: "@GNUCASH_MICRO_VERSION@"; Flags: uninsdeletevalue
-
-; Additionally, we have to install the paths for gwenhywfar
-Root: HKLM; Subkey: "Software\Gwenhywfar"; ValueType: none; Flags: uninsdeletekeyifempty
-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\@-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
-
-; And we also need some registry keys for aqbanking
-Root: HKLM; Subkey: "Software\Aqbanking"; ValueType: none; Flags: uninsdeletekeyifempty
-Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: none; Flags: uninsdeletekeyifempty
-Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "providerdir"; ValueData: "{app}\lib\aqbanking\plugins\@-aqbanking_so_effective-@\providers"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "bankinfodir"; ValueData: "{app}\lib\aqbanking\plugins\@-aqbanking_so_effective-@\bankinfo"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "importerdir"; ValueData: "{app}\lib\aqbanking\plugins\@-aqbanking_so_effective-@\imexporters"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "wizarddir"; ValueData: "{app}\lib\aqbanking\plugins\@-aqbanking_so_effective-@\wizards"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "pkgdatadir"; ValueData: "{app}\share\aqbanking"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "sysconfdir"; ValueData: "{app}\etc"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "localedir"; ValueData: "{app}\share\locale"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\AqBanking\Paths"; ValueType: string; ValueName: "xmldatadir"; ValueData: "{app}\share\aqhbci\xml"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\AqBanking\Paths"; ValueType: string; ValueName: "cfgmoduledir"; ValueData: "{app}\lib\aqbanking\plugins\@-aqbanking_so_effective-@\frontends\qbanking\cfgmodules"; Flags: uninsdeletevalue
-
-
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Delete the created config script on uninstall
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-[UninstallDelete]
-Type: files; Name: "{app}\bin\guile.cmd"
-Type: files; Name: "{app}\etc\gnucash\environment"
-Type: filesandordirs; Name: "{app}\share\guile"
-Type: filesandordirs; Name: "{app}\etc\gconf"
-Type: dirifempty; Name: "{app}\etc\gnucash"
-Type: dirifempty; Name: "{app}\etc"
-
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Perform some additional actions in code that can't be done
-; by the installer by default. The code snippets below hook
-; into the installer code at specific events. See
-; http://www.jrsoftware.org/ishelp/index.php?topic=scriptintro
-; for more information on iss scription and a syntax reference.
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-[Code]
-var
- PrevInstDetectedPage : TOutputMsgWizardPage;
- PrevAppName, PrevUninstallString : String;
- PrevVersionMajor, PrevVersionMinor, PrevVersionMicro : Cardinal;
- Uninstallrequired : Boolean;
-
-// ----------------------------------------------------------------
-// Sometimes it's not possible to install a newer version of
-// GnuCash over an older one on Windows. This happens for example
-// when libraries or reports are moved around in the newer version.
-// The code below will detect an existing GnuCash installation
-// and will remove it (if the user accepts) before installing
-// the version the user has selected.
-// ----------------------------------------------------------------
-
-{ Lookup the registry information on a previous installation }
-procedure GetPrevInstallInfo();
-var
- sUnInstPath, sAppVersionPath: String;
- rootKey : Integer;
-begin
- sAppVersionPath := 'Software\GnuCash\Version';
- sUnInstPath := 'Software\Microsoft\Windows\CurrentVersion\Uninstall\GnuCash_is1';
-
- PrevAppName := '';
- PrevUninstallString := '';
- PrevVersionMajor := 0;
- PrevVersionMinor := 0;
- PrevVersionMicro := 0;
-
- if RegKeyExists(HKLM, sUnInstPath) then
- rootKey := HKLM
- else
- rootKey := HKCU;
-
- RegQueryStringValue(rootKey, sUnInstPath, 'UninstallString', PrevUninstallString);
- RegQueryStringValue(rootKey, sUnInstPath, 'DisplayName', PrevAppName);
- RegQueryDwordValue(rootKey, sAppVersionPath, 'VersionMajor', PrevVersionMajor);
- RegQueryDwordValue(rootKey, sAppVersionPath, 'VersionMinor', PrevVersionMinor);
- RegQueryDwordValue(rootKey, sAppVersionPath, 'VersionMicro', PrevVersionMicro);
-end;
-
-{ Check if there is another GnuCash currently installed }
-{ If so, the user will be prompted if it can be uninstalled first. }
-{ If the user doesn't allow uninstall, the installation will be aborted. }
-procedure CheckUninstallRequired();
-begin
- UninstallRequired := True;
- GetPrevInstallInfo;
-
- if (PrevUninstallString = '') then
- UninstallRequired := False
-// We used to check on major-minor versions to determine the uninstall requirement,
-// but this is not always sufficient. So the following code won't be used until
-// refined.
-// else if (PrevVersionMajor = @GNUCASH_MAJOR_VERSION@) and (PrevVersionMinor = @GNUCASH_MINOR_VERSION@) then
-// UninstallRequired := False;
-end;
-
-{ Uninstall the current installation }
-function UnInstallOldVersion(): Integer;
-var
- sUnInstallString: String;
- iResultCode: Integer;
-begin
-// Return Values:
-// 1 - uninstall string is empty
-// 2 - error executing the UnInstallString
-// 3 - successfully executed the UnInstallString
-
- // default return value
- Result := 0;
-
- if PrevUninstallString <> '' then begin
- sUnInstallString := RemoveQuotes(PrevUninstallString);
- if Exec(sUnInstallString, '/SILENT /NORESTART /SUPPRESSMSGBOXES','', SW_HIDE, ewWaitUntilTerminated, iResultCode) then
- Result := 3
- else
- Result := 2;
- end else
- Result := 1;
-end;
-
-function GetPrevAppName(Param: String): String;
-begin
- Result := PrevAppName;
-end;
-
-{ Setup a page to display if a previous (incompatible) GnuCash installation is found }
-procedure InitializeWizard;
-begin
- CheckUninstallRequired;
- PrevInstDetectedPage := CreateOutputMsgPage(wpReady,
- ExpandConstant('{cm:AIWP_Title}'),
- ExpandConstant('{cm:AIWP_Description,{code:GetPrevAppName}}'),
- ExpandConstant('{cm:AIWP_Message,{code:GetPrevAppName}}'));
-end;
-
-{ Determine whether the previous installation page should be displayed or not }
-function ShouldSkipPage(PageID: Integer): Boolean;
-begin
- Result := False
- if (PageID = PrevInstDetectedPage.ID) and (not UninstallRequired) then
- Result := True;
-end;
-
-{ If a previous (incompatible) installation is present start the installation }
-{ process with deleting this old installation }
-procedure CurStepChanged(CurStep: TSetupStep);
-begin
- if (CurStep=ssInstall) and (UninstallRequired) then
- UnInstallOldVersion();
-end;
-
-// ------------------------------------------------------------
-// The GnuCash environment file contains paths that have to be
-// adapted at install time. The code below does that.
-// ------------------------------------------------------------
-function MingwBacksl(const S: String): String;
-begin
- { Modify the path name S so that it can be used by MinGW }
- if Length(ExtractFileDrive(S)) = 0 then
- Result := S
- else begin
- Result := '/'+S;
- StringChange(Result, ':\', '\');
- end;
- StringChange(Result, '\', '/');
-end;
-
-procedure MyAfterInstallConfig();
-var
- FileName, FileString, appdir, libdir, pkglibdir, pkgdatadir: String;
- Res: Boolean;
-begin
-
- { Get the installation-specific paths }
- appdir := ExpandConstant('{app}');
- pkgdatadir := appdir + '\share\gnucash';
-
- { Create the guile.cmd file; #10 is the linefeed character and #13 CR }
-
- FileName := appdir + '\bin\guile.cmd' ;
- FileString := 'set GUILE_LOAD_PATH=' + pkgdatadir + '\guile-modules;' + pkgdatadir + '\scm;' + appdir + '\share\guile\1.8;%GUILE_LOAD_PATH%'#13#10 ;
- FileString := FileString + 'start guile.exe %*'#13#10 ;
-
- { Save the final file }
-
- Res := SaveStringToFile(FileName, FileString, False);
- if Res = False then
- MsgBox('Error on saving '+FileName+' for completing the installation', mbInformation, MB_OK);
-
-end;
-
-function BackslashPath(const S: String): String;
-begin
- { Convert c:\soft to c:/soft }
- Result := S;
- StringChange(Result, '\', '/');
-end;
-
-procedure MyAfterInstallEnvironment();
-var
- EnvFile, EtcDir: String;
- iLineCounter, iSize : Integer;
- EnvStrList: TArrayOfString;
- Res: Boolean;
-begin
- { Make some Windows-only changes to the etc/@PACKAGE@/environment file }
- { If you make any changes here, you should probably also change the equivalent sections }
- { in packaging/win32/install.sh }
- { A new line is stared with #13#10 - #10 is the linefeed character and #13 CR }
-
- { Get the installation-specific paths }
- EnvFile := ExpandConstant(CurrentFileName);
- EtcDir := ExtractFileDir(EnvFile);
-
- { Load the current contents of the environment file }
- Res := LoadStringsFromFile(EnvFile, EnvStrList);
- if Res = False then
- MsgBox('Error on reading ' + EnvFile + ' for completing the installation', mbInformation, MB_OK);
-
- iSize := GetArrayLength(EnvStrList);
- for iLineCounter := 0 to iSize-1 do
- begin
- { Adapt GUILE_LOAD_PATH parameter and prevent cygwin interference in SCHEME_LIBRARY_PATH }
- if (Pos('GUILE_LOAD_PATH', EnvStrList[iLineCounter]) = 1) then
- begin
- StringChangeEx(EnvStrList[iLineCounter], '{GUILE_LOAD_PATH}', '{GNC_HOME}/share/guile/1.8;{GUILE_LOAD_PATH}', True);
-
- EnvStrList[iLineCounter] := EnvStrList[iLineCounter] + #13#10 + '# Clear SCHEME_LIBRARY_PATH to prevent interference from other guile installations (like cygwin)' + #13#10;
- EnvStrList[iLineCounter] := EnvStrList[iLineCounter] + 'SCHEME_LIBRARY_PATH=' + #13#10;
- end;
- { Adapt GNC_DBD_DIR parameter }
- if (Pos('GNC_DBD_DIR', EnvStrList[iLineCounter]) > 0) then
- EnvStrList[iLineCounter] := 'GNC_DBD_DIR={GNC_HOME}/lib/dbd';
- end;
-
- { Save the final file }
- Res := ForceDirectories(EtcDir);
- if Res = False then
- MsgBox('Error on creating ' + EtcDir + ' for completing the installation', mbInformation, MB_OK);
-
- Res := SaveStringsToFile(EnvFile, EnvStrList, False);
- if Res = False then
- MsgBox('Error on saving ' + EnvFile + ' for completing the installation', mbInformation, MB_OK);
-end;
-
-[Languages]
-Name: "en"; MessagesFile: "compiler:Default.isl"
-Name: "de"; MessagesFile: "compiler:Languages\German.isl"; InfoAfterFile: "@prefix@\share\doc\@PACKAGE@\README-de.win32-bin.txt"
-Name: "el"; MessagesFile: "@prefix@\share\@PACKAGE@\Greek-4-5.1.11.isl"
-Name: "fr"; MessagesFile: "compiler:Languages\French.isl"; InfoAfterFile: "@prefix@\share\doc\@PACKAGE@\README-fr.win32-bin.txt"
-Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"; InfoAfterFile: "@prefix@\share\doc\@PACKAGE@\README-it.win32-bin.txt"
-Name: "ja"; MessagesFile: "@prefix@\share\@PACKAGE@\Japanese-5-5.1.11.isl"
-Name: "lv"; MessagesFile: "@prefix@\share\@PACKAGE@\Latvian-1-5.1.11.isl"; InfoAfterFile: "@prefix@\share\doc\@PACKAGE@\README-lv.win32-bin.txt"
-Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"; InfoAfterFile: "@prefix@\share\doc\@PACKAGE@\README-nl.win32-bin.txt"
-Name: "pt_BR"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
-Name: "zh_CN"; MessagesFile: "@prefix@\share\@PACKAGE@\ChineseSimp-12-5.1.11.isl"; InfoAfterFile: "@prefix@\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"
-Name: "zh_TW"; MessagesFile: "@prefix@\share\@PACKAGE@\ChineseTrad-2-5.1.11.isl"; InfoAfterFile: "@prefix@\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"
-
-;; The following language files are available as well, in alphabetical
-;; order: Basque, BrazilianPortuguese, Catalan, Czech, Danish, Dutch,
-;; Finnish, Hungarian, Italian, Norwegian, Polish, Portuguese,
-;; Russian, Slovak, Slovenian, Spanish
-
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; These are only for improved text messages
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-[Messages]
-
-[CustomMessages]
-; *** "Select Components" wizard page
-FullInstall=Full installation
-CustomInstall=Custom installation
-CreateDesktopIcon=Create a &desktop icon
-CreateMenuLink=Create a start menu link
-RunPrg=Run GnuCash now
-AdditionalIcons=Create these icons:
-StatusMsgFirewall=Installing Windows firewall rules...
-; *** "Another install" wizard page
-; %1 in the following messages will be replaced with the application name and version, like "GnuCash 2.3.15"
-AIWP_Title=Another installation has been found
-AIWP_Description=%1 is currently installed on this computer
-AIWP_Message=This earlier installation has to be removed before continuing.%n%nIf you don't want that, click Cancel now to abort the current installation.%n%nClick Next to remove %1 and continue with the installation.%n%nNote: Only the program will be removed, not your financial data.
-
-MainFiles=GnuCash Program
-TranslFiles=Translation Files
-TemplFiles=Account Template Files
-
-IconComment_GnuCash=GnuCash Free Finance Manager
-IconName_README=Show README
-IconComment_README=Show the README file
-IconFilename_README=README.win32-bin.txt
-IconName_FAQ=FAQ (Online)
-IconName_Bugzilla=Report a Bug (Online)
-IconName_InstallFQ=Install Online Price Retrieval
-IconComment_InstallFQ=Install the necessary perl module Finance-Quote for online retrieval of prices. Requires ActivePerl 5.8 or later
-IconName_Theme=Select Theme
-IconName_Uninstall=Uninstall GnuCash
-IconComment_Uninstall=Uninstall the Finance Manager GnuCash
-
-;; List of Code pages, used in gnucash.cmd
-LanguageCodePage=1252
-de.LanguageCodePage=1252
-el.LanguageCodePage=1253
-fr.LanguageCodePage=1252
-it.LanguageCodePage=1252
-ja.LanguageCodePage=932
-nl.LanguageCodePage=1252
-pt_BR.LanguageCodePage=1252
-zh_CN.LanguageCodePage=936
-zh_TW.LanguageCodePage=950
-
-;; ;;;;;;;;;;;;;;;;;;;;
-;; German translation
-
-de.FullInstall=Komplett-Installation
-de.CustomInstall=Benutzerdefiniert
-de.CreateDesktopIcon=Ein Icon auf dem Desktop erstellen
-de.CreateMenuLink=Eine Verknüpfung im Startmenü erstellen
-de.RunPrg=GnuCash jetzt starten
-de.AdditionalIcons=Folgende Icons erstellen:
-de.StatusMsgFirewall=Ausnahmen für Windows-Firewall installieren...
-
-de.MainFiles=GnuCash Hauptprogramm
-de.TranslFiles=Deutsche Ãœbersetzung
-de.TemplFiles=Beispiel-Kontenrahmen
-
-de.IconComment_GnuCash=GnuCash OpenSource-Finanzverwaltung
-de.IconName_README=README anzeigen
-de.IconComment_README=Die Informationsdatei (README) anzeigen
-de.IconFilename_README=README-de.win32-bin.txt
-de.IconName_FAQ=Häufige Fragen (online, engl.)
-de.IconName_Bugzilla=Fehlerbericht einsenden (online, engl.)
-de.IconName_InstallFQ=Online Kursabruf installieren
-de.IconComment_InstallFQ=Das zusätzliche Modul Finance-Quote installieren, um online Aktien- und Devisenkurse abrufen zu können. Dazu ist das Programm ActivePerl 5.8 oder neuer erforderlich.
-de.IconName_Uninstall=Deinstallieren von GnuCash
-de.IconComment_Uninstall=Die OpenSource-Finanzverwaltung GnuCash wieder deinstallieren und vom Computer löschen
-
-de.AIWP_Title=Frühere Version gefunden
-de.AIWP_Description=%1 ist momentan auf diesem Computer installiert
-de.AIWP_Message=Diese frühere Version muss vor der neuen Installation entfernt werden. %n%nFalls Sie das nicht möchten, klicken Sie jetzt auf »Abbrechen«.%n%nKlicken Sie auf »Fortsetzen«, um %1 zu entfernen und die neue Version zu installieren.%n%nHinweis: Lediglich die Programmversion wird entfernt, aber nicht Ihre finanziellen Daten.
-
-
-;; ;;;;;;;;;;;;;;;;;;;
-;; Greek translation
-
-el.FullInstall=ΠλήÏης εγκατάσταση
-el.CustomInstall=Î ÏοσαÏμοσμÎνη εγκατάσταση
-el.CreateDesktopIcon=ΔημιουÏγία εικονιδίου στην επιφάνεια εÏγασίας
-el.CreateMenuLink=Î Ïοσθήκη στο Î¼ÎµÎ½Î¿Ï ÎˆÎ½Î±Ïξη
-el.RunPrg=ΕκτÎλεση του GnuCash Ï„ÏŽÏα
-el.AdditionalIcons=ΔημιουÏγία εικονιδίων:
-el.StatusMsgFirewall=Εγκατάσταση κανόνων για το τοίχος Ï€Ïοστασίας των Windows...
-
-el.MainFiles=Î ÏόγÏαμμα GnuCash
-el.TranslFiles=ΑÏχεία μετάφÏασεων
-el.TemplFiles=ΑÏχεία με Ï€Ïότυπα λογαÏιασμών
-
-el.IconComment_GnuCash=GnuCash Ï€ÏόγÏαμμα διαχ. οικονομικών
-el.IconName_README=Εμφάνιση του README
-el.IconComment_README=Εμφάνιση του αÏχείου README
-el.IconFilename_README=README.win32-bin.txt
-el.IconName_FAQ=ΣυχνÎÏ‚ εÏωτήσεις (Online)
-el.IconName_Bugzilla=ΑναφοÏά σφάλματος (Online)
-el.IconName_InstallFQ=Εγκατάσταση λήψης τιμών (online)
-el.IconComment_InstallFQ=Εγκατάσταση του perl module Finance-Quote για λήψη τιμών online. Απαιτεί ActivePerl 5.8+
-el.IconName_Uninstall=Απεγκατάσταση GnuCash
-el.IconComment_Uninstall=Απεγκατάσταση του διαχειÏιστή οικονομικών GnuCash
-
-
-;; ;;;;;;;;;;;;;;;;;;;;
-;; French translation
-
-fr.FullInstall=Installation complète
-fr.CustomInstall=Installation personnalisée
-fr.CreateDesktopIcon=Créer un icône sur le bureau
-fr.CreateMenuLink=Créer un lien dans le menu de démarrage
-fr.RunPrg=Démarrer GnuCash maintenant
-fr.AdditionalIcons=Créer les icônes suivants:
-fr.StatusMsgFirewall=Installation des règles de pare-feu de Windows
-
-fr.MainFiles=Programme GnuCash
-fr.TranslFiles=Traduction française
-fr.TemplFiles=Modèle de plan comptable
-
-fr.IconComment_GnuCash=GnuCash, le gestionnaire financier OpenSource
-fr.IconName_README=Afficher le LISEZMOI
-fr.IconComment_README=Afficher le fichier LISEZMOI
-fr.IconFilename_README=README-fr.win32-bin.txt
-fr.IconName_FAQ=FAQ (En ligne, en anglais)
-fr.IconName_Bugzilla=Envoyer un rapport d'erreur (En ligne, en anglais)
-fr.IconName_InstallFQ=Installer les quotations en ligne
-fr.IconComment_InstallFQ=Installation du module Finance-Quote requis pour le téléchargement du cours des devises et actions. Le programme ActivePerl 5.8 ou plus récent est aussi requis
-fr.IconName_Uninstall=Dé-installer GnuCash
-fr.IconComment_Uninstall=Désinstalle le gestionnaire financier GnuCash
-
-
-;; ;;;;;;;;;;;;;;;;;;;;;
-;; Italian translation
-
-; *** Pagina di "Selezione dei componenti"
-it.FullInstall=Installazione completa
-it.CustomInstall=Installazione personalizzata
-it.CreateDesktopIcon=Crea un'icona sul desktop
-it.CreateMenuLink=Crea un collegamento nel menu "Start"
-it.RunPrg=Avvia GnuCash
-it.AdditionalIcons=Crea queste icone:
-it.StatusMsgFirewall=Installazione delle regole per il firewall di Windows...
-; *** Pagina di "Altra installazione"
-; nel messaggio seguente la stringa %1 sarà sostituita dal nome e dalla versione dell'applicazione, ad esempio "GnuCash 2.3.15"
-it.AIWP_Title=È stata trovata un'altra installazione
-it.AIWP_Description=%1 è installato in questo computer
-it.AIWP_Message=Questa precedente installazione deve essere rimossa prima di continuare.%n%nSe non si intende rimuoverla, fare clic su «Annulla» per terminare l'installazione.%n%nFare invece clic su «Avanti» per rimuovere %1 e continuare con l'installazione.%n%nNota: verrà rimosso solo il programma, non i propri dati finanziari.
-
-it.MainFiles=File del programma GnuCash
-it.TranslFiles=Traduzione Italiana
-it.TemplFiles=Modelli di strutture dei conti
-
-it.IconComment_GnuCash=GnuCash: gestore di finanze libero
-it.IconName_README=Mostra il file LEGGIMI
-it.IconComment_README=Mostra il file LEGGIMI
-it.IconFilename_README=README-it.win32-bin.txt
-it.IconName_FAQ=FAQ (online, in Inglese)
-it.IconName_Bugzilla=Segnalare un bug (online, in Inglese)
-it.IconName_InstallFQ=Installa la funzione di ricerca delle quotazioni online
-it.IconComment_InstallFQ=Installa il modulo di perl Finance-Quote necessario per ricevere le quotazioni online. Richiede ActivePerl 5.8+
-it.IconName_Theme=Selezione del tema
-it.IconName_Uninstall=Disinstalla GnuCash
-it.IconComment_Uninstall=Disinstalla il programma di gestione delle finanze GnuCash
-
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Japanese translation
-
-ja.FullInstall=完全インストール
-ja.CustomInstall=カスタムインストール
-ja.CreateDesktopIcon=デスクトップã«ã‚¢ã‚¤ã‚³ãƒ³ã‚’作æˆ(&D)
-ja.CreateMenuLink=スタートメニューã«ãƒªãƒ³ã‚¯ã‚’作æˆ
-ja.RunPrg=GnuCashã‚’ã™ãã«å®Ÿè¡Œ
-ja.AdditionalIcons=作æˆã•ã‚ŒãŸã‚¢ã‚¤ã‚³ãƒ³:
-ja.StatusMsgFirewall=ファイアウォール定義をインストールä¸
-; *** "Another install" wizard page
-; %1 in the following messages will be replaced with the application name and version, like "GnuCash 2.3.15"
-ja.AIWP_Title=ä»–ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã™
-ja.AIWP_Description=ã“ã®ã‚³ãƒ³ãƒ”ュータã«ã¯ %1 ãŒç¾åœ¨ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã™
-ja.AIWP_Message=インストールを継続ã™ã‚‹å‰ã«å‰ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¯ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¾ã™ã€‚%n%nã‚‚ã—ã“ã®å‹•ä½œã‚’望ã¾ãªã„ãªã‚‰ã€Œã‚ャンセルã€ã‚’クリックã—ã¦ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’ä¸æ¢ã—ã¦ãã ã•ã„。%n%n%1 を削除ã—ã¦ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’継続ã™ã‚‹å ´åˆã¯ã€Œæ¬¡ã¸ã€ã‚’クリックã—ã¦ãã ã•ã„。%n%n備考: 作æˆã—ãŸè²¡å‹™ãƒ‡ãƒ¼ã‚¿ã¯å‰Šé™¤ã•ã‚Œã¾ã›ã‚“。プãƒã‚°ãƒ©ãƒ ã®ã¿ãŒå‰Šé™¤ã•ã‚Œã¾ã™ã€‚
-
-ja.MainFiles=GnuCashプãƒã‚°ãƒ©ãƒ
-ja.TranslFiles=翻訳ファイル
-ja.TemplFiles=勘定科目テンプレートファイル
-
-ja.IconComment_GnuCash=GnuCash フリーã®è²¡å‹™ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢
-ja.IconName_README=READMEを表示
-ja.IconComment_README=READMEファイルを表示ã—ã¾ã™
-ja.IconFilename_README=README.win32-bin.txt
-ja.IconName_FAQ=FAQ (オンライン)
-ja.IconName_Bugzilla=ãƒã‚°ã‚’å ±å‘Š (オンライン)
-ja.IconName_InstallFQ=ã‚ªãƒ³ãƒ©ã‚¤ãƒ³ç›¸å ´è¡¨å–得ツールをインストール
-ja.IconComment_InstallFQ=ã‚ªãƒ³ãƒ©ã‚¤ãƒ³ç›¸å ´è¡¨ã‚’å–å¾—ã™ã‚‹ãŸã‚ã«Finance-Quote perl モジュールをインストールã—ã¾ã™ã€‚ActivePerl5.8ã¾ãŸã¯5.10ãŒå¿…è¦ã§ã™
-ja.IconName_Theme=テーマã®é¸æŠž
-ja.IconName_Uninstall=GnuCashをアンインストール
-ja.IconComment_Uninstall=財務ソフトウェアGnuCashをアンインストールã—ã¾ã™
-
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Latvian translation
-
-; *** "Select Components" wizard page
-lv.FullInstall=Pilna uzstÄdÄ«Å¡ana
-lv.CustomInstall=IzvÄ“les uzstÄdÄ«Å¡ana
-lv.CreateDesktopIcon=Izveidot &darbvirsmas ikonu
-lv.CreateMenuLink=Izveidot starta izvēlnes saiti
-lv.RunPrg=Palaist GnuCash tagad
-lv.AdditionalIcons=Izveidot sekojošas ikonas:
-lv.StatusMsgFirewall=UzstÄda Windows ugunssienas likumus...
-
-; *** "Another install" wizard page
-; %1 in the following messages will be replaced with the application name and version, like "GnuCash 2.3.15"
-lv.AIWP_Title=Ir atrasta cita programmas versija
-lv.AIWP_Description=Uz Å¡Ä« datora jau ir uzstÄdÄ«t %1 versija
-lv.AIWP_Message=Pirms turpinÄt, ir nepiecieÅ¡ams noņemt iepriekÅ¡ uzstÄdÄ«to versiju.%n%nJa nevÄ“laties to darÄ«t, spiediet Atcelt pogu, un Å¡Ä« uzstÄdÄ«Å¡ana tiks atcelta.%n%nSpiediet TurpinÄt, lai noņemtu %1 un turpinÄtu jaunÄs versijas uzstÄdÄ«Å¡anu.%n%nNote: Tiks noņemta tikai iepriekÅ¡Ä“jÄs programmas versija. JÅ«su finanÅ¡u dati aiztikti netiks.
-
-lv.MainFiles=GnuCash Programma
-lv.TranslFiles=Tulkojumu faili
-lv.TemplFiles=Kontu sagatavju faili
-
-lv.IconComment_GnuCash=GnuCash grÄmatvedÄ«bas programma
-lv.IconName_README=ParÄdÄ«t README
-lv.IconComment_README=ParÄda README failu
-lv.IconFilename_README=README-lv.win32-bin.txt
-lv.IconName_FAQ=BUJ (tiešsaistē)
-lv.IconName_Bugzilla=Ziņot par kļūdu (tiešsaistē)
-lv.IconName_InstallFQ=UzstÄdÄ«t tieÅ¡saistes kursu iegÅ«Å¡anu
-lv.IconComment_InstallFQ=UzstÄdÄ«t nepiecieÅ¡amos Perl moduļus valÅ«tas kursu iegÅ«Å¡anai. NepiecieÅ¡ams ActivePerl 5.8+
-lv.IconName_Theme=Izvēlieties tēmu
-lv.IconName_Uninstall=Noņemt GnuCash
-lv.IconComment_Uninstall=Noņemt GnuCash grÄmatvedÄ«bas programmu
-
-
-;; ;;;;;;;;;;;;;;;;;
-;; Dutch translation
-
-nl.FullInstall=Volledige installatie
-nl.CustomInstall=Aangepaste installatiie
-nl.CreateDesktopIcon=Een &bureablad icoon aanmaken
-nl.CreateMenuLink=Een verwijzing in het start menu aanmaken
-nl.RunPrg=GnuCash nu starten
-nl.AdditionalIcons=Deze iconen aanmaken:
-nl.StatusMsgFirewall=Windows firewall regels installeren...
-
-nl.MainFiles=GnuCash Programma
-nl.TranslFiles=Vertalingsbestanden
-nl.TemplFiles=Grootboekrekeningssjablonen
-
-nl.IconComment_GnuCash=GnuCash Vrij Financieel Beheer
-nl.IconName_README=LEESMIJ Tonen
-nl.IconComment_README=Het LEESMIJ bestand tonen
-nl.IconFilename_README=README-nl.win32-bin.txt
-nl.IconName_FAQ=FAQ (Online)
-nl.IconName_Bugzilla=Een Bug Melden (Online)
-nl.IconName_InstallFQ=Online Koersen Opvragen installeren
-nl.IconComment_InstallFQ=De benodigde perl module Finance Quote om online koersen op te vragen installeren. Hiervoor is ActivePerl 5.8 of recenter nodig.
-nl.IconName_Uninstall=GnuCash verwijderen
-nl.IconComment_Uninstall=Het financieel beheersprogramma GnuCash verwijderen
-
-nl.AIWP_Title=Een eerdere installatie werd gevonden
-nl.AIWP_Description=%1 is momenteel op deze computer geïnstalleerd
-nl.AIWP_Message=Deze eerdere installatie moet verwijderd worden alvorens verder te gaan.%n%nAls je dat niet wil, klik dan nu op Annuleren om de huidige installatie af te breken.%n%nKlik op Volgende om %1 te verwijderen en de installatie te vervolgen.%n%nOpmerking: enkel het programma zal verwijderd worden, niet je financiële data.
-
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Brazilian Portuguese translation
-
-pt_BR.FullInstall=Instalação Completa
-pt_BR.CustomInstall=Instalação Personalizada
-pt_BR.CreateDesktopIcon=Criar um Ãcone na Ãrea de Trabalho
-pt_BR.CreateMenuLink=Criar um link no menu Iniciar
-pt_BR.RunPrg=Executar o GnuCash agora
-pt_BR.AdditionalIcons=Criar estes Ãcones:
-pt_BR.StatusMsgFirewall=Instalando as regras de firewall do Windows...
-
-pt_BR.MainFiles=Programa GnuCash
-pt_BR.TranslFiles=Tradução
-pt_BR.TemplFiles=Modelos de Conta
-
-pt_BR.IconComment_GnuCash=Gerenciador Financeiro Livre GnuCash
-pt_BR.IconName_README=Mostrar LEIA-ME (README)
-pt_BR.IconComment_README=Mostra o arquivo LEIA-ME (README)
-pt_BR.IconFilename_README=LEIA-ME.win32-bin.txt
-pt_BR.IconName_FAQ=Perguntas Freqüentes (online, inglês)
-pt_BR.IconName_Bugzilla=Relatar um erro (online, inglês)
-pt_BR.IconName_InstallFQ=Instalar a Consulta de Preços Online
-pt_BR.IconComment_InstallFQ=Instala o módulo perl Finance-Quote, necessário para a busca de preços online. Requer ActivePerl 5.8+.
-pt_BR.IconName_Uninstall=Desinstalar o GnuCash
-pt_BR.IconComment_Uninstall=Desinstala o Gerenciador Financeiro GnuCash
-
-
-;; ;;;;;;;;;;;;;;;;;
-;; Simplified Chinese translation
-
-zh_CN.FullInstall=完全安装
-zh_CN.CustomInstall=自定义安装
-zh_CN.CreateDesktopIcon=创建桌é¢å›¾æ ‡
-zh_CN.CreateMenuLink=创建开始èœå•é“¾æŽ¥
-zh_CN.RunPrg=现在开始è¿è¡Œ GnuCash
-zh_CN.AdditionalIcons=åˆ›å»ºè¿™äº›å›¾æ ‡
-zh_CN.StatusMsgFirewall=æ£åœ¨å®‰è£… Windows 防ç«å¢™è§„则...
-
-zh_CN.MainFiles=GnuCash 程åº
-zh_CN.TranslFiles=翻译文件
-zh_CN.TemplFiles=会计科目模æ¿æ–‡ä»¶
-
-zh_CN.IconComment_GnuCash=GnuCash å…费财务管ç†
-zh_CN.IconName_README=显示自述文件
-zh_CN.IconComment_README=显示自述文件
-zh_CN.IconFilename_README=README-zh_CN.win32-bin.txt
-zh_CN.IconName_FAQ=常è§é—®é¢˜ (在线)
-zh_CN.IconName_Bugzilla=报告软件 Bug (在线)
-zh_CN.IconName_InstallFQ=å®‰è£…åœ¨çº¿ä»·æ ¼æ£€ç´¢åŠŸèƒ½
-zh_CN.IconComment_InstallFQ=å®‰è£…åœ¨çº¿ä»·æ ¼æ£€ç´¢æ‰€å¿…éœ€çš„ Perl Finance-Quote模å—ã€‚éœ€è¦ ActivePerl 5.8 或 5.10
-zh_CN.IconName_Uninstall=å¸è½½ GnuCash
-zh_CN.IconComment_Uninstall=å¸è½½è´¢åŠ¡ç®¡ç†è½¯ä»¶ GnuCash
-
-;; ;;;;;;;;;;;;;;;;;
-;; Traditional Chinese translation
-
-; *** "Select Components" wizard page
-zh_TW.FullInstall=完整安è£
-zh_TW.CustomInstall=自訂安è£
-zh_TW.CreateDesktopIcon=產生桌é¢åœ–示
-zh_TW.CreateMenuLink=產生開始功能表圖示
-zh_TW.RunPrg=ç¾åœ¨é–‹å§‹åŸ·è¡Œ GnuCash
-zh_TW.AdditionalIcons=建立這些圖示:
-zh_TW.StatusMsgFirewall=æ£åœ¨å®‰è£ Windows 防ç«ç‰†è¦å‰‡...
-; *** "Another install" wizard page
-; %1 in the following messages will be replaced with the application name and version, like "GnuCash 2.3.15"
-zh_TW.AIWP_Title=發ç¾å·²å®‰è£éŽ
-zh_TW.AIWP_Description=%1 已經安è£æ–¼ç³»çµ±ä¸
-zh_TW.AIWP_Message=èˆŠç‰ˆå¿…é ˆå…ˆç§»é™¤æ‰èƒ½ç¹¼çºŒã€‚%n%n若您ä¸æƒ³ç§»é™¤ï¼Œç¾åœ¨å°±é»žé¸ã€Œå–消ã€ä¸æ–·å®‰è£ã€‚%n%n點é¸ã€Œä¸‹ä¸€æ¥ã€æœƒç§»é™¤ %1 並繼續安è£ã€‚%n%n注æ„: åªæœ‰ç¨‹å¼æœƒè¢«ç§»é™¤ï¼Œä¸æœƒå½±éŸ¿åˆ°æ‚¨çš„財務資料å˜æª”。
-
-zh_TW.MainFiles=GnuCash 程å¼
-zh_TW.TranslFiles=ç¿»è¯æª”
-zh_TW.TemplFiles=會計科目範本檔
-
-zh_TW.IconComment_GnuCash=GnuCash 自由財務管ç†
-zh_TW.IconName_README=顯示 README
-zh_TW.IconComment_README=顯示 README 檔
-zh_TW.IconFilename_README=README-zh_TW.win32-bin.txt
-zh_TW.IconName_FAQ=常見å•é¡Œ (線上)
-zh_TW.IconName_Bugzilla=å›žå ±ç¨‹å¼ Bug (線上)
-zh_TW.IconName_InstallFQ=安è£ç¶²è·¯å ±åƒ¹æˆªå–功能
-zh_TW.IconComment_InstallFQ=安è£æˆªå–ç¶²è·¯å ±åƒ¹æ‰€éœ€çš„ Perl Finance-Quote æ¨¡çµ„ã€‚éœ€è¦ ActivePerl 5.8 或 5.10
-zh_TW.IconName_Theme=é¸æ“‡ä»‹é¢é¢¨æ ¼
-zh_TW.IconName_Uninstall=åå®‰è£ GnuCash
-zh_TW.IconComment_Uninstall=å安è£è²¡å‹™ç®¡ç†å“¡ GnuCash
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Input configuration for the Inno Setup Compiler
+; Copyright (c) 2004-2005 Christian Stimming <stimming at tuhh.de>
+;
+; Inno Setup Compiler: See http://www.jrsoftware.org/isdl.php
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[Setup]
+; Using the name here directly because we want it capitalized
+AppName=GnuCash
+AppVerName=GnuCash @VERSION@
+AppPublisher=GnuCash Development Team
+AppPublisherURL=http://www.gnucash.org
+AppSupportURL=http://www.gnucash.org
+AppUpdatesURL=http://www.gnucash.org
+VersionInfoVersion=@VERSION@
+DefaultDirName={pf}\@PACKAGE@
+DefaultGroupName=GnuCash
+LicenseFile=@prefix@\..\dist\share\doc\@PACKAGE@\COPYING
+Compression=lzma
+MinVersion=5.0,5.0
+PrivilegesRequired=poweruser
+OutputDir=.
+OutputBaseFilename=@PACKAGE at -@VERSION at -setup
+UninstallFilesDir={app}\uninstall\@PACKAGE@
+InfoAfterFile=@prefix@\..\dist\share\doc\@PACKAGE@\README.win32-bin.txt
+SetupIconFile=@prefix@\..\dist\share\@PACKAGE@\pixmaps\gnucash-icon.ico
+WizardSmallImageFile=@prefix@\..\dist\share\@PACKAGE@\pixmaps\gnucash-icon-48x48.bmp
+
+[Types]
+Name: "full"; Description: "{cm:FullInstall}"
+Name: "custom"; Description: "{cm:CustomInstall}"; Flags: iscustom
+
+[Components]
+Name: "main"; Description: "{cm:MainFiles}"; Types: full custom; Flags: fixed
+;Name: "translations"; Description: "{cm:TranslFiles}"; Types: full
+;Name: "templates"; Description: "{cm:TemplFiles}"; Types: full
+
+[Tasks]
+Name: desktopicon; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"
+Name: menuicon; Description: "{cm:CreateMenuLink}"; GroupDescription: "{cm:AdditionalIcons}"
+
+[Icons]
+Name: "{group}\GnuCash"; Filename: "{app}\bin\gnucash.exe"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: menuicon
+Name: "{group}\{cm:IconName_README}"; Filename: "{app}\doc\gnucash\{cm:IconFilename_README}"; Comment: "{cm:IconComment_README}"; Tasks: menuicon
+Name: "{group}\{cm:IconName_FAQ}"; Filename: "http://wiki.gnucash.org/wiki/FAQ"; Tasks: menuicon
+Name: "{group}\{cm:IconName_Bugzilla}"; Filename: "http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash"; Tasks: menuicon
+Name: "{group}\{cm:IconName_InstallFQ}"; Filename: "{app}\bin\install-fq-mods.cmd"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_InstallFQ}"; Tasks: menuicon
+Name: "{group}\{cm:IconName_Theme}"; Filename: "{app}\bin\gtk2_prefs.exe"; WorkingDir: "{app}\bin"; Tasks: menuicon
+Name: "{group}\{cm:IconName_Uninstall}"; Filename: "{uninstallexe}"; Comment: "{cm:IconComment_Uninstall}"; Tasks: menuicon
+
+Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\gnucash.exe"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: desktopicon
+
+[Run]
+Filename: "{app}\bin\gnucash.exe"; Description: "{cm:RunPrg}"; WorkingDir: "{app}\bin"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent
+Filename: "{app}\bin\guile.cmd"; Flags: runhidden
+;; The Windows firewall exceptions, see http://www.vincenzo.net/isxkb/index.php?title=Adding_a_rule_to_the_Windows_firewall
+Filename: "{sys}\netsh.exe"; Parameters: "firewall add allowedprogram ""{app}\bin\gnucash.exe"" ""GnuCash Free Finance Manager"" ENABLE ALL"; StatusMsg: "{cm:StatusMsgFirewall}"; Flags: runhidden; MinVersion: 0,5.01.2600sp2;
+Filename: "{sys}\netsh.exe"; Parameters: "firewall add allowedprogram ""{app}\bin\gconfd-2.exe"" ""GConf Settings Manager"" ENABLE ALL"; StatusMsg: "{cm:StatusMsgFirewall}"; Flags: runhidden; MinVersion: 0,5.01.2600sp2;
+
+[UninstallRun]
+Filename: "{app}\bin\gconftool-2.exe"; Parameters: "--shutdown"; Flags: runhidden
+Filename: "{sys}\netsh.exe"; Parameters: "firewall delete allowedprogram program=""{app}\bin\@PACKAGE at .exe"""; Flags: runhidden; MinVersion: 0,5.01.2600sp2
+Filename: "{sys}\netsh.exe"; Parameters: "firewall delete allowedprogram program=""{app}\bin\gconfd-2.exe"""; Flags: runhidden; MinVersion: 0,5.01.2600sp2
+
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Here we configure the included files and the place of their
+; installation
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+[Files]
+; The main executables and DLLs
+Source: "@prefix@\..\dist\bin\*"; DestDir: "{app}\bin"; Flags: recursesubdirs ignoreversion; Components: main
+Source: "@prefix@\..\dist\etc\*"; DestDir: "{app}\etc"; Flags: recursesubdirs; Components: main
+Source: "@prefix@\..\dist\etc\@PACKAGE@\environment"; DestDir: "{app}\etc\@PACKAGE@"; Components: main; AfterInstall: MyAfterInstallEnvironment()
+; 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
+;; 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!
+;; Additionally, we ship the Qt DLLs because the Online-Banking-Wizard
+;; lib/aqbanking/plugins/@-aqbanking_so_effective-@/wizards/qt3-wizard.exe needs them.
+;Source: "@-qtbindir-@\QtCore4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+;Source: "@-qtbindir-@\QtGui4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+;Source: "@-qtbindir-@\mingwm10.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+;;; The following are all needed by Qt3Support
+;Source: "@-qtbindir-@\Qt3Support4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+;Source: "@-qtbindir-@\QtXml4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+;Source: "@-qtbindir-@\QtSql4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+;Source: "@-qtbindir-@\QtNetwork4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+
+;; The translations
+;Source: "@prefix@\..\dist\share\locale\*"; DestDir: "{app}\share\locale"; Flags: recursesubdirs; Components: translations
+;
+;; The account templates
+;Source: "@prefix@\..\dist\share\@PACKAGE@\accounts\*"; DestDir: "{app}\share\@PACKAGE@\accounts"; Flags: recursesubdirs; Components: templates
+
+; And all the documentation
+Source: "@prefix@\..\dist\share\doc\@PACKAGE@\README"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@prefix@\..\dist\share\doc\@PACKAGE@\README.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@prefix@\..\dist\share\doc\@PACKAGE@\README-de.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@prefix@\..\dist\share\doc\@PACKAGE@\README-fr.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@prefix@\..\dist\share\doc\@PACKAGE@\README-it.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@prefix@\..\dist\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@prefix@\..\dist\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@prefix@\..\dist\share\doc\@PACKAGE@\COPYING"; DestDir: "{app}\doc\@PACKAGE@"; Flags: ignoreversion; Components: main
+Source: "@prefix@\..\dist\share\doc\@PACKAGE@\AUTHORS"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@prefix@\..\dist\share\doc\@PACKAGE@\ChangeLog"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+
+
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Define the registry keys Setup should create (HKLM = HKEY_LOCAL_MACHINE)
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+[Registry]
+Root: HKCR; Subkey: ".gnucash"; ValueType: string; ValueName: ""; ValueData: "GnuCash.Financial.Data"; Flags: uninsdeletevalue
+Root: HKCR; Subkey: ".gnucash"; ValueType: string; ValueName: "Content Type"; ValueData: "application/x-gnucash"; Flags: uninsdeletevalue
+Root: HKCR; Subkey: "GnuCash.Financial.Data"; ValueType: string; ValueName: ""; ValueData: "GnuCash Financial Data"; Flags: uninsdeletevalue
+Root: HKCR; Subkey: "GnuCash.Financial.Data\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\share\gnucash\pixmaps\gnucash-icon.ico,0"
+Root: HKCR; Subkey: "GnuCash.Financial.Data\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\bin\gnucash.exe"" ""%1"""
+
+Root: HKLM; Subkey: "Software\GnuCash"; ValueType: none; Flags: uninsdeletekeyifempty
+Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: none; Flags: uninsdeletekeyifempty
+Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "prefix"; ValueData: "{app}"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\GnuCash"; ValueType: string; ValueName: "InstallationDirectory"; ValueData: "{app}"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "libdir"; ValueData: "{app}\lib"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "pkglibdir"; ValueData: "{app}\lib\@PACKAGE@"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "sysconfdir"; ValueData: "{app}\etc"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "localedir"; ValueData: "{app}\share\locale"; Flags: uninsdeletevalue
+
+; Store the version information
+Root: HKLM; Subkey: "Software\GnuCash\Version"; ValueType: none; Flags: uninsdeletekeyifempty
+Root: HKLM; Subkey: "Software\GnuCash\Version"; ValueType: string; ValueName: "Version"; ValueData: "@PACKAGE_VERSION@"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\GnuCash\Version"; ValueType: dword; ValueName: "VersionMajor"; ValueData: "@GNUCASH_MAJOR_VERSION@"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\GnuCash\Version"; ValueType: dword; ValueName: "VersionMinor"; ValueData: "@GNUCASH_MINOR_VERSION@"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\GnuCash\Version"; ValueType: dword; ValueName: "VersionMicro"; ValueData: "@GNUCASH_MICRO_VERSION@"; Flags: uninsdeletevalue
+
+; Additionally, we have to install the paths for gwenhywfar
+Root: HKLM; Subkey: "Software\Gwenhywfar"; ValueType: none; Flags: uninsdeletekeyifempty
+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\@-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
+
+; And we also need some registry keys for aqbanking
+Root: HKLM; Subkey: "Software\Aqbanking"; ValueType: none; Flags: uninsdeletekeyifempty
+Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: none; Flags: uninsdeletekeyifempty
+Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "providerdir"; ValueData: "{app}\lib\aqbanking\plugins\@-aqbanking_so_effective-@\providers"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "bankinfodir"; ValueData: "{app}\lib\aqbanking\plugins\@-aqbanking_so_effective-@\bankinfo"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "importerdir"; ValueData: "{app}\lib\aqbanking\plugins\@-aqbanking_so_effective-@\imexporters"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "wizarddir"; ValueData: "{app}\lib\aqbanking\plugins\@-aqbanking_so_effective-@\wizards"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "pkgdatadir"; ValueData: "{app}\share\aqbanking"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "sysconfdir"; ValueData: "{app}\etc"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "localedir"; ValueData: "{app}\share\locale"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\AqBanking\Paths"; ValueType: string; ValueName: "xmldatadir"; ValueData: "{app}\share\aqhbci\xml"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\AqBanking\Paths"; ValueType: string; ValueName: "cfgmoduledir"; ValueData: "{app}\lib\aqbanking\plugins\@-aqbanking_so_effective-@\frontends\qbanking\cfgmodules"; Flags: uninsdeletevalue
+
+
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Delete the created config script on uninstall
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+[UninstallDelete]
+Type: files; Name: "{app}\bin\guile.cmd"
+Type: files; Name: "{app}\etc\gnucash\environment"
+Type: filesandordirs; Name: "{app}\share\guile"
+Type: filesandordirs; Name: "{app}\etc\gconf"
+Type: dirifempty; Name: "{app}\etc\gnucash"
+Type: dirifempty; Name: "{app}\etc"
+
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Perform some additional actions in code that can't be done
+; by the installer by default. The code snippets below hook
+; into the installer code at specific events. See
+; http://www.jrsoftware.org/ishelp/index.php?topic=scriptintro
+; for more information on iss scription and a syntax reference.
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+[Code]
+var
+ PrevInstDetectedPage : TOutputMsgWizardPage;
+ PrevAppName, PrevUninstallString : String;
+ PrevVersionMajor, PrevVersionMinor, PrevVersionMicro : Cardinal;
+ Uninstallrequired : Boolean;
+
+// ----------------------------------------------------------------
+// Sometimes it's not possible to install a newer version of
+// GnuCash over an older one on Windows. This happens for example
+// when libraries or reports are moved around in the newer version.
+// The code below will detect an existing GnuCash installation
+// and will remove it (if the user accepts) before installing
+// the version the user has selected.
+// ----------------------------------------------------------------
+
+{ Lookup the registry information on a previous installation }
+procedure GetPrevInstallInfo();
+var
+ sUnInstPath, sAppVersionPath: String;
+ rootKey : Integer;
+begin
+ sAppVersionPath := 'Software\GnuCash\Version';
+ sUnInstPath := 'Software\Microsoft\Windows\CurrentVersion\Uninstall\GnuCash_is1';
+
+ PrevAppName := '';
+ PrevUninstallString := '';
+ PrevVersionMajor := 0;
+ PrevVersionMinor := 0;
+ PrevVersionMicro := 0;
+
+ if RegKeyExists(HKLM, sUnInstPath) then
+ rootKey := HKLM
+ else
+ rootKey := HKCU;
+
+ RegQueryStringValue(rootKey, sUnInstPath, 'UninstallString', PrevUninstallString);
+ RegQueryStringValue(rootKey, sUnInstPath, 'DisplayName', PrevAppName);
+ RegQueryDwordValue(rootKey, sAppVersionPath, 'VersionMajor', PrevVersionMajor);
+ RegQueryDwordValue(rootKey, sAppVersionPath, 'VersionMinor', PrevVersionMinor);
+ RegQueryDwordValue(rootKey, sAppVersionPath, 'VersionMicro', PrevVersionMicro);
+end;
+
+{ Check if there is another GnuCash currently installed }
+{ If so, the user will be prompted if it can be uninstalled first. }
+{ If the user doesn't allow uninstall, the installation will be aborted. }
+procedure CheckUninstallRequired();
+begin
+ UninstallRequired := True;
+ GetPrevInstallInfo;
+
+ if (PrevUninstallString = '') then
+ UninstallRequired := False
+// We used to check on major-minor versions to determine the uninstall requirement,
+// but this is not always sufficient. So the following code won't be used until
+// refined.
+// else if (PrevVersionMajor = @GNUCASH_MAJOR_VERSION@) and (PrevVersionMinor = @GNUCASH_MINOR_VERSION@) then
+// UninstallRequired := False;
+end;
+
+{ Uninstall the current installation }
+function UnInstallOldVersion(): Integer;
+var
+ sUnInstallString: String;
+ iResultCode: Integer;
+begin
+// Return Values:
+// 1 - uninstall string is empty
+// 2 - error executing the UnInstallString
+// 3 - successfully executed the UnInstallString
+
+ // default return value
+ Result := 0;
+
+ if PrevUninstallString <> '' then begin
+ sUnInstallString := RemoveQuotes(PrevUninstallString);
+ if Exec(sUnInstallString, '/SILENT /NORESTART /SUPPRESSMSGBOXES','', SW_HIDE, ewWaitUntilTerminated, iResultCode) then
+ Result := 3
+ else
+ Result := 2;
+ end else
+ Result := 1;
+end;
+
+function GetPrevAppName(Param: String): String;
+begin
+ Result := PrevAppName;
+end;
+
+{ Setup a page to display if a previous (incompatible) GnuCash installation is found }
+procedure InitializeWizard;
+begin
+ CheckUninstallRequired;
+ PrevInstDetectedPage := CreateOutputMsgPage(wpReady,
+ ExpandConstant('{cm:AIWP_Title}'),
+ ExpandConstant('{cm:AIWP_Description,{code:GetPrevAppName}}'),
+ ExpandConstant('{cm:AIWP_Message,{code:GetPrevAppName}}'));
+end;
+
+{ Determine whether the previous installation page should be displayed or not }
+function ShouldSkipPage(PageID: Integer): Boolean;
+begin
+ Result := False
+ if (PageID = PrevInstDetectedPage.ID) and (not UninstallRequired) then
+ Result := True;
+end;
+
+{ If a previous (incompatible) installation is present start the installation }
+{ process with deleting this old installation }
+procedure CurStepChanged(CurStep: TSetupStep);
+begin
+ if (CurStep=ssInstall) and (UninstallRequired) then
+ UnInstallOldVersion();
+end;
+
+// ------------------------------------------------------------
+// The GnuCash environment file contains paths that have to be
+// adapted at install time. The code below does that.
+// ------------------------------------------------------------
+function MingwBacksl(const S: String): String;
+begin
+ { Modify the path name S so that it can be used by MinGW }
+ if Length(ExtractFileDrive(S)) = 0 then
+ Result := S
+ else begin
+ Result := '/'+S;
+ StringChange(Result, ':\', '\');
+ end;
+ StringChange(Result, '\', '/');
+end;
+
+procedure MyAfterInstallConfig();
+var
+ FileName, FileString, appdir, libdir, pkglibdir, pkgdatadir: String;
+ Res: Boolean;
+begin
+
+ { Get the installation-specific paths }
+ appdir := ExpandConstant('{app}');
+ pkgdatadir := appdir + '\share\gnucash';
+
+ { Create the guile.cmd file; #10 is the linefeed character and #13 CR }
+
+ FileName := appdir + '\bin\guile.cmd' ;
+ FileString := 'set GUILE_LOAD_PATH=' + pkgdatadir + '\guile-modules;' + pkgdatadir + '\scm;' + appdir + '\share\guile\1.8;%GUILE_LOAD_PATH%'#13#10 ;
+ FileString := FileString + 'start guile.exe %*'#13#10 ;
+
+ { Save the final file }
+
+ Res := SaveStringToFile(FileName, FileString, False);
+ if Res = False then
+ MsgBox('Error on saving '+FileName+' for completing the installation', mbInformation, MB_OK);
+
+end;
+
+function BackslashPath(const S: String): String;
+begin
+ { Convert c:\soft to c:/soft }
+ Result := S;
+ StringChange(Result, '\', '/');
+end;
+
+procedure MyAfterInstallEnvironment();
+var
+ EnvFile, EtcDir: String;
+ iLineCounter, iSize : Integer;
+ EnvStrList: TArrayOfString;
+ Res: Boolean;
+begin
+ { Make some Windows-only changes to the etc/@PACKAGE@/environment file }
+ { If you make any changes here, you should probably also change the equivalent sections }
+ { in packaging/win32/install.sh }
+ { A new line is stared with #13#10 - #10 is the linefeed character and #13 CR }
+
+ { Get the installation-specific paths }
+ EnvFile := ExpandConstant(CurrentFileName);
+ EtcDir := ExtractFileDir(EnvFile);
+
+ { Load the current contents of the environment file }
+ Res := LoadStringsFromFile(EnvFile, EnvStrList);
+ if Res = False then
+ MsgBox('Error on reading ' + EnvFile + ' for completing the installation', mbInformation, MB_OK);
+
+ iSize := GetArrayLength(EnvStrList);
+ for iLineCounter := 0 to iSize-1 do
+ begin
+ { Adapt GUILE_LOAD_PATH parameter and prevent cygwin interference in SCHEME_LIBRARY_PATH }
+ if (Pos('GUILE_LOAD_PATH', EnvStrList[iLineCounter]) = 1) then
+ begin
+ StringChangeEx(EnvStrList[iLineCounter], '{GUILE_LOAD_PATH}', '{GNC_HOME}/share/guile/1.8;{GUILE_LOAD_PATH}', True);
+
+ EnvStrList[iLineCounter] := EnvStrList[iLineCounter] + #13#10 + '# Clear SCHEME_LIBRARY_PATH to prevent interference from other guile installations (like cygwin)' + #13#10;
+ EnvStrList[iLineCounter] := EnvStrList[iLineCounter] + 'SCHEME_LIBRARY_PATH=' + #13#10;
+ end;
+ { Adapt GNC_DBD_DIR parameter }
+ if (Pos('GNC_DBD_DIR', EnvStrList[iLineCounter]) > 0) then
+ EnvStrList[iLineCounter] := 'GNC_DBD_DIR={GNC_HOME}/lib/dbd';
+ end;
+
+ { Save the final file }
+ Res := ForceDirectories(EtcDir);
+ if Res = False then
+ MsgBox('Error on creating ' + EtcDir + ' for completing the installation', mbInformation, MB_OK);
+
+ Res := SaveStringsToFile(EnvFile, EnvStrList, False);
+ if Res = False then
+ MsgBox('Error on saving ' + EnvFile + ' for completing the installation', mbInformation, MB_OK);
+end;
+
+[Languages]
+Name: "en"; MessagesFile: "compiler:Default.isl"
+Name: "de"; MessagesFile: "compiler:Languages\German.isl"; InfoAfterFile: "@prefix@\share\doc\@PACKAGE@\README-de.win32-bin.txt"
+Name: "el"; MessagesFile: "@prefix@\share\@PACKAGE@\Greek-4-5.1.11.isl"
+Name: "fr"; MessagesFile: "compiler:Languages\French.isl"; InfoAfterFile: "@prefix@\share\doc\@PACKAGE@\README-fr.win32-bin.txt"
+Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"; InfoAfterFile: "@prefix@\share\doc\@PACKAGE@\README-it.win32-bin.txt"
+Name: "ja"; MessagesFile: "@prefix@\share\@PACKAGE@\Japanese-5-5.1.11.isl"
+Name: "lv"; MessagesFile: "@prefix@\share\@PACKAGE@\Latvian-1-5.1.11.isl"; InfoAfterFile: "@prefix@\share\doc\@PACKAGE@\README-lv.win32-bin.txt"
+Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"; InfoAfterFile: "@prefix@\share\doc\@PACKAGE@\README-nl.win32-bin.txt"
+Name: "pt_BR"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
+Name: "zh_CN"; MessagesFile: "@prefix@\share\@PACKAGE@\ChineseSimp-12-5.1.11.isl"; InfoAfterFile: "@prefix@\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"
+Name: "zh_TW"; MessagesFile: "@prefix@\share\@PACKAGE@\ChineseTrad-2-5.1.11.isl"; InfoAfterFile: "@prefix@\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"
+
+;; The following language files are available as well, in alphabetical
+;; order: Basque, BrazilianPortuguese, Catalan, Czech, Danish, Dutch,
+;; Finnish, Hungarian, Italian, Norwegian, Polish, Portuguese,
+;; Russian, Slovak, Slovenian, Spanish
+
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; These are only for improved text messages
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+[Messages]
+
+[CustomMessages]
+; *** "Select Components" wizard page
+FullInstall=Full installation
+CustomInstall=Custom installation
+CreateDesktopIcon=Create a &desktop icon
+CreateMenuLink=Create a start menu link
+RunPrg=Run GnuCash now
+AdditionalIcons=Create these icons:
+StatusMsgFirewall=Installing Windows firewall rules...
+; *** "Another install" wizard page
+; %1 in the following messages will be replaced with the application name and version, like "GnuCash 2.3.15"
+AIWP_Title=Another installation has been found
+AIWP_Description=%1 is currently installed on this computer
+AIWP_Message=This earlier installation has to be removed before continuing.%n%nIf you don't want that, click Cancel now to abort the current installation.%n%nClick Next to remove %1 and continue with the installation.%n%nNote: Only the program will be removed, not your financial data.
+
+MainFiles=GnuCash Program
+TranslFiles=Translation Files
+TemplFiles=Account Template Files
+
+IconComment_GnuCash=GnuCash Free Finance Manager
+IconName_README=Show README
+IconComment_README=Show the README file
+IconFilename_README=README.win32-bin.txt
+IconName_FAQ=FAQ (Online)
+IconName_Bugzilla=Report a Bug (Online)
+IconName_InstallFQ=Install Online Price Retrieval
+IconComment_InstallFQ=Install the necessary perl module Finance-Quote for online retrieval of prices. Requires ActivePerl 5.8 or later
+IconName_Theme=Select Theme
+IconName_Uninstall=Uninstall GnuCash
+IconComment_Uninstall=Uninstall the Finance Manager GnuCash
+
+;; List of Code pages, used in gnucash.cmd
+LanguageCodePage=1252
+de.LanguageCodePage=1252
+el.LanguageCodePage=1253
+fr.LanguageCodePage=1252
+it.LanguageCodePage=1252
+ja.LanguageCodePage=932
+nl.LanguageCodePage=1252
+pt_BR.LanguageCodePage=1252
+zh_CN.LanguageCodePage=936
+zh_TW.LanguageCodePage=950
+
+;; ;;;;;;;;;;;;;;;;;;;;
+;; German translation
+
+de.FullInstall=Komplett-Installation
+de.CustomInstall=Benutzerdefiniert
+de.CreateDesktopIcon=Ein Icon auf dem Desktop erstellen
+de.CreateMenuLink=Eine Verknüpfung im Startmenü erstellen
+de.RunPrg=GnuCash jetzt starten
+de.AdditionalIcons=Folgende Icons erstellen:
+de.StatusMsgFirewall=Ausnahmen für Windows-Firewall installieren...
+
+de.MainFiles=GnuCash Hauptprogramm
+de.TranslFiles=Deutsche Ãœbersetzung
+de.TemplFiles=Beispiel-Kontenrahmen
+
+de.IconComment_GnuCash=GnuCash OpenSource-Finanzverwaltung
+de.IconName_README=README anzeigen
+de.IconComment_README=Die Informationsdatei (README) anzeigen
+de.IconFilename_README=README-de.win32-bin.txt
+de.IconName_FAQ=Häufige Fragen (online, engl.)
+de.IconName_Bugzilla=Fehlerbericht einsenden (online, engl.)
+de.IconName_InstallFQ=Online Kursabruf installieren
+de.IconComment_InstallFQ=Das zusätzliche Modul Finance-Quote installieren, um online Aktien- und Devisenkurse abrufen zu können. Dazu ist das Programm ActivePerl 5.8 oder neuer erforderlich.
+de.IconName_Uninstall=Deinstallieren von GnuCash
+de.IconComment_Uninstall=Die OpenSource-Finanzverwaltung GnuCash wieder deinstallieren und vom Computer löschen
+
+de.AIWP_Title=Frühere Version gefunden
+de.AIWP_Description=%1 ist momentan auf diesem Computer installiert
+de.AIWP_Message=Diese frühere Version muss vor der neuen Installation entfernt werden. %n%nFalls Sie das nicht möchten, klicken Sie jetzt auf »Abbrechen«.%n%nKlicken Sie auf »Fortsetzen«, um %1 zu entfernen und die neue Version zu installieren.%n%nHinweis: Lediglich die Programmversion wird entfernt, aber nicht Ihre finanziellen Daten.
+
+
+;; ;;;;;;;;;;;;;;;;;;;
+;; Greek translation
+
+el.FullInstall=ΠλήÏης εγκατάσταση
+el.CustomInstall=Î ÏοσαÏμοσμÎνη εγκατάσταση
+el.CreateDesktopIcon=ΔημιουÏγία εικονιδίου στην επιφάνεια εÏγασίας
+el.CreateMenuLink=Î Ïοσθήκη στο Î¼ÎµÎ½Î¿Ï ÎˆÎ½Î±Ïξη
+el.RunPrg=ΕκτÎλεση του GnuCash Ï„ÏŽÏα
+el.AdditionalIcons=ΔημιουÏγία εικονιδίων:
+el.StatusMsgFirewall=Εγκατάσταση κανόνων για το τοίχος Ï€Ïοστασίας των Windows...
+
+el.MainFiles=Î ÏόγÏαμμα GnuCash
+el.TranslFiles=ΑÏχεία μετάφÏασεων
+el.TemplFiles=ΑÏχεία με Ï€Ïότυπα λογαÏιασμών
+
+el.IconComment_GnuCash=GnuCash Ï€ÏόγÏαμμα διαχ. οικονομικών
+el.IconName_README=Εμφάνιση του README
+el.IconComment_README=Εμφάνιση του αÏχείου README
+el.IconFilename_README=README.win32-bin.txt
+el.IconName_FAQ=ΣυχνÎÏ‚ εÏωτήσεις (Online)
+el.IconName_Bugzilla=ΑναφοÏά σφάλματος (Online)
+el.IconName_InstallFQ=Εγκατάσταση λήψης τιμών (online)
+el.IconComment_InstallFQ=Εγκατάσταση του perl module Finance-Quote για λήψη τιμών online. Απαιτεί ActivePerl 5.8+
+el.IconName_Uninstall=Απεγκατάσταση GnuCash
+el.IconComment_Uninstall=Απεγκατάσταση του διαχειÏιστή οικονομικών GnuCash
+
+
+;; ;;;;;;;;;;;;;;;;;;;;
+;; French translation
+
+fr.FullInstall=Installation complète
+fr.CustomInstall=Installation personnalisée
+fr.CreateDesktopIcon=Créer un icône sur le bureau
+fr.CreateMenuLink=Créer un lien dans le menu de démarrage
+fr.RunPrg=Démarrer GnuCash maintenant
+fr.AdditionalIcons=Créer les icônes suivants:
+fr.StatusMsgFirewall=Installation des règles de pare-feu de Windows
+
+fr.MainFiles=Programme GnuCash
+fr.TranslFiles=Traduction française
+fr.TemplFiles=Modèle de plan comptable
+
+fr.IconComment_GnuCash=GnuCash, le gestionnaire financier OpenSource
+fr.IconName_README=Afficher le LISEZMOI
+fr.IconComment_README=Afficher le fichier LISEZMOI
+fr.IconFilename_README=README-fr.win32-bin.txt
+fr.IconName_FAQ=FAQ (En ligne, en anglais)
+fr.IconName_Bugzilla=Envoyer un rapport d'erreur (En ligne, en anglais)
+fr.IconName_InstallFQ=Installer les quotations en ligne
+fr.IconComment_InstallFQ=Installation du module Finance-Quote requis pour le téléchargement du cours des devises et actions. Le programme ActivePerl 5.8 ou plus récent est aussi requis
+fr.IconName_Uninstall=Dé-installer GnuCash
+fr.IconComment_Uninstall=Désinstalle le gestionnaire financier GnuCash
+
+
+;; ;;;;;;;;;;;;;;;;;;;;;
+;; Italian translation
+
+; *** Pagina di "Selezione dei componenti"
+it.FullInstall=Installazione completa
+it.CustomInstall=Installazione personalizzata
+it.CreateDesktopIcon=Crea un'icona sul desktop
+it.CreateMenuLink=Crea un collegamento nel menu "Start"
+it.RunPrg=Avvia GnuCash
+it.AdditionalIcons=Crea queste icone:
+it.StatusMsgFirewall=Installazione delle regole per il firewall di Windows...
+; *** Pagina di "Altra installazione"
+; nel messaggio seguente la stringa %1 sarà sostituita dal nome e dalla versione dell'applicazione, ad esempio "GnuCash 2.3.15"
+it.AIWP_Title=È stata trovata un'altra installazione
+it.AIWP_Description=%1 è installato in questo computer
+it.AIWP_Message=Questa precedente installazione deve essere rimossa prima di continuare.%n%nSe non si intende rimuoverla, fare clic su «Annulla» per terminare l'installazione.%n%nFare invece clic su «Avanti» per rimuovere %1 e continuare con l'installazione.%n%nNota: verrà rimosso solo il programma, non i propri dati finanziari.
+
+it.MainFiles=File del programma GnuCash
+it.TranslFiles=Traduzione Italiana
+it.TemplFiles=Modelli di strutture dei conti
+
+it.IconComment_GnuCash=GnuCash: gestore di finanze libero
+it.IconName_README=Mostra il file LEGGIMI
+it.IconComment_README=Mostra il file LEGGIMI
+it.IconFilename_README=README-it.win32-bin.txt
+it.IconName_FAQ=FAQ (online, in Inglese)
+it.IconName_Bugzilla=Segnalare un bug (online, in Inglese)
+it.IconName_InstallFQ=Installa la funzione di ricerca delle quotazioni online
+it.IconComment_InstallFQ=Installa il modulo di perl Finance-Quote necessario per ricevere le quotazioni online. Richiede ActivePerl 5.8+
+it.IconName_Theme=Selezione del tema
+it.IconName_Uninstall=Disinstalla GnuCash
+it.IconComment_Uninstall=Disinstalla il programma di gestione delle finanze GnuCash
+
+
+;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Japanese translation
+
+ja.FullInstall=完全インストール
+ja.CustomInstall=カスタムインストール
+ja.CreateDesktopIcon=デスクトップã«ã‚¢ã‚¤ã‚³ãƒ³ã‚’作æˆ(&D)
+ja.CreateMenuLink=スタートメニューã«ãƒªãƒ³ã‚¯ã‚’作æˆ
+ja.RunPrg=GnuCashã‚’ã™ãã«å®Ÿè¡Œ
+ja.AdditionalIcons=作æˆã•ã‚ŒãŸã‚¢ã‚¤ã‚³ãƒ³:
+ja.StatusMsgFirewall=ファイアウォール定義をインストールä¸
+; *** "Another install" wizard page
+; %1 in the following messages will be replaced with the application name and version, like "GnuCash 2.3.15"
+ja.AIWP_Title=ä»–ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã™
+ja.AIWP_Description=ã“ã®ã‚³ãƒ³ãƒ”ュータã«ã¯ %1 ãŒç¾åœ¨ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã™
+ja.AIWP_Message=インストールを継続ã™ã‚‹å‰ã«å‰ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¯ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¾ã™ã€‚%n%nã‚‚ã—ã“ã®å‹•ä½œã‚’望ã¾ãªã„ãªã‚‰ã€Œã‚ャンセルã€ã‚’クリックã—ã¦ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’ä¸æ¢ã—ã¦ãã ã•ã„。%n%n%1 を削除ã—ã¦ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’継続ã™ã‚‹å ´åˆã¯ã€Œæ¬¡ã¸ã€ã‚’クリックã—ã¦ãã ã•ã„。%n%n備考: 作æˆã—ãŸè²¡å‹™ãƒ‡ãƒ¼ã‚¿ã¯å‰Šé™¤ã•ã‚Œã¾ã›ã‚“。プãƒã‚°ãƒ©ãƒ ã®ã¿ãŒå‰Šé™¤ã•ã‚Œã¾ã™ã€‚
+
+ja.MainFiles=GnuCashプãƒã‚°ãƒ©ãƒ
+ja.TranslFiles=翻訳ファイル
+ja.TemplFiles=勘定科目テンプレートファイル
+
+ja.IconComment_GnuCash=GnuCash フリーã®è²¡å‹™ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢
+ja.IconName_README=READMEを表示
+ja.IconComment_README=READMEファイルを表示ã—ã¾ã™
+ja.IconFilename_README=README.win32-bin.txt
+ja.IconName_FAQ=FAQ (オンライン)
+ja.IconName_Bugzilla=ãƒã‚°ã‚’å ±å‘Š (オンライン)
+ja.IconName_InstallFQ=ã‚ªãƒ³ãƒ©ã‚¤ãƒ³ç›¸å ´è¡¨å–得ツールをインストール
+ja.IconComment_InstallFQ=ã‚ªãƒ³ãƒ©ã‚¤ãƒ³ç›¸å ´è¡¨ã‚’å–å¾—ã™ã‚‹ãŸã‚ã«Finance-Quote perl モジュールをインストールã—ã¾ã™ã€‚ActivePerl5.8ã¾ãŸã¯5.10ãŒå¿…è¦ã§ã™
+ja.IconName_Theme=テーマã®é¸æŠž
+ja.IconName_Uninstall=GnuCashをアンインストール
+ja.IconComment_Uninstall=財務ソフトウェアGnuCashをアンインストールã—ã¾ã™
+
+
+;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Latvian translation
+
+; *** "Select Components" wizard page
+lv.FullInstall=Pilna uzstÄdÄ«Å¡ana
+lv.CustomInstall=IzvÄ“les uzstÄdÄ«Å¡ana
+lv.CreateDesktopIcon=Izveidot &darbvirsmas ikonu
+lv.CreateMenuLink=Izveidot starta izvēlnes saiti
+lv.RunPrg=Palaist GnuCash tagad
+lv.AdditionalIcons=Izveidot sekojošas ikonas:
+lv.StatusMsgFirewall=UzstÄda Windows ugunssienas likumus...
+
+; *** "Another install" wizard page
+; %1 in the following messages will be replaced with the application name and version, like "GnuCash 2.3.15"
+lv.AIWP_Title=Ir atrasta cita programmas versija
+lv.AIWP_Description=Uz Å¡Ä« datora jau ir uzstÄdÄ«t %1 versija
+lv.AIWP_Message=Pirms turpinÄt, ir nepiecieÅ¡ams noņemt iepriekÅ¡ uzstÄdÄ«to versiju.%n%nJa nevÄ“laties to darÄ«t, spiediet Atcelt pogu, un Å¡Ä« uzstÄdÄ«Å¡ana tiks atcelta.%n%nSpiediet TurpinÄt, lai noņemtu %1 un turpinÄtu jaunÄs versijas uzstÄdÄ«Å¡anu.%n%nNote: Tiks noņemta tikai iepriekÅ¡Ä“jÄs programmas versija. JÅ«su finanÅ¡u dati aiztikti netiks.
+
+lv.MainFiles=GnuCash Programma
+lv.TranslFiles=Tulkojumu faili
+lv.TemplFiles=Kontu sagatavju faili
+
+lv.IconComment_GnuCash=GnuCash grÄmatvedÄ«bas programma
+lv.IconName_README=ParÄdÄ«t README
+lv.IconComment_README=ParÄda README failu
+lv.IconFilename_README=README-lv.win32-bin.txt
+lv.IconName_FAQ=BUJ (tiešsaistē)
+lv.IconName_Bugzilla=Ziņot par kļūdu (tiešsaistē)
+lv.IconName_InstallFQ=UzstÄdÄ«t tieÅ¡saistes kursu iegÅ«Å¡anu
+lv.IconComment_InstallFQ=UzstÄdÄ«t nepiecieÅ¡amos Perl moduļus valÅ«tas kursu iegÅ«Å¡anai. NepiecieÅ¡ams ActivePerl 5.8+
+lv.IconName_Theme=Izvēlieties tēmu
+lv.IconName_Uninstall=Noņemt GnuCash
+lv.IconComment_Uninstall=Noņemt GnuCash grÄmatvedÄ«bas programmu
+
+
+;; ;;;;;;;;;;;;;;;;;
+;; Dutch translation
+
+nl.FullInstall=Volledige installatie
+nl.CustomInstall=Aangepaste installatiie
+nl.CreateDesktopIcon=Een &bureablad icoon aanmaken
+nl.CreateMenuLink=Een verwijzing in het start menu aanmaken
+nl.RunPrg=GnuCash nu starten
+nl.AdditionalIcons=Deze iconen aanmaken:
+nl.StatusMsgFirewall=Windows firewall regels installeren...
+
+nl.MainFiles=GnuCash Programma
+nl.TranslFiles=Vertalingsbestanden
+nl.TemplFiles=Grootboekrekeningssjablonen
+
+nl.IconComment_GnuCash=GnuCash Vrij Financieel Beheer
+nl.IconName_README=LEESMIJ Tonen
+nl.IconComment_README=Het LEESMIJ bestand tonen
+nl.IconFilename_README=README-nl.win32-bin.txt
+nl.IconName_FAQ=FAQ (Online)
+nl.IconName_Bugzilla=Een Bug Melden (Online)
+nl.IconName_InstallFQ=Online Koersen Opvragen installeren
+nl.IconComment_InstallFQ=De benodigde perl module Finance Quote om online koersen op te vragen installeren. Hiervoor is ActivePerl 5.8 of recenter nodig.
+nl.IconName_Uninstall=GnuCash verwijderen
+nl.IconComment_Uninstall=Het financieel beheersprogramma GnuCash verwijderen
+
+nl.AIWP_Title=Een eerdere installatie werd gevonden
+nl.AIWP_Description=%1 is momenteel op deze computer geïnstalleerd
+nl.AIWP_Message=Deze eerdere installatie moet verwijderd worden alvorens verder te gaan.%n%nAls je dat niet wil, klik dan nu op Annuleren om de huidige installatie af te breken.%n%nKlik op Volgende om %1 te verwijderen en de installatie te vervolgen.%n%nOpmerking: enkel het programma zal verwijderd worden, niet je financiële data.
+
+
+;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Brazilian Portuguese translation
+
+pt_BR.FullInstall=Instalação Completa
+pt_BR.CustomInstall=Instalação Personalizada
+pt_BR.CreateDesktopIcon=Criar um Ãcone na Ãrea de Trabalho
+pt_BR.CreateMenuLink=Criar um link no menu Iniciar
+pt_BR.RunPrg=Executar o GnuCash agora
+pt_BR.AdditionalIcons=Criar estes Ãcones:
+pt_BR.StatusMsgFirewall=Instalando as regras de firewall do Windows...
+
+pt_BR.MainFiles=Programa GnuCash
+pt_BR.TranslFiles=Tradução
+pt_BR.TemplFiles=Modelos de Conta
+
+pt_BR.IconComment_GnuCash=Gerenciador Financeiro Livre GnuCash
+pt_BR.IconName_README=Mostrar LEIA-ME (README)
+pt_BR.IconComment_README=Mostra o arquivo LEIA-ME (README)
+pt_BR.IconFilename_README=LEIA-ME.win32-bin.txt
+pt_BR.IconName_FAQ=Perguntas Freqüentes (online, inglês)
+pt_BR.IconName_Bugzilla=Relatar um erro (online, inglês)
+pt_BR.IconName_InstallFQ=Instalar a Consulta de Preços Online
+pt_BR.IconComment_InstallFQ=Instala o módulo perl Finance-Quote, necessário para a busca de preços online. Requer ActivePerl 5.8+.
+pt_BR.IconName_Uninstall=Desinstalar o GnuCash
+pt_BR.IconComment_Uninstall=Desinstala o Gerenciador Financeiro GnuCash
+
+
+;; ;;;;;;;;;;;;;;;;;
+;; Simplified Chinese translation
+
+zh_CN.FullInstall=完全安装
+zh_CN.CustomInstall=自定义安装
+zh_CN.CreateDesktopIcon=创建桌é¢å›¾æ ‡
+zh_CN.CreateMenuLink=创建开始èœå•é“¾æŽ¥
+zh_CN.RunPrg=现在开始è¿è¡Œ GnuCash
+zh_CN.AdditionalIcons=åˆ›å»ºè¿™äº›å›¾æ ‡
+zh_CN.StatusMsgFirewall=æ£åœ¨å®‰è£… Windows 防ç«å¢™è§„则...
+
+zh_CN.MainFiles=GnuCash 程åº
+zh_CN.TranslFiles=翻译文件
+zh_CN.TemplFiles=会计科目模æ¿æ–‡ä»¶
+
+zh_CN.IconComment_GnuCash=GnuCash å…费财务管ç†
+zh_CN.IconName_README=显示自述文件
+zh_CN.IconComment_README=显示自述文件
+zh_CN.IconFilename_README=README-zh_CN.win32-bin.txt
+zh_CN.IconName_FAQ=常è§é—®é¢˜ (在线)
+zh_CN.IconName_Bugzilla=报告软件 Bug (在线)
+zh_CN.IconName_InstallFQ=å®‰è£…åœ¨çº¿ä»·æ ¼æ£€ç´¢åŠŸèƒ½
+zh_CN.IconComment_InstallFQ=å®‰è£…åœ¨çº¿ä»·æ ¼æ£€ç´¢æ‰€å¿…éœ€çš„ Perl Finance-Quote模å—ã€‚éœ€è¦ ActivePerl 5.8 或 5.10
+zh_CN.IconName_Uninstall=å¸è½½ GnuCash
+zh_CN.IconComment_Uninstall=å¸è½½è´¢åŠ¡ç®¡ç†è½¯ä»¶ GnuCash
+
+;; ;;;;;;;;;;;;;;;;;
+;; Traditional Chinese translation
+
+; *** "Select Components" wizard page
+zh_TW.FullInstall=完整安è£
+zh_TW.CustomInstall=自訂安è£
+zh_TW.CreateDesktopIcon=產生桌é¢åœ–示
+zh_TW.CreateMenuLink=產生開始功能表圖示
+zh_TW.RunPrg=ç¾åœ¨é–‹å§‹åŸ·è¡Œ GnuCash
+zh_TW.AdditionalIcons=建立這些圖示:
+zh_TW.StatusMsgFirewall=æ£åœ¨å®‰è£ Windows 防ç«ç‰†è¦å‰‡...
+; *** "Another install" wizard page
+; %1 in the following messages will be replaced with the application name and version, like "GnuCash 2.3.15"
+zh_TW.AIWP_Title=發ç¾å·²å®‰è£éŽ
+zh_TW.AIWP_Description=%1 已經安è£æ–¼ç³»çµ±ä¸
+zh_TW.AIWP_Message=èˆŠç‰ˆå¿…é ˆå…ˆç§»é™¤æ‰èƒ½ç¹¼çºŒã€‚%n%n若您ä¸æƒ³ç§»é™¤ï¼Œç¾åœ¨å°±é»žé¸ã€Œå–消ã€ä¸æ–·å®‰è£ã€‚%n%n點é¸ã€Œä¸‹ä¸€æ¥ã€æœƒç§»é™¤ %1 並繼續安è£ã€‚%n%n注æ„: åªæœ‰ç¨‹å¼æœƒè¢«ç§»é™¤ï¼Œä¸æœƒå½±éŸ¿åˆ°æ‚¨çš„財務資料å˜æª”。
+
+zh_TW.MainFiles=GnuCash 程å¼
+zh_TW.TranslFiles=ç¿»è¯æª”
+zh_TW.TemplFiles=會計科目範本檔
+
+zh_TW.IconComment_GnuCash=GnuCash 自由財務管ç†
+zh_TW.IconName_README=顯示 README
+zh_TW.IconComment_README=顯示 README 檔
+zh_TW.IconFilename_README=README-zh_TW.win32-bin.txt
+zh_TW.IconName_FAQ=常見å•é¡Œ (線上)
+zh_TW.IconName_Bugzilla=å›žå ±ç¨‹å¼ Bug (線上)
+zh_TW.IconName_InstallFQ=安è£ç¶²è·¯å ±åƒ¹æˆªå–功能
+zh_TW.IconComment_InstallFQ=安è£æˆªå–ç¶²è·¯å ±åƒ¹æ‰€éœ€çš„ Perl Finance-Quote æ¨¡çµ„ã€‚éœ€è¦ ActivePerl 5.8 或 5.10
+zh_TW.IconName_Theme=é¸æ“‡ä»‹é¢é¢¨æ ¼
+zh_TW.IconName_Uninstall=åå®‰è£ GnuCash
+zh_TW.IconComment_Uninstall=å安è£è²¡å‹™ç®¡ç†å“¡ GnuCash
diff --git a/install-impl.sh b/install-impl.sh
index f8d88d5..fc8e146 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -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
commit 2d777cab1263ec7b1aa94ecd45807dffd0daa7b3
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Oct 7 14:28:44 2013 +0000
Remove remaining gconf code bits
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23264 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/crossbuild_webkit.sh b/crossbuild_webkit.sh
index 06cafe3..e983948 100755
--- a/crossbuild_webkit.sh
+++ b/crossbuild_webkit.sh
@@ -191,8 +191,7 @@ function inst_libxslt_gnome() {
else
add_to_env pkg-config PKG_CONFIG
fi
- if quiet gconftool-2 --version &&
- quiet ${PKG_CONFIG} --exists libxslt &&
+ if quiet ${PKG_CONFIG} --exists libxslt &&
[ -f $_GNOME_UDIR/lib/pkgconfig/libxslt.pc ] &&
quiet intltoolize --version
then
@@ -245,8 +244,7 @@ function check_gnome() {
else
add_to_env pkg-config PKG_CONFIG
fi
- if quiet gconftool-2 --version &&
- quiet ${PKG_CONFIG} --exists gconf-2.0 gtk+-2.0 cairo libxml-2.0 &&
+ if quiet ${PKG_CONFIG} --exists gtk+-2.0 cairo libxml-2.0 &&
quiet intltoolize --version
then
echo "gnome packages installed."
@@ -282,8 +280,7 @@ function inst_enchant () {
else
add_to_env pkg-config PKG_CONFIG
fi
- if quiet gconftool-2 --version &&
- quiet ${PKG_CONFIG} --exists enchant &&
+ if quiet ${PKG_CONFIG} --exists enchant &&
[ -f $_GNOME_UDIR/lib/pkgconfig/enchant.pc ] &&
quiet intltoolize --version
then
@@ -307,8 +304,7 @@ function inst_libsoup () {
else
add_to_env pkg-config PKG_CONFIG
fi
- if quiet gconftool-2 --version &&
- quiet ${PKG_CONFIG} --exists libsoup-2.4 &&
+ if quiet ${PKG_CONFIG} --exists libsoup-2.4 &&
[ -f $_GNOME_UDIR/lib/pkgconfig/libsoup-2.4.pc ] &&
quiet intltoolize --version
then
@@ -357,8 +353,7 @@ function inst_webkit() {
else
add_to_env pkg-config PKG_CONFIG
fi
- if quiet gconftool-2 --version &&
- quiet ${PKG_CONFIG} --exists webkit-1.0 &&
+ if quiet ${PKG_CONFIG} --exists webkit-1.0 &&
[ -f $_GNOME_UDIR/lib/pkgconfig/webkit-1.0.pc ] &&
quiet intltoolize --version
then
diff --git a/defaults.sh b/defaults.sh
index 8ec22d4..ba381d3 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -236,9 +236,6 @@ set_default FREETYPE_URL "$GNOME_WIN32_DEPS_URL/freetype_2.4.4-1_win3
set_default FREETYPE_DEV_URL "$GNOME_WIN32_DEPS_URL/freetype-dev_2.4.4-1_win32.zip"
set_default GAIL_URL "$GNOME_WIN32_URL/gail/1.22/gail-1.22.0.zip"
set_default GAIL_DEV_URL "$GNOME_WIN32_URL/gail/1.22/gail-dev-1.22.0.zip"
-GCONF_VERSION="2.22.0"
-set_default GCONF_URL "$GNOME_WIN32_URL/GConf/2.22/GConf_${GCONF_VERSION}-3_win32.zip"
-set_default GCONF_DEV_URL "$GNOME_WIN32_URL/GConf/2.22/GConf-dev_${GCONF_VERSION}-3_win32.zip"
GDK_PIXBUF_VERSION=2.24.0
set_default GDK_PIXBUF_URL "$GNOME_WIN32_URL/gdk-pixbuf/2.24/gdk-pixbuf_${GDK_PIXBUF_VERSION}-1_win32.zip"
set_default GDK_PIXBUF_DEV_URL "$GNOME_WIN32_URL/gdk-pixbuf/2.24/gdk-pixbuf-dev_${GDK_PIXBUF_VERSION}-1_win32.zip"
diff --git a/dist-impl.sh b/dist-impl.sh
index 8f29c30..e179f4b 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -52,7 +52,6 @@ Please set AQBANKING_WITH_QT to yes and rerun install.sh first."
_ISOCODES_UDIR=`unix_path $ISOCODES_DIR`
_MINGW_WFSDIR=`win_fs_path $MINGW_DIR`
add_to_env $_UNZIP_UDIR/bin PATH # unzip
- add_to_env $_GNOME_UDIR/bin PATH # gconftool-2
add_to_env $_EXETYPE_UDIR/bin PATH # exetype
_PID=$$
@@ -87,7 +86,6 @@ function dist_gnome() {
wget_unpacked $FONTCONFIG_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $FREETYPE_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GAIL_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $GCONF_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GDK_PIXBUF_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GETTEXT_RUNTIME_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GLIB_URL $DOWNLOAD_DIR $DIST_DIR
@@ -118,7 +116,6 @@ function dist_gnome() {
cp -a $_GNOME_UDIR/bin/libxml*.dll $DIST_DIR/bin
- rm -rf $DIST_UDIR/etc/gconf/gconf.xml.defaults/{desktop,schemas}
if [ -d $DIST_UDIR/lib/locale ] ; then
# Huh, is this removed in newer gtk?
cp -a $DIST_UDIR/lib/locale $DIST_UDIR/share
@@ -233,8 +230,6 @@ function dist_gnucash() {
mkdir -p $DIST_UDIR/bin
cp $_MINGW_UDIR/bin/pthreadGC2.dll $DIST_UDIR/bin
cp -a $_INSTALL_UDIR/bin/* $DIST_UDIR/bin
- mkdir -p $DIST_UDIR/etc/gconf/schemas
- cp -a $_INSTALL_UDIR/etc/gconf/schemas/* $DIST_UDIR/etc/gconf/schemas
mkdir -p $DIST_UDIR/etc/gnucash
cp -a $_INSTALL_UDIR/etc/gnucash/* $DIST_UDIR/etc/gnucash
cp -a $_INSTALL_UDIR/lib/lib*.la $DIST_UDIR/bin
@@ -263,19 +258,6 @@ function dist_gnucash() {
}
function dist_finish() {
- for file in $DIST_UDIR/etc/gconf/schemas/*.schemas; do
- echo -n "Installing $file ... "
- gconftool-2 \
- --config-source=xml:merged:${DIST_WFSDIR}/etc/gconf/gconf.xml.defaults \
- --install-schema-file $file >/dev/null
- echo "done"
- done
- gconftool-2 --shutdown
-
- mv $DIST_UDIR/libexec/gconfd-2.exe $DIST_UDIR/bin
- exetype $DIST_UDIR/bin/gconfd-2.exe windows
- cp $_INSTALL_UDIR/bin/redirect.exe $DIST_UDIR/libexec/gconfd-2.exe
-
if [ "$AQBANKING_WITH_QT" = "yes" ]; then
assert_one_dir ${DIST_UDIR}/lib/aqbanking/plugins/*/wizards
_qt3_wizard_path=`ls ${DIST_UDIR}/lib/aqbanking/plugins/*/wizards/qt3-wizard.exe`
diff --git a/install-impl.sh b/install-impl.sh
index 9dda4e3..f8d88d5 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -502,9 +502,7 @@ function inst_gnome() {
else
add_to_env pkg-config PKG_CONFIG
fi
- if quiet gconftool-2 --version &&
- quiet ${PKG_CONFIG} --atleast-version=${GCONF_VERSION} gconf-2.0 &&
- quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-2.0 &&
+ if quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-2.0 &&
quiet ${PKG_CONFIG} --atleast-version=${CAIRO_VERSION} cairo &&
quiet ${PKG_CONFIG} --exact-version=${LIBXML2_VERSION} libxml-2.0 &&
quiet intltoolize --version
@@ -524,8 +522,6 @@ function inst_gnome() {
wget_unpacked $FREETYPE_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GAIL_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GAIL_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GCONF_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GCONF_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GDK_PIXBUF_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GDK_PIXBUF_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GETTEXT_RUNTIME_URL $DOWNLOAD_DIR $GNOME_DIR
@@ -574,10 +570,6 @@ function inst_gnome() {
qpushd $_GNOME_UDIR
assert_one_dir $TMP_UDIR/gtk-doc-*
mv $TMP_UDIR/gtk-doc-*/gtk-doc.m4 $_GNOME_UDIR/share/aclocal
- if [ ! -f libexec/gconfd-2.console.exe ]; then
- cp libexec/gconfd-2.exe libexec/gconfd-2.console.exe
- fi
- exetype libexec/gconfd-2.exe windows
for file in bin/intltool-*; do
sed '1s,!.*perl,!'"$INTLTOOL_PERL"',;s,/opt/gnu/bin/iconv,iconv,' $file > tmp
mv tmp $file
@@ -620,8 +612,6 @@ EOF
#perl -pi.bak -e's!^Libs: !Libs: -L\${prefix}/bin !' *.pc
qpopd
- quiet gconftool-2 --version || die "gnome not installed correctly"
- quiet ${PKG_CONFIG} --atleast-version=${GCONF_VERSION} gconf-2.0 || die "gnome not installed correctly: no gconf-2.0 with atleast-version=${GCONF_VERSION}"
quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-2.0 || die "gnome not installed correctly: no gtk+-2.0 with atleast-version=${GTK_VERSION}"
quiet ${PKG_CONFIG} --atleast-version=${CAIRO_VERSION} cairo || die "gnome not installed correctly: no cairo with atleast-version=${CAIRO_VERSION}"
quiet ${PKG_CONFIG} --exact-version=${LIBXML2_VERSION} libxml-2.0 || die "gnome not installed correctly: no libxml-2.0 with exact-version=${LIBXML2_VERSION}"
@@ -1458,7 +1448,7 @@ function inst_gnucash() {
# This function will be called by make_install.sh as well,
# so do not regard variables from inst_* functions as set
-# Parameters allowed: skip_scripts, skip_schemas
+# Parameters allowed: skip_scripts
function make_install() {
_BUILD_UDIR=`unix_path $BUILD_DIR`
_INSTALL_UDIR=`unix_path $INSTALL_DIR`
@@ -1483,7 +1473,6 @@ function make_install() {
for param in "$@"; do
[ "$param" = "skip_scripts" ] && _skip_scripts=1
- [ "$param" = "skip_schemas" ] && _skip_schemas=1
done
make install
@@ -1511,17 +1500,6 @@ function make_install() {
done
qpopd
- if [ -z $_skip_schemas ]; then
- qpushd $_INSTALL_UDIR/etc/gconf/schemas
- for file in *.schemas; do
- gconftool-2 \
- --config-source=xml:merged:${_INSTALL_WFSDIR}/etc/gconf/gconf.xml.defaults \
- --install-schema-file $file >/dev/null
- done
- gconftool-2 --shutdown
- qpopd
- fi
-
if [ -z $_skip_scripts ]; then
# Create a startup script that works without the msys shell
# If you make any changes here, you should probably also change
commit 8243625fb29efd3806970d362e5a798beb79cb02
Author: Christian Stimming <stimming at tuhh.de>
Date: Sat Sep 28 21:28:05 2013 +0000
Win32: Update aqbanking/gwenhywfar package versions for windows build.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23199 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 908c5ff..8ec22d4 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -354,8 +354,8 @@ set_default AQBANKING5 yes
# needed.
if [ "$AQBANKING5" = "yes" ]; then
- GWENHYWFAR_VERSION="4.6.0beta"
- set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=69&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
+ GWENHYWFAR_VERSION="4.7.0beta"
+ set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=70&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
else
GWENHYWFAR_VERSION="3.11.3"
set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=31&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
@@ -363,13 +363,13 @@ else
fi
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
-KTOBLZCHECK_VERSION="1.41"
+KTOBLZCHECK_VERSION="1.43"
set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-${KTOBLZCHECK_VERSION}.tar.gz"
# ktoblzcheck is being installed into GWENHYWFAR_DIR
if [ "$AQBANKING5" = "yes" ]; then
- AQBANKING_VERSION="5.0.28beta"
- set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=98&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
+ AQBANKING_VERSION="5.0.32beta"
+ set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=102&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
set_default AQBANKING_WITH_QT no
else
AQBANKING_VERSION="4.2.4"
commit 2229df014a64feffdf79d8454f9515cf54343558
Author: Christian Stimming <stimming at tuhh.de>
Date: Sun May 26 19:21:31 2013 +0000
Win32 build: Update versions of gwenhywfar, aqbanking
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23006 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index e3ee78b..908c5ff 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -354,8 +354,8 @@ set_default AQBANKING5 yes
# needed.
if [ "$AQBANKING5" = "yes" ]; then
- GWENHYWFAR_VERSION="4.5.0beta"
- set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=68&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
+ GWENHYWFAR_VERSION="4.6.0beta"
+ set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=69&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
else
GWENHYWFAR_VERSION="3.11.3"
set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=31&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
@@ -368,8 +368,8 @@ set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-${KTOBLZCHECK_VE
# ktoblzcheck is being installed into GWENHYWFAR_DIR
if [ "$AQBANKING5" = "yes" ]; then
- AQBANKING_VERSION="5.0.27beta"
- set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=97&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
+ AQBANKING_VERSION="5.0.28beta"
+ set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=98&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
set_default AQBANKING_WITH_QT no
else
AQBANKING_VERSION="4.2.4"
commit f6a53e7aaade0fcba3b02aa931ec45721a68a92b
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed May 15 14:24:52 2013 +0000
Win32 git: fetch potentially new tags before running the tags build
Apparently tags are not copied over automatically using git pull.
This may be a side effect of our main repo still being svn, I'm not sure.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22981 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_tags_git.sh b/build_tags_git.sh
index 1c0aac5..8e6fced 100644
--- a/build_tags_git.sh
+++ b/build_tags_git.sh
@@ -39,6 +39,7 @@ $GIT_CMD pull
################################################################
# determine if there are any new tags since the last time we ran
#
+$GIT_CMD fetch -t
# If we don't have a tagfile then start from 'now'
tagfile=tags_git
commit fc94fdd072156cbd4d1697b1f862bf3705530580
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed May 15 13:27:51 2013 +0000
Win32 fix path to git build script for tags
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22980 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/daily_build.bat b/daily_build.bat
index 80dc56c..5a605b4 100644
--- a/daily_build.bat
+++ b/daily_build.bat
@@ -9,6 +9,6 @@ c:\msys\1.0\bin\sh.exe --login c:\soft\gnucash\repos\packaging\win32\daily_build
rem Tags build for 2.4 and older (daily -- only tags that weren't built yet)
c:\msys\1.0\bin\sh.exe --login c:\soft\packaging\build_tags.sh
rem Tags build for 2.5 and newer (daily -- only tags that weren't built yet)
-c:\msys\1.0\bin\sh.exe --login c:\soft\packaging\build_tags_git.sh
+c:\msys\1.0\bin\sh.exe --login c:\soft\gnucash\repos\packaging\win32\build_tags_git.sh
rem 2.4 branch build (weekly)
c:\msys\1.0\bin\sh.exe --login c:\soft-2.4\packaging\weekly_build.sh
\ No newline at end of file
commit fac350ee4aeddb086b99cc19f2d7a3909de49208
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed May 15 13:24:25 2013 +0000
Win32: build 2.5 tagged releases from git instead of svn
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22979 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_tags.sh b/build_tags.sh
index f5a44c3..0f03ca4 100644
--- a/build_tags.sh
+++ b/build_tags.sh
@@ -56,6 +56,17 @@ mv -f ${tagfile}.new ${tagfile}
for tag_rev in $tags ; do
tag=${tag_rev#*/}
tag=${tag%/*}
+
+ # From 2.5 and up, tags are built from git
+ tag_major=${tag%%.*}
+ tag_tmp=${tag#*.}
+ tag_minor=${tag_tmp%%.*}
+ major_minor=$(( $tag_major*100 + $tag_minor ))
+ if (( $major_minor >= 205 ))
+ then
+ continue
+ fi
+
tagbasedir=/c/soft/gnucash-${tag}
tagdir=${tagbasedir}/gnucash
rm -fr $tagbasedir
diff --git a/build_tags_git.sh b/build_tags_git.sh
index 53e2e1b..1c0aac5 100644
--- a/build_tags_git.sh
+++ b/build_tags_git.sh
@@ -68,6 +68,17 @@ mv -f ${tagfile}.new ${tagfile}
for tag_rev in $tags ; do
tag=${tag_rev#*/}
tag=${tag%/*}
+
+ # Git builds are only supported from 2.5 up
+ tag_major=${tag%%.*}
+ tag_tmp=${tag#*.}
+ tag_minor=${tag_tmp%%.*}
+ major_minor=$(( $tag_major*100 + $tag_minor ))
+ if (( $major_minor < 205 ))
+ then
+ continue
+ fi
+
tagbasedir=/c/soft/gnucash-${tag}
tagdir=${tagbasedir}/gnucash
rm -fr $tagbasedir
diff --git a/daily_build.bat b/daily_build.bat
index f477d07..80dc56c 100644
--- a/daily_build.bat
+++ b/daily_build.bat
@@ -1,12 +1,14 @@
-rem This is the Windows Batch Script for the daily builds.
-rem It simply calls the actual MSYS Shell script to perform
-rem the daily build and then the tag builds.
-
-cd c:\soft\gnucash\repos\packaging\win32\
-
-rem Development build (daily)
-c:\msys\1.0\bin\sh.exe --login c:\soft\gnucash\repos\packaging\win32\daily_build_git.sh
-rem Tags build (daily -- only tags that weren't built yet)
-c:\msys\1.0\bin\sh.exe --login c:\soft\packaging\build_tags.sh
-rem 2.4 branch build (weekly)
+rem This is the Windows Batch Script for the daily builds.
+rem It simply calls the actual MSYS Shell script to perform
+rem the daily build and then the tag builds.
+
+cd c:\soft\gnucash\repos\packaging\win32\
+
+rem Development build (daily)
+c:\msys\1.0\bin\sh.exe --login c:\soft\gnucash\repos\packaging\win32\daily_build_git.sh
+rem Tags build for 2.4 and older (daily -- only tags that weren't built yet)
+c:\msys\1.0\bin\sh.exe --login c:\soft\packaging\build_tags.sh
+rem Tags build for 2.5 and newer (daily -- only tags that weren't built yet)
+c:\msys\1.0\bin\sh.exe --login c:\soft\packaging\build_tags_git.sh
+rem 2.4 branch build (weekly)
c:\msys\1.0\bin\sh.exe --login c:\soft-2.4\packaging\weekly_build.sh
\ No newline at end of file
commit 252b8f5c248c137c28c9879fb63ebaf5aee78588
Author: Christian Stimming <stimming at tuhh.de>
Date: Wed Apr 17 20:15:07 2013 +0000
Win32 build: Update libofx to version 0.9.8
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22911 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index c2cf8bc..e3ee78b 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -342,7 +342,7 @@ set_default OPENSP_URL "$SF_MIRROR/openjade/OpenSP-1.5.2.tar.gz"
set_default OPENSP_DIR $GLOBAL_DIR\\opensp
set_default OPENSP_PATCH `pwd`/opensp-1.5.2.patch
-LIBOFX_VERSION="0.9.7"
+LIBOFX_VERSION="0.9.8"
set_default LIBOFX_URL "$SF_MIRROR/libofx/libofx-${LIBOFX_VERSION}.tar.gz"
set_default LIBOFX_DIR $GLOBAL_DIR\\libofx
#set_default LIBOFX_PATCH `pwd`/libofx-x.x.x.patch
commit c25b451fd989be327b88f95e646111ca8e2a86a8
Author: Christian Stimming <stimming at tuhh.de>
Date: Thu Apr 11 20:31:30 2013 +0000
Win32 build: Upgrade libofx to 0.9.7 due to bug #697133 with long lines
BP
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22895 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 7a95d80..c2cf8bc 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -342,7 +342,7 @@ set_default OPENSP_URL "$SF_MIRROR/openjade/OpenSP-1.5.2.tar.gz"
set_default OPENSP_DIR $GLOBAL_DIR\\opensp
set_default OPENSP_PATCH `pwd`/opensp-1.5.2.patch
-LIBOFX_VERSION="0.9.6"
+LIBOFX_VERSION="0.9.7"
set_default LIBOFX_URL "$SF_MIRROR/libofx/libofx-${LIBOFX_VERSION}.tar.gz"
set_default LIBOFX_DIR $GLOBAL_DIR\\libofx
#set_default LIBOFX_PATCH `pwd`/libofx-x.x.x.patch
commit 78855386eac9f2508e3f55f374de7a7ee1eead39
Author: Christian Stimming <stimming at tuhh.de>
Date: Mon Apr 8 10:23:04 2013 +0000
Win32 build: Disable debug output of r22877 again as it does not seem necessary anymore.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22890 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
index ccd4cc6..9dda4e3 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1594,9 +1594,9 @@ function make_chm() {
_XSLTPROC_OPTS=$3
echo "Processing $_CHM_TYPE ($_CHM_LANG) ..."
qpushd $_CHM_TYPE/$_CHM_LANG
- # Some debug output
- echo xsltproc $XSLTPROCFLAGS $_XSLTPROC_OPTS --path ../../../docbookx-dtd ../../../docbook-xsl/htmlhelp/htmlhelp.xsl gnucash-$_CHM_TYPE.xml
- ls ../../../docbookx-dtd ../../../docbook-xsl/htmlhelp/htmlhelp.xsl gnucash-$_CHM_TYPE.xml
+ ## Some debug output
+ #echo xsltproc $XSLTPROCFLAGS $_XSLTPROC_OPTS --path ../../../docbookx-dtd ../../../docbook-xsl/htmlhelp/htmlhelp.xsl gnucash-$_CHM_TYPE.xml
+ #ls ../../../docbookx-dtd ../../../docbook-xsl/htmlhelp/htmlhelp.xsl gnucash-$_CHM_TYPE.xml
xsltproc $XSLTPROCFLAGS $_XSLTPROC_OPTS --path ../../../docbookx-dtd ../../../docbook-xsl/htmlhelp/htmlhelp.xsl gnucash-$_CHM_TYPE.xml
count=0
echo >> htmlhelp.hhp
commit 46aba5495c37e25ecdc28ba95feb41295e803eb7
Author: Christian Stimming <stimming at tuhh.de>
Date: Sun Apr 7 07:48:06 2013 +0000
Win32 build: Copy an initial logfile to the webserver when the build is started
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22880 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_package.sh b/build_package.sh
index 0a84c15..179995c 100644
--- a/build_package.sh
+++ b/build_package.sh
@@ -47,6 +47,14 @@ if [ `hostname` = "gnucash-win32" ]; then
rmdir "$_OUTPUT_DIR/$LOG_DIR"
fi
+# If we're running on the build server, copy a temporary logfile
+# content to the webserver to signal that the build is in progress
+if [ `hostname` = "gnucash-win32" ]; then
+ _PWD=`pwd`
+ echo "Build for tag \"${tag}\" is in progress (current working directory: ${_PWD}) ..." > ${LOGFILE}
+ scp -p ${LOGFILE} upload at code.gnucash.org:public_html/win32/$LOG_DIR
+fi
+
set +e
trap on_error ERR
commit 9c7d3c84e72886fb8a436de49e1a32e95faeddae
Author: Christian Stimming <stimming at tuhh.de>
Date: Sat Apr 6 20:28:48 2013 +0000
Update ActivePerl URL to a currently active (no pun intended) one.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22878 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 1d0436e..7a95d80 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -178,7 +178,7 @@ set_default READLINE_BIN_URL "$SF_MIRROR/gnuwin32/readline-5.0-1-bin.zip"
set_default READLINE_LIB_URL "$SF_MIRROR/gnuwin32/readline-5.0-1-lib.zip"
set_default READLINE_DIR $GLOBAL_DIR\\readline
-set_default ACTIVE_PERL_URL "http://downloads.activestate.com/ActivePerl/releases/5.14.2.1402/ActivePerl-5.14.2.1402-MSWin32-x86-295342.zip"
+set_default ACTIVE_PERL_URL "http://downloads.activestate.com/ActivePerl/releases/5.14.4.1405/ActivePerl-5.14.4.1405-MSWin32-x86-296746.zip"
set_default ACTIVE_PERL_DIR $GLOBAL_DIR\\active-perl
set_default AUTOCONF_URL "http://ftp.gnu.org/gnu/autoconf/autoconf-2.63.tar.bz2"
commit f0d3f089230f0b93f258bdd079ce6c0d8e6fbf4b
Author: Christian Stimming <stimming at tuhh.de>
Date: Sat Apr 6 20:13:18 2013 +0000
Win32 build: Add debug output where xsltproc currently fails
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22877 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
index 952030e..ccd4cc6 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1594,6 +1594,9 @@ function make_chm() {
_XSLTPROC_OPTS=$3
echo "Processing $_CHM_TYPE ($_CHM_LANG) ..."
qpushd $_CHM_TYPE/$_CHM_LANG
+ # Some debug output
+ echo xsltproc $XSLTPROCFLAGS $_XSLTPROC_OPTS --path ../../../docbookx-dtd ../../../docbook-xsl/htmlhelp/htmlhelp.xsl gnucash-$_CHM_TYPE.xml
+ ls ../../../docbookx-dtd ../../../docbook-xsl/htmlhelp/htmlhelp.xsl gnucash-$_CHM_TYPE.xml
xsltproc $XSLTPROCFLAGS $_XSLTPROC_OPTS --path ../../../docbookx-dtd ../../../docbook-xsl/htmlhelp/htmlhelp.xsl gnucash-$_CHM_TYPE.xml
count=0
echo >> htmlhelp.hhp
commit 77592214fb182553d66a8c7641ef74872adc1fcb
Author: Christian Stimming <stimming at tuhh.de>
Date: Fri Apr 5 19:42:20 2013 +0000
Win32 build: Version update for libxslt, libxml2, goffice.
No special reason for this, though, except that it still compiles.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22876 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 8e14887..1d0436e 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -211,13 +211,13 @@ set_default EXETYPE_SCRIPT `pwd`/exetype.pl
set_default EXETYPE_DIR $TOOLS_DIR
XMLSOFT_URL="http://xmlsoft.org/sources/win32"
-XSLT_BASE_URL="http://ftp.acc.umu.se/pub/GNOME/sources/libxslt/1.1"
+#XSLT_BASE_URL="http://ftp.acc.umu.se/pub/GNOME/sources/libxslt/1.1"
XML2_BASE_URL="ftp://xmlsoft.org/libxml2"
-LIBXSLT_VERSION="1.1.22"
+LIBXSLT_VERSION="1.1.28"
#LIBXSLT_VERSION=1.1.26
-set_default LIBXSLT_SRC_URL "${XSLT_BASE_URL}/libxslt-${LIBXSLT_VERSION}.tar.bz2"
-set_default LIBXSLT_MAKEFILE_PATCH "`pwd`/libxslt-1.1.22.Makefile.in.patch"
-LIBXML2_VERSION="2.7.7"
+set_default LIBXSLT_SRC_URL "${XML2_BASE_URL}/libxslt-${LIBXSLT_VERSION}.tar.gz"
+#set_default LIBXSLT_MAKEFILE_PATCH "`pwd`/libxslt-1.1.22.Makefile.in.patch"
+LIBXML2_VERSION="2.9.0"
set_default LIBXML2_SRC_URL "${XML2_BASE_URL}/libxml2-${LIBXML2_VERSION}.tar.gz"
set_default LIBXSLT_ICONV_URL "${XMLSOFT_URL}/iconv-1.9.2.win32.zip"
set_default LIBXSLT_ZLIB_URL "${XMLSOFT_URL}/zlib-1.2.3.win32.zip"
@@ -288,7 +288,7 @@ LIBGSF_VERSION="1.14.21"
set_default LIBGSF_URL "$GNOME_MIRROR/sources/libgsf/1.14/libgsf-${LIBGSF_VERSION}.tar.bz2"
set_default LIBGSF_DIR $GLOBAL_DIR\\libgsf
-GOFFICE_VERSION="0.8.13"
+GOFFICE_VERSION="0.8.17"
set_default GOFFICE_URL "$GNOME_MIRROR/sources/goffice/0.8/goffice-${GOFFICE_VERSION}.tar.bz2"
set_default GOFFICE_DIR $GLOBAL_DIR\\goffice
#set_default GOFFICE_PATCH `pwd`/goffice-x.x.x.patch
commit ab30f9bb1a2fc48386300899383cb84b06701968
Author: Christian Stimming <stimming at tuhh.de>
Date: Thu Apr 4 19:46:30 2013 +0000
Win32 build: Switch to another libgsf version 1.4.21 that has a .tar.bz2 available
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22873 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 1a1c4b2..8e14887 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -284,7 +284,7 @@ set_default PCRE_BIN_URL "$SF_MIRROR/gnuwin32/pcre-7.0-bin.zip"
set_default PCRE_LIB_URL "$SF_MIRROR/gnuwin32/pcre-7.0-lib.zip"
set_default PCRE_DIR $GLOBAL_DIR\\pcre
-LIBGSF_VERSION="1.14.26"
+LIBGSF_VERSION="1.14.21"
set_default LIBGSF_URL "$GNOME_MIRROR/sources/libgsf/1.14/libgsf-${LIBGSF_VERSION}.tar.bz2"
set_default LIBGSF_DIR $GLOBAL_DIR\\libgsf
commit a2fa6cea4b7e069076fdd55d6b3e475ccf6ed07b
Author: Christian Stimming <stimming at tuhh.de>
Date: Wed Apr 3 13:21:21 2013 +0000
Win32 build: Can we get along without libgsf-gnome?
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22869 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 0f245c9..1a1c4b2 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -284,7 +284,7 @@ set_default PCRE_BIN_URL "$SF_MIRROR/gnuwin32/pcre-7.0-bin.zip"
set_default PCRE_LIB_URL "$SF_MIRROR/gnuwin32/pcre-7.0-lib.zip"
set_default PCRE_DIR $GLOBAL_DIR\\pcre
-LIBGSF_VERSION="1.14.17"
+LIBGSF_VERSION="1.14.26"
set_default LIBGSF_URL "$GNOME_MIRROR/sources/libgsf/1.14/libgsf-${LIBGSF_VERSION}.tar.bz2"
set_default LIBGSF_DIR $GLOBAL_DIR\\libgsf
diff --git a/install-impl.sh b/install-impl.sh
index 3bf4370..952030e 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -995,7 +995,7 @@ function inst_libgsf() {
_LIBGSF_UDIR=`unix_path $LIBGSF_DIR`
add_to_env $_LIBGSF_UDIR/bin PATH
add_to_env $_LIBGSF_UDIR/lib/pkgconfig PKG_CONFIG_PATH
- if quiet ${PKG_CONFIG} --exists libgsf-1 libgsf-gnome-1 &&
+ if quiet ${PKG_CONFIG} --exists libgsf-1 &&
quiet ${PKG_CONFIG} --atleast-version=${LIBGSF_VERSION} libgsf-1
then
echo "libgsf already installed in $_LIBGSF_UDIR. skipping."
@@ -1008,7 +1008,6 @@ function inst_libgsf() {
--prefix=$_LIBGSF_UDIR \
--disable-static \
--without-python \
- --with-gnome-vfs \
CPPFLAGS="${GNOME_CPPFLAGS}" \
LDFLAGS="${GNOME_LDFLAGS}"
make
@@ -1016,7 +1015,7 @@ function inst_libgsf() {
make install
qpopd
${PKG_CONFIG} --exists libgsf-1 || die "libgsf not installed correctly: No libgsf-1"
- ${PKG_CONFIG} --exists libgsf-gnome-1 || die "libgsf not installed correctly: No libgsf-gnome-1"
+ #${PKG_CONFIG} --exists libgsf-gnome-1 || die "libgsf not installed correctly: No libgsf-gnome-1"
fi
}
commit 0b373c4a72e6bcc1b8cd54088853c3ad0670518f
Author: Christian Stimming <stimming at tuhh.de>
Date: Wed Apr 3 08:21:54 2013 +0000
Win32 build: Add probably missing libgsf configure argument
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22868 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
index 4801b70..3bf4370 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1008,13 +1008,15 @@ function inst_libgsf() {
--prefix=$_LIBGSF_UDIR \
--disable-static \
--without-python \
+ --with-gnome-vfs \
CPPFLAGS="${GNOME_CPPFLAGS}" \
LDFLAGS="${GNOME_LDFLAGS}"
make
rm -rf ${_LIBGSF_UDIR}
make install
qpopd
- ${PKG_CONFIG} --exists libgsf-1 libgsf-gnome-1 || die "libgsf not installed correctly"
+ ${PKG_CONFIG} --exists libgsf-1 || die "libgsf not installed correctly: No libgsf-1"
+ ${PKG_CONFIG} --exists libgsf-gnome-1 || die "libgsf not installed correctly: No libgsf-gnome-1"
fi
}
commit e9cee1ddd9a98deeb178b79cfd13795dd3521741
Author: Christian Stimming <stimming at tuhh.de>
Date: Tue Apr 2 14:06:28 2013 +0000
Win32 build: Remove check for pixman lib, because that one was removed in r22813.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22864 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
index 1d12aa2..4801b70 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -506,7 +506,6 @@ function inst_gnome() {
quiet ${PKG_CONFIG} --atleast-version=${GCONF_VERSION} gconf-2.0 &&
quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-2.0 &&
quiet ${PKG_CONFIG} --atleast-version=${CAIRO_VERSION} cairo &&
- quiet ${PKG_CONFIG} --atleast-version=${PIXMAN_VERSION} pixman-1 &&
quiet ${PKG_CONFIG} --exact-version=${LIBXML2_VERSION} libxml-2.0 &&
quiet intltoolize --version
then
@@ -625,7 +624,6 @@ EOF
quiet ${PKG_CONFIG} --atleast-version=${GCONF_VERSION} gconf-2.0 || die "gnome not installed correctly: no gconf-2.0 with atleast-version=${GCONF_VERSION}"
quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-2.0 || die "gnome not installed correctly: no gtk+-2.0 with atleast-version=${GTK_VERSION}"
quiet ${PKG_CONFIG} --atleast-version=${CAIRO_VERSION} cairo || die "gnome not installed correctly: no cairo with atleast-version=${CAIRO_VERSION}"
- quiet ${PKG_CONFIG} --atleast-version=${PIXMAN_VERSION} pixman-1 || die "gnome not installed correctly: no pixman-1 with atleast-version=${PIXMAN_VERSION}"
quiet ${PKG_CONFIG} --exact-version=${LIBXML2_VERSION} libxml-2.0 || die "gnome not installed correctly: no libxml-2.0 with exact-version=${LIBXML2_VERSION}"
quiet intltoolize --version || die "gnome not installed correctly: no intltoolize"
fi
commit 97c69fc6543f3e3fecbd9d27ac33b69d8ea2ce12
Author: Christian Stimming <stimming at tuhh.de>
Date: Tue Apr 2 06:59:08 2013 +0000
Win32 build: Increase verbosity on check for installed gnome.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22863 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
index 97d27ec..1d12aa2 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -506,6 +506,7 @@ function inst_gnome() {
quiet ${PKG_CONFIG} --atleast-version=${GCONF_VERSION} gconf-2.0 &&
quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-2.0 &&
quiet ${PKG_CONFIG} --atleast-version=${CAIRO_VERSION} cairo &&
+ quiet ${PKG_CONFIG} --atleast-version=${PIXMAN_VERSION} pixman-1 &&
quiet ${PKG_CONFIG} --exact-version=${LIBXML2_VERSION} libxml-2.0 &&
quiet intltoolize --version
then
@@ -620,13 +621,13 @@ EOF
#perl -pi.bak -e's!^Libs: !Libs: -L\${prefix}/bin !' *.pc
qpopd
- quiet gconftool-2 --version &&
- quiet ${PKG_CONFIG} --atleast-version=${GCONF_VERSION} gconf-2.0 &&
- quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-2.0 &&
- quiet ${PKG_CONFIG} --atleast-version=${CAIRO_VERSION} cairo &&
- quiet ${PKG_CONFIG} --atleast-version=${PIXMAN_VERSION} pixman-1 &&
- quiet ${PKG_CONFIG} --exact-version=${LIBXML2_VERSION} libxml-2.0 &&
- quiet intltoolize --version || die "gnome not installed correctly"
+ quiet gconftool-2 --version || die "gnome not installed correctly"
+ quiet ${PKG_CONFIG} --atleast-version=${GCONF_VERSION} gconf-2.0 || die "gnome not installed correctly: no gconf-2.0 with atleast-version=${GCONF_VERSION}"
+ quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-2.0 || die "gnome not installed correctly: no gtk+-2.0 with atleast-version=${GTK_VERSION}"
+ quiet ${PKG_CONFIG} --atleast-version=${CAIRO_VERSION} cairo || die "gnome not installed correctly: no cairo with atleast-version=${CAIRO_VERSION}"
+ quiet ${PKG_CONFIG} --atleast-version=${PIXMAN_VERSION} pixman-1 || die "gnome not installed correctly: no pixman-1 with atleast-version=${PIXMAN_VERSION}"
+ quiet ${PKG_CONFIG} --exact-version=${LIBXML2_VERSION} libxml-2.0 || die "gnome not installed correctly: no libxml-2.0 with exact-version=${LIBXML2_VERSION}"
+ quiet intltoolize --version || die "gnome not installed correctly: no intltoolize"
fi
[ ! -d $_GNOME_UDIR/share/aclocal ] || add_to_env "-I $_GNOME_UDIR/share/aclocal" ACLOCAL_FLAGS
}
commit b17910c07064930ced13da2ffb495d89c89ea00f
Author: Christian Stimming <stimming at tuhh.de>
Date: Mon Apr 1 19:37:31 2013 +0000
Win32 build: Add more output for debugging.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22861 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_package.sh b/build_package.sh
index c0d15c5..0a84c15 100644
--- a/build_package.sh
+++ b/build_package.sh
@@ -77,12 +77,14 @@ fi
if [ ! -d ${_OUTPUT_DIR} ] ; then
echo "Error: _OUTPUT_DIR=${_OUTPUT_DIR} does not exist" >> ${LOGFILE}
fi
-if [ ! -f ${_GNUCASH_UDIR}/${SETUP_FILENAME} ] ; then
+if [ -f ${_GNUCASH_UDIR}/${SETUP_FILENAME} ] ; then
+ echo "Successfully created ${SETUP_FILENAME} in ${_GNUCASH_UDIR}" >> ${LOGFILE}
+else
echo "Error: File _GNUCASH_UDIR/SETUP_FILENAME = ${_GNUCASH_UDIR}/${SETUP_FILENAME} does not exist" >> ${LOGFILE}
echo "Files in _GNUCASH_UDIR:" >> ${LOGFILE}
ls ${_GNUCASH_UDIR}/* >> ${LOGFILE}
fi
-mv ${_GNUCASH_UDIR}/${SETUP_FILENAME} ${_OUTPUT_DIR}
+mv ${_GNUCASH_UDIR}/${SETUP_FILENAME} ${_OUTPUT_DIR} >> ${LOGFILE} 2>&1
#
# Verify that PKG_VERSION == $tag, and add to the build log if it's not.
@@ -103,10 +105,10 @@ fi
# If we're running on the build server then upload the files
if [ `hostname` = "gnucash-win32" ]; then
# Small hack to create the $TARGET_DIR on the webserver if it doesn't exist yet
- mkdir -p "$_OUTPUT_DIR/$TARGET_DIR"
- scp -r "$_OUTPUT_DIR/$TARGET_DIR" upload at code.gnucash.org:public_html/win32
- rmdir "$_OUTPUT_DIR/$TARGET_DIR"
+ mkdir -p "$_OUTPUT_DIR/$TARGET_DIR" >> ${LOGFILE} 2>&1
+ scp -r "$_OUTPUT_DIR/$TARGET_DIR" upload at code.gnucash.org:public_html/win32 >> ${LOGFILE} 2>&1
+ rmdir "$_OUTPUT_DIR/$TARGET_DIR" >> ${LOGFILE} 2>&1
# Copy the files to the chosen target directory
+ scp -p ${_OUTPUT_DIR}/${SETUP_FILENAME} upload at code.gnucash.org:public_html/win32/$TARGET_DIR >> ${LOGFILE} 2>&1
scp -p ${LOGFILE} upload at code.gnucash.org:public_html/win32/$LOG_DIR
- scp -p ${_OUTPUT_DIR}/${SETUP_FILENAME} upload at code.gnucash.org:public_html/win32/$TARGET_DIR
fi
diff --git a/build_tags.sh b/build_tags.sh
index d3ebd2c..f5a44c3 100644
--- a/build_tags.sh
+++ b/build_tags.sh
@@ -60,15 +60,18 @@ for tag_rev in $tags ; do
tagdir=${tagbasedir}/gnucash
rm -fr $tagbasedir
mkdir -p ${tagdir}
+ echo "Building tag $tag in $tagbasedir."
# Copy the downloads to save time
mkdir -p ${tagbasedir}/downloads
cp -p $(unix_path ${DOWNLOAD_DIR})/* ${tagbasedir}/downloads
+ echo "Successfully copied the downloads dir to ${tagbasedir}/downloads"
# Check out the tag and setup custom.sh
svn co -q ${TAG_URL}/${tag} ${tagdir}/repos
w32pkg=${tagdir}/repos/packaging/win32
cp -p "${pkgdir}/custom.sh" ${w32pkg}/custom.sh
+ echo "Successfully checked out the sources"
# Set the global directory to the tag build
echo -n 'GLOBAL_DIR=c:\\soft\\gnucash-' >> ${w32pkg}/custom.sh
commit e9d16a3a0f873b40744b55e7fa69dfd383516705
Author: Christian Stimming <stimming at tuhh.de>
Date: Sun Mar 31 21:28:56 2013 +0000
Win32 build: Add some more output into log on error conditions.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22857 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_package.sh b/build_package.sh
index 3ce5eac..c0d15c5 100644
--- a/build_package.sh
+++ b/build_package.sh
@@ -74,6 +74,14 @@ if [ "$BUILD_FROM_TARBALL" = "no" ]; then
else
SETUP_FILENAME="gnucash-${PKG_VERSION}-setup.exe"
fi
+if [ ! -d ${_OUTPUT_DIR} ] ; then
+ echo "Error: _OUTPUT_DIR=${_OUTPUT_DIR} does not exist" >> ${LOGFILE}
+fi
+if [ ! -f ${_GNUCASH_UDIR}/${SETUP_FILENAME} ] ; then
+ echo "Error: File _GNUCASH_UDIR/SETUP_FILENAME = ${_GNUCASH_UDIR}/${SETUP_FILENAME} does not exist" >> ${LOGFILE}
+ echo "Files in _GNUCASH_UDIR:" >> ${LOGFILE}
+ ls ${_GNUCASH_UDIR}/* >> ${LOGFILE}
+fi
mv ${_GNUCASH_UDIR}/${SETUP_FILENAME} ${_OUTPUT_DIR}
#
commit b9e4a754e7aa42bc731661bb2bf970c387b6d073
Author: Christian Stimming <stimming at tuhh.de>
Date: Sat Mar 30 14:58:56 2013 +0000
Update libofx version to 0.9.6, released today
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22848 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index fe36662..0f245c9 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -342,7 +342,7 @@ set_default OPENSP_URL "$SF_MIRROR/openjade/OpenSP-1.5.2.tar.gz"
set_default OPENSP_DIR $GLOBAL_DIR\\opensp
set_default OPENSP_PATCH `pwd`/opensp-1.5.2.patch
-LIBOFX_VERSION="0.9.5"
+LIBOFX_VERSION="0.9.6"
set_default LIBOFX_URL "$SF_MIRROR/libofx/libofx-${LIBOFX_VERSION}.tar.gz"
set_default LIBOFX_DIR $GLOBAL_DIR\\libofx
#set_default LIBOFX_PATCH `pwd`/libofx-x.x.x.patch
commit 01d2a4b71c5c9502e6786db72e45e2ac49966327
Author: Christian Stimming <stimming at tuhh.de>
Date: Fri Mar 29 20:14:09 2013 +0000
Win32 build: Update libofx version... there was a 0.9.5 release last year.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22843 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index cbe88ce..fe36662 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -342,7 +342,7 @@ set_default OPENSP_URL "$SF_MIRROR/openjade/OpenSP-1.5.2.tar.gz"
set_default OPENSP_DIR $GLOBAL_DIR\\opensp
set_default OPENSP_PATCH `pwd`/opensp-1.5.2.patch
-LIBOFX_VERSION="0.9.4"
+LIBOFX_VERSION="0.9.5"
set_default LIBOFX_URL "$SF_MIRROR/libofx/libofx-${LIBOFX_VERSION}.tar.gz"
set_default LIBOFX_DIR $GLOBAL_DIR\\libofx
#set_default LIBOFX_PATCH `pwd`/libofx-x.x.x.patch
commit 09c5442b102ae403b6b1ddf68e6ccb538eb26ae3
Author: Christian Stimming <stimming at tuhh.de>
Date: Fri Mar 29 16:42:30 2013 +0000
Win32 build: Temporarily disable ja_JP guide htmlhelp because the hhc compiler seems to crash on this every time.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22838 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
index 69604f3..97d27ec 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1612,7 +1612,9 @@ function make_chm() {
echo "[MAP]" >> htmlhelp.hhp
cat mymaps >> htmlhelp.hhp
rm mymaps
+ echo "Will now call hhc.exe for $_CHM_TYPE ($_CHM_LANG)..."
hhc htmlhelp.hhp >/dev/null || true
+ echo "... hhc.exe completed successfully."
cp -fv htmlhelp.chm $_DOCS_INST_UDIR/$_CHM_LANG/gnucash-$_CHM_TYPE.chm
cp -fv htmlhelp.hhmap $_DOCS_INST_UDIR/$_CHM_LANG/gnucash-$_CHM_TYPE.hhmap
qpopd
@@ -1649,7 +1651,8 @@ function inst_docs() {
make_chm guide C
make_chm guide de_DE
make_chm guide it_IT
- make_chm guide ja_JP "--stringparam chunker.output.encoding Shift_JIS --stringparam htmlhelp.encoding Shift_JIS"
+# Temporarily disabled because it makes hh
+# make_chm guide ja_JP "--stringparam chunker.output.encoding Shift_JIS --stringparam htmlhelp.encoding Shift_JIS"
make_chm help C
make_chm help de_DE
# make_chm help it_IT
commit 43e344b3905a8a834add6d6172bf42a60e49488d
Author: Christian Stimming <stimming at tuhh.de>
Date: Sat Mar 2 14:03:42 2013 +0000
Win32 installer: Update version numbers for gwenhywfar, aqbanking, ktoblzcheck.
Once this compiles, the resulting binary can also run SEPA online transfers.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22821 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 5417631..cbe88ce 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -354,8 +354,8 @@ set_default AQBANKING5 yes
# needed.
if [ "$AQBANKING5" = "yes" ]; then
- GWENHYWFAR_VERSION="4.3.2"
- set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=66&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
+ GWENHYWFAR_VERSION="4.5.0beta"
+ set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=68&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
else
GWENHYWFAR_VERSION="3.11.3"
set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=31&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
@@ -363,13 +363,13 @@ else
fi
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
-KTOBLZCHECK_VERSION="1.40"
+KTOBLZCHECK_VERSION="1.41"
set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-${KTOBLZCHECK_VERSION}.tar.gz"
# ktoblzcheck is being installed into GWENHYWFAR_DIR
if [ "$AQBANKING5" = "yes" ]; then
- AQBANKING_VERSION="5.0.25"
- set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=95&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
+ AQBANKING_VERSION="5.0.27beta"
+ set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=97&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
set_default AQBANKING_WITH_QT no
else
AQBANKING_VERSION="4.2.4"
commit 88044d3323b87fff1b9e0390ef9ab03acb21e117
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Feb 25 10:13:26 2013 +0000
Winbuild: remove obsolete pixman dependency
It was an internal depencency of libgnomeui, which
is no longer used for GnuCash
I found one more reference to libgnomeui in the
crosbuild_webkit.sh script. I have removed it there as well.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22813 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/crossbuild_webkit.sh b/crossbuild_webkit.sh
index d9cfe4c..06cafe3 100755
--- a/crossbuild_webkit.sh
+++ b/crossbuild_webkit.sh
@@ -246,8 +246,7 @@ function check_gnome() {
add_to_env pkg-config PKG_CONFIG
fi
if quiet gconftool-2 --version &&
- quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgtkhtml-3.14 pixman-1 &&
- [ -f $_GNOME_UDIR/lib/pkgconfig/pixman-1.pc ] &&
+ quiet ${PKG_CONFIG} --exists gconf-2.0 gtk+-2.0 cairo libxml-2.0 &&
quiet intltoolize --version
then
echo "gnome packages installed."
diff --git a/defaults.sh b/defaults.sh
index 54e9d42..5417631 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -277,9 +277,6 @@ set_default ZLIB_URL "$GNOME_WIN32_DEPS_URL/zlib_1.2.5-2_win32.zi
set_default ZLIB_DEV_URL "$GNOME_WIN32_DEPS_URL/zlib-dev_1.2.5-2_win32.zip"
set_default GNOME_DIR $GLOBAL_DIR\\gnome
-PIXMAN_VERSION="0.22.0"
-set_default PIXMAN_URL "http://www.cairographics.org/releases/pixman-${PIXMAN_VERSION}.tar.gz"
-
set_default SWIG_URL "$SF_MIRROR/swig/swigwin-1.3.36.zip"
set_default SWIG_DIR $GLOBAL_DIR\\swig
diff --git a/dist-impl.sh b/dist-impl.sh
index 44b387a..8f29c30 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -116,8 +116,6 @@ function dist_gnome() {
mv $TMP_UDIR/gtk2_prefs-*/gtk2_prefs.exe $DIST_DIR/bin
rm -rf $TMP_UDIR/gtk2_prefs-*
- wget_unpacked $PIXMAN_URL $DOWNLOAD_DIR $DIST_DIR
-
cp -a $_GNOME_UDIR/bin/libxml*.dll $DIST_DIR/bin
rm -rf $DIST_UDIR/etc/gconf/gconf.xml.defaults/{desktop,schemas}
diff --git a/install-impl.sh b/install-impl.sh
index 85dab6d..69604f3 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -506,7 +506,6 @@ function inst_gnome() {
quiet ${PKG_CONFIG} --atleast-version=${GCONF_VERSION} gconf-2.0 &&
quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-2.0 &&
quiet ${PKG_CONFIG} --atleast-version=${CAIRO_VERSION} cairo &&
- quiet ${PKG_CONFIG} --atleast-version=${PIXMAN_VERSION} pixman-1 &&
quiet ${PKG_CONFIG} --exact-version=${LIBXML2_VERSION} libxml-2.0 &&
quiet intltoolize --version
then
@@ -598,25 +597,6 @@ EOF
rm -rf $TMP_UDIR/gtk-doc-*
qpopd
- if quiet ${PKG_CONFIG} --exact-version=${PIXMAN_VERSION} pixman-1 ; then
- echo "Pixman already compiled+installed"
- else
- wget_unpacked $PIXMAN_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/pixman-*
- qpushd $TMP_UDIR/pixman-*
- GLIB_CPPFLAGS=`${PKG_CONFIG} --cflags glib-2.0`
- GTK_CPPFLAGS="-I${_GNOME_UDIR}/include/gtk-2.0"
- ./configure ${HOST_XCOMPILE} \
- --prefix=$_GNOME_UDIR \
- --disable-static \
- CPPFLAGS="${GLIB_CPPFLAGS} ${GTK_CPPFLAGS}"
- make
- make install
- qpopd
- rm -rf $TMP_UDIR/pixman-*
- fi
- quiet ${PKG_CONFIG} --exact-version=${PIXMAN_VERSION} pixman-1 || die "pixman not installed correctly"
-
if quiet ${PKG_CONFIG} --exact-version=${LIBXML2_VERSION} libxml-2.0 ; then
echo "Libxml2 already compiled + installed"
else
commit c78da71e72449d5621222ab118fe177d3b38eee3
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Jan 22 10:14:35 2013 +0000
Win32 build: add attribution for a code snippet in bootstrap
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22720 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/bootstrap_win_dev.vbs b/bootstrap_win_dev.vbs
index 0b5f359..ca77552 100644
--- a/bootstrap_win_dev.vbs
+++ b/bootstrap_win_dev.vbs
@@ -1,390 +1,393 @@
-' bootstap_win_dev.vbs
-'
-' The goal of this script is to simplify setting up a development
-' environment to develop for GnuCash on Windows.
-' It will set up an absolute minimal environment from where
-' the regular GnuCash Windows build system can take over.
-' This minimal environment consists of
-' - mingw-get: the mingw package installer tool
-' - msys-base: a basic MSYS shell environment
-' - git for windows, required for:-
-' - the GnuCash source code repository, cloned from the github GnuCash repository
-'
-' The bootstrap script can also be run on top of an existing set up
-' in which case the script will only do what is necessary to get
-' the above items in place. For example, if git is already installed
-' in the location pointed to by GIT_DIR below, it won't be installed
-' again.
-'
-' IN CASE OF UNEXPECTED CLOSING OF THE CONSOLE
-' Please open a console (cmd.exe) and run the script under cscript.exe as follows:
-' cscript.exe <path-to-this-script>
-' This will keep your console open, so you can read if there were errors
-
-' Script start
-' ------------
-' Ensure we have a visible console to display output
-CheckStartMode
-
-' Parameters
-' ----------
-' All of the above will be installed in the base directory specified below.
-' If this path doesn't suit you, please feel free to modify it before
-' running this bootstrap script.
-' Note: avoid paths with spaces or other special characters (like &).
-' these can confuse msys/mingw or some of the tools depending on them.
-GLOBAL_DIR = "c:\soft"
-MINGW_DIR = GLOBAL_DIR & "\mingw"
-TMP_DIR= GLOBAL_DIR & "\tmp"
-DOWNLOAD_DIR= GLOBAL_DIR & "\downloads"
-GIT_PKG = "Git-1.7.10-preview20120409.exe"
-strGitBaseUrl = "http://msysgit.googlecode.com/files/"
-GIT_URL = strGitBaseUrl & GIT_PKG
-GIT_DIR = GLOBAL_DIR & "\git-1.7.10"
-REPOS_URL = "git://github.com/Gnucash/gnucash.git"
-REPOS_DIR = GLOBAL_DIR & "\gnucash.git"
-
-' Global parameters for visual basic
-Set objFso = CreateObject("Scripting.FileSystemObject")
-Set stdout = objFso.GetStandardStream(1)
-Set stdin = objFso.GetStandardStream(0)
-Set objWsh = WScript.CreateObject ("WScript.Shell")
-Const ForReading = 1, ForWriting = 2, ForAppending = 8
-
-Welcome
-
-
-' Create base directories if necessary
-' ------------------------------------
-If Not objFso.FolderExists(GLOBAL_DIR) Then
- stdout.Write "Creating " & GLOBAL_DIR & "... "
- objFso.CreateFolder(GLOBAL_DIR)
- stdout.WriteLine "Ok"
-End If
-If Not objFso.FolderExists(MINGW_DIR) Then
- stdout.Write "Creating " & MINGW_DIR & "... "
- objFso.CreateFolder(MINGW_DIR)
- stdout.WriteLine "Ok"
-End If
-If Not objFso.FolderExists(TMP_DIR) Then
- stdout.Write "Creating " & TMP_DIR & "... "
- objFso.CreateFolder(TMP_DIR)
- stdout.WriteLine "Ok"
-End If
-If Not objFso.FolderExists(DOWNLOAD_DIR) Then
- stdout.Write "Creating " & DOWNLOAD_DIR & "... "
- objFso.CreateFolder(DOWNLOAD_DIR)
- stdout.WriteLine "Ok"
-End If
-
-
-' Install mingw-get
-' -----------------
-
-strMingwGet = MINGW_DIR & "\bin\mingw-get.exe"
-stdout.Write "Checking " & strMingwGet & "... "
-If objFso.FileExists(strMingwGet) Then
- stdout.WriteLine "Found, no need to install"
-Else
- stdout.WriteLine "Not found, will be installed"
-
- strMingwGetZip = DOWNLOAD_DIR & "\mingw-get.zip"
- If Not objFso.FileExists(strMingwGetZip) Then
- stdout.Write "Downloading mingw-get.zip (slow!)... "
- strMingwGetZipUrl = "https://github.com/gjanssens/gnucash-on-windows/raw/master/mingw-get.zip"
- HTTPDownload strMingwGetZipUrl, strMingwGetZip
- stdout.WriteLine "Success"
- End If
-
- ' Extract mingw-get.zip into our MINGW_DIR
- ' using a detour via a temporary directory to deal with the
- ' cludgy way to detect when extracting is finished.
- ' I couldn't find a better way so far.
- stdout.Write "Installing mingw-get... "
- strMingwTmpDir = TMP_DIR & "\mingwtmp"
- If objFso.FolderExists(strMingwTmpDir) Then
- objFso.DeleteFolder strMingwTmpDir , True
- End If
- ExtractAll objFso.GetAbsolutePathName(".")& "\mingw-get.zip", strMingwTmpDir
- objFso.CopyFolder strMingwTmpDir & "\*", MINGW_DIR, True
- objFso.DeleteFolder strMingwTmpDir , True
- stdout.WriteLine "Success"
-
-End If
-
-
-' Instal Basic Msys (we need msys-wget to install git)
-' ----------------------------------------------------
-' Note: we don't check if these are installed already.
-' mingw-get will do this for us automatically.
-stdout.Write "Installing msys and wget... "
-strMingwGet = MINGW_DIR & "\bin\mingw-get.exe"
-
-objWsh.Run strMingwGet & " install msys-base msys-wget", 1, True
-'Set objExec = objWsh.Exec (strMingwGet & " install msys-base msys-wget")
-
-strWget = MINGW_DIR & "\msys\1.0\bin\wget.exe"
-If Not objFso.FileExists(strWget) Then
- stdout.WriteLine "Failed"
- stdout.WriteBlankLines (1)
- stdout.WriteLine "*** ERROR ***"
- stdout.WriteLine "Msys/Wget installation failed."
- stdout.WriteBlankLines (1)
- stdout.WriteLine "Cannot continue until this has been resolved."
- AbortScript
-End If
-stdout.WriteLine "Success"
-
-
-' Install Git
-' -----------
-strGit = GIT_DIR & "\bin\git.exe"
-stdout.Write "Checking " & strGit & "... "
-If objFso.FileExists(strGit) Then
- stdout.WriteLine "Found, no need to install"
-Else
- stdout.WriteLine "Not found, will be installed"
-
- strGitPkg = DOWNLOAD_DIR & "\" & GIT_PKG
- If Not objFso.FileExists(strGitPkg) Then
- stdout.Write "Downloading git installer... "
- objWsh.Run strWget & " -P" & DOWNLOAD_DIR & " " & GIT_URL, 1, true
-
- If Not objFso.FileExists(strGitPkg) Then
- stdout.WriteLine "Failed"
- stdout.WriteBlankLines (1)
- stdout.WriteLine "*** ERROR ***"
- stdout.WriteLine "Download git installer failed."
- stdout.WriteBlankLines (1)
- stdout.WriteLine "Cannot continue until this has been resolved."
- AbortScript
- End If
- stdout.WriteLine "Success"
- End If
-
- stdout.Write "Installing git... "
- objWsh.Run strGitPkg & " /SP- /SILENT /DIR=" & GIT_DIR, 1, true
-
- If Not objFso.FileExists(strGit) Then
- stdout.WriteLine "Failed"
- stdout.WriteBlankLines (1)
- stdout.WriteLine "*** ERROR ***"
- stdout.WriteLine "Git installation failed."
- stdout.WriteBlankLines (1)
- stdout.WriteLine "Cannot continue until this has been resolved."
- AbortScript
- End If
- stdout.WriteLine "Sucess"
-End If
-
-
-' Set up git repository
-' ---------------------
-strInstall = REPOS_DIR & "\packaging\win32\install.sh"
-stdout.WriteLine "Checking if " & REPOS_DIR
-stdout.Write " is a GnuCash git repository... "
-If objFso.FolderExists(REPOS_DIR & "\.git") And objFso.FileExists(strInstall) Then
- stdout.WriteLine "Most likely ok, won't clone"
-Else
- stdout.WriteLine "Not found"
- stdout.WriteLine "Set up GnuCash git repository... "
- objWsh.Run strGit & " clone " & REPOS_URL & " " & REPOS_DIR, 1, true
-
- If Not objFso.FileExists(strInstall) Then
- stdout.WriteLine "Failed"
- stdout.WriteBlankLines (1)
- stdout.WriteLine "*** ERROR ***"
- stdout.WriteLine "Failed to set up GnuCash git repository."
- stdout.WriteBlankLines (1)
- stdout.WriteLine "Cannot continue until this has been resolved."
- AbortScript
- End If
- stdout.WriteLine "Ok"
-End If
-
-' Create custom.sh
-' ----------------
-strCustomSh = REPOS_DIR & "\packaging\win32\custom.sh"
-bExistingCustomSh = False
-If objFso.FileExists(strCustomSh) Then
- stdout.WriteLine "Found existing custom.sh file"
- bExistingCustomSh = True
-Else
- ' Create a custom.sh file that matches the parameters set at the beginning of this script
- ' This ensures install.sh will find the development environment we set up
- ' Note: we're deliberately not storing versions of used components in the autogenerated custom.sh
- ' This allows install.sh to update to newer versions if deemed useful
- stdout.Write "Autogenerating custom.sh file... "
- Set myRegExp = New RegExp
- myRegExp.Global = True
- myRegExp.Pattern = "\\"
-
- strGlobalDir = myRegExp.Replace (GLOBAL_DIR, "\\")
- strMingwDir = myRegExp.Replace (MINGW_DIR, "\\")
- strMsysDir = myRegExp.Replace (MINGW_DIR & "\msys\1.0", "\\")
- strTmpDir = myRegExp.Replace (TMP_DIR, "\\")
- strDownloadDir = myRegExp.Replace (DOWNLOAD_DIR, "\\")
- strGitDir = myRegExp.Replace (GIT_DIR, "\\")
- strReposDir = myRegExp.Replace (REPOS_DIR, "\\")
-
- Set objCustomSh = objFso.OpenTextFile( strCustomSh, ForWriting, True )
- objCustomSh.WriteLine "# custom.sh, automatically created by bootstrap_win_dev.vbs"
- objCustomSh.WriteLine "#"
- objCustomSh.WriteLine "# The parameters set here match the parameters used by"
- objCustomSh.WriteLine "# bootstrap_win_dev.vbs to set up the GnuCash development"
- objCustomSh.WriteLine "# environment and should ensure the install.sh works out"
- objCustomSh.WriteLine "# of the box."
- objCustomSh.WriteLine "#"
- objCustomSh.WriteLine "# You are free to modify these parameters to suit you,"
- objCustomSh.WriteLine "# but keep in mind that if you ever want to run"
- objCustomSh.WriteLine "# bootstrap_win_dev.vbs again you should make sure"
- objCustomSh.WriteLine "# the parameters it uses match the ones you set here."
- objCustomSh.WriteBlankLines 1
- objCustomSh.WriteLine "GLOBAL_DIR=" & strGlobalDir
- objCustomSh.WriteLine "MINGW_DIR=" & strMingwDir
- objCustomSh.WriteLine "MSYS_DIR=" & strMsysDir
- objCustomSh.WriteLine "TMP_DIR=" & strTmpDir
- objCustomSh.WriteLine "DOWNLOAD_DIR=" & strDownloadDir
- objCustomSh.WriteLine "GIT_DIR=" & strGitDir
- objCustomSh.WriteLine "REPOS_TYPE=git" ' Bootstrap only works with a git repo
- objCustomSh.WriteLine "REPOS_URL=" & REPOS_URL
- objCustomSh.WriteLine "REPOS_DIR=" & strReposDir
- objCustomSh.Close
- stdout.WriteLine "Success"
-End If
-
-
-' End message
-' -----------
-stdout.WriteBlankLines 1
-stdout.WriteLine "Bootstrap completed successfully !"
-stdout.WriteBlankLines 1
-stdout.WriteLine "You can now continue as follows"
-stdout.WriteLine "- Open the msys shell"
-stdout.WriteLine "- cd " & REPOS_DIR & "\packaging\win32"
-stdout.WriteLine "- Properly configure a custom.sh"
-stdout.WriteLine " (if you changed any default path in the bootstrap script)"
-stdout.WriteLine "- Run install.sh"
-stdout.WriteBlankLines 1
-stdout.WriteLine "Happy hacking !"
-
-AbortScript
-
-
-' Functions used in the script
-' ----------------------------
-' Initial message to user
-Sub Welcome
- stdout.WriteLine "Boostrap GnuCash Development on Windows"
- stdout.WriteLine "---------------------------------------"
- stdout.WriteLine "This script is intended for people that wish to develop GnuCash on Windows"
- stdout.WriteLine "It will download and install the minimal set of tools"
- stdout.WriteLine "to run a first build of the GnuCash sources."
- stdout.WriteLine "It will install"
- stdout.WriteLine "- mingw-get, an msys shell and wget in " & MINGW_DIR
- stdout.WriteLine "- git in " & GIT_DIR
- stdout.WriteLine "- a GnuCash git repository cloned from"
- stdout.WriteLine " " & REPOS_URL
- stdout.WriteLine " into " & REPOS_DIR
- stdout.WriteBlankLines 1
- stdout.WriteLine "Notes:"
- stdout.WriteLine "* Components already found in the given locations"
- stdout.WriteLine " won't be touched. Instead the available versions"
- stdout.WriteLine " will be used in that case."
- stdout.WriteLine "* If the proposed locations don't suit you, you can"
- stdout.WriteLine " customize them before running this script."
- stdout.WriteLine " All of them are located at the beginning of this file."
- stdout.WriteBlankLines 1
- stdout.Write "Continue with the set up (Y/N) ? "
- chRead = stdin.ReadLine
- If Not (UCase(Left(chRead,1)) = "Y") Then
- stdout.WriteLine "Installation interrupted."
- AbortScript
- End If
-End Sub
-
-
-' Download a file over http
-Sub HTTPDownload( myURL, myPath )
-' This Sub downloads the FILE specified in myURL to the path specified in myPath.
-'
-' myURL must always end with a file name
-' myPath may be a directory or a file name; in either case the directory must exist
-'
-' Based on a script written by Rob van der Woude
-' http://www.robvanderwoude.com
-
- ' Standard housekeeping
- Dim i, objFile, objHTTP, strFile, strMsg
-
- ' Check if the specified target file or folder exists,
- ' and build the fully qualified path of the target file
- If objFso.FolderExists( myPath ) Then
- strFile = objFso.BuildPath( myPath, Mid( myURL, InStrRev( myURL, "/" ) + 1 ) )
- ElseIf objFso.FolderExists( Left( myPath, InStrRev( myPath, "\" ) - 1 ) ) Then
- strFile = myPath
- Else
- stdout.WriteLine "ERROR: Target folder not found."
- AbortScript
- End If
-
- ' Create or open the target file
- Set objFile = objFso.OpenTextFile( strFile, ForWriting, True )
-
- ' Create an HTTP object
- Set objHTTP = CreateObject( "MSXML2.ServerXMLHTTP" )
-
- ' Download the specified URL
- objHTTP.Open "GET", myURL, False
- objHTTP.Send
-
- ' Write the downloaded byte stream to the target file
- For i = 1 To LenB( objHTTP.ResponseBody )
- objFile.Write Chr( AscB( MidB( objHTTP.ResponseBody, i, 1 ) ) )
- Next
-
- ' Close the target file
- objFile.Close( )
-End Sub
-
-
-' Extract a zip file strZipFile into strFolder
-Function ExtractAll(strZipFile, strFolder)
- Set objShell = CreateObject("Shell.Application")
- If Not objFso.FolderExists(strFolder) Then
- objFso.CreateFolder(strFolder)
- End If
-
- intCount = objShell.NameSpace(strFolder).Items.Count
- Set colItems = objShell.NameSpace(strZipFile).Items
- objShell.NameSpace(strFolder).CopyHere colItems, 256
- Do Until objShell.NameSpace(strFolder).Items.Count = intCount + colItems.Count
- WScript.Sleep 200
- Loop
-End Function
-
-
-' Make sure we run in a console (so output is visible)
-Sub CheckStartMode
- ' Returns the running executable as upper case from the last \ symbol
- strStartExe = UCase( Mid( wscript.fullname, instrRev(wscript.fullname, "\") + 1 ) )
-
- If Not strStartExe = "CSCRIPT.EXE" Then
- ' This wasn't launched with cscript.exe, so relaunch using cscript.exe explicitly!
- ' wscript.scriptfullname is the full path to the actual script
-
- set oSh = CreateObject("wscript.shell")
- oSh.Run "cscript.exe """ & wscript.scriptfullname & """"
- wscript.quit
-
- End If
-End Sub
-
-
-' Abort the script
-Sub AbortScript
- stdout.WriteBlankLines 1
- stdout.Write "Pres enter to continue... "
- chRead = stdin.Read (1)
- WScript.Quit
-End Sub
\ No newline at end of file
+' bootstap_win_dev.vbs
+'
+' The goal of this script is to simplify setting up a development
+' environment to develop for GnuCash on Windows.
+' It will set up an absolute minimal environment from where
+' the regular GnuCash Windows build system can take over.
+' This minimal environment consists of
+' - mingw-get: the mingw package installer tool
+' - msys-base: a basic MSYS shell environment
+' - git for windows, required for:-
+' - the GnuCash source code repository, cloned from the github GnuCash repository
+'
+' The bootstrap script can also be run on top of an existing set up
+' in which case the script will only do what is necessary to get
+' the above items in place. For example, if git is already installed
+' in the location pointed to by GIT_DIR below, it won't be installed
+' again.
+'
+' IN CASE OF UNEXPECTED CLOSING OF THE CONSOLE
+' Please open a console (cmd.exe) and run the script under cscript.exe as follows:
+' cscript.exe <path-to-this-script>
+' This will keep your console open, so you can read if there were errors
+
+' Script start
+' ------------
+' Ensure we have a visible console to display output
+CheckStartMode
+
+' Parameters
+' ----------
+' All of the above will be installed in the base directory specified below.
+' If this path doesn't suit you, please feel free to modify it before
+' running this bootstrap script.
+' Note: avoid paths with spaces or other special characters (like &).
+' these can confuse msys/mingw or some of the tools depending on them.
+GLOBAL_DIR = "c:\soft"
+MINGW_DIR = GLOBAL_DIR & "\mingw"
+TMP_DIR= GLOBAL_DIR & "\tmp"
+DOWNLOAD_DIR= GLOBAL_DIR & "\downloads"
+GIT_PKG = "Git-1.7.10-preview20120409.exe"
+strGitBaseUrl = "http://msysgit.googlecode.com/files/"
+GIT_URL = strGitBaseUrl & GIT_PKG
+GIT_DIR = GLOBAL_DIR & "\git-1.7.10"
+REPOS_URL = "git://github.com/Gnucash/gnucash.git"
+REPOS_DIR = GLOBAL_DIR & "\gnucash.git"
+
+' Global parameters for visual basic
+Set objFso = CreateObject("Scripting.FileSystemObject")
+Set stdout = objFso.GetStandardStream(1)
+Set stdin = objFso.GetStandardStream(0)
+Set objWsh = WScript.CreateObject ("WScript.Shell")
+Const ForReading = 1, ForWriting = 2, ForAppending = 8
+
+Welcome
+
+
+' Create base directories if necessary
+' ------------------------------------
+If Not objFso.FolderExists(GLOBAL_DIR) Then
+ stdout.Write "Creating " & GLOBAL_DIR & "... "
+ objFso.CreateFolder(GLOBAL_DIR)
+ stdout.WriteLine "Ok"
+End If
+If Not objFso.FolderExists(MINGW_DIR) Then
+ stdout.Write "Creating " & MINGW_DIR & "... "
+ objFso.CreateFolder(MINGW_DIR)
+ stdout.WriteLine "Ok"
+End If
+If Not objFso.FolderExists(TMP_DIR) Then
+ stdout.Write "Creating " & TMP_DIR & "... "
+ objFso.CreateFolder(TMP_DIR)
+ stdout.WriteLine "Ok"
+End If
+If Not objFso.FolderExists(DOWNLOAD_DIR) Then
+ stdout.Write "Creating " & DOWNLOAD_DIR & "... "
+ objFso.CreateFolder(DOWNLOAD_DIR)
+ stdout.WriteLine "Ok"
+End If
+
+
+' Install mingw-get
+' -----------------
+
+strMingwGet = MINGW_DIR & "\bin\mingw-get.exe"
+stdout.Write "Checking " & strMingwGet & "... "
+If objFso.FileExists(strMingwGet) Then
+ stdout.WriteLine "Found, no need to install"
+Else
+ stdout.WriteLine "Not found, will be installed"
+
+ strMingwGetZip = DOWNLOAD_DIR & "\mingw-get.zip"
+ If Not objFso.FileExists(strMingwGetZip) Then
+ stdout.Write "Downloading mingw-get.zip (slow!)... "
+ strMingwGetZipUrl = "https://github.com/gjanssens/gnucash-on-windows/raw/master/mingw-get.zip"
+ HTTPDownload strMingwGetZipUrl, strMingwGetZip
+ stdout.WriteLine "Success"
+ End If
+
+ ' Extract mingw-get.zip into our MINGW_DIR
+ ' using a detour via a temporary directory to deal with the
+ ' cludgy way to detect when extracting is finished.
+ ' I couldn't find a better way so far.
+ stdout.Write "Installing mingw-get... "
+ strMingwTmpDir = TMP_DIR & "\mingwtmp"
+ If objFso.FolderExists(strMingwTmpDir) Then
+ objFso.DeleteFolder strMingwTmpDir , True
+ End If
+ ExtractAll objFso.GetAbsolutePathName(".")& "\mingw-get.zip", strMingwTmpDir
+ objFso.CopyFolder strMingwTmpDir & "\*", MINGW_DIR, True
+ objFso.DeleteFolder strMingwTmpDir , True
+ stdout.WriteLine "Success"
+
+End If
+
+
+' Instal Basic Msys (we need msys-wget to install git)
+' ----------------------------------------------------
+' Note: we don't check if these are installed already.
+' mingw-get will do this for us automatically.
+stdout.Write "Installing msys and wget... "
+strMingwGet = MINGW_DIR & "\bin\mingw-get.exe"
+
+objWsh.Run strMingwGet & " install msys-base msys-wget", 1, True
+'Set objExec = objWsh.Exec (strMingwGet & " install msys-base msys-wget")
+
+strWget = MINGW_DIR & "\msys\1.0\bin\wget.exe"
+If Not objFso.FileExists(strWget) Then
+ stdout.WriteLine "Failed"
+ stdout.WriteBlankLines (1)
+ stdout.WriteLine "*** ERROR ***"
+ stdout.WriteLine "Msys/Wget installation failed."
+ stdout.WriteBlankLines (1)
+ stdout.WriteLine "Cannot continue until this has been resolved."
+ AbortScript
+End If
+stdout.WriteLine "Success"
+
+
+' Install Git
+' -----------
+strGit = GIT_DIR & "\bin\git.exe"
+stdout.Write "Checking " & strGit & "... "
+If objFso.FileExists(strGit) Then
+ stdout.WriteLine "Found, no need to install"
+Else
+ stdout.WriteLine "Not found, will be installed"
+
+ strGitPkg = DOWNLOAD_DIR & "\" & GIT_PKG
+ If Not objFso.FileExists(strGitPkg) Then
+ stdout.Write "Downloading git installer... "
+ objWsh.Run strWget & " -P" & DOWNLOAD_DIR & " " & GIT_URL, 1, true
+
+ If Not objFso.FileExists(strGitPkg) Then
+ stdout.WriteLine "Failed"
+ stdout.WriteBlankLines (1)
+ stdout.WriteLine "*** ERROR ***"
+ stdout.WriteLine "Download git installer failed."
+ stdout.WriteBlankLines (1)
+ stdout.WriteLine "Cannot continue until this has been resolved."
+ AbortScript
+ End If
+ stdout.WriteLine "Success"
+ End If
+
+ stdout.Write "Installing git... "
+ objWsh.Run strGitPkg & " /SP- /SILENT /DIR=" & GIT_DIR, 1, true
+
+ If Not objFso.FileExists(strGit) Then
+ stdout.WriteLine "Failed"
+ stdout.WriteBlankLines (1)
+ stdout.WriteLine "*** ERROR ***"
+ stdout.WriteLine "Git installation failed."
+ stdout.WriteBlankLines (1)
+ stdout.WriteLine "Cannot continue until this has been resolved."
+ AbortScript
+ End If
+ stdout.WriteLine "Sucess"
+End If
+
+
+' Set up git repository
+' ---------------------
+strInstall = REPOS_DIR & "\packaging\win32\install.sh"
+stdout.WriteLine "Checking if " & REPOS_DIR
+stdout.Write " is a GnuCash git repository... "
+If objFso.FolderExists(REPOS_DIR & "\.git") And objFso.FileExists(strInstall) Then
+ stdout.WriteLine "Most likely ok, won't clone"
+Else
+ stdout.WriteLine "Not found"
+ stdout.WriteLine "Set up GnuCash git repository... "
+ objWsh.Run strGit & " clone " & REPOS_URL & " " & REPOS_DIR, 1, true
+
+ If Not objFso.FileExists(strInstall) Then
+ stdout.WriteLine "Failed"
+ stdout.WriteBlankLines (1)
+ stdout.WriteLine "*** ERROR ***"
+ stdout.WriteLine "Failed to set up GnuCash git repository."
+ stdout.WriteBlankLines (1)
+ stdout.WriteLine "Cannot continue until this has been resolved."
+ AbortScript
+ End If
+ stdout.WriteLine "Ok"
+End If
+
+' Create custom.sh
+' ----------------
+strCustomSh = REPOS_DIR & "\packaging\win32\custom.sh"
+bExistingCustomSh = False
+If objFso.FileExists(strCustomSh) Then
+ stdout.WriteLine "Found existing custom.sh file"
+ bExistingCustomSh = True
+Else
+ ' Create a custom.sh file that matches the parameters set at the beginning of this script
+ ' This ensures install.sh will find the development environment we set up
+ ' Note: we're deliberately not storing versions of used components in the autogenerated custom.sh
+ ' This allows install.sh to update to newer versions if deemed useful
+ stdout.Write "Autogenerating custom.sh file... "
+ Set myRegExp = New RegExp
+ myRegExp.Global = True
+ myRegExp.Pattern = "\\"
+
+ strGlobalDir = myRegExp.Replace (GLOBAL_DIR, "\\")
+ strMingwDir = myRegExp.Replace (MINGW_DIR, "\\")
+ strMsysDir = myRegExp.Replace (MINGW_DIR & "\msys\1.0", "\\")
+ strTmpDir = myRegExp.Replace (TMP_DIR, "\\")
+ strDownloadDir = myRegExp.Replace (DOWNLOAD_DIR, "\\")
+ strGitDir = myRegExp.Replace (GIT_DIR, "\\")
+ strReposDir = myRegExp.Replace (REPOS_DIR, "\\")
+
+ Set objCustomSh = objFso.OpenTextFile( strCustomSh, ForWriting, True )
+ objCustomSh.WriteLine "# custom.sh, automatically created by bootstrap_win_dev.vbs"
+ objCustomSh.WriteLine "#"
+ objCustomSh.WriteLine "# The parameters set here match the parameters used by"
+ objCustomSh.WriteLine "# bootstrap_win_dev.vbs to set up the GnuCash development"
+ objCustomSh.WriteLine "# environment and should ensure the install.sh works out"
+ objCustomSh.WriteLine "# of the box."
+ objCustomSh.WriteLine "#"
+ objCustomSh.WriteLine "# You are free to modify these parameters to suit you,"
+ objCustomSh.WriteLine "# but keep in mind that if you ever want to run"
+ objCustomSh.WriteLine "# bootstrap_win_dev.vbs again you should make sure"
+ objCustomSh.WriteLine "# the parameters it uses match the ones you set here."
+ objCustomSh.WriteBlankLines 1
+ objCustomSh.WriteLine "GLOBAL_DIR=" & strGlobalDir
+ objCustomSh.WriteLine "MINGW_DIR=" & strMingwDir
+ objCustomSh.WriteLine "MSYS_DIR=" & strMsysDir
+ objCustomSh.WriteLine "TMP_DIR=" & strTmpDir
+ objCustomSh.WriteLine "DOWNLOAD_DIR=" & strDownloadDir
+ objCustomSh.WriteLine "GIT_DIR=" & strGitDir
+ objCustomSh.WriteLine "REPOS_TYPE=git" ' Bootstrap only works with a git repo
+ objCustomSh.WriteLine "REPOS_URL=" & REPOS_URL
+ objCustomSh.WriteLine "REPOS_DIR=" & strReposDir
+ objCustomSh.Close
+ stdout.WriteLine "Success"
+End If
+
+
+' End message
+' -----------
+stdout.WriteBlankLines 1
+stdout.WriteLine "Bootstrap completed successfully !"
+stdout.WriteBlankLines 1
+stdout.WriteLine "You can now continue as follows"
+stdout.WriteLine "- Open the msys shell"
+stdout.WriteLine "- cd " & REPOS_DIR & "\packaging\win32"
+stdout.WriteLine "- Properly configure a custom.sh"
+stdout.WriteLine " (if you changed any default path in the bootstrap script)"
+stdout.WriteLine "- Run install.sh"
+stdout.WriteBlankLines 1
+stdout.WriteLine "Happy hacking !"
+
+AbortScript
+
+
+' Functions used in the script
+' ----------------------------
+' Initial message to user
+Sub Welcome
+ stdout.WriteLine "Boostrap GnuCash Development on Windows"
+ stdout.WriteLine "---------------------------------------"
+ stdout.WriteLine "This script is intended for people that wish to develop GnuCash on Windows"
+ stdout.WriteLine "It will download and install the minimal set of tools"
+ stdout.WriteLine "to run a first build of the GnuCash sources."
+ stdout.WriteLine "It will install"
+ stdout.WriteLine "- mingw-get, an msys shell and wget in " & MINGW_DIR
+ stdout.WriteLine "- git in " & GIT_DIR
+ stdout.WriteLine "- a GnuCash git repository cloned from"
+ stdout.WriteLine " " & REPOS_URL
+ stdout.WriteLine " into " & REPOS_DIR
+ stdout.WriteBlankLines 1
+ stdout.WriteLine "Notes:"
+ stdout.WriteLine "* Components already found in the given locations"
+ stdout.WriteLine " won't be touched. Instead the available versions"
+ stdout.WriteLine " will be used in that case."
+ stdout.WriteLine "* If the proposed locations don't suit you, you can"
+ stdout.WriteLine " customize them before running this script."
+ stdout.WriteLine " All of them are located at the beginning of this file."
+ stdout.WriteBlankLines 1
+ stdout.Write "Continue with the set up (Y/N) ? "
+ chRead = stdin.ReadLine
+ If Not (UCase(Left(chRead,1)) = "Y") Then
+ stdout.WriteLine "Installation interrupted."
+ AbortScript
+ End If
+End Sub
+
+
+' Download a file over http
+Sub HTTPDownload( myURL, myPath )
+' This Sub downloads the FILE specified in myURL to the path specified in myPath.
+'
+' myURL must always end with a file name
+' myPath may be a directory or a file name; in either case the directory must exist
+'
+' Based on a script written by Rob van der Woude
+' http://www.robvanderwoude.com
+
+ ' Standard housekeeping
+ Dim i, objFile, objHTTP, strFile, strMsg
+
+ ' Check if the specified target file or folder exists,
+ ' and build the fully qualified path of the target file
+ If objFso.FolderExists( myPath ) Then
+ strFile = objFso.BuildPath( myPath, Mid( myURL, InStrRev( myURL, "/" ) + 1 ) )
+ ElseIf objFso.FolderExists( Left( myPath, InStrRev( myPath, "\" ) - 1 ) ) Then
+ strFile = myPath
+ Else
+ stdout.WriteLine "ERROR: Target folder not found."
+ AbortScript
+ End If
+
+ ' Create or open the target file
+ Set objFile = objFso.OpenTextFile( strFile, ForWriting, True )
+
+ ' Create an HTTP object
+ Set objHTTP = CreateObject( "MSXML2.ServerXMLHTTP" )
+
+ ' Download the specified URL
+ objHTTP.Open "GET", myURL, False
+ objHTTP.Send
+
+ ' Write the downloaded byte stream to the target file
+ For i = 1 To LenB( objHTTP.ResponseBody )
+ objFile.Write Chr( AscB( MidB( objHTTP.ResponseBody, i, 1 ) ) )
+ Next
+
+ ' Close the target file
+ objFile.Close( )
+End Sub
+
+
+' Extract a zip file strZipFile into strFolder
+Function ExtractAll(strZipFile, strFolder)
+ Set objShell = CreateObject("Shell.Application")
+ If Not objFso.FolderExists(strFolder) Then
+ objFso.CreateFolder(strFolder)
+ End If
+
+ intCount = objShell.NameSpace(strFolder).Items.Count
+ Set colItems = objShell.NameSpace(strZipFile).Items
+ objShell.NameSpace(strFolder).CopyHere colItems, 256
+ Do Until objShell.NameSpace(strFolder).Items.Count = intCount + colItems.Count
+ WScript.Sleep 200
+ Loop
+End Function
+
+
+' Make sure we run in a console (so output is visible)
+' Based on a code snipped found here
+' http://ask.metafilter.com/79481/vbscript-printing-to-command-line
+Sub CheckStartMode
+ ' Returns the running executable as upper case from the last \ symbol
+ strStartExe = UCase( Mid( wscript.fullname, instrRev(wscript.fullname, "\") + 1 ) )
+
+ If Not strStartExe = "CSCRIPT.EXE" Then
+ ' This wasn't launched with cscript.exe, so relaunch using cscript.exe explicitly!
+ ' wscript.scriptfullname is the full path to the actual script
+
+ set oSh = CreateObject("wscript.shell")
+ oSh.Run "cscript.exe """ & wscript.scriptfullname & """"
+ wscript.quit
+
+ End If
+End Sub
+
+
+' Abort the script
+Sub AbortScript
+ stdout.WriteBlankLines 1
+ stdout.Write "Pres enter to continue... "
+ chRead = stdin.Read (1)
+ WScript.Quit
+End Sub
+
commit 8659d61bb462dfaa5caf468f274042bffed485eb
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat Jan 19 18:28:00 2013 +0000
Win32 build: some more patchfile cleanups
Wrap patching code in conditional in most cases to only run patch if
there actually is a patch file available.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22715 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
index 00afd71..85dab6d 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -722,7 +722,9 @@ function inst_guile() {
tar -xzpf $_GUILE_BALL -C $TMP_UDIR
assert_one_dir $TMP_UDIR/guile-*
qpushd $TMP_UDIR/guile-*
- patch -p1 < $GUILE_PATCH
+ if [ -n "$GUILE_PATCH" -a -f "$GUILE_PATCH" ]; then
+ patch -p1 < $GUILE_PATCH
+ fi
ACLOCAL="aclocal $ACLOCAL_FLAGS" autoreconf -fvi $ACLOCAL_FLAGS
./configure ${HOST_XCOMPILE} \
--disable-static \
@@ -946,7 +948,7 @@ function inst_libdbi() {
fi
if [ -n "$LIBDBI_PATCH2" -a -f "$LIBDBI_PATCH2" ]; then
patch -p1 < $LIBDBI_PATCH2
- fi
+ fi
if [ "$CROSS_COMPILE" = "yes" ]; then
rm ltmain.sh aclocal.m4
libtoolize --force
@@ -1116,7 +1118,9 @@ function inst_libxslt() {
wget_unpacked $LIBXSLT_SRC_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/libxslt-*
qpushd $TMP_UDIR/libxslt-*
- patch -p0 -u -i ${LIBXSLT_MAKEFILE_PATCH}
+ if [ -n "$LIBXSLT_MAKEFILE_PATCH" -a -f "$LIBXSLT_MAKEFILE_PATCH" ]; then
+ patch -p0 -u -i ${LIBXSLT_MAKEFILE_PATCH}
+ fi
./configure ${HOST_XCOMPILE} \
--prefix=${_LIBXSLT_UDIR} \
--with-python=no \
commit 8c26eeaf4984b7f95b3cd305053e69e20a60ef65
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat Jan 19 18:27:51 2013 +0000
Win32 build: rename patch files to consistently end in .patch
This way they will be checked in/out in proper line ending style on all
supported platforms.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22714 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/Makefile.am b/Makefile.am
index 0404df1..b246e1e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
EXTRA_DIST = \
README \
- aqbanking-4.2.4-r2132-patch.diff \
+ aqbanking-4.2.4-r2132.patch \
defaults.sh \
dist.sh \
exetype.pl \
@@ -10,7 +10,7 @@ EXTRA_DIST = \
install.sh \
install-fq-mods.cmd \
libmysql.def \
- opensp-1.5.2-patch.diff \
+ opensp-1.5.2.patch \
pi.sh \
ChineseSimp-12-5.1.11.isl \
ChineseTrad-2-5.1.11.isl \
diff --git a/aqbanking-4.2.4-r2132-patch.diff b/aqbanking-4.2.4-r2132.patch
similarity index 100%
rename from aqbanking-4.2.4-r2132-patch.diff
rename to aqbanking-4.2.4-r2132.patch
diff --git a/defaults.sh b/defaults.sh
index fc43de7..54e9d42 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -294,7 +294,7 @@ set_default LIBGSF_DIR $GLOBAL_DIR\\libgsf
GOFFICE_VERSION="0.8.13"
set_default GOFFICE_URL "$GNOME_MIRROR/sources/goffice/0.8/goffice-${GOFFICE_VERSION}.tar.bz2"
set_default GOFFICE_DIR $GLOBAL_DIR\\goffice
-#set_default GOFFICE_PATCH `pwd`/goffice-x.x.x-patch.diff
+#set_default GOFFICE_PATCH `pwd`/goffice-x.x.x.patch
set_default GLADE_URL "$GNOME_MIRROR/sources/glade3/3.0/glade3-3.1.2.tar.bz2"
set_default GLADE_DIR $GLOBAL_DIR\\glade
@@ -343,12 +343,12 @@ set_default GIT_DIR $GLOBAL_DIR\\git-1.7.10
# OFX import in gnucash and ofx directconnect support for aqbanking
set_default OPENSP_URL "$SF_MIRROR/openjade/OpenSP-1.5.2.tar.gz"
set_default OPENSP_DIR $GLOBAL_DIR\\opensp
-set_default OPENSP_PATCH `pwd`/opensp-1.5.2-patch.diff
+set_default OPENSP_PATCH `pwd`/opensp-1.5.2.patch
LIBOFX_VERSION="0.9.4"
set_default LIBOFX_URL "$SF_MIRROR/libofx/libofx-${LIBOFX_VERSION}.tar.gz"
set_default LIBOFX_DIR $GLOBAL_DIR\\libofx
-#set_default LIBOFX_PATCH `pwd`/libofx-x.x.x-patch.diff
+#set_default LIBOFX_PATCH `pwd`/libofx-x.x.x.patch
## online banking: gwenhywfar+aqbanking
set_default AQBANKING5 yes
@@ -362,7 +362,7 @@ if [ "$AQBANKING5" = "yes" ]; then
else
GWENHYWFAR_VERSION="3.11.3"
set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=31&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
- #set_default GWENHYWFAR_PATCH `pwd`/gwenhywfar-x.x.x-patch.diff
+ #set_default GWENHYWFAR_PATCH `pwd`/gwenhywfar-x.x.x.patch
fi
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
@@ -377,7 +377,7 @@ if [ "$AQBANKING5" = "yes" ]; then
else
AQBANKING_VERSION="4.2.4"
set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=50&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
- set_default AQBANKING_PATCH `pwd`/aqbanking-4.2.4-r2132-patch.diff
+ set_default AQBANKING_PATCH `pwd`/aqbanking-4.2.4-r2132.patch
set_default AQBANKING_WITH_QT yes
fi
set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
diff --git a/opensp-1.5.2-patch.diff b/opensp-1.5.2.patch
similarity index 100%
rename from opensp-1.5.2-patch.diff
rename to opensp-1.5.2.patch
commit 4cde35f67235713d1996f5e1f4dce988c4fd45cf
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat Jan 19 18:27:40 2013 +0000
Win32 build: remove obsolete patches
The code used to apply the patches if present still remains to cater for
possible future patches.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22713 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/Makefile.am b/Makefile.am
index 831420b..0404df1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,17 +1,15 @@
EXTRA_DIST = \
README \
+ aqbanking-4.2.4-r2132-patch.diff \
defaults.sh \
dist.sh \
exetype.pl \
functions.sh \
getperl.vbs \
gnc-path-check \
- goffice-0.7.2-patch.diff \
- gwenhywfar-3.6.0-patch.diff \
install.sh \
install-fq-mods.cmd \
libmysql.def \
- libofx-0.8.3-patch.diff \
opensp-1.5.2-patch.diff \
pi.sh \
ChineseSimp-12-5.1.11.isl \
diff --git a/aqbanking-3.8.3-patch.diff b/aqbanking-3.8.3-patch.diff
deleted file mode 100644
index db1d302..0000000
--- a/aqbanking-3.8.3-patch.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- aqbanking-3.8.3/configure.ac~ Fri May 29 14:57:00 2009
-+++ aqbanking-3.8.3/configure.ac Sat Jun 13 15:45:49 2009
-@@ -476,7 +476,7 @@
- AC_PROG_INSTALL
-
- AC_LIBTOOL_WIN32_DLL
--AC_LIBTOOL_RC
-+AC_CHECK_TOOL([RC], [windres], [no])
- AC_PROG_LIBTOOL
- AC_CHECK_PROG(USE_DOT,dot,YES,NO)
- AC_CHECK_PROG(SED,sed,sed)
diff --git a/aqbanking-4.1.6-patch.diff b/aqbanking-4.1.6-patch.diff
deleted file mode 100644
index 667fa4e..0000000
--- a/aqbanking-4.1.6-patch.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-From ba9cf4b5f7ad999381d9cfa8bf4048ec4afb4b96 Mon Sep 17 00:00:00 2001
-From: christian <christian at 5c42a225-8b10-0410-9873-89b7810ad06e>
-Date: Tue, 22 Sep 2009 19:31:39 +0000
-Subject: [PATCH] Add linking of libofxparser.la into ofx plugin again.
-
-Was probably accidentally removed in r1753.
-
-git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@1758 5c42a225-8b10-0410-9873-89b7810ad06e
----
- src/plugins/imexporters/ofx/Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/plugins/imexporters/ofx/Makefile.am b/src/plugins/imexporters/ofx/Makefile.am
-index ca89db1..5ea7496 100644
---- a/src/plugins/imexporters/ofx/Makefile.am
-+++ b/src/plugins/imexporters/ofx/Makefile.am
-@@ -18,7 +18,7 @@ imexporterplugin_LTLIBRARIES=ofx.la
- imexporterplugin_DATA=ofx.xml
-
- ofx_la_SOURCES=ofx.c
--ofx_la_LIBADD=$(aqbanking_internal_libs) $(gwenhywfar_libs)
-+ofx_la_LIBADD = parser/libofxparser.la $(aqbanking_internal_libs) $(gwenhywfar_libs)
- ofx_la_LDFLAGS = -no-undefined @STRIPALL@ -module -avoid-version
-
-
---
-1.6.1.rc3.51.g5832d
-
diff --git a/defaults.sh b/defaults.sh
index ac7f8dd..fc43de7 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -294,7 +294,7 @@ set_default LIBGSF_DIR $GLOBAL_DIR\\libgsf
GOFFICE_VERSION="0.8.13"
set_default GOFFICE_URL "$GNOME_MIRROR/sources/goffice/0.8/goffice-${GOFFICE_VERSION}.tar.bz2"
set_default GOFFICE_DIR $GLOBAL_DIR\\goffice
-#set_default GOFFICE_PATCH `pwd`/goffice-0.7.2-patch.diff
+#set_default GOFFICE_PATCH `pwd`/goffice-x.x.x-patch.diff
set_default GLADE_URL "$GNOME_MIRROR/sources/glade3/3.0/glade3-3.1.2.tar.bz2"
set_default GLADE_DIR $GLOBAL_DIR\\glade
@@ -348,7 +348,7 @@ set_default OPENSP_PATCH `pwd`/opensp-1.5.2-patch.diff
LIBOFX_VERSION="0.9.4"
set_default LIBOFX_URL "$SF_MIRROR/libofx/libofx-${LIBOFX_VERSION}.tar.gz"
set_default LIBOFX_DIR $GLOBAL_DIR\\libofx
-#set_default LIBOFX_PATCH `pwd`/libofx-0.8.3-patch.diff
+#set_default LIBOFX_PATCH `pwd`/libofx-x.x.x-patch.diff
## online banking: gwenhywfar+aqbanking
set_default AQBANKING5 yes
@@ -362,7 +362,7 @@ if [ "$AQBANKING5" = "yes" ]; then
else
GWENHYWFAR_VERSION="3.11.3"
set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=31&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
- #set_default GWENHYWFAR_PATCH `pwd`/gwenhywfar-3.11.1-patch.diff
+ #set_default GWENHYWFAR_PATCH `pwd`/gwenhywfar-x.x.x-patch.diff
fi
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
diff --git a/goffice-0.7.2-patch.diff b/goffice-0.7.2-patch.diff
deleted file mode 100644
index ebf1988..0000000
--- a/goffice-0.7.2-patch.diff
+++ /dev/null
@@ -1,86 +0,0 @@
---- goffice-0.7.2-old/goffice/Makefile.am Fri Dec 28 22:55:15 2007
-+++ goffice-0.7.2/goffice/Makefile.am Sat Jan 10 21:50:04 2009
-@@ -27,7 +27,6 @@
- if WITH_NATIVE_WIN32
- # libtool thinks there are undefined refs in libhtmlhelp, by pass libtool
- libgoffice_ at GOFFICE_API_VER@_la_LDFLAGS += -Wl,-lhtmlhelp
--libgoffice_ at GOFFICE_API_VER@_la_LIBADD += -lurlmon
- endif
- endif
-
---- goffice-0.7.2-old/goffice/utils/go-file.c Tue Oct 14 10:52:48 2008
-+++ goffice-0.7.2/goffice/utils/go-file.c Sat Jan 10 20:33:58 2009
-@@ -31,11 +31,11 @@
- #include <glib/gi18n-lib.h>
- #include <gsf/gsf-input-gio.h>
- #include <gsf/gsf-output-gio.h>
--#ifdef GOFFICE_WITH_GNOME
-+#ifdef G_OS_WIN32
-+#include <windows.h>
-+/*#include <io.h>*/
-+#elif defined GOFFICE_WITH_GNOME
- #include <libgnome/gnome-url.h>
--#elif defined G_OS_WIN32
--#include <urlmon.h>
--#include <io.h>
- #endif
-
- #include <string.h>
-@@ -1065,6 +1065,7 @@
- go_get_mime_type (gchar const *uri)
- {
- #if defined(G_OS_WIN32)
-+#if defined(FindMimeFromData)
- /* Do we really need that? */
- LPWSTR wuri, mime_type;
-
-@@ -1079,6 +1080,7 @@
- }
-
- g_free (wuri);
-+#endif
-
- /* We try to determine mime using FindMimeFromData().
- * However, we are not sure whether the functions will know about
-@@ -1117,6 +1119,7 @@
- go_get_mime_type_for_data (gconstpointer data, int data_size)
- {
- #if defined(G_OS_WIN32)
-+#if defined(FindMimeFromData)
- /* Do we really need that? */
- LPWSTR mime_type;
-
-@@ -1126,6 +1129,7 @@
- {
- return g_utf16_to_utf8 (mime_type, -1, NULL, NULL, NULL);
- }
-+#endif
-
- /* We try to determine mime using FindMimeFromData().
- * However, we are not sure whether the functions will know about
---- goffice-0.7.2-old/goffice/gtk/goffice-gtk.c Sun Sep 14 11:15:14 2008
-+++ goffice-0.7.2/goffice/gtk/goffice-gtk.c Sat Jan 10 20:59:39 2009
-@@ -779,11 +779,11 @@
- char const *link;
- } CBHelpPaths;
-
--#ifdef GOFFICE_WITH_GNOME
--#include <libgnome/gnome-help.h>
--#elif defined(G_OS_WIN32)
-+#ifdef G_OS_WIN32
- #include <windows.h>
- #include <htmlhelp.h>
-+#elif defined(GOFFICE_WITH_GNOME)
-+#include <libgnome/gnome-help.h>
- #endif
- static void
- go_help_display (CBHelpPaths const *paths)
-@@ -837,7 +837,7 @@
- gchar *path = g_build_filename (paths->data_dir, "doc", "C", chmfile, NULL);
-
- g_free (chmfile);
-- if (!HtmlHelp (GetDesktopWindow (), path, HH_HELP_CONTEXT, id))
-+ if (!HtmlHelpW (GetDesktopWindow (), path, HH_HELP_CONTEXT, id))
- go_gtk_notice_dialog (NULL, GTK_MESSAGE_ERROR, "Failed to spawn HtmlHelp");
- g_free (path);
- }
diff --git a/gwenhywfar-3.11.0-patch.diff b/gwenhywfar-3.11.0-patch.diff
deleted file mode 100644
index 1fe902e..0000000
--- a/gwenhywfar-3.11.0-patch.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-From a31de9bb25ddb34cc5d53736d11b58e67a0e65f8 Mon Sep 17 00:00:00 2001
-From: christian <christian at 70169cfe-8b10-0410-8925-dcb4b91034d8>
-Date: Tue, 22 Sep 2009 18:31:55 +0000
-Subject: [PATCH] Win32: Add configure check for RC executable.
-
-git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@1597 70169cfe-8b10-0410-8925-dcb4b91034d8
----
- configure.ac | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 38fb73f..7b00908 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -187,6 +187,9 @@ AC_PROG_INSTALL
-
- AC_LIBTOOL_WIN32_DLL
- AC_LIBTOOL_RC
-+# Newer libtool doesn't have AC_LIBTOOL_RC anymore. Need to check for
-+# $(RC) by ourselves.
-+AC_CHECK_TOOL([RC], [windres], [no])
- AC_PROG_LIBTOOL
- AC_PROG_AWK
- AC_CHECK_PROG(USE_DOT,dot,YES,NO)
---
-1.6.1.rc3.51.g5832d
-
diff --git a/gwenhywfar-3.11.1-patch.diff b/gwenhywfar-3.11.1-patch.diff
deleted file mode 100644
index 0051bc5..0000000
--- a/gwenhywfar-3.11.1-patch.diff
+++ /dev/null
@@ -1,132 +0,0 @@
-From 1919a8e3c51e8c71f2c92a944cd07dc4e99a1265 Mon Sep 17 00:00:00 2001
-From: christian <christian at 70169cfe-8b10-0410-8925-dcb4b91034d8>
-Date: Thu, 24 Sep 2009 20:04:08 +0000
-Subject: [PATCH] Fix GWEN_Url_fromString for windows paths which include a drive letter.
-
-Also, gracefully return NULL instead of abort on unknown port number.
-Also, improve error message output. Also, confirm this to work
-without breaking anything by adding several more unittests for
-this function.
-
-git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@1601 70169cfe-8b10-0410-8925-dcb4b91034d8
----
- checks/check_urlfns.c | 105 +++++++++++++++++++++++++++++++++++++++++++++---
- src/parser/urlfns.c | 33 ++++++++++++---
- 2 files changed, 124 insertions(+), 14 deletions(-)
-
-diff --git a/src/parser/urlfns.c b/src/parser/urlfns.c
-index 363cdff..9a5e1d1 100644
---- a/src/parser/urlfns.c
-+++ b/src/parser/urlfns.c
-@@ -18,6 +18,7 @@
- #include "url_p.h"
- #include "urlfns.h"
- #include <gwenhywfar/debug.h>
-+#include <ctype.h> // for isalpha()
-
-
- GWEN_URL *GWEN_Url_fromString(const char *str) {
-@@ -25,6 +26,7 @@ GWEN_URL *GWEN_Url_fromString(const char *str) {
- GWEN_DB_NODE *dbVars;
- const char *s;
- const char *p;
-+ int starts_with_drive_letter = 0;
-
- url=GWEN_Url_new();
- dbVars=GWEN_DB_Group_new("vars");
-@@ -33,8 +35,17 @@ GWEN_URL *GWEN_Url_fromString(const char *str) {
- dbVars=0;
-
- s=str;
-+
-+ /* Check for a drive letter, which occurs on windows, but this will
-+ always be one single alpha character followed by a colon followed
-+ by a directory separator. */
-+ if (s && isalpha(s[0]) && s[1] == ':'
-+ && (s[2] == '/' || s[2] == '\\')) {
-+ starts_with_drive_letter = 1;
-+ }
-+
- /* read protocol (if any) */
-- p=strchr(s, ':');
-+ p = starts_with_drive_letter ? s : strchr(s, ':');
- if (p) {
- if (p[1]=='/' && p[2]=='/') {
- char *buf;
-@@ -51,7 +62,7 @@ GWEN_URL *GWEN_Url_fromString(const char *str) {
- }
-
- if (!*s) {
-- DBG_ERROR(GWEN_LOGDOMAIN, "No server given");
-+ DBG_ERROR(GWEN_LOGDOMAIN, "No server or path given in url \"%s\"", str);
- GWEN_Url_free(url);
- return 0;
- }
-@@ -83,14 +94,21 @@ GWEN_URL *GWEN_Url_fromString(const char *str) {
- s=p+1;
- }
-
-+ /* Do we now have a drive letter? (After the protocol?) */
-+ if (!starts_with_drive_letter
-+ && s && isalpha(s[0]) && s[1] == ':'
-+ && (s[2] == '/' || s[2] == '\\')) {
-+ starts_with_drive_letter = 1;
-+ }
-+
- /* read server */
- if (!*s) {
-- DBG_ERROR(GWEN_LOGDOMAIN, "No server given");
-+ DBG_ERROR(GWEN_LOGDOMAIN, "No server given in url \"%s\"", str);
- GWEN_Url_free(url);
- return 0;
- }
- p=s;
-- while(*p && *p!=':' && *p!='/' && *p!='?')
-+ while(!starts_with_drive_letter && *p && *p!=':' && *p!='/' && *p!='?')
- p++;
- if (p!=s) {
- char *buf;
-@@ -120,9 +138,10 @@ GWEN_URL *GWEN_Url_fromString(const char *str) {
- memmove(buf, s, p-s+1);
- buf[p-s]=0;
- if (sscanf(buf, "%d", &port)!=1) {
-- DBG_ERROR(GWEN_LOGDOMAIN, "Bad port (%s)", buf);
-+ DBG_ERROR(GWEN_LOGDOMAIN, "Bad port (%s) in url \"%s\"", buf, str);
- free(buf);
-- abort();
-+ GWEN_Url_free(url);
-+ return 0;
- }
- url->port=port;
- free(buf);
-@@ -139,7 +158,7 @@ GWEN_URL *GWEN_Url_fromString(const char *str) {
- }
-
- /* get path */
-- if (*s=='/') {
-+ if (starts_with_drive_letter || *s=='/') {
- p=s;
- while(*p && *p!='?')
- p++;
-diff --git a/plugins/configmgr/dir/cfgdir.c b/plugins/configmgr/dir/cfgdir.c
-index 7b89933..e44ac9a 100644
---- a/plugins/configmgr/dir/cfgdir.c
-+++ b/plugins/configmgr/dir/cfgdir.c
-@@ -102,8 +102,13 @@ GWEN_CONFIGMGR *GWEN_ConfigMgrDir_new(const char *url) {
- GWEN_Buffer_AppendString(nbuf, s);
- s=GWEN_Url_GetPath(gurl);
- if (s) {
-- if (*s!='/' && *s!='\\')
-+ /* Does this begin with a slash? If not, we add one, but only if
-+ this isn't a drive letter (for windows!) */
-+ if (*s!='/' && *s!='\\'
-+ && !(isalpha(s[0]) && s[1] == ':'
-+ && (s[2] == '/' || s[2] == '\\'))) {
- GWEN_Buffer_AppendString(nbuf, GWEN_DIR_SEPARATOR_S);
-+ }
- GWEN_Buffer_AppendString(nbuf, s);
- }
- xcfg->folder=strdup(GWEN_Buffer_GetStart(nbuf));
---
-1.6.1.rc3.51.g5832d
-
diff --git a/gwenhywfar-3.6.0-patch.diff b/gwenhywfar-3.6.0-patch.diff
deleted file mode 100644
index b346d45..0000000
--- a/gwenhywfar-3.6.0-patch.diff
+++ /dev/null
@@ -1,76 +0,0 @@
---- gwenhywfar-3.6.0-old/src/cryptmsg/cryptmgrkeys.c Sun Dec 7 16:56:04 2008
-+++ gwenhywfar-3.6.0/src/cryptmsg/cryptmgrkeys.c Tue Jan 13 01:05:44 2009
-@@ -74,6 +74,7 @@
-
-
-
-+GWENHYWFAR_CB
- void GWEN_CryptMgrKeys_FreeData(void *bp, void *p) {
- GWEN_CRYPTMGR_KEYS *xcm;
-
-@@ -104,6 +105,7 @@
-
-
-
-+GWENHYWFAR_CB
- int GWEN_CryptMgrKeys_SignData(GWEN_CRYPTMGR *cm,
- const uint8_t *pData, uint32_t lData,
- GWEN_BUFFER *dbuf) {
-@@ -176,6 +178,7 @@
-
-
-
-+GWENHYWFAR_CB
- int GWEN_CryptMgrKeys_VerifyData(GWEN_CRYPTMGR *cm,
- const uint8_t *pData, uint32_t lData,
- const uint8_t *pSignature, uint32_t lSignature) {
-@@ -271,6 +274,7 @@
-
-
-
-+GWENHYWFAR_CB
- int GWEN_CryptMgrKeys_EncryptKey(GWEN_CRYPTMGR *cm,
- const uint8_t *pData, uint32_t lData,
- GWEN_BUFFER *dbuf) {
-@@ -322,6 +326,7 @@
-
-
-
-+GWENHYWFAR_CB
- int GWEN_CryptMgrKeys_DecryptKey(GWEN_CRYPTMGR *cm,
- const uint8_t *pData, uint32_t lData,
- GWEN_BUFFER *dbuf) {
---- gwenhywfar-3.6.0-old/src/cryptmsg/cryptmgr_be.h Tue Dec 2 17:06:50 2008
-+++ gwenhywfar-3.6.0/src/cryptmsg/cryptmgr_be.h Tue Jan 13 01:17:30 2009
-@@ -22,19 +22,19 @@
- GWEN_INHERIT_FUNCTION_LIB_DEFS(GWEN_CRYPTMGR, GWENHYWFAR_API)
-
-
--typedef int (*GWEN_CRYPTMGR_SIGNDATA_FN)(GWEN_CRYPTMGR *cm,
-- const uint8_t *pData, uint32_t lData,
-- GWEN_BUFFER *dbuf);
--typedef int (*GWEN_CRYPTMGR_ENCRYPTKEY_FN)(GWEN_CRYPTMGR *cm,
-- const uint8_t *pData, uint32_t lData,
-- GWEN_BUFFER *dbuf);
-+typedef GWENHYWFAR_CB int (*GWEN_CRYPTMGR_SIGNDATA_FN)(GWEN_CRYPTMGR *cm,
-+ const uint8_t *pData, uint32_t lData,
-+ GWEN_BUFFER *dbuf);
-+typedef GWENHYWFAR_CB int (*GWEN_CRYPTMGR_ENCRYPTKEY_FN)(GWEN_CRYPTMGR *cm,
-+ const uint8_t *pData, uint32_t lData,
-+ GWEN_BUFFER *dbuf);
-
--typedef int (*GWEN_CRYPTMGR_VERIFYDATA_FN)(GWEN_CRYPTMGR *cm,
-- const uint8_t *pData, uint32_t lData,
-- const uint8_t *pSignature, uint32_t lSignature);
--typedef int (*GWEN_CRYPTMGR_DECRYPTKEY_FN)(GWEN_CRYPTMGR *cm,
-- const uint8_t *pData, uint32_t lData,
-- GWEN_BUFFER *dbuf);
-+typedef GWENHYWFAR_CB int (*GWEN_CRYPTMGR_VERIFYDATA_FN)(GWEN_CRYPTMGR *cm,
-+ const uint8_t *pData, uint32_t lData,
-+ const uint8_t *pSignature, uint32_t lSignature);
-+typedef GWENHYWFAR_CB int (*GWEN_CRYPTMGR_DECRYPTKEY_FN)(GWEN_CRYPTMGR *cm,
-+ const uint8_t *pData, uint32_t lData,
-+ GWEN_BUFFER *dbuf);
-
-
-
diff --git a/libofx-0.8.3-patch.diff b/libofx-0.8.3-patch.diff
deleted file mode 100644
index e0e9ffb..0000000
--- a/libofx-0.8.3-patch.diff
+++ /dev/null
@@ -1,225 +0,0 @@
-diff -ur libofx-0.8.3/lib/ofx_preproc.cpp win32-libofx-0.8.3/lib/ofx_preproc.cpp
---- libofx-0.8.3/lib/ofx_preproc.cpp Tue Jan 9 02:38:33 2007
-+++ win32-libofx-0.8.3/lib/ofx_preproc.cpp Thu Feb 8 13:53:59 2007
-@@ -20,8 +20,14 @@
- #include <iostream>
- #include <fstream>
- #include <stdlib.h>
-+#include <io.h> // for mktemp() on win32/mingw
- #include <stdio.h>
- #include <string>
-+#ifdef OS_WIN32
-+#include <windows.h> // for GetModuleFileName()
-+#undef ERROR
-+#undef DELETE
-+#endif
- #include "ParserEventGeneratorKit.h"
- #include "libofx.h"
- #include "messages.hh"
-@@ -51,6 +57,57 @@
- "~/"};
- const unsigned int READ_BUFFER_SIZE = 1024;
-
-+#ifdef OS_WIN32
-+# define DIR_SEPARATOR_S "\\"
-+#else
-+# define DIR_SEPARATOR_S "/"
-+#endif
-+// The filenames can get quite long on windows.
-+#define TMPFILEBUFSIZE 120
-+
-+std::string get_tmp_dir()
-+{
-+ // Tries to mimic the behaviour of
-+ // http://developer.gnome.org/doc/API/2.0/glib/glib-Miscellaneous-Utility-Functions.html#g-get-tmp-dir
-+#ifdef OS_WIN32
-+ char *var;
-+ var = getenv("TMPDIR");
-+ if (var) return var;
-+ var = getenv("TMP");
-+ if (var) return var;
-+ var = getenv("TEMP");
-+ if (var) return var;
-+ return "C:\\";
-+#else
-+ return "/tmp";
-+#endif
-+}
-+
-+#ifdef OS_WIN32
-+std::string get_dtd_installation_directory()
-+{
-+ // Partial implementation of
-+ // http://developer.gnome.org/doc/API/2.0/glib/glib-Windows-Compatibility-Functions.html#g-win32-get-package-installation-directory
-+ char ch_fn[MAX_PATH], *p;
-+ std::string str_fn;
-+
-+ if (!GetModuleFileName(NULL, ch_fn, MAX_PATH)) return "";
-+
-+ if ((p = strrchr(ch_fn, '\\')) != NULL)
-+ *p = '\0';
-+
-+ p = strrchr(ch_fn, '\\');
-+ if (p && (_stricmp(p+1, "bin") == 0 ||
-+ _stricmp(p+1, "lib") == 0))
-+ *p = '\0';
-+
-+ str_fn = ch_fn;
-+ str_fn += "\\share\\libofx\\dtd\\";
-+
-+ return str_fn;
-+}
-+#endif
-+
- /** @brief File pre-processing of OFX AND for OFC files
- *
- * Takes care of comment striping, dtd locating, etc.
-@@ -66,7 +123,7 @@
- char buffer[READ_BUFFER_SIZE];
- string s_buffer;
- char *filenames[3];
-- char tmp_filename[50];
-+ char tmp_filename[TMPFILEBUFSIZE];
-
- libofx_context=(LibofxContext*)ctx;
-
-@@ -75,8 +132,10 @@
- message_out(DEBUG, string("ofx_proc_file():Opening file: ")+ p_filename);
-
- input_file.open(p_filename);
-- strncpy(tmp_filename,"/tmp/libofxtmpXXXXXX",50);
-- mkstemp(tmp_filename);
-+ std::string tmpdir = get_tmp_dir();
-+ std::string tmpfiletemplate = tmpdir + DIR_SEPARATOR_S "libofxtmpXXXXXX";
-+ strncpy(tmp_filename,tmpfiletemplate.c_str(),TMPFILEBUFSIZE);
-+ mktemp(tmp_filename);
- tmp_file.open(tmp_filename);
-
- message_out(DEBUG,"ofx_proc_file(): Creating temp file: "+string(tmp_filename));
-@@ -203,7 +262,7 @@
- ofstream tmp_file;
- string s_buffer;
- char *filenames[3];
-- char tmp_filename[50];
-+ char tmp_filename[TMPFILEBUFSIZE];
- int pos;
- LibofxContext *libofx_context;
-
-@@ -216,8 +275,10 @@
- }
- s_buffer=string(s, size);
-
-- strncpy(tmp_filename,"/tmp/libofxtmpXXXXXX",50);
-- mkstemp(tmp_filename);
-+ std::string tmpdir = get_tmp_dir();
-+ std::string tmpfiletemplate = tmpdir + DIR_SEPARATOR_S "libofxtmpXXXXXX";
-+ strncpy(tmp_filename,tmpfiletemplate.c_str(),TMPFILEBUFSIZE);
-+ mktemp(tmp_filename);
- tmp_file.open(tmp_filename);
-
- message_out(DEBUG,"ofx_proc_file(): Creating temp file: "+string(tmp_filename));
-@@ -439,8 +500,16 @@
- string dtd_path_filename;
- bool dtd_found=false;
-
-- for(i=0;i<DTD_SEARCH_PATH_NUM&&dtd_found==false;i++){
-- dtd_path_filename=DTD_SEARCH_PATH[i];
-+ for(i=-1;i<DTD_SEARCH_PATH_NUM&&dtd_found==false;i++){
-+ if (i==-1) {
-+#ifdef OS_WIN32
-+ dtd_path_filename=get_dtd_installation_directory();
-+#else
-+ continue;
-+#endif
-+ } else {
-+ dtd_path_filename=DTD_SEARCH_PATH[i];
-+ }
- dtd_path_filename.append(dtd_filename);
- dtd_file.clear();
- dtd_file.open(dtd_path_filename.c_str());
---- libofx-0.8.3/lib/ofx_utilities.cpp-org 2010-05-22 12:57:31 +0000
-+++ libofx-0.8.3/lib/ofx_utilities.cpp 2010-05-22 13:31:13 +0000
-@@ -19,7 +19,8 @@
- #include <iostream>
- #include "ParserEventGeneratorKit.h"
- #include "SGMLApplication.h"
--#include <time.h>
-+#include <ctime>
-+#include <cstdlib>
- #include <string>
- #include <locale.h>
- #include "messages.hh"
---- libofx-0.8.3/lib/ofx_container_transaction.cpp-org 2010-05-22 14:08:02 +0000
-+++ libofx-0.8.3/lib/ofx_container_transaction.cpp 2010-05-22 14:07:09 +0000
-@@ -21,6 +21,7 @@
- #include <config.h>
- #endif
-
-+#include <cstdlib>
- #include <string>
- #include "messages.hh"
- #include "libofx.h"
---- libofx-0.8.3/lib/ofx_request_accountinfo.cpp-org 2010-05-22 14:17:26 +0000
-+++ libofx-0.8.3/lib/ofx_request_accountinfo.cpp 2010-05-22 14:17:55 +0000
-@@ -21,6 +21,7 @@
- #include <config.h>
- #endif
-
-+#include <cstdlib>
- #include <string>
- #include "libofx.h"
- #include "ofx_request_accountinfo.hh"
---- libofx-0.8.3/lib/ofx_request.cpp-org 2010-05-22 14:19:52 +0000
-+++ libofx-0.8.3/lib/ofx_request.cpp 2010-05-22 14:20:12 +0000
-@@ -21,6 +21,7 @@
- #include <config.h>
- #endif
-
-+#include <cstring>
- #include <string>
- #include "messages.hh"
- #include "libofx.h"
---- libofx-0.8.3/lib/ofx_request_statement.cpp-org 2010-05-22 14:21:19 +0000
-+++ libofx-0.8.3/lib/ofx_request_statement.cpp 2010-05-22 14:21:34 +0000
-@@ -21,6 +21,7 @@
- #include <config.h>
- #endif
-
-+#include <cstdlib>
- #include <string>
- #include "libofx.h"
- #include "ofx_utilities.hh"
---- libofx-0.8.3/ofxdump/ofxdump.cpp-org 2010-05-22 14:54:40 +0000
-+++ libofx-0.8.3/ofxdump/ofxdump.cpp 2010-05-22 14:55:20 +0000
-@@ -29,6 +29,8 @@
- ***************************************************************************/
- #include <iostream>
- #include <iomanip>
-+#include <cstdlib>
-+#include <cstring>
- #include <string>
- #include "libofx.h"
- #include <stdio.h> /* for printf() */
---- libofx-0.8.3/ofxconnect/ofxconnect.cpp-org 2010-05-22 14:57:35 +0000
-+++ libofx-0.8.3/ofxconnect/ofxconnect.cpp 2010-05-22 14:58:24 +0000
-@@ -30,6 +30,7 @@
- ***************************************************************************/
- #include <iostream>
- #include <fstream>
-+#include <cstring>
- #include <string>
- #include "libofx.h"
- #include <config.h> /* Include config constants, e.g., VERSION TF */
---- libofx-0.8.3/ofxconnect/ofxpartner.cpp-org 2010-05-22 14:59:39 +0000
-+++ libofx-0.8.3/ofxconnect/ofxpartner.cpp 2010-05-22 15:00:46 +0000
-@@ -33,8 +33,10 @@
- #include <sys/stat.h>
-
- #include <iostream>
-+#include <cstring>
- #include <string>
- #include <vector>
-+#include <algorithm>
-
- using std::string;
- using std::vector;
diff --git a/libofx-0.9.2-patch.diff b/libofx-0.9.2-patch.diff
deleted file mode 100644
index 1e51ead..0000000
--- a/libofx-0.9.2-patch.diff
+++ /dev/null
@@ -1,184 +0,0 @@
-Index: ChangeLog
-===================================================================
-RCS file: /cvsroot/libofx/libofx/ChangeLog,v
-retrieving revision 1.96
-diff -u -r1.96 ChangeLog
---- ChangeLog 15 May 2009 14:11:41 -0000 1.96
-+++ ChangeLog 22 Sep 2009 20:28:40 -0000
-@@ -1,3 +1,8 @@
-+2009-09-22 Christian Stimming <stimming at tuhh.de>
-+
-+ * lib/ofx_preproc.cpp: Win32: Add gnucash patch that looks up the
-+ dtd installation directory from the current executable's location.
-+
- 2009-05-09 Benoit Grégoire <benoitg at coeus.ca>
- * Various C++ include fixes for building with recent compilers. Patch by Bill Nottingham <notting at redhat.com>
-
-Index: lib/ofx_preproc.cpp
-===================================================================
-RCS file: /cvsroot/libofx/libofx/lib/ofx_preproc.cpp,v
-retrieving revision 1.24
-diff -u -r1.24 ofx_preproc.cpp
---- lib/ofx_preproc.cpp 6 Dec 2008 22:28:39 -0000 1.24
-+++ lib/ofx_preproc.cpp 22 Sep 2009 20:28:41 -0000
-@@ -36,6 +36,9 @@
-
- #ifdef OS_WIN32
- # include "win32.hh"
-+# include <windows.h> // for GetModuleFileName()
-+# undef ERROR
-+# undef DELETE
- #endif
-
- #define LIBOFX_DEFAULT_INPUT_ENCODING "CP1252"
-@@ -505,6 +508,31 @@
- }
-
-
-+#ifdef OS_WIN32
-+static std::string get_dtd_installation_directory()
-+{
-+ // Partial implementation of
-+ // http://developer.gnome.org/doc/API/2.0/glib/glib-Windows-Compatibility-Functions.html#g-win32-get-package-installation-directory
-+ char ch_fn[MAX_PATH], *p;
-+ std::string str_fn;
-+
-+ if (!GetModuleFileName(NULL, ch_fn, MAX_PATH)) return "";
-+
-+ if ((p = strrchr(ch_fn, '\\')) != NULL)
-+ *p = '\0';
-+
-+ p = strrchr(ch_fn, '\\');
-+ if (p && (_stricmp(p+1, "bin") == 0 ||
-+ _stricmp(p+1, "lib") == 0))
-+ *p = '\0';
-+
-+ str_fn = ch_fn;
-+ str_fn += "\\share\\libofx\\dtd\\";
-+
-+ return str_fn;
-+}
-+#endif
-+
-
- /**
- This function will try to find a DTD matching the requested_version and return the full path of the DTD found (or an empty string if unsuccessfull)
-@@ -513,45 +541,45 @@
- */
- string find_dtd(LibofxContextPtr ctx, string dtd_filename)
- {
-- int i;
-- ifstream dtd_file;
- string dtd_path_filename;
-- bool dtd_found=false;
-
-- dtd_path_filename=((LibofxContext*)ctx)->dtdDir();
-+ dtd_path_filename = reinterpret_cast<const LibofxContext*>(ctx)->dtdDir();
- if (!dtd_path_filename.empty()) {
- dtd_path_filename.append(dtd_filename);
-- dtd_file.clear();
-- dtd_file.open(dtd_path_filename.c_str());
-+ ifstream dtd_file(dtd_path_filename.c_str());
- if(dtd_file){
- message_out(STATUS,"find_dtd():DTD found: "+dtd_path_filename);
-- dtd_file.close();
-- dtd_found=true;
-+ return dtd_path_filename;
- }
- }
-
-- if (!dtd_found) {
-- for(i=0;i<DTD_SEARCH_PATH_NUM&&dtd_found==false;i++){
-+#ifdef OS_WIN32
-+ dtd_path_filename = get_dtd_installation_directory();
-+ if (!dtd_path_filename.empty()) {
-+ dtd_path_filename.append(dtd_filename);
-+ ifstream dtd_file(dtd_path_filename.c_str());
-+ if(dtd_file){
-+ message_out(STATUS,"find_dtd():DTD found: "+dtd_path_filename);
-+ return dtd_path_filename;
-+ }
-+ }
-+#endif
-+
-+ for(int i=0;i<DTD_SEARCH_PATH_NUM;i++){
- dtd_path_filename=DTD_SEARCH_PATH[i];
- dtd_path_filename.append(dtd_filename);
-- dtd_file.clear();
-- dtd_file.open(dtd_path_filename.c_str());
-+ ifstream dtd_file(dtd_path_filename.c_str());
- if(!dtd_file){
- message_out(DEBUG,"find_dtd():Unable to open the file "+dtd_path_filename);
- }
- else{
- message_out(STATUS,"find_dtd():DTD found: "+dtd_path_filename);
-- dtd_file.close();
-- dtd_found=true;
-+ return dtd_path_filename;
- }
-- }
- }
-
-- if(dtd_found==false){
-- message_out(ERROR,"find_dtd():Unable to find the DTD named " + dtd_filename);
-- dtd_path_filename="";
-- }
-- return dtd_path_filename;
-+ message_out(ERROR,"find_dtd():Unable to find the DTD named " + dtd_filename);
-+ return "";
- }
-
-
-Index: lib/ofx_utilities.cpp
-===================================================================
-RCS file: /cvsroot/libofx/libofx/lib/ofx_utilities.cpp,v
-retrieving revision 1.12
-diff -u -r1.12 ofx_utilities.cpp
---- lib/ofx_utilities.cpp 15 May 2009 14:11:41 -0000 1.12
-+++ lib/ofx_utilities.cpp 22 Sep 2009 20:28:41 -0000
-@@ -217,25 +217,29 @@
- }
-
-
--int mkTempFileName(const char *tmpl, char *buffer, unsigned int size) {
-- const char *tmp_dir;
-+std::string get_tmp_dir()
-+{
-+ // Tries to mimic the behaviour of
-+ // http://developer.gnome.org/doc/API/2.0/glib/glib-Miscellaneous-Utility-Functions.html#g-get-tmp-dir
-+ char *var;
-+ var = getenv("TMPDIR");
-+ if (var) return var;
-+ var = getenv("TMP");
-+ if (var) return var;
-+ var = getenv("TEMP");
-+ if (var) return var;
-+#ifdef OS_WIN32
-+ return "C:\\";
-+#else
-+ return "/tmp";
-+#endif
-+}
-
-- tmp_dir = getenv ("TMPDIR");
-- if (!tmp_dir)
-- tmp_dir = getenv ("TMP");
-- if (!tmp_dir)
-- tmp_dir = getenv ("TEMP");
-+int mkTempFileName(const char *tmpl, char *buffer, unsigned int size) {
-
-- if (!tmp_dir)
-- {
--#ifdef OS_WIN32
-- tmp_dir = "C:\\";
--#else
-- tmp_dir = "/tmp";
--#endif /* !OS_WIN32 */
-- }
-+ std::string tmp_dir = get_tmp_dir();
-
-- strncpy(buffer, tmp_dir, size);
-+ strncpy(buffer, tmp_dir.c_str(), size);
- assert((strlen(buffer)+strlen(tmpl)+2)<size);
- strcat(buffer, DIRSEP);
- strcat(buffer, tmpl);
commit d4ffc0d7532947b912c426e3e0922c45ab8d0ff6
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri Jan 18 16:02:09 2013 +0000
Win32 build system: Experimental bootstrap script
The goal of this script is to make is extremely easy to start gnucash
development on Windows. After downloading and running this script, the
user should be ready to start coding.
Note that this is not the case yet. The bootstrap script is only the
first step in that direction.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22707 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/bootstrap_win_dev.vbs b/bootstrap_win_dev.vbs
new file mode 100644
index 0000000..0b5f359
--- /dev/null
+++ b/bootstrap_win_dev.vbs
@@ -0,0 +1,390 @@
+' bootstap_win_dev.vbs
+'
+' The goal of this script is to simplify setting up a development
+' environment to develop for GnuCash on Windows.
+' It will set up an absolute minimal environment from where
+' the regular GnuCash Windows build system can take over.
+' This minimal environment consists of
+' - mingw-get: the mingw package installer tool
+' - msys-base: a basic MSYS shell environment
+' - git for windows, required for:-
+' - the GnuCash source code repository, cloned from the github GnuCash repository
+'
+' The bootstrap script can also be run on top of an existing set up
+' in which case the script will only do what is necessary to get
+' the above items in place. For example, if git is already installed
+' in the location pointed to by GIT_DIR below, it won't be installed
+' again.
+'
+' IN CASE OF UNEXPECTED CLOSING OF THE CONSOLE
+' Please open a console (cmd.exe) and run the script under cscript.exe as follows:
+' cscript.exe <path-to-this-script>
+' This will keep your console open, so you can read if there were errors
+
+' Script start
+' ------------
+' Ensure we have a visible console to display output
+CheckStartMode
+
+' Parameters
+' ----------
+' All of the above will be installed in the base directory specified below.
+' If this path doesn't suit you, please feel free to modify it before
+' running this bootstrap script.
+' Note: avoid paths with spaces or other special characters (like &).
+' these can confuse msys/mingw or some of the tools depending on them.
+GLOBAL_DIR = "c:\soft"
+MINGW_DIR = GLOBAL_DIR & "\mingw"
+TMP_DIR= GLOBAL_DIR & "\tmp"
+DOWNLOAD_DIR= GLOBAL_DIR & "\downloads"
+GIT_PKG = "Git-1.7.10-preview20120409.exe"
+strGitBaseUrl = "http://msysgit.googlecode.com/files/"
+GIT_URL = strGitBaseUrl & GIT_PKG
+GIT_DIR = GLOBAL_DIR & "\git-1.7.10"
+REPOS_URL = "git://github.com/Gnucash/gnucash.git"
+REPOS_DIR = GLOBAL_DIR & "\gnucash.git"
+
+' Global parameters for visual basic
+Set objFso = CreateObject("Scripting.FileSystemObject")
+Set stdout = objFso.GetStandardStream(1)
+Set stdin = objFso.GetStandardStream(0)
+Set objWsh = WScript.CreateObject ("WScript.Shell")
+Const ForReading = 1, ForWriting = 2, ForAppending = 8
+
+Welcome
+
+
+' Create base directories if necessary
+' ------------------------------------
+If Not objFso.FolderExists(GLOBAL_DIR) Then
+ stdout.Write "Creating " & GLOBAL_DIR & "... "
+ objFso.CreateFolder(GLOBAL_DIR)
+ stdout.WriteLine "Ok"
+End If
+If Not objFso.FolderExists(MINGW_DIR) Then
+ stdout.Write "Creating " & MINGW_DIR & "... "
+ objFso.CreateFolder(MINGW_DIR)
+ stdout.WriteLine "Ok"
+End If
+If Not objFso.FolderExists(TMP_DIR) Then
+ stdout.Write "Creating " & TMP_DIR & "... "
+ objFso.CreateFolder(TMP_DIR)
+ stdout.WriteLine "Ok"
+End If
+If Not objFso.FolderExists(DOWNLOAD_DIR) Then
+ stdout.Write "Creating " & DOWNLOAD_DIR & "... "
+ objFso.CreateFolder(DOWNLOAD_DIR)
+ stdout.WriteLine "Ok"
+End If
+
+
+' Install mingw-get
+' -----------------
+
+strMingwGet = MINGW_DIR & "\bin\mingw-get.exe"
+stdout.Write "Checking " & strMingwGet & "... "
+If objFso.FileExists(strMingwGet) Then
+ stdout.WriteLine "Found, no need to install"
+Else
+ stdout.WriteLine "Not found, will be installed"
+
+ strMingwGetZip = DOWNLOAD_DIR & "\mingw-get.zip"
+ If Not objFso.FileExists(strMingwGetZip) Then
+ stdout.Write "Downloading mingw-get.zip (slow!)... "
+ strMingwGetZipUrl = "https://github.com/gjanssens/gnucash-on-windows/raw/master/mingw-get.zip"
+ HTTPDownload strMingwGetZipUrl, strMingwGetZip
+ stdout.WriteLine "Success"
+ End If
+
+ ' Extract mingw-get.zip into our MINGW_DIR
+ ' using a detour via a temporary directory to deal with the
+ ' cludgy way to detect when extracting is finished.
+ ' I couldn't find a better way so far.
+ stdout.Write "Installing mingw-get... "
+ strMingwTmpDir = TMP_DIR & "\mingwtmp"
+ If objFso.FolderExists(strMingwTmpDir) Then
+ objFso.DeleteFolder strMingwTmpDir , True
+ End If
+ ExtractAll objFso.GetAbsolutePathName(".")& "\mingw-get.zip", strMingwTmpDir
+ objFso.CopyFolder strMingwTmpDir & "\*", MINGW_DIR, True
+ objFso.DeleteFolder strMingwTmpDir , True
+ stdout.WriteLine "Success"
+
+End If
+
+
+' Instal Basic Msys (we need msys-wget to install git)
+' ----------------------------------------------------
+' Note: we don't check if these are installed already.
+' mingw-get will do this for us automatically.
+stdout.Write "Installing msys and wget... "
+strMingwGet = MINGW_DIR & "\bin\mingw-get.exe"
+
+objWsh.Run strMingwGet & " install msys-base msys-wget", 1, True
+'Set objExec = objWsh.Exec (strMingwGet & " install msys-base msys-wget")
+
+strWget = MINGW_DIR & "\msys\1.0\bin\wget.exe"
+If Not objFso.FileExists(strWget) Then
+ stdout.WriteLine "Failed"
+ stdout.WriteBlankLines (1)
+ stdout.WriteLine "*** ERROR ***"
+ stdout.WriteLine "Msys/Wget installation failed."
+ stdout.WriteBlankLines (1)
+ stdout.WriteLine "Cannot continue until this has been resolved."
+ AbortScript
+End If
+stdout.WriteLine "Success"
+
+
+' Install Git
+' -----------
+strGit = GIT_DIR & "\bin\git.exe"
+stdout.Write "Checking " & strGit & "... "
+If objFso.FileExists(strGit) Then
+ stdout.WriteLine "Found, no need to install"
+Else
+ stdout.WriteLine "Not found, will be installed"
+
+ strGitPkg = DOWNLOAD_DIR & "\" & GIT_PKG
+ If Not objFso.FileExists(strGitPkg) Then
+ stdout.Write "Downloading git installer... "
+ objWsh.Run strWget & " -P" & DOWNLOAD_DIR & " " & GIT_URL, 1, true
+
+ If Not objFso.FileExists(strGitPkg) Then
+ stdout.WriteLine "Failed"
+ stdout.WriteBlankLines (1)
+ stdout.WriteLine "*** ERROR ***"
+ stdout.WriteLine "Download git installer failed."
+ stdout.WriteBlankLines (1)
+ stdout.WriteLine "Cannot continue until this has been resolved."
+ AbortScript
+ End If
+ stdout.WriteLine "Success"
+ End If
+
+ stdout.Write "Installing git... "
+ objWsh.Run strGitPkg & " /SP- /SILENT /DIR=" & GIT_DIR, 1, true
+
+ If Not objFso.FileExists(strGit) Then
+ stdout.WriteLine "Failed"
+ stdout.WriteBlankLines (1)
+ stdout.WriteLine "*** ERROR ***"
+ stdout.WriteLine "Git installation failed."
+ stdout.WriteBlankLines (1)
+ stdout.WriteLine "Cannot continue until this has been resolved."
+ AbortScript
+ End If
+ stdout.WriteLine "Sucess"
+End If
+
+
+' Set up git repository
+' ---------------------
+strInstall = REPOS_DIR & "\packaging\win32\install.sh"
+stdout.WriteLine "Checking if " & REPOS_DIR
+stdout.Write " is a GnuCash git repository... "
+If objFso.FolderExists(REPOS_DIR & "\.git") And objFso.FileExists(strInstall) Then
+ stdout.WriteLine "Most likely ok, won't clone"
+Else
+ stdout.WriteLine "Not found"
+ stdout.WriteLine "Set up GnuCash git repository... "
+ objWsh.Run strGit & " clone " & REPOS_URL & " " & REPOS_DIR, 1, true
+
+ If Not objFso.FileExists(strInstall) Then
+ stdout.WriteLine "Failed"
+ stdout.WriteBlankLines (1)
+ stdout.WriteLine "*** ERROR ***"
+ stdout.WriteLine "Failed to set up GnuCash git repository."
+ stdout.WriteBlankLines (1)
+ stdout.WriteLine "Cannot continue until this has been resolved."
+ AbortScript
+ End If
+ stdout.WriteLine "Ok"
+End If
+
+' Create custom.sh
+' ----------------
+strCustomSh = REPOS_DIR & "\packaging\win32\custom.sh"
+bExistingCustomSh = False
+If objFso.FileExists(strCustomSh) Then
+ stdout.WriteLine "Found existing custom.sh file"
+ bExistingCustomSh = True
+Else
+ ' Create a custom.sh file that matches the parameters set at the beginning of this script
+ ' This ensures install.sh will find the development environment we set up
+ ' Note: we're deliberately not storing versions of used components in the autogenerated custom.sh
+ ' This allows install.sh to update to newer versions if deemed useful
+ stdout.Write "Autogenerating custom.sh file... "
+ Set myRegExp = New RegExp
+ myRegExp.Global = True
+ myRegExp.Pattern = "\\"
+
+ strGlobalDir = myRegExp.Replace (GLOBAL_DIR, "\\")
+ strMingwDir = myRegExp.Replace (MINGW_DIR, "\\")
+ strMsysDir = myRegExp.Replace (MINGW_DIR & "\msys\1.0", "\\")
+ strTmpDir = myRegExp.Replace (TMP_DIR, "\\")
+ strDownloadDir = myRegExp.Replace (DOWNLOAD_DIR, "\\")
+ strGitDir = myRegExp.Replace (GIT_DIR, "\\")
+ strReposDir = myRegExp.Replace (REPOS_DIR, "\\")
+
+ Set objCustomSh = objFso.OpenTextFile( strCustomSh, ForWriting, True )
+ objCustomSh.WriteLine "# custom.sh, automatically created by bootstrap_win_dev.vbs"
+ objCustomSh.WriteLine "#"
+ objCustomSh.WriteLine "# The parameters set here match the parameters used by"
+ objCustomSh.WriteLine "# bootstrap_win_dev.vbs to set up the GnuCash development"
+ objCustomSh.WriteLine "# environment and should ensure the install.sh works out"
+ objCustomSh.WriteLine "# of the box."
+ objCustomSh.WriteLine "#"
+ objCustomSh.WriteLine "# You are free to modify these parameters to suit you,"
+ objCustomSh.WriteLine "# but keep in mind that if you ever want to run"
+ objCustomSh.WriteLine "# bootstrap_win_dev.vbs again you should make sure"
+ objCustomSh.WriteLine "# the parameters it uses match the ones you set here."
+ objCustomSh.WriteBlankLines 1
+ objCustomSh.WriteLine "GLOBAL_DIR=" & strGlobalDir
+ objCustomSh.WriteLine "MINGW_DIR=" & strMingwDir
+ objCustomSh.WriteLine "MSYS_DIR=" & strMsysDir
+ objCustomSh.WriteLine "TMP_DIR=" & strTmpDir
+ objCustomSh.WriteLine "DOWNLOAD_DIR=" & strDownloadDir
+ objCustomSh.WriteLine "GIT_DIR=" & strGitDir
+ objCustomSh.WriteLine "REPOS_TYPE=git" ' Bootstrap only works with a git repo
+ objCustomSh.WriteLine "REPOS_URL=" & REPOS_URL
+ objCustomSh.WriteLine "REPOS_DIR=" & strReposDir
+ objCustomSh.Close
+ stdout.WriteLine "Success"
+End If
+
+
+' End message
+' -----------
+stdout.WriteBlankLines 1
+stdout.WriteLine "Bootstrap completed successfully !"
+stdout.WriteBlankLines 1
+stdout.WriteLine "You can now continue as follows"
+stdout.WriteLine "- Open the msys shell"
+stdout.WriteLine "- cd " & REPOS_DIR & "\packaging\win32"
+stdout.WriteLine "- Properly configure a custom.sh"
+stdout.WriteLine " (if you changed any default path in the bootstrap script)"
+stdout.WriteLine "- Run install.sh"
+stdout.WriteBlankLines 1
+stdout.WriteLine "Happy hacking !"
+
+AbortScript
+
+
+' Functions used in the script
+' ----------------------------
+' Initial message to user
+Sub Welcome
+ stdout.WriteLine "Boostrap GnuCash Development on Windows"
+ stdout.WriteLine "---------------------------------------"
+ stdout.WriteLine "This script is intended for people that wish to develop GnuCash on Windows"
+ stdout.WriteLine "It will download and install the minimal set of tools"
+ stdout.WriteLine "to run a first build of the GnuCash sources."
+ stdout.WriteLine "It will install"
+ stdout.WriteLine "- mingw-get, an msys shell and wget in " & MINGW_DIR
+ stdout.WriteLine "- git in " & GIT_DIR
+ stdout.WriteLine "- a GnuCash git repository cloned from"
+ stdout.WriteLine " " & REPOS_URL
+ stdout.WriteLine " into " & REPOS_DIR
+ stdout.WriteBlankLines 1
+ stdout.WriteLine "Notes:"
+ stdout.WriteLine "* Components already found in the given locations"
+ stdout.WriteLine " won't be touched. Instead the available versions"
+ stdout.WriteLine " will be used in that case."
+ stdout.WriteLine "* If the proposed locations don't suit you, you can"
+ stdout.WriteLine " customize them before running this script."
+ stdout.WriteLine " All of them are located at the beginning of this file."
+ stdout.WriteBlankLines 1
+ stdout.Write "Continue with the set up (Y/N) ? "
+ chRead = stdin.ReadLine
+ If Not (UCase(Left(chRead,1)) = "Y") Then
+ stdout.WriteLine "Installation interrupted."
+ AbortScript
+ End If
+End Sub
+
+
+' Download a file over http
+Sub HTTPDownload( myURL, myPath )
+' This Sub downloads the FILE specified in myURL to the path specified in myPath.
+'
+' myURL must always end with a file name
+' myPath may be a directory or a file name; in either case the directory must exist
+'
+' Based on a script written by Rob van der Woude
+' http://www.robvanderwoude.com
+
+ ' Standard housekeeping
+ Dim i, objFile, objHTTP, strFile, strMsg
+
+ ' Check if the specified target file or folder exists,
+ ' and build the fully qualified path of the target file
+ If objFso.FolderExists( myPath ) Then
+ strFile = objFso.BuildPath( myPath, Mid( myURL, InStrRev( myURL, "/" ) + 1 ) )
+ ElseIf objFso.FolderExists( Left( myPath, InStrRev( myPath, "\" ) - 1 ) ) Then
+ strFile = myPath
+ Else
+ stdout.WriteLine "ERROR: Target folder not found."
+ AbortScript
+ End If
+
+ ' Create or open the target file
+ Set objFile = objFso.OpenTextFile( strFile, ForWriting, True )
+
+ ' Create an HTTP object
+ Set objHTTP = CreateObject( "MSXML2.ServerXMLHTTP" )
+
+ ' Download the specified URL
+ objHTTP.Open "GET", myURL, False
+ objHTTP.Send
+
+ ' Write the downloaded byte stream to the target file
+ For i = 1 To LenB( objHTTP.ResponseBody )
+ objFile.Write Chr( AscB( MidB( objHTTP.ResponseBody, i, 1 ) ) )
+ Next
+
+ ' Close the target file
+ objFile.Close( )
+End Sub
+
+
+' Extract a zip file strZipFile into strFolder
+Function ExtractAll(strZipFile, strFolder)
+ Set objShell = CreateObject("Shell.Application")
+ If Not objFso.FolderExists(strFolder) Then
+ objFso.CreateFolder(strFolder)
+ End If
+
+ intCount = objShell.NameSpace(strFolder).Items.Count
+ Set colItems = objShell.NameSpace(strZipFile).Items
+ objShell.NameSpace(strFolder).CopyHere colItems, 256
+ Do Until objShell.NameSpace(strFolder).Items.Count = intCount + colItems.Count
+ WScript.Sleep 200
+ Loop
+End Function
+
+
+' Make sure we run in a console (so output is visible)
+Sub CheckStartMode
+ ' Returns the running executable as upper case from the last \ symbol
+ strStartExe = UCase( Mid( wscript.fullname, instrRev(wscript.fullname, "\") + 1 ) )
+
+ If Not strStartExe = "CSCRIPT.EXE" Then
+ ' This wasn't launched with cscript.exe, so relaunch using cscript.exe explicitly!
+ ' wscript.scriptfullname is the full path to the actual script
+
+ set oSh = CreateObject("wscript.shell")
+ oSh.Run "cscript.exe """ & wscript.scriptfullname & """"
+ wscript.quit
+
+ End If
+End Sub
+
+
+' Abort the script
+Sub AbortScript
+ stdout.WriteBlankLines 1
+ stdout.Write "Pres enter to continue... "
+ chRead = stdin.Read (1)
+ WScript.Quit
+End Sub
\ No newline at end of file
commit f13487e2d4c122fd506f3caa5ee4b3607f8a14e1
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu Nov 1 10:35:34 2012 +0000
Change of mind. Use scm instead of vcs.
scm is the modern term. vcs is rather used to refer to archaic systems
such as cvs and older. I wish I remembered this before my previous
commit. Oh well...
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22476 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_package.sh b/build_package.sh
index 797f500..3ce5eac 100644
--- a/build_package.sh
+++ b/build_package.sh
@@ -65,12 +65,12 @@ rm -rf ${_DIST_UDIR}
_BUILD_UDIR=`unix_path $BUILD_DIR`
_GNUCASH_UDIR=`unix_path $GNUCASH_DIR`
PKG_VERSION=`grep PACKAGE_VERSION ${_BUILD_UDIR}/config.h | cut -d" " -f3 | cut -d\" -f2 `
-GNC_VCS_REV=`grep GNUCASH_VCS_REV ${_BUILD_UDIR}/src/core-utils/gnc-vcs-info.h | cut -d" " -f3 | cut -d\" -f2 `
+GNUCASH_SCM_REV=`grep GNUCASH_SCM_REV ${_BUILD_UDIR}/src/core-utils/gnc-scm-info.h | cut -d" " -f3 | cut -d\" -f2 `
# Choose the output filename based on our "build_from_tarball" setting
# Make sure this logic matches the logic in dist.sh!
if [ "$BUILD_FROM_TARBALL" = "no" ]; then
- SETUP_FILENAME="gnucash-${PKG_VERSION}-svn-r${GNC_VCS_REV}-setup.exe"
+ SETUP_FILENAME="gnucash-${PKG_VERSION}-svn-r${GNUCASH_SCM_REV}-setup.exe"
else
SETUP_FILENAME="gnucash-${PKG_VERSION}-setup.exe"
fi
diff --git a/build_package_git.sh b/build_package_git.sh
index cc06162..ea842f3 100644
--- a/build_package_git.sh
+++ b/build_package_git.sh
@@ -23,7 +23,7 @@ function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
. functions.sh
. defaults.sh
-tag="${1:-$GNC_VCS_REV}"
+tag="${1:-$GNUCASH_SCM_REV}"
# Determine where to upload to
# NOTE: this assumes "tag" to be either a tag or a branch, not a
@@ -69,7 +69,7 @@ rm -rf ${_DIST_UDIR}
_BUILD_UDIR=`unix_path $BUILD_DIR`
_GNUCASH_UDIR=`unix_path $GNUCASH_DIR`
PKG_VERSION=`grep PACKAGE_VERSION ${_BUILD_UDIR}/config.h | cut -d" " -f3 | cut -d\" -f2 `
-REVISION=`grep GNUCASH_VCS_REV ${_BUILD_UDIR}/src/core-utils/gnc-vcs-info.h | cut -d" " -f3 | cut -d\" -f2 `
+REVISION=`grep GNUCASH_SCM_REV ${_BUILD_UDIR}/src/core-utils/gnc-scm-info.h | cut -d" " -f3 | cut -d\" -f2 `
# Choose the output filename based on our "build_from_tarball" setting
# Make sure this logic matches the logic in dist.sh!
diff --git a/defaults.sh b/defaults.sh
index 1e4f5b3..ac7f8dd 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -42,11 +42,11 @@ else
set_default REPOS_TYPE "git"
if [ "$REPOS_TYPE" = "git" ]; then
- set_default GNC_VCS_REV "trunk"
+ set_default GNUCASH_SCM_REV "trunk"
set_default REPOS_URL "git://github.com/Gnucash/gnucash.git"
elif [ "$REPOS_TYPE" = "svn" ]; then
# latest revision that should compile, use HEAD or vwxyz
- set_default GNC_VCS_REV "HEAD"
+ set_default GNUCASH_SCM_REV "HEAD"
set_default REPOS_URL "http://svn.gnucash.org/repo/gnucash/trunk"
fi
fi
@@ -409,11 +409,11 @@ set_default CMAKE_DIR $GLOBAL_DIR\\cmake
set_default DOCBOOK_XSL_URL "$SF_MIRROR/docbook/docbook-xsl-1.76.1.zip"
set_default DOCBOOK_DTD_URL "http://www.oasis-open.org/docbook/xml/4.1.2/docbkx412.zip"
if [ "$REPOS_TYPE" = "git" ]; then
- set_default DOCS_VCS_REV "trunk"
+ set_default DOCS_SCM_REV "trunk"
set_default DOCS_URL "git://github.com/Gnucash/gnucash-docs.git"
elif [ "$REPOS_TYPE" = "svn" ]; then
# latest revision that should compile, use HEAD or vwxyz
- set_default DOCS_VCS_REV "HEAD"
+ set_default DOCS_SCM_REV "HEAD"
set_default DOCS_URL "http://svn.gnucash.org/repo/gnucash-docs/trunk"
fi
set_default UPDATE_DOCS yes
diff --git a/dist-impl.sh b/dist-impl.sh
index a10e29c..44b387a 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -297,7 +297,7 @@ function dist_finish() {
if [ "$BUILD_FROM_TARBALL" = "no" ]; then
# And changing output filename
PKG_VERSION=`grep PACKAGE_VERSION ${_BUILD_UDIR}/config.h | cut -d" " -f3 | cut -d\" -f2 `
- REVISION=`grep GNUCASH_VCS_REV ${_BUILD_UDIR}/src/core-utils/gnc-vcs-info.h | cut -d" " -f3 | cut -d\" -f2 `
+ REVISION=`grep GNUCASH_SCM_REV ${_BUILD_UDIR}/src/core-utils/gnc-scm-info.h | cut -d" " -f3 | cut -d\" -f2 `
if [ "$REPOS_TYPE" = "svn" ]; then
SETUP_FILENAME="gnucash-${PKG_VERSION}-${REPOS_TYPE}-r${REVISION}-setup.exe"
else
diff --git a/install-impl.sh b/install-impl.sh
index 9fa4012..00afd71 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1582,10 +1582,10 @@ function checkupd_docs_svn() {
if [ "$UPDATE_DOCS" = "yes" ]; then
if [ -x .svn ]; then
setup "Docs - Update repository (svn)"
- svn up -r $DOCS_VCS_REV
+ svn up -r $DOCS_SCM_REV
else
setup "Docs - Checkout repository (svn)"
- svn co -r $DOCS_VCS_REV $DOCS_URL .
+ svn co -r $DOCS_SCM_REV $DOCS_URL .
fi
fi
}
@@ -1599,7 +1599,7 @@ function checkupd_docs_git() {
else
setup "Docs - Checkout repository (git)"
$GIT_CMD clone $DOCS_URL .
- $GIT_CMD checkout $DOCS_VCS_REV
+ $GIT_CMD checkout $DOCS_SCM_REV
fi
fi
}
commit c6d1608a21d00082c15f1874057e530392ee308d
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed Oct 31 21:38:49 2012 +0000
Minor changes to indicate svn is not the only/primary vcs used.
The code actually has provisions for svn, svk, git and bzr. Only svn and
git are actively used by the core developers though.
This involves changing
- filenames that contained svn while meant for multiple vcs's
- variable and macro names that are relevant for multiple vcs's
- the various locations where the vcs revision info is displayed
to the user, to mention the actual vcs used instead of standard "svn"
While at the last item, I also changed the text printed when gnucash is
called with the --version parameter, to reuse the translatable string
that is also used for the about dialog. This saves us one string to
translate.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22475 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_package.sh b/build_package.sh
index b25fd8d..797f500 100644
--- a/build_package.sh
+++ b/build_package.sh
@@ -65,12 +65,12 @@ rm -rf ${_DIST_UDIR}
_BUILD_UDIR=`unix_path $BUILD_DIR`
_GNUCASH_UDIR=`unix_path $GNUCASH_DIR`
PKG_VERSION=`grep PACKAGE_VERSION ${_BUILD_UDIR}/config.h | cut -d" " -f3 | cut -d\" -f2 `
-SVN_REV=`grep GNUCASH_SVN_REV ${_BUILD_UDIR}/src/core-utils/gnc-svninfo.h | cut -d" " -f3 | cut -d\" -f2 `
+GNC_VCS_REV=`grep GNUCASH_VCS_REV ${_BUILD_UDIR}/src/core-utils/gnc-vcs-info.h | cut -d" " -f3 | cut -d\" -f2 `
# Choose the output filename based on our "build_from_tarball" setting
# Make sure this logic matches the logic in dist.sh!
if [ "$BUILD_FROM_TARBALL" = "no" ]; then
- SETUP_FILENAME="gnucash-${PKG_VERSION}-svn-r${SVN_REV}-setup.exe"
+ SETUP_FILENAME="gnucash-${PKG_VERSION}-svn-r${GNC_VCS_REV}-setup.exe"
else
SETUP_FILENAME="gnucash-${PKG_VERSION}-setup.exe"
fi
diff --git a/build_package_git.sh b/build_package_git.sh
index 62254e3..cc06162 100644
--- a/build_package_git.sh
+++ b/build_package_git.sh
@@ -23,7 +23,7 @@ function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
. functions.sh
. defaults.sh
-tag="${1:-$GIT_REV}"
+tag="${1:-$GNC_VCS_REV}"
# Determine where to upload to
# NOTE: this assumes "tag" to be either a tag or a branch, not a
@@ -69,7 +69,7 @@ rm -rf ${_DIST_UDIR}
_BUILD_UDIR=`unix_path $BUILD_DIR`
_GNUCASH_UDIR=`unix_path $GNUCASH_DIR`
PKG_VERSION=`grep PACKAGE_VERSION ${_BUILD_UDIR}/config.h | cut -d" " -f3 | cut -d\" -f2 `
-REVISION=`grep GNUCASH_SVN_REV ${_BUILD_UDIR}/src/core-utils/gnc-svninfo.h | cut -d" " -f3 | cut -d\" -f2 `
+REVISION=`grep GNUCASH_VCS_REV ${_BUILD_UDIR}/src/core-utils/gnc-vcs-info.h | cut -d" " -f3 | cut -d\" -f2 `
# Choose the output filename based on our "build_from_tarball" setting
# Make sure this logic matches the logic in dist.sh!
diff --git a/defaults.sh b/defaults.sh
index 4ddfcbf..1e4f5b3 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -42,11 +42,11 @@ else
set_default REPOS_TYPE "git"
if [ "$REPOS_TYPE" = "git" ]; then
- set_default GIT_REV "trunk"
+ set_default GNC_VCS_REV "trunk"
set_default REPOS_URL "git://github.com/Gnucash/gnucash.git"
elif [ "$REPOS_TYPE" = "svn" ]; then
# latest revision that should compile, use HEAD or vwxyz
- set_default SVN_REV "HEAD"
+ set_default GNC_VCS_REV "HEAD"
set_default REPOS_URL "http://svn.gnucash.org/repo/gnucash/trunk"
fi
fi
@@ -409,11 +409,11 @@ set_default CMAKE_DIR $GLOBAL_DIR\\cmake
set_default DOCBOOK_XSL_URL "$SF_MIRROR/docbook/docbook-xsl-1.76.1.zip"
set_default DOCBOOK_DTD_URL "http://www.oasis-open.org/docbook/xml/4.1.2/docbkx412.zip"
if [ "$REPOS_TYPE" = "git" ]; then
- set_default DOCS_REV "trunk"
+ set_default DOCS_VCS_REV "trunk"
set_default DOCS_URL "git://github.com/Gnucash/gnucash-docs.git"
elif [ "$REPOS_TYPE" = "svn" ]; then
# latest revision that should compile, use HEAD or vwxyz
- set_default DOCS_REV "HEAD"
+ set_default DOCS_VCS_REV "HEAD"
set_default DOCS_URL "http://svn.gnucash.org/repo/gnucash-docs/trunk"
fi
set_default UPDATE_DOCS yes
diff --git a/dist-impl.sh b/dist-impl.sh
index 9a41003..a10e29c 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -297,7 +297,7 @@ function dist_finish() {
if [ "$BUILD_FROM_TARBALL" = "no" ]; then
# And changing output filename
PKG_VERSION=`grep PACKAGE_VERSION ${_BUILD_UDIR}/config.h | cut -d" " -f3 | cut -d\" -f2 `
- REVISION=`grep GNUCASH_SVN_REV ${_BUILD_UDIR}/src/core-utils/gnc-svninfo.h | cut -d" " -f3 | cut -d\" -f2 `
+ REVISION=`grep GNUCASH_VCS_REV ${_BUILD_UDIR}/src/core-utils/gnc-vcs-info.h | cut -d" " -f3 | cut -d\" -f2 `
if [ "$REPOS_TYPE" = "svn" ]; then
SETUP_FILENAME="gnucash-${PKG_VERSION}-${REPOS_TYPE}-r${REVISION}-setup.exe"
else
diff --git a/install-impl.sh b/install-impl.sh
index 1cb2bab..9fa4012 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1582,10 +1582,10 @@ function checkupd_docs_svn() {
if [ "$UPDATE_DOCS" = "yes" ]; then
if [ -x .svn ]; then
setup "Docs - Update repository (svn)"
- svn up -r $DOCS_REV
+ svn up -r $DOCS_VCS_REV
else
setup "Docs - Checkout repository (svn)"
- svn co -r $DOCS_REV $DOCS_URL .
+ svn co -r $DOCS_VCS_REV $DOCS_URL .
fi
fi
}
@@ -1599,7 +1599,7 @@ function checkupd_docs_git() {
else
setup "Docs - Checkout repository (git)"
$GIT_CMD clone $DOCS_URL .
- $GIT_CMD checkout $DOCS_REV
+ $GIT_CMD checkout $DOCS_VCS_REV
fi
fi
}
diff --git a/install.sh b/install.sh
index 024fe84..bacc5fb 100644
--- a/install.sh
+++ b/install.sh
@@ -83,7 +83,7 @@ add_step inst_gnome
add_step inst_guile
if [ "$CROSS_COMPILE" != "yes" ]; then
add_step inst_svn
-add_step inst_git
+ add_step inst_git
fi
add_step inst_gnutls
add_step inst_libxslt
diff --git a/reset.sh b/reset.sh
index a19ca91..b0b5ca1 100644
--- a/reset.sh
+++ b/reset.sh
@@ -26,6 +26,7 @@ function add_precious_path() {
add_precious_path msys $MSYS_DIR
add_precious_path wget $WGET_DIR
add_precious_path svn $SVN_DIR
+add_precious_path git $GIT_DIR
add_precious_path repos $REPOS_DIR
add_precious_path hh $HH_DIR
commit 1914f566e89a852778ada26e258969b5b57d0439
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed Oct 31 12:14:39 2012 +0000
Win32 build - build docs either from git (default) or svn
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22474 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_tags_git.sh b/build_tags_git.sh
index da1f876..53e2e1b 100644
--- a/build_tags_git.sh
+++ b/build_tags_git.sh
@@ -18,8 +18,6 @@ function qpushd() { pushd "$@" >/dev/null; }
function qpopd() { popd >/dev/null; }
function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
-TAG_URL=http://svn.gnucash.org/repo/gnucash/tags
-
################################################################
# Setup our environment (we need the DOWNLOAD_DIR)
diff --git a/defaults.sh b/defaults.sh
index 087d386..4ddfcbf 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -408,9 +408,15 @@ set_default CMAKE_DIR $GLOBAL_DIR\\cmake
set_default DOCBOOK_XSL_URL "$SF_MIRROR/docbook/docbook-xsl-1.76.1.zip"
set_default DOCBOOK_DTD_URL "http://www.oasis-open.org/docbook/xml/4.1.2/docbkx412.zip"
+if [ "$REPOS_TYPE" = "git" ]; then
+ set_default DOCS_REV "trunk"
+ set_default DOCS_URL "git://github.com/Gnucash/gnucash-docs.git"
+elif [ "$REPOS_TYPE" = "svn" ]; then
+ # latest revision that should compile, use HEAD or vwxyz
+ set_default DOCS_REV "HEAD"
+ set_default DOCS_URL "http://svn.gnucash.org/repo/gnucash-docs/trunk"
+fi
set_default UPDATE_DOCS yes
-set_default DOCS_REV "HEAD"
-set_default DOCS_URL "http://svn.gnucash.org/repo/gnucash-docs/trunk"
set_default DOCS_DIR $GLOBAL_DIR\\gnucash-docs
set_default XSLTPROCFLAGS ""
diff --git a/install-impl.sh b/install-impl.sh
index 9e07b28..1cb2bab 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1578,6 +1578,32 @@ EOF
fi
}
+function checkupd_docs_svn() {
+ if [ "$UPDATE_DOCS" = "yes" ]; then
+ if [ -x .svn ]; then
+ setup "Docs - Update repository (svn)"
+ svn up -r $DOCS_REV
+ else
+ setup "Docs - Checkout repository (svn)"
+ svn co -r $DOCS_REV $DOCS_URL .
+ fi
+ fi
+}
+
+function checkupd_docs_git() {
+
+ if [ "$UPDATE_DOCS" = "yes" ]; then
+ if [ -x .git ]; then
+ setup "Docs - Update repository (git)"
+ $GIT_CMD pull
+ else
+ setup "Docs - Checkout repository (git)"
+ $GIT_CMD clone $DOCS_URL .
+ $GIT_CMD checkout $DOCS_REV
+ fi
+ fi
+}
+
function make_chm() {
_CHM_TYPE=$1
_CHM_LANG=$2
@@ -1628,14 +1654,10 @@ function inst_docs() {
mkdir -p $_DOCS_UDIR/repos
qpushd $_DOCS_UDIR/repos
- if [ "$UPDATE_DOCS" = "yes" ]; then
- if [ -x .svn ]; then
- setup "SVN update of docs"
- svn up -r ${DOCS_REV}
- else
- setup "SVN checkout of docs"
- svn co -r ${DOCS_REV} $DOCS_URL .
- fi
+ if [ "$REPOS_TYPE" = "svn" ]; then
+ checkupd_docs_svn
+ else
+ checkupd_docs_git
fi
setup docs
_DOCS_INST_UDIR=`unix_path $INSTALL_DIR`/share/gnucash/help
commit c845b856d2d81c324c4819617b48cf6deff6d4c5
Author: Christian Stimming <stimming at tuhh.de>
Date: Sun Sep 30 19:05:48 2012 +0000
Upgrade aqbanking package versions.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22428 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 1c15a4d..087d386 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -366,13 +366,13 @@ else
fi
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
-KTOBLZCHECK_VERSION="1.37"
+KTOBLZCHECK_VERSION="1.40"
set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-${KTOBLZCHECK_VERSION}.tar.gz"
# ktoblzcheck is being installed into GWENHYWFAR_DIR
if [ "$AQBANKING5" = "yes" ]; then
- AQBANKING_VERSION="5.0.23"
- set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=93&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
+ AQBANKING_VERSION="5.0.25"
+ set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=95&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
set_default AQBANKING_WITH_QT no
else
AQBANKING_VERSION="4.2.4"
commit 32e3feda64bac39d3e4c46ee74bd1dcfc1d80121
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Sep 10 19:22:22 2012 +0000
Win32 build: more post-libgnome related build script changes
The previous commit broke the build. Hopefully this one fixes it again.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22381 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
index 67f00c5..9e07b28 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -503,7 +503,6 @@ function inst_gnome() {
add_to_env pkg-config PKG_CONFIG
fi
if quiet gconftool-2 --version &&
- quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 &&
quiet ${PKG_CONFIG} --atleast-version=${GCONF_VERSION} gconf-2.0 &&
quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-2.0 &&
quiet ${PKG_CONFIG} --atleast-version=${CAIRO_VERSION} cairo &&
@@ -642,7 +641,6 @@ EOF
qpopd
quiet gconftool-2 --version &&
- quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 &&
quiet ${PKG_CONFIG} --atleast-version=${GCONF_VERSION} gconf-2.0 &&
quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-2.0 &&
quiet ${PKG_CONFIG} --atleast-version=${CAIRO_VERSION} cairo &&
commit 5c439da09aef2aa65606e1fa1873d56d00dbfd43
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Sep 10 19:22:12 2012 +0000
Win32 build: remove libgnome related parts from the build scripts
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22380 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 7d8ee2a..1c15a4d 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -247,8 +247,6 @@ set_default GETTEXT_RUNTIME_DEV_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime-dev_0
set_default GETTEXT_TOOLS_URL "$GNOME_WIN32_DEPS_URL/gettext-tools-dev_0.18.1.1-2_win32.zip"
set_default GLIB_URL "$GNOME_WIN32_URL/glib/2.28/glib_2.28.8-1_win32.zip"
set_default GLIB_DEV_URL "$GNOME_WIN32_URL/glib/2.28/glib-dev_2.28.8-1_win32.zip"
-set_default GNOME_VFS_URL "$GNOME_WIN32_URL/gnome-vfs/2.24/gnome-vfs_2.24.1-1_win32.zip"
-set_default GNOME_VFS_DEV_URL "$GNOME_WIN32_URL/gnome-vfs/2.24/gnome-vfs-dev_2.24.1-1_win32.zip"
GTK_VERSION="2.24.10"
set_default GTK_URL "$GNOME_WIN32_URL/gtk+/2.24/gtk+_${GTK_VERSION}-1_win32.zip"
set_default GTK_DEV_URL "$GNOME_WIN32_URL/gtk+/2.24/gtk+-dev_${GTK_VERSION}-1_win32.zip"
@@ -258,14 +256,8 @@ set_default GTK_THEME_URL "$SF_MIRROR/gtk-win/gtk2-themes-2009-09-07-w
set_default INTLTOOL_URL "$GNOME_WIN32_URL/intltool/0.40/intltool_0.40.4-1_win32.zip"
set_default LIBART_LGPL_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart-lgpl_2.3.21-1_win32.zip"
set_default LIBART_LGPL_DEV_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart-lgpl-dev_2.3.21-1_win32.zip"
-set_default LIBBONOBO_URL "$GNOME_WIN32_URL/libbonobo/2.24/libbonobo_2.24.0-1_win32.zip"
-set_default LIBBONOBO_DEV_URL "$GNOME_WIN32_URL/libbonobo/2.24/libbonobo-dev_2.24.0-1_win32.zip"
-set_default LIBGNOME_URL "$GNOME_WIN32_URL/libgnome/2.24/libgnome_2.24.1-1_win32.zip"
-set_default LIBGNOME_DEV_URL "$GNOME_WIN32_URL/libgnome/2.24/libgnome-dev_2.24.1-1_win32.zip"
set_default LIBGNOMECANVAS_URL "$GNOME_WIN32_URL/libgnomecanvas/2.30/libgnomecanvas_2.30.1-1_win32.zip"
set_default LIBGNOMECANVAS_DEV_URL "$GNOME_WIN32_URL/libgnomecanvas/2.30/libgnomecanvas-dev_2.30.1-1_win32.zip"
-set_default LIBGNOMEUI_URL "$GNOME_WIN32_URL/libgnomeui/2.22/libgnomeui-2.22.1.zip"
-set_default LIBGNOMEUI_DEV_URL "$GNOME_WIN32_URL/libgnomeui/2.22/libgnomeui-dev-2.22.1.zip"
set_default LIBICONV_URL "$GNOME_WIN32_DEPS_URL/libiconv-1.9.1.bin.woe32.zip"
set_default LIBJPEG_URL "$SF_MIRROR/gnucash/jpeg_7-1-fixed-win32.zip"
set_default LIBJPEG_DEV_URL "$GNOME_WIN32_DEPS_URL/jpeg-dev_7-1_win32.zip"
@@ -281,8 +273,6 @@ set_default PANGO_URL "$GNOME_WIN32_URL/pango/1.29/pango_1.29.4-1_
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"
set_default PKG_CONFIG_DEV_URL "$GNOME_WIN32_DEPS_URL/pkg-config-dev_0.25-1_win32.zip"
-set_default POPT_URL "$GNOME_WIN32_DEPS_URL/popt-1.10.2-tml-20050828.zip"
-set_default POPT_DEV_URL "$GNOME_WIN32_DEPS_URL/popt-dev-1.10.2-tml-20050828.zip"
set_default ZLIB_URL "$GNOME_WIN32_DEPS_URL/zlib_1.2.5-2_win32.zip"
set_default ZLIB_DEV_URL "$GNOME_WIN32_DEPS_URL/zlib-dev_1.2.5-2_win32.zip"
set_default GNOME_DIR $GLOBAL_DIR\\gnome
@@ -290,12 +280,6 @@ set_default GNOME_DIR $GLOBAL_DIR\\gnome
PIXMAN_VERSION="0.22.0"
set_default PIXMAN_URL "http://www.cairographics.org/releases/pixman-${PIXMAN_VERSION}.tar.gz"
-set_default LIBBONOBOUI_URL "$GNOME_WIN32_URL/libbonoboui/2.24/libbonoboui_2.24.0-1_win32.zip"
-set_default LIBBONOBOUI_DEV_URL "$GNOME_WIN32_URL/libbonoboui/2.24/libbonoboui-dev_2.24.0-1_win32.zip"
-set_default LIBBONOBOUI_SRC_URL "$GNOME_MIRROR/sources/libbonoboui/2.24/libbonoboui-2.24.2.tar.bz2"
-set_default LIBBONOBOUI_PATCH `pwd`/libbonoboui-2.24.2.patch
-set_default LIBBONOBOUI_DIR $GLOBAL_DIR\\libbonoboui
-
set_default SWIG_URL "$SF_MIRROR/swig/swigwin-1.3.36.zip"
set_default SWIG_DIR $GLOBAL_DIR\\swig
diff --git a/dist-impl.sh b/dist-impl.sh
index 392ac6a..9a41003 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -25,7 +25,6 @@ Please set AQBANKING_WITH_QT to yes and rerun install.sh first."
_EXETYPE_UDIR=`unix_path $EXETYPE_DIR`
_GNOME_UDIR=`unix_path $GNOME_DIR`
_PCRE_UDIR=`unix_path $PCRE_DIR`
- _LIBBONOBOUI_UDIR=`unix_path $LIBBONOBOUI_DIR`
_LIBSOUP_UDIR=`unix_path $LIBSOUP_DIR`
_ENCHANT_UDIR=`unix_path $ENCHANT_DIR`
_LIBGSF_UDIR=`unix_path $LIBGSF_DIR`
@@ -92,14 +91,9 @@ function dist_gnome() {
wget_unpacked $GDK_PIXBUF_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GETTEXT_RUNTIME_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GLIB_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $GNOME_VFS_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GTK_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBART_LGPL_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $LIBBONOBO_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $LIBBONOBOUI_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $LIBGNOME_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBGNOMECANVAS_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $LIBGNOMEUI_URL $DOWNLOAD_DIR $DIST_DIR
smart_wget $LIBICONV_URL $DOWNLOAD_DIR
unzip -q $LAST_FILE bin/iconv.dll -d $DIST_DIR
wget_unpacked $LIBJPEG_URL $DOWNLOAD_DIR $DIST_DIR
@@ -108,7 +102,6 @@ function dist_gnome() {
#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 $POPT_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
@@ -181,12 +174,6 @@ function dist_ktoblzcheck() {
cp -a ${_GWENHYWFAR_UDIR}/share/ktoblzcheck ${DIST_UDIR}/share
}
-function dist_libbonoboui() {
- setup libbonoboui
- mkdir -p $DIST_UDIR/bin
- cp -a $_LIBBONOBOUI_UDIR/bin/libbonoboui*.dll $DIST_UDIR/bin
-}
-
function dist_libdbi() {
setup LibDBI
cp -a ${_SQLITE3_UDIR}/bin/* ${DIST_UDIR}/bin
diff --git a/dist.sh b/dist.sh
index 7253826..807b03b 100755
--- a/dist.sh
+++ b/dist.sh
@@ -31,7 +31,6 @@ add_step dist_guile
add_step dist_gnome
add_step dist_isocodes
add_step dist_pcre
-add_step dist_libbonoboui
add_step dist_libgsf
add_step dist_goffice
add_step dist_libofx
diff --git a/install-impl.sh b/install-impl.sh
index b574ccf..67f00c5 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -535,23 +535,13 @@ function inst_gnome() {
wget_unpacked $GETTEXT_TOOLS_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GLIB_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GLIB_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GNOME_VFS_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GNOME_VFS_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GTK_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GTK_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $INTLTOOL_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBART_LGPL_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBART_LGPL_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBBONOBO_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBBONOBO_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBBONOBOUI_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBBONOBOUI_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBGNOME_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBGNOME_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBGNOMECANVAS_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBGNOMECANVAS_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBGNOMEUI_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBGNOMEUI_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBICONV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBJPEG_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBJPEG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
@@ -567,8 +557,6 @@ function inst_gnome() {
wget_unpacked $PANGO_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $PKG_CONFIG_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $PKG_CONFIG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $POPT_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $POPT_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $ZLIB_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $ZLIB_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
echo 'gtk-theme-name = "Nimbus"' > ${_GNOME_UDIR}/etc/gtk-2.0/gtkrc
@@ -895,43 +883,6 @@ function inst_ktoblzcheck() {
fi
}
-function inst_libbonoboui() {
- setup libbonoboui
- _LIBBONOBOUI_UDIR=`unix_path $LIBBONOBOUI_DIR`
- add_to_env $_LIBBONOBOUI_UDIR/bin PATH
- add_to_env $_LIBBONOBOUI_UDIR/lib/pkgconfig PKG_CONFIG_PATH
- if quiet ${PKG_CONFIG} --exists --atleast-version=2.24.2 libbonoboui-2.0 && [ -f $_LIBBONOBOUI_UDIR/bin/libbonoboui*.dll ]
- then
- echo "libbonoboui already installed in $_LIBBONOBOUI_UDIR. skipping."
- else
- wget_unpacked $LIBBONOBOUI_SRC_URL $DOWNLOAD_DIR $TMP_DIR
- mydir=`pwd`
- assert_one_dir $TMP_UDIR/libbonoboui-*
- qpushd $TMP_UDIR/libbonoboui-*
- [ -n "$LIBBONOBOUI_PATCH" -a -f "$LIBBONOBOUI_PATCH" ] && \
- patch -p1 < $LIBBONOBOUI_PATCH
- #libtoolize --force
- #aclocal ${ACLOCAL_FLAGS} -I .
- #automake
- #autoconf
- ./configure ${HOST_XCOMPILE} --prefix=$_LIBBONOBOUI_UDIR \
- POPT_LIBS="-lpopt" \
- CPPFLAGS="${GNOME_CPPFLAGS}" \
- LDFLAGS="${GNOME_LDFLAGS}" \
- --enable-static=no
- make
- make install
-
- # We override the $GNOME_DIR libbonoboui files because
- # those erroneously depend on the obsolete libxml2.dll
- cp -a $_LIBBONOBOUI_UDIR/bin/libbonoboui*.dll $_GNOME_UDIR/bin
- cp -a $_LIBBONOBOUI_UDIR/lib/libbonoboui* $_GNOME_UDIR/lib
- qpopd
- ${PKG_CONFIG} --exists --atleast-version=2.24.2 libbonoboui-2.0 && [ -f $_LIBBONOBOUI_UDIR/bin/libbonoboui*.dll ] || die "libbonoboui not installed correctly"
- rm -rf ${TMP_UDIR}/libbonoboui-*
- fi
-}
-
function inst_libdbi() {
setup LibDBI
_SQLITE3_UDIR=`unix_path ${SQLITE3_DIR}`
diff --git a/install.sh b/install.sh
index f7ac729..024fe84 100644
--- a/install.sh
+++ b/install.sh
@@ -90,7 +90,6 @@ add_step inst_libxslt
add_step inst_isocodes
add_step inst_swig
add_step inst_pcre
-add_step inst_libbonoboui
add_step inst_libgsf
if [ "$CROSS_COMPILE" != "yes" ]; then
add_step inst_hh
diff --git a/libbonoboui-2.24.2.patch b/libbonoboui-2.24.2.patch
deleted file mode 100644
index c245d53..0000000
--- a/libbonoboui-2.24.2.patch
+++ /dev/null
@@ -1,453 +0,0 @@
-diff -ur libbonoboui-2.24.2/configure ../libbonoboui-2.24.2/configure
---- libbonoboui-2.24.2/configure 2009-09-22 18:12:20.000000000 -0500
-+++ ../libbonoboui-2.24.2/configure 2012-04-19 16:43:20.000000000 -0500
-@@ -798,8 +798,6 @@
- GLIB_MKENUMS
- GLIB_GENMARSHAL
- BONOBOUI_SINGLE_INCLUDES
--BONOBOUI_GLADE_LIBS
--BONOBOUI_GLADE_CFLAGS
- BONOBOUI_LIBS
- BONOBOUI_CFLAGS
- POPT_LIBS
-@@ -998,9 +996,7 @@
- XMKMF
- PKG_CONFIG
- BONOBOUI_CFLAGS
--BONOBOUI_LIBS
--BONOBOUI_GLADE_CFLAGS
--BONOBOUI_GLADE_LIBS'
-+BONOBOUI_LIBS'
-
-
- # Initialize some variables set by options.
-@@ -1680,10 +1676,6 @@
- C compiler flags for BONOBOUI, overriding pkg-config
- BONOBOUI_LIBS
- linker flags for BONOBOUI, overriding pkg-config
-- BONOBOUI_GLADE_CFLAGS
-- C compiler flags for BONOBOUI_GLADE, overriding pkg-config
-- BONOBOUI_GLADE_LIBS
-- linker flags for BONOBOUI_GLADE, overriding pkg-config
-
- Use these variables to override the choices made by `configure' or to help
- it to find libraries and programs with nonstandard names/locations.
-@@ -16422,219 +16414,6 @@
-
-
- # popt
--{ $as_echo "$as_me:$LINENO: checking for poptStrippedArgv in -lpopt" >&5
--$as_echo_n "checking for poptStrippedArgv in -lpopt... " >&6; }
--if test "${ac_cv_lib_popt_poptStrippedArgv+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpopt $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char poptStrippedArgv ();
--int
--main ()
--{
--return poptStrippedArgv ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- ac_cv_lib_popt_poptStrippedArgv=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_popt_poptStrippedArgv=no
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_popt_poptStrippedArgv" >&5
--$as_echo "$ac_cv_lib_popt_poptStrippedArgv" >&6; }
--if test "x$ac_cv_lib_popt_poptStrippedArgv" = x""yes; then
-- POPT_LIBS=-lpopt
--else
-- { { $as_echo "$as_me:$LINENO: error: You must have popt version 1.5 or greater installed." >&5
--$as_echo "$as_me: error: You must have popt version 1.5 or greater installed." >&2;}
-- { (exit 1); exit 1; }; }
--fi
--
--
--if test "${ac_cv_header_popt_h+set}" = set; then
-- { $as_echo "$as_me:$LINENO: checking for popt.h" >&5
--$as_echo_n "checking for popt.h... " >&6; }
--if test "${ac_cv_header_popt_h+set}" = set; then
-- $as_echo_n "(cached) " >&6
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_popt_h" >&5
--$as_echo "$ac_cv_header_popt_h" >&6; }
--else
-- # Is the header compilable?
--{ $as_echo "$as_me:$LINENO: checking popt.h usability" >&5
--$as_echo_n "checking popt.h usability... " >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--#include <popt.h>
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_header_compiler=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_header_compiler=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--$as_echo "$ac_header_compiler" >&6; }
--
--# Is the header present?
--{ $as_echo "$as_me:$LINENO: checking popt.h presence" >&5
--$as_echo_n "checking popt.h presence... " >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <popt.h>
--_ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null && {
-- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- }; then
-- ac_header_preproc=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_header_preproc=no
--fi
--
--rm -f conftest.err conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
--
--# So? What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-- yes:no: )
-- { $as_echo "$as_me:$LINENO: WARNING: popt.h: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: popt.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: popt.h: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: popt.h: proceeding with the compiler's result" >&2;}
-- ac_header_preproc=yes
-- ;;
-- no:yes:* )
-- { $as_echo "$as_me:$LINENO: WARNING: popt.h: present but cannot be compiled" >&5
--$as_echo "$as_me: WARNING: popt.h: present but cannot be compiled" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: popt.h: check for missing prerequisite headers?" >&5
--$as_echo "$as_me: WARNING: popt.h: check for missing prerequisite headers?" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: popt.h: see the Autoconf documentation" >&5
--$as_echo "$as_me: WARNING: popt.h: see the Autoconf documentation" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: popt.h: section \"Present But Cannot Be Compiled\"" >&5
--$as_echo "$as_me: WARNING: popt.h: section \"Present But Cannot Be Compiled\"" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: popt.h: proceeding with the preprocessor's result" >&5
--$as_echo "$as_me: WARNING: popt.h: proceeding with the preprocessor's result" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: popt.h: in the future, the compiler will take precedence" >&5
--$as_echo "$as_me: WARNING: popt.h: in the future, the compiler will take precedence" >&2;}
-- ( cat <<\_ASBOX
--## ------------------------------------------------------------------------------------------- ##
--## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=bonobo&component=libbonoboui ##
--## ------------------------------------------------------------------------------------------- ##
--_ASBOX
-- ) | sed "s/^/$as_me: WARNING: /" >&2
-- ;;
--esac
--{ $as_echo "$as_me:$LINENO: checking for popt.h" >&5
--$as_echo_n "checking for popt.h... " >&6; }
--if test "${ac_cv_header_popt_h+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_cv_header_popt_h=$ac_header_preproc
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_popt_h" >&5
--$as_echo "$ac_cv_header_popt_h" >&6; }
--
--fi
--if test "x$ac_cv_header_popt_h" = x""yes; then
-- :
--else
-- { { $as_echo "$as_me:$LINENO: error: Failed to find popt.h - you may have to adjust your environment" >&5
--$as_echo "$as_me: error: Failed to find popt.h - you may have to adjust your environment" >&2;}
-- { (exit 1); exit 1; }; }
--fi
-
-
-
-@@ -16891,115 +16670,6 @@
- fi;
-
-
--pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for BONOBOUI_GLADE" >&5
--$as_echo_n "checking for BONOBOUI_GLADE... " >&6; }
--
--if test -n "$BONOBOUI_GLADE_CFLAGS"; then
-- pkg_cv_BONOBOUI_GLADE_CFLAGS="$BONOBOUI_GLADE_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$BONOBOUI_MODULES libglade-2.0 >= 1.99.11\"") >&5
-- ($PKG_CONFIG --exists --print-errors "$BONOBOUI_MODULES libglade-2.0 >= 1.99.11") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-- pkg_cv_BONOBOUI_GLADE_CFLAGS=`$PKG_CONFIG --cflags "$BONOBOUI_MODULES libglade-2.0 >= 1.99.11" 2>/dev/null`
--else
-- pkg_failed=yes
--fi
-- else
-- pkg_failed=untried
--fi
--if test -n "$BONOBOUI_GLADE_LIBS"; then
-- pkg_cv_BONOBOUI_GLADE_LIBS="$BONOBOUI_GLADE_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$BONOBOUI_MODULES libglade-2.0 >= 1.99.11\"") >&5
-- ($PKG_CONFIG --exists --print-errors "$BONOBOUI_MODULES libglade-2.0 >= 1.99.11") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-- pkg_cv_BONOBOUI_GLADE_LIBS=`$PKG_CONFIG --libs "$BONOBOUI_MODULES libglade-2.0 >= 1.99.11" 2>/dev/null`
--else
-- pkg_failed=yes
--fi
-- else
-- pkg_failed=untried
--fi
--
--
--
--if test $pkg_failed = yes; then
--
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-- _pkg_short_errors_supported=yes
--else
-- _pkg_short_errors_supported=no
--fi
-- if test $_pkg_short_errors_supported = yes; then
-- BONOBOUI_GLADE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$BONOBOUI_MODULES libglade-2.0 >= 1.99.11" 2>&1`
-- else
-- BONOBOUI_GLADE_PKG_ERRORS=`$PKG_CONFIG --print-errors "$BONOBOUI_MODULES libglade-2.0 >= 1.99.11" 2>&1`
-- fi
-- # Put the nasty error message in config.log where it belongs
-- echo "$BONOBOUI_GLADE_PKG_ERRORS" >&5
--
-- { { $as_echo "$as_me:$LINENO: error: Package requirements ($BONOBOUI_MODULES libglade-2.0 >= 1.99.11) were not met:
--
--$BONOBOUI_GLADE_PKG_ERRORS
--
--Consider adjusting the PKG_CONFIG_PATH environment variable if you
--installed software in a non-standard prefix.
--
--Alternatively, you may set the environment variables BONOBOUI_GLADE_CFLAGS
--and BONOBOUI_GLADE_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--" >&5
--$as_echo "$as_me: error: Package requirements ($BONOBOUI_MODULES libglade-2.0 >= 1.99.11) were not met:
--
--$BONOBOUI_GLADE_PKG_ERRORS
--
--Consider adjusting the PKG_CONFIG_PATH environment variable if you
--installed software in a non-standard prefix.
--
--Alternatively, you may set the environment variables BONOBOUI_GLADE_CFLAGS
--and BONOBOUI_GLADE_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--" >&2;}
-- { (exit 1); exit 1; }; }
--elif test $pkg_failed = untried; then
-- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
--is in your PATH or set the PKG_CONFIG environment variable to the full
--path to pkg-config.
--
--Alternatively, you may set the environment variables BONOBOUI_GLADE_CFLAGS
--and BONOBOUI_GLADE_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
--is in your PATH or set the PKG_CONFIG environment variable to the full
--path to pkg-config.
--
--Alternatively, you may set the environment variables BONOBOUI_GLADE_CFLAGS
--and BONOBOUI_GLADE_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
--else
-- BONOBOUI_GLADE_CFLAGS=$pkg_cv_BONOBOUI_GLADE_CFLAGS
-- BONOBOUI_GLADE_LIBS=$pkg_cv_BONOBOUI_GLADE_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-- :
--fi
--
-
-
- if test "$enable_maintainer_mode" = "yes"; then
-@@ -17194,7 +16864,7 @@
-
-
-
--ac_config_files="$ac_config_files Makefile libbonoboui-zip po/Makefile.in bonobo/Makefile bonobo/libbonoboui-2.0.pc bonobo/libbonoboui-2.0-uninstalled.pc glade/Makefile samples/Makefile samples/controls/Makefile samples/bonoboui/Makefile samples/container/Makefile samples/compound-doc/Makefile samples/compound-doc/container/Makefile samples/canvdemo/Makefile tests/Makefile tests/control/Makefile tools/Makefile tools/browser/Makefile doc/Makefile doc/api/Makefile doc/api/figures/Makefile"
-+ac_config_files="$ac_config_files Makefile libbonoboui-zip po/Makefile.in bonobo/Makefile bonobo/libbonoboui-2.0.pc bonobo/libbonoboui-2.0-uninstalled.pc samples/Makefile samples/controls/Makefile samples/bonoboui/Makefile samples/container/Makefile samples/compound-doc/Makefile samples/compound-doc/container/Makefile samples/canvdemo/Makefile tests/Makefile tests/control/Makefile tools/Makefile tools/browser/Makefile doc/Makefile doc/api/Makefile doc/api/figures/Makefile"
-
-
- cat >confcache <<\_ACEOF
-@@ -18123,7 +17793,6 @@
- "bonobo/Makefile") CONFIG_FILES="$CONFIG_FILES bonobo/Makefile" ;;
- "bonobo/libbonoboui-2.0.pc") CONFIG_FILES="$CONFIG_FILES bonobo/libbonoboui-2.0.pc" ;;
- "bonobo/libbonoboui-2.0-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES bonobo/libbonoboui-2.0-uninstalled.pc" ;;
-- "glade/Makefile") CONFIG_FILES="$CONFIG_FILES glade/Makefile" ;;
- "samples/Makefile") CONFIG_FILES="$CONFIG_FILES samples/Makefile" ;;
- "samples/controls/Makefile") CONFIG_FILES="$CONFIG_FILES samples/controls/Makefile" ;;
- "samples/bonoboui/Makefile") CONFIG_FILES="$CONFIG_FILES samples/bonoboui/Makefile" ;;
-Only in ../libbonoboui-2.24.2: configure~
-diff -ur libbonoboui-2.24.2/configure.in ../libbonoboui-2.24.2/configure.in
---- libbonoboui-2.24.2/configure.in 2009-09-22 18:11:35.000000000 -0500
-+++ ../libbonoboui-2.24.2/configure.in 2012-04-19 16:41:13.000000000 -0500
-@@ -96,11 +96,6 @@
-
- AC_SUBST(X_LIBS)
-
--# popt
--AC_CHECK_LIB(popt, poptStrippedArgv, POPT_LIBS=-lpopt, AC_MSG_ERROR([You must have popt version 1.5 or greater installed.]))
--AC_SUBST(POPT_LIBS)
--AC_CHECK_HEADER(popt.h,,AC_MSG_ERROR([Failed to find popt.h - you may have to adjust your environment]))
--
- dnl
- dnl Start of pkg-config checks
- dnl
-@@ -127,10 +122,6 @@
- AC_MSG_RESULT([clean])
- fi;
-
--PKG_CHECK_MODULES(BONOBOUI_GLADE, $BONOBOUI_MODULES libglade-2.0 >= 1.99.11)
--AC_SUBST(BONOBOUI_GLADE_CFLAGS)
--AC_SUBST(BONOBOUI_GLADE_LIBS)
--
- if test "$enable_maintainer_mode" = "yes"; then
- BONOBOUI_SINGLE_INCLUDES="-DGTK_DISABLE_SINGLE_INCLUDES -DG_DISABLE_SINGLE_INCLUDES"
- AC_SUBST(BONOBOUI_SINGLE_INCLUDES)
-@@ -150,7 +141,6 @@
- bonobo/Makefile
- bonobo/libbonoboui-2.0.pc
- bonobo/libbonoboui-2.0-uninstalled.pc
--glade/Makefile
- samples/Makefile
- samples/controls/Makefile
- samples/bonoboui/Makefile
-diff -ur libbonoboui-2.24.2/Makefile.am ../libbonoboui-2.24.2/Makefile.am
---- libbonoboui-2.24.2/Makefile.am 2009-04-23 17:38:18.000000000 -0500
-+++ ../libbonoboui-2.24.2/Makefile.am 2012-04-19 16:41:13.000000000 -0500
-@@ -1,4 +1,4 @@
--SUBDIRS = bonobo glade samples tests tools po doc
-+SUBDIRS = bonobo samples tests tools po doc
-
- libincludedir = $(includedir)/libbonoboui-2.0
- libinclude_HEADERS = \
-diff -ur libbonoboui-2.24.2/Makefile.in ../libbonoboui-2.24.2/Makefile.in
---- libbonoboui-2.24.2/Makefile.in 2009-09-22 18:12:19.000000000 -0500
-+++ ../libbonoboui-2.24.2/Makefile.in 2012-04-19 16:43:32.000000000 -0500
-@@ -138,8 +138,6 @@
- AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
- BONOBOUI_CFLAGS = @BONOBOUI_CFLAGS@
--BONOBOUI_GLADE_CFLAGS = @BONOBOUI_GLADE_CFLAGS@
--BONOBOUI_GLADE_LIBS = @BONOBOUI_GLADE_LIBS@
- BONOBOUI_LIBS = @BONOBOUI_LIBS@
- BONOBOUI_SINGLE_INCLUDES = @BONOBOUI_SINGLE_INCLUDES@
- CATALOGS = @CATALOGS@
-@@ -284,7 +282,7 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = bonobo glade samples tests tools po doc
-+SUBDIRS = bonobo samples tests tools po doc
- libincludedir = $(includedir)/libbonoboui-2.0
- libinclude_HEADERS = \
- bonobo.h \
-Only in ../libbonoboui-2.24.2: Makefile.in~
commit dc1777a1ea9fbcc625d77cfcebd651f15b925423
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri Aug 17 21:26:20 2012 +0000
Win32 nightly: fix syntax error caused by previous commit
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22330 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/dist-impl.sh b/dist-impl.sh
index e189e9d..392ac6a 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -315,6 +315,7 @@ function dist_finish() {
SETUP_FILENAME="gnucash-${PKG_VERSION}-${REPOS_TYPE}-r${REVISION}-setup.exe"
else
SETUP_FILENAME="gnucash-${PKG_VERSION}-$(date +'%Y-%m-%d')-${REPOS_TYPE}-${REVISION}-setup.exe"
+ fi
qpushd ${_GNUCASH_UDIR}
mv gnucash-${PKG_VERSION}-setup.exe ${SETUP_FILENAME}
qpopd
commit 7f0d67a3562ba667fdc0345303a6cfc74fe40463
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri Aug 17 20:30:41 2012 +0000
Win32 nightly: match built package name to the one expected for upload
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22329 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/dist-impl.sh b/dist-impl.sh
index 58c0687..e189e9d 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -310,8 +310,11 @@ function dist_finish() {
if [ "$BUILD_FROM_TARBALL" = "no" ]; then
# And changing output filename
PKG_VERSION=`grep PACKAGE_VERSION ${_BUILD_UDIR}/config.h | cut -d" " -f3 | cut -d\" -f2 `
- SVN_REV=`grep GNUCASH_SVN_REV ${_BUILD_UDIR}/src/core-utils/gnc-svninfo.h | cut -d" " -f3 | cut -d\" -f2 `
- SETUP_FILENAME="gnucash-${PKG_VERSION}-${REPOS_TYPE}-r${SVN_REV}-setup.exe"
+ REVISION=`grep GNUCASH_SVN_REV ${_BUILD_UDIR}/src/core-utils/gnc-svninfo.h | cut -d" " -f3 | cut -d\" -f2 `
+ if [ "$REPOS_TYPE" = "svn" ]; then
+ SETUP_FILENAME="gnucash-${PKG_VERSION}-${REPOS_TYPE}-r${REVISION}-setup.exe"
+ else
+ SETUP_FILENAME="gnucash-${PKG_VERSION}-$(date +'%Y-%m-%d')-${REPOS_TYPE}-${REVISION}-setup.exe"
qpushd ${_GNUCASH_UDIR}
mv gnucash-${PKG_VERSION}-setup.exe ${SETUP_FILENAME}
qpopd
commit 18b6907ec90b21b9c3c9e8f00805f99786d8d448
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri Aug 17 16:13:03 2012 +0000
W32 nightly: fix typos in previous commit
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22328 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/daily_build_git.sh b/daily_build_git.sh
index 1fe585a..38aed10 100644
--- a/daily_build_git.sh
+++ b/daily_build_git.sh
@@ -43,7 +43,7 @@ else
fi
newrev=$($GIT_CMD rev-parse HEAD)
-if [[ "${oldrev}" != "${oldrev}" ]]; then
+if [[ "${oldrev}" != "${newrev}" ]]; then
./build_package_git.sh
fi
diff --git a/weekly_build_git.sh b/weekly_build_git.sh
index 368a0a2..b3aef2d 100644
--- a/weekly_build_git.sh
+++ b/weekly_build_git.sh
@@ -46,7 +46,7 @@ else
fi
newrev=$($GIT_CMD rev-parse HEAD)
-if [[ "${oldrev}" != "${oldrev}" ]]; then
+if [[ "${oldrev}" != "${newrev}" ]]; then
./build_package_git.sh
fi
commit 0ff2d1ff8ad2e6e7165944ebe46c28f11b5d5a1b
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri Aug 17 15:55:06 2012 +0000
Win32 nightlies: more small build tweaks
- start from the proper base directory (daily_build.bat)
- don't build daily/weekly unless there are new commits since the last
build
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22327 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_package_git.sh b/build_package_git.sh
index 4851e3b..62254e3 100644
--- a/build_package_git.sh
+++ b/build_package_git.sh
@@ -69,12 +69,12 @@ rm -rf ${_DIST_UDIR}
_BUILD_UDIR=`unix_path $BUILD_DIR`
_GNUCASH_UDIR=`unix_path $GNUCASH_DIR`
PKG_VERSION=`grep PACKAGE_VERSION ${_BUILD_UDIR}/config.h | cut -d" " -f3 | cut -d\" -f2 `
-SVN_REV=`grep GNUCASH_SVN_REV ${_BUILD_UDIR}/src/core-utils/gnc-svninfo.h | cut -d" " -f3 | cut -d\" -f2 `
+REVISION=`grep GNUCASH_SVN_REV ${_BUILD_UDIR}/src/core-utils/gnc-svninfo.h | cut -d" " -f3 | cut -d\" -f2 `
# Choose the output filename based on our "build_from_tarball" setting
# Make sure this logic matches the logic in dist.sh!
if [ "$BUILD_FROM_TARBALL" = "no" ]; then
- SETUP_FILENAME="gnucash-${PKG_VERSION}-$(date +'%Y-%m-%d')-git-${SVN_REV}-setup.exe"
+ SETUP_FILENAME="gnucash-${PKG_VERSION}-$(date +'%Y-%m-%d')-git-${REVISION}-setup.exe"
else
SETUP_FILENAME="gnucash-${PKG_VERSION}-setup.exe"
fi
diff --git a/daily_build.bat b/daily_build.bat
index 71ac3a4..f477d07 100644
--- a/daily_build.bat
+++ b/daily_build.bat
@@ -2,7 +2,7 @@ rem This is the Windows Batch Script for the daily builds.
rem It simply calls the actual MSYS Shell script to perform
rem the daily build and then the tag builds.
-cd c:\soft\packaging
+cd c:\soft\gnucash\repos\packaging\win32\
rem Development build (daily)
c:\msys\1.0\bin\sh.exe --login c:\soft\gnucash\repos\packaging\win32\daily_build_git.sh
diff --git a/daily_build_git.sh b/daily_build_git.sh
index f04d535..1fe585a 100644
--- a/daily_build_git.sh
+++ b/daily_build_git.sh
@@ -28,5 +28,26 @@ set_env "$_GIT_UDIR/bin/git" GIT_CMD
export GIT_CMD
$GIT_CMD pull
-./build_package_git.sh
+
+################################################################
+# determine if there are any new commits since the last time we ran
+#
+
+# If we don't have a rev file then start from 'now' and force a build
+revfile=last_rev_daily
+if [ ! -f ${revfile} ] ; then
+ echo $($GIT_CMD rev-parse HEAD) > ${revfile}
+ oldrev=a # definitely an invalid, so non-existing git rev
+else
+ oldrev=$(cat ${revfile})
+fi
+
+newrev=$($GIT_CMD rev-parse HEAD)
+if [[ "${oldrev}" != "${oldrev}" ]]; then
+ ./build_package_git.sh
+fi
+
+# move the new file into place, will only happen if the build was successful
+echo ${newrev} > ${revfile}
+
qpopd
diff --git a/weekly_build_git.sh b/weekly_build_git.sh
index 1e1a07a..368a0a2 100644
--- a/weekly_build_git.sh
+++ b/weekly_build_git.sh
@@ -31,5 +31,26 @@ set_env "$_GIT_UDIR/bin/git" GIT_CMD
export $GIT_CMD
$GIT_CMD pull
-./build_package.sh
-qpopd
+
+################################################################
+# determine if there are any new commits since the last time we ran
+#
+
+# If we don't have a rev file then start from 'now' and force a build
+revfile=last_rev_weekly
+if [ ! -f ${revfile} ] ; then
+ echo $($GIT_CMD rev-parse HEAD) > ${revfile}
+ oldrev=a # definitely an invalid, so non-existing git rev
+else
+ oldrev=$(cat ${revfile})
+fi
+
+newrev=$($GIT_CMD rev-parse HEAD)
+if [[ "${oldrev}" != "${oldrev}" ]]; then
+ ./build_package_git.sh
+fi
+
+# move the new file into place, will only happen if the build was successful
+echo ${newrev} > ${revfile}
+
+qpopd
\ No newline at end of file
commit b789ed901493d3f532da59827d97abb7f0039b75
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu Aug 16 16:21:08 2012 +0000
Win32 nightly build: add timestamp in package name created from git
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22325 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_package_git.sh b/build_package_git.sh
index 357ccd6..4851e3b 100644
--- a/build_package_git.sh
+++ b/build_package_git.sh
@@ -74,7 +74,7 @@ SVN_REV=`grep GNUCASH_SVN_REV ${_BUILD_UDIR}/src/core-utils/gnc-svninfo.h | cut
# Choose the output filename based on our "build_from_tarball" setting
# Make sure this logic matches the logic in dist.sh!
if [ "$BUILD_FROM_TARBALL" = "no" ]; then
- SETUP_FILENAME="gnucash-${PKG_VERSION}-git-r${SVN_REV}-setup.exe"
+ SETUP_FILENAME="gnucash-${PKG_VERSION}-$(date +'%Y-%m-%d')-git-${SVN_REV}-setup.exe"
else
SETUP_FILENAME="gnucash-${PKG_VERSION}-setup.exe"
fi
commit d780ddedf095288fb524524683b69f6013a92564
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu Aug 16 12:25:57 2012 +0000
Win32 tag build: fix yet another typo
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22324 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_tags_git.sh b/build_tags_git.sh
index 1a03275..da1f876 100644
--- a/build_tags_git.sh
+++ b/build_tags_git.sh
@@ -81,7 +81,7 @@ for tag_rev in $tags ; do
# Check out the tag and setup custom.sh
qpushd ${tagdir}
- $GIT_CMD clone ${REPO_URL} repos
+ $GIT_CMD clone ${REPOS_URL} repos
qpushd repos
$GIT_CMD checkout $tag
qpopd
commit 8ec78d130ca146d43e99fa1d88ca7806bea8c360
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu Aug 16 11:12:40 2012 +0000
Win32 tag build: avoid Windows paths in git commands
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22323 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_tags_git.sh b/build_tags_git.sh
index 3dc7319..1a03275 100644
--- a/build_tags_git.sh
+++ b/build_tags_git.sh
@@ -80,10 +80,12 @@ for tag_rev in $tags ; do
cp -p $(unix_path ${DOWNLOAD_DIR})/* ${tagbasedir}/downloads
# Check out the tag and setup custom.sh
- $GIT_CMD clone ${REPO_URL} ${tagdir}/repos
- qpushd ${tagdir}/repos
+ qpushd ${tagdir}
+ $GIT_CMD clone ${REPO_URL} repos
+ qpushd repos
$GIT_CMD checkout $tag
qpopd
+ qpopd
w32pkg=${tagdir}/repos/packaging/win32
cp -p "${pkgdir}/custom.sh" ${w32pkg}/custom.sh
commit 540f537071c332d81d4eca4ca4f27d18c97097d9
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu Aug 16 11:01:11 2012 +0000
Win32 tag build: fix another typo
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22322 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_tags_git.sh b/build_tags_git.sh
index f797dfa..3dc7319 100644
--- a/build_tags_git.sh
+++ b/build_tags_git.sh
@@ -81,7 +81,7 @@ for tag_rev in $tags ; do
# Check out the tag and setup custom.sh
$GIT_CMD clone ${REPO_URL} ${tagdir}/repos
- qpushd {tagdir}/repos
+ qpushd ${tagdir}/repos
$GIT_CMD checkout $tag
qpopd
w32pkg=${tagdir}/repos/packaging/win32
commit c5f11e4057b96c12927ac2b932a73fa64aea053c
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu Aug 16 10:47:25 2012 +0000
Win32 tag build: fix typo
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22321 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_tags_git.sh b/build_tags_git.sh
index fc73b88..f797dfa 100644
--- a/build_tags_git.sh
+++ b/build_tags_git.sh
@@ -80,7 +80,7 @@ for tag_rev in $tags ; do
cp -p $(unix_path ${DOWNLOAD_DIR})/* ${tagbasedir}/downloads
# Check out the tag and setup custom.sh
- $GIT_CMD clone checkout ${REPO_URL} ${tagdir}/repos
+ $GIT_CMD clone ${REPO_URL} ${tagdir}/repos
qpushd {tagdir}/repos
$GIT_CMD checkout $tag
qpopd
commit 9759a35283e3c84c163d381510d456e60b8698e3
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu Aug 16 10:27:38 2012 +0000
Win32 tag builds: match tag cache syntax with the actual tag checks
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22320 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_tags_git.sh b/build_tags_git.sh
index 18ca7b1..fc73b88 100644
--- a/build_tags_git.sh
+++ b/build_tags_git.sh
@@ -48,7 +48,7 @@ if [ ! -f ${tagfile} ] ; then
for one_tag in $($GIT_CMD tag)
do
tag_hash=$($GIT_CMD rev-parse ${one_tag})
- echo ${one_tag}/${tag_hash} >> ${tagfile}
+ echo ${tag_hash}/${one_tag} >> ${tagfile}
done
fi
@@ -56,8 +56,8 @@ fi
rm -f ${tagfile}.new
for one_tag in $($GIT_CMD tag)
do
- tag_hash=$($GIT_CMD rev-parse ${one_tag})
-echo ${one_tag}/${tag_hash} >> ${tagfile}.new
+ tag_hash=$($GIT_CMD rev-parse ${one_tag})
+ echo ${tag_hash}/${one_tag} >> ${tagfile}.new
done
tags="`diff --suppress-common-lines ${tagfile} ${tagfile}.new | grep '^> ' | sed -e 's/^> //g'`"
commit 3116b8f179226348304231022497b072d685e8f6
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu Aug 16 10:15:48 2012 +0000
Win32: restore UPDATE_SOURCES in tags build script.
The parameter has been obsoleted recently, but older
tags may still depend on its availability and the tag script is
supposed to be capable of building older tags as well.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22319 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_tags_git.sh b/build_tags_git.sh
index 95510ba..18ca7b1 100644
--- a/build_tags_git.sh
+++ b/build_tags_git.sh
@@ -91,6 +91,12 @@ for tag_rev in $tags ; do
echo -n 'GLOBAL_DIR=c:\\soft\\gnucash-' >> ${w32pkg}/custom.sh
echo "${tag}" >> ${w32pkg}/custom.sh
+ # UPDATE_SOURCES is obsolete, but preserved here to allow the
+ # current script to also build older tags, that may still
+ # use this parameter.
+ # No need to update the sources we just checked out
+ echo "UPDATE_SOURCES=no" >> ${w32pkg}/custom.sh
+
# BUILD_FROM_TARBALL is special:
# in install.sh place we check !=yes, in defaults.sh =yes, in dist.sh =no
# We want it to look like 'no' in install and defaults, but yes in dist
commit c6cf20a06a83a1f248cbff3ec08cbd6bb4cc3a55
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu Aug 16 10:05:13 2012 +0000
Win32: call proper script when building tags from git
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22318 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_tags_git.sh b/build_tags_git.sh
index 1562c4f..95510ba 100644
--- a/build_tags_git.sh
+++ b/build_tags_git.sh
@@ -104,6 +104,6 @@ for tag_rev in $tags ; do
# Now build the tag! (this will upload it too)
# Use the build_package script from trunk (cwd), not from the tag
qpushd ${w32pkg}
- ${pkgdir}/build_package.sh ${tag}
+ ${pkgdir}/build_package_git.sh ${tag}
qpopd
done
commit eb9295fd65c6fe1bbe7e27139384827e265d45cf
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu Aug 16 09:37:19 2012 +0000
Win32 automated build: add note about Windows' restriction on updating
files that are in use in every file that can be affected.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22317 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_tags.sh b/build_tags.sh
index f529fee..d3ebd2c 100644
--- a/build_tags.sh
+++ b/build_tags.sh
@@ -1,12 +1,19 @@
#!/bin/sh
#
-# Note: for this script to work, you need to make sure bash can
-# find svn on your system. If it's not in the default
-# Windows path, you will have to add it yourself, for
-# example like this:
-# - create a file /etc/profile.d/svn.sh
-# - add this line: export PATH=/c/soft/svn/bin:$PATH
-# (Use the real path to your svn installation, obviously)
+# Notes:
+# 1. for this script to work, you need to make sure bash can
+# find svn on your system. If it's not in the default
+# Windows path, you will have to add it yourself, for
+# example like this:
+# - create a file /etc/profile.d/svn.sh
+# - add this line: export PATH=/c/soft/svn/bin:$PATH
+# (Use the real path to your svn installation, obviously)
+#
+# 2. Should this script change in the source repository, then the
+# svn update below will fail due to a limitation in Windows that
+# won't allow to change a file that is "in use". So in the rare
+# situation this script needs to be updated, you will need to
+# run the svn update once yourself.
set -e
diff --git a/build_tags_git.sh b/build_tags_git.sh
index d5c2de2..1562c4f 100644
--- a/build_tags_git.sh
+++ b/build_tags_git.sh
@@ -1,9 +1,16 @@
#!/bin/sh
#
-# Note: for this script to work, git must have been setup before
-# in a way that doesn't conflict with the GnuCash build.
-# The easiest way to do so is to run the build once manually
-# with a properly set up custom.sh.
+# Notes:
+# 1. for this script to work, git must have been setup before
+# in a way that doesn't conflict with the GnuCash build.
+# The easiest way to do so is to run the build once manually
+# with a properly set up custom.sh.
+#
+# 2. Should this script change in the source repository, then the
+# git pull below will fail due to a limitation in Windows that
+# won't allow to change a file that is "in use". So in the rare
+# situation this script needs to be updated, you will need to
+# run the git pull once yourself.
set -e
diff --git a/daily_build.sh b/daily_build.sh
index c1f92b4..a2ce0e2 100755
--- a/daily_build.sh
+++ b/daily_build.sh
@@ -19,6 +19,12 @@
# using the old way)
# The second invocation is superfluous if this script was called
# from within the source code repository.
+#
+# 3. Should this script change in the source repository, then the
+# svn update below will fail due to a limitation in Windows that
+# won't allow to change a file that is "in use". So in the rare
+# situation this script needs to be updated, you will need to
+# run the svn update once yourself.
set -e
diff --git a/daily_build_git.sh b/daily_build_git.sh
index af6e533..f04d535 100644
--- a/daily_build_git.sh
+++ b/daily_build_git.sh
@@ -1,9 +1,16 @@
#!/bin/sh
#
-# Note: for this script to work, git must have been setup before
-# in a way that doesn't conflict with the GnuCash build.
-# The easiest way to do so is to run the build once manually
-# with a properly set up custom.sh.
+# Notes:
+# 1. for this script to work, git must have been setup before
+# in a way that doesn't conflict with the GnuCash build.
+# The easiest way to do so is to run the build once manually
+# with a properly set up custom.sh.
+#
+# 2. Should this script change in the source repository, then the
+# git pull below will fail due to a limitation in Windows that
+# won't allow to change a file that is "in use". So in the rare
+# situation this script needs to be updated, you will need to
+# run the git pull once yourself.
set -e
diff --git a/weekly_build.sh b/weekly_build.sh
index 8defaad..250d310 100644
--- a/weekly_build.sh
+++ b/weekly_build.sh
@@ -1,12 +1,30 @@
#!/bin/sh
#
-# Note: for this script to work, you need to make sure bash can
-# find svn on your system. If it's not in the default
-# Windows path, you will have to add it yourself, for
-# example like this:
-# - create a file /etc/profile.d/svn.sh
-# - add this line: export PATH=/c/soft/svn/bin:$PATH
-# (Use the real path to your svn installation, obviously)
+# Notes:
+# 1. for this script to work, you need to make sure bash can
+# find svn on your system. If it's not in the default
+# Windows path, you will have to add it yourself, for
+# example like this:
+# - create a file /etc/profile.d/svn.sh
+# - add this line: export PATH=/c/soft/svn/bin:$PATH
+# (Use the real path to your svn installation, obviously)
+#
+# 2. The recommended setup is to call this script from within the
+# source code repository (packaging/win32 directory). This is
+# different from before, where it was assumed to be called
+# from outside the source code repository. To remain some
+# compatibility with the old way, svn update is called twice
+# - once for the repository (to update all)
+# - once for the build scripts (to also update the build scripts
+# using the old way)
+# The second invocation is superfluous if this script was called
+# from within the source code repository.
+#
+# 3. Should this script change in the source repository, then the
+# svn update below will fail due to a limitation in Windows that
+# won't allow to change a file that is "in use". So in the rare
+# situation this script needs to be updated, you will need to
+# run the svn update once yourself.
set -e
diff --git a/weekly_build_git.sh b/weekly_build_git.sh
index 2f9a6ed..1e1a07a 100644
--- a/weekly_build_git.sh
+++ b/weekly_build_git.sh
@@ -1,9 +1,16 @@
#!/bin/sh
#
-# Note: for this script to work, git must have been setup before
-# in a way that doesn't conflict with the GnuCash build.
-# The easiest way to do so is to run the build once manually
-# with a properly set up custom.sh.
+# Notes:
+# 1. for this script to work, git must have been setup before
+# in a way that doesn't conflict with the GnuCash build.
+# The easiest way to do so is to run the build once manually
+# with a properly set up custom.sh.
+#
+# 2. Should this script change in the source repository, then the
+# git pull below will fail due to a limitation in Windows that
+# won't allow to change a file that is "in use". So in the rare
+# situation this script needs to be updated, you will need to
+# run the git pull once yourself.
set -e
commit f0f12c0951b3d8ff118dc83f62cbff7935cb91e4
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu Aug 16 09:37:07 2012 +0000
Win32: call proper script to autobuild from git
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22316 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/daily_build.bat b/daily_build.bat
index 4df0c26..71ac3a4 100644
--- a/daily_build.bat
+++ b/daily_build.bat
@@ -5,7 +5,7 @@ rem the daily build and then the tag builds.
cd c:\soft\packaging
rem Development build (daily)
-c:\msys\1.0\bin\sh.exe --login c:\soft\gnucash\repos\packaging\win32\daily_build.sh
+c:\msys\1.0\bin\sh.exe --login c:\soft\gnucash\repos\packaging\win32\daily_build_git.sh
rem Tags build (daily -- only tags that weren't built yet)
c:\msys\1.0\bin\sh.exe --login c:\soft\packaging\build_tags.sh
rem 2.4 branch build (weekly)
commit e0dec761877d5121210fea314685b0e99ed2f505
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed Aug 15 09:55:29 2012 +0000
Win32: fix log file name generated by automated build
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22315 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_package_git.sh b/build_package_git.sh
index f5e2595..357ccd6 100644
--- a/build_package_git.sh
+++ b/build_package_git.sh
@@ -20,20 +20,20 @@ function on_error() {
function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
-tag="$1"
-
. functions.sh
. defaults.sh
+tag="${1:-$GIT_REV}"
+
# Determine where to upload to
-# NOTE: this assumes GIT_REV to be either a tag or a branch, not a
+# NOTE: this assumes "tag" to be either a tag or a branch, not a
# commit hash. It will probably work with a hash as well,
# but will create a directory for the hash
-if [ -n "$($GIT_CMD tag -l $GIT_REV)" ]; then
+if [ -n "$($GIT_CMD tag -l $tag)" ]; then
TARGET_DIR=releases
LOG_TAG=$tag
else
- TARGET_DIR=${GIT_REV}
+ TARGET_DIR=$tag
LOG_TAG=$TARGET_DIR
fi
commit cb2ad2a8cc102736559aaf7509fc9f82932e9e5a
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed Aug 15 09:55:20 2012 +0000
Make weekly build truly weekly again
This was temporarily changed to daily during the 2.4.10 release
timeframe to stomp out some release bugs. That should no longer be
necessary.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22314 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/weekly_build.sh b/weekly_build.sh
index 5d5a320..8defaad 100644
--- a/weekly_build.sh
+++ b/weekly_build.sh
@@ -11,7 +11,7 @@
set -e
## Only run this script on Monday night (first day of the week)
-#if [ `date +%u` != 1 ] ; then exit ; fi
+if [ `date +%u` != 1 ] ; then exit ; fi
function qpushd() { pushd "$@" >/dev/null; }
function qpopd() { popd >/dev/null; }
commit 274563c6d4fd45989436255c28cdc0dcd0f0c7bc
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed Aug 15 08:37:34 2012 +0000
Win32: more fixes for git based tag build
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22311 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_tags_git.sh b/build_tags_git.sh
index f0aa359..d5c2de2 100644
--- a/build_tags_git.sh
+++ b/build_tags_git.sh
@@ -40,7 +40,7 @@ tagfile=tags_git
if [ ! -f ${tagfile} ] ; then
for one_tag in $($GIT_CMD tag)
do
- tag_hash=$($GIT_CMD rev_parse ${one_tag})
+ tag_hash=$($GIT_CMD rev-parse ${one_tag})
echo ${one_tag}/${tag_hash} >> ${tagfile}
done
fi
@@ -49,7 +49,7 @@ fi
rm -f ${tagfile}.new
for one_tag in $($GIT_CMD tag)
do
- tag_hash=$($GIT_CMD rev_parse ${one_tag})
+ tag_hash=$($GIT_CMD rev-parse ${one_tag})
echo ${one_tag}/${tag_hash} >> ${tagfile}.new
done
tags="`diff --suppress-common-lines ${tagfile} ${tagfile}.new | grep '^> ' | sed -e 's/^> //g'`"
commit bed1b41b1149b7483f0fd0574477217c7d8d2224
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Aug 14 16:04:54 2012 +0000
Win32: fix tag build for git
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22310 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_tags_git.sh b/build_tags_git.sh
index f09bfa5..f0aa359 100644
--- a/build_tags_git.sh
+++ b/build_tags_git.sh
@@ -24,7 +24,7 @@ pkgdir="`pwd`"
# Variables
_GIT_UDIR=`unix_path $GIT_DIR`
set_env "$_GIT_UDIR/bin/git" GIT_CMD
-export $GIT_CMD
+export GIT_CMD
$GIT_CMD pull
. functions.sh
commit abb036594295cc088724371d083e4595a2fe6fb0
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Aug 14 15:14:25 2012 +0000
Win32 nightly build: build trunk from git by default.
Additionally, update the README file to explain how the start from
scratch with a git repository.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22309 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/README b/README
index 7761bd3..825524f 100644
--- a/README
+++ b/README
@@ -1,6 +1,10 @@
These scripts try to download and install a Windows/mingw32 build
environment for GnuCash on Windows.
+Note: The mingw homepage is http://www.mingw.org. You can read more
+ about mingw over there. The packages to download are all
+ on sourceforge however, so the direct links are given here.
+
These scripts support two ways to build a Windows/mingw32 version of GnuCash:
- directly on a Windows PC
- via cross-compilation on Linux
@@ -12,9 +16,30 @@ Before you start with the automated build, you have to complete these
steps manually. The directory variables are set in `defaults.sh' and optionally
`custom.sh'.
-Note: The mingw homepage is http://www.mingw.org. You can read more
- about mingw over there. The packages to download are all
- on sourceforge however, so the direct links are given here.
+Note: when installing software as asked below, avoid using paths
+ with spaces. Some parts of the build system don't cope well
+ with spaces. So don't install in c:\Program Files. The build
+ system by default assumes c:\soft as base directory
+ called $GLOBAL_DIR from now on).
+
+* Download and install git for windows from http://git-scm.com/downloads.
+ This will install some git related items in the Windows Explorer
+ context menus (you can access them via right-click in any directory)
+
+* Choose a spot where you want to store a copy of the GnuCash repository.
+ The default path is $GLOBAL_DIR\gnucash\repos.
+ Reminder: avoid pathnames with spaces in it.
+
+* Create all directories in the path except the last one. For the example,
+ make sure $GLOBAL_DIR\gnucash exists
+
+* Open a Windows explorer and go to $GLOBAL_DIR\gnucash (or your chosen location)
+
+* Right-click. In the popup select git bash. This will open a command prompt.
+
+* Enter: git clone git://github.com/Gnucash/gnucash.git repos
+ The last part should be what you chose the call the directory to store the
+ copy of the GnuCash repository.
* Download MSYS from
https://sourceforge.net/projects/mingw/files/MSYS%20Base%20System/msys-1.0.11/MSYS-1.0.11.exe/download
@@ -35,9 +60,16 @@ Note: The mingw homepage is http://www.mingw.org. You can read more
Note: the version number may have changed when you try this. Use whatever version
that is available
+* Via Windows Explorer go to <your-repos-dir>\packaging\win32
+
* Look at defaults.sh and create a file named custom.sh to specify adapted directory
- variables. If you want verbose output of any script
- step, add "set -x" to that file.
+ variables.
+
+ - If you used a path to your GnuCash repository other than the default
+ $GLOBAL_DIR\gnucash\repos, you should at least specify REPOS_DIR in here.
+ - Also if you want the build system to reuse git you have just installed,
+ you can specify the path to git's installation location via GIT_DIR
+ - If you want verbose output of any script step, add "set -x" to that file.
* Either, 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"; or skip building
diff --git a/daily_build.bat b/daily_build.bat
index 8483785..4df0c26 100644
--- a/daily_build.bat
+++ b/daily_build.bat
@@ -5,7 +5,7 @@ rem the daily build and then the tag builds.
cd c:\soft\packaging
rem Development build (daily)
-c:\msys\1.0\bin\sh.exe --login c:\soft\packaging\daily_build.sh
+c:\msys\1.0\bin\sh.exe --login c:\soft\gnucash\repos\packaging\win32\daily_build.sh
rem Tags build (daily -- only tags that weren't built yet)
c:\msys\1.0\bin\sh.exe --login c:\soft\packaging\build_tags.sh
rem 2.4 branch build (weekly)
commit 2eeee255a897b9ecdf41150c086b2ca8f7f8a264
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Aug 14 15:14:12 2012 +0000
Win32 build: remove UPDATE_SOURCES parameter
Developers should manually choose when and how to update their checked
out repository. Automated builders can simply write a short wrapper
script around the install the does the update for them. The
daily_build_git.sh and daily_build.sh scripts are fine examples.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22308 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_tags_git.sh b/build_tags_git.sh
index d56ff6b..f09bfa5 100644
--- a/build_tags_git.sh
+++ b/build_tags_git.sh
@@ -84,9 +84,6 @@ for tag_rev in $tags ; do
echo -n 'GLOBAL_DIR=c:\\soft\\gnucash-' >> ${w32pkg}/custom.sh
echo "${tag}" >> ${w32pkg}/custom.sh
- # No need to update the sources we just checked out
- echo "UPDATE_SOURCES=no" >> ${w32pkg}/custom.sh
-
# BUILD_FROM_TARBALL is special:
# in install.sh place we check !=yes, in defaults.sh =yes, in dist.sh =no
# We want it to look like 'no' in install and defaults, but yes in dist
diff --git a/daily_build.sh b/daily_build.sh
index be7fb39..c1f92b4 100755
--- a/daily_build.sh
+++ b/daily_build.sh
@@ -1,12 +1,24 @@
#!/bin/sh
#
-# Note: for this script to work, you need to make sure bash can
-# find svn on your system. If it's not in the default
-# Windows path, you will have to add it yourself, for
-# example like this:
-# - create a file /etc/profile.d/svn.sh
-# - add this line: export PATH=/c/soft/svn/bin:$PATH
-# (Use the real path to your svn installation, obviously)
+# Notes:
+# 1. for this script to work, you need to make sure bash can
+# find svn on your system. If it's not in the default
+# Windows path, you will have to add it yourself, for
+# example like this:
+# - create a file /etc/profile.d/svn.sh
+# - add this line: export PATH=/c/soft/svn/bin:$PATH
+# (Use the real path to your svn installation, obviously)
+#
+# 2. The recommended setup is to call this script from within the
+# source code repository (packaging/win32 directory). This is
+# different from before, where it was assumed to be called
+# from outside the source code repository. To remain some
+# compatibility with the old way, svn update is called twice
+# - once for the repository (to update all)
+# - once for the build scripts (to also update the build scripts
+# using the old way)
+# The second invocation is superfluous if this script was called
+# from within the source code repository.
set -e
@@ -15,6 +27,14 @@ function qpopd() { popd >/dev/null; }
function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
qpushd "$(dirname $(unix_path "$0"))"
+. functions.sh
+. defaults.sh
+
+qpushd "$REPOS_DIR"
+svn update
+qpopd
+
svn update
+
./build_package.sh
qpopd
diff --git a/defaults.sh b/defaults.sh
index 14f8542..7d8ee2a 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -29,10 +29,7 @@ if [ -z "$BUILD_FROM_TARBALL" ]; then
fi
fi
-# only change this to "yes" if you are using install.sh from the outside the repository checkout
-set_default UPDATE_SOURCES noyes
if [ "$BUILD_FROM_TARBALL" = "yes" ]; then
- UPDATE_SOURCES=no
set_default GNUCASH_DIR "$(wpwd ..\\..)"
set_default REPOS_DIR $GNUCASH_DIR
# keep this pointing from BUILD_DIR to REPOS_DIR
@@ -43,7 +40,7 @@ else
# keep this pointing from BUILD_DIR to REPOS_DIR
set_default REL_REPOS_DIR ..\\repos
- set_default REPOS_TYPE svn
+ set_default REPOS_TYPE "git"
if [ "$REPOS_TYPE" = "git" ]; then
set_default GIT_REV "trunk"
set_default REPOS_URL "git://github.com/Gnucash/gnucash.git"
diff --git a/install-impl.sh b/install-impl.sh
index d69c682..b574ccf 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1453,46 +1453,6 @@ function inst_hh() {
fi
}
-function git_up() {
- mkdir -p $_REPOS_UDIR
- qpushd $_REPOS_UDIR
- if [ -x .git ]; then
- setup "git update in ${REPOS_DIR}"
-# IMPORTANT: the update mechanism from git
-# has been kept deliberately simple.
-#
-# It assumes you are working as a non-committer
-# (see http://wiki.gnucash.org/wiki/Git for what that means)
-# and will simply try to pull the current branch from
-# the upstream repository.
-# If you are a committer (and intend to commit from your Windows
-# git clone) you should disable updates from the build scripts
-# and manually update using the git-update script.
-# FIXME the last part needs perl 5.8 and some config tweaks for
-# perl to find git's Git.pm
-# msys-dtk installed by default only has perl 5.6.
- $GIT_CMD pull origin
- else
- setup git clone
- $GIT_CMD clone $REPOS_URL .
- $GIT_CMD checkout $GIT_REV .
- fi
- qpopd
-}
-
-function svn_up() {
- mkdir -p $_REPOS_UDIR
- qpushd $_REPOS_UDIR
- if [ -x .svn ]; then
- setup "svn update in ${REPOS_DIR}"
- svn up -r ${SVN_REV}
- else
- setup svn co
- svn co -r ${SVN_REV} $REPOS_URL .
- fi
- qpopd
-}
-
function inst_cutecash() {
setup Cutecash
_BUILD_UDIR=`unix_path $CUTECASH_BUILD_DIR`
diff --git a/install.sh b/install.sh
index 2033dfd..f7ac729 100644
--- a/install.sh
+++ b/install.sh
@@ -111,15 +111,6 @@ add_step inst_enchant
add_step inst_webkit
##
-if [ "$UPDATE_SOURCES" = "yes" ]; then
- if [ "$REPOS_TYPE" = "git" ]; then
- add_step git_up
- elif [ "$REPOS_TYPE" = "svn" ]; then
- add_step svn_up
- else
- die "Unkown repos type $REPOS_TYPE. Sources can only be updated for git or svn type repos"
- fi
-fi
if [ "$WITH_CUTECASH" = "yes" ]; then
add_step inst_cmake
add_step inst_cutecash
commit 29de71b46d0e5edefe518f48f23e63974189d89e
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sun Aug 12 19:36:50 2012 +0000
Win32: more automated build from git fixes
- use consistent naming for the final installer executable
- Default to no for UPDATE_SOURCES
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22306 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index dc84cf4..14f8542 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -29,6 +29,8 @@ if [ -z "$BUILD_FROM_TARBALL" ]; then
fi
fi
+# only change this to "yes" if you are using install.sh from the outside the repository checkout
+set_default UPDATE_SOURCES noyes
if [ "$BUILD_FROM_TARBALL" = "yes" ]; then
UPDATE_SOURCES=no
set_default GNUCASH_DIR "$(wpwd ..\\..)"
@@ -36,8 +38,6 @@ if [ "$BUILD_FROM_TARBALL" = "yes" ]; then
# keep this pointing from BUILD_DIR to REPOS_DIR
set_default REL_REPOS_DIR ..
else
- # change this to "no" if you are using install.sh from the same repository checkout
- set_default UPDATE_SOURCES yes
set_default GNUCASH_DIR $GLOBAL_DIR\\gnucash
set_default REPOS_DIR $GNUCASH_DIR\\repos
# keep this pointing from BUILD_DIR to REPOS_DIR
diff --git a/dist-impl.sh b/dist-impl.sh
index 181c5c6..58c0687 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -311,7 +311,7 @@ function dist_finish() {
# And changing output filename
PKG_VERSION=`grep PACKAGE_VERSION ${_BUILD_UDIR}/config.h | cut -d" " -f3 | cut -d\" -f2 `
SVN_REV=`grep GNUCASH_SVN_REV ${_BUILD_UDIR}/src/core-utils/gnc-svninfo.h | cut -d" " -f3 | cut -d\" -f2 `
- SETUP_FILENAME="gnucash-${PKG_VERSION}-svn-r${SVN_REV}-setup.exe"
+ SETUP_FILENAME="gnucash-${PKG_VERSION}-${REPOS_TYPE}-r${SVN_REV}-setup.exe"
qpushd ${_GNUCASH_UDIR}
mv gnucash-${PKG_VERSION}-setup.exe ${SETUP_FILENAME}
qpopd
commit 1748d99c531b982fc8652b93fe2f4614abdcf0fe
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat Aug 11 16:29:56 2012 +0000
Win32: bugfix in the git scripts
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22305 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_package_git.sh b/build_package_git.sh
index 1349d43..f5e2595 100644
--- a/build_package_git.sh
+++ b/build_package_git.sh
@@ -4,6 +4,7 @@
# This assumes we're in the "packaging" directory for the correct build.
# It could be the packaging/win32 subdir of a tag checkout, or it could
# be the top-level daily-build packaging directory.
+# Note: GIT_CMD below should have been set by a calling script.
#
set -o pipefail
diff --git a/daily_build_git.sh b/daily_build_git.sh
index 400c1bb..af6e533 100644
--- a/daily_build_git.sh
+++ b/daily_build_git.sh
@@ -18,7 +18,7 @@ qpushd "$(dirname $(unix_path "$0"))"
# Variables
_GIT_UDIR=`unix_path $GIT_DIR`
set_env "$_GIT_UDIR/bin/git" GIT_CMD
-export $GIT_CMD
+export GIT_CMD
$GIT_CMD pull
./build_package_git.sh
commit b6a375dda0cfe224a5b11059c448b99fb6e1ef86
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat Aug 11 14:24:45 2012 +0000
First attempt at rewriting the win32 automated build scripts for git
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22304 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_package_git.sh b/build_package_git.sh
new file mode 100644
index 0000000..1349d43
--- /dev/null
+++ b/build_package_git.sh
@@ -0,0 +1,107 @@
+#!/bin/sh
+
+#
+# This assumes we're in the "packaging" directory for the correct build.
+# It could be the packaging/win32 subdir of a tag checkout, or it could
+# be the top-level daily-build packaging directory.
+#
+
+set -o pipefail
+set -e
+LOG_DIR=build-logs
+
+function on_error() {
+ if [ `hostname` = "gnucash-win32" ]; then
+ scp -p ${LOGFILE} upload at code.gnucash.org:public_html/win32/$LOG_DIR
+ fi
+ exit
+}
+
+function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
+
+tag="$1"
+
+. functions.sh
+. defaults.sh
+
+# Determine where to upload to
+# NOTE: this assumes GIT_REV to be either a tag or a branch, not a
+# commit hash. It will probably work with a hash as well,
+# but will create a directory for the hash
+if [ -n "$($GIT_CMD tag -l $GIT_REV)" ]; then
+ TARGET_DIR=releases
+ LOG_TAG=$tag
+else
+ TARGET_DIR=${GIT_REV}
+ LOG_TAG=$TARGET_DIR
+fi
+
+set_default OUTPUT_DIR $GLOBAL_DIR\\output
+LOGFILENAME=build-${LOG_TAG}-`date +'%Y-%m-%d'`.log
+
+_OUTPUT_DIR=`unix_path $OUTPUT_DIR`
+LOGFILE=${_OUTPUT_DIR}/${LOGFILENAME}
+mkdir -p ${_OUTPUT_DIR}
+
+# Small hack to create $LOG_DIR on the webserver if it doesn't exist yet
+if [ `hostname` = "gnucash-win32" ]; then
+ mkdir -p "$_OUTPUT_DIR/$LOG_DIR"
+ scp -r "$_OUTPUT_DIR/$LOG_DIR" upload at code.gnucash.org:public_html/win32
+ rmdir "$_OUTPUT_DIR/$LOG_DIR"
+fi
+
+set +e
+trap on_error ERR
+
+# Run the compile
+./install.sh 2>&1 | tee ${LOGFILE}
+
+# This directory needs to be removed before calling dist.sh
+DIST_DIR=${INSTALL_DIR}\\..\\dist
+_DIST_UDIR=`unix_path $DIST_DIR`
+rm -rf ${_DIST_UDIR}
+
+# Create the installer
+./dist.sh 2>&1 | tee -a ${LOGFILE}
+
+# Copy the resulting installer into the output directory
+_BUILD_UDIR=`unix_path $BUILD_DIR`
+_GNUCASH_UDIR=`unix_path $GNUCASH_DIR`
+PKG_VERSION=`grep PACKAGE_VERSION ${_BUILD_UDIR}/config.h | cut -d" " -f3 | cut -d\" -f2 `
+SVN_REV=`grep GNUCASH_SVN_REV ${_BUILD_UDIR}/src/core-utils/gnc-svninfo.h | cut -d" " -f3 | cut -d\" -f2 `
+
+# Choose the output filename based on our "build_from_tarball" setting
+# Make sure this logic matches the logic in dist.sh!
+if [ "$BUILD_FROM_TARBALL" = "no" ]; then
+ SETUP_FILENAME="gnucash-${PKG_VERSION}-git-r${SVN_REV}-setup.exe"
+else
+ SETUP_FILENAME="gnucash-${PKG_VERSION}-setup.exe"
+fi
+mv ${_GNUCASH_UDIR}/${SETUP_FILENAME} ${_OUTPUT_DIR}
+
+#
+# Verify that PKG_VERSION == $tag, and add to the build log if it's not.
+# Note: only do this if tag exists and matches x.y.z
+#
+if [ -n "${tag}" ] ; then
+ case "${tag}" in
+ [0-9]*.[0-9]*.[0-9]*)
+ if [ "${PKG_VERSION}" != "${tag}" ] ; then
+ echo "" >> ${LOGFILE}
+ echo " *** ERROR: Package Version ${PKG_VERSION} doesn't match Tag ${tag}" >> ${LOGFILE}
+ echo "" >> ${LOGFILE}
+ fi
+ ;;
+ esac
+fi
+
+# If we're running on the build server then upload the files
+if [ `hostname` = "gnucash-win32" ]; then
+ # Small hack to create the $TARGET_DIR on the webserver if it doesn't exist yet
+ mkdir -p "$_OUTPUT_DIR/$TARGET_DIR"
+ scp -r "$_OUTPUT_DIR/$TARGET_DIR" upload at code.gnucash.org:public_html/win32
+ rmdir "$_OUTPUT_DIR/$TARGET_DIR"
+ # Copy the files to the chosen target directory
+ scp -p ${LOGFILE} upload at code.gnucash.org:public_html/win32/$LOG_DIR
+ scp -p ${_OUTPUT_DIR}/${SETUP_FILENAME} upload at code.gnucash.org:public_html/win32/$TARGET_DIR
+fi
diff --git a/build_tags_git.sh b/build_tags_git.sh
new file mode 100644
index 0000000..d56ff6b
--- /dev/null
+++ b/build_tags_git.sh
@@ -0,0 +1,105 @@
+#!/bin/sh
+#
+# Note: for this script to work, git must have been setup before
+# in a way that doesn't conflict with the GnuCash build.
+# The easiest way to do so is to run the build once manually
+# with a properly set up custom.sh.
+
+set -e
+
+function qpushd() { pushd "$@" >/dev/null; }
+function qpopd() { popd >/dev/null; }
+function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
+
+TAG_URL=http://svn.gnucash.org/repo/gnucash/tags
+
+################################################################
+# Setup our environment (we need the DOWNLOAD_DIR)
+
+qpushd "$(dirname $(unix_path "$0"))"
+pkgdir="`pwd`"
+. functions.sh
+. defaults.sh
+
+# Variables
+_GIT_UDIR=`unix_path $GIT_DIR`
+set_env "$_GIT_UDIR/bin/git" GIT_CMD
+export $GIT_CMD
+
+$GIT_CMD pull
+. functions.sh
+. defaults.sh
+
+
+################################################################
+# determine if there are any new tags since the last time we ran
+#
+
+# If we don't have a tagfile then start from 'now'
+tagfile=tags_git
+if [ ! -f ${tagfile} ] ; then
+ for one_tag in $($GIT_CMD tag)
+ do
+ tag_hash=$($GIT_CMD rev_parse ${one_tag})
+ echo ${one_tag}/${tag_hash} >> ${tagfile}
+ done
+fi
+
+# Figure out the new set of tags
+rm -f ${tagfile}.new
+for one_tag in $($GIT_CMD tag)
+do
+ tag_hash=$($GIT_CMD rev_parse ${one_tag})
+echo ${one_tag}/${tag_hash} >> ${tagfile}.new
+done
+tags="`diff --suppress-common-lines ${tagfile} ${tagfile}.new | grep '^> ' | sed -e 's/^> //g'`"
+
+# move the new file into place
+mv -f ${tagfile}.new ${tagfile}
+
+################################################################
+# Now iterate over all the new tags (if any) and build a package
+
+for tag_rev in $tags ; do
+ tag=${tag_rev#*/}
+ tag=${tag%/*}
+ tagbasedir=/c/soft/gnucash-${tag}
+ tagdir=${tagbasedir}/gnucash
+ rm -fr $tagbasedir
+ mkdir -p ${tagdir}
+
+ # Copy the downloads to save time
+ mkdir -p ${tagbasedir}/downloads
+ cp -p $(unix_path ${DOWNLOAD_DIR})/* ${tagbasedir}/downloads
+
+ # Check out the tag and setup custom.sh
+ $GIT_CMD clone checkout ${REPO_URL} ${tagdir}/repos
+ qpushd {tagdir}/repos
+ $GIT_CMD checkout $tag
+ qpopd
+ w32pkg=${tagdir}/repos/packaging/win32
+ cp -p "${pkgdir}/custom.sh" ${w32pkg}/custom.sh
+
+ # Set the global directory to the tag build
+ echo -n 'GLOBAL_DIR=c:\\soft\\gnucash-' >> ${w32pkg}/custom.sh
+ echo "${tag}" >> ${w32pkg}/custom.sh
+
+ # No need to update the sources we just checked out
+ echo "UPDATE_SOURCES=no" >> ${w32pkg}/custom.sh
+
+ # BUILD_FROM_TARBALL is special:
+ # in install.sh place we check !=yes, in defaults.sh =yes, in dist.sh =no
+ # We want it to look like 'no' in install and defaults, but yes in dist
+ # so this hack works!
+ echo "BUILD_FROM_TARBALL=maybe" >> ${w32pkg}/custom.sh
+
+ # Point HH_DIR at the global installation because we don't need to redo it
+ echo -n "HH_DIR=" >> ${w32pkg}/custom.sh
+ echo "${GLOBAL_DIR}\\hh" | sed -e 's/\\/\\\\/g' >> ${w32pkg}/custom.sh
+
+ # Now build the tag! (this will upload it too)
+ # Use the build_package script from trunk (cwd), not from the tag
+ qpushd ${w32pkg}
+ ${pkgdir}/build_package.sh ${tag}
+ qpopd
+done
diff --git a/daily_build_git.sh b/daily_build_git.sh
new file mode 100644
index 0000000..400c1bb
--- /dev/null
+++ b/daily_build_git.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# Note: for this script to work, git must have been setup before
+# in a way that doesn't conflict with the GnuCash build.
+# The easiest way to do so is to run the build once manually
+# with a properly set up custom.sh.
+
+set -e
+
+function qpushd() { pushd "$@" >/dev/null; }
+function qpopd() { popd >/dev/null; }
+function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
+
+qpushd "$(dirname $(unix_path "$0"))"
+. functions.sh
+. defaults.sh
+
+# Variables
+_GIT_UDIR=`unix_path $GIT_DIR`
+set_env "$_GIT_UDIR/bin/git" GIT_CMD
+export $GIT_CMD
+
+$GIT_CMD pull
+./build_package_git.sh
+qpopd
diff --git a/weekly_build_git.sh b/weekly_build_git.sh
new file mode 100644
index 0000000..2f9a6ed
--- /dev/null
+++ b/weekly_build_git.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# Note: for this script to work, git must have been setup before
+# in a way that doesn't conflict with the GnuCash build.
+# The easiest way to do so is to run the build once manually
+# with a properly set up custom.sh.
+
+set -e
+
+## Only run this script on Monday night (first day of the week)
+if [ `date +%u` != 1 ] ; then exit ; fi
+
+function qpushd() { pushd "$@" >/dev/null; }
+function qpopd() { popd >/dev/null; }
+function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
+
+qpushd "$(dirname $(unix_path "$0"))"
+. functions.sh
+. defaults.sh
+
+# Variables
+_GIT_UDIR=`unix_path $GIT_DIR`
+set_env "$_GIT_UDIR/bin/git" GIT_CMD
+export $GIT_CMD
+
+$GIT_CMD pull
+./build_package.sh
+qpopd
commit d8004d22ebdf2df1cb0f17d0c1745ee24e57a72f
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat Aug 11 14:24:33 2012 +0000
Win32: fix UPDATE_SOURCES with a git repo
IMPORTANT: the update mechanism from git has been kept deliberately
simple because svn updates don't really match well to
git's distributed repository concept.
It assumes you are working as a non-committer (see
http://wiki.gnucash.org/wiki/Git for what that means) and will
simply try to pull the current branch from the upstream
repository. I don't know of any currently active committer that works
from Windows, so to start that should be sufficient.
Setting up git-update instead of git pull requires more thorough
changes in the Windows build system:
- it requires at least perl 5.8 (our default msys-dtk only install perl
5.6)
- the environment variable GITPERLLIB should be set to the perl library
that comes with the installed git.
- git-update should be installed somewhere
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22303 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
index 17b6055..d69c682 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -268,7 +268,8 @@ function inst_git() {
else
smart_wget $GIT_URL $DOWNLOAD_DIR
$LAST_FILE //SP- //SILENT //DIR="$GIT_DIR"
- quiet "$_GIT_UDIR/bin/git" --help || die "git unavailable"
+ set_env "$_GIT_UDIR/bin/git" GIT_CMD
+ quiet "$GIT_CMD" --help || die "git unavailable"
fi
# Make sure GIT_CMD is available to subshells if it is set
[ -n "$GIT_CMD" ] && export GIT_CMD
@@ -1457,14 +1458,20 @@ function git_up() {
qpushd $_REPOS_UDIR
if [ -x .git ]; then
setup "git update in ${REPOS_DIR}"
-# FIXME I'm not sure what update sources should do for git.
-# git update ? That would pull from upstream branches
-# but does nothing useful if the user checked out a local branches
-# Additionally this script is not available by default
-# git pull ? I'm not sure if this doesn't have unwanted side effects
-# So for now an update does nothing other than cloning the repository the
-# first time it's called
-# $GIT_CMD pull origin
+# IMPORTANT: the update mechanism from git
+# has been kept deliberately simple.
+#
+# It assumes you are working as a non-committer
+# (see http://wiki.gnucash.org/wiki/Git for what that means)
+# and will simply try to pull the current branch from
+# the upstream repository.
+# If you are a committer (and intend to commit from your Windows
+# git clone) you should disable updates from the build scripts
+# and manually update using the git-update script.
+# FIXME the last part needs perl 5.8 and some config tweaks for
+# perl to find git's Git.pm
+# msys-dtk installed by default only has perl 5.6.
+ $GIT_CMD pull origin
else
setup git clone
$GIT_CMD clone $REPOS_URL .
commit 98ebd35c768a7fa83bc8389fa1e9710c853af7fd
Author: John Ralls <jralls at ceridwen.us>
Date: Mon May 21 22:10:00 2012 +0000
Add EXTRA_CFLAGS for compiling on Win7
Configure gets confused by some gcc builtins on Win7: Disable them so that configure finds the right settings.
[BP]
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22197 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/custom.sh.sample b/custom.sh.sample
index a4745ee..ce8bd30 100644
--- a/custom.sh.sample
+++ b/custom.sh.sample
@@ -17,3 +17,5 @@
# function greetings() { setup Greetings; }
# QTDIR=c:\\Qt\\4.2.3
# CROSS_COMPILE=yes
+#Uncomment this for building on Win7 (and maybe Vista):
+#EXTRA_CFLAGS="-fno-builtin-dgettext -fno-builtin-towupper -fno-builtin-iswlower"
\ No newline at end of file
commit 26a3a97e822cbdfba89427f19c701447bf72fbd2
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sun May 6 21:19:34 2012 +0000
Rearrange install-fq-mods.cmd to avoid duplicate code and make it easier to understand
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22170 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-fq-mods.cmd b/install-fq-mods.cmd
index 44d1a2c..ce45e97 100644
--- a/install-fq-mods.cmd
+++ b/install-fq-mods.cmd
@@ -1,5 +1,6 @@
@echo off
setlocal
+
REM ----------------------------------------------------------------------------
if not exist ssleay32.dll (
echo.
@@ -7,6 +8,7 @@ if not exist ssleay32.dll (
echo Please start this cmd file in the bin directory created by the setup.exe.
goto error
)
+
REM ----------------------------------------------------------------------------
echo.
echo * Check Perl
@@ -14,53 +16,50 @@ echo.
perl -v > NUL 2>&1
if %errorlevel% equ 0 goto chkver
echo.
-echo no perl executable found
-echo.
-echo Now finding and installing perl.....
+echo No Perl executable found, attempt to install Strawberry Perl
+
REM ----------------------------------------------------------------------------
echo.
-echo * download Strawberry perl
+echo * Download Strawberry Perl package
echo.
call cscript//nologo getperl.vbs %TEMP%\Perl.msi
-if %errorlevel% equ 0 goto donegetperl
+if %errorlevel% neq 0 (
echo Return Value: "%errorlevel%"
echo.
echo failed to download perl install file
echo.
goto error
-:donegetperl
+)
+
REM ----------------------------------------------------------------------------
echo.
-echo * automated Perl install
+echo * Run automated Perl install
echo.
msiexec /qb /l* %TEMP%\perl-log.txt /i %TEMP%\Perl.msi PERL_PATH=Yes PERL_EXT=Yes
-if %errorlevel% equ 0 goto doneperlinst
+if %errorlevel% neq 0 (
echo Return Value: "%errorlevel%"
echo.
- echo failed to install perl (%TEMP%\Perl.msi)
+ echo failed to install perl from %TEMP%\Perl.msi
echo.
+ del %TEMP%\Perl.msi
goto error
-:doneperlinst
+)
perl -v
del %TEMP%\Perl.msi
+
REM ----------------------------------------------------------------------------
echo.
-echo * updating PATH variable to include Perl
+echo * Update PATH variable to include Perl
echo.
:: delims is a TAB followed by a space
FOR /F "tokens=2* delims= " %%A IN ('REG QUERY "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment" /v Path') DO SET NewPath=%%B
ECHO NewPath = %NewPath%
-set Path="%NewPath%"
-REM ----------------------------------------------------------------------------
-echo.
-echo * Run gnc-fq-update
-echo.
-perl -w gnc-fq-update
-if %errorlevel% neq 0 goto error
+set Path=%NewPath%
+
REM ----------------------------------------------------------------------------
:chkver
echo.
-echo * Check Perl Version
+echo * Check Perl version
echo.
perl -e "exit(int($]));"
set _perlmajor=%errorlevel%
@@ -69,38 +68,26 @@ set _perlminor=%errorlevel%
if %_perlmajor% equ 5 (
if %_perlminor% geq 10 (
set _perlversion=5.10
- goto ccp
+ goto pchk
)
if %_perlminor% equ 8 (
set _perlversion=5.8
- goto ccp
+ goto pchk
)
+REM Note: GnuCash no longer "officially" supports perl 5.6, but as long as it works it will be allowed...
if %_perlminor% equ 6 (
set _perlversion=5.6
- goto ccp
+ goto pchk
)
)
echo.
-echo Did not find a usable perl.
-echo Please install ActivePerl 5.8, or above (http://www.activestate.com/store/activeperl)
+echo Found perl version %_perlmajor%.%_perlminor%, but GnuCash requires at least version 5.8.
+echo Please install version 5.8 or above of
+echo * ActivePerl (http://www.activestate.com/store/activeperl) or
+echo * Strawberry Perl (http://strawberry-perl.googlecode.com/files/)
echo and add the bin directory to your Path environment variable.
goto error
-REM ----------------------------------------------------------------------------
-:ccp
-echo.
-echo * Test for ActivePerl
-echo.
-perl -e "use Win32;if(defined &Win32::BuildNumber){exit 2;}else{exit 3;};"
-REM echo status = %errorlevel%
-if %errorlevel% equ 2 (
-set bld=AS
-goto pchk
-)else if %errorlevel% equ 3 (
-set bld=Other
-goto pchk
-)
-if %errorlevel% equ 0 goto pchk
-goto error
+
REM ----------------------------------------------------------------------------
:pchk
REM echo.
@@ -108,31 +95,47 @@ REM echo * Run gnc-path-check
REM echo.
REM perl -w gnc-path-check
REM if %errorlevel% neq 0 goto error
+
REM ----------------------------------------------------------------------------
+echo.
+echo * Determine which Perl flavour we have found
+echo.
+perl -e "use Win32;if(defined &Win32::BuildNumber){exit 2;}else{exit 3;};"
+REM echo status = %errorlevel%
+if %errorlevel% equ 2 (
+ echo => ActivePerl
+ goto inst_mod_as
+) else if %errorlevel% equ 3 (
+ echo => Other, probably Strawberry perl ?
+ goto inst_mod_oth
+) else if %errorlevel% neq 0 goto error
+
+REM ----------------------------------------------------------------------------
+:inst_mod_oth
+echo.
+echo * Install required perl modules
+echo.
+perl -w gnc-fq-update
+if %errorlevel% neq 0 goto error
+goto fqchk
+
+REM ----------------------------------------------------------------------------
+:inst_mod_as
echo * Install DateManip
echo.
-if "%bld%" equ "AS" (
perl -x -S ppm install Date-Manip
if %errorlevel% neq 0 (
perl -x -S ppm install DateManip
if %errorlevel% neq 0 goto error
)
-)else if "%bld%" equ "Other" (
-perl -e "use strict;use CPAN;CPAN::Shell->install('Date::Manip');"
-if %errorlevel% neq 0 (
-echo failed to install Date::Manip module
-goto error
-)
-)
+
REM ----------------------------------------------------------------------------
echo.
echo * Install Crypt-SSLeay
echo.
-
-if "%bld%" equ "AS" (
-set OLDPATH="%PATH%"
-set PATH="%CD%;%PATH%"
+set OLDPATH=%PATH%
+set PATH=%CD%;%PATH%
if %_perlversion% == 5.6 (
perl -x -S ppm install http://theoryx5.uwinnipeg.ca/ppmpackages/Crypt-SSLeay.ppd
) else if %_perlversion% == 5.8 (
@@ -141,66 +144,44 @@ if %_perlversion% == 5.6 (
perl -x -S ppm install Crypt-SSLeay
)
set errlvlbak=%errorlevel%
-set PATH="%OLDPATH%"
+set PATH=%OLDPATH%
if "%errlvlbak%" neq "0" goto error
-)else if "%bld%" equ "Other" (
-echo using CPAN install for Crypt::SSLeay
-perl -e "use strict;use CPAN;CPAN::Shell->install('Crypt::SSLeay');"
-if %errorlevel% neq 0 (
-echo failed to install Crypt::SSLeay module
-goto error
-)
-)
-REM ----------------------------------------------------------------------------
-REM for some reason a CPAN install of Finance::Quote does not install prequisite
-REM package HTML::Treebuilder
-echo.
-echo * Install HTML-TreeBuilder
-echo.
-if "%bld%" equ "Other" (
-perl -e "use strict;use CPAN;CPAN::Shell->install('HTML::TreeBuilder');"
-if %errorlevel% neq 0 (
-echo failed to install HTML::TreeBuilder module
-goto error
-)
-)
+
REM ----------------------------------------------------------------------------
echo.
echo * Install Finance-Quote
echo.
-if "%bld%" equ "AS" (
perl -x -S ppm install Finance-Quote
if %errorlevel% neq 0 goto error
-)
-if "%bld%" equ "Other" (
-perl -e "use strict;use CPAN;CPAN::Shell->install('Finance::Quote');"
-if %errorlevel% neq 0 (
-echo failed to install Finance::Quote module
-goto error
-)
-)
+
REM ----------------------------------------------------------------------------
+:fqchk
echo.
echo * Run gnc-fq-check
echo.
perl -w gnc-fq-check
if %errorlevel% neq 0 goto error
+
REM ----------------------------------------------------------------------------
echo.
echo * Run gnc-fq-helper
echo.
echo (yahoo "AMZN") | perl -w gnc-fq-helper
if %errorlevel% neq 0 goto error
+
REM ----------------------------------------------------------------------------
+:success
echo.
echo * Installation succeeded
echo.
goto end
+
REM ----------------------------------------------------------------------------
:error:
echo.
echo An error occurred, see above.
echo.
+
REM ----------------------------------------------------------------------------
:end
pause
commit 8d64d81b56fde0db94ac0f2cbf83e59e663068ec
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sun May 6 21:19:24 2012 +0000
Bug #670355 - Automated install of Perl with Finance-Quote
With these changes install-fq-mods.cmd will automatically download and install
Strawberry perl if now perl version if found on the system.
Patches by Dave Roberts
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22169 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/Makefile.am b/Makefile.am
index 2b9c07d..831420b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,6 +4,8 @@ EXTRA_DIST = \
dist.sh \
exetype.pl \
functions.sh \
+ getperl.vbs \
+ gnc-path-check \
goffice-0.7.2-patch.diff \
gwenhywfar-3.6.0-patch.diff \
install.sh \
diff --git a/dist-impl.sh b/dist-impl.sh
index 1d79428..181c5c6 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -255,7 +255,7 @@ function dist_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 $_REPOS_UDIR/packaging/win32/install-fq-mods.cmd $DIST_UDIR/bin
+ 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' )
if [ "$AQBANKING5" != "yes" ] ; then
diff --git a/getperl.vbs b/getperl.vbs
new file mode 100644
index 0000000..b2b5fe9
--- /dev/null
+++ b/getperl.vbs
@@ -0,0 +1,49 @@
+' script to download perl install file and save on local disc
+' the location of which is provided by first argument
+
+
+Const WindowsFolder = 0
+Const SystemFolder = 1
+Const TemporaryFolder = 2
+Dim fso: Set fso = CreateObject("Scripting.FileSystemObject")
+Dim tempFolder: tempFolder = fso.GetSpecialFolder(TemporaryFolder)
+
+strHDLocation = Wscript.Arguments.Item(0)
+
+' Set your settings
+ strFileURL = "http://strawberry-perl.googlecode.com/files/strawberry-perl-5.12.3.0.msi"
+
+ Wscript.Echo " copying " & strFileURL
+ Wscript.Echo " to " & strHDLocation
+
+
+' Fetch the file
+ Set objXMLHTTP = CreateObject("MSXML2.XMLHTTP")
+
+ objXMLHTTP.open "GET", strFileURL, false
+ objXMLHTTP.send()
+
+If objXMLHTTP.Status = 200 Then
+ Set objADOStream = CreateObject("ADODB.Stream")
+ objADOStream.Open
+ objADOStream.Type = 1 'adTypeBinary
+
+ objADOStream.Write objXMLHTTP.ResponseBody
+ objADOStream.Position = 0 'Set the stream position to the start
+
+ Set objFSO = Createobject("Scripting.FileSystemObject")
+ If objFSO.Fileexists(strHDLocation) Then objFSO.DeleteFile strHDLocation
+
+ objADOStream.SaveToFile strHDLocation
+ objADOStream.Close
+ Set objADOStream = Nothing
+ If objFSO.Fileexists(strHDLocation) Then
+ Wscript.Echo " "
+ Wscript.Echo " " & strHDLocation & " downloaded OK"
+ Wscript.Echo " "
+ Set objFSO = Nothing
+ wscript.quit 0
+ End if
+End if
+
+wscript.quit 1
diff --git a/gnc-path-check b/gnc-path-check
new file mode 100644
index 0000000..1dc1661
--- /dev/null
+++ b/gnc-path-check
@@ -0,0 +1,71 @@
+#!/bin/perl -w
+######################################################################
+### gnc-path-check - verify the windows path
+###
+### This script verifies the window path. It is used to check for an error
+### condition identified in Bug 657117
+### (https://bugzilla.gnome.org/show_bug.cgi?id=657117)
+###
+### Verifying that all directies in the path environment will avoid
+### the glib bug conditioned identified bug 670233.
+###
+### Copyright © Dave Roberts 2012 (droberts at cpan.org)
+###
+### This program is free software; you can redistribute it and/or
+### modify it under the terms of the GNU General Public License as
+### published by the Free Software Foundation; either version 2 of
+### the License, or (at your option) any later version.
+###
+### This program is distributed in the hope that it will be useful,
+### but WITHOUT ANY WARRANTY; without even the implied warranty of
+### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+### GNU General Public License for more details.
+###
+### You should have received a copy of the GNU General Public License
+### along with this program# if not, contact:
+###
+### Free Software Foundation Voice: +1-617-542-5942
+### 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652
+### Boston, MA 02110-1301, USA gnu at gnu.org
+######################################################################
+
+use strict;
+use English;
+use Win32;
+
+# Input: <none>
+#
+# Output:
+#
+# A list of directory names in the PATH that are not valid. The normal
+# output (no error found) is nothing.
+#
+# Exit status
+#
+# 0 - success
+# non-zero - failure - number of invalid directories found
+
+my $path = Win32::ExpandEnvironmentStrings("%Path%");
+my(@path) = split(/;/,$path);
+my($error) = 0;
+my($msg) = << "EOT";
+
+The following directory name(s) were found in the PATH environment
+which are invalid. This may cause the Finance Quote function to fail
+depending on the order of directories in the PATH. Please correct the
+system PATH variable.
+
+EOT
+
+foreach my $_ (@path){
+ my($dir) = Win32::ExpandEnvironmentStrings("$_");
+ unless (-d $dir){
+ $msg .= " $dir\n";
+ $error++;
+ }
+}
+if ($error){
+ print STDERR $msg;
+}
+exit $error;
+
diff --git a/install-fq-mods.cmd b/install-fq-mods.cmd
index 1c35b21..44d1a2c 100644
--- a/install-fq-mods.cmd
+++ b/install-fq-mods.cmd
@@ -1,16 +1,67 @@
@echo off
setlocal
-
+REM ----------------------------------------------------------------------------
if not exist ssleay32.dll (
echo.
echo Did not find ssleay32.dll in current directory.
echo Please start this cmd file in the bin directory created by the setup.exe.
goto error
)
-
+REM ----------------------------------------------------------------------------
echo.
echo * Check Perl
echo.
+perl -v > NUL 2>&1
+if %errorlevel% equ 0 goto chkver
+echo.
+echo no perl executable found
+echo.
+echo Now finding and installing perl.....
+REM ----------------------------------------------------------------------------
+echo.
+echo * download Strawberry perl
+echo.
+call cscript//nologo getperl.vbs %TEMP%\Perl.msi
+if %errorlevel% equ 0 goto donegetperl
+ echo Return Value: "%errorlevel%"
+ echo.
+ echo failed to download perl install file
+ echo.
+ goto error
+:donegetperl
+REM ----------------------------------------------------------------------------
+echo.
+echo * automated Perl install
+echo.
+msiexec /qb /l* %TEMP%\perl-log.txt /i %TEMP%\Perl.msi PERL_PATH=Yes PERL_EXT=Yes
+if %errorlevel% equ 0 goto doneperlinst
+ echo Return Value: "%errorlevel%"
+ echo.
+ echo failed to install perl (%TEMP%\Perl.msi)
+ echo.
+ goto error
+:doneperlinst
+perl -v
+del %TEMP%\Perl.msi
+REM ----------------------------------------------------------------------------
+echo.
+echo * updating PATH variable to include Perl
+echo.
+:: delims is a TAB followed by a space
+FOR /F "tokens=2* delims= " %%A IN ('REG QUERY "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment" /v Path') DO SET NewPath=%%B
+ECHO NewPath = %NewPath%
+set Path="%NewPath%"
+REM ----------------------------------------------------------------------------
+echo.
+echo * Run gnc-fq-update
+echo.
+perl -w gnc-fq-update
+if %errorlevel% neq 0 goto error
+REM ----------------------------------------------------------------------------
+:chkver
+echo.
+echo * Check Perl Version
+echo.
perl -e "exit(int($]));"
set _perlmajor=%errorlevel%
perl -e "$ver=1000*sprintf(\"%%.3f\", $]); exit(int($ver)-5000);"
@@ -34,21 +85,54 @@ echo Did not find a usable perl.
echo Please install ActivePerl 5.8, or above (http://www.activestate.com/store/activeperl)
echo and add the bin directory to your Path environment variable.
goto error
+REM ----------------------------------------------------------------------------
:ccp
-
+echo.
+echo * Test for ActivePerl
+echo.
+perl -e "use Win32;if(defined &Win32::BuildNumber){exit 2;}else{exit 3;};"
+REM echo status = %errorlevel%
+if %errorlevel% equ 2 (
+set bld=AS
+goto pchk
+)else if %errorlevel% equ 3 (
+set bld=Other
+goto pchk
+)
+if %errorlevel% equ 0 goto pchk
+goto error
+REM ----------------------------------------------------------------------------
+:pchk
+REM echo.
+REM echo * Run gnc-path-check
+REM echo.
+REM perl -w gnc-path-check
+REM if %errorlevel% neq 0 goto error
+REM ----------------------------------------------------------------------------
echo * Install DateManip
echo.
+if "%bld%" equ "AS" (
perl -x -S ppm install Date-Manip
if %errorlevel% neq 0 (
perl -x -S ppm install DateManip
if %errorlevel% neq 0 goto error
)
-
+)else if "%bld%" equ "Other" (
+perl -e "use strict;use CPAN;CPAN::Shell->install('Date::Manip');"
+if %errorlevel% neq 0 (
+echo failed to install Date::Manip module
+goto error
+)
+)
+REM ----------------------------------------------------------------------------
echo.
echo * Install Crypt-SSLeay
echo.
-set OLDPATH=%PATH%
-set PATH=%CD%;%PATH%
+
+
+if "%bld%" equ "AS" (
+set OLDPATH="%PATH%"
+set PATH="%CD%;%PATH%"
if %_perlversion% == 5.6 (
perl -x -S ppm install http://theoryx5.uwinnipeg.ca/ppmpackages/Crypt-SSLeay.ppd
) else if %_perlversion% == 5.8 (
@@ -57,36 +141,67 @@ if %_perlversion% == 5.6 (
perl -x -S ppm install Crypt-SSLeay
)
set errlvlbak=%errorlevel%
-set PATH=%OLDPATH%
-if %errlvlbak% neq 0 goto error
-
+set PATH="%OLDPATH%"
+if "%errlvlbak%" neq "0" goto error
+)else if "%bld%" equ "Other" (
+echo using CPAN install for Crypt::SSLeay
+perl -e "use strict;use CPAN;CPAN::Shell->install('Crypt::SSLeay');"
+if %errorlevel% neq 0 (
+echo failed to install Crypt::SSLeay module
+goto error
+)
+)
+REM ----------------------------------------------------------------------------
+REM for some reason a CPAN install of Finance::Quote does not install prequisite
+REM package HTML::Treebuilder
+echo.
+echo * Install HTML-TreeBuilder
+echo.
+if "%bld%" equ "Other" (
+perl -e "use strict;use CPAN;CPAN::Shell->install('HTML::TreeBuilder');"
+if %errorlevel% neq 0 (
+echo failed to install HTML::TreeBuilder module
+goto error
+)
+)
+REM ----------------------------------------------------------------------------
echo.
echo * Install Finance-Quote
echo.
+if "%bld%" equ "AS" (
perl -x -S ppm install Finance-Quote
if %errorlevel% neq 0 goto error
-
+)
+if "%bld%" equ "Other" (
+perl -e "use strict;use CPAN;CPAN::Shell->install('Finance::Quote');"
+if %errorlevel% neq 0 (
+echo failed to install Finance::Quote module
+goto error
+)
+)
+REM ----------------------------------------------------------------------------
echo.
echo * Run gnc-fq-check
echo.
perl -w gnc-fq-check
if %errorlevel% neq 0 goto error
-
+REM ----------------------------------------------------------------------------
echo.
echo * Run gnc-fq-helper
echo.
echo (yahoo "AMZN") | perl -w gnc-fq-helper
if %errorlevel% neq 0 goto error
-
+REM ----------------------------------------------------------------------------
echo.
echo * Installation succeeded
echo.
goto end
-
+REM ----------------------------------------------------------------------------
:error:
echo.
echo An error occurred, see above.
echo.
-
+REM ----------------------------------------------------------------------------
:end
pause
+
commit 8756db73d820f6159190bd73786797c29509827a
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat Apr 28 16:18:29 2012 +0000
Further tweaks to enable git on the windows build
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22167 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index a1346cd..dc84cf4 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -35,21 +35,26 @@ if [ "$BUILD_FROM_TARBALL" = "yes" ]; then
set_default REPOS_DIR $GNUCASH_DIR
# keep this pointing from BUILD_DIR to REPOS_DIR
set_default REL_REPOS_DIR ..
- set_default BUILD_DIR $GNUCASH_DIR\\build
- set_default INSTALL_DIR $GNUCASH_DIR\\inst
else
# change this to "no" if you are using install.sh from the same repository checkout
set_default UPDATE_SOURCES yes
- # latest revision that should compile, use HEAD or vwxyz
- set_default SVN_REV "HEAD"
set_default GNUCASH_DIR $GLOBAL_DIR\\gnucash
- set_default REPOS_URL "http://svn.gnucash.org/repo/gnucash/trunk"
set_default REPOS_DIR $GNUCASH_DIR\\repos
# keep this pointing from BUILD_DIR to REPOS_DIR
set_default REL_REPOS_DIR ..\\repos
- set_default BUILD_DIR $GNUCASH_DIR\\build
- set_default INSTALL_DIR $GNUCASH_DIR\\inst
+
+ set_default REPOS_TYPE svn
+ if [ "$REPOS_TYPE" = "git" ]; then
+ set_default GIT_REV "trunk"
+ set_default REPOS_URL "git://github.com/Gnucash/gnucash.git"
+ elif [ "$REPOS_TYPE" = "svn" ]; then
+ # latest revision that should compile, use HEAD or vwxyz
+ set_default SVN_REV "HEAD"
+ set_default REPOS_URL "http://svn.gnucash.org/repo/gnucash/trunk"
+ fi
fi
+set_default BUILD_DIR $GNUCASH_DIR\\build
+set_default INSTALL_DIR $GNUCASH_DIR\\inst
set_default WITH_CUTECASH no
set_default CUTECASH_BUILD_DIR $GNUCASH_DIR\\build-cutecash
@@ -351,8 +356,8 @@ set_default ICU4C_PATCH `pwd`/icu-crossmingw.patch
set_default SVN_URL "http://subversion.tigris.org/files/documents/15/47914/svn-win32-1.6.6.zip"
set_default SVN_DIR $GLOBAL_DIR\\svn
-set_default GIT_URL "http://msysgit.googlecode.com/files/Git-1.7.8-preview20111206.exe"
-set_default GIT_DIR $GLOBAL_DIR\\git-1.7.8
+set_default GIT_URL "http://msysgit.googlecode.com/files/Git-1.7.10-preview20120409.exe"
+set_default GIT_DIR $GLOBAL_DIR\\git-1.7.10
# OFX import in gnucash and ofx directconnect support for aqbanking
set_default OPENSP_URL "$SF_MIRROR/openjade/OpenSP-1.5.2.tar.gz"
diff --git a/install-impl.sh b/install-impl.sh
index d2c338f..17b6055 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -254,15 +254,24 @@ function inst_unzip() {
function inst_git() {
setup Git
_GIT_UDIR=`unix_path $GIT_DIR`
- add_to_env $_GIT_UDIR/bin PATH
- if quiet $_GIT_UDIR/bin/git --help || quiet git --help
+ # Don't add git's directory to the PATH, its installed DLLs conflict
+ # with the ones in our mingw environment
+ # add_to_env $_GIT_UDIR/bin PATH
+ if quiet git --help
+ then
+ echo "git already installed in the system path. skipping."
+ set_env git GIT_CMD
+ elif quiet "$_GIT_UDIR/bin/git" --help
then
echo "git already installed in $_GIT_UDIR. skipping."
+ set_env "$_GIT_UDIR/bin/git" GIT_CMD
else
smart_wget $GIT_URL $DOWNLOAD_DIR
$LAST_FILE //SP- //SILENT //DIR="$GIT_DIR"
- quiet git --help || die "git unavailable"
+ quiet "$_GIT_UDIR/bin/git" --help || die "git unavailable"
fi
+ # Make sure GIT_CMD is available to subshells if it is set
+ [ -n "$GIT_CMD" ] && export GIT_CMD
}
# Functions before this point are basic build infrastructure functions or else they get pieces needed to build
@@ -1443,6 +1452,27 @@ function inst_hh() {
fi
}
+function git_up() {
+ mkdir -p $_REPOS_UDIR
+ qpushd $_REPOS_UDIR
+ if [ -x .git ]; then
+ setup "git update in ${REPOS_DIR}"
+# FIXME I'm not sure what update sources should do for git.
+# git update ? That would pull from upstream branches
+# but does nothing useful if the user checked out a local branches
+# Additionally this script is not available by default
+# git pull ? I'm not sure if this doesn't have unwanted side effects
+# So for now an update does nothing other than cloning the repository the
+# first time it's called
+# $GIT_CMD pull origin
+ else
+ setup git clone
+ $GIT_CMD clone $REPOS_URL .
+ $GIT_CMD checkout $GIT_REV .
+ fi
+ qpopd
+}
+
function svn_up() {
mkdir -p $_REPOS_UDIR
qpushd $_REPOS_UDIR
diff --git a/install.sh b/install.sh
index be68dae..2033dfd 100644
--- a/install.sh
+++ b/install.sh
@@ -83,7 +83,7 @@ add_step inst_gnome
add_step inst_guile
if [ "$CROSS_COMPILE" != "yes" ]; then
add_step inst_svn
-# add_step inst_git
+add_step inst_git
fi
add_step inst_gnutls
add_step inst_libxslt
@@ -112,7 +112,13 @@ add_step inst_webkit
##
if [ "$UPDATE_SOURCES" = "yes" ]; then
- add_step svn_up
+ if [ "$REPOS_TYPE" = "git" ]; then
+ add_step git_up
+ elif [ "$REPOS_TYPE" = "svn" ]; then
+ add_step svn_up
+ else
+ die "Unkown repos type $REPOS_TYPE. Sources can only be updated for git or svn type repos"
+ fi
fi
if [ "$WITH_CUTECASH" = "yes" ]; then
add_step inst_cmake
commit a8021e996574ae9648c1d9c0b0e5c2140f87a3c2
Author: Christian Stimming <stimming at tuhh.de>
Date: Sun Apr 22 20:51:16 2012 +0000
Bug #674494: Fix version and method of downloading isocodes in win32 packaging
Patch by Mark Jenkins
BP
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22157 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index ea57c06..a1346cd 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -428,7 +428,7 @@ set_default DOCS_URL "http://svn.gnucash.org/repo/gnucash-docs/trunk"
set_default DOCS_DIR $GLOBAL_DIR\\gnucash-docs
set_default XSLTPROCFLAGS ""
-set_default ISOCODES_URL "ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/iso-codes-3.18.tar.bz2"
+set_default ISOCODES_URL "http://pkg-isocodes.alioth.debian.org/downloads/iso-codes-3.34.tar.bz2"
set_default ISOCODES_DIR $GLOBAL_DIR\\isocodes
### Local Variables: ***
commit 053476bf23fc6e621c6416aa2c26e66dc610cf91
Author: Christian Stimming <stimming at tuhh.de>
Date: Sun Apr 22 20:49:01 2012 +0000
Bug #674495: Fix libbonoboui build for win32 packaging insists on availability of glade
Patch alters packaging/win32/libbonoboui-2.24.2.patch to not look for glade and not
build libbonoboui-2.24.2/glade
Patch by Mark Jenkins.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22156 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/libbonoboui-2.24.2.patch b/libbonoboui-2.24.2.patch
index f10c5b9..c245d53 100644
--- a/libbonoboui-2.24.2.patch
+++ b/libbonoboui-2.24.2.patch
@@ -1,7 +1,38 @@
-diff -ur libbonoboui-2.24.2/configure libbonoboui-2.24.2-cs/configure
---- libbonoboui-2.24.2/configure 2009-09-22 23:12:20 +0000
-+++ libbonoboui-2.24.2-cs/configure 2010-02-23 12:25:27 +0000
-@@ -16422,219 +16422,6 @@
+diff -ur libbonoboui-2.24.2/configure ../libbonoboui-2.24.2/configure
+--- libbonoboui-2.24.2/configure 2009-09-22 18:12:20.000000000 -0500
++++ ../libbonoboui-2.24.2/configure 2012-04-19 16:43:20.000000000 -0500
+@@ -798,8 +798,6 @@
+ GLIB_MKENUMS
+ GLIB_GENMARSHAL
+ BONOBOUI_SINGLE_INCLUDES
+-BONOBOUI_GLADE_LIBS
+-BONOBOUI_GLADE_CFLAGS
+ BONOBOUI_LIBS
+ BONOBOUI_CFLAGS
+ POPT_LIBS
+@@ -998,9 +996,7 @@
+ XMKMF
+ PKG_CONFIG
+ BONOBOUI_CFLAGS
+-BONOBOUI_LIBS
+-BONOBOUI_GLADE_CFLAGS
+-BONOBOUI_GLADE_LIBS'
++BONOBOUI_LIBS'
+
+
+ # Initialize some variables set by options.
+@@ -1680,10 +1676,6 @@
+ C compiler flags for BONOBOUI, overriding pkg-config
+ BONOBOUI_LIBS
+ linker flags for BONOBOUI, overriding pkg-config
+- BONOBOUI_GLADE_CFLAGS
+- C compiler flags for BONOBOUI_GLADE, overriding pkg-config
+- BONOBOUI_GLADE_LIBS
+- linker flags for BONOBOUI_GLADE, overriding pkg-config
+
+ Use these variables to override the choices made by `configure' or to help
+ it to find libraries and programs with nonstandard names/locations.
+@@ -16422,219 +16414,6 @@
# popt
@@ -221,3 +252,202 @@ diff -ur libbonoboui-2.24.2/configure libbonoboui-2.24.2-cs/configure
+@@ -16891,115 +16670,6 @@
+ fi;
+
+
+-pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for BONOBOUI_GLADE" >&5
+-$as_echo_n "checking for BONOBOUI_GLADE... " >&6; }
+-
+-if test -n "$BONOBOUI_GLADE_CFLAGS"; then
+- pkg_cv_BONOBOUI_GLADE_CFLAGS="$BONOBOUI_GLADE_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$BONOBOUI_MODULES libglade-2.0 >= 1.99.11\"") >&5
+- ($PKG_CONFIG --exists --print-errors "$BONOBOUI_MODULES libglade-2.0 >= 1.99.11") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_BONOBOUI_GLADE_CFLAGS=`$PKG_CONFIG --cflags "$BONOBOUI_MODULES libglade-2.0 >= 1.99.11" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
+-fi
+-if test -n "$BONOBOUI_GLADE_LIBS"; then
+- pkg_cv_BONOBOUI_GLADE_LIBS="$BONOBOUI_GLADE_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$BONOBOUI_MODULES libglade-2.0 >= 1.99.11\"") >&5
+- ($PKG_CONFIG --exists --print-errors "$BONOBOUI_MODULES libglade-2.0 >= 1.99.11") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_BONOBOUI_GLADE_LIBS=`$PKG_CONFIG --libs "$BONOBOUI_MODULES libglade-2.0 >= 1.99.11" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- BONOBOUI_GLADE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$BONOBOUI_MODULES libglade-2.0 >= 1.99.11" 2>&1`
+- else
+- BONOBOUI_GLADE_PKG_ERRORS=`$PKG_CONFIG --print-errors "$BONOBOUI_MODULES libglade-2.0 >= 1.99.11" 2>&1`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$BONOBOUI_GLADE_PKG_ERRORS" >&5
+-
+- { { $as_echo "$as_me:$LINENO: error: Package requirements ($BONOBOUI_MODULES libglade-2.0 >= 1.99.11) were not met:
+-
+-$BONOBOUI_GLADE_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables BONOBOUI_GLADE_CFLAGS
+-and BONOBOUI_GLADE_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements ($BONOBOUI_MODULES libglade-2.0 >= 1.99.11) were not met:
+-
+-$BONOBOUI_GLADE_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables BONOBOUI_GLADE_CFLAGS
+-and BONOBOUI_GLADE_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&2;}
+- { (exit 1); exit 1; }; }
+-elif test $pkg_failed = untried; then
+- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables BONOBOUI_GLADE_CFLAGS
+-and BONOBOUI_GLADE_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables BONOBOUI_GLADE_CFLAGS
+-and BONOBOUI_GLADE_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
+-else
+- BONOBOUI_GLADE_CFLAGS=$pkg_cv_BONOBOUI_GLADE_CFLAGS
+- BONOBOUI_GLADE_LIBS=$pkg_cv_BONOBOUI_GLADE_LIBS
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+- :
+-fi
+-
+
+
+ if test "$enable_maintainer_mode" = "yes"; then
+@@ -17194,7 +16864,7 @@
+
+
+
+-ac_config_files="$ac_config_files Makefile libbonoboui-zip po/Makefile.in bonobo/Makefile bonobo/libbonoboui-2.0.pc bonobo/libbonoboui-2.0-uninstalled.pc glade/Makefile samples/Makefile samples/controls/Makefile samples/bonoboui/Makefile samples/container/Makefile samples/compound-doc/Makefile samples/compound-doc/container/Makefile samples/canvdemo/Makefile tests/Makefile tests/control/Makefile tools/Makefile tools/browser/Makefile doc/Makefile doc/api/Makefile doc/api/figures/Makefile"
++ac_config_files="$ac_config_files Makefile libbonoboui-zip po/Makefile.in bonobo/Makefile bonobo/libbonoboui-2.0.pc bonobo/libbonoboui-2.0-uninstalled.pc samples/Makefile samples/controls/Makefile samples/bonoboui/Makefile samples/container/Makefile samples/compound-doc/Makefile samples/compound-doc/container/Makefile samples/canvdemo/Makefile tests/Makefile tests/control/Makefile tools/Makefile tools/browser/Makefile doc/Makefile doc/api/Makefile doc/api/figures/Makefile"
+
+
+ cat >confcache <<\_ACEOF
+@@ -18123,7 +17793,6 @@
+ "bonobo/Makefile") CONFIG_FILES="$CONFIG_FILES bonobo/Makefile" ;;
+ "bonobo/libbonoboui-2.0.pc") CONFIG_FILES="$CONFIG_FILES bonobo/libbonoboui-2.0.pc" ;;
+ "bonobo/libbonoboui-2.0-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES bonobo/libbonoboui-2.0-uninstalled.pc" ;;
+- "glade/Makefile") CONFIG_FILES="$CONFIG_FILES glade/Makefile" ;;
+ "samples/Makefile") CONFIG_FILES="$CONFIG_FILES samples/Makefile" ;;
+ "samples/controls/Makefile") CONFIG_FILES="$CONFIG_FILES samples/controls/Makefile" ;;
+ "samples/bonoboui/Makefile") CONFIG_FILES="$CONFIG_FILES samples/bonoboui/Makefile" ;;
+Only in ../libbonoboui-2.24.2: configure~
+diff -ur libbonoboui-2.24.2/configure.in ../libbonoboui-2.24.2/configure.in
+--- libbonoboui-2.24.2/configure.in 2009-09-22 18:11:35.000000000 -0500
++++ ../libbonoboui-2.24.2/configure.in 2012-04-19 16:41:13.000000000 -0500
+@@ -96,11 +96,6 @@
+
+ AC_SUBST(X_LIBS)
+
+-# popt
+-AC_CHECK_LIB(popt, poptStrippedArgv, POPT_LIBS=-lpopt, AC_MSG_ERROR([You must have popt version 1.5 or greater installed.]))
+-AC_SUBST(POPT_LIBS)
+-AC_CHECK_HEADER(popt.h,,AC_MSG_ERROR([Failed to find popt.h - you may have to adjust your environment]))
+-
+ dnl
+ dnl Start of pkg-config checks
+ dnl
+@@ -127,10 +122,6 @@
+ AC_MSG_RESULT([clean])
+ fi;
+
+-PKG_CHECK_MODULES(BONOBOUI_GLADE, $BONOBOUI_MODULES libglade-2.0 >= 1.99.11)
+-AC_SUBST(BONOBOUI_GLADE_CFLAGS)
+-AC_SUBST(BONOBOUI_GLADE_LIBS)
+-
+ if test "$enable_maintainer_mode" = "yes"; then
+ BONOBOUI_SINGLE_INCLUDES="-DGTK_DISABLE_SINGLE_INCLUDES -DG_DISABLE_SINGLE_INCLUDES"
+ AC_SUBST(BONOBOUI_SINGLE_INCLUDES)
+@@ -150,7 +141,6 @@
+ bonobo/Makefile
+ bonobo/libbonoboui-2.0.pc
+ bonobo/libbonoboui-2.0-uninstalled.pc
+-glade/Makefile
+ samples/Makefile
+ samples/controls/Makefile
+ samples/bonoboui/Makefile
+diff -ur libbonoboui-2.24.2/Makefile.am ../libbonoboui-2.24.2/Makefile.am
+--- libbonoboui-2.24.2/Makefile.am 2009-04-23 17:38:18.000000000 -0500
++++ ../libbonoboui-2.24.2/Makefile.am 2012-04-19 16:41:13.000000000 -0500
+@@ -1,4 +1,4 @@
+-SUBDIRS = bonobo glade samples tests tools po doc
++SUBDIRS = bonobo samples tests tools po doc
+
+ libincludedir = $(includedir)/libbonoboui-2.0
+ libinclude_HEADERS = \
+diff -ur libbonoboui-2.24.2/Makefile.in ../libbonoboui-2.24.2/Makefile.in
+--- libbonoboui-2.24.2/Makefile.in 2009-09-22 18:12:19.000000000 -0500
++++ ../libbonoboui-2.24.2/Makefile.in 2012-04-19 16:43:32.000000000 -0500
+@@ -138,8 +138,6 @@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+ BONOBOUI_CFLAGS = @BONOBOUI_CFLAGS@
+-BONOBOUI_GLADE_CFLAGS = @BONOBOUI_GLADE_CFLAGS@
+-BONOBOUI_GLADE_LIBS = @BONOBOUI_GLADE_LIBS@
+ BONOBOUI_LIBS = @BONOBOUI_LIBS@
+ BONOBOUI_SINGLE_INCLUDES = @BONOBOUI_SINGLE_INCLUDES@
+ CATALOGS = @CATALOGS@
+@@ -284,7 +282,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = bonobo glade samples tests tools po doc
++SUBDIRS = bonobo samples tests tools po doc
+ libincludedir = $(includedir)/libbonoboui-2.0
+ libinclude_HEADERS = \
+ bonobo.h \
+Only in ../libbonoboui-2.24.2: Makefile.in~
commit c734d4a924c8b20b8180970ce2d53919eddeb4db
Author: Christian Stimming <stimming at tuhh.de>
Date: Mon Mar 19 20:31:50 2012 +0000
[Win32 build] Update gwenhywfar/aqbanking versions.
BP
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22097 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 54c4d82..ea57c06 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -371,8 +371,8 @@ set_default AQBANKING5 yes
# needed.
if [ "$AQBANKING5" = "yes" ]; then
- GWENHYWFAR_VERSION="4.3.1"
- set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=65&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
+ GWENHYWFAR_VERSION="4.3.2"
+ set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=66&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
else
GWENHYWFAR_VERSION="3.11.3"
set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=31&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
@@ -385,8 +385,8 @@ set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-${KTOBLZCHECK_VE
# ktoblzcheck is being installed into GWENHYWFAR_DIR
if [ "$AQBANKING5" = "yes" ]; then
- AQBANKING_VERSION="5.0.21"
- set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=91&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
+ AQBANKING_VERSION="5.0.23"
+ set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=93&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
set_default AQBANKING_WITH_QT no
else
AQBANKING_VERSION="4.2.4"
commit 6feb5b08235cee4166b25af39fe116f7e5557e48
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sun Feb 12 09:44:40 2012 +0000
Win32: tag builds when a tag is not x.y.z (like 2.4.10-1) fail to upload
due to a typo in the build scripts.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22005 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_package.sh b/build_package.sh
index a762201..b25fd8d 100644
--- a/build_package.sh
+++ b/build_package.sh
@@ -85,7 +85,7 @@ if [ -n "${tag}" ] ; then
[0-9]*.[0-9]*.[0-9]*)
if [ "${PKG_VERSION}" != "${tag}" ] ; then
echo "" >> ${LOGFILE}
- echo " *** ERROR: Package Version ${PKG_VERSION} doesn't match Tag ${tag}" >> ${LOGILE}
+ echo " *** ERROR: Package Version ${PKG_VERSION} doesn't match Tag ${tag}" >> ${LOGFILE}
echo "" >> ${LOGFILE}
fi
;;
commit aca5e0b236bac9dda9314cc9e5dd72d3243b5637
Author: Christian Stimming <stimming at tuhh.de>
Date: Fri Feb 10 09:19:47 2012 +0000
Win32 build: Update gtk to 2.4.10 [21977] and update other packages to Nov 2011 versions as well.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@21980 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index d312b95..54c4d82 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -221,11 +221,11 @@ set_default LIBXSLT_ICONV_URL "${XMLSOFT_URL}/iconv-1.9.2.win32.zip"
set_default LIBXSLT_ZLIB_URL "${XMLSOFT_URL}/zlib-1.2.3.win32.zip"
set_default LIBXSLT_DIR $GLOBAL_DIR\\libxslt
-set_default ATK_URL "$GNOME_WIN32_URL/atk/1.32/atk_1.32.0-1_win32.zip"
-set_default ATK_DEV_URL "$GNOME_WIN32_URL/atk/1.32/atk-dev_1.32.0-1_win32.zip"
+set_default ATK_URL "$GNOME_WIN32_URL/atk/1.32/atk_1.32.0-2_win32.zip"
+set_default ATK_DEV_URL "$GNOME_WIN32_URL/atk/1.32/atk-dev_1.32.0-2_win32.zip"
CAIRO_VERSION="1.10.2"
-set_default CAIRO_URL "$GNOME_WIN32_DEPS_URL/cairo_${CAIRO_VERSION}-1_win32.zip"
-set_default CAIRO_DEV_URL "$GNOME_WIN32_DEPS_URL/cairo-dev_${CAIRO_VERSION}-1_win32.zip"
+set_default CAIRO_URL "$GNOME_WIN32_DEPS_URL/cairo_${CAIRO_VERSION}-2_win32.zip"
+set_default CAIRO_DEV_URL "$GNOME_WIN32_DEPS_URL/cairo-dev_${CAIRO_VERSION}-2_win32.zip"
set_default EXPAT_URL "$GNOME_WIN32_DEPS_URL/expat_2.0.1-1_win32.zip"
set_default EXPAT_DEV_URL "$GNOME_WIN32_DEPS_URL/expat-dev_2.0.1-1_win32.zip"
set_default FONTCONFIG_URL "$GNOME_WIN32_DEPS_URL/fontconfig_2.8.0-2_win32.zip"
@@ -237,17 +237,17 @@ set_default GAIL_DEV_URL "$GNOME_WIN32_URL/gail/1.22/gail-dev-1.22.0.
GCONF_VERSION="2.22.0"
set_default GCONF_URL "$GNOME_WIN32_URL/GConf/2.22/GConf_${GCONF_VERSION}-3_win32.zip"
set_default GCONF_DEV_URL "$GNOME_WIN32_URL/GConf/2.22/GConf-dev_${GCONF_VERSION}-3_win32.zip"
-#GDK_PIXBUF_VERSION=2.22.1
-set_default GDK_PIXBUF_URL "$GNOME_WIN32_URL/gdk-pixbuf/2.22/gdk-pixbuf_${GCONF_VERSION}-1_win32.zip"
-set_default GDK_PIXBUF_DEV_URL "$GNOME_WIN32_URL/gdk-pixbuf/2.22/gdk-pixbuf-dev_${GCONF_VERSION}-1_win32.zip"
+GDK_PIXBUF_VERSION=2.24.0
+set_default GDK_PIXBUF_URL "$GNOME_WIN32_URL/gdk-pixbuf/2.24/gdk-pixbuf_${GDK_PIXBUF_VERSION}-1_win32.zip"
+set_default GDK_PIXBUF_DEV_URL "$GNOME_WIN32_URL/gdk-pixbuf/2.24/gdk-pixbuf-dev_${GDK_PIXBUF_VERSION}-1_win32.zip"
set_default GETTEXT_RUNTIME_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime_0.18.1.1-2_win32.zip"
set_default GETTEXT_RUNTIME_DEV_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime-dev_0.18.1.1-2_win32.zip"
set_default GETTEXT_TOOLS_URL "$GNOME_WIN32_DEPS_URL/gettext-tools-dev_0.18.1.1-2_win32.zip"
-set_default GLIB_URL "$GNOME_WIN32_URL/glib/2.28/glib_2.28.1-1_win32.zip"
-set_default GLIB_DEV_URL "$GNOME_WIN32_URL/glib/2.28/glib-dev_2.28.1-1_win32.zip"
+set_default GLIB_URL "$GNOME_WIN32_URL/glib/2.28/glib_2.28.8-1_win32.zip"
+set_default GLIB_DEV_URL "$GNOME_WIN32_URL/glib/2.28/glib-dev_2.28.8-1_win32.zip"
set_default GNOME_VFS_URL "$GNOME_WIN32_URL/gnome-vfs/2.24/gnome-vfs_2.24.1-1_win32.zip"
set_default GNOME_VFS_DEV_URL "$GNOME_WIN32_URL/gnome-vfs/2.24/gnome-vfs-dev_2.24.1-1_win32.zip"
-GTK_VERSION="2.24.0"
+GTK_VERSION="2.24.10"
set_default GTK_URL "$GNOME_WIN32_URL/gtk+/2.24/gtk+_${GTK_VERSION}-1_win32.zip"
set_default GTK_DEV_URL "$GNOME_WIN32_URL/gtk+/2.24/gtk+-dev_${GTK_VERSION}-1_win32.zip"
set_default GTK_DOC_URL "$GNOME_MIRROR/sources/gtk-doc/1.13/gtk-doc-1.13.tar.bz2"
@@ -275,8 +275,8 @@ set_default LIBXML2_URL "$GNOME_WIN32_DEPS_URL/libxml2_2.7.7-1_win32
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.28/pango_1.28.3-1_win32.zip"
-set_default PANGO_DEV_URL "$GNOME_WIN32_URL/pango/1.28/pango-dev_1.28.3-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"
set_default PKG_CONFIG_DEV_URL "$GNOME_WIN32_DEPS_URL/pkg-config-dev_0.25-1_win32.zip"
set_default POPT_URL "$GNOME_WIN32_DEPS_URL/popt-1.10.2-tml-20050828.zip"
commit 357da9f5f84cdf92e403235db6ab724c722f9933
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri Jan 27 20:09:55 2012 +0000
Win32 installer: always remove previously installed versions.
This avoids problems when libraries or reports have been moved around in newer versions.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@21894 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/gnucash.iss.in b/gnucash.iss.in
index d199b19..6a21a7b 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -183,14 +183,14 @@ var
PrevVersionMajor, PrevVersionMinor, PrevVersionMicro : Cardinal;
Uninstallrequired : Boolean;
-// -----------------------------------------------------------
+// ----------------------------------------------------------------
// Sometimes it's not possible to install a newer version of
-// GnuCash over an older one on Windows. This is mostly the
-// case when libraries are moved around in the newer version.
+// GnuCash over an older one on Windows. This happens for example
+// when libraries or reports are moved around in the newer version.
// The code below will detect an existing GnuCash installation
// and will remove it (if the user accepts) before installing
// the version the user has selected.
-// -----------------------------------------------------------
+// ----------------------------------------------------------------
{ Lookup the registry information on a previous installation }
procedure GetPrevInstallInfo();
@@ -219,10 +219,9 @@ begin
RegQueryDwordValue(rootKey, sAppVersionPath, 'VersionMicro', PrevVersionMicro);
end;
-{ Check if there is another GnuCash currently installed }
-{ and whether we can simply install over it or have to remove it first }
-{ Versions are considered 'incompatible' if the major or minor }
-{ version components are different }
+{ Check if there is another GnuCash currently installed }
+{ If so, the user will be prompted if it can be uninstalled first. }
+{ If the user doesn't allow uninstall, the installation will be aborted. }
procedure CheckUninstallRequired();
begin
UninstallRequired := True;
@@ -230,8 +229,11 @@ begin
if (PrevUninstallString = '') then
UninstallRequired := False
- else if (PrevVersionMajor = @GNUCASH_MAJOR_VERSION@) and (PrevVersionMinor = @GNUCASH_MINOR_VERSION@) then
- UninstallRequired := False;
+// We used to check on major-minor versions to determine the uninstall requirement,
+// but this is not always sufficient. So the following code won't be used until
+// refined.
+// else if (PrevVersionMajor = @GNUCASH_MAJOR_VERSION@) and (PrevVersionMinor = @GNUCASH_MINOR_VERSION@) then
+// UninstallRequired := False;
end;
{ Uninstall the current installation }
commit 08ccff62e8b9daef6814ab2bae8acea96dade143
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Jan 23 20:45:26 2012 +0000
Remove some stray references to libglade.
It's no longer used by GnuCash. Yay!
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@21880 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index f872dbb..d312b95 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -258,8 +258,6 @@ set_default LIBART_LGPL_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart-lgp
set_default LIBART_LGPL_DEV_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart-lgpl-dev_2.3.21-1_win32.zip"
set_default LIBBONOBO_URL "$GNOME_WIN32_URL/libbonobo/2.24/libbonobo_2.24.0-1_win32.zip"
set_default LIBBONOBO_DEV_URL "$GNOME_WIN32_URL/libbonobo/2.24/libbonobo-dev_2.24.0-1_win32.zip"
-set_default LIBGLADE_URL "$GNOME_WIN32_URL/libglade/2.6/libglade_2.6.4-1_win32.zip"
-set_default LIBGLADE_DEV_URL "$GNOME_WIN32_URL/libglade/2.6/libglade-dev_2.6.4-1_win32.zip"
set_default LIBGNOME_URL "$GNOME_WIN32_URL/libgnome/2.24/libgnome_2.24.1-1_win32.zip"
set_default LIBGNOME_DEV_URL "$GNOME_WIN32_URL/libgnome/2.24/libgnome-dev_2.24.1-1_win32.zip"
set_default LIBGNOMECANVAS_URL "$GNOME_WIN32_URL/libgnomecanvas/2.30/libgnomecanvas_2.30.1-1_win32.zip"
diff --git a/dist-impl.sh b/dist-impl.sh
index 6f8edfc..1d79428 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -97,7 +97,6 @@ function dist_gnome() {
wget_unpacked $LIBART_LGPL_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBBONOBO_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBBONOBOUI_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $LIBGLADE_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBGNOME_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBGNOMECANVAS_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBGNOMEUI_URL $DOWNLOAD_DIR $DIST_DIR
diff --git a/install-impl.sh b/install-impl.sh
index 9f790b4..d2c338f 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -536,8 +536,6 @@ function inst_gnome() {
wget_unpacked $LIBBONOBO_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBBONOBOUI_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBBONOBOUI_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBGLADE_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBGLADE_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBGNOME_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBGNOME_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBGNOMECANVAS_URL $DOWNLOAD_DIR $GNOME_DIR
commit feae20b5c40b0167f8daa8b006fb0e2770b26a8f
Author: Christian Stimming <stimming at tuhh.de>
Date: Wed Jan 11 21:48:43 2012 +0000
[Win32 build] Disable git.exe package again, as it might collide with DLLs.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@21847 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index a3fd7a1..be68dae 100644
--- a/install.sh
+++ b/install.sh
@@ -83,7 +83,7 @@ add_step inst_gnome
add_step inst_guile
if [ "$CROSS_COMPILE" != "yes" ]; then
add_step inst_svn
- add_step inst_git
+# add_step inst_git
fi
add_step inst_gnutls
add_step inst_libxslt
commit 6cf92d6343b810ea0298e5076dbb5450e062f152
Author: Christian Stimming <stimming at tuhh.de>
Date: Mon Jan 2 12:51:24 2012 +0000
[Win32 build] Let git.exe be downloaded and unpacked as well. We might start using it sooner or later.
BP
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@21818 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index fe02a17..f872dbb 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -353,6 +353,9 @@ set_default ICU4C_PATCH `pwd`/icu-crossmingw.patch
set_default SVN_URL "http://subversion.tigris.org/files/documents/15/47914/svn-win32-1.6.6.zip"
set_default SVN_DIR $GLOBAL_DIR\\svn
+set_default GIT_URL "http://msysgit.googlecode.com/files/Git-1.7.8-preview20111206.exe"
+set_default GIT_DIR $GLOBAL_DIR\\git-1.7.8
+
# OFX import in gnucash and ofx directconnect support for aqbanking
set_default OPENSP_URL "$SF_MIRROR/openjade/OpenSP-1.5.2.tar.gz"
set_default OPENSP_DIR $GLOBAL_DIR\\opensp
diff --git a/install-impl.sh b/install-impl.sh
index 2c435c4..9f790b4 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -251,6 +251,20 @@ function inst_unzip() {
fi
}
+function inst_git() {
+ setup Git
+ _GIT_UDIR=`unix_path $GIT_DIR`
+ add_to_env $_GIT_UDIR/bin PATH
+ if quiet $_GIT_UDIR/bin/git --help || quiet git --help
+ then
+ echo "git already installed in $_GIT_UDIR. skipping."
+ else
+ smart_wget $GIT_URL $DOWNLOAD_DIR
+ $LAST_FILE //SP- //SILENT //DIR="$GIT_DIR"
+ quiet git --help || die "git unavailable"
+ fi
+}
+
# Functions before this point are basic build infrastructure functions or else they get pieces needed to build
# gnucash but which are not part of the final product. Functions after this point are for components of the
# final build. Please leave in alphabetical order so they are easier to find.
diff --git a/install.sh b/install.sh
index a401951..a3fd7a1 100644
--- a/install.sh
+++ b/install.sh
@@ -83,6 +83,7 @@ add_step inst_gnome
add_step inst_guile
if [ "$CROSS_COMPILE" != "yes" ]; then
add_step inst_svn
+ add_step inst_git
fi
add_step inst_gnutls
add_step inst_libxslt
commit fc6e892647797d0f9e7d6c0d845c08a2b36098bd
Author: Christian Stimming <stimming at tuhh.de>
Date: Sun Jan 1 19:43:03 2012 +0000
[Win32 build] Update aqbanking version again.
BP
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@21812 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index b4871dc..fe02a17 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -384,8 +384,8 @@ set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-${KTOBLZCHECK_VE
# ktoblzcheck is being installed into GWENHYWFAR_DIR
if [ "$AQBANKING5" = "yes" ]; then
- AQBANKING_VERSION="5.0.20"
- set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=90&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
+ AQBANKING_VERSION="5.0.21"
+ set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=91&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
set_default AQBANKING_WITH_QT no
else
AQBANKING_VERSION="4.2.4"
commit 672fcf14cd77cef5ee76c53dbbed6fc9a00da709
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri Dec 30 17:27:12 2011 +0000
Win32: use proper cpp and ld include parameters
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@21802 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
index 2d46597..2c435c4 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1150,8 +1150,8 @@ function inst_libxslt() {
--prefix=${_LIBXSLT_UDIR} \
--with-python=no \
--with-libxml-prefix=${_GNOME_UDIR} \
- CPPFLAGS="-I${_GNOME_UDIR}/include ${GNUTLS_CPPFLAGS}" \
- LDFLAGS="-L${_GNOME_UDIR}/lib ${GNUTLS_LDFLAGS}"
+ CPPFLAGS="${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS}" \
+ LDFLAGS="${GNOME_LDFLAGS} ${GNUTLS_LDFLAGS}"
make
make install
qpopd
commit 044fdcfc4d1d90c68242ddb9af1856a9ec9dc94e
Author: Christian Stimming <stimming at tuhh.de>
Date: Thu Dec 29 21:36:35 2011 +0000
Revert r21789 - not needed as r21791 adds required include flags in a better way.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@21793 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
index 6c9afa2..2d46597 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1139,15 +1139,8 @@ function inst_libxslt() {
then
echo "libxslt already installed in $_LIBXSLT_UDIR. skipping."
else
- if [ "$CROSS_COMPILE" = "yes" ]; then
- _MORE_CPPFLAGS="-I${_LIBXSLT_UDIR}/iconv-1.9.2.win32/include"
- _MORE_LDFLAGS="-L${_LIBXSLT_UDIR}/lib"
- wget_unpacked ${LIBXSLT_ICONV_URL} ${DOWNLOAD_DIR} ${LIBXSLT_DIR}
- wget_unpacked ${LIBXSLT_ZLIB_URL} ${DOWNLOAD_DIR} ${LIBXSLT_DIR}
- else
- _MORE_CPPFLAGS=""
- _MORE_LDFLAGS=""
- fi
+ #wget_unpacked ${LIBXSLT_ICONV_URL} ${DOWNLOAD_DIR} ${LIBXSLT_DIR}
+ #wget_unpacked ${LIBXSLT_ZLIB_URL} ${DOWNLOAD_DIR} ${LIBXSLT_DIR}
wget_unpacked $LIBXSLT_SRC_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/libxslt-*
@@ -1157,8 +1150,8 @@ function inst_libxslt() {
--prefix=${_LIBXSLT_UDIR} \
--with-python=no \
--with-libxml-prefix=${_GNOME_UDIR} \
- CPPFLAGS="-I${_GNOME_UDIR}/include ${GNUTLS_CPPFLAGS} ${_MORE_CPPFLAGS}" \
- LDFLAGS="-L${_GNOME_UDIR}/lib ${GNUTLS_LDFLAGS} ${_MORE_LD_FLAGS}"
+ CPPFLAGS="-I${_GNOME_UDIR}/include ${GNUTLS_CPPFLAGS}" \
+ LDFLAGS="-L${_GNOME_UDIR}/lib ${GNUTLS_LDFLAGS}"
make
make install
qpopd
commit 7355faf0d011228c797600bb04086e2c296861c7
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu Dec 29 20:20:46 2011 +0000
Win32: use new location of gnucash doc directory
It changed in r20736
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@21792 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/dist-impl.sh b/dist-impl.sh
index b6fed61..6f8edfc 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -255,7 +255,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/{gnucash,locale} $DIST_UDIR/share
+ cp -a $_INSTALL_UDIR/share/{doc,gnucash,locale} $DIST_UDIR/share
cp -a $_REPOS_UDIR/packaging/win32/install-fq-mods.cmd $DIST_UDIR/bin
_QTDIR_WIN=$(unix_path $QTDIR | sed 's,^/\([A-Za-z]\)/,\1:/,g' )
diff --git a/gnucash.iss.in b/gnucash.iss.in
index 7f9b83c..d199b19 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -16,14 +16,14 @@ AppUpdatesURL=http://www.gnucash.org
VersionInfoVersion=@VERSION@
DefaultDirName={pf}\@PACKAGE@
DefaultGroupName=GnuCash
-LicenseFile=@prefix@\..\dist\share\@PACKAGE@\doc\COPYING
+LicenseFile=@prefix@\..\dist\share\doc\@PACKAGE@\COPYING
Compression=lzma
MinVersion=5.0,5.0
PrivilegesRequired=poweruser
OutputDir=.
OutputBaseFilename=@PACKAGE at -@VERSION at -setup
UninstallFilesDir={app}\uninstall\@PACKAGE@
-InfoAfterFile=@prefix@\..\dist\share\@PACKAGE@\doc\README.win32-bin.txt
+InfoAfterFile=@prefix@\..\dist\share\doc\@PACKAGE@\README.win32-bin.txt
SetupIconFile=@prefix@\..\dist\share\@PACKAGE@\pixmaps\gnucash-icon.ico
WizardSmallImageFile=@prefix@\..\dist\share\@PACKAGE@\pixmaps\gnucash-icon-48x48.bmp
@@ -94,19 +94,19 @@ Source: "@prefix@\..\dist\share\*"; DestDir: "{app}\share"; Flags: recursesubdir
;Source: "@prefix@\..\dist\share\locale\*"; DestDir: "{app}\share\locale"; Flags: recursesubdirs; Components: translations
;
;; The account templates
-;Source: "@prefix@\..\dist\share\gnucash\accounts\*"; DestDir: "{app}\share\gnucash\accounts"; Flags: recursesubdirs; Components: templates
+;Source: "@prefix@\..\dist\share\@PACKAGE@\accounts\*"; DestDir: "{app}\share\@PACKAGE@\accounts"; Flags: recursesubdirs; Components: templates
; And all the documentation
-Source: "@prefix@\..\dist\share\@PACKAGE@\doc\README"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@prefix@\..\dist\share\@PACKAGE@\doc\README.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@prefix@\..\dist\share\@PACKAGE@\doc\README-de.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@prefix@\..\dist\share\@PACKAGE@\doc\README-fr.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@prefix@\..\dist\share\@PACKAGE@\doc\README-it.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@prefix@\..\dist\share\@PACKAGE@\doc\README-zh_CN.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@prefix@\..\dist\share\@PACKAGE@\doc\README-zh_TW.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@prefix@\..\dist\share\@PACKAGE@\doc\COPYING"; DestDir: "{app}\doc\@PACKAGE@"; Flags: ignoreversion; Components: main
-Source: "@prefix@\..\dist\share\@PACKAGE@\doc\AUTHORS"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@prefix@\..\dist\share\@PACKAGE@\doc\ChangeLog"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@prefix@\..\dist\share\doc\@PACKAGE@\README"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@prefix@\..\dist\share\doc\@PACKAGE@\README.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@prefix@\..\dist\share\doc\@PACKAGE@\README-de.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@prefix@\..\dist\share\doc\@PACKAGE@\README-fr.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@prefix@\..\dist\share\doc\@PACKAGE@\README-it.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@prefix@\..\dist\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@prefix@\..\dist\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@prefix@\..\dist\share\doc\@PACKAGE@\COPYING"; DestDir: "{app}\doc\@PACKAGE@"; Flags: ignoreversion; Components: main
+Source: "@prefix@\..\dist\share\doc\@PACKAGE@\AUTHORS"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@prefix@\..\dist\share\doc\@PACKAGE@\ChangeLog"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -385,16 +385,16 @@ end;
[Languages]
Name: "en"; MessagesFile: "compiler:Default.isl"
-Name: "de"; MessagesFile: "compiler:Languages\German.isl"; InfoAfterFile: "@prefix@\share\@PACKAGE@\doc\README-de.win32-bin.txt"
+Name: "de"; MessagesFile: "compiler:Languages\German.isl"; InfoAfterFile: "@prefix@\share\doc\@PACKAGE@\README-de.win32-bin.txt"
Name: "el"; MessagesFile: "@prefix@\share\@PACKAGE@\Greek-4-5.1.11.isl"
-Name: "fr"; MessagesFile: "compiler:Languages\French.isl"; InfoAfterFile: "@prefix@\share\@PACKAGE@\doc\README-fr.win32-bin.txt"
-Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"; InfoAfterFile: "@prefix@\share\@PACKAGE@\doc\README-it.win32-bin.txt"
+Name: "fr"; MessagesFile: "compiler:Languages\French.isl"; InfoAfterFile: "@prefix@\share\doc\@PACKAGE@\README-fr.win32-bin.txt"
+Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"; InfoAfterFile: "@prefix@\share\doc\@PACKAGE@\README-it.win32-bin.txt"
Name: "ja"; MessagesFile: "@prefix@\share\@PACKAGE@\Japanese-5-5.1.11.isl"
-Name: "lv"; MessagesFile: "@prefix@\share\@PACKAGE@\Latvian-1-5.1.11.isl"; InfoAfterFile: "@prefix@\share\@PACKAGE@\doc\README-lv.win32-bin.txt"
-Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"; InfoAfterFile: "@prefix@\share\@PACKAGE@\doc\README-nl.win32-bin.txt"
+Name: "lv"; MessagesFile: "@prefix@\share\@PACKAGE@\Latvian-1-5.1.11.isl"; InfoAfterFile: "@prefix@\share\doc\@PACKAGE@\README-lv.win32-bin.txt"
+Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"; InfoAfterFile: "@prefix@\share\doc\@PACKAGE@\README-nl.win32-bin.txt"
Name: "pt_BR"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
-Name: "zh_CN"; MessagesFile: "@prefix@\share\@PACKAGE@\ChineseSimp-12-5.1.11.isl"; InfoAfterFile: "@prefix@\share\@PACKAGE@\doc\README-zh_CN.win32-bin.txt"
-Name: "zh_TW"; MessagesFile: "@prefix@\share\@PACKAGE@\ChineseTrad-2-5.1.11.isl"; InfoAfterFile: "@prefix@\share\@PACKAGE@\doc\README-zh_TW.win32-bin.txt"
+Name: "zh_CN"; MessagesFile: "@prefix@\share\@PACKAGE@\ChineseSimp-12-5.1.11.isl"; InfoAfterFile: "@prefix@\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"
+Name: "zh_TW"; MessagesFile: "@prefix@\share\@PACKAGE@\ChineseTrad-2-5.1.11.isl"; InfoAfterFile: "@prefix@\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"
;; The following language files are available as well, in alphabetical
;; order: Basque, BrazilianPortuguese, Catalan, Czech, Danish, Dutch,
commit d97f1b77523830b8be5ccb5dfbd6c32c0e7d5f73
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu Dec 29 20:18:29 2011 +0000
Win32: fix clean trunk build
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@21791 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
index 6c20617..6c9afa2 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1156,7 +1156,9 @@ function inst_libxslt() {
./configure ${HOST_XCOMPILE} \
--prefix=${_LIBXSLT_UDIR} \
--with-python=no \
- --with-libxml-prefix=${_GNOME_UDIR} CPPFLAGS="${GNUTLS_CPPFLAGS} ${_MORE_CPPFLAGS}" LDFLAGS="${GNUTLS_LDFLAGS} ${_MORE_LDFLAGS}"
+ --with-libxml-prefix=${_GNOME_UDIR} \
+ CPPFLAGS="-I${_GNOME_UDIR}/include ${GNUTLS_CPPFLAGS} ${_MORE_CPPFLAGS}" \
+ LDFLAGS="-L${_GNOME_UDIR}/lib ${GNUTLS_LDFLAGS} ${_MORE_LD_FLAGS}"
make
make install
qpopd
commit 4550f35afd3bc34b3c896e20c823a858a3fb84d8
Author: Christian Stimming <stimming at tuhh.de>
Date: Thu Dec 29 19:50:56 2011 +0000
[Win32 build] Enable libxslt to be built in a cross-compile environment.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@21789 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
index 6b9b1c1..6c20617 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1139,9 +1139,15 @@ function inst_libxslt() {
then
echo "libxslt already installed in $_LIBXSLT_UDIR. skipping."
else
- [ "$CROSS_COMPILE" = "yes" ] && die "xsltproc unavailable"
- #wget_unpacked ${LIBXSLT_ICONV_URL} ${DOWNLOAD_DIR} ${LIBXSLT_DIR}
- #wget_unpacked ${LIBXSLT_ZLIB_URL} ${DOWNLOAD_DIR} ${LIBXSLT_DIR}
+ if [ "$CROSS_COMPILE" = "yes" ]; then
+ _MORE_CPPFLAGS="-I${_LIBXSLT_UDIR}/iconv-1.9.2.win32/include"
+ _MORE_LDFLAGS="-L${_LIBXSLT_UDIR}/lib"
+ wget_unpacked ${LIBXSLT_ICONV_URL} ${DOWNLOAD_DIR} ${LIBXSLT_DIR}
+ wget_unpacked ${LIBXSLT_ZLIB_URL} ${DOWNLOAD_DIR} ${LIBXSLT_DIR}
+ else
+ _MORE_CPPFLAGS=""
+ _MORE_LDFLAGS=""
+ fi
wget_unpacked $LIBXSLT_SRC_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/libxslt-*
@@ -1150,7 +1156,7 @@ function inst_libxslt() {
./configure ${HOST_XCOMPILE} \
--prefix=${_LIBXSLT_UDIR} \
--with-python=no \
- --with-libxml-prefix=${_GNOME_UDIR} CPPFLAGS="${GNUTLS_CPPFLAGS}" LDFLAGS="${GNUTLS_LDFLAGS}"
+ --with-libxml-prefix=${_GNOME_UDIR} CPPFLAGS="${GNUTLS_CPPFLAGS} ${_MORE_CPPFLAGS}" LDFLAGS="${GNUTLS_LDFLAGS} ${_MORE_LDFLAGS}"
make
make install
qpopd
commit 4e9db5e0516c080bad9e554c8b251f03f9769969
Author: Christian Stimming <stimming at tuhh.de>
Date: Thu Dec 29 19:50:40 2011 +0000
[Win32 build] Another aqbanking version update.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@21788 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 7a5f0a7..b4871dc 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -384,8 +384,8 @@ set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-${KTOBLZCHECK_VE
# ktoblzcheck is being installed into GWENHYWFAR_DIR
if [ "$AQBANKING5" = "yes" ]; then
- AQBANKING_VERSION="5.0.19"
- set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=89&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
+ AQBANKING_VERSION="5.0.20"
+ set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=90&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
set_default AQBANKING_WITH_QT no
else
AQBANKING_VERSION="4.2.4"
commit ef9a2c9e3becdc7bab29a77ac0681ed9174fd03b
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu Dec 29 12:13:22 2011 +0000
Avoid build failure if a temporary directory still exists
BP
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@21787 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_package.sh b/build_package.sh
index d26b0b4..a762201 100644
--- a/build_package.sh
+++ b/build_package.sh
@@ -42,7 +42,7 @@ mkdir -p ${_OUTPUT_DIR}
# Small hack to create $LOG_DIR on the webserver if it doesn't exist yet
if [ `hostname` = "gnucash-win32" ]; then
- mkdir "$_OUTPUT_DIR/$LOG_DIR"
+ mkdir -p "$_OUTPUT_DIR/$LOG_DIR"
scp -r "$_OUTPUT_DIR/$LOG_DIR" upload at code.gnucash.org:public_html/win32
rmdir "$_OUTPUT_DIR/$LOG_DIR"
fi
@@ -95,7 +95,7 @@ fi
# If we're running on the build server then upload the files
if [ `hostname` = "gnucash-win32" ]; then
# Small hack to create the $TARGET_DIR on the webserver if it doesn't exist yet
- mkdir "$_OUTPUT_DIR/$TARGET_DIR"
+ mkdir -p "$_OUTPUT_DIR/$TARGET_DIR"
scp -r "$_OUTPUT_DIR/$TARGET_DIR" upload at code.gnucash.org:public_html/win32
rmdir "$_OUTPUT_DIR/$TARGET_DIR"
# Copy the files to the chosen target directory
commit 228500be390af8f1f63e7844aebc0fa21bb570a6
Author: Christian Stimming <stimming at tuhh.de>
Date: Wed Dec 28 21:42:15 2011 +0000
Update versions of gwenhywfar, aqbanking to most recent ones.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@21786 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index bde4160..7a5f0a7 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -370,8 +370,8 @@ set_default AQBANKING5 yes
# needed.
if [ "$AQBANKING5" = "yes" ]; then
- GWENHYWFAR_VERSION="4.3.0"
- set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=64&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
+ GWENHYWFAR_VERSION="4.3.1"
+ set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=65&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
else
GWENHYWFAR_VERSION="3.11.3"
set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=31&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
@@ -384,8 +384,8 @@ set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-${KTOBLZCHECK_VE
# ktoblzcheck is being installed into GWENHYWFAR_DIR
if [ "$AQBANKING5" = "yes" ]; then
- AQBANKING_VERSION="5.0.17"
- set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=88&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
+ AQBANKING_VERSION="5.0.19"
+ set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=89&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
set_default AQBANKING_WITH_QT no
else
AQBANKING_VERSION="4.2.4"
commit 50c60286403aa613992d35bc1c75a3c5b9cea1f4
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat Dec 24 13:27:56 2011 +0000
Win32 build: abort build process if install.sh step failed.
BP
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@21775 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_package.sh b/build_package.sh
index cb280df..d26b0b4 100644
--- a/build_package.sh
+++ b/build_package.sh
@@ -6,6 +6,7 @@
# be the top-level daily-build packaging directory.
#
+set -o pipefail
set -e
LOG_DIR=build-logs
commit 15a17ad87a06edb8a33143784c94a9f297798f0c
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Dec 22 20:36:10 2011 +0000
Update ActivePerl URL
Old one no longer available.
BP
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@21772 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index ac9959b..bde4160 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -176,7 +176,7 @@ set_default READLINE_BIN_URL "$SF_MIRROR/gnuwin32/readline-5.0-1-bin.zip"
set_default READLINE_LIB_URL "$SF_MIRROR/gnuwin32/readline-5.0-1-lib.zip"
set_default READLINE_DIR $GLOBAL_DIR\\readline
-set_default ACTIVE_PERL_URL "http://downloads.activestate.com/ActivePerl/releases/5.10.1.1008/ActivePerl-5.10.1.1008-MSWin32-x86-294165.zip"
+set_default ACTIVE_PERL_URL "http://downloads.activestate.com/ActivePerl/releases/5.14.2.1402/ActivePerl-5.14.2.1402-MSWin32-x86-295342.zip"
set_default ACTIVE_PERL_DIR $GLOBAL_DIR\\active-perl
set_default AUTOCONF_URL "http://ftp.gnu.org/gnu/autoconf/autoconf-2.63.tar.bz2"
commit a2ef5a4a9c98e6254715624f3f81b944e522c883
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed Dec 21 17:43:48 2011 +0000
win32 build: indicate when dist.sh begins or ends and remove redundant crosscompile check
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@21771 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/dist.sh b/dist.sh
index 986181d..7253826 100755
--- a/dist.sh
+++ b/dist.sh
@@ -8,6 +8,9 @@ function on_error() {
}
trap on_error ERR
+echo -n "Build (dist) Starting at "
+date
+
function qpushd() { pushd "$@" >/dev/null; }
function qpopd() { popd >/dev/null; }
function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
@@ -55,6 +58,9 @@ restore_msys "$_PID"
qpopd
+echo -n "Build (dist) Finished at "
+date
+
### Local Variables: ***
### sh-basic-offset: 4 ***
### indent-tabs-mode: nil ***
diff --git a/install-impl.sh b/install-impl.sh
index d58b0cd..6b9b1c1 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -148,7 +148,6 @@ function inst_mingw() {
_MINGW_WFSDIR=`win_fs_path $MINGW_DIR`
# Configure msys to use mingw on the above path before running any tests !
configure_msys "$_PID" "$_MINGW_WFSDIR"
- [ "$CROSS_COMPILE" = "yes" ] && add_to_env $_MINGW_UDIR/bin PATH
add_to_env $_MINGW_UDIR/bin PATH
if quiet test_for_mingw
commit 6042dedc483396425c5deead24268f35ffbee975
Author: Christian Stimming <stimming at tuhh.de>
Date: Tue Dec 20 08:04:00 2011 +0000
Win32 build: Switch weekly build to daily one.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@21761 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/weekly_build.sh b/weekly_build.sh
index 9645b95..5d5a320 100644
--- a/weekly_build.sh
+++ b/weekly_build.sh
@@ -10,8 +10,8 @@
set -e
-# Only run this script on Monday night (first day of the week)
-if [ `date +%u` != 1 ] ; then exit ; fi
+## Only run this script on Monday night (first day of the week)
+#if [ `date +%u` != 1 ] ; then exit ; fi
function qpushd() { pushd "$@" >/dev/null; }
function qpopd() { popd >/dev/null; }
commit ccde1f4b7415f1733a3941e2f9766030734e8299
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu Dec 8 17:11:06 2011 +0000
ActivePerl only allows to download the most recent version. So change
the comments to be more liberal (at least 5.8).
BP
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@21686 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/gnucash.iss.in b/gnucash.iss.in
index f0d9932..7f9b83c 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -432,7 +432,7 @@ IconFilename_README=README.win32-bin.txt
IconName_FAQ=FAQ (Online)
IconName_Bugzilla=Report a Bug (Online)
IconName_InstallFQ=Install Online Price Retrieval
-IconComment_InstallFQ=Install the necessary perl module Finance-Quote for online retrieval of prices. Requires ActivePerl 5.8 or 5.10
+IconComment_InstallFQ=Install the necessary perl module Finance-Quote for online retrieval of prices. Requires ActivePerl 5.8 or later
IconName_Theme=Select Theme
IconName_Uninstall=Uninstall GnuCash
IconComment_Uninstall=Uninstall the Finance Manager GnuCash
@@ -471,7 +471,7 @@ de.IconFilename_README=README-de.win32-bin.txt
de.IconName_FAQ=Häufige Fragen (online, engl.)
de.IconName_Bugzilla=Fehlerbericht einsenden (online, engl.)
de.IconName_InstallFQ=Online Kursabruf installieren
-de.IconComment_InstallFQ=Das zusätzliche Modul Finance-Quote installieren, um online Aktien- und Devisenkurse abrufen zu können. Dazu ist das Programm ActivePerl 5.8 oder 5.10 erforderlich.
+de.IconComment_InstallFQ=Das zusätzliche Modul Finance-Quote installieren, um online Aktien- und Devisenkurse abrufen zu können. Dazu ist das Programm ActivePerl 5.8 oder neuer erforderlich.
de.IconName_Uninstall=Deinstallieren von GnuCash
de.IconComment_Uninstall=Die OpenSource-Finanzverwaltung GnuCash wieder deinstallieren und vom Computer löschen
@@ -502,7 +502,7 @@ el.IconFilename_README=README.win32-bin.txt
el.IconName_FAQ=ΣυχνÎÏ‚ εÏωτήσεις (Online)
el.IconName_Bugzilla=ΑναφοÏά σφάλματος (Online)
el.IconName_InstallFQ=Εγκατάσταση λήψης τιμών (online)
-el.IconComment_InstallFQ=Εγκατάσταση του perl module Finance-Quote για λήψη τιμών online. Απαιτεί ActivePerl 5.8/5.10
+el.IconComment_InstallFQ=Εγκατάσταση του perl module Finance-Quote για λήψη τιμών online. Απαιτεί ActivePerl 5.8+
el.IconName_Uninstall=Απεγκατάσταση GnuCash
el.IconComment_Uninstall=Απεγκατάσταση του διαχειÏιστή οικονομικών GnuCash
@@ -529,7 +529,7 @@ fr.IconFilename_README=README-fr.win32-bin.txt
fr.IconName_FAQ=FAQ (En ligne, en anglais)
fr.IconName_Bugzilla=Envoyer un rapport d'erreur (En ligne, en anglais)
fr.IconName_InstallFQ=Installer les quotations en ligne
-fr.IconComment_InstallFQ=Installation du module Finance-Quote requis pour le téléchargement du cours des devises et actions. Le programme ActivePerl 5.8 ou 5.10 est aussi requis
+fr.IconComment_InstallFQ=Installation du module Finance-Quote requis pour le téléchargement du cours des devises et actions. Le programme ActivePerl 5.8 ou plus récent est aussi requis
fr.IconName_Uninstall=Dé-installer GnuCash
fr.IconComment_Uninstall=Désinstalle le gestionnaire financier GnuCash
@@ -562,7 +562,7 @@ it.IconFilename_README=README-it.win32-bin.txt
it.IconName_FAQ=FAQ (online, in Inglese)
it.IconName_Bugzilla=Segnalare un bug (online, in Inglese)
it.IconName_InstallFQ=Installa la funzione di ricerca delle quotazioni online
-it.IconComment_InstallFQ=Installa il modulo di perl Finance-Quote necessario per ricevere le quotazioni online. Richiede ActivePerl 5.8 o 5.10
+it.IconComment_InstallFQ=Installa il modulo di perl Finance-Quote necessario per ricevere le quotazioni online. Richiede ActivePerl 5.8+
it.IconName_Theme=Selezione del tema
it.IconName_Uninstall=Disinstalla GnuCash
it.IconComment_Uninstall=Disinstalla il programma di gestione delle finanze GnuCash
@@ -630,7 +630,7 @@ lv.IconFilename_README=README-lv.win32-bin.txt
lv.IconName_FAQ=BUJ (tiešsaistē)
lv.IconName_Bugzilla=Ziņot par kļūdu (tiešsaistē)
lv.IconName_InstallFQ=UzstÄdÄ«t tieÅ¡saistes kursu iegÅ«Å¡anu
-lv.IconComment_InstallFQ=UzstÄdÄ«t nepiecieÅ¡amos Perl moduļus valÅ«tas kursu iegÅ«Å¡anai. NepiecieÅ¡ams ActivePerl 5.8 vai 5.10
+lv.IconComment_InstallFQ=UzstÄdÄ«t nepiecieÅ¡amos Perl moduļus valÅ«tas kursu iegÅ«Å¡anai. NepiecieÅ¡ams ActivePerl 5.8+
lv.IconName_Theme=Izvēlieties tēmu
lv.IconName_Uninstall=Noņemt GnuCash
lv.IconComment_Uninstall=Noņemt GnuCash grÄmatvedÄ«bas programmu
@@ -658,7 +658,7 @@ nl.IconFilename_README=README-nl.win32-bin.txt
nl.IconName_FAQ=FAQ (Online)
nl.IconName_Bugzilla=Een Bug Melden (Online)
nl.IconName_InstallFQ=Online Koersen Opvragen installeren
-nl.IconComment_InstallFQ=De benodigde perl module Finance Quote om online koersen op te vragen installeren. Hiervoor is ActivePerl 5.8 of 5.10 nodig.
+nl.IconComment_InstallFQ=De benodigde perl module Finance Quote om online koersen op te vragen installeren. Hiervoor is ActivePerl 5.8 of recenter nodig.
nl.IconName_Uninstall=GnuCash verwijderen
nl.IconComment_Uninstall=Het financieel beheersprogramma GnuCash verwijderen
@@ -689,7 +689,7 @@ pt_BR.IconFilename_README=LEIA-ME.win32-bin.txt
pt_BR.IconName_FAQ=Perguntas Freqüentes (online, inglês)
pt_BR.IconName_Bugzilla=Relatar um erro (online, inglês)
pt_BR.IconName_InstallFQ=Instalar a Consulta de Preços Online
-pt_BR.IconComment_InstallFQ=Instala o módulo perl Finance-Quote, necessário para a busca de preços online. Requer ActivePerl 5.8/5.10.
+pt_BR.IconComment_InstallFQ=Instala o módulo perl Finance-Quote, necessário para a busca de preços online. Requer ActivePerl 5.8+.
pt_BR.IconName_Uninstall=Desinstalar o GnuCash
pt_BR.IconComment_Uninstall=Desinstala o Gerenciador Financeiro GnuCash
diff --git a/install-fq-mods.cmd b/install-fq-mods.cmd
index 73c2ac5..1c35b21 100644
--- a/install-fq-mods.cmd
+++ b/install-fq-mods.cmd
@@ -31,7 +31,7 @@ if %_perlmajor% equ 5 (
)
echo.
echo Did not find a usable perl.
-echo Please install ActivePerl 5.8, 5.10 or 5.12 (http://www.activestate.com/store/activeperl)
+echo Please install ActivePerl 5.8, or above (http://www.activestate.com/store/activeperl)
echo and add the bin directory to your Path environment variable.
goto error
:ccp
commit 7a33b93314f7542c8aa8985b3dacd51ce6dfb3a8
Author: Christian Stimming <stimming at tuhh.de>
Date: Sun Dec 4 20:44:24 2011 +0000
Win32 build: Minor version upgrade of aqbanking and ktoblzcheck.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@21666 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 33cc54e..ac9959b 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -379,13 +379,13 @@ else
fi
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
-KTOBLZCHECK_VERSION="1.36"
+KTOBLZCHECK_VERSION="1.37"
set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-${KTOBLZCHECK_VERSION}.tar.gz"
# ktoblzcheck is being installed into GWENHYWFAR_DIR
if [ "$AQBANKING5" = "yes" ]; then
- AQBANKING_VERSION="5.0.16"
- set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=87&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
+ AQBANKING_VERSION="5.0.17"
+ set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=88&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
set_default AQBANKING_WITH_QT no
else
AQBANKING_VERSION="4.2.4"
commit f5b9bc2f241ba19ead781f792907a77f07eb6fb7
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sun Oct 9 21:06:40 2011 +0000
Use "Nimbus" gtk theme on Windows.
A previous attempt failed to set this in the installer.
BP
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@21408 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/dist-impl.sh b/dist-impl.sh
index 086fc15..b6fed61 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -111,7 +111,7 @@ function dist_gnome() {
wget_unpacked $PANGO_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $POPT_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $ZLIB_URL $DOWNLOAD_DIR $DIST_DIR
- echo 'gtk-theme-name = "MS-Windows"' > $DIST_DIR/etc/gtk-2.0/gtkrc
+ echo 'gtk-theme-name = "Nimbus"' > $DIST_DIR/etc/gtk-2.0/gtkrc
wget_unpacked $GTK_THEME_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/gtk2-themes-*
commit 2c1f8991b2327159a9b1771e2184283a6d84b17d
Author: Christian Stimming <stimming at tuhh.de>
Date: Fri Oct 7 10:00:34 2011 +0000
Win32 build: Make sure to distribute all of gwenhywfar's share directory.
In newer gwenhywfar versions there are more sub-directories here which are
required for the online banking setup GUI.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@21378 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/dist-impl.sh b/dist-impl.sh
index 176d03e..086fc15 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -166,8 +166,8 @@ function dist_gwenhywfar() {
cp -a ${_GWENHYWFAR_UDIR}/bin/*.dll ${DIST_UDIR}/bin
mkdir -p ${DIST_UDIR}/etc
cp -a ${_GWENHYWFAR_UDIR}/lib/gwenhywfar ${DIST_UDIR}/lib
- mkdir -p ${DIST_UDIR}/share/gwenhywfar
- cp -a ${_GWENHYWFAR_UDIR}/share/gwenhywfar/ca-bundle.crt ${DIST_UDIR}/share/gwenhywfar
+ mkdir -p ${DIST_UDIR}/share
+ cp -a ${_GWENHYWFAR_UDIR}/share/gwenhywfar ${DIST_UDIR}/share
}
function dist_isocodes() {
commit 447c65a60da11ee1677844ca9d7beb7f211d8189
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Oct 3 16:52:00 2011 +0000
Bug 651645 - Windows SVN trunk nightly builds fails to open compressed
xml files
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@21369 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 74a066f..33cc54e 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -210,13 +210,13 @@ set_default EXETYPE_DIR $TOOLS_DIR
XMLSOFT_URL="http://xmlsoft.org/sources/win32"
XSLT_BASE_URL="http://ftp.acc.umu.se/pub/GNOME/sources/libxslt/1.1"
-XML2_BASE_URL="http://ftp.acc.umu.se/pub/GNOME/sources/libxml2/2.6"
+XML2_BASE_URL="ftp://xmlsoft.org/libxml2"
LIBXSLT_VERSION="1.1.22"
#LIBXSLT_VERSION=1.1.26
set_default LIBXSLT_SRC_URL "${XSLT_BASE_URL}/libxslt-${LIBXSLT_VERSION}.tar.bz2"
set_default LIBXSLT_MAKEFILE_PATCH "`pwd`/libxslt-1.1.22.Makefile.in.patch"
-LIBXML2_VERSION="2.6.27"
-set_default LIBXML2_SRC_URL "${XML2_BASE_URL}/libxml2-${LIBXML2_VERSION}.tar.bz2"
+LIBXML2_VERSION="2.7.7"
+set_default LIBXML2_SRC_URL "${XML2_BASE_URL}/libxml2-${LIBXML2_VERSION}.tar.gz"
set_default LIBXSLT_ICONV_URL "${XMLSOFT_URL}/iconv-1.9.2.win32.zip"
set_default LIBXSLT_ZLIB_URL "${XMLSOFT_URL}/zlib-1.2.3.win32.zip"
set_default LIBXSLT_DIR $GLOBAL_DIR\\libxslt
diff --git a/install-impl.sh b/install-impl.sh
index dfd3721..d58b0cd 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -619,7 +619,8 @@ EOF
--prefix=${_GNOME_UDIR} \
--disable-static \
--with-python=no \
- --without-threads
+ --without-threads \
+ CPPFLAGS="${GNOME_CPPFLAGS}" LDFLAGS="${GNOME_LDFLAGS}"
make
make install
qpopd
commit 89e1b06a1eb69db879914105a7f5c99d53bdf955
Author: Christian Stimming <stimming at tuhh.de>
Date: Thu Sep 29 10:06:11 2011 +0000
Win32 build: Update version numbers of aqbanking, gwenhywfar, ktoblzcheck.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@21361 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index de4566d..74a066f 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -370,8 +370,8 @@ set_default AQBANKING5 yes
# needed.
if [ "$AQBANKING5" = "yes" ]; then
- GWENHYWFAR_VERSION="4.1.0"
- set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=61&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
+ GWENHYWFAR_VERSION="4.3.0"
+ set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=64&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
else
GWENHYWFAR_VERSION="3.11.3"
set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=31&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
@@ -379,13 +379,13 @@ else
fi
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
-KTOBLZCHECK_VERSION="1.31"
+KTOBLZCHECK_VERSION="1.36"
set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-${KTOBLZCHECK_VERSION}.tar.gz"
# ktoblzcheck is being installed into GWENHYWFAR_DIR
if [ "$AQBANKING5" = "yes" ]; then
- AQBANKING_VERSION="5.0.10"
- set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=83&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
+ AQBANKING_VERSION="5.0.16"
+ set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=87&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
set_default AQBANKING_WITH_QT no
else
AQBANKING_VERSION="4.2.4"
commit 3b22dc0de9b7f1e3828fb830691c2af725dbea7b
Author: Christian Stimming <stimming at tuhh.de>
Date: Sun Jun 12 19:54:06 2011 +0000
[Win32 build] Update aqbanking versino to 5.0.10
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20754 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 4f08a9e..de4566d 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -384,8 +384,8 @@ set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-${KTOBLZCHECK_VE
# ktoblzcheck is being installed into GWENHYWFAR_DIR
if [ "$AQBANKING5" = "yes" ]; then
- AQBANKING_VERSION="5.0.7"
- set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=80&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
+ AQBANKING_VERSION="5.0.10"
+ set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=83&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
set_default AQBANKING_WITH_QT no
else
AQBANKING_VERSION="4.2.4"
commit 3e472821850cad297446c51f75354d45cbfa057d
Author: Christian Stimming <stimming at tuhh.de>
Date: Sat Jun 11 19:26:56 2011 +0000
[win32 build] Update gwenhywfar version.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20752 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index fd9bbd6..4f08a9e 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -370,8 +370,8 @@ set_default AQBANKING5 yes
# needed.
if [ "$AQBANKING5" = "yes" ]; then
- GWENHYWFAR_VERSION="4.0.9"
- set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=60&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
+ GWENHYWFAR_VERSION="4.1.0"
+ set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=61&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
else
GWENHYWFAR_VERSION="3.11.3"
set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=31&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
commit d1ea8d299e2345ed88496872b67770e28af361a4
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat Jun 11 10:56:56 2011 +0000
Windows build: change default gtk theme to work around a number of
problems in the Ms-Windows theme we used before.
Particularly, this prevents the crash caused by bug #614636 and fixes
the black notebook tabs that appeared after Phil upgraded webkit and
many related gnome dependencies.
The new default theme is "Nimbus" following a suggestion by Kim Wood
on the mailing list.
BP
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20750 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
old mode 100755
new mode 100644
index f71231e..dfd3721
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -550,7 +550,7 @@ function inst_gnome() {
wget_unpacked $POPT_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $ZLIB_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $ZLIB_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- echo 'gtk-theme-name = "MS-Windows"' > ${_GNOME_UDIR}/etc/gtk-2.0/gtkrc
+ echo 'gtk-theme-name = "Nimbus"' > ${_GNOME_UDIR}/etc/gtk-2.0/gtkrc
wget_unpacked $GTK_THEME_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/gtk2-themes-*
commit c648c2f8e2b6b2ea4ed449ed7d2725443e3e1b06
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat May 28 09:27:57 2011 +0000
Windows build: be sure to restore msys environment even when the build
fails
BP
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20711 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/dist-impl.sh b/dist-impl.sh
index bea1b15..176d03e 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -56,8 +56,8 @@ Please set AQBANKING_WITH_QT to yes and rerun install.sh first."
add_to_env $_GNOME_UDIR/bin PATH # gconftool-2
add_to_env $_EXETYPE_UDIR/bin PATH # exetype
- PID=$$
- configure_msys "$PID" "$_MINGW_WFSDIR"
+ _PID=$$
+ configure_msys "$_PID" "$_MINGW_WFSDIR"
}
function dist_aqbanking() {
diff --git a/dist.sh b/dist.sh
index 7f26067..986181d 100755
--- a/dist.sh
+++ b/dist.sh
@@ -2,6 +2,12 @@
set -e
+function on_error() {
+ setup "An error occurred, exiting."
+ restore_msys "$_PID"
+}
+trap on_error ERR
+
function qpushd() { pushd "$@" >/dev/null; }
function qpopd() { popd >/dev/null; }
function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
@@ -44,7 +50,7 @@ for step in "${steps[@]}" ; do
done
setup Restore MSYS
-restore_msys "$PID"
+restore_msys "$_PID"
qpopd
diff --git a/install-impl.sh b/install-impl.sh
old mode 100644
new mode 100755
diff --git a/install.sh b/install.sh
index 4586db0..a401951 100644
--- a/install.sh
+++ b/install.sh
@@ -10,6 +10,12 @@
set -e
+function on_error() {
+ setup "An error occurred, exiting."
+ restore_msys "$_PID"
+}
+trap on_error ERR
+
echo -n "Build Starting at "
date
commit 04bc78af0a9517273fed896087ee3ae3d9524981
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat May 28 09:27:47 2011 +0000
Windows build: properly configure msys before checking mingw
availability
BP
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20710 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
old mode 100755
new mode 100644
index 1a69cd9..f71231e
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -146,6 +146,8 @@ function inst_mingw() {
setup MinGW
_MINGW_UDIR=`unix_path $MINGW_DIR`
_MINGW_WFSDIR=`win_fs_path $MINGW_DIR`
+ # Configure msys to use mingw on the above path before running any tests !
+ configure_msys "$_PID" "$_MINGW_WFSDIR"
[ "$CROSS_COMPILE" = "yes" ] && add_to_env $_MINGW_UDIR/bin PATH
add_to_env $_MINGW_UDIR/bin PATH
@@ -181,8 +183,6 @@ function inst_mingw() {
if [ "$CROSS_COMPILE" != "yes" ]; then
# Some preparation steps, only for native (non-cross-compile)
cp ${_MINGW_UDIR}/bin/libpthread-2.dll ${_MINGW_UDIR}/bin/pthreadGC2.dll
-
- configure_msys "$_PID" "$_MINGW_WFSDIR"
fi
}
commit 8e42f31e7e192cd3e21107c511610a784ec02e36
Author: Christian Stimming <stimming at tuhh.de>
Date: Fri May 27 06:54:51 2011 +0000
Win32: Update aqbanking version
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20696 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 2ad0149..fd9bbd6 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -384,8 +384,8 @@ set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-${KTOBLZCHECK_VE
# ktoblzcheck is being installed into GWENHYWFAR_DIR
if [ "$AQBANKING5" = "yes" ]; then
- AQBANKING_VERSION="5.0.6"
- set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=79&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
+ AQBANKING_VERSION="5.0.7"
+ set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=80&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
set_default AQBANKING_WITH_QT no
else
AQBANKING_VERSION="4.2.4"
commit 6b6e2f73f23296d2b9737b4a80a4b31232b5c8e9
Author: Christian Stimming <stimming at tuhh.de>
Date: Sat May 21 20:16:57 2011 +0000
Win32: Update aqbanking5 version.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20671 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index cfbd7ba..2ad0149 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -384,8 +384,8 @@ set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-${KTOBLZCHECK_VE
# ktoblzcheck is being installed into GWENHYWFAR_DIR
if [ "$AQBANKING5" = "yes" ]; then
- AQBANKING_VERSION="5.0.5"
- set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=78&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
+ AQBANKING_VERSION="5.0.6"
+ set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=79&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
set_default AQBANKING_WITH_QT no
else
AQBANKING_VERSION="4.2.4"
commit dcda0e54f8b0f7c3ee24ae965eb66f3ea7e00e16
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed May 18 14:56:09 2011 +0000
Windows build: fix additional obsolete references to guile 1.6
Pointed out by Robert Fewell
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20656 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/gnucash.iss.in b/gnucash.iss.in
index 2fa95ff..f0d9932 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -53,7 +53,7 @@ Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\gnucash.exe"; WorkingDir:
[Run]
Filename: "{app}\bin\gnucash.exe"; Description: "{cm:RunPrg}"; WorkingDir: "{app}\bin"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent
-Filename: "{app}\bin\guile.cmd"; Parameters: "-c ""(use-modules (ice-9 slib)) (require 'printf)"""; Flags: runhidden
+Filename: "{app}\bin\guile.cmd"; Flags: runhidden
;; The Windows firewall exceptions, see http://www.vincenzo.net/isxkb/index.php?title=Adding_a_rule_to_the_Windows_firewall
Filename: "{sys}\netsh.exe"; Parameters: "firewall add allowedprogram ""{app}\bin\gnucash.exe"" ""GnuCash Free Finance Manager"" ENABLE ALL"; StatusMsg: "{cm:StatusMsgFirewall}"; Flags: runhidden; MinVersion: 0,5.01.2600sp2;
Filename: "{sys}\netsh.exe"; Parameters: "firewall add allowedprogram ""{app}\bin\gconfd-2.exe"" ""GConf Settings Manager"" ENABLE ALL"; StatusMsg: "{cm:StatusMsgFirewall}"; Flags: runhidden; MinVersion: 0,5.01.2600sp2;
@@ -164,7 +164,6 @@ Root: HKLM; Subkey: "Software\AqBanking\Paths"; ValueType: string; ValueName: "c
[UninstallDelete]
Type: files; Name: "{app}\bin\guile.cmd"
Type: files; Name: "{app}\etc\gnucash\environment"
-Type: files; Name: "{app}\share\guile\1.6\slibcat"
Type: filesandordirs; Name: "{app}\share\guile"
Type: filesandordirs; Name: "{app}\etc\gconf"
Type: dirifempty; Name: "{app}\etc\gnucash"
@@ -364,7 +363,7 @@ begin
{ Adapt GUILE_LOAD_PATH parameter and prevent cygwin interference in SCHEME_LIBRARY_PATH }
if (Pos('GUILE_LOAD_PATH', EnvStrList[iLineCounter]) = 1) then
begin
- StringChangeEx(EnvStrList[iLineCounter], '{GUILE_LOAD_PATH}', '{GNC_HOME}/share/guile/1.6;{GUILE_LOAD_PATH}', True);
+ StringChangeEx(EnvStrList[iLineCounter], '{GUILE_LOAD_PATH}', '{GNC_HOME}/share/guile/1.8;{GUILE_LOAD_PATH}', True);
EnvStrList[iLineCounter] := EnvStrList[iLineCounter] + #13#10 + '# Clear SCHEME_LIBRARY_PATH to prevent interference from other guile installations (like cygwin)' + #13#10;
EnvStrList[iLineCounter] := EnvStrList[iLineCounter] + 'SCHEME_LIBRARY_PATH=' + #13#10;
commit c8146abf9537506212af2bd4099a05e63104745e
Author: Christian Stimming <stimming at tuhh.de>
Date: Tue May 10 11:05:18 2011 +0000
Win32 build: Revert r20614 libxml2 version update because the win build seems to stop due to bad linker flags in libxml-2.0.pc.
Also, fix the pkgconfig files unconditionally.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20615 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index f5bc8d6..cfbd7ba 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -215,7 +215,7 @@ LIBXSLT_VERSION="1.1.22"
#LIBXSLT_VERSION=1.1.26
set_default LIBXSLT_SRC_URL "${XSLT_BASE_URL}/libxslt-${LIBXSLT_VERSION}.tar.bz2"
set_default LIBXSLT_MAKEFILE_PATCH "`pwd`/libxslt-1.1.22.Makefile.in.patch"
-LIBXML2_VERSION="2.6.30"
+LIBXML2_VERSION="2.6.27"
set_default LIBXML2_SRC_URL "${XML2_BASE_URL}/libxml2-${LIBXML2_VERSION}.tar.bz2"
set_default LIBXSLT_ICONV_URL "${XMLSOFT_URL}/iconv-1.9.2.win32.zip"
set_default LIBXSLT_ZLIB_URL "${XMLSOFT_URL}/zlib-1.2.3.win32.zip"
diff --git a/install-impl.sh b/install-impl.sh
index 6cc6b30..1a69cd9 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -485,7 +485,7 @@ function inst_gnome() {
quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-2.0 &&
quiet ${PKG_CONFIG} --atleast-version=${CAIRO_VERSION} cairo &&
quiet ${PKG_CONFIG} --atleast-version=${PIXMAN_VERSION} pixman-1 &&
- quiet ${PKG_CONFIG} --atleast-version=${LIBXML2_VERSION} libxml-2.0 &&
+ quiet ${PKG_CONFIG} --exact-version=${LIBXML2_VERSION} libxml-2.0 &&
quiet intltoolize --version
then
echo "gnome packages installed in $_GNOME_UDIR. skipping."
@@ -590,14 +590,6 @@ EOF
rm -rf $TMP_UDIR/gtk-doc-*
qpopd
- if [ "$CROSS_COMPILE" = "yes" ]; then
- qpushd $_GNOME_UDIR/lib/pkgconfig
- perl -pi.bak -e"s!^prefix=.*\$!prefix=$_GNOME_UDIR!" *.pc
- #perl -pi.bak -e's!^Libs: !Libs: -L\${prefix}/bin !' *.pc
- qpopd
- fi
-
-
if quiet ${PKG_CONFIG} --exact-version=${PIXMAN_VERSION} pixman-1 ; then
echo "Pixman already compiled+installed"
else
@@ -634,13 +626,18 @@ EOF
rm -rf ${TMP_UDIR}/libxml2-*
fi
+ qpushd $_GNOME_UDIR/lib/pkgconfig
+ perl -pi.bak -e"s!^prefix=.*\$!prefix=$_GNOME_UDIR!" *.pc
+ #perl -pi.bak -e's!^Libs: !Libs: -L\${prefix}/bin !' *.pc
+ qpopd
+
quiet gconftool-2 --version &&
quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 &&
quiet ${PKG_CONFIG} --atleast-version=${GCONF_VERSION} gconf-2.0 &&
quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-2.0 &&
quiet ${PKG_CONFIG} --atleast-version=${CAIRO_VERSION} cairo &&
quiet ${PKG_CONFIG} --atleast-version=${PIXMAN_VERSION} pixman-1 &&
- quiet ${PKG_CONFIG} --atleast-version=${LIBXML2_VERSION} libxml-2.0 &&
+ quiet ${PKG_CONFIG} --exact-version=${LIBXML2_VERSION} libxml-2.0 &&
quiet intltoolize --version || die "gnome not installed correctly"
fi
[ ! -d $_GNOME_UDIR/share/aclocal ] || add_to_env "-I $_GNOME_UDIR/share/aclocal" ACLOCAL_FLAGS
commit 683fd86cd6faf795c29e6d50eb5f58e24aba7987
Author: Christian Stimming <stimming at tuhh.de>
Date: Sun May 8 20:05:43 2011 +0000
Win32 build: Update libxml2 to slightly more recent version. Add version check.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20614 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index e5b648a..f5bc8d6 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -211,11 +211,12 @@ set_default EXETYPE_DIR $TOOLS_DIR
XMLSOFT_URL="http://xmlsoft.org/sources/win32"
XSLT_BASE_URL="http://ftp.acc.umu.se/pub/GNOME/sources/libxslt/1.1"
XML2_BASE_URL="http://ftp.acc.umu.se/pub/GNOME/sources/libxml2/2.6"
-LIBXSLT_VERSION=1.1.22
+LIBXSLT_VERSION="1.1.22"
#LIBXSLT_VERSION=1.1.26
set_default LIBXSLT_SRC_URL "${XSLT_BASE_URL}/libxslt-${LIBXSLT_VERSION}.tar.bz2"
set_default LIBXSLT_MAKEFILE_PATCH "`pwd`/libxslt-1.1.22.Makefile.in.patch"
-set_default LIBXML2_SRC_URL "${XML2_BASE_URL}/libxml2-2.6.27.tar.bz2"
+LIBXML2_VERSION="2.6.30"
+set_default LIBXML2_SRC_URL "${XML2_BASE_URL}/libxml2-${LIBXML2_VERSION}.tar.bz2"
set_default LIBXSLT_ICONV_URL "${XMLSOFT_URL}/iconv-1.9.2.win32.zip"
set_default LIBXSLT_ZLIB_URL "${XMLSOFT_URL}/zlib-1.2.3.win32.zip"
set_default LIBXSLT_DIR $GLOBAL_DIR\\libxslt
diff --git a/install-impl.sh b/install-impl.sh
index 13b9883..6cc6b30 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -485,6 +485,7 @@ function inst_gnome() {
quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-2.0 &&
quiet ${PKG_CONFIG} --atleast-version=${CAIRO_VERSION} cairo &&
quiet ${PKG_CONFIG} --atleast-version=${PIXMAN_VERSION} pixman-1 &&
+ quiet ${PKG_CONFIG} --atleast-version=${LIBXML2_VERSION} libxml-2.0 &&
quiet intltoolize --version
then
echo "gnome packages installed in $_GNOME_UDIR. skipping."
@@ -616,19 +617,30 @@ EOF
fi
quiet ${PKG_CONFIG} --exact-version=${PIXMAN_VERSION} pixman-1 || die "pixman not installed correctly"
- wget_unpacked $LIBXML2_SRC_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/libxml2-*
- qpushd $TMP_UDIR/libxml2-*
- ./configure ${HOST_XCOMPILE} \
- --prefix=${_GNOME_UDIR} \
- --without-threads
- make
- make install
- qpopd
- rm -rf ${TMP_UDIR}/libxml2-*
+ if quiet ${PKG_CONFIG} --exact-version=${LIBXML2_VERSION} libxml-2.0 ; then
+ echo "Libxml2 already compiled + installed"
+ else
+ wget_unpacked $LIBXML2_SRC_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/libxml2-*
+ qpushd $TMP_UDIR/libxml2-*
+ ./configure ${HOST_XCOMPILE} \
+ --prefix=${_GNOME_UDIR} \
+ --disable-static \
+ --with-python=no \
+ --without-threads
+ make
+ make install
+ qpopd
+ rm -rf ${TMP_UDIR}/libxml2-*
+ fi
quiet gconftool-2 --version &&
quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 &&
+ quiet ${PKG_CONFIG} --atleast-version=${GCONF_VERSION} gconf-2.0 &&
+ quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-2.0 &&
+ quiet ${PKG_CONFIG} --atleast-version=${CAIRO_VERSION} cairo &&
+ quiet ${PKG_CONFIG} --atleast-version=${PIXMAN_VERSION} pixman-1 &&
+ quiet ${PKG_CONFIG} --atleast-version=${LIBXML2_VERSION} libxml-2.0 &&
quiet intltoolize --version || die "gnome not installed correctly"
fi
[ ! -d $_GNOME_UDIR/share/aclocal ] || add_to_env "-I $_GNOME_UDIR/share/aclocal" ACLOCAL_FLAGS
@@ -1140,6 +1152,7 @@ function inst_libxslt() {
patch -p0 -u -i ${LIBXSLT_MAKEFILE_PATCH}
./configure ${HOST_XCOMPILE} \
--prefix=${_LIBXSLT_UDIR} \
+ --with-python=no \
--with-libxml-prefix=${_GNOME_UDIR} CPPFLAGS="${GNUTLS_CPPFLAGS}" LDFLAGS="${GNUTLS_LDFLAGS}"
make
make install
commit 9a809d608d0d5c2f0e4c62eeb5bfc38f53cfdda1
Author: Christian Stimming <stimming at tuhh.de>
Date: Sun May 8 20:05:33 2011 +0000
Win32 build: Fix pixman URL (old version has disappeared from URL)
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20613 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index de3fe8d..e5b648a 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -278,7 +278,6 @@ set_default ORBIT2_URL "$GNOME_WIN32_URL/ORBit2/2.14/ORBit2_2.14.16
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.28/pango_1.28.3-1_win32.zip"
set_default PANGO_DEV_URL "$GNOME_WIN32_URL/pango/1.28/pango-dev_1.28.3-1_win32.zip"
-set_default PIXMAN_DEV_URL "$GNOME_WIN32_DEPS_URL/pixman-dev_0.20.0-1_win32.zip"
set_default PKG_CONFIG_URL "$GNOME_WIN32_DEPS_URL/pkg-config_0.25-1_win32.zip"
set_default PKG_CONFIG_DEV_URL "$GNOME_WIN32_DEPS_URL/pkg-config-dev_0.25-1_win32.zip"
set_default POPT_URL "$GNOME_WIN32_DEPS_URL/popt-1.10.2-tml-20050828.zip"
@@ -287,7 +286,8 @@ set_default ZLIB_URL "$GNOME_WIN32_DEPS_URL/zlib_1.2.5-2_win32.zi
set_default ZLIB_DEV_URL "$GNOME_WIN32_DEPS_URL/zlib-dev_1.2.5-2_win32.zip"
set_default GNOME_DIR $GLOBAL_DIR\\gnome
-set_default PIXMAN_URL "http://cairographics.org/releases/pixman-0.17.6.tar.gz"
+PIXMAN_VERSION="0.22.0"
+set_default PIXMAN_URL "http://www.cairographics.org/releases/pixman-${PIXMAN_VERSION}.tar.gz"
set_default LIBBONOBOUI_URL "$GNOME_WIN32_URL/libbonoboui/2.24/libbonoboui_2.24.0-1_win32.zip"
set_default LIBBONOBOUI_DEV_URL "$GNOME_WIN32_URL/libbonoboui/2.24/libbonoboui-dev_2.24.0-1_win32.zip"
diff --git a/install-impl.sh b/install-impl.sh
index 039b5b1..13b9883 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -484,6 +484,7 @@ function inst_gnome() {
quiet ${PKG_CONFIG} --atleast-version=${GCONF_VERSION} gconf-2.0 &&
quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-2.0 &&
quiet ${PKG_CONFIG} --atleast-version=${CAIRO_VERSION} cairo &&
+ quiet ${PKG_CONFIG} --atleast-version=${PIXMAN_VERSION} pixman-1 &&
quiet intltoolize --version
then
echo "gnome packages installed in $_GNOME_UDIR. skipping."
@@ -595,20 +596,25 @@ EOF
qpopd
fi
- wget_unpacked $PIXMAN_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/pixman-*
- qpushd $TMP_UDIR/pixman-*
- GLIB_CPPFLAGS=`${PKG_CONFIG} --cflags glib-2.0`
- GTK_CPPFLAGS="-I${_GNOME_UDIR}/include/gtk-2.0"
- ./configure ${HOST_XCOMPILE} \
- --prefix=$_GNOME_UDIR \
- --disable-static \
- CPPFLAGS="${GLIB_CPPFLAGS} ${GTK_CPPFLAGS}"
- make
- make install
- qpopd
- ${PKG_CONFIG} --exists pixman-1 || die "pixman not installed correctly"
- rm -rf $TMP_UDIR/pixman-*
+
+ if quiet ${PKG_CONFIG} --exact-version=${PIXMAN_VERSION} pixman-1 ; then
+ echo "Pixman already compiled+installed"
+ else
+ wget_unpacked $PIXMAN_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/pixman-*
+ qpushd $TMP_UDIR/pixman-*
+ GLIB_CPPFLAGS=`${PKG_CONFIG} --cflags glib-2.0`
+ GTK_CPPFLAGS="-I${_GNOME_UDIR}/include/gtk-2.0"
+ ./configure ${HOST_XCOMPILE} \
+ --prefix=$_GNOME_UDIR \
+ --disable-static \
+ CPPFLAGS="${GLIB_CPPFLAGS} ${GTK_CPPFLAGS}"
+ make
+ make install
+ qpopd
+ rm -rf $TMP_UDIR/pixman-*
+ fi
+ quiet ${PKG_CONFIG} --exact-version=${PIXMAN_VERSION} pixman-1 || die "pixman not installed correctly"
wget_unpacked $LIBXML2_SRC_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/libxml2-*
commit e4872111731051ade5a3eadd3c79000ceb060dee
Author: Christian Stimming <stimming at tuhh.de>
Date: Sun May 1 21:03:29 2011 +0000
Win32 build: Add missing include flags when building aqbanking5.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20606 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
index 5887d76..039b5b1 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -287,7 +287,7 @@ function inst_aqbanking() {
wget_unpacked $AQBANKING_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/aqbanking-*
qpushd $TMP_UDIR/aqbanking-*
- _AQ_CPPFLAGS="-I${_LIBOFX_UDIR}/include ${KTOBLZCHECK_CPPFLAGS} ${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS}"
+ _AQ_CPPFLAGS="-I${_LIBOFX_UDIR}/include ${KTOBLZCHECK_CPPFLAGS} ${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS} -I${_GWENHYWFAR_UDIR}/include/gwenhywfar4"
_AQ_LDFLAGS="-L${_LIBOFX_UDIR}/lib ${KTOBLZCHECK_LDFLAGS} ${GNOME_LDFLAGS} ${GNUTLS_LDFLAGS}"
if test x$CROSS_COMPILE = xyes; then
XMLMERGE="xmlmerge"
commit 551cae0a7c6204d474d0d551421067d2ed1a5d26
Author: Christian Stimming <stimming at tuhh.de>
Date: Fri Apr 29 20:09:02 2011 +0000
Win32 build: libxslt requires gnutls includes.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20603 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
index 9c89b79..5887d76 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1134,7 +1134,7 @@ function inst_libxslt() {
patch -p0 -u -i ${LIBXSLT_MAKEFILE_PATCH}
./configure ${HOST_XCOMPILE} \
--prefix=${_LIBXSLT_UDIR} \
- --with-libxml-prefix=${_GNOME_UDIR}
+ --with-libxml-prefix=${_GNOME_UDIR} CPPFLAGS="${GNUTLS_CPPFLAGS}" LDFLAGS="${GNUTLS_LDFLAGS}"
make
make install
qpopd
diff --git a/install.sh b/install.sh
index acce95c..4586db0 100644
--- a/install.sh
+++ b/install.sh
@@ -78,8 +78,8 @@ add_step inst_guile
if [ "$CROSS_COMPILE" != "yes" ]; then
add_step inst_svn
fi
-add_step inst_libxslt
add_step inst_gnutls
+add_step inst_libxslt
add_step inst_isocodes
add_step inst_swig
add_step inst_pcre
commit 2d2678f4c9d5819bf6540f3aedfe11de5361340b
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri Apr 29 07:48:51 2011 +0000
Fix guile load path for guile 1.8
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20597 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/gnucash.iss.in b/gnucash.iss.in
index da39ffc..2fa95ff 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -319,7 +319,7 @@ begin
{ Create the guile.cmd file; #10 is the linefeed character and #13 CR }
FileName := appdir + '\bin\guile.cmd' ;
- FileString := 'set GUILE_LOAD_PATH=' + pkgdatadir + '\guile-modules;' + pkgdatadir + '\scm;' + appdir + '\share\guile\1.6;%GUILE_LOAD_PATH%'#13#10 ;
+ FileString := 'set GUILE_LOAD_PATH=' + pkgdatadir + '\guile-modules;' + pkgdatadir + '\scm;' + appdir + '\share\guile\1.8;%GUILE_LOAD_PATH%'#13#10 ;
FileString := FileString + 'start guile.exe %*'#13#10 ;
{ Save the final file }
commit 0a52ed7062e9a566b72362111efac8c8e36ff264
Author: Christian Stimming <stimming at tuhh.de>
Date: Sat Apr 23 20:33:06 2011 +0000
Win32 build: Additional tweaks for easier cross-compiling.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20595 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index c78a564..de3fe8d 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -84,6 +84,18 @@ set_default W32API_URL "$SF_MIRROR/mingw/w32api-3.15-1-mingw32-dev.tar.lzma"
set_default MINGW_MAKE_URL "$SF_MIRROR/mingw/mingw32-make-3.81-20080326-3.tar.gz"
set_default MINGW_DIR $GLOBAL_DIR\\mingw
+# The URLs for precompiled gcc/mingw binaries
+set_default BINUTILS_URL "$SF_MIRROR/mingw/binutils-2.21-2-mingw32-bin.tar.lzma"
+set_default GCC_CORE_URL "$SF_MIRROR/mingw/gcc-core-4.5.2-1-mingw32-bin.tar.lzma"
+set_default GCC_CORE_DLL_URL "$SF_MIRROR/mingw/libgcc-4.5.2-1-mingw32-dll-1.tar.lzma"
+set_default GCC_GPP_URL "$SF_MIRROR/mingw/gcc-c++-4.5.2-1-mingw32-bin.tar.lzma"
+set_default GCC_GPP_DLL_URL "$SF_MIRROR/mingw/libstdc++-4.5.2-1-mingw32-dll-6.tar.lzma"
+set_default GCC_GPP_PATCH "`pwd`/gcc-c++-4.4.0.patch"
+set_default GCC_MPC_URL "$SF_MIRROR/mingw/libmpc-0.8.1-1-mingw32-dll-2.tar.lzma"
+set_default GCC_MPFR_URL "$SF_MIRROR/mingw/libmpfr-2.4.1-1-mingw32-dll-1.tar.lzma"
+set_default GCC_GMP_URL "$SF_MIRROR/mingw/libgmp-5.0.1-1-mingw32-dll-10.tar.lzma"
+set_default GCC_PTHREADS_URL "$SF_MIRROR/mingw/libpthread-2.8.0-3-mingw32-dll-2.tar.lzma"
+
if [ "$CROSS_COMPILE" != yes ]; then
# Use native toolchain
set_default LD ld
@@ -91,17 +103,9 @@ if [ "$CROSS_COMPILE" != yes ]; then
set_default DLLTOOL dlltool
set_default RANLIB ranlib
- # For native build on Windows we can use precompiled binaries
- set_default BINUTILS_URL "$SF_MIRROR/mingw/binutils-2.21-2-mingw32-bin.tar.lzma"
- set_default GCC_CORE_URL "$SF_MIRROR/mingw/gcc-core-4.5.2-1-mingw32-bin.tar.lzma"
- set_default GCC_CORE_DLL_URL "$SF_MIRROR/mingw/libgcc-4.5.2-1-mingw32-dll-1.tar.lzma"
- set_default GCC_GPP_URL "$SF_MIRROR/mingw/gcc-c++-4.5.2-1-mingw32-bin.tar.lzma"
- set_default GCC_GPP_DLL_URL "$SF_MIRROR/mingw/libstdc++-4.5.2-1-mingw32-dll-6.tar.lzma"
- set_default GCC_GPP_PATCH "`pwd`/gcc-c++-4.4.0.patch"
- set_default GCC_MPC_URL "$SF_MIRROR/mingw/libmpc-0.8.1-1-mingw32-dll-2.tar.lzma"
- set_default GCC_MPFR_URL "$SF_MIRROR/mingw/libmpfr-2.4.1-1-mingw32-dll-1.tar.lzma"
- set_default GCC_GMP_URL "$SF_MIRROR/mingw/libgmp-5.0.1-1-mingw32-dll-10.tar.lzma"
- set_default GCC_PTHREADS_URL "$SF_MIRROR/mingw/libpthread-2.8.0-3-mingw32-dll-2.tar.lzma"
+ # For native build on Windows we can use the precompiled binaries
+ # defined above
+
else
# What flavor of GCC cross-compiler are we building?
set_default TARGET "mingw32"
diff --git a/install-impl.sh b/install-impl.sh
index a6889b6..9c89b79 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -154,19 +154,22 @@ function inst_mingw() {
echo "mingw already installed in $_MINGW_UDIR. skipping."
else
mkdir -p $_MINGW_UDIR
+
+ # Download the precompiled packages in any case to get their DLLs
+ wget_unpacked $BINUTILS_URL $DOWNLOAD_DIR $MINGW_DIR
+ wget_unpacked $GCC_CORE_URL $DOWNLOAD_DIR $MINGW_DIR
+ wget_unpacked $GCC_CORE_DLL_URL $DOWNLOAD_DIR $MINGW_DIR
+ wget_unpacked $GCC_GPP_URL $DOWNLOAD_DIR $MINGW_DIR
+ wget_unpacked $GCC_GPP_DLL_URL $DOWNLOAD_DIR $MINGW_DIR
+ wget_unpacked $GCC_GMP_URL $DOWNLOAD_DIR $MINGW_DIR
+ wget_unpacked $GCC_MPC_URL $DOWNLOAD_DIR $MINGW_DIR
+ wget_unpacked $GCC_MPFR_URL $DOWNLOAD_DIR $MINGW_DIR
+ wget_unpacked $GCC_PTHREADS_URL $DOWNLOAD_DIR $MINGW_DIR
+ wget_unpacked $MINGW_RT_URL $DOWNLOAD_DIR $MINGW_DIR
+ wget_unpacked $MINGW_RT_DLL_URL $DOWNLOAD_DIR $MINGW_DIR
+ wget_unpacked $W32API_URL $DOWNLOAD_DIR $MINGW_DIR
+
if [ "$CROSS_COMPILE" != "yes" ]; then
- wget_unpacked $BINUTILS_URL $DOWNLOAD_DIR $MINGW_DIR
- wget_unpacked $GCC_CORE_URL $DOWNLOAD_DIR $MINGW_DIR
- wget_unpacked $GCC_CORE_DLL_URL $DOWNLOAD_DIR $MINGW_DIR
- wget_unpacked $GCC_GPP_URL $DOWNLOAD_DIR $MINGW_DIR
- wget_unpacked $GCC_GPP_DLL_URL $DOWNLOAD_DIR $MINGW_DIR
- wget_unpacked $GCC_GMP_URL $DOWNLOAD_DIR $MINGW_DIR
- wget_unpacked $GCC_MPC_URL $DOWNLOAD_DIR $MINGW_DIR
- wget_unpacked $GCC_MPFR_URL $DOWNLOAD_DIR $MINGW_DIR
- wget_unpacked $GCC_PTHREADS_URL $DOWNLOAD_DIR $MINGW_DIR
- wget_unpacked $MINGW_RT_URL $DOWNLOAD_DIR $MINGW_DIR
- wget_unpacked $MINGW_RT_DLL_URL $DOWNLOAD_DIR $MINGW_DIR
- wget_unpacked $W32API_URL $DOWNLOAD_DIR $MINGW_DIR
wget_unpacked $MINGW_MAKE_URL $DOWNLOAD_DIR $MINGW_DIR
(echo "y"; echo "y"; echo "$_MINGW_WFSDIR"; echo "y") | sh pi.sh
else
@@ -1527,7 +1530,7 @@ function make_install() {
make install
qpushd $_INSTALL_UDIR/bin
- [ "$CROSS_COMPILE" = "yes" ] && die "Cross-compile mingw is missing some parts for installation. Install step unavailable in cross-compile."
+ if [ ! -f $_MINGW_UDIR/bin/libstdc++-6.dll ] ; then die "File $_MINGW_UDIR/bin/libstdc++-6.dll is missing. Install step unavailable in cross-compile." ; fi
# Copy libstdc++-6.dll and its dependency to gnucash bin directory
# to prevent DLL loading errors
@@ -1649,7 +1652,7 @@ function inst_docs() {
fi
mkdir -p $_DOCS_UDIR/repos
- qpushd $DOCS_DIR/repos
+ qpushd $_DOCS_UDIR/repos
if [ "$UPDATE_DOCS" = "yes" ]; then
if [ -x .svn ]; then
setup "SVN update of docs"
commit 0aac7dca3a7ab03185a16aebe2fcc293c6c7c9a1
Author: Christian Stimming <stimming at tuhh.de>
Date: Sat Apr 23 20:32:56 2011 +0000
Win32 build: Add version checks for guile and libxslt.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20594 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 6f79869..c78a564 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -186,7 +186,8 @@ set_default GMP_DIR $GLOBAL_DIR\\gmp
set_default GMP5_BIN_URL "$SF_MIRROR/mingw/libgmp-5.0.1-1-mingw32-dll-10.tar.lzma"
set_default GMP5_DEV_URL "$SF_MIRROR/mingw/gmp-5.0.1-1-mingw32-dev.tar.lzma"
-set_default GUILE_URL "http://ftp.gnu.org/pub/gnu/guile/guile-1.8.8.tar.gz"
+GUILE_VERSION="1.8.8"
+set_default GUILE_URL "http://ftp.gnu.org/pub/gnu/guile/guile-${GUILE_VERSION}.tar.gz"
set_default GUILE_DIR $GLOBAL_DIR\\guile
set_default GUILE_PATCH `pwd`/guile-1.8.8.patch
@@ -231,7 +232,7 @@ set_default GAIL_DEV_URL "$GNOME_WIN32_URL/gail/1.22/gail-dev-1.22.0.
GCONF_VERSION="2.22.0"
set_default GCONF_URL "$GNOME_WIN32_URL/GConf/2.22/GConf_${GCONF_VERSION}-3_win32.zip"
set_default GCONF_DEV_URL "$GNOME_WIN32_URL/GConf/2.22/GConf-dev_${GCONF_VERSION}-3_win32.zip"
-GDK_PIXBUF_VERSION=2.22.1
+#GDK_PIXBUF_VERSION=2.22.1
set_default GDK_PIXBUF_URL "$GNOME_WIN32_URL/gdk-pixbuf/2.22/gdk-pixbuf_${GCONF_VERSION}-1_win32.zip"
set_default GDK_PIXBUF_DEV_URL "$GNOME_WIN32_URL/gdk-pixbuf/2.22/gdk-pixbuf-dev_${GCONF_VERSION}-1_win32.zip"
set_default GETTEXT_RUNTIME_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime_0.18.1.1-2_win32.zip"
diff --git a/install-impl.sh b/install-impl.sh
index b5cf192..a6889b6 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -610,14 +610,14 @@ EOF
wget_unpacked $LIBXML2_SRC_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/libxml2-*
qpushd $TMP_UDIR/libxml2-*
- ./configure \
+ ./configure ${HOST_XCOMPILE} \
--prefix=${_GNOME_UDIR} \
--without-threads
make
make install
qpopd
-
rm -rf ${TMP_UDIR}/libxml2-*
+
quiet gconftool-2 --version &&
quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 &&
quiet intltoolize --version || die "gnome not installed correctly"
@@ -686,7 +686,8 @@ function inst_guile() {
add_to_env -L$_GUILE_UDIR/lib GUILE_LDFLAGS
add_to_env $_GUILE_UDIR/bin PATH
add_to_env ${_GUILE_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
- if quiet guile -c '(use-modules (srfi srfi-39))'
+ if quiet guile -c '(use-modules (srfi srfi-39))' &&
+ quiet ${PKG_CONFIG} --atleast-version=${GUILE_VERSION} guile-1.8
then
echo "guile and slib already installed in $_GUILE_UDIR. skipping."
else
@@ -1093,7 +1094,7 @@ function inst_libsoup() {
wget_unpacked $LIBSOUP_SRC_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/libsoup-*
qpushd $TMP_UDIR/libsoup-*
- ./configure \
+ ./configure ${HOST_XCOMPILE} \
--prefix=${_LIBSOUP_UDIR} \
--disable-gtk-doc \
--without-gnome \
@@ -1115,7 +1116,8 @@ function inst_libxslt() {
add_to_env $_LIBXSLT_UDIR/bin PATH
add_to_env $_LIBXSLT_UDIR/lib/pkgconfig PKG_CONFIG_PATH
add_to_env -L${_LIBXSLT_UDIR}/lib LIBXSLT_LDFLAGS
- if quiet which xsltproc
+ if quiet which xsltproc &&
+ quiet ${PKG_CONFIG} --atleast-version=${LIBXSLT_VERSION} libxslt
then
echo "libxslt already installed in $_LIBXSLT_UDIR. skipping."
else
@@ -1127,7 +1129,7 @@ function inst_libxslt() {
assert_one_dir $TMP_UDIR/libxslt-*
qpushd $TMP_UDIR/libxslt-*
patch -p0 -u -i ${LIBXSLT_MAKEFILE_PATCH}
- ./configure \
+ ./configure ${HOST_XCOMPILE} \
--prefix=${_LIBXSLT_UDIR} \
--with-libxml-prefix=${_GNOME_UDIR}
make
@@ -1525,10 +1527,12 @@ function make_install() {
make install
qpushd $_INSTALL_UDIR/bin
+ [ "$CROSS_COMPILE" = "yes" ] && die "Cross-compile mingw is missing some parts for installation. Install step unavailable in cross-compile."
+
# Copy libstdc++-6.dll and its dependency to gnucash bin directory
# to prevent DLL loading errors
# (__gxx_personality_v0 not found in libstdc++-6.dll)
- cp $MINGW_DIR/bin/{libstdc++-6.dll,libgcc_s_dw2-1.dll} .
+ cp $_MINGW_UDIR/bin/{libstdc++-6.dll,libgcc_s_dw2-1.dll} .
qpopd
qpushd $_INSTALL_UDIR/lib
commit dba7d960a5edf20e63092eea2cb9169e0adcdec1
Author: Christian Stimming <stimming at tuhh.de>
Date: Sat Apr 23 08:42:20 2011 +0000
Win32 build: Tweak webkit.pc prefix path to match the installation.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20590 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
index 6e58ef7..b5cf192 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1348,6 +1348,10 @@ function inst_webkit() {
fi
quiet ${PKG_CONFIG} --exists webkit-1.0 || die "webkit not installed correctly"
rm -rf ${TMP_UDIR}/webkit-*
+
+ qpushd $_WEBKIT_UDIR/lib/pkgconfig
+ perl -pi.bak -e"s!^prefix=.*\$!prefix=$_WEBKIT_UDIR!" *.pc
+ qpopd
fi
}
commit 082bac01ad16e9b3a58e6adb4529a457734d336a
Author: Christian Stimming <stimming at tuhh.de>
Date: Fri Apr 22 19:59:13 2011 +0000
Win32 build: Remove manually setting guile variables because pkg-config finds them correctly now even in cross-compile.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20588 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
index 0b9078e..6e58ef7 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1461,14 +1461,6 @@ function inst_gnucash() {
AQBANKING_UPATH="${_OPENSSL_UDIR}/bin:${_GWENHYWFAR_UDIR}/bin:${_AQBANKING_UDIR}/bin"
LIBOFX_OPTIONS="--enable-ofx --with-ofx-prefix=${_LIBOFX_UDIR}"
- if [ "$CROSS_COMPILE" = "yes" ]; then
- # Set these variables manually because of cross-compiling
- export GUILE_LIBS="${GUILE_LDFLAGS} -lguile -lguile-ltdl"
- export GUILE_INCS="${GUILE_CPPFLAGS}"
- export BUILD_GUILE=yes
- export name_build_guile=/usr/bin/guile-config
- fi
-
if [ "$BUILD_FROM_TARBALL" != "yes" ]; then
qpushd $REPOS_DIR
./autogen.sh
commit f66d300c3b1abea64f557970d1651b90f0c212ba
Author: Christian Stimming <stimming at tuhh.de>
Date: Fri Apr 22 19:44:00 2011 +0000
Win32 build: Fix aqbanking version lookup
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20587 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/dist-impl.sh b/dist-impl.sh
index 68a04fc..bea1b15 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -259,8 +259,18 @@ function dist_gnucash() {
cp -a $_REPOS_UDIR/packaging/win32/install-fq-mods.cmd $DIST_UDIR/bin
_QTDIR_WIN=$(unix_path $QTDIR | sed 's,^/\([A-Za-z]\)/,\1:/,g' )
- _AQBANKING_SO_EFFECTIVE=$(awk '/AQBANKING_SO_EFFECTIVE / { print $3 }' ${_AQBANKING_UDIR}/include/aqbanking/version.h )
- _GWENHYWFAR_SO_EFFECTIVE=$(awk '/GWENHYWFAR_SO_EFFECTIVE / { print $3 }' ${_GWENHYWFAR_UDIR}/include/gwenhywfar3/gwenhywfar/version.h )
+ if [ "$AQBANKING5" != "yes" ] ; then
+ # aqbanking < 5
+ AQBANKING_VERSION_H=${_AQBANKING_UDIR}/include/aqbanking/version.h
+ GWENHYWFAR_VERSION_H=${_GWENHYWFAR_UDIR}/include/gwenhywfar3/gwenhywfar/version.h
+ else
+ # aqbanking >= 5.0.0
+ AQBANKING_VERSION_H=${_AQBANKING_UDIR}/include/aqbanking5/aqbanking/version.h
+ GWENHYWFAR_VERSION_H=${_GWENHYWFAR_UDIR}/include/gwenhywfar4/gwenhywfar/version.h
+ fi
+
+ _AQBANKING_SO_EFFECTIVE=$(awk '/AQBANKING_SO_EFFECTIVE / { print $3 }' ${AQBANKING_VERSION_H} )
+ _GWENHYWFAR_SO_EFFECTIVE=$(awk '/GWENHYWFAR_SO_EFFECTIVE / { print $3 }' ${GWENHYWFAR_VERSION_H} )
sed < $_BUILD_UDIR/packaging/win32/gnucash.iss \
> $_GNUCASH_UDIR/gnucash.iss \
-e "s#@-qtbindir-@#${_QTDIR_WIN}/bin#g" \
commit b0220aea4d902ab777ff80a799f3df65551bd822
Author: Christian Stimming <stimming at tuhh.de>
Date: Fri Apr 22 19:43:50 2011 +0000
Win32 build: GUILE must be in PKG_CONFIG_PATH
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20586 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
index f7eef8c..0b9078e 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -685,6 +685,7 @@ function inst_guile() {
add_to_env -I$_GUILE_UDIR/include GUILE_CPPFLAGS
add_to_env -L$_GUILE_UDIR/lib GUILE_LDFLAGS
add_to_env $_GUILE_UDIR/bin PATH
+ add_to_env ${_GUILE_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
if quiet guile -c '(use-modules (srfi srfi-39))'
then
echo "guile and slib already installed in $_GUILE_UDIR. skipping."
commit bf1680dcad6cc66c5e0d53e589a25723f667da43
Author: Christian Stimming <stimming at tuhh.de>
Date: Fri Apr 22 19:20:00 2011 +0000
Win32 build: Add linker directories for xslt and pthread.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20584 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
index ec8627b..f7eef8c 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1113,6 +1113,7 @@ function inst_libxslt() {
_LIBXSLT_UDIR=`unix_path $LIBXSLT_DIR`
add_to_env $_LIBXSLT_UDIR/bin PATH
add_to_env $_LIBXSLT_UDIR/lib/pkgconfig PKG_CONFIG_PATH
+ add_to_env -L${_LIBXSLT_UDIR}/lib LIBXSLT_LDFLAGS
if quiet which xsltproc
then
echo "libxslt already installed in $_LIBXSLT_UDIR. skipping."
@@ -1485,7 +1486,7 @@ function inst_gnucash() {
--enable-binreloc \
--enable-locale-specific-tax \
CPPFLAGS="${AUTOTOOLS_CPPFLAGS} ${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GMP_CPPFLAGS} ${GUILE_CPPFLAGS} ${LIBDBI_CPPFLAGS} ${KTOBLZCHECK_CPPFLAGS} ${HH_CPPFLAGS} ${LIBSOUP_CPPFLAGS} -D_WIN32 ${EXTRA_CFLAGS}" \
- LDFLAGS="${AUTOTOOLS_LDFLAGS} ${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GMP_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} ${HH_LDFLAGS} -L${_SQLITE3_UDIR}/lib -L${_ENCHANT_UDIR}/lib" \
+ LDFLAGS="${AUTOTOOLS_LDFLAGS} ${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GMP_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} ${HH_LDFLAGS} -L${_SQLITE3_UDIR}/lib -L${_ENCHANT_UDIR}/lib -L${_LIBXSLT_UDIR}/lib -L${_MINGW_UDIR}/lib" \
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
make
commit 568ab9155128738bc2c5ce41084a9f222bc9b024
Author: Christian Stimming <stimming at tuhh.de>
Date: Fri Apr 22 12:56:07 2011 +0000
Win32: another try to have gnucash pick up the correct libdirs.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20583 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
index a70ac67..ec8627b 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1485,7 +1485,7 @@ function inst_gnucash() {
--enable-binreloc \
--enable-locale-specific-tax \
CPPFLAGS="${AUTOTOOLS_CPPFLAGS} ${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GMP_CPPFLAGS} ${GUILE_CPPFLAGS} ${LIBDBI_CPPFLAGS} ${KTOBLZCHECK_CPPFLAGS} ${HH_CPPFLAGS} ${LIBSOUP_CPPFLAGS} -D_WIN32 ${EXTRA_CFLAGS}" \
- LDFLAGS="${AUTOTOOLS_LDFLAGS} ${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GMP_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} ${HH_LDFLAGS} ${SQLITE3_LDFLAGS} ${ENCHANT_LDFLAGS}" \
+ LDFLAGS="${AUTOTOOLS_LDFLAGS} ${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GMP_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} ${HH_LDFLAGS} -L${_SQLITE3_UDIR}/lib -L${_ENCHANT_UDIR}/lib" \
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
make
commit 0f1c30ed57e753a055963530a59365c37190b415
Author: Christian Stimming <stimming at tuhh.de>
Date: Fri Apr 22 12:52:43 2011 +0000
Win32 build: Fixes for cross-compiling.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20582 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
index de2454c..a70ac67 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -174,9 +174,13 @@ function inst_mingw() {
fi
quiet test_for_mingw || die "mingw not installed correctly"
fi
- cp ${_MINGW_UDIR}/bin/libpthread-2.dll ${_MINGW_UDIR}/bin/pthreadGC2.dll
- configure_msys "$_PID" "$_MINGW_WFSDIR"
+ if [ "$CROSS_COMPILE" != "yes" ]; then
+ # Some preparation steps, only for native (non-cross-compile)
+ cp ${_MINGW_UDIR}/bin/libpthread-2.dll ${_MINGW_UDIR}/bin/pthreadGC2.dll
+
+ configure_msys "$_PID" "$_MINGW_WFSDIR"
+ fi
}
function inst_mingwutils() {
commit f06e57ee6f9d509e18064594c83c6d0addc33830
Author: Christian Stimming <stimming at tuhh.de>
Date: Fri Apr 22 12:27:47 2011 +0000
Win32 build: Potentially fix another typo?
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20581 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
index 39596fb..de2454c 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -402,7 +402,7 @@ function inst_enchant() {
setup enchant
_ENCHANT_UDIR=`unix_path $ENCHANT_DIR`
add_to_env ${_ENCHANT_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
- add_to_env "-L${_ENCHANT_UDIR}/lib" ENCHANT_LDFLAGS
+ add_to_env -L${_ENCHANT_UDIR}/lib ENCHANT_LDFLAGS
if quiet ${PKG_CONFIG} --exists enchant
then
echo "enchant already installed in $_ENCHANT_UDIR. skipping."
@@ -896,7 +896,7 @@ function inst_libdbi() {
add_to_env -I$_LIBDBI_UDIR/include LIBDBI_CPPFLAGS
add_to_env -L$_LIBDBI_UDIR/lib LIBDBI_LDFLAGS
add_to_env -I${_SQLITE3_UDIR}/include SQLITE3_CFLAGS
- add_to_env "-L${_SQLITE3_UDIR}/lib" SQLITE3_LDFLAGS
+ add_to_env -L${_SQLITE3_UDIR}/lib SQLITE3_LDFLAGS
if test -f ${_SQLITE3_UDIR}/bin/libsqlite3-0.dll
then
echo "SQLite3 already installed in $_SQLITE3_UDIR. skipping."
commit e47169497558ccd66b10706729462c4354427d06
Author: Christian Stimming <stimming at tuhh.de>
Date: Fri Apr 22 12:27:37 2011 +0000
Win32 build: Enable aqbanking5 instead of aqbanking4, which is possible because of updated gtk.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20580 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 195ed0d..6f79869 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -358,14 +358,14 @@ set_default LIBOFX_DIR $GLOBAL_DIR\\libofx
#set_default LIBOFX_PATCH `pwd`/libofx-0.8.3-patch.diff
## online banking: gwenhywfar+aqbanking
-set_default AQBANKING5 no
+set_default AQBANKING5 yes
# If sticking to aqbanking4, make sure to enable the QtCore4.dll et al
# in gnucash.iss.in again because in aqbanking4 those DLLs are still
# needed.
if [ "$AQBANKING5" = "yes" ]; then
- GWENHYWFAR_VERSION="4.0.7"
- set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=59&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
+ GWENHYWFAR_VERSION="4.0.9"
+ set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=60&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
else
GWENHYWFAR_VERSION="3.11.3"
set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=31&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
@@ -378,8 +378,8 @@ set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-${KTOBLZCHECK_VE
# ktoblzcheck is being installed into GWENHYWFAR_DIR
if [ "$AQBANKING5" = "yes" ]; then
- AQBANKING_VERSION="5.0.4"
- set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=77&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
+ AQBANKING_VERSION="5.0.5"
+ set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=78&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
set_default AQBANKING_WITH_QT no
else
AQBANKING_VERSION="4.2.4"
diff --git a/gnucash.iss.in b/gnucash.iss.in
index 24c479a..da39ffc 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -81,14 +81,14 @@ Source: "@prefix@\..\dist\share\*"; DestDir: "{app}\share"; Flags: recursesubdir
;;; Not needed with AQBANKING5!
;; Additionally, we ship the Qt DLLs because the Online-Banking-Wizard
;; lib/aqbanking/plugins/@-aqbanking_so_effective-@/wizards/qt3-wizard.exe needs them.
-Source: "@-qtbindir-@\QtCore4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-Source: "@-qtbindir-@\QtGui4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-Source: "@-qtbindir-@\mingwm10.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-;; The following are all needed by Qt3Support
-Source: "@-qtbindir-@\Qt3Support4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-Source: "@-qtbindir-@\QtXml4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-Source: "@-qtbindir-@\QtSql4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-Source: "@-qtbindir-@\QtNetwork4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+;Source: "@-qtbindir-@\QtCore4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+;Source: "@-qtbindir-@\QtGui4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+;Source: "@-qtbindir-@\mingwm10.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+;;; The following are all needed by Qt3Support
+;Source: "@-qtbindir-@\Qt3Support4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+;Source: "@-qtbindir-@\QtXml4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+;Source: "@-qtbindir-@\QtSql4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+;Source: "@-qtbindir-@\QtNetwork4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
;; The translations
;Source: "@prefix@\..\dist\share\locale\*"; DestDir: "{app}\share\locale"; Flags: recursesubdirs; Components: translations
commit 3f30599003e567e6b03a14ce0b0f71d6c7e35c2f
Author: Christian Stimming <stimming at tuhh.de>
Date: Fri Apr 22 12:11:07 2011 +0000
Win32 build: Fix typo
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20579 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
index d87634b..39596fb 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -402,7 +402,7 @@ function inst_enchant() {
setup enchant
_ENCHANT_UDIR=`unix_path $ENCHANT_DIR`
add_to_env ${_ENCHANT_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
- add_to_end "-L${_ENCHANT_UDIR}/lib" ENCHANT_LDFLAGS
+ add_to_env "-L${_ENCHANT_UDIR}/lib" ENCHANT_LDFLAGS
if quiet ${PKG_CONFIG} --exists enchant
then
echo "enchant already installed in $_ENCHANT_UDIR. skipping."
commit 158aeb7151709121d47c84564ca885c303e7241b
Author: Christian Stimming <stimming at tuhh.de>
Date: Fri Apr 22 10:07:51 2011 +0000
Win32 build: Add missing LDFLAGS for correct usage of new webkit.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20578 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
index f3315fb..d87634b 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -402,6 +402,7 @@ function inst_enchant() {
setup enchant
_ENCHANT_UDIR=`unix_path $ENCHANT_DIR`
add_to_env ${_ENCHANT_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
+ add_to_end "-L${_ENCHANT_UDIR}/lib" ENCHANT_LDFLAGS
if quiet ${PKG_CONFIG} --exists enchant
then
echo "enchant already installed in $_ENCHANT_UDIR. skipping."
@@ -895,8 +896,7 @@ function inst_libdbi() {
add_to_env -I$_LIBDBI_UDIR/include LIBDBI_CPPFLAGS
add_to_env -L$_LIBDBI_UDIR/lib LIBDBI_LDFLAGS
add_to_env -I${_SQLITE3_UDIR}/include SQLITE3_CFLAGS
- add_to_env -lsqlite3 SQLITE3_LIBS
- add_to_env -L${_SQLITE3_UDIR}/lib SQLITE3_LIBS
+ add_to_env "-L${_SQLITE3_UDIR}/lib" SQLITE3_LDFLAGS
if test -f ${_SQLITE3_UDIR}/bin/libsqlite3-0.dll
then
echo "SQLite3 already installed in $_SQLITE3_UDIR. skipping."
@@ -1317,7 +1317,7 @@ function inst_webkit() {
patch -p0 -u < $WEBKIT_CONFIGURE_PATCH
CPPFLAGS="${GNOME_CPPFLAGS} ${SQLITE3_CFLAGS}" \
- LDFLAGS="${GNOME_LDFLAGS} ${SQLITE3_LIBS}" \
+ LDFLAGS="${GNOME_LDFLAGS} ${SQLITE3_LDFLAGS} -lsqlite3" \
PERL="${_ACTIVE_PERL_BASE_DIR}/bin/perl" \
./configure \
--prefix=${_WEBKIT_UDIR} \
@@ -1480,9 +1480,8 @@ function inst_gnucash() {
${AQBANKING_OPTIONS} \
--enable-binreloc \
--enable-locale-specific-tax \
- --with-html-engine=webkit \
CPPFLAGS="${AUTOTOOLS_CPPFLAGS} ${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GMP_CPPFLAGS} ${GUILE_CPPFLAGS} ${LIBDBI_CPPFLAGS} ${KTOBLZCHECK_CPPFLAGS} ${HH_CPPFLAGS} ${LIBSOUP_CPPFLAGS} -D_WIN32 ${EXTRA_CFLAGS}" \
- LDFLAGS="${AUTOTOOLS_LDFLAGS} ${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GMP_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} ${HH_LDFLAGS}" \
+ LDFLAGS="${AUTOTOOLS_LDFLAGS} ${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GMP_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} ${HH_LDFLAGS} ${SQLITE3_LDFLAGS} ${ENCHANT_LDFLAGS}" \
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
make
commit 40fd8b81d9c6064068088cc6eccf8e8e6f923167
Author: Christian Stimming <stimming at tuhh.de>
Date: Thu Apr 21 10:53:33 2011 +0000
Win32 build: Add version check for webkit
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20575 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
index 9321132..f3315fb 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1301,7 +1301,8 @@ function inst_webkit() {
setup WebKit
_WEBKIT_UDIR=`unix_path ${WEBKIT_DIR}`
add_to_env ${_WEBKIT_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
- if quiet ${PKG_CONFIG} --exists webkit-1.0
+ if quiet ${PKG_CONFIG} --exists webkit-1.0 &&
+ quiet ${PKG_CONFIG} --atleast-version=${WEBKIT_VERSION} webkit-1.0
then
echo "webkit already installed in $_WEBKIT_UDIR. skipping."
else
commit fb240569e4bfdb8cd4f122ecee4a6128c5fd01b3
Author: Christian Stimming <stimming at tuhh.de>
Date: Tue Apr 19 11:32:51 2011 +0000
Win32 build: Update libofx version.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20567 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 4d8578f..195ed0d 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -352,7 +352,8 @@ set_default OPENSP_URL "$SF_MIRROR/openjade/OpenSP-1.5.2.tar.gz"
set_default OPENSP_DIR $GLOBAL_DIR\\opensp
set_default OPENSP_PATCH `pwd`/opensp-1.5.2-patch.diff
-set_default LIBOFX_URL "$SF_MIRROR/libofx/libofx-0.9.2.tar.gz"
+LIBOFX_VERSION="0.9.4"
+set_default LIBOFX_URL "$SF_MIRROR/libofx/libofx-${LIBOFX_VERSION}.tar.gz"
set_default LIBOFX_DIR $GLOBAL_DIR\\libofx
#set_default LIBOFX_PATCH `pwd`/libofx-0.8.3-patch.diff
diff --git a/install-impl.sh b/install-impl.sh
index 043271c..9321132 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1047,7 +1047,7 @@ function inst_libofx() {
_LIBOFX_UDIR=`unix_path ${LIBOFX_DIR}`
add_to_env ${_LIBOFX_UDIR}/bin PATH
add_to_env ${_LIBOFX_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
- if quiet ${PKG_CONFIG} --exists libofx
+ if quiet ${PKG_CONFIG} --exists libofx && quiet ${PKG_CONFIG} --atleast-version=${LIBOFX_VERSION} libofx
then
echo "Libofx already installed in $_LIBOFX_UDIR. skipping."
else
@@ -1068,7 +1068,7 @@ function inst_libofx() {
--with-opensp-libs=${_OPENSP_UDIR}/lib \
CPPFLAGS="-DOS_WIN32 ${GNOME_CPPFLAGS}" \
--disable-static \
- --with-iconv=${_GNOME_UDIR}
+ --with-iconv=${_GNOME_UDIR}
make LDFLAGS="${LDFLAGS} -no-undefined ${GNOME_LDFLAGS} -liconv"
make install
qpopd
commit 6d74496588d50d0db8deff33d413c98fbe47261e
Author: Phil Longstaff <plongstaff at newearth.org>
Date: Sun Apr 17 16:42:57 2011 +0000
Modify win32 component directories - remove remaining version numbers from directory names. I'd like
to add them back, eventually, but this matches the naming used when I built the webkit 1.2.7 zip.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20561 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index aa1dc8b..4d8578f 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -318,7 +318,7 @@ set_default HH_DIR $GLOBAL_DIR\\hh
set_default BUILD_WEBKIT_FROM_SOURCE no
set_default WEBKIT_VERSION "1.2.7"
set_default WEBKIT_URL "$SF_MIRROR/gnucash/webkit-${WEBKIT_VERSION}-win32.zip"
-set_default WEBKIT_DIR $GLOBAL_DIR\\webkit-${WEBKIT_VERSION}
+set_default WEBKIT_DIR $GLOBAL_DIR\\webkit
set_default WEBKIT_SRC_URL "http://www.webkitgtk.org/webkit-1.2.7.tar.gz"
set_default WEBKIT_PATCH `pwd`/webkit-1.2.7-time.patch
set_default WEBKIT_PATCH2 `pwd`/webkit-1.2.7-vasprintf.patch
@@ -333,11 +333,11 @@ set_default WEBKIT_WEBKITENUMTYPES_H `pwd`/webkitenumtypes.h
set_default ENCHANT_VERSION "1.5.0"
set_default ENCHANT_URL "$GNOME_WIN32_URL/dependencies/enchant_${ENCHANT_VERSION}-2_win32.zip"
set_default ENCHANT_DEV_URL "$GNOME_WIN32_URL/dependencies/enchant-dev_${ENCHANT_VERSION}-2_win32.zip"
-set_default ENCHANT_DIR $GLOBAL_DIR\\enchant-${ENCHANT_VERSION}
+set_default ENCHANT_DIR $GLOBAL_DIR\\enchant
set_default LIBSOUP_VERSION "2.28.2"
set_default LIBSOUP_URL "$GNOME_WIN32_URL/libsoup/2.26/libsoup-${LIBSOUP_VERSION}-1_win32.zip"
set_default LIBSOUP_DEV_URL "$GNOME_WIN32_URL/libsoup/2.26/libsoup-dev-${LIBSOUP_VERSION}-1_win32.zip"
-set_default LIBSOUP_DIR $GLOBAL_DIR\\libsoup-${LIBSOUP_VERSION}
+set_default LIBSOUP_DIR $GLOBAL_DIR\\libsoup
set_default LIBSOUP_SRC_URL "$GNOME_MIRROR/sources/libsoup/2.28/libsoup-${LIBSOUP_VERSION}.tar.bz2"
set_default ICU4C_URL "http://download.icu-project.org/files/icu4c/4.4.1/icu4c-4_4_1-Win32-msvc9.zip"
set_default ICU4C_SRC_URL "http://download.icu-project.org/files/icu4c/4.4.1/icu4c-4_4_1-src.tgz"
commit 888e3f04369b108901c7460f5ffc00b01b7427f8
Author: Phil Longstaff <plongstaff at newearth.org>
Date: Tue Apr 12 23:52:51 2011 +0000
Update win32 components:
Gtk to 2.24
Webkit to 1.2.7
Others to latest version
install-impl.sh now has option to build webkit if BUILD_WEBKIT_FROM_SOURCE is defined as "yes".
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20560 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 20e7357..aa1dc8b 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -204,77 +204,86 @@ set_default EXETYPE_SCRIPT `pwd`/exetype.pl
set_default EXETYPE_DIR $TOOLS_DIR
XMLSOFT_URL="http://xmlsoft.org/sources/win32"
-set_default LIBXSLT_URL "${XMLSOFT_URL}/libxslt-1.1.26.win32.zip"
-set_default LIBXSLT_LIBXML2_URL "${XMLSOFT_URL}/libxml2-2.7.6.win32.zip"
+XSLT_BASE_URL="http://ftp.acc.umu.se/pub/GNOME/sources/libxslt/1.1"
+XML2_BASE_URL="http://ftp.acc.umu.se/pub/GNOME/sources/libxml2/2.6"
+LIBXSLT_VERSION=1.1.22
+#LIBXSLT_VERSION=1.1.26
+set_default LIBXSLT_SRC_URL "${XSLT_BASE_URL}/libxslt-${LIBXSLT_VERSION}.tar.bz2"
+set_default LIBXSLT_MAKEFILE_PATCH "`pwd`/libxslt-1.1.22.Makefile.in.patch"
+set_default LIBXML2_SRC_URL "${XML2_BASE_URL}/libxml2-2.6.27.tar.bz2"
set_default LIBXSLT_ICONV_URL "${XMLSOFT_URL}/iconv-1.9.2.win32.zip"
set_default LIBXSLT_ZLIB_URL "${XMLSOFT_URL}/zlib-1.2.3.win32.zip"
set_default LIBXSLT_DIR $GLOBAL_DIR\\libxslt
-set_default LIBXSLT_SRC_URL "http://xmlsoft.org/sources/libxslt-1.1.26.tar.gz" # needed for webkit build
-
-set_default LIBXML2_URL "$GNOME_WIN32_DEPS_URL/libxml2_2.7.4-1_win32.zip"
-set_default LIBXML2_DEV_URL "$GNOME_WIN32_DEPS_URL/libxml2-dev_2.7.4-1_win32.zip"
-set_default GETTEXT_RUNTIME_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime-0.17-1.zip"
-set_default GETTEXT_RUNTIME_DEV_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime-dev-0.17-1.zip"
-set_default GETTEXT_TOOLS_URL "$GNOME_WIN32_DEPS_URL/gettext-tools-0.17.zip"
-set_default LIBICONV_URL "$GNOME_WIN32_DEPS_URL/libiconv-1.9.1.bin.woe32.zip"
-set_default GLIB_URL "$GNOME_WIN32_URL/glib/2.22/glib_2.22.4-1_win32.zip"
-set_default GLIB_DEV_URL "$GNOME_WIN32_URL/glib/2.22/glib-dev_2.22.4-1_win32.zip"
-set_default LIBJPEG_URL "$SF_MIRROR/gnucash/jpeg_7-1-fixed-win32.zip"
-set_default LIBJPEG_DEV_URL "$GNOME_WIN32_DEPS_URL/jpeg-dev_7-1_win32.zip"
-set_default LIBPNG_URL "$GNOME_WIN32_DEPS_URL/libpng_1.4.0-1_win32.zip"
-set_default LIBPNG_DEV_URL "$GNOME_WIN32_DEPS_URL/libpng-dev_1.4.0-1_win32.zip"
-set_default LIBTIFF_URL "$GNOME_WIN32_DEPS_URL/libtiff_3.9.1-1_win32.zip"
-set_default LIBTIFF_DEV_URL "$GNOME_WIN32_DEPS_URL/libtiff-dev_3.9.1-1_win32.zip"
-set_default ZLIB_URL "$GNOME_WIN32_DEPS_URL/zlib-1.2.3.zip"
-set_default ZLIB_DEV_URL "$GNOME_WIN32_DEPS_URL/zlib-dev-1.2.3.zip"
-set_default PKG_CONFIG_URL "$GNOME_WIN32_DEPS_URL/pkg-config_0.23-3_win32.zip"
-set_default PKG_CONFIG_DEV_URL "$GNOME_WIN32_DEPS_URL/pkg-config-dev_0.23-3_win32.zip"
-CAIRO_VERSION="1.8.8"
-set_default CAIRO_URL "$GNOME_WIN32_DEPS_URL/cairo_${CAIRO_VERSION}-4_win32.zip"
-set_default CAIRO_DEV_URL "$GNOME_WIN32_DEPS_URL/cairo-dev_${CAIRO_VERSION}-4_win32.zip"
-set_default PIXMAN_URL "http://cairographics.org/releases/pixman-0.17.6.tar.gz"
-set_default EXPAT_URL "$GNOME_WIN32_DEPS_URL/expat_2.0.1-1_win32.zip"
-set_default EXPAT_DEV_URL "$GNOME_WIN32_DEPS_URL/expat-dev_2.0.1-1_win32.zip"
-set_default FONTCONFIG_URL "$GNOME_WIN32_DEPS_URL/fontconfig_2.8.0-2_win32.zip"
-set_default FONTCONFIG_DEV_URL "$GNOME_WIN32_DEPS_URL/fontconfig-dev_2.8.0-2_win32.zip"
-set_default FREETYPE_URL "$GNOME_WIN32_DEPS_URL/freetype_2.3.11-2_win32.zip"
-set_default FREETYPE_DEV_URL "$GNOME_WIN32_DEPS_URL/freetype-dev_2.3.11-2_win32.zip"
-set_default ATK_URL "$GNOME_WIN32_URL/atk/1.28/atk_1.28.0-1_win32.zip"
-set_default ATK_DEV_URL "$GNOME_WIN32_URL/atk/1.28/atk-dev_1.28.0-1_win32.zip"
-set_default PANGO_URL "$GNOME_WIN32_URL/pango/1.26/pango_1.26.2-1_win32.zip"
-set_default PANGO_DEV_URL "$GNOME_WIN32_URL/pango/1.26/pango-dev_1.26.2-1_win32.zip"
-set_default LIBART_LGPL_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart_lgpl-2.3.20.zip"
-set_default LIBART_LGPL_DEV_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart_lgpl-dev-2.3.20.zip"
-GTK_VERSION="2.16.6"
-set_default GTK_URL "$GNOME_WIN32_URL/gtk+/2.16/gtk+_${GTK_VERSION}-2_win32.zip"
-set_default GTK_DEV_URL "$GNOME_WIN32_URL/gtk+/2.16/gtk+-dev_${GTK_VERSION}-2_win32.zip"
-set_default INTLTOOL_URL "$GNOME_WIN32_URL/intltool/0.40/intltool_0.40.4-1_win32.zip"
-set_default ORBIT2_URL "$GNOME_WIN32_URL/ORBit2/2.14/ORBit2-2.14.13.zip"
-set_default ORBIT2_DEV_URL "$GNOME_WIN32_URL/ORBit2/2.14/ORBit2-dev-2.14.13.zip"
-set_default GAIL_URL "$GNOME_WIN32_URL/gail/1.22/gail-1.22.0.zip"
-set_default GAIL_DEV_URL "$GNOME_WIN32_URL/gail/1.22/gail-dev-1.22.0.zip"
-set_default POPT_URL "$GNOME_WIN32_DEPS_URL/popt-1.10.2-tml-20050828.zip"
-set_default POPT_DEV_URL "$GNOME_WIN32_DEPS_URL/popt-dev-1.10.2-tml-20050828.zip"
+
+set_default ATK_URL "$GNOME_WIN32_URL/atk/1.32/atk_1.32.0-1_win32.zip"
+set_default ATK_DEV_URL "$GNOME_WIN32_URL/atk/1.32/atk-dev_1.32.0-1_win32.zip"
+CAIRO_VERSION="1.10.2"
+set_default CAIRO_URL "$GNOME_WIN32_DEPS_URL/cairo_${CAIRO_VERSION}-1_win32.zip"
+set_default CAIRO_DEV_URL "$GNOME_WIN32_DEPS_URL/cairo-dev_${CAIRO_VERSION}-1_win32.zip"
+set_default EXPAT_URL "$GNOME_WIN32_DEPS_URL/expat_2.0.1-1_win32.zip"
+set_default EXPAT_DEV_URL "$GNOME_WIN32_DEPS_URL/expat-dev_2.0.1-1_win32.zip"
+set_default FONTCONFIG_URL "$GNOME_WIN32_DEPS_URL/fontconfig_2.8.0-2_win32.zip"
+set_default FONTCONFIG_DEV_URL "$GNOME_WIN32_DEPS_URL/fontconfig-dev_2.8.0-2_win32.zip"
+set_default FREETYPE_URL "$GNOME_WIN32_DEPS_URL/freetype_2.4.4-1_win32.zip"
+set_default FREETYPE_DEV_URL "$GNOME_WIN32_DEPS_URL/freetype-dev_2.4.4-1_win32.zip"
+set_default GAIL_URL "$GNOME_WIN32_URL/gail/1.22/gail-1.22.0.zip"
+set_default GAIL_DEV_URL "$GNOME_WIN32_URL/gail/1.22/gail-dev-1.22.0.zip"
GCONF_VERSION="2.22.0"
-set_default GCONF_URL "$GNOME_WIN32_URL/GConf/2.22/GConf_${GCONF_VERSION}-3_win32.zip"
-set_default GCONF_DEV_URL "$GNOME_WIN32_URL/GConf/2.22/GConf-dev_${GCONF_VERSION}-3_win32.zip"
-set_default LIBBONOBO_URL "$GNOME_WIN32_URL/libbonobo/2.24/libbonobo_2.24.0-1_win32.zip"
-set_default LIBBONOBO_DEV_URL "$GNOME_WIN32_URL/libbonobo/2.24/libbonobo-dev_2.24.0-1_win32.zip"
-set_default GNOME_VFS_URL "$GNOME_WIN32_URL/gnome-vfs/2.24/gnome-vfs_2.24.1-1_win32.zip"
-set_default GNOME_VFS_DEV_URL "$GNOME_WIN32_URL/gnome-vfs/2.24/gnome-vfs-dev_2.24.1-1_win32.zip"
-set_default LIBGNOME_URL "$GNOME_WIN32_URL/libgnome/2.24/libgnome_2.24.1-1_win32.zip"
-set_default LIBGNOME_DEV_URL "$GNOME_WIN32_URL/libgnome/2.24/libgnome-dev_2.24.1-1_win32.zip"
-set_default LIBGNOMECANVAS_URL "$GNOME_WIN32_URL/libgnomecanvas/2.20/libgnomecanvas-2.20.1.zip"
-set_default LIBGNOMECANVAS_DEV_URL "$GNOME_WIN32_URL/libgnomecanvas/2.20/libgnomecanvas-dev-2.20.1.zip"
-set_default LIBGNOMEUI_URL "$GNOME_WIN32_URL/libgnomeui/2.22/libgnomeui-2.22.1.zip"
-set_default LIBGNOMEUI_DEV_URL "$GNOME_WIN32_URL/libgnomeui/2.22/libgnomeui-dev-2.22.1.zip"
-set_default LIBGLADE_URL "$GNOME_WIN32_URL/libglade/2.6/libglade_2.6.4-1_win32.zip"
-set_default LIBGLADE_DEV_URL "$GNOME_WIN32_URL/libglade/2.6/libglade-dev_2.6.4-1_win32.zip"
-set_default GTK_DOC_URL "$GNOME_MIRROR/sources/gtk-doc/1.13/gtk-doc-1.13.tar.bz2"
-set_default GTK_THEME_URL "$SF_MIRROR/gtk-win/gtk2-themes-2009-09-07-win32_bin.zip"
-set_default GTK_PREFS_URL "$SF_MIRROR/gtk-win/gtk2_prefs-0.4.1.bin-gtk2.10-win32.zip"
+set_default GCONF_URL "$GNOME_WIN32_URL/GConf/2.22/GConf_${GCONF_VERSION}-3_win32.zip"
+set_default GCONF_DEV_URL "$GNOME_WIN32_URL/GConf/2.22/GConf-dev_${GCONF_VERSION}-3_win32.zip"
+GDK_PIXBUF_VERSION=2.22.1
+set_default GDK_PIXBUF_URL "$GNOME_WIN32_URL/gdk-pixbuf/2.22/gdk-pixbuf_${GCONF_VERSION}-1_win32.zip"
+set_default GDK_PIXBUF_DEV_URL "$GNOME_WIN32_URL/gdk-pixbuf/2.22/gdk-pixbuf-dev_${GCONF_VERSION}-1_win32.zip"
+set_default GETTEXT_RUNTIME_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime_0.18.1.1-2_win32.zip"
+set_default GETTEXT_RUNTIME_DEV_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime-dev_0.18.1.1-2_win32.zip"
+set_default GETTEXT_TOOLS_URL "$GNOME_WIN32_DEPS_URL/gettext-tools-dev_0.18.1.1-2_win32.zip"
+set_default GLIB_URL "$GNOME_WIN32_URL/glib/2.28/glib_2.28.1-1_win32.zip"
+set_default GLIB_DEV_URL "$GNOME_WIN32_URL/glib/2.28/glib-dev_2.28.1-1_win32.zip"
+set_default GNOME_VFS_URL "$GNOME_WIN32_URL/gnome-vfs/2.24/gnome-vfs_2.24.1-1_win32.zip"
+set_default GNOME_VFS_DEV_URL "$GNOME_WIN32_URL/gnome-vfs/2.24/gnome-vfs-dev_2.24.1-1_win32.zip"
+GTK_VERSION="2.24.0"
+set_default GTK_URL "$GNOME_WIN32_URL/gtk+/2.24/gtk+_${GTK_VERSION}-1_win32.zip"
+set_default GTK_DEV_URL "$GNOME_WIN32_URL/gtk+/2.24/gtk+-dev_${GTK_VERSION}-1_win32.zip"
+set_default GTK_DOC_URL "$GNOME_MIRROR/sources/gtk-doc/1.13/gtk-doc-1.13.tar.bz2"
+set_default GTK_PREFS_URL "$SF_MIRROR/gtk-win/gtk2_prefs-0.4.1.bin-gtk2.10-win32.zip"
+set_default GTK_THEME_URL "$SF_MIRROR/gtk-win/gtk2-themes-2009-09-07-win32_bin.zip"
+set_default INTLTOOL_URL "$GNOME_WIN32_URL/intltool/0.40/intltool_0.40.4-1_win32.zip"
+set_default LIBART_LGPL_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart-lgpl_2.3.21-1_win32.zip"
+set_default LIBART_LGPL_DEV_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart-lgpl-dev_2.3.21-1_win32.zip"
+set_default LIBBONOBO_URL "$GNOME_WIN32_URL/libbonobo/2.24/libbonobo_2.24.0-1_win32.zip"
+set_default LIBBONOBO_DEV_URL "$GNOME_WIN32_URL/libbonobo/2.24/libbonobo-dev_2.24.0-1_win32.zip"
+set_default LIBGLADE_URL "$GNOME_WIN32_URL/libglade/2.6/libglade_2.6.4-1_win32.zip"
+set_default LIBGLADE_DEV_URL "$GNOME_WIN32_URL/libglade/2.6/libglade-dev_2.6.4-1_win32.zip"
+set_default LIBGNOME_URL "$GNOME_WIN32_URL/libgnome/2.24/libgnome_2.24.1-1_win32.zip"
+set_default LIBGNOME_DEV_URL "$GNOME_WIN32_URL/libgnome/2.24/libgnome-dev_2.24.1-1_win32.zip"
+set_default LIBGNOMECANVAS_URL "$GNOME_WIN32_URL/libgnomecanvas/2.30/libgnomecanvas_2.30.1-1_win32.zip"
+set_default LIBGNOMECANVAS_DEV_URL "$GNOME_WIN32_URL/libgnomecanvas/2.30/libgnomecanvas-dev_2.30.1-1_win32.zip"
+set_default LIBGNOMEUI_URL "$GNOME_WIN32_URL/libgnomeui/2.22/libgnomeui-2.22.1.zip"
+set_default LIBGNOMEUI_DEV_URL "$GNOME_WIN32_URL/libgnomeui/2.22/libgnomeui-dev-2.22.1.zip"
+set_default LIBICONV_URL "$GNOME_WIN32_DEPS_URL/libiconv-1.9.1.bin.woe32.zip"
+set_default LIBJPEG_URL "$SF_MIRROR/gnucash/jpeg_7-1-fixed-win32.zip"
+set_default LIBJPEG_DEV_URL "$GNOME_WIN32_DEPS_URL/jpeg-dev_7-1_win32.zip"
+set_default LIBPNG_URL "$GNOME_WIN32_DEPS_URL/libpng_1.4.3-1_win32.zip"
+set_default LIBPNG_DEV_URL "$GNOME_WIN32_DEPS_URL/libpng-dev_1.4.3-1_win32.zip"
+set_default LIBTIFF_URL "$GNOME_WIN32_DEPS_URL/libtiff_3.9.2-1_win32.zip"
+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.28/pango_1.28.3-1_win32.zip"
+set_default PANGO_DEV_URL "$GNOME_WIN32_URL/pango/1.28/pango-dev_1.28.3-1_win32.zip"
+set_default PIXMAN_DEV_URL "$GNOME_WIN32_DEPS_URL/pixman-dev_0.20.0-1_win32.zip"
+set_default PKG_CONFIG_URL "$GNOME_WIN32_DEPS_URL/pkg-config_0.25-1_win32.zip"
+set_default PKG_CONFIG_DEV_URL "$GNOME_WIN32_DEPS_URL/pkg-config-dev_0.25-1_win32.zip"
+set_default POPT_URL "$GNOME_WIN32_DEPS_URL/popt-1.10.2-tml-20050828.zip"
+set_default POPT_DEV_URL "$GNOME_WIN32_DEPS_URL/popt-dev-1.10.2-tml-20050828.zip"
+set_default ZLIB_URL "$GNOME_WIN32_DEPS_URL/zlib_1.2.5-2_win32.zip"
+set_default ZLIB_DEV_URL "$GNOME_WIN32_DEPS_URL/zlib-dev_1.2.5-2_win32.zip"
set_default GNOME_DIR $GLOBAL_DIR\\gnome
+set_default PIXMAN_URL "http://cairographics.org/releases/pixman-0.17.6.tar.gz"
+
set_default LIBBONOBOUI_URL "$GNOME_WIN32_URL/libbonoboui/2.24/libbonoboui_2.24.0-1_win32.zip"
set_default LIBBONOBOUI_DEV_URL "$GNOME_WIN32_URL/libbonoboui/2.24/libbonoboui-dev_2.24.0-1_win32.zip"
set_default LIBBONOBOUI_SRC_URL "$GNOME_MIRROR/sources/libbonoboui/2.24/libbonoboui-2.24.2.tar.bz2"
@@ -292,8 +301,8 @@ LIBGSF_VERSION="1.14.17"
set_default LIBGSF_URL "$GNOME_MIRROR/sources/libgsf/1.14/libgsf-${LIBGSF_VERSION}.tar.bz2"
set_default LIBGSF_DIR $GLOBAL_DIR\\libgsf
-GOFFICE_VERSION="0.7.18"
-set_default GOFFICE_URL "$GNOME_MIRROR/sources/goffice/0.7/goffice-${GOFFICE_VERSION}.tar.bz2"
+GOFFICE_VERSION="0.8.13"
+set_default GOFFICE_URL "$GNOME_MIRROR/sources/goffice/0.8/goffice-${GOFFICE_VERSION}.tar.bz2"
set_default GOFFICE_DIR $GLOBAL_DIR\\goffice
#set_default GOFFICE_PATCH `pwd`/goffice-0.7.2-patch.diff
@@ -306,17 +315,30 @@ set_default INNO_DIR $GLOBAL_DIR\\inno
set_default HH_URL "http://download.microsoft.com/download/0/a/9/0a939ef6-e31c-430f-a3df-dfae7960d564/htmlhelp.exe"
set_default HH_DIR $GLOBAL_DIR\\hh
-set_default WEBKIT_VERSION "1.1.90"
+set_default BUILD_WEBKIT_FROM_SOURCE no
+set_default WEBKIT_VERSION "1.2.7"
set_default WEBKIT_URL "$SF_MIRROR/gnucash/webkit-${WEBKIT_VERSION}-win32.zip"
set_default WEBKIT_DIR $GLOBAL_DIR\\webkit-${WEBKIT_VERSION}
set_default WEBKIT_SRC_URL "http://www.webkitgtk.org/webkit-1.2.7.tar.gz"
set_default WEBKIT_PATCH `pwd`/webkit-1.2.7-time.patch
set_default WEBKIT_PATCH2 `pwd`/webkit-1.2.7-vasprintf.patch
-set_default ENCHANT_URL "$GNOME_WIN32_URL/dependencies/enchant_1.5.0-2_win32.zip"
-set_default ENCHANT_DEV_URL "$GNOME_WIN32_URL/dependencies/enchant-dev_1.5.0-2_win32.zip"
-#set_default LIBSOUP_URL "$GNOME_WIN32_URL/libsoup/2.4/libsoup-2.4.0.zip"
-#set_default LIBSOUP_DEV_URL "$GNOME_WIN32_URL/libsoup/2.4/libsoup-dev-2.4.0.zip"
-set_default LIBSOUP_SRC_URL "$GNOME_MIRROR/sources/libsoup/2.30/libsoup-2.30.1.tar.bz2"
+set_default WEBKIT_CONFIGURE_PATCH `pwd`/webkit-1.2.7-configure.patch
+set_default WEBKIT_DATADIR_PATCH `pwd`/webkit-1.2.7-datadir.patch
+set_default WEBKIT_GCCPATH_PATCH `pwd`/webkit-1.2.7-gccpath.patch
+set_default WEBKIT_MAKEFILE_PATCH `pwd`/webkit-1.2.7-makefile.patch
+set_default WEBKIT_MINGW32_PATCH `pwd`/webkit-1.2.7-mingw32.patch
+set_default WEBKIT_NOSVG_PATCH `pwd`/webkit-1.2.7-nosvg.patch
+set_default WEBKIT_WEBKITENUMTYPES_CPP `pwd`/webkitenumtypes.cpp
+set_default WEBKIT_WEBKITENUMTYPES_H `pwd`/webkitenumtypes.h
+set_default ENCHANT_VERSION "1.5.0"
+set_default ENCHANT_URL "$GNOME_WIN32_URL/dependencies/enchant_${ENCHANT_VERSION}-2_win32.zip"
+set_default ENCHANT_DEV_URL "$GNOME_WIN32_URL/dependencies/enchant-dev_${ENCHANT_VERSION}-2_win32.zip"
+set_default ENCHANT_DIR $GLOBAL_DIR\\enchant-${ENCHANT_VERSION}
+set_default LIBSOUP_VERSION "2.28.2"
+set_default LIBSOUP_URL "$GNOME_WIN32_URL/libsoup/2.26/libsoup-${LIBSOUP_VERSION}-1_win32.zip"
+set_default LIBSOUP_DEV_URL "$GNOME_WIN32_URL/libsoup/2.26/libsoup-dev-${LIBSOUP_VERSION}-1_win32.zip"
+set_default LIBSOUP_DIR $GLOBAL_DIR\\libsoup-${LIBSOUP_VERSION}
+set_default LIBSOUP_SRC_URL "$GNOME_MIRROR/sources/libsoup/2.28/libsoup-${LIBSOUP_VERSION}.tar.bz2"
set_default ICU4C_URL "http://download.icu-project.org/files/icu4c/4.4.1/icu4c-4_4_1-Win32-msvc9.zip"
set_default ICU4C_SRC_URL "http://download.icu-project.org/files/icu4c/4.4.1/icu4c-4_4_1-src.tgz"
set_default ICU4C_DIR $GLOBAL_DIR\\icu-mingw32
diff --git a/dist-impl.sh b/dist-impl.sh
index c7f0640..68a04fc 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -26,10 +26,13 @@ Please set AQBANKING_WITH_QT to yes and rerun install.sh first."
_GNOME_UDIR=`unix_path $GNOME_DIR`
_PCRE_UDIR=`unix_path $PCRE_DIR`
_LIBBONOBOUI_UDIR=`unix_path $LIBBONOBOUI_DIR`
+ _LIBSOUP_UDIR=`unix_path $LIBSOUP_DIR`
+ _ENCHANT_UDIR=`unix_path $ENCHANT_DIR`
_LIBGSF_UDIR=`unix_path $LIBGSF_DIR`
_GOFFICE_UDIR=`unix_path $GOFFICE_DIR`
_OPENSP_UDIR=`unix_path $OPENSP_DIR`
_LIBOFX_UDIR=`unix_path $LIBOFX_DIR`
+ _LIBXSLT_UDIR=`unix_path $LIBXSLT_DIR`
_GMP_UDIR=`unix_path $GMP_DIR`
_GNUTLS_UDIR=`unix_path $GNUTLS_DIR`
_GWENHYWFAR_UDIR=`unix_path $GWENHYWFAR_DIR`
@@ -43,6 +46,7 @@ Please set AQBANKING_WITH_QT to yes and rerun install.sh first."
_GNUCASH_UDIR=`unix_path $GNUCASH_DIR`
_REPOS_UDIR=`unix_path $REPOS_DIR`
_BUILD_UDIR=`unix_path $BUILD_DIR`
+ _MINGW_UDIR=`unix_path $MINGW_DIR`
_INSTALL_UDIR=`unix_path $INSTALL_DIR`
_INNO_UDIR=`unix_path $INNO_DIR`
_WEBKIT_UDIR=`unix_path $WEBKIT_DIR`
@@ -56,10 +60,13 @@ Please set AQBANKING_WITH_QT to yes and rerun install.sh first."
configure_msys "$PID" "$_MINGW_WFSDIR"
}
-function dist_regex() {
- setup RegEx
- smart_wget $REGEX_URL $DOWNLOAD_DIR
- unzip -q $LAST_FILE bin/libgnurx-0.dll -d $DIST_DIR
+function dist_aqbanking() {
+ setup aqbanking
+ cp -a ${_AQBANKING_UDIR}/bin/*.exe ${DIST_UDIR}/bin
+ cp -a ${_AQBANKING_UDIR}/bin/*.dll ${DIST_UDIR}/bin
+ cp -a ${_AQBANKING_UDIR}/lib/aqbanking ${DIST_UDIR}/lib
+ cp -a ${_AQBANKING_UDIR}/share/aqbanking ${DIST_UDIR}/share
+ cp -a ${_AQBANKING_UDIR}/share/locale ${DIST_UDIR}/share
}
function dist_autotools() {
@@ -68,56 +75,45 @@ function dist_autotools() {
cp -a $_AUTOTOOLS_UDIR/bin/*.dll $DIST_UDIR/bin
}
-function dist_guile() {
- setup Guile
- mkdir -p $DIST_UDIR/bin
- cp -a $_GUILE_UDIR/bin/libguile{.,-srfi}*dll $DIST_UDIR/bin
- cp -a $_GUILE_UDIR/bin/guile.exe $DIST_UDIR/bin
- mkdir -p $DIST_UDIR/share
- cp -a $_GUILE_UDIR/share/guile $DIST_UDIR/share
-}
-
-function dist_openssl() {
- setup OpenSSL
- _OPENSSL_UDIR=`unix_path $OPENSSL_DIR`
- mkdir -p $DIST_UDIR/bin
- cp -a $_OPENSSL_UDIR/bin/*.dll $DIST_UDIR/bin
+function dist_gmp() {
+ setup gmp
+ cp -a ${_GMP_UDIR}/bin/*.dll ${DIST_UDIR}/bin
}
function dist_gnome() {
setup Gnome platform
- wget_unpacked $LIBXML2_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $GETTEXT_RUNTIME_URL $DOWNLOAD_DIR $DIST_DIR
- smart_wget $LIBICONV_URL $DOWNLOAD_DIR
- unzip -q $LAST_FILE bin/iconv.dll -d $DIST_DIR
- wget_unpacked $GLIB_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $LIBJPEG_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $LIBPNG_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $LIBTIFF_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $ZLIB_URL $DOWNLOAD_DIR $DIST_DIR
+ wget_unpacked $ATK_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $CAIRO_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $EXPAT_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $FONTCONFIG_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $FREETYPE_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $ATK_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $PANGO_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $LIBART_LGPL_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $GTK_URL $DOWNLOAD_DIR $DIST_DIR
- echo 'gtk-theme-name = "MS-Windows"' > $DIST_DIR/etc/gtk-2.0/gtkrc
- wget_unpacked $ORBIT2_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GAIL_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $POPT_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GCONF_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $LIBBONOBO_URL $DOWNLOAD_DIR $DIST_DIR
+ wget_unpacked $GDK_PIXBUF_URL $DOWNLOAD_DIR $DIST_DIR
+ wget_unpacked $GETTEXT_RUNTIME_URL $DOWNLOAD_DIR $DIST_DIR
+ wget_unpacked $GLIB_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GNOME_VFS_URL $DOWNLOAD_DIR $DIST_DIR
+ wget_unpacked $GTK_URL $DOWNLOAD_DIR $DIST_DIR
+ wget_unpacked $LIBART_LGPL_URL $DOWNLOAD_DIR $DIST_DIR
+ wget_unpacked $LIBBONOBO_URL $DOWNLOAD_DIR $DIST_DIR
+ wget_unpacked $LIBBONOBOUI_URL $DOWNLOAD_DIR $DIST_DIR
+ wget_unpacked $LIBGLADE_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBGNOME_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBGNOMECANVAS_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $LIBBONOBOUI_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBGNOMEUI_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $LIBGLADE_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $PIXMAN_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $GTK_THEME_URL $DOWNLOAD_DIR $TMP_DIR
+ smart_wget $LIBICONV_URL $DOWNLOAD_DIR
+ unzip -q $LAST_FILE bin/iconv.dll -d $DIST_DIR
+ wget_unpacked $LIBJPEG_URL $DOWNLOAD_DIR $DIST_DIR
+ 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 $POPT_URL $DOWNLOAD_DIR $DIST_DIR
+ wget_unpacked $ZLIB_URL $DOWNLOAD_DIR $DIST_DIR
+ echo 'gtk-theme-name = "MS-Windows"' > $DIST_DIR/etc/gtk-2.0/gtkrc
+ wget_unpacked $GTK_THEME_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/gtk2-themes-*
cp -a $TMP_UDIR/gtk2-themes-*/lib $DIST_DIR/
cp -a $TMP_UDIR/gtk2-themes-*/share $DIST_DIR/
@@ -128,6 +124,10 @@ function dist_gnome() {
mv $TMP_UDIR/gtk2_prefs-*/gtk2_prefs.exe $DIST_DIR/bin
rm -rf $TMP_UDIR/gtk2_prefs-*
+ wget_unpacked $PIXMAN_URL $DOWNLOAD_DIR $DIST_DIR
+
+ cp -a $_GNOME_UDIR/bin/libxml*.dll $DIST_DIR/bin
+
rm -rf $DIST_UDIR/etc/gconf/gconf.xml.defaults/{desktop,schemas}
if [ -d $DIST_UDIR/lib/locale ] ; then
# Huh, is this removed in newer gtk?
@@ -136,30 +136,10 @@ function dist_gnome() {
fi
}
-function dist_isocodes() {
- setup isocodes
- mkdir -p $DIST_UDIR/share
- cp -a $_ISOCODES_UDIR/share/{locale,xml} $DIST_UDIR/share
-}
-
-function dist_pcre() {
- setup pcre
- mkdir -p $DIST_UDIR/bin
- cp -a $_PCRE_UDIR/bin/pcre3.dll $DIST_UDIR/bin
-}
-
-function dist_libbonoboui() {
- setup libbonoboui
- mkdir -p $DIST_UDIR/bin
- cp -a $_LIBBONOBOUI_UDIR/bin/libbonoboui*.dll $DIST_UDIR/bin
-}
-
-function dist_libgsf() {
- setup libGSF
- mkdir -p $DIST_UDIR/bin
- cp -a $_LIBGSF_UDIR/bin/libgsf*.dll $DIST_UDIR/bin
- mkdir -p $DIST_UDIR/share
- cp -a $_LIBGSF_UDIR/share/locale $DIST_UDIR/share
+function dist_gnutls() {
+ setup gnutls
+ cp -a ${_GNUTLS_UDIR}/bin/*.dll ${DIST_UDIR}/bin
+ cp -a ${_GNUTLS_UDIR}/bin/*.exe ${DIST_UDIR}/bin
}
function dist_goffice() {
@@ -172,24 +152,13 @@ function dist_goffice() {
cp -a $_GOFFICE_UDIR/share/{goffice,locale,pixmaps} $DIST_UDIR/share
}
-function dist_libofx() {
- setup OpenSP and LibOFX
- cp -a ${_OPENSP_UDIR}/bin/*.dll ${DIST_UDIR}/bin
- cp -a ${_OPENSP_UDIR}/share/OpenSP ${DIST_UDIR}/share
- cp -a ${_LIBOFX_UDIR}/bin/*.dll ${DIST_UDIR}/bin
- cp -a ${_LIBOFX_UDIR}/bin/*.exe ${DIST_UDIR}/bin
- cp -a ${_LIBOFX_UDIR}/share/libofx ${DIST_UDIR}/share
-}
-
-function dist_gnutls() {
- setup gnutls
- cp -a ${_GNUTLS_UDIR}/bin/*.dll ${DIST_UDIR}/bin
- cp -a ${_GNUTLS_UDIR}/bin/*.exe ${DIST_UDIR}/bin
-}
-
-function dist_gmp() {
- setup gmp
- cp -a ${_GMP_UDIR}/bin/*.dll ${DIST_UDIR}/bin
+function dist_guile() {
+ setup Guile
+ mkdir -p $DIST_UDIR/bin
+ cp -a $_GUILE_UDIR/bin/libguile{.,-srfi}*dll $DIST_UDIR/bin
+ cp -a $_GUILE_UDIR/bin/guile.exe $DIST_UDIR/bin
+ mkdir -p $DIST_UDIR/share
+ cp -a $_GUILE_UDIR/share/guile $DIST_UDIR/share
}
function dist_gwenhywfar() {
@@ -201,19 +170,22 @@ function dist_gwenhywfar() {
cp -a ${_GWENHYWFAR_UDIR}/share/gwenhywfar/ca-bundle.crt ${DIST_UDIR}/share/gwenhywfar
}
+function dist_isocodes() {
+ setup isocodes
+ mkdir -p $DIST_UDIR/share
+ cp -a $_ISOCODES_UDIR/share/{locale,xml} $DIST_UDIR/share
+}
+
function dist_ktoblzcheck() {
setup ktoblzcheck
# dll is already copied in dist_gwenhywfar
cp -a ${_GWENHYWFAR_UDIR}/share/ktoblzcheck ${DIST_UDIR}/share
}
-function dist_aqbanking() {
- setup aqbanking
- cp -a ${_AQBANKING_UDIR}/bin/*.exe ${DIST_UDIR}/bin
- cp -a ${_AQBANKING_UDIR}/bin/*.dll ${DIST_UDIR}/bin
- cp -a ${_AQBANKING_UDIR}/lib/aqbanking ${DIST_UDIR}/lib
- cp -a ${_AQBANKING_UDIR}/share/aqbanking ${DIST_UDIR}/share
- cp -a ${_AQBANKING_UDIR}/share/locale ${DIST_UDIR}/share
+function dist_libbonoboui() {
+ setup libbonoboui
+ mkdir -p $DIST_UDIR/bin
+ cp -a $_LIBBONOBOUI_UDIR/bin/libbonoboui*.dll $DIST_UDIR/bin
}
function dist_libdbi() {
@@ -228,14 +200,54 @@ function dist_libdbi() {
cp -a ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/*.dll ${DIST_UDIR}/lib/dbd
}
+function dist_libgsf() {
+ setup libGSF
+ mkdir -p $DIST_UDIR/bin
+ cp -a $_LIBGSF_UDIR/bin/libgsf*.dll $DIST_UDIR/bin
+ mkdir -p $DIST_UDIR/share
+ cp -a $_LIBGSF_UDIR/share/locale $DIST_UDIR/share
+}
+
+function dist_libofx() {
+ setup OpenSP and LibOFX
+ cp -a ${_OPENSP_UDIR}/bin/*.dll ${DIST_UDIR}/bin
+ cp -a ${_OPENSP_UDIR}/share/OpenSP ${DIST_UDIR}/share
+ cp -a ${_LIBOFX_UDIR}/bin/*.dll ${DIST_UDIR}/bin
+ cp -a ${_LIBOFX_UDIR}/bin/*.exe ${DIST_UDIR}/bin
+ cp -a ${_LIBOFX_UDIR}/share/libofx ${DIST_UDIR}/share
+}
+
+function dist_openssl() {
+ setup OpenSSL
+ _OPENSSL_UDIR=`unix_path $OPENSSL_DIR`
+ mkdir -p $DIST_UDIR/bin
+ cp -a $_OPENSSL_UDIR/bin/*.dll $DIST_UDIR/bin
+}
+
+function dist_pcre() {
+ setup pcre
+ mkdir -p $DIST_UDIR/bin
+ cp -a $_PCRE_UDIR/bin/pcre3.dll $DIST_UDIR/bin
+}
+
+function dist_regex() {
+ setup RegEx
+ smart_wget $REGEX_URL $DOWNLOAD_DIR
+ unzip -q $LAST_FILE bin/libgnurx-0.dll -d $DIST_DIR
+}
+
function dist_webkit() {
setup WebKit
+ cp -a ${_LIBSOUP_UDIR}/bin/* ${DIST_UDIR}/bin
+ cp -a ${_LIBXSLT_UDIR}/bin/* ${DIST_UDIR}/bin
+ cp -a ${_ENCHANT_UDIR}/bin/* ${DIST_UDIR}/bin
cp -a ${_WEBKIT_UDIR}/bin/* ${DIST_UDIR}/bin
}
function dist_gnucash() {
setup GnuCash
mkdir -p $DIST_UDIR/bin
+ cp $_MINGW_UDIR/bin/pthreadGC2.dll $DIST_UDIR/bin
cp -a $_INSTALL_UDIR/bin/* $DIST_UDIR/bin
mkdir -p $DIST_UDIR/etc/gconf/schemas
cp -a $_INSTALL_UDIR/etc/gconf/schemas/* $DIST_UDIR/etc/gconf/schemas
diff --git a/install-impl.sh b/install-impl.sh
index 2bfb70c..043271c 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -75,6 +75,24 @@ function inst_wget() {
fi
}
+function inst_cmake() {
+ setup CMake
+ _CMAKE_UDIR=`unix_path ${CMAKE_DIR}`
+ add_to_env ${_CMAKE_UDIR}/bin PATH
+ if [ -f ${_CMAKE_UDIR}/bin/cmake.exe ]
+ then
+ echo "cmake already installed in $_CMAKE_UDIR. skipping."
+ else
+ wget_unpacked $CMAKE_URL $DOWNLOAD_DIR $CMAKE_DIR
+
+ assert_one_dir ${_CMAKE_UDIR}/cmake-2*
+ mv ${_CMAKE_UDIR}/cmake-2*/* ${_CMAKE_UDIR}
+ rm -rf ${_CMAKE_UDIR}/cmake-2*
+
+ [ -f ${_CMAKE_UDIR}/bin/cmake.exe ] || die "cmake not installed correctly"
+ fi
+}
+
function inst_dtk() {
setup MSYS DTK
_MSYS_UDIR=`unix_path $MSYS_DIR`
@@ -101,6 +119,21 @@ function inst_dtk() {
fi
}
+function inst_exetype() {
+ setup exetype
+ _EXETYPE_UDIR=`unix_path $EXETYPE_DIR`
+ add_to_env $_EXETYPE_UDIR/bin PATH
+ if quiet which exetype
+ then
+ echo "exetype already installed in $_EXETYPE_UDIR. skipping."
+ else
+ mkdir -p $_EXETYPE_UDIR/bin
+ cp $EXETYPE_SCRIPT $_EXETYPE_UDIR/bin/exetype
+ chmod +x $_EXETYPE_UDIR/bin/exetype
+ quiet which exetype || die "exetype unavailable"
+ fi
+}
+
function test_for_mingw() {
if [ "$CROSS_COMPILE" == "yes" ]; then
${CC} --version && ${LD} --help
@@ -114,6 +147,7 @@ function inst_mingw() {
_MINGW_UDIR=`unix_path $MINGW_DIR`
_MINGW_WFSDIR=`win_fs_path $MINGW_DIR`
[ "$CROSS_COMPILE" = "yes" ] && add_to_env $_MINGW_UDIR/bin PATH
+ add_to_env $_MINGW_UDIR/bin PATH
if quiet test_for_mingw
then
@@ -140,62 +174,85 @@ function inst_mingw() {
fi
quiet test_for_mingw || die "mingw not installed correctly"
fi
+ cp ${_MINGW_UDIR}/bin/libpthread-2.dll ${_MINGW_UDIR}/bin/pthreadGC2.dll
configure_msys "$_PID" "$_MINGW_WFSDIR"
}
-function inst_unzip() {
- setup Unzip
- _UNZIP_UDIR=`unix_path $UNZIP_DIR`
- add_to_env $_UNZIP_UDIR/bin PATH
- if quiet $_UNZIP_UDIR/bin/unzip --help || quiet unzip --help
+function inst_mingwutils() {
+ setup MinGW-Utils
+ _MINGW_UTILS_UDIR=`unix_path $MINGW_UTILS_DIR`
+ add_to_env $_MINGW_UTILS_UDIR/bin PATH
+ if quiet which pexports && quiet which reimp
then
- echo "unzip already installed in $_UNZIP_UDIR. skipping."
+ echo "mingw-utils already installed in $_MINGW_UTILS_UDIR. skipping."
else
- smart_wget $UNZIP_URL $DOWNLOAD_DIR
- $LAST_FILE //SP- //SILENT //DIR="$UNZIP_DIR"
- quiet unzip --help || die "unzip unavailable"
+ wget_unpacked $MINGW_UTILS_URL $DOWNLOAD_DIR $MINGW_UTILS_DIR
+ quiet which pexports || die "mingw-utils not installed correctly (pexports)"
+ quiet which reimp || die "mingw-utils not installed correctly (reimp)"
fi
}
-function inst_regex() {
- setup RegEx
- _REGEX_UDIR=`unix_path $REGEX_DIR`
- add_to_env -lregex REGEX_LDFLAGS
- add_to_env -I$_REGEX_UDIR/include REGEX_CPPFLAGS
- add_to_env -L$_REGEX_UDIR/lib REGEX_LDFLAGS
- add_to_env $_REGEX_UDIR/bin PATH
- if quiet ${LD} $REGEX_LDFLAGS -o $TMP_UDIR/ofile
+function inst_svn() {
+ setup Subversion
+ _SVN_UDIR=`unix_path $SVN_DIR`
+ add_to_env $_SVN_UDIR/bin PATH
+ if quiet $_SVN_UDIR/bin/svn --version
then
- echo "regex already installed in $_REGEX_UDIR. skipping."
+ echo "subversion already installed in $_SVN_UDIR. skipping."
else
- mkdir -p $_REGEX_UDIR
- wget_unpacked $REGEX_URL $DOWNLOAD_DIR $REGEX_DIR
- wget_unpacked $REGEX_DEV_URL $DOWNLOAD_DIR $REGEX_DIR
- quiet ${LD} $REGEX_LDFLAGS -o $TMP_UDIR/ofile || die "regex not installed correctly"
+ wget_unpacked $SVN_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/svn-win32-*
+ rm -rf $SVN_DIR
+ mkdir -p $SVN_DIR
+ cp -a $TMP_UDIR/svn-win32-*/* $SVN_DIR
+ rm -rf $TMP_UDIR/svn-win32-*
+ quiet $_SVN_UDIR/bin/svn --version || die "svn not installed correctly"
fi
}
-function inst_readline() {
- setup Readline
- _READLINE_UDIR=`unix_path $READLINE_DIR`
- add_to_env -I$_READLINE_UDIR/include READLINE_CPPFLAGS
- add_to_env -L$_READLINE_UDIR/lib READLINE_LDFLAGS
- add_to_env $_READLINE_UDIR/bin PATH
- if quiet ${LD} $READLINE_LDFLAGS -lreadline -o $TMP_UDIR/ofile
+function inst_swig() {
+ setup Swig
+ _SWIG_UDIR=`unix_path $SWIG_DIR`
+ add_to_env $_SWIG_UDIR PATH
+ if quiet swig -version
then
- echo "readline already installed in $_READLINE_UDIR. skipping."
+ echo "swig already installed in $_SWIG_UDIR. skipping."
else
- mkdir -p $_READLINE_UDIR
- wget_unpacked $READLINE_BIN_URL $DOWNLOAD_DIR $READLINE_DIR
- wget_unpacked $READLINE_LIB_URL $DOWNLOAD_DIR $READLINE_DIR
- quiet ${LD} $READLINE_LDFLAGS -lreadline -o $TMP_UDIR/ofile || die "readline not installed correctly"
+ wget_unpacked $SWIG_URL $DOWNLOAD_DIR $SWIG_DIR
+ qpushd $SWIG_DIR
+ mv swigwin-* mydir
+ mv mydir/* .
+ mv mydir/.[A-Za-z]* . # hidden files
+ rmdir mydir
+ rm INSTALL # bites with /bin/install
+ qpopd
+ quiet swig -version || die "swig unavailable"
+ fi
+}
+
+function inst_unzip() {
+ setup Unzip
+ _UNZIP_UDIR=`unix_path $UNZIP_DIR`
+ add_to_env $_UNZIP_UDIR/bin PATH
+ if quiet $_UNZIP_UDIR/bin/unzip --help || quiet unzip --help
+ then
+ echo "unzip already installed in $_UNZIP_UDIR. skipping."
+ else
+ smart_wget $UNZIP_URL $DOWNLOAD_DIR
+ $LAST_FILE //SP- //SILENT //DIR="$UNZIP_DIR"
+ quiet unzip --help || die "unzip unavailable"
fi
}
+# Functions before this point are basic build infrastructure functions or else they get pieces needed to build
+# gnucash but which are not part of the final product. Functions after this point are for components of the
+# final build. Please leave in alphabetical order so they are easier to find.
+
function inst_active_perl() {
setup ActivePerl \(intltool\)
_ACTIVE_PERL_UDIR=`unix_path $ACTIVE_PERL_DIR`
+ _ACTIVE_PERL_BASE_DIR=$_ACTIVE_PERL_UDIR/ActivePerl/Perl
_ACTIVE_PERL_WFSDIR=`win_fs_path $ACTIVE_PERL_DIR`
set_env_or_die $_ACTIVE_PERL_WFSDIR/ActivePerl/Perl/bin/perl INTLTOOL_PERL
if quiet $INTLTOOL_PERL --help
@@ -211,6 +268,86 @@ function inst_active_perl() {
fi
}
+function inst_aqbanking() {
+ setup AqBanking
+ _AQBANKING_UDIR=`unix_path ${AQBANKING_DIR}`
+ add_to_env ${_AQBANKING_UDIR}/bin PATH
+ add_to_env ${_AQBANKING_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
+ if quiet ${PKG_CONFIG} --exact-version=${AQBANKING_VERSION} aqbanking
+ then
+ echo "AqBanking already installed in $_AQBANKING_UDIR. skipping."
+ else
+ wget_unpacked $AQBANKING_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/aqbanking-*
+ qpushd $TMP_UDIR/aqbanking-*
+ _AQ_CPPFLAGS="-I${_LIBOFX_UDIR}/include ${KTOBLZCHECK_CPPFLAGS} ${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS}"
+ _AQ_LDFLAGS="-L${_LIBOFX_UDIR}/lib ${KTOBLZCHECK_LDFLAGS} ${GNOME_LDFLAGS} ${GNUTLS_LDFLAGS}"
+ if test x$CROSS_COMPILE = xyes; then
+ XMLMERGE="xmlmerge"
+ else
+ XMLMERGE="${_GWENHYWFAR_UDIR}/bin/xmlmerge"
+ fi
+ if [ "$AQBANKING5" != "yes" ] ; then
+ _AQ_BACKENDS="aqhbci aqofxconnect"
+ else
+ # FIXME: Maybe also aqpaypal?
+ _AQ_BACKENDS="aqhbci aqofxconnect"
+ fi
+ if test x$AQBANKING_WITH_QT = xyes; then
+ inst_qt4
+ if [ -n "$AQBANKING_PATCH" -a -f "$AQBANKING_PATCH" ] ; then
+ patch -p1 < $AQBANKING_PATCH
+ #automake
+ #aclocal -I m4 ${ACLOCAL_FLAGS}
+ #autoconf
+ fi
+ ./configure ${HOST_XCOMPILE} \
+ --with-gwen-dir=${_GWENHYWFAR_UDIR} \
+ --with-xmlmerge=${XMLMERGE} \
+ --with-frontends="cbanking qbanking" \
+ --with-backends="${_AQ_BACKENDS}" \
+ CPPFLAGS="${_AQ_CPPFLAGS} ${GMP_CPPFLAGS}" \
+ LDFLAGS="${_AQ_LDFLAGS} ${GMP_LDFLAGS}" \
+ qt3_libs="-L${_QTDIR}/lib -L${_QTDIR}/bin -lQtCore4 -lQtGui4 -lQt3Support4" \
+ qt3_includes="-I${_QTDIR}/include -I${_QTDIR}/include/Qt -I${_QTDIR}/include/QtCore -I${_QTDIR}/include/QtGui -I${_QTDIR}/include/Qt3Support" \
+ --prefix=${_AQBANKING_UDIR}
+ make qt4-port
+ make clean
+ else
+ if [ -n "$AQBANKING_PATCH" -a -f "$AQBANKING_PATCH" ] ; then
+ patch -p1 < $AQBANKING_PATCH
+ #automake
+ #aclocal -I m4 ${ACLOCAL_FLAGS}
+ #autoconf
+ fi
+ ./configure ${HOST_XCOMPILE} \
+ --with-gwen-dir=${_GWENHYWFAR_UDIR} \
+ --with-xmlmerge=${XMLMERGE} \
+ --with-frontends="cbanking" \
+ --with-backends="${_AQ_BACKENDS}" \
+ CPPFLAGS="${_AQ_CPPFLAGS} ${GMP_CPPFLAGS}" \
+ LDFLAGS="${_AQ_LDFLAGS} ${GMP_LDFLAGS}" \
+ --prefix=${_AQBANKING_UDIR}
+ fi
+ make
+ rm -rf ${_AQBANKING_UDIR}
+ make install
+ qpopd
+ qpushd ${_AQBANKING_UDIR}/bin
+ if [ "$AQBANKING5" = "yes" ]; then
+ exetype aqbanking-cli.exe console
+ exetype aqhbci-tool4.exe console
+ else
+ exetype aqbanking-cli.exe console
+ exetype aqhbci-tool4.exe console
+ fi
+ qpopd
+ ${PKG_CONFIG} --exists aqbanking || die "AqBanking not installed correctly"
+ rm -rf ${TMP_UDIR}/aqbanking-*
+ fi
+ [ ! -d $_AQBANKING_UDIR/share/aclocal ] || add_to_env "-I $_AQBANKING_UDIR/share/aclocal" ACLOCAL_FLAGS
+}
+
function inst_autotools() {
setup Autotools
_AUTOTOOLS_UDIR=`unix_path $AUTOTOOLS_DIR`
@@ -237,7 +374,8 @@ function inst_autotools() {
make
make install
qpopd
- quiet autoconf --help && quiet automake --help || die "autoconf/automake not installed correctly"
+ quiet autoconf --help || die "autoconf not installed correctly"
+ quiet automake --help || die "automake not installed correctly"
rm -rf ${TMP_UDIR}/autoconf-* ${TMP_UDIR}/automake-*
fi
if quiet libtoolize --help && \
@@ -260,6 +398,41 @@ function inst_autotools() {
[ ! -d $_AUTOTOOLS_UDIR/share/aclocal ] || add_to_env "-I $_AUTOTOOLS_UDIR/share/aclocal" ACLOCAL_FLAGS
}
+function inst_enchant() {
+ setup enchant
+ _ENCHANT_UDIR=`unix_path $ENCHANT_DIR`
+ add_to_env ${_ENCHANT_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
+ if quiet ${PKG_CONFIG} --exists enchant
+ then
+ echo "enchant already installed in $_ENCHANT_UDIR. skipping."
+ else
+ wget_unpacked $ENCHANT_URL $DOWNLOAD_DIR $ENCHANT_DIR
+ wget_unpacked $ENCHANT_DEV_URL $DOWNLOAD_DIR $ENCHANT_DIR
+ quiet ${PKG_CONFIG} --exists enchant || die "enchant not installed correctly"
+ fi
+}
+
+function inst_glade() {
+ setup Glade
+ _GLADE_UDIR=`unix_path $GLADE_DIR`
+ _GLADE_WFSDIR=`win_fs_path $GLADE_DIR`
+ add_to_env $_GLADE_UDIR/bin PATH
+ if quiet glade-3 --version
+ then
+ echo "glade already installed in $_GLADE_UDIR. skipping."
+ else
+ wget_unpacked $GLADE_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/glade3-*
+ qpushd $TMP_UDIR/glade3-*
+ ./configure ${HOST_XCOMPILE} --prefix=$_GLADE_WFSDIR
+ make
+ make install
+ qpopd
+ quiet glade-3 --version || die "glade not installed correctly"
+ rm -rf ${TMP_UDIR}/glade3-*
+ fi
+}
+
function inst_gmp() {
setup Gmp
_GMP_UDIR=`unix_path ${GMP_DIR}`
@@ -286,22 +459,235 @@ function inst_gmp() {
fi
}
-function inst_guile() {
- setup Guile
- _GUILE_WFSDIR=`win_fs_path $GUILE_DIR`
- _GUILE_UDIR=`unix_path $GUILE_DIR`
- _WIN_UDIR=`unix_path $WINDIR`
- add_to_env -I$_GUILE_UDIR/include GUILE_CPPFLAGS
- add_to_env -L$_GUILE_UDIR/lib GUILE_LDFLAGS
- add_to_env $_GUILE_UDIR/bin PATH
- if quiet guile -c '(use-modules (srfi srfi-39))'
+function inst_gnome() {
+ setup Gnome platform
+ _GNOME_UDIR=`unix_path $GNOME_DIR`
+ add_to_env -I$_GNOME_UDIR/include GNOME_CPPFLAGS
+ add_to_env -L$_GNOME_UDIR/lib GNOME_LDFLAGS
+ add_to_env $_GNOME_UDIR/bin PATH
+ add_to_env $_GNOME_UDIR/lib/pkgconfig PKG_CONFIG_PATH
+ if [ "$CROSS_COMPILE" != "yes" ]; then
+ add_to_env $_GNOME_UDIR/bin/pkg-config-msys.sh PKG_CONFIG
+ else
+ add_to_env pkg-config PKG_CONFIG
+ fi
+ if quiet gconftool-2 --version &&
+ quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 &&
+ quiet ${PKG_CONFIG} --atleast-version=${GCONF_VERSION} gconf-2.0 &&
+ quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-2.0 &&
+ quiet ${PKG_CONFIG} --atleast-version=${CAIRO_VERSION} cairo &&
+ quiet intltoolize --version
then
- echo "guile and slib already installed in $_GUILE_UDIR. skipping."
+ echo "gnome packages installed in $_GNOME_UDIR. skipping."
else
- smart_wget $GUILE_URL $DOWNLOAD_DIR
- _GUILE_BALL=$LAST_FILE
- tar -xzpf $_GUILE_BALL -C $TMP_UDIR
- assert_one_dir $TMP_UDIR/guile-*
+ mkdir -p $_GNOME_UDIR
+ wget_unpacked $ATK_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $ATK_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $CAIRO_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $CAIRO_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $EXPAT_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $EXPAT_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $FONTCONFIG_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $FONTCONFIG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $FREETYPE_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $FREETYPE_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $GAIL_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $GAIL_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $GCONF_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $GCONF_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $GDK_PIXBUF_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $GDK_PIXBUF_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $GETTEXT_RUNTIME_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $GETTEXT_RUNTIME_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $GETTEXT_TOOLS_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $GLIB_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $GLIB_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $GNOME_VFS_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $GNOME_VFS_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $GTK_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $GTK_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $INTLTOOL_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $LIBART_LGPL_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $LIBART_LGPL_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $LIBBONOBO_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $LIBBONOBO_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $LIBBONOBOUI_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $LIBBONOBOUI_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $LIBGLADE_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $LIBGLADE_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $LIBGNOME_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $LIBGNOME_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $LIBGNOMECANVAS_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $LIBGNOMECANVAS_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $LIBGNOMEUI_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $LIBGNOMEUI_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $LIBICONV_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $LIBJPEG_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $LIBJPEG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $LIBPNG_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $LIBPNG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $LIBTIFF_URL $DOWNLOAD_DIR $GNOME_DIR
+ 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
+ wget_unpacked $PKG_CONFIG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $POPT_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $POPT_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $ZLIB_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $ZLIB_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+ echo 'gtk-theme-name = "MS-Windows"' > ${_GNOME_UDIR}/etc/gtk-2.0/gtkrc
+
+ wget_unpacked $GTK_THEME_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/gtk2-themes-*
+ cp -a $TMP_UDIR/gtk2-themes-*/lib $_GNOME_UDIR/
+ cp -a $TMP_UDIR/gtk2-themes-*/share $_GNOME_UDIR/
+ rm -rf $TMP_UDIR/gtk2-themes-*
+
+ wget_unpacked $GTK_PREFS_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/gtk2_prefs-*
+ mv $TMP_UDIR/gtk2_prefs-*/gtk2_prefs.exe $_GNOME_UDIR/bin
+ rm -rf $TMP_UDIR/gtk2_prefs-*
+
+ wget_unpacked $GTK_DOC_URL $DOWNLOAD_DIR $TMP_DIR
+ qpushd $_GNOME_UDIR
+ assert_one_dir $TMP_UDIR/gtk-doc-*
+ mv $TMP_UDIR/gtk-doc-*/gtk-doc.m4 $_GNOME_UDIR/share/aclocal
+ if [ ! -f libexec/gconfd-2.console.exe ]; then
+ cp libexec/gconfd-2.exe libexec/gconfd-2.console.exe
+ fi
+ exetype libexec/gconfd-2.exe windows
+ for file in bin/intltool-*; do
+ sed '1s,!.*perl,!'"$INTLTOOL_PERL"',;s,/opt/gnu/bin/iconv,iconv,' $file > tmp
+ mv tmp $file
+ done
+ # work around a bug in msys bash, adding 0x01 smilies
+ cat > bin/pkg-config-msys.sh <<EOF
+#!/bin/sh
+PKG_CONFIG="\$(dirname \$0)/pkg-config"
+if \${PKG_CONFIG} "\$@" > /dev/null 2>&1 ; then
+ res=true
+else
+ res=false
+fi
+\${PKG_CONFIG} "\$@" | tr -d \\\\r && \$res
+EOF
+ chmod +x bin/pkg-config{.exe,-msys.sh}
+ rm -rf $TMP_UDIR/gtk-doc-*
+ qpopd
+
+ if [ "$CROSS_COMPILE" = "yes" ]; then
+ qpushd $_GNOME_UDIR/lib/pkgconfig
+ perl -pi.bak -e"s!^prefix=.*\$!prefix=$_GNOME_UDIR!" *.pc
+ #perl -pi.bak -e's!^Libs: !Libs: -L\${prefix}/bin !' *.pc
+ qpopd
+ fi
+
+ wget_unpacked $PIXMAN_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/pixman-*
+ qpushd $TMP_UDIR/pixman-*
+ GLIB_CPPFLAGS=`${PKG_CONFIG} --cflags glib-2.0`
+ GTK_CPPFLAGS="-I${_GNOME_UDIR}/include/gtk-2.0"
+ ./configure ${HOST_XCOMPILE} \
+ --prefix=$_GNOME_UDIR \
+ --disable-static \
+ CPPFLAGS="${GLIB_CPPFLAGS} ${GTK_CPPFLAGS}"
+ make
+ make install
+ qpopd
+ ${PKG_CONFIG} --exists pixman-1 || die "pixman not installed correctly"
+ rm -rf $TMP_UDIR/pixman-*
+
+ wget_unpacked $LIBXML2_SRC_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/libxml2-*
+ qpushd $TMP_UDIR/libxml2-*
+ ./configure \
+ --prefix=${_GNOME_UDIR} \
+ --without-threads
+ make
+ make install
+ qpopd
+
+ rm -rf ${TMP_UDIR}/libxml2-*
+ quiet gconftool-2 --version &&
+ quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 &&
+ quiet intltoolize --version || die "gnome not installed correctly"
+ fi
+ [ ! -d $_GNOME_UDIR/share/aclocal ] || add_to_env "-I $_GNOME_UDIR/share/aclocal" ACLOCAL_FLAGS
+}
+
+function inst_gnutls() {
+ setup GNUTLS
+ _GNUTLS_UDIR=`unix_path ${GNUTLS_DIR}`
+ add_to_env ${_GNUTLS_UDIR}/bin PATH
+ add_to_env ${_GNUTLS_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
+ add_to_env "-I${_GNUTLS_UDIR}/include" GNUTLS_CPPFLAGS
+ add_to_env "-L${_GNUTLS_UDIR}/lib" GNUTLS_LDFLAGS
+ if quiet ${PKG_CONFIG} --exact-version=${GNUTLS_VERSION} gnutls
+ then
+ echo "GNUTLS already installed in $_GNUTLS_UDIR. skipping."
+ else
+ wget_unpacked $GNUTLS_URL $DOWNLOAD_DIR $GNUTLS_DIR
+ rm -f $_GNUTLS_UDIR/lib/*.la
+ quiet ${PKG_CONFIG} --exists gnutls || die "GNUTLS not installed correctly"
+ fi
+ [ ! -d $_GNUTLS_UDIR/share/aclocal ] || add_to_env "-I $_GNUTLS_UDIR/share/aclocal" ACLOCAL_FLAGS
+}
+
+function inst_goffice() {
+ setup GOffice
+ _GOFFICE_UDIR=`unix_path $GOFFICE_DIR`
+ add_to_env $_GOFFICE_UDIR/bin PATH
+ add_to_env $_GOFFICE_UDIR/lib/pkgconfig PKG_CONFIG_PATH
+ if quiet ${PKG_CONFIG} --atleast-version=${GOFFICE_VERSION} libgoffice-0.8
+ then
+ echo "goffice already installed in $_GOFFICE_UDIR. skipping."
+ else
+ wget_unpacked $GOFFICE_URL $DOWNLOAD_DIR $TMP_DIR
+ mydir=`pwd`
+ assert_one_dir $TMP_UDIR/goffice-*
+ qpushd $TMP_UDIR/goffice-*
+ [ -n "$GOFFICE_PATCH" -a -f "$GOFFICE_PATCH" ] && \
+ patch -p1 < $GOFFICE_PATCH
+ libtoolize --force
+ aclocal ${ACLOCAL_FLAGS} -I .
+ automake
+ autoconf
+ ./configure ${HOST_XCOMPILE} --prefix=$_GOFFICE_UDIR \
+ CPPFLAGS="${GNOME_CPPFLAGS} ${PCRE_CPPFLAGS} ${HH_CPPFLAGS}" \
+ LDFLAGS="${GNOME_LDFLAGS} ${PCRE_LDFLAGS} ${HH_LDFLAGS}"
+ [ -d ../libgsf-* ] || die "We need the unpacked package $TMP_UDIR/libgsf-*; please unpack it in $TMP_UDIR"
+ [ -f dumpdef.pl ] || cp -p ../libgsf-*/dumpdef.pl .
+ make
+ rm -rf ${_GOFFICE_UDIR}
+ make install
+ qpopd
+ ${PKG_CONFIG} --exists libgoffice-0.8 && [ -f $_GOFFICE_UDIR/bin/libgoffice*.dll ] || die "goffice not installed correctly"
+ rm -rf ${TMP_UDIR}/goffice-*
+ rm -rf ${TMP_UDIR}/libgsf-*
+ fi
+}
+
+function inst_guile() {
+ setup Guile
+ _GUILE_WFSDIR=`win_fs_path $GUILE_DIR`
+ _GUILE_UDIR=`unix_path $GUILE_DIR`
+ _WIN_UDIR=`unix_path $WINDIR`
+ add_to_env -I$_GUILE_UDIR/include GUILE_CPPFLAGS
+ add_to_env -L$_GUILE_UDIR/lib GUILE_LDFLAGS
+ add_to_env $_GUILE_UDIR/bin PATH
+ if quiet guile -c '(use-modules (srfi srfi-39))'
+ then
+ echo "guile and slib already installed in $_GUILE_UDIR. skipping."
+ else
+ smart_wget $GUILE_URL $DOWNLOAD_DIR
+ _GUILE_BALL=$LAST_FILE
+ tar -xzpf $_GUILE_BALL -C $TMP_UDIR
+ assert_one_dir $TMP_UDIR/guile-*
qpushd $TMP_UDIR/guile-*
patch -p1 < $GUILE_PATCH
ACLOCAL="aclocal $ACLOCAL_FLAGS" autoreconf -fvi $ACLOCAL_FLAGS
@@ -364,369 +750,267 @@ EOF
[ ! -d $_GUILE_UDIR/share/aclocal ] || add_to_env "-I $_GUILE_UDIR/share/aclocal" ACLOCAL_FLAGS
}
-function inst_svn() {
- setup Subversion
- _SVN_UDIR=`unix_path $SVN_DIR`
- add_to_env $_SVN_UDIR/bin PATH
- if quiet $_SVN_UDIR/bin/svn --version
+function inst_gwenhywfar() {
+ setup Gwenhywfar
+ _GWENHYWFAR_UDIR=`unix_path ${GWENHYWFAR_DIR}`
+ add_to_env ${_GWENHYWFAR_UDIR}/bin PATH
+ add_to_env ${_GWENHYWFAR_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
+ if quiet ${PKG_CONFIG} --exact-version=${GWENHYWFAR_VERSION} gwenhywfar
then
- echo "subversion already installed in $_SVN_UDIR. skipping."
+ echo "Gwenhywfar already installed in $_GWENHYWFAR_UDIR. skipping."
else
- wget_unpacked $SVN_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/svn-win32-*
- rm -rf $SVN_DIR
- mkdir -p $SVN_DIR
- cp -a $TMP_UDIR/svn-win32-*/* $SVN_DIR
- rm -rf $TMP_UDIR/svn-win32-*
- quiet $_SVN_UDIR/bin/svn --version || die "svn not installed correctly"
+ wget_unpacked $GWENHYWFAR_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/gwenhywfar-*
+ qpushd $TMP_UDIR/gwenhywfar-*
+ # circumvent binreloc bug, http://trac.autopackage.org/ticket/28
+ if [ "$AQBANKING5" = "yes" ]; then
+ # Note: gwenhywfar-3.x and higher don't use openssl anymore.
+ ./configure ${HOST_XCOMPILE} \
+ --with-libgcrypt-prefix=$_GNUTLS_UDIR \
+ --disable-binreloc \
+ --disable-ssl \
+ --prefix=$_GWENHYWFAR_UDIR \
+ --with-guis=gtk2 \
+ CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS} `pkg-config --cflags gtk+-2.0`" \
+ LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GNUTLS_LDFLAGS} -lintl"
+ else
+ if [ -n "$GWENHYWFAR_PATCH" -a -f "$GWENHYWFAR_PATCH" ] ; then
+ patch -p1 < $GWENHYWFAR_PATCH
+ #aclocal -I m4 ${ACLOCAL_FLAGS}
+ #automake
+ #autoconf
+ fi
+ # Note: gwenhywfar-3.x and higher don't use openssl anymore.
+ ./configure ${HOST_XCOMPILE} \
+ --with-libgcrypt-prefix=$_GNUTLS_UDIR \
+ --disable-binreloc \
+ --disable-ssl \
+ --prefix=$_GWENHYWFAR_UDIR \
+ CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS}" \
+ LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GNUTLS_LDFLAGS} -lintl"
+ fi
+ make
+# [ "$CROSS_COMPILE" != "yes" ] && make check
+ rm -rf ${_GWENHYWFAR_UDIR}
+ make install
+ qpopd
+ ${PKG_CONFIG} --exists gwenhywfar || die "Gwenhywfar not installed correctly"
+ rm -rf ${TMP_UDIR}/gwenhywfar-*
fi
+ [ ! -d $_GWENHYWFAR_UDIR/share/aclocal ] || add_to_env "-I $_GWENHYWFAR_UDIR/share/aclocal" ACLOCAL_FLAGS
}
-function inst_openssl() {
- setup OpenSSL
- _OPENSSL_UDIR=`unix_path $OPENSSL_DIR`
- add_to_env $_OPENSSL_UDIR/bin PATH
- # Make sure the files of Win32OpenSSL-0_9_8d are really gone!
- if test -f $_OPENSSL_UDIR/unins000.exe ; then
- die "Wrong version of OpenSSL installed! Run $_OPENSSL_UDIR/unins000.exe and start install.sh again."
- fi
- # Make sure the files of openssl-0.9.7c-{bin,lib}.zip are really gone!
- if [ -f $_OPENSSL_UDIR/lib/libcrypto.dll.a ] ; then
- die "Found old OpenSSL installation in $_OPENSSL_UDIR. Please remove that first."
- fi
-
- if quiet ${LD} -L$_OPENSSL_UDIR/lib -leay32 -lssl32 -o $TMP_UDIR/ofile ; then
- echo "openssl already installed in $_OPENSSL_UDIR. skipping."
+function inst_isocodes() {
+ setup isocodes
+ _ISOCODES_UDIR=`unix_path ${ISOCODES_DIR}`
+ add_to_env $_ISOCODES_UDIR/share/pkgconfig PKG_CONFIG_PATH
+ if [ -f ${_ISOCODES_UDIR}/share/pkgconfig/iso-codes.pc ]
+ then
+ echo "isocodes already installed in $_ISOCODES_UDIR. skipping."
else
- smart_wget $OPENSSL_URL $DOWNLOAD_DIR
- echo -n "Extracting ${LAST_FILE##*/} ... "
- tar -xzpf $LAST_FILE -C $TMP_UDIR &>/dev/null | true
- echo "done"
- assert_one_dir $TMP_UDIR/openssl-*
- qpushd $TMP_UDIR/openssl-*
- for _dir in crypto ssl ; do
- qpushd $_dir
- find . -name "*.h" -exec cp {} ../include/openssl/ \;
- qpopd
- done
- cp *.h include/openssl
- _COMSPEC_U=`unix_path $COMSPEC`
- PATH=$_ACTIVE_PERL_UDIR/ActivePerl/Perl/bin:$_MINGW_UDIR/bin $_COMSPEC_U //c ms\\mingw32
- mkdir -p $_OPENSSL_UDIR/bin
- mkdir -p $_OPENSSL_UDIR/lib
- mkdir -p $_OPENSSL_UDIR/include
- cp -a libeay32.dll libssl32.dll $_OPENSSL_UDIR/bin
- cp -a libssl32.dll $_OPENSSL_UDIR/bin/ssleay32.dll
- for _implib in libeay32 libssl32 ; do
- cp -a out/$_implib.a $_OPENSSL_UDIR/lib/$_implib.dll.a
- done
- cp -a include/openssl $_OPENSSL_UDIR/include
+ wget_unpacked $ISOCODES_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/iso-codes-*
+ qpushd $TMP_UDIR/iso-codes-*
+ ./configure ${HOST_XCOMPILE} \
+ --prefix=${_ISOCODES_UDIR}
+ make
+ make install
qpopd
- quiet ${LD} -L$_OPENSSL_UDIR/lib -leay32 -lssl32 -o $TMP_UDIR/ofile || die "openssl not installed correctly"
- rm -rf ${TMP_UDIR}/openssl-*
- fi
- _eay32dll=$(echo $(which libeay32.dll)) # which sucks
- if [ -z "$_eay32dll" ] ; then
- die "Did not find libeay32.dll in your PATH, why that?"
- fi
- if [ "$_eay32dll" != "$_OPENSSL_UDIR/bin/libeay32.dll" ] ; then
- die "Found $_eay32dll in PATH. If you have added $_OPENSSL_UDIR/bin to your PATH before, make sure it is listed before paths from other packages shipping SSL libraries, like SVN. In particular, check $_MINGW_UDIR/etc/profile.d/installer.sh."
+ quiet [ -f ${_ISOCODES_UDIR}/share/pkgconfig/iso-codes.pc ] || die "isocodes not installed correctly"
+ rm -rf ${TMP_UDIR}/iso-codes-*
fi
}
-function inst_mingwutils() {
- setup MinGW-Utils
- _MINGW_UTILS_UDIR=`unix_path $MINGW_UTILS_DIR`
- add_to_env $_MINGW_UTILS_UDIR/bin PATH
- if quiet which pexports && quiet which reimp
+function inst_ktoblzcheck() {
+ setup Ktoblzcheck
+ # Out of convenience ktoblzcheck is being installed into
+ # GWENHYWFAR_DIR
+ add_to_env "-I${_GWENHYWFAR_UDIR}/include" KTOBLZCHECK_CPPFLAGS
+ add_to_env "-L${_GWENHYWFAR_UDIR}/lib" KTOBLZCHECK_LDFLAGS
+ if quiet ${PKG_CONFIG} --exact-version=${KTOBLZCHECK_VERSION} ktoblzcheck
then
- echo "mingw-utils already installed in $_MINGW_UTILS_UDIR. skipping."
+ echo "Ktoblzcheck already installed in $_GWENHYWFAR_UDIR. skipping."
else
- wget_unpacked $MINGW_UTILS_URL $DOWNLOAD_DIR $MINGW_UTILS_DIR
- (quiet which pexports && quiet which reimp) || die "mingw-utils not installed correctly"
+ wget_unpacked $KTOBLZCHECK_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/ktoblzcheck-*
+ qpushd $TMP_UDIR/ktoblzcheck-*
+ # circumvent binreloc bug, http://trac.autopackage.org/ticket/28
+ ./configure ${HOST_XCOMPILE} \
+ --prefix=${_GWENHYWFAR_UDIR} \
+ --disable-binreloc \
+ --disable-python
+ make
+# [ "$CROSS_COMPILE" != "yes" ] && make check
+ make install
+ qpopd
+ ${PKG_CONFIG} --exists ktoblzcheck || die "Ktoblzcheck not installed correctly"
+ rm -rf ${TMP_UDIR}/ktoblzcheck-*
fi
}
-function inst_exetype() {
- setup exetype
- _EXETYPE_UDIR=`unix_path $EXETYPE_DIR`
- add_to_env $_EXETYPE_UDIR/bin PATH
- if quiet which exetype
+function inst_libbonoboui() {
+ setup libbonoboui
+ _LIBBONOBOUI_UDIR=`unix_path $LIBBONOBOUI_DIR`
+ add_to_env $_LIBBONOBOUI_UDIR/bin PATH
+ add_to_env $_LIBBONOBOUI_UDIR/lib/pkgconfig PKG_CONFIG_PATH
+ if quiet ${PKG_CONFIG} --exists --atleast-version=2.24.2 libbonoboui-2.0 && [ -f $_LIBBONOBOUI_UDIR/bin/libbonoboui*.dll ]
then
- echo "exetype already installed in $_EXETYPE_UDIR. skipping."
+ echo "libbonoboui already installed in $_LIBBONOBOUI_UDIR. skipping."
else
- mkdir -p $_EXETYPE_UDIR/bin
- cp $EXETYPE_SCRIPT $_EXETYPE_UDIR/bin/exetype
- chmod +x $_EXETYPE_UDIR/bin/exetype
- quiet which exetype || die "exetype unavailable"
- fi
-}
+ wget_unpacked $LIBBONOBOUI_SRC_URL $DOWNLOAD_DIR $TMP_DIR
+ mydir=`pwd`
+ assert_one_dir $TMP_UDIR/libbonoboui-*
+ qpushd $TMP_UDIR/libbonoboui-*
+ [ -n "$LIBBONOBOUI_PATCH" -a -f "$LIBBONOBOUI_PATCH" ] && \
+ patch -p1 < $LIBBONOBOUI_PATCH
+ #libtoolize --force
+ #aclocal ${ACLOCAL_FLAGS} -I .
+ #automake
+ #autoconf
+ ./configure ${HOST_XCOMPILE} --prefix=$_LIBBONOBOUI_UDIR \
+ POPT_LIBS="-lpopt" \
+ CPPFLAGS="${GNOME_CPPFLAGS}" \
+ LDFLAGS="${GNOME_LDFLAGS}" \
+ --enable-static=no
+ make
+ make install
-function inst_libxslt() {
- setup LibXSLT
- _LIBXSLT_UDIR=`unix_path $LIBXSLT_DIR`
- add_to_env $_LIBXSLT_UDIR/bin PATH
- if quiet which xsltproc
- then
- echo "libxslt already installed in $_LIBXSLT_UDIR. skipping."
- else
- [ "$CROSS_COMPILE" = "yes" ] && die "xsltproc unavailable"
- wget_unpacked $LIBXSLT_URL $DOWNLOAD_DIR $LIBXSLT_DIR
- wget_unpacked $LIBXSLT_LIBXML2_URL $DOWNLOAD_DIR $LIBXSLT_DIR
- wget_unpacked ${LIBXSLT_ICONV_URL} ${DOWNLOAD_DIR} ${LIBXSLT_DIR}
- wget_unpacked ${LIBXSLT_ZLIB_URL} ${DOWNLOAD_DIR} ${LIBXSLT_DIR}
- qpushd $_LIBXSLT_UDIR
- # The unpacked zips put their content into a directory one
- # below of where we want them, so we move the content to
- # the parent directory here.
- for A in libxslt-* libxml2-* iconv-* zlib-* ; do
- if [ -d $A ] ; then
- mv $A tmpdir
- cp -r tmpdir/* .
- rm -rf tmpdir
- else
- echo "Oops, $A is not a directory - skipping here."
- fi
- done
+ # We override the $GNOME_DIR libbonoboui files because
+ # those erroneously depend on the obsolete libxml2.dll
+ cp -a $_LIBBONOBOUI_UDIR/bin/libbonoboui*.dll $_GNOME_UDIR/bin
+ cp -a $_LIBBONOBOUI_UDIR/lib/libbonoboui* $_GNOME_UDIR/lib
qpopd
- quiet which xsltproc || die "libxslt not installed correctly"
+ ${PKG_CONFIG} --exists --atleast-version=2.24.2 libbonoboui-2.0 && [ -f $_LIBBONOBOUI_UDIR/bin/libbonoboui*.dll ] || die "libbonoboui not installed correctly"
+ rm -rf ${TMP_UDIR}/libbonoboui-*
fi
}
-function inst_gnome() {
- setup Gnome platform
- _GNOME_UDIR=`unix_path $GNOME_DIR`
- add_to_env -I$_GNOME_UDIR/include GNOME_CPPFLAGS
- add_to_env -L$_GNOME_UDIR/lib GNOME_LDFLAGS
- add_to_env $_GNOME_UDIR/bin PATH
- add_to_env $_GNOME_UDIR/lib/pkgconfig PKG_CONFIG_PATH
- if [ "$CROSS_COMPILE" != "yes" ]; then
- add_to_env $_GNOME_UDIR/bin/pkg-config-msys.sh PKG_CONFIG
- else
- add_to_env pkg-config PKG_CONFIG
- fi
- if quiet gconftool-2 --version &&
- quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 &&
- quiet ${PKG_CONFIG} --atleast-version=${GCONF_VERSION} gconf-2.0 &&
- quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-2.0 &&
- quiet ${PKG_CONFIG} --atleast-version=${CAIRO_VERSION} cairo &&
- quiet intltoolize --version
+function inst_libdbi() {
+ setup LibDBI
+ _SQLITE3_UDIR=`unix_path ${SQLITE3_DIR}`
+ _MYSQL_LIB_UDIR=`unix_path ${MYSQL_LIB_DIR}`
+ _PGSQL_UDIR=`unix_path ${PGSQL_DIR}`
+ _LIBDBI_UDIR=`unix_path ${LIBDBI_DIR}`
+ _LIBDBI_DRIVERS_UDIR=`unix_path ${LIBDBI_DRIVERS_DIR}`
+ add_to_env -I$_LIBDBI_UDIR/include LIBDBI_CPPFLAGS
+ add_to_env -L$_LIBDBI_UDIR/lib LIBDBI_LDFLAGS
+ add_to_env -I${_SQLITE3_UDIR}/include SQLITE3_CFLAGS
+ add_to_env -lsqlite3 SQLITE3_LIBS
+ add_to_env -L${_SQLITE3_UDIR}/lib SQLITE3_LIBS
+ if test -f ${_SQLITE3_UDIR}/bin/libsqlite3-0.dll
then
- echo "gnome packages installed in $_GNOME_UDIR. skipping."
+ echo "SQLite3 already installed in $_SQLITE3_UDIR. skipping."
else
- mkdir -p $_GNOME_UDIR
- wget_unpacked $LIBXML2_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBXML2_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GETTEXT_RUNTIME_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GETTEXT_RUNTIME_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GETTEXT_TOOLS_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBICONV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GLIB_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GLIB_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBJPEG_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBJPEG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBPNG_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBPNG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBTIFF_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBTIFF_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $ZLIB_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $ZLIB_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $PKG_CONFIG_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $PKG_CONFIG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $CAIRO_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $CAIRO_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $EXPAT_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $EXPAT_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $FONTCONFIG_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $FONTCONFIG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $FREETYPE_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $FREETYPE_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $ATK_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $ATK_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 $LIBART_LGPL_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBART_LGPL_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GTK_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GTK_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- echo 'gtk-theme-name = "MS-Windows"' > ${_GNOME_UDIR}/etc/gtk-2.0/gtkrc
- wget_unpacked $INTLTOOL_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $ORBIT2_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $ORBIT2_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GAIL_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GAIL_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $POPT_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $POPT_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GCONF_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GCONF_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBBONOBO_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBBONOBO_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GNOME_VFS_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GNOME_VFS_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBGNOME_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBGNOME_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBGNOMECANVAS_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBGNOMECANVAS_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBBONOBOUI_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBBONOBOUI_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBGNOMEUI_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBGNOMEUI_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBGLADE_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBGLADE_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GTK_THEME_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/gtk2-themes-*
- cp -a $TMP_UDIR/gtk2-themes-*/lib $_GNOME_UDIR/
- cp -a $TMP_UDIR/gtk2-themes-*/share $_GNOME_UDIR/
- rm -rf $TMP_UDIR/gtk2-themes-*
-
- wget_unpacked $GTK_PREFS_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/gtk2_prefs-*
- mv $TMP_UDIR/gtk2_prefs-*/gtk2_prefs.exe $_GNOME_UDIR/bin
- rm -rf $TMP_UDIR/gtk2_prefs-*
-
- wget_unpacked $GTK_DOC_URL $DOWNLOAD_DIR $TMP_DIR
- qpushd $_GNOME_UDIR
- assert_one_dir $TMP_UDIR/gtk-doc-*
- mv $TMP_UDIR/gtk-doc-*/gtk-doc.m4 $_GNOME_UDIR/share/aclocal
- if [ ! -f libexec/gconfd-2.console.exe ]; then
- cp libexec/gconfd-2.exe libexec/gconfd-2.console.exe
- fi
- exetype libexec/gconfd-2.exe windows
- for file in bin/intltool-*; do
- sed '1s,!.*perl,!'"$INTLTOOL_PERL"',;s,/opt/gnu/bin/iconv,iconv,' $file > tmp
- mv tmp $file
- done
- # work around a bug in msys bash, adding 0x01 smilies
- cat > bin/pkg-config-msys.sh <<EOF
-#!/bin/sh
-PKG_CONFIG="\$(dirname \$0)/pkg-config"
-if \${PKG_CONFIG} "\$@" > /dev/null 2>&1 ; then
- res=true
-else
- res=false
-fi
-\${PKG_CONFIG} "\$@" | tr -d \\\\r && \$res
-EOF
- chmod +x bin/pkg-config{.exe,-msys.sh}
- rm -rf $TMP_UDIR/gtk-doc-*
- qpopd
-
- if [ "$CROSS_COMPILE" = "yes" ]; then
- qpushd $_GNOME_UDIR/lib/pkgconfig
- perl -pi.bak -e"s!^prefix=.*\$!prefix=$_GNOME_UDIR!" *.pc
- #perl -pi.bak -e's!^Libs: !Libs: -L\${prefix}/bin !' *.pc
- qpopd
- fi
- wget_unpacked $PIXMAN_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/pixman-*
- qpushd $TMP_UDIR/pixman-*
+ wget_unpacked $SQLITE3_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/sqlite-*
+ qpushd $TMP_UDIR/sqlite-*
./configure ${HOST_XCOMPILE} \
- --prefix=$_GNOME_UDIR \
- --disable-static
+ --prefix=${_SQLITE3_UDIR}
make
make install
qpopd
- rm -rf $TMP_UDIR/pixman-*
- ${PKG_CONFIG} --exists pixman-1 || die "pixman not installed correctly"
- quiet gconftool-2 --version &&
- quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 &&
- quiet intltoolize --version || die "gnome not installed correctly"
+ test -f ${_SQLITE3_UDIR}/bin/libsqlite3-0.dll || die "SQLite3 not installed correctly"
+ rm -rf ${TMP_UDIR}/sqlite-*
fi
- [ ! -d $_GNOME_UDIR/share/aclocal ] || add_to_env "-I $_GNOME_UDIR/share/aclocal" ACLOCAL_FLAGS
-}
-
-function inst_isocodes() {
- setup isocodes
- _ISOCODES_UDIR=`unix_path ${ISOCODES_DIR}`
- add_to_env $_ISOCODES_UDIR/share/pkgconfig PKG_CONFIG_PATH
- if [ -f ${_ISOCODES_UDIR}/share/pkgconfig/iso-codes.pc ]
+ if test -f ${_MYSQL_LIB_UDIR}/lib/libmysql.dll -a \
+ -f ${_MYSQL_LIB_UDIR}/lib/libmysqlclient.a
then
- echo "isocodes already installed in $_ISOCODES_UDIR. skipping."
+ echo "MySQL library already installed in $_MYSQL_LIB_UDIR. skipping."
else
- wget_unpacked $ISOCODES_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/iso-codes-*
- qpushd $TMP_UDIR/iso-codes-*
- ./configure ${HOST_XCOMPILE} \
- --prefix=${_ISOCODES_UDIR}
- make
- make install
+ wget_unpacked $MYSQL_LIB_URL $DOWNLOAD_DIR $TMP_DIR
+ mkdir -p $_MYSQL_LIB_UDIR
+ assert_one_dir $TMP_UDIR/mysql*
+ cp -r $TMP_UDIR/mysql*/* $_MYSQL_LIB_UDIR
+ cp -r $TMP_UDIR/mysql*/include $_MYSQL_LIB_UDIR/include/mysql
+ rm -rf ${TMP_UDIR}/mysql*
+ qpushd $_MYSQL_LIB_UDIR/lib
+ ${DLLTOOL} --input-def $LIBMYSQL_DEF --dllname libmysql.dll --output-lib libmysqlclient.a -k
+ test -f ${_MYSQL_LIB_UDIR}/lib/libmysql.dll || die "mysql not installed correctly - libmysql.dll"
+ test -f ${_MYSQL_LIB_UDIR}/lib/libmysqlclient.a || die "mysql not installed correctly - libmysqlclient.a"
qpopd
- quiet [ -f ${_ISOCODES_UDIR}/share/pkgconfig/iso-codes.pc ] || die "isocodes not installed correctly"
- rm -rf ${TMP_UDIR}/iso-codes-*
fi
-}
-
-function inst_swig() {
- setup Swig
- _SWIG_UDIR=`unix_path $SWIG_DIR`
- add_to_env $_SWIG_UDIR PATH
- if quiet swig -version
+ if test -f ${_PGSQL_UDIR}/lib/libpq.dll
then
- echo "swig already installed in $_SWIG_UDIR. skipping."
+ echo "PGSQL library already installed in $_PGSQL_UDIR. skipping."
else
- wget_unpacked $SWIG_URL $DOWNLOAD_DIR $SWIG_DIR
- qpushd $SWIG_DIR
- mv swigwin-* mydir
- mv mydir/* .
- mv mydir/.[A-Za-z]* . # hidden files
- rmdir mydir
- rm INSTALL # bites with /bin/install
+ wget_unpacked $PGSQL_LIB_URL $DOWNLOAD_DIR $TMP_DIR
+ cp -r $TMP_UDIR/pgsql* $_PGSQL_UDIR
+ rm -rf ${TMP_UDIR}/pgsql*
+ test -f ${_PGSQL_UDIR}/lib/libpq.dll || die "libpq not installed correctly"
+ fi
+ if test -f ${_LIBDBI_UDIR}/bin/libdbi-0.dll
+ then
+ echo "libdbi already installed in $_LIBDBI_UDIR. skipping."
+ else
+ wget_unpacked $LIBDBI_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/libdbi-0*
+ qpushd $TMP_UDIR/libdbi-0*
+ if [ -n "$LIBDBI_PATCH" -a -f "$LIBDBI_PATCH" ]; then
+ patch -p1 < $LIBDBI_PATCH
+ ./autogen.sh
+ fi
+ if [ -n "$LIBDBI_PATCH2" -a -f "$LIBDBI_PATCH2" ]; then
+ patch -p1 < $LIBDBI_PATCH2
+ fi
+ if [ "$CROSS_COMPILE" = "yes" ]; then
+ rm ltmain.sh aclocal.m4
+ libtoolize --force
+ aclocal -I ${_AUTOTOOLS_UDIR}/share/aclocal
+ autoheader
+ automake --add-missing
+ autoconf
+ fi
+ ./configure ${HOST_XCOMPILE} \
+ --disable-docs \
+ --prefix=${_LIBDBI_UDIR}
+ make
+ make install
qpopd
- quiet swig -version || die "swig unavailable"
- fi
-}
-
-function inst_pcre() {
- setup pcre
- _PCRE_UDIR=`unix_path $PCRE_DIR`
- add_to_env -I$_PCRE_UDIR/include PCRE_CPPFLAGS
- add_to_env -L$_PCRE_UDIR/lib PCRE_LDFLAGS
- add_to_env $_PCRE_UDIR/bin PATH
- if quiet ${LD} $PCRE_LDFLAGS -lpcre -o $TMP_UDIR/ofile
- then
- echo "pcre already installed in $_PCRE_UDIR. skipping."
- else
- mkdir -p $_PCRE_UDIR
- wget_unpacked $PCRE_BIN_URL $DOWNLOAD_DIR $PCRE_DIR
- wget_unpacked $PCRE_LIB_URL $DOWNLOAD_DIR $PCRE_DIR
+ qpushd ${_LIBDBI_UDIR}
+ if [ x"$(which pexports.exe > /dev/null 2>&1)" != x ]
+ then
+ pexports bin/libdbi-0.dll > lib/libdbi.def
+ ${DLLTOOL} -d lib/libdbi.def -D bin/libdbi-0.dll -l lib/libdbi.lib
+ fi
+ qpopd
+ test -f ${_LIBDBI_UDIR}/bin/libdbi-0.dll || die "libdbi not installed correctly"
+ rm -rf ${TMP_UDIR}/libdbi-0*
fi
- quiet ${LD} $PCRE_LDFLAGS -lpcre -o $TMP_UDIR/ofile || die "pcre not installed correctly"
-}
-
-function inst_libbonoboui() {
- setup libbonoboui
- _LIBBONOBOUI_UDIR=`unix_path $LIBBONOBOUI_DIR`
- add_to_env $_LIBBONOBOUI_UDIR/bin PATH
- add_to_env $_LIBBONOBOUI_UDIR/lib/pkgconfig PKG_CONFIG_PATH
- if quiet ${PKG_CONFIG} --exists --atleast-version=2.24.2 libbonoboui-2.0 && [ -f $_LIBBONOBOUI_UDIR/bin/libbonoboui*.dll ]
+ if test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdsqlite3.dll -a \
+ -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdmysql.dll -a \
+ -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdpgsql.dll
then
- echo "libbonoboui already installed in $_LIBBONOBOUI_UDIR. skipping."
+ echo "libdbi drivers already installed in $_LIBDBI_DRIVERS_UDIR. skipping."
else
- wget_unpacked $LIBBONOBOUI_SRC_URL $DOWNLOAD_DIR $TMP_DIR
- mydir=`pwd`
- assert_one_dir $TMP_UDIR/libbonoboui-*
- qpushd $TMP_UDIR/libbonoboui-*
- [ -n "$LIBBONOBOUI_PATCH" -a -f "$LIBBONOBOUI_PATCH" ] && \
- patch -p1 < $LIBBONOBOUI_PATCH
- #libtoolize --force
- #aclocal ${ACLOCAL_FLAGS} -I .
- #automake
- #autoconf
- ./configure ${HOST_XCOMPILE} --prefix=$_LIBBONOBOUI_UDIR \
- POPT_LIBS="-lpopt" \
- CPPFLAGS="${GNOME_CPPFLAGS}" \
- LDFLAGS="${GNOME_LDFLAGS}" \
- --enable-static=no
+ wget_unpacked $LIBDBI_DRIVERS_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/libdbi-drivers-*
+ qpushd $TMP_UDIR/libdbi-drivers*
+ [ -n "$LIBDBI_DRIVERS_PATCH" -a -f "$LIBDBI_DRIVERS_PATCH" ] && \
+ patch -p0 < $LIBDBI_DRIVERS_PATCH
+ [ -n "$LIBDBI_DRIVERS_PATCH2" -a -f "$LIBDBI_DRIVERS_PATCH2" ] && \
+ patch -p0 < $LIBDBI_DRIVERS_PATCH2
+ [ -n "$LIBDBI_DRIVERS_PATCH3" -a -f "$LIBDBI_DRIVERS_PATCH3" ] && \
+ patch -p0 < $LIBDBI_DRIVERS_PATCH3
+ [ -n "$LIBDBI_DRIVERS_PATCH4" -a -f "$LIBDBI_DRIVERS_PATCH4" ] && \
+ patch -p0 < $LIBDBI_DRIVERS_PATCH4
+ LDFLAGS=-no-undefined ./configure ${HOST_XCOMPILE} \
+ --disable-docs \
+ --with-dbi-incdir=${_LIBDBI_UDIR}/include \
+ --with-dbi-libdir=${_LIBDBI_UDIR}/lib \
+ --with-sqlite3 \
+ --with-sqlite3-dir=${_SQLITE3_UDIR} \
+ --with-mysql \
+ --with-mysql-dir=${_MYSQL_LIB_UDIR} \
+ --with-pgsql \
+ --with-pgsql-dir=${_PGSQL_UDIR} \
+ --prefix=${_LIBDBI_DRIVERS_UDIR}
make
make install
-
- # We override the $GNOME_DIR libbonoboui files because
- # those erroneously depend on the obsolete libxml2.dll
- cp -a $_LIBBONOBOUI_UDIR/bin/libbonoboui*.dll $_GNOME_UDIR/bin
- cp -a $_LIBBONOBOUI_UDIR/lib/libbonoboui* $_GNOME_UDIR/lib
qpopd
- ${PKG_CONFIG} --exists --atleast-version=2.24.2 libbonoboui-2.0 && [ -f $_LIBBONOBOUI_UDIR/bin/libbonoboui*.dll ] || die "libbonoboui not installed correctly"
- rm -rf ${TMP_UDIR}/libbonoboui-*
+ test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdsqlite3.dll || die "libdbi sqlite3 driver not installed correctly"
+ test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdmysql.dll || die "libdbi mysql driver not installed correctly"
+ test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdpgsql.dll || die "libdbi pgsql driver not installed correctly"
+ rm -rf ${TMP_UDIR}/libdbi-drivers-*
fi
}
@@ -758,146 +1042,6 @@ function inst_libgsf() {
fi
}
-function inst_goffice() {
- setup GOffice
- _GOFFICE_UDIR=`unix_path $GOFFICE_DIR`
- add_to_env $_GOFFICE_UDIR/bin PATH
- add_to_env $_GOFFICE_UDIR/lib/pkgconfig PKG_CONFIG_PATH
- if quiet ${PKG_CONFIG} --atleast-version=${GOFFICE_VERSION} libgoffice-0.8
- then
- echo "goffice already installed in $_GOFFICE_UDIR. skipping."
- else
- wget_unpacked $GOFFICE_URL $DOWNLOAD_DIR $TMP_DIR
- mydir=`pwd`
- assert_one_dir $TMP_UDIR/goffice-*
- qpushd $TMP_UDIR/goffice-*
- [ -n "$GOFFICE_PATCH" -a -f "$GOFFICE_PATCH" ] && \
- patch -p1 < $GOFFICE_PATCH
- libtoolize --force
- aclocal ${ACLOCAL_FLAGS} -I .
- automake
- autoconf
- ./configure ${HOST_XCOMPILE} --prefix=$_GOFFICE_UDIR \
- CPPFLAGS="${GNOME_CPPFLAGS} ${PCRE_CPPFLAGS} ${HH_CPPFLAGS}" \
- LDFLAGS="${GNOME_LDFLAGS} ${PCRE_LDFLAGS} ${HH_LDFLAGS}"
- [ -d ../libgsf-* ] || die "We need the unpacked package $TMP_UDIR/libgsf-*; please unpack it in $TMP_UDIR"
- [ -f dumpdef.pl ] || cp -p ../libgsf-*/dumpdef.pl .
- make
- rm -rf ${_GOFFICE_UDIR}
- make install
- qpopd
- ${PKG_CONFIG} --exists libgoffice-0.8 && [ -f $_GOFFICE_UDIR/bin/libgoffice*.dll ] || die "goffice not installed correctly"
- rm -rf ${TMP_UDIR}/goffice-*
- rm -rf ${TMP_UDIR}/libgsf-*
- fi
-}
-
-function inst_glade() {
- setup Glade
- _GLADE_UDIR=`unix_path $GLADE_DIR`
- _GLADE_WFSDIR=`win_fs_path $GLADE_DIR`
- add_to_env $_GLADE_UDIR/bin PATH
- if quiet glade-3 --version
- then
- echo "glade already installed in $_GLADE_UDIR. skipping."
- else
- wget_unpacked $GLADE_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/glade3-*
- qpushd $TMP_UDIR/glade3-*
- ./configure ${HOST_XCOMPILE} --prefix=$_GLADE_WFSDIR
- make
- make install
- qpopd
- quiet glade-3 --version || die "glade not installed correctly"
- rm -rf ${TMP_UDIR}/glade3-*
- fi
-}
-
-function inst_inno() {
- setup Inno Setup Compiler
- _INNO_UDIR=`unix_path $INNO_DIR`
- add_to_env $_INNO_UDIR PATH
- if quiet which iscc
- then
- echo "Inno Setup Compiler already installed in $_INNO_UDIR. skipping."
- else
- smart_wget $INNO_URL $DOWNLOAD_DIR
- $LAST_FILE //SP- //SILENT //DIR="$INNO_DIR"
- quiet which iscc || die "iscc (Inno Setup Compiler) not installed correctly"
- fi
-}
-
-function test_for_hh() {
- qpushd $TMP_UDIR
- cat > ofile.c <<EOF
-#include <windows.h>
-#include <htmlhelp.h>
-int main(int argc, char **argv) {
- HtmlHelpW(0, (wchar_t*)"", HH_HELP_CONTEXT, 0);
- return 0;
-}
-EOF
- gcc -shared -o ofile.dll ofile.c $HH_CPPFLAGS $HH_LDFLAGS -lhtmlhelp || return 1
- qpopd
-}
-
-function inst_hh() {
- setup HTML Help Workshop
- _HH_UDIR=`unix_path $HH_DIR`
- add_to_env -I$_HH_UDIR/include HH_CPPFLAGS
- add_to_env -L$_HH_UDIR/lib HH_LDFLAGS
- add_to_env $_HH_UDIR PATH
- if quiet test_for_hh
- then
- echo "html help workshop already installed in $_HH_UDIR. skipping."
- else
- smart_wget $HH_URL $DOWNLOAD_DIR
- echo "!!! When asked for an installation path, specify $HH_DIR !!!"
- $LAST_FILE
- qpushd $HH_DIR
- _HHCTRL_OCX=$(which hhctrl.ocx || true)
- [ "$_HHCTRL_OCX" ] || die "Did not find hhctrl.ocx"
- pexports -h include/htmlhelp.h $_HHCTRL_OCX > lib/htmlhelp.def
- qpushd lib
- ${DLLTOOL} -k -d htmlhelp.def -l libhtmlhelp.a
- mv htmlhelp.lib htmlhelp.lib.bak
- qpopd
- qpopd
- quiet test_for_hh || die "html help workshop not installed correctly"
- fi
-}
-
-function inst_opensp() {
- setup OpenSP
- _OPENSP_UDIR=`unix_path ${OPENSP_DIR}`
- add_to_env ${_OPENSP_UDIR}/bin PATH
- if test -f ${_OPENSP_UDIR}/bin/libosp-5.dll
- then
- echo "OpenSP already installed in $_OPENSP_UDIR. skipping."
- else
- wget_unpacked $OPENSP_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/OpenSP-*
- qpushd $TMP_UDIR/OpenSP-*
- [ -n "$OPENSP_PATCH" -a -f "$OPENSP_PATCH" ] && \
- patch -p0 < $OPENSP_PATCH
- libtoolize --force
- aclocal ${ACLOCAL_FLAGS} -I m4
- automake
- autoconf
- ./configure ${HOST_XCOMPILE} \
- --prefix=${_OPENSP_UDIR} \
- --disable-doc-build --disable-static
- # On many windows machines, none of the programs will
- # build, but we only need the library, so ignore the rest.
- make all-am
- make -C lib
- make -i
- make -i install
- qpopd
- test -f ${_OPENSP_UDIR}/bin/libosp-5.dll || die "OpenSP not installed correctly"
- fi
-}
-
function inst_libofx() {
setup Libofx
_LIBOFX_UDIR=`unix_path ${LIBOFX_DIR}`
@@ -923,7 +1067,8 @@ function inst_libofx() {
--with-opensp-includes=${_OPENSP_UDIR}/include/OpenSP \
--with-opensp-libs=${_OPENSP_UDIR}/lib \
CPPFLAGS="-DOS_WIN32 ${GNOME_CPPFLAGS}" \
- --disable-static
+ --disable-static \
+ --with-iconv=${_GNOME_UDIR}
make LDFLAGS="${LDFLAGS} -no-undefined ${GNOME_LDFLAGS} -liconv"
make install
qpopd
@@ -931,352 +1076,339 @@ function inst_libofx() {
rm -rf ${TMP_UDIR}/libofx-*
fi
}
-
-function inst_gnutls() {
- setup GNUTLS
- _GNUTLS_UDIR=`unix_path ${GNUTLS_DIR}`
- add_to_env ${_GNUTLS_UDIR}/bin PATH
- add_to_env ${_GNUTLS_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
- add_to_env "-I${_GNUTLS_UDIR}/include" GNUTLS_CPPFLAGS
- add_to_env "-L${_GNUTLS_UDIR}/lib" GNUTLS_LDFLAGS
- if quiet ${PKG_CONFIG} --exact-version=${GNUTLS_VERSION} gnutls
- then
- echo "GNUTLS already installed in $_GNUTLS_UDIR. skipping."
- else
- wget_unpacked $GNUTLS_URL $DOWNLOAD_DIR $GNUTLS_DIR
- rm -f $_GNUTLS_UDIR/lib/*.la
- quiet ${PKG_CONFIG} --exists gnutls || die "GNUTLS not installed correctly"
- fi
- [ ! -d $_GNUTLS_UDIR/share/aclocal ] || add_to_env "-I $_GNUTLS_UDIR/share/aclocal" ACLOCAL_FLAGS
-}
-
-function inst_gwenhywfar() {
- setup Gwenhywfar
- _GWENHYWFAR_UDIR=`unix_path ${GWENHYWFAR_DIR}`
- add_to_env ${_GWENHYWFAR_UDIR}/bin PATH
- add_to_env ${_GWENHYWFAR_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
- if quiet ${PKG_CONFIG} --exact-version=${GWENHYWFAR_VERSION} gwenhywfar
+
+function inst_libsoup() {
+ setup libsoup
+ _LIBSOUP_UDIR=`unix_path $LIBSOUP_DIR`
+ add_to_env $_LIBSOUP_UDIR/lib/pkgconfig PKG_CONFIG_PATH
+ if quiet ${PKG_CONFIG} --exists libsoup-2.4
then
- echo "Gwenhywfar already installed in $_GWENHYWFAR_UDIR. skipping."
+ echo "libsoup already installed in $_LIBSOUP_UDIR. skipping."
else
- wget_unpacked $GWENHYWFAR_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/gwenhywfar-*
- qpushd $TMP_UDIR/gwenhywfar-*
- # circumvent binreloc bug, http://trac.autopackage.org/ticket/28
- if [ "$AQBANKING5" = "yes" ]; then
- # Note: gwenhywfar-3.x and higher don't use openssl anymore.
- ./configure ${HOST_XCOMPILE} \
- --with-libgcrypt-prefix=$_GNUTLS_UDIR \
- --disable-binreloc \
- --disable-ssl \
- --prefix=$_GWENHYWFAR_UDIR \
- --with-guis=gtk2 \
- CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS} `pkg-config --cflags gtk+-2.0`" \
- LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GNUTLS_LDFLAGS} -lintl"
- else
- if [ -n "$GWENHYWFAR_PATCH" -a -f "$GWENHYWFAR_PATCH" ] ; then
- patch -p1 < $GWENHYWFAR_PATCH
- #aclocal -I m4 ${ACLOCAL_FLAGS}
- #automake
- #autoconf
- fi
- # Note: gwenhywfar-3.x and higher don't use openssl anymore.
- ./configure ${HOST_XCOMPILE} \
- --with-libgcrypt-prefix=$_GNUTLS_UDIR \
- --disable-binreloc \
- --disable-ssl \
- --prefix=$_GWENHYWFAR_UDIR \
- CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS}" \
- LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GNUTLS_LDFLAGS} -lintl"
- fi
+ wget_unpacked $LIBSOUP_SRC_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/libsoup-*
+ qpushd $TMP_UDIR/libsoup-*
+ ./configure \
+ --prefix=${_LIBSOUP_UDIR} \
+ --disable-gtk-doc \
+ --without-gnome \
+ --disable-ssl \
+ CPPFLAGS=-I${_GNOME_UDIR}/include \
+ LDFLAGS="-L${_GNOME_UDIR}/lib -Wl,-s -lz"
make
-# [ "$CROSS_COMPILE" != "yes" ] && make check
- rm -rf ${_GWENHYWFAR_UDIR}
make install
qpopd
- ${PKG_CONFIG} --exists gwenhywfar || die "Gwenhywfar not installed correctly"
- rm -rf ${TMP_UDIR}/gwenhywfar-*
+ quiet ${PKG_CONFIG} --exists libsoup-2.4 || die "libsoup not installed correctly"
+ rm -rf ${TMP_UDIR}/libsoup-*
fi
- [ ! -d $_GWENHYWFAR_UDIR/share/aclocal ] || add_to_env "-I $_GWENHYWFAR_UDIR/share/aclocal" ACLOCAL_FLAGS
+ LIBSOUP_CPPFLAGS=`${PKG_CONFIG} --cflags libsoup-2.4`
}
-function inst_ktoblzcheck() {
- setup Ktoblzcheck
- # Out of convenience ktoblzcheck is being installed into
- # GWENHYWFAR_DIR
- add_to_env "-I${_GWENHYWFAR_UDIR}/include" KTOBLZCHECK_CPPFLAGS
- add_to_env "-L${_GWENHYWFAR_UDIR}/lib" KTOBLZCHECK_LDFLAGS
- if quiet ${PKG_CONFIG} --exact-version=${KTOBLZCHECK_VERSION} ktoblzcheck
+function inst_libxslt() {
+ setup LibXSLT
+ _LIBXSLT_UDIR=`unix_path $LIBXSLT_DIR`
+ add_to_env $_LIBXSLT_UDIR/bin PATH
+ add_to_env $_LIBXSLT_UDIR/lib/pkgconfig PKG_CONFIG_PATH
+ if quiet which xsltproc
then
- echo "Ktoblzcheck already installed in $_GWENHYWFAR_UDIR. skipping."
+ echo "libxslt already installed in $_LIBXSLT_UDIR. skipping."
else
- wget_unpacked $KTOBLZCHECK_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/ktoblzcheck-*
- qpushd $TMP_UDIR/ktoblzcheck-*
- # circumvent binreloc bug, http://trac.autopackage.org/ticket/28
- ./configure ${HOST_XCOMPILE} \
- --prefix=${_GWENHYWFAR_UDIR} \
- --disable-binreloc \
- --disable-python
+ [ "$CROSS_COMPILE" = "yes" ] && die "xsltproc unavailable"
+ #wget_unpacked ${LIBXSLT_ICONV_URL} ${DOWNLOAD_DIR} ${LIBXSLT_DIR}
+ #wget_unpacked ${LIBXSLT_ZLIB_URL} ${DOWNLOAD_DIR} ${LIBXSLT_DIR}
+
+ wget_unpacked $LIBXSLT_SRC_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/libxslt-*
+ qpushd $TMP_UDIR/libxslt-*
+ patch -p0 -u -i ${LIBXSLT_MAKEFILE_PATCH}
+ ./configure \
+ --prefix=${_LIBXSLT_UDIR} \
+ --with-libxml-prefix=${_GNOME_UDIR}
make
-# [ "$CROSS_COMPILE" != "yes" ] && make check
make install
qpopd
- ${PKG_CONFIG} --exists ktoblzcheck || die "Ktoblzcheck not installed correctly"
- rm -rf ${TMP_UDIR}/ktoblzcheck-*
+ rm -rf ${TMP_UDIR}/libxslt-*
+
+ quiet which xsltproc || die "libxslt not installed correctly"
fi
}
-function inst_qt4() {
- # This section is not a full install, but the .la creation is
- # already useful in itself and that's why it has already been
- # added.
+function inst_opensp() {
+ setup OpenSP
+ _OPENSP_UDIR=`unix_path ${OPENSP_DIR}`
+ add_to_env ${_OPENSP_UDIR}/bin PATH
+ if test -f ${_OPENSP_UDIR}/bin/libosp-5.dll
+ then
+ echo "OpenSP already installed in $_OPENSP_UDIR. skipping."
+ else
+ wget_unpacked $OPENSP_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/OpenSP-*
+ qpushd $TMP_UDIR/OpenSP-*
+ [ -n "$OPENSP_PATCH" -a -f "$OPENSP_PATCH" ] && \
+ patch -p0 < $OPENSP_PATCH
+ libtoolize --force
+ aclocal ${ACLOCAL_FLAGS} -I m4
+ automake
+ autoconf
+ ./configure ${HOST_XCOMPILE} \
+ --prefix=${_OPENSP_UDIR} \
+ --disable-doc-build --disable-static
+ # On many windows machines, none of the programs will
+ # build, but we only need the library, so ignore the rest.
+ make all-am
+ make -C lib
+ make -i
+ make -i install
+ qpopd
+ test -f ${_OPENSP_UDIR}/bin/libosp-5.dll || die "OpenSP not installed correctly"
+ rm -rf $TMP_UDIR/OpenSP-*
+ fi
+}
- [ "$QTDIR" ] || die "QTDIR is not set. Please install Qt and set that variable in custom.sh, or deactivate AQBANKING_WITH_QT"
- export QTDIR=`unix_path ${QTDIR}` # help configure of aqbanking
- _QTDIR=$QTDIR
- # This section creates .la files for the Qt-4 DLLs so that
- # libtool correctly links to the DLLs.
- if test ! -f ${_QTDIR}/lib/libQtCore4.la ; then
- qpushd ${_QTDIR}/lib
- for A in lib*.a; do
- LIBBASENAME=`basename ${A} .a`
- OUTFILE="${LIBBASENAME}.la"
- BASENAME=`echo ${LIBBASENAME} | sed -e"s/lib//" `
- DLLNAME="${BASENAME}.dll"
+function inst_openssl() {
+ setup OpenSSL
+ _OPENSSL_UDIR=`unix_path $OPENSSL_DIR`
+ add_to_env $_OPENSSL_UDIR/bin PATH
+ # Make sure the files of Win32OpenSSL-0_9_8d are really gone!
+ if test -f $_OPENSSL_UDIR/unins000.exe ; then
+ die "Wrong version of OpenSSL installed! Run $_OPENSSL_UDIR/unins000.exe and start install.sh again."
+ fi
+ # Make sure the files of openssl-0.9.7c-{bin,lib}.zip are really gone!
+ if [ -f $_OPENSSL_UDIR/lib/libcrypto.dll.a ] ; then
+ die "Found old OpenSSL installation in $_OPENSSL_UDIR. Please remove that first."
+ fi
- # Create la file
- echo "# Generated by foo bar libtool" > $OUTFILE
- echo "dlname='../bin/${DLLNAME}'" >> $OUTFILE
- echo "library_names='${DLLNAME}'" >> $OUTFILE
- echo "libdir='${_QTDIR}/bin'" >> $OUTFILE
+ if quiet ${LD} -L$_OPENSSL_UDIR/lib -leay32 -lssl32 -o $TMP_UDIR/ofile ; then
+ echo "openssl already installed in $_OPENSSL_UDIR. skipping."
+ else
+ smart_wget $OPENSSL_URL $DOWNLOAD_DIR
+ echo -n "Extracting ${LAST_FILE##*/} ... "
+ tar -xzpf $LAST_FILE -C $TMP_UDIR &>/dev/null | true
+ echo "done"
+ assert_one_dir $TMP_UDIR/openssl-*
+ qpushd $TMP_UDIR/openssl-*
+ for _dir in crypto ssl ; do
+ qpushd $_dir
+ find . -name "*.h" -exec cp {} ../include/openssl/ \;
+ qpopd
+ done
+ cp *.h include/openssl
+ _COMSPEC_U=`unix_path $COMSPEC`
+ PATH=$_ACTIVE_PERL_UDIR/ActivePerl/Perl/bin:$_MINGW_UDIR/bin $_COMSPEC_U //c ms\\mingw32
+ mkdir -p $_OPENSSL_UDIR/bin
+ mkdir -p $_OPENSSL_UDIR/lib
+ mkdir -p $_OPENSSL_UDIR/include
+ cp -a libeay32.dll libssl32.dll $_OPENSSL_UDIR/bin
+ cp -a libssl32.dll $_OPENSSL_UDIR/bin/ssleay32.dll
+ for _implib in libeay32 libssl32 ; do
+ cp -a out/$_implib.a $_OPENSSL_UDIR/lib/$_implib.dll.a
done
+ cp -a include/openssl $_OPENSSL_UDIR/include
qpopd
+ quiet ${LD} -L$_OPENSSL_UDIR/lib -leay32 -lssl32 -o $TMP_UDIR/ofile || die "openssl not installed correctly"
+ rm -rf ${TMP_UDIR}/openssl-*
+ fi
+ _eay32dll=$(echo $(which libeay32.dll)) # which sucks
+ if [ -z "$_eay32dll" ] ; then
+ die "Did not find libeay32.dll in your PATH, why that?"
+ fi
+ if [ "$_eay32dll" != "$_OPENSSL_UDIR/bin/libeay32.dll" ] ; then
+ die "Found $_eay32dll in PATH. If you have added $_OPENSSL_UDIR/bin to your PATH before, make sure it is listed before paths from other packages shipping SSL libraries, like SVN. In particular, check $_MINGW_UDIR/etc/profile.d/installer.sh."
fi
}
-function inst_aqbanking() {
- setup AqBanking
- _AQBANKING_UDIR=`unix_path ${AQBANKING_DIR}`
- add_to_env ${_AQBANKING_UDIR}/bin PATH
- add_to_env ${_AQBANKING_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
- if quiet ${PKG_CONFIG} --exact-version=${AQBANKING_VERSION} aqbanking
+function inst_pcre() {
+ setup pcre
+ _PCRE_UDIR=`unix_path $PCRE_DIR`
+ add_to_env -I$_PCRE_UDIR/include PCRE_CPPFLAGS
+ add_to_env -L$_PCRE_UDIR/lib PCRE_LDFLAGS
+ add_to_env $_PCRE_UDIR/bin PATH
+ if quiet ${LD} $PCRE_LDFLAGS -lpcre -o $TMP_UDIR/ofile
then
- echo "AqBanking already installed in $_AQBANKING_UDIR. skipping."
+ echo "pcre already installed in $_PCRE_UDIR. skipping."
else
- wget_unpacked $AQBANKING_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/aqbanking-*
- qpushd $TMP_UDIR/aqbanking-*
- _AQ_CPPFLAGS="-I${_LIBOFX_UDIR}/include ${KTOBLZCHECK_CPPFLAGS} ${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS}"
- _AQ_LDFLAGS="-L${_LIBOFX_UDIR}/lib ${KTOBLZCHECK_LDFLAGS} ${GNOME_LDFLAGS} ${GNUTLS_LDFLAGS}"
- if test x$CROSS_COMPILE = xyes; then
- XMLMERGE="xmlmerge"
- else
- XMLMERGE="${_GWENHYWFAR_UDIR}/bin/xmlmerge"
- fi
- if [ "$AQBANKING5" != "yes" ] ; then
- _AQ_BACKENDS="aqhbci aqofxconnect"
- else
- # FIXME: Maybe also aqpaypal?
- _AQ_BACKENDS="aqhbci aqofxconnect"
- fi
- if test x$AQBANKING_WITH_QT = xyes; then
- inst_qt4
- if [ -n "$AQBANKING_PATCH" -a -f "$AQBANKING_PATCH" ] ; then
- patch -p1 < $AQBANKING_PATCH
- #automake
- #aclocal -I m4 ${ACLOCAL_FLAGS}
- #autoconf
- fi
- ./configure ${HOST_XCOMPILE} \
- --with-gwen-dir=${_GWENHYWFAR_UDIR} \
- --with-xmlmerge=${XMLMERGE} \
- --with-frontends="cbanking qbanking" \
- --with-backends="${_AQ_BACKENDS}" \
- CPPFLAGS="${_AQ_CPPFLAGS} ${GMP_CPPFLAGS}" \
- LDFLAGS="${_AQ_LDFLAGS} ${GMP_LDFLAGS}" \
- qt3_libs="-L${_QTDIR}/lib -L${_QTDIR}/bin -lQtCore4 -lQtGui4 -lQt3Support4" \
- qt3_includes="-I${_QTDIR}/include -I${_QTDIR}/include/Qt -I${_QTDIR}/include/QtCore -I${_QTDIR}/include/QtGui -I${_QTDIR}/include/Qt3Support" \
- --prefix=${_AQBANKING_UDIR}
- make qt4-port
- make clean
- else
- if [ -n "$AQBANKING_PATCH" -a -f "$AQBANKING_PATCH" ] ; then
- patch -p1 < $AQBANKING_PATCH
- #automake
- #aclocal -I m4 ${ACLOCAL_FLAGS}
- #autoconf
- fi
- ./configure ${HOST_XCOMPILE} \
- --with-gwen-dir=${_GWENHYWFAR_UDIR} \
- --with-xmlmerge=${XMLMERGE} \
- --with-frontends="cbanking" \
- --with-backends="${_AQ_BACKENDS}" \
- CPPFLAGS="${_AQ_CPPFLAGS} ${GMP_CPPFLAGS}" \
- LDFLAGS="${_AQ_LDFLAGS} ${GMP_LDFLAGS}" \
- --prefix=${_AQBANKING_UDIR}
- fi
- make
- rm -rf ${_AQBANKING_UDIR}
- make install
- qpopd
- qpushd ${_AQBANKING_UDIR}/bin
- if [ "$AQBANKING5" = "yes" ]; then
- exetype aqbanking-cli.exe console
- exetype aqhbci-tool4.exe console
- else
- exetype aqbanking-cli.exe console
- exetype aqhbci-tool4.exe console
- fi
+ mkdir -p $_PCRE_UDIR
+ wget_unpacked $PCRE_BIN_URL $DOWNLOAD_DIR $PCRE_DIR
+ wget_unpacked $PCRE_LIB_URL $DOWNLOAD_DIR $PCRE_DIR
+ fi
+ quiet ${LD} $PCRE_LDFLAGS -lpcre -o $TMP_UDIR/ofile || die "pcre not installed correctly"
+}
+
+function inst_qt4() {
+ # This section is not a full install, but the .la creation is
+ # already useful in itself and that's why it has already been
+ # added.
+
+ [ "$QTDIR" ] || die "QTDIR is not set. Please install Qt and set that variable in custom.sh, or deactivate AQBANKING_WITH_QT"
+ export QTDIR=`unix_path ${QTDIR}` # help configure of aqbanking
+ _QTDIR=$QTDIR
+ # This section creates .la files for the Qt-4 DLLs so that
+ # libtool correctly links to the DLLs.
+ if test ! -f ${_QTDIR}/lib/libQtCore4.la ; then
+ qpushd ${_QTDIR}/lib
+ for A in lib*.a; do
+ LIBBASENAME=`basename ${A} .a`
+ OUTFILE="${LIBBASENAME}.la"
+ BASENAME=`echo ${LIBBASENAME} | sed -e"s/lib//" `
+ DLLNAME="${BASENAME}.dll"
+
+ # Create la file
+ echo "# Generated by foo bar libtool" > $OUTFILE
+ echo "dlname='../bin/${DLLNAME}'" >> $OUTFILE
+ echo "library_names='${DLLNAME}'" >> $OUTFILE
+ echo "libdir='${_QTDIR}/bin'" >> $OUTFILE
+ done
qpopd
- ${PKG_CONFIG} --exists aqbanking || die "AqBanking not installed correctly"
- rm -rf ${TMP_UDIR}/aqbanking-*
fi
- [ ! -d $_AQBANKING_UDIR/share/aclocal ] || add_to_env "-I $_AQBANKING_UDIR/share/aclocal" ACLOCAL_FLAGS
}
-function inst_libdbi() {
- setup LibDBI
- _SQLITE3_UDIR=`unix_path ${SQLITE3_DIR}`
- _MYSQL_LIB_UDIR=`unix_path ${MYSQL_LIB_DIR}`
- _PGSQL_UDIR=`unix_path ${PGSQL_DIR}`
- _LIBDBI_UDIR=`unix_path ${LIBDBI_DIR}`
- _LIBDBI_DRIVERS_UDIR=`unix_path ${LIBDBI_DRIVERS_DIR}`
- add_to_env -I$_LIBDBI_UDIR/include LIBDBI_CPPFLAGS
- add_to_env -L$_LIBDBI_UDIR/lib LIBDBI_LDFLAGS
- if test -f ${_SQLITE3_UDIR}/bin/libsqlite3-0.dll
+function inst_readline() {
+ setup Readline
+ _READLINE_UDIR=`unix_path $READLINE_DIR`
+ add_to_env -I$_READLINE_UDIR/include READLINE_CPPFLAGS
+ add_to_env -L$_READLINE_UDIR/lib READLINE_LDFLAGS
+ add_to_env $_READLINE_UDIR/bin PATH
+ if quiet ${LD} $READLINE_LDFLAGS -lreadline -o $TMP_UDIR/ofile
then
- echo "SQLite3 already installed in $_SQLITE3_UDIR. skipping."
+ echo "readline already installed in $_READLINE_UDIR. skipping."
else
- wget_unpacked $SQLITE3_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/sqlite-*
- qpushd $TMP_UDIR/sqlite-*
- ./configure ${HOST_XCOMPILE} \
- --prefix=${_SQLITE3_UDIR}
- make
- make install
- qpopd
- test -f ${_SQLITE3_UDIR}/bin/libsqlite3-0.dll || die "SQLite3 not installed correctly"
- rm -rf ${TMP_UDIR}/sqlite-*
+ mkdir -p $_READLINE_UDIR
+ wget_unpacked $READLINE_BIN_URL $DOWNLOAD_DIR $READLINE_DIR
+ wget_unpacked $READLINE_LIB_URL $DOWNLOAD_DIR $READLINE_DIR
+ quiet ${LD} $READLINE_LDFLAGS -lreadline -o $TMP_UDIR/ofile || die "readline not installed correctly"
fi
- if test -f ${_MYSQL_LIB_UDIR}/lib/libmysql.dll -a \
- -f ${_MYSQL_LIB_UDIR}/lib/libmysqlclient.a
+}
+
+function inst_regex() {
+ setup RegEx
+ _REGEX_UDIR=`unix_path $REGEX_DIR`
+ add_to_env -lregex REGEX_LDFLAGS
+ add_to_env -I$_REGEX_UDIR/include REGEX_CPPFLAGS
+ add_to_env -L$_REGEX_UDIR/lib REGEX_LDFLAGS
+ add_to_env $_REGEX_UDIR/bin PATH
+ if quiet ${LD} $REGEX_LDFLAGS -o $TMP_UDIR/ofile
then
- echo "MySQL library already installed in $_MYSQL_LIB_UDIR. skipping."
+ echo "regex already installed in $_REGEX_UDIR. skipping."
else
- wget_unpacked $MYSQL_LIB_URL $DOWNLOAD_DIR $TMP_DIR
- mkdir -p $_MYSQL_LIB_UDIR
- assert_one_dir $TMP_UDIR/mysql*
- cp -r $TMP_UDIR/mysql*/* $_MYSQL_LIB_UDIR
- cp -r $TMP_UDIR/mysql*/include $_MYSQL_LIB_UDIR/include/mysql
- rm -rf ${TMP_UDIR}/mysql*
- qpushd $_MYSQL_LIB_UDIR/lib
- ${DLLTOOL} --input-def $LIBMYSQL_DEF --dllname libmysql.dll --output-lib libmysqlclient.a -k
- test -f ${_MYSQL_LIB_UDIR}/lib/libmysql.dll || die "mysql not installed correctly - libmysql.dll"
- test -f ${_MYSQL_LIB_UDIR}/lib/libmysqlclient.a || die "mysql not installed correctly - libmysqlclient.a"
- qpopd
+ mkdir -p $_REGEX_UDIR
+ wget_unpacked $REGEX_URL $DOWNLOAD_DIR $REGEX_DIR
+ wget_unpacked $REGEX_DEV_URL $DOWNLOAD_DIR $REGEX_DIR
+ quiet ${LD} $REGEX_LDFLAGS -o $TMP_UDIR/ofile || die "regex not installed correctly"
fi
- if test -f ${_PGSQL_UDIR}/lib/libpq.dll
+}
+
+function inst_webkit() {
+ setup WebKit
+ _WEBKIT_UDIR=`unix_path ${WEBKIT_DIR}`
+ add_to_env ${_WEBKIT_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
+ if quiet ${PKG_CONFIG} --exists webkit-1.0
then
- echo "PGSQL library already installed in $_PGSQL_UDIR. skipping."
+ echo "webkit already installed in $_WEBKIT_UDIR. skipping."
else
- wget_unpacked $PGSQL_LIB_URL $DOWNLOAD_DIR $TMP_DIR
- cp -r $TMP_UDIR/pgsql* $_PGSQL_UDIR
- rm -rf ${TMP_UDIR}/pgsql*
- test -f ${_PGSQL_UDIR}/lib/libpq.dll || die "libpq not installed correctly"
+ if [ "$BUILD_WEBKIT_FROM_SOURCE" = "yes" ]; then
+ wget_unpacked $WEBKIT_SRC_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir ${TMP_UDIR}/webkit-*
+ qpushd $TMP_UDIR/webkit-*
+ add_to_env /c/Programs/GnuWin32/bin PATH
+ SAVED_PATH=$PATH
+ add_to_env ${_ACTIVE_PERL_BASE_DIR}/bin PATH
+ export PERL5LIB=${_ACTIVE_PERL_BASE_DIR}/lib
+
+ patch -p0 -u < $WEBKIT_CONFIGURE_PATCH
+ CPPFLAGS="${GNOME_CPPFLAGS} ${SQLITE3_CFLAGS}" \
+ LDFLAGS="${GNOME_LDFLAGS} ${SQLITE3_LIBS}" \
+ PERL="${_ACTIVE_PERL_BASE_DIR}/bin/perl" \
+ ./configure \
+ --prefix=${_WEBKIT_UDIR} \
+ --with-target=win32 \
+ --with-unicode-backend=glib \
+ --enable-web-sockets \
+ --enable-3D-transforms \
+ --disable-video
+ patch -p0 -u < $WEBKIT_DATADIR_PATCH
+ patch -p0 -u < $WEBKIT_GCCPATH_PATCH
+ patch -p0 -u < $WEBKIT_MAKEFILE_PATCH
+ patch -p0 -u < $WEBKIT_MINGW32_PATCH
+ patch -p0 -u < $WEBKIT_NOSVG_PATCH
+ cp $WEBKIT_WEBKITENUMTYPES_CPP DerivedSources
+ cp $WEBKIT_WEBKITENUMTYPES_H Webkit/gtk/webkit
+ make
+ make install
+ PATH=$SAVED_PATH
+ qpopd
+ else
+ wget_unpacked $WEBKIT_URL $DOWNLOAD_DIR $WEBKIT_DIR
+ fi
+ quiet ${PKG_CONFIG} --exists webkit-1.0 || die "webkit not installed correctly"
+ rm -rf ${TMP_UDIR}/webkit-*
fi
- if test -f ${_LIBDBI_UDIR}/bin/libdbi-0.dll
+}
+
+function inst_inno() {
+ setup Inno Setup Compiler
+ _INNO_UDIR=`unix_path $INNO_DIR`
+ add_to_env $_INNO_UDIR PATH
+ if quiet which iscc
then
- echo "libdbi already installed in $_LIBDBI_UDIR. skipping."
+ echo "Inno Setup Compiler already installed in $_INNO_UDIR. skipping."
else
- wget_unpacked $LIBDBI_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/libdbi-0*
- qpushd $TMP_UDIR/libdbi-0*
- if [ -n "$LIBDBI_PATCH" -a -f "$LIBDBI_PATCH" ]; then
- patch -p1 < $LIBDBI_PATCH
- ./autogen.sh
- fi
- if [ -n "$LIBDBI_PATCH2" -a -f "$LIBDBI_PATCH2" ]; then
- patch -p1 < $LIBDBI_PATCH2
- fi
- if [ "$CROSS_COMPILE" = "yes" ]; then
- rm ltmain.sh aclocal.m4
- libtoolize --force
- aclocal -I ${_AUTOTOOLS_UDIR}/share/aclocal
- autoheader
- automake --add-missing
- autoconf
- fi
- ./configure ${HOST_XCOMPILE} \
- --disable-docs \
- --prefix=${_LIBDBI_UDIR}
- make
- make install
- qpopd
- qpushd ${_LIBDBI_UDIR}
- if [ x"$(which pexports.exe > /dev/null 2>&1)" != x ]
- then
- pexports bin/libdbi-0.dll > lib/libdbi.def
- ${DLLTOOL} -d lib/libdbi.def -D bin/libdbi-0.dll -l lib/libdbi.lib
- fi
- qpopd
- test -f ${_LIBDBI_UDIR}/bin/libdbi-0.dll || die "libdbi not installed correctly"
- rm -rf ${TMP_UDIR}/libdbi-0*
+ smart_wget $INNO_URL $DOWNLOAD_DIR
+ $LAST_FILE //SP- //SILENT //DIR="$INNO_DIR"
+ quiet which iscc || die "iscc (Inno Setup Compiler) not installed correctly"
fi
- if test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdsqlite3.dll -a \
- -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdmysql.dll -a \
- -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdpgsql.dll
+}
+
+function test_for_hh() {
+ qpushd $TMP_UDIR
+ cat > ofile.c <<EOF
+#include <windows.h>
+#include <htmlhelp.h>
+int main(int argc, char **argv) {
+ HtmlHelpW(0, (wchar_t*)"", HH_HELP_CONTEXT, 0);
+ return 0;
+}
+EOF
+ gcc -shared -o ofile.dll ofile.c $HH_CPPFLAGS $HH_LDFLAGS -lhtmlhelp || return 1
+ qpopd
+}
+
+function inst_hh() {
+ setup HTML Help Workshop
+ _HH_UDIR=`unix_path $HH_DIR`
+ add_to_env -I$_HH_UDIR/include HH_CPPFLAGS
+ add_to_env -L$_HH_UDIR/lib HH_LDFLAGS
+ add_to_env $_HH_UDIR PATH
+ if quiet test_for_hh
then
- echo "libdbi drivers already installed in $_LIBDBI_DRIVERS_UDIR. skipping."
+ echo "html help workshop already installed in $_HH_UDIR. skipping."
else
- wget_unpacked $LIBDBI_DRIVERS_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/libdbi-drivers-*
- qpushd $TMP_UDIR/libdbi-drivers*
- [ -n "$LIBDBI_DRIVERS_PATCH" -a -f "$LIBDBI_DRIVERS_PATCH" ] && \
- patch -p0 < $LIBDBI_DRIVERS_PATCH
- [ -n "$LIBDBI_DRIVERS_PATCH2" -a -f "$LIBDBI_DRIVERS_PATCH2" ] && \
- patch -p0 < $LIBDBI_DRIVERS_PATCH2
- [ -n "$LIBDBI_DRIVERS_PATCH3" -a -f "$LIBDBI_DRIVERS_PATCH3" ] && \
- patch -p0 < $LIBDBI_DRIVERS_PATCH3
- [ -n "$LIBDBI_DRIVERS_PATCH4" -a -f "$LIBDBI_DRIVERS_PATCH4" ] && \
- patch -p0 < $LIBDBI_DRIVERS_PATCH4
- LDFLAGS=-no-undefined ./configure ${HOST_XCOMPILE} \
- --disable-docs \
- --with-dbi-incdir=${_LIBDBI_UDIR}/include \
- --with-dbi-libdir=${_LIBDBI_UDIR}/lib \
- --with-sqlite3 \
- --with-sqlite3-dir=${_SQLITE3_UDIR} \
- --with-mysql \
- --with-mysql-dir=${_MYSQL_LIB_UDIR} \
- --with-pgsql \
- --with-pgsql-dir=${_PGSQL_UDIR} \
- --prefix=${_LIBDBI_DRIVERS_UDIR}
- make
- make install
+ smart_wget $HH_URL $DOWNLOAD_DIR
+ echo "!!! When asked for an installation path, specify $HH_DIR !!!"
+ $LAST_FILE
+ qpushd $HH_DIR
+ _HHCTRL_OCX=$(which hhctrl.ocx || true)
+ [ "$_HHCTRL_OCX" ] || die "Did not find hhctrl.ocx"
+ pexports -h include/htmlhelp.h $_HHCTRL_OCX > lib/htmlhelp.def
+ qpushd lib
+ ${DLLTOOL} -k -d htmlhelp.def -l libhtmlhelp.a
+ mv htmlhelp.lib htmlhelp.lib.bak
+ qpopd
qpopd
- test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdsqlite3.dll || die "libdbi sqlite3 driver not installed correctly"
- test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdmysql.dll || die "libdbi mysql driver not installed correctly"
- test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdpgsql.dll || die "libdbi pgsql driver not installed correctly"
- rm -rf ${TMP_UDIR}/libdbi-drivers-*
+ quiet test_for_hh || die "html help workshop not installed correctly"
fi
}
-function inst_cmake() {
- setup CMake
- _CMAKE_UDIR=`unix_path ${CMAKE_DIR}`
- add_to_env ${_CMAKE_UDIR}/bin PATH
- if [ -f ${_CMAKE_UDIR}/bin/cmake.exe ]
- then
- echo "cmake already installed in $_CMAKE_UDIR. skipping."
+function svn_up() {
+ mkdir -p $_REPOS_UDIR
+ qpushd $_REPOS_UDIR
+ if [ -x .svn ]; then
+ setup "svn update in ${REPOS_DIR}"
+ svn up -r ${SVN_REV}
else
- wget_unpacked $CMAKE_URL $DOWNLOAD_DIR $CMAKE_DIR
-
- assert_one_dir ${_CMAKE_UDIR}/cmake-2*
- mv ${_CMAKE_UDIR}/cmake-2*/* ${_CMAKE_UDIR}
- rm -rf ${_CMAKE_UDIR}/cmake-2*
-
- [ -f ${_CMAKE_UDIR}/bin/cmake.exe ] || die "cmake not installed correctly"
+ setup svn co
+ svn co -r ${SVN_REV} $REPOS_URL .
fi
+ qpopd
}
function inst_cutecash() {
@@ -1309,35 +1441,6 @@ function inst_cutecash() {
qpopd
}
-function inst_webkit() {
- setup WebKit
- _WEBKIT_UDIR=`unix_path ${WEBKIT_DIR}`
- add_to_env ${_WEBKIT_UDIR}/bin PATH
- add_to_env -lwebkit-1.0-2 WEBKIT_LIBS
- add_to_env -L${_WEBKIT_UDIR}/bin WEBKIT_LIBS
- add_to_env -I${_WEBKIT_UDIR}/include/webkit-1.0 WEBKIT_CFLAGS
- if quiet ${LD} ${WEBKIT_LIBS} -o $TMP_UDIR/ofile
- then
- echo "webkit already installed in $_WEBKIT_UDIR. skipping."
- else
- wget_unpacked $WEBKIT_URL $DOWNLOAD_DIR $WEBKIT_DIR
- quiet ${LD} ${WEBKIT_LIBS} -o $TMP_UDIR/ofile || die "webkit not installed correctly"
- fi
-}
-
-function svn_up() {
- mkdir -p $_REPOS_UDIR
- qpushd $_REPOS_UDIR
- if [ -x .svn ]; then
- setup "svn update in ${REPOS_DIR}"
- svn up -r ${SVN_REV}
- else
- setup svn co
- svn co -r ${SVN_REV} $REPOS_URL .
- fi
- qpopd
-}
-
function inst_gnucash() {
setup GnuCash
_INSTALL_WFSDIR=`win_fs_path $INSTALL_DIR`
@@ -1359,11 +1462,11 @@ function inst_gnucash() {
export name_build_guile=/usr/bin/guile-config
fi
- qpushd $REPOS_DIR
- if [ "$BUILD_FROM_TARBALL" != "yes" ]; then
+ if [ "$BUILD_FROM_TARBALL" != "yes" ]; then
+ qpushd $REPOS_DIR
./autogen.sh
- fi
- qpopd
+ qpopd
+ fi
qpushd $_BUILD_UDIR
$_REL_REPOS_UDIR/configure ${HOST_XCOMPILE} \
@@ -1377,7 +1480,7 @@ function inst_gnucash() {
--enable-binreloc \
--enable-locale-specific-tax \
--with-html-engine=webkit \
- CPPFLAGS="${AUTOTOOLS_CPPFLAGS} ${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GMP_CPPFLAGS} ${GUILE_CPPFLAGS} ${LIBDBI_CPPFLAGS} ${KTOBLZCHECK_CPPFLAGS} ${HH_CPPFLAGS} -D_WIN32" \
+ CPPFLAGS="${AUTOTOOLS_CPPFLAGS} ${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GMP_CPPFLAGS} ${GUILE_CPPFLAGS} ${LIBDBI_CPPFLAGS} ${KTOBLZCHECK_CPPFLAGS} ${HH_CPPFLAGS} ${LIBSOUP_CPPFLAGS} -D_WIN32 ${EXTRA_CFLAGS}" \
LDFLAGS="${AUTOTOOLS_LDFLAGS} ${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GMP_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} ${HH_LDFLAGS}" \
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
diff --git a/install.sh b/install.sh
index 56179ca..acce95c 100644
--- a/install.sh
+++ b/install.sh
@@ -51,8 +51,8 @@ register_env_var READLINE_CPPFLAGS " "
register_env_var READLINE_LDFLAGS " "
register_env_var REGEX_CPPFLAGS " "
register_env_var REGEX_LDFLAGS " "
-register_env_var WEBKIT_CFLAGS " "
-register_env_var WEBKIT_LIBS " "
+register_env_var SQLITE3_CFLAGS " "
+register_env_var SQLITE3_LIBS " "
# steps
# There is no reason to ever need to comment these out!
@@ -97,7 +97,12 @@ add_step inst_gwenhywfar
add_step inst_ktoblzcheck
add_step inst_aqbanking
add_step inst_libdbi
+
+# libsoup and enchant needed by webkit
+add_step inst_libsoup
+add_step inst_enchant
add_step inst_webkit
+
##
if [ "$UPDATE_SOURCES" = "yes" ]; then
add_step svn_up
diff --git a/libxslt-1.1.22.Makefile.in.patch b/libxslt-1.1.22.Makefile.in.patch
new file mode 100755
index 0000000..ecf8be5
--- /dev/null
+++ b/libxslt-1.1.22.Makefile.in.patch
@@ -0,0 +1,26 @@
+--- libxslt/Makefile.in.orig 2007-08-23 11:22:57 -0400
++++ libxslt/Makefile.in 2011-04-05 17:11:09 -0400
+@@ -293,8 +293,8 @@
+ xsltwin32config.h.in \
+ libxslt.h
+
+-libxslt_la_LIBADD = $(EXTRA_LIBS)
+-libxslt_la_LDFLAGS = -version-info @LIBXSLT_VERSION_INFO@
++libxslt_la_LIBADD = $(EXTRA_LIBS) $(WIN32_EXTRA_LIBADD)
++libxslt_la_LDFLAGS = -version-info @LIBXSLT_VERSION_INFO@ $(WIN32_EXTRA_LDFLAGS)
+ man_MANS = libxslt.3
+ EXTRA_DIST = $(man_MANS) trio.h triodef.h
+ all: all-am
+--- libexslt/Makefile.in.orig 2007-08-23 11:22:57 -0400
++++ libexslt/Makefile.in 2011-04-05 17:11:44 -0400
+@@ -269,8 +269,8 @@
+ libexslt.h \
+ dynamic.c
+
+-libexslt_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS)
+-libexslt_la_LDFLAGS = -version-info @LIBEXSLT_VERSION_INFO@ $(LIBGCRYPT_LIBS)
++libexslt_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS) $(WIN32_EXTRA_LIBADD)
++libexslt_la_LDFLAGS = -version-info @LIBEXSLT_VERSION_INFO@ $(LIBGCRYPT_LIBS) $(WIN32_EXTRA_LDFLAGS)
+ man_MANS = libexslt.3
+ EXTRA_DIST = $(man_MANS)
+ all: all-am
diff --git a/webkit-1.2.7-configure.patch b/webkit-1.2.7-configure.patch
new file mode 100755
index 0000000..57f7ceb
--- /dev/null
+++ b/webkit-1.2.7-configure.patch
@@ -0,0 +1,23 @@
+--- configure Tue Oct 05 06:02:37 2010
++++ configure Tue Jan 11 07:28:51 2011
+@@ -1077,6 +1077,7 @@
+ enable_icon_database
+ enable_datalist
+ enable_ruby
++enable_sandbox
+ enable_video
+ enable_xhtmlmp
+ enable_xpath
+@@ -19020,9 +19021,9 @@
+ # check whether to enable HTML5 sandbox iframe support
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable HTML5 sandboxed iframe support" >&5
+ $as_echo_n "checking whether to enable HTML5 sandboxed iframe support... " >&6; }
+-# Check whether --enable-ruby was given.
+-if test "${enable_ruby+set}" = set; then :
+- enableval=$enable_ruby;
++# Check whether --enable-sandbox was given.
++if test "${enable_sandbox+set}" = set; then :
++ enableval=$enable_sandbox;
+ else
+ enable_sandbox="yes"
+ fi
diff --git a/webkit-1.2.7-datadir.patch b/webkit-1.2.7-datadir.patch
new file mode 100755
index 0000000..39db939
--- /dev/null
+++ b/webkit-1.2.7-datadir.patch
@@ -0,0 +1,143 @@
+--- WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp Fri Sep 10 20:20:33 2010
++++ WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp Tue Jan 11 12:47:14 2011
+@@ -71,6 +71,30 @@
+ #include <glib/gi18n-lib.h>
+ #include <stdio.h>
+
++#ifdef _WIN32
++/* search for data relative to where we are installed */
++#include <shlobj.h>
++#include <assert.h>
++
++static HMODULE GetThisDllHandle()
++{
++ MEMORY_BASIC_INFORMATION info;
++ size_t len = VirtualQueryEx(GetCurrentProcess(), (void*)GetThisDllHandle, &info, sizeof(info));
++ assert(len == sizeof(info));
++ return len ? (HMODULE)info.AllocationBase : NULL;
++}
++
++const gchar *
++get_webkit_datadir(void)
++{
++ gchar *retval;
++ retval = g_build_filename (g_win32_get_package_installation_directory_of_module (GetThisDllHandle()), "/share", NULL);
++ return retval;
++}
++#undef DATA_DIR
++#define DATA_DIR get_webkit_datadir ()
++#endif
++
+ using namespace WebCore;
+
+ namespace WebKit {
+@@ -989,7 +1013,13 @@
+
+ String content;
+ gchar* fileContent = 0;
++#ifdef _WIN32
++ gchar* errorPath = g_build_filename (DATA_DIR, "/webkit-1.0/resources/error.html", NULL);
++ gchar* errorURI = g_filename_to_uri(errorPath, NULL, NULL);
++ g_free(errorPath);
++#else
+ gchar* errorURI = g_filename_to_uri(DATA_DIR"/webkit-1.0/resources/error.html", NULL, NULL);
++#endif
+ GFile* errorFile = g_file_new_for_uri(errorURI);
+ g_free(errorURI);
+
+--- WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp Fri Sep 10 20:20:33 2010
++++ WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp Mon Jan 17 07:42:35 2011
+@@ -27,6 +27,31 @@
+ #include "NotImplemented.h"
+ #include "PlatformString.h"
+
++#ifdef _WIN32
++/* search for data relative to where we are installed */
++# include <shlobj.h>
++# include <assert.h>
++
++static HMODULE GetThisDllHandle()
++{
++ MEMORY_BASIC_INFORMATION info;
++ size_t len = VirtualQueryEx(GetCurrentProcess(), (void*)GetThisDllHandle, &info, sizeof(info));
++ assert(len == sizeof(info));
++ return len ? (HMODULE)info.AllocationBase : NULL;
++}
++
++const gchar *
++get_webkit_path(void)
++{
++ gchar *retval;
++ retval = g_build_filename (g_win32_get_package_installation_directory_of_module (GetThisDllHandle()), "/share", NULL);
++ return retval;
++}
++#undef DATA_DIR
++#define DATA_DIR get_webkit_path ()
++#endif
++
++
+ using namespace WebCore;
+
+ namespace WebKit {
+@@ -67,21 +92,30 @@
+ webkit_web_inspector_set_web_view(webInspector, inspectorWebView);
+
+ GOwnPtr<gchar> inspectorURI;
+-
++#ifdef _WIN32
++ gchar* inspectorPath = g_build_filename (DATA_DIR, "/webkit-1.0/webinspector/inspector.html", NULL);
++#endif
+ // Make the Web Inspector work when running tests
+ if (g_file_test("WebCore/inspector/front-end/inspector.html", G_FILE_TEST_EXISTS)) {
+ GOwnPtr<gchar> currentDirectory(g_get_current_dir());
+ GOwnPtr<gchar> fullPath(g_strdup_printf("%s/WebCore/inspector/front-end/inspector.html", currentDirectory.get()));
+ inspectorURI.set(g_filename_to_uri(fullPath.get(), NULL, NULL));
+ } else
++#ifdef _WIN32
++ inspectorURI.set(g_filename_to_uri(inspectorPath, NULL, NULL));
++#else
+ inspectorURI.set(g_filename_to_uri(DATA_DIR"/webkit-1.0/webinspector/inspector.html", NULL, NULL));
+-
++#endif
+ webkit_web_view_load_uri(inspectorWebView, inspectorURI.get());
+
+ gtk_widget_show(GTK_WIDGET(inspectorWebView));
+
+ Page* inspectorPage = core(inspectorWebView);
+ inspectorPage->inspectorController()->setInspectorFrontendClient(new InspectorFrontendClient(m_inspectedWebView, inspectorWebView, webInspector, inspectorPage));
++
++#ifdef _WIN32
++ g_free(inspectorPath);
++#endif
+ }
+
+ void InspectorClient::highlight(Node* node)
+@@ -145,6 +179,10 @@
+ String InspectorFrontendClient::localizedStringsURL()
+ {
+ GOwnPtr<gchar> URL;
++
++#ifdef _WIN32
++ gchar* localizedPath = g_build_filename (DATA_DIR, "/webkit-1.0/webinspector/localizedStrings.js", NULL);
++#endif
+
+ // Make the Web Inspector work when running tests
+ if (g_file_test("WebCore/English.lproj/localizedStrings.js", G_FILE_TEST_EXISTS)) {
+@@ -152,10 +190,16 @@
+ GOwnPtr<gchar> fullPath(g_strdup_printf("%s/WebCore/English.lproj/localizedStrings.js", currentDirectory.get()));
+ URL.set(g_filename_to_uri(fullPath.get(), NULL, NULL));
+ } else
++#ifdef _WIN32
++ URL.set(g_filename_to_uri(localizedPath, NULL, NULL));
++#else
+ URL.set(g_filename_to_uri(DATA_DIR"/webkit-1.0/webinspector/localizedStrings.js", NULL, NULL));
+-
++#endif
+ // FIXME: support l10n of localizedStrings.js
+ return String::fromUTF8(URL.get());
++#ifdef _WIN32
++ g_free(localizedPath);
++#endif
+ }
+
+ String InspectorFrontendClient::hiddenPanels()
diff --git a/webkit-1.2.7-gccpath.patch b/webkit-1.2.7-gccpath.patch
new file mode 100755
index 0000000..2274f9d
--- /dev/null
+++ b/webkit-1.2.7-gccpath.patch
@@ -0,0 +1,33 @@
+--- WebCore/bindings/scripts/IDLParser.pm Thu Jan 15 16:14:12 1970
++++ WebCore/bindings/scripts/IDLParser.pm Thu Jan 15 16:14:12 1970
+@@ -69,7 +69,7 @@
+ if (($Config::Config{'osname'}) =~ /solaris/i) {
+ $gccLocation = "/usr/sfw/bin/gcc";
+ } else {
+- $gccLocation = "/usr/bin/gcc";
++ $gccLocation = "gcc";
+ }
+ $preprocessor = $gccLocation . " -E -P -x c++";
+ }
+--- WebCore/css/make-css-file-arrays.pl Thu Jan 15 16:14:12 1970
++++ WebCore/css/make-css-file-arrays.pl Thu Jan 15 16:14:12 1970
+@@ -33,7 +33,7 @@
+ if (($Config::Config{'osname'}) =~ /solaris/i) {
+ $gccLocation = "/usr/sfw/bin/gcc";
+ } else {
+- $gccLocation = "/usr/bin/gcc";
++ $gccLocation = "gcc";
+ }
+ $preprocessor = $gccLocation . " -E -P -x c++";
+ }
+--- WebCore/dom/make_names.pl Thu Jan 15 16:14:12 1970
++++ WebCore/dom/make_names.pl Thu Jan 15 16:14:12 1970
+@@ -52,7 +52,7 @@
+ if (($Config::Config{'osname'}) =~ /solaris/i) {
+ $gccLocation = "/usr/sfw/bin/gcc";
+ } else {
+- $gccLocation = "/usr/bin/gcc";
++ $gccLocation = "gcc";
+ }
+ my $preprocessor = $gccLocation . " -E -P -x c++";
+
diff --git a/webkit-1.2.7-makefile.patch b/webkit-1.2.7-makefile.patch
new file mode 100755
index 0000000..6476ae1
--- /dev/null
+++ b/webkit-1.2.7-makefile.patch
@@ -0,0 +1,81 @@
+--- GNUmakefile Mon Jan 17 09:32:30 2011
++++ GNUmakefile Mon Jan 17 09:44:19 2011
+@@ -6411,3 +6411,4 @@
+ STRIP = strip
+-SYMBOL_VISIBILITY = -fvisibility=hidden
+-SYMBOL_VISIBILITY_INLINES = -fvisibility-inlines-hidden
++SYMBOL_VISIBILITY =
++SYMBOL_VISIBILITY_INLINES =
++PTHREAD_LIBS = -lpthread
+@@ -8967,7 +8967,7 @@
+ # It breaks the build on other platforms, so we use it conditionally
+ no_undefined = -no-undefined
+ #version_script = -Wl,--version-script,$(srcdir)/autotools/symbols.filter
+-version_script = -export-symbols-regex "^(webkit_|JS).*"
++version_script = -export-symbols-regex "^(webkit_|k?JS).*"
+
+ # Shared libraries
+ lib_LTLIBRARIES = \
+@@ -8987,7 +8987,7 @@
+ libJavaScriptCore_la_LIBADD = \
+ $(UNICODE_LIBS) \
+ $(GLIB_LIBS) \
+- -lpthread
++ $(PTHREAD_LIBS)
+
+ libJavaScriptCore_la_CXXFLAGS = \
+ $(global_cxxflags) \
+@@ -9042,7 +9042,6 @@
+ $(no_undefined)
+
+ libwebkit_1_0_la_LIBADD = \
+- -lpthread \
+ libJavaScriptCore.la \
+ libWebCoreJS.la \
+ $(webcore_ldflags) \
+@@ -9064,7 +9063,8 @@
+ $(PNG_LIBS) \
+ $(SQLITE3_LIBS) \
+ $(UNICODE_LIBS) \
+- $(XT_LIBS)
++ $(PTHREAD_LIBS) \
++ $(XT_LIBS) -lwinmm -lshlwapi -lole32
+
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = WebKit/gtk/webkit-1.0.pc
+@@ -9104,7 +9104,7 @@
+ Programs_minidom_LDADD = \
+ libJavaScriptCore.la \
+ -lm \
+- -lstdc++
++ -lstdc++ -lwinmm
+
+ Programs_minidom_LDFLAGS = \
+ -no-install \
+@@ -9127,7 +9127,7 @@
+ $(UNICODE_CFLAGS)
+
+ Programs_jsc_LDADD = \
+- libJavaScriptCore.la
++ libJavaScriptCore.la -lwinmm
+
+ WebCore := $(srcdir)/WebCore
+
+@@ -9263,7 +9263,7 @@
+ Programs_GtkLauncher_LDADD = \
+ libwebkit-1.0.la \
+ $(GTK_LIBS) \
+- $(GLIB_LIBS)
++ $(GLIB_LIBS) -lwinmm
+
+ Programs_GtkLauncher_LDFLAGS = \
+ -no-fast-install \
+@@ -9326,7 +9326,7 @@
+ $(GTK_LIBS) \
+ $(GLIB_LIBS) \
+ $(LIBSOUP_LIBS) \
+- $(FREETYPE_LIBS)
++ $(FREETYPE_LIBS) -lwinmm
+
+ Programs_DumpRenderTree_LDFLAGS = \
+ -no-fast-install \
diff --git a/webkit-1.2.7-mingw32.patch b/webkit-1.2.7-mingw32.patch
new file mode 100755
index 0000000..e7278fc
--- /dev/null
+++ b/webkit-1.2.7-mingw32.patch
@@ -0,0 +1,592 @@
+--- JavaScriptCore/jit/ExecutableAllocator.h 2010-05-07 16:09:08.000000000 +0200
++++ JavaScriptCore/jit/ExecutableAllocator.h 2010-05-17 22:33:16.000000000 +0200
+@@ -285,7 +285,7 @@
+ inline ExecutablePool::ExecutablePool(size_t n)
+ {
+ size_t allocSize = roundUpAllocationSize(n, JIT_ALLOCATOR_PAGE_SIZE);
+- Allocation mem = systemAlloc(allocSize);
++ const Allocation mem = systemAlloc(allocSize);
+ m_pools.append(mem);
+ m_freePtr = mem.pages;
+ if (!m_freePtr)
+--- JavaScriptCore/runtime/Collector.cpp (revision 63307)
++++ JavaScriptCore/runtime/Collector.cpp (working copy)
+@@ -91,6 +91,13 @@
+
+ #define COLLECT_ON_EVERY_ALLOCATION 0
+
++#if COMPILER(MINGW64)
++extern "C" {
++void * __mingw_aligned_malloc (size_t, size_t);
++void __mingw_aligned_free (void *);
++}
++#endif
++
+ using std::max;
+
+ namespace JSC {
+@@ -201,7 +208,7 @@
+ #elif OS(WINCE)
+ void* address = VirtualAlloc(NULL, BLOCK_SIZE, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
+ #elif OS(WINDOWS)
+-#if COMPILER(MINGW) && !COMPILER(MINGW64)
++#if COMPILER(MINGW)
+ void* address = __mingw_aligned_malloc(BLOCK_SIZE, BLOCK_SIZE);
+ #else
+ void* address = _aligned_malloc(BLOCK_SIZE, BLOCK_SIZE);
+@@ -292,7 +299,7 @@
+ #elif OS(WINCE)
+ VirtualFree(block, 0, MEM_RELEASE);
+ #elif OS(WINDOWS)
+-#if COMPILER(MINGW) && !COMPILER(MINGW64)
++#if COMPILER(MINGW)
+ __mingw_aligned_free(block);
+ #else
+ _aligned_free(block);
+--- JavaScriptCore/wtf/TCSpinLock.h 2010-03-19 16:20:53.000000000 +0100
++++ JavaScriptCore/wtf/TCSpinLock.h 2010-05-17 22:33:16.000000000 +0200
+@@ -37,8 +37,6 @@
+
+ #include <time.h> /* For nanosleep() */
+
+-#include <sched.h> /* For sched_yield() */
+-
+ #if HAVE(STDINT_H)
+ #include <stdint.h>
+ #elif HAVE(INTTYPES_H)
+@@ -134,7 +132,7 @@
+ #define SPINLOCK_INITIALIZER { 0 }
+
+ static void TCMalloc_SlowLock(volatile unsigned int* lockword) {
+- sched_yield(); // Yield immediately since fast path failed
++ Sleep(0); // Yield immediately since fast path failed
+ while (true) {
+ int r;
+ #if COMPILER(GCC)
+--- JavaScriptCore/wtf/unicode/glib/UnicodeGLib.cpp 2010-03-19 16:20:53.000000000 +0100
++++ JavaScriptCore/wtf/unicode/glib/UnicodeGLib.cpp 2010-05-17 22:33:16.000000000 +0200
+@@ -49,7 +49,7 @@
+ GOwnPtr<GError> gerror;
+
+ GOwnPtr<char> utf8src;
+- utf8src.set(g_utf16_to_utf8(src, srcLength, 0, 0, &gerror.outPtr()));
++ utf8src.set(g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(src), srcLength, 0, 0, &gerror.outPtr()));
+ if (gerror) {
+ *error = true;
+ return -1;
+@@ -60,7 +60,7 @@
+
+ long utf16resultLength = -1;
+ GOwnPtr<UChar> utf16result;
+- utf16result.set(g_utf8_to_utf16(utf8result.get(), -1, 0, &utf16resultLength, &gerror.outPtr()));
++ utf16result.set(reinterpret_cast<UChar*>(g_utf8_to_utf16(utf8result.get(), -1, 0, &utf16resultLength, &gerror.outPtr())));
+ if (gerror) {
+ *error = true;
+ return -1;
+@@ -81,7 +81,7 @@
+ GOwnPtr<GError> gerror;
+
+ GOwnPtr<char> utf8src;
+- utf8src.set(g_utf16_to_utf8(src, srcLength, 0, 0, &gerror.outPtr()));
++ utf8src.set(g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(src), srcLength, 0, 0, &gerror.outPtr()));
+ if (gerror) {
+ *error = true;
+ return -1;
+@@ -92,7 +92,7 @@
+
+ long utf16resultLength = -1;
+ GOwnPtr<UChar> utf16result;
+- utf16result.set(g_utf8_to_utf16(utf8result.get(), -1, 0, &utf16resultLength, &gerror.outPtr()));
++ utf16result.set(reinterpret_cast<UChar*>(g_utf8_to_utf16(utf8result.get(), -1, 0, &utf16resultLength, &gerror.outPtr())));
+ if (gerror) {
+ *error = true;
+ return -1;
+@@ -113,7 +113,7 @@
+ GOwnPtr<GError> gerror;
+
+ GOwnPtr<char> utf8src;
+- utf8src.set(g_utf16_to_utf8(src, srcLength, 0, 0, &gerror.outPtr()));
++ utf8src.set(g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(src), srcLength, 0, 0, &gerror.outPtr()));
+ if (gerror) {
+ *error = true;
+ return -1;
+@@ -124,7 +124,7 @@
+
+ long utf16resultLength = -1;
+ GOwnPtr<UChar> utf16result;
+- utf16result.set(g_utf8_to_utf16(utf8result.get(), -1, 0, &utf16resultLength, &gerror.outPtr()));
++ utf16result.set(reinterpret_cast<UChar*>(g_utf8_to_utf16(utf8result.get(), -1, 0, &utf16resultLength, &gerror.outPtr())));
+ if (gerror) {
+ *error = true;
+ return -1;
+@@ -189,8 +189,8 @@
+ GOwnPtr<char> utf8a;
+ GOwnPtr<char> utf8b;
+
+- utf8a.set(g_utf16_to_utf8(a, len, 0, 0, 0));
+- utf8b.set(g_utf16_to_utf8(b, len, 0, 0, 0));
++ utf8a.set(g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(a), len, 0, 0, 0));
++ utf8b.set(g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(b), len, 0, 0, 0));
+
+ GOwnPtr<char> foldedA;
+ GOwnPtr<char> foldedB;
+--- JavaScriptCore/wtf/unicode/glib/UnicodeGLib.h 2010-03-19 16:20:53.000000000 +0100
++++ JavaScriptCore/wtf/unicode/glib/UnicodeGLib.h 2010-05-17 22:33:16.000000000 +0200
+@@ -34,7 +34,12 @@
+ #include <stdlib.h>
+ #include <string.h>
+
+-typedef uint16_t UChar;
++#if !defined(WIN32) && !defined(_WIN32) && !defined(__WINSCW__) \
++ && !(defined(__CC_ARM) || defined(__ARMCC__)) /* RVCT */
++ typedef unsigned short UChar;
++#else
++ typedef wchar_t UChar;
++#endif
+ typedef int32_t UChar32;
+
+ namespace WTF {
+--- WebCore/bindings/js/ScriptObject.cpp 2010-05-07 16:09:09.000000000 +0200
++++ WebCore/bindings/js/ScriptObject.cpp 2010-05-17 22:33:16.000000000 +0200
+@@ -136,6 +136,14 @@
+ return handleException(m_scriptState);
+ }
+
++bool ScriptObject::set(const char* name, unsigned long long value)
++{
++ JSLock lock(SilenceAssertionsOnly);
++ PutPropertySlot slot;
++ jsObject()->put(m_scriptState, Identifier(m_scriptState, name), jsNumber(m_scriptState, value), slot);
++ return handleException(m_scriptState);
++}
++
+ bool ScriptObject::set(const char* name, bool value)
+ {
+ JSLock lock(SilenceAssertionsOnly);
+--- WebCore/bindings/js/ScriptObject.h 2010-03-19 16:20:54.000000000 +0100
++++ WebCore/bindings/js/ScriptObject.h 2010-05-17 22:33:16.000000000 +0200
+@@ -59,6 +59,7 @@
+ bool set(const char* name, unsigned);
+ bool set(const char* name, unsigned long);
+ bool set(const char* name, bool);
++ bool set(const char* name, unsigned long long);
+
+ static ScriptObject createNew(ScriptState*);
+
+--- WebCore/dom/XMLTokenizerLibxml2.cpp 2010-05-07 16:09:09.000000000 +0200
++++ WebCore/dom/XMLTokenizerLibxml2.cpp 2010-05-17 22:33:16.000000000 +0200
+@@ -908,7 +908,7 @@
+ if (m_parserStopped)
+ return;
+
+-#if COMPILER(MSVC) || COMPILER(RVCT)
++#if OS(WINDOWS) || COMPILER(RVCT)
+ char m[1024];
+ vsnprintf(m, sizeof(m) - 1, message, args);
+ #else
+@@ -922,7 +922,7 @@
+ else
+ handleError(type, m, lineNumber(), columnNumber());
+
+-#if !COMPILER(MSVC) && !COMPILER(RVCT)
++#if !OS(WINDOWS) && !COMPILER(RVCT)
+ free(m);
+ #endif
+ }
+--- WebCore/platform/FileSystem.h 2010-05-07 16:09:09.000000000 +0200
++++ WebCore/platform/FileSystem.h 2010-05-17 22:33:16.000000000 +0200
+@@ -64,7 +64,7 @@
+ class CString;
+
+ // PlatformModule
+-#if OS(WINDOWS)
++#if OS(WINDOWS) && !PLATFORM(GTK)
+ typedef HMODULE PlatformModule;
+ #elif PLATFORM(QT)
+ #if defined(Q_WS_MAC)
+@@ -107,7 +107,7 @@
+ #if PLATFORM(QT)
+ typedef QFile* PlatformFileHandle;
+ const PlatformFileHandle invalidPlatformFileHandle = 0;
+-#elif OS(WINDOWS)
++#elif OS(WINDOWS) && !PLATFORM(GTK)
+ typedef HANDLE PlatformFileHandle;
+ // FIXME: -1 is INVALID_HANDLE_VALUE, defined in <winbase.h>. Chromium tries to
+ // avoid using Windows headers in headers. We'd rather move this into the .cpp.
+@@ -142,7 +142,7 @@
+ // Methods for dealing with loadable modules
+ bool unloadModule(PlatformModule);
+
+-#if PLATFORM(WIN)
++#if PLATFORM(WIN) && !PLATFORM(GTK)
+ String localUserSpecificStorageDirectory();
+ String roamingUserSpecificStorageDirectory();
+
+--- WebCore/platform/gtk/GeolocationServiceGtk.cpp 2010-05-07 16:09:09.000000000 +0200
++++ WebCore/platform/gtk/GeolocationServiceGtk.cpp 2010-05-17 22:33:16.000000000 +0200
+@@ -18,6 +18,11 @@
+ */
+
+ #include "config.h"
++
++#ifdef interface
++#undef interface
++#endif
++
+ #include "GeolocationServiceGtk.h"
+
+ #include "CString.h"
+--- WebCore/platform/gtk/GeolocationServiceGtk.h 2010-03-19 16:20:54.000000000 +0100
++++ WebCore/platform/gtk/GeolocationServiceGtk.h 2010-05-17 22:33:16.000000000 +0200
+@@ -25,6 +25,10 @@
+ #include "PositionError.h"
+ #include "RefPtr.h"
+
++#ifdef interface
++#undef interface
++#endif
++
+ #include <geoclue/geoclue-master.h>
+ #include <geoclue/geoclue-position.h>
+
+--- WebCore/platform/KURL.cpp 2010-05-07 16:09:09.000000000 +0200
++++ WebCore/platform/KURL.cpp 2010-05-17 22:33:16.000000000 +0200
+@@ -1425,7 +1425,7 @@
+ #elif USE(GLIB_UNICODE)
+ GOwnPtr<gchar> utf8Hostname;
+ GOwnPtr<GError> utf8Err;
+- utf8Hostname.set(g_utf16_to_utf8(str, strLen, 0, 0, &utf8Err.outPtr()));
++ utf8Hostname.set(g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(str), strLen, 0, 0, &utf8Err.outPtr()));
+ if (utf8Err)
+ return;
+
+--- WebCore/platform/network/soup/ResourceHandleSoup.cpp (revision 60658)
++++ WebCore/platform/network/soup/ResourceHandleSoup.cpp (working copy)
+@@ -856,7 +856,11 @@
+ return;
+ }
+
++#if OS(WINDOWS)
++ response.setMimeType(g_content_type_get_mime_type(g_file_info_get_content_type(info)));
++#else
+ response.setMimeType(g_file_info_get_content_type(info));
++#endif
+ response.setExpectedContentLength(g_file_info_get_size(info));
+
+ GTimeVal tv;
+--- WebCore/platform/text/gtk/TextBreakIteratorGtk.cpp 2010-03-19 16:20:54.000000000 +0100
++++ WebCore/platform/text/gtk/TextBreakIteratorGtk.cpp 2010-05-17 22:33:16.000000000 +0200
+@@ -59,7 +59,7 @@
+
+ long utf8len;
+ GOwnPtr<char> utf8;
+- utf8.set(g_utf16_to_utf8(string, length, 0, &utf8len, 0));
++ utf8.set(g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(string), length, 0, &utf8len, 0));
+
+ // FIXME: assumes no surrogate pairs
+
+--- WebCore/platform/text/TextEncoding.cpp 2010-05-07 16:09:09.000000000 +0200
++++ WebCore/platform/text/TextEncoding.cpp 2010-05-17 22:33:16.000000000 +0200
+@@ -119,14 +119,14 @@
+ return newTextCodec(*this)->encode(reinterpret_cast<const UChar *>(str.utf16()), str.length(), handling);
+ #elif USE(GLIB_UNICODE)
+ GOwnPtr<char> UTF8Source;
+- UTF8Source.set(g_utf16_to_utf8(characters, length, 0, 0, 0));
++ UTF8Source.set(g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(characters), length, 0, 0, 0));
+
+ GOwnPtr<char> UTF8Normalized;
+ UTF8Normalized.set(g_utf8_normalize(UTF8Source.get(), -1, G_NORMALIZE_NFC));
+
+ long UTF16Length;
+ GOwnPtr<UChar> UTF16Normalized;
+- UTF16Normalized.set(g_utf8_to_utf16(UTF8Normalized.get(), -1, 0, &UTF16Length, 0));
++ UTF16Normalized.set(reinterpret_cast<UChar*>(g_utf8_to_utf16(UTF8Normalized.get(), -1, 0, &UTF16Length, 0)));
+
+ return newTextCodec(*this)->encode(UTF16Normalized.get(), UTF16Length, handling);
+ #elif OS(WINCE)
+--- WebCore/plugins/gtk/PluginViewGtk.cpp 2010-05-07 16:09:09.000000000 +0200
++++ WebCore/plugins/gtk/PluginViewGtk.cpp 2010-05-17 22:33:16.000000000 +0200
+@@ -45,6 +45,7 @@
+ #include "Image.h"
+ #include "KeyboardEvent.h"
+ #include "MouseEvent.h"
++#include "NotImplemented.h"
+ #include "Page.h"
+ #include "PlatformKeyboardEvent.h"
+ #include "PlatformMouseEvent.h"
+@@ -71,7 +72,7 @@
+ #include <cairo/cairo-xlib.h>
+ #include <gdk/gdkx.h>
+ #elif defined(GDK_WINDOWING_WIN32)
+-#include "PluginMessageThrottlerWin.h"
++#include "win/PluginMessageThrottlerWin.h"
+ #include <gdk/gdkwin32.h>
+ #endif
+
+@@ -706,6 +707,7 @@
+ gtk_widget_queue_draw(m_parentFrame->view()->hostWindow()->platformPageClient());
+ }
+
++#ifndef GDK_WINDOWING_WIN32
+ static Display* getPluginDisplay()
+ {
+ // The plugin toolkit might have a different X connection open. Since we're
+@@ -719,6 +721,7 @@
+ return 0;
+ #endif
+ }
++#endif
+
+ #if defined(XP_UNIX)
+ static void getVisualAndColormap(int depth, Visual** visual, Colormap* colormap)
+@@ -788,15 +791,16 @@
+ PluginView::setCurrentPluginView(this);
+ JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
+ setCallingPlugin(true);
++#if defined(XP_UNIX)
+ m_plugin->pluginFuncs()->getvalue(m_instance, NPPVpluginNeedsXEmbed, &m_needsXEmbed);
++#endif
+ setCallingPlugin(false);
+ PluginView::setCurrentPluginView(0);
+ }
+
+ if (m_isWindowed) {
+-#if defined(XP_UNIX)
+ GtkWidget* pageClient = m_parentFrame->view()->hostWindow()->platformPageClient();
+-
++#if defined(XP_UNIX)
+ if (m_needsXEmbed) {
+ // If our parent is not anchored the startup process will
+ // fail miserably for XEmbed plugins a bit later on when
+@@ -817,7 +821,9 @@
+ #endif
+ } else {
+ setPlatformWidget(0);
++#if defined(XP_UNIX)
+ m_pluginDisplay = getPluginDisplay();
++#endif
+ }
+
+ show();
+--- WebCore/plugins/PluginView.cpp 2010-05-07 16:09:09.000000000 +0200
++++ WebCore/plugins/PluginView.cpp 2010-05-17 22:33:16.000000000 +0200
+@@ -68,7 +68,7 @@
+ #include <wtf/ASCIICType.h>
+
+ #if OS(WINDOWS) && ENABLE(NETSCAPE_PLUGIN_API)
+-#include "PluginMessageThrottlerWin.h"
++#include "win/PluginMessageThrottlerWin.h"
+ #endif
+
+ using JSC::ExecState;
+@@ -333,7 +333,7 @@
+ JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
+
+ #if ENABLE(NETSCAPE_PLUGIN_API)
+-#ifdef XP_WIN
++#if defined(XP_WIN) && !PLATFORM(GTK)
+ // Unsubclass the window
+ if (m_isWindowed) {
+ #if OS(WINCE)
+--- WebCore/plugins/PluginView.h 2010-05-07 16:09:09.000000000 +0200
++++ WebCore/plugins/PluginView.h 2010-05-17 22:33:16.000000000 +0200
+@@ -313,7 +313,7 @@
+ bool m_haveInitialized;
+ bool m_isWaitingToStart;
+
+-#if defined(XP_UNIX)
++#if defined(XP_UNIX) || PLATFORM(GTK)
+ bool m_needsXEmbed;
+ #endif
+
+@@ -341,7 +341,7 @@
+
+ private:
+
+-#if defined(XP_UNIX) || OS(SYMBIAN)
++#if defined(XP_UNIX) || OS(SYMBIAN) || PLATFORM(GTK)
+ void setNPWindowIfNeeded();
+ #elif defined(XP_MACOSX)
+ NP_CGContext m_npCgContext;
+--- WebCore/plugins/win/PluginDatabaseWin.cpp 2010-03-19 16:20:54.000000000 +0100
++++ WebCore/plugins/win/PluginDatabaseWin.cpp 2010-05-17 22:33:16.000000000 +0200
+@@ -34,7 +34,7 @@
+ #include <windows.h>
+ #include <shlwapi.h>
+
+-#if COMPILER(MINGW)
++#if COMPILER(MINGW) && !COMPILER(MINGW64)
+ #define _countof(x) (sizeof(x)/sizeof(x[0]))
+ #endif
+
+@@ -104,7 +104,7 @@
+ DWORD pathStrSize = sizeof(pathStr);
+ DWORD type;
+
+- result = SHGetValue(key, name, TEXT("Path"), &type, (LPBYTE)pathStr, &pathStrSize);
++ result = SHGetValueW(key, name, L"Path", &type, (LPBYTE)pathStr, &pathStrSize);
+ if (result != ERROR_SUCCESS || type != REG_SZ)
+ continue;
+
+@@ -212,7 +212,7 @@
+ HKEY key;
+ LONG result;
+
+- result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT("Software\\Mozilla"), 0, KEY_READ, &key);
++ result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Mozilla", 0, KEY_READ, &key);
+ if (result == ERROR_SUCCESS) {
+ WCHAR name[128];
+ FILETIME lastModified;
+@@ -229,7 +229,7 @@
+ HKEY extensionsKey;
+
+ // Try opening the key
+- result = RegOpenKeyEx(key, extensionsPath.charactersWithNullTermination(), 0, KEY_READ, &extensionsKey);
++ result = RegOpenKeyExW(key, extensionsPath.charactersWithNullTermination(), 0, KEY_READ, &extensionsKey);
+
+ if (result == ERROR_SUCCESS) {
+ // Now get the plugins directory
+@@ -237,7 +237,7 @@
+ DWORD pluginsDirectorySize = sizeof(pluginsDirectoryStr);
+ DWORD type;
+
+- result = RegQueryValueEx(extensionsKey, TEXT("Plugins"), 0, &type, (LPBYTE)&pluginsDirectoryStr, &pluginsDirectorySize);
++ result = RegQueryValueExW(extensionsKey, L"Plugins", 0, &type, (LPBYTE)&pluginsDirectoryStr, &pluginsDirectorySize);
+
+ if (result == ERROR_SUCCESS && type == REG_SZ)
+ directories.append(String(pluginsDirectoryStr, pluginsDirectorySize / sizeof(WCHAR) - 1));
+@@ -255,7 +255,7 @@
+ #if !OS(WINCE)
+ // The new WMP Firefox plugin is installed in \PFiles\Plugins if it can't find any Firefox installs
+ WCHAR pluginDirectoryStr[_MAX_PATH + 1];
+- DWORD pluginDirectorySize = ::ExpandEnvironmentStringsW(TEXT("%SYSTEMDRIVE%\\PFiles\\Plugins"), pluginDirectoryStr, _countof(pluginDirectoryStr));
++ DWORD pluginDirectorySize = ::ExpandEnvironmentStringsW(L"%SYSTEMDRIVE%\\PFiles\\Plugins", pluginDirectoryStr, _countof(pluginDirectoryStr));
+
+ if (pluginDirectorySize > 0 && pluginDirectorySize <= _countof(pluginDirectoryStr))
+ directories.append(String(pluginDirectoryStr, pluginDirectorySize - 1));
+@@ -265,7 +265,7 @@
+ WCHAR installationDirectoryStr[_MAX_PATH];
+ DWORD installationDirectorySize = sizeof(installationDirectoryStr);
+
+- HRESULT result = SHGetValue(HKEY_LOCAL_MACHINE, TEXT("Software\\Microsoft\\MediaPlayer"), TEXT("Installation Directory"), &type, (LPBYTE)&installationDirectoryStr, &installationDirectorySize);
++ HRESULT result = SHGetValueW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\MediaPlayer", L"Installation Directory", &type, (LPBYTE)&installationDirectoryStr, &installationDirectorySize);
+
+ if (result == ERROR_SUCCESS && type == REG_SZ)
+ directories.append(String(installationDirectoryStr, installationDirectorySize / sizeof(WCHAR) - 1));
+@@ -277,7 +277,7 @@
+ WCHAR installationDirectoryStr[_MAX_PATH];
+ DWORD installationDirectorySize = sizeof(installationDirectoryStr);
+
+- HRESULT result = SHGetValue(HKEY_LOCAL_MACHINE, TEXT("Software\\Apple Computer, Inc.\\QuickTime"), TEXT("InstallDir"), &type, (LPBYTE)&installationDirectoryStr, &installationDirectorySize);
++ HRESULT result = SHGetValueW(HKEY_LOCAL_MACHINE, L"Software\\Apple Computer, Inc.\\QuickTime", L"InstallDir", &type, (LPBYTE)&installationDirectoryStr, &installationDirectorySize);
+
+ if (result == ERROR_SUCCESS && type == REG_SZ) {
+ String pluginDir = String(installationDirectoryStr, installationDirectorySize / sizeof(WCHAR) - 1) + "\\plugins";
+@@ -288,7 +288,7 @@
+ static inline void addAdobeAcrobatPluginDirectory(Vector<String>& directories)
+ {
+ HKEY key;
+- HRESULT result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT("Software\\Adobe\\Acrobat Reader"), 0, KEY_READ, &key);
++ HRESULT result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Adobe\\Acrobat Reader", 0, KEY_READ, &key);
+ if (result != ERROR_SUCCESS)
+ return;
+
+@@ -319,7 +319,7 @@
+ DWORD acrobatInstallPathSize = sizeof(acrobatInstallPathStr);
+
+ String acrobatPluginKeyPath = "Software\\Adobe\\Acrobat Reader\\" + latestAcrobatVersionString + "\\InstallPath";
+- result = SHGetValue(HKEY_LOCAL_MACHINE, acrobatPluginKeyPath.charactersWithNullTermination(), 0, &type, (LPBYTE)acrobatInstallPathStr, &acrobatInstallPathSize);
++ result = SHGetValueW(HKEY_LOCAL_MACHINE, acrobatPluginKeyPath.charactersWithNullTermination(), 0, &type, (LPBYTE)acrobatInstallPathStr, &acrobatInstallPathSize);
+
+ if (result == ERROR_SUCCESS) {
+ String acrobatPluginDirectory = String(acrobatInstallPathStr, acrobatInstallPathSize / sizeof(WCHAR) - 1) + "\\browser";
+@@ -339,12 +339,12 @@
+ if (!cachedPluginDirectory) {
+ cachedPluginDirectory = true;
+
+- int moduleFileNameLen = GetModuleFileName(0, moduleFileNameStr, _MAX_PATH);
++ int moduleFileNameLen = GetModuleFileNameW(0, moduleFileNameStr, _MAX_PATH);
+
+ if (!moduleFileNameLen || moduleFileNameLen == _MAX_PATH)
+ goto exit;
+
+- if (!PathRemoveFileSpec(moduleFileNameStr))
++ if (!PathRemoveFileSpecW(moduleFileNameStr))
+ goto exit;
+
+ pluginsDirectory = String(moduleFileNameStr) + "\\Plugins";
+@@ -358,15 +358,15 @@
+ #if !OS(WINCE)
+ WCHAR systemDirectoryStr[MAX_PATH];
+
+- if (GetSystemDirectory(systemDirectoryStr, _countof(systemDirectoryStr)) == 0)
++ if (GetSystemDirectoryW(systemDirectoryStr, _countof(systemDirectoryStr)) == 0)
+ return;
+
+ WCHAR macromediaDirectoryStr[MAX_PATH];
+
+- PathCombine(macromediaDirectoryStr, systemDirectoryStr, TEXT("macromed\\Flash"));
++ PathCombineW(macromediaDirectoryStr, systemDirectoryStr, L"macromed\\Flash");
+ directories.append(macromediaDirectoryStr);
+
+- PathCombine(macromediaDirectoryStr, systemDirectoryStr, TEXT("macromed\\Shockwave 10"));
++ PathCombineW(macromediaDirectoryStr, systemDirectoryStr, L"macromed\\Shockwave 10");
+ directories.append(macromediaDirectoryStr);
+ #endif
+ }
+--- WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp 2010-05-07 16:09:09.000000000 +0200
++++ WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp 2010-05-17 22:33:16.000000000 +0200
+@@ -660,7 +660,7 @@
+ if (!dicts)
+ return;
+
+- gchar* ctext = g_utf16_to_utf8(const_cast<gunichar2*>(text), length, 0, 0, 0);
++ gchar* ctext = g_utf16_to_utf8(const_cast<gunichar2*>(reinterpret_cast<const gunichar2*>(text)), length, 0, 0, 0);
+ int utflen = g_utf8_strlen(ctext, -1);
+
+ PangoLanguage* language = pango_language_get_default();
+--- WebCore/platform/Arena.h 2010-05-18 18:02:56.000000000 +0200
++++ WebCore/platform/Arena.h 2010-05-18 18:03:33.000000000 +0200
+@@ -44,7 +44,7 @@
+
+ namespace WebCore {
+
+-typedef unsigned long uword;
++typedef uintptr_t uword;
+
+ struct Arena {
+ Arena* next; // next arena
+--- WebCore/platform/text/TextStream.cpp 2010-05-07 16:09:09.000000000 +0200
++++ WebCore/platform/text/TextStream.cpp 2010-05-18 23:12:39.000000000 +0200
+@@ -90,7 +90,7 @@
+ return *this;
+ }
+
+-TextStream& TextStream::operator<<(void* p)
++TextStream& TextStream::operator<<(const void* p)
+ {
+ char buffer[printBufferSize];
+ snprintf(buffer, sizeof(buffer) - 1, "%p", p);
+@@ -108,7 +108,7 @@
+ return String::adopt(m_text);
+ }
+
+-#if OS(WINDOWS) && PLATFORM(X86_64) && COMPILER(MSVC)
++#if OS(WINDOWS) && CPU(X86_64)
+ TextStream& TextStream::operator<<(__int64 i)
+ {
+ char buffer[printBufferSize];
+--- WebCore/platform/text/TextStream.h 2010-05-07 16:09:09.000000000 +0200
++++ WebCore/platform/text/TextStream.h 2010-05-18 23:12:39.000000000 +0200
+@@ -43,9 +43,9 @@
+ TextStream& operator<<(float);
+ TextStream& operator<<(double);
+ TextStream& operator<<(const char*);
+- TextStream& operator<<(void*);
++ TextStream& operator<<(const void*);
+ TextStream& operator<<(const String&);
+-#if OS(WINDOWS) && PLATFORM(X86_64) && COMPILER(MSVC)
++#if OS(WINDOWS) && CPU(X86_64)
+ TextStream& operator<<(unsigned __int64);
+ TextStream& operator<<(__int64);
+ #endif
diff --git a/webkit-1.2.7-nosvg.patch b/webkit-1.2.7-nosvg.patch
new file mode 100755
index 0000000..d634966
--- /dev/null
+++ b/webkit-1.2.7-nosvg.patch
@@ -0,0 +1,10 @@
+--- WebCore/bindings/js/JSNodeCustom.cpp.ori Sun Jan 23 11:38:08 2011
++++ WebCore/bindings/js/JSNodeCustom.cpp Sun Jan 23 11:37:57 2011
+@@ -34,6 +34,7 @@
+ #include "DocumentType.h"
+ #include "Entity.h"
+ #include "EntityReference.h"
++#include "ExceptionCode.h"
+ #include "HTMLElement.h"
+ #include "JSAttr.h"
+ #include "JSCDATASection.h"
diff --git a/webkitenumtypes.cpp b/webkitenumtypes.cpp
new file mode 100755
index 0000000..62268c8
--- /dev/null
+++ b/webkitenumtypes.cpp
@@ -0,0 +1,248 @@
+
+/* Generated data (by glib-mkenums) */
+
+#include <config.h>
+#include <glib-object.h>
+#include "./WebKit/gtk/webkit/webkitenumtypes.h"
+
+extern "C" {
+
+
+/* enumerations from "./WebKit/gtk/webkit/webkitdownload.h" */
+static const GEnumValue _webkit_download_status_values[] = {
+ { WEBKIT_DOWNLOAD_STATUS_ERROR, "WEBKIT_DOWNLOAD_STATUS_ERROR", "error" },
+ { WEBKIT_DOWNLOAD_STATUS_CREATED, "WEBKIT_DOWNLOAD_STATUS_CREATED", "created" },
+ { WEBKIT_DOWNLOAD_STATUS_STARTED, "WEBKIT_DOWNLOAD_STATUS_STARTED", "started" },
+ { WEBKIT_DOWNLOAD_STATUS_CANCELLED, "WEBKIT_DOWNLOAD_STATUS_CANCELLED", "cancelled" },
+ { WEBKIT_DOWNLOAD_STATUS_FINISHED, "WEBKIT_DOWNLOAD_STATUS_FINISHED", "finished" },
+ { 0, NULL, NULL }
+};
+
+GType webkit_download_status_get_type(void)
+{
+ static GType type = 0;
+
+ if (!type)
+ type = g_enum_register_static("WebKitDownloadStatus", _webkit_download_status_values);
+
+ return type;
+}
+
+static const GEnumValue _webkit_download_error_values[] = {
+ { WEBKIT_DOWNLOAD_ERROR_CANCELLED_BY_USER, "WEBKIT_DOWNLOAD_ERROR_CANCELLED_BY_USER", "cancelled-by-user" },
+ { WEBKIT_DOWNLOAD_ERROR_DESTINATION, "WEBKIT_DOWNLOAD_ERROR_DESTINATION", "destination" },
+ { WEBKIT_DOWNLOAD_ERROR_NETWORK, "WEBKIT_DOWNLOAD_ERROR_NETWORK", "network" },
+ { 0, NULL, NULL }
+};
+
+GType webkit_download_error_get_type(void)
+{
+ static GType type = 0;
+
+ if (!type)
+ type = g_enum_register_static("WebKitDownloadError", _webkit_download_error_values);
+
+ return type;
+}
+
+
+/* enumerations from "./WebKit/gtk/webkit/webkiterror.h" */
+static const GEnumValue _webkit_network_error_values[] = {
+ { WEBKIT_NETWORK_ERROR_FAILED, "WEBKIT_NETWORK_ERROR_FAILED", "failed" },
+ { WEBKIT_NETWORK_ERROR_TRANSPORT, "WEBKIT_NETWORK_ERROR_TRANSPORT", "transport" },
+ { WEBKIT_NETWORK_ERROR_UNKNOWN_PROTOCOL, "WEBKIT_NETWORK_ERROR_UNKNOWN_PROTOCOL", "unknown-protocol" },
+ { WEBKIT_NETWORK_ERROR_CANCELLED, "WEBKIT_NETWORK_ERROR_CANCELLED", "cancelled" },
+ { WEBKIT_NETWORK_ERROR_FILE_DOES_NOT_EXIST, "WEBKIT_NETWORK_ERROR_FILE_DOES_NOT_EXIST", "file-does-not-exist" },
+ { 0, NULL, NULL }
+};
+
+GType webkit_network_error_get_type(void)
+{
+ static GType type = 0;
+
+ if (!type)
+ type = g_enum_register_static("WebKitNetworkError", _webkit_network_error_values);
+
+ return type;
+}
+
+static const GEnumValue _webkit_policy_error_values[] = {
+ { WEBKIT_POLICY_ERROR_FAILED, "WEBKIT_POLICY_ERROR_FAILED", "failed" },
+ { WEBKIT_POLICY_ERROR_CANNOT_SHOW_MIME_TYPE, "WEBKIT_POLICY_ERROR_CANNOT_SHOW_MIME_TYPE", "cannot-show-mime-type" },
+ { WEBKIT_POLICY_ERROR_CANNOT_SHOW_URL, "WEBKIT_POLICY_ERROR_CANNOT_SHOW_URL", "cannot-show-url" },
+ { WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE, "WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE", "frame-load-interrupted-by-policy-change" },
+ { WEBKIT_POLICY_ERROR_CANNOT_USE_RESTRICTED_PORT, "WEBKIT_POLICY_ERROR_CANNOT_USE_RESTRICTED_PORT", "cannot-use-restricted-port" },
+ { 0, NULL, NULL }
+};
+
+GType webkit_policy_error_get_type(void)
+{
+ static GType type = 0;
+
+ if (!type)
+ type = g_enum_register_static("WebKitPolicyError", _webkit_policy_error_values);
+
+ return type;
+}
+
+static const GEnumValue _webkit_plugin_error_values[] = {
+ { WEBKIT_PLUGIN_ERROR_FAILED, "WEBKIT_PLUGIN_ERROR_FAILED", "failed" },
+ { WEBKIT_PLUGIN_ERROR_CANNOT_FIND_PLUGIN, "WEBKIT_PLUGIN_ERROR_CANNOT_FIND_PLUGIN", "cannot-find-plugin" },
+ { WEBKIT_PLUGIN_ERROR_CANNOT_LOAD_PLUGIN, "WEBKIT_PLUGIN_ERROR_CANNOT_LOAD_PLUGIN", "cannot-load-plugin" },
+ { WEBKIT_PLUGIN_ERROR_JAVA_UNAVAILABLE, "WEBKIT_PLUGIN_ERROR_JAVA_UNAVAILABLE", "java-unavailable" },
+ { WEBKIT_PLUGIN_ERROR_CONNECTION_CANCELLED, "WEBKIT_PLUGIN_ERROR_CONNECTION_CANCELLED", "connection-cancelled" },
+ { WEBKIT_PLUGIN_ERROR_WILL_HANDLE_LOAD, "WEBKIT_PLUGIN_ERROR_WILL_HANDLE_LOAD", "will-handle-load" },
+ { 0, NULL, NULL }
+};
+
+GType webkit_plugin_error_get_type(void)
+{
+ static GType type = 0;
+
+ if (!type)
+ type = g_enum_register_static("WebKitPluginError", _webkit_plugin_error_values);
+
+ return type;
+}
+
+
+/* enumerations from "./WebKit/gtk/webkit/webkithittestresult.h" */
+static const GFlagsValue _webkit_hit_test_result_context_values[] = {
+ { WEBKIT_HIT_TEST_RESULT_CONTEXT_DOCUMENT, "WEBKIT_HIT_TEST_RESULT_CONTEXT_DOCUMENT", "document" },
+ { WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK, "WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK", "link" },
+ { WEBKIT_HIT_TEST_RESULT_CONTEXT_IMAGE, "WEBKIT_HIT_TEST_RESULT_CONTEXT_IMAGE", "image" },
+ { WEBKIT_HIT_TEST_RESULT_CONTEXT_MEDIA, "WEBKIT_HIT_TEST_RESULT_CONTEXT_MEDIA", "media" },
+ { WEBKIT_HIT_TEST_RESULT_CONTEXT_SELECTION, "WEBKIT_HIT_TEST_RESULT_CONTEXT_SELECTION", "selection" },
+ { WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE, "WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE", "editable" },
+ { 0, NULL, NULL }
+};
+
+GType webkit_hit_test_result_context_get_type(void)
+{
+ static GType type = 0;
+
+ if (!type)
+ type = g_flags_register_static("WebKitHitTestResultContext", _webkit_hit_test_result_context_values);
+
+ return type;
+}
+
+
+/* enumerations from "./WebKit/gtk/webkit/webkitwebframe.h" */
+static const GEnumValue _webkit_load_status_values[] = {
+ { WEBKIT_LOAD_PROVISIONAL, "WEBKIT_LOAD_PROVISIONAL", "provisional" },
+ { WEBKIT_LOAD_COMMITTED, "WEBKIT_LOAD_COMMITTED", "committed" },
+ { WEBKIT_LOAD_FINISHED, "WEBKIT_LOAD_FINISHED", "finished" },
+ { WEBKIT_LOAD_FIRST_VISUALLY_NON_EMPTY_LAYOUT, "WEBKIT_LOAD_FIRST_VISUALLY_NON_EMPTY_LAYOUT", "first-visually-non-empty-layout" },
+ { WEBKIT_LOAD_FAILED, "WEBKIT_LOAD_FAILED", "failed" },
+ { 0, NULL, NULL }
+};
+
+GType webkit_load_status_get_type(void)
+{
+ static GType type = 0;
+
+ if (!type)
+ type = g_enum_register_static("WebKitLoadStatus", _webkit_load_status_values);
+
+ return type;
+}
+
+
+/* enumerations from "./WebKit/gtk/webkit/webkitwebnavigationaction.h" */
+static const GEnumValue _webkit_web_navigation_reason_values[] = {
+ { WEBKIT_WEB_NAVIGATION_REASON_LINK_CLICKED, "WEBKIT_WEB_NAVIGATION_REASON_LINK_CLICKED", "link-clicked" },
+ { WEBKIT_WEB_NAVIGATION_REASON_FORM_SUBMITTED, "WEBKIT_WEB_NAVIGATION_REASON_FORM_SUBMITTED", "form-submitted" },
+ { WEBKIT_WEB_NAVIGATION_REASON_BACK_FORWARD, "WEBKIT_WEB_NAVIGATION_REASON_BACK_FORWARD", "back-forward" },
+ { WEBKIT_WEB_NAVIGATION_REASON_RELOAD, "WEBKIT_WEB_NAVIGATION_REASON_RELOAD", "reload" },
+ { WEBKIT_WEB_NAVIGATION_REASON_FORM_RESUBMITTED, "WEBKIT_WEB_NAVIGATION_REASON_FORM_RESUBMITTED", "form-resubmitted" },
+ { WEBKIT_WEB_NAVIGATION_REASON_OTHER, "WEBKIT_WEB_NAVIGATION_REASON_OTHER", "other" },
+ { 0, NULL, NULL }
+};
+
+GType webkit_web_navigation_reason_get_type(void)
+{
+ static GType type = 0;
+
+ if (!type)
+ type = g_enum_register_static("WebKitWebNavigationReason", _webkit_web_navigation_reason_values);
+
+ return type;
+}
+
+
+/* enumerations from "./WebKit/gtk/webkit/webkitwebsettings.h" */
+static const GEnumValue _webkit_editing_behavior_values[] = {
+ { WEBKIT_EDITING_BEHAVIOR_MAC, "WEBKIT_EDITING_BEHAVIOR_MAC", "mac" },
+ { WEBKIT_EDITING_BEHAVIOR_WINDOWS, "WEBKIT_EDITING_BEHAVIOR_WINDOWS", "windows" },
+ { 0, NULL, NULL }
+};
+
+GType webkit_editing_behavior_get_type(void)
+{
+ static GType type = 0;
+
+ if (!type)
+ type = g_enum_register_static("WebKitEditingBehavior", _webkit_editing_behavior_values);
+
+ return type;
+}
+
+
+/* enumerations from "./WebKit/gtk/webkit/webkitwebview.h" */
+static const GEnumValue _webkit_navigation_response_values[] = {
+ { WEBKIT_NAVIGATION_RESPONSE_ACCEPT, "WEBKIT_NAVIGATION_RESPONSE_ACCEPT", "accept" },
+ { WEBKIT_NAVIGATION_RESPONSE_IGNORE, "WEBKIT_NAVIGATION_RESPONSE_IGNORE", "ignore" },
+ { WEBKIT_NAVIGATION_RESPONSE_DOWNLOAD, "WEBKIT_NAVIGATION_RESPONSE_DOWNLOAD", "download" },
+ { 0, NULL, NULL }
+};
+
+GType webkit_navigation_response_get_type(void)
+{
+ static GType type = 0;
+
+ if (!type)
+ type = g_enum_register_static("WebKitNavigationResponse", _webkit_navigation_response_values);
+
+ return type;
+}
+
+static const GEnumValue _webkit_cache_model_values[] = {
+ { WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER, "WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER", "document-viewer" },
+ { WEBKIT_CACHE_MODEL_WEB_BROWSER, "WEBKIT_CACHE_MODEL_WEB_BROWSER", "web-browser" },
+ { 0, NULL, NULL }
+};
+
+GType webkit_cache_model_get_type(void)
+{
+ static GType type = 0;
+
+ if (!type)
+ type = g_enum_register_static("WebKitCacheModel", _webkit_cache_model_values);
+
+ return type;
+}
+
+static const GEnumValue _webkit_web_view_target_info_values[] = {
+ { WEBKIT_WEB_VIEW_TARGET_INFO_HTML, "WEBKIT_WEB_VIEW_TARGET_INFO_HTML", "html" },
+ { WEBKIT_WEB_VIEW_TARGET_INFO_TEXT, "WEBKIT_WEB_VIEW_TARGET_INFO_TEXT", "text" },
+ { WEBKIT_WEB_VIEW_TARGET_INFO_IMAGE, "WEBKIT_WEB_VIEW_TARGET_INFO_IMAGE", "image" },
+ { WEBKIT_WEB_VIEW_TARGET_INFO_URI_LIST, "WEBKIT_WEB_VIEW_TARGET_INFO_URI_LIST", "uri-list" },
+ { WEBKIT_WEB_VIEW_TARGET_INFO_NETSCAPE_URL, "WEBKIT_WEB_VIEW_TARGET_INFO_NETSCAPE_URL", "netscape-url" },
+ { 0, NULL, NULL }
+};
+
+GType webkit_web_view_target_info_get_type(void)
+{
+ static GType type = 0;
+
+ if (!type)
+ type = g_enum_register_static("WebKitWebViewTargetInfo", _webkit_web_view_target_info_values);
+
+ return type;
+}
+
+}
+
+/* Generated data ends here */
+
diff --git a/webkitenumtypes.h b/webkitenumtypes.h
new file mode 100755
index 0000000..5d40777
--- /dev/null
+++ b/webkitenumtypes.h
@@ -0,0 +1,92 @@
+
+/* Generated data (by glib-mkenums) */
+
+#ifndef WEBKIT_ENUM_TYPES_H
+#define WEBKIT_ENUM_TYPES_H
+
+#include <glib-object.h>
+
+#include <webkit/webkitdefines.h>
+
+G_BEGIN_DECLS
+
+#include <webkit/webkitdownload.h>
+
+#define WEBKIT_TYPE_DOWNLOAD_STATUS webkit_download_status_get_type()
+
+WEBKIT_API GType
+webkit_download_status_get_type(void);
+
+#define WEBKIT_TYPE_DOWNLOAD_ERROR webkit_download_error_get_type()
+
+WEBKIT_API GType
+webkit_download_error_get_type(void);
+
+#include <webkit/webkiterror.h>
+
+#define WEBKIT_TYPE_NETWORK_ERROR webkit_network_error_get_type()
+
+WEBKIT_API GType
+webkit_network_error_get_type(void);
+
+#define WEBKIT_TYPE_POLICY_ERROR webkit_policy_error_get_type()
+
+WEBKIT_API GType
+webkit_policy_error_get_type(void);
+
+#define WEBKIT_TYPE_PLUGIN_ERROR webkit_plugin_error_get_type()
+
+WEBKIT_API GType
+webkit_plugin_error_get_type(void);
+
+#include <webkit/webkithittestresult.h>
+
+#define WEBKIT_TYPE_HIT_TEST_RESULT_CONTEXT webkit_hit_test_result_context_get_type()
+
+WEBKIT_API GType
+webkit_hit_test_result_context_get_type(void);
+
+#include <webkit/webkitwebframe.h>
+
+#define WEBKIT_TYPE_LOAD_STATUS webkit_load_status_get_type()
+
+WEBKIT_API GType
+webkit_load_status_get_type(void);
+
+#include <webkit/webkitwebnavigationaction.h>
+
+#define WEBKIT_TYPE_WEB_NAVIGATION_REASON webkit_web_navigation_reason_get_type()
+
+WEBKIT_API GType
+webkit_web_navigation_reason_get_type(void);
+
+#include <webkit/webkitwebsettings.h>
+
+#define WEBKIT_TYPE_EDITING_BEHAVIOR webkit_editing_behavior_get_type()
+
+WEBKIT_API GType
+webkit_editing_behavior_get_type(void);
+
+#include <webkit/webkitwebview.h>
+
+#define WEBKIT_TYPE_NAVIGATION_RESPONSE webkit_navigation_response_get_type()
+
+WEBKIT_API GType
+webkit_navigation_response_get_type(void);
+
+#define WEBKIT_TYPE_CACHE_MODEL webkit_cache_model_get_type()
+
+WEBKIT_API GType
+webkit_cache_model_get_type(void);
+
+#define WEBKIT_TYPE_WEB_VIEW_TARGET_INFO webkit_web_view_target_info_get_type()
+
+WEBKIT_API GType
+webkit_web_view_target_info_get_type(void);
+
+G_END_DECLS
+
+#endif
+
+/* Generated data ends here */
+
commit e83b820bbbe215381e1db46a33b748498d17c6a1
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed Apr 6 16:02:58 2011 +0000
Windows build: fix logfile naming for tag builds
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20538 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_tags.sh b/build_tags.sh
index 7999963..f529fee 100644
--- a/build_tags.sh
+++ b/build_tags.sh
@@ -69,6 +69,11 @@ for tag_rev in $tags ; do
# No need to update the sources we just checked out
echo "UPDATE_SOURCES=no" >> ${w32pkg}/custom.sh
+
+ # But set the repos url to the current tag anyway, it will be used
+ # to name the log file
+ echo -n "REPOS_URL=" >> ${w32pkg}/custom.sh
+ echo "${TAG_URL}/${tag}" >> ${w32pkg}/custom.sh
# BUILD_FROM_TARBALL is special:
# in install.sh place we check !=yes, in defaults.sh =yes, in dist.sh =no
commit b999a040e6b9d626c3d1c95b032ffd34a48c086f
Author: Phil Longstaff <plongstaff at newearth.org>
Date: Tue Mar 29 01:17:00 2011 +0000
During win32 build, if a component is already installed, print the installation path
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20501 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
index 8a5fde1..2bfb70c 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -66,7 +66,7 @@ function inst_wget() {
add_to_env $_WGET_UDIR/bin PATH
if quiet $_WGET_UDIR/wget --version || quiet wget --version
then
- echo "already installed. skipping."
+ echo "already installed in $_WGET_UDIR/bin. skipping."
else
mkdir -p $_WGET_UDIR/bin
tar -xjpf $DOWNLOAD_UDIR/wget*.tar.bz2 -C $_WGET_UDIR
@@ -80,7 +80,7 @@ function inst_dtk() {
_MSYS_UDIR=`unix_path $MSYS_DIR`
if quiet ${_MSYS_UDIR}/bin/perl --help && [ check_m4_version_ok ]
then
- echo "msys dtk already installed. skipping."
+ echo "msys dtk already installed in ${_MSYS_UDIR}. skipping."
else
smart_wget $DTK_URL $DOWNLOAD_DIR
$LAST_FILE //SP- //SILENT //DIR="$MSYS_DIR"
@@ -117,7 +117,7 @@ function inst_mingw() {
if quiet test_for_mingw
then
- echo "mingw already installed."
+ echo "mingw already installed in $_MINGW_UDIR. skipping."
else
mkdir -p $_MINGW_UDIR
if [ "$CROSS_COMPILE" != "yes" ]; then
@@ -150,7 +150,7 @@ function inst_unzip() {
add_to_env $_UNZIP_UDIR/bin PATH
if quiet $_UNZIP_UDIR/bin/unzip --help || quiet unzip --help
then
- echo "unzip already installed. skipping."
+ echo "unzip already installed in $_UNZIP_UDIR. skipping."
else
smart_wget $UNZIP_URL $DOWNLOAD_DIR
$LAST_FILE //SP- //SILENT //DIR="$UNZIP_DIR"
@@ -167,7 +167,7 @@ function inst_regex() {
add_to_env $_REGEX_UDIR/bin PATH
if quiet ${LD} $REGEX_LDFLAGS -o $TMP_UDIR/ofile
then
- echo "regex already installed. skipping."
+ echo "regex already installed in $_REGEX_UDIR. skipping."
else
mkdir -p $_REGEX_UDIR
wget_unpacked $REGEX_URL $DOWNLOAD_DIR $REGEX_DIR
@@ -184,7 +184,7 @@ function inst_readline() {
add_to_env $_READLINE_UDIR/bin PATH
if quiet ${LD} $READLINE_LDFLAGS -lreadline -o $TMP_UDIR/ofile
then
- echo "readline already installed. skipping."
+ echo "readline already installed in $_READLINE_UDIR. skipping."
else
mkdir -p $_READLINE_UDIR
wget_unpacked $READLINE_BIN_URL $DOWNLOAD_DIR $READLINE_DIR
@@ -200,7 +200,7 @@ function inst_active_perl() {
set_env_or_die $_ACTIVE_PERL_WFSDIR/ActivePerl/Perl/bin/perl INTLTOOL_PERL
if quiet $INTLTOOL_PERL --help
then
- echo "ActivePerl already installed. skipping."
+ echo "ActivePerl already installed IN $_ACTIVE_PERL_UDIR. skipping."
else
wget_unpacked $ACTIVE_PERL_URL $DOWNLOAD_DIR $ACTIVE_PERL_DIR
qpushd $_ACTIVE_PERL_UDIR
@@ -219,7 +219,7 @@ function inst_autotools() {
add_to_env -L$_AUTOTOOLS_UDIR/lib AUTOTOOLS_LDFLAGS
if quiet autoconf --help && quiet automake --help
then
- echo "autoconf/automake already installed. skipping."
+ echo "autoconf/automake already installed in $_AUTOTOOLS_UDIR. skipping."
else
wget_unpacked $AUTOCONF_URL $DOWNLOAD_DIR $TMP_DIR
wget_unpacked $AUTOMAKE_URL $DOWNLOAD_DIR $TMP_DIR
@@ -268,7 +268,7 @@ function inst_gmp() {
add_to_env ${_GMP_UDIR}/bin PATH
if quiet ${LD} $GMP_LDFLAGS -lgmp -o $TMP_UDIR/ofile
then
- echo "Gmp already installed. skipping."
+ echo "Gmp already installed in ${_GMP_UDIR}. skipping."
else
wget_unpacked $GMP_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/gmp-*
@@ -296,7 +296,7 @@ function inst_guile() {
add_to_env $_GUILE_UDIR/bin PATH
if quiet guile -c '(use-modules (srfi srfi-39))'
then
- echo "guile already installed. skipping."
+ echo "guile and slib already installed in $_GUILE_UDIR. skipping."
else
smart_wget $GUILE_URL $DOWNLOAD_DIR
_GUILE_BALL=$LAST_FILE
@@ -370,7 +370,7 @@ function inst_svn() {
add_to_env $_SVN_UDIR/bin PATH
if quiet $_SVN_UDIR/bin/svn --version
then
- echo "subversion already installed. skipping."
+ echo "subversion already installed in $_SVN_UDIR. skipping."
else
wget_unpacked $SVN_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/svn-win32-*
@@ -396,7 +396,7 @@ function inst_openssl() {
fi
if quiet ${LD} -L$_OPENSSL_UDIR/lib -leay32 -lssl32 -o $TMP_UDIR/ofile ; then
- echo "openssl already installed. skipping."
+ echo "openssl already installed in $_OPENSSL_UDIR. skipping."
else
smart_wget $OPENSSL_URL $DOWNLOAD_DIR
echo -n "Extracting ${LAST_FILE##*/} ... "
@@ -440,7 +440,7 @@ function inst_mingwutils() {
add_to_env $_MINGW_UTILS_UDIR/bin PATH
if quiet which pexports && quiet which reimp
then
- echo "mingw-utils already installed. skipping."
+ echo "mingw-utils already installed in $_MINGW_UTILS_UDIR. skipping."
else
wget_unpacked $MINGW_UTILS_URL $DOWNLOAD_DIR $MINGW_UTILS_DIR
(quiet which pexports && quiet which reimp) || die "mingw-utils not installed correctly"
@@ -453,7 +453,7 @@ function inst_exetype() {
add_to_env $_EXETYPE_UDIR/bin PATH
if quiet which exetype
then
- echo "exetype already installed. skipping."
+ echo "exetype already installed in $_EXETYPE_UDIR. skipping."
else
mkdir -p $_EXETYPE_UDIR/bin
cp $EXETYPE_SCRIPT $_EXETYPE_UDIR/bin/exetype
@@ -468,7 +468,7 @@ function inst_libxslt() {
add_to_env $_LIBXSLT_UDIR/bin PATH
if quiet which xsltproc
then
- echo "libxslt already installed. skipping."
+ echo "libxslt already installed in $_LIBXSLT_UDIR. skipping."
else
[ "$CROSS_COMPILE" = "yes" ] && die "xsltproc unavailable"
wget_unpacked $LIBXSLT_URL $DOWNLOAD_DIR $LIBXSLT_DIR
@@ -512,7 +512,7 @@ function inst_gnome() {
quiet ${PKG_CONFIG} --atleast-version=${CAIRO_VERSION} cairo &&
quiet intltoolize --version
then
- echo "gnome packages installed. skipping."
+ echo "gnome packages installed in $_GNOME_UDIR. skipping."
else
mkdir -p $_GNOME_UDIR
wget_unpacked $LIBXML2_URL $DOWNLOAD_DIR $GNOME_DIR
@@ -641,7 +641,7 @@ function inst_isocodes() {
add_to_env $_ISOCODES_UDIR/share/pkgconfig PKG_CONFIG_PATH
if [ -f ${_ISOCODES_UDIR}/share/pkgconfig/iso-codes.pc ]
then
- echo "isocodes already installed. skipping."
+ echo "isocodes already installed in $_ISOCODES_UDIR. skipping."
else
wget_unpacked $ISOCODES_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/iso-codes-*
@@ -662,7 +662,7 @@ function inst_swig() {
add_to_env $_SWIG_UDIR PATH
if quiet swig -version
then
- echo "swig already installed. skipping."
+ echo "swig already installed in $_SWIG_UDIR. skipping."
else
wget_unpacked $SWIG_URL $DOWNLOAD_DIR $SWIG_DIR
qpushd $SWIG_DIR
@@ -684,7 +684,7 @@ function inst_pcre() {
add_to_env $_PCRE_UDIR/bin PATH
if quiet ${LD} $PCRE_LDFLAGS -lpcre -o $TMP_UDIR/ofile
then
- echo "pcre already installed. skipping."
+ echo "pcre already installed in $_PCRE_UDIR. skipping."
else
mkdir -p $_PCRE_UDIR
wget_unpacked $PCRE_BIN_URL $DOWNLOAD_DIR $PCRE_DIR
@@ -700,7 +700,7 @@ function inst_libbonoboui() {
add_to_env $_LIBBONOBOUI_UDIR/lib/pkgconfig PKG_CONFIG_PATH
if quiet ${PKG_CONFIG} --exists --atleast-version=2.24.2 libbonoboui-2.0 && [ -f $_LIBBONOBOUI_UDIR/bin/libbonoboui*.dll ]
then
- echo "libbonoboui already installed. skipping."
+ echo "libbonoboui already installed in $_LIBBONOBOUI_UDIR. skipping."
else
wget_unpacked $LIBBONOBOUI_SRC_URL $DOWNLOAD_DIR $TMP_DIR
mydir=`pwd`
@@ -738,7 +738,7 @@ function inst_libgsf() {
if quiet ${PKG_CONFIG} --exists libgsf-1 libgsf-gnome-1 &&
quiet ${PKG_CONFIG} --atleast-version=${LIBGSF_VERSION} libgsf-1
then
- echo "libgsf already installed. skipping."
+ echo "libgsf already installed in $_LIBGSF_UDIR. skipping."
else
rm -rf ${TMP_UDIR}/libgsf-*
wget_unpacked $LIBGSF_URL $DOWNLOAD_DIR $TMP_DIR
@@ -765,7 +765,7 @@ function inst_goffice() {
add_to_env $_GOFFICE_UDIR/lib/pkgconfig PKG_CONFIG_PATH
if quiet ${PKG_CONFIG} --atleast-version=${GOFFICE_VERSION} libgoffice-0.8
then
- echo "goffice already installed. skipping."
+ echo "goffice already installed in $_GOFFICE_UDIR. skipping."
else
wget_unpacked $GOFFICE_URL $DOWNLOAD_DIR $TMP_DIR
mydir=`pwd`
@@ -799,7 +799,7 @@ function inst_glade() {
add_to_env $_GLADE_UDIR/bin PATH
if quiet glade-3 --version
then
- echo "glade already installed. skipping."
+ echo "glade already installed in $_GLADE_UDIR. skipping."
else
wget_unpacked $GLADE_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/glade3-*
@@ -819,7 +819,7 @@ function inst_inno() {
add_to_env $_INNO_UDIR PATH
if quiet which iscc
then
- echo "Inno Setup Compiler already installed. skipping."
+ echo "Inno Setup Compiler already installed in $_INNO_UDIR. skipping."
else
smart_wget $INNO_URL $DOWNLOAD_DIR
$LAST_FILE //SP- //SILENT //DIR="$INNO_DIR"
@@ -849,7 +849,7 @@ function inst_hh() {
add_to_env $_HH_UDIR PATH
if quiet test_for_hh
then
- echo "html help workshop already installed. skipping."
+ echo "html help workshop already installed in $_HH_UDIR. skipping."
else
smart_wget $HH_URL $DOWNLOAD_DIR
echo "!!! When asked for an installation path, specify $HH_DIR !!!"
@@ -873,7 +873,7 @@ function inst_opensp() {
add_to_env ${_OPENSP_UDIR}/bin PATH
if test -f ${_OPENSP_UDIR}/bin/libosp-5.dll
then
- echo "OpenSP already installed. skipping."
+ echo "OpenSP already installed in $_OPENSP_UDIR. skipping."
else
wget_unpacked $OPENSP_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/OpenSP-*
@@ -905,7 +905,7 @@ function inst_libofx() {
add_to_env ${_LIBOFX_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
if quiet ${PKG_CONFIG} --exists libofx
then
- echo "Libofx already installed. skipping."
+ echo "Libofx already installed in $_LIBOFX_UDIR. skipping."
else
wget_unpacked $LIBOFX_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/libofx-*
@@ -941,7 +941,7 @@ function inst_gnutls() {
add_to_env "-L${_GNUTLS_UDIR}/lib" GNUTLS_LDFLAGS
if quiet ${PKG_CONFIG} --exact-version=${GNUTLS_VERSION} gnutls
then
- echo "GNUTLS already installed. skipping."
+ echo "GNUTLS already installed in $_GNUTLS_UDIR. skipping."
else
wget_unpacked $GNUTLS_URL $DOWNLOAD_DIR $GNUTLS_DIR
rm -f $_GNUTLS_UDIR/lib/*.la
@@ -957,7 +957,7 @@ function inst_gwenhywfar() {
add_to_env ${_GWENHYWFAR_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
if quiet ${PKG_CONFIG} --exact-version=${GWENHYWFAR_VERSION} gwenhywfar
then
- echo "Gwenhywfar already installed. skipping."
+ echo "Gwenhywfar already installed in $_GWENHYWFAR_UDIR. skipping."
else
wget_unpacked $GWENHYWFAR_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/gwenhywfar-*
@@ -1008,7 +1008,7 @@ function inst_ktoblzcheck() {
add_to_env "-L${_GWENHYWFAR_UDIR}/lib" KTOBLZCHECK_LDFLAGS
if quiet ${PKG_CONFIG} --exact-version=${KTOBLZCHECK_VERSION} ktoblzcheck
then
- echo "Ktoblzcheck already installed. skipping."
+ echo "Ktoblzcheck already installed in $_GWENHYWFAR_UDIR. skipping."
else
wget_unpacked $KTOBLZCHECK_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/ktoblzcheck-*
@@ -1062,7 +1062,7 @@ function inst_aqbanking() {
add_to_env ${_AQBANKING_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
if quiet ${PKG_CONFIG} --exact-version=${AQBANKING_VERSION} aqbanking
then
- echo "AqBanking already installed. skipping."
+ echo "AqBanking already installed in $_AQBANKING_UDIR. skipping."
else
wget_unpacked $AQBANKING_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/aqbanking-*
@@ -1146,7 +1146,7 @@ function inst_libdbi() {
add_to_env -L$_LIBDBI_UDIR/lib LIBDBI_LDFLAGS
if test -f ${_SQLITE3_UDIR}/bin/libsqlite3-0.dll
then
- echo "SQLite3 already installed. skipping."
+ echo "SQLite3 already installed in $_SQLITE3_UDIR. skipping."
else
wget_unpacked $SQLITE3_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/sqlite-*
@@ -1162,7 +1162,7 @@ function inst_libdbi() {
if test -f ${_MYSQL_LIB_UDIR}/lib/libmysql.dll -a \
-f ${_MYSQL_LIB_UDIR}/lib/libmysqlclient.a
then
- echo "MySQL library already installed. skipping."
+ echo "MySQL library already installed in $_MYSQL_LIB_UDIR. skipping."
else
wget_unpacked $MYSQL_LIB_URL $DOWNLOAD_DIR $TMP_DIR
mkdir -p $_MYSQL_LIB_UDIR
@@ -1178,7 +1178,7 @@ function inst_libdbi() {
fi
if test -f ${_PGSQL_UDIR}/lib/libpq.dll
then
- echo "PGSQL library already installed. skipping."
+ echo "PGSQL library already installed in $_PGSQL_UDIR. skipping."
else
wget_unpacked $PGSQL_LIB_URL $DOWNLOAD_DIR $TMP_DIR
cp -r $TMP_UDIR/pgsql* $_PGSQL_UDIR
@@ -1187,7 +1187,7 @@ function inst_libdbi() {
fi
if test -f ${_LIBDBI_UDIR}/bin/libdbi-0.dll
then
- echo "libdbi already installed. skipping."
+ echo "libdbi already installed in $_LIBDBI_UDIR. skipping."
else
wget_unpacked $LIBDBI_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/libdbi-0*
@@ -1227,7 +1227,7 @@ function inst_libdbi() {
-f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdmysql.dll -a \
-f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdpgsql.dll
then
- echo "libdbi drivers already installed. skipping."
+ echo "libdbi drivers already installed in $_LIBDBI_DRIVERS_UDIR. skipping."
else
wget_unpacked $LIBDBI_DRIVERS_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/libdbi-drivers-*
@@ -1267,7 +1267,7 @@ function inst_cmake() {
add_to_env ${_CMAKE_UDIR}/bin PATH
if [ -f ${_CMAKE_UDIR}/bin/cmake.exe ]
then
- echo "cmake already installed. skipping."
+ echo "cmake already installed in $_CMAKE_UDIR. skipping."
else
wget_unpacked $CMAKE_URL $DOWNLOAD_DIR $CMAKE_DIR
@@ -1318,7 +1318,7 @@ function inst_webkit() {
add_to_env -I${_WEBKIT_UDIR}/include/webkit-1.0 WEBKIT_CFLAGS
if quiet ${LD} ${WEBKIT_LIBS} -o $TMP_UDIR/ofile
then
- echo "webkit already installed. skipping."
+ echo "webkit already installed in $_WEBKIT_UDIR. skipping."
else
wget_unpacked $WEBKIT_URL $DOWNLOAD_DIR $WEBKIT_DIR
quiet ${LD} ${WEBKIT_LIBS} -o $TMP_UDIR/ofile || die "webkit not installed correctly"
commit 0bb3a6f80c28e32ce7d1a66def4f769cbf9ea765
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat Mar 26 10:50:18 2011 +0000
Windows nightly build: fix webserver directory creation hack
BP
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20487 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_package.sh b/build_package.sh
index 7795107..cb280df 100644
--- a/build_package.sh
+++ b/build_package.sh
@@ -7,10 +7,11 @@
#
set -e
+LOG_DIR=build-logs
function on_error() {
if [ `hostname` = "gnucash-win32" ]; then
- scp -p ${LOGFILE} upload at code.gnucash.org:public_html/win32/build-logs
+ scp -p ${LOGFILE} upload at code.gnucash.org:public_html/win32/$LOG_DIR
fi
exit
}
@@ -38,11 +39,11 @@ _OUTPUT_DIR=`unix_path $OUTPUT_DIR`
LOGFILE=${_OUTPUT_DIR}/${LOGFILENAME}
mkdir -p ${_OUTPUT_DIR}
+# Small hack to create $LOG_DIR on the webserver if it doesn't exist yet
if [ `hostname` = "gnucash-win32" ]; then
- # Small hack to create the build-logs directory if it doesn't exist yet
- mkdir "$TMP_DIR/build-logs"
- scp -r "$TMP_DIR/build-logs" upload at code.gnucash.org:public_html/win32
- rmdir "$TMP_DIR/build-logs"
+ mkdir "$_OUTPUT_DIR/$LOG_DIR"
+ scp -r "$_OUTPUT_DIR/$LOG_DIR" upload at code.gnucash.org:public_html/win32
+ rmdir "$_OUTPUT_DIR/$LOG_DIR"
fi
set +e
@@ -91,13 +92,12 @@ if [ -n "${tag}" ] ; then
fi
# If we're running on the build server then upload the files
-# Note: change this target if you're building a different branch
if [ `hostname` = "gnucash-win32" ]; then
- # Small hack to create the target directory if it doesn't exist yet
- mkdir "$TMP_DIR/$TARGET_DIR"
- scp -r "$TMP_DIR/$TARGET_DIR" upload at code.gnucash.org:public_html/win32
- rmdir "$TMP_DIR/$TARGET_DIR"
+ # Small hack to create the $TARGET_DIR on the webserver if it doesn't exist yet
+ mkdir "$_OUTPUT_DIR/$TARGET_DIR"
+ scp -r "$_OUTPUT_DIR/$TARGET_DIR" upload at code.gnucash.org:public_html/win32
+ rmdir "$_OUTPUT_DIR/$TARGET_DIR"
# Copy the files to the chosen target directory
- scp -p ${LOGFILE} upload at code.gnucash.org:public_html/win32/build-logs
+ scp -p ${LOGFILE} upload at code.gnucash.org:public_html/win32/$LOG_DIR
scp -p ${_OUTPUT_DIR}/${SETUP_FILENAME} upload at code.gnucash.org:public_html/win32/$TARGET_DIR
fi
commit 4ecb0227a18f872ea639585ebf3ab77e1952eb5f
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu Mar 24 21:50:01 2011 +0000
Windows build: fix weekly 2.4 build and move log files into separate directory
BP
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20475 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_package.sh b/build_package.sh
index 792358f..7795107 100644
--- a/build_package.sh
+++ b/build_package.sh
@@ -10,7 +10,7 @@ set -e
function on_error() {
if [ `hostname` = "gnucash-win32" ]; then
- scp -p ${LOGFILE} upload at code.gnucash.org:public_html/win32/trunk
+ scp -p ${LOGFILE} upload at code.gnucash.org:public_html/win32/build-logs
fi
exit
}
@@ -22,13 +22,29 @@ tag="$1"
. functions.sh
. defaults.sh
+# Determine where to upload to
+if $(echo $REPOS_URL | grep -q tags); then
+ TARGET_DIR=releases
+ LOG_TAG=$tag
+else
+ TARGET_DIR=${REPOS_URL##*/}
+ LOG_TAG=$TARGET_DIR
+fi
+
set_default OUTPUT_DIR $GLOBAL_DIR\\output
-LOGFILENAME=build${tag:+-${tag}}-`date +'%Y-%m-%d'`.log
+LOGFILENAME=build-${LOG_TAG}-`date +'%Y-%m-%d'`.log
_OUTPUT_DIR=`unix_path $OUTPUT_DIR`
LOGFILE=${_OUTPUT_DIR}/${LOGFILENAME}
mkdir -p ${_OUTPUT_DIR}
+if [ `hostname` = "gnucash-win32" ]; then
+ # Small hack to create the build-logs directory if it doesn't exist yet
+ mkdir "$TMP_DIR/build-logs"
+ scp -r "$TMP_DIR/build-logs" upload at code.gnucash.org:public_html/win32
+ rmdir "$TMP_DIR/build-logs"
+fi
+
set +e
trap on_error ERR
@@ -77,16 +93,11 @@ fi
# If we're running on the build server then upload the files
# Note: change this target if you're building a different branch
if [ `hostname` = "gnucash-win32" ]; then
- # Determine where to upload to
- if $(echo $REPOS_URL | grep -q tags); then
- TARGET_DIR=releases
- else
- TARGET_DIR=${REPOS_URL##*/}
- fi
# Small hack to create the target directory if it doesn't exist yet
mkdir "$TMP_DIR/$TARGET_DIR"
scp -r "$TMP_DIR/$TARGET_DIR" upload at code.gnucash.org:public_html/win32
rmdir "$TMP_DIR/$TARGET_DIR"
# Copy the files to the chosen target directory
- scp -p ${LOGFILE} ${_OUTPUT_DIR}/${SETUP_FILENAME} upload at code.gnucash.org:public_html/win32/$TARGET_DIR
+ scp -p ${LOGFILE} upload at code.gnucash.org:public_html/win32/build-logs
+ scp -p ${_OUTPUT_DIR}/${SETUP_FILENAME} upload at code.gnucash.org:public_html/win32/$TARGET_DIR
fi
diff --git a/daily_build.bat b/daily_build.bat
index 0afca3a..8483785 100644
--- a/daily_build.bat
+++ b/daily_build.bat
@@ -9,4 +9,4 @@ c:\msys\1.0\bin\sh.exe --login c:\soft\packaging\daily_build.sh
rem Tags build (daily -- only tags that weren't built yet)
c:\msys\1.0\bin\sh.exe --login c:\soft\packaging\build_tags.sh
rem 2.4 branch build (weekly)
-c:\msys\1.0\bin\sh.exe --login c:\soft\packaging\daily_build.sh c:\soft-2.4\packaging
\ No newline at end of file
+c:\msys\1.0\bin\sh.exe --login c:\soft-2.4\packaging\weekly_build.sh
\ No newline at end of file
commit ee47a4d0021fcb502d54b4270223f8c6beba453d
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu Mar 24 19:25:08 2011 +0000
Windows build: allow reset.sh to remove mingw
BP
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20461 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/reset.sh b/reset.sh
index 541500a..a19ca91 100644
--- a/reset.sh
+++ b/reset.sh
@@ -63,6 +63,7 @@ function eval_all() {
eval_path $AUTOTOOLS_DIR
eval_path $GUILE_DIR
eval_path $OPENSSL_DIR
+ eval_path $MINGW_DIR
eval_path $MINGW_UTILS_DIR
eval_path $EXETYPE_DIR
eval_path $LIBXML2_DIR
commit 90eed41c6d07b43db38ccab3566da0d983b16924
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed Mar 23 21:38:21 2011 +0000
Windows build: fix upload code
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20460 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_package.sh b/build_package.sh
index 8ce3685..792358f 100644
--- a/build_package.sh
+++ b/build_package.sh
@@ -84,7 +84,9 @@ if [ `hostname` = "gnucash-win32" ]; then
TARGET_DIR=${REPOS_URL##*/}
fi
# Small hack to create the target directory if it doesn't exist yet
- scp -r $TARGET_DIR upload at code.gnucash.org:public_html/win32
+ mkdir "$TMP_DIR/$TARGET_DIR"
+ scp -r "$TMP_DIR/$TARGET_DIR" upload at code.gnucash.org:public_html/win32
+ rmdir "$TMP_DIR/$TARGET_DIR"
# Copy the files to the chosen target directory
scp -p ${LOGFILE} ${_OUTPUT_DIR}/${SETUP_FILENAME} upload at code.gnucash.org:public_html/win32/$TARGET_DIR
fi
commit 81231261f4b6f3ca43f8e985fba0e1a303b822fb
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed Mar 23 17:48:57 2011 +0000
Fix windows build:
- Add missing patch for guile 1.8.8
- Add missing mingwrt dev package
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20458 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index b2a62a9..20e7357 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -78,7 +78,8 @@ set_default GNOME_WIN32_DEPS_URL "$GNOME_WIN32_URL/dependencies"
set_default DTK_URL "$SF_MIRROR/mingw/msysDTK-1.0.1.exe"
set_default M4_URL "$SF_MIRROR/mingw/m4-1.4.7-MSYS.tar.bz2"
-set_default MINGW_RT_URL "$SF_MIRROR/mingw/mingwrt-3.18-mingw32-dll.tar.gz"
+set_default MINGW_RT_URL "$SF_MIRROR/mingw/mingwrt-3.18-mingw32-dev.tar.gz"
+set_default MINGW_RT_DLL_URL "$SF_MIRROR/mingw/mingwrt-3.18-mingw32-dll.tar.gz"
set_default W32API_URL "$SF_MIRROR/mingw/w32api-3.15-1-mingw32-dev.tar.lzma"
set_default MINGW_MAKE_URL "$SF_MIRROR/mingw/mingw32-make-3.81-20080326-3.tar.gz"
set_default MINGW_DIR $GLOBAL_DIR\\mingw
diff --git a/guile-1.8.8.patch b/guile-1.8.8.patch
new file mode 100644
index 0000000..ec92de5
--- /dev/null
+++ b/guile-1.8.8.patch
@@ -0,0 +1,89 @@
+diff -urN old.guile-1.8.7/configure.in new/guile-1.8.7/configure.in
+--- old.guile-1.8.7/configure.in 2009-07-05 14:40:06.000000000 -0400
++++ new.guile-1.8.7/configure.in 2009-08-26 15:33:43.996500000 -0400
+@@ -25,7 +25,7 @@
+
+ ]])
+
+-AC_PREREQ(2.61)
++AC_PREREQ(2.63)
+
+ dnl `patsubst' here deletes the newline which "echo" prints. We can't use
+ dnl "echo -n" since -n is not portable (see autoconf manual "Limitations of
+@@ -41,7 +41,7 @@
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_SRCDIR(GUILE-VERSION)
+
+-AM_INIT_AUTOMAKE([gnu no-define check-news -Wall -Wno-override])
++AM_INIT_AUTOMAKE([1.11 silent-rules gnu no-define check-news -Wall -Wno-override])
+
+ AC_COPYRIGHT(GUILE_CONFIGURE_COPYRIGHT)
+ AC_CONFIG_SRCDIR([GUILE-VERSION])
+@@ -68,8 +68,6 @@
+
+ AB_INIT
+
+-AC_LIBTOOL_WIN32_DLL
+-
+ AC_PROG_INSTALL
+ AC_PROG_CC
+ AC_PROG_CPP
+@@ -82,8 +80,7 @@
+ # for per-target cflags in the libguile subdir
+ AM_PROG_CC_C_O
+
+-AC_LIBTOOL_DLOPEN
+-AC_PROG_LIBTOOL
++LT_INIT([win32-dll dlopen])
+ AC_CHECK_LIB([ltdl], [lt_dlinit], ,
+ [AC_MSG_ERROR([libltdl not found. See README.])])
+ AC_CHECK_HEADER([ltdl.h], [],
+diff -urN old.guile-1.8.7/guile-readline/configure.in new/guile-1.8.7/guile-readline/configure.in
+--- old.guile-1.8.7/guile-readline/configure.in 2009-07-03 18:19:22.000000000 -0400
++++ new.guile-1.8.7/guile-readline/configure.in 2009-08-26 15:35:08.398500000 -0400
+@@ -1,4 +1,4 @@
+-AC_PREREQ(2.50)
++AC_PREREQ(2.63)
+
+ dnl Don't use "echo -n", which is not portable (e.g., not available on
+ dnl MacOS X). Instead, use `patsubst' to remove the newline.
+@@ -10,15 +10,14 @@
+ AC_CONFIG_AUX_DIR([.])
+ AC_CONFIG_SRCDIR(readline.c)
+ AM_CONFIG_HEADER([guile-readline-config.h])
+-AM_INIT_AUTOMAKE([foreign no-define])
++AM_INIT_AUTOMAKE([1.11 silent-rules foreign no-define])
+
+ . $srcdir/../GUILE-VERSION
+
+ AC_PROG_INSTALL
+ AC_PROG_CC
+ AM_PROG_CC_STDC
+-AC_LIBTOOL_WIN32_DLL
+-AC_PROG_LIBTOOL
++LT_INIT([win32-dll])
+
+ dnl
+ dnl Check for Winsock and other functionality on Win32 (*not* CygWin)
+--- old.guile-1.8.7/pre-inst-guile.in 2010-05-30 09:38:50 +0000
++++ new.guile-1.8.7/pre-inst-guile.in 2010-05-30 09:39:30 +0000
+@@ -87,7 +87,7 @@
+ export DYLD_LIBRARY_PATH
+
+ # set GUILE (clobber)
+-GUILE=${top_builddir}/libguile/guile
++GUILE=${top_builddir}/libguile/.libs/guile
+ export GUILE
+
+ # do it
+===================================================================
+--- sid.orig/libguile/threads.h
++++ sid/libguile/threads.h
+@@ -26,7 +26,6 @@
+ #include "libguile/procs.h"
+ #include "libguile/throw.h"
+ #include "libguile/root.h"
+-#include "libguile/iselect.h"
+ #include "libguile/dynwind.h"
+ #include "libguile/continuations.h"
+
diff --git a/install-impl.sh b/install-impl.sh
index 2a9c4cf..8a5fde1 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -131,6 +131,7 @@ function inst_mingw() {
wget_unpacked $GCC_MPFR_URL $DOWNLOAD_DIR $MINGW_DIR
wget_unpacked $GCC_PTHREADS_URL $DOWNLOAD_DIR $MINGW_DIR
wget_unpacked $MINGW_RT_URL $DOWNLOAD_DIR $MINGW_DIR
+ wget_unpacked $MINGW_RT_DLL_URL $DOWNLOAD_DIR $MINGW_DIR
wget_unpacked $W32API_URL $DOWNLOAD_DIR $MINGW_DIR
wget_unpacked $MINGW_MAKE_URL $DOWNLOAD_DIR $MINGW_DIR
(echo "y"; echo "y"; echo "$_MINGW_WFSDIR"; echo "y") | sh pi.sh
commit e7039475c8077510c707f9a5b2a4064cb3e8b85b
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed Mar 23 17:28:24 2011 +0000
Improve message printed on screen
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20457 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/functions.sh b/functions.sh
index c68ecc0..b7142a9 100644
--- a/functions.sh
+++ b/functions.sh
@@ -206,7 +206,7 @@ function configure_msys() {
# Make sure msys will be using this mingw
SUFFIX=$1
_MINGW_WFSDIR=$2
- echo "configuring msys to use this mingw. suffix=$SUFFIX, _MINGW_WFSDIR=$_MINGW_WFSDIR"
+ echo "configuring msys to use $_MINGW_WFSDIR."
cp /etc/fstab /etc/fstab.$SUFFIX
sed '\,/mingw$, d' /etc/fstab > tmp
echo "$_MINGW_WFSDIR /mingw" >> tmp
commit 0727cc09129686ce595834f0603809e3c0eb65e0
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Mar 22 21:46:13 2011 +0000
Some additional Windows nightly build fixes:
- restore the original mingw/msys link, even when the build script abort (due to a die command)
- only restore the mingw/msys link if it was saved before
- weekly builds should be on Monday, not Tuesday
- upload tag rebuilds to a directory named 'releases' instead of 'tags'
BP
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20456 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_package.sh b/build_package.sh
index e2b674d..8ce3685 100644
--- a/build_package.sh
+++ b/build_package.sh
@@ -79,7 +79,7 @@ fi
if [ `hostname` = "gnucash-win32" ]; then
# Determine where to upload to
if $(echo $REPOS_URL | grep -q tags); then
- TARGET_DIR=tags
+ TARGET_DIR=releases
else
TARGET_DIR=${REPOS_URL##*/}
fi
diff --git a/functions.sh b/functions.sh
index 7bd37ca..c68ecc0 100644
--- a/functions.sh
+++ b/functions.sh
@@ -121,6 +121,7 @@ function die() {
echo
[ "$*" ] && echo "!!! $* !!!"
echo "!!! ABORTING !!!"
+ restore_msys
exit -1
}
@@ -214,9 +215,11 @@ function configure_msys() {
function restore_msys() {
SUFFIX=$1
- echo "resetting msys to use original mingw."
- rm /etc/fstab
- mv /etc/fstab.$SUFFIX /etc/fstab
+ if [ -f /ect/fstab.$SUFFIX ]; then
+ echo "resetting msys to use original mingw."
+ rm /etc/fstab
+ mv /etc/fstab.$SUFFIX /etc/fstab
+ fi
}
### Local Variables: ***
diff --git a/weekly_build.sh b/weekly_build.sh
index af28c48..9645b95 100644
--- a/weekly_build.sh
+++ b/weekly_build.sh
@@ -11,7 +11,7 @@
set -e
# Only run this script on Monday night (first day of the week)
-if [ `date +%u` != 2 ] ; then exit ; fi
+if [ `date +%u` != 1 ] ; then exit ; fi
function qpushd() { pushd "$@" >/dev/null; }
function qpopd() { popd >/dev/null; }
commit 59c06060058b68cc98ea9b1ec267df51cbedf456
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Mar 22 21:03:22 2011 +0000
Build server: automatically create directories on webserver for new branches
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20455 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_package.sh b/build_package.sh
index 092132e..e2b674d 100644
--- a/build_package.sh
+++ b/build_package.sh
@@ -77,5 +77,14 @@ fi
# If we're running on the build server then upload the files
# Note: change this target if you're building a different branch
if [ `hostname` = "gnucash-win32" ]; then
- scp -p ${LOGFILE} ${_OUTPUT_DIR}/${SETUP_FILENAME} upload at code.gnucash.org:public_html/win32/trunk
+ # Determine where to upload to
+ if $(echo $REPOS_URL | grep -q tags); then
+ TARGET_DIR=tags
+ else
+ TARGET_DIR=${REPOS_URL##*/}
+ fi
+ # Small hack to create the target directory if it doesn't exist yet
+ scp -r $TARGET_DIR upload at code.gnucash.org:public_html/win32
+ # Copy the files to the chosen target directory
+ scp -p ${LOGFILE} ${_OUTPUT_DIR}/${SETUP_FILENAME} upload at code.gnucash.org:public_html/win32/$TARGET_DIR
fi
commit 24b5682cb24fcba5f7fe7636a9dbe436ac28e0b3
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Mar 22 20:24:13 2011 +0000
Rework the Windows weekly 2.4 build to avoid parallel builds (which would fail
BP (note that r20452 should be backported first, though I forgot to add the BP marker)
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20454 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/daily_build.bat b/daily_build.bat
index cd73e76..0afca3a 100644
--- a/daily_build.bat
+++ b/daily_build.bat
@@ -3,5 +3,10 @@ rem It simply calls the actual MSYS Shell script to perform
rem the daily build and then the tag builds.
cd c:\soft\packaging
+
+rem Development build (daily)
c:\msys\1.0\bin\sh.exe --login c:\soft\packaging\daily_build.sh
+rem Tags build (daily -- only tags that weren't built yet)
c:\msys\1.0\bin\sh.exe --login c:\soft\packaging\build_tags.sh
+rem 2.4 branch build (weekly)
+c:\msys\1.0\bin\sh.exe --login c:\soft\packaging\daily_build.sh c:\soft-2.4\packaging
\ No newline at end of file
diff --git a/weekly_build.bat b/weekly_build.bat
deleted file mode 100644
index 6ca3e71..0000000
--- a/weekly_build.bat
+++ /dev/null
@@ -1,6 +0,0 @@
-rem This is the Windows Batch Script for the daily builds.
-rem It simply calls the actual MSYS Shell script to perform
-rem the daily build and then the tag builds.
-
-cd c:\soft-2.4\packaging
-c:\msys\1.0\bin\sh.exe --login c:\soft-2.4\packaging\daily_build.sh
diff --git a/weekly_build.sh b/weekly_build.sh
new file mode 100644
index 0000000..af28c48
--- /dev/null
+++ b/weekly_build.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# Note: for this script to work, you need to make sure bash can
+# find svn on your system. If it's not in the default
+# Windows path, you will have to add it yourself, for
+# example like this:
+# - create a file /etc/profile.d/svn.sh
+# - add this line: export PATH=/c/soft/svn/bin:$PATH
+# (Use the real path to your svn installation, obviously)
+
+set -e
+
+# Only run this script on Monday night (first day of the week)
+if [ `date +%u` != 2 ] ; then exit ; fi
+
+function qpushd() { pushd "$@" >/dev/null; }
+function qpopd() { popd >/dev/null; }
+function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
+
+qpushd "$(dirname $(unix_path "$0"))"
+svn update
+./build_package.sh
+qpopd
commit a8e40744b945afb83a0b2252dbf8f20ab3f6fad3
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Mar 22 19:43:05 2011 +0000
Adapt the windows build system to deal with swapping mingw installations on one build machine
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20452 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/dist-impl.sh b/dist-impl.sh
index 78d2c3a..c7f0640 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -46,10 +46,14 @@ Please set AQBANKING_WITH_QT to yes and rerun install.sh first."
_INSTALL_UDIR=`unix_path $INSTALL_DIR`
_INNO_UDIR=`unix_path $INNO_DIR`
_WEBKIT_UDIR=`unix_path $WEBKIT_DIR`
- _ISOCODES_UDIR=`unix_path $ISOCODES_DIR`
+ _ISOCODES_UDIR=`unix_path $ISOCODES_DIR`
+ _MINGW_WFSDIR=`win_fs_path $MINGW_DIR`
add_to_env $_UNZIP_UDIR/bin PATH # unzip
add_to_env $_GNOME_UDIR/bin PATH # gconftool-2
add_to_env $_EXETYPE_UDIR/bin PATH # exetype
+
+ PID=$$
+ configure_msys "$PID" "$_MINGW_WFSDIR"
}
function dist_regex() {
diff --git a/dist.sh b/dist.sh
index 863677f..7f26067 100755
--- a/dist.sh
+++ b/dist.sh
@@ -43,6 +43,9 @@ for step in "${steps[@]}" ; do
eval $step
done
+setup Restore MSYS
+restore_msys "$PID"
+
qpopd
diff --git a/functions.sh b/functions.sh
index 043bb19..7bd37ca 100644
--- a/functions.sh
+++ b/functions.sh
@@ -201,6 +201,24 @@ function dos2unix() {
perl -pi.bak -e"s!\\r\\n\$!\\n!" $@
}
+function configure_msys() {
+ # Make sure msys will be using this mingw
+ SUFFIX=$1
+ _MINGW_WFSDIR=$2
+ echo "configuring msys to use this mingw. suffix=$SUFFIX, _MINGW_WFSDIR=$_MINGW_WFSDIR"
+ cp /etc/fstab /etc/fstab.$SUFFIX
+ sed '\,/mingw$, d' /etc/fstab > tmp
+ echo "$_MINGW_WFSDIR /mingw" >> tmp
+ mv tmp /etc/fstab
+}
+
+function restore_msys() {
+ SUFFIX=$1
+ echo "resetting msys to use original mingw."
+ rm /etc/fstab
+ mv /etc/fstab.$SUFFIX /etc/fstab
+}
+
### Local Variables: ***
### mode: shell-script ***
### sh-basic-offset: 4 ***
diff --git a/install-impl.sh b/install-impl.sh
index cb5bebc..2a9c4cf 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -45,6 +45,9 @@ function inst_prepare() {
set_env "" PKG_CONFIG_PATH # registered
export PKG_CONFIG_LIBDIR="" # not registered
fi
+
+ # Save pid for use in temporary files
+ _PID=$$
}
function check_m4_version_ok() {
@@ -114,7 +117,7 @@ function inst_mingw() {
if quiet test_for_mingw
then
- echo "mingw already installed. skipping."
+ echo "mingw already installed."
else
mkdir -p $_MINGW_UDIR
if [ "$CROSS_COMPILE" != "yes" ]; then
@@ -136,6 +139,8 @@ function inst_mingw() {
fi
quiet test_for_mingw || die "mingw not installed correctly"
fi
+
+ configure_msys "$_PID" "$_MINGW_WFSDIR"
}
function inst_unzip() {
diff --git a/install.sh b/install.sh
index 9280535..56179ca 100644
--- a/install.sh
+++ b/install.sh
@@ -119,6 +119,10 @@ eval_now
for step in "${steps[@]}" ; do
eval $step
done
+
+setup Restore MSYS
+restore_msys "$_PID"
+
qpopd
echo -n "Build Finished at "
diff --git a/weekly_build.bat b/weekly_build.bat
new file mode 100644
index 0000000..6ca3e71
--- /dev/null
+++ b/weekly_build.bat
@@ -0,0 +1,6 @@
+rem This is the Windows Batch Script for the daily builds.
+rem It simply calls the actual MSYS Shell script to perform
+rem the daily build and then the tag builds.
+
+cd c:\soft-2.4\packaging
+c:\msys\1.0\bin\sh.exe --login c:\soft-2.4\packaging\daily_build.sh
commit 8ae9522bacc3e5593c8ef383c31d809e3ae50720
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Mar 21 15:11:25 2011 +0000
Windows build: update dist script for guile 1.8
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20446 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/dist-impl.sh b/dist-impl.sh
index 315609b..78d2c3a 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -67,11 +67,10 @@ function dist_autotools() {
function dist_guile() {
setup Guile
mkdir -p $DIST_UDIR/bin
- cp -a $_GUILE_UDIR/bin/libguile{.,-ltdl.,-srfi}*dll $DIST_UDIR/bin
+ cp -a $_GUILE_UDIR/bin/libguile{.,-srfi}*dll $DIST_UDIR/bin
cp -a $_GUILE_UDIR/bin/guile.exe $DIST_UDIR/bin
mkdir -p $DIST_UDIR/share
cp -a $_GUILE_UDIR/share/guile $DIST_UDIR/share
- [ -f $DIST_UDIR/share/guile/1.6/slibcat ] && rm $DIST_UDIR/share/guile/1.6/slibcat
}
function dist_openssl() {
commit aed6b91138e9dec9decc5cbdc0a89cbd5344279a
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Mar 21 15:11:16 2011 +0000
Windows build: fix libstdc++-6 DLL error
This may be a hack, but I have no clue how to fix it otherwise...
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20445 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
index 7b4dd44..cb5bebc 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -910,7 +910,7 @@ function inst_libofx() {
# aclocal ${ACLOCAL_FLAGS}
# automake
# autoconf
-# ACLOCAL="aclocal $ACLOCAL_FLAGS" autoreconf -fvi $ACLOCAL_FLAGS -B $_AUTOTOOLS_UDIR/share/autoconf/autoconf
+# ACLOCAL="aclocal $ACLOCAL_FLAGS" autoreconf -fvi $ACLOCAL_FLAGS -B $_AUTOTOOLS_UDIR/share/autoconf/autoconf
fi
./configure ${HOST_XCOMPILE} \
--prefix=${_LIBOFX_UDIR} \
@@ -1413,6 +1413,13 @@ function make_install() {
make install
+ qpushd $_INSTALL_UDIR/bin
+ # Copy libstdc++-6.dll and its dependency to gnucash bin directory
+ # to prevent DLL loading errors
+ # (__gxx_personality_v0 not found in libstdc++-6.dll)
+ cp $MINGW_DIR/bin/{libstdc++-6.dll,libgcc_s_dw2-1.dll} .
+ qpopd
+
qpushd $_INSTALL_UDIR/lib
# Move modules that are compiled without -module to lib/gnucash and
# correct the 'dlname' in the libtool archives. We do not use these
commit 1a6403cf8b73e6c6970cd680122d51b60cb9b7c5
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Mar 21 15:11:08 2011 +0000
Windows build: update guile to 1.8.8 and remove slib
Note: The Windows GnuCash build will still fail as GnuCash still
depends on slib...
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20444 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 4dd5404..b2a62a9 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -175,7 +175,7 @@ set_default ACTIVE_PERL_URL "http://downloads.activestate.com/ActivePerl/release
set_default ACTIVE_PERL_DIR $GLOBAL_DIR\\active-perl
set_default AUTOCONF_URL "http://ftp.gnu.org/gnu/autoconf/autoconf-2.63.tar.bz2"
-set_default AUTOMAKE_URL "http://ftp.gnu.org/gnu/automake/automake-1.10.2.tar.bz2"
+set_default AUTOMAKE_URL "http://ftp.gnu.org/gnu/automake/automake-1.11.1.tar.bz2"
set_default LIBTOOL_URL "http://ftp.gnu.org/gnu/libtool/libtool-2.2.6a.tar.gz"
set_default AUTOTOOLS_DIR $GLOBAL_DIR\\autotools
@@ -185,9 +185,9 @@ set_default GMP_DIR $GLOBAL_DIR\\gmp
set_default GMP5_BIN_URL "$SF_MIRROR/mingw/libgmp-5.0.1-1-mingw32-dll-10.tar.lzma"
set_default GMP5_DEV_URL "$SF_MIRROR/mingw/gmp-5.0.1-1-mingw32-dev.tar.lzma"
-set_default GUILE_URL "http://ftp.gnu.org/pub/gnu/guile/guile-1.6.8.tar.gz"
-set_default SLIB_URL "http://swiss.csail.mit.edu/ftpdir/scm/OLD/slib3a3.zip"
+set_default GUILE_URL "http://ftp.gnu.org/pub/gnu/guile/guile-1.8.8.tar.gz"
set_default GUILE_DIR $GLOBAL_DIR\\guile
+set_default GUILE_PATCH `pwd`/guile-1.8.8.patch
set_default OPENSSL_URL "http://www.openssl.org/source/openssl-0.9.8j.tar.gz"
set_default OPENSSL_DIR $GLOBAL_DIR\\openssl
diff --git a/install-impl.sh b/install-impl.sh
index e6d1b6a..7b4dd44 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -284,66 +284,34 @@ function inst_guile() {
setup Guile
_GUILE_WFSDIR=`win_fs_path $GUILE_DIR`
_GUILE_UDIR=`unix_path $GUILE_DIR`
+ _WIN_UDIR=`unix_path $WINDIR`
add_to_env -I$_GUILE_UDIR/include GUILE_CPPFLAGS
add_to_env -L$_GUILE_UDIR/lib GUILE_LDFLAGS
add_to_env $_GUILE_UDIR/bin PATH
- if quiet guile -c '(use-modules (srfi srfi-39))' &&
- quiet guile -c "(use-modules (ice-9 slib)) (require 'printf)"
+ if quiet guile -c '(use-modules (srfi srfi-39))'
then
- echo "guile and slib already installed. skipping."
+ echo "guile already installed. skipping."
else
smart_wget $GUILE_URL $DOWNLOAD_DIR
_GUILE_BALL=$LAST_FILE
- smart_wget $SLIB_URL $DOWNLOAD_DIR
- _SLIB_BALL=$LAST_FILE
tar -xzpf $_GUILE_BALL -C $TMP_UDIR
assert_one_dir $TMP_UDIR/guile-*
qpushd $TMP_UDIR/guile-*
- qpushd ice-9
- cp boot-9.scm boot-9.scm.bak
- cat boot-9.scm.bak | sed '/SIGBUS/d' > boot-9.scm
- qpopd
- qpushd libguile
- cp fports.c fports.c.bak
- cat fports.c.bak | sed 's,#elif defined (FIONREAD),#elif 0,' > fports.c
- cp load.c load.c.bak
- cat load.c.bak | sed '/scan !=/s,:,;,' > load.c
- qpopd
- qpushd libguile-ltdl
- cp raw-ltdl.c raw-ltdl.c.bak
- cat raw-ltdl.c.bak | sed 's,\(SCMLTSTATIC\) LT_GLOBAL_DATA,\1,' > raw-ltdl.c
- touch upstream/ltdl.c.diff
- qpopd
+ patch -p1 < $GUILE_PATCH
+ ACLOCAL="aclocal $ACLOCAL_FLAGS" autoreconf -fvi $ACLOCAL_FLAGS
./configure ${HOST_XCOMPILE} \
--disable-static \
--disable-elisp \
- --disable-networking \
--disable-dependency-tracking \
- --disable-libtool-lock \
- --disable-linuxthreads \
-C --prefix=$_GUILE_WFSDIR \
ac_cv_func_regcomp_rx=yes \
- CPPFLAGS="${READLINE_CPPFLAGS} ${REGEX_CPPFLAGS}" \
- LDFLAGS="-lwsock32 ${READLINE_LDFLAGS} ${REGEX_LDFLAGS}"
- cp config.status config.status.bak
- cat config.status.bak | sed 's# fileblocks[$.A-Za-z]*,#,#' > config.status
- ./config.status
- qpushd guile-config
- cp Makefile Makefile.bak
- cat Makefile.bak | sed '/-bindir-/s,:,^,g' > Makefile
- qpopd
- make LDFLAGS="-lwsock32 ${READLINE_LDFLAGS} ${REGEX_LDFLAGS} -no-undefined -avoid-version"
+ CFLAGS="-D__MINGW32__" \
+ CPPFLAGS="${READLINE_CPPFLAGS} ${REGEX_CPPFLAGS} ${AUTOTOOLS_CPPFLAGS} ${GMP_CPPFLAGS} -D__MINGW32__" \
+ LDFLAGS="${READLINE_LDFLAGS} ${REGEX_LDFLAGS} ${AUTOTOOLS_LDFLAGS} ${GMP_LDFLAGS} -Wl,--enable-auto-import"
+ make LDFLAGS="${READLINE_LDFLAGS} ${REGEX_LDFLAGS} ${AUTOTOOLS_LDFLAGS} ${GMP_LDFLAGS} -Wl,--enable-auto-import -no-undefined -avoid-version"
make install
qpopd
- _SLIB_DIR=$_GUILE_UDIR/share/guile/1.*
- unzip $_SLIB_BALL -d $_SLIB_DIR
- qpushd $_SLIB_DIR/slib
- cp guile.init guile.init.bak
- sed '/lambda.*'"'"'unix/a\
-(define software-type (lambda () '"'"'ms-dos))' guile.init.bak > guile.init
- qpopd
- guile -c '(use-modules (srfi srfi-39))' &&
- guile -c "(use-modules (ice-9 slib)) (require 'printf)" || die "guile not installed correctly"
+ guile -c '(use-modules (srfi srfi-39))' || die "guile not installed correctly"
# If this libguile is used from MSVC compiler, we must
# deactivate some macros of scmconfig.h again.
@@ -936,8 +904,14 @@ function inst_libofx() {
wget_unpacked $LIBOFX_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/libofx-*
qpushd $TMP_UDIR/libofx-*
- [ -n "$LIBOFX_PATCH" -a -f "$LIBOFX_PATCH" ] && \
+ if [ -n "$LIBOFX_PATCH" -a -f "$LIBOFX_PATCH" ]; then
patch -p1 < $LIBOFX_PATCH
+# libtoolize --force
+# aclocal ${ACLOCAL_FLAGS}
+# automake
+# autoconf
+# ACLOCAL="aclocal $ACLOCAL_FLAGS" autoreconf -fvi $ACLOCAL_FLAGS -B $_AUTOTOOLS_UDIR/share/autoconf/autoconf
+ fi
./configure ${HOST_XCOMPILE} \
--prefix=${_LIBOFX_UDIR} \
--with-opensp-includes=${_OPENSP_UDIR}/include/OpenSP \
@@ -1397,8 +1371,8 @@ function inst_gnucash() {
--enable-binreloc \
--enable-locale-specific-tax \
--with-html-engine=webkit \
- CPPFLAGS="${AUTOTOOLS_CPPFLAGS} ${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GUILE_CPPFLAGS} ${LIBDBI_CPPFLAGS} ${KTOBLZCHECK_CPPFLAGS} ${HH_CPPFLAGS} -D_WIN32" \
- LDFLAGS="${AUTOTOOLS_LDFLAGS} ${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} ${HH_LDFLAGS}" \
+ CPPFLAGS="${AUTOTOOLS_CPPFLAGS} ${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GMP_CPPFLAGS} ${GUILE_CPPFLAGS} ${LIBDBI_CPPFLAGS} ${KTOBLZCHECK_CPPFLAGS} ${HH_CPPFLAGS} -D_WIN32" \
+ LDFLAGS="${AUTOTOOLS_LDFLAGS} ${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GMP_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} ${HH_LDFLAGS}" \
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
make
diff --git a/install.sh b/install.sh
index 8c4f1b3..9280535 100644
--- a/install.sh
+++ b/install.sh
@@ -72,13 +72,13 @@ if [ "$CROSS_COMPILE" != "yes" ]; then
fi
add_step inst_autotools
add_step inst_gmp
+add_step inst_exetype
+add_step inst_gnome
add_step inst_guile
if [ "$CROSS_COMPILE" != "yes" ]; then
add_step inst_svn
fi
-add_step inst_exetype
add_step inst_libxslt
-add_step inst_gnome
add_step inst_gnutls
add_step inst_isocodes
add_step inst_swig
commit 167e83d312b825b46d2a5e44073655cf8ff2327d
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Mar 21 15:10:58 2011 +0000
Windows build: patch libofx to build with mingw gcc 4.5.2
Note: the complete gnucash build is still broken and will be fixed
with following patches.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20443 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/libofx-0.8.3-patch.diff b/libofx-0.8.3-patch.diff
index 811c44c..e0e9ffb 100644
--- a/libofx-0.8.3-patch.diff
+++ b/libofx-0.8.3-patch.diff
@@ -137,3 +137,89 @@ diff -ur libofx-0.8.3/lib/ofx_preproc.cpp win32-libofx-0.8.3/lib/ofx_preproc.cpp
dtd_path_filename.append(dtd_filename);
dtd_file.clear();
dtd_file.open(dtd_path_filename.c_str());
+--- libofx-0.8.3/lib/ofx_utilities.cpp-org 2010-05-22 12:57:31 +0000
++++ libofx-0.8.3/lib/ofx_utilities.cpp 2010-05-22 13:31:13 +0000
+@@ -19,7 +19,8 @@
+ #include <iostream>
+ #include "ParserEventGeneratorKit.h"
+ #include "SGMLApplication.h"
+-#include <time.h>
++#include <ctime>
++#include <cstdlib>
+ #include <string>
+ #include <locale.h>
+ #include "messages.hh"
+--- libofx-0.8.3/lib/ofx_container_transaction.cpp-org 2010-05-22 14:08:02 +0000
++++ libofx-0.8.3/lib/ofx_container_transaction.cpp 2010-05-22 14:07:09 +0000
+@@ -21,6 +21,7 @@
+ #include <config.h>
+ #endif
+
++#include <cstdlib>
+ #include <string>
+ #include "messages.hh"
+ #include "libofx.h"
+--- libofx-0.8.3/lib/ofx_request_accountinfo.cpp-org 2010-05-22 14:17:26 +0000
++++ libofx-0.8.3/lib/ofx_request_accountinfo.cpp 2010-05-22 14:17:55 +0000
+@@ -21,6 +21,7 @@
+ #include <config.h>
+ #endif
+
++#include <cstdlib>
+ #include <string>
+ #include "libofx.h"
+ #include "ofx_request_accountinfo.hh"
+--- libofx-0.8.3/lib/ofx_request.cpp-org 2010-05-22 14:19:52 +0000
++++ libofx-0.8.3/lib/ofx_request.cpp 2010-05-22 14:20:12 +0000
+@@ -21,6 +21,7 @@
+ #include <config.h>
+ #endif
+
++#include <cstring>
+ #include <string>
+ #include "messages.hh"
+ #include "libofx.h"
+--- libofx-0.8.3/lib/ofx_request_statement.cpp-org 2010-05-22 14:21:19 +0000
++++ libofx-0.8.3/lib/ofx_request_statement.cpp 2010-05-22 14:21:34 +0000
+@@ -21,6 +21,7 @@
+ #include <config.h>
+ #endif
+
++#include <cstdlib>
+ #include <string>
+ #include "libofx.h"
+ #include "ofx_utilities.hh"
+--- libofx-0.8.3/ofxdump/ofxdump.cpp-org 2010-05-22 14:54:40 +0000
++++ libofx-0.8.3/ofxdump/ofxdump.cpp 2010-05-22 14:55:20 +0000
+@@ -29,6 +29,8 @@
+ ***************************************************************************/
+ #include <iostream>
+ #include <iomanip>
++#include <cstdlib>
++#include <cstring>
+ #include <string>
+ #include "libofx.h"
+ #include <stdio.h> /* for printf() */
+--- libofx-0.8.3/ofxconnect/ofxconnect.cpp-org 2010-05-22 14:57:35 +0000
++++ libofx-0.8.3/ofxconnect/ofxconnect.cpp 2010-05-22 14:58:24 +0000
+@@ -30,6 +30,7 @@
+ ***************************************************************************/
+ #include <iostream>
+ #include <fstream>
++#include <cstring>
+ #include <string>
+ #include "libofx.h"
+ #include <config.h> /* Include config constants, e.g., VERSION TF */
+--- libofx-0.8.3/ofxconnect/ofxpartner.cpp-org 2010-05-22 14:59:39 +0000
++++ libofx-0.8.3/ofxconnect/ofxpartner.cpp 2010-05-22 15:00:46 +0000
+@@ -33,8 +33,10 @@
+ #include <sys/stat.h>
+
+ #include <iostream>
++#include <cstring>
+ #include <string>
+ #include <vector>
++#include <algorithm>
+
+ using std::string;
+ using std::vector;
commit 1a50bd49f8c76dfe3be01839a5b3c5cff6c92329
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Mar 21 15:10:48 2011 +0000
Windows build: update gcc to 4.5.2
Note this breaks the build as some other parts still need
tweaking before this works.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20442 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 902d0f7..4dd5404 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -78,8 +78,8 @@ set_default GNOME_WIN32_DEPS_URL "$GNOME_WIN32_URL/dependencies"
set_default DTK_URL "$SF_MIRROR/mingw/msysDTK-1.0.1.exe"
set_default M4_URL "$SF_MIRROR/mingw/m4-1.4.7-MSYS.tar.bz2"
-set_default MINGW_RT_URL "$SF_MIRROR/mingw/mingwrt-3.15.1-mingw32.tar.gz"
-set_default W32API_URL "$SF_MIRROR/mingw/w32api-3.13-mingw32-dev.tar.gz"
+set_default MINGW_RT_URL "$SF_MIRROR/mingw/mingwrt-3.18-mingw32-dll.tar.gz"
+set_default W32API_URL "$SF_MIRROR/mingw/w32api-3.15-1-mingw32-dev.tar.lzma"
set_default MINGW_MAKE_URL "$SF_MIRROR/mingw/mingw32-make-3.81-20080326-3.tar.gz"
set_default MINGW_DIR $GLOBAL_DIR\\mingw
@@ -91,9 +91,16 @@ if [ "$CROSS_COMPILE" != yes ]; then
set_default RANLIB ranlib
# For native build on Windows we can use precompiled binaries
- set_default BINUTILS_URL "$SF_MIRROR/mingw/binutils-2.19-mingw32-bin.tar.gz"
- set_default GCC_CORE_URL "$SF_MIRROR/mingw/gcc-core-3.4.5-20060117-3.tar.gz"
- set_default GCC_GPP_URL "$SF_MIRROR/mingw/gcc-g++-3.4.5-20060117-3.tar.gz"
+ set_default BINUTILS_URL "$SF_MIRROR/mingw/binutils-2.21-2-mingw32-bin.tar.lzma"
+ set_default GCC_CORE_URL "$SF_MIRROR/mingw/gcc-core-4.5.2-1-mingw32-bin.tar.lzma"
+ set_default GCC_CORE_DLL_URL "$SF_MIRROR/mingw/libgcc-4.5.2-1-mingw32-dll-1.tar.lzma"
+ set_default GCC_GPP_URL "$SF_MIRROR/mingw/gcc-c++-4.5.2-1-mingw32-bin.tar.lzma"
+ set_default GCC_GPP_DLL_URL "$SF_MIRROR/mingw/libstdc++-4.5.2-1-mingw32-dll-6.tar.lzma"
+ set_default GCC_GPP_PATCH "`pwd`/gcc-c++-4.4.0.patch"
+ set_default GCC_MPC_URL "$SF_MIRROR/mingw/libmpc-0.8.1-1-mingw32-dll-2.tar.lzma"
+ set_default GCC_MPFR_URL "$SF_MIRROR/mingw/libmpfr-2.4.1-1-mingw32-dll-1.tar.lzma"
+ set_default GCC_GMP_URL "$SF_MIRROR/mingw/libgmp-5.0.1-1-mingw32-dll-10.tar.lzma"
+ set_default GCC_PTHREADS_URL "$SF_MIRROR/mingw/libpthread-2.8.0-3-mingw32-dll-2.tar.lzma"
else
# What flavor of GCC cross-compiler are we building?
set_default TARGET "mingw32"
diff --git a/install-impl.sh b/install-impl.sh
index 4745d1b..e6d1b6a 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -120,7 +120,13 @@ function inst_mingw() {
if [ "$CROSS_COMPILE" != "yes" ]; then
wget_unpacked $BINUTILS_URL $DOWNLOAD_DIR $MINGW_DIR
wget_unpacked $GCC_CORE_URL $DOWNLOAD_DIR $MINGW_DIR
+ wget_unpacked $GCC_CORE_DLL_URL $DOWNLOAD_DIR $MINGW_DIR
wget_unpacked $GCC_GPP_URL $DOWNLOAD_DIR $MINGW_DIR
+ wget_unpacked $GCC_GPP_DLL_URL $DOWNLOAD_DIR $MINGW_DIR
+ wget_unpacked $GCC_GMP_URL $DOWNLOAD_DIR $MINGW_DIR
+ wget_unpacked $GCC_MPC_URL $DOWNLOAD_DIR $MINGW_DIR
+ wget_unpacked $GCC_MPFR_URL $DOWNLOAD_DIR $MINGW_DIR
+ wget_unpacked $GCC_PTHREADS_URL $DOWNLOAD_DIR $MINGW_DIR
wget_unpacked $MINGW_RT_URL $DOWNLOAD_DIR $MINGW_DIR
wget_unpacked $W32API_URL $DOWNLOAD_DIR $MINGW_DIR
wget_unpacked $MINGW_MAKE_URL $DOWNLOAD_DIR $MINGW_DIR
@@ -1471,6 +1477,7 @@ set PATH=$INSTALL_DIR\\bin;%PATH%
set PATH=$INSTALL_DIR\\lib;%PATH%
set PATH=$INSTALL_DIR\\lib\\gnucash;%PATH%
set PATH=$GNUTLS_DIR\\bin;%PATH%
+set PATH=$MINGW_DIR\\bin;%PATH%
set PATH=$GMP_DIR\\bin;%PATH%
set PATH=$GOFFICE_DIR\\bin;%PATH%
set PATH=$LIBGSF_DIR\\bin;%PATH%
commit fe362711eb39c7b54a0ce7fbbda601bd9b486976
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Mar 15 17:17:14 2011 +0000
Bug #641645 - Support ActivePerl 5.12 for Finance:Quote on Windows
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20426 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-fq-mods.cmd b/install-fq-mods.cmd
index 3f71d87..73c2ac5 100644
--- a/install-fq-mods.cmd
+++ b/install-fq-mods.cmd
@@ -16,7 +16,7 @@ set _perlmajor=%errorlevel%
perl -e "$ver=1000*sprintf(\"%%.3f\", $]); exit(int($ver)-5000);"
set _perlminor=%errorlevel%
if %_perlmajor% equ 5 (
- if %_perlminor% equ 10 (
+ if %_perlminor% geq 10 (
set _perlversion=5.10
goto ccp
)
@@ -31,7 +31,7 @@ if %_perlmajor% equ 5 (
)
echo.
echo Did not find a usable perl.
-echo Please install ActivePerl 5.8 (http://www.activestate.com/store/activeperl)
+echo Please install ActivePerl 5.8, 5.10 or 5.12 (http://www.activestate.com/store/activeperl)
echo and add the bin directory to your Path environment variable.
goto error
:ccp
@@ -49,12 +49,12 @@ echo * Install Crypt-SSLeay
echo.
set OLDPATH=%PATH%
set PATH=%CD%;%PATH%
-if %_perlversion% == 5.10 (
- perl -x -S ppm install Crypt-SSLeay
+if %_perlversion% == 5.6 (
+ perl -x -S ppm install http://theoryx5.uwinnipeg.ca/ppmpackages/Crypt-SSLeay.ppd
) else if %_perlversion% == 5.8 (
echo anything | perl -x -S ppm install http://theoryx5.uwinnipeg.ca/ppms/Crypt-SSLeay.ppd
) else (
- perl -x -S ppm install http://theoryx5.uwinnipeg.ca/ppmpackages/Crypt-SSLeay.ppd
+ perl -x -S ppm install Crypt-SSLeay
)
set errlvlbak=%errorlevel%
set PATH=%OLDPATH%
@@ -85,7 +85,7 @@ goto end
:error:
echo.
-echo An error occured, see above.
+echo An error occurred, see above.
echo.
:end
commit 07363cdca3e012ce6e7a611dd11fa251a5aff5aa
Author: Christian Stimming <stimming at tuhh.de>
Date: Sun Mar 13 00:02:27 2011 +0000
Win32: Tweak cross compiling script for webkit so that is seems to almost compile.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20406 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/crossbuild_webkit.sh b/crossbuild_webkit.sh
index 10c9cbe..d9cfe4c 100755
--- a/crossbuild_webkit.sh
+++ b/crossbuild_webkit.sh
@@ -82,11 +82,10 @@ function inst_crossmingw() {
_MINGW_UDIR=`unix_path $MINGW_DIR`
mkdir -p `unix_path $MINGW_DIR\\\\mingw32`
if [ -d $_MINGW_UDIR ] &&
- quiet $_MINGW_UDIR/bin/mingw32-gcc -v &&
- quiet mingw32-gcc -v
+ quiet $CC -v
then
echo "Cross mingw installed."
- if [ ` mingw32-gcc -dumpversion | cut -d. -f1` -le 3 ] ;then
+ if [ ` $CC -dumpversion | cut -d. -f1` -le 3 ] ;then
die "GCC 4.4 or higher needed"
fi
else
@@ -105,7 +104,7 @@ function inst_crossmingw() {
function inst_crossbinutils() {
_MINGW_UDIR=`unix_path $MINGW_DIR`
- if quiet $_MINGW_UDIR/bin/mingw32-ld -v
+ if quiet $LD -v
then
echo "Cross binutils already installed."
else
@@ -131,7 +130,7 @@ function inst_crossbinutils() {
function inst_crossgcc(){
_MINGW_UDIR=`unix_path $MINGW_DIR`
- if quiet $_MINGW_UDIR/bin/mingw32-gcc
+ if quiet $CC
then
echo "Cross gcc alreadyinstalled."
else
@@ -160,7 +159,7 @@ EOF
qpopd
qpushd $TMP_UDIR/build-gcc
$TMP_UDIR/gcc-*/configure \
- --prefix=$_MINGW_UDIR --target=mingw32 \
+ --prefix=$_MINGW_UDIR --target=$TARGET \
--with-headers=$_MINGW_UDIR/mingw32/include \
--enable-languages=c,c++ \
--with-gcc --with-gnu-ld --with-gnu-as \
@@ -171,7 +170,7 @@ EOF
make
make install
qpopd
- if quiet $_MINGW_UDIR/bin/mingw32-gcc -v
+ if quiet $CC -v
then
rm -rf $TMP_UDIR/build-gcc $TMP_UDIR/gcc-* $TMP_UDIR/mydir
echo "Cross gcc installed successfully."
@@ -188,7 +187,7 @@ function inst_libxslt_gnome() {
add_to_env -L$_GNOME_UDIR/lib GNOME_LDFLAGS
add_to_env $_GNOME_UDIR/lib/pkgconfig PKG_CONFIG_PATH
if [ "$CROSS_COMPILE" != "yes" ]; then
- add_to_env $_GNOME_UDIR//pkg-config-msys.shPKG_CONFIG
+ add_to_env $_GNOME_UDIR//pkg-config-msys.sh PKG_CONFIG
else
add_to_env pkg-config PKG_CONFIG
fi
@@ -214,12 +213,24 @@ EOF
assert_one_dir $TMP_UDIR/libxslt-*
qpushd $TMP_UDIR/libxslt-*
./configure ${HOST_XCOMPILE} \
+ --with-libxml-prefix=$_GNOME_UDIR \
+ --with-libxml-include-prefix=$_GNOME_UDIR/include/libxml2 \
+ --with-libxml-libs-prefix=$_GNOME_UDIR/lib \
+ PKG_CONFIG_PATH="$_GNOME_UDIR/lib/pkgconfig" \
--prefix=${_GNOME_UDIR} \
+ --enable-static=no \
+ --with-plugins=no \
+ --with-python=no \
CPPFLAGS="$GNOME_CPPFLAGS $GNUTLS_CPPFLAGS" \
LDFLAGS="$GNOME_LDFLAGS $GNUTLS_LDFLAGS"
+ make .
+ cd libxslt
+ make EXTRA_LIBS="-L$_GNOME_UDIR/bin -lxml2-2"
+ cd ..
make
make install
qpopd
+ rm -r $TMP_UDIR/libxslt-*
fi
}
@@ -318,6 +329,7 @@ function inst_libsoup () {
make
make install
qpopd
+ rm -r $TMP_UDIR/libsoup-*
fi
}
@@ -325,6 +337,7 @@ function inst_webkit() {
setup WebKitGTK+
_MINGW_UDIR=`unix_path $MINGW_DIR`
_GNOME_UDIR=`unix_path $GNOME_DIR`
+ _WEBKIT_DIR=`unix_path $WEBKIT_DIR`
add_to_env -I$_GNOME_UDIR/include GNOME_CPPFLAGS
add_to_env -L$_GNOME_UDIR/lib GNOME_LDFLAGS
add_to_env $_GNOME_UDIR/lib/pkgconfig PKG_CONFIG_PATH
@@ -355,18 +368,39 @@ function inst_webkit() {
wget_unpacked $WEBKIT_SRC_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/webkit-*
qpushd $TMP_UDIR/webkit-*
- patch -p1 < $WEBKIT_PATCH
- patch -p1 < $WEBKIT_PATCH2
- perl -pi.bak -e"s!/usr/bin/gcc!$_MINGW_UDIR/bin/mingw32-gcc!" \
+ if [ -n "$WEBKIT_PATCH" -a -f "$WEBKIT_PATCH" ] ; then
+ patch -p1 < $WEBKIT_PATCH
+ fi
+ if [ -n "$WEBKIT_PATCH2" -a -f "$WEBKIT_PATCH2" ] ; then
+ patch -p1 < $WEBKIT_PATCH2
+ fi
+ perl -pi.bak -e"s!/usr/bin/gcc!$CC!" \
WebCore/dom/make_names.pl \
WebCore/css/make-css-file-arrays.pl \
WebCore/bindings/scripts/IDLParser.pm
./configure ${HOST_XCOMPILE} \
- --prefix=${_GNOME_UDIR} \
- --disable-silent-rules \
- --disable-video \
- --with-target=win32 \
CPPFLAGS="$GNOME_CPPFLAGS" \
+ --prefix=${_WEBKIT_DIR} \
+ --enable-silent-rules \
+ --disable-datalist \
+ --disable-dom-storage \
+ --disable-eventsource \
+ --disable-filters \
+ --disable-gtk-doc-html \
+ --disable-offline-web-applications \
+ --disable-ruby \
+ --disable-shared-workers \
+ --disable-silent-rules \
+ --disable-svg-animation \
+ --disable-svg-as-image \
+ --disable-svg-fonts \
+ --disable-svg-foreign-object \
+ --disable-svg-use \
+ --disable-video \
+ --disable-workers \
+ --disable-xpath \
+ --with-target=win32 \
+ --with-unicode-backend=icu \
CFLAGS="-g -O2 -std=gnu99" \
CXXFLAGS="-g -O2 -std=gnu++98" \
LDFLAGS="$GNOME_LDFLAGS"
@@ -445,12 +479,20 @@ function build_icu4c_native() {
function inst_icu4c_mingw32() {
setup icu4c-mingw32
_ICU4C_UDIR=`unix_path $ICU4C_DIR`
+ rm -rf $TMP_UDIR/icu-cross
mkdir -p $TMP_UDIR/icu-cross
+
+ # Note: If you have TARGET=i586-mingw32mingw, for this library you
+ # need to set a different --host argument here due to some known
+ # bug in the ICU source package
+ #HOST_XCOMPILE="--host=i586-mingw32"
+
qpushd $TMP_UDIR/icu-cross
$TMP_UDIR/icu/source/configure ${HOST_XCOMPILE} \
--prefix=$_ICU4C_UDIR \
--with-cross-build=$TMP_UDIR/icu-native \
- --with-data-packaging=library
+ --with-data-packaging=library \
+ CC=$CC CPP="$CC -E" RANLIB=$RANLIB CXX=$TARGET-g++
make \
CFLAGS="-g -O2 -std=gnu99" \
CXXFLAGS="-g -O2 -std=gnu++98"
diff --git a/defaults.sh b/defaults.sh
index 0893bc8..902d0f7 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -201,7 +201,7 @@ set_default LIBXSLT_LIBXML2_URL "${XMLSOFT_URL}/libxml2-2.7.6.win32.zip"
set_default LIBXSLT_ICONV_URL "${XMLSOFT_URL}/iconv-1.9.2.win32.zip"
set_default LIBXSLT_ZLIB_URL "${XMLSOFT_URL}/zlib-1.2.3.win32.zip"
set_default LIBXSLT_DIR $GLOBAL_DIR\\libxslt
-#set_default LIBXSLT_SRC_URL "http://xmlsoft.org/sources/libxslt-1.1.26.tar.gz" # unused
+set_default LIBXSLT_SRC_URL "http://xmlsoft.org/sources/libxslt-1.1.26.tar.gz" # needed for webkit build
set_default LIBXML2_URL "$GNOME_WIN32_DEPS_URL/libxml2_2.7.4-1_win32.zip"
set_default LIBXML2_DEV_URL "$GNOME_WIN32_DEPS_URL/libxml2-dev_2.7.4-1_win32.zip"
@@ -298,11 +298,12 @@ set_default INNO_DIR $GLOBAL_DIR\\inno
set_default HH_URL "http://download.microsoft.com/download/0/a/9/0a939ef6-e31c-430f-a3df-dfae7960d564/htmlhelp.exe"
set_default HH_DIR $GLOBAL_DIR\\hh
-set_default WEBKIT_URL "$SF_MIRROR/gnucash/webkit-1.1.90-win32.zip"
-set_default WEBKIT_DIR $GLOBAL_DIR\\webkit-1.1.90
-set_default WEBKIT_SRC_URL "http://www.webkitgtk.org/webkit-1.1.90.tar.gz"
-set_default WEBKIT_PATCH `pwd`/webkit-1.2.0-time.diff
-set_default WEBKIT_PATCH2 `pwd`/webkit-1.2.0-vsaprintf.diff
+set_default WEBKIT_VERSION "1.1.90"
+set_default WEBKIT_URL "$SF_MIRROR/gnucash/webkit-${WEBKIT_VERSION}-win32.zip"
+set_default WEBKIT_DIR $GLOBAL_DIR\\webkit-${WEBKIT_VERSION}
+set_default WEBKIT_SRC_URL "http://www.webkitgtk.org/webkit-1.2.7.tar.gz"
+set_default WEBKIT_PATCH `pwd`/webkit-1.2.7-time.patch
+set_default WEBKIT_PATCH2 `pwd`/webkit-1.2.7-vasprintf.patch
set_default ENCHANT_URL "$GNOME_WIN32_URL/dependencies/enchant_1.5.0-2_win32.zip"
set_default ENCHANT_DEV_URL "$GNOME_WIN32_URL/dependencies/enchant-dev_1.5.0-2_win32.zip"
#set_default LIBSOUP_URL "$GNOME_WIN32_URL/libsoup/2.4/libsoup-2.4.0.zip"
diff --git a/webkit-1.2.7-time.patch b/webkit-1.2.7-time.patch
new file mode 100644
index 0000000..68c6b44
--- /dev/null
+++ b/webkit-1.2.7-time.patch
@@ -0,0 +1,22 @@
+diff -ur -x '*.lo' -x '*.o' webkit-1.1.90-orig/WebCore/platform/network/ResourceResponseBase.h webkit-1.1.90/WebCore/platform/network/ResourceResponseBase.h
+--- webkit-1.1.90-orig/WebCore/platform/network/ResourceResponseBase.h 2010-02-22 17:36:04.000000000 +0100
++++ webkit-1.1.90/WebCore/platform/network/ResourceResponseBase.h 2011-03-12 22:11:06.720211214 +0100
+@@ -31,6 +31,7 @@
+ #include "KURL.h"
+
+ #include <wtf/PassOwnPtr.h>
++#include <ctime>
+
+ namespace WebCore {
+
+diff -ur webkit-1.2.7-orig/WebCore/page/Page.h webkit-1.2.7/WebCore/page/Page.h
+--- webkit-1.2.7-orig/WebCore/page/Page.h 2010-09-10 15:20:33.000000000 +0200
++++ webkit-1.2.7/WebCore/page/Page.h 2011-03-12 23:25:35.670211006 +0100
+@@ -26,6 +26,7 @@
+ #include <wtf/Forward.h>
+ #include <wtf/HashSet.h>
+ #include <wtf/Noncopyable.h>
++#include <ctime>
+
+ #if PLATFORM(MAC)
+ #include "SchedulePair.h"
diff --git a/webkit-1.2.7-vasprintf.patch b/webkit-1.2.7-vasprintf.patch
new file mode 100644
index 0000000..f739658
--- /dev/null
+++ b/webkit-1.2.7-vasprintf.patch
@@ -0,0 +1,22 @@
+diff -ur webkit-1.2.7-orig/WebCore/dom/XMLTokenizerLibxml2.cpp webkit-1.2.7/WebCore/dom/XMLTokenizerLibxml2.cpp
+--- webkit-1.2.7-orig/WebCore/dom/XMLTokenizerLibxml2.cpp 2010-09-10 15:20:33.000000000 +0200
++++ webkit-1.2.7/WebCore/dom/XMLTokenizerLibxml2.cpp 2011-03-12 23:13:39.521370554 +0100
+@@ -23,6 +23,9 @@
+ * Boston, MA 02110-1301, USA.
+ */
+
++#define _GNU_SOURCE
++#include <cstdio>
++
+ #include "config.h"
+ #include "XMLTokenizer.h"
+
+@@ -908,7 +911,7 @@
+ if (m_parserStopped)
+ return;
+
+-#if COMPILER(MSVC) || COMPILER(RVCT)
++#if 1
+ char m[1024];
+ vsnprintf(m, sizeof(m) - 1, message, args);
+ #else
commit ceca37921d1443ba14bed5479f90aec914457602
Author: Cristian Marchi <cri79 at libero.it>
Date: Wed Mar 2 19:33:25 2011 +0000
Fix Traditional Chinese win32 package translation.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20363 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/Makefile.am b/Makefile.am
index c6573ac..2b9c07d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,6 +13,7 @@ EXTRA_DIST = \
opensp-1.5.2-patch.diff \
pi.sh \
ChineseSimp-12-5.1.11.isl \
+ ChineseTrad-2-5.1.11.isl \
Greek-4-5.1.11.isl \
Japanese-5-5.1.11.isl \
Latvian-1-5.1.11.isl \
@@ -24,6 +25,7 @@ if OS_WIN32
redirect_LDADD = $(GLIB_LIBS)
AM_CPPFLAGS = $(GLIB_CFLAGS)
pkgdata_DATA = ChineseSimp-12-5.1.11.isl
+ pkgdata_DATA += ChineseTrad-2-5.1.11.isl
pkgdata_DATA += Greek-4-5.1.11.isl
pkgdata_DATA += Japanese-5-5.1.11.isl
pkgdata_DATA += Latvian-1-5.1.11.isl
diff --git a/gnucash.iss.in b/gnucash.iss.in
index 0d931f3..24c479a 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -103,6 +103,7 @@ Source: "@prefix@\..\dist\share\@PACKAGE@\doc\README-de.win32-bin.txt"; DestDir:
Source: "@prefix@\..\dist\share\@PACKAGE@\doc\README-fr.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
Source: "@prefix@\..\dist\share\@PACKAGE@\doc\README-it.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
Source: "@prefix@\..\dist\share\@PACKAGE@\doc\README-zh_CN.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@prefix@\..\dist\share\@PACKAGE@\doc\README-zh_TW.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
Source: "@prefix@\..\dist\share\@PACKAGE@\doc\COPYING"; DestDir: "{app}\doc\@PACKAGE@"; Flags: ignoreversion; Components: main
Source: "@prefix@\..\dist\share\@PACKAGE@\doc\AUTHORS"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
Source: "@prefix@\..\dist\share\@PACKAGE@\doc\ChangeLog"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
commit 98938ab8ca40604d8f59f32d4892170ce825c392
Author: Cristian Marchi <cri79 at libero.it>
Date: Tue Mar 1 19:44:05 2011 +0000
Add Traditional Chinese translation for win32 package system.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20357 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/ChineseTrad-2-5.1.11.isl b/ChineseTrad-2-5.1.11.isl
new file mode 100644
index 0000000..748442d
--- /dev/null
+++ b/ChineseTrad-2-5.1.11.isl
@@ -0,0 +1,317 @@
+; *** Inno Setup version 5.1.11+ Chinese (Traditional) messages ***
+;
+; To download user-contributed translations of this file, go to:
+; http://www.jrsoftware.org/is3rdparty.php
+;
+; Translated by: Patrick Pang (uncleleft at yahoo.com.hk)
+;
+; Note: When translating this text, do not add periods (.) to the end of
+; messages that didn't have them already, because on those messages Inno
+; Setup adds the periods automatically (appending a period would result in
+; two periods being displayed).
+
+[LangOptions]
+LanguageName=<7e41><9ad4><4e2d><6587>
+LanguageID=$0404
+LanguageCodepage=950
+; If the language you are translating to requires special font faces or
+; sizes, uncomment any of the following entries and change them accordingly.
+DialogFontName=·s²Ó©úÅé
+DialogFontSize=9
+TitleFontName=Arial
+TitleFontSize=28
+WelcomeFontName=·s²Ó©úÅé
+WelcomeFontSize=12
+CopyrightFontName=·s²Ó©úÅé
+CopyrightFontSize=9
+
+[Messages]
+
+; *** Application titles
+SetupAppTitle=¦w¸Ëµ{¦¡
+SetupWindowTitle=%1 ¦w¸Ëµ{¦¡
+UninstallAppTitle=¸Ñ°£¦w¸Ë
+UninstallAppFullTitle=¸Ñ°£¦w¸Ë %1
+
+; *** Misc. common
+InformationTitle=°T®§
+ConfirmTitle=½T»{
+ErrorTitle=¿ù»~
+
+; *** SetupLdr messages
+SetupLdrStartupMessage=³o±N·|¦w¸Ë %1¡C±z·QnÄ~Äò¶Ü?
+LdrCannotCreateTemp=µLªk«Ø¥ß¼È¦sÀɮסC¦w¸Ëµ{¦¡±N·|µ²§ô¡C
+LdrCannotExecTemp=µLªk°õ¦æ¼È¦sÀɮסC¦w¸Ëµ{¦¡±N·|µ²§ô¡C
+
+; *** Startup error messages
+LastErrorMessage=%1%n%n¿ù»~ %2: %3
+SetupFileMissing=¦w¸Ë¸ê®Æ§¨¤¤¿ò¥¢ÀÉ®× %1¡C½Ð×¥¿¦¹°ÝÃD©Î«·s¨ú±o¦¹³nÅé¡C
+SetupFileCorrupt=¦w¸ËÀɮפw¸g·l·´¡C½Ð«·s¨ú±o¦¹³nÅé¡C
+SetupFileCorruptOrWrongVer=¦w¸ËÀɮפw¸g·l·´¡A©Î»P¦w¸Ëµ{¦¡ªºª©¥»¤£²Å¡C½Ð«·s¨ú±o¦¹³nÅé¡C
+NotOnThisPlatform=³oÓµ{¦¡µLªk¦b %1 °õ¦æ¡C
+OnlyOnThisPlatform=³oÓµ{¦¡¥²¶·¦b %1 °õ¦æ¡C
+OnlyOnTheseArchitectures=³oÓµ{¦¡¥u¯à¦b±Mªù¬°¥H¤U³B²z¾¹¬[ºc¦Ó³]pªº Windows ¤W¦w¸Ë:%n%n%1
+MissingWOW64APIs=³oÓª©¥»ªº Windows ¤£¥]§t¦w¸Ëµ{¦¡°õ¦æ 64 ¦ì¤¸¦w¸Ë©Ò»Ýªº¥\¯à¡C½Ð¦w¸Ë Service Pack %1 ¥h×¥¿¦¹°ÝÃD¡C
+WinVersionTooLowError=³oÓµ{¦¡¥²¶·¦b %1 ª©¥» %2 ©Î¥H¤Wªº¨t²Î°õ¦æ¡C
+WinVersionTooHighError=³oÓµ{¦¡µLªk¦w¸Ë¦b %1 ª©¥» %2 ©Î¥H¤Wªº¨t²Î¡C
+AdminPrivilegesRequired=±z¥²¶·µn¤J¦¨¨t²ÎºÞ²zû¥H¦w¸Ë³oÓµ{¦¡¡C
+PowerUserPrivilegesRequired=±z¥²¶·µn¤J¦¨¨ã¦³¨t²ÎºÞ²zû©Î Power User Åvªº¨Ï¥ÎªÌ¥H¦w¸Ë³oÓµ{¦¡¡C
+SetupAppRunningError=¦w¸Ëµ{¦¡°»´ú¨ì %1 ¥¿¦b°õ¦æ¡C%n%n½ÐÃö³¬¸Óµ{¦¡«á«ö [½T©w] Ä~Äò¡A©Î«ö [¨ú®ø] Â÷¶}¡C
+UninstallAppRunningError=¸Ñ°£¦w¸Ëµ{¦¡°»´ú¨ì %1 ¥¿¦b°õ¦æ¡C%n%n½ÐÃö³¬¸Óµ{¦¡«á«ö [½T©w] Ä~Äò¡A©Î«ö [¨ú®ø] Â÷¶}¡C
+
+; *** Misc. errors
+ErrorCreatingDir=¦w¸Ëµ{¦¡µLªk«Ø¥ß¸ê®Æ§¨ "%1"¡C
+ErrorTooManyFilesInDir=µLªk¦b¸ê®Æ§¨ "%1" ¤º«Ø¥ßÀɮסA¦]¬°¸ê®Æ§¨¤º¦³¤Ó¦hªºÀɮסC
+
+; *** Setup common messages
+ExitSetupTitle=µ²§ô¦w¸Ëµ{¦¡
+ExitSetupMessage=¦w¸Ë©|¥¼§¹¦¨¡C¦pªG±z²{¦bµ²§ô¦w¸Ëµ{¦¡¡A³oÓµ{¦¡±N¤£·|³Q¦w¸Ë¡C%n%n±z¥i¥Hµy«á¦A°õ¦æ¦w¸Ëµ{¦¡¥H§¹¦¨¦w¸Ëµ{§Ç¡C±z²{¦bnµ²§ô¦w¸Ëµ{¦¡¶Ü?
+AboutSetupMenuItem=Ãö©ó¦w¸Ëµ{¦¡(&A)...
+AboutSetupTitle=Ãö©ó¦w¸Ëµ{¦¡
+AboutSetupMessage=%1 ª©¥» %2%n%3%n%n%1 ºô§}:%n%4
+AboutSetupNote=
+TranslatorNote=ÁcÅ餤¤å»y¨t¥Ñ Patrick Pang (uncleleft at yahoo.com.hk) ºûÅ@¡C
+
+; *** Buttons
+ButtonBack=< ¤W¤@¨B(&B)
+ButtonNext=¤U¤@¨B(&N) >
+ButtonInstall=¦w¸Ë(&I)
+ButtonOK=½T©w
+ButtonCancel=¨ú®ø
+ButtonYes=¬O(&Y)
+ButtonYesToAll=¥þ³¡¬Ò¬O(&A)
+ButtonNo=§_(&N)
+ButtonNoToAll=¥þ³¡¬Ò§_(&O)
+ButtonFinish=§¹¦¨(&F)
+ButtonBrowse=ÂsÄý(&B)...
+ButtonWizardBrowse=ÂsÄý(&R)...
+ButtonNewFolder=«Ø¥ß·s¸ê®Æ§¨(&M)
+
+; *** "Select Language" dialog messages
+SelectLanguageTitle=¿ï¾Ü¦w¸Ë»y¨¥
+SelectLanguageLabel=¿ï¾Ü¦b¦w¸Ë¹Lµ{¤¤¨Ï¥Îªº»y¨¥:
+
+; *** Common wizard text
+ClickNext=«ö [¤U¤@¨B] Ä~Äò¦w¸Ë¡A©Î«ö [¨ú®ø] µ²§ô¦w¸Ëµ{¦¡¡C
+BeveledLabel=
+BrowseDialogTitle=ÂsÄý¸ê®Æ§¨
+BrowseDialogLabel=¦b¤U±ªº¸ê®Æ§¨¦Cªí¤¤¿ï¾Ü¤@Ó¸ê®Æ§¨¡AµM«á«ö [½T©w]¡C
+NewFolderName=·s¸ê®Æ§¨
+
+; *** "Welcome" wizard page
+WelcomeLabel1=Åwªï¨Ï¥Î [name] ¦w¸Ëµ{¦¡
+WelcomeLabel2=³oÓ¦w¸Ëµ{¦¡±N·|¦w¸Ë [name/ver] ¨ì±zªº¹q¸£¡C%n%n§Ú̱j¯P«Øij±z¦b¦w¸Ë¹Lµ{¤¤Ãö³¬¨ä¥¦ªºÀ³¥Îµ{¦¡¡A¥HÁקK»P¦w¸Ëµ{¦¡µo¥Í½Ä¬ð¡C
+
+; *** "Password" wizard page
+WizardPassword=±K½X
+PasswordLabel1=³oÓ¦w¸Ëµ{¦¡¨ã¦³±K½X«OÅ@¡C
+PasswordLabel3=½Ð¿é¤J±K½X¡AµM«á«ö [¤U¤@¨B] Ä~Äò¡C±K½X¬O°Ï¤À¤j¤p¼gªº¡C
+PasswordEditLabel=±K½X(&P):
+IncorrectPassword=±z¿é¤Jªº±K½X¤£¥¿½T¡A½Ð«·s¿é¤J¡C
+
+; *** "License Agreement" wizard page
+WizardLicense=±ÂÅv¦X¬ù
+LicenseLabel=½Ð¾\Ū¥H¤U±ÂÅv¦X¬ù¡C
+LicenseLabel3=½Ð¾\Ū¥H¤U±ÂÅv¦X¬ù¡A±z¥²¶·±µ¨ü¦X¬ùªº¦U¶µ±ø´Ú¤~¯àÄ~Äò¦w¸Ë¡C
+LicenseAccepted=§Ú¦P·N(&A)
+LicenseNotAccepted=§Ú¤£¦P·N(&D)
+
+; *** "Information" wizard pages
+WizardInfoBefore=°T®§
+InfoBeforeLabel=¦bÄ~Äò¦w¸Ë¤§«e½Ð¾\Ū¥H¤U«n¸ê°T¡C
+InfoBeforeClickLabel=·í±z·Ç³Æ¦nÄ~Äò¦w¸Ë¡A½Ð«ö [¤U¤@¨B]¡C
+WizardInfoAfter=°T®§
+InfoAfterLabel=¦bÄ~Äò¦w¸Ë¤§«e½Ð¾\Ū¥H¤U«n¸ê°T¡C
+InfoAfterClickLabel=·í±z·Ç³Æ¦nÄ~Äò¦w¸Ë¡A½Ð«ö [¤U¤@¨B]¡C
+
+; *** "User Information" wizard page
+WizardUserInfo=¨Ï¥ÎªÌ¸ê°T
+UserInfoDesc=½Ð¿é¤J±zªº¸ê®Æ¡C
+UserInfoName=¨Ï¥ÎªÌ¦WºÙ(&U):
+UserInfoOrg=²Õ´(&O):
+UserInfoSerial=§Ç¸¹(&S):
+UserInfoNameRequired=±z¥²¶·¿é¤J±zªº¦WºÙ¡C
+
+; *** "Select Destination Location" wizard page
+WizardSelectDir=¿ï¾Ü¥Øªº¸ê®Æ§¨
+SelectDirDesc=¿ï¾Ü¦w¸Ëµ{¦¡¦w¸Ë [name] ªº¦ì¸m¡C
+SelectDirLabel3=¦w¸Ëµ{¦¡±N·|§â [name] ¦w¸Ë¨ì¤U±ªº¸ê®Æ§¨¡C
+SelectDirBrowseLabel=«ö [½T©w] Ä~Äò¡A¦pªG±z·Q¿ï¾Ü¥t¤@Ó¸ê®Æ§¨¡A½Ð«ö [ÂsÄý]¡C
+DiskSpaceMBLabel=³Ì¤Ö»Ýn [mb] MB ºÏºÐªÅ¶¡¡C
+ToUNCPathname=¦w¸Ëµ{¦¡µLªk¦w¸Ë©ó UNC ¸ô®|¦WºÙ¡C¦pªG±z§Æ±æ¦w¸Ë©óºô¸ô¤W¨ä¥L¹q¸£¤¤¡A±z¥²¶·«Ø¥ß¤@Ó©T©w³s±µªººô¸ôºÏºÐ¾÷¡C
+InvalidPath=±z¥²¶·¿é¤J§¹¾ãªº¸ô®|¦WºÙ¤ÎºÏºÐ¾÷¥N½X¡C%n%n¨Ò¦p C:\App ©Î UNC ¸ô®|®æ¦¡ \\¦øªA¾¹\¦@¥Î¸ê®Æ§¨¡C
+InvalidDrive=±z¿ï¨úªººÏºÐ¾÷©Î UNC ¦WºÙ¤£¦s¦b©ÎµLªk¦s¨ú¡A½Ð¿ï¾Ü¨ä¥Lªº¥Øªº¦a¡C
+DiskSpaceWarningTitle=ºÏºÐªÅ¶¡¤£¨¬
+DiskSpaceWarning=¦w¸Ëµ{¦¡»Ýn¦Ü¤Ö %1 KB ªººÏºÐªÅ¶¡¡A±z©Ò¿ï¨úªººÏºÐ¥u¦³ %2 KB ¥i¥ÎªÅ¶¡¡C%n%n±znÄ~Äò¦w¸Ë¶Ü?
+DirNameTooLong=¸ê®Æ§¨¦WºÙ©Î¸ô®|¤Óªø¡C
+InvalidDirName=¸ê®Æ§¨¦WºÙ¤£¥¿½T¡C
+BadDirName32=¸ê®Æ§¨¦WºÙ¤£±o¥]§t¥H¤U¯S®í¦r¤¸:%n%n%1
+DirExistsTitle=¸ê®Æ§¨¤w¸g¦s¦b
+DirExists=¸ê®Æ§¨ %1 ¤w¸g¦s¦b¡C%n%n±znÄ~Äò¦w¸Ë¨ì³oÓ¸ê®Æ§¨¶Ü?
+DirDoesntExistTitle=¸ê®Æ§¨¤£¦s¦b
+DirDoesntExist=¸ê®Æ§¨ %1 ¤£¦s¦b¡C%n%n±zn«Ø¥ß³oÓ¸ê®Æ§¨¶Ü?
+
+; *** "Select Components" wizard page
+WizardSelectComponents=¿ï¾Ü¤¸¥ó
+SelectComponentsDesc=¿ï¾Ü±N·|³Q¦w¸Ëªº¤¸¥ó¡C
+SelectComponentsLabel2=¿ï¾Ü±z·Qn¦w¸Ëªº¤¸¥ó¤Î²M°£±z¤£·Q¦w¸Ëªº¤¸¥ó¡AµM«á«ö [¤U¤@¨B] Ä~Äò¦w¸Ë¡C
+FullInstallation=§¹¾ã¦w¸Ë
+; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
+CompactInstallation=³Ì¤p¦w¸Ë
+CustomInstallation=¦Ûq¦w¸Ë
+NoUninstallWarningTitle=¤¸¥ó¤w¦s¦b
+NoUninstallWarning=¦w¸Ëµ{¦¡°»´ú¨ì¥H¤U¤¸¥ó¤w¸g¦w¸Ë¦b±zªº¹q¸£¤W:%n%n%1%n%n¨ú®ø¿ï¾Ü³o¨Ç¤¸¥ó±N¤£·|²¾°£¥¦Ì¡C%n%n±z¤´µMnÄ~Äò¶Ü?
+ComponentSize1=%1 KB
+ComponentSize2=%1 MB
+ComponentsDiskSpaceMBLabel=¥Ø«eªº¿ï¾Ü»Ýn¦Ü¤Ö [mb] MB ºÏºÐªÅ¶¡¡C
+
+; *** "Select Additional Tasks" wizard page
+WizardSelectTasks=¿ï¾Üªþ¥[ªº¤u§@
+SelectTasksDesc=¿ï¾Ün°õ¦æªºªþ¥[¤u§@¡C
+SelectTasksLabel2=¿ï¾Ü¦w¸Ëµ{¦¡¦b¦w¸Ë [name] ®Én°õ¦æªºªþ¥[¤u§@¡AµM«á«ö [¤U¤@¨B]¡C
+
+; *** "Select Start Menu Folder" wizard page
+WizardSelectProgramGroup=¿ï¾Ü¡u¶}©l¡v¥\¯àªíªº¸ê®Æ§¨
+SelectStartMenuFolderDesc=¿ï¾Ü¦w¸Ëµ{¦¡«Ø¥ßµ{¦¡ªº±¶®|ªº¦ì¸m¡C
+SelectStartMenuFolderLabel3=¦w¸Ëµ{¦¡±N·|§âµ{¦¡ªº±¶®|«Ø¥ß¦b¤U±ªº¡u¶}©l¡v¥\¯àªí¸ê®Æ§¨¡C
+SelectStartMenuFolderBrowseLabel=«ö [½T©w] Ä~Äò¡A¦pªG±z·Q¿ï¾Ü¥t¤@Ó¸ê®Æ§¨¡A½Ð«ö [ÂsÄý]¡C
+MustEnterGroupName=±z¥²¶·¿é¤J¤@Ó¸ê®Æ§¨ªº¦WºÙ¡C
+GroupNameTooLong=¸ê®Æ§¨¦WºÙ©Î¸ô®|¤Óªø¡C
+InvalidGroupName=¸ê®Æ§¨¦WºÙ¤£¥¿½T¡C
+BadGroupName=¸ê®Æ§¨¦WºÙ¤£±o¥]§t¤U¦C¦r¤¸:%n%n%1
+NoProgramGroupCheck2=¤£n¦b¡u¶}©l¡v¥\¯àªí¤¤«Ø¥ß¸ê®Æ§¨(&D)
+
+; *** "Ready to Install" wizard page
+WizardReady=·Ç³Æ¦w¸Ë
+ReadyLabel1=¦w¸Ëµ{¦¡±N¶}©l¦w¸Ë [name] ¨ì±zªº¹q¸£¤¤¡C
+ReadyLabel2a=«ö¤U [¦w¸Ë] Ä~Äò¦w¸Ë¡A©Î«ö [¤W¤@¨B] «·sÀ˵ø©Î³]©w¦U¿ï¶µªº¤º®e¡C
+ReadyLabel2b=«ö¤U [¦w¸Ë] Ä~Äò¦w¸Ë¡C
+ReadyMemoUserInfo=¨Ï¥ÎªÌ¸ê°T
+ReadyMemoDir=¥Øªº¸ê®Æ§¨:
+ReadyMemoType=¦w¸Ë«¬ºA:
+ReadyMemoComponents=¿ï¾Üªº¤¸¥ó:
+ReadyMemoGroup=¡u¶}©l¡v¥\¯àªí¸ê®Æ§¨:
+ReadyMemoTasks=ªþ¥[¤u§@:
+
+; *** "Preparing to Install" wizard page
+WizardPreparing=·Ç³Æ¦w¸Ëµ{¦¡
+PreparingDesc=¦w¸Ëµ{¦¡·Ç³Æ±N [name] ¦w¸Ë¨ì±zªº¹q¸£¤W¡C
+PreviousInstallNotCompleted=¥ý«eªº¦w¸Ë/ ¸Ñ°£¦w¸Ë©|¥¼§¹¦¨¡A±z¥²¶·«·s±Ò°Ê¹q¸£¥H§¹¦¨¸Ó¦w¸Ë¡C%n%n¦b«·s±Ò°Ê¹q¸£¤§«á¡A½Ð¦A°õ¦æ³oÓµ{¦¡¨Ó¦w¸Ë [name]¡C
+CannotContinue=¦w¸Ëµ{¦¡µLªkÄ~Äò¡C½Ð«ö [¨ú®ø] Â÷¶}¡C
+
+; *** "Installing" wizard page
+WizardInstalling=¥¿¦b¦w¸Ë
+InstallingLabel=½ÐµyÔ¡A¦w¸Ëµ{¦¡¥¿¦b±N [name] ¦w¸Ë¨ì±zªº¹q¸£¤W¡C
+
+; *** "Setup Completed" wizard page
+FinishedHeadingLabel=¦w¸Ë§¹¦¨
+FinishedLabelNoIcons=¦w¸Ëµ{¦¡¤w¸g±N [name] ¦w¸Ë¦b±zªº¹q¸£¤W¡C
+FinishedLabel=¦w¸Ëµ{¦¡¤w¸g±N [name] ¦w¸Ë¦b±zªº¹q¸£¤¤¡A±z¥i¥H¿ï¾Üµ{¦¡ªº¹Ï¥Ü¨Ó°õ¦æ¸ÓÀ³¥Îµ{¦¡¡C
+ClickFinish=«ö [§¹¦¨] ¥Hµ²§ô¦w¸Ëµ{¦¡¡C
+FinishedRestartLabel=n§¹¦¨ [name] ªº¦w¸Ë¡A¦w¸Ëµ{¦¡¥²¶·«·s±Ò°Ê±zªº¹q¸£¡C±z·Qn²{¦b«·s±Ò°Ê¹q¸£¶Ü?
+FinishedRestartMessage=n§¹¦¨ [name] ªº¦w¸Ë¡A¦w¸Ëµ{¦¡¥²¶·«·s±Ò°Ê±zªº¹q¸£¡C%n%n±z·Qn²{¦b«·s±Ò°Ê¹q¸£¶Ü?
+ShowReadmeCheck=¬O¡A§Ún¾\ŪŪ§ÚÀɮסC
+YesRadio=¬O¡A¥ß§Y«·s±Ò°Ê¹q¸£(&Y)
+NoRadio=§_¡A§Úµy«á«·s±Ò°Ê¹q¸£(&N)
+; used for example as 'Run MyProg.exe'
+RunEntryExec=°õ¦æ %1
+; used for example as 'View Readme.txt'
+RunEntryShellExec=À˵ø %1
+
+; *** "Setup Needs the Next Disk" stuff
+ChangeDiskTitle=¦w¸Ëµ{¦¡»Ýn¤U¤@±iºÏ¤ù
+SelectDiskLabel2=½Ð´¡¤JºÏ¤ù %1¡AµM«á«ö [½T©w]¡C%n%n¦pªGÀɮפ£¦b¥H¤U©ÒÅã¥Üªº¸ê®Æ§¨¤§¤¤¡A½Ð¿é¤J¥¿½Tªº¸ê®Æ§¨¦WºÙ©Î«ö [ÂsÄý] ¿ï¨ú¡C
+PathLabel=¸ô®|(&P):
+FileNotInDir2=ÀÉ®× "%1" µLªk¦b "%2" §ä¨ì¡C½Ð´¡¤J¥¿½TªººÏ¤ù©Î¿ï¾Ü¨ä¥¦ªº¸ê®Æ§¨¡C
+SelectDirectoryLabel=½Ð«ü©w¤U¤@±iºÏ¤ùªº¦ì¸m¡C
+
+; *** Installation phase messages
+SetupAborted=¦w¸Ë¨S¦³§¹¦¨¡C%n%n½Ð§ó¥¿°ÝÃD«á«·s¦w¸Ë¤@¦¸¡C
+EntryAbortRetryIgnore=«ö [«¸Õ] «¸Õ¤@¦¸¡A«ö¤U [²¤¹L] ¸õ¹L³oÓÀɮסA©Î«ö¤U [¤¤¤î] µ²§ô¦w¸Ë¡C
+
+; *** Installation status messages
+StatusCreateDirs=¥¿¦b«Ø¥ß¸ê®Æ§¨...
+StatusExtractFiles=¥¿¦b¸ÑÀ£ÁYÀÉ®×...
+StatusCreateIcons=¥¿¦b«Ø¥ßµ{¦¡¶°¹Ï¥Ü...
+StatusCreateIniEntries=¼g¤J INI Àɮתº¶µ¥Ø...
+StatusCreateRegistryEntries=¥¿¦b§ó·s¨t²Îµn¿ý...
+StatusRegisterFiles=¥¿¦bµn¿ýÀÉ®×...
+StatusSavingUninstall=Àx¦s¸Ñ°£¦w¸Ë¸ê°T...
+StatusRunProgram=¥¿¦b§¹¦¨¦w¸Ë...
+StatusRollback=¥¿¦b´_ìÅܧó...
+
+; *** Misc. errors
+ErrorInternal2=¤º³¡¿ù»~: %1¡C
+ErrorFunctionFailedNoCode=%1 ¥¢±Ñ¡C
+ErrorFunctionFailed=%1 ¥¢±Ñ¡C¥N½X %2¡C
+ErrorFunctionFailedWithMessage=%1 ¥¢±Ñ¡C¥N½X %2¡C%n%3
+ErrorExecutingProgram=µLªk°õ¦æÀÉ®×:%n%1
+
+; *** Registry errors
+ErrorRegOpenKey=µLªk¶}±Òµn¿ýÁä:%n%1\%2
+ErrorRegCreateKey=µLªk«Ø¥ßµn¿ý¶µ¥Ø:%n%1\%2
+ErrorRegWriteKey=µLªkÅܧóµn¿ý¶µ¥Ø:%n%1\%2
+
+; *** INI errors
+ErrorIniEntry=µLªk«Ø¥ß INI ¶µ¥Ø "%1"¡C
+
+; *** File copying errors
+FileAbortRetryIgnore=«ö [«¸Õ] ¦A¸Õ¤@¦¸¡A«ö [²¤¹L] ¸õ¹L³oÓÀɮס]¤£«Øij¡^¡A©Î«ö [¤¤¤î] µ²§ô¦w¸Ë¡C
+FileAbortRetryIgnore2=«ö [«¸Õ] ¦A¸Õ¤@¦¸¡A«ö [²¤¹L] Ä~Äò¶i¦æ¡]¤£«Øij¡^¡A©Î«ö [¤¤¤î] µ²§ô¦w¸Ë¡C
+SourceIsCorrupted=¨Ó·½Àɮפw¸g·l·´¡C
+SourceDoesntExist=¨Ó·½ÀÉ®× "%1" ¤£¦s¦b¡C
+ExistingFileReadOnly=ÀÉ®×Äݩʤw³]¬°°ßŪ¡C%n%n«ö [«¸Õ] ±N°ßŪÄݩʲ¾°£¨Ã¦A¸Õ¤@¦¸¡A«ö [²¤¹L] ¸õ¹L³oÓÀɮסA©Î«ö [¤¤¤î] µ²§ô¦w¸Ë¡C
+ErrorReadingExistingDest=Ū¨ú¤@Ó¤w¦s¦bªºÀɮ׮ɵo¥Í¿ù»~:
+FileExists=Àɮפw¸g¦s¦b¡C±zn¨ú¥N¥Ø«eªºÀɮ׶Ü?
+ExistingFileNewer=¦s¦bªºÀɮת©¥»¤ñ¸û·s¡A«Øij±z«O¯d¥Ø«e¤w¦s¦bªºÀɮסC%n%n±zn«O¯d¥Ø«e¤w¦s¦bªºÀɮ׶Ü?
+ErrorChangingAttr=¦bÅܧóÀÉ®×Äݩʮɵo¥Í¿ù»~:
+ErrorCreatingTemp=¦b¥Øªº¸ê®Æ§¨¤¤«Ø¥ßÀɮ׮ɵo¥Í¿ù»~:
+ErrorReadingSource=Ū¨úì©lÀɮ׮ɵo¥Í¿ù»~:
+ErrorCopying=½Æ»sÀɮ׮ɵo¥Í¿ù»~:
+ErrorReplacingExistingFile=¨ú¥NÀɮ׮ɵo¥Í¿ù»~:
+ErrorRestartReplace=«·s±Ò°Ê¹q¸£«á¨ú¥NÀÉ®×¥¢±Ñ:
+ErrorRenamingTemp=¦b¥Øªº¸ê®Æ§¨ÅܧóÀɮצWºÙ®Éµo¥Í¿ù»~:
+ErrorRegisterServer=µLªkµn¿ý DLL/OCX ÀÉ®×: %1¡C
+ErrorRegSvr32Failed=°õ¦æ RegSvr32 ¥¢±Ñ¡A¿ù»~½X¬° %1¡C
+ErrorRegisterTypeLib=µLªkµn¿ý Type Library: %1¡C
+
+; *** Post-installation errors
+ErrorOpeningReadme=¶}±ÒŪ§ÚÀɮ׮ɵo¥Í¿ù»~¡C
+ErrorRestartingComputer=¦w¸Ëµ{¦¡µLªk«·s±Ò°Ê¹q¸£¡A½Ð¥H¤â°Ê¤è¦¡¦Û¦æ«·s±Ò°Ê¹q¸£¡C
+
+; *** Uninstaller messages
+UninstallNotFound=ÀÉ®× "%1" ¤£¦s¦b¡AµLªk²¾°£µ{¦¡¡C
+UninstallOpenError=µLªk¶}±ÒÀÉ®× "%1"¡AµLªk²¾°£µ{¦¡¡C
+UninstallUnsupportedVer=³oÓª©¥»ªº¸Ñ°£¦w¸Ëµ{¦¡µLªk¿ëÃÑ°O¿ýÀÉ "%1" ¤§®æ¦¡¡AµLªk¸Ñ°£¦w¸Ë¡C
+UninstallUnknownEntry=¸Ñ°£¦w¸Ë°O¿ýÀɤ¤µo²{¥¼ª¾ªº°O¿ý (%1)¡C
+ConfirmUninstall=±z½T©wn§¹¥þ²¾°£ %1 ¤Î¨ä¬ÛÃöªºÀɮ׶Ü?
+UninstallOnlyOnWin64=³oÓµ{¦¡¥u¯à¦b 64 ¦ì¤¸ªº Windows ¤W¸Ñ°£¦w¸Ë¡C
+OnlyAdminCanUninstall=³oÓµ{¦¡n¨ã³Æ¨t²ÎºÞ²zûÅvªº¨Ï¥ÎªÌ¤è¥i¸Ñ°£¦w¸Ë¡C
+UninstallStatusLabel=¥¿¦b±q±zªº¹q¸£²¾°£ %1 ¤¤¡A½ÐµyÔ...
+UninstalledAll=%1 ¤w¸g¦¨¥\±q±zªº¹q¸£¤¤²¾°£¡C
+UninstalledMost=%1 ¸Ñ°£¦w¸Ë§¹¦¨¡C%n%n¬Y¨ÇÀɮפΤ¸¥óµLªk²¾°£¡A±z¥i¥H¦Û¦æ§R°£³o¨ÇÀɮסC
+UninstalledAndNeedsRestart=n§¹¦¨ %1 ªº¸Ñ°£¦w¸Ëµ{§Ç¡A±z¥²¶·«·s±Ò°Ê¹q¸£¡C%n%n±z·Qn²{¦b«·s±Ò°Ê¹q¸£¶Ü?
+UninstallDataCorrupted=ÀÉ®× "%1" ¤w¸g·l·´¡AµLªk¸Ñ°£¦w¸Ë¡C
+
+; *** Uninstallation phase messages
+ConfirmDeleteSharedFileTitle=²¾°£¦@¥ÎÀÉ®×
+ConfirmDeleteSharedFile2=¨t²ÎÅã¥Ü¤U¦C¦@¥ÎÀɮפw¤£¦A³Q¥ô¦óµ{¦¡©Ò¨Ï¥Î¡A±zn²¾°£³o¨ÇÀɮ׶Ü?%n%n%1%n%nÕY±z²¾°£¤F¥H¤WÀɮצý¤´¦³µ{¦¡»Ýn¨Ï¥Î¥¦Ì¡A±N³y¦¨³o¨Çµ{¦¡µLªk¥¿±`°õ¦æ¡A¦]¦¹±zYµLªk½T©w½Ð¿ï¾Ü [§_]¡C«O¯d³o¨ÇÀɮצb±zªº¨t²Î¤¤¤£·|³y¦¨¥ô¦ó·l®`¡C
+SharedFileNameLabel=ÀɮצWºÙ:
+SharedFileLocationLabel=¦ì¸m:
+WizardUninstalling=¸Ñ°£¦w¸Ëª¬ºA
+StatusUninstalling=¥¿¦b¸Ñ°£¦w¸Ë %1...
+
+; The custom messages below aren't used by Setup itself, but if you make
+; use of them in your scripts, you'll want to translate them.
+
+[CustomMessages]
+
+NameAndVersion=%1 ª©¥» %2
+AdditionalIcons=ªþ¥[¹Ï¥Ü:
+CreateDesktopIcon=«Ø¥ß®à±¹Ï¥Ü(&D)
+CreateQuickLaunchIcon=«Ø¥ß§Ö³t±Ò°Ê¹Ï¥Ü(&Q)
+ProgramOnTheWeb=%1 ªººô¯¸
+UninstallProgram=¸Ñ°£¦w¸Ë %1
+LaunchProgram=±Ò°Ê %1
+AssocFileExtension=±N %1 »PÀÉ®×°ÆÀɦW %2 ²£¥ÍÃöÁp(&A)
+AssocingFileExtension=¥¿¦b±N %1 »PÀÉ®×°ÆÀɦW %2 ²£¥ÍÃöÁp...
diff --git a/gnucash.iss.in b/gnucash.iss.in
index 259715e..0d931f3 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -394,6 +394,7 @@ Name: "lv"; MessagesFile: "@prefix@\share\@PACKAGE@\Latvian-1-5.1.11.isl"; InfoA
Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"; InfoAfterFile: "@prefix@\share\@PACKAGE@\doc\README-nl.win32-bin.txt"
Name: "pt_BR"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
Name: "zh_CN"; MessagesFile: "@prefix@\share\@PACKAGE@\ChineseSimp-12-5.1.11.isl"; InfoAfterFile: "@prefix@\share\@PACKAGE@\doc\README-zh_CN.win32-bin.txt"
+Name: "zh_TW"; MessagesFile: "@prefix@\share\@PACKAGE@\ChineseTrad-2-5.1.11.isl"; InfoAfterFile: "@prefix@\share\@PACKAGE@\doc\README-zh_TW.win32-bin.txt"
;; The following language files are available as well, in alphabetical
;; order: Basque, BrazilianPortuguese, Catalan, Czech, Danish, Dutch,
@@ -446,6 +447,7 @@ ja.LanguageCodePage=932
nl.LanguageCodePage=1252
pt_BR.LanguageCodePage=1252
zh_CN.LanguageCodePage=936
+zh_TW.LanguageCodePage=950
;; ;;;;;;;;;;;;;;;;;;;;
;; German translation
@@ -718,3 +720,35 @@ zh_CN.IconComment_InstallFQ=å®‰è£…åœ¨çº¿ä»·æ ¼æ£€ç´¢æ‰€å¿…éœ€çš„ Perl Finance-Qu
zh_CN.IconName_Uninstall=å¸è½½ GnuCash
zh_CN.IconComment_Uninstall=å¸è½½è´¢åŠ¡ç®¡ç†è½¯ä»¶ GnuCash
+;; ;;;;;;;;;;;;;;;;;
+;; Traditional Chinese translation
+
+; *** "Select Components" wizard page
+zh_TW.FullInstall=完整安è£
+zh_TW.CustomInstall=自訂安è£
+zh_TW.CreateDesktopIcon=產生桌é¢åœ–示
+zh_TW.CreateMenuLink=產生開始功能表圖示
+zh_TW.RunPrg=ç¾åœ¨é–‹å§‹åŸ·è¡Œ GnuCash
+zh_TW.AdditionalIcons=建立這些圖示:
+zh_TW.StatusMsgFirewall=æ£åœ¨å®‰è£ Windows 防ç«ç‰†è¦å‰‡...
+; *** "Another install" wizard page
+; %1 in the following messages will be replaced with the application name and version, like "GnuCash 2.3.15"
+zh_TW.AIWP_Title=發ç¾å·²å®‰è£éŽ
+zh_TW.AIWP_Description=%1 已經安è£æ–¼ç³»çµ±ä¸
+zh_TW.AIWP_Message=èˆŠç‰ˆå¿…é ˆå…ˆç§»é™¤æ‰èƒ½ç¹¼çºŒã€‚%n%n若您ä¸æƒ³ç§»é™¤ï¼Œç¾åœ¨å°±é»žé¸ã€Œå–消ã€ä¸æ–·å®‰è£ã€‚%n%n點é¸ã€Œä¸‹ä¸€æ¥ã€æœƒç§»é™¤ %1 並繼續安è£ã€‚%n%n注æ„: åªæœ‰ç¨‹å¼æœƒè¢«ç§»é™¤ï¼Œä¸æœƒå½±éŸ¿åˆ°æ‚¨çš„財務資料å˜æª”。
+
+zh_TW.MainFiles=GnuCash 程å¼
+zh_TW.TranslFiles=ç¿»è¯æª”
+zh_TW.TemplFiles=會計科目範本檔
+
+zh_TW.IconComment_GnuCash=GnuCash 自由財務管ç†
+zh_TW.IconName_README=顯示 README
+zh_TW.IconComment_README=顯示 README 檔
+zh_TW.IconFilename_README=README-zh_TW.win32-bin.txt
+zh_TW.IconName_FAQ=常見å•é¡Œ (線上)
+zh_TW.IconName_Bugzilla=å›žå ±ç¨‹å¼ Bug (線上)
+zh_TW.IconName_InstallFQ=安è£ç¶²è·¯å ±åƒ¹æˆªå–功能
+zh_TW.IconComment_InstallFQ=安è£æˆªå–ç¶²è·¯å ±åƒ¹æ‰€éœ€çš„ Perl Finance-Quote æ¨¡çµ„ã€‚éœ€è¦ ActivePerl 5.8 或 5.10
+zh_TW.IconName_Theme=é¸æ“‡ä»‹é¢é¢¨æ ¼
+zh_TW.IconName_Uninstall=åå®‰è£ GnuCash
+zh_TW.IconComment_Uninstall=å安è£è²¡å‹™ç®¡ç†å“¡ GnuCash
commit b4b1c4f4b9e8dbcbe4b3686523ff4090ce66ce00
Author: Christian Stimming <stimming at tuhh.de>
Date: Wed Feb 16 20:16:35 2011 +0000
Win32 build: Updated aqbanking5 version numbers
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20305 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 4f14267..0893bc8 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -332,8 +332,8 @@ set_default AQBANKING5 no
# needed.
if [ "$AQBANKING5" = "yes" ]; then
- GWENHYWFAR_VERSION="4.0.5"
- set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=58&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
+ GWENHYWFAR_VERSION="4.0.7"
+ set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=59&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
else
GWENHYWFAR_VERSION="3.11.3"
set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=31&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
@@ -346,8 +346,8 @@ set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-${KTOBLZCHECK_VE
# ktoblzcheck is being installed into GWENHYWFAR_DIR
if [ "$AQBANKING5" = "yes" ]; then
- AQBANKING_VERSION="5.0.3"
- set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=76&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
+ AQBANKING_VERSION="5.0.4"
+ set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=77&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
set_default AQBANKING_WITH_QT no
else
AQBANKING_VERSION="4.2.4"
commit a460456424324aea90d047559d61df1b3f9d298d
Author: Christian Stimming <stimming at tuhh.de>
Date: Mon Feb 14 19:34:52 2011 +0000
Win32 build: Fix outdated (and broken) URL of ActivePerl.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20301 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index a2ea726..4f14267 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -164,7 +164,7 @@ set_default READLINE_BIN_URL "$SF_MIRROR/gnuwin32/readline-5.0-1-bin.zip"
set_default READLINE_LIB_URL "$SF_MIRROR/gnuwin32/readline-5.0-1-lib.zip"
set_default READLINE_DIR $GLOBAL_DIR\\readline
-set_default ACTIVE_PERL_URL "http://downloads.activestate.com/ActivePerl/releases/5.10.1.1007/ActivePerl-5.10.1.1007-MSWin32-x86-291969.zip"
+set_default ACTIVE_PERL_URL "http://downloads.activestate.com/ActivePerl/releases/5.10.1.1008/ActivePerl-5.10.1.1008-MSWin32-x86-294165.zip"
set_default ACTIVE_PERL_DIR $GLOBAL_DIR\\active-perl
set_default AUTOCONF_URL "http://ftp.gnu.org/gnu/autoconf/autoconf-2.63.tar.bz2"
commit af8f525f06d8e90bd367cc0a358ac8160a87f82b
Author: Christian Stimming <stimming at tuhh.de>
Date: Sat Feb 12 20:32:17 2011 +0000
Win32 build: Fix some cross-compiling issues.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20292 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
index 30b1178..4745d1b 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -569,7 +569,7 @@ function inst_gnome() {
wget_unpacked $LIBART_LGPL_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GTK_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GTK_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- echo 'gtk-theme-name = "MS-Windows"' > $GNOME_DIR/etc/gtk-2.0/gtkrc
+ echo 'gtk-theme-name = "MS-Windows"' > ${_GNOME_UDIR}/etc/gtk-2.0/gtkrc
wget_unpacked $INTLTOOL_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $ORBIT2_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $ORBIT2_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
@@ -936,9 +936,9 @@ function inst_libofx() {
--prefix=${_LIBOFX_UDIR} \
--with-opensp-includes=${_OPENSP_UDIR}/include/OpenSP \
--with-opensp-libs=${_OPENSP_UDIR}/lib \
- CPPFLAGS="-DOS_WIN32" \
+ CPPFLAGS="-DOS_WIN32 ${GNOME_CPPFLAGS}" \
--disable-static
- make LDFLAGS="${LDFLAGS} -no-undefined"
+ make LDFLAGS="${LDFLAGS} -no-undefined ${GNOME_LDFLAGS} -liconv"
make install
qpopd
quiet ${PKG_CONFIG} --exists libofx || die "Libofx not installed correctly"
@@ -982,6 +982,7 @@ function inst_gwenhywfar() {
./configure ${HOST_XCOMPILE} \
--with-libgcrypt-prefix=$_GNUTLS_UDIR \
--disable-binreloc \
+ --disable-ssl \
--prefix=$_GWENHYWFAR_UDIR \
--with-guis=gtk2 \
CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS} `pkg-config --cflags gtk+-2.0`" \
@@ -997,6 +998,7 @@ function inst_gwenhywfar() {
./configure ${HOST_XCOMPILE} \
--with-libgcrypt-prefix=$_GNUTLS_UDIR \
--disable-binreloc \
+ --disable-ssl \
--prefix=$_GWENHYWFAR_UDIR \
CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS}" \
LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GNUTLS_LDFLAGS} -lintl"
@@ -1211,6 +1213,14 @@ function inst_libdbi() {
if [ -n "$LIBDBI_PATCH2" -a -f "$LIBDBI_PATCH2" ]; then
patch -p1 < $LIBDBI_PATCH2
fi
+ if [ "$CROSS_COMPILE" = "yes" ]; then
+ rm ltmain.sh aclocal.m4
+ libtoolize --force
+ aclocal -I ${_AUTOTOOLS_UDIR}/share/aclocal
+ autoheader
+ automake --add-missing
+ autoconf
+ fi
./configure ${HOST_XCOMPILE} \
--disable-docs \
--prefix=${_LIBDBI_UDIR}
@@ -1331,7 +1341,7 @@ function inst_webkit() {
function svn_up() {
mkdir -p $_REPOS_UDIR
- qpushd $REPOS_DIR
+ qpushd $_REPOS_UDIR
if [ -x .svn ]; then
setup "svn update in ${REPOS_DIR}"
svn up -r ${SVN_REV}
commit a5917e9db5d4663d02f265193f0f13f6098e161b
Author: Christian Stimming <stimming at tuhh.de>
Date: Sat Feb 12 19:28:52 2011 +0000
Win32 build: Update some version numbers: libofx, gwenhywfar, aqbanking
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20291 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 2ed31df..a2ea726 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -321,9 +321,9 @@ set_default OPENSP_URL "$SF_MIRROR/openjade/OpenSP-1.5.2.tar.gz"
set_default OPENSP_DIR $GLOBAL_DIR\\opensp
set_default OPENSP_PATCH `pwd`/opensp-1.5.2-patch.diff
-set_default LIBOFX_URL "$SF_MIRROR/libofx/libofx-0.8.3.tar.gz"
+set_default LIBOFX_URL "$SF_MIRROR/libofx/libofx-0.9.2.tar.gz"
set_default LIBOFX_DIR $GLOBAL_DIR\\libofx
-set_default LIBOFX_PATCH `pwd`/libofx-0.8.3-patch.diff
+#set_default LIBOFX_PATCH `pwd`/libofx-0.8.3-patch.diff
## online banking: gwenhywfar+aqbanking
set_default AQBANKING5 no
@@ -332,8 +332,8 @@ set_default AQBANKING5 no
# needed.
if [ "$AQBANKING5" = "yes" ]; then
- GWENHYWFAR_VERSION="4.0.2"
- set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=55&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
+ GWENHYWFAR_VERSION="4.0.5"
+ set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=58&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
else
GWENHYWFAR_VERSION="3.11.3"
set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=31&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
@@ -341,13 +341,13 @@ else
fi
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
-KTOBLZCHECK_VERSION="1.29"
+KTOBLZCHECK_VERSION="1.31"
set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-${KTOBLZCHECK_VERSION}.tar.gz"
# ktoblzcheck is being installed into GWENHYWFAR_DIR
if [ "$AQBANKING5" = "yes" ]; then
- AQBANKING_VERSION="5.0.1"
- set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=74&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
+ AQBANKING_VERSION="5.0.3"
+ set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=76&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
set_default AQBANKING_WITH_QT no
else
AQBANKING_VERSION="4.2.4"
commit 15bc59433d29ec9c4f646005aa20105db5918b4f
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri Jan 21 22:27:48 2011 +0000
Bug #638762 - Windows 7 64-bit: GnuCash will not start due to existing SCHEME_LIBRARY_PATH env variable
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20141 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/gnucash.iss.in b/gnucash.iss.in
index 0fc0603..259715e 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -340,7 +340,7 @@ procedure MyAfterInstallEnvironment();
var
EnvFile, EtcDir: String;
iLineCounter, iSize : Integer;
- EnvStringList: TArrayOfString;
+ EnvStrList: TArrayOfString;
Res: Boolean;
begin
{ Make some Windows-only changes to the etc/@PACKAGE@/environment file }
@@ -353,19 +353,24 @@ begin
EtcDir := ExtractFileDir(EnvFile);
{ Load the current contents of the environment file }
- Res := LoadStringsFromFile(EnvFile, EnvStringList);
+ Res := LoadStringsFromFile(EnvFile, EnvStrList);
if Res = False then
MsgBox('Error on reading ' + EnvFile + ' for completing the installation', mbInformation, MB_OK);
- iSize := GetArrayLength(EnvStringList);
+ iSize := GetArrayLength(EnvStrList);
for iLineCounter := 0 to iSize-1 do
begin
- { Adapt GUILE_LOAD_PATH parameter }
- if (Pos('GUILE_LOAD_PATH', EnvStringList[iLineCounter]) = 1) then
- StringChangeEx(EnvStringList[iLineCounter], '{GUILE_LOAD_PATH}', '{GNC_HOME}/share/guile/1.6;{GUILE_LOAD_PATH}', True);
+ { Adapt GUILE_LOAD_PATH parameter and prevent cygwin interference in SCHEME_LIBRARY_PATH }
+ if (Pos('GUILE_LOAD_PATH', EnvStrList[iLineCounter]) = 1) then
+ begin
+ StringChangeEx(EnvStrList[iLineCounter], '{GUILE_LOAD_PATH}', '{GNC_HOME}/share/guile/1.6;{GUILE_LOAD_PATH}', True);
+
+ EnvStrList[iLineCounter] := EnvStrList[iLineCounter] + #13#10 + '# Clear SCHEME_LIBRARY_PATH to prevent interference from other guile installations (like cygwin)' + #13#10;
+ EnvStrList[iLineCounter] := EnvStrList[iLineCounter] + 'SCHEME_LIBRARY_PATH=' + #13#10;
+ end;
{ Adapt GNC_DBD_DIR parameter }
- if (Pos('GNC_DBD_DIR', EnvStringList[iLineCounter]) > 0) then
- EnvStringList[iLineCounter] := 'GNC_DBD_DIR={GNC_HOME}/lib/dbd';
+ if (Pos('GNC_DBD_DIR', EnvStrList[iLineCounter]) > 0) then
+ EnvStrList[iLineCounter] := 'GNC_DBD_DIR={GNC_HOME}/lib/dbd';
end;
{ Save the final file }
@@ -373,7 +378,7 @@ begin
if Res = False then
MsgBox('Error on creating ' + EtcDir + ' for completing the installation', mbInformation, MB_OK);
- Res := SaveStringsToFile(EnvFile, EnvStringList, False);
+ Res := SaveStringsToFile(EnvFile, EnvStrList, False);
if Res = False then
MsgBox('Error on saving ' + EnvFile + ' for completing the installation', mbInformation, MB_OK);
end;
commit 0a330acbb1775837b17ceef88df0b66b2e291c69
Author: Christian Stimming <stimming at tuhh.de>
Date: Sun Jan 16 19:33:20 2011 +0000
Win32 build: Aqbanking has a patch now, but doesn't need autotools called.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20114 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
index ff24a71..30b1178 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1096,9 +1096,9 @@ function inst_aqbanking() {
inst_qt4
if [ -n "$AQBANKING_PATCH" -a -f "$AQBANKING_PATCH" ] ; then
patch -p1 < $AQBANKING_PATCH
- automake
- aclocal -I m4 ${ACLOCAL_FLAGS}
- autoconf
+ #automake
+ #aclocal -I m4 ${ACLOCAL_FLAGS}
+ #autoconf
fi
./configure ${HOST_XCOMPILE} \
--with-gwen-dir=${_GWENHYWFAR_UDIR} \
@@ -1115,9 +1115,9 @@ function inst_aqbanking() {
else
if [ -n "$AQBANKING_PATCH" -a -f "$AQBANKING_PATCH" ] ; then
patch -p1 < $AQBANKING_PATCH
- automake
- aclocal -I m4 ${ACLOCAL_FLAGS}
- autoconf
+ #automake
+ #aclocal -I m4 ${ACLOCAL_FLAGS}
+ #autoconf
fi
./configure ${HOST_XCOMPILE} \
--with-gwen-dir=${_GWENHYWFAR_UDIR} \
commit 31639c42baf5fb2842d93c8190addc7e4441ae64
Author: Christian Stimming <stimming at tuhh.de>
Date: Sat Jan 15 20:33:28 2011 +0000
Bug #639498: Fix aqbanking-4.2.4 issue with "execute online transfer" on WinXP.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20108 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/aqbanking-4.2.4-r2132-patch.diff b/aqbanking-4.2.4-r2132-patch.diff
new file mode 100644
index 0000000..b94803a
--- /dev/null
+++ b/aqbanking-4.2.4-r2132-patch.diff
@@ -0,0 +1,56 @@
+--- trunk/src/plugins/parsers/dtaus/dtaus-export.c 2011/01/11 19:59:25 2131
++++ trunk/src/plugins/parsers/dtaus/dtaus-export.c 2011/01/13 21:47:48 2132
+@@ -531,7 +531,7 @@
+ return -1;
+ }
+ AB_Value_AddValue(sumDEM, val);
+- snprintf(buffer, sizeof(buffer), "%011.0lf", AB_Value_GetValueAsDouble(val)*100.0);
++ snprintf(buffer, sizeof(buffer), "%011.0f", AB_Value_GetValueAsDouble(val)*100.0);
+ AB_Value_free(val);
+ if (AHB_DTAUS__AddNum(dst, 11, buffer)) {
+ DBG_ERROR(AQBANKING_LOGDOMAIN, "Error writing to buffer");
+@@ -587,7 +587,7 @@
+ return -1;
+ }
+ AB_Value_AddValue(sumEUR, val);
+- snprintf(buffer, sizeof(buffer), "%011.0lf", AB_Value_GetValueAsDouble(val)*100.0);
++ snprintf(buffer, sizeof(buffer), "%011.0f", AB_Value_GetValueAsDouble(val)*100.0);
+ AB_Value_free(val);
+ if (AHB_DTAUS__AddNum(dst, 11, buffer)) {
+ DBG_ERROR(AQBANKING_LOGDOMAIN, "Error writing to buffer");
+@@ -768,7 +768,7 @@
+ }
+
+ /* field 5: sum of DEM values */
+- snprintf(buffer, sizeof(buffer), "%013.0lf",
++ snprintf(buffer, sizeof(buffer), "%013.0f",
+ AB_Value_GetValueAsDouble(sumDEM)*100.0);
+ if (AHB_DTAUS__AddNum(dst, 13, buffer)) {
+ DBG_ERROR(AQBANKING_LOGDOMAIN, "Error writing to buffer");
+@@ -776,7 +776,7 @@
+ }
+
+ /* field 6: sum of peer account ids */
+- snprintf(buffer, sizeof(buffer), "%017.0lf",
++ snprintf(buffer, sizeof(buffer), "%017.0f",
+ AB_Value_GetValueAsDouble(sumAccountIds));
+ if (AHB_DTAUS__AddNum(dst, 17, buffer)) {
+ DBG_ERROR(AQBANKING_LOGDOMAIN, "Error writing to buffer");
+@@ -784,7 +784,7 @@
+ }
+
+ /* field 7: sum of peer bank codes */
+- snprintf(buffer, sizeof(buffer), "%017.0lf",
++ snprintf(buffer, sizeof(buffer), "%017.0f",
+ AB_Value_GetValueAsDouble(sumBankCodes));
+ if (AHB_DTAUS__AddNum(dst, 17, buffer)) {
+ DBG_ERROR(AQBANKING_LOGDOMAIN, "Error writing to buffer");
+@@ -792,7 +792,7 @@
+ }
+
+ /* field 8: sum of EUR values */
+- snprintf(buffer, sizeof(buffer), "%013.0lf",
++ snprintf(buffer, sizeof(buffer), "%013.0f",
+ AB_Value_GetValueAsDouble(sumEUR)*100.0);
+ if (AHB_DTAUS__AddNum(dst, 13, buffer)) {
+ DBG_ERROR(AQBANKING_LOGDOMAIN, "Error writing to buffer");
diff --git a/defaults.sh b/defaults.sh
index 648f2c1..2ed31df 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -352,7 +352,7 @@ if [ "$AQBANKING5" = "yes" ]; then
else
AQBANKING_VERSION="4.2.4"
set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=50&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
- #set_default AQBANKING_PATCH `pwd`/aqbanking-4.1.6-patch.diff
+ set_default AQBANKING_PATCH `pwd`/aqbanking-4.2.4-r2132-patch.diff
set_default AQBANKING_WITH_QT yes
fi
set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
commit 111ff3faca29cf23bba6026f91d598d4e6d5bb89
Author: Mike Alexander <mta at umich.edu>
Date: Sun Dec 12 06:48:20 2010 +0000
Move gnc-version.h and gnc-svninfo.h from gnome-utils to core-utils.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19928 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_package.sh b/build_package.sh
index 3cd1a76..092132e 100644
--- a/build_package.sh
+++ b/build_package.sh
@@ -47,7 +47,7 @@ rm -rf ${_DIST_UDIR}
_BUILD_UDIR=`unix_path $BUILD_DIR`
_GNUCASH_UDIR=`unix_path $GNUCASH_DIR`
PKG_VERSION=`grep PACKAGE_VERSION ${_BUILD_UDIR}/config.h | cut -d" " -f3 | cut -d\" -f2 `
-SVN_REV=`grep GNUCASH_SVN_REV ${_BUILD_UDIR}/src/gnome-utils/gnc-svninfo.h | cut -d" " -f3 | cut -d\" -f2 `
+SVN_REV=`grep GNUCASH_SVN_REV ${_BUILD_UDIR}/src/core-utils/gnc-svninfo.h | cut -d" " -f3 | cut -d\" -f2 `
# Choose the output filename based on our "build_from_tarball" setting
# Make sure this logic matches the logic in dist.sh!
diff --git a/dist-impl.sh b/dist-impl.sh
index 00d79d4..315609b 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -286,7 +286,7 @@ function dist_finish() {
if [ "$BUILD_FROM_TARBALL" = "no" ]; then
# And changing output filename
PKG_VERSION=`grep PACKAGE_VERSION ${_BUILD_UDIR}/config.h | cut -d" " -f3 | cut -d\" -f2 `
- SVN_REV=`grep GNUCASH_SVN_REV ${_BUILD_UDIR}/src/gnome-utils/gnc-svninfo.h | cut -d" " -f3 | cut -d\" -f2 `
+ SVN_REV=`grep GNUCASH_SVN_REV ${_BUILD_UDIR}/src/core-utils/gnc-svninfo.h | cut -d" " -f3 | cut -d\" -f2 `
SETUP_FILENAME="gnucash-${PKG_VERSION}-svn-r${SVN_REV}-setup.exe"
qpushd ${_GNUCASH_UDIR}
mv gnucash-${PKG_VERSION}-setup.exe ${SETUP_FILENAME}
commit 76b86ce6860f8447c9033d098ec57724e1a06500
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu Nov 18 15:33:53 2010 +0000
Bug #633550 - Help and concepts guide are missing from the prebuilt binary (because xsltproc chokes on undefined entities)
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19827 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 2e74165..648f2c1 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -381,7 +381,8 @@ set_default LIBDBI_DRIVERS_PATCH4 `pwd`/libdbi-drivers-dbd_pgsql.c.patch
set_default CMAKE_URL "http://www.cmake.org/files/v2.8/cmake-2.8.0-win32-x86.zip"
set_default CMAKE_DIR $GLOBAL_DIR\\cmake
-set_default DOCBOOK_XSL_URL "$SF_MIRROR/docbook/docbook-xsl-1.72.0.zip"
+set_default DOCBOOK_XSL_URL "$SF_MIRROR/docbook/docbook-xsl-1.76.1.zip"
+set_default DOCBOOK_DTD_URL "http://www.oasis-open.org/docbook/xml/4.1.2/docbkx412.zip"
set_default UPDATE_DOCS yes
set_default DOCS_REV "HEAD"
set_default DOCS_URL "http://svn.gnucash.org/repo/gnucash-docs/trunk"
diff --git a/install-impl.sh b/install-impl.sh
index e809a5b..ff24a71 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1493,7 +1493,7 @@ function make_chm() {
_XSLTPROC_OPTS=$3
echo "Processing $_CHM_TYPE ($_CHM_LANG) ..."
qpushd $_CHM_TYPE/$_CHM_LANG
- xsltproc $XSLTPROCFLAGS $_XSLTPROC_OPTS ../../../docbook-xsl/htmlhelp/htmlhelp.xsl gnucash-$_CHM_TYPE.xml
+ xsltproc $XSLTPROCFLAGS $_XSLTPROC_OPTS --path ../../../docbookx-dtd ../../../docbook-xsl/htmlhelp/htmlhelp.xsl gnucash-$_CHM_TYPE.xml
count=0
echo >> htmlhelp.hhp
echo "[ALIAS]" >> htmlhelp.hhp
@@ -1518,13 +1518,23 @@ function make_chm() {
}
function inst_docs() {
+ setup "Docbook xsl and dtd"
_DOCS_UDIR=`unix_path $DOCS_DIR`
if [ ! -d $_DOCS_UDIR/docbook-xsl ] ; then
wget_unpacked $DOCBOOK_XSL_URL $DOWNLOAD_DIR $DOCS_DIR
# add a pause to allow windows to realize that the files now exist
sleep 1
mv $_DOCS_UDIR/docbook-xsl-* $_DOCS_UDIR/docbook-xsl
+ else
+ echo "Docbook xsl already installed. Skipping."
+ fi
+ if [ ! -d $_DOCS_UDIR/docbookx-dtd ] ; then
+ mkdir -p $_DOCS_UDIR/docbookx-dtd
+ wget_unpacked $DOCBOOK_DTD_URL $DOWNLOAD_DIR $DOCS_DIR/docbookx-dtd
+ else
+ echo "Docbook dtd already installed. Skipping."
fi
+
mkdir -p $_DOCS_UDIR/repos
qpushd $DOCS_DIR/repos
if [ "$UPDATE_DOCS" = "yes" ]; then
commit 1a2217321ea9b75bcde48bff297d9f6a6098334e
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Nov 16 09:06:36 2010 +0000
Disable Italian docs generation I just accidentally enabled. It
wasn't enabled before the xsltproc issue popped up, so it shouldn't
be enabled now.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19817 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
index 87b24e5..e809a5b 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1545,7 +1545,7 @@ function inst_docs() {
make_chm guide ja_JP "--stringparam chunker.output.encoding Shift_JIS --stringparam htmlhelp.encoding Shift_JIS"
make_chm help C
make_chm help de_DE
- make_chm help it_IT
+# make_chm help it_IT
qpopd
}
commit 89f8e932637ba5c534674d9eabfaa42fdf65b06d
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Nov 16 09:06:25 2010 +0000
Reactivate English docs generation in Windows build
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19816 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
index 83eac27..87b24e5 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1543,10 +1543,9 @@ function inst_docs() {
make_chm guide de_DE
make_chm guide it_IT
make_chm guide ja_JP "--stringparam chunker.output.encoding Shift_JIS --stringparam htmlhelp.encoding Shift_JIS"
-# FIXME: C help is temporarily disabled because it crashes the hhc.exe compiler!
-# make_chm help C
+ make_chm help C
make_chm help de_DE
-# make_chm help it_IT
+ make_chm help it_IT
qpopd
}
commit 1ea806b50b7bc2cf8f3ff3be46229a7f604eb7c4
Author: Christian Stimming <stimming at tuhh.de>
Date: Sat Nov 13 21:32:18 2010 +0000
Win32 build: Update versions of libktoblzcheck, gwenhywfar4.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19805 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index b340575..2e74165 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -332,8 +332,8 @@ set_default AQBANKING5 no
# needed.
if [ "$AQBANKING5" = "yes" ]; then
- GWENHYWFAR_VERSION="4.0.1"
- set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=54&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
+ GWENHYWFAR_VERSION="4.0.2"
+ set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=55&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
else
GWENHYWFAR_VERSION="3.11.3"
set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=31&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
@@ -341,7 +341,8 @@ else
fi
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
-set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-1.28.tar.gz"
+KTOBLZCHECK_VERSION="1.29"
+set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-${KTOBLZCHECK_VERSION}.tar.gz"
# ktoblzcheck is being installed into GWENHYWFAR_DIR
if [ "$AQBANKING5" = "yes" ]; then
diff --git a/install-impl.sh b/install-impl.sh
index abbad05..83eac27 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1018,7 +1018,7 @@ function inst_ktoblzcheck() {
# GWENHYWFAR_DIR
add_to_env "-I${_GWENHYWFAR_UDIR}/include" KTOBLZCHECK_CPPFLAGS
add_to_env "-L${_GWENHYWFAR_UDIR}/lib" KTOBLZCHECK_LDFLAGS
- if quiet ${PKG_CONFIG} --exists ktoblzcheck
+ if quiet ${PKG_CONFIG} --exact-version=${KTOBLZCHECK_VERSION} ktoblzcheck
then
echo "Ktoblzcheck already installed. skipping."
else
commit 97612ce8af8aaac9d82564cde5c159cca9f6f671
Author: Christian Stimming <stimming at tuhh.de>
Date: Mon Nov 8 19:40:23 2010 +0000
Increase gnutls version to 2.8.6 (might fix bug#632158)
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19780 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 499d27f..b340575 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -185,7 +185,8 @@ set_default GUILE_DIR $GLOBAL_DIR\\guile
set_default OPENSSL_URL "http://www.openssl.org/source/openssl-0.9.8j.tar.gz"
set_default OPENSSL_DIR $GLOBAL_DIR\\openssl
-set_default GNUTLS_URL "http://josefsson.org/gnutls4win/gnutls-2.8.1.zip"
+GNUTLS_VERSION="2.8.6"
+set_default GNUTLS_URL "http://josefsson.org/gnutls4win/gnutls-${GNUTLS_VERSION}.zip"
set_default GNUTLS_DIR $GLOBAL_DIR\\gnutls
set_default MINGW_UTILS_URL "$SF_MIRROR/mingw/mingw-utils-0.3.tar.gz"
diff --git a/install-impl.sh b/install-impl.sh
index 6a55a90..abbad05 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -953,7 +953,7 @@ function inst_gnutls() {
add_to_env ${_GNUTLS_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
add_to_env "-I${_GNUTLS_UDIR}/include" GNUTLS_CPPFLAGS
add_to_env "-L${_GNUTLS_UDIR}/lib" GNUTLS_LDFLAGS
- if quiet ${PKG_CONFIG} --exists gnutls
+ if quiet ${PKG_CONFIG} --exact-version=${GNUTLS_VERSION} gnutls
then
echo "GNUTLS already installed. skipping."
else
commit c746b2fa62379fdef65c1561fba353faaa7abd78
Author: Christian Stimming <stimming at tuhh.de>
Date: Sat Oct 30 19:01:22 2010 +0000
Win32 build: Update ktoblzcheck version number.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19734 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index eb56a43..499d27f 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -340,7 +340,7 @@ else
fi
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
-set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-1.24.tar.gz"
+set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-1.28.tar.gz"
# ktoblzcheck is being installed into GWENHYWFAR_DIR
if [ "$AQBANKING5" = "yes" ]; then
commit 5cbf8e0226ed9c6e9063ca03d8ed9a63580d4887
Author: Christian Stimming <stimming at tuhh.de>
Date: Thu Oct 7 20:04:14 2010 +0000
Fix erroneous extra package that I forgot to remove in r19641.
It doesn't have to be reverted because libjpeg-7 shouldn't be needed
with a clean webkit rebuild anyway.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19643 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/dist-impl.sh b/dist-impl.sh
index f68828c..00d79d4 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -88,7 +88,6 @@ function dist_gnome() {
smart_wget $LIBICONV_URL $DOWNLOAD_DIR
unzip -q $LAST_FILE bin/iconv.dll -d $DIST_DIR
wget_unpacked $GLIB_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $LIBJPEG_7_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBJPEG_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBPNG_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBTIFF_URL $DOWNLOAD_DIR $DIST_DIR
commit 8df6a4b2cc6d0a6829cead68e2db099550f14a6e
Author: Christian Stimming <stimming at tuhh.de>
Date: Tue Oct 5 19:29:09 2010 +0000
Revert r19576, r19590, r19593, r19601: "Update gtk versions..."
It's been 3 weeks without a working windows build. Apparently this
has to wait until we have an updated webkit again. Revert this back once
we have a working webkit with gtk-2.20.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19641 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index ca1a187..eb56a43 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -202,49 +202,46 @@ set_default LIBXSLT_ZLIB_URL "${XMLSOFT_URL}/zlib-1.2.3.win32.zip"
set_default LIBXSLT_DIR $GLOBAL_DIR\\libxslt
#set_default LIBXSLT_SRC_URL "http://xmlsoft.org/sources/libxslt-1.1.26.tar.gz" # unused
-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 LIBXML2_URL "$GNOME_WIN32_DEPS_URL/libxml2_2.7.4-1_win32.zip"
+set_default LIBXML2_DEV_URL "$GNOME_WIN32_DEPS_URL/libxml2-dev_2.7.4-1_win32.zip"
set_default GETTEXT_RUNTIME_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime-0.17-1.zip"
set_default GETTEXT_RUNTIME_DEV_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime-dev-0.17-1.zip"
set_default GETTEXT_TOOLS_URL "$GNOME_WIN32_DEPS_URL/gettext-tools-0.17.zip"
set_default LIBICONV_URL "$GNOME_WIN32_DEPS_URL/libiconv-1.9.1.bin.woe32.zip"
-set_default GLIB_URL "$GNOME_WIN32_URL/glib/2.24/glib_2.24.2-2_win32.zip"
-set_default GLIB_DEV_URL "$GNOME_WIN32_URL/glib/2.24/glib-dev_2.24.2-2_win32.zip"
-#set_default LIBJPEG_URL "$SF_MIRROR/gnucash/jpeg_7-1-fixed-win32.zip" # ?!?
-set_default LIBJPEG_7_URL "$GNOME_WIN32_DEPS_URL/jpeg_7-1_win32.zip"
-set_default LIBJPEG_URL "$GNOME_WIN32_DEPS_URL/jpeg_8-1_win32.zip"
-set_default LIBJPEG_DEV_URL "$GNOME_WIN32_DEPS_URL/jpeg-dev_8-1_win32.zip"
-set_default LIBPNG_URL "$GNOME_WIN32_DEPS_URL/libpng_1.4.3-1_win32.zip"
-set_default LIBPNG_DEV_URL "$GNOME_WIN32_DEPS_URL/libpng-dev_1.4.3-1_win32.zip"
-set_default LIBTIFF_URL "$GNOME_WIN32_DEPS_URL/libtiff_3.9.2-1_win32.zip"
-set_default LIBTIFF_DEV_URL "$GNOME_WIN32_DEPS_URL/libtiff-dev_3.9.2-1_win32.zip"
-set_default ZLIB_URL "$GNOME_WIN32_DEPS_URL/zlib_1.2.5-2_win32.zip"
-set_default ZLIB_DEV_URL "$GNOME_WIN32_DEPS_URL/zlib-dev_1.2.5-2_win32.zip"
+set_default GLIB_URL "$GNOME_WIN32_URL/glib/2.22/glib_2.22.4-1_win32.zip"
+set_default GLIB_DEV_URL "$GNOME_WIN32_URL/glib/2.22/glib-dev_2.22.4-1_win32.zip"
+set_default LIBJPEG_URL "$SF_MIRROR/gnucash/jpeg_7-1-fixed-win32.zip"
+set_default LIBJPEG_DEV_URL "$GNOME_WIN32_DEPS_URL/jpeg-dev_7-1_win32.zip"
+set_default LIBPNG_URL "$GNOME_WIN32_DEPS_URL/libpng_1.4.0-1_win32.zip"
+set_default LIBPNG_DEV_URL "$GNOME_WIN32_DEPS_URL/libpng-dev_1.4.0-1_win32.zip"
+set_default LIBTIFF_URL "$GNOME_WIN32_DEPS_URL/libtiff_3.9.1-1_win32.zip"
+set_default LIBTIFF_DEV_URL "$GNOME_WIN32_DEPS_URL/libtiff-dev_3.9.1-1_win32.zip"
+set_default ZLIB_URL "$GNOME_WIN32_DEPS_URL/zlib-1.2.3.zip"
+set_default ZLIB_DEV_URL "$GNOME_WIN32_DEPS_URL/zlib-dev-1.2.3.zip"
set_default PKG_CONFIG_URL "$GNOME_WIN32_DEPS_URL/pkg-config_0.23-3_win32.zip"
set_default PKG_CONFIG_DEV_URL "$GNOME_WIN32_DEPS_URL/pkg-config-dev_0.23-3_win32.zip"
-CAIRO_VERSION="1.10.0"
-set_default CAIRO_URL "$GNOME_WIN32_DEPS_URL/cairo_${CAIRO_VERSION}-1_win32.zip"
-set_default CAIRO_DEV_URL "$GNOME_WIN32_DEPS_URL/cairo-dev_${CAIRO_VERSION}-1_win32.zip"
-set_default PIXMAN_URL "$GNOME_WIN32_DEPS_URL/pixman_0.18.4-2_win32.zip"
-set_default PIXMAN_DEV_URL "$GNOME_WIN32_DEPS_URL/pixman-dev_0.18.4-2_win32.zip"
+CAIRO_VERSION="1.8.8"
+set_default CAIRO_URL "$GNOME_WIN32_DEPS_URL/cairo_${CAIRO_VERSION}-4_win32.zip"
+set_default CAIRO_DEV_URL "$GNOME_WIN32_DEPS_URL/cairo-dev_${CAIRO_VERSION}-4_win32.zip"
+set_default PIXMAN_URL "http://cairographics.org/releases/pixman-0.17.6.tar.gz"
set_default EXPAT_URL "$GNOME_WIN32_DEPS_URL/expat_2.0.1-1_win32.zip"
set_default EXPAT_DEV_URL "$GNOME_WIN32_DEPS_URL/expat-dev_2.0.1-1_win32.zip"
set_default FONTCONFIG_URL "$GNOME_WIN32_DEPS_URL/fontconfig_2.8.0-2_win32.zip"
set_default FONTCONFIG_DEV_URL "$GNOME_WIN32_DEPS_URL/fontconfig-dev_2.8.0-2_win32.zip"
-set_default FREETYPE_URL "$GNOME_WIN32_DEPS_URL/freetype_2.4.2-1_win32.zip"
-set_default FREETYPE_DEV_URL "$GNOME_WIN32_DEPS_URL/freetype-dev_2.4.2-1_win32.zip"
-set_default ATK_URL "$GNOME_WIN32_URL/atk/1.30/atk_1.30.0-2_win32.zip"
-set_default ATK_DEV_URL "$GNOME_WIN32_URL/atk/1.30/atk-dev_1.30.0-2_win32.zip"
-set_default PANGO_URL "$GNOME_WIN32_URL/pango/1.28/pango_1.28.1-2_win32.zip"
-set_default PANGO_DEV_URL "$GNOME_WIN32_URL/pango/1.28/pango-dev_1.28.1-2_win32.zip"
-set_default LIBART_LGPL_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart-lgpl_2.3.21-1_win32.zip"
-set_default LIBART_LGPL_DEV_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart-lgpl-dev_2.3.21-1_win32.zip"
-GTK_VERSION="2.20.1"
-set_default GTK_URL "$GNOME_WIN32_URL/gtk+/2.20/gtk+_${GTK_VERSION}-3_win32.zip"
-set_default GTK_DEV_URL "$GNOME_WIN32_URL/gtk+/2.20/gtk+-dev_${GTK_VERSION}-3_win32.zip"
+set_default FREETYPE_URL "$GNOME_WIN32_DEPS_URL/freetype_2.3.11-2_win32.zip"
+set_default FREETYPE_DEV_URL "$GNOME_WIN32_DEPS_URL/freetype-dev_2.3.11-2_win32.zip"
+set_default ATK_URL "$GNOME_WIN32_URL/atk/1.28/atk_1.28.0-1_win32.zip"
+set_default ATK_DEV_URL "$GNOME_WIN32_URL/atk/1.28/atk-dev_1.28.0-1_win32.zip"
+set_default PANGO_URL "$GNOME_WIN32_URL/pango/1.26/pango_1.26.2-1_win32.zip"
+set_default PANGO_DEV_URL "$GNOME_WIN32_URL/pango/1.26/pango-dev_1.26.2-1_win32.zip"
+set_default LIBART_LGPL_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart_lgpl-2.3.20.zip"
+set_default LIBART_LGPL_DEV_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart_lgpl-dev-2.3.20.zip"
+GTK_VERSION="2.16.6"
+set_default GTK_URL "$GNOME_WIN32_URL/gtk+/2.16/gtk+_${GTK_VERSION}-2_win32.zip"
+set_default GTK_DEV_URL "$GNOME_WIN32_URL/gtk+/2.16/gtk+-dev_${GTK_VERSION}-2_win32.zip"
set_default INTLTOOL_URL "$GNOME_WIN32_URL/intltool/0.40/intltool_0.40.4-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 ORBIT2_URL "$GNOME_WIN32_URL/ORBit2/2.14/ORBit2-2.14.13.zip"
+set_default ORBIT2_DEV_URL "$GNOME_WIN32_URL/ORBit2/2.14/ORBit2-dev-2.14.13.zip"
set_default GAIL_URL "$GNOME_WIN32_URL/gail/1.22/gail-1.22.0.zip"
set_default GAIL_DEV_URL "$GNOME_WIN32_URL/gail/1.22/gail-dev-1.22.0.zip"
set_default POPT_URL "$GNOME_WIN32_DEPS_URL/popt-1.10.2-tml-20050828.zip"
@@ -258,13 +255,13 @@ set_default GNOME_VFS_URL "$GNOME_WIN32_URL/gnome-vfs/2.24/gnome-vfs_2.24.1-1_wi
set_default GNOME_VFS_DEV_URL "$GNOME_WIN32_URL/gnome-vfs/2.24/gnome-vfs-dev_2.24.1-1_win32.zip"
set_default LIBGNOME_URL "$GNOME_WIN32_URL/libgnome/2.24/libgnome_2.24.1-1_win32.zip"
set_default LIBGNOME_DEV_URL "$GNOME_WIN32_URL/libgnome/2.24/libgnome-dev_2.24.1-1_win32.zip"
-set_default LIBGNOMECANVAS_URL "$GNOME_WIN32_URL/libgnomecanvas/2.30/libgnomecanvas_2.30.1-1_win32.zip"
-set_default LIBGNOMECANVAS_DEV_URL "$GNOME_WIN32_URL/libgnomecanvas/2.30/libgnomecanvas-dev_2.30.1-1_win32.zip"
+set_default LIBGNOMECANVAS_URL "$GNOME_WIN32_URL/libgnomecanvas/2.20/libgnomecanvas-2.20.1.zip"
+set_default LIBGNOMECANVAS_DEV_URL "$GNOME_WIN32_URL/libgnomecanvas/2.20/libgnomecanvas-dev-2.20.1.zip"
set_default LIBGNOMEUI_URL "$GNOME_WIN32_URL/libgnomeui/2.22/libgnomeui-2.22.1.zip"
set_default LIBGNOMEUI_DEV_URL "$GNOME_WIN32_URL/libgnomeui/2.22/libgnomeui-dev-2.22.1.zip"
set_default LIBGLADE_URL "$GNOME_WIN32_URL/libglade/2.6/libglade_2.6.4-1_win32.zip"
set_default LIBGLADE_DEV_URL "$GNOME_WIN32_URL/libglade/2.6/libglade-dev_2.6.4-1_win32.zip"
-set_default GTK_DOC_URL "$GNOME_MIRROR/sources/gtk-doc/1.15/gtk-doc-1.15.tar.bz2"
+set_default GTK_DOC_URL "$GNOME_MIRROR/sources/gtk-doc/1.13/gtk-doc-1.13.tar.bz2"
set_default GTK_THEME_URL "$SF_MIRROR/gtk-win/gtk2-themes-2009-09-07-win32_bin.zip"
set_default GTK_PREFS_URL "$SF_MIRROR/gtk-win/gtk2_prefs-0.4.1.bin-gtk2.10-win32.zip"
set_default GNOME_DIR $GLOBAL_DIR\\gnome
@@ -282,12 +279,12 @@ set_default PCRE_BIN_URL "$SF_MIRROR/gnuwin32/pcre-7.0-bin.zip"
set_default PCRE_LIB_URL "$SF_MIRROR/gnuwin32/pcre-7.0-lib.zip"
set_default PCRE_DIR $GLOBAL_DIR\\pcre
-LIBGSF_VERSION="1.14.18"
+LIBGSF_VERSION="1.14.17"
set_default LIBGSF_URL "$GNOME_MIRROR/sources/libgsf/1.14/libgsf-${LIBGSF_VERSION}.tar.bz2"
set_default LIBGSF_DIR $GLOBAL_DIR\\libgsf
-GOFFICE_VERSION="0.8.10"
-set_default GOFFICE_URL "$GNOME_MIRROR/sources/goffice/0.8/goffice-${GOFFICE_VERSION}.tar.bz2"
+GOFFICE_VERSION="0.7.18"
+set_default GOFFICE_URL "$GNOME_MIRROR/sources/goffice/0.7/goffice-${GOFFICE_VERSION}.tar.bz2"
set_default GOFFICE_DIR $GLOBAL_DIR\\goffice
#set_default GOFFICE_PATCH `pwd`/goffice-0.7.2-patch.diff
diff --git a/install-impl.sh b/install-impl.sh
index 21dc5fc..6a55a90 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -543,7 +543,6 @@ function inst_gnome() {
wget_unpacked $LIBICONV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GLIB_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GLIB_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBJPEG_7_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBJPEG_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBJPEG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBPNG_URL $DOWNLOAD_DIR $GNOME_DIR
@@ -556,8 +555,6 @@ function inst_gnome() {
wget_unpacked $PKG_CONFIG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $CAIRO_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $CAIRO_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $PIXMAN_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $PIXMAN_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $EXPAT_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $EXPAT_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $FONTCONFIG_URL $DOWNLOAD_DIR $GNOME_DIR
@@ -640,6 +637,17 @@ EOF
#perl -pi.bak -e's!^Libs: !Libs: -L\${prefix}/bin !' *.pc
qpopd
fi
+ wget_unpacked $PIXMAN_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/pixman-*
+ qpushd $TMP_UDIR/pixman-*
+ ./configure ${HOST_XCOMPILE} \
+ --prefix=$_GNOME_UDIR \
+ --disable-static
+ make
+ make install
+ qpopd
+ rm -rf $TMP_UDIR/pixman-*
+ ${PKG_CONFIG} --exists pixman-1 || die "pixman not installed correctly"
quiet gconftool-2 --version &&
quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 &&
quiet intltoolize --version || die "gnome not installed correctly"
commit dcf98d13ae4e6d57e9bb68eb5e467cb25cb89449
Author: Christian Stimming <stimming at tuhh.de>
Date: Fri Sep 24 19:28:46 2010 +0000
Win32 build: Temporarily disable the english (C) help compiling because it crashes the hhc.exe compiler.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19607 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 6c350d1..ca1a187 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -297,7 +297,7 @@ set_default GLADE_DIR $GLOBAL_DIR\\glade
set_default INNO_URL "http://files.jrsoftware.org/is/5/isetup-5.3.9-unicode.exe"
set_default INNO_DIR $GLOBAL_DIR\\inno
-set_default HH_URL "http://download.microsoft.com/download/OfficeXPProf/Install/4.71.1015.0/W98NT42KMe/EN-US/HTMLHELP.EXE"
+set_default HH_URL "http://download.microsoft.com/download/0/a/9/0a939ef6-e31c-430f-a3df-dfae7960d564/htmlhelp.exe"
set_default HH_DIR $GLOBAL_DIR\\hh
set_default WEBKIT_URL "$SF_MIRROR/gnucash/webkit-1.1.90-win32.zip"
diff --git a/install-impl.sh b/install-impl.sh
index 183fd0d..21dc5fc 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1535,7 +1535,8 @@ function inst_docs() {
make_chm guide de_DE
make_chm guide it_IT
make_chm guide ja_JP "--stringparam chunker.output.encoding Shift_JIS --stringparam htmlhelp.encoding Shift_JIS"
- make_chm help C
+# FIXME: C help is temporarily disabled because it crashes the hhc.exe compiler!
+# make_chm help C
make_chm help de_DE
# make_chm help it_IT
qpopd
commit 68d79939f072c707190d43e4d22c019b166d1068
Author: Christian Stimming <stimming at tuhh.de>
Date: Tue Sep 21 19:51:58 2010 +0000
Win32 build: Needs libjpeg-7 in dist as well.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19602 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/dist-impl.sh b/dist-impl.sh
index 695081c..f68828c 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -88,6 +88,7 @@ function dist_gnome() {
smart_wget $LIBICONV_URL $DOWNLOAD_DIR
unzip -q $LAST_FILE bin/iconv.dll -d $DIST_DIR
wget_unpacked $GLIB_URL $DOWNLOAD_DIR $DIST_DIR
+ wget_unpacked $LIBJPEG_7_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBJPEG_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBPNG_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBTIFF_URL $DOWNLOAD_DIR $DIST_DIR
@@ -113,8 +114,6 @@ function dist_gnome() {
wget_unpacked $LIBGNOMEUI_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBGLADE_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $PIXMAN_URL $DOWNLOAD_DIR $DIST_DIR
-# GnuCash on Windows is built with webkit, no need to install gtkhtml
-# wget_unpacked $GTKHTML_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GTK_THEME_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/gtk2-themes-*
commit c87cc67fdfcd1143ab524b6f422b2bcb0977db9c
Author: Christian Stimming <stimming at tuhh.de>
Date: Tue Sep 21 19:48:54 2010 +0000
Win32 build: The existing webkit binary needs libjpeg-7, so we install that one, too.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19601 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index d375cef..6c350d1 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -211,6 +211,7 @@ set_default LIBICONV_URL "$GNOME_WIN32_DEPS_URL/libiconv-1.9.1.bin.woe32.zip"
set_default GLIB_URL "$GNOME_WIN32_URL/glib/2.24/glib_2.24.2-2_win32.zip"
set_default GLIB_DEV_URL "$GNOME_WIN32_URL/glib/2.24/glib-dev_2.24.2-2_win32.zip"
#set_default LIBJPEG_URL "$SF_MIRROR/gnucash/jpeg_7-1-fixed-win32.zip" # ?!?
+set_default LIBJPEG_7_URL "$GNOME_WIN32_DEPS_URL/jpeg_7-1_win32.zip"
set_default LIBJPEG_URL "$GNOME_WIN32_DEPS_URL/jpeg_8-1_win32.zip"
set_default LIBJPEG_DEV_URL "$GNOME_WIN32_DEPS_URL/jpeg-dev_8-1_win32.zip"
set_default LIBPNG_URL "$GNOME_WIN32_DEPS_URL/libpng_1.4.3-1_win32.zip"
diff --git a/install-impl.sh b/install-impl.sh
index 1d90535..183fd0d 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -543,6 +543,7 @@ function inst_gnome() {
wget_unpacked $LIBICONV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GLIB_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GLIB_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $LIBJPEG_7_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBJPEG_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBJPEG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBPNG_URL $DOWNLOAD_DIR $GNOME_DIR
commit ed73d8a1798ca0e4a44902f5d4b19248d7b8bab0
Author: Christian Stimming <stimming at tuhh.de>
Date: Tue Sep 21 17:46:17 2010 +0000
Win32 build: Is running again. Some debug output of r19595 can be removed again.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19599 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index d8a9974..d375cef 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -386,7 +386,7 @@ set_default UPDATE_DOCS yes
set_default DOCS_REV "HEAD"
set_default DOCS_URL "http://svn.gnucash.org/repo/gnucash-docs/trunk"
set_default DOCS_DIR $GLOBAL_DIR\\gnucash-docs
-set_default XSLTPROCFLAGS "--nonet"
+set_default XSLTPROCFLAGS ""
set_default ISOCODES_URL "ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/iso-codes-3.18.tar.bz2"
set_default ISOCODES_DIR $GLOBAL_DIR\\isocodes
diff --git a/install-impl.sh b/install-impl.sh
index c34ceb4..1d90535 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1482,9 +1482,8 @@ function make_chm() {
_CHM_TYPE=$1
_CHM_LANG=$2
_XSLTPROC_OPTS=$3
- echo "\nProcessing $_CHM_TYPE ($_CHM_LANG) ...\n"
+ echo "Processing $_CHM_TYPE ($_CHM_LANG) ..."
qpushd $_CHM_TYPE/$_CHM_LANG
- echo "xsltproc $XSLTPROCFLAGS $_XSLTPROC_OPTS ../../../docbook-xsl/htmlhelp/htmlhelp.xsl gnucash-$_CHM_TYPE.xml"
xsltproc $XSLTPROCFLAGS $_XSLTPROC_OPTS ../../../docbook-xsl/htmlhelp/htmlhelp.xsl gnucash-$_CHM_TYPE.xml
count=0
echo >> htmlhelp.hhp
commit 184dbc3944659f635b4f4b250f4ae888750ec657
Author: Christian Stimming <stimming at tuhh.de>
Date: Tue Sep 21 17:09:42 2010 +0000
Win32 build: Fix libxslt installation. Improve its calling arguments. Download inno before processing the docs (if the latter fails, we at least have inno).
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19595 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index d375cef..d8a9974 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -386,7 +386,7 @@ set_default UPDATE_DOCS yes
set_default DOCS_REV "HEAD"
set_default DOCS_URL "http://svn.gnucash.org/repo/gnucash-docs/trunk"
set_default DOCS_DIR $GLOBAL_DIR\\gnucash-docs
-set_default XSLTPROCFLAGS ""
+set_default XSLTPROCFLAGS "--nonet"
set_default ISOCODES_URL "ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/iso-codes-3.18.tar.bz2"
set_default ISOCODES_DIR $GLOBAL_DIR\\isocodes
diff --git a/install-impl.sh b/install-impl.sh
index 9aad882..c34ceb4 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -496,12 +496,18 @@ function inst_libxslt() {
wget_unpacked ${LIBXSLT_ICONV_URL} ${DOWNLOAD_DIR} ${LIBXSLT_DIR}
wget_unpacked ${LIBXSLT_ZLIB_URL} ${DOWNLOAD_DIR} ${LIBXSLT_DIR}
qpushd $_LIBXSLT_UDIR
- mv libxslt-* mydir
- cp -r mydir/* .
- rm -rf mydir
- mv libxml2-* mydir
- cp -r mydir/* .
- rm -rf mydir
+ # The unpacked zips put their content into a directory one
+ # below of where we want them, so we move the content to
+ # the parent directory here.
+ for A in libxslt-* libxml2-* iconv-* zlib-* ; do
+ if [ -d $A ] ; then
+ mv $A tmpdir
+ cp -r tmpdir/* .
+ rm -rf tmpdir
+ else
+ echo "Oops, $A is not a directory - skipping here."
+ fi
+ done
qpopd
quiet which xsltproc || die "libxslt not installed correctly"
fi
@@ -1476,8 +1482,9 @@ function make_chm() {
_CHM_TYPE=$1
_CHM_LANG=$2
_XSLTPROC_OPTS=$3
- echo "Processing $_CHM_TYPE ($_CHM_LANG) ..."
+ echo "\nProcessing $_CHM_TYPE ($_CHM_LANG) ...\n"
qpushd $_CHM_TYPE/$_CHM_LANG
+ echo "xsltproc $XSLTPROCFLAGS $_XSLTPROC_OPTS ../../../docbook-xsl/htmlhelp/htmlhelp.xsl gnucash-$_CHM_TYPE.xml"
xsltproc $XSLTPROCFLAGS $_XSLTPROC_OPTS ../../../docbook-xsl/htmlhelp/htmlhelp.xsl gnucash-$_CHM_TYPE.xml
count=0
echo >> htmlhelp.hhp
diff --git a/install.sh b/install.sh
index 279a7e6..8c4f1b3 100644
--- a/install.sh
+++ b/install.sh
@@ -107,10 +107,10 @@ if [ "$WITH_CUTECASH" = "yes" ]; then
add_step inst_cutecash
fi
add_step inst_gnucash
-add_step inst_docs
if [ "$CROSS_COMPILE" != "yes" ]; then
add_step inst_inno
fi
+add_step inst_docs
add_step inst_finish
# run commands registered with late_eval
commit 2951ac8d4879cec438c2b01bb7b5e4344907da67
Author: Christian Stimming <stimming at tuhh.de>
Date: Mon Sep 20 19:34:41 2010 +0000
Win32 build: Switch back gettext to 0.17 because 0.18 require libc++ which we don't want to have.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19593 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 32a67a5..d375cef 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -204,9 +204,9 @@ set_default LIBXSLT_DIR $GLOBAL_DIR\\libxslt
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 GETTEXT_RUNTIME_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime_0.18.1.1-2_win32.zip"
-set_default GETTEXT_RUNTIME_DEV_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime-dev_0.18.1.1-2_win32.zip"
-set_default GETTEXT_TOOLS_DEV_URL "$GNOME_WIN32_DEPS_URL/gettext-tools-dev_0.18.1.1-2_win32.zip"
+set_default GETTEXT_RUNTIME_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime-0.17-1.zip"
+set_default GETTEXT_RUNTIME_DEV_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime-dev-0.17-1.zip"
+set_default GETTEXT_TOOLS_URL "$GNOME_WIN32_DEPS_URL/gettext-tools-0.17.zip"
set_default LIBICONV_URL "$GNOME_WIN32_DEPS_URL/libiconv-1.9.1.bin.woe32.zip"
set_default GLIB_URL "$GNOME_WIN32_URL/glib/2.24/glib_2.24.2-2_win32.zip"
set_default GLIB_DEV_URL "$GNOME_WIN32_URL/glib/2.24/glib-dev_2.24.2-2_win32.zip"
diff --git a/install-impl.sh b/install-impl.sh
index 518473e..9aad882 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -533,7 +533,7 @@ function inst_gnome() {
wget_unpacked $LIBXML2_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GETTEXT_RUNTIME_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GETTEXT_RUNTIME_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GETTEXT_TOOLS_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $GETTEXT_TOOLS_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBICONV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GLIB_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GLIB_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
commit 08fcef55d83385043efb895f3b12e27bc19bd2c2
Author: Christian Stimming <stimming at tuhh.de>
Date: Mon Sep 20 19:34:13 2010 +0000
Win32 build: xsltproc needs its suitable iconv and zlib, so install it there.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19592 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 7934974..32a67a5 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -194,10 +194,13 @@ set_default MINGW_UTILS_DIR $TOOLS_DIR
set_default EXETYPE_SCRIPT `pwd`/exetype.pl
set_default EXETYPE_DIR $TOOLS_DIR
-set_default LIBXSLT_URL "http://xmlsoft.org/sources/win32/libxslt-1.1.26.win32.zip"
-set_default LIBXSLT_LIBXML2_URL "http://xmlsoft.org/sources/win32/libxml2-2.7.6.win32.zip"
-set_default LIBXSLT_SRC_URL "http://xmlsoft.org/sources/libxslt-1.1.26.tar.gz"
+XMLSOFT_URL="http://xmlsoft.org/sources/win32"
+set_default LIBXSLT_URL "${XMLSOFT_URL}/libxslt-1.1.26.win32.zip"
+set_default LIBXSLT_LIBXML2_URL "${XMLSOFT_URL}/libxml2-2.7.6.win32.zip"
+set_default LIBXSLT_ICONV_URL "${XMLSOFT_URL}/iconv-1.9.2.win32.zip"
+set_default LIBXSLT_ZLIB_URL "${XMLSOFT_URL}/zlib-1.2.3.win32.zip"
set_default LIBXSLT_DIR $GLOBAL_DIR\\libxslt
+#set_default LIBXSLT_SRC_URL "http://xmlsoft.org/sources/libxslt-1.1.26.tar.gz" # unused
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"
diff --git a/install-impl.sh b/install-impl.sh
index 140280b..518473e 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -493,6 +493,8 @@ function inst_libxslt() {
[ "$CROSS_COMPILE" = "yes" ] && die "xsltproc unavailable"
wget_unpacked $LIBXSLT_URL $DOWNLOAD_DIR $LIBXSLT_DIR
wget_unpacked $LIBXSLT_LIBXML2_URL $DOWNLOAD_DIR $LIBXSLT_DIR
+ wget_unpacked ${LIBXSLT_ICONV_URL} ${DOWNLOAD_DIR} ${LIBXSLT_DIR}
+ wget_unpacked ${LIBXSLT_ZLIB_URL} ${DOWNLOAD_DIR} ${LIBXSLT_DIR}
qpushd $_LIBXSLT_UDIR
mv libxslt-* mydir
cp -r mydir/* .
commit 221dd306feb7374adee3418a304114919bc14361
Author: Christian Stimming <stimming at tuhh.de>
Date: Mon Sep 20 19:11:58 2010 +0000
Win32 build: Fix typo
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19591 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
index d01a713..140280b 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -531,7 +531,7 @@ function inst_gnome() {
wget_unpacked $LIBXML2_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GETTEXT_RUNTIME_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GETTEXT_RUNTIME_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GETTEXT_DEV_TOOLS_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $GETTEXT_TOOLS_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBICONV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GLIB_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GLIB_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
commit e0fa7a744e6ebaf995819a49e95089ca9c6cb0a9
Author: Christian Stimming <stimming at tuhh.de>
Date: Mon Sep 20 19:08:42 2010 +0000
Win32: Fix missing gettext-tools (is packaged in gettext-tools-dev)
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19590 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 9f65a40..7934974 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -203,7 +203,7 @@ 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 GETTEXT_RUNTIME_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime_0.18.1.1-2_win32.zip"
set_default GETTEXT_RUNTIME_DEV_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime-dev_0.18.1.1-2_win32.zip"
-set_default GETTEXT_TOOLS_URL "$GNOME_WIN32_DEPS_URL/gettext-tools_0.18.1.1-2_win32.zip"
+set_default GETTEXT_TOOLS_DEV_URL "$GNOME_WIN32_DEPS_URL/gettext-tools-dev_0.18.1.1-2_win32.zip"
set_default LIBICONV_URL "$GNOME_WIN32_DEPS_URL/libiconv-1.9.1.bin.woe32.zip"
set_default GLIB_URL "$GNOME_WIN32_URL/glib/2.24/glib_2.24.2-2_win32.zip"
set_default GLIB_DEV_URL "$GNOME_WIN32_URL/glib/2.24/glib-dev_2.24.2-2_win32.zip"
diff --git a/install-impl.sh b/install-impl.sh
index 477bb23..d01a713 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -531,7 +531,7 @@ function inst_gnome() {
wget_unpacked $LIBXML2_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GETTEXT_RUNTIME_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GETTEXT_RUNTIME_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GETTEXT_TOOLS_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $GETTEXT_DEV_TOOLS_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBICONV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GLIB_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GLIB_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
commit cc1b0cab63c0e6c2a08e0c2566f9de46bed0431d
Author: Derek Atkins <derek at ihtfp.com>
Date: Sun Sep 19 23:21:46 2010 +0000
add "isocodes" to reset directory
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19584 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/reset.sh b/reset.sh
index e2c994d..541500a 100644
--- a/reset.sh
+++ b/reset.sh
@@ -96,6 +96,7 @@ function eval_all() {
eval_path $MYSQL_LIB_DIR
eval_path $PGSQL_DIR
eval_path $WEBKIT_DIR
+ eval_path $ISOCODES_DIR
}
echo
commit effdc594f6845701219db1225564112ac7dd701e
Author: Christian Stimming <stimming at tuhh.de>
Date: Thu Sep 16 16:13:10 2010 +0000
Win32 build: Remove installation directory before installing the new version. Require exact gwen/aqbanking version.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19581 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
index 684d6fe..477bb23 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -754,6 +754,7 @@ function inst_libgsf() {
CPPFLAGS="${GNOME_CPPFLAGS}" \
LDFLAGS="${GNOME_LDFLAGS}"
make
+ rm -rf ${_LIBGSF_UDIR}
make install
qpopd
${PKG_CONFIG} --exists libgsf-1 libgsf-gnome-1 || die "libgsf not installed correctly"
@@ -785,9 +786,10 @@ function inst_goffice() {
[ -d ../libgsf-* ] || die "We need the unpacked package $TMP_UDIR/libgsf-*; please unpack it in $TMP_UDIR"
[ -f dumpdef.pl ] || cp -p ../libgsf-*/dumpdef.pl .
make
+ rm -rf ${_GOFFICE_UDIR}
make install
qpopd
- ${PKG_CONFIG} --exists libgoffice-0.8 && [ -f $_GOFFICE_UDIR/bin/libgoffice-0.8-8.dll ] || die "goffice not installed correctly"
+ ${PKG_CONFIG} --exists libgoffice-0.8 && [ -f $_GOFFICE_UDIR/bin/libgoffice*.dll ] || die "goffice not installed correctly"
rm -rf ${TMP_UDIR}/goffice-*
rm -rf ${TMP_UDIR}/libgsf-*
fi
@@ -950,7 +952,7 @@ function inst_gwenhywfar() {
_GWENHYWFAR_UDIR=`unix_path ${GWENHYWFAR_DIR}`
add_to_env ${_GWENHYWFAR_UDIR}/bin PATH
add_to_env ${_GWENHYWFAR_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
- if quiet ${PKG_CONFIG} --atleast-version=${GWENHYWFAR_VERSION} gwenhywfar
+ if quiet ${PKG_CONFIG} --exact-version=${GWENHYWFAR_VERSION} gwenhywfar
then
echo "Gwenhywfar already installed. skipping."
else
@@ -984,6 +986,7 @@ function inst_gwenhywfar() {
fi
make
# [ "$CROSS_COMPILE" != "yes" ] && make check
+ rm -rf ${_GWENHYWFAR_UDIR}
make install
qpopd
${PKG_CONFIG} --exists gwenhywfar || die "Gwenhywfar not installed correctly"
@@ -1052,7 +1055,7 @@ function inst_aqbanking() {
_AQBANKING_UDIR=`unix_path ${AQBANKING_DIR}`
add_to_env ${_AQBANKING_UDIR}/bin PATH
add_to_env ${_AQBANKING_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
- if quiet ${PKG_CONFIG} --atleast-version=${AQBANKING_VERSION} aqbanking
+ if quiet ${PKG_CONFIG} --exact-version=${AQBANKING_VERSION} aqbanking
then
echo "AqBanking already installed. skipping."
else
@@ -1109,6 +1112,7 @@ function inst_aqbanking() {
--prefix=${_AQBANKING_UDIR}
fi
make
+ rm -rf ${_AQBANKING_UDIR}
make install
qpopd
qpushd ${_AQBANKING_UDIR}/bin
commit 4e48b3dd00ea03a4a51cb728ca8ff73a42b2dfaf
Author: Christian Stimming <stimming at tuhh.de>
Date: Wed Sep 15 20:18:18 2010 +0000
Win32: Try to fix the nightly build errors. (Directory went away?)
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19580 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/dist-impl.sh b/dist-impl.sh
index 35c58d9..695081c 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -128,8 +128,11 @@ function dist_gnome() {
rm -rf $TMP_UDIR/gtk2_prefs-*
rm -rf $DIST_UDIR/etc/gconf/gconf.xml.defaults/{desktop,schemas}
- cp -a $DIST_UDIR/lib/locale $DIST_UDIR/share
- rm -rf $DIST_UDIR/lib/locale
+ if [ -d $DIST_UDIR/lib/locale ] ; then
+ # Huh, is this removed in newer gtk?
+ cp -a $DIST_UDIR/lib/locale $DIST_UDIR/share
+ rm -rf $DIST_UDIR/lib/locale
+ fi
}
function dist_isocodes() {
commit d9be6298a4c547689a4e76e36296660789a38432
Author: Christian Stimming <stimming at tuhh.de>
Date: Tue Sep 14 20:45:04 2010 +0000
Win32: Fix checking for goffice installation
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19577 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
index e9e85aa..684d6fe 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -787,7 +787,7 @@ function inst_goffice() {
make
make install
qpopd
- ${PKG_CONFIG} --exists libgoffice-0.8 && [ -f $_GOFFICE_UDIR/bin/libgoffice*.dll ] || die "goffice not installed correctly"
+ ${PKG_CONFIG} --exists libgoffice-0.8 && [ -f $_GOFFICE_UDIR/bin/libgoffice-0.8-8.dll ] || die "goffice not installed correctly"
rm -rf ${TMP_UDIR}/goffice-*
rm -rf ${TMP_UDIR}/libgsf-*
fi
commit aa9faea20e5baa47959b2f67b6f385fe22eda489
Author: Christian Stimming <stimming at tuhh.de>
Date: Tue Sep 14 20:28:23 2010 +0000
Win32 build: Update gtk to 2.20; let pkg-config check for the versions, hence triggering the update automatically.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19576 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 9a82e58..9f65a40 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -199,45 +199,48 @@ set_default LIBXSLT_LIBXML2_URL "http://xmlsoft.org/sources/win32/libxml2-2.7.6.
set_default LIBXSLT_SRC_URL "http://xmlsoft.org/sources/libxslt-1.1.26.tar.gz"
set_default LIBXSLT_DIR $GLOBAL_DIR\\libxslt
-set_default LIBXML2_URL "$GNOME_WIN32_DEPS_URL/libxml2_2.7.4-1_win32.zip"
-set_default LIBXML2_DEV_URL "$GNOME_WIN32_DEPS_URL/libxml2-dev_2.7.4-1_win32.zip"
-set_default GETTEXT_RUNTIME_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime-0.17-1.zip"
-set_default GETTEXT_RUNTIME_DEV_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime-dev-0.17-1.zip"
-set_default GETTEXT_TOOLS_URL "$GNOME_WIN32_DEPS_URL/gettext-tools-0.17.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 GETTEXT_RUNTIME_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime_0.18.1.1-2_win32.zip"
+set_default GETTEXT_RUNTIME_DEV_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime-dev_0.18.1.1-2_win32.zip"
+set_default GETTEXT_TOOLS_URL "$GNOME_WIN32_DEPS_URL/gettext-tools_0.18.1.1-2_win32.zip"
set_default LIBICONV_URL "$GNOME_WIN32_DEPS_URL/libiconv-1.9.1.bin.woe32.zip"
-set_default GLIB_URL "$GNOME_WIN32_URL/glib/2.22/glib_2.22.4-1_win32.zip"
-set_default GLIB_DEV_URL "$GNOME_WIN32_URL/glib/2.22/glib-dev_2.22.4-1_win32.zip"
-set_default LIBJPEG_URL "$SF_MIRROR/gnucash/jpeg_7-1-fixed-win32.zip"
-set_default LIBJPEG_DEV_URL "$GNOME_WIN32_DEPS_URL/jpeg-dev_7-1_win32.zip"
-set_default LIBPNG_URL "$GNOME_WIN32_DEPS_URL/libpng_1.4.0-1_win32.zip"
-set_default LIBPNG_DEV_URL "$GNOME_WIN32_DEPS_URL/libpng-dev_1.4.0-1_win32.zip"
-set_default LIBTIFF_URL "$GNOME_WIN32_DEPS_URL/libtiff_3.9.1-1_win32.zip"
-set_default LIBTIFF_DEV_URL "$GNOME_WIN32_DEPS_URL/libtiff-dev_3.9.1-1_win32.zip"
-set_default ZLIB_URL "$GNOME_WIN32_DEPS_URL/zlib-1.2.3.zip"
-set_default ZLIB_DEV_URL "$GNOME_WIN32_DEPS_URL/zlib-dev-1.2.3.zip"
+set_default GLIB_URL "$GNOME_WIN32_URL/glib/2.24/glib_2.24.2-2_win32.zip"
+set_default GLIB_DEV_URL "$GNOME_WIN32_URL/glib/2.24/glib-dev_2.24.2-2_win32.zip"
+#set_default LIBJPEG_URL "$SF_MIRROR/gnucash/jpeg_7-1-fixed-win32.zip" # ?!?
+set_default LIBJPEG_URL "$GNOME_WIN32_DEPS_URL/jpeg_8-1_win32.zip"
+set_default LIBJPEG_DEV_URL "$GNOME_WIN32_DEPS_URL/jpeg-dev_8-1_win32.zip"
+set_default LIBPNG_URL "$GNOME_WIN32_DEPS_URL/libpng_1.4.3-1_win32.zip"
+set_default LIBPNG_DEV_URL "$GNOME_WIN32_DEPS_URL/libpng-dev_1.4.3-1_win32.zip"
+set_default LIBTIFF_URL "$GNOME_WIN32_DEPS_URL/libtiff_3.9.2-1_win32.zip"
+set_default LIBTIFF_DEV_URL "$GNOME_WIN32_DEPS_URL/libtiff-dev_3.9.2-1_win32.zip"
+set_default ZLIB_URL "$GNOME_WIN32_DEPS_URL/zlib_1.2.5-2_win32.zip"
+set_default ZLIB_DEV_URL "$GNOME_WIN32_DEPS_URL/zlib-dev_1.2.5-2_win32.zip"
set_default PKG_CONFIG_URL "$GNOME_WIN32_DEPS_URL/pkg-config_0.23-3_win32.zip"
set_default PKG_CONFIG_DEV_URL "$GNOME_WIN32_DEPS_URL/pkg-config-dev_0.23-3_win32.zip"
-set_default CAIRO_URL "$GNOME_WIN32_DEPS_URL/cairo_1.8.8-4_win32.zip"
-set_default CAIRO_DEV_URL "$GNOME_WIN32_DEPS_URL/cairo-dev_1.8.8-4_win32.zip"
-set_default PIXMAN_URL "http://cairographics.org/releases/pixman-0.17.6.tar.gz"
+CAIRO_VERSION="1.10.0"
+set_default CAIRO_URL "$GNOME_WIN32_DEPS_URL/cairo_${CAIRO_VERSION}-1_win32.zip"
+set_default CAIRO_DEV_URL "$GNOME_WIN32_DEPS_URL/cairo-dev_${CAIRO_VERSION}-1_win32.zip"
+set_default PIXMAN_URL "$GNOME_WIN32_DEPS_URL/pixman_0.18.4-2_win32.zip"
+set_default PIXMAN_DEV_URL "$GNOME_WIN32_DEPS_URL/pixman-dev_0.18.4-2_win32.zip"
set_default EXPAT_URL "$GNOME_WIN32_DEPS_URL/expat_2.0.1-1_win32.zip"
set_default EXPAT_DEV_URL "$GNOME_WIN32_DEPS_URL/expat-dev_2.0.1-1_win32.zip"
set_default FONTCONFIG_URL "$GNOME_WIN32_DEPS_URL/fontconfig_2.8.0-2_win32.zip"
set_default FONTCONFIG_DEV_URL "$GNOME_WIN32_DEPS_URL/fontconfig-dev_2.8.0-2_win32.zip"
-set_default FREETYPE_URL "$GNOME_WIN32_DEPS_URL/freetype_2.3.11-2_win32.zip"
-set_default FREETYPE_DEV_URL "$GNOME_WIN32_DEPS_URL/freetype-dev_2.3.11-2_win32.zip"
-set_default ATK_URL "$GNOME_WIN32_URL/atk/1.28/atk_1.28.0-1_win32.zip"
-set_default ATK_DEV_URL "$GNOME_WIN32_URL/atk/1.28/atk-dev_1.28.0-1_win32.zip"
-set_default PANGO_URL "$GNOME_WIN32_URL/pango/1.26/pango_1.26.2-1_win32.zip"
-set_default PANGO_DEV_URL "$GNOME_WIN32_URL/pango/1.26/pango-dev_1.26.2-1_win32.zip"
-set_default LIBART_LGPL_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart_lgpl-2.3.20.zip"
-set_default LIBART_LGPL_DEV_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart_lgpl-dev-2.3.20.zip"
-GTK_VERSION="2.16.6"
-set_default GTK_URL "$GNOME_WIN32_URL/gtk+/2.16/gtk+_${GTK_VERSION}-2_win32.zip"
-set_default GTK_DEV_URL "$GNOME_WIN32_URL/gtk+/2.16/gtk+-dev_${GTK_VERSION}-2_win32.zip"
+set_default FREETYPE_URL "$GNOME_WIN32_DEPS_URL/freetype_2.4.2-1_win32.zip"
+set_default FREETYPE_DEV_URL "$GNOME_WIN32_DEPS_URL/freetype-dev_2.4.2-1_win32.zip"
+set_default ATK_URL "$GNOME_WIN32_URL/atk/1.30/atk_1.30.0-2_win32.zip"
+set_default ATK_DEV_URL "$GNOME_WIN32_URL/atk/1.30/atk-dev_1.30.0-2_win32.zip"
+set_default PANGO_URL "$GNOME_WIN32_URL/pango/1.28/pango_1.28.1-2_win32.zip"
+set_default PANGO_DEV_URL "$GNOME_WIN32_URL/pango/1.28/pango-dev_1.28.1-2_win32.zip"
+set_default LIBART_LGPL_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart-lgpl_2.3.21-1_win32.zip"
+set_default LIBART_LGPL_DEV_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart-lgpl-dev_2.3.21-1_win32.zip"
+GTK_VERSION="2.20.1"
+set_default GTK_URL "$GNOME_WIN32_URL/gtk+/2.20/gtk+_${GTK_VERSION}-3_win32.zip"
+set_default GTK_DEV_URL "$GNOME_WIN32_URL/gtk+/2.20/gtk+-dev_${GTK_VERSION}-3_win32.zip"
set_default INTLTOOL_URL "$GNOME_WIN32_URL/intltool/0.40/intltool_0.40.4-1_win32.zip"
-set_default ORBIT2_URL "$GNOME_WIN32_URL/ORBit2/2.14/ORBit2-2.14.13.zip"
-set_default ORBIT2_DEV_URL "$GNOME_WIN32_URL/ORBit2/2.14/ORBit2-dev-2.14.13.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 GAIL_URL "$GNOME_WIN32_URL/gail/1.22/gail-1.22.0.zip"
set_default GAIL_DEV_URL "$GNOME_WIN32_URL/gail/1.22/gail-dev-1.22.0.zip"
set_default POPT_URL "$GNOME_WIN32_DEPS_URL/popt-1.10.2-tml-20050828.zip"
@@ -251,13 +254,13 @@ set_default GNOME_VFS_URL "$GNOME_WIN32_URL/gnome-vfs/2.24/gnome-vfs_2.24.1-1_wi
set_default GNOME_VFS_DEV_URL "$GNOME_WIN32_URL/gnome-vfs/2.24/gnome-vfs-dev_2.24.1-1_win32.zip"
set_default LIBGNOME_URL "$GNOME_WIN32_URL/libgnome/2.24/libgnome_2.24.1-1_win32.zip"
set_default LIBGNOME_DEV_URL "$GNOME_WIN32_URL/libgnome/2.24/libgnome-dev_2.24.1-1_win32.zip"
-set_default LIBGNOMECANVAS_URL "$GNOME_WIN32_URL/libgnomecanvas/2.20/libgnomecanvas-2.20.1.zip"
-set_default LIBGNOMECANVAS_DEV_URL "$GNOME_WIN32_URL/libgnomecanvas/2.20/libgnomecanvas-dev-2.20.1.zip"
+set_default LIBGNOMECANVAS_URL "$GNOME_WIN32_URL/libgnomecanvas/2.30/libgnomecanvas_2.30.1-1_win32.zip"
+set_default LIBGNOMECANVAS_DEV_URL "$GNOME_WIN32_URL/libgnomecanvas/2.30/libgnomecanvas-dev_2.30.1-1_win32.zip"
set_default LIBGNOMEUI_URL "$GNOME_WIN32_URL/libgnomeui/2.22/libgnomeui-2.22.1.zip"
set_default LIBGNOMEUI_DEV_URL "$GNOME_WIN32_URL/libgnomeui/2.22/libgnomeui-dev-2.22.1.zip"
set_default LIBGLADE_URL "$GNOME_WIN32_URL/libglade/2.6/libglade_2.6.4-1_win32.zip"
set_default LIBGLADE_DEV_URL "$GNOME_WIN32_URL/libglade/2.6/libglade-dev_2.6.4-1_win32.zip"
-set_default GTK_DOC_URL "$GNOME_MIRROR/sources/gtk-doc/1.13/gtk-doc-1.13.tar.bz2"
+set_default GTK_DOC_URL "$GNOME_MIRROR/sources/gtk-doc/1.15/gtk-doc-1.15.tar.bz2"
set_default GTK_THEME_URL "$SF_MIRROR/gtk-win/gtk2-themes-2009-09-07-win32_bin.zip"
set_default GTK_PREFS_URL "$SF_MIRROR/gtk-win/gtk2_prefs-0.4.1.bin-gtk2.10-win32.zip"
set_default GNOME_DIR $GLOBAL_DIR\\gnome
@@ -275,10 +278,12 @@ set_default PCRE_BIN_URL "$SF_MIRROR/gnuwin32/pcre-7.0-bin.zip"
set_default PCRE_LIB_URL "$SF_MIRROR/gnuwin32/pcre-7.0-lib.zip"
set_default PCRE_DIR $GLOBAL_DIR\\pcre
-set_default LIBGSF_URL "$GNOME_MIRROR/sources/libgsf/1.14/libgsf-1.14.15.tar.bz2"
+LIBGSF_VERSION="1.14.18"
+set_default LIBGSF_URL "$GNOME_MIRROR/sources/libgsf/1.14/libgsf-${LIBGSF_VERSION}.tar.bz2"
set_default LIBGSF_DIR $GLOBAL_DIR\\libgsf
-set_default GOFFICE_URL "$GNOME_MIRROR/sources/goffice/0.7/goffice-0.7.14.tar.bz2"
+GOFFICE_VERSION="0.8.10"
+set_default GOFFICE_URL "$GNOME_MIRROR/sources/goffice/0.8/goffice-${GOFFICE_VERSION}.tar.bz2"
set_default GOFFICE_DIR $GLOBAL_DIR\\goffice
#set_default GOFFICE_PATCH `pwd`/goffice-0.7.2-patch.diff
diff --git a/install-impl.sh b/install-impl.sh
index 1b94439..e9e85aa 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -521,6 +521,7 @@ function inst_gnome() {
quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 &&
quiet ${PKG_CONFIG} --atleast-version=${GCONF_VERSION} gconf-2.0 &&
quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-2.0 &&
+ quiet ${PKG_CONFIG} --atleast-version=${CAIRO_VERSION} cairo &&
quiet intltoolize --version
then
echo "gnome packages installed. skipping."
@@ -546,6 +547,8 @@ function inst_gnome() {
wget_unpacked $PKG_CONFIG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $CAIRO_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $CAIRO_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $PIXMAN_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $PIXMAN_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $EXPAT_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $EXPAT_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $FONTCONFIG_URL $DOWNLOAD_DIR $GNOME_DIR
@@ -628,17 +631,6 @@ EOF
#perl -pi.bak -e's!^Libs: !Libs: -L\${prefix}/bin !' *.pc
qpopd
fi
- wget_unpacked $PIXMAN_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/pixman-*
- qpushd $TMP_UDIR/pixman-*
- ./configure ${HOST_XCOMPILE} \
- --prefix=$_GNOME_UDIR \
- --disable-static
- make
- make install
- qpopd
- rm -rf $TMP_UDIR/pixman-*
- ${PKG_CONFIG} --exists pixman-1 || die "pixman not installed correctly"
quiet gconftool-2 --version &&
quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 &&
quiet intltoolize --version || die "gnome not installed correctly"
@@ -746,10 +738,12 @@ function inst_libgsf() {
_LIBGSF_UDIR=`unix_path $LIBGSF_DIR`
add_to_env $_LIBGSF_UDIR/bin PATH
add_to_env $_LIBGSF_UDIR/lib/pkgconfig PKG_CONFIG_PATH
- if quiet ${PKG_CONFIG} --exists libgsf-1 libgsf-gnome-1
+ if quiet ${PKG_CONFIG} --exists libgsf-1 libgsf-gnome-1 &&
+ quiet ${PKG_CONFIG} --atleast-version=${LIBGSF_VERSION} libgsf-1
then
echo "libgsf already installed. skipping."
else
+ rm -rf ${TMP_UDIR}/libgsf-*
wget_unpacked $LIBGSF_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/libgsf-*
qpushd $TMP_UDIR/libgsf-*
@@ -771,7 +765,7 @@ function inst_goffice() {
_GOFFICE_UDIR=`unix_path $GOFFICE_DIR`
add_to_env $_GOFFICE_UDIR/bin PATH
add_to_env $_GOFFICE_UDIR/lib/pkgconfig PKG_CONFIG_PATH
- if quiet ${PKG_CONFIG} --exists libgoffice-0.8
+ if quiet ${PKG_CONFIG} --atleast-version=${GOFFICE_VERSION} libgoffice-0.8
then
echo "goffice already installed. skipping."
else
commit 9d83d10c6be8b4800185829ed88c8ecbf90e1d96
Author: Christian Stimming <stimming at tuhh.de>
Date: Tue Sep 14 19:26:30 2010 +0000
Win32 build: Add version number checks for gtk and gconf so that updating them should work more easily.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19575 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 4f21cb6..9a82e58 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -232,8 +232,9 @@ set_default PANGO_URL "$GNOME_WIN32_URL/pango/1.26/pango_1.26.2-1_win32.zip"
set_default PANGO_DEV_URL "$GNOME_WIN32_URL/pango/1.26/pango-dev_1.26.2-1_win32.zip"
set_default LIBART_LGPL_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart_lgpl-2.3.20.zip"
set_default LIBART_LGPL_DEV_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart_lgpl-dev-2.3.20.zip"
-set_default GTK_URL "$GNOME_WIN32_URL/gtk+/2.16/gtk+_2.16.6-2_win32.zip"
-set_default GTK_DEV_URL "$GNOME_WIN32_URL/gtk+/2.16/gtk+-dev_2.16.6-2_win32.zip"
+GTK_VERSION="2.16.6"
+set_default GTK_URL "$GNOME_WIN32_URL/gtk+/2.16/gtk+_${GTK_VERSION}-2_win32.zip"
+set_default GTK_DEV_URL "$GNOME_WIN32_URL/gtk+/2.16/gtk+-dev_${GTK_VERSION}-2_win32.zip"
set_default INTLTOOL_URL "$GNOME_WIN32_URL/intltool/0.40/intltool_0.40.4-1_win32.zip"
set_default ORBIT2_URL "$GNOME_WIN32_URL/ORBit2/2.14/ORBit2-2.14.13.zip"
set_default ORBIT2_DEV_URL "$GNOME_WIN32_URL/ORBit2/2.14/ORBit2-dev-2.14.13.zip"
@@ -241,8 +242,9 @@ set_default GAIL_URL "$GNOME_WIN32_URL/gail/1.22/gail-1.22.0.zip"
set_default GAIL_DEV_URL "$GNOME_WIN32_URL/gail/1.22/gail-dev-1.22.0.zip"
set_default POPT_URL "$GNOME_WIN32_DEPS_URL/popt-1.10.2-tml-20050828.zip"
set_default POPT_DEV_URL "$GNOME_WIN32_DEPS_URL/popt-dev-1.10.2-tml-20050828.zip"
-set_default GCONF_URL "$GNOME_WIN32_URL/GConf/2.22/GConf_2.22.0-3_win32.zip"
-set_default GCONF_DEV_URL "$GNOME_WIN32_URL/GConf/2.22/GConf-dev_2.22.0-3_win32.zip"
+GCONF_VERSION="2.22.0"
+set_default GCONF_URL "$GNOME_WIN32_URL/GConf/2.22/GConf_${GCONF_VERSION}-3_win32.zip"
+set_default GCONF_DEV_URL "$GNOME_WIN32_URL/GConf/2.22/GConf-dev_${GCONF_VERSION}-3_win32.zip"
set_default LIBBONOBO_URL "$GNOME_WIN32_URL/libbonobo/2.24/libbonobo_2.24.0-1_win32.zip"
set_default LIBBONOBO_DEV_URL "$GNOME_WIN32_URL/libbonobo/2.24/libbonobo-dev_2.24.0-1_win32.zip"
set_default GNOME_VFS_URL "$GNOME_WIN32_URL/gnome-vfs/2.24/gnome-vfs_2.24.1-1_win32.zip"
diff --git a/install-impl.sh b/install-impl.sh
index a1c114a..1b94439 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -519,6 +519,8 @@ function inst_gnome() {
fi
if quiet gconftool-2 --version &&
quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 &&
+ quiet ${PKG_CONFIG} --atleast-version=${GCONF_VERSION} gconf-2.0 &&
+ quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-2.0 &&
quiet intltoolize --version
then
echo "gnome packages installed. skipping."
commit 0c609c7b6af8d39b9681a867e9c80291e6670544
Author: Christian Stimming <stimming at tuhh.de>
Date: Tue Sep 14 19:26:17 2010 +0000
Win32 build: Remove commented-out gtkhtml references.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19574 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 007fac0..4f21cb6 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -255,9 +255,6 @@ set_default LIBGNOMEUI_URL "$GNOME_WIN32_URL/libgnomeui/2.22/libgnomeui-2.22.1.z
set_default LIBGNOMEUI_DEV_URL "$GNOME_WIN32_URL/libgnomeui/2.22/libgnomeui-dev-2.22.1.zip"
set_default LIBGLADE_URL "$GNOME_WIN32_URL/libglade/2.6/libglade_2.6.4-1_win32.zip"
set_default LIBGLADE_DEV_URL "$GNOME_WIN32_URL/libglade/2.6/libglade-dev_2.6.4-1_win32.zip"
-# GnuCash on Windows is built with webkit, no need to install gtkhtml
-#set_default GTKHTML_URL "$GNOME_WIN32_URL/gtkhtml/3.24/gtkhtml_3.24.2-1_win32.zip"
-#set_default GTKHTML_DEV_URL "$GNOME_WIN32_URL/gtkhtml/3.24/gtkhtml-dev_3.24.2-1_win32.zip"
set_default GTK_DOC_URL "$GNOME_MIRROR/sources/gtk-doc/1.13/gtk-doc-1.13.tar.bz2"
set_default GTK_THEME_URL "$SF_MIRROR/gtk-win/gtk2-themes-2009-09-07-win32_bin.zip"
set_default GTK_PREFS_URL "$SF_MIRROR/gtk-win/gtk2_prefs-0.4.1.bin-gtk2.10-win32.zip"
diff --git a/install-impl.sh b/install-impl.sh
index 73f1440..a1c114a 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -518,8 +518,6 @@ function inst_gnome() {
add_to_env pkg-config PKG_CONFIG
fi
if quiet gconftool-2 --version &&
-# GnuCash on Windows is built with webkit, no need to install gtkhtml
-# quiet ${PKG_CONFIG} --exists libgtkhtml-3.14 &&
quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 &&
quiet intltoolize --version
then
@@ -584,9 +582,6 @@ function inst_gnome() {
wget_unpacked $LIBGNOMEUI_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBGLADE_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBGLADE_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
-# GnuCash on Windows is built with webkit, no need to install gtkhtml
-# wget_unpacked $GTKHTML_URL $DOWNLOAD_DIR $GNOME_DIR
-# wget_unpacked $GTKHTML_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GTK_THEME_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/gtk2-themes-*
cp -a $TMP_UDIR/gtk2-themes-*/lib $_GNOME_UDIR/
@@ -622,9 +617,6 @@ fi
\${PKG_CONFIG} "\$@" | tr -d \\\\r && \$res
EOF
chmod +x bin/pkg-config{.exe,-msys.sh}
-# GnuCash on Windows is built with webkit, no need to install gtkhtml
-# sed '/Requires/s,\(.*\) enchant\(.*\) iso-codes\(.*\),\1\2\3,' lib/pkgconfig/libgtkhtml-3.14.pc > tmp
-# mv tmp lib/pkgconfig/libgtkhtml-3.14.pc
rm -rf $TMP_UDIR/gtk-doc-*
qpopd
@@ -646,8 +638,6 @@ EOF
rm -rf $TMP_UDIR/pixman-*
${PKG_CONFIG} --exists pixman-1 || die "pixman not installed correctly"
quiet gconftool-2 --version &&
-# GnuCash on Windows is built with webkit, no need to install gtkhtml
-# quiet ${PKG_CONFIG} --exists libgtkhtml-3.14 &&
quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 &&
quiet intltoolize --version || die "gnome not installed correctly"
fi
commit 0daada51f68797e087abf8d2a97e95a82fbf2950
Author: Christian Stimming <stimming at tuhh.de>
Date: Tue Sep 14 19:26:04 2010 +0000
Win32 build: Set gwen/aqbanking version numbers in defaults.sh.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19573 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 8d3e8d8..007fac0 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -326,9 +326,11 @@ set_default AQBANKING5 no
# needed.
if [ "$AQBANKING5" = "yes" ]; then
- set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=54&file=01&dummy=gwenhywfar-4.0.1.tar.gz"
+ GWENHYWFAR_VERSION="4.0.1"
+ set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=54&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
else
- set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=31&file=01&dummy=gwenhywfar-3.11.3.tar.gz"
+ GWENHYWFAR_VERSION="3.11.3"
+ set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=31&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
#set_default GWENHYWFAR_PATCH `pwd`/gwenhywfar-3.11.1-patch.diff
fi
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
@@ -337,10 +339,12 @@ set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-1.24.tar.gz"
# ktoblzcheck is being installed into GWENHYWFAR_DIR
if [ "$AQBANKING5" = "yes" ]; then
- set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=74&file=01&dummy=aqbanking-5.0.1.tar.gz"
+ AQBANKING_VERSION="5.0.1"
+ set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=74&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
set_default AQBANKING_WITH_QT no
else
- set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=50&file=01&dummy=aqbanking-4.2.4.tar.gz"
+ AQBANKING_VERSION="4.2.4"
+ set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=50&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
#set_default AQBANKING_PATCH `pwd`/aqbanking-4.1.6-patch.diff
set_default AQBANKING_WITH_QT yes
fi
diff --git a/install-impl.sh b/install-impl.sh
index b26e3d6..73f1440 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -964,12 +964,7 @@ function inst_gwenhywfar() {
_GWENHYWFAR_UDIR=`unix_path ${GWENHYWFAR_DIR}`
add_to_env ${_GWENHYWFAR_UDIR}/bin PATH
add_to_env ${_GWENHYWFAR_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
- if [ "$AQBANKING5" = "yes" ]; then
- _GWEN_VERSION="4.0.1"
- else
- _GWEN_VERSION="3.11.3"
- fi
- if quiet ${PKG_CONFIG} --atleast-version=${_GWEN_VERSION} gwenhywfar
+ if quiet ${PKG_CONFIG} --atleast-version=${GWENHYWFAR_VERSION} gwenhywfar
then
echo "Gwenhywfar already installed. skipping."
else
@@ -1071,12 +1066,7 @@ function inst_aqbanking() {
_AQBANKING_UDIR=`unix_path ${AQBANKING_DIR}`
add_to_env ${_AQBANKING_UDIR}/bin PATH
add_to_env ${_AQBANKING_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
- if [ "$AQBANKING5" = "yes" ]; then
- _AQBANKING_VERSION="5.0.1"
- else
- _AQBANKING_VERSION="4.2.4"
- fi
- if quiet ${PKG_CONFIG} --atleast-version=${_AQBANKING_VERSION} aqbanking
+ if quiet ${PKG_CONFIG} --atleast-version=${AQBANKING_VERSION} aqbanking
then
echo "AqBanking already installed. skipping."
else
commit c91474b961c9cd266fed5c6a635011acfdbfbd2b
Author: Christian Stimming <stimming at tuhh.de>
Date: Mon Sep 6 19:25:48 2010 +0000
De-activate aqbanking5 by default again because it requires gtk-2.18 or higher, which we don't have. Sigh.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19557 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 478cc9a..8d3e8d8 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -320,7 +320,7 @@ set_default LIBOFX_DIR $GLOBAL_DIR\\libofx
set_default LIBOFX_PATCH `pwd`/libofx-0.8.3-patch.diff
## online banking: gwenhywfar+aqbanking
-set_default AQBANKING5 yes
+set_default AQBANKING5 no
# If sticking to aqbanking4, make sure to enable the QtCore4.dll et al
# in gnucash.iss.in again because in aqbanking4 those DLLs are still
# needed.
diff --git a/gnucash.iss.in b/gnucash.iss.in
index e13d2df..0fc0603 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -78,17 +78,17 @@ Source: "@prefix@\..\dist\lib\*"; DestDir: "{app}\lib"; Flags: recursesubdirs; C
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 anymore!
+;;; Not needed with AQBANKING5!
;; Additionally, we ship the Qt DLLs because the Online-Banking-Wizard
;; lib/aqbanking/plugins/@-aqbanking_so_effective-@/wizards/qt3-wizard.exe needs them.
-;Source: "@-qtbindir-@\QtCore4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-;Source: "@-qtbindir-@\QtGui4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-;Source: "@-qtbindir-@\mingwm10.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "@-qtbindir-@\QtCore4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "@-qtbindir-@\QtGui4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "@-qtbindir-@\mingwm10.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
;; The following are all needed by Qt3Support
-;Source: "@-qtbindir-@\Qt3Support4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-;Source: "@-qtbindir-@\QtXml4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-;Source: "@-qtbindir-@\QtSql4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-;Source: "@-qtbindir-@\QtNetwork4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "@-qtbindir-@\Qt3Support4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "@-qtbindir-@\QtXml4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "@-qtbindir-@\QtSql4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "@-qtbindir-@\QtNetwork4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
;; The translations
;Source: "@prefix@\..\dist\share\locale\*"; DestDir: "{app}\share\locale"; Flags: recursesubdirs; Components: translations
commit 08335c9104252b4ac4df2d815ac3cdb2eff1c5fa
Author: Christian Stimming <stimming at tuhh.de>
Date: Sun Sep 5 19:19:32 2010 +0000
Win32: Add gtk's cflags to gwenhywfar configure.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19553 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
index 690869a..b26e3d6 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -984,7 +984,7 @@ function inst_gwenhywfar() {
--disable-binreloc \
--prefix=$_GWENHYWFAR_UDIR \
--with-guis=gtk2 \
- CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} -I${_GNOME_UDIR}/include/gtk-2.0 ${GNUTLS_CPPFLAGS}" \
+ CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS} `pkg-config --cflags gtk+-2.0`" \
LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GNUTLS_LDFLAGS} -lintl"
else
if [ -n "$GWENHYWFAR_PATCH" -a -f "$GWENHYWFAR_PATCH" ] ; then
commit a9d7fdbd7887bd628e0b7cca4dfc737dbc2ffbf9
Author: Christian Stimming <stimming at tuhh.de>
Date: Sun Sep 5 19:14:54 2010 +0000
I18n: Add German translation for new installer texts.
Suggested by Frank H. Ellenberger and edited by myself.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19551 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/gnucash.iss.in b/gnucash.iss.in
index 1f28a6a..e13d2df 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -468,6 +468,10 @@ de.IconComment_InstallFQ=Das zusätzliche Modul Finance-Quote installieren, um o
de.IconName_Uninstall=Deinstallieren von GnuCash
de.IconComment_Uninstall=Die OpenSource-Finanzverwaltung GnuCash wieder deinstallieren und vom Computer löschen
+de.AIWP_Title=Frühere Version gefunden
+de.AIWP_Description=%1 ist momentan auf diesem Computer installiert
+de.AIWP_Message=Diese frühere Version muss vor der neuen Installation entfernt werden. %n%nFalls Sie das nicht möchten, klicken Sie jetzt auf »Abbrechen«.%n%nKlicken Sie auf »Fortsetzen«, um %1 zu entfernen und die neue Version zu installieren.%n%nHinweis: Lediglich die Programmversion wird entfernt, aber nicht Ihre finanziellen Daten.
+
;; ;;;;;;;;;;;;;;;;;;;
;; Greek translation
commit 5553b339ff4d57f56523f90973c007ac2e63889b
Author: Cristian Marchi <cri79 at libero.it>
Date: Sat Sep 4 11:41:21 2010 +0000
Updated Japanese translation for win32 installer wizard by Yasuaki Taniguchi.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19544 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/gnucash.iss.in b/gnucash.iss.in
index 2fa9613..1f28a6a 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -567,6 +567,11 @@ ja.CreateMenuLink=スタートメニューã«ãƒªãƒ³ã‚¯ã‚’作æˆ
ja.RunPrg=GnuCashã‚’ã™ãã«å®Ÿè¡Œ
ja.AdditionalIcons=作æˆã•ã‚ŒãŸã‚¢ã‚¤ã‚³ãƒ³:
ja.StatusMsgFirewall=ファイアウォール定義をインストールä¸
+; *** "Another install" wizard page
+; %1 in the following messages will be replaced with the application name and version, like "GnuCash 2.3.15"
+ja.AIWP_Title=ä»–ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã™
+ja.AIWP_Description=ã“ã®ã‚³ãƒ³ãƒ”ュータã«ã¯ %1 ãŒç¾åœ¨ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã™
+ja.AIWP_Message=インストールを継続ã™ã‚‹å‰ã«å‰ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¯ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¾ã™ã€‚%n%nã‚‚ã—ã“ã®å‹•ä½œã‚’望ã¾ãªã„ãªã‚‰ã€Œã‚ャンセルã€ã‚’クリックã—ã¦ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’ä¸æ¢ã—ã¦ãã ã•ã„。%n%n%1 を削除ã—ã¦ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’継続ã™ã‚‹å ´åˆã¯ã€Œæ¬¡ã¸ã€ã‚’クリックã—ã¦ãã ã•ã„。%n%n備考: 作æˆã—ãŸè²¡å‹™ãƒ‡ãƒ¼ã‚¿ã¯å‰Šé™¤ã•ã‚Œã¾ã›ã‚“。プãƒã‚°ãƒ©ãƒ ã®ã¿ãŒå‰Šé™¤ã•ã‚Œã¾ã™ã€‚
ja.MainFiles=GnuCashプãƒã‚°ãƒ©ãƒ
ja.TranslFiles=翻訳ファイル
commit 6e5175b2def4bb5e26de8fda59b7f78952a701f3
Author: Christian Stimming <stimming at tuhh.de>
Date: Sat Sep 4 08:52:04 2010 +0000
Win32: Add gtk include path to gwenhywfar configure.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19543 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
index 2ab8df1..690869a 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -984,7 +984,7 @@ function inst_gwenhywfar() {
--disable-binreloc \
--prefix=$_GWENHYWFAR_UDIR \
--with-guis=gtk2 \
- CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS}" \
+ CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} -I${_GNOME_UDIR}/include/gtk-2.0 ${GNUTLS_CPPFLAGS}" \
LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GNUTLS_LDFLAGS} -lintl"
else
if [ -n "$GWENHYWFAR_PATCH" -a -f "$GWENHYWFAR_PATCH" ] ; then
commit 330c22c845c2af7f8a5066bc71df97a32be5c524
Author: Cristian Marchi <cri79 at libero.it>
Date: Sat Sep 4 06:02:34 2010 +0000
Added Japanese translation for win32 installer wizard by Yasuaki Taniguchi.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19542 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/gnucash.iss.in b/gnucash.iss.in
index 1cf47ec..2fa9613 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -556,6 +556,35 @@ it.IconName_Theme=Selezione del tema
it.IconName_Uninstall=Disinstalla GnuCash
it.IconComment_Uninstall=Disinstalla il programma di gestione delle finanze GnuCash
+
+;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Japanese translation
+
+ja.FullInstall=完全インストール
+ja.CustomInstall=カスタムインストール
+ja.CreateDesktopIcon=デスクトップã«ã‚¢ã‚¤ã‚³ãƒ³ã‚’作æˆ(&D)
+ja.CreateMenuLink=スタートメニューã«ãƒªãƒ³ã‚¯ã‚’作æˆ
+ja.RunPrg=GnuCashã‚’ã™ãã«å®Ÿè¡Œ
+ja.AdditionalIcons=作æˆã•ã‚ŒãŸã‚¢ã‚¤ã‚³ãƒ³:
+ja.StatusMsgFirewall=ファイアウォール定義をインストールä¸
+
+ja.MainFiles=GnuCashプãƒã‚°ãƒ©ãƒ
+ja.TranslFiles=翻訳ファイル
+ja.TemplFiles=勘定科目テンプレートファイル
+
+ja.IconComment_GnuCash=GnuCash フリーã®è²¡å‹™ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢
+ja.IconName_README=READMEを表示
+ja.IconComment_README=READMEファイルを表示ã—ã¾ã™
+ja.IconFilename_README=README.win32-bin.txt
+ja.IconName_FAQ=FAQ (オンライン)
+ja.IconName_Bugzilla=ãƒã‚°ã‚’å ±å‘Š (オンライン)
+ja.IconName_InstallFQ=ã‚ªãƒ³ãƒ©ã‚¤ãƒ³ç›¸å ´è¡¨å–得ツールをインストール
+ja.IconComment_InstallFQ=ã‚ªãƒ³ãƒ©ã‚¤ãƒ³ç›¸å ´è¡¨ã‚’å–å¾—ã™ã‚‹ãŸã‚ã«Finance-Quote perl モジュールをインストールã—ã¾ã™ã€‚ActivePerl5.8ã¾ãŸã¯5.10ãŒå¿…è¦ã§ã™
+ja.IconName_Theme=テーマã®é¸æŠž
+ja.IconName_Uninstall=GnuCashをアンインストール
+ja.IconComment_Uninstall=財務ソフトウェアGnuCashをアンインストールã—ã¾ã™
+
+
;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Latvian translation
@@ -648,6 +677,7 @@ pt_BR.IconComment_InstallFQ=Instala o módulo perl Finance-Quote, necessário pa
pt_BR.IconName_Uninstall=Desinstalar o GnuCash
pt_BR.IconComment_Uninstall=Desinstala o Gerenciador Financeiro GnuCash
+
;; ;;;;;;;;;;;;;;;;;
;; Simplified Chinese translation
commit c5a12076d0d120e68ef9012989c138c9ffd5ae03
Author: Cristian Marchi <cri79 at libero.it>
Date: Fri Sep 3 18:01:46 2010 +0000
Updated Latvian translation for win32 installer wizard by Valdis Vītoliņš.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19541 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/gnucash.iss.in b/gnucash.iss.in
index 5c4b367..1cf47ec 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -559,6 +559,7 @@ it.IconComment_Uninstall=Disinstalla il programma di gestione delle finanze GnuC
;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Latvian translation
+; *** "Select Components" wizard page
lv.FullInstall=Pilna uzstÄdÄ«Å¡ana
lv.CustomInstall=IzvÄ“les uzstÄdÄ«Å¡ana
lv.CreateDesktopIcon=Izveidot &darbvirsmas ikonu
@@ -567,6 +568,12 @@ lv.RunPrg=Palaist GnuCash tagad
lv.AdditionalIcons=Izveidot sekojošas ikonas:
lv.StatusMsgFirewall=UzstÄda Windows ugunssienas likumus...
+; *** "Another install" wizard page
+; %1 in the following messages will be replaced with the application name and version, like "GnuCash 2.3.15"
+lv.AIWP_Title=Ir atrasta cita programmas versija
+lv.AIWP_Description=Uz Å¡Ä« datora jau ir uzstÄdÄ«t %1 versija
+lv.AIWP_Message=Pirms turpinÄt, ir nepiecieÅ¡ams noņemt iepriekÅ¡ uzstÄdÄ«to versiju.%n%nJa nevÄ“laties to darÄ«t, spiediet Atcelt pogu, un Å¡Ä« uzstÄdÄ«Å¡ana tiks atcelta.%n%nSpiediet TurpinÄt, lai noņemtu %1 un turpinÄtu jaunÄs versijas uzstÄdÄ«Å¡anu.%n%nNote: Tiks noņemta tikai iepriekÅ¡Ä“jÄs programmas versija. JÅ«su finanÅ¡u dati aiztikti netiks.
+
lv.MainFiles=GnuCash Programma
lv.TranslFiles=Tulkojumu faili
lv.TemplFiles=Kontu sagatavju faili
@@ -579,6 +586,7 @@ lv.IconName_FAQ=BUJ (tiešsaistē)
lv.IconName_Bugzilla=Ziņot par kļūdu (tiešsaistē)
lv.IconName_InstallFQ=UzstÄdÄ«t tieÅ¡saistes kursu iegÅ«Å¡anu
lv.IconComment_InstallFQ=UzstÄdÄ«t nepiecieÅ¡amos Perl moduļus valÅ«tas kursu iegÅ«Å¡anai. NepiecieÅ¡ams ActivePerl 5.8 vai 5.10
+lv.IconName_Theme=Izvēlieties tēmu
lv.IconName_Uninstall=Noņemt GnuCash
lv.IconComment_Uninstall=Noņemt GnuCash grÄmatvedÄ«bas programmu
commit 7ad9890fc1e4a35b8157b697ae8c784952ce117b
Author: Christian Stimming <stimming at tuhh.de>
Date: Fri Sep 3 16:18:58 2010 +0000
Win32: Add pkg-config version check for aqbanking so that the new version is installed without removing the old one manually.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19540 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index ef4046b..478cc9a 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -340,7 +340,7 @@ if [ "$AQBANKING5" = "yes" ]; then
set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=74&file=01&dummy=aqbanking-5.0.1.tar.gz"
set_default AQBANKING_WITH_QT no
else
- set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=49&file=01&dummy=aqbanking-4.2.3.tar.gz"
+ set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=50&file=01&dummy=aqbanking-4.2.4.tar.gz"
#set_default AQBANKING_PATCH `pwd`/aqbanking-4.1.6-patch.diff
set_default AQBANKING_WITH_QT yes
fi
diff --git a/install-impl.sh b/install-impl.sh
index b6c1faa..2ab8df1 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -964,7 +964,12 @@ function inst_gwenhywfar() {
_GWENHYWFAR_UDIR=`unix_path ${GWENHYWFAR_DIR}`
add_to_env ${_GWENHYWFAR_UDIR}/bin PATH
add_to_env ${_GWENHYWFAR_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
- if quiet ${PKG_CONFIG} --exists gwenhywfar
+ if [ "$AQBANKING5" = "yes" ]; then
+ _GWEN_VERSION="4.0.1"
+ else
+ _GWEN_VERSION="3.11.3"
+ fi
+ if quiet ${PKG_CONFIG} --atleast-version=${_GWEN_VERSION} gwenhywfar
then
echo "Gwenhywfar already installed. skipping."
else
@@ -1066,7 +1071,12 @@ function inst_aqbanking() {
_AQBANKING_UDIR=`unix_path ${AQBANKING_DIR}`
add_to_env ${_AQBANKING_UDIR}/bin PATH
add_to_env ${_AQBANKING_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
- if quiet ${PKG_CONFIG} --exists aqbanking
+ if [ "$AQBANKING5" = "yes" ]; then
+ _AQBANKING_VERSION="5.0.1"
+ else
+ _AQBANKING_VERSION="4.2.4"
+ fi
+ if quiet ${PKG_CONFIG} --atleast-version=${_AQBANKING_VERSION} aqbanking
then
echo "AqBanking already installed. skipping."
else
commit 57ca2020f2fc38c908d394e0f87eaeaf1922f712
Author: Christian Stimming <stimming at tuhh.de>
Date: Fri Sep 3 16:08:20 2010 +0000
Win32: Update aqbanking packages. Enable building with aqbanking5.
In r19532 I accidentally already removed the Qt DLLs from the installer. Of
course those can only be removed if indeed aqbanking5 is used, otherwise
they must still be in the installer.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19539 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index b91ba44..ef4046b 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -320,10 +320,13 @@ set_default LIBOFX_DIR $GLOBAL_DIR\\libofx
set_default LIBOFX_PATCH `pwd`/libofx-0.8.3-patch.diff
## online banking: gwenhywfar+aqbanking
-set_default AQBANKING5 no
+set_default AQBANKING5 yes
+# If sticking to aqbanking4, make sure to enable the QtCore4.dll et al
+# in gnucash.iss.in again because in aqbanking4 those DLLs are still
+# needed.
if [ "$AQBANKING5" = "yes" ]; then
- set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=53&file=01&dummy=gwenhywfar-4.0.0.tar.gz"
+ set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=54&file=01&dummy=gwenhywfar-4.0.1.tar.gz"
else
set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=31&file=01&dummy=gwenhywfar-3.11.3.tar.gz"
#set_default GWENHYWFAR_PATCH `pwd`/gwenhywfar-3.11.1-patch.diff
@@ -334,7 +337,7 @@ set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-1.24.tar.gz"
# ktoblzcheck is being installed into GWENHYWFAR_DIR
if [ "$AQBANKING5" = "yes" ]; then
- set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=73&file=01&dummy=aqbanking-5.0.0.tar.gz"
+ set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=74&file=01&dummy=aqbanking-5.0.1.tar.gz"
set_default AQBANKING_WITH_QT no
else
set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=49&file=01&dummy=aqbanking-4.2.3.tar.gz"
commit 8c8412c4db2b58862241e2a38f74f8181349e671
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri Sep 3 10:10:46 2010 +0000
Updated Latvian translation for the Windows installer, patch by Valdis Vītoliņš
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19536 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/Latvian-1-5.1.11.isl b/Latvian-1-5.1.11.isl
index ad1eccc..1ceb7c2 100644
--- a/Latvian-1-5.1.11.isl
+++ b/Latvian-1-5.1.11.isl
@@ -1,328 +1,328 @@
-;Agris Ausejs
-;******************************************************
-; *** ***
-; *** Inno Setup version 5.1.11+ Latvian messages ***
-; *** ***
-; *** Original Author: ***
-; *** ***
-; *** Agris Ausejs (oby2005 at gmail.com) ***
-; *** ***
-; *** 02/22/2008 ***
-; ******************************************************
-;
-;
-; To download user-contributed translations of this file, go to:
-; http://www.jrsoftware.org/is3rdparty.php
-;
-; Note: When translating this text, do not add periods (.) to the end of
-; messages that didn't have them already, because on those messages Inno
-; Setup adds the periods automatically (appending a period would result in
-; two periods being displayed).
-
-[LangOptions]
-; The following three entries are very important. Be sure to read and
-; understand the '[LangOptions] section' topic in the help file.
-LanguageName=Latviski
-LanguageID=$0426
-LanguageCodePage=1257
-; If the language you are translating to requires special font faces or
-; sizes, uncomment any of the following entries and change them accordingly.
-;DialogFontName=
-;DialogFontSize=8
-;WelcomeFontName=Verdana
-;WelcomeFontSize=12
-;TitleFontName=Arial
-;TitleFontSize=29
-;CopyrightFontName=Arial
-;CopyrightFontSize=8
-
-[Messages]
-
-; *** Application titles
-SetupAppTitle=Uzstâdîðana
-SetupWindowTitle=Uzstâdîðana - %1
-UninstallAppTitle=Atinstalâcija
-UninstallAppFullTitle=%1 Atinstalâcija
-
-; *** Misc. common
-InformationTitle=Informâcija
-ConfirmTitle=Apstiprinât
-ErrorTitle=Kïûda
-
-; *** SetupLdr messages
-SetupLdrStartupMessage=Tiks uzstâdîta programma %1. Vai vçlaties turpinât?
-LdrCannotCreateTemp=Neiespçjami izveidot pagaidu datnes. Uzstâdîðana pârtraukta
-LdrCannotExecTemp=Neiespçjami palaist datni no pagaidu mapes. Uzstâdîðana pârtraukta
-
-; *** Startup error messages
-LastErrorMessage=%1.%n%nKïûda %2: %3
-SetupFileMissing=Datne %1 nav atrodama instalâcijas mapç. Lûdzu, izlabojiet kïûdu vai iegâdâjieties jaunu programmas kopiju.
-SetupFileCorrupt=Uzstâdâmâs datnes ir sabojâtas. Lûdzu, iegâdâjieties jaunu programmas kopiju.
-SetupFileCorruptOrWrongVer=Uzstâdâmâs datnes ir bojâtas vai nav savienojamas ar ðo Uzstâdîðanas programmu. Lûdzu, izlabojiet ðo kïûdu vai iegâdâjieties jaunu programmas kopiju.
-NotOnThisPlatform=Ðo programmu nevar palaist uz %1.
-OnlyOnThisPlatform=Ðî programma darbojas uz %1.
-OnlyOnTheseArchitectures=Ðo programmu var uzstâdît tikai uz ðâdâm Windows versijâm:%n%n%1
-MissingWOW64APIs=Paðlaik palaistâ Windows versija neatbalsta 64-bitu instalâciju. Lai izlabotu ðo kïûdu, uzinstalçjiet Service Pack %1.
-WinVersionTooLowError=Ðî programma pieprasa %1 versiju %2 vai jaunâku.
-WinVersionTooHighError=Ðo programmu nevar uzstâdît uz %1 versijas %2 vai jaunâkas.
-AdminPrivilegesRequired=Jums ir jâbût adminstratoram, lai varçtu uzsâkt instalâciju.
-PowerUserPrivilegesRequired=Jums ir jâbût administratoram vai pilnvarotam lietotâjam, lai uzstâdîtu ðo programmu.
-SetupAppRunningError=Uzstâdîðana ir atklâjusi, ka %1 paðlaik darbojas.%n%nLûdzu, aizveriet visas programmas un spiediet "Ok" vai "Atcelt", lai izietu.
-UninstallAppRunningError=Atinstalâcija ir atklâjusi ka %1 paðlaik darbojas.%n%nLûdzu, aizveriet visas programmas un spiediet "Ok", lai turpinâtu, vai "Atcelt", lai izietu.
-
-; *** Misc. errors
-ErrorCreatingDir=Uzstâdîðanâ ir neiespçjami izveidot mapi "%1"
-ErrorTooManyFilesInDir=Neiespçjami izveidot datnes mapç "%1", jo tâ satur pârâk daudz datòu
-
-; *** Setup common messages
-ExitSetupTitle=Iziet no Uzstâdîðanas
-ExitSetupMessage=Uzstâdîðana nav pabeigta. Ja Jûs tagad iziesiet, tad programma netiks uzinstalçta.%n%nJums bûs atkal jâpalaiþ Uzstâdîðana, lai pabeigtu programmas instalâciju.%n%nIziet no Uzstâdîðanas?
-AboutSetupMenuItem=&Par Uzstâdîðanu...
-AboutSetupTitle=Par Uzstâdîðanu
-AboutSetupMessage=%1 versija %2%n%3%n%n%1 mâjas lapa:%n%4
-AboutSetupNote=
-TranslatorNote=
-
-; *** Buttons
-ButtonBack=< &Atpakaï
-ButtonNext=&Tâlâk >
-ButtonInstall=&Uzstâdît
-ButtonOK=OK
-ButtonCancel=Atcelt
-ButtonYes=&Jâ
-ButtonYesToAll=Jâ &Visam
-ButtonNo=&Nç
-ButtonNoToAll=Nç V&isam
-ButtonFinish=&Pabeigt
-ButtonBrowse=Pâ&rlûkot...
-ButtonWizardBrowse=Pârlû&kot...
-ButtonNewFolder=I&zveidot jaunu mapi
-
-; *** "Select Language" dialog messages
-SelectLanguageTitle=Izvçlieties Uzstâdîðanas valodu
-SelectLanguageLabel=Izvçlieties valodu, kurâ notiks Uzstâdîðana:
-
-; *** Common wizard text
-ClickNext=Spiediet "Tâlâk", lai turpinâtu, vai "Atcelt", lai izietu no Uzstâdîðanas.
-BeveledLabel=
-BrowseDialogTitle=Pârlûkot mapi
-BrowseDialogLabel=Izvçlieties mapi no saraksta, tad spiediet "Ok".
-NewFolderName=Jauna mape
-
-; *** "Welcome" wizard page
-WelcomeLabel1=Laipni lûdzam [name] Uzstâdîðanâ
-WelcomeLabel2=Ðis uzstâdîs [name/ver] uz Jûsu datora.%n%nVçlams aizvçrt visas programmas pirms turpinâðanas.
-
-; *** "Password" wizard page
-WizardPassword=Parole
-PasswordLabel1=Ðî instalâcija ir aizsargâta ar paroli.
-PasswordLabel3=Lûdzu, ievadiet paroli, tad spiediet "Tâlâk", lai turpinâtu. Parole ir reìistrjutîga.
-PasswordEditLabel=&Parole:
-IncorrectPassword=Parole, ko Jûs ievadîjât, ir nepareiza. Lûdzu, mçìiniet vçlreiz.
-
-; *** "License Agreement" wizard page
-WizardLicense=Lîgums
-LicenseLabel=Lûdzu, izlasiet sekojoðo informâciju, pirms turpinât.
-LicenseLabel3=Lûdzu, izlasiet Lîgumu. Jums ir jâapstiprina Lîgums, lai turpinâtu instalâciju.
-LicenseAccepted=Es &piekrîtu lîgumam
-LicenseNotAccepted=Es &nepiekrîtu lîgumam
-
-; *** "Information" wizard pages
-WizardInfoBefore=Informâcija
-InfoBeforeLabel=Lûdzu, izlasiet ðo informâciju.
-InfoBeforeClickLabel=Kad esat gatavs turpinât instalâciju, spiediet "Tâlâk".
-WizardInfoAfter=Informâcija
-InfoAfterLabel=Lûdzu izlasiet sekojoðo informâciju.
-InfoAfterClickLabel=Kad esat gatavs turpinât instalâciju, spiediet "Tâlâk".
-
-; *** "User Information" wizard page
-WizardUserInfo=Lietotâja informâcija
-UserInfoDesc=Lûdzu, ievadiet savu informâciju.
-UserInfoName=&Lietotâja vârds:
-UserInfoOrg=&Organizâcija:
-UserInfoSerial=&Seriâlais numurs:
-UserInfoNameRequired=Jums ir jâievada savs vârds.
-
-; *** "Select Destination Location" wizard page
-WizardSelectDir=Izvçlieties mapi, uz kuru tiks sûtîti dati
-SelectDirDesc=Kur [name] tiks instalçts?
-SelectDirLabel3=[name] datnes tiks instalçtas norâdîtajâ mapç.
-SelectDirBrowseLabel=Lai turpinâtu, spiediet "Tâlâk". Ja vçlaties norâdît citu mapi, spiediet "Pârlûkot".
-DiskSpaceMBLabel=Ir nepiecieðami brîvi [mb] MB uz cietâ diska.
-ToUNCPathname=Uzstâdîðana nevar uzstâdît datnes norâdîtajâ adresç. Ja Jûs mçìinât uzstâdît tîklâ, tad Jums ir nepiecieðama speciâla mape.
-InvalidPath=Jums ir jânorâda pilna instalâcijas adrese, piemçrs:%n%nC:\APP%n%nvai UNC adrese:%n%n\\server\share
-InvalidDrive=Ierîce UNC, kuru Jûs izvçlçjâties, nepastâv vai arî nav pieejama. Lûdzu, izvçlieties citu.
-DiskSpaceWarningTitle=Nepietiek vietas uz diska
-DiskSpaceWarning=Instalâcijai ir nepiecieðami vismaz %1 KB brîvâs vietas uz diska, bet pieejami ir tikai %2 KB.%n%nVai vçlaties turpinât?
-DirNameTooLong=Mapes nosaukums vai adrese ir pârâk gara.
-InvalidDirName=Mapes nosaukums nav derîgs.
-BadDirName32=Mapes nosaukumâ nedrîkst bût ðâdi simboli:%n%n%1
-DirExistsTitle=Mape jau pastâv
-DirExists=Mape:%n%n%1%n%njau pastâv. Vai vienalga vçlaties turpinât?
-DirDoesntExistTitle=Mape nepastâv
-DirDoesntExist=Mape:%n%n%1%n%ndoes nepastâv. Vai vçlaties izveidot mapi?
-
-; *** "Select Components" wizard page
-WizardSelectComponents=Izvçlieties sastâvdaïas
-SelectComponentsDesc=Kurus komponentus vçlaties uzstâdît?
-SelectComponentsLabel2=Izvçlieties komponentus, kurus vçlaties uzstâdît. Spiediet "Tâlâk", lai turpinâtu.
-FullInstallation=Pilna Uzstâdîðana
-; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
-CompactInstallation=Kompakta Uzstâdîðana
-CustomInstallation=Izveidot Uzstâdîðanu
-NoUninstallWarningTitle=Komponenti jau pastâv
-NoUninstallWarning=Uzstâdîðana ir atklâjusi ka ðâdi faili jau ir uzstâdîti:%n%n%1%n%nAtiestatiet ðos komponentus.%n%nVai vçlaties turpinât?
-ComponentSize1=%1 KB
-ComponentSize2=%1 MB
-ComponentsDiskSpaceMBLabel=Paðlaik izvçlçtie komponenti aizòem [mb] MB uz cietâ diska.
-
-; *** "Select Additional Tasks" wizard page
-WizardSelectTasks=Papilduzdevumu izvçlne
-SelectTasksDesc=Kurus papilduzdevumus vajadzçtu veikt?
-SelectTasksLabel2=Izvçlieties, kâdi papilduzdevumi tiks veikti [name] Uzstâdîðanas laikâ, tad spiediet "Tâlâk".
-
-; *** "Select Start Menu Folder" wizard page
-WizardSelectProgramGroup=Izvçlieties Start Menu mapi
-SelectStartMenuFolderDesc=Kur Uzstâdîðanas programmai vajadzçtu likt îsinâjumikonas?
-SelectStartMenuFolderLabel3=Uzstâdîðana izveidos îsinâjumikonas Start Menu mapç.
-SelectStartMenuFolderBrowseLabel=Lai turpinâtu, spiediet "Tâlâk". Ja vçlaties norâdît citu mapi, spiediet "Pârlûkot".
-MustEnterGroupName=Jums ir jânorâda mape.
-GroupNameTooLong=Mapes nosaukums ir pârâk garð.
-InvalidGroupName=Mape nav derîga.
-BadGroupName=Mapes nosaukums satur kâdu no ðiem simboliem:%n%n%1
-NoProgramGroupCheck2=&Neizveidot Start Menu mapi
-
-; *** "Ready to Install" wizard page
-WizardReady=Gatavs instalâcijai
-ReadyLabel1=Uzstâdîðana ir gatava instalçt [name] uz Jûsu datora.
-ReadyLabel2a=Spiediet "Uzstâdît", lai sâktu instalâciju, vai spiediet Atpakaï, lai izmainîtu parametrus.
-ReadyLabel2b=Spiediet "Uzstâdît", lai sâktu instalâciju.
-ReadyMemoUserInfo=Lietotâja informâcija:
-ReadyMemoDir=Galamçríis:
-ReadyMemoType=Uzstâdîðanas tips:
-ReadyMemoComponents=Izvçlçtie komponenti:
-ReadyMemoGroup=Start Menu mape:
-ReadyMemoTasks=Papilduzdevumi:
-
-; *** "Preparing to Install" wizard page
-WizardPreparing=Gatavoties instalâcijai
-PreparingDesc=Uzstâdîðana ir gatava instalçt [name] uz Jûsu datora.
-PreviousInstallNotCompleted=Instalâcija/noòemðana iepriekðçjai programmai nav pabeigta. Jums ir jâpârstartç dators, lai pabeigtu instalâciju.%n%nPçc pârstartçðanas palaidiet uzstâdîðanu no jauna, lai pabeigtu uzstâdît [name].
-CannotContinue=Uzstâdîðanu nevar turpinât. Lûdzu, spiediet "Atcelt", lai izietu.
-
-; *** "Installing" wizard page
-WizardInstalling=Instalâcija
-InstallingLabel=Lûdzu, uzgaidiet, kamçr [name] tiks uzstâdîts uz Jûsu datora.
-
-; *** "Setup Completed" wizard page
-FinishedHeadingLabel=Pabeigta [name] Uzstâdîðana
-FinishedLabelNoIcons=Uzstâdîðana pabeigta.
-FinishedLabel=Uzstâdîðana pabeigta. Programmu var palaist, uzklikðíinot uz izveidotajâm ikonâm.
-ClickFinish=Spiediet "Pabeigt", lai aizvçrtu Uzstâdîðanu.
-FinishedRestartLabel=Lai pabeigtu [name] uzstâdîðanu, nepiecieðams pârstartçt Jûsu datoru. Vai vçlaties to darît tagad?
-FinishedRestartMessage=Lai pabeigtu [name] uzstâdîðanu, nepiecieðams pârstartçt Jûsu datoru.%n%nVai vçlaties to darît tagad?
-ShowReadmeCheck=Jâ, vçlos apskatît README failu
-YesRadio=&Jâ, pârstartçt datoru tagad
-NoRadio=&Nç, datoru pârstartçðu vçlâk
-; used for example as 'Run MyProg.exe'
-RunEntryExec=Run %1
-; used for example as 'View Readme.txt'
-RunEntryShellExec=View %1
-
-; *** "Setup Needs the Next Disk" stuff
-ChangeDiskTitle=Uzstâdîðanai ir nepiecieðams nâkamais disks
-SelectDiskLabel2=Lûdzu, ielieciet %1 disku un spiediet "Ok".%n%nJa datne ir atrodama uz ðî paða diska kâdâ citâ mapç, norâdiet tâs atraðanâs vietu vai spiediet "Pârlûkot", lai to norâdîtu.
-PathLabel=&Ceïð:
-FileNotInDir2=Datne "%1" neatrodas "%2". Lûdzu, ielieciet pareizo disku vai norâdiet pareizo mapi.
-SelectDirectoryLabel=Lûdzu, norâdiet nâkamâ diska atraðanâs vietu.
-
-; *** Installation phase messages
-SetupAborted=Uzstâdîðana netika pabeigta.%n%nLûdzu, izlabojiet kïûdu un palaidiet Uzstâdîðanu no jauna.
-EntryAbortRetryIgnore=Spiediet "Atkârtot", lai mçìinâtu vçlreiz, vai "Ignorçt", lai turpinâtu, vai "Pârtraukt", lai beigtu instalâciju.
-
-; *** Installation status messages
-StatusCreateDirs=Mapju izveidoðana...
-StatusExtractFiles=Datòu kopçðana...
-StatusCreateIcons=Îsinâjumikonu izveidoðana...
-StatusCreateIniEntries=Izveido INI ierakstu...
-StatusCreateRegistryEntries=Izveido reìistra ierakstus...
-StatusRegisterFiles=Reìistrç datnes...
-StatusSavingUninstall=Saglabâ atinstalçðanas datus...
-StatusRunProgram=Pabeidz instalâciju...
-StatusRollback=Izveido izmaiòas...
-
-; *** Misc. errors
-ErrorInternal2=Iekðçja kïûda: %1
-ErrorFunctionFailedNoCode=%1 cieta neveiksmi
-ErrorFunctionFailed=%1 cieta neveiksmi; kods %2
-ErrorFunctionFailedWithMessage=%1 cieta neveiksmi; kods %2.%n%3
-ErrorExecutingProgram=Neiespçjami palaist failu:%n%1
-
-; *** Registry errors
-ErrorRegOpenKey=Kïûda, atverot reìistra atslçgu:%n%1\%2
-ErrorRegCreateKey=Kïûda, izveidojot reìistra atslçgu:%n%1\%2
-ErrorRegWriteKey=Kïûda, rakstot reìistra atslçgu:%n%1\%2
-
-; *** INI errors
-ErrorIniEntry=Kïûda, izveidojot INI ieraksta datni "%1".
-
-; *** File copying errors
-FileAbortRetryIgnore=Spiediet "Atkârtot", lai mçìinâtu vçlreiz, "Ignorçt", lai izlaistu datni (nav ieteicams), vai "Pârtraukt", lai beigtu instalâciju.
-FileAbortRetryIgnore2=Spiediet "Atkârtot", lai mçìinâtu vçlreiz, "Ignorçt", lai turpinâtu (nav ieteicams), vai "Pârtraukt", lai beigtu instalâciju.
-SourceIsCorrupted=Datnes avots ir bojâts
-SourceDoesntExist=Datnes avots "%1" nepastâv
-ExistingFileReadOnly=Pastâvoðâ datne ir izveidota kâ read-only.%n%nSpiediet "Atkârtot", lai noòemtu read-only îpaðîbu un mçìinâtu vçlreiz, "Ignorçt", lai izlaistu datni, vai "Pârtraukt", lai beigtu instalâciju.
-ErrorReadingExistingDest=Kïûda, nolasot pastâvoðo datni:
-FileExists=Datne jau pastâv.%n%nVai vçlaties, lai Uzstâdîðana to pârraksta?
-ExistingFileNewer=Pastâvoðâ datne ir jaunâka par to, kuru nepiecieðams uzstâdît. Vçlams atstât jau pastâvoðo datni.%n%nVai vçlaties to paturçt?
-ErrorChangingAttr=Radusies kïûda, mçìinot nomainît datnes îpaðîbu:
-ErrorCreatingTemp=Radusies kïûda, izveidojot datni galamçría mapç:
-ErrorReadingSource=Radusies kïûda, nolasot datni:
-ErrorCopying=Radusies kïûda, pârkopçjot datni:
-ErrorReplacingExistingFile=Radusies kïûda, pârrakstot jau pastâvoðo datni:
-ErrorRestartReplace=Atkârtota aizstâðana cietusi neveiksmi:
-ErrorRenamingTemp=Radusies kïûda, nomainot nosaukumu datnei galamçría mapç:
-ErrorRegisterServer=Neiespçjami reìistrçt DLL/OCX: %1
-ErrorRegisterServerMissingExport=DllReìistra servera eksports nav atrodams
-ErrorRegisterTypeLib=Neiespçjami reìistrçt tipa bibliotçku: %1
-
-; *** Post-installation errors
-ErrorOpeningReadme=Radusies kïûda, atverot README datni.
-ErrorRestartingComputer=Uzstâdîðana nevar pârstartçt datoru. Lûdzu, izdariet to manuâli.
-
-; *** Uninstaller messages
-UninstallNotFound=Datne "%1" nepastâv. Nevar atinstalçt.
-UninstallOpenError=Datni "%1" nevar atvçrt. Nevar atinstalçt
-UninstallUnsupportedVer=Atinstalçðanas datne "%1" nav atpazîstama ðai atinstalçðanas programmai. Nevar atinstalçt
-UninstallUnknownEntry=Nezinâms ieraksts (%1) izveidoja sadursmi ar atinstalâciju
-ConfirmUninstall=Vai esat pârliecinâts, ka vçlaties pilnîbâ noòemt %1 un visus tâ komponentus?
-UninstallOnlyOnWin64=Ðo instalâciju var noòemt tikai ar 64-bitu Windows.
-OnlyAdminCanUninstall=Atinstalâciju var veikt tikai lietotâjs ar Adminstratora privilçìijâm.
-UninstallStatusLabel=Lûdzu uzgaidiet, kamçr %1 tiek noòemts no Jûsu datora.
-UninstalledAll=%1 tika veiksmîgi noòemts no Jûsu datora.
-UninstalledMost=%1 atinstalâcija pabeigta.%n%nDaþus elementus nevarçja noòemt. Tos var noòemt manuâli.
-UninstalledAndNeedsRestart=Lai pabeigtu atinstalâciju %1, Jûsu dators jâpârstartç.%n%nVai vçlaties to darît tagad?
-UninstallDataCorrupted="%1" datne ir bojâta. Nevar atinstalçt
-
-; *** Uninstallation phase messages
-ConfirmDeleteSharedFileTitle=Noòemt kopîgâs datnes?
-ConfirmDeleteSharedFile2=Sistçma ir secinâjusi, ka ðîs koplietoðanas datnes vairs netiks lietotas. Vai vçlaties tâs noòemt?%n%nJa kâda cita programma izmanto ðîs datnes, tad ðî programma var strâdât nekorekti. Ja neesat droðs, izvçlieties "Nç". Atstâjot ðîs datnes, Jûsu datoram netiks nodarîti nekâdi bojâjumi.
-SharedFileNameLabel=Faila nosaukums:
-SharedFileLocationLabel=Atraðanâs vieta:
-WizardUninstalling=Atinstalçðanas Statuss
-StatusUninstalling=Atinstalç %1...
-
-; The custom messages below aren't used by Setup itself, but if you make
-; use of them in your scripts, you'll want to translate them.
-
-[CustomMessages]
-
-NameAndVersion=%1 versija %2
-AdditionalIcons=Papildu ikonas:
-CreateDesktopIcon=Izveidot &darbvisrmas ikonu
-CreateQuickLaunchIcon=Izveidot &Quick Launch ikonu
-ProgramOnTheWeb=%1 Internçtâ
-UninstallProgram=Atinstalçt %1
-LaunchProgram=Palaist %1
-AssocFileExtension=&Apvienot %1 ar %2 faila paplaðinâjumu
-AssocingFileExtension=Apvienoðana %1 ar %2 faila paplaðinâjumu...
+;Agris Ausejs
+;******************************************************
+; *** ***
+; *** Inno Setup version 5.1.11+ Latvian messages ***
+; *** ***
+; *** Original Author: ***
+; *** ***
+; *** Agris Ausejs (oby2005 at gmail.com) ***
+; *** ***
+; *** 02/22/2008 ***
+; ******************************************************
+;
+;
+; To download user-contributed translations of this file, go to:
+; http://www.jrsoftware.org/is3rdparty.php
+;
+; Note: When translating this text, do not add periods (.) to the end of
+; messages that didn't have them already, because on those messages Inno
+; Setup adds the periods automatically (appending a period would result in
+; two periods being displayed).
+
+[LangOptions]
+; The following three entries are very important. Be sure to read and
+; understand the '[LangOptions] section' topic in the help file.
+LanguageName=Latviski
+LanguageID=$0426
+LanguageCodePage=1257
+; If the language you are translating to requires special font faces or
+; sizes, uncomment any of the following entries and change them accordingly.
+;DialogFontName=
+;DialogFontSize=8
+;WelcomeFontName=Verdana
+;WelcomeFontSize=12
+;TitleFontName=Arial
+;TitleFontSize=29
+;CopyrightFontName=Arial
+;CopyrightFontSize=8
+
+[Messages]
+
+; *** Application titles
+SetupAppTitle=Uzstâdîðana
+SetupWindowTitle=Noòemðana - %1
+UninstallAppTitle=Noòemðana
+UninstallAppFullTitle=%1 Noòemðana
+
+; *** Misc. common
+InformationTitle=Informâcija
+ConfirmTitle=Apstiprinât
+ErrorTitle=Kïûda
+
+; *** SetupLdr messages
+SetupLdrStartupMessage=Tiks uzstâdîta programma %1. Vai vçlaties turpinât?
+LdrCannotCreateTemp=Neiespçjami izveidot pagaidu datnes. Uzstâdîðana pârtraukta
+LdrCannotExecTemp=Neiespçjami palaist datni no pagaidu mapes. Uzstâdîðana pârtraukta
+
+; *** Startup error messages
+LastErrorMessage=%1.%n%nKïûda %2: %3
+SetupFileMissing=Datne %1 nav atrodama uzstâdîðanas mapç. Lûdzu, izlabojiet kïûdu vai iegâdâjieties jaunu programmas kopiju.
+SetupFileCorrupt=Uzstâdâmâs datnes ir sabojâtas. Lûdzu, iegâdâjieties jaunu programmas kopiju.
+SetupFileCorruptOrWrongVer=Uzstâdâmâs datnes ir bojâtas vai nav savienojamas ar ðo uzstâdîðanas programmu. Lûdzu, izlabojiet ðo kïûdu vai iegâdâjieties jaunu programmas kopiju.
+NotOnThisPlatform=Ðo programmu nevar palaist uz %1.
+OnlyOnThisPlatform=Ðî programma darbojas uz %1.
+OnlyOnTheseArchitectures=Ðo programmu var uzstâdît tikai uz ðâdâm Windows versijâm:%n%n%1
+MissingWOW64APIs=Paðlaik palaistâ Windows versija neatbalsta 64-bitu uzstâdîðanu. Lai izlabotu ðo kïûdu, uzinstalçjiet Service Pack %1.
+WinVersionTooLowError=Ðî programma pieprasa %1 versiju %2 vai jaunâku.
+WinVersionTooHighError=Ðo programmu nevar uzstâdît uz %1 versijas %2 vai jaunâkas.
+AdminPrivilegesRequired=Jums ir jâbût adminstratoram, lai varçtu uzsâkt uzstâdîðanu.
+PowerUserPrivilegesRequired=Jums ir jâbût administratoram vai pilnvarotam lietotâjam, lai uzstâdîtu ðo programmu.
+SetupAppRunningError=Uzstâdîðana ir atklâjusi, ka %1 paðlaik darbojas.%n%nLûdzu, aizveriet visas programmas un spiediet "Ok" vai "Atcelt", lai izietu.
+UninstallAppRunningError=Noòeðana ir atklâjusi ka %1 paðlaik darbojas.%n%nLûdzu, aizveriet visas programmas un spiediet "Ok", lai turpinâtu, vai "Atcelt", lai izietu.
+
+; *** Misc. errors
+ErrorCreatingDir=Uzstâdîðanâ ir neiespçjami izveidot mapi "%1"
+ErrorTooManyFilesInDir=Neiespçjami izveidot datnes mapç "%1", jo tâ satur pârâk daudz datòu
+
+; *** Setup common messages
+ExitSetupTitle=Iziet no uzstâdîðanas
+ExitSetupMessage=Uzstâdîðana nav pabeigta. Ja Jûs tagad iziesiet, tad programma netiks uzstâdîta.%n%nLai uzstâdîtu programmu, jums bûs atkal jâpalaiþ uzstâdîðana. %n%nIziet no uzstâdîðanas?
+AboutSetupMenuItem=&Par uzstâdîðanu...
+AboutSetupTitle=Par uzstâdîðanu
+AboutSetupMessage=%1 versija %2%n%3%n%n%1 mâjas lapa:%n%4
+AboutSetupNote=
+TranslatorNote=
+
+; *** Buttons
+ButtonBack=< &Atpakaï
+ButtonNext=&Tâlâk >
+ButtonInstall=&Uzstâdît
+ButtonOK=OK
+ButtonCancel=Atcelt
+ButtonYes=&Jâ
+ButtonYesToAll=Jâ &Visam
+ButtonNo=&Nç
+ButtonNoToAll=Nç V&isam
+ButtonFinish=&Pabeigt
+ButtonBrowse=Pâ&rlûkot...
+ButtonWizardBrowse=Pârlû&kot...
+ButtonNewFolder=I&zveidot jaunu mapi
+
+; *** "Select Language" dialog messages
+SelectLanguageTitle=Izvçlieties uzstâdîðanas valodu
+SelectLanguageLabel=Izvçlieties valodu, kurâ notiks uzstâdîðana:
+
+; *** Common wizard text
+ClickNext=Spiediet "Tâlâk", lai turpinâtu, vai "Atcelt", lai izietu no uzstâdîðanas.
+BeveledLabel=
+BrowseDialogTitle=Pârlûkot mapi
+BrowseDialogLabel=Izvçlieties mapi no saraksta, tad spiediet "Ok".
+NewFolderName=Jauna mape
+
+; *** "Welcome" wizard page
+WelcomeLabel1=Laipni lûdzam [name] uzstâdîðanâ
+WelcomeLabel2=Ðis uzstâdîs [name/ver] uz Jûsu datora.%n%nPirms turpinâðanas vçlams aizvçrt visas programmas.
+
+; *** "Password" wizard page
+WizardPassword=Parole
+PasswordLabel1=Ðî uzstâdîðana ir aizsargâta ar paroli.
+PasswordLabel3=Lûdzu, ievadiet paroli, tad spiediet "Tâlâk", lai turpinâtu. Parole ir reìistrjutîga.
+PasswordEditLabel=&Parole:
+IncorrectPassword=Parole, ko Jûs ievadîjât, ir nepareiza. Lûdzu, mçìiniet vçlreiz.
+
+; *** "License Agreement" wizard page
+WizardLicense=Lîgums
+LicenseLabel=Lûdzu, izlasiet sekojoðo informâciju, pirms turpinât.
+LicenseLabel3=Lûdzu, izlasiet Lîgumu. Jums ir jâapstiprina Lîgums, lai turpinâtu uzstâdîðanu.
+LicenseAccepted=Es &piekrîtu lîgumam
+LicenseNotAccepted=Es &nepiekrîtu lîgumam
+
+; *** "Information" wizard pages
+WizardInfoBefore=Informâcija
+InfoBeforeLabel=Lûdzu, izlasiet ðo informâciju.
+InfoBeforeClickLabel=Kad esat gatavs turpinât uzstâdîðanu, spiediet "Tâlâk".
+WizardInfoAfter=Informâcija
+InfoAfterLabel=Lûdzu izlasiet sekojoðo informâciju.
+InfoAfterClickLabel=Kad esat gatavs turpinât uzstâdîðanu, spiediet "Tâlâk".
+
+; *** "User Information" wizard page
+WizardUserInfo=Lietotâja informâcija
+UserInfoDesc=Lûdzu, ievadiet savu informâciju.
+UserInfoName=&Lietotâja vârds:
+UserInfoOrg=&Organizâcija:
+UserInfoSerial=&Sçrijas numurs:
+UserInfoNameRequired=Jums ir jâievada savs vârds.
+
+; *** "Select Destination Location" wizard page
+WizardSelectDir=Izvçlieties mapi, uz kuru tiks sûtîti dati
+SelectDirDesc=Kur [name] tiks instalçts?
+SelectDirLabel3=[name] datnes tiks instalçtas norâdîtajâ mapç.
+SelectDirBrowseLabel=Lai turpinâtu, spiediet "Tâlâk". Ja vçlaties norâdît citu mapi, spiediet "Pârlûkot".
+DiskSpaceMBLabel=Ir nepiecieðami brîvi [mb] MB uz cietâ diska.
+ToUNCPathname=Uzstâdîðana nevar uzstâdît datnes norâdîtajâ adresç. Ja Jûs mçìinât uzstâdît tîklâ, tad Jums ir nepiecieðama speciâla mape.
+InvalidPath=Jums ir jânorâda pilna uzstâdîðanas adrese, piemçrs:%n%nC:\APP%n%nvai UNC adrese:%n%n\\server\share
+InvalidDrive=Ierîce UNC, kuru Jûs izvçlçjâties, nepastâv vai arî nav pieejama. Lûdzu, izvçlieties citu.
+DiskSpaceWarningTitle=Nepietiek vietas uz diska
+DiskSpaceWarning=Uzstâdîðanai ir nepiecieðami vismaz %1 KB brîvâs vietas uz diska, bet pieejami ir tikai %2 KB.%n%nVai vçlaties turpinât?
+DirNameTooLong=Mapes nosaukums vai adrese ir pârâk gara.
+InvalidDirName=Mapes nosaukums nav derîgs.
+BadDirName32=Mapes nosaukumâ nedrîkst bût ðâdi simboli:%n%n%1
+DirExistsTitle=Mape jau pastâv
+DirExists=Mape:%n%n%1%n%njau pastâv. Vai vienalga vçlaties turpinât?
+DirDoesntExistTitle=Mape nepastâv
+DirDoesntExist=Mape:%n%n%1%n%ndoes nepastâv. Vai vçlaties izveidot mapi?
+
+; *** "Select Components" wizard page
+WizardSelectComponents=Izvçlieties sastâvdaïas
+SelectComponentsDesc=Kurus komponentus vçlaties uzstâdît?
+SelectComponentsLabel2=Izvçlieties komponentus, kurus vçlaties uzstâdît. Spiediet "Tâlâk", lai turpinâtu.
+FullInstallation=Pilna uzstâdîðana
+; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
+CompactInstallation=Kompakta uzstâdîðana
+CustomInstallation=Izveidot uzstâdîðanu
+NoUninstallWarningTitle=Komponenti jau pastâv
+NoUninstallWarning=Uzstâdîðana ir atklâjusi ka ðâdi faili jau ir uzstâdîti:%n%n%1%n%nAtiestatiet ðos komponentus.%n%nVai vçlaties turpinât?
+ComponentSize1=%1 KB
+ComponentSize2=%1 MB
+ComponentsDiskSpaceMBLabel=Paðlaik izvçlçtie komponenti aizòem [mb] MB uz cietâ diska.
+
+; *** "Select Additional Tasks" wizard page
+WizardSelectTasks=Papilduzdevumu izvçlne
+SelectTasksDesc=Kurus papilduzdevumus vajadzçtu veikt?
+SelectTasksLabel2=Izvçlieties, kâdi papilduzdevumi tiks veikti [name] uzstâdîðanas laikâ, tad spiediet "Tâlâk".
+
+; *** "Select Start Menu Folder" wizard page
+WizardSelectProgramGroup=Izvçlieties Start Menu mapi
+SelectStartMenuFolderDesc=Kur uzstâdîðanas programmai vajadzçtu likt îsinâjumikonas?
+SelectStartMenuFolderLabel3=Uzstâdîðana izveidos îsinâjumikonas Start Menu mapç.
+SelectStartMenuFolderBrowseLabel=Lai turpinâtu, spiediet "Tâlâk". Ja vçlaties norâdît citu mapi, spiediet "Pârlûkot".
+MustEnterGroupName=Jums ir jânorâda mape.
+GroupNameTooLong=Mapes nosaukums ir pârâk garð.
+InvalidGroupName=Mape nav derîga.
+BadGroupName=Mapes nosaukums satur kâdu no ðiem simboliem:%n%n%1
+NoProgramGroupCheck2=&Neizveidot Start Menu mapi
+
+; *** "Ready to Install" wizard page
+WizardReady=Gatavs uzstâdîðanai
+ReadyLabel1=Uzstâdîðana ir gatava instalçt [name] uz Jûsu datora.
+ReadyLabel2a=Spiediet "Uzstâdît", lai sâktu uzstâdîðanu, vai spiediet Atpakaï, lai izmainîtu parametrus.
+ReadyLabel2b=Spiediet "Uzstâdît", lai sâktu uzstâdîðanu.
+ReadyMemoUserInfo=Lietotâja informâcija:
+ReadyMemoDir=Galamçríis:
+ReadyMemoType=Uzstâdîðanas tips:
+ReadyMemoComponents=Izvçlçtie komponenti:
+ReadyMemoGroup=Start Menu mape:
+ReadyMemoTasks=Papilduzdevumi:
+
+; *** "Preparing to Install" wizard page
+WizardPreparing=Gatavoties uzstâdîðanai
+PreparingDesc=Uzstâdîðana ir gatava instalçt [name] uz Jûsu datora.
+PreviousInstallNotCompleted=Uzstâdîðana/noòemðana iepriekðçjai programmai nav pabeigta. Jums ir jâpârstartç dators, lai pabeigtu uzstâdîðanu.%n%nPçc pârstartçðanas palaidiet uzstâdîðanu no jauna, lai pabeigtu uzstâdît [name].
+CannotContinue=Uzstâdîðanu nevar turpinât. Lûdzu, spiediet "Atcelt", lai izietu.
+
+; *** "Installing" wizard page
+WizardInstalling=Uzstâdîðana
+InstallingLabel=Lûdzu, uzgaidiet, kamçr [name] tiks uzstâdîts uz Jûsu datora.
+
+; *** "Setup Completed" wizard page
+FinishedHeadingLabel=Pabeigta [name] uzstâdîðana
+FinishedLabelNoIcons=Uzstâdîðana pabeigta.
+FinishedLabel=Uzstâdîðana pabeigta. Programmu var palaist, uzklikðíinot uz izveidotajâm ikonâm.
+ClickFinish=Spiediet "Pabeigt", lai aizvçrtu uzstâdîðanu.
+FinishedRestartLabel=Lai pabeigtu [name] uzstâdîðanu, nepiecieðams pârstartçt Jûsu datoru. Vai vçlaties to darît tagad?
+FinishedRestartMessage=Lai pabeigtu [name] uzstâdîðanu, nepiecieðams pârstartçt Jûsu datoru.%n%nVai vçlaties to darît tagad?
+ShowReadmeCheck=Jâ, vçlos apskatît README failu
+YesRadio=&Jâ, pârstartçt datoru tagad
+NoRadio=&Nç, datoru pârstartçðu vçlâk
+; used for example as 'Run MyProg.exe'
+RunEntryExec=Run %1
+; used for example as 'View Readme.txt'
+RunEntryShellExec=View %1
+
+; *** "Setup Needs the Next Disk" stuff
+ChangeDiskTitle=Uzstâdîðanai ir nepiecieðams nâkamais disks
+SelectDiskLabel2=Lûdzu, ielieciet %1 disku un spiediet "Ok".%n%nJa datne ir atrodama uz ðî paða diska kâdâ citâ mapç, norâdiet tâs atraðanâs vietu vai spiediet "Pârlûkot", lai to norâdîtu.
+PathLabel=&Ceïð:
+FileNotInDir2=Datne "%1" neatrodas "%2". Lûdzu, ielieciet pareizo disku vai norâdiet pareizo mapi.
+SelectDirectoryLabel=Lûdzu, norâdiet nâkamâ diska atraðanâs vietu.
+
+; *** Installation phase messages
+SetupAborted=Uzstâdîðana netika pabeigta.%n%nLûdzu, izlabojiet kïûdu un palaidiet uzstâdîðanu no jauna.
+EntryAbortRetryIgnore=Spiediet "Atkârtot", lai mçìinâtu vçlreiz, vai "Ignorçt", lai turpinâtu, vai "Pârtraukt", lai beigtu uzstâdîðanu.
+
+; *** Installation status messages
+StatusCreateDirs=Mapju izveidoðana...
+StatusExtractFiles=Datòu kopçðana...
+StatusCreateIcons=Îsinâjumikonu izveidoðana...
+StatusCreateIniEntries=Izveido INI ierakstu...
+StatusCreateRegistryEntries=Izveido reìistra ierakstus...
+StatusRegisterFiles=Reìistrç datnes...
+StatusSavingUninstall=Saglabâ noòemðanas datus...
+StatusRunProgram=Pabeidz uzstâdîðanu...
+StatusRollback=Izveido izmaiòas...
+
+; *** Misc. errors
+ErrorInternal2=Iekðçja kïûda: %1
+ErrorFunctionFailedNoCode=%1 cieta neveiksmi
+ErrorFunctionFailed=%1 cieta neveiksmi; kods %2
+ErrorFunctionFailedWithMessage=%1 cieta neveiksmi; kods %2.%n%3
+ErrorExecutingProgram=Nespçju palaist failu:%n%1
+
+; *** Registry errors
+ErrorRegOpenKey=Kïûda, atverot reìistra atslçgu:%n%1\%2
+ErrorRegCreateKey=Kïûda, izveidojot reìistra atslçgu:%n%1\%2
+ErrorRegWriteKey=Kïûda, rakstot reìistra atslçgu:%n%1\%2
+
+; *** INI errors
+ErrorIniEntry=Kïûda, izveidojot INI ieraksta datni "%1".
+
+; *** File copying errors
+FileAbortRetryIgnore=Spiediet "Atkârtot", lai mçìinâtu vçlreiz, "Ignorçt", lai izlaistu datni (nav ieteicams), vai "Pârtraukt", lai beigtu uzstâdîðanu.
+FileAbortRetryIgnore2=Spiediet "Atkârtot", lai mçìinâtu vçlreiz, "Ignorçt", lai turpinâtu (nav ieteicams), vai "Pârtraukt", lai beigtu uzstâdîðanu.
+SourceIsCorrupted=Datnes avots ir bojâts
+SourceDoesntExist=Datnes avots "%1" nepastâv
+ExistingFileReadOnly=Pastâvoðâ datne ir izveidota kâ read-only.%n%nSpiediet "Atkârtot", lai noòemtu read-only îpaðîbu un mçìinâtu vçlreiz, "Ignorçt", lai izlaistu datni, vai "Pârtraukt", lai beigtu uzstâdîðanu.
+ErrorReadingExistingDest=Kïûda, nolasot pastâvoðo datni:
+FileExists=Datne jau pastâv.%n%nVai vçlaties, lai uzstâdîðana to pârraksta?
+ExistingFileNewer=Pastâvoðâ datne ir jaunâka par to, kuru nepiecieðams uzstâdît. Vçlams atstât jau pastâvoðo datni.%n%nVai vçlaties to paturçt?
+ErrorChangingAttr=Radusies kïûda, mçìinot nomainît datnes îpaðîbu:
+ErrorCreatingTemp=Radusies kïûda, izveidojot datni galamçría mapç:
+ErrorReadingSource=Radusies kïûda, nolasot datni:
+ErrorCopying=Radusies kïûda, pârkopçjot datni:
+ErrorReplacingExistingFile=Radusies kïûda, pârrakstot jau pastâvoðo datni:
+ErrorRestartReplace=Atkârtota aizstâðana cietusi neveiksmi:
+ErrorRenamingTemp=Radusies kïûda, nomainot nosaukumu datnei galamçría mapç:
+ErrorRegisterServer=Neiespçjami reìistrçt DLL/OCX: %1
+ErrorRegisterServerMissingExport=DllReìistra servera eksports nav atrodams
+ErrorRegisterTypeLib=Neiespçjami reìistrçt tipa bibliotçku: %1
+
+; *** Post-installation errors
+ErrorOpeningReadme=Radusies kïûda, atverot README datni.
+ErrorRestartingComputer=Uzstâdîðana nevar pârstartçt datoru. Lûdzu, izdariet to manuâli.
+
+; *** Uninstaller messages
+UninstallNotFound=Datne "%1" nepastâv. Nevar noòemt.
+UninstallOpenError=Datni "%1" nevar atvçrt. Nevar noòemt
+UninstallUnsupportedVer=Noòeðanas datne "%1" nav atpazîstama ðai noòemðanas programmai. Nevar noòemt
+UninstallUnknownEntry=Nezinâms ieraksts (%1) izveidoja sadursmi ar noòeðanu
+ConfirmUninstall=Vai esat pârliecinâts, ka vçlaties pilnîbâ noòemt %1 un visus tâ komponentus?
+UninstallOnlyOnWin64=Noòemðanu var veikt tikai ar 64-bitu Windows.
+OnlyAdminCanUninstall=Noòeðanu var veikt tikai lietotâjs ar Adminstratora privilçìijâm.
+UninstallStatusLabel=Lûdzu uzgaidiet, kamçr %1 tiek noòemts no Jûsu datora.
+UninstalledAll=%1 tika veiksmîgi noòemts no Jûsu datora.
+UninstalledMost=%1 noòeðana pabeigta.%n%nDaþus elementus nevarçja noòemt. Tos var noòemt manuâli.
+UninstalledAndNeedsRestart=Lai pabeigtu noòeðanu %1, Jûsu dators jâpârstartç.%n%nVai vçlaties to darît tagad?
+UninstallDataCorrupted="%1" datne ir bojâta. Nevar noòemt
+
+; *** Uninstallation phase messages
+ConfirmDeleteSharedFileTitle=Noòemt kopîgâs datnes?
+ConfirmDeleteSharedFile2=Sistçma ir secinâjusi, ka ðîs koplietoðanas datnes vairs netiks lietotas. Vai vçlaties tâs noòemt?%n%nJa kâda cita programma izmanto ðîs datnes, tad ðî programma var strâdât nekorekti. Ja neesat droðs, izvçlieties "Nç". Atstâjot ðîs datnes, Jûsu datoram netiks nodarîti nekâdi bojâjumi.
+SharedFileNameLabel=Faila nosaukums:
+SharedFileLocationLabel=Atraðanâs vieta:
+WizardUninstalling=Noòeðanas statuss
+StatusUninstalling=Noòem %1...
+
+; The custom messages below aren't used by Setup itself, but if you make
+; use of them in your scripts, you'll want to translate them.
+
+[CustomMessages]
+
+NameAndVersion=%1 versija %2
+AdditionalIcons=Papildu ikonas:
+CreateDesktopIcon=Izveidot &darbvisrmas ikonu
+CreateQuickLaunchIcon=Izveidot &Quick Launch ikonu
+ProgramOnTheWeb=%1 Internçtâ
+UninstallProgram=Noòemt %1
+LaunchProgram=Palaist %1
+AssocFileExtension=&Apvienot %1 ar %2 faila paplaðinâjumu
+AssocingFileExtension=Apvieno %1 ar %2 faila paplaðinâjumu...
commit 2097a69a97c150c8d79ff7d16cce31d208ecc3e9
Author: Cristian Marchi <cri79 at libero.it>
Date: Thu Sep 2 14:08:05 2010 +0000
Updated Italian translation for win32 installer wizard.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19534 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/gnucash.iss.in b/gnucash.iss.in
index eac29a3..5c4b367 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -526,13 +526,19 @@ fr.IconComment_Uninstall=Désinstalle le gestionnaire financier GnuCash
;; ;;;;;;;;;;;;;;;;;;;;;
;; Italian translation
+; *** Pagina di "Selezione dei componenti"
it.FullInstall=Installazione completa
it.CustomInstall=Installazione personalizzata
it.CreateDesktopIcon=Crea un'icona sul desktop
-it.CreateMenuLink=Crea un collegamento nel menu "start"
+it.CreateMenuLink=Crea un collegamento nel menu "Start"
it.RunPrg=Avvia GnuCash
it.AdditionalIcons=Crea queste icone:
it.StatusMsgFirewall=Installazione delle regole per il firewall di Windows...
+; *** Pagina di "Altra installazione"
+; nel messaggio seguente la stringa %1 sarà sostituita dal nome e dalla versione dell'applicazione, ad esempio "GnuCash 2.3.15"
+it.AIWP_Title=È stata trovata un'altra installazione
+it.AIWP_Description=%1 è installato in questo computer
+it.AIWP_Message=Questa precedente installazione deve essere rimossa prima di continuare.%n%nSe non si intende rimuoverla, fare clic su «Annulla» per terminare l'installazione.%n%nFare invece clic su «Avanti» per rimuovere %1 e continuare con l'installazione.%n%nNota: verrà rimosso solo il programma, non i propri dati finanziari.
it.MainFiles=File del programma GnuCash
it.TranslFiles=Traduzione Italiana
@@ -543,13 +549,13 @@ it.IconName_README=Mostra il file LEGGIMI
it.IconComment_README=Mostra il file LEGGIMI
it.IconFilename_README=README-it.win32-bin.txt
it.IconName_FAQ=FAQ (online, in Inglese)
-it.IconName_Bugzilla=Comunicare un bug (online, in Inglese)
+it.IconName_Bugzilla=Segnalare un bug (online, in Inglese)
it.IconName_InstallFQ=Installa la funzione di ricerca delle quotazioni online
-it.IconComment_InstallFQ=Installa il modulo di perl Finance-Quote necessario per ricevere le quotazioni online. Richiede ActivePerl 5.8/5.10
+it.IconComment_InstallFQ=Installa il modulo di perl Finance-Quote necessario per ricevere le quotazioni online. Richiede ActivePerl 5.8 o 5.10
+it.IconName_Theme=Selezione del tema
it.IconName_Uninstall=Disinstalla GnuCash
it.IconComment_Uninstall=Disinstalla il programma di gestione delle finanze GnuCash
-
;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Latvian translation
commit 026b9ecbfbd10b326e2fd0677d20abb7476418c5
Author: Christian Stimming <stimming at tuhh.de>
Date: Wed Sep 1 16:24:02 2010 +0000
Remove aqbanking2 from windows build scripts. Add optional aqbanking5 instead, which works without QT.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19532 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 4c0c859..b91ba44 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -320,10 +320,10 @@ set_default LIBOFX_DIR $GLOBAL_DIR\\libofx
set_default LIBOFX_PATCH `pwd`/libofx-0.8.3-patch.diff
## online banking: gwenhywfar+aqbanking
-set_default AQBANKING3 yes
+set_default AQBANKING5 no
-if [ "$AQBANKING3" != "yes" ]; then
- set_default GWENHYWFAR_URL "$SF_MIRROR/gwenhywfar/gwenhywfar-2.6.2.tar.gz"
+if [ "$AQBANKING5" = "yes" ]; then
+ set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=53&file=01&dummy=gwenhywfar-4.0.0.tar.gz"
else
set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=31&file=01&dummy=gwenhywfar-3.11.3.tar.gz"
#set_default GWENHYWFAR_PATCH `pwd`/gwenhywfar-3.11.1-patch.diff
@@ -333,14 +333,15 @@ set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-1.24.tar.gz"
# ktoblzcheck is being installed into GWENHYWFAR_DIR
-if [ "$AQBANKING3" != "yes" ]; then
- set_default AQBANKING_URL "$SF_MIRROR/aqbanking/aqbanking-2.3.3.tar.gz"
+if [ "$AQBANKING5" = "yes" ]; then
+ set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=73&file=01&dummy=aqbanking-5.0.0.tar.gz"
+ set_default AQBANKING_WITH_QT no
else
set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=49&file=01&dummy=aqbanking-4.2.3.tar.gz"
#set_default AQBANKING_PATCH `pwd`/aqbanking-4.1.6-patch.diff
+ set_default AQBANKING_WITH_QT yes
fi
set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
-set_default AQBANKING_WITH_QT yes
# 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 QT_WIN_SRC_URL "ftp://ftp.qt.nokia.com/qt/source/qt-all-opensource-src-4.5.3.zip"
diff --git a/dist-impl.sh b/dist-impl.sh
index 6602f31..35c58d9 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -12,9 +12,11 @@ function dist_prepare() {
if [ -x $DIST_DIR ]; then
die "Please remove ${DIST_DIR} first"
fi
- if [ x$AQBANKING_WITH_QT != xyes ]; then
- die "The aqbanking wizard is required to create the Windows installer.
+ if [ "$AQBANKING5" != "yes" ] ; then
+ if [ x$AQBANKING_WITH_QT != xyes ]; then
+ die "The aqbanking wizard is required to create the Windows installer.
Please set AQBANKING_WITH_QT to yes and rerun install.sh first."
+ fi
fi
_UNZIP_UDIR=`unix_path $UNZIP_DIR`
_AUTOTOOLS_UDIR=`unix_path $AUTOTOOLS_DIR`
@@ -190,9 +192,6 @@ function dist_gwenhywfar() {
setup gwenhywfar
cp -a ${_GWENHYWFAR_UDIR}/bin/*.dll ${DIST_UDIR}/bin
mkdir -p ${DIST_UDIR}/etc
- if [ "$AQBANKING3" != "yes" ]; then
- cp -a ${_GWENHYWFAR_UDIR}/etc/* ${DIST_UDIR}/etc
- fi
cp -a ${_GWENHYWFAR_UDIR}/lib/gwenhywfar ${DIST_UDIR}/lib
mkdir -p ${DIST_UDIR}/share/gwenhywfar
cp -a ${_GWENHYWFAR_UDIR}/share/gwenhywfar/ca-bundle.crt ${DIST_UDIR}/share/gwenhywfar
@@ -210,9 +209,6 @@ function dist_aqbanking() {
cp -a ${_AQBANKING_UDIR}/bin/*.dll ${DIST_UDIR}/bin
cp -a ${_AQBANKING_UDIR}/lib/aqbanking ${DIST_UDIR}/lib
cp -a ${_AQBANKING_UDIR}/share/aqbanking ${DIST_UDIR}/share
- if [ "$AQBANKING3" != "yes" ]; then
- cp -a ${_AQBANKING_UDIR}/share/aqhbci ${DIST_UDIR}/share
- fi
cp -a ${_AQBANKING_UDIR}/share/locale ${DIST_UDIR}/share
}
diff --git a/dist.sh b/dist.sh
index ca6122c..863677f 100755
--- a/dist.sh
+++ b/dist.sh
@@ -26,12 +26,8 @@ add_step dist_libbonoboui
add_step dist_libgsf
add_step dist_goffice
add_step dist_libofx
-if [ "$AQBANKING3" != "yes" ]; then
- add_step dist_openssl
-else
- add_step dist_gnutls
- add_step dist_gmp
-fi
+add_step dist_gnutls
+add_step dist_gmp
add_step dist_gwenhywfar
add_step dist_ktoblzcheck
add_step dist_aqbanking
diff --git a/gnucash.iss.in b/gnucash.iss.in
index 1ac0ef4..eac29a3 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -78,16 +78,17 @@ Source: "@prefix@\..\dist\lib\*"; DestDir: "{app}\lib"; Flags: recursesubdirs; C
Source: "@prefix@\..\dist\libexec\*"; DestDir: "{app}\libexec"; Flags: recursesubdirs; Components: main
Source: "@prefix@\..\dist\share\*"; DestDir: "{app}\share"; Flags: recursesubdirs; Components: main
-; Additionally, we ship the Qt DLLs because the Online-Banking-Wizard
-; lib/aqbanking/plugins/@-aqbanking_so_effective-@/wizards/qt3-wizard.exe needs them.
-Source: "@-qtbindir-@\QtCore4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-Source: "@-qtbindir-@\QtGui4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-Source: "@-qtbindir-@\mingwm10.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-; The following are all needed by Qt3Support
-Source: "@-qtbindir-@\Qt3Support4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-Source: "@-qtbindir-@\QtXml4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-Source: "@-qtbindir-@\QtSql4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-Source: "@-qtbindir-@\QtNetwork4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+;;; Not needed with AQBANKING5 anymore!
+;; Additionally, we ship the Qt DLLs because the Online-Banking-Wizard
+;; lib/aqbanking/plugins/@-aqbanking_so_effective-@/wizards/qt3-wizard.exe needs them.
+;Source: "@-qtbindir-@\QtCore4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+;Source: "@-qtbindir-@\QtGui4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+;Source: "@-qtbindir-@\mingwm10.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+;; The following are all needed by Qt3Support
+;Source: "@-qtbindir-@\Qt3Support4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+;Source: "@-qtbindir-@\QtXml4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+;Source: "@-qtbindir-@\QtSql4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+;Source: "@-qtbindir-@\QtNetwork4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
;; The translations
;Source: "@prefix@\..\dist\share\locale\*"; DestDir: "{app}\share\locale"; Flags: recursesubdirs; Components: translations
diff --git a/install-impl.sh b/install-impl.sh
index 5f8c3c1..b6c1faa 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -972,15 +972,15 @@ function inst_gwenhywfar() {
assert_one_dir $TMP_UDIR/gwenhywfar-*
qpushd $TMP_UDIR/gwenhywfar-*
# circumvent binreloc bug, http://trac.autopackage.org/ticket/28
- if [ "$AQBANKING3" != "yes" ]; then
+ if [ "$AQBANKING5" = "yes" ]; then
+ # Note: gwenhywfar-3.x and higher don't use openssl anymore.
./configure ${HOST_XCOMPILE} \
- --with-openssl-includes=$_OPENSSL_UDIR/include \
+ --with-libgcrypt-prefix=$_GNUTLS_UDIR \
--disable-binreloc \
- ssl_libraries="-L${_OPENSSL_UDIR}/lib" \
- ssl_lib="-leay32 -lssl32" \
--prefix=$_GWENHYWFAR_UDIR \
- CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS}" \
- LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} -lintl"
+ --with-guis=gtk2 \
+ CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS}" \
+ LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GNUTLS_LDFLAGS} -lintl"
else
if [ -n "$GWENHYWFAR_PATCH" -a -f "$GWENHYWFAR_PATCH" ] ; then
patch -p1 < $GWENHYWFAR_PATCH
@@ -1080,10 +1080,11 @@ function inst_aqbanking() {
else
XMLMERGE="${_GWENHYWFAR_UDIR}/bin/xmlmerge"
fi
- if test x$AQBANKING3 = xyes; then
+ if [ "$AQBANKING5" != "yes" ] ; then
_AQ_BACKENDS="aqhbci aqofxconnect"
else
- _AQ_BACKENDS="aqdtaus aqhbci aqofxconnect"
+ # FIXME: Maybe also aqpaypal?
+ _AQ_BACKENDS="aqhbci aqofxconnect"
fi
if test x$AQBANKING_WITH_QT = xyes; then
inst_qt4
@@ -1125,9 +1126,9 @@ function inst_aqbanking() {
make install
qpopd
qpushd ${_AQBANKING_UDIR}/bin
- if [ "$AQBANKING3" != "yes" ]; then
- exetype aqbanking-tool.exe console
- exetype aqhbci-tool.exe console
+ if [ "$AQBANKING5" = "yes" ]; then
+ exetype aqbanking-cli.exe console
+ exetype aqhbci-tool4.exe console
else
exetype aqbanking-cli.exe console
exetype aqhbci-tool4.exe console
diff --git a/install.sh b/install.sh
index 53afa01..279a7e6 100644
--- a/install.sh
+++ b/install.sh
@@ -71,22 +71,15 @@ if [ "$CROSS_COMPILE" != "yes" ]; then
add_step inst_mingwutils
fi
add_step inst_autotools
-if [ "$AQBANKING3" = "yes" ]; then
- add_step inst_gmp
-fi
+add_step inst_gmp
add_step inst_guile
if [ "$CROSS_COMPILE" != "yes" ]; then
add_step inst_svn
- if [ "$AQBANKING3" != "yes" ]; then
- add_step inst_openssl
- fi
fi
add_step inst_exetype
add_step inst_libxslt
add_step inst_gnome
-if [ "$AQBANKING3" = "yes" ]; then
- add_step inst_gnutls
-fi
+add_step inst_gnutls
add_step inst_isocodes
add_step inst_swig
add_step inst_pcre
commit d644deace3e0c21457dfa33654105583f812650e
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed Sep 1 13:09:57 2010 +0000
Bug #588414 - Got "Entry Point Not Found" errors starting GnuCash, but ran OK
The problem is caused by leftover files from a previous install.
The solution is to uninstall GnuCash before installing a new version in such cases.
This commit adds a compatibility test and uninstall step to the windows installer
that will automatically uninstall the previous gnucash release if it is considered
'incompatible' with the one to be installed. The user will be warned of this, so
he can decide to cancel the installation if he doesn't like the idea of uninstalling
his working GnuCash installation.
Currently, versions are considered 'incompatible' if their major or minor version
components are different, so 2.3.x is incompatible with 2.2.x and will trigger
an uninstall. Likewise, a 2.4.x install is incompatible with a 2.3.x and will
trigger an uninstall. This is a nice way to remove all testing 'cruft' from the
system once the new release comes out.
Note that in the future installing 2.3.16+ over 2.4.x will also trigger the uninstall, which is
a good thing IMO. An older release can't know about changes made in a newer one,
so it's safer to first uninstall the newer one to avoid leftover files.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19528 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/gnucash.iss.in b/gnucash.iss.in
index 078d056..1ac0ef4 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -1,4 +1,4 @@
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Input configuration for the Inno Setup Compiler
; Copyright (c) 2004-2005 Christian Stimming <stimming at tuhh.de>
;
@@ -126,6 +126,13 @@ Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "pkg
Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "sysconfdir"; ValueData: "{app}\etc"; Flags: uninsdeletevalue
Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "localedir"; ValueData: "{app}\share\locale"; Flags: uninsdeletevalue
+; Store the version information
+Root: HKLM; Subkey: "Software\GnuCash\Version"; ValueType: none; Flags: uninsdeletekeyifempty
+Root: HKLM; Subkey: "Software\GnuCash\Version"; ValueType: string; ValueName: "Version"; ValueData: "@PACKAGE_VERSION@"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\GnuCash\Version"; ValueType: dword; ValueName: "VersionMajor"; ValueData: "@GNUCASH_MAJOR_VERSION@"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\GnuCash\Version"; ValueType: dword; ValueName: "VersionMinor"; ValueData: "@GNUCASH_MINOR_VERSION@"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\GnuCash\Version"; ValueType: dword; ValueName: "VersionMicro"; ValueData: "@GNUCASH_MICRO_VERSION@"; Flags: uninsdeletevalue
+
; Additionally, we have to install the paths for gwenhywfar
Root: HKLM; Subkey: "Software\Gwenhywfar"; ValueType: none; Flags: uninsdeletekeyifempty
Root: HKLM; Subkey: "Software\Gwenhywfar\Paths"; ValueType: none; Flags: uninsdeletekeyifempty
@@ -162,12 +169,129 @@ Type: dirifempty; Name: "{app}\etc\gnucash"
Type: dirifempty; Name: "{app}\etc"
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; This large section is a Pascal scripting program that will modify
-; the gnucash shell script so that it then includes the
-; correct values according to our local installation. See
-; http://www.remobjects.com/?ps for a syntax reference.
+; Perform some additional actions in code that can't be done
+; by the installer by default. The code snippets below hook
+; into the installer code at specific events. See
+; http://www.jrsoftware.org/ishelp/index.php?topic=scriptintro
+; for more information on iss scription and a syntax reference.
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
[Code]
+var
+ PrevInstDetectedPage : TOutputMsgWizardPage;
+ PrevAppName, PrevUninstallString : String;
+ PrevVersionMajor, PrevVersionMinor, PrevVersionMicro : Cardinal;
+ Uninstallrequired : Boolean;
+
+// -----------------------------------------------------------
+// Sometimes it's not possible to install a newer version of
+// GnuCash over an older one on Windows. This is mostly the
+// case when libraries are moved around in the newer version.
+// The code below will detect an existing GnuCash installation
+// and will remove it (if the user accepts) before installing
+// the version the user has selected.
+// -----------------------------------------------------------
+
+{ Lookup the registry information on a previous installation }
+procedure GetPrevInstallInfo();
+var
+ sUnInstPath, sAppVersionPath: String;
+ rootKey : Integer;
+begin
+ sAppVersionPath := 'Software\GnuCash\Version';
+ sUnInstPath := 'Software\Microsoft\Windows\CurrentVersion\Uninstall\GnuCash_is1';
+
+ PrevAppName := '';
+ PrevUninstallString := '';
+ PrevVersionMajor := 0;
+ PrevVersionMinor := 0;
+ PrevVersionMicro := 0;
+
+ if RegKeyExists(HKLM, sUnInstPath) then
+ rootKey := HKLM
+ else
+ rootKey := HKCU;
+
+ RegQueryStringValue(rootKey, sUnInstPath, 'UninstallString', PrevUninstallString);
+ RegQueryStringValue(rootKey, sUnInstPath, 'DisplayName', PrevAppName);
+ RegQueryDwordValue(rootKey, sAppVersionPath, 'VersionMajor', PrevVersionMajor);
+ RegQueryDwordValue(rootKey, sAppVersionPath, 'VersionMinor', PrevVersionMinor);
+ RegQueryDwordValue(rootKey, sAppVersionPath, 'VersionMicro', PrevVersionMicro);
+end;
+
+{ Check if there is another GnuCash currently installed }
+{ and whether we can simply install over it or have to remove it first }
+{ Versions are considered 'incompatible' if the major or minor }
+{ version components are different }
+procedure CheckUninstallRequired();
+begin
+ UninstallRequired := True;
+ GetPrevInstallInfo;
+
+ if (PrevUninstallString = '') then
+ UninstallRequired := False
+ else if (PrevVersionMajor = @GNUCASH_MAJOR_VERSION@) and (PrevVersionMinor = @GNUCASH_MINOR_VERSION@) then
+ UninstallRequired := False;
+end;
+
+{ Uninstall the current installation }
+function UnInstallOldVersion(): Integer;
+var
+ sUnInstallString: String;
+ iResultCode: Integer;
+begin
+// Return Values:
+// 1 - uninstall string is empty
+// 2 - error executing the UnInstallString
+// 3 - successfully executed the UnInstallString
+
+ // default return value
+ Result := 0;
+
+ if PrevUninstallString <> '' then begin
+ sUnInstallString := RemoveQuotes(PrevUninstallString);
+ if Exec(sUnInstallString, '/SILENT /NORESTART /SUPPRESSMSGBOXES','', SW_HIDE, ewWaitUntilTerminated, iResultCode) then
+ Result := 3
+ else
+ Result := 2;
+ end else
+ Result := 1;
+end;
+
+function GetPrevAppName(Param: String): String;
+begin
+ Result := PrevAppName;
+end;
+
+{ Setup a page to display if a previous (incompatible) GnuCash installation is found }
+procedure InitializeWizard;
+begin
+ CheckUninstallRequired;
+ PrevInstDetectedPage := CreateOutputMsgPage(wpReady,
+ ExpandConstant('{cm:AIWP_Title}'),
+ ExpandConstant('{cm:AIWP_Description,{code:GetPrevAppName}}'),
+ ExpandConstant('{cm:AIWP_Message,{code:GetPrevAppName}}'));
+end;
+
+{ Determine whether the previous installation page should be displayed or not }
+function ShouldSkipPage(PageID: Integer): Boolean;
+begin
+ Result := False
+ if (PageID = PrevInstDetectedPage.ID) and (not UninstallRequired) then
+ Result := True;
+end;
+
+{ If a previous (incompatible) installation is present start the installation }
+{ process with deleting this old installation }
+procedure CurStepChanged(CurStep: TSetupStep);
+begin
+ if (CurStep=ssInstall) and (UninstallRequired) then
+ UnInstallOldVersion();
+end;
+
+// ------------------------------------------------------------
+// The GnuCash environment file contains paths that have to be
+// adapted at install time. The code below does that.
+// ------------------------------------------------------------
function MingwBacksl(const S: String): String;
begin
{ Modify the path name S so that it can be used by MinGW }
@@ -284,6 +408,11 @@ CreateMenuLink=Create a start menu link
RunPrg=Run GnuCash now
AdditionalIcons=Create these icons:
StatusMsgFirewall=Installing Windows firewall rules...
+; *** "Another install" wizard page
+; %1 in the following messages will be replaced with the application name and version, like "GnuCash 2.3.15"
+AIWP_Title=Another installation has been found
+AIWP_Description=%1 is currently installed on this computer
+AIWP_Message=This earlier installation has to be removed before continuing.%n%nIf you don't want that, click Cancel now to abort the current installation.%n%nClick Next to remove %1 and continue with the installation.%n%nNote: Only the program will be removed, not your financial data.
MainFiles=GnuCash Program
TranslFiles=Translation Files
@@ -473,6 +602,10 @@ nl.IconComment_InstallFQ=De benodigde perl module Finance Quote om online koerse
nl.IconName_Uninstall=GnuCash verwijderen
nl.IconComment_Uninstall=Het financieel beheersprogramma GnuCash verwijderen
+nl.AIWP_Title=Een eerdere installatie werd gevonden
+nl.AIWP_Description=%1 is momenteel op deze computer geïnstalleerd
+nl.AIWP_Message=Deze eerdere installatie moet verwijderd worden alvorens verder te gaan.%n%nAls je dat niet wil, klik dan nu op Annuleren om de huidige installatie af te breken.%n%nKlik op Volgende om %1 te verwijderen en de installatie te vervolgen.%n%nOpmerking: enkel het programma zal verwijderd worden, niet je financiële data.
+
;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Brazilian Portuguese translation
commit fbc0b8687fd75803238881285718aecdd0e85e16
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Aug 31 19:57:33 2010 +0000
GnuCash on Windows is built with webkit, no need to install gtkhtml
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19526 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index befbbed..4c0c859 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -255,8 +255,9 @@ set_default LIBGNOMEUI_URL "$GNOME_WIN32_URL/libgnomeui/2.22/libgnomeui-2.22.1.z
set_default LIBGNOMEUI_DEV_URL "$GNOME_WIN32_URL/libgnomeui/2.22/libgnomeui-dev-2.22.1.zip"
set_default LIBGLADE_URL "$GNOME_WIN32_URL/libglade/2.6/libglade_2.6.4-1_win32.zip"
set_default LIBGLADE_DEV_URL "$GNOME_WIN32_URL/libglade/2.6/libglade-dev_2.6.4-1_win32.zip"
-set_default GTKHTML_URL "$GNOME_WIN32_URL/gtkhtml/3.24/gtkhtml_3.24.2-1_win32.zip"
-set_default GTKHTML_DEV_URL "$GNOME_WIN32_URL/gtkhtml/3.24/gtkhtml-dev_3.24.2-1_win32.zip"
+# GnuCash on Windows is built with webkit, no need to install gtkhtml
+#set_default GTKHTML_URL "$GNOME_WIN32_URL/gtkhtml/3.24/gtkhtml_3.24.2-1_win32.zip"
+#set_default GTKHTML_DEV_URL "$GNOME_WIN32_URL/gtkhtml/3.24/gtkhtml-dev_3.24.2-1_win32.zip"
set_default GTK_DOC_URL "$GNOME_MIRROR/sources/gtk-doc/1.13/gtk-doc-1.13.tar.bz2"
set_default GTK_THEME_URL "$SF_MIRROR/gtk-win/gtk2-themes-2009-09-07-win32_bin.zip"
set_default GTK_PREFS_URL "$SF_MIRROR/gtk-win/gtk2_prefs-0.4.1.bin-gtk2.10-win32.zip"
diff --git a/dist-impl.sh b/dist-impl.sh
index 70b37c4..6602f31 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -111,7 +111,8 @@ function dist_gnome() {
wget_unpacked $LIBGNOMEUI_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBGLADE_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $PIXMAN_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $GTKHTML_URL $DOWNLOAD_DIR $DIST_DIR
+# GnuCash on Windows is built with webkit, no need to install gtkhtml
+# wget_unpacked $GTKHTML_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GTK_THEME_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/gtk2-themes-*
diff --git a/install-impl.sh b/install-impl.sh
index a7e252f..5f8c3c1 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -518,7 +518,9 @@ function inst_gnome() {
add_to_env pkg-config PKG_CONFIG
fi
if quiet gconftool-2 --version &&
- quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgtkhtml-3.14 &&
+# GnuCash on Windows is built with webkit, no need to install gtkhtml
+# quiet ${PKG_CONFIG} --exists libgtkhtml-3.14 &&
+ quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 &&
quiet intltoolize --version
then
echo "gnome packages installed. skipping."
@@ -582,8 +584,9 @@ function inst_gnome() {
wget_unpacked $LIBGNOMEUI_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBGLADE_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBGLADE_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GTKHTML_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GTKHTML_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+# GnuCash on Windows is built with webkit, no need to install gtkhtml
+# wget_unpacked $GTKHTML_URL $DOWNLOAD_DIR $GNOME_DIR
+# wget_unpacked $GTKHTML_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GTK_THEME_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/gtk2-themes-*
cp -a $TMP_UDIR/gtk2-themes-*/lib $_GNOME_UDIR/
@@ -619,8 +622,9 @@ fi
\${PKG_CONFIG} "\$@" | tr -d \\\\r && \$res
EOF
chmod +x bin/pkg-config{.exe,-msys.sh}
- sed '/Requires/s,\(.*\) enchant\(.*\) iso-codes\(.*\),\1\2\3,' lib/pkgconfig/libgtkhtml-3.14.pc > tmp
- mv tmp lib/pkgconfig/libgtkhtml-3.14.pc
+# GnuCash on Windows is built with webkit, no need to install gtkhtml
+# sed '/Requires/s,\(.*\) enchant\(.*\) iso-codes\(.*\),\1\2\3,' lib/pkgconfig/libgtkhtml-3.14.pc > tmp
+# mv tmp lib/pkgconfig/libgtkhtml-3.14.pc
rm -rf $TMP_UDIR/gtk-doc-*
qpopd
@@ -642,7 +646,9 @@ EOF
rm -rf $TMP_UDIR/pixman-*
${PKG_CONFIG} --exists pixman-1 || die "pixman not installed correctly"
quiet gconftool-2 --version &&
- quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgtkhtml-3.14 &&
+# GnuCash on Windows is built with webkit, no need to install gtkhtml
+# quiet ${PKG_CONFIG} --exists libgtkhtml-3.14 &&
+ quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 &&
quiet intltoolize --version || die "gnome not installed correctly"
fi
[ ! -d $_GNOME_UDIR/share/aclocal ] || add_to_env "-I $_GNOME_UDIR/share/aclocal" ACLOCAL_FLAGS
commit 1eb2eb3065b19d8301623bd2e29aa24bbe6d121b
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Aug 31 14:31:35 2010 +0000
Make GnuCash more runtime relocatable by using dynamic paths in the environment file.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19518 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/dist-impl.sh b/dist-impl.sh
index accf559..70b37c4 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -238,6 +238,8 @@ function dist_gnucash() {
cp -a $_INSTALL_UDIR/bin/* $DIST_UDIR/bin
mkdir -p $DIST_UDIR/etc/gconf/schemas
cp -a $_INSTALL_UDIR/etc/gconf/schemas/* $DIST_UDIR/etc/gconf/schemas
+ mkdir -p $DIST_UDIR/etc/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/{gnucash,locale} $DIST_UDIR/share
diff --git a/gnucash.iss.in b/gnucash.iss.in
index 0557ea2..078d056 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -1,4 +1,4 @@
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Input configuration for the Inno Setup Compiler
; Copyright (c) 2004-2005 Christian Stimming <stimming at tuhh.de>
;
@@ -60,7 +60,7 @@ Filename: "{sys}\netsh.exe"; Parameters: "firewall add allowedprogram ""{app}\bi
[UninstallRun]
Filename: "{app}\bin\gconftool-2.exe"; Parameters: "--shutdown"; Flags: runhidden
-Filename: "{sys}\netsh.exe"; Parameters: "firewall delete allowedprogram program=""{app}\bin\gnucash.exe"""; Flags: runhidden; MinVersion: 0,5.01.2600sp2
+Filename: "{sys}\netsh.exe"; Parameters: "firewall delete allowedprogram program=""{app}\bin\@PACKAGE at .exe"""; Flags: runhidden; MinVersion: 0,5.01.2600sp2
Filename: "{sys}\netsh.exe"; Parameters: "firewall delete allowedprogram program=""{app}\bin\gconfd-2.exe"""; Flags: runhidden; MinVersion: 0,5.01.2600sp2
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -70,8 +70,9 @@ Filename: "{sys}\netsh.exe"; Parameters: "firewall delete allowedprogram program
[Files]
; The main executables and DLLs
Source: "@prefix@\..\dist\bin\*"; DestDir: "{app}\bin"; Flags: recursesubdirs ignoreversion; Components: main
-Source: "@prefix@\..\dist\etc\*"; DestDir: "{app}\etc"; Flags: recursesubdirs; Components: main; AfterInstall: MyAfterInstallEtc()
-; Note: The above AfterInstall function will create the
+Source: "@prefix@\..\dist\etc\*"; DestDir: "{app}\etc"; Flags: recursesubdirs; Components: main
+Source: "@prefix@\..\dist\etc\@PACKAGE@\environment"; DestDir: "{app}\etc\@PACKAGE@"; Components: main; AfterInstall: MyAfterInstallEnvironment()
+; 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
@@ -203,58 +204,54 @@ begin
end;
-
function BackslashPath(const S: String): String;
begin
- { Convert c:\soft to c:/soft }
- Result := S;
- StringChange(Result, '\', '/');
+ { Convert c:\soft to c:/soft }
+ Result := S;
+ StringChange(Result, '\', '/');
end;
-procedure MyAfterInstallEtc();
+procedure MyAfterInstallEnvironment();
var
- FileName, FileString, appdir, libdir, pkglibdir, pkgdatadir: String;
+ EnvFile, EtcDir: String;
+ iLineCounter, iSize : Integer;
+ EnvStringList: TArrayOfString;
Res: Boolean;
begin
+ { Make some Windows-only changes to the etc/@PACKAGE@/environment file }
+ { If you make any changes here, you should probably also change the equivalent sections }
+ { in packaging/win32/install.sh }
+ { A new line is stared with #13#10 - #10 is the linefeed character and #13 CR }
{ Get the installation-specific paths }
- appdir := BackslashPath( ExpandConstant('{app}') );
- libdir := BackslashPath( appdir + '/lib' );
- pkglibdir := BackslashPath( appdir + '/bin' );
- pkgdatadir := BackslashPath( appdir + '/share/gnucash' );
-
- { Create the etc/gnucash/environment file; #10 is the linefeed character and #13 CR }
+ EnvFile := ExpandConstant(CurrentFileName);
+ EtcDir := ExtractFileDir(EnvFile);
- { If you make any changes here, you should probably also change the equivalent sections }
- { in packaging/win32/install.sh, src/bin/environment*.in and src/bin/gnucash-setup-env-osx.in }
- FileName := appdir + '\etc\gnucash\environment' ;
-
-
- FileString := '# environment'#13#10 ;
- FileString := FileString + '#'#13#10 ;
- FileString := FileString + '# This configuration file can be used to change/add'#13#10 ;
- FileString := FileString + '# environment variables during GnuCash startup.'#13#10 ;
- FileString := FileString + '#'#13#10 ;
-
- FileString := FileString + '[Variables]'#13#10 ;
- FileString := FileString + 'PATH=' + pkglibdir + ';{PATH}'#13#10 ;
- FileString := FileString + 'GNC_MODULE_PATH=' + pkglibdir + ''#13#10 ;
- FileString := FileString + 'GUILE_LOAD_PATH=' + pkgdatadir + '/guile-modules;' + pkgdatadir + '/scm;' + appdir + '/share/guile/1.6;{GUILE_LOAD_PATH}'#13#10 ;
- FileString := FileString + 'EXTRA_LIBS={GNC_MODULE_PATH}'#13#10 ;
- FileString := FileString + 'LD_LIBRARY_PATH={EXTRA_LIBS};{LD_LIBRARY_PATH}'#13#10 ;
- FileString := FileString + 'DYLD_LIBRARY_PATH={EXTRA_LIBS};{DYLD_LIBRARY_PATH}'#13#10 ;
- FileString := FileString + 'GNC_DBD_DIR=' + libdir + '/dbd'#13#10 ;
- FileString := FileString + 'GUILE_WARN_DEPRECATED=no'#13#10 ;
+ { Load the current contents of the environment file }
+ Res := LoadStringsFromFile(EnvFile, EnvStringList);
+ if Res = False then
+ MsgBox('Error on reading ' + EnvFile + ' for completing the installation', mbInformation, MB_OK);
+
+ iSize := GetArrayLength(EnvStringList);
+ for iLineCounter := 0 to iSize-1 do
+ begin
+ { Adapt GUILE_LOAD_PATH parameter }
+ if (Pos('GUILE_LOAD_PATH', EnvStringList[iLineCounter]) = 1) then
+ StringChangeEx(EnvStringList[iLineCounter], '{GUILE_LOAD_PATH}', '{GNC_HOME}/share/guile/1.6;{GUILE_LOAD_PATH}', True);
+ { Adapt GNC_DBD_DIR parameter }
+ if (Pos('GNC_DBD_DIR', EnvStringList[iLineCounter]) > 0) then
+ EnvStringList[iLineCounter] := 'GNC_DBD_DIR={GNC_HOME}/lib/dbd';
+ end;
{ Save the final file }
- Res := ForceDirectories(appdir + '\etc\gnucash');
+ Res := ForceDirectories(EtcDir);
if Res = False then
- MsgBox('Error on creating '+appdir+'\etc\gnucash for completing the installation', mbInformation, MB_OK);
-
- Res := SaveStringToFile(FileName, FileString, False);
+ MsgBox('Error on creating ' + EtcDir + ' for completing the installation', mbInformation, MB_OK);
+
+ Res := SaveStringsToFile(EnvFile, EnvStringList, False);
if Res = False then
- MsgBox('Error on saving '+FileName+' for completing the installation', mbInformation, MB_OK);
-end;
+ MsgBox('Error on saving ' + EnvFile + ' for completing the installation', mbInformation, MB_OK);
+end;
[Languages]
Name: "en"; MessagesFile: "compiler:Default.isl"
commit d02235383599705a50ffa794eb695b5f195ca973
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Aug 30 18:38:26 2010 +0000
Windows build: strip the .la files in their new location
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19514 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/dist-impl.sh b/dist-impl.sh
index 45c2457..accf559 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -238,7 +238,6 @@ function dist_gnucash() {
cp -a $_INSTALL_UDIR/bin/* $DIST_UDIR/bin
mkdir -p $DIST_UDIR/etc/gconf/schemas
cp -a $_INSTALL_UDIR/etc/gconf/schemas/* $DIST_UDIR/etc/gconf/schemas
- mkdir -p $DIST_UDIR/lib
cp -a $_INSTALL_UDIR/lib/lib*.la $DIST_UDIR/bin
mkdir -p $DIST_UDIR/share
cp -a $_INSTALL_UDIR/share/{gnucash,locale} $DIST_UDIR/share
@@ -276,7 +275,7 @@ function dist_finish() {
fi
# Strip redirections in distributed libtool .la files
- for file in $DIST_UDIR/lib/*.la; do
+ for file in $DIST_UDIR/bin/*.la; do
cat $file | sed 's,^libdir=,#libdir=,' > $file.new
mv $file.new $file
done
commit 65e63045d4978c4530922fae7dc46a4a4b7d494d
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Aug 30 17:10:31 2010 +0000
Windows version:
* reduce footprint by not packaging unused files
* move gnc-mod required files to bin
* remove libdir from the PATH
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19513 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/dist-impl.sh b/dist-impl.sh
index 43fe91a..45c2457 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -218,15 +218,13 @@ function dist_aqbanking() {
function dist_libdbi() {
setup LibDBI
cp -a ${_SQLITE3_UDIR}/bin/* ${DIST_UDIR}/bin
- cp -a ${_SQLITE3_UDIR}/lib/* ${DIST_UDIR}/lib
- cp -a ${_MYSQL_LIB_UDIR}/bin/* ${DIST_UDIR}/bin
- cp -a ${_MYSQL_LIB_UDIR}/lib/* ${DIST_UDIR}/lib
+ cp -a ${_MYSQL_LIB_UDIR}/bin/*.{dll,manifest} ${DIST_UDIR}/bin
+ cp -a ${_MYSQL_LIB_UDIR}/lib/*.dll ${DIST_UDIR}/bin
cp -a ${_PGSQL_UDIR}/bin/* ${DIST_UDIR}/bin
- cp -a ${_PGSQL_UDIR}/lib/* ${DIST_UDIR}/lib
+ cp -a ${_PGSQL_UDIR}/lib/*.dll ${DIST_UDIR}/bin
cp -a ${_LIBDBI_UDIR}/bin/* ${DIST_UDIR}/bin
- cp -a ${_LIBDBI_UDIR}/lib/* ${DIST_UDIR}/lib
mkdir ${DIST_UDIR}/lib/dbd
- cp -a ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/* ${DIST_UDIR}/lib/dbd
+ cp -a ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/*.dll ${DIST_UDIR}/lib/dbd
}
function dist_webkit() {
@@ -241,7 +239,7 @@ function dist_gnucash() {
mkdir -p $DIST_UDIR/etc/gconf/schemas
cp -a $_INSTALL_UDIR/etc/gconf/schemas/* $DIST_UDIR/etc/gconf/schemas
mkdir -p $DIST_UDIR/lib
- cp -a $_INSTALL_UDIR/lib/lib*.la $DIST_UDIR/lib
+ cp -a $_INSTALL_UDIR/lib/lib*.la $DIST_UDIR/bin
mkdir -p $DIST_UDIR/share
cp -a $_INSTALL_UDIR/share/{gnucash,locale} $DIST_UDIR/share
cp -a $_REPOS_UDIR/packaging/win32/install-fq-mods.cmd $DIST_UDIR/bin
diff --git a/gnucash.iss.in b/gnucash.iss.in
index 442cd1b..0557ea2 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -237,7 +237,7 @@ begin
FileString := FileString + '#'#13#10 ;
FileString := FileString + '[Variables]'#13#10 ;
- FileString := FileString + 'PATH=' + pkglibdir + ';' + libdir + ';{PATH}'#13#10 ;
+ FileString := FileString + 'PATH=' + pkglibdir + ';{PATH}'#13#10 ;
FileString := FileString + 'GNC_MODULE_PATH=' + pkglibdir + ''#13#10 ;
FileString := FileString + 'GUILE_LOAD_PATH=' + pkgdatadir + '/guile-modules;' + pkgdatadir + '/scm;' + appdir + '/share/guile/1.6;{GUILE_LOAD_PATH}'#13#10 ;
FileString := FileString + 'EXTRA_LIBS={GNC_MODULE_PATH}'#13#10 ;
commit 4359d214242832c329962bd5de1901ee41f9a632
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Aug 30 17:08:36 2010 +0000
Windows version: remove obsolete and duplicate parameters from the environment file
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19512 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/gnucash.iss.in b/gnucash.iss.in
index 6d283af..442cd1b 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -237,17 +237,13 @@ begin
FileString := FileString + '#'#13#10 ;
FileString := FileString + '[Variables]'#13#10 ;
- FileString := FileString + 'PATH=' + appdir + '/bin;' + libdir + ';' + pkglibdir + ';{PATH}'#13#10 ;
- FileString := FileString + 'SCHEME_LIBRARY_PATH='#13#10 ;
+ FileString := FileString + 'PATH=' + pkglibdir + ';' + libdir + ';{PATH}'#13#10 ;
FileString := FileString + 'GNC_MODULE_PATH=' + pkglibdir + ''#13#10 ;
FileString := FileString + 'GUILE_LOAD_PATH=' + pkgdatadir + '/guile-modules;' + pkgdatadir + '/scm;' + appdir + '/share/guile/1.6;{GUILE_LOAD_PATH}'#13#10 ;
FileString := FileString + 'EXTRA_LIBS={GNC_MODULE_PATH}'#13#10 ;
FileString := FileString + 'LD_LIBRARY_PATH={EXTRA_LIBS};{LD_LIBRARY_PATH}'#13#10 ;
FileString := FileString + 'DYLD_LIBRARY_PATH={EXTRA_LIBS};{DYLD_LIBRARY_PATH}'#13#10 ;
- FileString := FileString + 'LTDL_LIBRARY_PATH=' + libdir + ''#13#10 ;
- FileString := FileString + 'QOF_LIB_DIR=' + pkglibdir + ''#13#10 ;
FileString := FileString + 'GNC_DBD_DIR=' + libdir + '/dbd'#13#10 ;
- FileString := FileString + 'GNC_STANDARD_REPORTS_DIR=' + pkgdatadir + '/guile-modules/gnucash/report/standard-reports'#13#10 ;
FileString := FileString + 'GUILE_WARN_DEPRECATED=no'#13#10 ;
{ Save the final file }
commit 6d30befc7c16ba78844ae57d3c4c5db1593394eb
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu Aug 19 08:43:33 2010 +0000
Bug #627325 - Update Subversion URL, patch by Yasuaki Taniguchi
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19448 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 4cd9df3..befbbed 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -306,7 +306,7 @@ set_default ICU4C_SRC_URL "http://download.icu-project.org/files/icu4c/4.4.1/icu
set_default ICU4C_DIR $GLOBAL_DIR\\icu-mingw32
set_default ICU4C_PATCH `pwd`/icu-crossmingw.patch
-set_default SVN_URL "http://subversion.tigris.org/files/documents/15/46880/svn-win32-1.6.6.zip"
+set_default SVN_URL "http://subversion.tigris.org/files/documents/15/47914/svn-win32-1.6.6.zip"
set_default SVN_DIR $GLOBAL_DIR\\svn
# OFX import in gnucash and ofx directconnect support for aqbanking
commit e830a3a39f51d13a72b81a678e9dc16ab25886da
Author: Christian Stimming <stimming at tuhh.de>
Date: Wed Jul 14 20:22:18 2010 +0000
Bug #118391: This patch add isocodes support for Windows build.
It automatically download,
build, install and packaging the isocodes.
Currently, the patch will not make Windows build show the locale long
currencies name. But it make the isocode available on Windows. Since the long
currencies names are already shown on Linux, I think it should not far to make
it happen on Windows too, especially the isocode will be available after this
patch.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19369 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 83d5e4e..4cd9df3 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -372,6 +372,9 @@ set_default DOCS_URL "http://svn.gnucash.org/repo/gnucash-docs/trunk"
set_default DOCS_DIR $GLOBAL_DIR\\gnucash-docs
set_default XSLTPROCFLAGS ""
+set_default ISOCODES_URL "ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/iso-codes-3.18.tar.bz2"
+set_default ISOCODES_DIR $GLOBAL_DIR\\isocodes
+
### Local Variables: ***
### sh-basic-offset: 4 ***
### indent-tabs-mode: nil ***
diff --git a/dist-impl.sh b/dist-impl.sh
index b394642..43fe91a 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -44,6 +44,7 @@ Please set AQBANKING_WITH_QT to yes and rerun install.sh first."
_INSTALL_UDIR=`unix_path $INSTALL_DIR`
_INNO_UDIR=`unix_path $INNO_DIR`
_WEBKIT_UDIR=`unix_path $WEBKIT_DIR`
+ _ISOCODES_UDIR=`unix_path $ISOCODES_DIR`
add_to_env $_UNZIP_UDIR/bin PATH # unzip
add_to_env $_GNOME_UDIR/bin PATH # gconftool-2
add_to_env $_EXETYPE_UDIR/bin PATH # exetype
@@ -128,6 +129,12 @@ function dist_gnome() {
rm -rf $DIST_UDIR/lib/locale
}
+function dist_isocodes() {
+ setup isocodes
+ mkdir -p $DIST_UDIR/share
+ cp -a $_ISOCODES_UDIR/share/{locale,xml} $DIST_UDIR/share
+}
+
function dist_pcre() {
setup pcre
mkdir -p $DIST_UDIR/bin
diff --git a/dist.sh b/dist.sh
index 14e59f1..ca6122c 100755
--- a/dist.sh
+++ b/dist.sh
@@ -20,6 +20,7 @@ add_step dist_regex
add_step dist_autotools
add_step dist_guile
add_step dist_gnome
+add_step dist_isocodes
add_step dist_pcre
add_step dist_libbonoboui
add_step dist_libgsf
diff --git a/install-impl.sh b/install-impl.sh
index 255ea63..a7e252f 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -648,6 +648,27 @@ EOF
[ ! -d $_GNOME_UDIR/share/aclocal ] || add_to_env "-I $_GNOME_UDIR/share/aclocal" ACLOCAL_FLAGS
}
+function inst_isocodes() {
+ setup isocodes
+ _ISOCODES_UDIR=`unix_path ${ISOCODES_DIR}`
+ add_to_env $_ISOCODES_UDIR/share/pkgconfig PKG_CONFIG_PATH
+ if [ -f ${_ISOCODES_UDIR}/share/pkgconfig/iso-codes.pc ]
+ then
+ echo "isocodes already installed. skipping."
+ else
+ wget_unpacked $ISOCODES_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/iso-codes-*
+ qpushd $TMP_UDIR/iso-codes-*
+ ./configure ${HOST_XCOMPILE} \
+ --prefix=${_ISOCODES_UDIR}
+ make
+ make install
+ qpopd
+ quiet [ -f ${_ISOCODES_UDIR}/share/pkgconfig/iso-codes.pc ] || die "isocodes not installed correctly"
+ rm -rf ${TMP_UDIR}/iso-codes-*
+ fi
+}
+
function inst_swig() {
setup Swig
_SWIG_UDIR=`unix_path $SWIG_DIR`
diff --git a/install.sh b/install.sh
index 5530998..53afa01 100644
--- a/install.sh
+++ b/install.sh
@@ -87,6 +87,7 @@ add_step inst_gnome
if [ "$AQBANKING3" = "yes" ]; then
add_step inst_gnutls
fi
+add_step inst_isocodes
add_step inst_swig
add_step inst_pcre
add_step inst_libbonoboui
commit 3fd1e4d05039306e2befff6b572f9af461c85f6e
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri Jun 25 12:50:20 2010 +0000
Bug #617797 - Win32 need to downgrade to gtk-2.16 (Default theme not working under Windows), second patch adding custom themes, by Tao Wang
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19297 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 9a4e941..83d5e4e 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -258,6 +258,8 @@ set_default LIBGLADE_DEV_URL "$GNOME_WIN32_URL/libglade/2.6/libglade-dev_2.6.4-1
set_default GTKHTML_URL "$GNOME_WIN32_URL/gtkhtml/3.24/gtkhtml_3.24.2-1_win32.zip"
set_default GTKHTML_DEV_URL "$GNOME_WIN32_URL/gtkhtml/3.24/gtkhtml-dev_3.24.2-1_win32.zip"
set_default GTK_DOC_URL "$GNOME_MIRROR/sources/gtk-doc/1.13/gtk-doc-1.13.tar.bz2"
+set_default GTK_THEME_URL "$SF_MIRROR/gtk-win/gtk2-themes-2009-09-07-win32_bin.zip"
+set_default GTK_PREFS_URL "$SF_MIRROR/gtk-win/gtk2_prefs-0.4.1.bin-gtk2.10-win32.zip"
set_default GNOME_DIR $GLOBAL_DIR\\gnome
set_default LIBBONOBOUI_URL "$GNOME_WIN32_URL/libbonoboui/2.24/libbonoboui_2.24.0-1_win32.zip"
diff --git a/dist-impl.sh b/dist-impl.sh
index 13e0f02..b394642 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -97,7 +97,7 @@ function dist_gnome() {
wget_unpacked $PANGO_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBART_LGPL_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GTK_URL $DOWNLOAD_DIR $DIST_DIR
- cp $DIST_DIR/share/themes/MS-Windows/gtk-2.0/gtkrc $DIST_DIR/etc/gtk-2.0
+ echo 'gtk-theme-name = "MS-Windows"' > $DIST_DIR/etc/gtk-2.0/gtkrc
wget_unpacked $ORBIT2_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GAIL_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $POPT_URL $DOWNLOAD_DIR $DIST_DIR
@@ -111,6 +111,18 @@ function dist_gnome() {
wget_unpacked $LIBGLADE_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $PIXMAN_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GTKHTML_URL $DOWNLOAD_DIR $DIST_DIR
+ wget_unpacked $GTK_THEME_URL $DOWNLOAD_DIR $TMP_DIR
+
+ assert_one_dir $TMP_UDIR/gtk2-themes-*
+ cp -a $TMP_UDIR/gtk2-themes-*/lib $DIST_DIR/
+ cp -a $TMP_UDIR/gtk2-themes-*/share $DIST_DIR/
+ rm -rf $TMP_UDIR/gtk2-themes-*
+
+ wget_unpacked $GTK_PREFS_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/gtk2_prefs-*
+ mv $TMP_UDIR/gtk2_prefs-*/gtk2_prefs.exe $DIST_DIR/bin
+ rm -rf $TMP_UDIR/gtk2_prefs-*
+
rm -rf $DIST_UDIR/etc/gconf/gconf.xml.defaults/{desktop,schemas}
cp -a $DIST_UDIR/lib/locale $DIST_UDIR/share
rm -rf $DIST_UDIR/lib/locale
diff --git a/gnucash.iss.in b/gnucash.iss.in
index e2c24a7..6d283af 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -46,6 +46,7 @@ Name: "{group}\{cm:IconName_README}"; Filename: "{app}\doc\gnucash\{cm:IconFilen
Name: "{group}\{cm:IconName_FAQ}"; Filename: "http://wiki.gnucash.org/wiki/FAQ"; Tasks: menuicon
Name: "{group}\{cm:IconName_Bugzilla}"; Filename: "http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash"; Tasks: menuicon
Name: "{group}\{cm:IconName_InstallFQ}"; Filename: "{app}\bin\install-fq-mods.cmd"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_InstallFQ}"; Tasks: menuicon
+Name: "{group}\{cm:IconName_Theme}"; Filename: "{app}\bin\gtk2_prefs.exe"; WorkingDir: "{app}\bin"; Tasks: menuicon
Name: "{group}\{cm:IconName_Uninstall}"; Filename: "{uninstallexe}"; Comment: "{cm:IconComment_Uninstall}"; Tasks: menuicon
Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\gnucash.exe"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: desktopicon
@@ -303,6 +304,7 @@ IconName_FAQ=FAQ (Online)
IconName_Bugzilla=Report a Bug (Online)
IconName_InstallFQ=Install Online Price Retrieval
IconComment_InstallFQ=Install the necessary perl module Finance-Quote for online retrieval of prices. Requires ActivePerl 5.8 or 5.10
+IconName_Theme=Select Theme
IconName_Uninstall=Uninstall GnuCash
IconComment_Uninstall=Uninstall the Finance Manager GnuCash
diff --git a/install-impl.sh b/install-impl.sh
index 1ef7a72..255ea63 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -558,6 +558,7 @@ function inst_gnome() {
wget_unpacked $LIBART_LGPL_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GTK_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GTK_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+ echo 'gtk-theme-name = "MS-Windows"' > $GNOME_DIR/etc/gtk-2.0/gtkrc
wget_unpacked $INTLTOOL_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $ORBIT2_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $ORBIT2_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
@@ -583,6 +584,17 @@ function inst_gnome() {
wget_unpacked $LIBGLADE_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GTKHTML_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GTKHTML_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $GTK_THEME_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/gtk2-themes-*
+ cp -a $TMP_UDIR/gtk2-themes-*/lib $_GNOME_UDIR/
+ cp -a $TMP_UDIR/gtk2-themes-*/share $_GNOME_UDIR/
+ rm -rf $TMP_UDIR/gtk2-themes-*
+
+ wget_unpacked $GTK_PREFS_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/gtk2_prefs-*
+ mv $TMP_UDIR/gtk2_prefs-*/gtk2_prefs.exe $_GNOME_UDIR/bin
+ rm -rf $TMP_UDIR/gtk2_prefs-*
+
wget_unpacked $GTK_DOC_URL $DOWNLOAD_DIR $TMP_DIR
qpushd $_GNOME_UDIR
assert_one_dir $TMP_UDIR/gtk-doc-*
commit 366c5ff42aa056f7702cd658f7c31ee0f0d30a35
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu Jun 24 08:56:35 2010 +0000
Bug #617797 - Win32 need to downgrade to gtk-2.16 (Default theme not working under Windows), patch by Tao Wang
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19290 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index a32b5f5..9a4e941 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -232,8 +232,8 @@ set_default PANGO_URL "$GNOME_WIN32_URL/pango/1.26/pango_1.26.2-1_win32.zip"
set_default PANGO_DEV_URL "$GNOME_WIN32_URL/pango/1.26/pango-dev_1.26.2-1_win32.zip"
set_default LIBART_LGPL_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart_lgpl-2.3.20.zip"
set_default LIBART_LGPL_DEV_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart_lgpl-dev-2.3.20.zip"
-set_default GTK_URL "$GNOME_WIN32_URL/gtk+/2.18/gtk+_2.18.7-1_win32.zip"
-set_default GTK_DEV_URL "$GNOME_WIN32_URL/gtk+/2.18/gtk+-dev_2.18.7-1_win32.zip"
+set_default GTK_URL "$GNOME_WIN32_URL/gtk+/2.16/gtk+_2.16.6-2_win32.zip"
+set_default GTK_DEV_URL "$GNOME_WIN32_URL/gtk+/2.16/gtk+-dev_2.16.6-2_win32.zip"
set_default INTLTOOL_URL "$GNOME_WIN32_URL/intltool/0.40/intltool_0.40.4-1_win32.zip"
set_default ORBIT2_URL "$GNOME_WIN32_URL/ORBit2/2.14/ORBit2-2.14.13.zip"
set_default ORBIT2_DEV_URL "$GNOME_WIN32_URL/ORBit2/2.14/ORBit2-dev-2.14.13.zip"
@@ -276,7 +276,7 @@ set_default PCRE_DIR $GLOBAL_DIR\\pcre
set_default LIBGSF_URL "$GNOME_MIRROR/sources/libgsf/1.14/libgsf-1.14.15.tar.bz2"
set_default LIBGSF_DIR $GLOBAL_DIR\\libgsf
-set_default GOFFICE_URL "$GNOME_MIRROR/sources/goffice/0.7/goffice-0.7.17.tar.bz2"
+set_default GOFFICE_URL "$GNOME_MIRROR/sources/goffice/0.7/goffice-0.7.14.tar.bz2"
set_default GOFFICE_DIR $GLOBAL_DIR\\goffice
#set_default GOFFICE_PATCH `pwd`/goffice-0.7.2-patch.diff
commit e97f834117d82c7384f67d4e64058dd751344944
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat Jun 19 15:42:32 2010 +0000
Improve name consistency. Use "GnuCash" (or more precisely PACKAGE_NAME), wherever the name is visible to the user, and "gnucash" (or more precisely PACKAGE) everywhere else.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19279 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/gnucash.iss.in b/gnucash.iss.in
index 618fba6..e2c24a7 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -41,25 +41,25 @@ Name: desktopicon; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm
Name: menuicon; Description: "{cm:CreateMenuLink}"; GroupDescription: "{cm:AdditionalIcons}"
[Icons]
-Name: "{group}\GnuCash"; Filename: "{app}\bin\GnuCash.exe"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: menuicon
+Name: "{group}\GnuCash"; Filename: "{app}\bin\gnucash.exe"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: menuicon
Name: "{group}\{cm:IconName_README}"; Filename: "{app}\doc\gnucash\{cm:IconFilename_README}"; Comment: "{cm:IconComment_README}"; Tasks: menuicon
Name: "{group}\{cm:IconName_FAQ}"; Filename: "http://wiki.gnucash.org/wiki/FAQ"; Tasks: menuicon
Name: "{group}\{cm:IconName_Bugzilla}"; Filename: "http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash"; Tasks: menuicon
Name: "{group}\{cm:IconName_InstallFQ}"; Filename: "{app}\bin\install-fq-mods.cmd"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_InstallFQ}"; Tasks: menuicon
Name: "{group}\{cm:IconName_Uninstall}"; Filename: "{uninstallexe}"; Comment: "{cm:IconComment_Uninstall}"; Tasks: menuicon
-Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\GnuCash.exe"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: desktopicon
+Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\gnucash.exe"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: desktopicon
[Run]
-Filename: "{app}\bin\GnuCash.exe"; Description: "{cm:RunPrg}"; WorkingDir: "{app}\bin"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent
+Filename: "{app}\bin\gnucash.exe"; Description: "{cm:RunPrg}"; WorkingDir: "{app}\bin"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent
Filename: "{app}\bin\guile.cmd"; Parameters: "-c ""(use-modules (ice-9 slib)) (require 'printf)"""; Flags: runhidden
;; The Windows firewall exceptions, see http://www.vincenzo.net/isxkb/index.php?title=Adding_a_rule_to_the_Windows_firewall
-Filename: "{sys}\netsh.exe"; Parameters: "firewall add allowedprogram ""{app}\bin\GnuCash.exe"" ""GnuCash Free Finance Manager"" ENABLE ALL"; StatusMsg: "{cm:StatusMsgFirewall}"; Flags: runhidden; MinVersion: 0,5.01.2600sp2;
+Filename: "{sys}\netsh.exe"; Parameters: "firewall add allowedprogram ""{app}\bin\gnucash.exe"" ""GnuCash Free Finance Manager"" ENABLE ALL"; StatusMsg: "{cm:StatusMsgFirewall}"; Flags: runhidden; MinVersion: 0,5.01.2600sp2;
Filename: "{sys}\netsh.exe"; Parameters: "firewall add allowedprogram ""{app}\bin\gconfd-2.exe"" ""GConf Settings Manager"" ENABLE ALL"; StatusMsg: "{cm:StatusMsgFirewall}"; Flags: runhidden; MinVersion: 0,5.01.2600sp2;
[UninstallRun]
Filename: "{app}\bin\gconftool-2.exe"; Parameters: "--shutdown"; Flags: runhidden
-Filename: "{sys}\netsh.exe"; Parameters: "firewall delete allowedprogram program=""{app}\bin\GnuCash.exe"""; Flags: runhidden; MinVersion: 0,5.01.2600sp2
+Filename: "{sys}\netsh.exe"; Parameters: "firewall delete allowedprogram program=""{app}\bin\gnucash.exe"""; Flags: runhidden; MinVersion: 0,5.01.2600sp2
Filename: "{sys}\netsh.exe"; Parameters: "firewall delete allowedprogram program=""{app}\bin\gconfd-2.exe"""; Flags: runhidden; MinVersion: 0,5.01.2600sp2
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -113,7 +113,7 @@ Root: HKCR; Subkey: ".gnucash"; ValueType: string; ValueName: ""; ValueData: "Gn
Root: HKCR; Subkey: ".gnucash"; ValueType: string; ValueName: "Content Type"; ValueData: "application/x-gnucash"; Flags: uninsdeletevalue
Root: HKCR; Subkey: "GnuCash.Financial.Data"; ValueType: string; ValueName: ""; ValueData: "GnuCash Financial Data"; Flags: uninsdeletevalue
Root: HKCR; Subkey: "GnuCash.Financial.Data\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\share\gnucash\pixmaps\gnucash-icon.ico,0"
-Root: HKCR; Subkey: "GnuCash.Financial.Data\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\bin\GnuCash.exe"" ""%1"""
+Root: HKCR; Subkey: "GnuCash.Financial.Data\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\bin\gnucash.exe"" ""%1"""
Root: HKLM; Subkey: "Software\GnuCash"; ValueType: none; Flags: uninsdeletekeyifempty
Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: none; Flags: uninsdeletekeyifempty
diff --git a/install-impl.sh b/install-impl.sh
index e530524..1ef7a72 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1434,7 +1434,7 @@ set PATH=$PGSQL_DIR\\lib;%PATH%
set LTDL_LIBRARY_PATH=${INSTALL_DIR}\\lib
-start GnuCash %*
+start gnucash %*
EOF
qpopd
fi
commit f949c4badb0df08f404f00183db33830363b44a4
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat Jun 19 13:28:23 2010 +0000
Document what to do if svn isn't found. This only applies to the scripts used to setup an automated build system
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19277 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_tags.sh b/build_tags.sh
index a2dd062..7999963 100644
--- a/build_tags.sh
+++ b/build_tags.sh
@@ -1,4 +1,12 @@
#!/bin/sh
+#
+# Note: for this script to work, you need to make sure bash can
+# find svn on your system. If it's not in the default
+# Windows path, you will have to add it yourself, for
+# example like this:
+# - create a file /etc/profile.d/svn.sh
+# - add this line: export PATH=/c/soft/svn/bin:$PATH
+# (Use the real path to your svn installation, obviously)
set -e
diff --git a/daily_build.sh b/daily_build.sh
index eb05e92..be7fb39 100755
--- a/daily_build.sh
+++ b/daily_build.sh
@@ -1,4 +1,12 @@
#!/bin/sh
+#
+# Note: for this script to work, you need to make sure bash can
+# find svn on your system. If it's not in the default
+# Windows path, you will have to add it yourself, for
+# example like this:
+# - create a file /etc/profile.d/svn.sh
+# - add this line: export PATH=/c/soft/svn/bin:$PATH
+# (Use the real path to your svn installation, obviously)
set -e
commit 3f5e1793ef520993d6c85498212e561e3f42bc57
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri Jun 18 12:03:43 2010 +0000
Fix Latvian language support for Windows installer (should have used lv instead of lv_LV)
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19274 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/gnucash.iss.in b/gnucash.iss.in
index 6e19713..618fba6 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -428,28 +428,28 @@ it.IconComment_Uninstall=Disinstalla il programma di gestione delle finanze GnuC
;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Latvian translation
-lv_LV.FullInstall=Pilna uzstÄdÄ«Å¡ana
-lv_LV.CustomInstall=IzvÄ“les uzstÄdÄ«Å¡ana
-lv_LV.CreateDesktopIcon=Izveidot &darbvirsmas ikonu
-lv_LV.CreateMenuLink=Izveidot starta izvēlnes saiti
-lv_LV.RunPrg=Palaist GnuCash tagad
-lv_LV.AdditionalIcons=Izveidot sekojošas ikonas:
-lv_LV.StatusMsgFirewall=UzstÄda Windows ugunssienas likumus...
-
-lv_LV.MainFiles=GnuCash Programma
-lv_LV.TranslFiles=Tulkojumu faili
-lv_LV.TemplFiles=Kontu sagatavju faili
-
-lv_LV.IconComment_GnuCash=GnuCash grÄmatvedÄ«bas programma
-lv_LV.IconName_README=ParÄdÄ«t README
-lv_LV.IconComment_README=ParÄda README failu
-lv_LV.IconFilename_README=README-lv_LV.win32-bin.txt
-lv_LV.IconName_FAQ=BUJ (tiešsaistē)
-lv_LV.IconName_Bugzilla=Ziņot par kļūdu (tiešsaistē)
-lv_LV.IconName_InstallFQ=UzstÄdÄ«t tieÅ¡saistes kursu iegÅ«Å¡anu
-lv_LV.IconComment_InstallFQ=UzstÄdÄ«t nepiecieÅ¡amos Perl moduļus valÅ«tas kursu iegÅ«Å¡anai. NepiecieÅ¡ams ActivePerl 5.8 vai 5.10
-lv_LV.IconName_Uninstall=Noņemt GnuCash
-lv_LV.IconComment_Uninstall=Noņemt GnuCash grÄmatvedÄ«bas programmu
+lv.FullInstall=Pilna uzstÄdÄ«Å¡ana
+lv.CustomInstall=IzvÄ“les uzstÄdÄ«Å¡ana
+lv.CreateDesktopIcon=Izveidot &darbvirsmas ikonu
+lv.CreateMenuLink=Izveidot starta izvēlnes saiti
+lv.RunPrg=Palaist GnuCash tagad
+lv.AdditionalIcons=Izveidot sekojošas ikonas:
+lv.StatusMsgFirewall=UzstÄda Windows ugunssienas likumus...
+
+lv.MainFiles=GnuCash Programma
+lv.TranslFiles=Tulkojumu faili
+lv.TemplFiles=Kontu sagatavju faili
+
+lv.IconComment_GnuCash=GnuCash grÄmatvedÄ«bas programma
+lv.IconName_README=ParÄdÄ«t README
+lv.IconComment_README=ParÄda README failu
+lv.IconFilename_README=README-lv.win32-bin.txt
+lv.IconName_FAQ=BUJ (tiešsaistē)
+lv.IconName_Bugzilla=Ziņot par kļūdu (tiešsaistē)
+lv.IconName_InstallFQ=UzstÄdÄ«t tieÅ¡saistes kursu iegÅ«Å¡anu
+lv.IconComment_InstallFQ=UzstÄdÄ«t nepiecieÅ¡amos Perl moduļus valÅ«tas kursu iegÅ«Å¡anai. NepiecieÅ¡ams ActivePerl 5.8 vai 5.10
+lv.IconName_Uninstall=Noņemt GnuCash
+lv.IconComment_Uninstall=Noņemt GnuCash grÄmatvedÄ«bas programmu
;; ;;;;;;;;;;;;;;;;;
commit b5f9f90008a98af47452f2e5bcc7d4332ef7b3bf
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu Jun 17 18:58:07 2010 +0000
Add Latvian translation for the Windows Installer, patch by Valdis Vītoliņš
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19272 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/Latvian-1-5.1.11.isl b/Latvian-1-5.1.11.isl
new file mode 100644
index 0000000..ad1eccc
--- /dev/null
+++ b/Latvian-1-5.1.11.isl
@@ -0,0 +1,328 @@
+;Agris Ausejs
+;******************************************************
+; *** ***
+; *** Inno Setup version 5.1.11+ Latvian messages ***
+; *** ***
+; *** Original Author: ***
+; *** ***
+; *** Agris Ausejs (oby2005 at gmail.com) ***
+; *** ***
+; *** 02/22/2008 ***
+; ******************************************************
+;
+;
+; To download user-contributed translations of this file, go to:
+; http://www.jrsoftware.org/is3rdparty.php
+;
+; Note: When translating this text, do not add periods (.) to the end of
+; messages that didn't have them already, because on those messages Inno
+; Setup adds the periods automatically (appending a period would result in
+; two periods being displayed).
+
+[LangOptions]
+; The following three entries are very important. Be sure to read and
+; understand the '[LangOptions] section' topic in the help file.
+LanguageName=Latviski
+LanguageID=$0426
+LanguageCodePage=1257
+; If the language you are translating to requires special font faces or
+; sizes, uncomment any of the following entries and change them accordingly.
+;DialogFontName=
+;DialogFontSize=8
+;WelcomeFontName=Verdana
+;WelcomeFontSize=12
+;TitleFontName=Arial
+;TitleFontSize=29
+;CopyrightFontName=Arial
+;CopyrightFontSize=8
+
+[Messages]
+
+; *** Application titles
+SetupAppTitle=Uzstâdîðana
+SetupWindowTitle=Uzstâdîðana - %1
+UninstallAppTitle=Atinstalâcija
+UninstallAppFullTitle=%1 Atinstalâcija
+
+; *** Misc. common
+InformationTitle=Informâcija
+ConfirmTitle=Apstiprinât
+ErrorTitle=Kïûda
+
+; *** SetupLdr messages
+SetupLdrStartupMessage=Tiks uzstâdîta programma %1. Vai vçlaties turpinât?
+LdrCannotCreateTemp=Neiespçjami izveidot pagaidu datnes. Uzstâdîðana pârtraukta
+LdrCannotExecTemp=Neiespçjami palaist datni no pagaidu mapes. Uzstâdîðana pârtraukta
+
+; *** Startup error messages
+LastErrorMessage=%1.%n%nKïûda %2: %3
+SetupFileMissing=Datne %1 nav atrodama instalâcijas mapç. Lûdzu, izlabojiet kïûdu vai iegâdâjieties jaunu programmas kopiju.
+SetupFileCorrupt=Uzstâdâmâs datnes ir sabojâtas. Lûdzu, iegâdâjieties jaunu programmas kopiju.
+SetupFileCorruptOrWrongVer=Uzstâdâmâs datnes ir bojâtas vai nav savienojamas ar ðo Uzstâdîðanas programmu. Lûdzu, izlabojiet ðo kïûdu vai iegâdâjieties jaunu programmas kopiju.
+NotOnThisPlatform=Ðo programmu nevar palaist uz %1.
+OnlyOnThisPlatform=Ðî programma darbojas uz %1.
+OnlyOnTheseArchitectures=Ðo programmu var uzstâdît tikai uz ðâdâm Windows versijâm:%n%n%1
+MissingWOW64APIs=Paðlaik palaistâ Windows versija neatbalsta 64-bitu instalâciju. Lai izlabotu ðo kïûdu, uzinstalçjiet Service Pack %1.
+WinVersionTooLowError=Ðî programma pieprasa %1 versiju %2 vai jaunâku.
+WinVersionTooHighError=Ðo programmu nevar uzstâdît uz %1 versijas %2 vai jaunâkas.
+AdminPrivilegesRequired=Jums ir jâbût adminstratoram, lai varçtu uzsâkt instalâciju.
+PowerUserPrivilegesRequired=Jums ir jâbût administratoram vai pilnvarotam lietotâjam, lai uzstâdîtu ðo programmu.
+SetupAppRunningError=Uzstâdîðana ir atklâjusi, ka %1 paðlaik darbojas.%n%nLûdzu, aizveriet visas programmas un spiediet "Ok" vai "Atcelt", lai izietu.
+UninstallAppRunningError=Atinstalâcija ir atklâjusi ka %1 paðlaik darbojas.%n%nLûdzu, aizveriet visas programmas un spiediet "Ok", lai turpinâtu, vai "Atcelt", lai izietu.
+
+; *** Misc. errors
+ErrorCreatingDir=Uzstâdîðanâ ir neiespçjami izveidot mapi "%1"
+ErrorTooManyFilesInDir=Neiespçjami izveidot datnes mapç "%1", jo tâ satur pârâk daudz datòu
+
+; *** Setup common messages
+ExitSetupTitle=Iziet no Uzstâdîðanas
+ExitSetupMessage=Uzstâdîðana nav pabeigta. Ja Jûs tagad iziesiet, tad programma netiks uzinstalçta.%n%nJums bûs atkal jâpalaiþ Uzstâdîðana, lai pabeigtu programmas instalâciju.%n%nIziet no Uzstâdîðanas?
+AboutSetupMenuItem=&Par Uzstâdîðanu...
+AboutSetupTitle=Par Uzstâdîðanu
+AboutSetupMessage=%1 versija %2%n%3%n%n%1 mâjas lapa:%n%4
+AboutSetupNote=
+TranslatorNote=
+
+; *** Buttons
+ButtonBack=< &Atpakaï
+ButtonNext=&Tâlâk >
+ButtonInstall=&Uzstâdît
+ButtonOK=OK
+ButtonCancel=Atcelt
+ButtonYes=&Jâ
+ButtonYesToAll=Jâ &Visam
+ButtonNo=&Nç
+ButtonNoToAll=Nç V&isam
+ButtonFinish=&Pabeigt
+ButtonBrowse=Pâ&rlûkot...
+ButtonWizardBrowse=Pârlû&kot...
+ButtonNewFolder=I&zveidot jaunu mapi
+
+; *** "Select Language" dialog messages
+SelectLanguageTitle=Izvçlieties Uzstâdîðanas valodu
+SelectLanguageLabel=Izvçlieties valodu, kurâ notiks Uzstâdîðana:
+
+; *** Common wizard text
+ClickNext=Spiediet "Tâlâk", lai turpinâtu, vai "Atcelt", lai izietu no Uzstâdîðanas.
+BeveledLabel=
+BrowseDialogTitle=Pârlûkot mapi
+BrowseDialogLabel=Izvçlieties mapi no saraksta, tad spiediet "Ok".
+NewFolderName=Jauna mape
+
+; *** "Welcome" wizard page
+WelcomeLabel1=Laipni lûdzam [name] Uzstâdîðanâ
+WelcomeLabel2=Ðis uzstâdîs [name/ver] uz Jûsu datora.%n%nVçlams aizvçrt visas programmas pirms turpinâðanas.
+
+; *** "Password" wizard page
+WizardPassword=Parole
+PasswordLabel1=Ðî instalâcija ir aizsargâta ar paroli.
+PasswordLabel3=Lûdzu, ievadiet paroli, tad spiediet "Tâlâk", lai turpinâtu. Parole ir reìistrjutîga.
+PasswordEditLabel=&Parole:
+IncorrectPassword=Parole, ko Jûs ievadîjât, ir nepareiza. Lûdzu, mçìiniet vçlreiz.
+
+; *** "License Agreement" wizard page
+WizardLicense=Lîgums
+LicenseLabel=Lûdzu, izlasiet sekojoðo informâciju, pirms turpinât.
+LicenseLabel3=Lûdzu, izlasiet Lîgumu. Jums ir jâapstiprina Lîgums, lai turpinâtu instalâciju.
+LicenseAccepted=Es &piekrîtu lîgumam
+LicenseNotAccepted=Es &nepiekrîtu lîgumam
+
+; *** "Information" wizard pages
+WizardInfoBefore=Informâcija
+InfoBeforeLabel=Lûdzu, izlasiet ðo informâciju.
+InfoBeforeClickLabel=Kad esat gatavs turpinât instalâciju, spiediet "Tâlâk".
+WizardInfoAfter=Informâcija
+InfoAfterLabel=Lûdzu izlasiet sekojoðo informâciju.
+InfoAfterClickLabel=Kad esat gatavs turpinât instalâciju, spiediet "Tâlâk".
+
+; *** "User Information" wizard page
+WizardUserInfo=Lietotâja informâcija
+UserInfoDesc=Lûdzu, ievadiet savu informâciju.
+UserInfoName=&Lietotâja vârds:
+UserInfoOrg=&Organizâcija:
+UserInfoSerial=&Seriâlais numurs:
+UserInfoNameRequired=Jums ir jâievada savs vârds.
+
+; *** "Select Destination Location" wizard page
+WizardSelectDir=Izvçlieties mapi, uz kuru tiks sûtîti dati
+SelectDirDesc=Kur [name] tiks instalçts?
+SelectDirLabel3=[name] datnes tiks instalçtas norâdîtajâ mapç.
+SelectDirBrowseLabel=Lai turpinâtu, spiediet "Tâlâk". Ja vçlaties norâdît citu mapi, spiediet "Pârlûkot".
+DiskSpaceMBLabel=Ir nepiecieðami brîvi [mb] MB uz cietâ diska.
+ToUNCPathname=Uzstâdîðana nevar uzstâdît datnes norâdîtajâ adresç. Ja Jûs mçìinât uzstâdît tîklâ, tad Jums ir nepiecieðama speciâla mape.
+InvalidPath=Jums ir jânorâda pilna instalâcijas adrese, piemçrs:%n%nC:\APP%n%nvai UNC adrese:%n%n\\server\share
+InvalidDrive=Ierîce UNC, kuru Jûs izvçlçjâties, nepastâv vai arî nav pieejama. Lûdzu, izvçlieties citu.
+DiskSpaceWarningTitle=Nepietiek vietas uz diska
+DiskSpaceWarning=Instalâcijai ir nepiecieðami vismaz %1 KB brîvâs vietas uz diska, bet pieejami ir tikai %2 KB.%n%nVai vçlaties turpinât?
+DirNameTooLong=Mapes nosaukums vai adrese ir pârâk gara.
+InvalidDirName=Mapes nosaukums nav derîgs.
+BadDirName32=Mapes nosaukumâ nedrîkst bût ðâdi simboli:%n%n%1
+DirExistsTitle=Mape jau pastâv
+DirExists=Mape:%n%n%1%n%njau pastâv. Vai vienalga vçlaties turpinât?
+DirDoesntExistTitle=Mape nepastâv
+DirDoesntExist=Mape:%n%n%1%n%ndoes nepastâv. Vai vçlaties izveidot mapi?
+
+; *** "Select Components" wizard page
+WizardSelectComponents=Izvçlieties sastâvdaïas
+SelectComponentsDesc=Kurus komponentus vçlaties uzstâdît?
+SelectComponentsLabel2=Izvçlieties komponentus, kurus vçlaties uzstâdît. Spiediet "Tâlâk", lai turpinâtu.
+FullInstallation=Pilna Uzstâdîðana
+; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
+CompactInstallation=Kompakta Uzstâdîðana
+CustomInstallation=Izveidot Uzstâdîðanu
+NoUninstallWarningTitle=Komponenti jau pastâv
+NoUninstallWarning=Uzstâdîðana ir atklâjusi ka ðâdi faili jau ir uzstâdîti:%n%n%1%n%nAtiestatiet ðos komponentus.%n%nVai vçlaties turpinât?
+ComponentSize1=%1 KB
+ComponentSize2=%1 MB
+ComponentsDiskSpaceMBLabel=Paðlaik izvçlçtie komponenti aizòem [mb] MB uz cietâ diska.
+
+; *** "Select Additional Tasks" wizard page
+WizardSelectTasks=Papilduzdevumu izvçlne
+SelectTasksDesc=Kurus papilduzdevumus vajadzçtu veikt?
+SelectTasksLabel2=Izvçlieties, kâdi papilduzdevumi tiks veikti [name] Uzstâdîðanas laikâ, tad spiediet "Tâlâk".
+
+; *** "Select Start Menu Folder" wizard page
+WizardSelectProgramGroup=Izvçlieties Start Menu mapi
+SelectStartMenuFolderDesc=Kur Uzstâdîðanas programmai vajadzçtu likt îsinâjumikonas?
+SelectStartMenuFolderLabel3=Uzstâdîðana izveidos îsinâjumikonas Start Menu mapç.
+SelectStartMenuFolderBrowseLabel=Lai turpinâtu, spiediet "Tâlâk". Ja vçlaties norâdît citu mapi, spiediet "Pârlûkot".
+MustEnterGroupName=Jums ir jânorâda mape.
+GroupNameTooLong=Mapes nosaukums ir pârâk garð.
+InvalidGroupName=Mape nav derîga.
+BadGroupName=Mapes nosaukums satur kâdu no ðiem simboliem:%n%n%1
+NoProgramGroupCheck2=&Neizveidot Start Menu mapi
+
+; *** "Ready to Install" wizard page
+WizardReady=Gatavs instalâcijai
+ReadyLabel1=Uzstâdîðana ir gatava instalçt [name] uz Jûsu datora.
+ReadyLabel2a=Spiediet "Uzstâdît", lai sâktu instalâciju, vai spiediet Atpakaï, lai izmainîtu parametrus.
+ReadyLabel2b=Spiediet "Uzstâdît", lai sâktu instalâciju.
+ReadyMemoUserInfo=Lietotâja informâcija:
+ReadyMemoDir=Galamçríis:
+ReadyMemoType=Uzstâdîðanas tips:
+ReadyMemoComponents=Izvçlçtie komponenti:
+ReadyMemoGroup=Start Menu mape:
+ReadyMemoTasks=Papilduzdevumi:
+
+; *** "Preparing to Install" wizard page
+WizardPreparing=Gatavoties instalâcijai
+PreparingDesc=Uzstâdîðana ir gatava instalçt [name] uz Jûsu datora.
+PreviousInstallNotCompleted=Instalâcija/noòemðana iepriekðçjai programmai nav pabeigta. Jums ir jâpârstartç dators, lai pabeigtu instalâciju.%n%nPçc pârstartçðanas palaidiet uzstâdîðanu no jauna, lai pabeigtu uzstâdît [name].
+CannotContinue=Uzstâdîðanu nevar turpinât. Lûdzu, spiediet "Atcelt", lai izietu.
+
+; *** "Installing" wizard page
+WizardInstalling=Instalâcija
+InstallingLabel=Lûdzu, uzgaidiet, kamçr [name] tiks uzstâdîts uz Jûsu datora.
+
+; *** "Setup Completed" wizard page
+FinishedHeadingLabel=Pabeigta [name] Uzstâdîðana
+FinishedLabelNoIcons=Uzstâdîðana pabeigta.
+FinishedLabel=Uzstâdîðana pabeigta. Programmu var palaist, uzklikðíinot uz izveidotajâm ikonâm.
+ClickFinish=Spiediet "Pabeigt", lai aizvçrtu Uzstâdîðanu.
+FinishedRestartLabel=Lai pabeigtu [name] uzstâdîðanu, nepiecieðams pârstartçt Jûsu datoru. Vai vçlaties to darît tagad?
+FinishedRestartMessage=Lai pabeigtu [name] uzstâdîðanu, nepiecieðams pârstartçt Jûsu datoru.%n%nVai vçlaties to darît tagad?
+ShowReadmeCheck=Jâ, vçlos apskatît README failu
+YesRadio=&Jâ, pârstartçt datoru tagad
+NoRadio=&Nç, datoru pârstartçðu vçlâk
+; used for example as 'Run MyProg.exe'
+RunEntryExec=Run %1
+; used for example as 'View Readme.txt'
+RunEntryShellExec=View %1
+
+; *** "Setup Needs the Next Disk" stuff
+ChangeDiskTitle=Uzstâdîðanai ir nepiecieðams nâkamais disks
+SelectDiskLabel2=Lûdzu, ielieciet %1 disku un spiediet "Ok".%n%nJa datne ir atrodama uz ðî paða diska kâdâ citâ mapç, norâdiet tâs atraðanâs vietu vai spiediet "Pârlûkot", lai to norâdîtu.
+PathLabel=&Ceïð:
+FileNotInDir2=Datne "%1" neatrodas "%2". Lûdzu, ielieciet pareizo disku vai norâdiet pareizo mapi.
+SelectDirectoryLabel=Lûdzu, norâdiet nâkamâ diska atraðanâs vietu.
+
+; *** Installation phase messages
+SetupAborted=Uzstâdîðana netika pabeigta.%n%nLûdzu, izlabojiet kïûdu un palaidiet Uzstâdîðanu no jauna.
+EntryAbortRetryIgnore=Spiediet "Atkârtot", lai mçìinâtu vçlreiz, vai "Ignorçt", lai turpinâtu, vai "Pârtraukt", lai beigtu instalâciju.
+
+; *** Installation status messages
+StatusCreateDirs=Mapju izveidoðana...
+StatusExtractFiles=Datòu kopçðana...
+StatusCreateIcons=Îsinâjumikonu izveidoðana...
+StatusCreateIniEntries=Izveido INI ierakstu...
+StatusCreateRegistryEntries=Izveido reìistra ierakstus...
+StatusRegisterFiles=Reìistrç datnes...
+StatusSavingUninstall=Saglabâ atinstalçðanas datus...
+StatusRunProgram=Pabeidz instalâciju...
+StatusRollback=Izveido izmaiòas...
+
+; *** Misc. errors
+ErrorInternal2=Iekðçja kïûda: %1
+ErrorFunctionFailedNoCode=%1 cieta neveiksmi
+ErrorFunctionFailed=%1 cieta neveiksmi; kods %2
+ErrorFunctionFailedWithMessage=%1 cieta neveiksmi; kods %2.%n%3
+ErrorExecutingProgram=Neiespçjami palaist failu:%n%1
+
+; *** Registry errors
+ErrorRegOpenKey=Kïûda, atverot reìistra atslçgu:%n%1\%2
+ErrorRegCreateKey=Kïûda, izveidojot reìistra atslçgu:%n%1\%2
+ErrorRegWriteKey=Kïûda, rakstot reìistra atslçgu:%n%1\%2
+
+; *** INI errors
+ErrorIniEntry=Kïûda, izveidojot INI ieraksta datni "%1".
+
+; *** File copying errors
+FileAbortRetryIgnore=Spiediet "Atkârtot", lai mçìinâtu vçlreiz, "Ignorçt", lai izlaistu datni (nav ieteicams), vai "Pârtraukt", lai beigtu instalâciju.
+FileAbortRetryIgnore2=Spiediet "Atkârtot", lai mçìinâtu vçlreiz, "Ignorçt", lai turpinâtu (nav ieteicams), vai "Pârtraukt", lai beigtu instalâciju.
+SourceIsCorrupted=Datnes avots ir bojâts
+SourceDoesntExist=Datnes avots "%1" nepastâv
+ExistingFileReadOnly=Pastâvoðâ datne ir izveidota kâ read-only.%n%nSpiediet "Atkârtot", lai noòemtu read-only îpaðîbu un mçìinâtu vçlreiz, "Ignorçt", lai izlaistu datni, vai "Pârtraukt", lai beigtu instalâciju.
+ErrorReadingExistingDest=Kïûda, nolasot pastâvoðo datni:
+FileExists=Datne jau pastâv.%n%nVai vçlaties, lai Uzstâdîðana to pârraksta?
+ExistingFileNewer=Pastâvoðâ datne ir jaunâka par to, kuru nepiecieðams uzstâdît. Vçlams atstât jau pastâvoðo datni.%n%nVai vçlaties to paturçt?
+ErrorChangingAttr=Radusies kïûda, mçìinot nomainît datnes îpaðîbu:
+ErrorCreatingTemp=Radusies kïûda, izveidojot datni galamçría mapç:
+ErrorReadingSource=Radusies kïûda, nolasot datni:
+ErrorCopying=Radusies kïûda, pârkopçjot datni:
+ErrorReplacingExistingFile=Radusies kïûda, pârrakstot jau pastâvoðo datni:
+ErrorRestartReplace=Atkârtota aizstâðana cietusi neveiksmi:
+ErrorRenamingTemp=Radusies kïûda, nomainot nosaukumu datnei galamçría mapç:
+ErrorRegisterServer=Neiespçjami reìistrçt DLL/OCX: %1
+ErrorRegisterServerMissingExport=DllReìistra servera eksports nav atrodams
+ErrorRegisterTypeLib=Neiespçjami reìistrçt tipa bibliotçku: %1
+
+; *** Post-installation errors
+ErrorOpeningReadme=Radusies kïûda, atverot README datni.
+ErrorRestartingComputer=Uzstâdîðana nevar pârstartçt datoru. Lûdzu, izdariet to manuâli.
+
+; *** Uninstaller messages
+UninstallNotFound=Datne "%1" nepastâv. Nevar atinstalçt.
+UninstallOpenError=Datni "%1" nevar atvçrt. Nevar atinstalçt
+UninstallUnsupportedVer=Atinstalçðanas datne "%1" nav atpazîstama ðai atinstalçðanas programmai. Nevar atinstalçt
+UninstallUnknownEntry=Nezinâms ieraksts (%1) izveidoja sadursmi ar atinstalâciju
+ConfirmUninstall=Vai esat pârliecinâts, ka vçlaties pilnîbâ noòemt %1 un visus tâ komponentus?
+UninstallOnlyOnWin64=Ðo instalâciju var noòemt tikai ar 64-bitu Windows.
+OnlyAdminCanUninstall=Atinstalâciju var veikt tikai lietotâjs ar Adminstratora privilçìijâm.
+UninstallStatusLabel=Lûdzu uzgaidiet, kamçr %1 tiek noòemts no Jûsu datora.
+UninstalledAll=%1 tika veiksmîgi noòemts no Jûsu datora.
+UninstalledMost=%1 atinstalâcija pabeigta.%n%nDaþus elementus nevarçja noòemt. Tos var noòemt manuâli.
+UninstalledAndNeedsRestart=Lai pabeigtu atinstalâciju %1, Jûsu dators jâpârstartç.%n%nVai vçlaties to darît tagad?
+UninstallDataCorrupted="%1" datne ir bojâta. Nevar atinstalçt
+
+; *** Uninstallation phase messages
+ConfirmDeleteSharedFileTitle=Noòemt kopîgâs datnes?
+ConfirmDeleteSharedFile2=Sistçma ir secinâjusi, ka ðîs koplietoðanas datnes vairs netiks lietotas. Vai vçlaties tâs noòemt?%n%nJa kâda cita programma izmanto ðîs datnes, tad ðî programma var strâdât nekorekti. Ja neesat droðs, izvçlieties "Nç". Atstâjot ðîs datnes, Jûsu datoram netiks nodarîti nekâdi bojâjumi.
+SharedFileNameLabel=Faila nosaukums:
+SharedFileLocationLabel=Atraðanâs vieta:
+WizardUninstalling=Atinstalçðanas Statuss
+StatusUninstalling=Atinstalç %1...
+
+; The custom messages below aren't used by Setup itself, but if you make
+; use of them in your scripts, you'll want to translate them.
+
+[CustomMessages]
+
+NameAndVersion=%1 versija %2
+AdditionalIcons=Papildu ikonas:
+CreateDesktopIcon=Izveidot &darbvisrmas ikonu
+CreateQuickLaunchIcon=Izveidot &Quick Launch ikonu
+ProgramOnTheWeb=%1 Internçtâ
+UninstallProgram=Atinstalçt %1
+LaunchProgram=Palaist %1
+AssocFileExtension=&Apvienot %1 ar %2 faila paplaðinâjumu
+AssocingFileExtension=Apvienoðana %1 ar %2 faila paplaðinâjumu...
diff --git a/Makefile.am b/Makefile.am
index c934cba..c6573ac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,9 +12,10 @@ EXTRA_DIST = \
libofx-0.8.3-patch.diff \
opensp-1.5.2-patch.diff \
pi.sh \
+ ChineseSimp-12-5.1.11.isl \
Greek-4-5.1.11.isl \
Japanese-5-5.1.11.isl \
- ChineseSimp-12-5.1.11.isl \
+ Latvian-1-5.1.11.isl \
reset.sh
if OS_WIN32
@@ -22,9 +23,10 @@ if OS_WIN32
redirect_SOURCES = redirect.c
redirect_LDADD = $(GLIB_LIBS)
AM_CPPFLAGS = $(GLIB_CFLAGS)
- pkgdata_DATA = Greek-4-5.1.11.isl
+ pkgdata_DATA = ChineseSimp-12-5.1.11.isl
+ pkgdata_DATA += Greek-4-5.1.11.isl
pkgdata_DATA += Japanese-5-5.1.11.isl
- pkgdata_DATA += ChineseSimp-12-5.1.11.isl
+ pkgdata_DATA += Latvian-1-5.1.11.isl
else
EXTRA_DIST += redirect.c
endif
diff --git a/gnucash.iss.in b/gnucash.iss.in
index 348503e..6e19713 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -266,6 +266,7 @@ Name: "el"; MessagesFile: "@prefix@\share\@PACKAGE@\Greek-4-5.1.11.isl"
Name: "fr"; MessagesFile: "compiler:Languages\French.isl"; InfoAfterFile: "@prefix@\share\@PACKAGE@\doc\README-fr.win32-bin.txt"
Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"; InfoAfterFile: "@prefix@\share\@PACKAGE@\doc\README-it.win32-bin.txt"
Name: "ja"; MessagesFile: "@prefix@\share\@PACKAGE@\Japanese-5-5.1.11.isl"
+Name: "lv"; MessagesFile: "@prefix@\share\@PACKAGE@\Latvian-1-5.1.11.isl"; InfoAfterFile: "@prefix@\share\@PACKAGE@\doc\README-lv.win32-bin.txt"
Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"; InfoAfterFile: "@prefix@\share\@PACKAGE@\doc\README-nl.win32-bin.txt"
Name: "pt_BR"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
Name: "zh_CN"; MessagesFile: "@prefix@\share\@PACKAGE@\ChineseSimp-12-5.1.11.isl"; InfoAfterFile: "@prefix@\share\@PACKAGE@\doc\README-zh_CN.win32-bin.txt"
@@ -424,6 +425,33 @@ it.IconName_Uninstall=Disinstalla GnuCash
it.IconComment_Uninstall=Disinstalla il programma di gestione delle finanze GnuCash
+;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Latvian translation
+
+lv_LV.FullInstall=Pilna uzstÄdÄ«Å¡ana
+lv_LV.CustomInstall=IzvÄ“les uzstÄdÄ«Å¡ana
+lv_LV.CreateDesktopIcon=Izveidot &darbvirsmas ikonu
+lv_LV.CreateMenuLink=Izveidot starta izvēlnes saiti
+lv_LV.RunPrg=Palaist GnuCash tagad
+lv_LV.AdditionalIcons=Izveidot sekojošas ikonas:
+lv_LV.StatusMsgFirewall=UzstÄda Windows ugunssienas likumus...
+
+lv_LV.MainFiles=GnuCash Programma
+lv_LV.TranslFiles=Tulkojumu faili
+lv_LV.TemplFiles=Kontu sagatavju faili
+
+lv_LV.IconComment_GnuCash=GnuCash grÄmatvedÄ«bas programma
+lv_LV.IconName_README=ParÄdÄ«t README
+lv_LV.IconComment_README=ParÄda README failu
+lv_LV.IconFilename_README=README-lv_LV.win32-bin.txt
+lv_LV.IconName_FAQ=BUJ (tiešsaistē)
+lv_LV.IconName_Bugzilla=Ziņot par kļūdu (tiešsaistē)
+lv_LV.IconName_InstallFQ=UzstÄdÄ«t tieÅ¡saistes kursu iegÅ«Å¡anu
+lv_LV.IconComment_InstallFQ=UzstÄdÄ«t nepiecieÅ¡amos Perl moduļus valÅ«tas kursu iegÅ«Å¡anai. NepiecieÅ¡ams ActivePerl 5.8 vai 5.10
+lv_LV.IconName_Uninstall=Noņemt GnuCash
+lv_LV.IconComment_Uninstall=Noņemt GnuCash grÄmatvedÄ«bas programmu
+
+
;; ;;;;;;;;;;;;;;;;;
;; Dutch translation
@@ -503,4 +531,3 @@ zh_CN.IconComment_InstallFQ=å®‰è£…åœ¨çº¿ä»·æ ¼æ£€ç´¢æ‰€å¿…éœ€çš„ Perl Finance-Qu
zh_CN.IconName_Uninstall=å¸è½½ GnuCash
zh_CN.IconComment_Uninstall=å¸è½½è´¢åŠ¡ç®¡ç†è½¯ä»¶ GnuCash
-;; ;;;;;;;;;;;;;;;;;;;;
commit dd563e001e8718c274aa7dc889c1745ab3e6db54
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed Jun 16 16:18:33 2010 +0000
Bug #619709 - Upgrade Inno Setup to 5.3.x to use utf-8 in .iss script, patch by Tao Wang
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19267 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index a6c38e1..a32b5f5 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -283,7 +283,7 @@ set_default GOFFICE_DIR $GLOBAL_DIR\\goffice
set_default GLADE_URL "$GNOME_MIRROR/sources/glade3/3.0/glade3-3.1.2.tar.bz2"
set_default GLADE_DIR $GLOBAL_DIR\\glade
-set_default INNO_URL "http://files.jrsoftware.org/is/5/isetup-5.1.12.exe"
+set_default INNO_URL "http://files.jrsoftware.org/is/5/isetup-5.3.9-unicode.exe"
set_default INNO_DIR $GLOBAL_DIR\\inno
set_default HH_URL "http://download.microsoft.com/download/OfficeXPProf/Install/4.71.1015.0/W98NT42KMe/EN-US/HTMLHELP.EXE"
diff --git a/gnucash.iss.in b/gnucash.iss.in
index ccaa950..348503e 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -1,4 +1,4 @@
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Input configuration for the Inno Setup Compiler
; Copyright (c) 2004-2005 Christian Stimming <stimming at tuhh.de>
;
@@ -322,68 +322,68 @@ zh_CN.LanguageCodePage=936
de.FullInstall=Komplett-Installation
de.CustomInstall=Benutzerdefiniert
de.CreateDesktopIcon=Ein Icon auf dem Desktop erstellen
-de.CreateMenuLink=Eine Verkn�pfung im Startmen� erstellen
+de.CreateMenuLink=Eine Verknüpfung im Startmenü erstellen
de.RunPrg=GnuCash jetzt starten
de.AdditionalIcons=Folgende Icons erstellen:
-de.StatusMsgFirewall=Ausnahmen f�r Windows-Firewall installieren...
+de.StatusMsgFirewall=Ausnahmen für Windows-Firewall installieren...
de.MainFiles=GnuCash Hauptprogramm
-de.TranslFiles=Deutsche �bersetzung
+de.TranslFiles=Deutsche Ãœbersetzung
de.TemplFiles=Beispiel-Kontenrahmen
de.IconComment_GnuCash=GnuCash OpenSource-Finanzverwaltung
de.IconName_README=README anzeigen
de.IconComment_README=Die Informationsdatei (README) anzeigen
de.IconFilename_README=README-de.win32-bin.txt
-de.IconName_FAQ=H�ufige Fragen (online, engl.)
+de.IconName_FAQ=Häufige Fragen (online, engl.)
de.IconName_Bugzilla=Fehlerbericht einsenden (online, engl.)
de.IconName_InstallFQ=Online Kursabruf installieren
-de.IconComment_InstallFQ=Das zus�tzliche Modul Finance-Quote installieren, um online Aktien- und Devisenkurse abrufen zu k�nnen. Dazu ist das Programm ActivePerl 5.8 oder 5.10 erforderlich.
+de.IconComment_InstallFQ=Das zusätzliche Modul Finance-Quote installieren, um online Aktien- und Devisenkurse abrufen zu können. Dazu ist das Programm ActivePerl 5.8 oder 5.10 erforderlich.
de.IconName_Uninstall=Deinstallieren von GnuCash
-de.IconComment_Uninstall=Die OpenSource-Finanzverwaltung GnuCash wieder deinstallieren und vom Computer l�schen
+de.IconComment_Uninstall=Die OpenSource-Finanzverwaltung GnuCash wieder deinstallieren und vom Computer löschen
;; ;;;;;;;;;;;;;;;;;;;
;; Greek translation
-el.FullInstall=������ �����������
-el.CustomInstall=������������� �����������
-el.CreateDesktopIcon=���������� ���������� ���� ��������� ��������
-el.CreateMenuLink=�������� ��� ����� ������
-el.RunPrg=�������� ��� GnuCash ����
-el.AdditionalIcons=���������� ����������:
-el.StatusMsgFirewall=����������� ������� ��� �� ������ ���������� ��� Windows...
-
-el.MainFiles=��������� GnuCash
-el.TranslFiles=������ �����������
-el.TemplFiles=������ �� ������� �����������
-
-el.IconComment_GnuCash=GnuCash ��������� ����. �����������
-el.IconName_README=�������� ��� README
-el.IconComment_README=�������� ��� ������� README
+el.FullInstall=ΠλήÏης εγκατάσταση
+el.CustomInstall=Î ÏοσαÏμοσμÎνη εγκατάσταση
+el.CreateDesktopIcon=ΔημιουÏγία εικονιδίου στην επιφάνεια εÏγασίας
+el.CreateMenuLink=Î Ïοσθήκη στο Î¼ÎµÎ½Î¿Ï ÎˆÎ½Î±Ïξη
+el.RunPrg=ΕκτÎλεση του GnuCash Ï„ÏŽÏα
+el.AdditionalIcons=ΔημιουÏγία εικονιδίων:
+el.StatusMsgFirewall=Εγκατάσταση κανόνων για το τοίχος Ï€Ïοστασίας των Windows...
+
+el.MainFiles=Î ÏόγÏαμμα GnuCash
+el.TranslFiles=ΑÏχεία μετάφÏασεων
+el.TemplFiles=ΑÏχεία με Ï€Ïότυπα λογαÏιασμών
+
+el.IconComment_GnuCash=GnuCash Ï€ÏόγÏαμμα διαχ. οικονομικών
+el.IconName_README=Εμφάνιση του README
+el.IconComment_README=Εμφάνιση του αÏχείου README
el.IconFilename_README=README.win32-bin.txt
-el.IconName_FAQ=������ ��������� (Online)
-el.IconName_Bugzilla=������� ��������� (Online)
-el.IconName_InstallFQ=����������� ����� ����� (online)
-el.IconComment_InstallFQ=����������� ��� perl module Finance-Quote ��� ���� ����� online. ������� ActivePerl 5.8/5.10
-el.IconName_Uninstall=������������� GnuCash
-el.IconComment_Uninstall=������������� ��� ����������� ����������� GnuCash
+el.IconName_FAQ=ΣυχνÎÏ‚ εÏωτήσεις (Online)
+el.IconName_Bugzilla=ΑναφοÏά σφάλματος (Online)
+el.IconName_InstallFQ=Εγκατάσταση λήψης τιμών (online)
+el.IconComment_InstallFQ=Εγκατάσταση του perl module Finance-Quote για λήψη τιμών online. Απαιτεί ActivePerl 5.8/5.10
+el.IconName_Uninstall=Απεγκατάσταση GnuCash
+el.IconComment_Uninstall=Απεγκατάσταση του διαχειÏιστή οικονομικών GnuCash
;; ;;;;;;;;;;;;;;;;;;;;
;; French translation
-fr.FullInstall=Installation compl�te
-fr.CustomInstall=Installation personnalis�e
-fr.CreateDesktopIcon=Cr�er un ic�ne sur le bureau
-fr.CreateMenuLink=Cr�er un lien dans le menu de d�marrage
-fr.RunPrg=D�marrer GnuCash maintenant
-fr.AdditionalIcons=Cr�er les ic�nes suivants:
-fr.StatusMsgFirewall=Installation des r�gles de pare-feu de Windows
+fr.FullInstall=Installation complète
+fr.CustomInstall=Installation personnalisée
+fr.CreateDesktopIcon=Créer un icône sur le bureau
+fr.CreateMenuLink=Créer un lien dans le menu de démarrage
+fr.RunPrg=Démarrer GnuCash maintenant
+fr.AdditionalIcons=Créer les icônes suivants:
+fr.StatusMsgFirewall=Installation des règles de pare-feu de Windows
fr.MainFiles=Programme GnuCash
-fr.TranslFiles=Traduction fran�aise
-fr.TemplFiles=Mod�le de plan comptable
+fr.TranslFiles=Traduction française
+fr.TemplFiles=Modèle de plan comptable
fr.IconComment_GnuCash=GnuCash, le gestionnaire financier OpenSource
fr.IconName_README=Afficher le LISEZMOI
@@ -392,9 +392,9 @@ fr.IconFilename_README=README-fr.win32-bin.txt
fr.IconName_FAQ=FAQ (En ligne, en anglais)
fr.IconName_Bugzilla=Envoyer un rapport d'erreur (En ligne, en anglais)
fr.IconName_InstallFQ=Installer les quotations en ligne
-fr.IconComment_InstallFQ=Installation du module Finance-Quote requis pour le t�l�chargement du cours des devises et actions. Le programme ActivePerl 5.8 ou 5.10 est aussi requis
-fr.IconName_Uninstall=D�-installer GnuCash
-fr.IconComment_Uninstall=D�sinstalle le gestionnaire financier GnuCash
+fr.IconComment_InstallFQ=Installation du module Finance-Quote requis pour le téléchargement du cours des devises et actions. Le programme ActivePerl 5.8 ou 5.10 est aussi requis
+fr.IconName_Uninstall=Dé-installer GnuCash
+fr.IconComment_Uninstall=Désinstalle le gestionnaire financier GnuCash
;; ;;;;;;;;;;;;;;;;;;;;;
@@ -454,53 +454,53 @@ nl.IconComment_Uninstall=Het financieel beheersprogramma GnuCash verwijderen
;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Brazilian Portuguese translation
-pt_BR.FullInstall=Instala��o Completa
-pt_BR.CustomInstall=Instala��o Personalizada
-pt_BR.CreateDesktopIcon=Criar um �cone na �rea de Trabalho
+pt_BR.FullInstall=Instalação Completa
+pt_BR.CustomInstall=Instalação Personalizada
+pt_BR.CreateDesktopIcon=Criar um Ãcone na Ãrea de Trabalho
pt_BR.CreateMenuLink=Criar um link no menu Iniciar
pt_BR.RunPrg=Executar o GnuCash agora
-pt_BR.AdditionalIcons=Criar estes �cones:
+pt_BR.AdditionalIcons=Criar estes Ãcones:
pt_BR.StatusMsgFirewall=Instalando as regras de firewall do Windows...
pt_BR.MainFiles=Programa GnuCash
-pt_BR.TranslFiles=Tradu��o
+pt_BR.TranslFiles=Tradução
pt_BR.TemplFiles=Modelos de Conta
pt_BR.IconComment_GnuCash=Gerenciador Financeiro Livre GnuCash
pt_BR.IconName_README=Mostrar LEIA-ME (README)
pt_BR.IconComment_README=Mostra o arquivo LEIA-ME (README)
pt_BR.IconFilename_README=LEIA-ME.win32-bin.txt
-pt_BR.IconName_FAQ=Perguntas Freq�entes (online, ingl�s)
-pt_BR.IconName_Bugzilla=Relatar um erro (online, ingl�s)
-pt_BR.IconName_InstallFQ=Instalar a Consulta de Pre�os Online
-pt_BR.IconComment_InstallFQ=Instala o m�dulo perl Finance-Quote, necess�rio para a busca de pre�os online. Requer ActivePerl 5.8/5.10.
+pt_BR.IconName_FAQ=Perguntas Freqüentes (online, inglês)
+pt_BR.IconName_Bugzilla=Relatar um erro (online, inglês)
+pt_BR.IconName_InstallFQ=Instalar a Consulta de Preços Online
+pt_BR.IconComment_InstallFQ=Instala o módulo perl Finance-Quote, necessário para a busca de preços online. Requer ActivePerl 5.8/5.10.
pt_BR.IconName_Uninstall=Desinstalar o GnuCash
pt_BR.IconComment_Uninstall=Desinstala o Gerenciador Financeiro GnuCash
;; ;;;;;;;;;;;;;;;;;
;; Simplified Chinese translation
-zh_CN.FullInstall=ÍêÈ«°²×°
-zh_CN.CustomInstall=×Ô¶¨Òå°²×°
-zh_CN.CreateDesktopIcon=´´½¨×ÀÃæͼ±ê
-zh_CN.CreateMenuLink=´´½¨¿ªÊ¼²Ëµ¥Á´½Ó
-zh_CN.RunPrg=ÏÖÔÚ¿ªÊ¼ÔËÐÐ GnuCash
-zh_CN.AdditionalIcons=´´½¨ÕâЩͼ±ê
-zh_CN.StatusMsgFirewall=ÕýÔÚ°²×° Windows ·À»ðǽ¹æÔò...
-
-zh_CN.MainFiles=GnuCash ³ÌÐò
-zh_CN.TranslFiles=·ÒëÎļþ
-zh_CN.TemplFiles=»á¼Æ¿ÆÄ¿Ä£°åÎļþ
-
-zh_CN.IconComment_GnuCash=GnuCash Ãâ·Ñ²ÆÎñ¹ÜÀí
-zh_CN.IconName_README=ÏÔʾ×ÔÊöÎļþ
-zh_CN.IconComment_README=ÏÔʾ×ÔÊöÎļþ
+zh_CN.FullInstall=完全安装
+zh_CN.CustomInstall=自定义安装
+zh_CN.CreateDesktopIcon=创建桌é¢å›¾æ ‡
+zh_CN.CreateMenuLink=创建开始èœå•é“¾æŽ¥
+zh_CN.RunPrg=现在开始è¿è¡Œ GnuCash
+zh_CN.AdditionalIcons=åˆ›å»ºè¿™äº›å›¾æ ‡
+zh_CN.StatusMsgFirewall=æ£åœ¨å®‰è£… Windows 防ç«å¢™è§„则...
+
+zh_CN.MainFiles=GnuCash 程åº
+zh_CN.TranslFiles=翻译文件
+zh_CN.TemplFiles=会计科目模æ¿æ–‡ä»¶
+
+zh_CN.IconComment_GnuCash=GnuCash å…费财务管ç†
+zh_CN.IconName_README=显示自述文件
+zh_CN.IconComment_README=显示自述文件
zh_CN.IconFilename_README=README-zh_CN.win32-bin.txt
-zh_CN.IconName_FAQ=³£¼ûÎÊÌâ (ÔÚÏß)
-zh_CN.IconName_Bugzilla=±¨¸æÈí¼þ Bug (ÔÚÏß)
-zh_CN.IconName_InstallFQ=°²×°ÔÚÏß¼Û¸ñ¼ìË÷¹¦ÄÜ
-zh_CN.IconComment_InstallFQ=°²×°ÔÚÏß¼Û¸ñ¼ìË÷Ëù±ØÐèµÄ Perl Finance-QuoteÄ£¿é¡£ÐèÒª ActivePerl 5.8 »ò 5.10
-zh_CN.IconName_Uninstall=жÔØ GnuCash
-zh_CN.IconComment_Uninstall=жÔزÆÎñ¹ÜÀíÈí¼þ GnuCash
+zh_CN.IconName_FAQ=常è§é—®é¢˜ (在线)
+zh_CN.IconName_Bugzilla=报告软件 Bug (在线)
+zh_CN.IconName_InstallFQ=å®‰è£…åœ¨çº¿ä»·æ ¼æ£€ç´¢åŠŸèƒ½
+zh_CN.IconComment_InstallFQ=å®‰è£…åœ¨çº¿ä»·æ ¼æ£€ç´¢æ‰€å¿…éœ€çš„ Perl Finance-Quote模å—ã€‚éœ€è¦ ActivePerl 5.8 或 5.10
+zh_CN.IconName_Uninstall=å¸è½½ GnuCash
+zh_CN.IconComment_Uninstall=å¸è½½è´¢åŠ¡ç®¡ç†è½¯ä»¶ GnuCash
;; ;;;;;;;;;;;;;;;;;;;;
commit 9c3ffaa9a2489088b2a90ab4229e9363457eff12
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed Jun 16 16:02:29 2010 +0000
Check properly for svn availability
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19266 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
index 8e8fe48..e530524 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -388,7 +388,7 @@ function inst_svn() {
setup Subversion
_SVN_UDIR=`unix_path $SVN_DIR`
add_to_env $_SVN_UDIR/bin PATH
- if quiet $_SVN_UDIR/svn --version
+ if quiet $_SVN_UDIR/bin/svn --version
then
echo "subversion already installed. skipping."
else
@@ -398,7 +398,7 @@ function inst_svn() {
mkdir -p $SVN_DIR
cp -a $TMP_UDIR/svn-win32-*/* $SVN_DIR
rm -rf $TMP_UDIR/svn-win32-*
- quiet $_SVN_UDIR/svn --version || die "svn not installed correctly"
+ quiet $_SVN_UDIR/bin/svn --version || die "svn not installed correctly"
fi
}
commit 0c3e1b2ec8cf7a47ff669ddd0fe9d2af9306eaeb
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed Jun 16 13:21:44 2010 +0000
Bug #621602 - Upgrade svn on Windows building environment to 1.6.x, patch by Tao Wang.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19265 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 0eb2268..a6c38e1 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -304,7 +304,7 @@ set_default ICU4C_SRC_URL "http://download.icu-project.org/files/icu4c/4.4.1/icu
set_default ICU4C_DIR $GLOBAL_DIR\\icu-mingw32
set_default ICU4C_PATCH `pwd`/icu-crossmingw.patch
-set_default SVN_URL "http://subversion.tigris.org/files/documents/15/35379/svn-1.4.2-setup.exe"
+set_default SVN_URL "http://subversion.tigris.org/files/documents/15/46880/svn-win32-1.6.6.zip"
set_default SVN_DIR $GLOBAL_DIR\\svn
# OFX import in gnucash and ofx directconnect support for aqbanking
diff --git a/install-impl.sh b/install-impl.sh
index 4ed810a..8e8fe48 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -388,13 +388,17 @@ function inst_svn() {
setup Subversion
_SVN_UDIR=`unix_path $SVN_DIR`
add_to_env $_SVN_UDIR/bin PATH
- if quiet svn --version
+ if quiet $_SVN_UDIR/svn --version
then
echo "subversion already installed. skipping."
else
- smart_wget $SVN_URL $DOWNLOAD_DIR
- $LAST_FILE //SP- //SILENT //DIR="$SVN_DIR"
- quiet svn --version || die "svn not installed correctly"
+ wget_unpacked $SVN_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/svn-win32-*
+ rm -rf $SVN_DIR
+ mkdir -p $SVN_DIR
+ cp -a $TMP_UDIR/svn-win32-*/* $SVN_DIR
+ rm -rf $TMP_UDIR/svn-win32-*
+ quiet $_SVN_UDIR/svn --version || die "svn not installed correctly"
fi
}
commit f1c1edb8a6670fdfb076e943145061eda542011d
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed Jun 16 12:45:34 2010 +0000
Finish direct binary execution on Windows and linux and cleanup bin Makefile/targets
- Windows
* binary name becomes GnuCash.exe
* gnucash.cmd is renamed to gnucash-launcer.cmd (consistent with OS X). This file is only needed to run GnuCash straight from the source installation. It is not used (or distributed) with the Windows Installer version.
* gnucash-valgrind, gnucash-gdb and the override extra's have been removed as they are meant for a UNIX like environment
- Linux/others
* binary name becomes gnucash
* the gnucash launch script has been removed together with gnucash-gdb. They no longer add value on linux.
* gnucash-valgrind has been retained because it contains useful presets
- OS X (Quartz)
* binary name remains gnucash-bin for now (requires synchronous changes in the externally hosted OS X build system)
* gnucash launcher script has been renamed to gnucash-launcher. This file is only needed to run GnuCash straight from the source installation. It is not used (or distributed) in the OS X bundle version.
* gnucash-gdb and gnucash-valgrind remain and can be used for debugging the source installation.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19263 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/dist-impl.sh b/dist-impl.sh
index 7f0f8e9..13e0f02 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -223,7 +223,6 @@ function dist_gnucash() {
cp -a $_INSTALL_UDIR/etc/gconf/schemas/* $DIST_UDIR/etc/gconf/schemas
mkdir -p $DIST_UDIR/lib
cp -a $_INSTALL_UDIR/lib/lib*.la $DIST_UDIR/lib
- cp -a $_INSTALL_UDIR/libexec $DIST_UDIR
mkdir -p $DIST_UDIR/share
cp -a $_INSTALL_UDIR/share/{gnucash,locale} $DIST_UDIR/share
cp -a $_REPOS_UDIR/packaging/win32/install-fq-mods.cmd $DIST_UDIR/bin
diff --git a/gnucash.iss.in b/gnucash.iss.in
index fd5ffc5..ccaa950 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -41,25 +41,25 @@ Name: desktopicon; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm
Name: menuicon; Description: "{cm:CreateMenuLink}"; GroupDescription: "{cm:AdditionalIcons}"
[Icons]
-Name: "{group}\GnuCash"; Filename: "{app}\bin\gnucash-bin.exe"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: menuicon; Flags: runminimized
+Name: "{group}\GnuCash"; Filename: "{app}\bin\GnuCash.exe"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: menuicon
Name: "{group}\{cm:IconName_README}"; Filename: "{app}\doc\gnucash\{cm:IconFilename_README}"; Comment: "{cm:IconComment_README}"; Tasks: menuicon
Name: "{group}\{cm:IconName_FAQ}"; Filename: "http://wiki.gnucash.org/wiki/FAQ"; Tasks: menuicon
Name: "{group}\{cm:IconName_Bugzilla}"; Filename: "http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash"; Tasks: menuicon
Name: "{group}\{cm:IconName_InstallFQ}"; Filename: "{app}\bin\install-fq-mods.cmd"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_InstallFQ}"; Tasks: menuicon
Name: "{group}\{cm:IconName_Uninstall}"; Filename: "{uninstallexe}"; Comment: "{cm:IconComment_Uninstall}"; Tasks: menuicon
-Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\gnucash-bin.exe"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: desktopicon; Flags: runminimized
+Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\GnuCash.exe"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: desktopicon
[Run]
-Filename: "{app}\bin\gnucash-bin.exe"; Description: "{cm:RunPrg}"; WorkingDir: "{app}\bin"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent runhidden
+Filename: "{app}\bin\GnuCash.exe"; Description: "{cm:RunPrg}"; WorkingDir: "{app}\bin"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent
Filename: "{app}\bin\guile.cmd"; Parameters: "-c ""(use-modules (ice-9 slib)) (require 'printf)"""; Flags: runhidden
;; The Windows firewall exceptions, see http://www.vincenzo.net/isxkb/index.php?title=Adding_a_rule_to_the_Windows_firewall
-Filename: "{sys}\netsh.exe"; Parameters: "firewall add allowedprogram ""{app}\bin\gnucash-bin.exe"" ""GnuCash Free Finance Manager"" ENABLE ALL"; StatusMsg: "{cm:StatusMsgFirewall}"; Flags: runhidden; MinVersion: 0,5.01.2600sp2;
+Filename: "{sys}\netsh.exe"; Parameters: "firewall add allowedprogram ""{app}\bin\GnuCash.exe"" ""GnuCash Free Finance Manager"" ENABLE ALL"; StatusMsg: "{cm:StatusMsgFirewall}"; Flags: runhidden; MinVersion: 0,5.01.2600sp2;
Filename: "{sys}\netsh.exe"; Parameters: "firewall add allowedprogram ""{app}\bin\gconfd-2.exe"" ""GConf Settings Manager"" ENABLE ALL"; StatusMsg: "{cm:StatusMsgFirewall}"; Flags: runhidden; MinVersion: 0,5.01.2600sp2;
[UninstallRun]
Filename: "{app}\bin\gconftool-2.exe"; Parameters: "--shutdown"; Flags: runhidden
-Filename: "{sys}\netsh.exe"; Parameters: "firewall delete allowedprogram program=""{app}\bin\gnucash-bin.exe"""; Flags: runhidden; MinVersion: 0,5.01.2600sp2
+Filename: "{sys}\netsh.exe"; Parameters: "firewall delete allowedprogram program=""{app}\bin\GnuCash.exe"""; Flags: runhidden; MinVersion: 0,5.01.2600sp2
Filename: "{sys}\netsh.exe"; Parameters: "firewall delete allowedprogram program=""{app}\bin\gconfd-2.exe"""; Flags: runhidden; MinVersion: 0,5.01.2600sp2
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -68,11 +68,10 @@ Filename: "{sys}\netsh.exe"; Parameters: "firewall delete allowedprogram program
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
[Files]
; The main executables and DLLs
-Source: "@prefix@\..\dist\bin\*"; DestDir: "{app}\bin"; Flags: recursesubdirs ignoreversion; Components: main; AfterInstall: MyAfterInstallConfig()
-; Note: The above AfterInstall function will create the
-; gnucash.cmd file on-the-fly by the Pascal script below.
-
+Source: "@prefix@\..\dist\bin\*"; DestDir: "{app}\bin"; Flags: recursesubdirs ignoreversion; Components: main
Source: "@prefix@\..\dist\etc\*"; DestDir: "{app}\etc"; Flags: recursesubdirs; Components: main; AfterInstall: MyAfterInstallEtc()
+; Note: The above AfterInstall function will create 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
Source: "@prefix@\..\dist\share\*"; DestDir: "{app}\share"; Flags: recursesubdirs; Components: main
@@ -114,7 +113,7 @@ Root: HKCR; Subkey: ".gnucash"; ValueType: string; ValueName: ""; ValueData: "Gn
Root: HKCR; Subkey: ".gnucash"; ValueType: string; ValueName: "Content Type"; ValueData: "application/x-gnucash"; Flags: uninsdeletevalue
Root: HKCR; Subkey: "GnuCash.Financial.Data"; ValueType: string; ValueName: ""; ValueData: "GnuCash Financial Data"; Flags: uninsdeletevalue
Root: HKCR; Subkey: "GnuCash.Financial.Data\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\share\gnucash\pixmaps\gnucash-icon.ico,0"
-Root: HKCR; Subkey: "GnuCash.Financial.Data\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\bin\gnucash-bin.exe"" ""%1"""
+Root: HKCR; Subkey: "GnuCash.Financial.Data\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\bin\GnuCash.exe"" ""%1"""
Root: HKLM; Subkey: "Software\GnuCash"; ValueType: none; Flags: uninsdeletekeyifempty
Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: none; Flags: uninsdeletekeyifempty
@@ -152,7 +151,6 @@ Root: HKLM; Subkey: "Software\AqBanking\Paths"; ValueType: string; ValueName: "c
; Delete the created config script on uninstall
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
[UninstallDelete]
-Type: files; Name: "{app}\bin\gnucash.cmd"
Type: files; Name: "{app}\bin\guile.cmd"
Type: files; Name: "{app}\etc\gnucash\environment"
Type: files; Name: "{app}\share\guile\1.6\slibcat"
@@ -188,37 +186,16 @@ begin
{ Get the installation-specific paths }
appdir := ExpandConstant('{app}');
- libdir := appdir + '\lib';
- pkglibdir := libdir + '\gnucash';
pkgdatadir := appdir + '\share\gnucash';
- { Create the gnucash.cmd file; #10 is the linefeed character and #13 CR }
-
- { If you make any changes here, you should probably also change the equivalent sections }
- { in packaging/win32/install.sh, src/bin/environment*.in and src/bin/gnucash-setup-env-osx.in }
- FileName := appdir + '\bin\gnucash.cmd' ;
- FileString := 'setlocal'#13#10 ;
- FileString := FileString + 'chcp ' + ExpandConstant('{cm:LanguageCodePage}') + ''#13#10 ;
- FileString := FileString + 'set PATH=' + appdir + '\bin;' + libdir + ';' + libdir + '\gnucash;%PATH%'#13#10 ;
-
- FileString := FileString + 'set GUILE_WARN_DEPRECATED=no'#13#10 ;
- FileString := FileString + 'set GNC_MODULE_PATH=' + pkglibdir + ''#13#10 ;
- FileString := FileString + 'set GUILE_LOAD_PATH=' + pkgdatadir + '\guile-modules;' + pkgdatadir + '\scm;' + appdir + '\share\guile\1.6;%GUILE_LOAD_PATH%'#13#10 ;
- FileString := FileString + 'set LTDL_LIBRARY_PATH=' + libdir + ''#13#10 ;
- FileString := FileString + 'set QOF_LIB_DIR=' + pkglibdir + ''#13#10 ;
- FileString := FileString + 'set GNC_DBD_DIR=' + libdir + '\dbd'#13#10 ;
- FileString := FileString + 'set GNC_STANDARD_REPORTS_DIR=' + pkgdatadir + '\guile-modules\gnucash\report\standard-reports'#13#10 ;
- FileString := FileString + 'set SCHEME_LIBRARY_PATH='#13#10 ;
- FileString := FileString + 'start gnucash-bin %*'#13#10 ;
-
- { Save the final file }
- Res := SaveStringToFile(FileName, FileString, False);
- if Res = False then
- MsgBox('Error on saving '+FileName+' for completing the installation', mbInformation, MB_OK);
+ { Create the guile.cmd file; #10 is the linefeed character and #13 CR }
FileName := appdir + '\bin\guile.cmd' ;
FileString := 'set GUILE_LOAD_PATH=' + pkgdatadir + '\guile-modules;' + pkgdatadir + '\scm;' + appdir + '\share\guile\1.6;%GUILE_LOAD_PATH%'#13#10 ;
FileString := FileString + 'start guile.exe %*'#13#10 ;
+
+ { Save the final file }
+
Res := SaveStringToFile(FileName, FileString, False);
if Res = False then
MsgBox('Error on saving '+FileName+' for completing the installation', mbInformation, MB_OK);
diff --git a/install-impl.sh b/install-impl.sh
index c2fcca2..4ed810a 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1403,7 +1403,7 @@ function make_install() {
# the equivalent sections in packaging/win32/gnucash.iss.in, and
# src/bin/environment*.in
qpushd $_INSTALL_UDIR/bin
- cat > gnucash.cmd <<EOF
+ cat > gnucash-launcher.cmd <<EOF
@echo off
setlocal
set PATH=$INSTALL_DIR\\bin;%PATH%
@@ -1430,7 +1430,7 @@ set PATH=$PGSQL_DIR\\lib;%PATH%
set LTDL_LIBRARY_PATH=${INSTALL_DIR}\\lib
-start gnucash-bin %*
+start GnuCash %*
EOF
qpopd
fi
commit 5f3a703c0cfa16e663d373a18f5146ee6cdb1ad6
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed Jun 16 08:48:47 2010 +0000
Undo debug modification introduced in r19100. It bypassed the Abort and was never intended to be committed.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19262 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/functions.sh b/functions.sh
index 04cbca0..043bb19 100644
--- a/functions.sh
+++ b/functions.sh
@@ -121,7 +121,7 @@ function die() {
echo
[ "$*" ] && echo "!!! $* !!!"
echo "!!! ABORTING !!!"
-# exit -1
+ exit -1
}
# usage: register_env_var NAME SEPARATOR [DEFAULT]
commit 1606a181fe5fdfe7d7a6085f35a8e8292bcda659
Author: Christian Stimming <stimming at tuhh.de>
Date: Thu Jun 3 19:58:28 2010 +0000
Bug #617797: Set eol-style to CRLF for win32 files.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19223 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/ChineseSimp-12-5.1.11.isl b/ChineseSimp-12-5.1.11.isl
index 1468280..2ef69e2 100644
--- a/ChineseSimp-12-5.1.11.isl
+++ b/ChineseSimp-12-5.1.11.isl
@@ -14,7 +14,7 @@
[LangOptions]
; The following three entries are very important. Be sure to read and
; understand the '[LangOptions] section' topic in the help file.
-LanguageName=<4E2D><6587> (<7B80><4F53>)
+LanguageName=Chinese(Simplified)
LanguageID=$0804
LanguageCodePage=936
; If the language you are translating to requires special font faces or
diff --git a/Greek-4-5.1.11.isl b/Greek-4-5.1.11.isl
index ca9e927..d25b3fb 100644
--- a/Greek-4-5.1.11.isl
+++ b/Greek-4-5.1.11.isl
@@ -13,6 +13,7 @@
[LangOptions]
LanguageName=Greek
LanguageID=$408
+LanguageCodePage=1253
; If the language you are translating to requires special font faces or
; sizes, uncomment any of the following entries and change them accordingly.
;DialogFontName=MS Shell Dlg
diff --git a/gnucash.iss.in b/gnucash.iss.in
index cfafd8b..fd5ffc5 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -1,529 +1,529 @@
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Input configuration for the Inno Setup Compiler
-; Copyright (c) 2004-2005 Christian Stimming <stimming at tuhh.de>
-;
-; Inno Setup Compiler: See http://www.jrsoftware.org/isdl.php
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-[Setup]
-; Using the name here directly because we want it capitalized
-AppName=GnuCash
-AppVerName=GnuCash @VERSION@
-AppPublisher=GnuCash Development Team
-AppPublisherURL=http://www.gnucash.org
-AppSupportURL=http://www.gnucash.org
-AppUpdatesURL=http://www.gnucash.org
-VersionInfoVersion=@VERSION@
-DefaultDirName={pf}\@PACKAGE@
-DefaultGroupName=GnuCash
-LicenseFile=@prefix@\..\dist\share\@PACKAGE@\doc\COPYING
-Compression=lzma
-MinVersion=5.0,5.0
-PrivilegesRequired=poweruser
-OutputDir=.
-OutputBaseFilename=@PACKAGE at -@VERSION at -setup
-UninstallFilesDir={app}\uninstall\@PACKAGE@
-InfoAfterFile=@prefix@\..\dist\share\@PACKAGE@\doc\README.win32-bin.txt
-SetupIconFile=@prefix@\..\dist\share\@PACKAGE@\pixmaps\gnucash-icon.ico
-WizardSmallImageFile=@prefix@\..\dist\share\@PACKAGE@\pixmaps\gnucash-icon-48x48.bmp
-
-[Types]
-Name: "full"; Description: "{cm:FullInstall}"
-Name: "custom"; Description: "{cm:CustomInstall}"; Flags: iscustom
-
-[Components]
-Name: "main"; Description: "{cm:MainFiles}"; Types: full custom; Flags: fixed
-;Name: "translations"; Description: "{cm:TranslFiles}"; Types: full
-;Name: "templates"; Description: "{cm:TemplFiles}"; Types: full
-
-[Tasks]
-Name: desktopicon; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"
-Name: menuicon; Description: "{cm:CreateMenuLink}"; GroupDescription: "{cm:AdditionalIcons}"
-
-[Icons]
-Name: "{group}\GnuCash"; Filename: "{app}\bin\gnucash-bin.exe"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: menuicon; Flags: runminimized
-Name: "{group}\{cm:IconName_README}"; Filename: "{app}\doc\gnucash\{cm:IconFilename_README}"; Comment: "{cm:IconComment_README}"; Tasks: menuicon
-Name: "{group}\{cm:IconName_FAQ}"; Filename: "http://wiki.gnucash.org/wiki/FAQ"; Tasks: menuicon
-Name: "{group}\{cm:IconName_Bugzilla}"; Filename: "http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash"; Tasks: menuicon
-Name: "{group}\{cm:IconName_InstallFQ}"; Filename: "{app}\bin\install-fq-mods.cmd"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_InstallFQ}"; Tasks: menuicon
-Name: "{group}\{cm:IconName_Uninstall}"; Filename: "{uninstallexe}"; Comment: "{cm:IconComment_Uninstall}"; Tasks: menuicon
-
-Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\gnucash-bin.exe"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: desktopicon; Flags: runminimized
-
-[Run]
-Filename: "{app}\bin\gnucash-bin.exe"; Description: "{cm:RunPrg}"; WorkingDir: "{app}\bin"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent runhidden
-Filename: "{app}\bin\guile.cmd"; Parameters: "-c ""(use-modules (ice-9 slib)) (require 'printf)"""; Flags: runhidden
-;; The Windows firewall exceptions, see http://www.vincenzo.net/isxkb/index.php?title=Adding_a_rule_to_the_Windows_firewall
-Filename: "{sys}\netsh.exe"; Parameters: "firewall add allowedprogram ""{app}\bin\gnucash-bin.exe"" ""GnuCash Free Finance Manager"" ENABLE ALL"; StatusMsg: "{cm:StatusMsgFirewall}"; Flags: runhidden; MinVersion: 0,5.01.2600sp2;
-Filename: "{sys}\netsh.exe"; Parameters: "firewall add allowedprogram ""{app}\bin\gconfd-2.exe"" ""GConf Settings Manager"" ENABLE ALL"; StatusMsg: "{cm:StatusMsgFirewall}"; Flags: runhidden; MinVersion: 0,5.01.2600sp2;
-
-[UninstallRun]
-Filename: "{app}\bin\gconftool-2.exe"; Parameters: "--shutdown"; Flags: runhidden
-Filename: "{sys}\netsh.exe"; Parameters: "firewall delete allowedprogram program=""{app}\bin\gnucash-bin.exe"""; Flags: runhidden; MinVersion: 0,5.01.2600sp2
-Filename: "{sys}\netsh.exe"; Parameters: "firewall delete allowedprogram program=""{app}\bin\gconfd-2.exe"""; Flags: runhidden; MinVersion: 0,5.01.2600sp2
-
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Here we configure the included files and the place of their
-; installation
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-[Files]
-; The main executables and DLLs
-Source: "@prefix@\..\dist\bin\*"; DestDir: "{app}\bin"; Flags: recursesubdirs ignoreversion; Components: main; AfterInstall: MyAfterInstallConfig()
-; Note: The above AfterInstall function will create the
-; gnucash.cmd file on-the-fly by the Pascal script below.
-
-Source: "@prefix@\..\dist\etc\*"; DestDir: "{app}\etc"; Flags: recursesubdirs; Components: main; AfterInstall: MyAfterInstallEtc()
-Source: "@prefix@\..\dist\lib\*"; DestDir: "{app}\lib"; Flags: recursesubdirs; Components: main
-Source: "@prefix@\..\dist\libexec\*"; DestDir: "{app}\libexec"; Flags: recursesubdirs; Components: main
-Source: "@prefix@\..\dist\share\*"; DestDir: "{app}\share"; Flags: recursesubdirs; Components: main
-
-; Additionally, we ship the Qt DLLs because the Online-Banking-Wizard
-; lib/aqbanking/plugins/@-aqbanking_so_effective-@/wizards/qt3-wizard.exe needs them.
-Source: "@-qtbindir-@\QtCore4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-Source: "@-qtbindir-@\QtGui4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-Source: "@-qtbindir-@\mingwm10.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-; The following are all needed by Qt3Support
-Source: "@-qtbindir-@\Qt3Support4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-Source: "@-qtbindir-@\QtXml4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-Source: "@-qtbindir-@\QtSql4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-Source: "@-qtbindir-@\QtNetwork4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-
-;; The translations
-;Source: "@prefix@\..\dist\share\locale\*"; DestDir: "{app}\share\locale"; Flags: recursesubdirs; Components: translations
-;
-;; The account templates
-;Source: "@prefix@\..\dist\share\gnucash\accounts\*"; DestDir: "{app}\share\gnucash\accounts"; Flags: recursesubdirs; Components: templates
-
-; And all the documentation
-Source: "@prefix@\..\dist\share\@PACKAGE@\doc\README"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@prefix@\..\dist\share\@PACKAGE@\doc\README.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@prefix@\..\dist\share\@PACKAGE@\doc\README-de.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@prefix@\..\dist\share\@PACKAGE@\doc\README-fr.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@prefix@\..\dist\share\@PACKAGE@\doc\README-it.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@prefix@\..\dist\share\@PACKAGE@\doc\README-zh_CN.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@prefix@\..\dist\share\@PACKAGE@\doc\COPYING"; DestDir: "{app}\doc\@PACKAGE@"; Flags: ignoreversion; Components: main
-Source: "@prefix@\..\dist\share\@PACKAGE@\doc\AUTHORS"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@prefix@\..\dist\share\@PACKAGE@\doc\ChangeLog"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-
-
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Define the registry keys Setup should create (HKLM = HKEY_LOCAL_MACHINE)
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-[Registry]
-Root: HKCR; Subkey: ".gnucash"; ValueType: string; ValueName: ""; ValueData: "GnuCash.Financial.Data"; Flags: uninsdeletevalue
-Root: HKCR; Subkey: ".gnucash"; ValueType: string; ValueName: "Content Type"; ValueData: "application/x-gnucash"; Flags: uninsdeletevalue
-Root: HKCR; Subkey: "GnuCash.Financial.Data"; ValueType: string; ValueName: ""; ValueData: "GnuCash Financial Data"; Flags: uninsdeletevalue
-Root: HKCR; Subkey: "GnuCash.Financial.Data\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\share\gnucash\pixmaps\gnucash-icon.ico,0"
-Root: HKCR; Subkey: "GnuCash.Financial.Data\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\bin\gnucash-bin.exe"" ""%1"""
-
-Root: HKLM; Subkey: "Software\GnuCash"; ValueType: none; Flags: uninsdeletekeyifempty
-Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: none; Flags: uninsdeletekeyifempty
-Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "prefix"; ValueData: "{app}"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\GnuCash"; ValueType: string; ValueName: "InstallationDirectory"; ValueData: "{app}"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "libdir"; ValueData: "{app}\lib"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "pkglibdir"; ValueData: "{app}\lib\@PACKAGE@"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "sysconfdir"; ValueData: "{app}\etc"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "localedir"; ValueData: "{app}\share\locale"; Flags: uninsdeletevalue
-
-; Additionally, we have to install the paths for gwenhywfar
-Root: HKLM; Subkey: "Software\Gwenhywfar"; ValueType: none; Flags: uninsdeletekeyifempty
-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\@-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
-
-; And we also need some registry keys for aqbanking
-Root: HKLM; Subkey: "Software\Aqbanking"; ValueType: none; Flags: uninsdeletekeyifempty
-Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: none; Flags: uninsdeletekeyifempty
-Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "providerdir"; ValueData: "{app}\lib\aqbanking\plugins\@-aqbanking_so_effective-@\providers"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "bankinfodir"; ValueData: "{app}\lib\aqbanking\plugins\@-aqbanking_so_effective-@\bankinfo"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "importerdir"; ValueData: "{app}\lib\aqbanking\plugins\@-aqbanking_so_effective-@\imexporters"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "wizarddir"; ValueData: "{app}\lib\aqbanking\plugins\@-aqbanking_so_effective-@\wizards"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "pkgdatadir"; ValueData: "{app}\share\aqbanking"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "sysconfdir"; ValueData: "{app}\etc"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "localedir"; ValueData: "{app}\share\locale"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\AqBanking\Paths"; ValueType: string; ValueName: "xmldatadir"; ValueData: "{app}\share\aqhbci\xml"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\AqBanking\Paths"; ValueType: string; ValueName: "cfgmoduledir"; ValueData: "{app}\lib\aqbanking\plugins\@-aqbanking_so_effective-@\frontends\qbanking\cfgmodules"; Flags: uninsdeletevalue
-
-
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Delete the created config script on uninstall
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-[UninstallDelete]
-Type: files; Name: "{app}\bin\gnucash.cmd"
-Type: files; Name: "{app}\bin\guile.cmd"
-Type: files; Name: "{app}\etc\gnucash\environment"
-Type: files; Name: "{app}\share\guile\1.6\slibcat"
-Type: filesandordirs; Name: "{app}\share\guile"
-Type: filesandordirs; Name: "{app}\etc\gconf"
-Type: dirifempty; Name: "{app}\etc\gnucash"
-Type: dirifempty; Name: "{app}\etc"
-
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; This large section is a Pascal scripting program that will modify
-; the gnucash shell script so that it then includes the
-; correct values according to our local installation. See
-; http://www.remobjects.com/?ps for a syntax reference.
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-[Code]
-function MingwBacksl(const S: String): String;
-begin
- { Modify the path name S so that it can be used by MinGW }
- if Length(ExtractFileDrive(S)) = 0 then
- Result := S
- else begin
- Result := '/'+S;
- StringChange(Result, ':\', '\');
- end;
- StringChange(Result, '\', '/');
-end;
-
-procedure MyAfterInstallConfig();
-var
- FileName, FileString, appdir, libdir, pkglibdir, pkgdatadir: String;
- Res: Boolean;
-begin
-
- { Get the installation-specific paths }
- appdir := ExpandConstant('{app}');
- libdir := appdir + '\lib';
- pkglibdir := libdir + '\gnucash';
- pkgdatadir := appdir + '\share\gnucash';
-
- { Create the gnucash.cmd file; #10 is the linefeed character and #13 CR }
-
- { If you make any changes here, you should probably also change the equivalent sections }
- { in packaging/win32/install.sh, src/bin/environment*.in and src/bin/gnucash-setup-env-osx.in }
- FileName := appdir + '\bin\gnucash.cmd' ;
- FileString := 'setlocal'#13#10 ;
- FileString := FileString + 'chcp ' + ExpandConstant('{cm:LanguageCodePage}') + ''#13#10 ;
- FileString := FileString + 'set PATH=' + appdir + '\bin;' + libdir + ';' + libdir + '\gnucash;%PATH%'#13#10 ;
-
- FileString := FileString + 'set GUILE_WARN_DEPRECATED=no'#13#10 ;
- FileString := FileString + 'set GNC_MODULE_PATH=' + pkglibdir + ''#13#10 ;
- FileString := FileString + 'set GUILE_LOAD_PATH=' + pkgdatadir + '\guile-modules;' + pkgdatadir + '\scm;' + appdir + '\share\guile\1.6;%GUILE_LOAD_PATH%'#13#10 ;
- FileString := FileString + 'set LTDL_LIBRARY_PATH=' + libdir + ''#13#10 ;
- FileString := FileString + 'set QOF_LIB_DIR=' + pkglibdir + ''#13#10 ;
- FileString := FileString + 'set GNC_DBD_DIR=' + libdir + '\dbd'#13#10 ;
- FileString := FileString + 'set GNC_STANDARD_REPORTS_DIR=' + pkgdatadir + '\guile-modules\gnucash\report\standard-reports'#13#10 ;
- FileString := FileString + 'set SCHEME_LIBRARY_PATH='#13#10 ;
- FileString := FileString + 'start gnucash-bin %*'#13#10 ;
-
- { Save the final file }
- Res := SaveStringToFile(FileName, FileString, False);
- if Res = False then
- MsgBox('Error on saving '+FileName+' for completing the installation', mbInformation, MB_OK);
-
- FileName := appdir + '\bin\guile.cmd' ;
- FileString := 'set GUILE_LOAD_PATH=' + pkgdatadir + '\guile-modules;' + pkgdatadir + '\scm;' + appdir + '\share\guile\1.6;%GUILE_LOAD_PATH%'#13#10 ;
- FileString := FileString + 'start guile.exe %*'#13#10 ;
- Res := SaveStringToFile(FileName, FileString, False);
- if Res = False then
- MsgBox('Error on saving '+FileName+' for completing the installation', mbInformation, MB_OK);
-
-end;
-
-
-function BackslashPath(const S: String): String;
-begin
- { Convert c:\soft to c:/soft }
- Result := S;
- StringChange(Result, '\', '/');
-end;
-
-procedure MyAfterInstallEtc();
-var
- FileName, FileString, appdir, libdir, pkglibdir, pkgdatadir: String;
- Res: Boolean;
-begin
-
- { Get the installation-specific paths }
- appdir := BackslashPath( ExpandConstant('{app}') );
- libdir := BackslashPath( appdir + '/lib' );
- pkglibdir := BackslashPath( appdir + '/bin' );
- pkgdatadir := BackslashPath( appdir + '/share/gnucash' );
-
- { Create the etc/gnucash/environment file; #10 is the linefeed character and #13 CR }
-
- { If you make any changes here, you should probably also change the equivalent sections }
- { in packaging/win32/install.sh, src/bin/environment*.in and src/bin/gnucash-setup-env-osx.in }
- FileName := appdir + '\etc\gnucash\environment' ;
-
-
- FileString := '# environment'#13#10 ;
- FileString := FileString + '#'#13#10 ;
- FileString := FileString + '# This configuration file can be used to change/add'#13#10 ;
- FileString := FileString + '# environment variables during GnuCash startup.'#13#10 ;
- FileString := FileString + '#'#13#10 ;
-
- FileString := FileString + '[Variables]'#13#10 ;
- FileString := FileString + 'PATH=' + appdir + '/bin;' + libdir + ';' + pkglibdir + ';{PATH}'#13#10 ;
- FileString := FileString + 'SCHEME_LIBRARY_PATH='#13#10 ;
- FileString := FileString + 'GNC_MODULE_PATH=' + pkglibdir + ''#13#10 ;
- FileString := FileString + 'GUILE_LOAD_PATH=' + pkgdatadir + '/guile-modules;' + pkgdatadir + '/scm;' + appdir + '/share/guile/1.6;{GUILE_LOAD_PATH}'#13#10 ;
- FileString := FileString + 'EXTRA_LIBS={GNC_MODULE_PATH}'#13#10 ;
- FileString := FileString + 'LD_LIBRARY_PATH={EXTRA_LIBS};{LD_LIBRARY_PATH}'#13#10 ;
- FileString := FileString + 'DYLD_LIBRARY_PATH={EXTRA_LIBS};{DYLD_LIBRARY_PATH}'#13#10 ;
- FileString := FileString + 'LTDL_LIBRARY_PATH=' + libdir + ''#13#10 ;
- FileString := FileString + 'QOF_LIB_DIR=' + pkglibdir + ''#13#10 ;
- FileString := FileString + 'GNC_DBD_DIR=' + libdir + '/dbd'#13#10 ;
- FileString := FileString + 'GNC_STANDARD_REPORTS_DIR=' + pkgdatadir + '/guile-modules/gnucash/report/standard-reports'#13#10 ;
- FileString := FileString + 'GUILE_WARN_DEPRECATED=no'#13#10 ;
-
- { Save the final file }
- Res := ForceDirectories(appdir + '\etc\gnucash');
- if Res = False then
- MsgBox('Error on creating '+appdir+'\etc\gnucash for completing the installation', mbInformation, MB_OK);
-
- Res := SaveStringToFile(FileName, FileString, False);
- if Res = False then
- MsgBox('Error on saving '+FileName+' for completing the installation', mbInformation, MB_OK);
-end;
-
-[Languages]
-Name: "en"; MessagesFile: "compiler:Default.isl"
-Name: "de"; MessagesFile: "compiler:Languages\German.isl"; InfoAfterFile: "@prefix@\share\@PACKAGE@\doc\README-de.win32-bin.txt"
-Name: "el"; MessagesFile: "@prefix@\share\@PACKAGE@\Greek-4-5.1.11.isl"
-Name: "fr"; MessagesFile: "compiler:Languages\French.isl"; InfoAfterFile: "@prefix@\share\@PACKAGE@\doc\README-fr.win32-bin.txt"
-Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"; InfoAfterFile: "@prefix@\share\@PACKAGE@\doc\README-it.win32-bin.txt"
-Name: "ja"; MessagesFile: "@prefix@\share\@PACKAGE@\Japanese-5-5.1.11.isl"
-Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"; InfoAfterFile: "@prefix@\share\@PACKAGE@\doc\README-nl.win32-bin.txt"
-Name: "pt_BR"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
-Name: "zh_CN"; MessagesFile: "@prefix@\share\@PACKAGE@\ChineseSimp-12-5.1.11.isl"; InfoAfterFile: "@prefix@\share\@PACKAGE@\doc\README-zh_CN.win32-bin.txt"
-
-;; The following language files are available as well, in alphabetical
-;; order: Basque, BrazilianPortuguese, Catalan, Czech, Danish, Dutch,
-;; Finnish, Hungarian, Italian, Norwegian, Polish, Portuguese,
-;; Russian, Slovak, Slovenian, Spanish
-
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; These are only for improved text messages
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-[Messages]
-
-[CustomMessages]
-; *** "Select Components" wizard page
-FullInstall=Full installation
-CustomInstall=Custom installation
-CreateDesktopIcon=Create a &desktop icon
-CreateMenuLink=Create a start menu link
-RunPrg=Run GnuCash now
-AdditionalIcons=Create these icons:
-StatusMsgFirewall=Installing Windows firewall rules...
-
-MainFiles=GnuCash Program
-TranslFiles=Translation Files
-TemplFiles=Account Template Files
-
-IconComment_GnuCash=GnuCash Free Finance Manager
-IconName_README=Show README
-IconComment_README=Show the README file
-IconFilename_README=README.win32-bin.txt
-IconName_FAQ=FAQ (Online)
-IconName_Bugzilla=Report a Bug (Online)
-IconName_InstallFQ=Install Online Price Retrieval
-IconComment_InstallFQ=Install the necessary perl module Finance-Quote for online retrieval of prices. Requires ActivePerl 5.8 or 5.10
-IconName_Uninstall=Uninstall GnuCash
-IconComment_Uninstall=Uninstall the Finance Manager GnuCash
-
-;; List of Code pages, used in gnucash.cmd
-LanguageCodePage=1252
-de.LanguageCodePage=1252
-el.LanguageCodePage=1253
-fr.LanguageCodePage=1252
-it.LanguageCodePage=1252
-ja.LanguageCodePage=932
-nl.LanguageCodePage=1252
-pt_BR.LanguageCodePage=1252
-zh_CN.LanguageCodePage=936
-
-;; ;;;;;;;;;;;;;;;;;;;;
-;; German translation
-
-de.FullInstall=Komplett-Installation
-de.CustomInstall=Benutzerdefiniert
-de.CreateDesktopIcon=Ein Icon auf dem Desktop erstellen
-de.CreateMenuLink=Eine Verkn�pfung im Startmen� erstellen
-de.RunPrg=GnuCash jetzt starten
-de.AdditionalIcons=Folgende Icons erstellen:
-de.StatusMsgFirewall=Ausnahmen f�r Windows-Firewall installieren...
-
-de.MainFiles=GnuCash Hauptprogramm
-de.TranslFiles=Deutsche �bersetzung
-de.TemplFiles=Beispiel-Kontenrahmen
-
-de.IconComment_GnuCash=GnuCash OpenSource-Finanzverwaltung
-de.IconName_README=README anzeigen
-de.IconComment_README=Die Informationsdatei (README) anzeigen
-de.IconFilename_README=README-de.win32-bin.txt
-de.IconName_FAQ=H�ufige Fragen (online, engl.)
-de.IconName_Bugzilla=Fehlerbericht einsenden (online, engl.)
-de.IconName_InstallFQ=Online Kursabruf installieren
-de.IconComment_InstallFQ=Das zus�tzliche Modul Finance-Quote installieren, um online Aktien- und Devisenkurse abrufen zu k�nnen. Dazu ist das Programm ActivePerl 5.8 oder 5.10 erforderlich.
-de.IconName_Uninstall=Deinstallieren von GnuCash
-de.IconComment_Uninstall=Die OpenSource-Finanzverwaltung GnuCash wieder deinstallieren und vom Computer l�schen
-
-
-;; ;;;;;;;;;;;;;;;;;;;
-;; Greek translation
-
-el.FullInstall=������ �����������
-el.CustomInstall=������������� �����������
-el.CreateDesktopIcon=���������� ���������� ���� ��������� ��������
-el.CreateMenuLink=�������� ��� ����� ������
-el.RunPrg=�������� ��� GnuCash ����
-el.AdditionalIcons=���������� ����������:
-el.StatusMsgFirewall=����������� ������� ��� �� ������ ���������� ��� Windows...
-
-el.MainFiles=��������� GnuCash
-el.TranslFiles=������ �����������
-el.TemplFiles=������ �� ������� �����������
-
-el.IconComment_GnuCash=GnuCash ��������� ����. �����������
-el.IconName_README=�������� ��� README
-el.IconComment_README=�������� ��� ������� README
-el.IconFilename_README=README.win32-bin.txt
-el.IconName_FAQ=������ ��������� (Online)
-el.IconName_Bugzilla=������� ��������� (Online)
-el.IconName_InstallFQ=����������� ����� ����� (online)
-el.IconComment_InstallFQ=����������� ��� perl module Finance-Quote ��� ���� ����� online. ������� ActivePerl 5.8/5.10
-el.IconName_Uninstall=������������� GnuCash
-el.IconComment_Uninstall=������������� ��� ����������� ����������� GnuCash
-
-
-;; ;;;;;;;;;;;;;;;;;;;;
-;; French translation
-
-fr.FullInstall=Installation compl�te
-fr.CustomInstall=Installation personnalis�e
-fr.CreateDesktopIcon=Cr�er un ic�ne sur le bureau
-fr.CreateMenuLink=Cr�er un lien dans le menu de d�marrage
-fr.RunPrg=D�marrer GnuCash maintenant
-fr.AdditionalIcons=Cr�er les ic�nes suivants:
-fr.StatusMsgFirewall=Installation des r�gles de pare-feu de Windows
-
-fr.MainFiles=Programme GnuCash
-fr.TranslFiles=Traduction fran�aise
-fr.TemplFiles=Mod�le de plan comptable
-
-fr.IconComment_GnuCash=GnuCash, le gestionnaire financier OpenSource
-fr.IconName_README=Afficher le LISEZMOI
-fr.IconComment_README=Afficher le fichier LISEZMOI
-fr.IconFilename_README=README-fr.win32-bin.txt
-fr.IconName_FAQ=FAQ (En ligne, en anglais)
-fr.IconName_Bugzilla=Envoyer un rapport d'erreur (En ligne, en anglais)
-fr.IconName_InstallFQ=Installer les quotations en ligne
-fr.IconComment_InstallFQ=Installation du module Finance-Quote requis pour le t�l�chargement du cours des devises et actions. Le programme ActivePerl 5.8 ou 5.10 est aussi requis
-fr.IconName_Uninstall=D�-installer GnuCash
-fr.IconComment_Uninstall=D�sinstalle le gestionnaire financier GnuCash
-
-
-;; ;;;;;;;;;;;;;;;;;;;;;
-;; Italian translation
-
-it.FullInstall=Installazione completa
-it.CustomInstall=Installazione personalizzata
-it.CreateDesktopIcon=Crea un'icona sul desktop
-it.CreateMenuLink=Crea un collegamento nel menu "start"
-it.RunPrg=Avvia GnuCash
-it.AdditionalIcons=Crea queste icone:
-it.StatusMsgFirewall=Installazione delle regole per il firewall di Windows...
-
-it.MainFiles=File del programma GnuCash
-it.TranslFiles=Traduzione Italiana
-it.TemplFiles=Modelli di strutture dei conti
-
-it.IconComment_GnuCash=GnuCash: gestore di finanze libero
-it.IconName_README=Mostra il file LEGGIMI
-it.IconComment_README=Mostra il file LEGGIMI
-it.IconFilename_README=README-it.win32-bin.txt
-it.IconName_FAQ=FAQ (online, in Inglese)
-it.IconName_Bugzilla=Comunicare un bug (online, in Inglese)
-it.IconName_InstallFQ=Installa la funzione di ricerca delle quotazioni online
-it.IconComment_InstallFQ=Installa il modulo di perl Finance-Quote necessario per ricevere le quotazioni online. Richiede ActivePerl 5.8/5.10
-it.IconName_Uninstall=Disinstalla GnuCash
-it.IconComment_Uninstall=Disinstalla il programma di gestione delle finanze GnuCash
-
-
-;; ;;;;;;;;;;;;;;;;;
-;; Dutch translation
-
-nl.FullInstall=Volledige installatie
-nl.CustomInstall=Aangepaste installatiie
-nl.CreateDesktopIcon=Een &bureablad icoon aanmaken
-nl.CreateMenuLink=Een verwijzing in het start menu aanmaken
-nl.RunPrg=GnuCash nu starten
-nl.AdditionalIcons=Deze iconen aanmaken:
-nl.StatusMsgFirewall=Windows firewall regels installeren...
-
-nl.MainFiles=GnuCash Programma
-nl.TranslFiles=Vertalingsbestanden
-nl.TemplFiles=Grootboekrekeningssjablonen
-
-nl.IconComment_GnuCash=GnuCash Vrij Financieel Beheer
-nl.IconName_README=LEESMIJ Tonen
-nl.IconComment_README=Het LEESMIJ bestand tonen
-nl.IconFilename_README=README-nl.win32-bin.txt
-nl.IconName_FAQ=FAQ (Online)
-nl.IconName_Bugzilla=Een Bug Melden (Online)
-nl.IconName_InstallFQ=Online Koersen Opvragen installeren
-nl.IconComment_InstallFQ=De benodigde perl module Finance Quote om online koersen op te vragen installeren. Hiervoor is ActivePerl 5.8 of 5.10 nodig.
-nl.IconName_Uninstall=GnuCash verwijderen
-nl.IconComment_Uninstall=Het financieel beheersprogramma GnuCash verwijderen
-
-
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Brazilian Portuguese translation
-
-pt_BR.FullInstall=Instala��o Completa
-pt_BR.CustomInstall=Instala��o Personalizada
-pt_BR.CreateDesktopIcon=Criar um �cone na �rea de Trabalho
-pt_BR.CreateMenuLink=Criar um link no menu Iniciar
-pt_BR.RunPrg=Executar o GnuCash agora
-pt_BR.AdditionalIcons=Criar estes �cones:
-pt_BR.StatusMsgFirewall=Instalando as regras de firewall do Windows...
-
-pt_BR.MainFiles=Programa GnuCash
-pt_BR.TranslFiles=Tradu��o
-pt_BR.TemplFiles=Modelos de Conta
-
-pt_BR.IconComment_GnuCash=Gerenciador Financeiro Livre GnuCash
-pt_BR.IconName_README=Mostrar LEIA-ME (README)
-pt_BR.IconComment_README=Mostra o arquivo LEIA-ME (README)
-pt_BR.IconFilename_README=LEIA-ME.win32-bin.txt
-pt_BR.IconName_FAQ=Perguntas Freq�entes (online, ingl�s)
-pt_BR.IconName_Bugzilla=Relatar um erro (online, ingl�s)
-pt_BR.IconName_InstallFQ=Instalar a Consulta de Pre�os Online
-pt_BR.IconComment_InstallFQ=Instala o m�dulo perl Finance-Quote, necess�rio para a busca de pre�os online. Requer ActivePerl 5.8/5.10.
-pt_BR.IconName_Uninstall=Desinstalar o GnuCash
-pt_BR.IconComment_Uninstall=Desinstala o Gerenciador Financeiro GnuCash
-
-;; ;;;;;;;;;;;;;;;;;
-;; Simplified Chinese translation
-
-zh_CN.FullInstall=ÍêÈ«°²×°
-zh_CN.CustomInstall=×Ô¶¨Òå°²×°
-zh_CN.CreateDesktopIcon=´´½¨×ÀÃæͼ±ê
-zh_CN.CreateMenuLink=´´½¨¿ªÊ¼²Ëµ¥Á´½Ó
-zh_CN.RunPrg=ÏÖÔÚ¿ªÊ¼ÔËÐÐ GnuCash
-zh_CN.AdditionalIcons=´´½¨ÕâЩͼ±ê
-zh_CN.StatusMsgFirewall=ÕýÔÚ°²×° Windows ·À»ðǽ¹æÔò...
-
-zh_CN.MainFiles=GnuCash ³ÌÐò
-zh_CN.TranslFiles=·ÒëÎļþ
-zh_CN.TemplFiles=»á¼Æ¿ÆÄ¿Ä£°åÎļþ
-
-zh_CN.IconComment_GnuCash=GnuCash Ãâ·Ñ²ÆÎñ¹ÜÀí
-zh_CN.IconName_README=ÏÔʾ×ÔÊöÎļþ
-zh_CN.IconComment_README=ÏÔʾ×ÔÊöÎļþ
-zh_CN.IconFilename_README=README-zh_CN.win32-bin.txt
-zh_CN.IconName_FAQ=³£¼ûÎÊÌâ (ÔÚÏß)
-zh_CN.IconName_Bugzilla=±¨¸æÈí¼þ Bug (ÔÚÏß)
-zh_CN.IconName_InstallFQ=°²×°ÔÚÏß¼Û¸ñ¼ìË÷¹¦ÄÜ
-zh_CN.IconComment_InstallFQ=°²×°ÔÚÏß¼Û¸ñ¼ìË÷Ëù±ØÐèµÄ Perl Finance-QuoteÄ£¿é¡£ÐèÒª ActivePerl 5.8 »ò 5.10
-zh_CN.IconName_Uninstall=жÔØ GnuCash
-zh_CN.IconComment_Uninstall=жÔزÆÎñ¹ÜÀíÈí¼þ GnuCash
-
-;; ;;;;;;;;;;;;;;;;;;;;
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Input configuration for the Inno Setup Compiler
+; Copyright (c) 2004-2005 Christian Stimming <stimming at tuhh.de>
+;
+; Inno Setup Compiler: See http://www.jrsoftware.org/isdl.php
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[Setup]
+; Using the name here directly because we want it capitalized
+AppName=GnuCash
+AppVerName=GnuCash @VERSION@
+AppPublisher=GnuCash Development Team
+AppPublisherURL=http://www.gnucash.org
+AppSupportURL=http://www.gnucash.org
+AppUpdatesURL=http://www.gnucash.org
+VersionInfoVersion=@VERSION@
+DefaultDirName={pf}\@PACKAGE@
+DefaultGroupName=GnuCash
+LicenseFile=@prefix@\..\dist\share\@PACKAGE@\doc\COPYING
+Compression=lzma
+MinVersion=5.0,5.0
+PrivilegesRequired=poweruser
+OutputDir=.
+OutputBaseFilename=@PACKAGE at -@VERSION at -setup
+UninstallFilesDir={app}\uninstall\@PACKAGE@
+InfoAfterFile=@prefix@\..\dist\share\@PACKAGE@\doc\README.win32-bin.txt
+SetupIconFile=@prefix@\..\dist\share\@PACKAGE@\pixmaps\gnucash-icon.ico
+WizardSmallImageFile=@prefix@\..\dist\share\@PACKAGE@\pixmaps\gnucash-icon-48x48.bmp
+
+[Types]
+Name: "full"; Description: "{cm:FullInstall}"
+Name: "custom"; Description: "{cm:CustomInstall}"; Flags: iscustom
+
+[Components]
+Name: "main"; Description: "{cm:MainFiles}"; Types: full custom; Flags: fixed
+;Name: "translations"; Description: "{cm:TranslFiles}"; Types: full
+;Name: "templates"; Description: "{cm:TemplFiles}"; Types: full
+
+[Tasks]
+Name: desktopicon; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"
+Name: menuicon; Description: "{cm:CreateMenuLink}"; GroupDescription: "{cm:AdditionalIcons}"
+
+[Icons]
+Name: "{group}\GnuCash"; Filename: "{app}\bin\gnucash-bin.exe"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: menuicon; Flags: runminimized
+Name: "{group}\{cm:IconName_README}"; Filename: "{app}\doc\gnucash\{cm:IconFilename_README}"; Comment: "{cm:IconComment_README}"; Tasks: menuicon
+Name: "{group}\{cm:IconName_FAQ}"; Filename: "http://wiki.gnucash.org/wiki/FAQ"; Tasks: menuicon
+Name: "{group}\{cm:IconName_Bugzilla}"; Filename: "http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash"; Tasks: menuicon
+Name: "{group}\{cm:IconName_InstallFQ}"; Filename: "{app}\bin\install-fq-mods.cmd"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_InstallFQ}"; Tasks: menuicon
+Name: "{group}\{cm:IconName_Uninstall}"; Filename: "{uninstallexe}"; Comment: "{cm:IconComment_Uninstall}"; Tasks: menuicon
+
+Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\gnucash-bin.exe"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: desktopicon; Flags: runminimized
+
+[Run]
+Filename: "{app}\bin\gnucash-bin.exe"; Description: "{cm:RunPrg}"; WorkingDir: "{app}\bin"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent runhidden
+Filename: "{app}\bin\guile.cmd"; Parameters: "-c ""(use-modules (ice-9 slib)) (require 'printf)"""; Flags: runhidden
+;; The Windows firewall exceptions, see http://www.vincenzo.net/isxkb/index.php?title=Adding_a_rule_to_the_Windows_firewall
+Filename: "{sys}\netsh.exe"; Parameters: "firewall add allowedprogram ""{app}\bin\gnucash-bin.exe"" ""GnuCash Free Finance Manager"" ENABLE ALL"; StatusMsg: "{cm:StatusMsgFirewall}"; Flags: runhidden; MinVersion: 0,5.01.2600sp2;
+Filename: "{sys}\netsh.exe"; Parameters: "firewall add allowedprogram ""{app}\bin\gconfd-2.exe"" ""GConf Settings Manager"" ENABLE ALL"; StatusMsg: "{cm:StatusMsgFirewall}"; Flags: runhidden; MinVersion: 0,5.01.2600sp2;
+
+[UninstallRun]
+Filename: "{app}\bin\gconftool-2.exe"; Parameters: "--shutdown"; Flags: runhidden
+Filename: "{sys}\netsh.exe"; Parameters: "firewall delete allowedprogram program=""{app}\bin\gnucash-bin.exe"""; Flags: runhidden; MinVersion: 0,5.01.2600sp2
+Filename: "{sys}\netsh.exe"; Parameters: "firewall delete allowedprogram program=""{app}\bin\gconfd-2.exe"""; Flags: runhidden; MinVersion: 0,5.01.2600sp2
+
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Here we configure the included files and the place of their
+; installation
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+[Files]
+; The main executables and DLLs
+Source: "@prefix@\..\dist\bin\*"; DestDir: "{app}\bin"; Flags: recursesubdirs ignoreversion; Components: main; AfterInstall: MyAfterInstallConfig()
+; Note: The above AfterInstall function will create the
+; gnucash.cmd file on-the-fly by the Pascal script below.
+
+Source: "@prefix@\..\dist\etc\*"; DestDir: "{app}\etc"; Flags: recursesubdirs; Components: main; AfterInstall: MyAfterInstallEtc()
+Source: "@prefix@\..\dist\lib\*"; DestDir: "{app}\lib"; Flags: recursesubdirs; Components: main
+Source: "@prefix@\..\dist\libexec\*"; DestDir: "{app}\libexec"; Flags: recursesubdirs; Components: main
+Source: "@prefix@\..\dist\share\*"; DestDir: "{app}\share"; Flags: recursesubdirs; Components: main
+
+; Additionally, we ship the Qt DLLs because the Online-Banking-Wizard
+; lib/aqbanking/plugins/@-aqbanking_so_effective-@/wizards/qt3-wizard.exe needs them.
+Source: "@-qtbindir-@\QtCore4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "@-qtbindir-@\QtGui4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "@-qtbindir-@\mingwm10.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+; The following are all needed by Qt3Support
+Source: "@-qtbindir-@\Qt3Support4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "@-qtbindir-@\QtXml4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "@-qtbindir-@\QtSql4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "@-qtbindir-@\QtNetwork4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+
+;; The translations
+;Source: "@prefix@\..\dist\share\locale\*"; DestDir: "{app}\share\locale"; Flags: recursesubdirs; Components: translations
+;
+;; The account templates
+;Source: "@prefix@\..\dist\share\gnucash\accounts\*"; DestDir: "{app}\share\gnucash\accounts"; Flags: recursesubdirs; Components: templates
+
+; And all the documentation
+Source: "@prefix@\..\dist\share\@PACKAGE@\doc\README"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@prefix@\..\dist\share\@PACKAGE@\doc\README.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@prefix@\..\dist\share\@PACKAGE@\doc\README-de.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@prefix@\..\dist\share\@PACKAGE@\doc\README-fr.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@prefix@\..\dist\share\@PACKAGE@\doc\README-it.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@prefix@\..\dist\share\@PACKAGE@\doc\README-zh_CN.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@prefix@\..\dist\share\@PACKAGE@\doc\COPYING"; DestDir: "{app}\doc\@PACKAGE@"; Flags: ignoreversion; Components: main
+Source: "@prefix@\..\dist\share\@PACKAGE@\doc\AUTHORS"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@prefix@\..\dist\share\@PACKAGE@\doc\ChangeLog"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+
+
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Define the registry keys Setup should create (HKLM = HKEY_LOCAL_MACHINE)
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+[Registry]
+Root: HKCR; Subkey: ".gnucash"; ValueType: string; ValueName: ""; ValueData: "GnuCash.Financial.Data"; Flags: uninsdeletevalue
+Root: HKCR; Subkey: ".gnucash"; ValueType: string; ValueName: "Content Type"; ValueData: "application/x-gnucash"; Flags: uninsdeletevalue
+Root: HKCR; Subkey: "GnuCash.Financial.Data"; ValueType: string; ValueName: ""; ValueData: "GnuCash Financial Data"; Flags: uninsdeletevalue
+Root: HKCR; Subkey: "GnuCash.Financial.Data\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\share\gnucash\pixmaps\gnucash-icon.ico,0"
+Root: HKCR; Subkey: "GnuCash.Financial.Data\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\bin\gnucash-bin.exe"" ""%1"""
+
+Root: HKLM; Subkey: "Software\GnuCash"; ValueType: none; Flags: uninsdeletekeyifempty
+Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: none; Flags: uninsdeletekeyifempty
+Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "prefix"; ValueData: "{app}"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\GnuCash"; ValueType: string; ValueName: "InstallationDirectory"; ValueData: "{app}"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "libdir"; ValueData: "{app}\lib"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "pkglibdir"; ValueData: "{app}\lib\@PACKAGE@"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "sysconfdir"; ValueData: "{app}\etc"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "localedir"; ValueData: "{app}\share\locale"; Flags: uninsdeletevalue
+
+; Additionally, we have to install the paths for gwenhywfar
+Root: HKLM; Subkey: "Software\Gwenhywfar"; ValueType: none; Flags: uninsdeletekeyifempty
+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\@-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
+
+; And we also need some registry keys for aqbanking
+Root: HKLM; Subkey: "Software\Aqbanking"; ValueType: none; Flags: uninsdeletekeyifempty
+Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: none; Flags: uninsdeletekeyifempty
+Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "providerdir"; ValueData: "{app}\lib\aqbanking\plugins\@-aqbanking_so_effective-@\providers"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "bankinfodir"; ValueData: "{app}\lib\aqbanking\plugins\@-aqbanking_so_effective-@\bankinfo"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "importerdir"; ValueData: "{app}\lib\aqbanking\plugins\@-aqbanking_so_effective-@\imexporters"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "wizarddir"; ValueData: "{app}\lib\aqbanking\plugins\@-aqbanking_so_effective-@\wizards"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "pkgdatadir"; ValueData: "{app}\share\aqbanking"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "sysconfdir"; ValueData: "{app}\etc"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "localedir"; ValueData: "{app}\share\locale"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\AqBanking\Paths"; ValueType: string; ValueName: "xmldatadir"; ValueData: "{app}\share\aqhbci\xml"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\AqBanking\Paths"; ValueType: string; ValueName: "cfgmoduledir"; ValueData: "{app}\lib\aqbanking\plugins\@-aqbanking_so_effective-@\frontends\qbanking\cfgmodules"; Flags: uninsdeletevalue
+
+
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Delete the created config script on uninstall
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+[UninstallDelete]
+Type: files; Name: "{app}\bin\gnucash.cmd"
+Type: files; Name: "{app}\bin\guile.cmd"
+Type: files; Name: "{app}\etc\gnucash\environment"
+Type: files; Name: "{app}\share\guile\1.6\slibcat"
+Type: filesandordirs; Name: "{app}\share\guile"
+Type: filesandordirs; Name: "{app}\etc\gconf"
+Type: dirifempty; Name: "{app}\etc\gnucash"
+Type: dirifempty; Name: "{app}\etc"
+
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; This large section is a Pascal scripting program that will modify
+; the gnucash shell script so that it then includes the
+; correct values according to our local installation. See
+; http://www.remobjects.com/?ps for a syntax reference.
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+[Code]
+function MingwBacksl(const S: String): String;
+begin
+ { Modify the path name S so that it can be used by MinGW }
+ if Length(ExtractFileDrive(S)) = 0 then
+ Result := S
+ else begin
+ Result := '/'+S;
+ StringChange(Result, ':\', '\');
+ end;
+ StringChange(Result, '\', '/');
+end;
+
+procedure MyAfterInstallConfig();
+var
+ FileName, FileString, appdir, libdir, pkglibdir, pkgdatadir: String;
+ Res: Boolean;
+begin
+
+ { Get the installation-specific paths }
+ appdir := ExpandConstant('{app}');
+ libdir := appdir + '\lib';
+ pkglibdir := libdir + '\gnucash';
+ pkgdatadir := appdir + '\share\gnucash';
+
+ { Create the gnucash.cmd file; #10 is the linefeed character and #13 CR }
+
+ { If you make any changes here, you should probably also change the equivalent sections }
+ { in packaging/win32/install.sh, src/bin/environment*.in and src/bin/gnucash-setup-env-osx.in }
+ FileName := appdir + '\bin\gnucash.cmd' ;
+ FileString := 'setlocal'#13#10 ;
+ FileString := FileString + 'chcp ' + ExpandConstant('{cm:LanguageCodePage}') + ''#13#10 ;
+ FileString := FileString + 'set PATH=' + appdir + '\bin;' + libdir + ';' + libdir + '\gnucash;%PATH%'#13#10 ;
+
+ FileString := FileString + 'set GUILE_WARN_DEPRECATED=no'#13#10 ;
+ FileString := FileString + 'set GNC_MODULE_PATH=' + pkglibdir + ''#13#10 ;
+ FileString := FileString + 'set GUILE_LOAD_PATH=' + pkgdatadir + '\guile-modules;' + pkgdatadir + '\scm;' + appdir + '\share\guile\1.6;%GUILE_LOAD_PATH%'#13#10 ;
+ FileString := FileString + 'set LTDL_LIBRARY_PATH=' + libdir + ''#13#10 ;
+ FileString := FileString + 'set QOF_LIB_DIR=' + pkglibdir + ''#13#10 ;
+ FileString := FileString + 'set GNC_DBD_DIR=' + libdir + '\dbd'#13#10 ;
+ FileString := FileString + 'set GNC_STANDARD_REPORTS_DIR=' + pkgdatadir + '\guile-modules\gnucash\report\standard-reports'#13#10 ;
+ FileString := FileString + 'set SCHEME_LIBRARY_PATH='#13#10 ;
+ FileString := FileString + 'start gnucash-bin %*'#13#10 ;
+
+ { Save the final file }
+ Res := SaveStringToFile(FileName, FileString, False);
+ if Res = False then
+ MsgBox('Error on saving '+FileName+' for completing the installation', mbInformation, MB_OK);
+
+ FileName := appdir + '\bin\guile.cmd' ;
+ FileString := 'set GUILE_LOAD_PATH=' + pkgdatadir + '\guile-modules;' + pkgdatadir + '\scm;' + appdir + '\share\guile\1.6;%GUILE_LOAD_PATH%'#13#10 ;
+ FileString := FileString + 'start guile.exe %*'#13#10 ;
+ Res := SaveStringToFile(FileName, FileString, False);
+ if Res = False then
+ MsgBox('Error on saving '+FileName+' for completing the installation', mbInformation, MB_OK);
+
+end;
+
+
+function BackslashPath(const S: String): String;
+begin
+ { Convert c:\soft to c:/soft }
+ Result := S;
+ StringChange(Result, '\', '/');
+end;
+
+procedure MyAfterInstallEtc();
+var
+ FileName, FileString, appdir, libdir, pkglibdir, pkgdatadir: String;
+ Res: Boolean;
+begin
+
+ { Get the installation-specific paths }
+ appdir := BackslashPath( ExpandConstant('{app}') );
+ libdir := BackslashPath( appdir + '/lib' );
+ pkglibdir := BackslashPath( appdir + '/bin' );
+ pkgdatadir := BackslashPath( appdir + '/share/gnucash' );
+
+ { Create the etc/gnucash/environment file; #10 is the linefeed character and #13 CR }
+
+ { If you make any changes here, you should probably also change the equivalent sections }
+ { in packaging/win32/install.sh, src/bin/environment*.in and src/bin/gnucash-setup-env-osx.in }
+ FileName := appdir + '\etc\gnucash\environment' ;
+
+
+ FileString := '# environment'#13#10 ;
+ FileString := FileString + '#'#13#10 ;
+ FileString := FileString + '# This configuration file can be used to change/add'#13#10 ;
+ FileString := FileString + '# environment variables during GnuCash startup.'#13#10 ;
+ FileString := FileString + '#'#13#10 ;
+
+ FileString := FileString + '[Variables]'#13#10 ;
+ FileString := FileString + 'PATH=' + appdir + '/bin;' + libdir + ';' + pkglibdir + ';{PATH}'#13#10 ;
+ FileString := FileString + 'SCHEME_LIBRARY_PATH='#13#10 ;
+ FileString := FileString + 'GNC_MODULE_PATH=' + pkglibdir + ''#13#10 ;
+ FileString := FileString + 'GUILE_LOAD_PATH=' + pkgdatadir + '/guile-modules;' + pkgdatadir + '/scm;' + appdir + '/share/guile/1.6;{GUILE_LOAD_PATH}'#13#10 ;
+ FileString := FileString + 'EXTRA_LIBS={GNC_MODULE_PATH}'#13#10 ;
+ FileString := FileString + 'LD_LIBRARY_PATH={EXTRA_LIBS};{LD_LIBRARY_PATH}'#13#10 ;
+ FileString := FileString + 'DYLD_LIBRARY_PATH={EXTRA_LIBS};{DYLD_LIBRARY_PATH}'#13#10 ;
+ FileString := FileString + 'LTDL_LIBRARY_PATH=' + libdir + ''#13#10 ;
+ FileString := FileString + 'QOF_LIB_DIR=' + pkglibdir + ''#13#10 ;
+ FileString := FileString + 'GNC_DBD_DIR=' + libdir + '/dbd'#13#10 ;
+ FileString := FileString + 'GNC_STANDARD_REPORTS_DIR=' + pkgdatadir + '/guile-modules/gnucash/report/standard-reports'#13#10 ;
+ FileString := FileString + 'GUILE_WARN_DEPRECATED=no'#13#10 ;
+
+ { Save the final file }
+ Res := ForceDirectories(appdir + '\etc\gnucash');
+ if Res = False then
+ MsgBox('Error on creating '+appdir+'\etc\gnucash for completing the installation', mbInformation, MB_OK);
+
+ Res := SaveStringToFile(FileName, FileString, False);
+ if Res = False then
+ MsgBox('Error on saving '+FileName+' for completing the installation', mbInformation, MB_OK);
+end;
+
+[Languages]
+Name: "en"; MessagesFile: "compiler:Default.isl"
+Name: "de"; MessagesFile: "compiler:Languages\German.isl"; InfoAfterFile: "@prefix@\share\@PACKAGE@\doc\README-de.win32-bin.txt"
+Name: "el"; MessagesFile: "@prefix@\share\@PACKAGE@\Greek-4-5.1.11.isl"
+Name: "fr"; MessagesFile: "compiler:Languages\French.isl"; InfoAfterFile: "@prefix@\share\@PACKAGE@\doc\README-fr.win32-bin.txt"
+Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"; InfoAfterFile: "@prefix@\share\@PACKAGE@\doc\README-it.win32-bin.txt"
+Name: "ja"; MessagesFile: "@prefix@\share\@PACKAGE@\Japanese-5-5.1.11.isl"
+Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"; InfoAfterFile: "@prefix@\share\@PACKAGE@\doc\README-nl.win32-bin.txt"
+Name: "pt_BR"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
+Name: "zh_CN"; MessagesFile: "@prefix@\share\@PACKAGE@\ChineseSimp-12-5.1.11.isl"; InfoAfterFile: "@prefix@\share\@PACKAGE@\doc\README-zh_CN.win32-bin.txt"
+
+;; The following language files are available as well, in alphabetical
+;; order: Basque, BrazilianPortuguese, Catalan, Czech, Danish, Dutch,
+;; Finnish, Hungarian, Italian, Norwegian, Polish, Portuguese,
+;; Russian, Slovak, Slovenian, Spanish
+
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; These are only for improved text messages
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+[Messages]
+
+[CustomMessages]
+; *** "Select Components" wizard page
+FullInstall=Full installation
+CustomInstall=Custom installation
+CreateDesktopIcon=Create a &desktop icon
+CreateMenuLink=Create a start menu link
+RunPrg=Run GnuCash now
+AdditionalIcons=Create these icons:
+StatusMsgFirewall=Installing Windows firewall rules...
+
+MainFiles=GnuCash Program
+TranslFiles=Translation Files
+TemplFiles=Account Template Files
+
+IconComment_GnuCash=GnuCash Free Finance Manager
+IconName_README=Show README
+IconComment_README=Show the README file
+IconFilename_README=README.win32-bin.txt
+IconName_FAQ=FAQ (Online)
+IconName_Bugzilla=Report a Bug (Online)
+IconName_InstallFQ=Install Online Price Retrieval
+IconComment_InstallFQ=Install the necessary perl module Finance-Quote for online retrieval of prices. Requires ActivePerl 5.8 or 5.10
+IconName_Uninstall=Uninstall GnuCash
+IconComment_Uninstall=Uninstall the Finance Manager GnuCash
+
+;; List of Code pages, used in gnucash.cmd
+LanguageCodePage=1252
+de.LanguageCodePage=1252
+el.LanguageCodePage=1253
+fr.LanguageCodePage=1252
+it.LanguageCodePage=1252
+ja.LanguageCodePage=932
+nl.LanguageCodePage=1252
+pt_BR.LanguageCodePage=1252
+zh_CN.LanguageCodePage=936
+
+;; ;;;;;;;;;;;;;;;;;;;;
+;; German translation
+
+de.FullInstall=Komplett-Installation
+de.CustomInstall=Benutzerdefiniert
+de.CreateDesktopIcon=Ein Icon auf dem Desktop erstellen
+de.CreateMenuLink=Eine Verkn�pfung im Startmen� erstellen
+de.RunPrg=GnuCash jetzt starten
+de.AdditionalIcons=Folgende Icons erstellen:
+de.StatusMsgFirewall=Ausnahmen f�r Windows-Firewall installieren...
+
+de.MainFiles=GnuCash Hauptprogramm
+de.TranslFiles=Deutsche �bersetzung
+de.TemplFiles=Beispiel-Kontenrahmen
+
+de.IconComment_GnuCash=GnuCash OpenSource-Finanzverwaltung
+de.IconName_README=README anzeigen
+de.IconComment_README=Die Informationsdatei (README) anzeigen
+de.IconFilename_README=README-de.win32-bin.txt
+de.IconName_FAQ=H�ufige Fragen (online, engl.)
+de.IconName_Bugzilla=Fehlerbericht einsenden (online, engl.)
+de.IconName_InstallFQ=Online Kursabruf installieren
+de.IconComment_InstallFQ=Das zus�tzliche Modul Finance-Quote installieren, um online Aktien- und Devisenkurse abrufen zu k�nnen. Dazu ist das Programm ActivePerl 5.8 oder 5.10 erforderlich.
+de.IconName_Uninstall=Deinstallieren von GnuCash
+de.IconComment_Uninstall=Die OpenSource-Finanzverwaltung GnuCash wieder deinstallieren und vom Computer l�schen
+
+
+;; ;;;;;;;;;;;;;;;;;;;
+;; Greek translation
+
+el.FullInstall=������ �����������
+el.CustomInstall=������������� �����������
+el.CreateDesktopIcon=���������� ���������� ���� ��������� ��������
+el.CreateMenuLink=�������� ��� ����� ������
+el.RunPrg=�������� ��� GnuCash ����
+el.AdditionalIcons=���������� ����������:
+el.StatusMsgFirewall=����������� ������� ��� �� ������ ���������� ��� Windows...
+
+el.MainFiles=��������� GnuCash
+el.TranslFiles=������ �����������
+el.TemplFiles=������ �� ������� �����������
+
+el.IconComment_GnuCash=GnuCash ��������� ����. �����������
+el.IconName_README=�������� ��� README
+el.IconComment_README=�������� ��� ������� README
+el.IconFilename_README=README.win32-bin.txt
+el.IconName_FAQ=������ ��������� (Online)
+el.IconName_Bugzilla=������� ��������� (Online)
+el.IconName_InstallFQ=����������� ����� ����� (online)
+el.IconComment_InstallFQ=����������� ��� perl module Finance-Quote ��� ���� ����� online. ������� ActivePerl 5.8/5.10
+el.IconName_Uninstall=������������� GnuCash
+el.IconComment_Uninstall=������������� ��� ����������� ����������� GnuCash
+
+
+;; ;;;;;;;;;;;;;;;;;;;;
+;; French translation
+
+fr.FullInstall=Installation compl�te
+fr.CustomInstall=Installation personnalis�e
+fr.CreateDesktopIcon=Cr�er un ic�ne sur le bureau
+fr.CreateMenuLink=Cr�er un lien dans le menu de d�marrage
+fr.RunPrg=D�marrer GnuCash maintenant
+fr.AdditionalIcons=Cr�er les ic�nes suivants:
+fr.StatusMsgFirewall=Installation des r�gles de pare-feu de Windows
+
+fr.MainFiles=Programme GnuCash
+fr.TranslFiles=Traduction fran�aise
+fr.TemplFiles=Mod�le de plan comptable
+
+fr.IconComment_GnuCash=GnuCash, le gestionnaire financier OpenSource
+fr.IconName_README=Afficher le LISEZMOI
+fr.IconComment_README=Afficher le fichier LISEZMOI
+fr.IconFilename_README=README-fr.win32-bin.txt
+fr.IconName_FAQ=FAQ (En ligne, en anglais)
+fr.IconName_Bugzilla=Envoyer un rapport d'erreur (En ligne, en anglais)
+fr.IconName_InstallFQ=Installer les quotations en ligne
+fr.IconComment_InstallFQ=Installation du module Finance-Quote requis pour le t�l�chargement du cours des devises et actions. Le programme ActivePerl 5.8 ou 5.10 est aussi requis
+fr.IconName_Uninstall=D�-installer GnuCash
+fr.IconComment_Uninstall=D�sinstalle le gestionnaire financier GnuCash
+
+
+;; ;;;;;;;;;;;;;;;;;;;;;
+;; Italian translation
+
+it.FullInstall=Installazione completa
+it.CustomInstall=Installazione personalizzata
+it.CreateDesktopIcon=Crea un'icona sul desktop
+it.CreateMenuLink=Crea un collegamento nel menu "start"
+it.RunPrg=Avvia GnuCash
+it.AdditionalIcons=Crea queste icone:
+it.StatusMsgFirewall=Installazione delle regole per il firewall di Windows...
+
+it.MainFiles=File del programma GnuCash
+it.TranslFiles=Traduzione Italiana
+it.TemplFiles=Modelli di strutture dei conti
+
+it.IconComment_GnuCash=GnuCash: gestore di finanze libero
+it.IconName_README=Mostra il file LEGGIMI
+it.IconComment_README=Mostra il file LEGGIMI
+it.IconFilename_README=README-it.win32-bin.txt
+it.IconName_FAQ=FAQ (online, in Inglese)
+it.IconName_Bugzilla=Comunicare un bug (online, in Inglese)
+it.IconName_InstallFQ=Installa la funzione di ricerca delle quotazioni online
+it.IconComment_InstallFQ=Installa il modulo di perl Finance-Quote necessario per ricevere le quotazioni online. Richiede ActivePerl 5.8/5.10
+it.IconName_Uninstall=Disinstalla GnuCash
+it.IconComment_Uninstall=Disinstalla il programma di gestione delle finanze GnuCash
+
+
+;; ;;;;;;;;;;;;;;;;;
+;; Dutch translation
+
+nl.FullInstall=Volledige installatie
+nl.CustomInstall=Aangepaste installatiie
+nl.CreateDesktopIcon=Een &bureablad icoon aanmaken
+nl.CreateMenuLink=Een verwijzing in het start menu aanmaken
+nl.RunPrg=GnuCash nu starten
+nl.AdditionalIcons=Deze iconen aanmaken:
+nl.StatusMsgFirewall=Windows firewall regels installeren...
+
+nl.MainFiles=GnuCash Programma
+nl.TranslFiles=Vertalingsbestanden
+nl.TemplFiles=Grootboekrekeningssjablonen
+
+nl.IconComment_GnuCash=GnuCash Vrij Financieel Beheer
+nl.IconName_README=LEESMIJ Tonen
+nl.IconComment_README=Het LEESMIJ bestand tonen
+nl.IconFilename_README=README-nl.win32-bin.txt
+nl.IconName_FAQ=FAQ (Online)
+nl.IconName_Bugzilla=Een Bug Melden (Online)
+nl.IconName_InstallFQ=Online Koersen Opvragen installeren
+nl.IconComment_InstallFQ=De benodigde perl module Finance Quote om online koersen op te vragen installeren. Hiervoor is ActivePerl 5.8 of 5.10 nodig.
+nl.IconName_Uninstall=GnuCash verwijderen
+nl.IconComment_Uninstall=Het financieel beheersprogramma GnuCash verwijderen
+
+
+;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Brazilian Portuguese translation
+
+pt_BR.FullInstall=Instala��o Completa
+pt_BR.CustomInstall=Instala��o Personalizada
+pt_BR.CreateDesktopIcon=Criar um �cone na �rea de Trabalho
+pt_BR.CreateMenuLink=Criar um link no menu Iniciar
+pt_BR.RunPrg=Executar o GnuCash agora
+pt_BR.AdditionalIcons=Criar estes �cones:
+pt_BR.StatusMsgFirewall=Instalando as regras de firewall do Windows...
+
+pt_BR.MainFiles=Programa GnuCash
+pt_BR.TranslFiles=Tradu��o
+pt_BR.TemplFiles=Modelos de Conta
+
+pt_BR.IconComment_GnuCash=Gerenciador Financeiro Livre GnuCash
+pt_BR.IconName_README=Mostrar LEIA-ME (README)
+pt_BR.IconComment_README=Mostra o arquivo LEIA-ME (README)
+pt_BR.IconFilename_README=LEIA-ME.win32-bin.txt
+pt_BR.IconName_FAQ=Perguntas Freq�entes (online, ingl�s)
+pt_BR.IconName_Bugzilla=Relatar um erro (online, ingl�s)
+pt_BR.IconName_InstallFQ=Instalar a Consulta de Pre�os Online
+pt_BR.IconComment_InstallFQ=Instala o m�dulo perl Finance-Quote, necess�rio para a busca de pre�os online. Requer ActivePerl 5.8/5.10.
+pt_BR.IconName_Uninstall=Desinstalar o GnuCash
+pt_BR.IconComment_Uninstall=Desinstala o Gerenciador Financeiro GnuCash
+
+;; ;;;;;;;;;;;;;;;;;
+;; Simplified Chinese translation
+
+zh_CN.FullInstall=ÍêÈ«°²×°
+zh_CN.CustomInstall=×Ô¶¨Òå°²×°
+zh_CN.CreateDesktopIcon=´´½¨×ÀÃæͼ±ê
+zh_CN.CreateMenuLink=´´½¨¿ªÊ¼²Ëµ¥Á´½Ó
+zh_CN.RunPrg=ÏÖÔÚ¿ªÊ¼ÔËÐÐ GnuCash
+zh_CN.AdditionalIcons=´´½¨ÕâЩͼ±ê
+zh_CN.StatusMsgFirewall=ÕýÔÚ°²×° Windows ·À»ðǽ¹æÔò...
+
+zh_CN.MainFiles=GnuCash ³ÌÐò
+zh_CN.TranslFiles=·ÒëÎļþ
+zh_CN.TemplFiles=»á¼Æ¿ÆÄ¿Ä£°åÎļþ
+
+zh_CN.IconComment_GnuCash=GnuCash Ãâ·Ñ²ÆÎñ¹ÜÀí
+zh_CN.IconName_README=ÏÔʾ×ÔÊöÎļþ
+zh_CN.IconComment_README=ÏÔʾ×ÔÊöÎļþ
+zh_CN.IconFilename_README=README-zh_CN.win32-bin.txt
+zh_CN.IconName_FAQ=³£¼ûÎÊÌâ (ÔÚÏß)
+zh_CN.IconName_Bugzilla=±¨¸æÈí¼þ Bug (ÔÚÏß)
+zh_CN.IconName_InstallFQ=°²×°ÔÚÏß¼Û¸ñ¼ìË÷¹¦ÄÜ
+zh_CN.IconComment_InstallFQ=°²×°ÔÚÏß¼Û¸ñ¼ìË÷Ëù±ØÐèµÄ Perl Finance-QuoteÄ£¿é¡£ÐèÒª ActivePerl 5.8 »ò 5.10
+zh_CN.IconName_Uninstall=жÔØ GnuCash
+zh_CN.IconComment_Uninstall=жÔزÆÎñ¹ÜÀíÈí¼þ GnuCash
+
+;; ;;;;;;;;;;;;;;;;;;;;
commit 5e49cc7434fe4679f583f72ce5205c2637269549
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Jun 1 14:22:34 2010 +0000
Fix script that builds the release tags. Awk works differently on windows than on linux apparently.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19216 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_tags.sh b/build_tags.sh
index 7300274..a2dd062 100644
--- a/build_tags.sh
+++ b/build_tags.sh
@@ -25,11 +25,11 @@ svn update
# If we don't have a tagfile then start from 'now'
tagfile=tags
if [ ! -f ${tagfile} ] ; then
- svn ls -v ${TAG_URL} | awk '/[^.]\/$/ { print $6$1 }' > ${tagfile}
+ svn ls -v ${TAG_URL} | awk '/[^.]\// { print $1"/"$6 }' > ${tagfile}
fi
# Figure out the new set of tags
-svn ls -v ${TAG_URL} | awk '/[^.]\/$/ { print $6$1 }' > ${tagfile}.new
+svn ls -v ${TAG_URL} | awk '/[^.]\// { print $1"/"$6 }' > ${tagfile}.new
tags="`diff --suppress-common-lines ${tagfile} ${tagfile}.new | grep '^> ' | sed -e 's/^> //g'`"
# move the new file into place
@@ -39,7 +39,8 @@ mv -f ${tagfile}.new ${tagfile}
# Now iterate over all the new tags (if any) and build a package
for tag_rev in $tags ; do
- tag=${tag_rev%/*}
+ tag=${tag_rev#*/}
+ tag=${tag%/*}
tagbasedir=/c/soft/gnucash-${tag}
tagdir=${tagbasedir}/gnucash
rm -fr $tagbasedir
commit d69f69a9d520d3f4eb52806c6cae59261dcacf60
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat May 29 16:36:13 2010 +0000
Win32 - Fix installation location of some files, reported by Tao Wang.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19210 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/dist-impl.sh b/dist-impl.sh
index 63f34ca..7f0f8e9 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -133,7 +133,7 @@ function dist_libgsf() {
mkdir -p $DIST_UDIR/bin
cp -a $_LIBGSF_UDIR/bin/libgsf*.dll $DIST_UDIR/bin
mkdir -p $DIST_UDIR/share
- cp -a $_LIBGSF_UDIR/share/locale $DIST_UDIR/lib
+ cp -a $_LIBGSF_UDIR/share/locale $DIST_UDIR/share
}
function dist_goffice() {
@@ -193,7 +193,7 @@ function dist_aqbanking() {
if [ "$AQBANKING3" != "yes" ]; then
cp -a ${_AQBANKING_UDIR}/share/aqhbci ${DIST_UDIR}/share
fi
- cp -a ${_AQBANKING_UDIR}/share/locale ${DIST_UDIR}/lib
+ cp -a ${_AQBANKING_UDIR}/share/locale ${DIST_UDIR}/share
}
function dist_libdbi() {
commit 885a0a70440c4666bd65c4aee0b9d18c67b4981d
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue May 25 21:35:50 2010 +0000
Fix encoding issues introduced in r19204
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19207 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/gnucash.iss.in b/gnucash.iss.in
index 4ee39f4..cfafd8b 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -503,27 +503,27 @@ pt_BR.IconComment_Uninstall=Desinstala o Gerenciador Financeiro GnuCash
;; ;;;;;;;;;;;;;;;;;
;; Simplified Chinese translation
-zh_CN.FullInstall=��ȫ��װ
-zh_CN.CustomInstall=�Զ��尲װ
-zh_CN.CreateDesktopIcon=��������ͼ��
-zh_CN.CreateMenuLink=������ʼ�˵�����
-zh_CN.RunPrg=���ڿ�ʼ���� GnuCash
-zh_CN.AdditionalIcons=������Щͼ��
-zh_CN.StatusMsgFirewall=���ڰ�װ Windows ����ǽ����...
-
-zh_CN.MainFiles=GnuCash ����
-zh_CN.TranslFiles=�����ļ�
-zh_CN.TemplFiles=��ƿ�Ŀģ���ļ�
-
-zh_CN.IconComment_GnuCash=GnuCash ��Ѳ������
-zh_CN.IconName_README=��ʾ�����ļ�
-zh_CN.IconComment_README=��ʾ�����ļ�
+zh_CN.FullInstall=ÍêÈ«°²×°
+zh_CN.CustomInstall=×Ô¶¨Òå°²×°
+zh_CN.CreateDesktopIcon=´´½¨×ÀÃæͼ±ê
+zh_CN.CreateMenuLink=´´½¨¿ªÊ¼²Ëµ¥Á´½Ó
+zh_CN.RunPrg=ÏÖÔÚ¿ªÊ¼ÔËÐÐ GnuCash
+zh_CN.AdditionalIcons=´´½¨ÕâЩͼ±ê
+zh_CN.StatusMsgFirewall=ÕýÔÚ°²×° Windows ·À»ðǽ¹æÔò...
+
+zh_CN.MainFiles=GnuCash ³ÌÐò
+zh_CN.TranslFiles=·ÒëÎļþ
+zh_CN.TemplFiles=»á¼Æ¿ÆÄ¿Ä£°åÎļþ
+
+zh_CN.IconComment_GnuCash=GnuCash Ãâ·Ñ²ÆÎñ¹ÜÀí
+zh_CN.IconName_README=ÏÔʾ×ÔÊöÎļþ
+zh_CN.IconComment_README=ÏÔʾ×ÔÊöÎļþ
zh_CN.IconFilename_README=README-zh_CN.win32-bin.txt
-zh_CN.IconName_FAQ=�������� (����)
-zh_CN.IconName_Bugzilla=������� Bug (����)
-zh_CN.IconName_InstallFQ=��װ���߼۸��������
-zh_CN.IconComment_InstallFQ=��װ���߼۸���������� Perl Finance-Quoteģ�顣��Ҫ ActivePerl 5.8 �� 5.10
-zh_CN.IconName_Uninstall=� GnuCash
-zh_CN.IconComment_Uninstall=ж�ز��������� GnuCash
+zh_CN.IconName_FAQ=³£¼ûÎÊÌâ (ÔÚÏß)
+zh_CN.IconName_Bugzilla=±¨¸æÈí¼þ Bug (ÔÚÏß)
+zh_CN.IconName_InstallFQ=°²×°ÔÚÏß¼Û¸ñ¼ìË÷¹¦ÄÜ
+zh_CN.IconComment_InstallFQ=°²×°ÔÚÏß¼Û¸ñ¼ìË÷Ëù±ØÐèµÄ Perl Finance-QuoteÄ£¿é¡£ÐèÒª ActivePerl 5.8 »ò 5.10
+zh_CN.IconName_Uninstall=жÔØ GnuCash
+zh_CN.IconComment_Uninstall=жÔزÆÎñ¹ÜÀíÈí¼þ GnuCash
;; ;;;;;;;;;;;;;;;;;;;;
commit 6de9051318990ab7c34a356c7bbdf9f0ee4c9617
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue May 25 20:20:52 2010 +0000
Bug #618646 - Should be able to run gnucash-bin.exe directly, rather than gnucash.cmd
Patch by Tao Wang.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19204 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/dist-impl.sh b/dist-impl.sh
index 6393062..63f34ca 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -223,8 +223,6 @@ function dist_gnucash() {
cp -a $_INSTALL_UDIR/etc/gconf/schemas/* $DIST_UDIR/etc/gconf/schemas
mkdir -p $DIST_UDIR/lib
cp -a $_INSTALL_UDIR/lib/lib*.la $DIST_UDIR/lib
- mkdir -p $DIST_UDIR/lib/gnucash
- cp -a $_INSTALL_UDIR/lib/gnucash/lib*.dll $DIST_UDIR/lib/gnucash
cp -a $_INSTALL_UDIR/libexec $DIST_UDIR
mkdir -p $DIST_UDIR/share
cp -a $_INSTALL_UDIR/share/{gnucash,locale} $DIST_UDIR/share
diff --git a/gnucash.iss.in b/gnucash.iss.in
index 3d2aea0..4ee39f4 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -41,17 +41,17 @@ Name: desktopicon; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm
Name: menuicon; Description: "{cm:CreateMenuLink}"; GroupDescription: "{cm:AdditionalIcons}"
[Icons]
-Name: "{group}\GnuCash"; Filename: "{app}\bin\gnucash.cmd"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: menuicon; Flags: runminimized
+Name: "{group}\GnuCash"; Filename: "{app}\bin\gnucash-bin.exe"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: menuicon; Flags: runminimized
Name: "{group}\{cm:IconName_README}"; Filename: "{app}\doc\gnucash\{cm:IconFilename_README}"; Comment: "{cm:IconComment_README}"; Tasks: menuicon
Name: "{group}\{cm:IconName_FAQ}"; Filename: "http://wiki.gnucash.org/wiki/FAQ"; Tasks: menuicon
Name: "{group}\{cm:IconName_Bugzilla}"; Filename: "http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash"; Tasks: menuicon
Name: "{group}\{cm:IconName_InstallFQ}"; Filename: "{app}\bin\install-fq-mods.cmd"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_InstallFQ}"; Tasks: menuicon
Name: "{group}\{cm:IconName_Uninstall}"; Filename: "{uninstallexe}"; Comment: "{cm:IconComment_Uninstall}"; Tasks: menuicon
-Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\gnucash.cmd"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: desktopicon; Flags: runminimized
+Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\gnucash-bin.exe"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: desktopicon; Flags: runminimized
[Run]
-Filename: "{app}\bin\gnucash.cmd"; Description: "{cm:RunPrg}"; WorkingDir: "{app}\bin"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent runhidden
+Filename: "{app}\bin\gnucash-bin.exe"; Description: "{cm:RunPrg}"; WorkingDir: "{app}\bin"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent runhidden
Filename: "{app}\bin\guile.cmd"; Parameters: "-c ""(use-modules (ice-9 slib)) (require 'printf)"""; Flags: runhidden
;; The Windows firewall exceptions, see http://www.vincenzo.net/isxkb/index.php?title=Adding_a_rule_to_the_Windows_firewall
Filename: "{sys}\netsh.exe"; Parameters: "firewall add allowedprogram ""{app}\bin\gnucash-bin.exe"" ""GnuCash Free Finance Manager"" ENABLE ALL"; StatusMsg: "{cm:StatusMsgFirewall}"; Flags: runhidden; MinVersion: 0,5.01.2600sp2;
@@ -72,7 +72,7 @@ Source: "@prefix@\..\dist\bin\*"; DestDir: "{app}\bin"; Flags: recursesubdirs ig
; Note: The above AfterInstall function will create the
; gnucash.cmd file on-the-fly by the Pascal script below.
-Source: "@prefix@\..\dist\etc\*"; DestDir: "{app}\etc"; Flags: recursesubdirs; Components: main
+Source: "@prefix@\..\dist\etc\*"; DestDir: "{app}\etc"; Flags: recursesubdirs; Components: main; AfterInstall: MyAfterInstallEtc()
Source: "@prefix@\..\dist\lib\*"; DestDir: "{app}\lib"; Flags: recursesubdirs; Components: main
Source: "@prefix@\..\dist\libexec\*"; DestDir: "{app}\libexec"; Flags: recursesubdirs; Components: main
Source: "@prefix@\..\dist\share\*"; DestDir: "{app}\share"; Flags: recursesubdirs; Components: main
@@ -114,7 +114,7 @@ Root: HKCR; Subkey: ".gnucash"; ValueType: string; ValueName: ""; ValueData: "Gn
Root: HKCR; Subkey: ".gnucash"; ValueType: string; ValueName: "Content Type"; ValueData: "application/x-gnucash"; Flags: uninsdeletevalue
Root: HKCR; Subkey: "GnuCash.Financial.Data"; ValueType: string; ValueName: ""; ValueData: "GnuCash Financial Data"; Flags: uninsdeletevalue
Root: HKCR; Subkey: "GnuCash.Financial.Data\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\share\gnucash\pixmaps\gnucash-icon.ico,0"
-Root: HKCR; Subkey: "GnuCash.Financial.Data\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\bin\gnucash.cmd"" ""%1"""
+Root: HKCR; Subkey: "GnuCash.Financial.Data\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\bin\gnucash-bin.exe"" ""%1"""
Root: HKLM; Subkey: "Software\GnuCash"; ValueType: none; Flags: uninsdeletekeyifempty
Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: none; Flags: uninsdeletekeyifempty
@@ -154,9 +154,11 @@ Root: HKLM; Subkey: "Software\AqBanking\Paths"; ValueType: string; ValueName: "c
[UninstallDelete]
Type: files; Name: "{app}\bin\gnucash.cmd"
Type: files; Name: "{app}\bin\guile.cmd"
+Type: files; Name: "{app}\etc\gnucash\environment"
Type: files; Name: "{app}\share\guile\1.6\slibcat"
Type: filesandordirs; Name: "{app}\share\guile"
Type: filesandordirs; Name: "{app}\etc\gconf"
+Type: dirifempty; Name: "{app}\etc\gnucash"
Type: dirifempty; Name: "{app}\etc"
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -224,6 +226,62 @@ begin
end;
+function BackslashPath(const S: String): String;
+begin
+ { Convert c:\soft to c:/soft }
+ Result := S;
+ StringChange(Result, '\', '/');
+end;
+
+procedure MyAfterInstallEtc();
+var
+ FileName, FileString, appdir, libdir, pkglibdir, pkgdatadir: String;
+ Res: Boolean;
+begin
+
+ { Get the installation-specific paths }
+ appdir := BackslashPath( ExpandConstant('{app}') );
+ libdir := BackslashPath( appdir + '/lib' );
+ pkglibdir := BackslashPath( appdir + '/bin' );
+ pkgdatadir := BackslashPath( appdir + '/share/gnucash' );
+
+ { Create the etc/gnucash/environment file; #10 is the linefeed character and #13 CR }
+
+ { If you make any changes here, you should probably also change the equivalent sections }
+ { in packaging/win32/install.sh, src/bin/environment*.in and src/bin/gnucash-setup-env-osx.in }
+ FileName := appdir + '\etc\gnucash\environment' ;
+
+
+ FileString := '# environment'#13#10 ;
+ FileString := FileString + '#'#13#10 ;
+ FileString := FileString + '# This configuration file can be used to change/add'#13#10 ;
+ FileString := FileString + '# environment variables during GnuCash startup.'#13#10 ;
+ FileString := FileString + '#'#13#10 ;
+
+ FileString := FileString + '[Variables]'#13#10 ;
+ FileString := FileString + 'PATH=' + appdir + '/bin;' + libdir + ';' + pkglibdir + ';{PATH}'#13#10 ;
+ FileString := FileString + 'SCHEME_LIBRARY_PATH='#13#10 ;
+ FileString := FileString + 'GNC_MODULE_PATH=' + pkglibdir + ''#13#10 ;
+ FileString := FileString + 'GUILE_LOAD_PATH=' + pkgdatadir + '/guile-modules;' + pkgdatadir + '/scm;' + appdir + '/share/guile/1.6;{GUILE_LOAD_PATH}'#13#10 ;
+ FileString := FileString + 'EXTRA_LIBS={GNC_MODULE_PATH}'#13#10 ;
+ FileString := FileString + 'LD_LIBRARY_PATH={EXTRA_LIBS};{LD_LIBRARY_PATH}'#13#10 ;
+ FileString := FileString + 'DYLD_LIBRARY_PATH={EXTRA_LIBS};{DYLD_LIBRARY_PATH}'#13#10 ;
+ FileString := FileString + 'LTDL_LIBRARY_PATH=' + libdir + ''#13#10 ;
+ FileString := FileString + 'QOF_LIB_DIR=' + pkglibdir + ''#13#10 ;
+ FileString := FileString + 'GNC_DBD_DIR=' + libdir + '/dbd'#13#10 ;
+ FileString := FileString + 'GNC_STANDARD_REPORTS_DIR=' + pkgdatadir + '/guile-modules/gnucash/report/standard-reports'#13#10 ;
+ FileString := FileString + 'GUILE_WARN_DEPRECATED=no'#13#10 ;
+
+ { Save the final file }
+ Res := ForceDirectories(appdir + '\etc\gnucash');
+ if Res = False then
+ MsgBox('Error on creating '+appdir+'\etc\gnucash for completing the installation', mbInformation, MB_OK);
+
+ Res := SaveStringToFile(FileName, FileString, False);
+ if Res = False then
+ MsgBox('Error on saving '+FileName+' for completing the installation', mbInformation, MB_OK);
+end;
+
[Languages]
Name: "en"; MessagesFile: "compiler:Default.isl"
Name: "de"; MessagesFile: "compiler:Languages\German.isl"; InfoAfterFile: "@prefix@\share\@PACKAGE@\doc\README-de.win32-bin.txt"
@@ -445,27 +503,27 @@ pt_BR.IconComment_Uninstall=Desinstala o Gerenciador Financeiro GnuCash
;; ;;;;;;;;;;;;;;;;;
;; Simplified Chinese translation
-zh_CN.FullInstall=ÍêÈ«°²×°
-zh_CN.CustomInstall=×Ô¶¨Òå°²×°
-zh_CN.CreateDesktopIcon=´´½¨×ÀÃæͼ±ê
-zh_CN.CreateMenuLink=´´½¨¿ªÊ¼²Ëµ¥Á´½Ó
-zh_CN.RunPrg=ÏÖÔÚ¿ªÊ¼ÔËÐÐ GnuCash
-zh_CN.AdditionalIcons=´´½¨ÕâЩͼ±ê
-zh_CN.StatusMsgFirewall=ÕýÔÚ°²×° Windows ·À»ðǽ¹æÔò...
-
-zh_CN.MainFiles=GnuCash ³ÌÐò
-zh_CN.TranslFiles=·ÒëÎļþ
-zh_CN.TemplFiles=»á¼Æ¿ÆÄ¿Ä£°åÎļþ
-
-zh_CN.IconComment_GnuCash=GnuCash Ãâ·Ñ²ÆÎñ¹ÜÀí
-zh_CN.IconName_README=ÏÔʾ×ÔÊöÎļþ
-zh_CN.IconComment_README=ÏÔʾ×ÔÊöÎļþ
+zh_CN.FullInstall=��ȫ��װ
+zh_CN.CustomInstall=�Զ��尲װ
+zh_CN.CreateDesktopIcon=��������ͼ��
+zh_CN.CreateMenuLink=������ʼ�˵�����
+zh_CN.RunPrg=���ڿ�ʼ���� GnuCash
+zh_CN.AdditionalIcons=������Щͼ��
+zh_CN.StatusMsgFirewall=���ڰ�װ Windows ����ǽ����...
+
+zh_CN.MainFiles=GnuCash ����
+zh_CN.TranslFiles=�����ļ�
+zh_CN.TemplFiles=��ƿ�Ŀģ���ļ�
+
+zh_CN.IconComment_GnuCash=GnuCash ��Ѳ������
+zh_CN.IconName_README=��ʾ�����ļ�
+zh_CN.IconComment_README=��ʾ�����ļ�
zh_CN.IconFilename_README=README-zh_CN.win32-bin.txt
-zh_CN.IconName_FAQ=³£¼ûÎÊÌâ (ÔÚÏß)
-zh_CN.IconName_Bugzilla=±¨¸æÈí¼þ Bug (ÔÚÏß)
-zh_CN.IconName_InstallFQ=°²×°ÔÚÏß¼Û¸ñ¼ìË÷¹¦ÄÜ
-zh_CN.IconComment_InstallFQ=°²×°ÔÚÏß¼Û¸ñ¼ìË÷Ëù±ØÐèµÄ Perl Finance-QuoteÄ£¿é¡£ÐèÒª ActivePerl 5.8 »ò 5.10
-zh_CN.IconName_Uninstall=жÔØ GnuCash
-zh_CN.IconComment_Uninstall=жÔزÆÎñ¹ÜÀíÈí¼þ GnuCash
+zh_CN.IconName_FAQ=�������� (����)
+zh_CN.IconName_Bugzilla=������� Bug (����)
+zh_CN.IconName_InstallFQ=��װ���߼۸��������
+zh_CN.IconComment_InstallFQ=��װ���߼۸���������� Perl Finance-Quoteģ�顣��Ҫ ActivePerl 5.8 �� 5.10
+zh_CN.IconName_Uninstall=� GnuCash
+zh_CN.IconComment_Uninstall=ж�ز��������� GnuCash
;; ;;;;;;;;;;;;;;;;;;;;
diff --git a/install-impl.sh b/install-impl.sh
index 7f3350f..c2fcca2 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1377,7 +1377,7 @@ function make_install() {
# correct the 'dlname' in the libtool archives. We do not use these
# files to dlopen the modules, so actually this is unneeded.
# Also, in all installed .la files, remove the dependency_libs line
- mv bin/*.dll gnucash 2>/dev/null || true
+ mv bin/*.dll gnucash/*.dll $_INSTALL_UDIR/bin 2>/dev/null || true
for A in gnucash/*.la; do
sed '/dependency_libs/d;s#../bin/##' $A > tmp ; mv tmp $A
done
commit 6e022a5f7139d42a9b6d378c71b2035c28ecda57
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu May 20 20:02:35 2010 +0000
Win32 use up-to-date configure parameters for aqbanking
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19190 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-impl.sh b/install-impl.sh
index 77ae09e..7f3350f 100755
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1300,7 +1300,7 @@ function inst_gnucash() {
mkdir -p $_BUILD_UDIR
add_to_env $_INSTALL_UDIR/bin PATH
- AQBANKING_OPTIONS="--enable-hbci --with-aqbanking-dir=${_AQBANKING_UDIR}"
+ AQBANKING_OPTIONS="--enable-aqbanking"
AQBANKING_UPATH="${_OPENSSL_UDIR}/bin:${_GWENHYWFAR_UDIR}/bin:${_AQBANKING_UDIR}/bin"
LIBOFX_OPTIONS="--enable-ofx --with-ofx-prefix=${_LIBOFX_UDIR}"
commit d3caaa7b0b6598c9483cfdf3e68a98e874edecfa
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu May 20 08:08:35 2010 +0000
Bug #618505 - Separate shell functions files from variables and steps files, patch by Yasuaki Taniguchi
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19184 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/custom.sh.sample b/custom.sh.sample
new file mode 100644
index 0000000..a4745ee
--- /dev/null
+++ b/custom.sh.sample
@@ -0,0 +1,19 @@
+#! /bin/bash
+# This is an example custom.sh file. Copy this file to custom.sh and
+# edit it.
+#
+# Note: All directories must be without spaces!
+#
+# REPOS_URL="svn+ssh://<dev>@svn.gnucash.org/repo/gnucash/trunk"
+# SF_MIRROR="http://switch.dl.sourceforge.net/sourceforge"
+# DISABLE_OPTIMIZATIONS=yes
+# AQBANKING_WITH_QT=no
+# GLOBAL_DIR=Z:\\mydir # all directories will use this
+# WGET_RATE=50k #limit download bandwith to 50KB/s
+# NO_SAVE_PROFILE=yes # don't save env settings to /etc/profile.d
+# late_eval 'INSTALL_DIR=$GNUCASH_DIR\\myinst' # no need to define GNUCASH_DIR
+# block_step inst_docs
+# late_eval 'add_step greetings'
+# function greetings() { setup Greetings; }
+# QTDIR=c:\\Qt\\4.2.3
+# CROSS_COMPILE=yes
diff --git a/defaults.sh b/defaults.sh
index 58ddd9e..0eb2268 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -1,7 +1,7 @@
#!/bin/sh # for emacs
#
-# Instead of just editing this file, it is recommended to create a file `custom.sh'
-# in the same directory that will be read in at the beginning of this script.
+# Don't edit this file directly. Edit `custom.sh' in the same directory
+# instead. That will be read in at the beginning of this script.
#
# You can use the full power of bash 2.04 scripting. In particular, you can
# set any variable mentioned here to something non-empty and it will not be
@@ -9,27 +9,8 @@
# yourself. Expressions registered with late_eval are executed at the end of
# the script.
#
-# Steps will be executed in the order they were added. They can only be added
-# at most once if they have not been blocked already (adding implies blocking).
-# To add a custom step <s>, just implement "function <s>()". Keep in mind that
-# blocking or reordering may render install.sh & friends non-functional.
-#
# Note: All directories must be without spaces!
#
-# Here is an example custom.sh file:
-#
-# REPOS_URL="svn+ssh://<dev>@svn.gnucash.org/repo/gnucash/trunk"
-# SF_MIRROR="http://switch.dl.sourceforge.net/sourceforge"
-# DISABLE_OPTIMIZATIONS=yes
-# AQBANKING_WITH_QT=no
-# GLOBAL_DIR=Z:\\mydir # all directories will use this
-# WGET_RATE=50k #limit download bandwith to 50KB/s
-# NO_SAVE_PROFILE=yes # don't save env settings to /etc/profile.d
-# late_eval 'INSTALL_DIR=$GNUCASH_DIR\\myinst' # no need to define GNUCASH_DIR
-# block_step inst_docs
-# late_eval 'add_step greetings'
-# function greetings() { setup Greetings; }
-
[ "$__SOURCED_DEFAULTS" ] && return
__SOURCED_DEFAULTS=1
@@ -388,71 +369,8 @@ set_default DOCS_REV "HEAD"
set_default DOCS_URL "http://svn.gnucash.org/repo/gnucash-docs/trunk"
set_default DOCS_DIR $GLOBAL_DIR\\gnucash-docs
set_default XSLTPROCFLAGS ""
-##
-
-# There is no reason to ever need to comment these out!
-# * commented out glade, as it is not needed to run gnucash
-add_step prepare
-if [ "$CROSS_COMPILE" != "yes" ]; then
- add_step inst_wget
- add_step inst_dtk
- add_step inst_unzip
-fi
-add_step inst_mingw
-add_step inst_regex
-add_step inst_readline
-if [ "$CROSS_COMPILE" != "yes" ]; then
- add_step inst_active_perl
- add_step inst_mingwutils
-fi
-add_step inst_autotools
-if [ "$AQBANKING3" = "yes" ]; then
- add_step inst_gmp
-fi
-add_step inst_guile
-if [ "$CROSS_COMPILE" != "yes" ]; then
- add_step inst_svn
- if [ "$AQBANKING3" != "yes" ]; then
- add_step inst_openssl
- fi
-fi
-add_step inst_exetype
-add_step inst_libxslt
-add_step inst_gnome
-if [ "$AQBANKING3" = "yes" ]; then
- add_step inst_gnutls
-fi
-add_step inst_swig
-add_step inst_pcre
-add_step inst_libbonoboui
-add_step inst_libgsf
-if [ "$CROSS_COMPILE" != "yes" ]; then
- add_step inst_hh
-fi
-add_step inst_goffice
-#add_step inst_glade
-add_step inst_opensp
-add_step inst_libofx
-## Online banking:
-add_step inst_gwenhywfar
-add_step inst_ktoblzcheck
-add_step inst_aqbanking
-add_step inst_libdbi
-add_step inst_webkit
-##
-if [ "$UPDATE_SOURCES" = "yes" ]; then
- add_step svn_up
-fi
-if [ "$WITH_CUTECASH" = "yes" ]; then
- add_step inst_cmake
- add_step inst_cutecash
-fi
-add_step inst_gnucash
-add_step inst_docs
-if [ "$CROSS_COMPILE" != "yes" ]; then
- add_step inst_inno
-fi
-add_step finish
-# run commands registered with late_eval
-eval_now
+### Local Variables: ***
+### sh-basic-offset: 4 ***
+### indent-tabs-mode: nil ***
+### End: ***
diff --git a/dist.sh b/dist-impl.sh
similarity index 94%
copy from dist.sh
copy to dist-impl.sh
index a4936f6..6393062 100755
--- a/dist.sh
+++ b/dist-impl.sh
@@ -1,18 +1,9 @@
#!/bin/sh
+#
+# GnuCash shellscript functions for dist.sh
+#
-set -e
-
-function qpushd() { pushd "$@" >/dev/null; }
-function qpopd() { popd >/dev/null; }
-function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
-
-qpushd "$(dirname $(unix_path "$0"))"
-. functions.sh
-. defaults.sh
-
-register_env_var PATH ":"
-
-function prepare() {
+function dist_prepare() {
# this directory is hardcoded in gnucash.iss.in
DIST_DIR=${INSTALL_DIR}\\..\\dist
DIST_UDIR=`unix_path $DIST_DIR`
@@ -249,7 +240,7 @@ function dist_gnucash() {
-e "s#@-aqbanking_so_effective-@#${_AQBANKING_SO_EFFECTIVE}#g"
}
-function finish() {
+function dist_finish() {
for file in $DIST_UDIR/etc/gconf/schemas/*.schemas; do
echo -n "Installing $file ... "
gconftool-2 \
@@ -292,32 +283,6 @@ function finish() {
fi
}
-prepare
-dist_regex
-dist_autotools
-dist_guile
-dist_gnome
-dist_pcre
-dist_libbonoboui
-dist_libgsf
-dist_goffice
-dist_libofx
-if [ "$AQBANKING3" != "yes" ]; then
- dist_openssl
-else
- dist_gnutls
- dist_gmp
-fi
-dist_gwenhywfar
-dist_ktoblzcheck
-dist_aqbanking
-dist_libdbi
-dist_webkit
-dist_gnucash
-finish
-qpopd
-
-
### Local Variables: ***
### sh-basic-offset: 4 ***
### indent-tabs-mode: nil ***
diff --git a/dist.sh b/dist.sh
index a4936f6..14e59f1 100755
--- a/dist.sh
+++ b/dist.sh
@@ -9,312 +9,43 @@ function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
qpushd "$(dirname $(unix_path "$0"))"
. functions.sh
. defaults.sh
+. dist-impl.sh
+# variables
register_env_var PATH ":"
-function prepare() {
- # this directory is hardcoded in gnucash.iss.in
- DIST_DIR=${INSTALL_DIR}\\..\\dist
- DIST_UDIR=`unix_path $DIST_DIR`
- DIST_WFSDIR=`win_fs_path $DIST_DIR`
- TMP_UDIR=`unix_path $TMP_DIR`
- if [ -x $DIST_DIR ]; then
- die "Please remove ${DIST_DIR} first"
- fi
- if [ x$AQBANKING_WITH_QT != xyes ]; then
- die "The aqbanking wizard is required to create the Windows installer.
-Please set AQBANKING_WITH_QT to yes and rerun install.sh first."
- fi
- _UNZIP_UDIR=`unix_path $UNZIP_DIR`
- _AUTOTOOLS_UDIR=`unix_path $AUTOTOOLS_DIR`
- _GUILE_UDIR=`unix_path $GUILE_DIR`
- _WIN_UDIR=`unix_path $WINDIR`
- _EXETYPE_UDIR=`unix_path $EXETYPE_DIR`
- _GNOME_UDIR=`unix_path $GNOME_DIR`
- _PCRE_UDIR=`unix_path $PCRE_DIR`
- _LIBBONOBOUI_UDIR=`unix_path $LIBBONOBOUI_DIR`
- _LIBGSF_UDIR=`unix_path $LIBGSF_DIR`
- _GOFFICE_UDIR=`unix_path $GOFFICE_DIR`
- _OPENSP_UDIR=`unix_path $OPENSP_DIR`
- _LIBOFX_UDIR=`unix_path $LIBOFX_DIR`
- _GMP_UDIR=`unix_path $GMP_DIR`
- _GNUTLS_UDIR=`unix_path $GNUTLS_DIR`
- _GWENHYWFAR_UDIR=`unix_path $GWENHYWFAR_DIR`
- _AQBANKING_UDIR=`unix_path $AQBANKING_DIR`
- _SQLITE3_UDIR=`unix_path ${SQLITE3_DIR}`
- _MYSQL_LIB_UDIR=`unix_path ${MYSQL_LIB_DIR}`
- _PGSQL_UDIR=`unix_path ${PGSQL_DIR}`
- _LIBDBI_UDIR=`unix_path ${LIBDBI_DIR}`
- _LIBDBI_DRIVERS_UDIR=`unix_path ${LIBDBI_DRIVERS_DIR}`
- _LIBGDA_UDIR=`unix_path $LIBGDA_DIR`
- _GNUCASH_UDIR=`unix_path $GNUCASH_DIR`
- _REPOS_UDIR=`unix_path $REPOS_DIR`
- _BUILD_UDIR=`unix_path $BUILD_DIR`
- _INSTALL_UDIR=`unix_path $INSTALL_DIR`
- _INNO_UDIR=`unix_path $INNO_DIR`
- _WEBKIT_UDIR=`unix_path $WEBKIT_DIR`
- add_to_env $_UNZIP_UDIR/bin PATH # unzip
- add_to_env $_GNOME_UDIR/bin PATH # gconftool-2
- add_to_env $_EXETYPE_UDIR/bin PATH # exetype
-}
-
-function dist_regex() {
- setup RegEx
- smart_wget $REGEX_URL $DOWNLOAD_DIR
- unzip -q $LAST_FILE bin/libgnurx-0.dll -d $DIST_DIR
-}
-
-function dist_autotools() {
- setup Autotools
- mkdir -p $DIST_UDIR/bin
- cp -a $_AUTOTOOLS_UDIR/bin/*.dll $DIST_UDIR/bin
-}
-
-function dist_guile() {
- setup Guile
- mkdir -p $DIST_UDIR/bin
- cp -a $_GUILE_UDIR/bin/libguile{.,-ltdl.,-srfi}*dll $DIST_UDIR/bin
- cp -a $_GUILE_UDIR/bin/guile.exe $DIST_UDIR/bin
- mkdir -p $DIST_UDIR/share
- cp -a $_GUILE_UDIR/share/guile $DIST_UDIR/share
- [ -f $DIST_UDIR/share/guile/1.6/slibcat ] && rm $DIST_UDIR/share/guile/1.6/slibcat
-}
-
-function dist_openssl() {
- setup OpenSSL
- _OPENSSL_UDIR=`unix_path $OPENSSL_DIR`
- mkdir -p $DIST_UDIR/bin
- cp -a $_OPENSSL_UDIR/bin/*.dll $DIST_UDIR/bin
-}
-
-function dist_gnome() {
- setup Gnome platform
- wget_unpacked $LIBXML2_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $GETTEXT_RUNTIME_URL $DOWNLOAD_DIR $DIST_DIR
- smart_wget $LIBICONV_URL $DOWNLOAD_DIR
- unzip -q $LAST_FILE bin/iconv.dll -d $DIST_DIR
- wget_unpacked $GLIB_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $LIBJPEG_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $LIBPNG_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $LIBTIFF_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $ZLIB_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $CAIRO_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $EXPAT_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $FONTCONFIG_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $FREETYPE_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $ATK_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $PANGO_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $LIBART_LGPL_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $GTK_URL $DOWNLOAD_DIR $DIST_DIR
- cp $DIST_DIR/share/themes/MS-Windows/gtk-2.0/gtkrc $DIST_DIR/etc/gtk-2.0
- wget_unpacked $ORBIT2_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $GAIL_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $POPT_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $GCONF_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $LIBBONOBO_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $GNOME_VFS_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $LIBGNOME_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $LIBGNOMECANVAS_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $LIBBONOBOUI_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $LIBGNOMEUI_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $LIBGLADE_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $PIXMAN_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $GTKHTML_URL $DOWNLOAD_DIR $DIST_DIR
- rm -rf $DIST_UDIR/etc/gconf/gconf.xml.defaults/{desktop,schemas}
- cp -a $DIST_UDIR/lib/locale $DIST_UDIR/share
- rm -rf $DIST_UDIR/lib/locale
-}
-
-function dist_pcre() {
- setup pcre
- mkdir -p $DIST_UDIR/bin
- cp -a $_PCRE_UDIR/bin/pcre3.dll $DIST_UDIR/bin
-}
-
-function dist_libbonoboui() {
- setup libbonoboui
- mkdir -p $DIST_UDIR/bin
- cp -a $_LIBBONOBOUI_UDIR/bin/libbonoboui*.dll $DIST_UDIR/bin
-}
-
-function dist_libgsf() {
- setup libGSF
- mkdir -p $DIST_UDIR/bin
- cp -a $_LIBGSF_UDIR/bin/libgsf*.dll $DIST_UDIR/bin
- mkdir -p $DIST_UDIR/share
- cp -a $_LIBGSF_UDIR/share/locale $DIST_UDIR/lib
-}
-
-function dist_goffice() {
- setup GOffice
- mkdir -p $DIST_UDIR/bin
- cp -a $_GOFFICE_UDIR/bin/libgoffice*.dll $DIST_UDIR/bin
- mkdir -p $DIST_UDIR/lib
- cp -a $_GOFFICE_UDIR/lib/goffice $DIST_UDIR/lib
- mkdir -p $DIST_UDIR/share
- cp -a $_GOFFICE_UDIR/share/{goffice,locale,pixmaps} $DIST_UDIR/share
-}
-
-function dist_libofx() {
- setup OpenSP and LibOFX
- cp -a ${_OPENSP_UDIR}/bin/*.dll ${DIST_UDIR}/bin
- cp -a ${_OPENSP_UDIR}/share/OpenSP ${DIST_UDIR}/share
- cp -a ${_LIBOFX_UDIR}/bin/*.dll ${DIST_UDIR}/bin
- cp -a ${_LIBOFX_UDIR}/bin/*.exe ${DIST_UDIR}/bin
- cp -a ${_LIBOFX_UDIR}/share/libofx ${DIST_UDIR}/share
-}
-
-function dist_gnutls() {
- setup gnutls
- cp -a ${_GNUTLS_UDIR}/bin/*.dll ${DIST_UDIR}/bin
- cp -a ${_GNUTLS_UDIR}/bin/*.exe ${DIST_UDIR}/bin
-}
-
-function dist_gmp() {
- setup gmp
- cp -a ${_GMP_UDIR}/bin/*.dll ${DIST_UDIR}/bin
-}
-
-function dist_gwenhywfar() {
- setup gwenhywfar
- cp -a ${_GWENHYWFAR_UDIR}/bin/*.dll ${DIST_UDIR}/bin
- mkdir -p ${DIST_UDIR}/etc
- if [ "$AQBANKING3" != "yes" ]; then
- cp -a ${_GWENHYWFAR_UDIR}/etc/* ${DIST_UDIR}/etc
- fi
- cp -a ${_GWENHYWFAR_UDIR}/lib/gwenhywfar ${DIST_UDIR}/lib
- mkdir -p ${DIST_UDIR}/share/gwenhywfar
- cp -a ${_GWENHYWFAR_UDIR}/share/gwenhywfar/ca-bundle.crt ${DIST_UDIR}/share/gwenhywfar
-}
-
-function dist_ktoblzcheck() {
- setup ktoblzcheck
- # dll is already copied in dist_gwenhywfar
- cp -a ${_GWENHYWFAR_UDIR}/share/ktoblzcheck ${DIST_UDIR}/share
-}
-
-function dist_aqbanking() {
- setup aqbanking
- cp -a ${_AQBANKING_UDIR}/bin/*.exe ${DIST_UDIR}/bin
- cp -a ${_AQBANKING_UDIR}/bin/*.dll ${DIST_UDIR}/bin
- cp -a ${_AQBANKING_UDIR}/lib/aqbanking ${DIST_UDIR}/lib
- cp -a ${_AQBANKING_UDIR}/share/aqbanking ${DIST_UDIR}/share
- if [ "$AQBANKING3" != "yes" ]; then
- cp -a ${_AQBANKING_UDIR}/share/aqhbci ${DIST_UDIR}/share
- fi
- cp -a ${_AQBANKING_UDIR}/share/locale ${DIST_UDIR}/lib
-}
-
-function dist_libdbi() {
- setup LibDBI
- cp -a ${_SQLITE3_UDIR}/bin/* ${DIST_UDIR}/bin
- cp -a ${_SQLITE3_UDIR}/lib/* ${DIST_UDIR}/lib
- cp -a ${_MYSQL_LIB_UDIR}/bin/* ${DIST_UDIR}/bin
- cp -a ${_MYSQL_LIB_UDIR}/lib/* ${DIST_UDIR}/lib
- cp -a ${_PGSQL_UDIR}/bin/* ${DIST_UDIR}/bin
- cp -a ${_PGSQL_UDIR}/lib/* ${DIST_UDIR}/lib
- cp -a ${_LIBDBI_UDIR}/bin/* ${DIST_UDIR}/bin
- cp -a ${_LIBDBI_UDIR}/lib/* ${DIST_UDIR}/lib
- mkdir ${DIST_UDIR}/lib/dbd
- cp -a ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/* ${DIST_UDIR}/lib/dbd
-}
-
-function dist_webkit() {
- setup WebKit
- cp -a ${_WEBKIT_UDIR}/bin/* ${DIST_UDIR}/bin
-}
-
-function dist_gnucash() {
- setup GnuCash
- mkdir -p $DIST_UDIR/bin
- cp -a $_INSTALL_UDIR/bin/* $DIST_UDIR/bin
- mkdir -p $DIST_UDIR/etc/gconf/schemas
- cp -a $_INSTALL_UDIR/etc/gconf/schemas/* $DIST_UDIR/etc/gconf/schemas
- mkdir -p $DIST_UDIR/lib
- cp -a $_INSTALL_UDIR/lib/lib*.la $DIST_UDIR/lib
- mkdir -p $DIST_UDIR/lib/gnucash
- cp -a $_INSTALL_UDIR/lib/gnucash/lib*.dll $DIST_UDIR/lib/gnucash
- cp -a $_INSTALL_UDIR/libexec $DIST_UDIR
- mkdir -p $DIST_UDIR/share
- cp -a $_INSTALL_UDIR/share/{gnucash,locale} $DIST_UDIR/share
- cp -a $_REPOS_UDIR/packaging/win32/install-fq-mods.cmd $DIST_UDIR/bin
-
- _QTDIR_WIN=$(unix_path $QTDIR | sed 's,^/\([A-Za-z]\)/,\1:/,g' )
- _AQBANKING_SO_EFFECTIVE=$(awk '/AQBANKING_SO_EFFECTIVE / { print $3 }' ${_AQBANKING_UDIR}/include/aqbanking/version.h )
- _GWENHYWFAR_SO_EFFECTIVE=$(awk '/GWENHYWFAR_SO_EFFECTIVE / { print $3 }' ${_GWENHYWFAR_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"
-}
-
-function finish() {
- for file in $DIST_UDIR/etc/gconf/schemas/*.schemas; do
- echo -n "Installing $file ... "
- gconftool-2 \
- --config-source=xml:merged:${DIST_WFSDIR}/etc/gconf/gconf.xml.defaults \
- --install-schema-file $file >/dev/null
- echo "done"
- done
- gconftool-2 --shutdown
-
- mv $DIST_UDIR/libexec/gconfd-2.exe $DIST_UDIR/bin
- exetype $DIST_UDIR/bin/gconfd-2.exe windows
- cp $_INSTALL_UDIR/bin/redirect.exe $DIST_UDIR/libexec/gconfd-2.exe
-
- if [ "$AQBANKING_WITH_QT" = "yes" ]; then
- assert_one_dir ${DIST_UDIR}/lib/aqbanking/plugins/*/wizards
- _qt3_wizard_path=`ls ${DIST_UDIR}/lib/aqbanking/plugins/*/wizards/qt3-wizard.exe`
- mv ${_qt3_wizard_path} $DIST_UDIR/bin
- cp $_INSTALL_UDIR/bin/redirect.exe ${_qt3_wizard_path}
- fi
-
- # Strip redirections in distributed libtool .la files
- for file in $DIST_UDIR/lib/*.la; do
- cat $file | sed 's,^libdir=,#libdir=,' > $file.new
- mv $file.new $file
- done
-
- echo "Now running the Inno Setup Compiler for creating the setup.exe"
- ${_INNO_UDIR}/iscc //Q ${_GNUCASH_UDIR}/gnucash.iss
-
- if [ "$BUILD_FROM_TARBALL" = "no" ]; then
- # And changing output filename
- PKG_VERSION=`grep PACKAGE_VERSION ${_BUILD_UDIR}/config.h | cut -d" " -f3 | cut -d\" -f2 `
- SVN_REV=`grep GNUCASH_SVN_REV ${_BUILD_UDIR}/src/gnome-utils/gnc-svninfo.h | cut -d" " -f3 | cut -d\" -f2 `
- SETUP_FILENAME="gnucash-${PKG_VERSION}-svn-r${SVN_REV}-setup.exe"
- qpushd ${_GNUCASH_UDIR}
- mv gnucash-${PKG_VERSION}-setup.exe ${SETUP_FILENAME}
- qpopd
- echo "Final resulting Setup program is:"
- echo ${_GNUCASH_UDIR}/${SETUP_FILENAME}
- fi
-}
-
-prepare
-dist_regex
-dist_autotools
-dist_guile
-dist_gnome
-dist_pcre
-dist_libbonoboui
-dist_libgsf
-dist_goffice
-dist_libofx
+# steps
+add_step dist_prepare
+add_step dist_regex
+add_step dist_autotools
+add_step dist_guile
+add_step dist_gnome
+add_step dist_pcre
+add_step dist_libbonoboui
+add_step dist_libgsf
+add_step dist_goffice
+add_step dist_libofx
if [ "$AQBANKING3" != "yes" ]; then
- dist_openssl
+ add_step dist_openssl
else
- dist_gnutls
- dist_gmp
+ add_step dist_gnutls
+ add_step dist_gmp
fi
-dist_gwenhywfar
-dist_ktoblzcheck
-dist_aqbanking
-dist_libdbi
-dist_webkit
-dist_gnucash
-finish
+add_step dist_gwenhywfar
+add_step dist_ktoblzcheck
+add_step dist_aqbanking
+add_step dist_libdbi
+add_step dist_webkit
+add_step dist_gnucash
+add_step dist_finish
+
+# run commands registered with late_eval
+eval_now
+
+for step in "${steps[@]}" ; do
+ eval $step
+done
+
qpopd
diff --git a/install.sh b/install-impl.sh
old mode 100644
new mode 100755
similarity index 97%
copy from install.sh
copy to install-impl.sh
index 5e50914..77ae09e
--- a/install.sh
+++ b/install-impl.sh
@@ -1,52 +1,9 @@
#!/bin/sh
+#
+# GnuCash shellscript functions for install.sh
+#
-[ ! "$BASH" -a -x /bin/bash ] && exec /bin/bash "$0" "$@"
-
-set -e
-
-echo -n "Build Starting at "
-date
-
-function qpushd() { pushd "$@" >/dev/null; }
-function qpopd() { popd >/dev/null; }
-function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
-
-qpushd "$(dirname $(unix_path "$0"))"
-. ./functions.sh
-. ./defaults.sh
-
-register_env_var ACLOCAL_FLAGS " "
-register_env_var AUTOTOOLS_CPPFLAGS " "
-register_env_var AUTOTOOLS_LDFLAGS " "
-register_env_var GMP_CPPFLAGS " "
-register_env_var GMP_LDFLAGS " "
-register_env_var GNOME_CPPFLAGS " "
-register_env_var GNOME_LDFLAGS " "
-register_env_var GNUTLS_CPPFLAGS " "
-register_env_var GNUTLS_LDFLAGS " "
-register_env_var GUILE_LOAD_PATH ";"
-register_env_var GUILE_CPPFLAGS " "
-register_env_var GUILE_LDFLAGS " "
-register_env_var HH_CPPFLAGS " "
-register_env_var HH_LDFLAGS " "
-register_env_var INTLTOOL_PERL " "
-register_env_var LIBDBI_CPPFLAGS " "
-register_env_var LIBDBI_LDFLAGS " "
-register_env_var KTOBLZCHECK_CPPFLAGS " "
-register_env_var KTOBLZCHECK_LDFLAGS " "
-register_env_var PATH ":"
-register_env_var PCRE_CPPFLAGS " "
-register_env_var PCRE_LDFLAGS " "
-register_env_var PKG_CONFIG ":" ""
-register_env_var PKG_CONFIG_PATH ":"
-register_env_var READLINE_CPPFLAGS " "
-register_env_var READLINE_LDFLAGS " "
-register_env_var REGEX_CPPFLAGS " "
-register_env_var REGEX_LDFLAGS " "
-register_env_var WEBKIT_CFLAGS " "
-register_env_var WEBKIT_LIBS " "
-
-function prepare() {
+function inst_prepare() {
# Necessary so that intltoolize doesn't come up with some
# foolish AC_CONFIG_AUX_DIR; bug#362006
# We cannot simply create install-sh in the repository, because
@@ -1541,7 +1498,7 @@ function inst_docs() {
qpopd
}
-function finish() {
+function inst_finish() {
setup Finish...
if [ "$NO_SAVE_PROFILE" != "yes" ]; then
_NEW=x
@@ -1581,14 +1538,6 @@ function finish() {
fi
}
-for step in "${steps[@]}" ; do
- eval $step
-done
-qpopd
-
-echo -n "Build Finished at "
-date
-
### Local Variables: ***
### sh-basic-offset: 4 ***
### indent-tabs-mode: nil ***
diff --git a/install.sh b/install.sh
index 5e50914..5530998 100644
--- a/install.sh
+++ b/install.sh
@@ -1,4 +1,10 @@
#!/bin/sh
+#
+# Steps will be executed in the order they were added. They can only be added
+# at most once if they have not been blocked already (adding implies blocking).
+# To add a custom step <s>, just implement "function <s>()". Keep in mind that
+# blocking or reordering may render install.sh & friends non-functional.
+
[ ! "$BASH" -a -x /bin/bash ] && exec /bin/bash "$0" "$@"
@@ -14,7 +20,9 @@ function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
qpushd "$(dirname $(unix_path "$0"))"
. ./functions.sh
. ./defaults.sh
+. ./install-impl.sh
+# variables
register_env_var ACLOCAL_FLAGS " "
register_env_var AUTOTOOLS_CPPFLAGS " "
register_env_var AUTOTOOLS_LDFLAGS " "
@@ -46,1540 +54,73 @@ register_env_var REGEX_LDFLAGS " "
register_env_var WEBKIT_CFLAGS " "
register_env_var WEBKIT_LIBS " "
-function prepare() {
- # Necessary so that intltoolize doesn't come up with some
- # foolish AC_CONFIG_AUX_DIR; bug#362006
- # We cannot simply create install-sh in the repository, because
- # this will confuse other parts of the tools
- _REPOS_UDIR=`unix_path $REPOS_DIR`
- level0=.
- level1=$(basename ${_REPOS_UDIR})
- level2=$(basename $(dirname ${_REPOS_UDIR}))"/"$level1
- for mydir in $level0 $level1 $level2; do
- if [ -f $mydir/make-gnucash-potfiles.in ]; then
- die "Do not save install.sh in the repository or one its parent directories"
- fi
- done
-# # Remove old empty install-sh files
-# if [ -f ${_REPOS_UDIR}/install-sh -a "$(cat ${_REPOS_UDIR}/install-sh &>/dev/null | wc -l)" -eq 0 ]; then
-# rm -f ${_REPOS_UDIR}/install-sh
-# fi
- # Partially remove RegEx-GNU if installed
- _REGEX_UDIR=`unix_path $REGEX_DIR`
- if [ -f ${_REGEX_UDIR}/contrib/regex-0.12-GnuWin32.README ]; then
- qpushd ${_REGEX_UDIR}
- rm -f bin/*regex*.dll
- rm -f contrib/regex*
- rm -f lib/*regex*
- qpopd
- fi
-
- DOWNLOAD_UDIR=`unix_path $DOWNLOAD_DIR`
- TMP_UDIR=`unix_path $TMP_DIR`
- mkdir -p $TMP_UDIR
- mkdir -p $DOWNLOAD_UDIR
-
- if [ "$DISABLE_OPTIMIZATIONS" = "yes" ]; then
- export CFLAGS="$CFLAGS -g -O0"
- fi
-
- if [ "$CROSS_COMPILE" = "yes" ]; then
- # to avoid using the build machine's installed packages
- set_env "" PKG_CONFIG_PATH # registered
- export PKG_CONFIG_LIBDIR="" # not registered
- fi
-}
-
-function check_m4_version_ok() {
- v=`m4 --version | grep -e '[0-9]*\.[0-9]*\.[0-9]*' | sed -e 's/[mM]4//g' -e 's/[^\.0-9]//g'`
- if [ "$v" = "1.4.7" -o "$v" = "1.4.11" -o "$v" = "1.4.13" ];
- then
- return 1
- else
- return 0
- fi
-}
-
-function inst_wget() {
- setup Wget
- _WGET_UDIR=`unix_path $WGET_DIR`
- add_to_env $_WGET_UDIR/bin PATH
- if quiet $_WGET_UDIR/wget --version || quiet wget --version
- then
- echo "already installed. skipping."
- else
- mkdir -p $_WGET_UDIR/bin
- tar -xjpf $DOWNLOAD_UDIR/wget*.tar.bz2 -C $_WGET_UDIR
- cp $_WGET_UDIR/*/*/wget.exe $_WGET_UDIR/bin
- quiet wget --version || die "wget unavailable"
- fi
-}
-
-function inst_dtk() {
- setup MSYS DTK
- _MSYS_UDIR=`unix_path $MSYS_DIR`
- if quiet ${_MSYS_UDIR}/bin/perl --help && [ check_m4_version_ok ]
- then
- echo "msys dtk already installed. skipping."
- else
- smart_wget $DTK_URL $DOWNLOAD_DIR
- $LAST_FILE //SP- //SILENT //DIR="$MSYS_DIR"
- for file in \
- /bin/{aclocal*,auto*,ifnames,libtool*,guile*} \
- /share/{aclocal,aclocal-1.7,autoconf,autogen,automake-1.7,guile,libtool}
- do
- [ -f $file ] || continue
- [ "${file##*.bak}" ] || continue
- _dst_file=$file.bak
- while [ -e $_dst_file ]; do _dst_file=$_dst_file.bak; done
- mv $file $_dst_file
- done
- wget_unpacked $M4_URL $DOWNLOAD_DIR $TMP_DIR
- mv $TMP_UDIR/usr/bin/m4.exe /bin
- quiet ${_MSYS_UDIR}/bin/perl --help &&
- [ check_m4_version_ok ] || die "msys dtk not installed correctly"
- fi
-}
-
-function test_for_mingw() {
- if [ "$CROSS_COMPILE" == "yes" ]; then
- ${CC} --version && ${LD} --help
- else
- g++ --version && mingw32-make --help
- fi
-}
-
-function inst_mingw() {
- setup MinGW
- _MINGW_UDIR=`unix_path $MINGW_DIR`
- _MINGW_WFSDIR=`win_fs_path $MINGW_DIR`
- [ "$CROSS_COMPILE" = "yes" ] && add_to_env $_MINGW_UDIR/bin PATH
-
- if quiet test_for_mingw
- then
- echo "mingw already installed. skipping."
- else
- mkdir -p $_MINGW_UDIR
- if [ "$CROSS_COMPILE" != "yes" ]; then
- wget_unpacked $BINUTILS_URL $DOWNLOAD_DIR $MINGW_DIR
- wget_unpacked $GCC_CORE_URL $DOWNLOAD_DIR $MINGW_DIR
- wget_unpacked $GCC_GPP_URL $DOWNLOAD_DIR $MINGW_DIR
- wget_unpacked $MINGW_RT_URL $DOWNLOAD_DIR $MINGW_DIR
- wget_unpacked $W32API_URL $DOWNLOAD_DIR $MINGW_DIR
- wget_unpacked $MINGW_MAKE_URL $DOWNLOAD_DIR $MINGW_DIR
- (echo "y"; echo "y"; echo "$_MINGW_WFSDIR"; echo "y") | sh pi.sh
- else
- ./create_cross_mingw.sh
- fi
- quiet test_for_mingw || die "mingw not installed correctly"
- fi
-}
-
-function inst_unzip() {
- setup Unzip
- _UNZIP_UDIR=`unix_path $UNZIP_DIR`
- add_to_env $_UNZIP_UDIR/bin PATH
- if quiet $_UNZIP_UDIR/bin/unzip --help || quiet unzip --help
- then
- echo "unzip already installed. skipping."
- else
- smart_wget $UNZIP_URL $DOWNLOAD_DIR
- $LAST_FILE //SP- //SILENT //DIR="$UNZIP_DIR"
- quiet unzip --help || die "unzip unavailable"
- fi
-}
-
-function inst_regex() {
- setup RegEx
- _REGEX_UDIR=`unix_path $REGEX_DIR`
- add_to_env -lregex REGEX_LDFLAGS
- add_to_env -I$_REGEX_UDIR/include REGEX_CPPFLAGS
- add_to_env -L$_REGEX_UDIR/lib REGEX_LDFLAGS
- add_to_env $_REGEX_UDIR/bin PATH
- if quiet ${LD} $REGEX_LDFLAGS -o $TMP_UDIR/ofile
- then
- echo "regex already installed. skipping."
- else
- mkdir -p $_REGEX_UDIR
- wget_unpacked $REGEX_URL $DOWNLOAD_DIR $REGEX_DIR
- wget_unpacked $REGEX_DEV_URL $DOWNLOAD_DIR $REGEX_DIR
- quiet ${LD} $REGEX_LDFLAGS -o $TMP_UDIR/ofile || die "regex not installed correctly"
- fi
-}
-
-function inst_readline() {
- setup Readline
- _READLINE_UDIR=`unix_path $READLINE_DIR`
- add_to_env -I$_READLINE_UDIR/include READLINE_CPPFLAGS
- add_to_env -L$_READLINE_UDIR/lib READLINE_LDFLAGS
- add_to_env $_READLINE_UDIR/bin PATH
- if quiet ${LD} $READLINE_LDFLAGS -lreadline -o $TMP_UDIR/ofile
- then
- echo "readline already installed. skipping."
- else
- mkdir -p $_READLINE_UDIR
- wget_unpacked $READLINE_BIN_URL $DOWNLOAD_DIR $READLINE_DIR
- wget_unpacked $READLINE_LIB_URL $DOWNLOAD_DIR $READLINE_DIR
- quiet ${LD} $READLINE_LDFLAGS -lreadline -o $TMP_UDIR/ofile || die "readline not installed correctly"
- fi
-}
-
-function inst_active_perl() {
- setup ActivePerl \(intltool\)
- _ACTIVE_PERL_UDIR=`unix_path $ACTIVE_PERL_DIR`
- _ACTIVE_PERL_WFSDIR=`win_fs_path $ACTIVE_PERL_DIR`
- set_env_or_die $_ACTIVE_PERL_WFSDIR/ActivePerl/Perl/bin/perl INTLTOOL_PERL
- if quiet $INTLTOOL_PERL --help
- then
- echo "ActivePerl already installed. skipping."
- else
- wget_unpacked $ACTIVE_PERL_URL $DOWNLOAD_DIR $ACTIVE_PERL_DIR
- qpushd $_ACTIVE_PERL_UDIR
- assert_one_dir ActivePerl-*
- mv ActivePerl-* ActivePerl
- qpopd
- quiet $INTLTOOL_PERL --help || die "ActivePerl not installed correctly"
- fi
-}
-
-function inst_autotools() {
- setup Autotools
- _AUTOTOOLS_UDIR=`unix_path $AUTOTOOLS_DIR`
- add_to_env $_AUTOTOOLS_UDIR/bin PATH
- add_to_env -I$_AUTOTOOLS_UDIR/include AUTOTOOLS_CPPFLAGS
- add_to_env -L$_AUTOTOOLS_UDIR/lib AUTOTOOLS_LDFLAGS
- if quiet autoconf --help && quiet automake --help
- then
- echo "autoconf/automake already installed. skipping."
- else
- wget_unpacked $AUTOCONF_URL $DOWNLOAD_DIR $TMP_DIR
- wget_unpacked $AUTOMAKE_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/autoconf-*
- qpushd $TMP_UDIR/autoconf-*
- echo "building autoconf..."
- ./configure --prefix=$_AUTOTOOLS_UDIR
- make
- make install
- qpopd
- assert_one_dir $TMP_UDIR/automake-*
- qpushd $TMP_UDIR/automake-*
- echo "building automake..."
- ./configure --prefix=$_AUTOTOOLS_UDIR
- make
- make install
- qpopd
- quiet autoconf --help && quiet automake --help || die "autoconf/automake not installed correctly"
- rm -rf ${TMP_UDIR}/autoconf-* ${TMP_UDIR}/automake-*
- fi
- if quiet libtoolize --help && \
- quiet ${LD} $AUTOTOOLS_LDFLAGS -lltdl -o $TMP_UDIR/ofile
- then
- echo "libtool/libtoolize already installed. skipping."
- else
- wget_unpacked $LIBTOOL_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/libtool-*
- qpushd $TMP_UDIR/libtool-*
- echo "building libtool..."
- ./configure ${HOST_XCOMPILE} --prefix=$_AUTOTOOLS_UDIR --disable-static
- make
- make install
- qpopd
- quiet libtoolize --help && \
- quiet ${LD} $AUTOTOOLS_LDFLAGS -lltdl -o $TMP_UDIR/ofile || die "libtool/libtoolize not installed correctly"
- rm -rf ${TMP_UDIR}/libtool-*
- fi
- [ ! -d $_AUTOTOOLS_UDIR/share/aclocal ] || add_to_env "-I $_AUTOTOOLS_UDIR/share/aclocal" ACLOCAL_FLAGS
-}
-
-function inst_gmp() {
- setup Gmp
- _GMP_UDIR=`unix_path ${GMP_DIR}`
- add_to_env -I$_GMP_UDIR/include GMP_CPPFLAGS
- add_to_env -L$_GMP_UDIR/lib GMP_LDFLAGS
- add_to_env ${_GMP_UDIR}/bin PATH
- if quiet ${LD} $GMP_LDFLAGS -lgmp -o $TMP_UDIR/ofile
- then
- echo "Gmp already installed. skipping."
- else
- wget_unpacked $GMP_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/gmp-*
- qpushd $TMP_UDIR/gmp-*
- ./configure ${HOST_XCOMPILE} \
- ABI=$GMP_ABI \
- --prefix=${_GMP_UDIR} \
- --disable-static --enable-shared
- make
-# [ "$CROSS_COMPILE" != "yes" ] && make check
- make install
- qpopd
- quiet ${LD} $GMP_LDFLAGS -lgmp -o $TMP_UDIR/ofile || die "Gmp not installed correctly"
- rm -rf ${TMP_UDIR}/gmp-*
- fi
-}
-
-function inst_guile() {
- setup Guile
- _GUILE_WFSDIR=`win_fs_path $GUILE_DIR`
- _GUILE_UDIR=`unix_path $GUILE_DIR`
- add_to_env -I$_GUILE_UDIR/include GUILE_CPPFLAGS
- add_to_env -L$_GUILE_UDIR/lib GUILE_LDFLAGS
- add_to_env $_GUILE_UDIR/bin PATH
- if quiet guile -c '(use-modules (srfi srfi-39))' &&
- quiet guile -c "(use-modules (ice-9 slib)) (require 'printf)"
- then
- echo "guile and slib already installed. skipping."
- else
- smart_wget $GUILE_URL $DOWNLOAD_DIR
- _GUILE_BALL=$LAST_FILE
- smart_wget $SLIB_URL $DOWNLOAD_DIR
- _SLIB_BALL=$LAST_FILE
- tar -xzpf $_GUILE_BALL -C $TMP_UDIR
- assert_one_dir $TMP_UDIR/guile-*
- qpushd $TMP_UDIR/guile-*
- qpushd ice-9
- cp boot-9.scm boot-9.scm.bak
- cat boot-9.scm.bak | sed '/SIGBUS/d' > boot-9.scm
- qpopd
- qpushd libguile
- cp fports.c fports.c.bak
- cat fports.c.bak | sed 's,#elif defined (FIONREAD),#elif 0,' > fports.c
- cp load.c load.c.bak
- cat load.c.bak | sed '/scan !=/s,:,;,' > load.c
- qpopd
- qpushd libguile-ltdl
- cp raw-ltdl.c raw-ltdl.c.bak
- cat raw-ltdl.c.bak | sed 's,\(SCMLTSTATIC\) LT_GLOBAL_DATA,\1,' > raw-ltdl.c
- touch upstream/ltdl.c.diff
- qpopd
- ./configure ${HOST_XCOMPILE} \
- --disable-static \
- --disable-elisp \
- --disable-networking \
- --disable-dependency-tracking \
- --disable-libtool-lock \
- --disable-linuxthreads \
- -C --prefix=$_GUILE_WFSDIR \
- ac_cv_func_regcomp_rx=yes \
- CPPFLAGS="${READLINE_CPPFLAGS} ${REGEX_CPPFLAGS}" \
- LDFLAGS="-lwsock32 ${READLINE_LDFLAGS} ${REGEX_LDFLAGS}"
- cp config.status config.status.bak
- cat config.status.bak | sed 's# fileblocks[$.A-Za-z]*,#,#' > config.status
- ./config.status
- qpushd guile-config
- cp Makefile Makefile.bak
- cat Makefile.bak | sed '/-bindir-/s,:,^,g' > Makefile
- qpopd
- make LDFLAGS="-lwsock32 ${READLINE_LDFLAGS} ${REGEX_LDFLAGS} -no-undefined -avoid-version"
- make install
- qpopd
- _SLIB_DIR=$_GUILE_UDIR/share/guile/1.*
- unzip $_SLIB_BALL -d $_SLIB_DIR
- qpushd $_SLIB_DIR/slib
- cp guile.init guile.init.bak
- sed '/lambda.*'"'"'unix/a\
-(define software-type (lambda () '"'"'ms-dos))' guile.init.bak > guile.init
- qpopd
- guile -c '(use-modules (srfi srfi-39))' &&
- guile -c "(use-modules (ice-9 slib)) (require 'printf)" || die "guile not installed correctly"
-
- # If this libguile is used from MSVC compiler, we must
- # deactivate some macros of scmconfig.h again.
- SCMCONFIG_H=$_GUILE_UDIR/include/libguile/scmconfig.h
- cat >> ${SCMCONFIG_H} <<EOF
-
-#ifdef _MSC_VER
-# undef HAVE_STDINT_H
-# undef HAVE_INTTYPES_H
-# undef HAVE_UNISTD_H
-#endif
-EOF
- # Also, for MSVC compiler we need to create an import library
- if [ x"$(which pexports.exe > /dev/null 2>&1)" != x ]
- then
- pexports $_GUILE_UDIR/bin/libguile.dll > $_GUILE_UDIR/lib/libguile.def
- ${DLLTOOL} -d $_GUILE_UDIR/lib/libguile.def -D $_GUILE_UDIR/bin/libguile.dll -l $_GUILE_UDIR/lib/libguile.lib
- fi
- # Also, for MSVC compiler we need to slightly modify the gc.h header
- GC_H=$_GUILE_UDIR/include/libguile/gc.h
- grep -v 'extern .*_freelist2;' ${GC_H} > ${GC_H}.tmp
- grep -v 'extern int scm_block_gc;' ${GC_H}.tmp > ${GC_H}
- cat >> ${GC_H} <<EOF
-#ifdef _MSC_VER
-# define LIBGUILEDECL __declspec (dllimport)
-#else
-# define LIBGUILEDECL /* */
-#endif
-extern LIBGUILEDECL SCM scm_freelist2;
-extern LIBGUILEDECL struct scm_t_freelist scm_master_freelist2;
-extern LIBGUILEDECL int scm_block_gc;
-EOF
- rm -rf ${TMP_UDIR}/guile-*
- fi
- if [ "$CROSS_COMPILE" = "yes" ]; then
- mkdir -p $_GUILE_UDIR/bin
- qpushd $_GUILE_UDIR/bin
- # The cross-compiling guile expects these program names
- # for the build-time guile
- ln -sf /usr/bin/guile-config mingw32-guile-config
- ln -sf /usr/bin/guile mingw32-build-guile
- qpopd
- fi
- [ ! -d $_GUILE_UDIR/share/aclocal ] || add_to_env "-I $_GUILE_UDIR/share/aclocal" ACLOCAL_FLAGS
-}
-
-function inst_svn() {
- setup Subversion
- _SVN_UDIR=`unix_path $SVN_DIR`
- add_to_env $_SVN_UDIR/bin PATH
- if quiet svn --version
- then
- echo "subversion already installed. skipping."
- else
- smart_wget $SVN_URL $DOWNLOAD_DIR
- $LAST_FILE //SP- //SILENT //DIR="$SVN_DIR"
- quiet svn --version || die "svn not installed correctly"
- fi
-}
-
-function inst_openssl() {
- setup OpenSSL
- _OPENSSL_UDIR=`unix_path $OPENSSL_DIR`
- add_to_env $_OPENSSL_UDIR/bin PATH
- # Make sure the files of Win32OpenSSL-0_9_8d are really gone!
- if test -f $_OPENSSL_UDIR/unins000.exe ; then
- die "Wrong version of OpenSSL installed! Run $_OPENSSL_UDIR/unins000.exe and start install.sh again."
- fi
- # Make sure the files of openssl-0.9.7c-{bin,lib}.zip are really gone!
- if [ -f $_OPENSSL_UDIR/lib/libcrypto.dll.a ] ; then
- die "Found old OpenSSL installation in $_OPENSSL_UDIR. Please remove that first."
- fi
-
- if quiet ${LD} -L$_OPENSSL_UDIR/lib -leay32 -lssl32 -o $TMP_UDIR/ofile ; then
- echo "openssl already installed. skipping."
- else
- smart_wget $OPENSSL_URL $DOWNLOAD_DIR
- echo -n "Extracting ${LAST_FILE##*/} ... "
- tar -xzpf $LAST_FILE -C $TMP_UDIR &>/dev/null | true
- echo "done"
- assert_one_dir $TMP_UDIR/openssl-*
- qpushd $TMP_UDIR/openssl-*
- for _dir in crypto ssl ; do
- qpushd $_dir
- find . -name "*.h" -exec cp {} ../include/openssl/ \;
- qpopd
- done
- cp *.h include/openssl
- _COMSPEC_U=`unix_path $COMSPEC`
- PATH=$_ACTIVE_PERL_UDIR/ActivePerl/Perl/bin:$_MINGW_UDIR/bin $_COMSPEC_U //c ms\\mingw32
- mkdir -p $_OPENSSL_UDIR/bin
- mkdir -p $_OPENSSL_UDIR/lib
- mkdir -p $_OPENSSL_UDIR/include
- cp -a libeay32.dll libssl32.dll $_OPENSSL_UDIR/bin
- cp -a libssl32.dll $_OPENSSL_UDIR/bin/ssleay32.dll
- for _implib in libeay32 libssl32 ; do
- cp -a out/$_implib.a $_OPENSSL_UDIR/lib/$_implib.dll.a
- done
- cp -a include/openssl $_OPENSSL_UDIR/include
- qpopd
- quiet ${LD} -L$_OPENSSL_UDIR/lib -leay32 -lssl32 -o $TMP_UDIR/ofile || die "openssl not installed correctly"
- rm -rf ${TMP_UDIR}/openssl-*
- fi
- _eay32dll=$(echo $(which libeay32.dll)) # which sucks
- if [ -z "$_eay32dll" ] ; then
- die "Did not find libeay32.dll in your PATH, why that?"
- fi
- if [ "$_eay32dll" != "$_OPENSSL_UDIR/bin/libeay32.dll" ] ; then
- die "Found $_eay32dll in PATH. If you have added $_OPENSSL_UDIR/bin to your PATH before, make sure it is listed before paths from other packages shipping SSL libraries, like SVN. In particular, check $_MINGW_UDIR/etc/profile.d/installer.sh."
- fi
-}
-
-function inst_mingwutils() {
- setup MinGW-Utils
- _MINGW_UTILS_UDIR=`unix_path $MINGW_UTILS_DIR`
- add_to_env $_MINGW_UTILS_UDIR/bin PATH
- if quiet which pexports && quiet which reimp
- then
- echo "mingw-utils already installed. skipping."
- else
- wget_unpacked $MINGW_UTILS_URL $DOWNLOAD_DIR $MINGW_UTILS_DIR
- (quiet which pexports && quiet which reimp) || die "mingw-utils not installed correctly"
- fi
-}
-
-function inst_exetype() {
- setup exetype
- _EXETYPE_UDIR=`unix_path $EXETYPE_DIR`
- add_to_env $_EXETYPE_UDIR/bin PATH
- if quiet which exetype
- then
- echo "exetype already installed. skipping."
- else
- mkdir -p $_EXETYPE_UDIR/bin
- cp $EXETYPE_SCRIPT $_EXETYPE_UDIR/bin/exetype
- chmod +x $_EXETYPE_UDIR/bin/exetype
- quiet which exetype || die "exetype unavailable"
- fi
-}
-
-function inst_libxslt() {
- setup LibXSLT
- _LIBXSLT_UDIR=`unix_path $LIBXSLT_DIR`
- add_to_env $_LIBXSLT_UDIR/bin PATH
- if quiet which xsltproc
- then
- echo "libxslt already installed. skipping."
- else
- [ "$CROSS_COMPILE" = "yes" ] && die "xsltproc unavailable"
- wget_unpacked $LIBXSLT_URL $DOWNLOAD_DIR $LIBXSLT_DIR
- wget_unpacked $LIBXSLT_LIBXML2_URL $DOWNLOAD_DIR $LIBXSLT_DIR
- qpushd $_LIBXSLT_UDIR
- mv libxslt-* mydir
- cp -r mydir/* .
- rm -rf mydir
- mv libxml2-* mydir
- cp -r mydir/* .
- rm -rf mydir
- qpopd
- quiet which xsltproc || die "libxslt not installed correctly"
- fi
-}
-
-function inst_gnome() {
- setup Gnome platform
- _GNOME_UDIR=`unix_path $GNOME_DIR`
- add_to_env -I$_GNOME_UDIR/include GNOME_CPPFLAGS
- add_to_env -L$_GNOME_UDIR/lib GNOME_LDFLAGS
- add_to_env $_GNOME_UDIR/bin PATH
- add_to_env $_GNOME_UDIR/lib/pkgconfig PKG_CONFIG_PATH
- if [ "$CROSS_COMPILE" != "yes" ]; then
- add_to_env $_GNOME_UDIR/bin/pkg-config-msys.sh PKG_CONFIG
- else
- add_to_env pkg-config PKG_CONFIG
- fi
- if quiet gconftool-2 --version &&
- quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgtkhtml-3.14 &&
- quiet intltoolize --version
- then
- echo "gnome packages installed. skipping."
- else
- mkdir -p $_GNOME_UDIR
- wget_unpacked $LIBXML2_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBXML2_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GETTEXT_RUNTIME_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GETTEXT_RUNTIME_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GETTEXT_TOOLS_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBICONV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GLIB_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GLIB_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBJPEG_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBJPEG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBPNG_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBPNG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBTIFF_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBTIFF_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $ZLIB_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $ZLIB_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $PKG_CONFIG_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $PKG_CONFIG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $CAIRO_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $CAIRO_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $EXPAT_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $EXPAT_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $FONTCONFIG_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $FONTCONFIG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $FREETYPE_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $FREETYPE_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $ATK_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $ATK_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 $LIBART_LGPL_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBART_LGPL_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GTK_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GTK_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $INTLTOOL_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $ORBIT2_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $ORBIT2_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GAIL_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GAIL_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $POPT_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $POPT_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GCONF_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GCONF_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBBONOBO_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBBONOBO_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GNOME_VFS_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GNOME_VFS_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBGNOME_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBGNOME_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBGNOMECANVAS_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBGNOMECANVAS_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBBONOBOUI_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBBONOBOUI_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBGNOMEUI_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBGNOMEUI_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBGLADE_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBGLADE_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GTKHTML_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GTKHTML_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GTK_DOC_URL $DOWNLOAD_DIR $TMP_DIR
- qpushd $_GNOME_UDIR
- assert_one_dir $TMP_UDIR/gtk-doc-*
- mv $TMP_UDIR/gtk-doc-*/gtk-doc.m4 $_GNOME_UDIR/share/aclocal
- if [ ! -f libexec/gconfd-2.console.exe ]; then
- cp libexec/gconfd-2.exe libexec/gconfd-2.console.exe
- fi
- exetype libexec/gconfd-2.exe windows
- for file in bin/intltool-*; do
- sed '1s,!.*perl,!'"$INTLTOOL_PERL"',;s,/opt/gnu/bin/iconv,iconv,' $file > tmp
- mv tmp $file
- done
- # work around a bug in msys bash, adding 0x01 smilies
- cat > bin/pkg-config-msys.sh <<EOF
-#!/bin/sh
-PKG_CONFIG="\$(dirname \$0)/pkg-config"
-if \${PKG_CONFIG} "\$@" > /dev/null 2>&1 ; then
- res=true
-else
- res=false
+# steps
+# There is no reason to ever need to comment these out!
+# * commented out glade, as it is not needed to run gnucash
+add_step inst_prepare
+if [ "$CROSS_COMPILE" != "yes" ]; then
+ add_step inst_wget
+ add_step inst_dtk
+ add_step inst_unzip
fi
-\${PKG_CONFIG} "\$@" | tr -d \\\\r && \$res
-EOF
- chmod +x bin/pkg-config{.exe,-msys.sh}
- sed '/Requires/s,\(.*\) enchant\(.*\) iso-codes\(.*\),\1\2\3,' lib/pkgconfig/libgtkhtml-3.14.pc > tmp
- mv tmp lib/pkgconfig/libgtkhtml-3.14.pc
- rm -rf $TMP_UDIR/gtk-doc-*
- qpopd
-
- if [ "$CROSS_COMPILE" = "yes" ]; then
- qpushd $_GNOME_UDIR/lib/pkgconfig
- perl -pi.bak -e"s!^prefix=.*\$!prefix=$_GNOME_UDIR!" *.pc
- #perl -pi.bak -e's!^Libs: !Libs: -L\${prefix}/bin !' *.pc
- qpopd
- fi
- wget_unpacked $PIXMAN_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/pixman-*
- qpushd $TMP_UDIR/pixman-*
- ./configure ${HOST_XCOMPILE} \
- --prefix=$_GNOME_UDIR \
- --disable-static
- make
- make install
- qpopd
- rm -rf $TMP_UDIR/pixman-*
- ${PKG_CONFIG} --exists pixman-1 || die "pixman not installed correctly"
- quiet gconftool-2 --version &&
- quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgtkhtml-3.14 &&
- quiet intltoolize --version || die "gnome not installed correctly"
- fi
- [ ! -d $_GNOME_UDIR/share/aclocal ] || add_to_env "-I $_GNOME_UDIR/share/aclocal" ACLOCAL_FLAGS
-}
-
-function inst_swig() {
- setup Swig
- _SWIG_UDIR=`unix_path $SWIG_DIR`
- add_to_env $_SWIG_UDIR PATH
- if quiet swig -version
- then
- echo "swig already installed. skipping."
- else
- wget_unpacked $SWIG_URL $DOWNLOAD_DIR $SWIG_DIR
- qpushd $SWIG_DIR
- mv swigwin-* mydir
- mv mydir/* .
- mv mydir/.[A-Za-z]* . # hidden files
- rmdir mydir
- rm INSTALL # bites with /bin/install
- qpopd
- quiet swig -version || die "swig unavailable"
- fi
-}
-
-function inst_pcre() {
- setup pcre
- _PCRE_UDIR=`unix_path $PCRE_DIR`
- add_to_env -I$_PCRE_UDIR/include PCRE_CPPFLAGS
- add_to_env -L$_PCRE_UDIR/lib PCRE_LDFLAGS
- add_to_env $_PCRE_UDIR/bin PATH
- if quiet ${LD} $PCRE_LDFLAGS -lpcre -o $TMP_UDIR/ofile
- then
- echo "pcre already installed. skipping."
- else
- mkdir -p $_PCRE_UDIR
- wget_unpacked $PCRE_BIN_URL $DOWNLOAD_DIR $PCRE_DIR
- wget_unpacked $PCRE_LIB_URL $DOWNLOAD_DIR $PCRE_DIR
- fi
- quiet ${LD} $PCRE_LDFLAGS -lpcre -o $TMP_UDIR/ofile || die "pcre not installed correctly"
-}
-
-function inst_libbonoboui() {
- setup libbonoboui
- _LIBBONOBOUI_UDIR=`unix_path $LIBBONOBOUI_DIR`
- add_to_env $_LIBBONOBOUI_UDIR/bin PATH
- add_to_env $_LIBBONOBOUI_UDIR/lib/pkgconfig PKG_CONFIG_PATH
- if quiet ${PKG_CONFIG} --exists --atleast-version=2.24.2 libbonoboui-2.0 && [ -f $_LIBBONOBOUI_UDIR/bin/libbonoboui*.dll ]
- then
- echo "libbonoboui already installed. skipping."
- else
- wget_unpacked $LIBBONOBOUI_SRC_URL $DOWNLOAD_DIR $TMP_DIR
- mydir=`pwd`
- assert_one_dir $TMP_UDIR/libbonoboui-*
- qpushd $TMP_UDIR/libbonoboui-*
- [ -n "$LIBBONOBOUI_PATCH" -a -f "$LIBBONOBOUI_PATCH" ] && \
- patch -p1 < $LIBBONOBOUI_PATCH
- #libtoolize --force
- #aclocal ${ACLOCAL_FLAGS} -I .
- #automake
- #autoconf
- ./configure ${HOST_XCOMPILE} --prefix=$_LIBBONOBOUI_UDIR \
- POPT_LIBS="-lpopt" \
- CPPFLAGS="${GNOME_CPPFLAGS}" \
- LDFLAGS="${GNOME_LDFLAGS}" \
- --enable-static=no
- make
- make install
-
- # We override the $GNOME_DIR libbonoboui files because
- # those erroneously depend on the obsolete libxml2.dll
- cp -a $_LIBBONOBOUI_UDIR/bin/libbonoboui*.dll $_GNOME_UDIR/bin
- cp -a $_LIBBONOBOUI_UDIR/lib/libbonoboui* $_GNOME_UDIR/lib
- qpopd
- ${PKG_CONFIG} --exists --atleast-version=2.24.2 libbonoboui-2.0 && [ -f $_LIBBONOBOUI_UDIR/bin/libbonoboui*.dll ] || die "libbonoboui not installed correctly"
- rm -rf ${TMP_UDIR}/libbonoboui-*
- fi
-}
-
-function inst_libgsf() {
- setup libGSF
- _LIBGSF_UDIR=`unix_path $LIBGSF_DIR`
- add_to_env $_LIBGSF_UDIR/bin PATH
- add_to_env $_LIBGSF_UDIR/lib/pkgconfig PKG_CONFIG_PATH
- if quiet ${PKG_CONFIG} --exists libgsf-1 libgsf-gnome-1
- then
- echo "libgsf already installed. skipping."
- else
- wget_unpacked $LIBGSF_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/libgsf-*
- qpushd $TMP_UDIR/libgsf-*
- ./configure ${HOST_XCOMPILE} \
- --prefix=$_LIBGSF_UDIR \
- --disable-static \
- --without-python \
- CPPFLAGS="${GNOME_CPPFLAGS}" \
- LDFLAGS="${GNOME_LDFLAGS}"
- make
- make install
- qpopd
- ${PKG_CONFIG} --exists libgsf-1 libgsf-gnome-1 || die "libgsf not installed correctly"
- fi
-}
-
-function inst_goffice() {
- setup GOffice
- _GOFFICE_UDIR=`unix_path $GOFFICE_DIR`
- add_to_env $_GOFFICE_UDIR/bin PATH
- add_to_env $_GOFFICE_UDIR/lib/pkgconfig PKG_CONFIG_PATH
- if quiet ${PKG_CONFIG} --exists libgoffice-0.8
- then
- echo "goffice already installed. skipping."
- else
- wget_unpacked $GOFFICE_URL $DOWNLOAD_DIR $TMP_DIR
- mydir=`pwd`
- assert_one_dir $TMP_UDIR/goffice-*
- qpushd $TMP_UDIR/goffice-*
- [ -n "$GOFFICE_PATCH" -a -f "$GOFFICE_PATCH" ] && \
- patch -p1 < $GOFFICE_PATCH
- libtoolize --force
- aclocal ${ACLOCAL_FLAGS} -I .
- automake
- autoconf
- ./configure ${HOST_XCOMPILE} --prefix=$_GOFFICE_UDIR \
- CPPFLAGS="${GNOME_CPPFLAGS} ${PCRE_CPPFLAGS} ${HH_CPPFLAGS}" \
- LDFLAGS="${GNOME_LDFLAGS} ${PCRE_LDFLAGS} ${HH_LDFLAGS}"
- [ -d ../libgsf-* ] || die "We need the unpacked package $TMP_UDIR/libgsf-*; please unpack it in $TMP_UDIR"
- [ -f dumpdef.pl ] || cp -p ../libgsf-*/dumpdef.pl .
- make
- make install
- qpopd
- ${PKG_CONFIG} --exists libgoffice-0.8 && [ -f $_GOFFICE_UDIR/bin/libgoffice*.dll ] || die "goffice not installed correctly"
- rm -rf ${TMP_UDIR}/goffice-*
- rm -rf ${TMP_UDIR}/libgsf-*
- fi
-}
-
-function inst_glade() {
- setup Glade
- _GLADE_UDIR=`unix_path $GLADE_DIR`
- _GLADE_WFSDIR=`win_fs_path $GLADE_DIR`
- add_to_env $_GLADE_UDIR/bin PATH
- if quiet glade-3 --version
- then
- echo "glade already installed. skipping."
- else
- wget_unpacked $GLADE_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/glade3-*
- qpushd $TMP_UDIR/glade3-*
- ./configure ${HOST_XCOMPILE} --prefix=$_GLADE_WFSDIR
- make
- make install
- qpopd
- quiet glade-3 --version || die "glade not installed correctly"
- rm -rf ${TMP_UDIR}/glade3-*
- fi
-}
-
-function inst_inno() {
- setup Inno Setup Compiler
- _INNO_UDIR=`unix_path $INNO_DIR`
- add_to_env $_INNO_UDIR PATH
- if quiet which iscc
- then
- echo "Inno Setup Compiler already installed. skipping."
- else
- smart_wget $INNO_URL $DOWNLOAD_DIR
- $LAST_FILE //SP- //SILENT //DIR="$INNO_DIR"
- quiet which iscc || die "iscc (Inno Setup Compiler) not installed correctly"
- fi
-}
-
-function test_for_hh() {
- qpushd $TMP_UDIR
- cat > ofile.c <<EOF
-#include <windows.h>
-#include <htmlhelp.h>
-int main(int argc, char **argv) {
- HtmlHelpW(0, (wchar_t*)"", HH_HELP_CONTEXT, 0);
- return 0;
-}
-EOF
- gcc -shared -o ofile.dll ofile.c $HH_CPPFLAGS $HH_LDFLAGS -lhtmlhelp || return 1
- qpopd
-}
-
-function inst_hh() {
- setup HTML Help Workshop
- _HH_UDIR=`unix_path $HH_DIR`
- add_to_env -I$_HH_UDIR/include HH_CPPFLAGS
- add_to_env -L$_HH_UDIR/lib HH_LDFLAGS
- add_to_env $_HH_UDIR PATH
- if quiet test_for_hh
- then
- echo "html help workshop already installed. skipping."
- else
- smart_wget $HH_URL $DOWNLOAD_DIR
- echo "!!! When asked for an installation path, specify $HH_DIR !!!"
- $LAST_FILE
- qpushd $HH_DIR
- _HHCTRL_OCX=$(which hhctrl.ocx || true)
- [ "$_HHCTRL_OCX" ] || die "Did not find hhctrl.ocx"
- pexports -h include/htmlhelp.h $_HHCTRL_OCX > lib/htmlhelp.def
- qpushd lib
- ${DLLTOOL} -k -d htmlhelp.def -l libhtmlhelp.a
- mv htmlhelp.lib htmlhelp.lib.bak
- qpopd
- qpopd
- quiet test_for_hh || die "html help workshop not installed correctly"
- fi
-}
-
-function inst_opensp() {
- setup OpenSP
- _OPENSP_UDIR=`unix_path ${OPENSP_DIR}`
- add_to_env ${_OPENSP_UDIR}/bin PATH
- if test -f ${_OPENSP_UDIR}/bin/libosp-5.dll
- then
- echo "OpenSP already installed. skipping."
- else
- wget_unpacked $OPENSP_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/OpenSP-*
- qpushd $TMP_UDIR/OpenSP-*
- [ -n "$OPENSP_PATCH" -a -f "$OPENSP_PATCH" ] && \
- patch -p0 < $OPENSP_PATCH
- libtoolize --force
- aclocal ${ACLOCAL_FLAGS} -I m4
- automake
- autoconf
- ./configure ${HOST_XCOMPILE} \
- --prefix=${_OPENSP_UDIR} \
- --disable-doc-build --disable-static
- # On many windows machines, none of the programs will
- # build, but we only need the library, so ignore the rest.
- make all-am
- make -C lib
- make -i
- make -i install
- qpopd
- test -f ${_OPENSP_UDIR}/bin/libosp-5.dll || die "OpenSP not installed correctly"
- fi
-}
-
-function inst_libofx() {
- setup Libofx
- _LIBOFX_UDIR=`unix_path ${LIBOFX_DIR}`
- add_to_env ${_LIBOFX_UDIR}/bin PATH
- add_to_env ${_LIBOFX_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
- if quiet ${PKG_CONFIG} --exists libofx
- then
- echo "Libofx already installed. skipping."
- else
- wget_unpacked $LIBOFX_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/libofx-*
- qpushd $TMP_UDIR/libofx-*
- [ -n "$LIBOFX_PATCH" -a -f "$LIBOFX_PATCH" ] && \
- patch -p1 < $LIBOFX_PATCH
- ./configure ${HOST_XCOMPILE} \
- --prefix=${_LIBOFX_UDIR} \
- --with-opensp-includes=${_OPENSP_UDIR}/include/OpenSP \
- --with-opensp-libs=${_OPENSP_UDIR}/lib \
- CPPFLAGS="-DOS_WIN32" \
- --disable-static
- make LDFLAGS="${LDFLAGS} -no-undefined"
- make install
- qpopd
- quiet ${PKG_CONFIG} --exists libofx || die "Libofx not installed correctly"
- rm -rf ${TMP_UDIR}/libofx-*
- fi
-}
-
-function inst_gnutls() {
- setup GNUTLS
- _GNUTLS_UDIR=`unix_path ${GNUTLS_DIR}`
- add_to_env ${_GNUTLS_UDIR}/bin PATH
- add_to_env ${_GNUTLS_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
- add_to_env "-I${_GNUTLS_UDIR}/include" GNUTLS_CPPFLAGS
- add_to_env "-L${_GNUTLS_UDIR}/lib" GNUTLS_LDFLAGS
- if quiet ${PKG_CONFIG} --exists gnutls
- then
- echo "GNUTLS already installed. skipping."
- else
- wget_unpacked $GNUTLS_URL $DOWNLOAD_DIR $GNUTLS_DIR
- rm -f $_GNUTLS_UDIR/lib/*.la
- quiet ${PKG_CONFIG} --exists gnutls || die "GNUTLS not installed correctly"
- fi
- [ ! -d $_GNUTLS_UDIR/share/aclocal ] || add_to_env "-I $_GNUTLS_UDIR/share/aclocal" ACLOCAL_FLAGS
-}
-
-function inst_gwenhywfar() {
- setup Gwenhywfar
- _GWENHYWFAR_UDIR=`unix_path ${GWENHYWFAR_DIR}`
- add_to_env ${_GWENHYWFAR_UDIR}/bin PATH
- add_to_env ${_GWENHYWFAR_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
- if quiet ${PKG_CONFIG} --exists gwenhywfar
- then
- echo "Gwenhywfar already installed. skipping."
- else
- wget_unpacked $GWENHYWFAR_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/gwenhywfar-*
- qpushd $TMP_UDIR/gwenhywfar-*
- # circumvent binreloc bug, http://trac.autopackage.org/ticket/28
- if [ "$AQBANKING3" != "yes" ]; then
- ./configure ${HOST_XCOMPILE} \
- --with-openssl-includes=$_OPENSSL_UDIR/include \
- --disable-binreloc \
- ssl_libraries="-L${_OPENSSL_UDIR}/lib" \
- ssl_lib="-leay32 -lssl32" \
- --prefix=$_GWENHYWFAR_UDIR \
- CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS}" \
- LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} -lintl"
- else
- if [ -n "$GWENHYWFAR_PATCH" -a -f "$GWENHYWFAR_PATCH" ] ; then
- patch -p1 < $GWENHYWFAR_PATCH
- #aclocal -I m4 ${ACLOCAL_FLAGS}
- #automake
- #autoconf
- fi
- # Note: gwenhywfar-3.x and higher don't use openssl anymore.
- ./configure ${HOST_XCOMPILE} \
- --with-libgcrypt-prefix=$_GNUTLS_UDIR \
- --disable-binreloc \
- --prefix=$_GWENHYWFAR_UDIR \
- CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS}" \
- LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GNUTLS_LDFLAGS} -lintl"
- fi
- make
-# [ "$CROSS_COMPILE" != "yes" ] && make check
- make install
- qpopd
- ${PKG_CONFIG} --exists gwenhywfar || die "Gwenhywfar not installed correctly"
- rm -rf ${TMP_UDIR}/gwenhywfar-*
- fi
- [ ! -d $_GWENHYWFAR_UDIR/share/aclocal ] || add_to_env "-I $_GWENHYWFAR_UDIR/share/aclocal" ACLOCAL_FLAGS
-}
-
-function inst_ktoblzcheck() {
- setup Ktoblzcheck
- # Out of convenience ktoblzcheck is being installed into
- # GWENHYWFAR_DIR
- add_to_env "-I${_GWENHYWFAR_UDIR}/include" KTOBLZCHECK_CPPFLAGS
- add_to_env "-L${_GWENHYWFAR_UDIR}/lib" KTOBLZCHECK_LDFLAGS
- if quiet ${PKG_CONFIG} --exists ktoblzcheck
- then
- echo "Ktoblzcheck already installed. skipping."
- else
- wget_unpacked $KTOBLZCHECK_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/ktoblzcheck-*
- qpushd $TMP_UDIR/ktoblzcheck-*
- # circumvent binreloc bug, http://trac.autopackage.org/ticket/28
- ./configure ${HOST_XCOMPILE} \
- --prefix=${_GWENHYWFAR_UDIR} \
- --disable-binreloc \
- --disable-python
- make
-# [ "$CROSS_COMPILE" != "yes" ] && make check
- make install
- qpopd
- ${PKG_CONFIG} --exists ktoblzcheck || die "Ktoblzcheck not installed correctly"
- rm -rf ${TMP_UDIR}/ktoblzcheck-*
- fi
-}
-
-function inst_qt4() {
- # This section is not a full install, but the .la creation is
- # already useful in itself and that's why it has already been
- # added.
-
- [ "$QTDIR" ] || die "QTDIR is not set. Please install Qt and set that variable in custom.sh, or deactivate AQBANKING_WITH_QT"
- export QTDIR=`unix_path ${QTDIR}` # help configure of aqbanking
- _QTDIR=$QTDIR
- # This section creates .la files for the Qt-4 DLLs so that
- # libtool correctly links to the DLLs.
- if test ! -f ${_QTDIR}/lib/libQtCore4.la ; then
- qpushd ${_QTDIR}/lib
- for A in lib*.a; do
- LIBBASENAME=`basename ${A} .a`
- OUTFILE="${LIBBASENAME}.la"
- BASENAME=`echo ${LIBBASENAME} | sed -e"s/lib//" `
- DLLNAME="${BASENAME}.dll"
-
- # Create la file
- echo "# Generated by foo bar libtool" > $OUTFILE
- echo "dlname='../bin/${DLLNAME}'" >> $OUTFILE
- echo "library_names='${DLLNAME}'" >> $OUTFILE
- echo "libdir='${_QTDIR}/bin'" >> $OUTFILE
- done
- qpopd
- fi
-}
-
-function inst_aqbanking() {
- setup AqBanking
- _AQBANKING_UDIR=`unix_path ${AQBANKING_DIR}`
- add_to_env ${_AQBANKING_UDIR}/bin PATH
- add_to_env ${_AQBANKING_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
- if quiet ${PKG_CONFIG} --exists aqbanking
- then
- echo "AqBanking already installed. skipping."
- else
- wget_unpacked $AQBANKING_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/aqbanking-*
- qpushd $TMP_UDIR/aqbanking-*
- _AQ_CPPFLAGS="-I${_LIBOFX_UDIR}/include ${KTOBLZCHECK_CPPFLAGS} ${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS}"
- _AQ_LDFLAGS="-L${_LIBOFX_UDIR}/lib ${KTOBLZCHECK_LDFLAGS} ${GNOME_LDFLAGS} ${GNUTLS_LDFLAGS}"
- if test x$CROSS_COMPILE = xyes; then
- XMLMERGE="xmlmerge"
- else
- XMLMERGE="${_GWENHYWFAR_UDIR}/bin/xmlmerge"
- fi
- if test x$AQBANKING3 = xyes; then
- _AQ_BACKENDS="aqhbci aqofxconnect"
- else
- _AQ_BACKENDS="aqdtaus aqhbci aqofxconnect"
- fi
- if test x$AQBANKING_WITH_QT = xyes; then
- inst_qt4
- if [ -n "$AQBANKING_PATCH" -a -f "$AQBANKING_PATCH" ] ; then
- patch -p1 < $AQBANKING_PATCH
- automake
- aclocal -I m4 ${ACLOCAL_FLAGS}
- autoconf
- fi
- ./configure ${HOST_XCOMPILE} \
- --with-gwen-dir=${_GWENHYWFAR_UDIR} \
- --with-xmlmerge=${XMLMERGE} \
- --with-frontends="cbanking qbanking" \
- --with-backends="${_AQ_BACKENDS}" \
- CPPFLAGS="${_AQ_CPPFLAGS} ${GMP_CPPFLAGS}" \
- LDFLAGS="${_AQ_LDFLAGS} ${GMP_LDFLAGS}" \
- qt3_libs="-L${_QTDIR}/lib -L${_QTDIR}/bin -lQtCore4 -lQtGui4 -lQt3Support4" \
- qt3_includes="-I${_QTDIR}/include -I${_QTDIR}/include/Qt -I${_QTDIR}/include/QtCore -I${_QTDIR}/include/QtGui -I${_QTDIR}/include/Qt3Support" \
- --prefix=${_AQBANKING_UDIR}
- make qt4-port
- make clean
- else
- if [ -n "$AQBANKING_PATCH" -a -f "$AQBANKING_PATCH" ] ; then
- patch -p1 < $AQBANKING_PATCH
- automake
- aclocal -I m4 ${ACLOCAL_FLAGS}
- autoconf
- fi
- ./configure ${HOST_XCOMPILE} \
- --with-gwen-dir=${_GWENHYWFAR_UDIR} \
- --with-xmlmerge=${XMLMERGE} \
- --with-frontends="cbanking" \
- --with-backends="${_AQ_BACKENDS}" \
- CPPFLAGS="${_AQ_CPPFLAGS} ${GMP_CPPFLAGS}" \
- LDFLAGS="${_AQ_LDFLAGS} ${GMP_LDFLAGS}" \
- --prefix=${_AQBANKING_UDIR}
- fi
- make
- make install
- qpopd
- qpushd ${_AQBANKING_UDIR}/bin
- if [ "$AQBANKING3" != "yes" ]; then
- exetype aqbanking-tool.exe console
- exetype aqhbci-tool.exe console
- else
- exetype aqbanking-cli.exe console
- exetype aqhbci-tool4.exe console
- fi
- qpopd
- ${PKG_CONFIG} --exists aqbanking || die "AqBanking not installed correctly"
- rm -rf ${TMP_UDIR}/aqbanking-*
- fi
- [ ! -d $_AQBANKING_UDIR/share/aclocal ] || add_to_env "-I $_AQBANKING_UDIR/share/aclocal" ACLOCAL_FLAGS
-}
-
-function inst_libdbi() {
- setup LibDBI
- _SQLITE3_UDIR=`unix_path ${SQLITE3_DIR}`
- _MYSQL_LIB_UDIR=`unix_path ${MYSQL_LIB_DIR}`
- _PGSQL_UDIR=`unix_path ${PGSQL_DIR}`
- _LIBDBI_UDIR=`unix_path ${LIBDBI_DIR}`
- _LIBDBI_DRIVERS_UDIR=`unix_path ${LIBDBI_DRIVERS_DIR}`
- add_to_env -I$_LIBDBI_UDIR/include LIBDBI_CPPFLAGS
- add_to_env -L$_LIBDBI_UDIR/lib LIBDBI_LDFLAGS
- if test -f ${_SQLITE3_UDIR}/bin/libsqlite3-0.dll
- then
- echo "SQLite3 already installed. skipping."
- else
- wget_unpacked $SQLITE3_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/sqlite-*
- qpushd $TMP_UDIR/sqlite-*
- ./configure ${HOST_XCOMPILE} \
- --prefix=${_SQLITE3_UDIR}
- make
- make install
- qpopd
- test -f ${_SQLITE3_UDIR}/bin/libsqlite3-0.dll || die "SQLite3 not installed correctly"
- rm -rf ${TMP_UDIR}/sqlite-*
- fi
- if test -f ${_MYSQL_LIB_UDIR}/lib/libmysql.dll -a \
- -f ${_MYSQL_LIB_UDIR}/lib/libmysqlclient.a
- then
- echo "MySQL library already installed. skipping."
- else
- wget_unpacked $MYSQL_LIB_URL $DOWNLOAD_DIR $TMP_DIR
- mkdir -p $_MYSQL_LIB_UDIR
- assert_one_dir $TMP_UDIR/mysql*
- cp -r $TMP_UDIR/mysql*/* $_MYSQL_LIB_UDIR
- cp -r $TMP_UDIR/mysql*/include $_MYSQL_LIB_UDIR/include/mysql
- rm -rf ${TMP_UDIR}/mysql*
- qpushd $_MYSQL_LIB_UDIR/lib
- ${DLLTOOL} --input-def $LIBMYSQL_DEF --dllname libmysql.dll --output-lib libmysqlclient.a -k
- test -f ${_MYSQL_LIB_UDIR}/lib/libmysql.dll || die "mysql not installed correctly - libmysql.dll"
- test -f ${_MYSQL_LIB_UDIR}/lib/libmysqlclient.a || die "mysql not installed correctly - libmysqlclient.a"
- qpopd
- fi
- if test -f ${_PGSQL_UDIR}/lib/libpq.dll
- then
- echo "PGSQL library already installed. skipping."
- else
- wget_unpacked $PGSQL_LIB_URL $DOWNLOAD_DIR $TMP_DIR
- cp -r $TMP_UDIR/pgsql* $_PGSQL_UDIR
- rm -rf ${TMP_UDIR}/pgsql*
- test -f ${_PGSQL_UDIR}/lib/libpq.dll || die "libpq not installed correctly"
- fi
- if test -f ${_LIBDBI_UDIR}/bin/libdbi-0.dll
- then
- echo "libdbi already installed. skipping."
- else
- wget_unpacked $LIBDBI_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/libdbi-0*
- qpushd $TMP_UDIR/libdbi-0*
- if [ -n "$LIBDBI_PATCH" -a -f "$LIBDBI_PATCH" ]; then
- patch -p1 < $LIBDBI_PATCH
- ./autogen.sh
- fi
- if [ -n "$LIBDBI_PATCH2" -a -f "$LIBDBI_PATCH2" ]; then
- patch -p1 < $LIBDBI_PATCH2
- fi
- ./configure ${HOST_XCOMPILE} \
- --disable-docs \
- --prefix=${_LIBDBI_UDIR}
- make
- make install
- qpopd
- qpushd ${_LIBDBI_UDIR}
- if [ x"$(which pexports.exe > /dev/null 2>&1)" != x ]
- then
- pexports bin/libdbi-0.dll > lib/libdbi.def
- ${DLLTOOL} -d lib/libdbi.def -D bin/libdbi-0.dll -l lib/libdbi.lib
- fi
- qpopd
- test -f ${_LIBDBI_UDIR}/bin/libdbi-0.dll || die "libdbi not installed correctly"
- rm -rf ${TMP_UDIR}/libdbi-0*
- fi
- if test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdsqlite3.dll -a \
- -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdmysql.dll -a \
- -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdpgsql.dll
- then
- echo "libdbi drivers already installed. skipping."
- else
- wget_unpacked $LIBDBI_DRIVERS_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/libdbi-drivers-*
- qpushd $TMP_UDIR/libdbi-drivers*
- [ -n "$LIBDBI_DRIVERS_PATCH" -a -f "$LIBDBI_DRIVERS_PATCH" ] && \
- patch -p0 < $LIBDBI_DRIVERS_PATCH
- [ -n "$LIBDBI_DRIVERS_PATCH2" -a -f "$LIBDBI_DRIVERS_PATCH2" ] && \
- patch -p0 < $LIBDBI_DRIVERS_PATCH2
- [ -n "$LIBDBI_DRIVERS_PATCH3" -a -f "$LIBDBI_DRIVERS_PATCH3" ] && \
- patch -p0 < $LIBDBI_DRIVERS_PATCH3
- [ -n "$LIBDBI_DRIVERS_PATCH4" -a -f "$LIBDBI_DRIVERS_PATCH4" ] && \
- patch -p0 < $LIBDBI_DRIVERS_PATCH4
- LDFLAGS=-no-undefined ./configure ${HOST_XCOMPILE} \
- --disable-docs \
- --with-dbi-incdir=${_LIBDBI_UDIR}/include \
- --with-dbi-libdir=${_LIBDBI_UDIR}/lib \
- --with-sqlite3 \
- --with-sqlite3-dir=${_SQLITE3_UDIR} \
- --with-mysql \
- --with-mysql-dir=${_MYSQL_LIB_UDIR} \
- --with-pgsql \
- --with-pgsql-dir=${_PGSQL_UDIR} \
- --prefix=${_LIBDBI_DRIVERS_UDIR}
- make
- make install
- qpopd
- test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdsqlite3.dll || die "libdbi sqlite3 driver not installed correctly"
- test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdmysql.dll || die "libdbi mysql driver not installed correctly"
- test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdpgsql.dll || die "libdbi pgsql driver not installed correctly"
- rm -rf ${TMP_UDIR}/libdbi-drivers-*
- fi
-}
-
-function inst_cmake() {
- setup CMake
- _CMAKE_UDIR=`unix_path ${CMAKE_DIR}`
- add_to_env ${_CMAKE_UDIR}/bin PATH
- if [ -f ${_CMAKE_UDIR}/bin/cmake.exe ]
- then
- echo "cmake already installed. skipping."
- else
- wget_unpacked $CMAKE_URL $DOWNLOAD_DIR $CMAKE_DIR
-
- assert_one_dir ${_CMAKE_UDIR}/cmake-2*
- mv ${_CMAKE_UDIR}/cmake-2*/* ${_CMAKE_UDIR}
- rm -rf ${_CMAKE_UDIR}/cmake-2*
-
- [ -f ${_CMAKE_UDIR}/bin/cmake.exe ] || die "cmake not installed correctly"
- fi
-}
-
-function inst_cutecash() {
- setup Cutecash
- _BUILD_UDIR=`unix_path $CUTECASH_BUILD_DIR`
- _REPOS_UDIR=`unix_path $REPOS_DIR`
- mkdir -p $_BUILD_UDIR
-
- qpushd $_BUILD_UDIR
- cmake ${_REPOS_UDIR} \
- -G"MSYS Makefiles" \
- -DREGEX_INCLUDE_PATH=${_REGEX_UDIR}/include \
- -DREGEX_LIBRARY=${_REGEX_UDIR}/lib/libregex.a \
- -DGUILE_INCLUDE_DIR=${_GUILE_UDIR}/include \
- -DGUILE_LIBRARY=${_GUILE_UDIR}/bin/libguile.dll \
- -DLIBINTL_INCLUDE_PATH=${_GNOME_UDIR}/include \
- -DLIBINTL_LIBRARY=${_GNOME_UDIR}/bin/intl.dll \
- -DLIBXML2_INCLUDE_DIR=${_GNOME_UDIR}/include/libxml2 \
- -DLIBXML2_LIBRARIES=${_GNOME_UDIR}/bin/libxml2-2.dll \
- -DPKG_CONFIG_EXECUTABLE=${_GNOME_UDIR}/bin/pkg-config \
- -DZLIB_INCLUDE_DIR=${_GNOME_UDIR}/include \
- -DZLIB_LIBRARY=${_GNOME_UDIR}/bin/zlib1.dll \
- -DSWIG_EXECUTABLE=${_SWIG_UDIR}/swig.exe \
- -DHTMLHELP_INCLUDE_PATH=${_HH_UDIR}/include \
- -DWITH_SQL=ON \
- -DLIBDBI_INCLUDE_PATH=${_LIBDBI_UDIR}/include \
- -DLIBDBI_LIBRARY=${_LIBDBI_UDIR}/lib/libdbi.dll.a \
- -DCMAKE_BUILD_TYPE=Debug
- make
- qpopd
-}
-
-function inst_webkit() {
- setup WebKit
- _WEBKIT_UDIR=`unix_path ${WEBKIT_DIR}`
- add_to_env ${_WEBKIT_UDIR}/bin PATH
- add_to_env -lwebkit-1.0-2 WEBKIT_LIBS
- add_to_env -L${_WEBKIT_UDIR}/bin WEBKIT_LIBS
- add_to_env -I${_WEBKIT_UDIR}/include/webkit-1.0 WEBKIT_CFLAGS
- if quiet ${LD} ${WEBKIT_LIBS} -o $TMP_UDIR/ofile
- then
- echo "webkit already installed. skipping."
- else
- wget_unpacked $WEBKIT_URL $DOWNLOAD_DIR $WEBKIT_DIR
- quiet ${LD} ${WEBKIT_LIBS} -o $TMP_UDIR/ofile || die "webkit not installed correctly"
- fi
-}
-
-function svn_up() {
- mkdir -p $_REPOS_UDIR
- qpushd $REPOS_DIR
- if [ -x .svn ]; then
- setup "svn update in ${REPOS_DIR}"
- svn up -r ${SVN_REV}
- else
- setup svn co
- svn co -r ${SVN_REV} $REPOS_URL .
- fi
- qpopd
-}
-
-function inst_gnucash() {
- setup GnuCash
- _INSTALL_WFSDIR=`win_fs_path $INSTALL_DIR`
- _INSTALL_UDIR=`unix_path $INSTALL_DIR`
- _BUILD_UDIR=`unix_path $BUILD_DIR`
- _REL_REPOS_UDIR=`unix_path $REL_REPOS_DIR`
- mkdir -p $_BUILD_UDIR
- add_to_env $_INSTALL_UDIR/bin PATH
-
- AQBANKING_OPTIONS="--enable-hbci --with-aqbanking-dir=${_AQBANKING_UDIR}"
- AQBANKING_UPATH="${_OPENSSL_UDIR}/bin:${_GWENHYWFAR_UDIR}/bin:${_AQBANKING_UDIR}/bin"
- LIBOFX_OPTIONS="--enable-ofx --with-ofx-prefix=${_LIBOFX_UDIR}"
-
- if [ "$CROSS_COMPILE" = "yes" ]; then
- # Set these variables manually because of cross-compiling
- export GUILE_LIBS="${GUILE_LDFLAGS} -lguile -lguile-ltdl"
- export GUILE_INCS="${GUILE_CPPFLAGS}"
- export BUILD_GUILE=yes
- export name_build_guile=/usr/bin/guile-config
- fi
-
- qpushd $REPOS_DIR
- if [ "$BUILD_FROM_TARBALL" != "yes" ]; then
- ./autogen.sh
- fi
- qpopd
-
- qpushd $_BUILD_UDIR
- $_REL_REPOS_UDIR/configure ${HOST_XCOMPILE} \
- --prefix=$_INSTALL_WFSDIR \
- --enable-debug \
- --enable-schemas-install=no \
- --enable-dbi \
- --with-dbi-dbd-dir=$( echo ${_LIBDBI_DRIVERS_UDIR} | sed 's,^/\([A-Za-z]\)/,\1:/,g' )/lib/dbd \
- ${LIBOFX_OPTIONS} \
- ${AQBANKING_OPTIONS} \
- --enable-binreloc \
- --enable-locale-specific-tax \
- --with-html-engine=webkit \
- CPPFLAGS="${AUTOTOOLS_CPPFLAGS} ${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GUILE_CPPFLAGS} ${LIBDBI_CPPFLAGS} ${KTOBLZCHECK_CPPFLAGS} ${HH_CPPFLAGS} -D_WIN32" \
- LDFLAGS="${AUTOTOOLS_LDFLAGS} ${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} ${HH_LDFLAGS}" \
- PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
-
- make
-
- make_install
- qpopd
-}
-
-# This function will be called by make_install.sh as well,
-# so do not regard variables from inst_* functions as set
-# Parameters allowed: skip_scripts, skip_schemas
-function make_install() {
- _BUILD_UDIR=`unix_path $BUILD_DIR`
- _INSTALL_UDIR=`unix_path $INSTALL_DIR`
- _GOFFICE_UDIR=`unix_path $GOFFICE_DIR`
- _LIBGSF_UDIR=`unix_path $LIBGSF_DIR`
- _PCRE_UDIR=`unix_path $PCRE_DIR`
- _GNOME_UDIR=`unix_path $GNOME_DIR`
- _GUILE_UDIR=`unix_path $GUILE_DIR`
- _REGEX_UDIR=`unix_path $REGEX_DIR`
- _AUTOTOOLS_UDIR=`unix_path $AUTOTOOLS_DIR`
- _OPENSSL_UDIR=`unix_path $OPENSSL_DIR`
- _GWENHYWFAR_UDIR=`unix_path ${GWENHYWFAR_DIR}`
- _AQBANKING_UDIR=`unix_path ${AQBANKING_DIR}`
- _LIBOFX_UDIR=`unix_path ${LIBOFX_DIR}`
- _OPENSP_UDIR=`unix_path ${OPENSP_DIR}`
- _LIBDBI_UDIR=`unix_path ${LIBDBI_DIR}`
- _SQLITE3_UDIR=`unix_path ${SQLITE3_DIR}`
- _WEBKIT_UDIR=`unix_path ${WEBKIT_DIR}`
- _GNUTLS_UDIR=`unix_path ${GNUTLS_DIR}`
- AQBANKING_UPATH="${_OPENSSL_UDIR}/bin:${_GWENHYWFAR_UDIR}/bin:${_AQBANKING_UDIR}/bin"
- AQBANKING_PATH="${OPENSSL_DIR}\\bin;${GWENHYWFAR_DIR}\\bin;${AQBANKING_DIR}\\bin"
-
- for param in "$@"; do
- [ "$param" = "skip_scripts" ] && _skip_scripts=1
- [ "$param" = "skip_schemas" ] && _skip_schemas=1
- done
-
- make install
-
- qpushd $_INSTALL_UDIR/lib
- # Move modules that are compiled without -module to lib/gnucash and
- # correct the 'dlname' in the libtool archives. We do not use these
- # files to dlopen the modules, so actually this is unneeded.
- # Also, in all installed .la files, remove the dependency_libs line
- mv bin/*.dll gnucash 2>/dev/null || true
- for A in gnucash/*.la; do
- sed '/dependency_libs/d;s#../bin/##' $A > tmp ; mv tmp $A
- done
- for A in *.la; do
- sed '/dependency_libs/d' $A > tmp ; mv tmp $A
- done
- qpopd
-
- if [ -z $_skip_schemas ]; then
- qpushd $_INSTALL_UDIR/etc/gconf/schemas
- for file in *.schemas; do
- gconftool-2 \
- --config-source=xml:merged:${_INSTALL_WFSDIR}/etc/gconf/gconf.xml.defaults \
- --install-schema-file $file >/dev/null
- done
- gconftool-2 --shutdown
- qpopd
- fi
-
- if [ -z $_skip_scripts ]; then
- # Create a startup script that works without the msys shell
- # If you make any changes here, you should probably also change
- # the equivalent sections in packaging/win32/gnucash.iss.in, and
- # src/bin/environment*.in
- qpushd $_INSTALL_UDIR/bin
- cat > gnucash.cmd <<EOF
- at echo off
-setlocal
-set PATH=$INSTALL_DIR\\bin;%PATH%
-set PATH=$INSTALL_DIR\\lib;%PATH%
-set PATH=$INSTALL_DIR\\lib\\gnucash;%PATH%
-set PATH=$GNUTLS_DIR\\bin;%PATH%
-set PATH=$GMP_DIR\\bin;%PATH%
-set PATH=$GOFFICE_DIR\\bin;%PATH%
-set PATH=$LIBGSF_DIR\\bin;%PATH%
-set PATH=$PCRE_DIR\\bin;%PATH%
-set PATH=$GNOME_DIR\\bin;%PATH%
-set PATH=$GUILE_DIR\\bin;%PATH%
-set PATH=$WEBKIT_DIR\\bin;%PATH%
-set PATH=$REGEX_DIR\\bin;%PATH%
-set PATH=$AUTOTOOLS_DIR\\bin;%PATH%
-set PATH=$AQBANKING_PATH;%PATH%
-set PATH=$LIBOFX_DIR\\bin;%PATH%
-set PATH=$OPENSP_DIR\\bin;%PATH%
-set PATH=$LIBDBI_DIR\\bin;%PATH%
-set PATH=$SQLITE3_DIR\\bin;%PATH%
-set PATH=$MYSQL_LIB_DIR\\lib;%PATH%
-set PATH=$PGSQL_DIR\\bin;%PATH%
-set PATH=$PGSQL_DIR\\lib;%PATH%
-
-set LTDL_LIBRARY_PATH=${INSTALL_DIR}\\lib
-
-start gnucash-bin %*
-EOF
- qpopd
- fi
-}
-
-function make_chm() {
- _CHM_TYPE=$1
- _CHM_LANG=$2
- _XSLTPROC_OPTS=$3
- echo "Processing $_CHM_TYPE ($_CHM_LANG) ..."
- qpushd $_CHM_TYPE/$_CHM_LANG
- xsltproc $XSLTPROCFLAGS $_XSLTPROC_OPTS ../../../docbook-xsl/htmlhelp/htmlhelp.xsl gnucash-$_CHM_TYPE.xml
- count=0
- echo >> htmlhelp.hhp
- echo "[ALIAS]" >> htmlhelp.hhp
- echo "IDH_0=index.html" >> htmlhelp.hhp
- echo "#define IDH_0 0" > mymaps
- echo "[Map]" > htmlhelp.hhmap
- echo "Searching for anchors ..."
- for id in `cat *.xml | sed '/sect.*id=/!d;s,.*id=["'\'']\([^"'\'']*\)["'\''].*,\1,'` ; do
- files=`grep -l "[\"']${id}[\"']" *.html` || continue
- echo "IDH_$((++count))=${files}#${id}" >> htmlhelp.hhp
- echo "#define IDH_${count} ${count}" >> mymaps
- echo "${id}=${count}" >> htmlhelp.hhmap
- done
- echo >> htmlhelp.hhp
- echo "[MAP]" >> htmlhelp.hhp
- cat mymaps >> htmlhelp.hhp
- rm mymaps
- hhc htmlhelp.hhp >/dev/null || true
- cp -fv htmlhelp.chm $_DOCS_INST_UDIR/$_CHM_LANG/gnucash-$_CHM_TYPE.chm
- cp -fv htmlhelp.hhmap $_DOCS_INST_UDIR/$_CHM_LANG/gnucash-$_CHM_TYPE.hhmap
- qpopd
-}
-
-function inst_docs() {
- _DOCS_UDIR=`unix_path $DOCS_DIR`
- if [ ! -d $_DOCS_UDIR/docbook-xsl ] ; then
- wget_unpacked $DOCBOOK_XSL_URL $DOWNLOAD_DIR $DOCS_DIR
- # add a pause to allow windows to realize that the files now exist
- sleep 1
- mv $_DOCS_UDIR/docbook-xsl-* $_DOCS_UDIR/docbook-xsl
- fi
- mkdir -p $_DOCS_UDIR/repos
- qpushd $DOCS_DIR/repos
- if [ "$UPDATE_DOCS" = "yes" ]; then
- if [ -x .svn ]; then
- setup "SVN update of docs"
- svn up -r ${DOCS_REV}
- else
- setup "SVN checkout of docs"
- svn co -r ${DOCS_REV} $DOCS_URL .
- fi
- fi
- setup docs
- _DOCS_INST_UDIR=`unix_path $INSTALL_DIR`/share/gnucash/help
- mkdir -p $_DOCS_INST_UDIR/{C,de_DE,it_IT,ja_JP}
- make_chm guide C
- make_chm guide de_DE
- make_chm guide it_IT
- make_chm guide ja_JP "--stringparam chunker.output.encoding Shift_JIS --stringparam htmlhelp.encoding Shift_JIS"
- make_chm help C
- make_chm help de_DE
-# make_chm help it_IT
- qpopd
-}
+add_step inst_mingw
+add_step inst_regex
+add_step inst_readline
+if [ "$CROSS_COMPILE" != "yes" ]; then
+ add_step inst_active_perl
+ add_step inst_mingwutils
+fi
+add_step inst_autotools
+if [ "$AQBANKING3" = "yes" ]; then
+ add_step inst_gmp
+fi
+add_step inst_guile
+if [ "$CROSS_COMPILE" != "yes" ]; then
+ add_step inst_svn
+ if [ "$AQBANKING3" != "yes" ]; then
+ add_step inst_openssl
+ fi
+fi
+add_step inst_exetype
+add_step inst_libxslt
+add_step inst_gnome
+if [ "$AQBANKING3" = "yes" ]; then
+ add_step inst_gnutls
+fi
+add_step inst_swig
+add_step inst_pcre
+add_step inst_libbonoboui
+add_step inst_libgsf
+if [ "$CROSS_COMPILE" != "yes" ]; then
+ add_step inst_hh
+fi
+add_step inst_goffice
+#add_step inst_glade
+add_step inst_opensp
+add_step inst_libofx
+## Online banking:
+add_step inst_gwenhywfar
+add_step inst_ktoblzcheck
+add_step inst_aqbanking
+add_step inst_libdbi
+add_step inst_webkit
+##
+if [ "$UPDATE_SOURCES" = "yes" ]; then
+ add_step svn_up
+fi
+if [ "$WITH_CUTECASH" = "yes" ]; then
+ add_step inst_cmake
+ add_step inst_cutecash
+fi
+add_step inst_gnucash
+add_step inst_docs
+if [ "$CROSS_COMPILE" != "yes" ]; then
+ add_step inst_inno
+fi
+add_step inst_finish
-function finish() {
- setup Finish...
- if [ "$NO_SAVE_PROFILE" != "yes" ]; then
- _NEW=x
- for _ENV in $ENV_VARS; do
- _ADDS=`eval echo '"\$'"${_ENV}"'_ADDS"'`
- if [ "$_ADDS" ]; then
- if [ "$_NEW" ]; then
- echo
- echo "Environment variables changed, please do the following"
- echo
- [ -d /etc/profile.d ] || echo "mkdir -p /etc/profile.d"
- _NEW=
- fi
- _VAL=`eval echo '"$'"${_ENV}_BASE"'"'`
- if [ "$_VAL" ]; then
- _CHANGE="export ${_ENV}=\"${_ADDS}"'$'"${_ENV}\""
- else
- _CHANGE="export ${_ENV}=\"${_ADDS}\""
- fi
- echo $_CHANGE
- echo echo "'${_CHANGE}' >> /etc/profile.d/installer.sh"
- fi
- done
- fi
- if [ "$CROSS_COMPILE" = "yes" ]; then
- echo "You might want to create a binary tarball now as follows:"
- qpushd $GLOBAL_DIR
- echo tar -czf $HOME/gnucash-fullbin.tar.gz --anchored \
- --exclude='*.a' --exclude='*.o' --exclude='*.h' \
- --exclude='*.info' --exclude='*.html' \
- --exclude='*include/*' --exclude='*gtk-doc*' \
- --exclude='bin*' \
- --exclude='mingw32/*' --exclude='*bin/mingw32-*' \
- --exclude='gnucash-trunk*' \
- *
- qpopd
- fi
-}
+# run commands registered with late_eval
+eval_now
for step in "${steps[@]}" ; do
eval $step
commit 1c00417e8a6cdc8631163a9bae610854b59b485d
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed May 19 22:00:48 2010 +0000
Additional fix for Simplified Chinese translation of windows installer
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19183 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/Makefile.am b/Makefile.am
index c339a40..c934cba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,6 +14,7 @@ EXTRA_DIST = \
pi.sh \
Greek-4-5.1.11.isl \
Japanese-5-5.1.11.isl \
+ ChineseSimp-12-5.1.11.isl \
reset.sh
if OS_WIN32
commit 6f1867842e8c2b835a2fcef08fa36cf7760067f1
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed May 19 16:21:50 2010 +0000
Fix windows build
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19181 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/Makefile.am b/Makefile.am
index eeb7934..c339a40 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,6 +23,7 @@ if OS_WIN32
AM_CPPFLAGS = $(GLIB_CFLAGS)
pkgdata_DATA = Greek-4-5.1.11.isl
pkgdata_DATA += Japanese-5-5.1.11.isl
+ pkgdata_DATA += ChineseSimp-12-5.1.11.isl
else
EXTRA_DIST += redirect.c
endif
commit f5fab318d24a8492bf860efaf01105af084d1ef1
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat May 15 10:27:50 2010 +0000
Reapply Simplified Chinese patches
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19168 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/ChineseSimp-12-5.1.11.isl b/ChineseSimp-12-5.1.11.isl
index 21fb877..1468280 100644
--- a/ChineseSimp-12-5.1.11.isl
+++ b/ChineseSimp-12-5.1.11.isl
@@ -1,320 +1,320 @@
-; *** Inno Setup version 5.1.11+ Simplified Chinese messages ***
-;
-; Based on previous version by Peng Bai
-; Update by Mack Zhang (hua_wuxin at 21cn.com) on Apr. 10, 2008
-;
-; To download user-contributed translations of this file, go to:
-; http://www.jrsoftware.org/files/istrans/
-;
-; Note: When translating this text, do not add periods (.) to the end of
-; messages that didn't have them already, because on those messages Inno
-; Setup adds the periods automatically (appending a period would result in
-; two periods being displayed).
-
-[LangOptions]
-; The following three entries are very important. Be sure to read and
-; understand the '[LangOptions] section' topic in the help file.
-LanguageName=<4E2D><6587> (<7B80><4F53>)
-LanguageID=$0804
-LanguageCodePage=936
-; If the language you are translating to requires special font faces or
-; sizes, uncomment any of the following entries and change them accordingly.
-DialogFontName=����
-DialogFontSize=9
-;WelcomeFontName=Verdana
-;WelcomeFontSize=12
-;TitleFontName=Arial
-;TitleFontSize=29
-;CopyrightFontName=Arial
-;CopyrightFontSize=8
-
-[Messages]
-
-; *** Application titles
-SetupAppTitle=��װ��
-SetupWindowTitle=��װ�� - %1
-UninstallAppTitle=���
-UninstallAppFullTitle=%1 ���
-
-; *** Misc. common
-InformationTitle=��Ϣ
-ConfirmTitle=ȷ��
-ErrorTitle=����
-
-; *** SetupLdr messages
-SetupLdrStartupMessage=��װ�򵼽�����ĵ����ϰ�װ %1����ȷ��Ҫ������
-LdrCannotCreateTemp=�޷�������ʱ�ļ�����װ��ֹ
-LdrCannotExecTemp=�޷�������ʱ�ļ����е��ļ�����װ��ֹ
-
-; *** Startup error messages
-LastErrorMessage=%1.%n%n���� %2��%3
-SetupFileMissing=��װ�ļ���ȱ���ļ� %1�����������������ȡ������°汾��
-SetupFileCorrupt=��װ�ļ����𻵡�����ȡ������°汾��
-SetupFileCorruptOrWrongVer=��װ�ļ����𻵣�������˰�װ�򵼵İ汾�����ݡ����������������ȡ������°汾��
-NotOnThisPlatform=�˳������� %1 �����С�
-OnlyOnThisPlatform=�˳�������� %1 �����С�
-OnlyOnTheseArchitectures=�˳���ֻ�ܰ�װ��Ϊ���д������ܹ���Ƶ� Windows �汾�У�%n%n%1
-MissingWOW64APIs=��ǰ�� Windows �汾û�а�ִ�� 64 λ��װ������ĺ�����Ҫ��������⣬�밲װ Service Pack %1��
-WinVersionTooLowError=�˳�����Ҫ %1 v%2 ���߰汾��
-WinVersionTooHighError=�˳����ܰ�װ�� %1 v%2 ���߰汾�ϡ�
-AdminPrivilegesRequired=��װ�˳���ʱ������Թ���Ա��ݵ�¼��
-PowerUserPrivilegesRequired=��װ�˳���ʱ������Թ���Ա�� Power Users ���Ա����ݵ�¼��
-SetupAppRunningError=��װ�򵼷��� %1 �������С�%n%n�������ر�������ʵ��Ȼ�󵥻���ȷ��������򵥻���ȡ���˳���
-UninstallAppRunningError=ж�س����� %1 �������С�%n%n�������ر�������ʵ��Ȼ�󵥻���ȷ��������򵥻���ȡ���˳���
-
-; *** Misc. errors
-ErrorCreatingDir=��װ���޷������ļ��С�%1��
-ErrorTooManyFilesInDir=�޷����ļ��С�%1���д����ļ�����Ϊ�����̫���ļ�
-
-; *** Setup common messages
-ExitSetupTitle=�˳���װ
-ExitSetupMessage=��װ��δ��ɡ�����������˳�����������ᰲװ��%n%n�����������ʱ���������а�װ������ɰ�װ��%n%n�����˳���װ��
-AboutSetupMenuItem=���ڰ�װ��(&A)...
-AboutSetupTitle=���ڰ�װ��
-AboutSetupMessage=%1 �汾 %2%n%3%n%n%1 ��ҳ��%n%4
-AboutSetupNote=
-TranslatorNote=
-
-; *** Buttons
-ButtonBack=< ��һ��(&B)
-ButtonNext=��һ��(&N) >
-ButtonInstall=��װ(&I)
-ButtonOK=ȷ��
-ButtonCancel=ȡ��
-ButtonYes=��(&Y)
-ButtonYesToAll=ȫ��(&A)
-ButtonNo=��(&N)
-ButtonNoToAll=ȫ��(&O)
-ButtonFinish=���(&F)
-ButtonBrowse=���(&B)...
-ButtonWizardBrowse=���(&R)...
-ButtonNewFolder=�����ļ���(&M)
-
-; *** "Select Language" dialog messages
-SelectLanguageTitle=ѡ��װ����
-SelectLanguageLabel=ѡ��װ�ڼ�Ҫʹ�õ����ԣ�
-
-; *** Common wizard text
-ClickNext=��������һ��������򵥻���ȡ���˳���װ��
-BeveledLabel=
-BrowseDialogTitle=����ļ���
-BrowseDialogLabel=ѡ��һ���ļ��У�Ȼ�󵥻���ȷ������
-NewFolderName=�½��ļ���
-
-; *** "Welcome" wizard page
-WelcomeLabel1=��Óʹ�� [name] ��װ��
-WelcomeLabel2=��װ�򵼽�����ĵ����ϰ�װ [name/ver]��%n%n�������ڼ���֮ǰ�ر���������Ӧ�ó���
-
-; *** "Password" wizard page
-WizardPassword=����
-PasswordLabel1=�˰�װ�������뱣����
-PasswordLabel3=���������룬Ȼ�󵥻�����һ����������һ����������ִ�Сд��
-PasswordEditLabel=����(&P)��
-IncorrectPassword=����������벻��ȷ�������ԡ�
-
-; *** "License Agreement" wizard page
-WizardLicense=�����
-LicenseLabel=���ڼ���֮ǰ�Ķ�������Ҫ��Ϣ��
-LicenseLabel3=���Ķ��������Ð�顣�ڼ���װ֮ǰ���������ܴ�Ð������
-LicenseAccepted=�ҽ���Ð��(&A)
-LicenseNotAccepted=�Ҳ�����Ð��(&D)
-
-; *** "Information" wizard pages
-WizardInfoBefore=��Ϣ
-InfoBeforeLabel=���ڼ���֮ǰ�Ķ�������Ҫ��Ϣ��
-InfoBeforeClickLabel=����׼���ü���װ���뵥������һ������
-WizardInfoAfter=��Ϣ
-InfoAfterLabel=���ڼ���֮ǰ�Ķ�������Ҫ��Ϣ��
-InfoAfterClickLabel=����׼���ü���װ���뵥������һ������
-
-; *** "User Information" wizard page
-WizardUserInfo=�û���Ϣ
-UserInfoDesc=�����������Ϣ��
-UserInfoName=�û���(&U)��
-UserInfoOrg=��֯(&O)��
-UserInfoSerial=���к�(&S)��
-UserInfoNameRequired=���������û���
-
-; *** "Select Destination Location" wizard page
-WizardSelectDir=ѡ��Ŀ��λ��
-SelectDirDesc=�� [name] ��װ�����
-SelectDirLabel3=��װ�򵼽��� [name] ��װ�������ļ����С�
-SelectDirBrowseLabel=��Ҫ����������һ�����������Ҫѡ��ͬ���ļ��У��뵥�����������
-DiskSpaceMBLabel=������Ҫ [mb] MB �Ŀ��д��̿ռ䡣
-ToUNCPathname=��װ�򵼲��ܰ�װ�� UNC ·�����������Ҫͨ�����簲װ����ӳ������������
-InvalidPath=�������������̷������·�������磺%n%nC:\APP%n%n���� UNC ·����ʽ��%n%n\\server\share
-InvalidDrive=��ѡ��������� UNC ���?���ڻ򲻿ɷ��ʡ�������ѡ��
-DiskSpaceWarningTitle=û���㹻�Ĵ��̿ռ�
-DiskSpaceWarning=��װ��������Ҫ %1 KB ��ʣ��ռ䣬������ѡ����ֻ�� %2 KB ���á�%n%n���������ҲҪ������
-DirNameTooLong=�ļ�����ƻ�·��̫����
-InvalidDirName=�ļ��������Ч��
-BadDirName32=�ļ�����Ʋ��ܰ������ַ�%n%n%1
-DirExistsTitle=�ļ����Ѵ���
-DirExists=�ļ��У�%n%n%1%n%n�Ѵ��ڡ���ȷ��Ҫ��װ�����ļ�����
-DirDoesntExistTitle=�ļ��в�����
-DirDoesntExist=�ļ��У�%n%n%1%n%n�����ڡ��������ļ�����
-
-; *** "Select Components" wizard page
-WizardSelectComponents=ѡ�����
-SelectComponentsDesc=Ҫ��װ��Щ�����
-SelectComponentsLabel2=��ѡ����Ҫ��װ�����������㲻�밲װ�������׼���ú�������һ������
-FullInstallation=����װ
-; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
-CompactInstallation=��లװ
-CustomInstallation=���ư�װ
-NoUninstallWarningTitle=����Ѵ���
-NoUninstallWarning=��װ�򵼷�����������Ѿ���װ��%n%n%1%n%nȡ��ѡ������ж����Щ�����%n%n����װ��
-ComponentSize1=%1 KB
-ComponentSize2=%1 MB
-ComponentsDiskSpaceMBLabel=��ǰ��ѡ��������Ҫ [mb] MB ���̿ռ䡣
-
-; *** "Select Additional Tasks" wizard page
-WizardSelectTasks=ѡ�񸽼�����
-SelectTasksDesc=Ҫִ����Щ��������
-SelectTasksLabel2=��ѡ���ڰ�װ [name] �ڼ䰲װ��Ҫִ�еĸ�������Ȼ��������һ������
-
-; *** "Select Start Menu Folder" wizard page
-WizardSelectProgramGroup=ѡ��ʼ�˵��ļ���
-SelectStartMenuFolderDesc=�ѳ����ݷ�ʽ�ŵ����
-SelectStartMenuFolderLabel3=��װ�򵼽������¿�ʼ�˵��ļ����д��������ݷ�ʽ��
-SelectStartMenuFolderBrowseLabel=�������һ����������һ���������Ҫѡ��ͬ���ļ��У��������������
-MustEnterGroupName=����������ļ������
-GroupNameTooLong=�ļ�����ƻ�·��̫��
-InvalidGroupName=�ļ��������Ч
-BadGroupName=�ļ�����Ʋ��ܰ������ַ�%n%n%1
-NoProgramGroupCheck2=��ֹ������ʼ�˵��ļ���(&D)
-
-; *** "Ready to Install" wizard page
-WizardReady=׼����װ
-ReadyLabel1=��װ������׼����ʼ��װ [name]��
-ReadyLabel2a=�������װ������װ���������Ҫ�鿴���߸��������������һ������
-ReadyLabel2b=�������װ������װ��
-ReadyMemoUserInfo=�û���Ϣ��
-ReadyMemoDir=Ŀ��λ�ã�
-ReadyMemoType=��װ���ͣ�
-ReadyMemoComponents=��ѡ�����
-ReadyMemoGroup=��ʼ�˵��ļ��У�
-ReadyMemoTasks=��������
-
-; *** "Preparing to Install" wizard page
-WizardPreparing=����׼����װ
-PreparingDesc=��װ������׼����װ [name]��
-PreviousInstallNotCompleted=��ǰ����İ�װ/ж����δ��ɡ�����Ҫ������������ɰ�װ��%n%n��������֮�����������а�װ������� [name] �İ�װ��
-CannotContinue=��װ�򵼲��ܼ���������ȡ���˳���
-
-; *** "Installing" wizard page
-WizardInstalling=���ڰ�װ
-InstallingLabel=������ļ�����а�װ [name]�����Ե�...
-
-; *** "Setup Completed" wizard page
-FinishedHeadingLabel=��� [name] ��װ
-FinishedLabelNoIcons=��װ������� [name] �İ�װ��
-FinishedLabel=��װ������� [name] �İ�װ������ͨ��ѡ���Ѱ�װ��ͼ��������Ӧ�ó���
-ClickFinish=�������ɡ��˳���װ��
-FinishedRestartLabel=Ϊ����� [name] �İ�װ����װ�򵼱����������ԡ���Ҫ����������
-FinishedRestartMessage=Ϊ����� [name] �İ�װ����װ�򵼱����������ԡ�%n%n��Ҫ����������
-ShowReadmeCheck=�ǣ���Ҫ�鿴�����ļ�
-YesRadio=�ǣ�������������(&Y)
-NoRadio=���Ժ���������(&N)
-; used for example as 'Run MyProg.exe'
-RunEntryExec=���� %1
-; used for example as 'View Readme.txt'
-RunEntryShellExec=�鿴 %1
-
-; *** "Setup Needs the Next Disk" stuff
-ChangeDiskTitle=��װ����Ҫ��һ������
-SelectDiskLabel2=�������� %1 �������ȷ������%n%n����ڳ���������ʾ���ļ���������ļ������Ҳ����ô����ϵ��ļ�������������ȷ��·���������������
-PathLabel=·��(&P)��
-FileNotInDir2=�ļ���%1�����ڡ�%2���С��������ȷ�Ĵ��̻�ѡ�������ļ��С�
-SelectDirectoryLabel=��ָ����һ�����̵�λ�á�
-
-; *** Installation phase messages
-SetupAborted=��װ��δ��ɡ�%n%n��������Ⲣ�������а�װ�򵼡�
-EntryAbortRetryIgnore=��������ԡ����³��ԣ���������ԡ�����װ����������ֹ��ȡ��װ��
-
-; *** Installation status messages
-StatusCreateDirs=���ڴ����ļ���...
-StatusExtractFiles=������ȡ�ļ�...
-StatusCreateIcons=���ڴ�����ݷ�ʽ...
-StatusCreateIniEntries=���ڴ��� INI ��Ŀ...
-StatusCreateRegistryEntries=���ڴ���ע�����Ŀ...
-StatusRegisterFiles=����ע���ļ�...
-StatusSavingUninstall=���ڱ���ж����Ϣ...
-StatusRunProgram=������ɰ�װ...
-StatusRollback=���ڻع����...
-
-; *** Misc. errors
-ErrorInternal2=�ڲ�����%1
-ErrorFunctionFailedNoCode=%1 ʧ��
-ErrorFunctionFailed=%1 ʧ�ܡ����� %2
-ErrorFunctionFailedWithMessage=%1 ʧ�ܡ����� %2��%n%3
-ErrorExecutingProgram=�޷�ִ���ļ���%n%1
-
-; *** Registry errors
-ErrorRegOpenKey=��ע����ʱ���?%n%1\%2
-ErrorRegCreateKey=����ע����ʱ���?%n%1\%2
-ErrorRegWriteKey=д��ע����ʱ���?%n%1\%2
-
-; *** INI errors
-ErrorIniEntry=���ļ���%1���д��� INI ��Ŀʱ���?
-
-; *** File copying errors
-FileAbortRetryIgnore=��������ԡ����³��ԣ���������ԡ������ļ� (���Ƽ�)����������ֹ��ȡ��װ��
-FileAbortRetryIgnore2=��������ԡ����³��ԣ���������ԡ�����װ (���Ƽ�)����������ֹ��ȡ��װ��
-SourceIsCorrupted=Դ�ļ�����
-SourceDoesntExist=Դ�ļ���%1��������
-ExistingFileReadOnly=�����ļ�Ϊֻ����%n%n��������ԡ��Ƴ�ֻ�����Բ����ԣ���������ԡ������ļ�����������ֹ��ȡ��װ��
-ErrorReadingExistingDest=��ȡ�����ļ�ʱ�������
-FileExists=�ļ��Ѵ��ڡ�%n%n��Ҫ��������
-ExistingFileNewer=�����ļ��Ȱ�װ��Ҫ��װ�Ļ��¡������㱣�������ļ���%n%n���������ļ���
-ErrorChangingAttr=��������ļ�������ʱ�������
-ErrorCreatingTemp=��Ŀ���ļ����д����ļ�ʱ�������
-ErrorReadingSource=��ȡԴ�ļ�ʱ�������
-ErrorCopying=�����ļ�ʱ�������
-ErrorReplacingExistingFile=�滻�����ļ�ʱ�������
-ErrorRestartReplace=�������滻ʧ�ܣ�
-ErrorRenamingTemp=������Ŀ���ļ����е��ļ�ʱ�������
-ErrorRegisterServer=�޷�ע�� DLL/OCX��%1
-ErrorRegSvr32Failed=RegSvr32 ʧ�ܡ�����ֵ��%1
-ErrorRegisterTypeLib=�޷�ע�����Ϳ⣺%1
-
-; *** Post-installation errors
-ErrorOpeningReadme=�������ļ�ʱ�������
-ErrorRestartingComputer=��װ���޷��������ԡ����ֶ�������
-
-; *** Uninstaller messages
-UninstallNotFound=�ļ���%1�������ڡ�����ж�ء�
-UninstallOpenError=�ļ���%1�����ܴ򿪡�����ж��
-UninstallUnsupportedVer=ж����־�ļ���%1���ĸ�ʽ���ܱ��˰汾��ж�س���ʶ�𡣲���ж��
-UninstallUnknownEntry=ж����־������һ��δ֪����Ŀ (%1)
-ConfirmUninstall=���Ƿ�ȷ��Ҫ��ȫɾ�� %1 �������������
-UninstallOnlyOnWin64=�˰�װֻ���� 64 λ Windows ��ж�ء�
-OnlyAdminCanUninstall=�˰�װֻ���ɾ߱�����ԱȨ�޵��û�ж�ء�
-UninstallStatusLabel=����ɾ�� %1�����Ե�...
-UninstalledAll=%1 �ѳɹ�ɾ��
-UninstalledMost=%1 ж����ɡ�%n%nijЩ��Ŀ����ɾ������ֶ�ɾ��
-UninstalledAndNeedsRestart=��Ҫ��� %1 ��ж�أ������������ԡ�%n%n��Ҫ����������
-UninstallDataCorrupted=�ļ���%1�����𻵡�����ж��
-
-; *** Uninstallation phase messages
-ConfirmDeleteSharedFileTitle=ɾ�����ļ���
-ConfirmDeleteSharedFile2=���й����ļ����ٱ��κγ���ʹ�á���Ҫɾ��ù����ļ���%n%n����г���ʹ�ø��ļ������ѱ�ɾ����Щ��������޷������С�����㲻ȷ��������ѡ�񡰷񡱡����¸��ļ������ϵͳ����κ�Σ����
-SharedFileNameLabel=�ļ���
-SharedFileLocationLabel=λ�ã�
-WizardUninstalling=ж��״̬
-StatusUninstalling=����� %1...
-
-; The custom messages below aren't used by Setup itself, but if you make
-; use of them in your scripts, you'll want to translate them.
-
-[CustomMessages]
-
-NameAndVersion=%1 �汾 %2
-AdditionalIcons=����ͼ�꣺
-CreateDesktopIcon=��������ͼ��(&D)
-CreateQuickLaunchIcon=��������������ͼ��(&Q)
-ProgramOnTheWeb=%1 ��վ
-UninstallProgram=� %1
-LaunchProgram=���� %1
-AssocFileExtension=�� %1 �� %2 �ļ���չ�����(&A)
-AssocingFileExtension=���ڽ� %1 �� %2 �ļ���չ�����...
+; *** Inno Setup version 5.1.11+ Simplified Chinese messages ***
+;
+; Based on previous version by Peng Bai
+; Update by Mack Zhang (hua_wuxin at 21cn.com) on Apr. 10, 2008
+;
+; To download user-contributed translations of this file, go to:
+; http://www.jrsoftware.org/files/istrans/
+;
+; Note: When translating this text, do not add periods (.) to the end of
+; messages that didn't have them already, because on those messages Inno
+; Setup adds the periods automatically (appending a period would result in
+; two periods being displayed).
+
+[LangOptions]
+; The following three entries are very important. Be sure to read and
+; understand the '[LangOptions] section' topic in the help file.
+LanguageName=<4E2D><6587> (<7B80><4F53>)
+LanguageID=$0804
+LanguageCodePage=936
+; If the language you are translating to requires special font faces or
+; sizes, uncomment any of the following entries and change them accordingly.
+DialogFontName=ËÎÌå
+DialogFontSize=9
+;WelcomeFontName=Verdana
+;WelcomeFontSize=12
+;TitleFontName=Arial
+;TitleFontSize=29
+;CopyrightFontName=Arial
+;CopyrightFontSize=8
+
+[Messages]
+
+; *** Application titles
+SetupAppTitle=°²×°Ïòµ¼
+SetupWindowTitle=°²×°Ïòµ¼ - %1
+UninstallAppTitle=жÔØÏòµ¼
+UninstallAppFullTitle=%1 жÔØÏòµ¼
+
+; *** Misc. common
+InformationTitle=ÐÅÏ¢
+ConfirmTitle=È·ÈÏ
+ErrorTitle=´íÎó
+
+; *** SetupLdr messages
+SetupLdrStartupMessage=°²×°Ïòµ¼½«ÔÚÄãµÄµçÄÔÉÏ°²×° %1¡£ÄãÈ·¶¨Òª¼ÌÐøÂð£¿
+LdrCannotCreateTemp=ÎÞ·¨´´½¨ÁÙʱÎļþ¡£°²×°ÖÐÖ¹
+LdrCannotExecTemp=ÎÞ·¨ÔËÐÐÁÙʱÎļþ¼ÐÖеÄÎļþ¡£°²×°ÖÐÖ¹
+
+; *** Startup error messages
+LastErrorMessage=%1.%n%n´íÎó %2£º%3
+SetupFileMissing=°²×°Îļþ¼ÐȱÉÙÎļþ %1¡£Çë¾ÀÕý´ËÎÊÌâ»òÕßË÷È¡Èí¼þµÄа汾¡£
+SetupFileCorrupt=°²×°ÎļþÒÑË𻵡£ÇëË÷È¡Èí¼þµÄа汾¡£
+SetupFileCorruptOrWrongVer=°²×°ÎļþÒÑË𻵣¬»òÕßÓë´Ë°²×°Ïòµ¼µÄ°æ±¾²»¼æÈÝ¡£Çë¾ÀÕý´ËÎÊÌâ»òÕßË÷È¡Èí¼þµÄа汾¡£
+NotOnThisPlatform=´Ë³ÌÐò²»ÄÜÔÚ %1 ÉÏÔËÐС£
+OnlyOnThisPlatform=´Ë³ÌÐò±ØÐëÔÚ %1 ÉÏÔËÐС£
+OnlyOnTheseArchitectures=´Ë³ÌÐòÖ»ÄÜ°²×°ÔÚΪÏÂÁд¦ÀíÆ÷¼Ü¹¹Éè¼ÆµÄ Windows °æ±¾ÖУº%n%n%1
+MissingWOW64APIs=µ±Ç°µÄ Windows °æ±¾Ã»Óаüº¬Ö´ÐÐ 64 λ°²×°Ïòµ¼ËùÐèµÄº¯Êý¡£ÈôÒª¾ÀÕý´ËÎÊÌ⣬Çë°²×° Service Pack %1¡£
+WinVersionTooLowError=´Ë³ÌÐòÐèÒª %1 v%2 »ò¸ü¸ß°æ±¾¡£
+WinVersionTooHighError=´Ë³ÌÐò²»ÄÜ°²×°ÔÚ %1 v%2 »ò¸ü¸ß°æ±¾ÉÏ¡£
+AdminPrivilegesRequired=°²×°´Ë³ÌÐòʱÄã±ØÐëÒÔ¹ÜÀíÔ±Éí·ÝµÇ¼¡£
+PowerUserPrivilegesRequired=°²×°´Ë³ÌÐòʱÄã±ØÐëÒÔ¹ÜÀíÔ±»ò Power Users ×é³ÉÔ±µÄÉí·ÝµÇ¼¡£
+SetupAppRunningError=°²×°Ïòµ¼·¢ÏÖ %1 ÕýÔÚÔËÐС£%n%nÇëÁ¢¼´¹Ø±ÕÆäËùÓÐʵÀý£¬È»ºóµ¥»÷¡°È·¶¨¡±¼ÌÐø£¬»òµ¥»÷¡°È¡Ïû¡±Í˳ö¡£
+UninstallAppRunningError=жÔسÌÐò·¢ÏÖ %1 ÕýÔÚÔËÐС£%n%nÇëÁ¢¼´¹Ø±ÕÆäËùÓÐʵÀý£¬È»ºóµ¥»÷¡°È·¶¨¡±¼ÌÐø£¬»òµ¥»÷¡°È¡Ïû¡±Í˳ö¡£
+
+; *** Misc. errors
+ErrorCreatingDir=°²×°Ïòµ¼ÎÞ·¨´´½¨Îļþ¼Ð¡°%1¡±
+ErrorTooManyFilesInDir=ÎÞ·¨ÔÚÎļþ¼Ð¡°%1¡±Öд´½¨Îļþ£¬ÒòΪËü°üº¬ÁËÌ«¶àÎļþ
+
+; *** Setup common messages
+ExitSetupTitle=Í˳ö°²×°
+ExitSetupMessage=°²×°ÉÐδÍê³É¡£Èç¹ûÄãÏÖÔÚÍ˳ö£¬Èí¼þ½«²»»á°²×°¡£%n%nÄã¿ÉÒÔÔÚÆäËüʱ¼äÖØÐÂÔËÐа²×°Ïòµ¼À´Íê³É°²×°¡£%n%nÏÖÔÚÍ˳ö°²×°Âð£¿
+AboutSetupMenuItem=¹ØÓÚ°²×°Ïòµ¼(&A)...
+AboutSetupTitle=¹ØÓÚ°²×°Ïòµ¼
+AboutSetupMessage=%1 °æ±¾ %2%n%3%n%n%1 Ö÷Ò³£º%n%4
+AboutSetupNote=
+TranslatorNote=
+
+; *** Buttons
+ButtonBack=< ÉÏÒ»²½(&B)
+ButtonNext=ÏÂÒ»²½(&N) >
+ButtonInstall=°²×°(&I)
+ButtonOK=È·¶¨
+ButtonCancel=È¡Ïû
+ButtonYes=ÊÇ(&Y)
+ButtonYesToAll=È«ÊÇ(&A)
+ButtonNo=·ñ(&N)
+ButtonNoToAll=È«·ñ(&O)
+ButtonFinish=Íê³É(&F)
+ButtonBrowse=ä¯ÀÀ(&B)...
+ButtonWizardBrowse=ä¯ÀÀ(&R)...
+ButtonNewFolder=´´½¨Îļþ¼Ð(&M)
+
+; *** "Select Language" dialog messages
+SelectLanguageTitle=Ñ¡Ôñ°²×°ÓïÑÔ
+SelectLanguageLabel=Ñ¡Ôñ°²×°ÆÚ¼äҪʹÓõÄÓïÑÔ£º
+
+; *** Common wizard text
+ClickNext=µ¥»÷¡°ÏÂÒ»²½¡±¼ÌÐø£¬»òµ¥»÷¡°È¡Ïû¡±Í˳ö°²×°¡£
+BeveledLabel=
+BrowseDialogTitle=ä¯ÀÀÎļþ¼Ð
+BrowseDialogLabel=Ñ¡ÔñÒ»¸öÎļþ¼Ð£¬È»ºóµ¥»÷¡°È·¶¨¡±¡£
+NewFolderName=н¨Îļþ¼Ð
+
+; *** "Welcome" wizard page
+WelcomeLabel1=»¶ÓʹÓà [name] °²×°Ïòµ¼
+WelcomeLabel2=°²×°Ïòµ¼½«ÔÚÄãµÄµçÄÔÉÏ°²×° [name/ver]¡£%n%n½¨ÒéÄãÔÚ¼ÌÐø֮ǰ¹Ø±ÕËùÓÐÆäËüÓ¦ÓóÌÐò¡£
+
+; *** "Password" wizard page
+WizardPassword=ÃÜÂë
+PasswordLabel1=´Ë°²×°Ïòµ¼ÓÐÃÜÂë±£»¤¡£
+PasswordLabel3=ÇëÊäÈëÃÜÂ룬Ȼºóµ¥»÷¡°ÏÂÒ»²½¡±½øÈëÏÂÒ»²½¡£ÃÜÂëÇø·Ö´óСд¡£
+PasswordEditLabel=ÃÜÂë(&P)£º
+IncorrectPassword=ÄãÊäÈëµÄÃÜÂë²»ÕýÈ·¡£ÇëÖØÊÔ¡£
+
+; *** "License Agreement" wizard page
+WizardLicense=Ðí¿ÉÐÒé
+LicenseLabel=ÇëÔÚ¼ÌÐø֮ǰÔĶÁÒÔÏÂÖØÒªÐÅÏ¢¡£
+LicenseLabel3=ÇëÔĶÁÒÔÏÂÐí¿ÉÐÒé¡£ÔÚ¼ÌÐø°²×°Ö®Ç°£¬Äã±ØÐë½ÓÊÜ´ËÐÒéµÄÌõ¿î¡£
+LicenseAccepted=ÎÒ½ÓÊÜÐÒé(&A)
+LicenseNotAccepted=ÎÒ²»½ÓÊÜÐÒé(&D)
+
+; *** "Information" wizard pages
+WizardInfoBefore=ÐÅÏ¢
+InfoBeforeLabel=ÇëÔÚ¼ÌÐø֮ǰÔĶÁÒÔÏÂÖØÒªÐÅÏ¢¡£
+InfoBeforeClickLabel=µ±Äã×¼±¸ºÃ¼ÌÐø°²×°ºó£¬Çëµ¥»÷¡°ÏÂÒ»²½¡±¡£
+WizardInfoAfter=ÐÅÏ¢
+InfoAfterLabel=ÇëÔÚ¼ÌÐø֮ǰÔĶÁÒÔÏÂÖØÒªÐÅÏ¢¡£
+InfoAfterClickLabel=µ±Äã×¼±¸ºÃ¼ÌÐø°²×°ºó£¬Çëµ¥»÷¡°ÏÂÒ»²½¡±¡£
+
+; *** "User Information" wizard page
+WizardUserInfo=Óû§ÐÅÏ¢
+UserInfoDesc=ÇëÊäÈëÄãµÄÐÅÏ¢¡£
+UserInfoName=Óû§Ãû(&U)£º
+UserInfoOrg=×éÖ¯(&O)£º
+UserInfoSerial=ÐòÁкÅ(&S)£º
+UserInfoNameRequired=±ØÐëÊäÈëÓû§Ãû¡£
+
+; *** "Select Destination Location" wizard page
+WizardSelectDir=Ñ¡ÔñÄ¿±êλÖÃ
+SelectDirDesc=½« [name] °²×°µ½ÄÄÀ
+SelectDirLabel3=°²×°Ïòµ¼½«°Ñ [name] °²×°µ½ÒÔÏÂÎļþ¼ÐÖС£
+SelectDirBrowseLabel=ÈôÒª¼ÌÐø£¬µ¥»÷¡°ÏÂÒ»²½¡±¡£Èç¹ûÄãҪѡÔñ²»Í¬µÄÎļþ¼Ð£¬Çëµ¥»÷¡°ä¯ÀÀ¡±¡£
+DiskSpaceMBLabel=ÖÁÉÙÐèÒª [mb] MB µÄ¿ÕÏдÅÅ̿ռ䡣
+ToUNCPathname=°²×°Ïòµ¼²»ÄÜ°²×°µ½ UNC ·¾¶¡£Èç¹ûÄãÊÇҪͨ¹ýÍøÂç°²×°£¬ÇëÓ³ÉäÍøÂçÇý¶¯Æ÷¡£
+InvalidPath=Äã±ØÐëÊäÈë´øÓÐÅÌ·ûµÄÍêÕû·¾¶¡£ÀýÈ磺%n%nC:\APP%n%n»òÕß UNC ·¾¶¸ñʽ£º%n%n\\server\share
+InvalidDrive=ÄãÑ¡ÔñµÄÇý¶¯Æ÷»ò UNC ¹²Ïí²»´æÔÚ»ò²»¿É·ÃÎÊ¡£ÇëÖØÐÂÑ¡Ôñ¡£
+DiskSpaceWarningTitle=ûÓÐ×ã¹»µÄ´ÅÅÌ¿Õ¼ä
+DiskSpaceWarning=°²×°Ïòµ¼ÖÁÉÙÐèÒª %1 KB µÄÊ£Óà¿Õ¼ä£¬µ«ÊÇËùÑ¡Çý¶¯Æ÷Ö»ÓÐ %2 KB ¿ÉÓá£%n%nÄãÎÞÂÛÈçºÎÒ²Òª¼ÌÐøÂð£¿
+DirNameTooLong=Îļþ¼ÐÃû³Æ»ò·¾¶Ì«³¤¡£
+InvalidDirName=Îļþ¼ÐÃû³ÆÎÞЧ¡£
+BadDirName32=Îļþ¼ÐÃû³Æ²»ÄÜ°üº¬ÏÂÁÐ×Ö·û£º%n%n%1
+DirExistsTitle=Îļþ¼ÐÒÑ´æÔÚ
+DirExists=Îļþ¼Ð£º%n%n%1%n%nÒÑ´æÔÚ¡£ÄãÈ·¶¨Òª°²×°µ½¸ÃÎļþ¼ÐÂð£¿
+DirDoesntExistTitle=Îļþ¼Ð²»´æÔÚ
+DirDoesntExist=Îļþ¼Ð£º%n%n%1%n%n²»´æÔÚ¡£´´½¨¸ÃÎļþ¼ÐÂð£¿
+
+; *** "Select Components" wizard page
+WizardSelectComponents=Ñ¡Ôñ×é¼þ
+SelectComponentsDesc=Òª°²×°ÄÄЩ×é¼þ£¿
+SelectComponentsLabel2=ÇëÑ¡ÔñÄãÒª°²×°µÄ×é¼þ£¬Çå³ýÄã²»Ïë°²×°µÄ×é¼þ¡£×¼±¸ºÃºóµã»÷¡°ÏÂÒ»²½¡±¡£
+FullInstallation=ÍêÕû°²×°
+; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
+CompactInstallation=¼ò½à°²×°
+CustomInstallation=¶¨ÖÆ°²×°
+NoUninstallWarningTitle=×é¼þÒÑ´æÔÚ
+NoUninstallWarning=°²×°Ïòµ¼·¢ÏÖÏÂÁÐ×é¼þÒѾ°²×°£º%n%n%1%n%nÈ¡ÏûÑ¡¶¨²»»áжÔØÕâЩ×é¼þ¡£%n%n¼ÌÐø°²×°Âð£¿
+ComponentSize1=%1 KB
+ComponentSize2=%1 MB
+ComponentsDiskSpaceMBLabel=µ±Ç°µÄÑ¡ÔñÖÁÉÙÐèÒª [mb] MB ´ÅÅ̿ռ䡣
+
+; *** "Select Additional Tasks" wizard page
+WizardSelectTasks=Ñ¡Ôñ¸½¼ÓÈÎÎñ
+SelectTasksDesc=ÒªÖ´ÐÐÄÄЩ¸½¼ÓÈÎÎñ£¿
+SelectTasksLabel2=ÇëÑ¡ÔñÔÚ°²×° [name] Æڼ䰲װÏòµ¼ÒªÖ´Ðеĸ½¼ÓÈÎÎñ£¬È»ºóµã»÷¡°ÏÂÒ»²½¡±¡£
+
+; *** "Select Start Menu Folder" wizard page
+WizardSelectProgramGroup=Ñ¡Ôñ¿ªÊ¼²Ëµ¥Îļþ¼Ð
+SelectStartMenuFolderDesc=°Ñ³ÌÐò¿ì½Ý·½Ê½·Åµ½ÄÄÀ
+SelectStartMenuFolderLabel3=°²×°Ïòµ¼½«ÔÚÒÔÏ¿ªÊ¼²Ëµ¥Îļþ¼ÐÖд´½¨³ÌÐò¿ì½Ý·½Ê½¡£
+SelectStartMenuFolderBrowseLabel=µã»÷¡°ÏÂÒ»²½¡±½øÈëÏÂÒ»²½¡£Èç¹ûÄãҪѡÔñ²»Í¬µÄÎļþ¼Ð£¬Çëµã»÷¡°ä¯ÀÀ¡±¡£
+MustEnterGroupName=Äã±ØÐëÊäÈëÎļþ¼ÐÃû³Æ
+GroupNameTooLong=Îļþ¼ÐÃû³Æ»ò·¾¶Ì«³¤
+InvalidGroupName=Îļþ¼ÐÃû³ÆÎÞЧ
+BadGroupName=Îļþ¼ÐÃû³Æ²»ÄÜ°üº¬ÏÂÁÐ×Ö·û£º%n%n%1
+NoProgramGroupCheck2=½ûÖ¹´´½¨¿ªÊ¼²Ëµ¥Îļþ¼Ð(&D)
+
+; *** "Ready to Install" wizard page
+WizardReady=×¼±¸°²×°
+ReadyLabel1=°²×°Ïòµ¼ÏÖÔÚ×¼±¸¿ªÊ¼°²×° [name]¡£
+ReadyLabel2a=µã»÷¡°°²×°¡±¼ÌÐø°²×°£¬Èç¹ûÄãÏëÒª²é¿´»òÕ߸ü¸ÄÉèÖÃÇëµã»÷¡°ÉÏÒ»²½¡±¡£
+ReadyLabel2b=µã»÷¡°°²×°¡±¼ÌÐø°²×°¡£
+ReadyMemoUserInfo=Óû§ÐÅÏ¢£º
+ReadyMemoDir=Ä¿±êλÖãº
+ReadyMemoType=°²×°ÀàÐÍ£º
+ReadyMemoComponents=ËùÑ¡×é¼þ£º
+ReadyMemoGroup=¿ªÊ¼²Ëµ¥Îļþ¼Ð£º
+ReadyMemoTasks=¸½¼ÓÈÎÎñ£º
+
+; *** "Preparing to Install" wizard page
+WizardPreparing=ÕýÔÚ×¼±¸°²×°
+PreparingDesc=°²×°Ïòµ¼ÕýÔÚ×¼±¸°²×° [name]¡£
+PreviousInstallNotCompleted=ÏÈÇ°³ÌÐòµÄ°²×°/жÔØÉÐδÍê³É¡£ÄãÐèÒªÖØÆôµçÄÔÀ´Íê³É°²×°¡£%n%nµçÄÔÖØÆôÖ®ºó£¬ÇëÖØÐÂÔËÐа²×°Ïòµ¼À´Íê³É [name] µÄ°²×°¡£
+CannotContinue=°²×°Ïòµ¼²»ÄܼÌÐø¡£Çëµã»÷¡°È¡Ïû¡±Í˳ö¡£
+
+; *** "Installing" wizard page
+WizardInstalling=ÕýÔÚ°²×°
+InstallingLabel=ÕýÔÚÄãµÄ¼ÆËã»úÖа²×° [name]£¬ÇëÉÔµÈ...
+
+; *** "Setup Completed" wizard page
+FinishedHeadingLabel=Íê³É [name] °²×°
+FinishedLabelNoIcons=°²×°Ïòµ¼ÒÑÍê³É [name] µÄ°²×°¡£
+FinishedLabel=°²×°Ïòµ¼ÒÑÍê³É [name] µÄ°²×°¡£¿ÉÒÔͨ¹ýÑ¡ÔñÒÑ°²×°µÄͼ±êÀ´ÔËÐÐÓ¦ÓóÌÐò¡£
+ClickFinish=µã»÷¡°Íê³É¡±Í˳ö°²×°¡£
+FinishedRestartLabel=ΪÁËÍê³É [name] µÄ°²×°£¬°²×°Ïòµ¼±ØÐëÖØÆôµçÄÔ¡£ÄãÒªÁ¢¼´ÖØÆôÂð£¿
+FinishedRestartMessage=ΪÁËÍê³É [name] µÄ°²×°£¬°²×°Ïòµ¼±ØÐëÖØÆôµçÄÔ¡£%n%nÄãÒªÁ¢¼´ÖØÆôÂð£¿
+ShowReadmeCheck=ÊÇ£¬ÎÒÒª²é¿´×ÔÊöÎļþ
+YesRadio=ÊÇ£¬Á¢¼´ÖØÆôµçÄÔ(&Y)
+NoRadio=·ñ£¬ÉÔºóÖØÆôµçÄÔ(&N)
+; used for example as 'Run MyProg.exe'
+RunEntryExec=ÔËÐÐ %1
+; used for example as 'View Readme.txt'
+RunEntryShellExec=²é¿´ %1
+
+; *** "Setup Needs the Next Disk" stuff
+ChangeDiskTitle=°²×°Ïòµ¼ÐèÒªÏÂÒ»¸ö´ÅÅÌ
+SelectDiskLabel2=Çë²åÈë´ÅÅÌ %1 ²¢µã»÷¡°È·¶¨¡±¡£%n%nÈç¹ûÔÚ³ýÁËÏÂÃæÏÔʾµÄÎļþ¼ÐÒÔÍâµÄÎļþ¼ÐÖÐÕÒ²»µ½¸Ã´ÅÅÌÉϵÄÎļþ£¬¾ÍÇëÊäÈëÕýÈ·µÄ·¾¶»òµã»÷¡°ä¯ÀÀ¡±¡£
+PathLabel=·¾¶(&P)£º
+FileNotInDir2=Îļþ¡°%1¡±²»ÔÚ¡°%2¡±ÖС£Çë²åÈëÕýÈ·µÄ´ÅÅÌ»òÑ¡ÔñÆäËûÎļþ¼Ð¡£
+SelectDirectoryLabel=ÇëÖ¸¶¨ÏÂÒ»¸ö´ÅÅ̵ÄλÖá£
+
+; *** Installation phase messages
+SetupAborted=°²×°ÉÐδÍê³É¡£%n%nÇë¾ÀÕýÎÊÌâ²¢ÖØÐÂÔËÐа²×°Ïòµ¼¡£
+EntryAbortRetryIgnore=µã»÷¡°ÖØÊÔ¡±ÖØг¢ÊÔ£¬µã»÷¡°ºöÂÔ¡±¼ÌÐø°²×°£¬»òµã»÷¡°ÖÐÖ¹¡±È¡Ïû°²×°¡£
+
+; *** Installation status messages
+StatusCreateDirs=ÕýÔÚ´´½¨Îļþ¼Ð...
+StatusExtractFiles=ÕýÔÚÌáÈ¡Îļþ...
+StatusCreateIcons=ÕýÔÚ´´½¨¿ì½Ý·½Ê½...
+StatusCreateIniEntries=ÕýÔÚ´´½¨ INI ÏîÄ¿...
+StatusCreateRegistryEntries=ÕýÔÚ´´½¨×¢²á±íÏîÄ¿...
+StatusRegisterFiles=ÕýÔÚ×¢²áÎļþ...
+StatusSavingUninstall=ÕýÔÚ±£´æжÔØÐÅÏ¢...
+StatusRunProgram=ÕýÔÚÍê³É°²×°...
+StatusRollback=ÕýÔڻعö¸ü¸Ä...
+
+; *** Misc. errors
+ErrorInternal2=ÄÚ²¿´íÎó£º%1
+ErrorFunctionFailedNoCode=%1 ʧ°Ü
+ErrorFunctionFailed=%1 ʧ°Ü¡£´úÂë %2
+ErrorFunctionFailedWithMessage=%1 ʧ°Ü¡£´úÂë %2¡£%n%3
+ErrorExecutingProgram=ÎÞ·¨Ö´ÐÐÎļþ£º%n%1
+
+; *** Registry errors
+ErrorRegOpenKey=´ò¿ª×¢²á±í¼üʱ³ö´í£º%n%1\%2
+ErrorRegCreateKey=´´½¨×¢²á±í¼üʱ³ö´í£º%n%1\%2
+ErrorRegWriteKey=дÈë×¢²á±í¼üʱ³ö´í£º%n%1\%2
+
+; *** INI errors
+ErrorIniEntry=ÔÚÎļþ¡°%1¡±Öд´½¨ INI ÏîĿʱ³ö´í¡£
+
+; *** File copying errors
+FileAbortRetryIgnore=µã»÷¡°ÖØÊÔ¡±ÖØг¢ÊÔ£¬µã»÷¡°ºöÂÔ¡±Ìø¹ý´ËÎļþ (²»ÍƼö)£¬»òµã»÷¡°ÖÐÖ¹¡±È¡Ïû°²×°¡£
+FileAbortRetryIgnore2=µã»÷¡°ÖØÊÔ¡±ÖØг¢ÊÔ£¬µã»÷¡°ºöÂÔ¡±¼ÌÐø°²×° (²»ÍƼö)£¬»òµã»÷¡°ÖÐÖ¹¡±È¡Ïû°²×°¡£
+SourceIsCorrupted=Ô´ÎļþÒÑËð»µ
+SourceDoesntExist=Ô´Îļþ¡°%1¡±²»´æÔÚ
+ExistingFileReadOnly=ÏÖÓÐÎļþΪֻ¶Á¡£%n%nµã»÷¡°ÖØÊÔ¡±ÒƳýÖ»¶ÁÊôÐÔ²¢ÖØÊÔ£¬µã»÷¡°ºöÂÔ¡±Ìø¹ý´ËÎļþ£¬»òµã»÷¡°ÖÐÖ¹¡±È¡Ïû°²×°¡£
+ErrorReadingExistingDest=¶ÁÈ¡ÏÖÓÐÎļþʱ·¢Éú´íÎó£º
+FileExists=ÎļþÒÑ´æÔÚ¡£%n%nÄãÒª¸²¸ÇËüÂð£¿
+ExistingFileNewer=ÏÖÓÐÎļþ±È°²×°Ïòµ¼Òª°²×°µÄ»¹Ð¡£½¨ÒéÄã±£ÁôÏÖÓÐÎļþ¡£%n%n±£ÁôÏÖÓÐÎļþÂð£¿
+ErrorChangingAttr=¸ü¸ÄÏÖÓÐÎļþµÄÊôÐÔʱ·¢Éú´íÎó£º
+ErrorCreatingTemp=ÔÚÄ¿±êÎļþ¼ÐÖд´½¨Îļþʱ·¢Éú´íÎó£º
+ErrorReadingSource=¶ÁÈ¡Ô´Îļþʱ·¢Éú´íÎó£º
+ErrorCopying=¸´ÖÆÎļþʱ·¢Éú´íÎó£º
+ErrorReplacingExistingFile=Ìæ»»ÏÖÓÐÎļþʱ·¢Éú´íÎó£º
+ErrorRestartReplace=ÖØÆôºóÌ滻ʧ°Ü£º
+ErrorRenamingTemp=ÖØÃüÃûÄ¿±êÎļþ¼ÐÖеÄÎļþʱ·¢Éú´íÎó£º
+ErrorRegisterServer=ÎÞ·¨×¢²á DLL/OCX£º%1
+ErrorRegSvr32Failed=RegSvr32 ʧ°Ü¡£·µ»ØÖµ£º%1
+ErrorRegisterTypeLib=ÎÞ·¨×¢²áÀàÐͿ⣺%1
+
+; *** Post-installation errors
+ErrorOpeningReadme=´ò¿ª×ÔÊöÎļþʱ·¢Éú´íÎó¡£
+ErrorRestartingComputer=°²×°Ïòµ¼ÎÞ·¨ÖØÆôµçÄÔ¡£ÇëÊÖ¶¯ÖØÆô¡£
+
+; *** Uninstaller messages
+UninstallNotFound=Îļþ¡°%1¡±²»´æÔÚ¡£²»ÄÜжÔØ¡£
+UninstallOpenError=Îļþ¡°%1¡±²»ÄÜ´ò¿ª¡£²»ÄÜжÔØ
+UninstallUnsupportedVer=жÔØÈÕÖ¾Îļþ¡°%1¡±µÄ¸ñʽ²»Äܱ»´Ë°æ±¾µÄжÔسÌÐòʶ±ð¡£²»ÄÜжÔØ
+UninstallUnknownEntry=жÔØÈÕÖ¾ÖÐÓöµ½Ò»¸öδ֪µÄÏîÄ¿ (%1)
+ConfirmUninstall=ÄãÊÇ·ñÈ·¶¨ÒªÍêȫɾ³ý %1 ¼°ÆäËùÓÐ×é¼þ£¿
+UninstallOnlyOnWin64=´Ë°²×°Ö»ÄÜÔÚ 64 λ Windows ÉÏжÔØ¡£
+OnlyAdminCanUninstall=´Ë°²×°Ö»ÄÜÓɾ߱¸¹ÜÀíԱȨÏÞµÄÓû§Ð¶ÔØ¡£
+UninstallStatusLabel=ÕýÔÚɾ³ý %1£¬ÇëÉÔµÈ...
+UninstalledAll=%1 Òѳɹ¦É¾³ý¡£
+UninstalledMost=%1 жÔØÍê³É¡£%n%nijЩÏîÄ¿²»ÄÜɾ³ý£¬¿ÉÒÔÊÖ¶¯É¾³ý¡£
+UninstalledAndNeedsRestart=ÈôÒªÍê³É %1 µÄжÔØ£¬±ØÐëÖØÆôµçÄÔ¡£%n%nÄãÒªÁ¢¼´ÖØÆôÂð£¿
+UninstallDataCorrupted=Îļþ¡°%1¡±ÒÑË𻵡£²»ÄÜжÔØ
+
+; *** Uninstallation phase messages
+ConfirmDeleteSharedFileTitle=ɾ³ý¹²ÏíÎļþÂð£¿
+ConfirmDeleteSharedFile2=ÏÂÁй²ÏíÎļþ²»ÔÙ±»ÈκγÌÐòʹÓá£ÄãҪɾ³ý¸Ã¹²ÏíÎļþÂð£¿%n%nÈç¹û»¹ÓгÌÐòʹÓøÃÎļþ¶øËüÒѱ»É¾³ý£¬ÕâЩ³ÌÐò¿ÉÄÜÎÞ·¨Õý³£ÔËÐС£Èç¹ûÄ㲻ȷ¶¨£¬¾ÍÇëÑ¡Ôñ¡°·ñ¡±¡£ÁôϸÃÎļþ²»»á¶ÔϵͳÔì³ÉÈκÎΣº¦¡£
+SharedFileNameLabel=ÎļþÃû£º
+SharedFileLocationLabel=λÖãº
+WizardUninstalling=жÔØ״̬
+StatusUninstalling=ÕýÔÚжÔØ %1...
+
+; The custom messages below aren't used by Setup itself, but if you make
+; use of them in your scripts, you'll want to translate them.
+
+[CustomMessages]
+
+NameAndVersion=%1 °æ±¾ %2
+AdditionalIcons=¸½¼Óͼ±ê£º
+CreateDesktopIcon=´´½¨×ÀÃæͼ±ê(&D)
+CreateQuickLaunchIcon=´´½¨¿ìËÙÆô¶¯À¸Í¼±ê(&Q)
+ProgramOnTheWeb=%1 ÍøÕ¾
+UninstallProgram=жÔØ %1
+LaunchProgram=ÔËÐÐ %1
+AssocFileExtension=½« %1 Óë %2 ÎļþÀ©Õ¹Ãû¹ØÁª(&A)
+AssocingFileExtension=ÕýÔÚ½« %1 Óë %2 ÎļþÀ©Õ¹Ãû¹ØÁª...
commit 09da25743255aa871f1c111fb2517968840a06bf
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat May 15 07:31:23 2010 +0000
Repatch Windows installer for Simplified Chinese
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19167 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/gnucash.iss.in b/gnucash.iss.in
index 700ae3c..3d2aea0 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -445,27 +445,27 @@ pt_BR.IconComment_Uninstall=Desinstala o Gerenciador Financeiro GnuCash
;; ;;;;;;;;;;;;;;;;;
;; Simplified Chinese translation
-zh_CN.FullInstall=��ȫ��װ
-zh_CN.CustomInstall=�Զ��尲װ
-zh_CN.CreateDesktopIcon=��������ͼ��
-zh_CN.CreateMenuLink=������ʼ�˵�����
-zh_CN.RunPrg=���ڿ�ʼ���� GnuCash
-zh_CN.AdditionalIcons=������Щͼ��
-zh_CN.StatusMsgFirewall=���ڰ�װ Windows ����ǽ����...
-
-zh_CN.MainFiles=GnuCash ����
-zh_CN.TranslFiles=�����ļ�
-zh_CN.TemplFiles=��ƿ�Ŀģ���ļ�
-
-zh_CN.IconComment_GnuCash=GnuCash ��Ѳ������
-zh_CN.IconName_README=��ʾ�����ļ�
-zh_CN.IconComment_README=��ʾ�����ļ�
+zh_CN.FullInstall=ÍêÈ«°²×°
+zh_CN.CustomInstall=×Ô¶¨Òå°²×°
+zh_CN.CreateDesktopIcon=´´½¨×ÀÃæͼ±ê
+zh_CN.CreateMenuLink=´´½¨¿ªÊ¼²Ëµ¥Á´½Ó
+zh_CN.RunPrg=ÏÖÔÚ¿ªÊ¼ÔËÐÐ GnuCash
+zh_CN.AdditionalIcons=´´½¨ÕâЩͼ±ê
+zh_CN.StatusMsgFirewall=ÕýÔÚ°²×° Windows ·À»ðǽ¹æÔò...
+
+zh_CN.MainFiles=GnuCash ³ÌÐò
+zh_CN.TranslFiles=·ÒëÎļþ
+zh_CN.TemplFiles=»á¼Æ¿ÆÄ¿Ä£°åÎļþ
+
+zh_CN.IconComment_GnuCash=GnuCash Ãâ·Ñ²ÆÎñ¹ÜÀí
+zh_CN.IconName_README=ÏÔʾ×ÔÊöÎļþ
+zh_CN.IconComment_README=ÏÔʾ×ÔÊöÎļþ
zh_CN.IconFilename_README=README-zh_CN.win32-bin.txt
-zh_CN.IconName_FAQ=�������� (����)
-zh_CN.IconName_Bugzilla=������� Bug (����)
-zh_CN.IconName_InstallFQ=��װ���߼۸��������
-zh_CN.IconComment_InstallFQ=��װ���߼۸���������� Perl Finance-Quoteģ�顣��Ҫ ActivePerl 5.8 �� 5.10
-zh_CN.IconName_Uninstall=� GnuCash
-zh_CN.IconComment_Uninstall=ж�ز��������� GnuCash
+zh_CN.IconName_FAQ=³£¼ûÎÊÌâ (ÔÚÏß)
+zh_CN.IconName_Bugzilla=±¨¸æÈí¼þ Bug (ÔÚÏß)
+zh_CN.IconName_InstallFQ=°²×°ÔÚÏß¼Û¸ñ¼ìË÷¹¦ÄÜ
+zh_CN.IconComment_InstallFQ=°²×°ÔÚÏß¼Û¸ñ¼ìË÷Ëù±ØÐèµÄ Perl Finance-QuoteÄ£¿é¡£ÐèÒª ActivePerl 5.8 »ò 5.10
+zh_CN.IconName_Uninstall=жÔØ GnuCash
+zh_CN.IconComment_Uninstall=жÔزÆÎñ¹ÜÀíÈí¼þ GnuCash
;; ;;;;;;;;;;;;;;;;;;;;
commit f653736a360d0bf1aefae0de5d9fb8fc0529f313
Author: Christian Stimming <stimming at tuhh.de>
Date: Fri May 14 15:43:16 2010 +0000
Fix windows tag build script, by Geert Janssens
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19165 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_tags.sh b/build_tags.sh
index 98037df..7300274 100644
--- a/build_tags.sh
+++ b/build_tags.sh
@@ -25,12 +25,12 @@ svn update
# If we don't have a tagfile then start from 'now'
tagfile=tags
if [ ! -f ${tagfile} ] ; then
- svn ls ${TAG_URL} > ${tagfile}
+ svn ls -v ${TAG_URL} | awk '/[^.]\/$/ { print $6$1 }' > ${tagfile}
fi
# Figure out the new set of tags
-svn ls ${TAG_URL} > ${tagfile}.new
-tags="`diff --suppress-common-lines ${tagfile} ${tagfile}.new | grep '^> ' | sed -e 's/^> //g' -e 's#/$##g'`"
+svn ls -v ${TAG_URL} | awk '/[^.]\/$/ { print $6$1 }' > ${tagfile}.new
+tags="`diff --suppress-common-lines ${tagfile} ${tagfile}.new | grep '^> ' | sed -e 's/^> //g'`"
# move the new file into place
mv -f ${tagfile}.new ${tagfile}
@@ -38,9 +38,11 @@ mv -f ${tagfile}.new ${tagfile}
################################################################
# Now iterate over all the new tags (if any) and build a package
-for tag in $tags ; do
+for tag_rev in $tags ; do
+ tag=${tag_rev%/*}
tagbasedir=/c/soft/gnucash-${tag}
tagdir=${tagbasedir}/gnucash
+ rm -fr $tagbasedir
mkdir -p ${tagdir}
# Copy the downloads to save time
commit 18e4e34ecf18322ac2a0968b4da7eddcfb979922
Author: Christian Stimming <stimming at tuhh.de>
Date: Fri May 14 09:00:57 2010 +0000
Revert r19159, "Fix windows tag build script, by Geert Janssens"
I thought I would get access to the build server immediately to
perform the cleanup of the old tag file, but apparently the server is
unreachable for me for now, so I cannot commit this change today. Maybe later.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19164 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_tags.sh b/build_tags.sh
index 7300274..98037df 100644
--- a/build_tags.sh
+++ b/build_tags.sh
@@ -25,12 +25,12 @@ svn update
# If we don't have a tagfile then start from 'now'
tagfile=tags
if [ ! -f ${tagfile} ] ; then
- svn ls -v ${TAG_URL} | awk '/[^.]\/$/ { print $6$1 }' > ${tagfile}
+ svn ls ${TAG_URL} > ${tagfile}
fi
# Figure out the new set of tags
-svn ls -v ${TAG_URL} | awk '/[^.]\/$/ { print $6$1 }' > ${tagfile}.new
-tags="`diff --suppress-common-lines ${tagfile} ${tagfile}.new | grep '^> ' | sed -e 's/^> //g'`"
+svn ls ${TAG_URL} > ${tagfile}.new
+tags="`diff --suppress-common-lines ${tagfile} ${tagfile}.new | grep '^> ' | sed -e 's/^> //g' -e 's#/$##g'`"
# move the new file into place
mv -f ${tagfile}.new ${tagfile}
@@ -38,11 +38,9 @@ mv -f ${tagfile}.new ${tagfile}
################################################################
# Now iterate over all the new tags (if any) and build a package
-for tag_rev in $tags ; do
- tag=${tag_rev%/*}
+for tag in $tags ; do
tagbasedir=/c/soft/gnucash-${tag}
tagdir=${tagbasedir}/gnucash
- rm -fr $tagbasedir
mkdir -p ${tagdir}
# Copy the downloads to save time
commit 14551239fc3638420ec33266b26bf1b581a3b690
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri May 14 08:36:59 2010 +0000
zh_CN translation for Windows Installer, patch by Tao Wang.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19161 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/ChineseSimp-12-5.1.11.isl b/ChineseSimp-12-5.1.11.isl
new file mode 100644
index 0000000..21fb877
--- /dev/null
+++ b/ChineseSimp-12-5.1.11.isl
@@ -0,0 +1,320 @@
+; *** Inno Setup version 5.1.11+ Simplified Chinese messages ***
+;
+; Based on previous version by Peng Bai
+; Update by Mack Zhang (hua_wuxin at 21cn.com) on Apr. 10, 2008
+;
+; To download user-contributed translations of this file, go to:
+; http://www.jrsoftware.org/files/istrans/
+;
+; Note: When translating this text, do not add periods (.) to the end of
+; messages that didn't have them already, because on those messages Inno
+; Setup adds the periods automatically (appending a period would result in
+; two periods being displayed).
+
+[LangOptions]
+; The following three entries are very important. Be sure to read and
+; understand the '[LangOptions] section' topic in the help file.
+LanguageName=<4E2D><6587> (<7B80><4F53>)
+LanguageID=$0804
+LanguageCodePage=936
+; If the language you are translating to requires special font faces or
+; sizes, uncomment any of the following entries and change them accordingly.
+DialogFontName=����
+DialogFontSize=9
+;WelcomeFontName=Verdana
+;WelcomeFontSize=12
+;TitleFontName=Arial
+;TitleFontSize=29
+;CopyrightFontName=Arial
+;CopyrightFontSize=8
+
+[Messages]
+
+; *** Application titles
+SetupAppTitle=��װ��
+SetupWindowTitle=��װ�� - %1
+UninstallAppTitle=���
+UninstallAppFullTitle=%1 ���
+
+; *** Misc. common
+InformationTitle=��Ϣ
+ConfirmTitle=ȷ��
+ErrorTitle=����
+
+; *** SetupLdr messages
+SetupLdrStartupMessage=��װ�򵼽�����ĵ����ϰ�װ %1����ȷ��Ҫ������
+LdrCannotCreateTemp=�޷�������ʱ�ļ�����װ��ֹ
+LdrCannotExecTemp=�޷�������ʱ�ļ����е��ļ�����װ��ֹ
+
+; *** Startup error messages
+LastErrorMessage=%1.%n%n���� %2��%3
+SetupFileMissing=��װ�ļ���ȱ���ļ� %1�����������������ȡ������°汾��
+SetupFileCorrupt=��װ�ļ����𻵡�����ȡ������°汾��
+SetupFileCorruptOrWrongVer=��װ�ļ����𻵣�������˰�װ�򵼵İ汾�����ݡ����������������ȡ������°汾��
+NotOnThisPlatform=�˳������� %1 �����С�
+OnlyOnThisPlatform=�˳�������� %1 �����С�
+OnlyOnTheseArchitectures=�˳���ֻ�ܰ�װ��Ϊ���д������ܹ���Ƶ� Windows �汾�У�%n%n%1
+MissingWOW64APIs=��ǰ�� Windows �汾û�а�ִ�� 64 λ��װ������ĺ�����Ҫ��������⣬�밲װ Service Pack %1��
+WinVersionTooLowError=�˳�����Ҫ %1 v%2 ���߰汾��
+WinVersionTooHighError=�˳����ܰ�װ�� %1 v%2 ���߰汾�ϡ�
+AdminPrivilegesRequired=��װ�˳���ʱ������Թ���Ա��ݵ�¼��
+PowerUserPrivilegesRequired=��װ�˳���ʱ������Թ���Ա�� Power Users ���Ա����ݵ�¼��
+SetupAppRunningError=��װ�򵼷��� %1 �������С�%n%n�������ر�������ʵ��Ȼ�󵥻���ȷ��������򵥻���ȡ���˳���
+UninstallAppRunningError=ж�س����� %1 �������С�%n%n�������ر�������ʵ��Ȼ�󵥻���ȷ��������򵥻���ȡ���˳���
+
+; *** Misc. errors
+ErrorCreatingDir=��װ���޷������ļ��С�%1��
+ErrorTooManyFilesInDir=�޷����ļ��С�%1���д����ļ�����Ϊ�����̫���ļ�
+
+; *** Setup common messages
+ExitSetupTitle=�˳���װ
+ExitSetupMessage=��װ��δ��ɡ�����������˳�����������ᰲװ��%n%n�����������ʱ���������а�װ������ɰ�װ��%n%n�����˳���װ��
+AboutSetupMenuItem=���ڰ�װ��(&A)...
+AboutSetupTitle=���ڰ�װ��
+AboutSetupMessage=%1 �汾 %2%n%3%n%n%1 ��ҳ��%n%4
+AboutSetupNote=
+TranslatorNote=
+
+; *** Buttons
+ButtonBack=< ��һ��(&B)
+ButtonNext=��һ��(&N) >
+ButtonInstall=��װ(&I)
+ButtonOK=ȷ��
+ButtonCancel=ȡ��
+ButtonYes=��(&Y)
+ButtonYesToAll=ȫ��(&A)
+ButtonNo=��(&N)
+ButtonNoToAll=ȫ��(&O)
+ButtonFinish=���(&F)
+ButtonBrowse=���(&B)...
+ButtonWizardBrowse=���(&R)...
+ButtonNewFolder=�����ļ���(&M)
+
+; *** "Select Language" dialog messages
+SelectLanguageTitle=ѡ��װ����
+SelectLanguageLabel=ѡ��װ�ڼ�Ҫʹ�õ����ԣ�
+
+; *** Common wizard text
+ClickNext=��������һ��������򵥻���ȡ���˳���װ��
+BeveledLabel=
+BrowseDialogTitle=����ļ���
+BrowseDialogLabel=ѡ��һ���ļ��У�Ȼ�󵥻���ȷ������
+NewFolderName=�½��ļ���
+
+; *** "Welcome" wizard page
+WelcomeLabel1=��Óʹ�� [name] ��װ��
+WelcomeLabel2=��װ�򵼽�����ĵ����ϰ�װ [name/ver]��%n%n�������ڼ���֮ǰ�ر���������Ӧ�ó���
+
+; *** "Password" wizard page
+WizardPassword=����
+PasswordLabel1=�˰�װ�������뱣����
+PasswordLabel3=���������룬Ȼ�󵥻�����һ����������һ����������ִ�Сд��
+PasswordEditLabel=����(&P)��
+IncorrectPassword=����������벻��ȷ�������ԡ�
+
+; *** "License Agreement" wizard page
+WizardLicense=�����
+LicenseLabel=���ڼ���֮ǰ�Ķ�������Ҫ��Ϣ��
+LicenseLabel3=���Ķ��������Ð�顣�ڼ���װ֮ǰ���������ܴ�Ð������
+LicenseAccepted=�ҽ���Ð��(&A)
+LicenseNotAccepted=�Ҳ�����Ð��(&D)
+
+; *** "Information" wizard pages
+WizardInfoBefore=��Ϣ
+InfoBeforeLabel=���ڼ���֮ǰ�Ķ�������Ҫ��Ϣ��
+InfoBeforeClickLabel=����׼���ü���װ���뵥������һ������
+WizardInfoAfter=��Ϣ
+InfoAfterLabel=���ڼ���֮ǰ�Ķ�������Ҫ��Ϣ��
+InfoAfterClickLabel=����׼���ü���װ���뵥������һ������
+
+; *** "User Information" wizard page
+WizardUserInfo=�û���Ϣ
+UserInfoDesc=�����������Ϣ��
+UserInfoName=�û���(&U)��
+UserInfoOrg=��֯(&O)��
+UserInfoSerial=���к�(&S)��
+UserInfoNameRequired=���������û���
+
+; *** "Select Destination Location" wizard page
+WizardSelectDir=ѡ��Ŀ��λ��
+SelectDirDesc=�� [name] ��װ�����
+SelectDirLabel3=��װ�򵼽��� [name] ��װ�������ļ����С�
+SelectDirBrowseLabel=��Ҫ����������һ�����������Ҫѡ��ͬ���ļ��У��뵥�����������
+DiskSpaceMBLabel=������Ҫ [mb] MB �Ŀ��д��̿ռ䡣
+ToUNCPathname=��װ�򵼲��ܰ�װ�� UNC ·�����������Ҫͨ�����簲װ����ӳ������������
+InvalidPath=�������������̷������·�������磺%n%nC:\APP%n%n���� UNC ·����ʽ��%n%n\\server\share
+InvalidDrive=��ѡ��������� UNC ���?���ڻ򲻿ɷ��ʡ�������ѡ��
+DiskSpaceWarningTitle=û���㹻�Ĵ��̿ռ�
+DiskSpaceWarning=��װ��������Ҫ %1 KB ��ʣ��ռ䣬������ѡ����ֻ�� %2 KB ���á�%n%n���������ҲҪ������
+DirNameTooLong=�ļ�����ƻ�·��̫����
+InvalidDirName=�ļ��������Ч��
+BadDirName32=�ļ�����Ʋ��ܰ������ַ�%n%n%1
+DirExistsTitle=�ļ����Ѵ���
+DirExists=�ļ��У�%n%n%1%n%n�Ѵ��ڡ���ȷ��Ҫ��װ�����ļ�����
+DirDoesntExistTitle=�ļ��в�����
+DirDoesntExist=�ļ��У�%n%n%1%n%n�����ڡ��������ļ�����
+
+; *** "Select Components" wizard page
+WizardSelectComponents=ѡ�����
+SelectComponentsDesc=Ҫ��װ��Щ�����
+SelectComponentsLabel2=��ѡ����Ҫ��װ�����������㲻�밲װ�������׼���ú�������һ������
+FullInstallation=����װ
+; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
+CompactInstallation=��లװ
+CustomInstallation=���ư�װ
+NoUninstallWarningTitle=����Ѵ���
+NoUninstallWarning=��װ�򵼷�����������Ѿ���װ��%n%n%1%n%nȡ��ѡ������ж����Щ�����%n%n����װ��
+ComponentSize1=%1 KB
+ComponentSize2=%1 MB
+ComponentsDiskSpaceMBLabel=��ǰ��ѡ��������Ҫ [mb] MB ���̿ռ䡣
+
+; *** "Select Additional Tasks" wizard page
+WizardSelectTasks=ѡ�񸽼�����
+SelectTasksDesc=Ҫִ����Щ��������
+SelectTasksLabel2=��ѡ���ڰ�װ [name] �ڼ䰲װ��Ҫִ�еĸ�������Ȼ��������һ������
+
+; *** "Select Start Menu Folder" wizard page
+WizardSelectProgramGroup=ѡ��ʼ�˵��ļ���
+SelectStartMenuFolderDesc=�ѳ����ݷ�ʽ�ŵ����
+SelectStartMenuFolderLabel3=��װ�򵼽������¿�ʼ�˵��ļ����д��������ݷ�ʽ��
+SelectStartMenuFolderBrowseLabel=�������һ����������һ���������Ҫѡ��ͬ���ļ��У��������������
+MustEnterGroupName=����������ļ������
+GroupNameTooLong=�ļ�����ƻ�·��̫��
+InvalidGroupName=�ļ��������Ч
+BadGroupName=�ļ�����Ʋ��ܰ������ַ�%n%n%1
+NoProgramGroupCheck2=��ֹ������ʼ�˵��ļ���(&D)
+
+; *** "Ready to Install" wizard page
+WizardReady=׼����װ
+ReadyLabel1=��װ������׼����ʼ��װ [name]��
+ReadyLabel2a=�������װ������װ���������Ҫ�鿴���߸��������������һ������
+ReadyLabel2b=�������װ������װ��
+ReadyMemoUserInfo=�û���Ϣ��
+ReadyMemoDir=Ŀ��λ�ã�
+ReadyMemoType=��װ���ͣ�
+ReadyMemoComponents=��ѡ�����
+ReadyMemoGroup=��ʼ�˵��ļ��У�
+ReadyMemoTasks=��������
+
+; *** "Preparing to Install" wizard page
+WizardPreparing=����׼����װ
+PreparingDesc=��װ������׼����װ [name]��
+PreviousInstallNotCompleted=��ǰ����İ�װ/ж����δ��ɡ�����Ҫ������������ɰ�װ��%n%n��������֮�����������а�װ������� [name] �İ�װ��
+CannotContinue=��װ�򵼲��ܼ���������ȡ���˳���
+
+; *** "Installing" wizard page
+WizardInstalling=���ڰ�װ
+InstallingLabel=������ļ�����а�װ [name]�����Ե�...
+
+; *** "Setup Completed" wizard page
+FinishedHeadingLabel=��� [name] ��װ
+FinishedLabelNoIcons=��װ������� [name] �İ�װ��
+FinishedLabel=��װ������� [name] �İ�װ������ͨ��ѡ���Ѱ�װ��ͼ��������Ӧ�ó���
+ClickFinish=�������ɡ��˳���װ��
+FinishedRestartLabel=Ϊ����� [name] �İ�װ����װ�򵼱����������ԡ���Ҫ����������
+FinishedRestartMessage=Ϊ����� [name] �İ�װ����װ�򵼱����������ԡ�%n%n��Ҫ����������
+ShowReadmeCheck=�ǣ���Ҫ�鿴�����ļ�
+YesRadio=�ǣ�������������(&Y)
+NoRadio=���Ժ���������(&N)
+; used for example as 'Run MyProg.exe'
+RunEntryExec=���� %1
+; used for example as 'View Readme.txt'
+RunEntryShellExec=�鿴 %1
+
+; *** "Setup Needs the Next Disk" stuff
+ChangeDiskTitle=��װ����Ҫ��һ������
+SelectDiskLabel2=�������� %1 �������ȷ������%n%n����ڳ���������ʾ���ļ���������ļ������Ҳ����ô����ϵ��ļ�������������ȷ��·���������������
+PathLabel=·��(&P)��
+FileNotInDir2=�ļ���%1�����ڡ�%2���С��������ȷ�Ĵ��̻�ѡ�������ļ��С�
+SelectDirectoryLabel=��ָ����һ�����̵�λ�á�
+
+; *** Installation phase messages
+SetupAborted=��װ��δ��ɡ�%n%n��������Ⲣ�������а�װ�򵼡�
+EntryAbortRetryIgnore=��������ԡ����³��ԣ���������ԡ�����װ����������ֹ��ȡ��װ��
+
+; *** Installation status messages
+StatusCreateDirs=���ڴ����ļ���...
+StatusExtractFiles=������ȡ�ļ�...
+StatusCreateIcons=���ڴ�����ݷ�ʽ...
+StatusCreateIniEntries=���ڴ��� INI ��Ŀ...
+StatusCreateRegistryEntries=���ڴ���ע�����Ŀ...
+StatusRegisterFiles=����ע���ļ�...
+StatusSavingUninstall=���ڱ���ж����Ϣ...
+StatusRunProgram=������ɰ�װ...
+StatusRollback=���ڻع����...
+
+; *** Misc. errors
+ErrorInternal2=�ڲ�����%1
+ErrorFunctionFailedNoCode=%1 ʧ��
+ErrorFunctionFailed=%1 ʧ�ܡ����� %2
+ErrorFunctionFailedWithMessage=%1 ʧ�ܡ����� %2��%n%3
+ErrorExecutingProgram=�޷�ִ���ļ���%n%1
+
+; *** Registry errors
+ErrorRegOpenKey=��ע����ʱ���?%n%1\%2
+ErrorRegCreateKey=����ע����ʱ���?%n%1\%2
+ErrorRegWriteKey=д��ע����ʱ���?%n%1\%2
+
+; *** INI errors
+ErrorIniEntry=���ļ���%1���д��� INI ��Ŀʱ���?
+
+; *** File copying errors
+FileAbortRetryIgnore=��������ԡ����³��ԣ���������ԡ������ļ� (���Ƽ�)����������ֹ��ȡ��װ��
+FileAbortRetryIgnore2=��������ԡ����³��ԣ���������ԡ�����װ (���Ƽ�)����������ֹ��ȡ��װ��
+SourceIsCorrupted=Դ�ļ�����
+SourceDoesntExist=Դ�ļ���%1��������
+ExistingFileReadOnly=�����ļ�Ϊֻ����%n%n��������ԡ��Ƴ�ֻ�����Բ����ԣ���������ԡ������ļ�����������ֹ��ȡ��װ��
+ErrorReadingExistingDest=��ȡ�����ļ�ʱ�������
+FileExists=�ļ��Ѵ��ڡ�%n%n��Ҫ��������
+ExistingFileNewer=�����ļ��Ȱ�װ��Ҫ��װ�Ļ��¡������㱣�������ļ���%n%n���������ļ���
+ErrorChangingAttr=��������ļ�������ʱ�������
+ErrorCreatingTemp=��Ŀ���ļ����д����ļ�ʱ�������
+ErrorReadingSource=��ȡԴ�ļ�ʱ�������
+ErrorCopying=�����ļ�ʱ�������
+ErrorReplacingExistingFile=�滻�����ļ�ʱ�������
+ErrorRestartReplace=�������滻ʧ�ܣ�
+ErrorRenamingTemp=������Ŀ���ļ����е��ļ�ʱ�������
+ErrorRegisterServer=�޷�ע�� DLL/OCX��%1
+ErrorRegSvr32Failed=RegSvr32 ʧ�ܡ�����ֵ��%1
+ErrorRegisterTypeLib=�޷�ע�����Ϳ⣺%1
+
+; *** Post-installation errors
+ErrorOpeningReadme=�������ļ�ʱ�������
+ErrorRestartingComputer=��װ���޷��������ԡ����ֶ�������
+
+; *** Uninstaller messages
+UninstallNotFound=�ļ���%1�������ڡ�����ж�ء�
+UninstallOpenError=�ļ���%1�����ܴ򿪡�����ж��
+UninstallUnsupportedVer=ж����־�ļ���%1���ĸ�ʽ���ܱ��˰汾��ж�س���ʶ�𡣲���ж��
+UninstallUnknownEntry=ж����־������һ��δ֪����Ŀ (%1)
+ConfirmUninstall=���Ƿ�ȷ��Ҫ��ȫɾ�� %1 �������������
+UninstallOnlyOnWin64=�˰�װֻ���� 64 λ Windows ��ж�ء�
+OnlyAdminCanUninstall=�˰�װֻ���ɾ߱�����ԱȨ�޵��û�ж�ء�
+UninstallStatusLabel=����ɾ�� %1�����Ե�...
+UninstalledAll=%1 �ѳɹ�ɾ��
+UninstalledMost=%1 ж����ɡ�%n%nijЩ��Ŀ����ɾ������ֶ�ɾ��
+UninstalledAndNeedsRestart=��Ҫ��� %1 ��ж�أ������������ԡ�%n%n��Ҫ����������
+UninstallDataCorrupted=�ļ���%1�����𻵡�����ж��
+
+; *** Uninstallation phase messages
+ConfirmDeleteSharedFileTitle=ɾ�����ļ���
+ConfirmDeleteSharedFile2=���й����ļ����ٱ��κγ���ʹ�á���Ҫɾ��ù����ļ���%n%n����г���ʹ�ø��ļ������ѱ�ɾ����Щ��������޷������С�����㲻ȷ��������ѡ�񡰷񡱡����¸��ļ������ϵͳ����κ�Σ����
+SharedFileNameLabel=�ļ���
+SharedFileLocationLabel=λ�ã�
+WizardUninstalling=ж��״̬
+StatusUninstalling=����� %1...
+
+; The custom messages below aren't used by Setup itself, but if you make
+; use of them in your scripts, you'll want to translate them.
+
+[CustomMessages]
+
+NameAndVersion=%1 �汾 %2
+AdditionalIcons=����ͼ�꣺
+CreateDesktopIcon=��������ͼ��(&D)
+CreateQuickLaunchIcon=��������������ͼ��(&Q)
+ProgramOnTheWeb=%1 ��վ
+UninstallProgram=� %1
+LaunchProgram=���� %1
+AssocFileExtension=�� %1 �� %2 �ļ���չ�����(&A)
+AssocingFileExtension=���ڽ� %1 �� %2 �ļ���չ�����...
diff --git a/gnucash.iss.in b/gnucash.iss.in
index 72a3e31..700ae3c 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -100,6 +100,7 @@ Source: "@prefix@\..\dist\share\@PACKAGE@\doc\README.win32-bin.txt"; DestDir: "{
Source: "@prefix@\..\dist\share\@PACKAGE@\doc\README-de.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
Source: "@prefix@\..\dist\share\@PACKAGE@\doc\README-fr.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
Source: "@prefix@\..\dist\share\@PACKAGE@\doc\README-it.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@prefix@\..\dist\share\@PACKAGE@\doc\README-zh_CN.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
Source: "@prefix@\..\dist\share\@PACKAGE@\doc\COPYING"; DestDir: "{app}\doc\@PACKAGE@"; Flags: ignoreversion; Components: main
Source: "@prefix@\..\dist\share\@PACKAGE@\doc\AUTHORS"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
Source: "@prefix@\..\dist\share\@PACKAGE@\doc\ChangeLog"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
@@ -232,6 +233,7 @@ Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"; InfoAfterFile: "@pre
Name: "ja"; MessagesFile: "@prefix@\share\@PACKAGE@\Japanese-5-5.1.11.isl"
Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"; InfoAfterFile: "@prefix@\share\@PACKAGE@\doc\README-nl.win32-bin.txt"
Name: "pt_BR"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
+Name: "zh_CN"; MessagesFile: "@prefix@\share\@PACKAGE@\ChineseSimp-12-5.1.11.isl"; InfoAfterFile: "@prefix@\share\@PACKAGE@\doc\README-zh_CN.win32-bin.txt"
;; The following language files are available as well, in alphabetical
;; order: Basque, BrazilianPortuguese, Catalan, Czech, Danish, Dutch,
@@ -277,7 +279,7 @@ it.LanguageCodePage=1252
ja.LanguageCodePage=932
nl.LanguageCodePage=1252
pt_BR.LanguageCodePage=1252
-
+zh_CN.LanguageCodePage=936
;; ;;;;;;;;;;;;;;;;;;;;
;; German translation
@@ -440,4 +442,30 @@ pt_BR.IconComment_InstallFQ=Instala o m�dulo perl Finance-Quote, necess�rio
pt_BR.IconName_Uninstall=Desinstalar o GnuCash
pt_BR.IconComment_Uninstall=Desinstala o Gerenciador Financeiro GnuCash
+;; ;;;;;;;;;;;;;;;;;
+;; Simplified Chinese translation
+
+zh_CN.FullInstall=��ȫ��װ
+zh_CN.CustomInstall=�Զ��尲װ
+zh_CN.CreateDesktopIcon=��������ͼ��
+zh_CN.CreateMenuLink=������ʼ�˵�����
+zh_CN.RunPrg=���ڿ�ʼ���� GnuCash
+zh_CN.AdditionalIcons=������Щͼ��
+zh_CN.StatusMsgFirewall=���ڰ�װ Windows ����ǽ����...
+
+zh_CN.MainFiles=GnuCash ����
+zh_CN.TranslFiles=�����ļ�
+zh_CN.TemplFiles=��ƿ�Ŀģ���ļ�
+
+zh_CN.IconComment_GnuCash=GnuCash ��Ѳ������
+zh_CN.IconName_README=��ʾ�����ļ�
+zh_CN.IconComment_README=��ʾ�����ļ�
+zh_CN.IconFilename_README=README-zh_CN.win32-bin.txt
+zh_CN.IconName_FAQ=�������� (����)
+zh_CN.IconName_Bugzilla=������� Bug (����)
+zh_CN.IconName_InstallFQ=��װ���߼۸��������
+zh_CN.IconComment_InstallFQ=��װ���߼۸���������� Perl Finance-Quoteģ�顣��Ҫ ActivePerl 5.8 �� 5.10
+zh_CN.IconName_Uninstall=� GnuCash
+zh_CN.IconComment_Uninstall=ж�ز��������� GnuCash
+
;; ;;;;;;;;;;;;;;;;;;;;
commit a8fea92d677d84e20e8be3d2b97d05d481d1a5e1
Author: Christian Stimming <stimming at tuhh.de>
Date: Fri May 14 07:55:45 2010 +0000
Fix windows tag build script, by Geert Janssens
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19159 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_tags.sh b/build_tags.sh
index 98037df..7300274 100644
--- a/build_tags.sh
+++ b/build_tags.sh
@@ -25,12 +25,12 @@ svn update
# If we don't have a tagfile then start from 'now'
tagfile=tags
if [ ! -f ${tagfile} ] ; then
- svn ls ${TAG_URL} > ${tagfile}
+ svn ls -v ${TAG_URL} | awk '/[^.]\/$/ { print $6$1 }' > ${tagfile}
fi
# Figure out the new set of tags
-svn ls ${TAG_URL} > ${tagfile}.new
-tags="`diff --suppress-common-lines ${tagfile} ${tagfile}.new | grep '^> ' | sed -e 's/^> //g' -e 's#/$##g'`"
+svn ls -v ${TAG_URL} | awk '/[^.]\/$/ { print $6$1 }' > ${tagfile}.new
+tags="`diff --suppress-common-lines ${tagfile} ${tagfile}.new | grep '^> ' | sed -e 's/^> //g'`"
# move the new file into place
mv -f ${tagfile}.new ${tagfile}
@@ -38,9 +38,11 @@ mv -f ${tagfile}.new ${tagfile}
################################################################
# Now iterate over all the new tags (if any) and build a package
-for tag in $tags ; do
+for tag_rev in $tags ; do
+ tag=${tag_rev%/*}
tagbasedir=/c/soft/gnucash-${tag}
tagdir=${tagbasedir}/gnucash
+ rm -fr $tagbasedir
mkdir -p ${tagdir}
# Copy the downloads to save time
commit 953b4f586d7c142c48ad2500297a016f46405acc
Author: Christian Stimming <stimming at tuhh.de>
Date: Fri May 14 07:36:11 2010 +0000
Bug #618341: Additional paths to reset.sh
Patch by Yasuaki Taniguchi.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19157 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/reset.sh b/reset.sh
index 25b0650..e2c994d 100644
--- a/reset.sh
+++ b/reset.sh
@@ -87,10 +87,15 @@ function eval_all() {
eval_path $BUILD_DIR
eval_path $INSTALL_DIR
eval_path $GNUCASH_DIR\\dist
+ eval_path $GNUCASH_DIR\\gnucash.iss
eval_path $TMP_DIR
eval_path $MSYS_DIR\\etc\\profile.d\\installer.sh force
eval_path $DOCS_DIR
eval_path $LIBXSLT_DIR
+ eval_path $LIBBONOBOUI_DIR
+ eval_path $MYSQL_LIB_DIR
+ eval_path $PGSQL_DIR
+ eval_path $WEBKIT_DIR
}
echo
commit 4354519221bfe6b3b1d680d5a96844f5a258afa5
Author: Phil Longstaff <plongstaff at newearth.org>
Date: Sun May 9 17:13:02 2010 +0000
Fix #616554 - New stylesheets based on Fancy template cause BIN to crash
An interface issue between libjpeg and webkit (incorrect type used in libjpeg) causes the crash. This patch replaces the normal libjpeg with a patched one.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19146 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index e074d0a..58ddd9e 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -226,7 +226,7 @@ set_default GETTEXT_TOOLS_URL "$GNOME_WIN32_DEPS_URL/gettext-tools-0.17.zip"
set_default LIBICONV_URL "$GNOME_WIN32_DEPS_URL/libiconv-1.9.1.bin.woe32.zip"
set_default GLIB_URL "$GNOME_WIN32_URL/glib/2.22/glib_2.22.4-1_win32.zip"
set_default GLIB_DEV_URL "$GNOME_WIN32_URL/glib/2.22/glib-dev_2.22.4-1_win32.zip"
-set_default LIBJPEG_URL "$GNOME_WIN32_DEPS_URL/jpeg_7-1_win32.zip"
+set_default LIBJPEG_URL "$SF_MIRROR/gnucash/jpeg_7-1-fixed-win32.zip"
set_default LIBJPEG_DEV_URL "$GNOME_WIN32_DEPS_URL/jpeg-dev_7-1_win32.zip"
set_default LIBPNG_URL "$GNOME_WIN32_DEPS_URL/libpng_1.4.0-1_win32.zip"
set_default LIBPNG_DEV_URL "$GNOME_WIN32_DEPS_URL/libpng-dev_1.4.0-1_win32.zip"
commit 5784ed0aba354020f1eb711af800db4d7c83e838
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu May 6 07:44:11 2010 +0000
Remove qsf related code from windows installer script.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19114 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/dist.sh b/dist.sh
index 085caa2..a4936f6 100755
--- a/dist.sh
+++ b/dist.sh
@@ -236,7 +236,7 @@ function dist_gnucash() {
cp -a $_INSTALL_UDIR/lib/gnucash/lib*.dll $DIST_UDIR/lib/gnucash
cp -a $_INSTALL_UDIR/libexec $DIST_UDIR
mkdir -p $DIST_UDIR/share
- cp -a $_INSTALL_UDIR/share/{gnucash,locale,xml} $DIST_UDIR/share
+ cp -a $_INSTALL_UDIR/share/{gnucash,locale} $DIST_UDIR/share
cp -a $_REPOS_UDIR/packaging/win32/install-fq-mods.cmd $DIST_UDIR/bin
_QTDIR_WIN=$(unix_path $QTDIR | sed 's,^/\([A-Za-z]\)/,\1:/,g' )
commit cd02310a17d1cb56b5302bb86467d5d7747eafb9
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed May 5 12:25:37 2010 +0000
Rewrite assert_one_dir function to not crash on a native build machine
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19107 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/functions.sh b/functions.sh
index 67d2f88..04cbca0 100644
--- a/functions.sh
+++ b/functions.sh
@@ -182,8 +182,12 @@ function set_env() {
function assert_one_dir() {
counted=$(ls -d "$@" 2>/dev/null | wc -l)
- [[ $counted -eq 0 ]] && die "Exactly one directory is required, but detected $counted; please check why $@ wasn't created"
- [[ $counted -gt 1 ]] && die "Exactly one directory is required, but detected $counted; please delete all but the latest one: $@"
+ if [[ $counted -eq 0 ]]; then
+ die "Exactly one directory is required, but detected $counted; please check why $@ wasn't created"
+ fi
+ if [[ $counted -gt 1 ]]; then
+ die "Exactly one directory is required, but detected $counted; please delete all but the latest one: $@"
+ fi
}
function fix_pkgconfigprefix() {
commit 7e384534fc8cd685dff0d69360a57f4e44179ff6
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue May 4 23:40:29 2010 +0000
Improve the cross-compilation process.
- improve create_cross_mingw.sh's integration in defaults.sh and install.sh
- update README file
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19104 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/README b/README
index 4140bef..7761bd3 100644
--- a/README
+++ b/README
@@ -1,8 +1,12 @@
These scripts try to download and install a Windows/mingw32 build
-environment for GnuCash on Windows.
+environment for GnuCash on Windows.
-For cross-compiling the windows executable on Linux, see the lower
-section of this file.
+These scripts support two ways to build a Windows/mingw32 version of GnuCash:
+- directly on a Windows PC
+- via cross-compilation on Linux
+
+1. Build GnuCash directly on a Windows PC
+-----------------------------------------
Before you start with the automated build, you have to complete these
steps manually. The directory variables are set in `defaults.sh' and optionally
@@ -59,7 +63,8 @@ completed:
More information is collected on http://wiki.gnucash.org/wiki/Windows
---------------------------
+2. Cross-compile GnuCash/win32 on a linux PC
+--------------------------------------------
Cross-compiling a Windows/mingw32 executable of GnuCash on a Linux
host system. (Note: This used to work unchangedly in Sept'2006 but
@@ -67,19 +72,21 @@ probably not any longer.)
These steps need to be performed:
-1. Edit the file create_cross_mingw.sh and set the PREFIX= variable to
- the preferred prefix of the mingw32 gcc/binutils on your
- Linux. (It is strongly recommended to choose a different prefix
- than your normal compiler tool chain in order to distinguish
- your native vs. cross compiler more easily.) Then run the
- script create_cross_mingw.sh - it will
- download, compile, and install a mingw32 toolchain.
-
-2. Edit the file defaults.sh: Make a global search-and-replace of
- '\\' into '/' so that all directories are specified in unix
- conventions. Set the variable cross_compile to "yes". Then
- adjust the directories in defaults.sh according to your
- preferred installation, especially $GLOBAL_DIR.
+1. Look at defaults.sh and create a file named custom.sh to specify adapted
+ directory variables. If you want verbose output of any script
+ step, add "set -x" to that file. Particularly for cross-compiling,
+ set these variables:
+ * cross_compile: should be set to yes
+ * GLOBAL_DIR: the base directory for all other directory definitions,
+ unless you explicitly override it for some directories.
+ * MINGW_DIR: set this to your preferred prefix of the mingw32 gcc/binutils
+ on your Linux installation.
+ (It is strongly recommended to choose a prefix different
+ from your normal compiler tool chain in order to distinguish
+ your native vs. cross compiler more easily.)
+
+2. Then run the script create_cross_mingw.sh - it will
+ download, compile, and install a mingw32 tool chain.
3. Download a binary windows packages for "guile" e.g. from
http://www.tu-harburg.de/~et2cs/gnc/ and unpack it into the
@@ -87,7 +94,7 @@ These steps need to be performed:
the build system for guile doesn't support cross-compiling.)
4. Call install.sh, which will read the directory settings from
- defaults.sh. It should download, compile, and install everything
+ defaults.sh/custom.sh. It should download, compile, and install everything
automatically. Eventually the windows gnucash is installed into
$GNUCASH_DIR.
diff --git a/create_cross_mingw.sh b/create_cross_mingw.sh
index ecfa971..7cda3b4 100755
--- a/create_cross_mingw.sh
+++ b/create_cross_mingw.sh
@@ -41,92 +41,6 @@ qpushd "$(dirname "$0")"
#
# Updated by Igor Mikolic-Torreira <igormt at alumni.caltech.edu>
-
-
-#-----------------------------------------------------
-#
-# BEGIN USER SETTINGS
-#
-# You need to review and adjust the macros that follow
-#
-#-----------------------------------------------------
-
-
-# What flavor of GCC cross-compiler are we building?
-
-TARGET=${TARGET:-mingw32}
-
-# What directory will the cross-compiler be built in?
-# This is the directory into which source archives will
-# be downloaded, expanded, compiled, etc. You need to
-# have write-access to this directory. If you leave it
-# blank, it defaults to the current directory.
-
-BUILDDIR=`unix_path $TMP_DIR`
-
-# Where does the cross-compiler go?
-# This should be the directory into which your cross-compiler
-# will be installed. Remember that if you set this to a directory
-# that only root has write access to, you will need to run this
-# script as root.
-
-_PREFIX=`unix_path $MINGW_DIR`
-PREFIX=${PREFIX:-$_PREFIX}
-
-# Purge anything and everything already in the $PREFIX
-#(also known as the destination or installation) directory?
-# Set to "Y" to purge, any other value omits the purge step.
-
-PURGE_DIR=${PURGE_DIR:-N}
-
-
-# Set the following to the files from the current MinGW release
-# (or whichever MinGW release you wish to build and install)
-# You need to set both the URL they will be downloaded from
-# and the exact name of the individual component files.
-
-MINGW_URL="http://heanet.dl.sourceforge.net/sourceforge/mingw"
-
-# GCC_CORE is required; the other components are optional.
-# Set any you don't want to "". You need binutils,
-# mingw runtime and w32api; do not ever set those to "".
-# gcc 3.4.5-20060117-3 is the same source of 3.4.5-20060117-2
-# see release notes
-GCC_CORE_ARCHIVE="gcc-core-3.4.5-20060117-2-src.tar.gz"
-GCC_GPP_ARCHIVE="gcc-g++-3.4.5-20060117-2-src.tar.gz"
-GCC_G77_ARCHIVE="" #gcc-g77-3.4.5-20060117-1-src.tar.gz"
-GCC_OBJC_ARCHIVE="" #gcc-objc-3.4.5-20060117-1-src.tar.gz"
-GCC_JAVA_ARCHIVE="" #gcc-java-3.4.5-20060117-1-src.tar.gz"
-GCC_ADA_ARCHIVE=""
-GCC_PATCH=""
-
-BINUTILS_ARCHIVE="binutils-2.20.1-src.tar.gz"
-
-MINGW_ARCHIVE="mingwrt-3.15.1-mingw32.tar.gz"
-
-W32API_ARCHIVE="w32api-3.13-mingw32-dev.tar.gz"
-
-
-# These are the files from the SDL website
-# These are optional, set them to "" if you don't want them)
-
-SDL_URL="" #http://www.libsdl.org/extras/win32/common"
-
-OPENGL_ARCHIVE="" #opengl-devel.tar.gz"
-DIRECTX_ARCHIVE="" #directx-devel.tar.gz"
-
-
-
-#-----------------------------------------------------
-#
-# END USER SETTINGS
-#
-# The remainder of the script should not neet any edits
-#
-#-----------------------------------------------------
-
-
-
# Make sure these are initialized as we want them
GCC_CORE=""
@@ -136,17 +50,32 @@ GCC_LANGS="c"
# Set our build directory and where our sources will go
-if [ "x$BUILDDIR" = "x" ]; then
- # Default to the current directory
- BUILDDIR=$(pwd)
+if [ "x$XC_BUILD_DIR" = "x" ]; then
+ # Default to the current directory
+ XC_BUILD_DIR=$(pwd)
fi
-SRCDIR="$BUILDDIR/source"
+SRCDIR="$XC_BUILD_DIR/source"
# Need install directory first on the path so gcc can find binutils
PATH="$PREFIX/bin:$PATH"
+# Prepare directories used by download function
+
+DOWNLOAD_UDIR=`unix_path $DOWNLOAD_DIR`
+TMP_UDIR=`unix_path $TMP_DIR`
+mkdir -p "$TMP_UDIR"
+mkdir -p "$DOWNLOAD_UDIR"
+mkdir -p "$SRCDIR"
+
+# Make sure wget is installed
+if test "x`which wget`" = "x" ; then
+ echo "You need to install wget."
+ exit 1
+fi
+
+qpushd "$XC_BUILD_DIR"
#-----------------------------------------------------
@@ -156,270 +85,201 @@ PATH="$PREFIX/bin:$PATH"
#-----------------------------------------------------
-function download_files
-{
- # Download a file from a given url, only if it is not present
- mkdir -p "$SRCDIR"
-
- # Make sure wget is installed
- if test "x`which wget`" = "x" ; then
- echo "You need to install wget."
- exit 1
- fi
- download_file "$GCC_CORE_ARCHIVE" "$MINGW_URL"
- if [ "x$GCC_GPP_ARCHIVE" != "x" ]; then
- download_file "$GCC_GPP_ARCHIVE" "$MINGW_URL"
- fi
- if [ "x$GCC_G77_ARCHIVE" != "x" ]; then
- download_file "$GCC_G77_ARCHIVE" "$MINGW_URL"
- fi
- if [ "x$GCC_OBJC_ARCHIVE" != "x" ]; then
- download_file "$GCC_OBJC_ARCHIVE" "$MINGW_URL"
- fi
- if [ "x$GCC_JAVA_ARCHIVE" != "x" ]; then
- download_file "$GCC_JAVA_ARCHIVE" "$MINGW_URL"
- fi
- if [ "x$GCC_ADA_ARCHIVE" != "x" ]; then
- download_file "$GCC_ADA_ARCHIVE" "$MINGW_URL"
- fi
-
- download_file "$BINUTILS_ARCHIVE" "$MINGW_URL"
- download_file "$MINGW_ARCHIVE" "$MINGW_URL"
- download_file "$W32API_ARCHIVE" "$MINGW_URL"
-
- if [ "x$OPENGL_ARCHIVE" != "x" ]; then
- download_file "$OPENGL_ARCHIVE" "$SDL_URL"
- fi
- if [ "x$DIRECTX_ARCHIVE" != "x" ]; then
- download_file "$DIRECTX_ARCHIVE" "$SDL_URL"
- fi
-}
-
-
-function download_file
-{
- cd "$SRCDIR"
- if test ! -f $1 ; then
- echo "Downloading $1"
- wget "$2/$1"
- if test ! -f $1 ; then
- echo "Could not download $1"
- exit 1
- fi
- else
- echo "Found $1 in the srcdir $SRCDIR"
- fi
- cd "$BUILDDIR"
-}
-
-
function purge_existing_install
{
- echo "Purging the existing files in $PREFIX"
- if cd "$PREFIX"; then
- rm -rf *
- fi
- cd "$BUILDDIR"
+ echo "Purging the existing files in $PREFIX"
+ mkdir -p "$PREFIX"
+ if cd "$PREFIX"; then
+ rm -rf *
+ fi
+ cd "$XC_BUILD_DIR"
}
function install_libs
{
- echo "Installing cross libs and includes"
- mkdir -p "$PREFIX/$TARGET"
- cd "$PREFIX/$TARGET"
-
- tar -xzf "$SRCDIR/$MINGW_ARCHIVE"
- tar -xzf "$SRCDIR/$W32API_ARCHIVE"
-
- if [ "x$OPENGL_ARCHIVE" != "x" ]; then
- tar -xzf "$SRCDIR/$OPENGL_ARCHIVE"
- fi
-
- if [ "x$DIRECTX_ARCHIVE" != "x" ]; then
- tar -xzf "$SRCDIR/$DIRECTX_ARCHIVE"
- fi
-
- cd "$BUILDDIR"
+ echo "Installing cross libs and includes"
+ mkdir -p "$PREFIX/$TARGET"
+
+ wget_unpacked "$MINGW_RT_URL" "$DOWNLOAD_DIR" "$PREFIX/$TARGET"
+ wget_unpacked "$W32API_URL" "$DOWNLOAD_DIR" "$PREFIX/$TARGET"
+
+ if [ "x$OPENGL_URL" != "x" ]; then
+ wget_unpacked "$GCC_OPENGL_SRC_URL" "$DOWNLOAD_DIR" "$SRCDIR"
+ fi
+ if [ "x$DIRECTX_URL" != "x" ]; then
+ wget_unpacked "$GCC_DIRECTX_SRC_URL" "$DOWNLOAD_DIR" "$SRCDIR"
+ fi
}
-function extract_binutils
-{
- cd "$SRCDIR"
- BINUTILS=`tar -tzf "$SRCDIR/$BINUTILS_ARCHIVE" | head -n 1`
- rm -rf "$BINUTILS"
- echo "Extracting binutils"
- tar -xzf "$SRCDIR/$BINUTILS_ARCHIVE"
- cd "$BUILDDIR"
-}
-
-
-function configure_binutils
+function install_binutils
{
- cd "$BUILDDIR"
- rm -rf "binutils-$TARGET"
- mkdir "binutils-$TARGET"
- cd "binutils-$TARGET"
- echo "Configuring binutils"
- "$SRCDIR/$BINUTILS/configure" --prefix="$PREFIX" --target=$TARGET --disable-nls \
+ setup " binutils (cross-compile)"
+
+ if quiet $PREFIX/bin/$TARGET-ld --version
+ then
+ echo "binutils already installed. skipping."
+ else
+ wget_unpacked "$BINUTILS_SRC_URL" "$DOWNLOAD_DIR" "$SRCDIR"
+ BINUTILS_SRC_DIR=$_EXTRACT_UDIR
+
+ BINUTILS_BUILD_DIR="$XC_BUILD_DIR/binutils-$TARGET"
+ rm -rf "$BINUTILS_BUILD_DIR"
+ mkdir "$BINUTILS_BUILD_DIR"
+ qpushd "$BINUTILS_BUILD_DIR"
+
+ echo -n "Configuring ... "
+ "$BINUTILS_SRC_DIR/configure" --prefix="$PREFIX" --target=$TARGET --disable-nls \
--with-gcc --with-gnu-as --with-gnu-ld --disable-shared &> configure.log
- cd "$BUILDDIR"
-}
-
+ echo done
-function build_binutils
-{
- cd "$BUILDDIR/binutils-$TARGET"
- echo "Building binutils"
+ echo -n "Building ... "
make CFLAGS="-O2 -fno-exceptions" LDFLAGS="-s" &> make.log
if test $? -ne 0; then
- echo "make of binutils failed - log available: binutils-$TARGET/make.log"
- exit 1
+ echo "failed - log available: $BINUTILS_BUILD_DIR/make.log"
+ exit 1
fi
- cd "$BUILDDIR"
-}
-
+ echo done
-function install_binutils
-{
- cd "$BUILDDIR/binutils-$TARGET"
- echo "Installing binutils"
+ echo -n "Installing ... "
make install &> make-install.log
if test $? -ne 0; then
- echo "install of binutils failed - log available: binutils-$TARGET/make-install.log"
- exit 1
+ echo "failed - log available: $BINUTILS_BUILD_DIR/make-install.log"
+ exit 1
fi
- cd "$BUILDDIR"
+ echo done
+
+ qpopd
+ fi
}
-function extract_gcc
+function install_gcc
{
- cd "$SRCDIR"
- GCC=`tar -tzf "$SRCDIR/$GCC_CORE_ARCHIVE" | head -n 1`
- rm -rf "$GCC"
- echo "Extracting gcc"
- tar -xzf "$SRCDIR/$GCC_CORE_ARCHIVE"
- if [ "x$GCC_GPP_ARCHIVE" != "x" ]; then
- GCC_LANGS=${GCC_LANGS}",c++"
- tar -xzf "$SRCDIR/$GCC_GPP_ARCHIVE"
+ setup " gcc (cross-compile)"
+
+ if quiet $PREFIX/bin/$TARGET-g++ --version
+ then
+ echo "gcc already installed. skipping."
+ else
+ # Filename doesn't match expanded directory, let's fix that
+ TARGET_FILE=${GCC_CORE_SRC_URL##*/}
+ TARGET_FILE=${TARGET_FILE/-core-/-}
+ wget_unpacked "$GCC_CORE_SRC_URL" "$DOWNLOAD_DIR" "$SRCDIR" $TARGET_FILE
+ GCC_SRC_DIR=$_EXTRACT_UDIR
+
+ if [ "x$GCC_GPP_SRC_URL" != "x" ]; then
+ GCC_LANGS=${GCC_LANGS}",c++"
+ wget_unpacked "$GCC_GPP_SRC_URL" "$DOWNLOAD_DIR" "$SRCDIR"
fi
- if [ "x$GCC_G77_ARCHIVE" != "x" ]; then
- GCC_LANGS=${GCC_LANGS}",f77"
- tar -xzf "$SRCDIR/$GCC_G77_ARCHIVE"
+ if [ "x$GCC_G77_SRC_URL" != "x" ]; then
+ GCC_LANGS=${GCC_LANGS}",f77"
+ wget_unpacked "$GCC_G77_SRC_URL" "$DOWNLOAD_DIR" "$SRCDIR"
fi
- if [ "x$GCC_OBJC_ARCHIVE" != "x" ]; then
- GCC_LANGS=${GCC_LANGS}",objc"
- tar -xzf "$SRCDIR/$GCC_OBJC_ARCHIVE"
+ if [ "x$GCC_OBJC_SRC_URL" != "x" ]; then
+ GCC_LANGS=${GCC_LANGS}",objc"
+ wget_unpacked "$GCC_OBJC_SRC_URL" "$DOWNLOAD_DIR" "$SRCDIR"
fi
- if [ "x$GCC_JAVA_ARCHIVE" != "x" ]; then
- GCC_LANGS=${GCC_LANGS}",java"
- tar -xzf "$SRCDIR/$GCC_JAVA_ARCHIVE"
+ if [ "x$GCC_JAVA_SRC_URL" != "x" ]; then
+ GCC_LANGS=${GCC_LANGS}",java"
+ wget_unpacked "$GCC_JAVA_SRC_URL" "$DOWNLOAD_DIR" "$SRCDIR"
fi
- if [ "x$GCC_ADA_ARCHIVE" != "x" ]; then
- GCC_LANGS=${GCC_LANGS}",ada"
- tar -xzf "$SRCDIR/$GCC_ADA_ARCHIVE"
+ if [ "x$GCC_ADA_SRC_URL" != "x" ]; then
+ GCC_LANGS=${GCC_LANGS}",ada"
+ wget_unpacked "$GCC_ADA_SRC_URL" "$DOWNLOAD_DIR" "$SRCDIR"
fi
- cd "$BUILDDIR"
-}
-
-function patch_gcc
-{
if [ "$GCC_PATCH" != "" ]; then
- echo "Patching gcc"
- cd "$SRCDIR/$GCC"
- patch -p1 < "$SRCDIR/$GCC_PATCH"
- cd "$BUILDDIR"
+ echo -n "Patching ... "
+ qpushd "$GCC_SRC_DIR"
+ patch -p1 < "$SRCDIR/$GCC_PATCH"
+ qpopd
+ echo done
fi
-}
-
-function configure_gcc
-{
- cd "$BUILDDIR"
- rm -rf "gcc-$TARGET"
- mkdir "gcc-$TARGET"
- cd "gcc-$TARGET"
- echo "Configuring gcc"
- "$SRCDIR/$GCC/configure" -v \
- --prefix="$PREFIX" --target=$TARGET \
- --with-headers="$PREFIX/$TARGET/include" \
- --with-gcc --with-gnu-ld --with-gnu-as \
- --enable-threads --disable-nls --enable-languages=$GCC_LANGS \
- --disable-win32-registry --disable-shared --enable-sjlj-exceptions --enable-libgcj \
- --disable-java-awt --without-x --enable-java-gc=boehm --disable-libgcj-debug \
- --enable-interpreter --enable-hash-synchronization --enable-libstdcxx-debug \
- &> configure.log
- cd "$BUILDDIR"
-}
-
-
-function build_gcc
-{
- cd "$BUILDDIR/gcc-$TARGET"
- echo "Building gcc"
+ GCC_BUILD_DIR="$XC_BUILD_DIR/gcc-$TARGET"
+ rm -rf "$GCC_BUILD_DIR"
+ mkdir "$GCC_BUILD_DIR"
+ qpushd "$GCC_BUILD_DIR"
+
+ echo -n "Configuring ... "
+ "$GCC_SRC_DIR/configure" -v \
+ --prefix="$PREFIX" --target=$TARGET \
+ --with-headers="$PREFIX/$TARGET/include" \
+ --with-gcc --with-gnu-ld --with-gnu-as \
+ --enable-threads --disable-nls --enable-languages=$GCC_LANGS \
+ --disable-win32-registry --disable-shared --enable-sjlj-exceptions --enable-libgcj \
+ --disable-java-awt --without-x --enable-java-gc=boehm --disable-libgcj-debug \
+ --enable-interpreter --enable-hash-synchronization --enable-libstdcxx-debug \
+ &> configure.log
+ echo done
+
+ echo -n "Building ... "
make CFLAGS="-O2" CXXFLAGS="-O2" GCJFLAGS="-O2" LDFLAGS="-s" DEBUG_FLAGS="-g0" &> make.log
if test $? -ne 0; then
- echo "make of gcc failed - log available: gcc-$TARGET/make.log"
- exit 1
+ echo "failed - log available: $GCC_BUILD_DIR/make.log"
+ exit 1
fi
+ echo done
+
+ # 2010-04-28 I doubt the code below is ever called. GCC_ADA is never defined
+ # Should this be GCC_ADA_SRC_URL ?
if [ "x$GCC_ADA" != "x" ]; then
- cd gcc
- make "CFLAGS=-O2" "LDFLAGS=-s" gnatlib_and_tools &> make-gnatlib.log
- if test $? -ne 0; then
- echo "make of gnatlib and tools failed - log available: gcc-$TARGET/make-gnatlib.log"
- exit 1
- fi
+ qpushd gcc
+ echo -n "Building gnatlib ... "
+ make "CFLAGS=-O2" "LDFLAGS=-s" gnatlib_and_tools &> make-gnatlib.log
+ if test $? -ne 0; then
+ echo "failed - log available: $GCC_BUILD_DIR/gcc/make-gnatlib.log"
+ exit 1
+ fi
+ echo done
+ qpopd
fi
- cd "$BUILDDIR"
-}
-
-function install_gcc
-{
- cd "$BUILDDIR/gcc-$TARGET"
- echo "Installing gcc"
+ echo "Installing ... "
make install &> make-install.log
if test $? -ne 0; then
- echo "install of gcc failed - log available: gcc-$TARGET/make-install.log"
- exit 1
+ echo "failed - log available: $GCC_BUILD_DIR/make-install.log"
+ exit 1
fi
- cd "$BUILDDIR"
+ echo done
+
+ qpopd
+ fi
}
function final_tweaks
{
- echo "Finalizing installation"
-
- # remove gcc build headers
- rm -rf "$PREFIX/$TARGET/sys-include"
-
- # Add extra binary links
- if [ ! -f "$PREFIX/$TARGET/bin/objdump" ]; then
- ln "$PREFIX/bin/$TARGET-objdump" "$PREFIX/$TARGET/bin/objdump"
- fi
-
- # make cc and c++ symlinks to gcc and g++
- if [ ! -f "$PREFIX/$TARGET/bin/g++" ]; then
- ln "$PREFIX/bin/$TARGET-g++" "$PREFIX/$TARGET/bin/g++"
- fi
- if [ ! -f "$PREFIX/$TARGET/bin/cc" ]; then
- ln -s "gcc" "$PREFIX/$TARGET/bin/cc"
- fi
- if [ ! -f "$PREFIX/$TARGET/bin/c++" ]; then
- ln -s "g++" "$PREFIX/$TARGET/bin/c++"
- fi
-
- # strip all the binaries
- ls "$PREFIX"/bin/* "$PREFIX/$TARGET"/bin/* | egrep -v '.dll$' | egrep -v 'gccbug$' |
- while read file; do
- strip "$file"
- done
-
- echo "Installation complete!"
+ echo "Finalizing installation"
+
+ # remove gcc build headers
+ rm -rf "$PREFIX/$TARGET/sys-include"
+
+ # Add extra binary links
+ if [ ! -f "$PREFIX/$TARGET/bin/objdump" ]; then
+ ln "$PREFIX/bin/$TARGET-objdump" "$PREFIX/$TARGET/bin/objdump"
+ fi
+
+ # make cc and c++ symlinks to gcc and g++
+ if [ ! -f "$PREFIX/$TARGET/bin/g++" ]; then
+ ln "$PREFIX/bin/$TARGET-g++" "$PREFIX/$TARGET/bin/g++"
+ fi
+ if [ ! -f "$PREFIX/$TARGET/bin/cc" ]; then
+ ln -s "gcc" "$PREFIX/$TARGET/bin/cc"
+ fi
+ if [ ! -f "$PREFIX/$TARGET/bin/c++" ]; then
+ ln -s "g++" "$PREFIX/$TARGET/bin/c++"
+ fi
+
+ # strip all the binaries
+ ls "$PREFIX"/bin/* "$PREFIX/$TARGET"/bin/* | egrep -v '.dll$' | egrep -v 'gccbug$' |
+ while read file; do
+ strip "$file"
+ done
+
+ echo "Installation complete!"
}
@@ -427,29 +287,15 @@ function final_tweaks
#
# Main part of the script
#
-
-download_files
-
-if [ "x$PURGE_DIR" = "xY" ]; then
- purge_existing_install
+if [ "x$PURGE_DIR" = "xyes" ]; then
+ purge_existing_install
fi
install_libs
-
-extract_binutils
-configure_binutils
-build_binutils
install_binutils
-
-extract_gcc
-patch_gcc
-configure_gcc
-build_gcc
install_gcc
-
final_tweaks
-
#
# End
#
diff --git a/defaults.sh b/defaults.sh
index 0197833..e074d0a 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -75,20 +75,9 @@ set_default CUTECASH_BUILD_DIR $GNUCASH_DIR\\build-cutecash
####
-set_default LD ld
-set_default CC gcc
-set_default DLLTOOL dlltool
-set_default RANLIB ranlib
-
# For cross-compiling, change this to "yes"
set_default CROSS_COMPILE "no"
-if [ "$CROSS_COMPILE" = yes ]; then
- # Insert your cross-compiler mingw32 bin-directories here
- set_default HOST_XCOMPILE "--host=mingw32"
-fi
-####
-
# If "yes", build without optimizations (-O0) and ease debugging
set_default DISABLE_OPTIMIZATIONS no
@@ -108,14 +97,75 @@ set_default GNOME_WIN32_DEPS_URL "$GNOME_WIN32_URL/dependencies"
set_default DTK_URL "$SF_MIRROR/mingw/msysDTK-1.0.1.exe"
set_default M4_URL "$SF_MIRROR/mingw/m4-1.4.7-MSYS.tar.bz2"
-set_default BINUTILS_URL "$SF_MIRROR/mingw/binutils-2.19-mingw32-bin.tar.gz"
-set_default GCC_CORE_URL "$SF_MIRROR/mingw/gcc-core-3.4.5-20060117-3.tar.gz"
-set_default GCC_GPP_URL "$SF_MIRROR/mingw/gcc-g++-3.4.5-20060117-3.tar.gz"
set_default MINGW_RT_URL "$SF_MIRROR/mingw/mingwrt-3.15.1-mingw32.tar.gz"
set_default W32API_URL "$SF_MIRROR/mingw/w32api-3.13-mingw32-dev.tar.gz"
set_default MINGW_MAKE_URL "$SF_MIRROR/mingw/mingw32-make-3.81-20080326-3.tar.gz"
set_default MINGW_DIR $GLOBAL_DIR\\mingw
+if [ "$CROSS_COMPILE" != yes ]; then
+ # Use native toolchain
+ set_default LD ld
+ set_default CC gcc
+ set_default DLLTOOL dlltool
+ set_default RANLIB ranlib
+
+ # For native build on Windows we can use precompiled binaries
+ set_default BINUTILS_URL "$SF_MIRROR/mingw/binutils-2.19-mingw32-bin.tar.gz"
+ set_default GCC_CORE_URL "$SF_MIRROR/mingw/gcc-core-3.4.5-20060117-3.tar.gz"
+ set_default GCC_GPP_URL "$SF_MIRROR/mingw/gcc-g++-3.4.5-20060117-3.tar.gz"
+else
+ # What flavor of GCC cross-compiler are we building?
+ set_default TARGET "mingw32"
+
+ # Insert your cross-compiler mingw32 bin-directories here
+ set_default HOST_XCOMPILE "--host=$TARGET"
+
+ # Where does the cross-compiler go?
+ # This should be the directory into which your cross-compiler
+ # will be installed. Remember that if you set this to a directory
+ # that only root has write access to, you will need to run this
+ # script as root.
+ set_default PREFIX `unix_path $MINGW_DIR`
+
+ # Use native toolchain
+ set_default LD $TARGET-ld
+ set_default CC $TARGET-gcc
+ set_default DLLTOOL $TARGET-dlltool
+ set_default RANLIB $TARGET-ranlib
+
+ # For cross compilation we need to build our own toolchain
+ set_default BINUTILS_SRC_URL "$SF_MIRROR/mingw/binutils-2.20.1-src.tar.gz"
+ set_default GCC_CORE_SRC_URL "$SF_MIRROR/mingw/gcc-core-3.4.5-20060117-2-src.tar.gz"
+ set_default GCC_GPP_SRC_URL "$SF_MIRROR/mingw/gcc-g++-3.4.5-20060117-2-src.tar.gz"
+ # Not required for GnuCash
+ set_default GCC_G77_SRC_URL "" #"$SF_MIRROR/mingw/gcc-g77-3.4.5-20060117-2-src.tar.gz"
+ set_default GCC_OBJC_SRC_URL "" #"$SF_MIRROR/mingw/gcc-objc-3.4.5-20060117-2-src.tar.gz"
+ set_default GCC_JAVA_SRC_URL "" #"$SF_MIRROR/mingw/gcc-java-3.4.5-20060117-2-src.tar.gz"
+ set_default GCC_ADA_SRC_URL "" #"$SF_MIRROR/mingw/gcc-ada-3.4.5-20060117-2-src.tar.gz"
+
+ # What directory will the cross-compiler be built in?
+ # This is the directory into which source archives will
+ # be downloaded, expanded, compiled, etc. You need to
+ # have write-access to this directory. If you leave it
+ # blank, it defaults to the current directory.
+ set_default XC_BUILD_DIR `unix_path $TMP_DIR`
+
+ # Purge anything and everything already in the $PREFIX
+ #(also known as the destination or installation) directory?
+ # Set to "yes" to purge, any other value omits the purge step.
+ set_default PURGE_DIR "no"
+
+ # If you wish to apply a patch to GCC, put it in the SRC_DIR
+ # and add its filename here.
+ set_default GCC_PATCH ""
+
+ # These are the files from the SDL website
+ # These are optional, set them to "" if you don't want them
+ set_default SDL_URL "" #http://www.libsdl.org/extras/win32/common"
+ set_default OPENGL_URL "" #"$SDL_URL/opengl-devel.tar.gz"
+ set_default DIRECTX_URL "" #$SDL_URL/directx-devel.tar.gz"
+fi
+
set_default CROSS_GCC_SRC_URL "$SF_MIRROR/mingw/gcc-4.4.0-src.tar.bz2"
set_default CROSS_GCC_SRC2_URL "$SF_MIRROR/mingw/gcc-4.4.0-mingw32-src-2.tar.gz"
#set_default CROSS_GCC_SRC_URL "$SF_MIRROR/mingw/gcc-4.5.0-1-mingw32-src.tar.lzma"
diff --git a/install.sh b/install.sh
index b726825..5e50914 100644
--- a/install.sh
+++ b/install.sh
@@ -153,7 +153,6 @@ function inst_mingw() {
setup MinGW
_MINGW_UDIR=`unix_path $MINGW_DIR`
_MINGW_WFSDIR=`win_fs_path $MINGW_DIR`
- [ "$CROSS_COMPILE" = "yes" ] && add_to_env $_MINGW_UDIR/mingw32/bin PATH
[ "$CROSS_COMPILE" = "yes" ] && add_to_env $_MINGW_UDIR/bin PATH
if quiet test_for_mingw
@@ -272,7 +271,8 @@ function inst_autotools() {
quiet autoconf --help && quiet automake --help || die "autoconf/automake not installed correctly"
rm -rf ${TMP_UDIR}/autoconf-* ${TMP_UDIR}/automake-*
fi
- if quiet libtoolize --help
+ if quiet libtoolize --help && \
+ quiet ${LD} $AUTOTOOLS_LDFLAGS -lltdl -o $TMP_UDIR/ofile
then
echo "libtool/libtoolize already installed. skipping."
else
@@ -284,7 +284,8 @@ function inst_autotools() {
make
make install
qpopd
- quiet libtoolize --help || die "libtool/libtoolize not installed correctly"
+ quiet libtoolize --help && \
+ quiet ${LD} $AUTOTOOLS_LDFLAGS -lltdl -o $TMP_UDIR/ofile || die "libtool/libtoolize not installed correctly"
rm -rf ${TMP_UDIR}/libtool-*
fi
[ ! -d $_AUTOTOOLS_UDIR/share/aclocal ] || add_to_env "-I $_AUTOTOOLS_UDIR/share/aclocal" ACLOCAL_FLAGS
@@ -649,6 +650,13 @@ EOF
mv tmp lib/pkgconfig/libgtkhtml-3.14.pc
rm -rf $TMP_UDIR/gtk-doc-*
qpopd
+
+ if [ "$CROSS_COMPILE" = "yes" ]; then
+ qpushd $_GNOME_UDIR/lib/pkgconfig
+ perl -pi.bak -e"s!^prefix=.*\$!prefix=$_GNOME_UDIR!" *.pc
+ #perl -pi.bak -e's!^Libs: !Libs: -L\${prefix}/bin !' *.pc
+ qpopd
+ fi
wget_unpacked $PIXMAN_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/pixman-*
qpushd $TMP_UDIR/pixman-*
@@ -664,12 +672,6 @@ EOF
quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgtkhtml-3.14 &&
quiet intltoolize --version || die "gnome not installed correctly"
fi
- if [ "$CROSS_COMPILE" = "yes" ]; then
- qpushd $_GNOME_UDIR/lib/pkgconfig
- perl -pi.bak -e"s!^prefix=.*\$!prefix=$_GNOME_UDIR!" *.pc
- #perl -pi.bak -e's!^Libs: !Libs: -L\${prefix}/bin !' *.pc
- qpopd
- fi
[ ! -d $_GNOME_UDIR/share/aclocal ] || add_to_env "-I $_GNOME_UDIR/share/aclocal" ACLOCAL_FLAGS
}
@@ -1345,20 +1347,21 @@ function inst_gnucash() {
AQBANKING_UPATH="${_OPENSSL_UDIR}/bin:${_GWENHYWFAR_UDIR}/bin:${_AQBANKING_UDIR}/bin"
LIBOFX_OPTIONS="--enable-ofx --with-ofx-prefix=${_LIBOFX_UDIR}"
+ if [ "$CROSS_COMPILE" = "yes" ]; then
+ # Set these variables manually because of cross-compiling
+ export GUILE_LIBS="${GUILE_LDFLAGS} -lguile -lguile-ltdl"
+ export GUILE_INCS="${GUILE_CPPFLAGS}"
+ export BUILD_GUILE=yes
+ export name_build_guile=/usr/bin/guile-config
+ fi
+
qpushd $REPOS_DIR
- if [ "$CROSS_COMPILE" = "yes" ]; then
- # Set these variables manually because of cross-compiling
- export GUILE_LIBS="${GUILE_LDFLAGS} -lguile -lguile-ltdl"
- export GUILE_INCS="${GUILE_CPPFLAGS}"
- export BUILD_GUILE=yes
- export name_build_guile=/usr/bin/guile-config
- fi
if [ "$BUILD_FROM_TARBALL" != "yes" ]; then
./autogen.sh
fi
qpopd
- qpushd $BUILD_DIR
+ qpushd $_BUILD_UDIR
$_REL_REPOS_UDIR/configure ${HOST_XCOMPILE} \
--prefix=$_INSTALL_WFSDIR \
--enable-debug \
commit 679d38d957e00d261cec8c4c6939c7ff8b6bdaf8
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue May 4 22:40:19 2010 +0000
Improve test_for_mingw
- change test so that both tested programs must work, not only the exit code of the last one
- make it cross-compile compatible
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19101 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index bb969b7..b726825 100644
--- a/install.sh
+++ b/install.sh
@@ -142,11 +142,10 @@ function inst_dtk() {
}
function test_for_mingw() {
- ${CC} --version
- ${LD} --help
- if [ "$CROSS_COMPILE" != "yes" ]; then
- g++ --version
- mingw32-make --help
+ if [ "$CROSS_COMPILE" == "yes" ]; then
+ ${CC} --version && ${LD} --help
+ else
+ g++ --version && mingw32-make --help
fi
}
commit 9dfb9a033bd16e51be4972ca80eaf2c65c3407e2
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue May 4 16:44:55 2010 +0000
Improve assert_one_dir
It now gives a different error message when no directory was found or when multiple directories were found
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19100 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/functions.sh b/functions.sh
index d0c6ab7..67d2f88 100644
--- a/functions.sh
+++ b/functions.sh
@@ -121,7 +121,7 @@ function die() {
echo
[ "$*" ] && echo "!!! $* !!!"
echo "!!! ABORTING !!!"
- exit -1
+# exit -1
}
# usage: register_env_var NAME SEPARATOR [DEFAULT]
@@ -181,7 +181,9 @@ function set_env() {
}
function assert_one_dir() {
- quiet [ -d "$@" ] || die "Detected multiple directories where only one was expected; please delete all but the latest one: $@"
+ counted=$(ls -d "$@" 2>/dev/null | wc -l)
+ [[ $counted -eq 0 ]] && die "Exactly one directory is required, but detected $counted; please check why $@ wasn't created"
+ [[ $counted -gt 1 ]] && die "Exactly one directory is required, but detected $counted; please delete all but the latest one: $@"
}
function fix_pkgconfigprefix() {
commit d3b5ed5af294828edbf8041d09978650da3d90d6
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue May 4 09:45:50 2010 +0000
Bug #617435 - webkitgtk+ cross build script, created by Yasuaki Taniguchi
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19098 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/crossbuild_webkit.sh b/crossbuild_webkit.sh
new file mode 100755
index 0000000..10c9cbe
--- /dev/null
+++ b/crossbuild_webkit.sh
@@ -0,0 +1,489 @@
+#!/bin/bash
+
+[ ! "$BASH" -a -x /bin/bash ] && exec /bin/bash "$0" "$@"
+
+set -e
+
+echo -n "Build Starting at "
+date
+
+function qpushd() { pushd "$@" >/dev/null; }
+function qpopd() { popd >/dev/null; }
+function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
+
+qpushd "$(dirname $(unix_path "$0"))"
+. functions.sh
+. defaults.sh
+
+register_env_var ACLOCAL_FLAGS " "
+register_env_var AUTOTOOLS_CPPFLAGS " "
+register_env_var AUTOTOOLS_LDFLAGS " "
+register_env_var GMP_CPPFLAGS " "
+register_env_var GMP_LDFLAGS " "
+register_env_var GNOME_CPPFLAGS " "
+register_env_var GNOME_LDFLAGS " "
+register_env_var GNUTLS_CPPFLAGS " "
+register_env_var GNUTLS_LDFLAGS " "
+register_env_var GUILE_LOAD_PATH ";"
+register_env_var GUILE_CPPFLAGS " "
+register_env_var GUILE_LDFLAGS " "
+register_env_var HH_CPPFLAGS " "
+register_env_var HH_LDFLAGS " "
+register_env_var INTLTOOL_PERL " "
+register_env_var LIBDBI_CPPFLAGS " "
+register_env_var LIBDBI_LDFLAGS " "
+register_env_var KTOBLZCHECK_CPPFLAGS " "
+register_env_var KTOBLZCHECK_LDFLAGS " "
+register_env_var PATH ":"
+register_env_var PCRE_CPPFLAGS " "
+register_env_var PCRE_LDFLAGS " "
+register_env_var PKG_CONFIG ":" ""
+register_env_var PKG_CONFIG_PATH ":"
+register_env_var READLINE_CPPFLAGS " "
+register_env_var READLINE_LDFLAGS " "
+register_env_var REGEX_CPPFLAGS " "
+register_env_var REGEX_LDFLAGS " "
+register_env_var WEBKIT_CFLAGS " "
+register_env_var WEBKIT_LIBS " "
+
+function prepare() {
+# check gnome
+
+ setup "prepare"
+ TMP_UDIR=`unix_path $TMP_DIR`
+ DOWNLOAD_UDIR=`unix_path $DOWNLOAD_DIR`
+ _GLOBAL_UDIR=`unix_path $GLOBAL_DIR`
+ _MINGW_UDIR=`unix_path $MINGW_DIR`
+ add_to_env $_MINGW_UDIR/bin PATH
+ mkdir -p $TMP_UDIR
+ if [ "$CROSS_COMPILE" != "yes" ]; then
+ die "Cross Compile needed"
+ fi
+ _UNAME_O=`uname -o`
+
+ if [ "$_UNAME_O" = "Msys" ]; then
+ die "You can't build webkit on msys. Use Cygwin on Windows instead."
+ fi
+
+ if [ "$_UNAME_O" = "Cygwin" ] &&
+ [ "$_GLOBAL_UDIR/mingw" = "$_MINGW_UDIR" ] ||
+ [ "$_GLOBAL_UDIR/msys" = "$_MINGW_UDIR" ];
+ then
+ die "Please set \$MINGW_DIR other than \$GLOBAL_DIR\\\\mingw or \$GLOBAL_DIR\\\\msys on Cygwin."
+ fi
+
+ if [ -n "$CCACHE_LINK_DIR" ]; then
+ export PATH=$CCACHE_LINK_DIR:$PATH
+ fi
+}
+
+function inst_crossmingw() {
+ setup "Cross mingw"
+ _MINGW_UDIR=`unix_path $MINGW_DIR`
+ mkdir -p `unix_path $MINGW_DIR\\\\mingw32`
+ if [ -d $_MINGW_UDIR ] &&
+ quiet $_MINGW_UDIR/bin/mingw32-gcc -v &&
+ quiet mingw32-gcc -v
+ then
+ echo "Cross mingw installed."
+ if [ ` mingw32-gcc -dumpversion | cut -d. -f1` -le 3 ] ;then
+ die "GCC 4.4 or higher needed"
+ fi
+ else
+ echo "Installing Cross mingw32 gcc 4.x"
+ mkdir -p $_MINGW_UDIR
+ wget_unpacked $MINGW_RT_URL $DOWNLOAD_DIR $MINGW_DIR\\mingw32
+ [ -n "$MINGW_RT_DEV_URL" ] && wget_unpacked $MINGW_RT_DEV_URL $DOWNLOAD_DIR $MINGW_DIR\\mingw32
+ wget_unpacked $W32API_URL $DOWNLOAD_DIR $MINGW_DIR\\mingw32
+ [ -n "$PTHREADS_W32_URL" ] && wget_unpacked $PTHREADS_W32_URL $DOWNLOAD_DIR $MINGW_DIR\\mingw32
+ [ -n "$PTHREADS_W32_DEV_URL" ] && wget_unpacked $PTHREADS_W32_DEV_URL $DOWNLOAD_DIR $MINGW_DIR\\mingw32
+
+ inst_crossbinutils
+ inst_crossgcc
+ fi
+}
+
+function inst_crossbinutils() {
+ _MINGW_UDIR=`unix_path $MINGW_DIR`
+ if quiet $_MINGW_UDIR/bin/mingw32-ld -v
+ then
+ echo "Cross binutils already installed."
+ else
+ wget_unpacked $CROSS_BINUTILS_SRC_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/binutils-*
+ mkdir -p $TMP_UDIR/build-binutils
+ qpushd $TMP_UDIR/build-binutils
+ $TMP_UDIR/binutils-*/configure \
+ --prefix=$_MINGW_UDIR --target=mingw32 \
+ --with-gcc --with-gnu-as --with-gnu-ld --enable-shared
+ make
+ make install
+ qpopd
+ if quiet $_MINGW_UDIR/bin/mingw32-ld -v
+ then
+ rm -rf $TMP_UDIR/binutils-* $TMP_UDIR/build-binutils
+ echo "Cross binutils installed successfully."
+ else
+ die "Cross binutils install failure"
+ fi
+ fi
+}
+
+function inst_crossgcc(){
+ _MINGW_UDIR=`unix_path $MINGW_DIR`
+ if quiet $_MINGW_UDIR/bin/mingw32-gcc
+ then
+ echo "Cross gcc alreadyinstalled."
+ else
+ mkdir -p $_MINGW_UDIR/mingw32/include
+ mkdir -p $TMP_UDIR/build-gcc
+ mkdir -p $TMP_UDIR/mydir
+ wget_unpacked $CROSS_GCC_SRC_URL $DOWNLOAD_DIR $TMP_DIR
+ wget_unpacked $CROSS_GCC_SRC2_URL $DOWNLOAD_DIR $TMP_DIR\\mydir
+ assert_one_dir $TMP_UDIR/gcc-*
+ qpushd $TMP_UDIR/gcc-*
+ dos2unix $TMP_UDIR/mydir/patches/gcc*.patch
+# FIXME: gcc-4.4.0 patch workaround
+ for i in $TMP_UDIR/mydir/patches/gcc*.patch; do
+# patch -p0 < $i
+ patch -p0 < $i || echo -n ""
+ done
+ cat >> libstdc++-v3/include/bits/c++config << EOF
+#ifndef _GLIBCXX_IMPORT
+#ifdef _GLIBCXX_DLL
+#define _GLIBCXX_IMPORT __attribute__((dllimport))
+#else
+#define _GLIBCXX_IMPORT
+#endif
+#endif
+EOF
+ qpopd
+ qpushd $TMP_UDIR/build-gcc
+ $TMP_UDIR/gcc-*/configure \
+ --prefix=$_MINGW_UDIR --target=mingw32 \
+ --with-headers=$_MINGW_UDIR/mingw32/include \
+ --enable-languages=c,c++ \
+ --with-gcc --with-gnu-ld --with-gnu-as \
+ --disable-sjlj-exceptions --enable-shared \
+ --with-dwarf2 --disable-win32-registry \
+ --enable-libstdcxx-debug --enable-version-specific-runtime-libs \
+ --enable-threads
+ make
+ make install
+ qpopd
+ if quiet $_MINGW_UDIR/bin/mingw32-gcc -v
+ then
+ rm -rf $TMP_UDIR/build-gcc $TMP_UDIR/gcc-* $TMP_UDIR/mydir
+ echo "Cross gcc installed successfully."
+ else
+ die "Cross install failure"
+ fi
+ fi
+}
+
+function inst_libxslt_gnome() {
+ setup libxslt-gnome
+ _GNOME_UDIR=`unix_path $GNOME_DIR`
+ add_to_env -I$_GNOME_UDIR/include GNOME_CPPFLAGS
+ add_to_env -L$_GNOME_UDIR/lib GNOME_LDFLAGS
+ add_to_env $_GNOME_UDIR/lib/pkgconfig PKG_CONFIG_PATH
+ if [ "$CROSS_COMPILE" != "yes" ]; then
+ add_to_env $_GNOME_UDIR//pkg-config-msys.shPKG_CONFIG
+ else
+ add_to_env pkg-config PKG_CONFIG
+ fi
+ if quiet gconftool-2 --version &&
+ quiet ${PKG_CONFIG} --exists libxslt &&
+ [ -f $_GNOME_UDIR/lib/pkgconfig/libxslt.pc ] &&
+ quiet intltoolize --version
+ then
+ echo "libxslt-gnome installed. skipping."
+ else
+ # create dummy xml2-config
+ cat > $_GNOME_UDIR/bin/xml2-config << EOF
+#!/bin/bash
+if [ "\$1" = "--version" ]; then
+ pkg-config --modversion libxml-2.0
+else
+ pkg-config \$1 libxml-2.0
+fi
+EOF
+ chmod a+x $_GNOME_UDIR/bin/xml2-config
+
+ wget_unpacked $LIBXSLT_SRC_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/libxslt-*
+ qpushd $TMP_UDIR/libxslt-*
+ ./configure ${HOST_XCOMPILE} \
+ --prefix=${_GNOME_UDIR} \
+ CPPFLAGS="$GNOME_CPPFLAGS $GNUTLS_CPPFLAGS" \
+ LDFLAGS="$GNOME_LDFLAGS $GNUTLS_LDFLAGS"
+ make
+ make install
+ qpopd
+ fi
+}
+
+function check_gnome() {
+ setup "Checking GNOME "
+ _GNOME_UDIR=`unix_path $GNOME_DIR`
+ add_to_env -I$_GNOME_UDIR/include GNOME_CPPFLAGS
+ add_to_env -L$_GNOME_UDIR/lib GNOME_LDFLAGS
+ add_to_env $_GNOME_UDIR/lib/pkgconfig PKG_CONFIG_PATH
+ if [ "$CROSS_COMPILE" != "yes" ]; then
+ add_to_env $_GNOME_UDIR/bin/pkg-config-msys.sh PKG_CONFIG
+ else
+ add_to_env pkg-config PKG_CONFIG
+ fi
+ if quiet gconftool-2 --version &&
+ quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgtkhtml-3.14 pixman-1 &&
+ [ -f $_GNOME_UDIR/lib/pkgconfig/pixman-1.pc ] &&
+ quiet intltoolize --version
+ then
+ echo "gnome packages installed."
+ else
+ die "gnome packages are not installed. Please install by install.sh"
+ fi
+}
+
+function check_gnutls() {
+ setup "Checking GNUTLS"
+ _GNUTLS_UDIR=`unix_path ${GNUTLS_DIR}`
+ add_to_env ${_GNUTLS_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
+ add_to_env "-I${_GNUTLS_UDIR}/include" GNUTLS_CPPFLAGS
+ add_to_env "-L${_GNUTLS_UDIR}/lib" GNUTLS_LDFLAGS
+ if quiet ${PKG_CONFIG} --exists gnutls &&
+ [ -f $_GNUTLS_UDIR/lib/pkgconfig/gnutls.pc ] &&
+ quiet intltoolize --version
+ then
+ echo "GNUTLS already installed."
+ else
+ die "GNUTLS packages are not installed. Please install by install.sh"
+ fi
+}
+
+function inst_enchant () {
+ setup enchant
+ _GNOME_UDIR=`unix_path $GNOME_DIR`
+ add_to_env -I$_GNOME_UDIR/include GNOME_CPPFLAGS
+ add_to_env -L$_GNOME_UDIR/lib GNOME_LDFLAGS
+ add_to_env $_GNOME_UDIR/lib/pkgconfig PKG_CONFIG_PATH
+ if [ "$CROSS_COMPILE" != "yes" ]; then
+ add_to_env $_GNOME_UDIR/bin/pkg-config-msys.sh PKG_CONFIG
+ else
+ add_to_env pkg-config PKG_CONFIG
+ fi
+ if quiet gconftool-2 --version &&
+ quiet ${PKG_CONFIG} --exists enchant &&
+ [ -f $_GNOME_UDIR/lib/pkgconfig/enchant.pc ] &&
+ quiet intltoolize --version
+ then
+ echo "enchant installed. skipping."
+ else
+ wget_unpacked $ENCHANT_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $ENCHANT_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+ fix_pkgconfigprefix $_GNOME_UDIR $_GNOME_UDIR/lib/pkgconfig/enchant.pc
+ fi
+}
+
+
+function inst_libsoup () {
+ setup libsoup
+ _GNOME_UDIR=`unix_path $GNOME_DIR`
+ add_to_env -I$_GNOME_UDIR/include GNOME_CPPFLAGS
+ add_to_env -L$_GNOME_UDIR/lib GNOME_LDFLAGS
+ add_to_env $_GNOME_UDIR/lib/pkgconfig PKG_CONFIG_PATH
+ if [ "$CROSS_COMPILE" != "yes" ]; then
+ add_to_env $_GNOME_UDIR/bin/pkg-config-msys.sh PKG_CONFIG
+ else
+ add_to_env pkg-config PKG_CONFIG
+ fi
+ if quiet gconftool-2 --version &&
+ quiet ${PKG_CONFIG} --exists libsoup-2.4 &&
+ [ -f $_GNOME_UDIR/lib/pkgconfig/libsoup-2.4.pc ] &&
+ quiet intltoolize --version
+ then
+ echo "libsoup installed. skipping."
+ else
+# wget_unpacked $LIBSOUP_URL $DOWNLOAD_DIR $GNOME_DIR
+# wget_unpacked $LIBSOUP_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+# libsoup binaries are too old so it is necessary to build new ones.
+ wget_unpacked $LIBSOUP_SRC_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/libsoup-*
+ qpushd $TMP_UDIR/libsoup-*
+ ./configure ${HOST_XCOMPILE} \
+ --prefix=${_GNOME_UDIR} \
+ --with-libxml-prefix=${_GNOME_UDIR} \
+ CPPFLAGS="$GNOME_CPPFLAGS $GNUTLS_CPPFLAGS" \
+ LDFLAGS="$GNOME_LDFLAGS $GNUTLS_LDFLAGS"
+ make
+ make install
+ qpopd
+ fi
+}
+
+function inst_webkit() {
+ setup WebKitGTK+
+ _MINGW_UDIR=`unix_path $MINGW_DIR`
+ _GNOME_UDIR=`unix_path $GNOME_DIR`
+ add_to_env -I$_GNOME_UDIR/include GNOME_CPPFLAGS
+ add_to_env -L$_GNOME_UDIR/lib GNOME_LDFLAGS
+ add_to_env $_GNOME_UDIR/lib/pkgconfig PKG_CONFIG_PATH
+ _GNUTLS_UDIR=`unix_path $GNUTLS_DIR`
+ add_to_env -I$_GNUTLS_UDIR/include GNOME_CPPFLAGS
+ add_to_env -L$_GNUTLS_UDIR/lib GNOME_LDFLAGS
+ add_to_env $_GNUTLS_UDIR/lib/pkgconfig PKG_CONFIG_PATH
+ _SQLITE3_UDIR=`unix_path $SQLITE3_DIR`
+ add_to_env -I$_SQLITE3_UDIR/include GNOME_CPPFLAGS
+ add_to_env -L$_SQLITE3_UDIR/lib GNOME_LDFLAGS
+ add_to_env $_SQLITE3_UDIR/lib/pkgconfig PKG_CONFIG_PATH
+ _ICU4C_UDIR=`unix_path $ICU4C_DIR`
+ add_to_env -I$_ICU4C_UDIR/include GNOME_CPPFLAGS
+ add_to_env -L$_ICU4C_UDIR/lib GNOME_LDFLAGS
+
+ if [ "$CROSS_COMPILE" != "yes" ]; then
+ add_to_env $_GNOME_UDIR/bin/pkg-config-msys.sh PKG_CONFIG
+ else
+ add_to_env pkg-config PKG_CONFIG
+ fi
+ if quiet gconftool-2 --version &&
+ quiet ${PKG_CONFIG} --exists webkit-1.0 &&
+ [ -f $_GNOME_UDIR/lib/pkgconfig/webkit-1.0.pc ] &&
+ quiet intltoolize --version
+ then
+ echo "WebKitGTK+ installed. skipping."
+ else
+ wget_unpacked $WEBKIT_SRC_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/webkit-*
+ qpushd $TMP_UDIR/webkit-*
+ patch -p1 < $WEBKIT_PATCH
+ patch -p1 < $WEBKIT_PATCH2
+ perl -pi.bak -e"s!/usr/bin/gcc!$_MINGW_UDIR/bin/mingw32-gcc!" \
+ WebCore/dom/make_names.pl \
+ WebCore/css/make-css-file-arrays.pl \
+ WebCore/bindings/scripts/IDLParser.pm
+ ./configure ${HOST_XCOMPILE} \
+ --prefix=${_GNOME_UDIR} \
+ --disable-silent-rules \
+ --disable-video \
+ --with-target=win32 \
+ CPPFLAGS="$GNOME_CPPFLAGS" \
+ CFLAGS="-g -O2 -std=gnu99" \
+ CXXFLAGS="-g -O2 -std=gnu++98" \
+ LDFLAGS="$GNOME_LDFLAGS"
+ make
+ make install
+ qpopd
+ rm -rf $TMP_UDIR/webkit-*
+ fi
+}
+
+function inst_sqlite3() {
+ setup sqlite3
+ _SQLITE3_UDIR=`unix_path ${SQLITE3_DIR}`
+ if [ -f ${_SQLITE3_UDIR}/bin/libsqlite3-0.dll ]
+ then
+ echo "SQLite3 already installed. Skipping."
+ else
+ wget_unpacked $SQLITE3_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/sqlite-*
+ qpushd $TMP_UDIR/sqlite-*
+ ./configure ${HOST_XCOMPILE} \
+ --prefix=${_SQLITE3_UDIR}
+ make
+ make install
+ qpopd
+ test -f ${_SQLITE3_UDIR}/bin/libsqlite3-0.dll || die "SQLite3 not installed correctly"
+ rm -rf ${TMP_UDIR}/sqlite-*
+ fi
+}
+
+function inst_icu4c() {
+ setup icu4c
+ _ICU4C_UDIR=`unix_path $ICU4C_DIR`
+ if [ -f "$_ICU4C_UDIR/bin/uconv.exe" ]
+ then
+ echo "icu4c already installed. Skipping."
+ else
+ wget_unpacked $ICU4C_SRC_URL $DOWNLOAD_DIR $TMP_DIR
+ qpushd $TMP_UDIR/icu
+ patch -p1 < $ICU4C_PATCH
+ qpopd
+ build_icu4c_native
+ inst_icu4c_mingw32
+ # cleanup
+ rm -rf $TMP_UDIR/icu*
+ fi
+}
+
+function build_icu4c_native() {
+ setup icu4c-native
+ mkdir -p $TMP_UDIR/icu-native
+ if [ -e "$TMP_UDIR/icu-native/bin/uconv.exe" ]
+ then
+ echo "native icu4c already compiled. Skipping."
+ else
+ qpushd $TMP_UDIR/icu-native
+ if uname -o |grep Linux > /dev/null 2>&1
+ then
+ $TMP_UDIR/icu/source/runConfigureICU Linux
+ elif uname -o |grep Cygwin > /dev/null 2>&1
+ then
+ $TMP_UDIR/icu/source/runConfigureICU Cygwin
+ else
+ die "Failed to execute runConfigICU. Please edit this script"
+ fi
+ make
+ make check
+ for i in $TMP_UDIR/icu-native/bin/* ; do
+ [ ! -f $i.exe ] && ln -s $i $i.exe
+ done
+ qpopd
+ echo "icu4c native compiled successfully"
+ fi
+}
+
+function inst_icu4c_mingw32() {
+ setup icu4c-mingw32
+ _ICU4C_UDIR=`unix_path $ICU4C_DIR`
+ mkdir -p $TMP_UDIR/icu-cross
+ qpushd $TMP_UDIR/icu-cross
+ $TMP_UDIR/icu/source/configure ${HOST_XCOMPILE} \
+ --prefix=$_ICU4C_UDIR \
+ --with-cross-build=$TMP_UDIR/icu-native \
+ --with-data-packaging=library
+ make \
+ CFLAGS="-g -O2 -std=gnu99" \
+ CXXFLAGS="-g -O2 -std=gnu++98"
+ make install
+ qpopd
+ if [ -f "$_ICU4C_UDIR/bin/uconv.exe" ]
+ then
+ echo "icu4c installed successfully."
+ else
+ die "icu4c installation falure"
+ fi
+}
+
+reset_steps
+add_step prepare
+add_step inst_crossmingw
+add_step prepare
+add_step check_gnome
+add_step check_gnutls
+add_step inst_libxslt_gnome
+add_step inst_enchant
+add_step inst_libsoup
+add_step inst_sqlite3
+add_step inst_icu4c
+add_step inst_webkit
+
+eval_now
+
+for step in "${steps[@]}" ; do
+ eval $step
+done
+qpopd
+
+echo -n "Build Finished at "
+date
+
diff --git a/defaults.sh b/defaults.sh
index b61d81c..0197833 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -116,6 +116,11 @@ set_default W32API_URL "$SF_MIRROR/mingw/w32api-3.13-mingw32-dev.tar.gz"
set_default MINGW_MAKE_URL "$SF_MIRROR/mingw/mingw32-make-3.81-20080326-3.tar.gz"
set_default MINGW_DIR $GLOBAL_DIR\\mingw
+set_default CROSS_GCC_SRC_URL "$SF_MIRROR/mingw/gcc-4.4.0-src.tar.bz2"
+set_default CROSS_GCC_SRC2_URL "$SF_MIRROR/mingw/gcc-4.4.0-mingw32-src-2.tar.gz"
+#set_default CROSS_GCC_SRC_URL "$SF_MIRROR/mingw/gcc-4.5.0-1-mingw32-src.tar.lzma"
+set_default CROSS_BINUTILS_SRC_URL "$SF_MIRROR/mingw/binutils-2.20.1-src.tar.gz"
+
set_default UNZIP_URL "$SF_MIRROR/gnuwin32/unzip-5.51-1.exe"
set_default UNZIP_DIR $TOOLS_DIR
@@ -139,6 +144,8 @@ set_default AUTOTOOLS_DIR $GLOBAL_DIR\\autotools
set_default GMP_URL "ftp://ftp.gnu.org/gnu/gmp/gmp-4.3.1.tar.bz2"
set_default GMP_ABI 32
set_default GMP_DIR $GLOBAL_DIR\\gmp
+set_default GMP5_BIN_URL "$SF_MIRROR/mingw/libgmp-5.0.1-1-mingw32-dll-10.tar.lzma"
+set_default GMP5_DEV_URL "$SF_MIRROR/mingw/gmp-5.0.1-1-mingw32-dev.tar.lzma"
set_default GUILE_URL "http://ftp.gnu.org/pub/gnu/guile/guile-1.6.8.tar.gz"
set_default SLIB_URL "http://swiss.csail.mit.edu/ftpdir/scm/OLD/slib3a3.zip"
@@ -158,6 +165,7 @@ set_default EXETYPE_DIR $TOOLS_DIR
set_default LIBXSLT_URL "http://xmlsoft.org/sources/win32/libxslt-1.1.26.win32.zip"
set_default LIBXSLT_LIBXML2_URL "http://xmlsoft.org/sources/win32/libxml2-2.7.6.win32.zip"
+set_default LIBXSLT_SRC_URL "http://xmlsoft.org/sources/libxslt-1.1.26.tar.gz"
set_default LIBXSLT_DIR $GLOBAL_DIR\\libxslt
set_default LIBXML2_URL "$GNOME_WIN32_DEPS_URL/libxml2_2.7.4-1_win32.zip"
@@ -252,6 +260,18 @@ set_default HH_DIR $GLOBAL_DIR\\hh
set_default WEBKIT_URL "$SF_MIRROR/gnucash/webkit-1.1.90-win32.zip"
set_default WEBKIT_DIR $GLOBAL_DIR\\webkit-1.1.90
+set_default WEBKIT_SRC_URL "http://www.webkitgtk.org/webkit-1.1.90.tar.gz"
+set_default WEBKIT_PATCH `pwd`/webkit-1.2.0-time.diff
+set_default WEBKIT_PATCH2 `pwd`/webkit-1.2.0-vsaprintf.diff
+set_default ENCHANT_URL "$GNOME_WIN32_URL/dependencies/enchant_1.5.0-2_win32.zip"
+set_default ENCHANT_DEV_URL "$GNOME_WIN32_URL/dependencies/enchant-dev_1.5.0-2_win32.zip"
+#set_default LIBSOUP_URL "$GNOME_WIN32_URL/libsoup/2.4/libsoup-2.4.0.zip"
+#set_default LIBSOUP_DEV_URL "$GNOME_WIN32_URL/libsoup/2.4/libsoup-dev-2.4.0.zip"
+set_default LIBSOUP_SRC_URL "$GNOME_MIRROR/sources/libsoup/2.30/libsoup-2.30.1.tar.bz2"
+set_default ICU4C_URL "http://download.icu-project.org/files/icu4c/4.4.1/icu4c-4_4_1-Win32-msvc9.zip"
+set_default ICU4C_SRC_URL "http://download.icu-project.org/files/icu4c/4.4.1/icu4c-4_4_1-src.tgz"
+set_default ICU4C_DIR $GLOBAL_DIR\\icu-mingw32
+set_default ICU4C_PATCH `pwd`/icu-crossmingw.patch
set_default SVN_URL "http://subversion.tigris.org/files/documents/15/35379/svn-1.4.2-setup.exe"
set_default SVN_DIR $GLOBAL_DIR\\svn
@@ -289,6 +309,7 @@ set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
set_default AQBANKING_WITH_QT yes
# 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 QT_WIN_SRC_URL "ftp://ftp.qt.nokia.com/qt/source/qt-all-opensource-src-4.5.3.zip"
set_default SQLITE3_URL "http://sqlite.org/sqlite-amalgamation-3.6.1.tar.gz"
set_default SQLITE3_DIR $GLOBAL_DIR\\sqlite3
diff --git a/functions.sh b/functions.sh
index 5598abf..d0c6ab7 100644
--- a/functions.sh
+++ b/functions.sh
@@ -81,7 +81,7 @@ function wget_unpacked() {
unzip -q -o $LAST_FILE -d $_EXTRACT_UDIR
_PACK_DIR=$(zipinfo -1 $LAST_FILE '*/*' 2>/dev/null | head -1)
;;
- *.tar.gz)
+ *.tar.gz|*.tgz)
tar -xzpf $LAST_FILE -C $_EXTRACT_UDIR
_PACK_DIR=$(tar -ztf $LAST_FILE 2>/dev/null | head -1)
;;
@@ -89,6 +89,10 @@ function wget_unpacked() {
tar -xjpf $LAST_FILE -C $_EXTRACT_UDIR
_PACK_DIR=$(tar -jtf $LAST_FILE 2>/dev/null | head -1)
;;
+ *.tar.lzma)
+ lzma -dc $LAST_FILE |tar xpf - -C $_EXTRACT_UDIR
+ _PACK_DIR=$(lzma -dc $LAST_FILE |tar -tf - 2>/dev/null | head -1)
+ ;;
*)
die "Cannot unpack file $LAST_FILE!"
;;
@@ -180,6 +184,17 @@ function assert_one_dir() {
quiet [ -d "$@" ] || die "Detected multiple directories where only one was expected; please delete all but the latest one: $@"
}
+function fix_pkgconfigprefix() {
+ _PREFIX=$1
+ shift
+ perl -pi.bak -e"s!^prefix=.*\$!prefix=$_PREFIX!" $@
+ qpopd
+}
+
+function dos2unix() {
+ perl -pi.bak -e"s!\\r\\n\$!\\n!" $@
+}
+
### Local Variables: ***
### mode: shell-script ***
### sh-basic-offset: 4 ***
diff --git a/icu-crossmingw.patch b/icu-crossmingw.patch
new file mode 100644
index 0000000..0fd4f24
--- /dev/null
+++ b/icu-crossmingw.patch
@@ -0,0 +1,13 @@
+--- icu.orig/source/config/mh-mingw 2010-04-29 00:27:52.000000000 +0900
++++ icu/source/config/mh-mingw 2010-05-02 16:18:18.821561705 +0900
+@@ -71,8 +71,8 @@
+
+ # The #M# is used to delete lines for icu-config
+ # Current full path directory.
+-#CURR_FULL_DIR=$(shell pwd -W)#M# for MSYS
+-CURR_FULL_DIR=$(subst \,/,$(shell cmd /c cd))#M# for Cygwin shell
++CURR_FULL_DIR=$(shell pwd)#M# for MSYS
++#CURR_FULL_DIR=$(subst \,/,$(shell cmd /c cd))#M# for Cygwin shell
+ # Current full path directory for use in source code in a -D compiler option.
+ #CURR_SRCCODE_FULL_DIR=$(subst /,\\\\,$(shell pwd -W))#M# for MSYS
+ CURR_SRCCODE_FULL_DIR=$(subst \,/,$(shell cmd /c cd))#M# for Cygwin shell
commit 9b6b4cd7017bfe9dc4d7b5f1ded4aac01927f799
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon May 3 20:15:08 2010 +0000
Remove forgotten debug statement
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19096 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index 68aef44..bb969b7 100644
--- a/install.sh
+++ b/install.sh
@@ -1316,7 +1316,6 @@ function inst_webkit() {
echo "webkit already installed. skipping."
else
wget_unpacked $WEBKIT_URL $DOWNLOAD_DIR $WEBKIT_DIR
-ls $WEBKIT_DIR
quiet ${LD} ${WEBKIT_LIBS} -o $TMP_UDIR/ofile || die "webkit not installed correctly"
fi
}
commit 2297d67f141cbf36479e6635884b2e2a1ef5af0b
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon May 3 20:07:49 2010 +0000
Add ./ to sourced files, so that they are found when cross-compiling.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19095 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index bef9d27..b61d81c 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -34,7 +34,7 @@
[ "$__SOURCED_DEFAULTS" ] && return
__SOURCED_DEFAULTS=1
-[ -f "custom.sh" ] && . custom.sh || true
+[ -f "./custom.sh" ] && . ./custom.sh || true
set_default GLOBAL_DIR c:\\soft
set_default TMP_DIR $GLOBAL_DIR\\tmp
diff --git a/install.sh b/install.sh
index 37683f6..68aef44 100644
--- a/install.sh
+++ b/install.sh
@@ -12,8 +12,8 @@ function qpopd() { popd >/dev/null; }
function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
qpushd "$(dirname $(unix_path "$0"))"
-. functions.sh
-. defaults.sh
+. ./functions.sh
+. ./defaults.sh
register_env_var ACLOCAL_FLAGS " "
register_env_var AUTOTOOLS_CPPFLAGS " "
commit 1533d558db5f3183f6fa53ba068f1229a0aaf1bd
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon May 3 19:50:12 2010 +0000
Add (optional) destination file name parameter to wget_unpacked and smart_wget functions.
This parameter can be used to override the filename to be used for the downloaded package. If empty, the functions continue to work as before.
This new option will be used for cross compilation.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19094 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/functions.sh b/functions.sh
index e78d9ca..5598abf 100644
--- a/functions.sh
+++ b/functions.sh
@@ -47,11 +47,11 @@ function wpwd() {
qpopd
}
-# usage: smart_wget URL DESTDIR
+# usage: smart_wget URL DESTDIR [DESTFILE]
function smart_wget() {
_FILE=`basename $1`
# Remove url garbage from filename that would not be removed by wget
- _UFILE=${_FILE##*=}
+ _UFILE=${3:-${_FILE##*=}}
_DLD=`unix_path $2`
# If the file already exists in the download directory ($2)
@@ -70,9 +70,9 @@ function smart_wget() {
LAST_FILE=$_DLD/$_UFILE
}
-# usage: wget_unpacked URL DOWNLOAD_DIR UNPACK_DIR
+# usage: wget_unpacked URL DOWNLOAD_DIR UNPACK_DIR [DESTFILE]
function wget_unpacked() {
- smart_wget $1 $2
+ smart_wget $1 $2 $4
_EXTRACT_UDIR=`unix_path $3`
_EXTRACT_SUBDIR=
echo -n "Extracting $_UFILE ... "
commit 4a8d301f7986f5a77477a1bdcddd72465397d21d
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sun May 2 23:18:04 2010 +0000
Windows build script improvements
- make sure pexports is available before guile is built
- test for pexports availability when compiling libdbi (to fix crosscompilation)
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19093 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 374a540..bef9d27 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -332,6 +332,7 @@ add_step inst_regex
add_step inst_readline
if [ "$CROSS_COMPILE" != "yes" ]; then
add_step inst_active_perl
+ add_step inst_mingwutils
fi
add_step inst_autotools
if [ "$AQBANKING3" = "yes" ]; then
@@ -340,7 +341,6 @@ fi
add_step inst_guile
if [ "$CROSS_COMPILE" != "yes" ]; then
add_step inst_svn
- add_step inst_mingwutils
if [ "$AQBANKING3" != "yes" ]; then
add_step inst_openssl
fi
diff --git a/install.sh b/install.sh
index 060a535..37683f6 100644
--- a/install.sh
+++ b/install.sh
@@ -1209,8 +1209,11 @@ function inst_libdbi() {
make install
qpopd
qpushd ${_LIBDBI_UDIR}
+ if [ x"$(which pexports.exe > /dev/null 2>&1)" != x ]
+ then
pexports bin/libdbi-0.dll > lib/libdbi.def
${DLLTOOL} -d lib/libdbi.def -D bin/libdbi-0.dll -l lib/libdbi.lib
+ fi
qpopd
test -f ${_LIBDBI_UDIR}/bin/libdbi-0.dll || die "libdbi not installed correctly"
rm -rf ${TMP_UDIR}/libdbi-0*
commit 12fbfe6cd5c1dde64485bb1b77c522cd08551d56
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed Apr 28 13:54:45 2010 +0000
Bug #617072 - Update create_cross_mingw.sh, patch by Yasuaki Taniguchi
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19082 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/create_cross_mingw.sh b/create_cross_mingw.sh
index 2a86afe..ecfa971 100755
--- a/create_cross_mingw.sh
+++ b/create_cross_mingw.sh
@@ -54,7 +54,7 @@ qpushd "$(dirname "$0")"
# What flavor of GCC cross-compiler are we building?
-TARGET=mingw32
+TARGET=${TARGET:-mingw32}
# What directory will the cross-compiler be built in?
# This is the directory into which source archives will
@@ -70,13 +70,14 @@ BUILDDIR=`unix_path $TMP_DIR`
# that only root has write access to, you will need to run this
# script as root.
-PREFIX=`unix_path $MINGW_DIR`
+_PREFIX=`unix_path $MINGW_DIR`
+PREFIX=${PREFIX:-$_PREFIX}
# Purge anything and everything already in the $PREFIX
#(also known as the destination or installation) directory?
# Set to "Y" to purge, any other value omits the purge step.
-PURGE_DIR="Y"
+PURGE_DIR=${PURGE_DIR:-N}
# Set the following to the files from the current MinGW release
@@ -89,20 +90,21 @@ MINGW_URL="http://heanet.dl.sourceforge.net/sourceforge/mingw"
# GCC_CORE is required; the other components are optional.
# Set any you don't want to "". You need binutils,
# mingw runtime and w32api; do not ever set those to "".
-
-GCC_CORE_ARCHIVE="gcc-core-3.4.5-20060117-1-src.tar.gz"
-GCC_GPP_ARCHIVE="gcc-g++-3.4.5-20060117-1-src.tar.gz"
+# gcc 3.4.5-20060117-3 is the same source of 3.4.5-20060117-2
+# see release notes
+GCC_CORE_ARCHIVE="gcc-core-3.4.5-20060117-2-src.tar.gz"
+GCC_GPP_ARCHIVE="gcc-g++-3.4.5-20060117-2-src.tar.gz"
GCC_G77_ARCHIVE="" #gcc-g77-3.4.5-20060117-1-src.tar.gz"
GCC_OBJC_ARCHIVE="" #gcc-objc-3.4.5-20060117-1-src.tar.gz"
GCC_JAVA_ARCHIVE="" #gcc-java-3.4.5-20060117-1-src.tar.gz"
GCC_ADA_ARCHIVE=""
GCC_PATCH=""
-BINUTILS_ARCHIVE="binutils-2.16.91-20060119-1-src.tar.gz"
+BINUTILS_ARCHIVE="binutils-2.20.1-src.tar.gz"
-MINGW_ARCHIVE="mingw-runtime-3.9.tar.gz"
+MINGW_ARCHIVE="mingwrt-3.15.1-mingw32.tar.gz"
-W32API_ARCHIVE="w32api-3.6.tar.gz"
+W32API_ARCHIVE="w32api-3.13-mingw32-dev.tar.gz"
# These are the files from the SDL website
commit bc8a781b1aedffca54457afcb9fe7c0ab0d08d37
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Apr 27 12:12:21 2010 +0000
Bug #615317 - Windows installer requires Qt libraries
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19075 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/dist.sh b/dist.sh
index 30859c3..085caa2 100755
--- a/dist.sh
+++ b/dist.sh
@@ -21,6 +21,10 @@ function prepare() {
if [ -x $DIST_DIR ]; then
die "Please remove ${DIST_DIR} first"
fi
+ if [ x$AQBANKING_WITH_QT != xyes ]; then
+ die "The aqbanking wizard is required to create the Windows installer.
+Please set AQBANKING_WITH_QT to yes and rerun install.sh first."
+ fi
_UNZIP_UDIR=`unix_path $UNZIP_DIR`
_AUTOTOOLS_UDIR=`unix_path $AUTOTOOLS_DIR`
_GUILE_UDIR=`unix_path $GUILE_DIR`
commit 8e5606c21db309e5c606a729288ad408b3ba27ea
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Apr 27 11:04:06 2010 +0000
Add missing libmysql.def to tarball
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19074 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/Makefile.am b/Makefile.am
index e836aad..eeb7934 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,6 +8,7 @@ EXTRA_DIST = \
gwenhywfar-3.6.0-patch.diff \
install.sh \
install-fq-mods.cmd \
+ libmysql.def \
libofx-0.8.3-patch.diff \
opensp-1.5.2-patch.diff \
pi.sh \
commit 476355abf282affa91c6e048e64eb74233c288f3
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat Apr 24 16:26:06 2010 +0000
Enable environment file on Windows (only direct install, not via ISS installer)
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19071 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index c0e6dc4..060a535 100644
--- a/install.sh
+++ b/install.sh
@@ -1363,7 +1363,7 @@ function inst_gnucash() {
--enable-debug \
--enable-schemas-install=no \
--enable-dbi \
- --with-dbi-dbd-dir=${_LIBDBI_DRIVERS_UDIR}/lib/dbd \
+ --with-dbi-dbd-dir=$( echo ${_LIBDBI_DRIVERS_UDIR} | sed 's,^/\([A-Za-z]\)/,\1:/,g' )/lib/dbd \
${LIBOFX_OPTIONS} \
${AQBANKING_OPTIONS} \
--enable-binreloc \
@@ -1409,16 +1409,6 @@ function make_install() {
[ "$param" = "skip_schemas" ] && _skip_schemas=1
done
- if [ -z $_skip_scripts ]; then
- # Try to fix the paths in the environment config file
- qpushd $_BUILD_UDIR/src/bin
- rm environment
- make \
- bindir="${_INSTALL_UDIR}/bin;${_INSTALL_UDIR}/lib;${_INSTALL_UDIR}/lib/gnucash;${_GNUTLS_UDIR}/bin;${_GMP_UDIR}/bin;${_GOFFICE_UDIR}/bin;${_LIBGSF_UDIR}/bin;${_PCRE_UDIR}/bin;${_GNOME_UDIR}/bin;${_GUILE_UDIR}/bin;${_WEBKIT_UDIR}/bin;${_REGEX_UDIR}/bin;${_AUTOTOOLS_UDIR}/bin;${AQBANKING_UPATH};${_LIBOFX_UDIR}/bin;${_OPENSP_UDIR}/bin;${_LIBDBI_UDIR}/bin;${_SQLITE3_UDIR}/bin;${MYSQL_LIB_DIR}/lib;${PGSQL_DIR}/lib;${PGSQL_DIR}/bin" \
- environment
- qpopd
- fi
-
make install
qpushd $_INSTALL_UDIR/lib
@@ -1452,16 +1442,35 @@ function make_install() {
# the equivalent sections in packaging/win32/gnucash.iss.in, and
# src/bin/environment*.in
qpushd $_INSTALL_UDIR/bin
- echo "setlocal" > gnucash.cmd
- echo "set PATH=${INSTALL_DIR}\\bin;${INSTALL_DIR}\\lib;${INSTALL_DIR}\\lib\\gnucash;${GNUTLS_DIR}\\bin;${GMP_DIR}\\bin;${GOFFICE_DIR}\\bin;${LIBGSF_DIR}\\bin;${PCRE_DIR}\\bin;${WEBKIT_DIR}\\bin;${GNOME_DIR}\\bin;${GUILE_DIR}\\bin;${REGEX_DIR}\\bin;${AUTOTOOLS_DIR}\\bin;${AQBANKING_PATH};${LIBOFX_DIR}\\bin;${OPENSP_DIR}\\bin;${LIBDBI_DIR}\\bin;${SQLITE3_DIR}\\bin;${MYSQL_LIB_DIR}\\lib;${PGSQL_DIR}\\lib;${PGSQL_DIR}\\bin;%PATH%" >> gnucash.cmd
- echo "set GUILE_WARN_DEPRECATED=no" >> gnucash.cmd
- echo "set GNC_MODULE_PATH=${INSTALL_DIR}\\lib\\gnucash" >> gnucash.cmd
- echo "set GUILE_LOAD_PATH=${INSTALL_DIR}\\share\\gnucash\\guile-modules;${INSTALL_DIR}\\share\\gnucash\\scm;%GUILE_LOAD_PATH%" >> gnucash.cmd
- echo "set LTDL_LIBRARY_PATH=${INSTALL_DIR}\\lib" >> gnucash.cmd
- echo "set GNC_DBD_DIR=${LIBDBI_DRIVERS_DIR}\\lib\\dbd" >> gnucash.cmd
- echo "set GNC_STANDARD_REPORTS_DIR=${INSTALL_DIR}\\share\\gnucash\\guile-modules\\gnucash\\report\\standard-reports" >> gnucash.cmd
- echo "set SCHEME_LIBRARY_PATH=" >> gnucash.cmd
- echo "start gnucash-bin %*" >> gnucash.cmd
+ cat > gnucash.cmd <<EOF
+ at echo off
+setlocal
+set PATH=$INSTALL_DIR\\bin;%PATH%
+set PATH=$INSTALL_DIR\\lib;%PATH%
+set PATH=$INSTALL_DIR\\lib\\gnucash;%PATH%
+set PATH=$GNUTLS_DIR\\bin;%PATH%
+set PATH=$GMP_DIR\\bin;%PATH%
+set PATH=$GOFFICE_DIR\\bin;%PATH%
+set PATH=$LIBGSF_DIR\\bin;%PATH%
+set PATH=$PCRE_DIR\\bin;%PATH%
+set PATH=$GNOME_DIR\\bin;%PATH%
+set PATH=$GUILE_DIR\\bin;%PATH%
+set PATH=$WEBKIT_DIR\\bin;%PATH%
+set PATH=$REGEX_DIR\\bin;%PATH%
+set PATH=$AUTOTOOLS_DIR\\bin;%PATH%
+set PATH=$AQBANKING_PATH;%PATH%
+set PATH=$LIBOFX_DIR\\bin;%PATH%
+set PATH=$OPENSP_DIR\\bin;%PATH%
+set PATH=$LIBDBI_DIR\\bin;%PATH%
+set PATH=$SQLITE3_DIR\\bin;%PATH%
+set PATH=$MYSQL_LIB_DIR\\lib;%PATH%
+set PATH=$PGSQL_DIR\\bin;%PATH%
+set PATH=$PGSQL_DIR\\lib;%PATH%
+
+set LTDL_LIBRARY_PATH=${INSTALL_DIR}\\lib
+
+start gnucash-bin %*
+EOF
qpopd
fi
}
commit b37af842ae32d3a7501d174fb74bfde7ff2c6671
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri Apr 23 12:13:39 2010 +0000
Replace directory mv's with cp -r when the move potentially crosses filesystem borders.
Apparently, Msys' mv command fails to move directories across filesystem borders (like
from a directory on the c drive to a mounted samba share).
I hit this issue because my tmp dir is on a different filesystem from
my base dir.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19053 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index b418b62..c0e6dc4 100644
--- a/install.sh
+++ b/install.sh
@@ -1171,19 +1171,21 @@ function inst_libdbi() {
mkdir -p $_MYSQL_LIB_UDIR
assert_one_dir $TMP_UDIR/mysql*
cp -r $TMP_UDIR/mysql*/* $_MYSQL_LIB_UDIR
- mv $TMP_UDIR/mysql*/include $_MYSQL_LIB_UDIR/include/mysql
- cd $_MYSQL_LIB_UDIR/lib
- ${DLLTOOL} --input-def $LIBMYSQL_DEF --dllname libmysql.dll --output-lib libmysqlclient.a -k
+ cp -r $TMP_UDIR/mysql*/include $_MYSQL_LIB_UDIR/include/mysql
+ rm -rf ${TMP_UDIR}/mysql*
+ qpushd $_MYSQL_LIB_UDIR/lib
+ ${DLLTOOL} --input-def $LIBMYSQL_DEF --dllname libmysql.dll --output-lib libmysqlclient.a -k
test -f ${_MYSQL_LIB_UDIR}/lib/libmysql.dll || die "mysql not installed correctly - libmysql.dll"
test -f ${_MYSQL_LIB_UDIR}/lib/libmysqlclient.a || die "mysql not installed correctly - libmysqlclient.a"
- rm -rf ${TMP_UDIR}/mysql*
+ qpopd
fi
if test -f ${_PGSQL_UDIR}/lib/libpq.dll
then
echo "PGSQL library already installed. skipping."
else
wget_unpacked $PGSQL_LIB_URL $DOWNLOAD_DIR $TMP_DIR
- mv $TMP_UDIR/pgsql* $PGSQL_DIR
+ cp -r $TMP_UDIR/pgsql* $_PGSQL_UDIR
+ rm -rf ${TMP_UDIR}/pgsql*
test -f ${_PGSQL_UDIR}/lib/libpq.dll || die "libpq not installed correctly"
fi
if test -f ${_LIBDBI_UDIR}/bin/libdbi-0.dll
commit 37fda130c249f65add75c952dcd10d64f2ee3ed4
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu Apr 22 09:25:51 2010 +0000
* Make sure wget downloads are stored with filenames not containing any html garbage (& and = signs as a result of http_get parameters).
* Have wget_unpacked return the actual path where the files were unpacked via the _EXTRACT_UDIR env variable. In most cases this is simply the path that was requested, but sometimes, a tarball or zip file adds its own relative path. The _EXTRACT_UDIR variable will take this into account by analysing the contents of the tarball/zip file.
These changes will be used in the revived cross-compile script.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19048 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/functions.sh b/functions.sh
index 7a04580..e78d9ca 100644
--- a/functions.sh
+++ b/functions.sh
@@ -50,35 +50,59 @@ function wpwd() {
# usage: smart_wget URL DESTDIR
function smart_wget() {
_FILE=`basename $1`
+ # Remove url garbage from filename that would not be removed by wget
+ _UFILE=${_FILE##*=}
_DLD=`unix_path $2`
# If the file already exists in the download directory ($2)
# then don't do anything. But if it does NOT exist then
# download the file to the tmpdir and then when that completes
# move it to the dest dir.
- if [ ! -f $_DLD/$_FILE ] ; then
+ if [ ! -f $_DLD/$_UFILE ] ; then
# If WGET_RATE is set (in bytes/sec), limit download bandwith
if [ ! -z "$WGET_RATE" ] ; then
wget --passive-ftp -c $1 -P $TMP_UDIR --limit-rate=$WGET_RATE
else
wget --passive-ftp -c $1 -P $TMP_UDIR
fi
- mv $TMP_UDIR/$_FILE $_DLD
+ mv $TMP_UDIR/$_FILE $_DLD/$_UFILE
fi
- LAST_FILE=$_DLD/$_FILE
+ LAST_FILE=$_DLD/$_UFILE
}
# usage: wget_unpacked URL DOWNLOAD_DIR UNPACK_DIR
function wget_unpacked() {
smart_wget $1 $2
- _UPD=`unix_path $3`
- echo -n "Extracting ${LAST_FILE##*/} ... "
+ _EXTRACT_UDIR=`unix_path $3`
+ _EXTRACT_SUBDIR=
+ echo -n "Extracting $_UFILE ... "
case $LAST_FILE in
- *.zip) unzip -q -o $LAST_FILE -d $_UPD;;
- *.tar.gz) tar -xzpf $LAST_FILE -C $_UPD;;
- *.tar.bz2) tar -xjpf $LAST_FILE -C $_UPD;;
- *) die "Cannot unpack file $LAST_FILE!";;
+ *.zip)
+ unzip -q -o $LAST_FILE -d $_EXTRACT_UDIR
+ _PACK_DIR=$(zipinfo -1 $LAST_FILE '*/*' 2>/dev/null | head -1)
+ ;;
+ *.tar.gz)
+ tar -xzpf $LAST_FILE -C $_EXTRACT_UDIR
+ _PACK_DIR=$(tar -ztf $LAST_FILE 2>/dev/null | head -1)
+ ;;
+ *.tar.bz2)
+ tar -xjpf $LAST_FILE -C $_EXTRACT_UDIR
+ _PACK_DIR=$(tar -jtf $LAST_FILE 2>/dev/null | head -1)
+ ;;
+ *)
+ die "Cannot unpack file $LAST_FILE!"
+ ;;
esac
+
+ # Get the path where the files were actually unpacked
+ # This can be a subdirectory of the requested directory, if the
+ # tarball or zipfile contained a relative path.
+ _PACK_DIR=$(echo "$_PACK_DIR" | sed 's,^\([^/]*\).*,\1,')
+ if (( ${#_PACK_DIR} > 3 )) # Skip the bin and lib directories from the test
+ then
+ _EXTRACT_SUBDIR=$(echo $_UFILE | sed "s,^\($_PACK_DIR\).*,/\1,;t;d")
+ fi
+ _EXTRACT_UDIR="$_EXTRACT_UDIR$_EXTRACT_SUBDIR"
echo "done"
}
commit 1015fffda72970e11324550994b4205578618e7b
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Apr 20 17:13:41 2010 +0000
Move one more MSVC-only line inside the MSVC test
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19044 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index 53b800a..b418b62 100644
--- a/install.sh
+++ b/install.sh
@@ -397,8 +397,8 @@ EOF
if [ x"$(which pexports.exe > /dev/null 2>&1)" != x ]
then
pexports $_GUILE_UDIR/bin/libguile.dll > $_GUILE_UDIR/lib/libguile.def
+ ${DLLTOOL} -d $_GUILE_UDIR/lib/libguile.def -D $_GUILE_UDIR/bin/libguile.dll -l $_GUILE_UDIR/lib/libguile.lib
fi
- ${DLLTOOL} -d $_GUILE_UDIR/lib/libguile.def -D $_GUILE_UDIR/bin/libguile.dll -l $_GUILE_UDIR/lib/libguile.lib
# Also, for MSVC compiler we need to slightly modify the gc.h header
GC_H=$_GUILE_UDIR/include/libguile/gc.h
grep -v 'extern .*_freelist2;' ${GC_H} > ${GC_H}.tmp
commit fb5aa9f6c9390ab8ec0961a2f8a1d18eeb2804ed
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Apr 20 14:54:58 2010 +0000
pexports is only available if MSVC is installed. Encapsulate it in a conditional.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19042 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index f3dedf2..53b800a 100644
--- a/install.sh
+++ b/install.sh
@@ -394,7 +394,10 @@ function inst_guile() {
#endif
EOF
# Also, for MSVC compiler we need to create an import library
- pexports $_GUILE_UDIR/bin/libguile.dll > $_GUILE_UDIR/lib/libguile.def
+ if [ x"$(which pexports.exe > /dev/null 2>&1)" != x ]
+ then
+ pexports $_GUILE_UDIR/bin/libguile.dll > $_GUILE_UDIR/lib/libguile.def
+ fi
${DLLTOOL} -d $_GUILE_UDIR/lib/libguile.def -D $_GUILE_UDIR/bin/libguile.dll -l $_GUILE_UDIR/lib/libguile.lib
# Also, for MSVC compiler we need to slightly modify the gc.h header
GC_H=$_GUILE_UDIR/include/libguile/gc.h
commit 92e3dd5203f14f4330d10992d799a5a8c13aa4e6
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Apr 19 17:41:28 2010 +0000
Allow QTDIR to be defined either in pure windows format (c:\xyz\def) or unix format (/c/xyz/def) without ISS bailing out.
Previously, only unix format worked.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19039 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/dist.sh b/dist.sh
index b1e3eb9..30859c3 100755
--- a/dist.sh
+++ b/dist.sh
@@ -235,7 +235,7 @@ function dist_gnucash() {
cp -a $_INSTALL_UDIR/share/{gnucash,locale,xml} $DIST_UDIR/share
cp -a $_REPOS_UDIR/packaging/win32/install-fq-mods.cmd $DIST_UDIR/bin
- _QTDIR_WIN=`echo $QTDIR | sed 's,^/\([A-Za-z]\)/,\1:/,g' `
+ _QTDIR_WIN=$(unix_path $QTDIR | sed 's,^/\([A-Za-z]\)/,\1:/,g' )
_AQBANKING_SO_EFFECTIVE=$(awk '/AQBANKING_SO_EFFECTIVE / { print $3 }' ${_AQBANKING_UDIR}/include/aqbanking/version.h )
_GWENHYWFAR_SO_EFFECTIVE=$(awk '/GWENHYWFAR_SO_EFFECTIVE / { print $3 }' ${_GWENHYWFAR_UDIR}/include/gwenhywfar3/gwenhywfar/version.h )
sed < $_BUILD_UDIR/packaging/win32/gnucash.iss \
commit bb35094ae09f0f9f46a6a08483204401e66f6131
Author: Christian Stimming <stimming at tuhh.de>
Date: Sat Apr 10 19:33:25 2010 +0000
Win32: Add mingw cutecash build to the install.sh script, enabled by WITH_CUTECASH=yes.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19012 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index e247eb6..374a540 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -71,6 +71,7 @@ else
fi
set_default WITH_CUTECASH no
+set_default CUTECASH_BUILD_DIR $GNUCASH_DIR\\build-cutecash
####
@@ -373,6 +374,7 @@ if [ "$UPDATE_SOURCES" = "yes" ]; then
fi
if [ "$WITH_CUTECASH" = "yes" ]; then
add_step inst_cmake
+ add_step inst_cutecash
fi
add_step inst_gnucash
add_step inst_docs
diff --git a/install.sh b/install.sh
index 0f19e0a..f3dedf2 100644
--- a/install.sh
+++ b/install.sh
@@ -1170,7 +1170,7 @@ function inst_libdbi() {
cp -r $TMP_UDIR/mysql*/* $_MYSQL_LIB_UDIR
mv $TMP_UDIR/mysql*/include $_MYSQL_LIB_UDIR/include/mysql
cd $_MYSQL_LIB_UDIR/lib
- dlltool --input-def $LIBMYSQL_DEF --dllname libmysql.dll --output-lib libmysqlclient.a -k
+ ${DLLTOOL} --input-def $LIBMYSQL_DEF --dllname libmysql.dll --output-lib libmysqlclient.a -k
test -f ${_MYSQL_LIB_UDIR}/lib/libmysql.dll || die "mysql not installed correctly - libmysql.dll"
test -f ${_MYSQL_LIB_UDIR}/lib/libmysqlclient.a || die "mysql not installed correctly - libmysqlclient.a"
rm -rf ${TMP_UDIR}/mysql*
@@ -1205,7 +1205,7 @@ function inst_libdbi() {
qpopd
qpushd ${_LIBDBI_UDIR}
pexports bin/libdbi-0.dll > lib/libdbi.def
- dlltool -d lib/libdbi.def -D bin/libdbi-0.dll -l lib/libdbi.lib
+ ${DLLTOOL} -d lib/libdbi.def -D bin/libdbi-0.dll -l lib/libdbi.lib
qpopd
test -f ${_LIBDBI_UDIR}/bin/libdbi-0.dll || die "libdbi not installed correctly"
rm -rf ${TMP_UDIR}/libdbi-0*
@@ -1266,6 +1266,36 @@ function inst_cmake() {
fi
}
+function inst_cutecash() {
+ setup Cutecash
+ _BUILD_UDIR=`unix_path $CUTECASH_BUILD_DIR`
+ _REPOS_UDIR=`unix_path $REPOS_DIR`
+ mkdir -p $_BUILD_UDIR
+
+ qpushd $_BUILD_UDIR
+ cmake ${_REPOS_UDIR} \
+ -G"MSYS Makefiles" \
+ -DREGEX_INCLUDE_PATH=${_REGEX_UDIR}/include \
+ -DREGEX_LIBRARY=${_REGEX_UDIR}/lib/libregex.a \
+ -DGUILE_INCLUDE_DIR=${_GUILE_UDIR}/include \
+ -DGUILE_LIBRARY=${_GUILE_UDIR}/bin/libguile.dll \
+ -DLIBINTL_INCLUDE_PATH=${_GNOME_UDIR}/include \
+ -DLIBINTL_LIBRARY=${_GNOME_UDIR}/bin/intl.dll \
+ -DLIBXML2_INCLUDE_DIR=${_GNOME_UDIR}/include/libxml2 \
+ -DLIBXML2_LIBRARIES=${_GNOME_UDIR}/bin/libxml2-2.dll \
+ -DPKG_CONFIG_EXECUTABLE=${_GNOME_UDIR}/bin/pkg-config \
+ -DZLIB_INCLUDE_DIR=${_GNOME_UDIR}/include \
+ -DZLIB_LIBRARY=${_GNOME_UDIR}/bin/zlib1.dll \
+ -DSWIG_EXECUTABLE=${_SWIG_UDIR}/swig.exe \
+ -DHTMLHELP_INCLUDE_PATH=${_HH_UDIR}/include \
+ -DWITH_SQL=ON \
+ -DLIBDBI_INCLUDE_PATH=${_LIBDBI_UDIR}/include \
+ -DLIBDBI_LIBRARY=${_LIBDBI_UDIR}/lib/libdbi.dll.a \
+ -DCMAKE_BUILD_TYPE=Debug
+ make
+ qpopd
+}
+
function inst_webkit() {
setup WebKit
_WEBKIT_UDIR=`unix_path ${WEBKIT_DIR}`
commit b7f7012e9f21603563ee06fcfc1f0fcb3e777f26
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat Apr 10 09:01:16 2010 +0000
Add note about required Qt for dist.sh + some typo fixes
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19009 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/README b/README
index 57c08e4..4140bef 100644
--- a/README
+++ b/README
@@ -16,7 +16,7 @@ Note: The mingw homepage is http://www.mingw.org. You can read more
https://sourceforge.net/projects/mingw/files/MSYS%20Base%20System/msys-1.0.11/MSYS-1.0.11.exe/download
to $DOWNLOAD_DIR
Note: there may be a more recent version available when you read this, use
- whatever verion that is available. BUT: be sure to use MSYS-xyz.exe
+ whatever version that is available. BUT: be sure to use MSYS-xyz.exe
(ie the MSYS installer) and not the *bin.tar.lzma. I got confused
the first time I tried, because directory msys-1.0.12 existed on
sourceforge, but it didn't have the windows installer. You should
@@ -25,7 +25,7 @@ Note: The mingw homepage is http://www.mingw.org. You can read more
* Install MSYS into $MSYS_DIR.
-* Download minwPORT's wget from
+* Download mingwPORT's wget from
https://sourceforge.net/projects/mingw/files/mingwPORT/Current%20Releases/wget-1.9.1-mingwPORT.tar.bz2/download
to $DOWNLOAD_DIR
Note: the version number may have changed when you try this. Use whatever version
@@ -50,6 +50,11 @@ To generate a self-installing setup.exe file that contains
completed:
$INSTALLER_DIR/dist.sh
+
+
+ Note: if you didn't download and install Qt earlier, this command will fail
+ regardless of whether you disabled AQ_BANKING_WITH_QT or not. This is
+ a bug in the configuration script for the installer builder (issc).
More information is collected on http://wiki.gnucash.org/wiki/Windows
@@ -65,7 +70,7 @@ These steps need to be performed:
1. Edit the file create_cross_mingw.sh and set the PREFIX= variable to
the preferred prefix of the mingw32 gcc/binutils on your
Linux. (It is strongly recommended to choose a different prefix
- than your normal compiler toolchain in order to distinguish
+ than your normal compiler tool chain in order to distinguish
your native vs. cross compiler more easily.) Then run the
script create_cross_mingw.sh - it will
download, compile, and install a mingw32 toolchain.
commit effe7314f636c40e8269220ffe69851dd90e1751
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Apr 6 11:55:43 2010 +0000
Fix Windows build after introduction of the environment config file.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19001 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/gnucash.iss.in b/gnucash.iss.in
index f5f1e57..72a3e31 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -192,7 +192,7 @@ begin
{ Create the gnucash.cmd file; #10 is the linefeed character and #13 CR }
{ If you make any changes here, you should probably also change the equivalent sections }
- { in packaging/win32/install.sh, src/bin/gnucash-setup-env.in and src/bin/gnucash-setup-env-osx.in }
+ { in packaging/win32/install.sh, src/bin/environment*.in and src/bin/gnucash-setup-env-osx.in }
FileName := appdir + '\bin\gnucash.cmd' ;
FileString := 'setlocal'#13#10 ;
FileString := FileString + 'chcp ' + ExpandConstant('{cm:LanguageCodePage}') + ''#13#10 ;
diff --git a/install.sh b/install.sh
index deeda9e..0f19e0a 100644
--- a/install.sh
+++ b/install.sh
@@ -1375,12 +1375,12 @@ function make_install() {
done
if [ -z $_skip_scripts ]; then
- # Try to fix the paths in the gnucash-setup-env script
+ # Try to fix the paths in the environment config file
qpushd $_BUILD_UDIR/src/bin
- rm gnucash-setup-env
- make PATH_SEPARATOR=";" \
- bindir="${_INSTALL_UDIR}/bin:${_INSTALL_UDIR}/lib:${_INSTALL_UDIR}/lib/gnucash:${_GNUTLS_UTIR}/bin:${_GMP_UDIR}/bin:${_GOFFICE_UDIR}/bin:${_LIBGSF_UDIR}/bin:${_PCRE_UDIR}/bin:${_GNOME_UDIR}/bin:${_GUILE_UDIR}/bin:${_WEBKIT_UDIR}/bin:${_REGEX_UDIR}/bin:${_AUTOTOOLS_UDIR}/bin:${AQBANKING_UPATH}:${_LIBOFX_UDIR}/bin:${_OPENSP_UDIR}/bin:${_LIBDBI_UDIR}/bin:${_SQLITE3_UDIR}/bin:${MYSQL_LIB_DIR}/lib:${PGSQL_DIR}/lib:${PGSQL_DIR}/bin" \
- gnucash-setup-env gnucash-valgrind
+ rm environment
+ make \
+ bindir="${_INSTALL_UDIR}/bin;${_INSTALL_UDIR}/lib;${_INSTALL_UDIR}/lib/gnucash;${_GNUTLS_UDIR}/bin;${_GMP_UDIR}/bin;${_GOFFICE_UDIR}/bin;${_LIBGSF_UDIR}/bin;${_PCRE_UDIR}/bin;${_GNOME_UDIR}/bin;${_GUILE_UDIR}/bin;${_WEBKIT_UDIR}/bin;${_REGEX_UDIR}/bin;${_AUTOTOOLS_UDIR}/bin;${AQBANKING_UPATH};${_LIBOFX_UDIR}/bin;${_OPENSP_UDIR}/bin;${_LIBDBI_UDIR}/bin;${_SQLITE3_UDIR}/bin;${MYSQL_LIB_DIR}/lib;${PGSQL_DIR}/lib;${PGSQL_DIR}/bin" \
+ environment
qpopd
fi
@@ -1414,8 +1414,8 @@ function make_install() {
if [ -z $_skip_scripts ]; then
# Create a startup script that works without the msys shell
# If you make any changes here, you should probably also change
- # the equivalent sections in packaging/win32/gnucash.iss.in,
- # src/bin/gnucash-setup-env.in and src/bin/gnucash-setup-env-osx.in
+ # the equivalent sections in packaging/win32/gnucash.iss.in, and
+ # src/bin/environment*.in
qpushd $_INSTALL_UDIR/bin
echo "setlocal" > gnucash.cmd
echo "set PATH=${INSTALL_DIR}\\bin;${INSTALL_DIR}\\lib;${INSTALL_DIR}\\lib\\gnucash;${GNUTLS_DIR}\\bin;${GMP_DIR}\\bin;${GOFFICE_DIR}\\bin;${LIBGSF_DIR}\\bin;${PCRE_DIR}\\bin;${WEBKIT_DIR}\\bin;${GNOME_DIR}\\bin;${GUILE_DIR}\\bin;${REGEX_DIR}\\bin;${AUTOTOOLS_DIR}\\bin;${AQBANKING_PATH};${LIBOFX_DIR}\\bin;${OPENSP_DIR}\\bin;${LIBDBI_DIR}\\bin;${SQLITE3_DIR}\\bin;${MYSQL_LIB_DIR}\\lib;${PGSQL_DIR}\\lib;${PGSQL_DIR}\\bin;%PATH%" >> gnucash.cmd
commit 0009ffc4bc22a0d81010fd1df5de7a6af4107020
Author: Phil Longstaff <plongstaff at newearth.org>
Date: Sun Apr 4 21:22:19 2010 +0000
Upgrade win32 version of webkit from 1.1.5 to 1.1.90.
This version contains changes required to fix #588816 (Heading Banner Image does not display or print
on invoice reports). Note that this bug won't be fixed until some gnucash changes are checked in as well.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18991 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 440e696..e247eb6 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -249,8 +249,8 @@ set_default INNO_DIR $GLOBAL_DIR\\inno
set_default HH_URL "http://download.microsoft.com/download/OfficeXPProf/Install/4.71.1015.0/W98NT42KMe/EN-US/HTMLHELP.EXE"
set_default HH_DIR $GLOBAL_DIR\\hh
-set_default WEBKIT_URL "$SF_MIRROR/gnucash/webkit-1.1.5-win32.zip"
-set_default WEBKIT_DIR $GLOBAL_DIR\\webkit-1.1.5
+set_default WEBKIT_URL "$SF_MIRROR/gnucash/webkit-1.1.90-win32.zip"
+set_default WEBKIT_DIR $GLOBAL_DIR\\webkit-1.1.90
set_default SVN_URL "http://subversion.tigris.org/files/documents/15/35379/svn-1.4.2-setup.exe"
set_default SVN_DIR $GLOBAL_DIR\\svn
diff --git a/install.sh b/install.sh
index 306e54d..deeda9e 100644
--- a/install.sh
+++ b/install.sh
@@ -1272,7 +1272,7 @@ function inst_webkit() {
add_to_env ${_WEBKIT_UDIR}/bin PATH
add_to_env -lwebkit-1.0-2 WEBKIT_LIBS
add_to_env -L${_WEBKIT_UDIR}/bin WEBKIT_LIBS
- add_to_env -I${_WEBKIT_UDIR}/include WEBKIT_CFLAGS
+ add_to_env -I${_WEBKIT_UDIR}/include/webkit-1.0 WEBKIT_CFLAGS
if quiet ${LD} ${WEBKIT_LIBS} -o $TMP_UDIR/ofile
then
echo "webkit already installed. skipping."
commit 8f4eb62680750eb4b2a852e9a4525e02e9437fec
Author: Christian Stimming <stimming at tuhh.de>
Date: Tue Mar 30 20:00:12 2010 +0000
MSVC: Add creation of MSVC import library of libdbi.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18983 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index 6f4421a..306e54d 100644
--- a/install.sh
+++ b/install.sh
@@ -1203,6 +1203,10 @@ function inst_libdbi() {
make
make install
qpopd
+ qpushd ${_LIBDBI_UDIR}
+ pexports bin/libdbi-0.dll > lib/libdbi.def
+ dlltool -d lib/libdbi.def -D bin/libdbi-0.dll -l lib/libdbi.lib
+ qpopd
test -f ${_LIBDBI_UDIR}/bin/libdbi-0.dll || die "libdbi not installed correctly"
rm -rf ${TMP_UDIR}/libdbi-0*
fi
commit 50af45e9756d53f6f7820832ab18fc9b733cfcab
Author: Christian Stimming <stimming at tuhh.de>
Date: Wed Mar 24 19:28:20 2010 +0000
Set some more line-ending style properties.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18961 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/README b/README
index 78a2512..57c08e4 100644
--- a/README
+++ b/README
@@ -1,95 +1,95 @@
-These scripts try to download and install a Windows/mingw32 build
-environment for GnuCash on Windows.
-
-For cross-compiling the windows executable on Linux, see the lower
-section of this file.
-
-Before you start with the automated build, you have to complete these
-steps manually. The directory variables are set in `defaults.sh' and optionally
-`custom.sh'.
-
-Note: The mingw homepage is http://www.mingw.org. You can read more
- about mingw over there. The packages to download are all
- on sourceforge however, so the direct links are given here.
-
-* Download MSYS from
- https://sourceforge.net/projects/mingw/files/MSYS%20Base%20System/msys-1.0.11/MSYS-1.0.11.exe/download
- to $DOWNLOAD_DIR
- Note: there may be a more recent version available when you read this, use
- whatever verion that is available. BUT: be sure to use MSYS-xyz.exe
- (ie the MSYS installer) and not the *bin.tar.lzma. I got confused
- the first time I tried, because directory msys-1.0.12 existed on
- sourceforge, but it didn't have the windows installer. You should
- use the installer, not try to unpack the -bin.tar.lzma files. So
- choose whatever version that has got an installer.
-
-* Install MSYS into $MSYS_DIR.
-
-* Download minwPORT's wget from
- https://sourceforge.net/projects/mingw/files/mingwPORT/Current%20Releases/wget-1.9.1-mingwPORT.tar.bz2/download
- to $DOWNLOAD_DIR
- Note: the version number may have changed when you try this. Use whatever version
- that is available
-
-* Look at defaults.sh and create a file named custom.sh to specify adapted directory
- variables. If you want verbose output of any script
- step, add "set -x" to that file.
-
-* Either, 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"; or skip building
- the AqBanking Setup Wizard by specifying "AQBANKING_WITH_QT=no".
-
-Start/Enter any MSYS shell window. Let the automated build begin by:
-
- $INSTALLER_DIR/install.sh
-
-Good luck!
-
-To generate a self-installing setup.exe file that contains
-*everything*, run the following command after install.sh has
-completed:
-
- $INSTALLER_DIR/dist.sh
-
-More information is collected on http://wiki.gnucash.org/wiki/Windows
-
-
---------------------------
-
-Cross-compiling a Windows/mingw32 executable of GnuCash on a Linux
-host system. (Note: This used to work unchangedly in Sept'2006 but
-probably not any longer.)
-
-These steps need to be performed:
-
-1. Edit the file create_cross_mingw.sh and set the PREFIX= variable to
- the preferred prefix of the mingw32 gcc/binutils on your
- Linux. (It is strongly recommended to choose a different prefix
- than your normal compiler toolchain in order to distinguish
- your native vs. cross compiler more easily.) Then run the
- script create_cross_mingw.sh - it will
- download, compile, and install a mingw32 toolchain.
-
-2. Edit the file defaults.sh: Make a global search-and-replace of
- '\\' into '/' so that all directories are specified in unix
- conventions. Set the variable cross_compile to "yes". Then
- adjust the directories in defaults.sh according to your
- preferred installation, especially $GLOBAL_DIR.
-
-3. Download a binary windows packages for "guile" e.g. from
- http://www.tu-harburg.de/~et2cs/gnc/ and unpack it into the
- directory $GUILE_DIR as given in defaults.sh. (This is done because
- the build system for guile doesn't support cross-compiling.)
-
-4. Call install.sh, which will read the directory settings from
- defaults.sh. It should download, compile, and install everything
- automatically. Eventually the windows gnucash is installed into
- $GNUCASH_DIR.
-
-5. The content of $GNUCASH_DIR (as well as all the other binary
- packages) should then be copied to a windows machine. The paths
- in $GNUCASH_DIR/bin/gnucash and/or $GNUCASH_DIR/bin/gnucash.cmd
- need to be adjusted for the installation location on the
- windows machine.
-
-Good luck!
+These scripts try to download and install a Windows/mingw32 build
+environment for GnuCash on Windows.
+
+For cross-compiling the windows executable on Linux, see the lower
+section of this file.
+
+Before you start with the automated build, you have to complete these
+steps manually. The directory variables are set in `defaults.sh' and optionally
+`custom.sh'.
+
+Note: The mingw homepage is http://www.mingw.org. You can read more
+ about mingw over there. The packages to download are all
+ on sourceforge however, so the direct links are given here.
+
+* Download MSYS from
+ https://sourceforge.net/projects/mingw/files/MSYS%20Base%20System/msys-1.0.11/MSYS-1.0.11.exe/download
+ to $DOWNLOAD_DIR
+ Note: there may be a more recent version available when you read this, use
+ whatever verion that is available. BUT: be sure to use MSYS-xyz.exe
+ (ie the MSYS installer) and not the *bin.tar.lzma. I got confused
+ the first time I tried, because directory msys-1.0.12 existed on
+ sourceforge, but it didn't have the windows installer. You should
+ use the installer, not try to unpack the -bin.tar.lzma files. So
+ choose whatever version that has got an installer.
+
+* Install MSYS into $MSYS_DIR.
+
+* Download minwPORT's wget from
+ https://sourceforge.net/projects/mingw/files/mingwPORT/Current%20Releases/wget-1.9.1-mingwPORT.tar.bz2/download
+ to $DOWNLOAD_DIR
+ Note: the version number may have changed when you try this. Use whatever version
+ that is available
+
+* Look at defaults.sh and create a file named custom.sh to specify adapted directory
+ variables. If you want verbose output of any script
+ step, add "set -x" to that file.
+
+* Either, 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"; or skip building
+ the AqBanking Setup Wizard by specifying "AQBANKING_WITH_QT=no".
+
+Start/Enter any MSYS shell window. Let the automated build begin by:
+
+ $INSTALLER_DIR/install.sh
+
+Good luck!
+
+To generate a self-installing setup.exe file that contains
+*everything*, run the following command after install.sh has
+completed:
+
+ $INSTALLER_DIR/dist.sh
+
+More information is collected on http://wiki.gnucash.org/wiki/Windows
+
+
+--------------------------
+
+Cross-compiling a Windows/mingw32 executable of GnuCash on a Linux
+host system. (Note: This used to work unchangedly in Sept'2006 but
+probably not any longer.)
+
+These steps need to be performed:
+
+1. Edit the file create_cross_mingw.sh and set the PREFIX= variable to
+ the preferred prefix of the mingw32 gcc/binutils on your
+ Linux. (It is strongly recommended to choose a different prefix
+ than your normal compiler toolchain in order to distinguish
+ your native vs. cross compiler more easily.) Then run the
+ script create_cross_mingw.sh - it will
+ download, compile, and install a mingw32 toolchain.
+
+2. Edit the file defaults.sh: Make a global search-and-replace of
+ '\\' into '/' so that all directories are specified in unix
+ conventions. Set the variable cross_compile to "yes". Then
+ adjust the directories in defaults.sh according to your
+ preferred installation, especially $GLOBAL_DIR.
+
+3. Download a binary windows packages for "guile" e.g. from
+ http://www.tu-harburg.de/~et2cs/gnc/ and unpack it into the
+ directory $GUILE_DIR as given in defaults.sh. (This is done because
+ the build system for guile doesn't support cross-compiling.)
+
+4. Call install.sh, which will read the directory settings from
+ defaults.sh. It should download, compile, and install everything
+ automatically. Eventually the windows gnucash is installed into
+ $GNUCASH_DIR.
+
+5. The content of $GNUCASH_DIR (as well as all the other binary
+ packages) should then be copied to a windows machine. The paths
+ in $GNUCASH_DIR/bin/gnucash and/or $GNUCASH_DIR/bin/gnucash.cmd
+ need to be adjusted for the installation location on the
+ windows machine.
+
+Good luck!
diff --git a/install-fq-mods.cmd b/install-fq-mods.cmd
index 6bf1775..3f71d87 100644
--- a/install-fq-mods.cmd
+++ b/install-fq-mods.cmd
@@ -1,92 +1,92 @@
- at echo off
-setlocal
-
-if not exist ssleay32.dll (
- echo.
- echo Did not find ssleay32.dll in current directory.
- echo Please start this cmd file in the bin directory created by the setup.exe.
- goto error
-)
-
-echo.
-echo * Check Perl
-echo.
-perl -e "exit(int($]));"
-set _perlmajor=%errorlevel%
-perl -e "$ver=1000*sprintf(\"%%.3f\", $]); exit(int($ver)-5000);"
-set _perlminor=%errorlevel%
-if %_perlmajor% equ 5 (
- if %_perlminor% equ 10 (
- set _perlversion=5.10
- goto ccp
- )
- if %_perlminor% equ 8 (
- set _perlversion=5.8
- goto ccp
- )
- if %_perlminor% equ 6 (
- set _perlversion=5.6
- goto ccp
- )
-)
-echo.
-echo Did not find a usable perl.
-echo Please install ActivePerl 5.8 (http://www.activestate.com/store/activeperl)
-echo and add the bin directory to your Path environment variable.
-goto error
-:ccp
-
-echo * Install DateManip
-echo.
-perl -x -S ppm install Date-Manip
-if %errorlevel% neq 0 (
- perl -x -S ppm install DateManip
- if %errorlevel% neq 0 goto error
-)
-
-echo.
-echo * Install Crypt-SSLeay
-echo.
-set OLDPATH=%PATH%
-set PATH=%CD%;%PATH%
-if %_perlversion% == 5.10 (
- perl -x -S ppm install Crypt-SSLeay
-) else if %_perlversion% == 5.8 (
- echo anything | perl -x -S ppm install http://theoryx5.uwinnipeg.ca/ppms/Crypt-SSLeay.ppd
-) else (
- perl -x -S ppm install http://theoryx5.uwinnipeg.ca/ppmpackages/Crypt-SSLeay.ppd
-)
-set errlvlbak=%errorlevel%
-set PATH=%OLDPATH%
-if %errlvlbak% neq 0 goto error
-
-echo.
-echo * Install Finance-Quote
-echo.
-perl -x -S ppm install Finance-Quote
-if %errorlevel% neq 0 goto error
-
-echo.
-echo * Run gnc-fq-check
-echo.
-perl -w gnc-fq-check
-if %errorlevel% neq 0 goto error
-
-echo.
-echo * Run gnc-fq-helper
-echo.
-echo (yahoo "AMZN") | perl -w gnc-fq-helper
-if %errorlevel% neq 0 goto error
-
-echo.
-echo * Installation succeeded
-echo.
-goto end
-
-:error:
-echo.
-echo An error occured, see above.
-echo.
-
-:end
-pause
+ at echo off
+setlocal
+
+if not exist ssleay32.dll (
+ echo.
+ echo Did not find ssleay32.dll in current directory.
+ echo Please start this cmd file in the bin directory created by the setup.exe.
+ goto error
+)
+
+echo.
+echo * Check Perl
+echo.
+perl -e "exit(int($]));"
+set _perlmajor=%errorlevel%
+perl -e "$ver=1000*sprintf(\"%%.3f\", $]); exit(int($ver)-5000);"
+set _perlminor=%errorlevel%
+if %_perlmajor% equ 5 (
+ if %_perlminor% equ 10 (
+ set _perlversion=5.10
+ goto ccp
+ )
+ if %_perlminor% equ 8 (
+ set _perlversion=5.8
+ goto ccp
+ )
+ if %_perlminor% equ 6 (
+ set _perlversion=5.6
+ goto ccp
+ )
+)
+echo.
+echo Did not find a usable perl.
+echo Please install ActivePerl 5.8 (http://www.activestate.com/store/activeperl)
+echo and add the bin directory to your Path environment variable.
+goto error
+:ccp
+
+echo * Install DateManip
+echo.
+perl -x -S ppm install Date-Manip
+if %errorlevel% neq 0 (
+ perl -x -S ppm install DateManip
+ if %errorlevel% neq 0 goto error
+)
+
+echo.
+echo * Install Crypt-SSLeay
+echo.
+set OLDPATH=%PATH%
+set PATH=%CD%;%PATH%
+if %_perlversion% == 5.10 (
+ perl -x -S ppm install Crypt-SSLeay
+) else if %_perlversion% == 5.8 (
+ echo anything | perl -x -S ppm install http://theoryx5.uwinnipeg.ca/ppms/Crypt-SSLeay.ppd
+) else (
+ perl -x -S ppm install http://theoryx5.uwinnipeg.ca/ppmpackages/Crypt-SSLeay.ppd
+)
+set errlvlbak=%errorlevel%
+set PATH=%OLDPATH%
+if %errlvlbak% neq 0 goto error
+
+echo.
+echo * Install Finance-Quote
+echo.
+perl -x -S ppm install Finance-Quote
+if %errorlevel% neq 0 goto error
+
+echo.
+echo * Run gnc-fq-check
+echo.
+perl -w gnc-fq-check
+if %errorlevel% neq 0 goto error
+
+echo.
+echo * Run gnc-fq-helper
+echo.
+echo (yahoo "AMZN") | perl -w gnc-fq-helper
+if %errorlevel% neq 0 goto error
+
+echo.
+echo * Installation succeeded
+echo.
+goto end
+
+:error:
+echo.
+echo An error occured, see above.
+echo.
+
+:end
+pause
diff --git a/make_install.sh b/make_install.sh
index 19fab94..cd3b79b 100644
--- a/make_install.sh
+++ b/make_install.sh
@@ -1,20 +1,20 @@
-#!/bin/sh
-
-set -e
-
-function qpushd() { pushd "$@" >/dev/null; }
-function qpopd() { popd >/dev/null; }
-function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
-
-qpushd "$(dirname $(unix_path "$0"))"
-. functions.sh
-. defaults.sh
-reset_steps
-. install.sh
-qpopd
-
-prepare
-_INSTALL_WFSDIR=`win_fs_path $INSTALL_DIR`
-_INSTALL_UDIR=`unix_path $INSTALL_DIR`
-
-make_install "$@"
+#!/bin/sh
+
+set -e
+
+function qpushd() { pushd "$@" >/dev/null; }
+function qpopd() { popd >/dev/null; }
+function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
+
+qpushd "$(dirname $(unix_path "$0"))"
+. functions.sh
+. defaults.sh
+reset_steps
+. install.sh
+qpopd
+
+prepare
+_INSTALL_WFSDIR=`win_fs_path $INSTALL_DIR`
+_INSTALL_UDIR=`unix_path $INSTALL_DIR`
+
+make_install "$@"
commit 4e69dd51d9a8aed1142a8e0064d28678608fa01f
Author: Christian Stimming <stimming at tuhh.de>
Date: Wed Mar 24 19:18:08 2010 +0000
Set the desired line-ending style to the correct value on the server side.
Without the svn:eol-style property, SVN checkouts on windows tend to appear
with varying line endings. The only possible way around this in svn is to
set the expected line endings as svn properties.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18959 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/libdbi-drivers-dbd_mysql.c.patch b/libdbi-drivers-dbd_mysql.c.patch
index 643958a..a8636fe 100644
--- a/libdbi-drivers-dbd_mysql.c.patch
+++ b/libdbi-drivers-dbd_mysql.c.patch
@@ -1,10 +1,10 @@
-Index: dbd_mysql.c
-===================================================================
-RCS file: /cvsroot/libdbi-drivers/libdbi-drivers/drivers/mysql/dbd_mysql.c,v
-retrieving revision 1.31
-diff -u -r1.31 dbd_mysql.c
---- drivers/mysql/dbd_mysql.c 13 Aug 2008 22:56:03 -0000 1.31
-+++ drivers/mysql/dbd_mysql.c 16 Aug 2008 20:23:23 -0000
+Index: dbd_mysql.c
+===================================================================
+RCS file: /cvsroot/libdbi-drivers/libdbi-drivers/drivers/mysql/dbd_mysql.c,v
+retrieving revision 1.31
+diff -u -r1.31 dbd_mysql.c
+--- drivers/mysql/dbd_mysql.c 13 Aug 2008 22:56:03 -0000 1.31
++++ drivers/mysql/dbd_mysql.c 16 Aug 2008 20:23:23 -0000
@@ -553,15 +553,15 @@
return db;
}
diff --git a/libdbi-drivers-dbd_sqlite3.c.patch b/libdbi-drivers-dbd_sqlite3.c.patch
index 8cba5f1..99481cb 100644
--- a/libdbi-drivers-dbd_sqlite3.c.patch
+++ b/libdbi-drivers-dbd_sqlite3.c.patch
@@ -1,24 +1,24 @@
-Index: dbd_sqlite3.c
-===================================================================
-RCS file: /cvsroot/libdbi-drivers/libdbi-drivers/drivers/sqlite3/dbd_sqlite3.c,v
-retrieving revision 1.31
-diff -u -r1.31 dbd_sqlite3.c
---- drivers/sqlite3/dbd_sqlite3.c 13 Aug 2008 22:56:03 -0000 1.31
-+++ drivers/sqlite3/dbd_sqlite3.c 16 Aug 2008 20:23:23 -0000
-@@ -1369,11 +1369,11 @@
- return db;
- }
-
--int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr) {
-- /* put error number into errno, error string into errstr
-- * return 0 if error, 1 if errno filled, 2 if errstr filled, 3 if both errno and errstr filled */
-+int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr) {
-+ /* put error number into err_no, error string into errstr
-+ * return 0 if error, 1 if err_no filled, 2 if errstr filled, 3 if both err_no and errstr filled */
-
-- *errno = sqlite3_errcode((sqlite3 *)conn->connection);
-+ *err_no = sqlite3_errcode((sqlite3 *)conn->connection);
- *errstr = strdup((char*)sqlite3_errmsg((sqlite3 *)conn->connection));
- return 3;
- }
-
+Index: dbd_sqlite3.c
+===================================================================
+RCS file: /cvsroot/libdbi-drivers/libdbi-drivers/drivers/sqlite3/dbd_sqlite3.c,v
+retrieving revision 1.31
+diff -u -r1.31 dbd_sqlite3.c
+--- drivers/sqlite3/dbd_sqlite3.c 13 Aug 2008 22:56:03 -0000 1.31
++++ drivers/sqlite3/dbd_sqlite3.c 16 Aug 2008 20:23:23 -0000
+@@ -1369,11 +1369,11 @@
+ return db;
+ }
+
+-int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr) {
+- /* put error number into errno, error string into errstr
+- * return 0 if error, 1 if errno filled, 2 if errstr filled, 3 if both errno and errstr filled */
++int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr) {
++ /* put error number into err_no, error string into errstr
++ * return 0 if error, 1 if err_no filled, 2 if errstr filled, 3 if both err_no and errstr filled */
+
+- *errno = sqlite3_errcode((sqlite3 *)conn->connection);
++ *err_no = sqlite3_errcode((sqlite3 *)conn->connection);
+ *errstr = strdup((char*)sqlite3_errmsg((sqlite3 *)conn->connection));
+ return 3;
+ }
+
commit b8f7f21e6fa37512cbdee05cdb9fe2231d4fa70e
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed Mar 17 10:54:35 2010 +0000
Fix Windows installer doc to have perl >= 5.8 instead of 5.10
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18923 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/gnucash.iss.in b/gnucash.iss.in
index bff3a11..f5f1e57 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -264,7 +264,7 @@ IconFilename_README=README.win32-bin.txt
IconName_FAQ=FAQ (Online)
IconName_Bugzilla=Report a Bug (Online)
IconName_InstallFQ=Install Online Price Retrieval
-IconComment_InstallFQ=Install the necessary perl module Finance-Quote for online retrieval of prices. Requires ActivePerl 5.10
+IconComment_InstallFQ=Install the necessary perl module Finance-Quote for online retrieval of prices. Requires ActivePerl 5.8 or 5.10
IconName_Uninstall=Uninstall GnuCash
IconComment_Uninstall=Uninstall the Finance Manager GnuCash
@@ -301,7 +301,7 @@ de.IconFilename_README=README-de.win32-bin.txt
de.IconName_FAQ=H�ufige Fragen (online, engl.)
de.IconName_Bugzilla=Fehlerbericht einsenden (online, engl.)
de.IconName_InstallFQ=Online Kursabruf installieren
-de.IconComment_InstallFQ=Das zus�tzliche Modul Finance-Quote installieren, um online Aktien- und Devisenkurse abrufen zu k�nnen. Dazu ist das Programm ActivePerl 5.10 erforderlich.
+de.IconComment_InstallFQ=Das zus�tzliche Modul Finance-Quote installieren, um online Aktien- und Devisenkurse abrufen zu k�nnen. Dazu ist das Programm ActivePerl 5.8 oder 5.10 erforderlich.
de.IconName_Uninstall=Deinstallieren von GnuCash
de.IconComment_Uninstall=Die OpenSource-Finanzverwaltung GnuCash wieder deinstallieren und vom Computer l�schen
@@ -328,7 +328,7 @@ el.IconFilename_README=README.win32-bin.txt
el.IconName_FAQ=������ ��������� (Online)
el.IconName_Bugzilla=������� ��������� (Online)
el.IconName_InstallFQ=����������� ����� ����� (online)
-el.IconComment_InstallFQ=����������� ��� perl module Finance-Quote ��� ���� ����� online. ������� ActivePerl 5.10
+el.IconComment_InstallFQ=����������� ��� perl module Finance-Quote ��� ���� ����� online. ������� ActivePerl 5.8/5.10
el.IconName_Uninstall=������������� GnuCash
el.IconComment_Uninstall=������������� ��� ����������� ����������� GnuCash
@@ -355,7 +355,7 @@ fr.IconFilename_README=README-fr.win32-bin.txt
fr.IconName_FAQ=FAQ (En ligne, en anglais)
fr.IconName_Bugzilla=Envoyer un rapport d'erreur (En ligne, en anglais)
fr.IconName_InstallFQ=Installer les quotations en ligne
-fr.IconComment_InstallFQ=Installation du module Finance-Quote requis pour le t�l�chargement du cours des devises et actions. Le programme ActivePerl 5.10 est aussi requis
+fr.IconComment_InstallFQ=Installation du module Finance-Quote requis pour le t�l�chargement du cours des devises et actions. Le programme ActivePerl 5.8 ou 5.10 est aussi requis
fr.IconName_Uninstall=D�-installer GnuCash
fr.IconComment_Uninstall=D�sinstalle le gestionnaire financier GnuCash
@@ -382,7 +382,7 @@ it.IconFilename_README=README-it.win32-bin.txt
it.IconName_FAQ=FAQ (online, in Inglese)
it.IconName_Bugzilla=Comunicare un bug (online, in Inglese)
it.IconName_InstallFQ=Installa la funzione di ricerca delle quotazioni online
-it.IconComment_InstallFQ=Installa il modulo di perl Finance-Quote necessario per ricevere le quotazioni online. Richiede ActivePerl 5.10
+it.IconComment_InstallFQ=Installa il modulo di perl Finance-Quote necessario per ricevere le quotazioni online. Richiede ActivePerl 5.8/5.10
it.IconName_Uninstall=Disinstalla GnuCash
it.IconComment_Uninstall=Disinstalla il programma di gestione delle finanze GnuCash
@@ -409,7 +409,7 @@ nl.IconFilename_README=README-nl.win32-bin.txt
nl.IconName_FAQ=FAQ (Online)
nl.IconName_Bugzilla=Een Bug Melden (Online)
nl.IconName_InstallFQ=Online Koersen Opvragen installeren
-nl.IconComment_InstallFQ=De benodigde perl module Finance Quote om online koersen op te vragen installeren. Hiervoor is ActivePerl 5.10 nodig.
+nl.IconComment_InstallFQ=De benodigde perl module Finance Quote om online koersen op te vragen installeren. Hiervoor is ActivePerl 5.8 of 5.10 nodig.
nl.IconName_Uninstall=GnuCash verwijderen
nl.IconComment_Uninstall=Het financieel beheersprogramma GnuCash verwijderen
@@ -436,7 +436,7 @@ pt_BR.IconFilename_README=LEIA-ME.win32-bin.txt
pt_BR.IconName_FAQ=Perguntas Freq�entes (online, ingl�s)
pt_BR.IconName_Bugzilla=Relatar um erro (online, ingl�s)
pt_BR.IconName_InstallFQ=Instalar a Consulta de Pre�os Online
-pt_BR.IconComment_InstallFQ=Instala o m�dulo perl Finance-Quote, necess�rio para a busca de pre�os online. Requer ActivePerl 5.10.
+pt_BR.IconComment_InstallFQ=Instala o m�dulo perl Finance-Quote, necess�rio para a busca de pre�os online. Requer ActivePerl 5.8/5.10.
pt_BR.IconName_Uninstall=Desinstalar o GnuCash
pt_BR.IconComment_Uninstall=Desinstala o Gerenciador Financeiro GnuCash
commit 6e600c8d6190c2640cf7b4f048e0ee63cb2fd0d7
Author: Christian Stimming <stimming at tuhh.de>
Date: Sun Mar 14 21:01:32 2010 +0000
Add src/calculation and src/app-utils to cmake build system.
app-utils is needed for the conversion from and to string
for gnc_numeric, date, and other values.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18905 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index d705014..6f4421a 100644
--- a/install.sh
+++ b/install.sh
@@ -390,6 +390,7 @@ function inst_guile() {
#ifdef _MSC_VER
# undef HAVE_STDINT_H
# undef HAVE_INTTYPES_H
+# undef HAVE_UNISTD_H
#endif
EOF
# Also, for MSVC compiler we need to create an import library
commit 94823dfd5430bbd531ad7d25bb497fe4f060e9e0
Author: Christian Stimming <stimming at tuhh.de>
Date: Sun Mar 7 13:06:03 2010 +0000
MSVC compatiblity: snprintf is required to have a prefixing underscore.
Also, more symbols of libguile/gc.h need explicit declspec on MSVC.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18864 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index 1704d79..d705014 100644
--- a/install.sh
+++ b/install.sh
@@ -397,8 +397,8 @@ EOF
${DLLTOOL} -d $_GUILE_UDIR/lib/libguile.def -D $_GUILE_UDIR/bin/libguile.dll -l $_GUILE_UDIR/lib/libguile.lib
# Also, for MSVC compiler we need to slightly modify the gc.h header
GC_H=$_GUILE_UDIR/include/libguile/gc.h
- grep -v 'extern.*_freelist2;' ${GC_H} > ${GC_H}.tmp
- mv ${GC_H}.tmp ${GC_H}
+ grep -v 'extern .*_freelist2;' ${GC_H} > ${GC_H}.tmp
+ grep -v 'extern int scm_block_gc;' ${GC_H}.tmp > ${GC_H}
cat >> ${GC_H} <<EOF
#ifdef _MSC_VER
# define LIBGUILEDECL __declspec (dllimport)
@@ -407,6 +407,7 @@ EOF
#endif
extern LIBGUILEDECL SCM scm_freelist2;
extern LIBGUILEDECL struct scm_t_freelist scm_master_freelist2;
+extern LIBGUILEDECL int scm_block_gc;
EOF
rm -rf ${TMP_UDIR}/guile-*
fi
commit f81e615bcebf0959655257e62115a507a5cef465
Author: Christian Stimming <stimming at tuhh.de>
Date: Thu Mar 4 17:47:51 2010 +0000
Win32: Add download of cmake, disabled by default.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18813 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 63fad8e..440e696 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -70,6 +70,8 @@ else
set_default INSTALL_DIR $GNUCASH_DIR\\inst
fi
+set_default WITH_CUTECASH no
+
####
set_default LD ld
@@ -305,6 +307,9 @@ set_default LIBDBI_DRIVERS_PATCH2 `pwd`/libdbi-drivers-Makefile.in.patch
set_default LIBDBI_DRIVERS_PATCH3 `pwd`/libdbi-drivers-dbd_mysql.c.patch
set_default LIBDBI_DRIVERS_PATCH4 `pwd`/libdbi-drivers-dbd_pgsql.c.patch
+set_default CMAKE_URL "http://www.cmake.org/files/v2.8/cmake-2.8.0-win32-x86.zip"
+set_default CMAKE_DIR $GLOBAL_DIR\\cmake
+
set_default DOCBOOK_XSL_URL "$SF_MIRROR/docbook/docbook-xsl-1.72.0.zip"
set_default UPDATE_DOCS yes
set_default DOCS_REV "HEAD"
@@ -366,6 +371,9 @@ add_step inst_webkit
if [ "$UPDATE_SOURCES" = "yes" ]; then
add_step svn_up
fi
+if [ "$WITH_CUTECASH" = "yes" ]; then
+ add_step inst_cmake
+fi
add_step inst_gnucash
add_step inst_docs
if [ "$CROSS_COMPILE" != "yes" ]; then
diff --git a/install.sh b/install.sh
index ac8cdf6..1704d79 100644
--- a/install.sh
+++ b/install.sh
@@ -395,6 +395,19 @@ EOF
# Also, for MSVC compiler we need to create an import library
pexports $_GUILE_UDIR/bin/libguile.dll > $_GUILE_UDIR/lib/libguile.def
${DLLTOOL} -d $_GUILE_UDIR/lib/libguile.def -D $_GUILE_UDIR/bin/libguile.dll -l $_GUILE_UDIR/lib/libguile.lib
+ # Also, for MSVC compiler we need to slightly modify the gc.h header
+ GC_H=$_GUILE_UDIR/include/libguile/gc.h
+ grep -v 'extern.*_freelist2;' ${GC_H} > ${GC_H}.tmp
+ mv ${GC_H}.tmp ${GC_H}
+ cat >> ${GC_H} <<EOF
+#ifdef _MSC_VER
+# define LIBGUILEDECL __declspec (dllimport)
+#else
+# define LIBGUILEDECL /* */
+#endif
+extern LIBGUILEDECL SCM scm_freelist2;
+extern LIBGUILEDECL struct scm_t_freelist scm_master_freelist2;
+EOF
rm -rf ${TMP_UDIR}/guile-*
fi
if [ "$CROSS_COMPILE" = "yes" ]; then
@@ -1229,6 +1242,24 @@ function inst_libdbi() {
fi
}
+function inst_cmake() {
+ setup CMake
+ _CMAKE_UDIR=`unix_path ${CMAKE_DIR}`
+ add_to_env ${_CMAKE_UDIR}/bin PATH
+ if [ -f ${_CMAKE_UDIR}/bin/cmake.exe ]
+ then
+ echo "cmake already installed. skipping."
+ else
+ wget_unpacked $CMAKE_URL $DOWNLOAD_DIR $CMAKE_DIR
+
+ assert_one_dir ${_CMAKE_UDIR}/cmake-2*
+ mv ${_CMAKE_UDIR}/cmake-2*/* ${_CMAKE_UDIR}
+ rm -rf ${_CMAKE_UDIR}/cmake-2*
+
+ [ -f ${_CMAKE_UDIR}/bin/cmake.exe ] || die "cmake not installed correctly"
+ fi
+}
+
function inst_webkit() {
setup WebKit
_WEBKIT_UDIR=`unix_path ${WEBKIT_DIR}`
commit d87d55fa415daf876459f5540c451a7b04d607b6
Author: Christian Stimming <stimming at tuhh.de>
Date: Tue Mar 2 20:22:01 2010 +0000
Win32: Create the MSVC import library for libguile during install.sh.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18781 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index 911be83..ac8cdf6 100644
--- a/install.sh
+++ b/install.sh
@@ -392,6 +392,9 @@ function inst_guile() {
# undef HAVE_INTTYPES_H
#endif
EOF
+ # Also, for MSVC compiler we need to create an import library
+ pexports $_GUILE_UDIR/bin/libguile.dll > $_GUILE_UDIR/lib/libguile.def
+ ${DLLTOOL} -d $_GUILE_UDIR/lib/libguile.def -D $_GUILE_UDIR/bin/libguile.dll -l $_GUILE_UDIR/lib/libguile.lib
rm -rf ${TMP_UDIR}/guile-*
fi
if [ "$CROSS_COMPILE" = "yes" ]; then
commit 0b94ff871fb7429d76edda7b781980f6546f2965
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Mar 2 14:54:34 2010 +0000
Bug #611470 Add Japanese concepts guide into GnuCash installer, patch by Yasuaki Taniguchi
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18779 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index fde8768..911be83 100644
--- a/install.sh
+++ b/install.sh
@@ -1394,9 +1394,10 @@ function make_install() {
function make_chm() {
_CHM_TYPE=$1
_CHM_LANG=$2
+ _XSLTPROC_OPTS=$3
echo "Processing $_CHM_TYPE ($_CHM_LANG) ..."
qpushd $_CHM_TYPE/$_CHM_LANG
- xsltproc $XSLTPROCFLAGS ../../../docbook-xsl/htmlhelp/htmlhelp.xsl gnucash-$_CHM_TYPE.xml
+ xsltproc $XSLTPROCFLAGS $_XSLTPROC_OPTS ../../../docbook-xsl/htmlhelp/htmlhelp.xsl gnucash-$_CHM_TYPE.xml
count=0
echo >> htmlhelp.hhp
echo "[ALIAS]" >> htmlhelp.hhp
@@ -1441,10 +1442,11 @@ function inst_docs() {
fi
setup docs
_DOCS_INST_UDIR=`unix_path $INSTALL_DIR`/share/gnucash/help
- mkdir -p $_DOCS_INST_UDIR/{C,de_DE,it_IT}
+ mkdir -p $_DOCS_INST_UDIR/{C,de_DE,it_IT,ja_JP}
make_chm guide C
make_chm guide de_DE
make_chm guide it_IT
+ make_chm guide ja_JP "--stringparam chunker.output.encoding Shift_JIS --stringparam htmlhelp.encoding Shift_JIS"
make_chm help C
make_chm help de_DE
# make_chm help it_IT
commit 2fb2e4f2dd073bf50d2e6eacbc1db0d85aef9c5e
Author: Christian Stimming <stimming at tuhh.de>
Date: Mon Mar 1 18:45:11 2010 +0000
Win32 build: libguile needs minor tweaking for MSVC compatibility.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18774 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
old mode 100755
new mode 100644
index f25d05b..fde8768
--- a/install.sh
+++ b/install.sh
@@ -381,6 +381,17 @@ function inst_guile() {
qpopd
guile -c '(use-modules (srfi srfi-39))' &&
guile -c "(use-modules (ice-9 slib)) (require 'printf)" || die "guile not installed correctly"
+
+ # If this libguile is used from MSVC compiler, we must
+ # deactivate some macros of scmconfig.h again.
+ SCMCONFIG_H=$_GUILE_UDIR/include/libguile/scmconfig.h
+ cat >> ${SCMCONFIG_H} <<EOF
+
+#ifdef _MSC_VER
+# undef HAVE_STDINT_H
+# undef HAVE_INTTYPES_H
+#endif
+EOF
rm -rf ${TMP_UDIR}/guile-*
fi
if [ "$CROSS_COMPILE" = "yes" ]; then
commit a96a6cce568c51ad0f9145f3c52ac133f5216eb5
Author: Christian Stimming <stimming at tuhh.de>
Date: Sat Feb 27 18:42:11 2010 +0000
Win32: Fix libbonoboui compiling.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18756 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index 8d42fa2..f25d05b 100755
--- a/install.sh
+++ b/install.sh
@@ -709,7 +709,7 @@ function inst_libbonoboui() {
# We override the $GNOME_DIR libbonoboui files because
# those erroneously depend on the obsolete libxml2.dll
cp -a $_LIBBONOBOUI_UDIR/bin/libbonoboui*.dll $_GNOME_UDIR/bin
- cp -a $_LIBBONOBOUI_UDIR/lib/libbonoboui*.dll $_GNOME_UDIR/lib
+ cp -a $_LIBBONOBOUI_UDIR/lib/libbonoboui* $_GNOME_UDIR/lib
qpopd
${PKG_CONFIG} --exists --atleast-version=2.24.2 libbonoboui-2.0 && [ -f $_LIBBONOBOUI_UDIR/bin/libbonoboui*.dll ] || die "libbonoboui not installed correctly"
rm -rf ${TMP_UDIR}/libbonoboui-*
commit eb62c86ce30b065bccfa9047d5022e0d30565233
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri Feb 26 21:28:27 2010 +0000
Clarify required steps to setup windows build environment.
The mingw website has changed quite a lot since the README
was written and some of the url's used in it were confusing.
I have changed the url's to point to the actual packages
on sourceforge (current at the time of this writing)
and added some extra details where I had trouble understanding
the actions to perform.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18740 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/README b/README
index 5758316..78a2512 100644
--- a/README
+++ b/README
@@ -8,16 +8,28 @@ Before you start with the automated build, you have to complete these
steps manually. The directory variables are set in `defaults.sh' and optionally
`custom.sh'.
-* Download MSYS (but *only* msys; no mingw and no msysdtk)
-from http://www.mingw.org/download.shtml -> Current -> MSYS -> (bin, *.exe)
-to $DOWNLOAD_DIR
-
-* Install MSYS (no postinstall)
-to $MSYS_DIR
-
-* Download wget
-from http://www.mingw.org/download.shtml -> Current -> mingwPORT -> (bin, wget-*)
-to $DOWNLOAD_DIR
+Note: The mingw homepage is http://www.mingw.org. You can read more
+ about mingw over there. The packages to download are all
+ on sourceforge however, so the direct links are given here.
+
+* Download MSYS from
+ https://sourceforge.net/projects/mingw/files/MSYS%20Base%20System/msys-1.0.11/MSYS-1.0.11.exe/download
+ to $DOWNLOAD_DIR
+ Note: there may be a more recent version available when you read this, use
+ whatever verion that is available. BUT: be sure to use MSYS-xyz.exe
+ (ie the MSYS installer) and not the *bin.tar.lzma. I got confused
+ the first time I tried, because directory msys-1.0.12 existed on
+ sourceforge, but it didn't have the windows installer. You should
+ use the installer, not try to unpack the -bin.tar.lzma files. So
+ choose whatever version that has got an installer.
+
+* Install MSYS into $MSYS_DIR.
+
+* Download minwPORT's wget from
+ https://sourceforge.net/projects/mingw/files/mingwPORT/Current%20Releases/wget-1.9.1-mingwPORT.tar.bz2/download
+ to $DOWNLOAD_DIR
+ Note: the version number may have changed when you try this. Use whatever version
+ that is available
* Look at defaults.sh and create a file named custom.sh to specify adapted directory
variables. If you want verbose output of any script
commit d475617f6a2bf9403770d23da914809a1f266b92
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed Feb 24 19:53:37 2010 +0000
Update documentation references to Active Perl (5.8->5.10)
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18723 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/gnucash.iss.in b/gnucash.iss.in
index a1c8371..bff3a11 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -264,7 +264,7 @@ IconFilename_README=README.win32-bin.txt
IconName_FAQ=FAQ (Online)
IconName_Bugzilla=Report a Bug (Online)
IconName_InstallFQ=Install Online Price Retrieval
-IconComment_InstallFQ=Install the necessary perl module Finance-Quote for online retrieval of prices. Requires ActivePerl 5.8
+IconComment_InstallFQ=Install the necessary perl module Finance-Quote for online retrieval of prices. Requires ActivePerl 5.10
IconName_Uninstall=Uninstall GnuCash
IconComment_Uninstall=Uninstall the Finance Manager GnuCash
@@ -301,7 +301,7 @@ de.IconFilename_README=README-de.win32-bin.txt
de.IconName_FAQ=H�ufige Fragen (online, engl.)
de.IconName_Bugzilla=Fehlerbericht einsenden (online, engl.)
de.IconName_InstallFQ=Online Kursabruf installieren
-de.IconComment_InstallFQ=Das zus�tzliche Modul Finance-Quote installieren, um online Aktien- und Devisenkurse abrufen zu k�nnen. Dazu ist das Programm ActivePerl 5.8 erforderlich.
+de.IconComment_InstallFQ=Das zus�tzliche Modul Finance-Quote installieren, um online Aktien- und Devisenkurse abrufen zu k�nnen. Dazu ist das Programm ActivePerl 5.10 erforderlich.
de.IconName_Uninstall=Deinstallieren von GnuCash
de.IconComment_Uninstall=Die OpenSource-Finanzverwaltung GnuCash wieder deinstallieren und vom Computer l�schen
@@ -328,7 +328,7 @@ el.IconFilename_README=README.win32-bin.txt
el.IconName_FAQ=������ ��������� (Online)
el.IconName_Bugzilla=������� ��������� (Online)
el.IconName_InstallFQ=����������� ����� ����� (online)
-el.IconComment_InstallFQ=����������� ��� perl module Finance-Quote ��� ���� ����� online. ������� ActivePerl 5.8
+el.IconComment_InstallFQ=����������� ��� perl module Finance-Quote ��� ���� ����� online. ������� ActivePerl 5.10
el.IconName_Uninstall=������������� GnuCash
el.IconComment_Uninstall=������������� ��� ����������� ����������� GnuCash
@@ -355,7 +355,7 @@ fr.IconFilename_README=README-fr.win32-bin.txt
fr.IconName_FAQ=FAQ (En ligne, en anglais)
fr.IconName_Bugzilla=Envoyer un rapport d'erreur (En ligne, en anglais)
fr.IconName_InstallFQ=Installer les quotations en ligne
-fr.IconComment_InstallFQ=Installation du module Finance-Quote requis pour le t�l�chargement du cours des devises et actions. Le programme ActivePerl 5.8 est aussi requis
+fr.IconComment_InstallFQ=Installation du module Finance-Quote requis pour le t�l�chargement du cours des devises et actions. Le programme ActivePerl 5.10 est aussi requis
fr.IconName_Uninstall=D�-installer GnuCash
fr.IconComment_Uninstall=D�sinstalle le gestionnaire financier GnuCash
@@ -382,7 +382,7 @@ it.IconFilename_README=README-it.win32-bin.txt
it.IconName_FAQ=FAQ (online, in Inglese)
it.IconName_Bugzilla=Comunicare un bug (online, in Inglese)
it.IconName_InstallFQ=Installa la funzione di ricerca delle quotazioni online
-it.IconComment_InstallFQ=Installa il modulo di perl Finance-Quote necessario per ricevere le quotazioni online. Richiede ActivePerl 5.8
+it.IconComment_InstallFQ=Installa il modulo di perl Finance-Quote necessario per ricevere le quotazioni online. Richiede ActivePerl 5.10
it.IconName_Uninstall=Disinstalla GnuCash
it.IconComment_Uninstall=Disinstalla il programma di gestione delle finanze GnuCash
@@ -409,7 +409,7 @@ nl.IconFilename_README=README-nl.win32-bin.txt
nl.IconName_FAQ=FAQ (Online)
nl.IconName_Bugzilla=Een Bug Melden (Online)
nl.IconName_InstallFQ=Online Koersen Opvragen installeren
-nl.IconComment_InstallFQ=De benodigde perl module Finance Quote om online koersen op te vragen installeren. Hiervoor is ActivePerl 5.8 nodig.
+nl.IconComment_InstallFQ=De benodigde perl module Finance Quote om online koersen op te vragen installeren. Hiervoor is ActivePerl 5.10 nodig.
nl.IconName_Uninstall=GnuCash verwijderen
nl.IconComment_Uninstall=Het financieel beheersprogramma GnuCash verwijderen
@@ -436,7 +436,7 @@ pt_BR.IconFilename_README=LEIA-ME.win32-bin.txt
pt_BR.IconName_FAQ=Perguntas Freq�entes (online, ingl�s)
pt_BR.IconName_Bugzilla=Relatar um erro (online, ingl�s)
pt_BR.IconName_InstallFQ=Instalar a Consulta de Pre�os Online
-pt_BR.IconComment_InstallFQ=Instala o m�dulo perl Finance-Quote, necess�rio para a busca de pre�os online. Requer ActivePerl 5.8.
+pt_BR.IconComment_InstallFQ=Instala o m�dulo perl Finance-Quote, necess�rio para a busca de pre�os online. Requer ActivePerl 5.10.
pt_BR.IconName_Uninstall=Desinstalar o GnuCash
pt_BR.IconComment_Uninstall=Desinstala o Gerenciador Financeiro GnuCash
commit 212df9b4ad347326cbd6712067ad5ea29dbfc4b8
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed Feb 24 18:30:30 2010 +0000
Add dutch translation to the Windows installer.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18718 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/gnucash.iss.in b/gnucash.iss.in
index a9954e7..a1c8371 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -230,6 +230,7 @@ Name: "el"; MessagesFile: "@prefix@\share\@PACKAGE@\Greek-4-5.1.11.isl"
Name: "fr"; MessagesFile: "compiler:Languages\French.isl"; InfoAfterFile: "@prefix@\share\@PACKAGE@\doc\README-fr.win32-bin.txt"
Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"; InfoAfterFile: "@prefix@\share\@PACKAGE@\doc\README-it.win32-bin.txt"
Name: "ja"; MessagesFile: "@prefix@\share\@PACKAGE@\Japanese-5-5.1.11.isl"
+Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"; InfoAfterFile: "@prefix@\share\@PACKAGE@\doc\README-nl.win32-bin.txt"
Name: "pt_BR"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
;; The following language files are available as well, in alphabetical
@@ -274,6 +275,7 @@ el.LanguageCodePage=1253
fr.LanguageCodePage=1252
it.LanguageCodePage=1252
ja.LanguageCodePage=932
+nl.LanguageCodePage=1252
pt_BR.LanguageCodePage=1252
@@ -283,68 +285,68 @@ pt_BR.LanguageCodePage=1252
de.FullInstall=Komplett-Installation
de.CustomInstall=Benutzerdefiniert
de.CreateDesktopIcon=Ein Icon auf dem Desktop erstellen
-de.CreateMenuLink=Eine Verknüpfung im Startmenü erstellen
+de.CreateMenuLink=Eine Verkn�pfung im Startmen� erstellen
de.RunPrg=GnuCash jetzt starten
de.AdditionalIcons=Folgende Icons erstellen:
-de.StatusMsgFirewall=Ausnahmen für Windows-Firewall installieren...
+de.StatusMsgFirewall=Ausnahmen f�r Windows-Firewall installieren...
de.MainFiles=GnuCash Hauptprogramm
-de.TranslFiles=Deutsche Übersetzung
+de.TranslFiles=Deutsche �bersetzung
de.TemplFiles=Beispiel-Kontenrahmen
de.IconComment_GnuCash=GnuCash OpenSource-Finanzverwaltung
de.IconName_README=README anzeigen
de.IconComment_README=Die Informationsdatei (README) anzeigen
de.IconFilename_README=README-de.win32-bin.txt
-de.IconName_FAQ=Häufige Fragen (online, engl.)
+de.IconName_FAQ=H�ufige Fragen (online, engl.)
de.IconName_Bugzilla=Fehlerbericht einsenden (online, engl.)
de.IconName_InstallFQ=Online Kursabruf installieren
-de.IconComment_InstallFQ=Das zusätzliche Modul Finance-Quote installieren, um online Aktien- und Devisenkurse abrufen zu können. Dazu ist das Programm ActivePerl 5.8 erforderlich.
+de.IconComment_InstallFQ=Das zus�tzliche Modul Finance-Quote installieren, um online Aktien- und Devisenkurse abrufen zu k�nnen. Dazu ist das Programm ActivePerl 5.8 erforderlich.
de.IconName_Uninstall=Deinstallieren von GnuCash
-de.IconComment_Uninstall=Die OpenSource-Finanzverwaltung GnuCash wieder deinstallieren und vom Computer löschen
+de.IconComment_Uninstall=Die OpenSource-Finanzverwaltung GnuCash wieder deinstallieren und vom Computer l�schen
;; ;;;;;;;;;;;;;;;;;;;
;; Greek translation
-el.FullInstall=ÐëÞñçò åãêáôÜóôáóç
-el.CustomInstall=ÐñïóáñìïóìÝíç åãêáôÜóôáóç
-el.CreateDesktopIcon=Äçìéïõñãßá åéêïíéäßïõ óôçí åðéöÜíåéá åñãáóßáò
-el.CreateMenuLink=ÐñïóèÞêç óôï ìåíïý ¸íáñîç
-el.RunPrg=ÅêôÝëåóç ôïõ GnuCash ôþñá
-el.AdditionalIcons=Äçìéïõñãßá åéêïíéäßùí:
-el.StatusMsgFirewall=ÅãêáôÜóôáóç êáíüíùí ãéá ôï ôïß÷ïò ðñïóôáóßáò ôùí Windows...
-
-el.MainFiles=Ðñüãñáììá GnuCash
-el.TranslFiles=Áñ÷åßá ìåôÜöñáóåùí
-el.TemplFiles=Áñ÷åßá ìå ðñüôõðá ëïãáñéáóìþí
-
-el.IconComment_GnuCash=GnuCash ðñüãñáììá äéá÷. ïéêïíïìéêþí
-el.IconName_README=ÅìöÜíéóç ôïõ README
-el.IconComment_README=ÅìöÜíéóç ôïõ áñ÷åßïõ README
+el.FullInstall=������ �����������
+el.CustomInstall=������������� �����������
+el.CreateDesktopIcon=���������� ���������� ���� ��������� ��������
+el.CreateMenuLink=�������� ��� ����� ������
+el.RunPrg=�������� ��� GnuCash ����
+el.AdditionalIcons=���������� ����������:
+el.StatusMsgFirewall=����������� ������� ��� �� ������ ���������� ��� Windows...
+
+el.MainFiles=��������� GnuCash
+el.TranslFiles=������ �����������
+el.TemplFiles=������ �� ������� �����������
+
+el.IconComment_GnuCash=GnuCash ��������� ����. �����������
+el.IconName_README=�������� ��� README
+el.IconComment_README=�������� ��� ������� README
el.IconFilename_README=README.win32-bin.txt
-el.IconName_FAQ=Óõ÷íÝò åñùôÞóåéò (Online)
-el.IconName_Bugzilla=ÁíáöïñÜ óöÜëìáôïò (Online)
-el.IconName_InstallFQ=ÅãêáôÜóôáóç ëÞøçò ôéìþí (online)
-el.IconComment_InstallFQ=ÅãêáôÜóôáóç ôïõ perl module Finance-Quote ãéá ëÞøç ôéìþí online. Áðáéôåß ActivePerl 5.8
-el.IconName_Uninstall=ÁðåãêáôÜóôáóç GnuCash
-el.IconComment_Uninstall=ÁðåãêáôÜóôáóç ôïõ äéá÷åéñéóôÞ ïéêïíïìéêþí GnuCash
+el.IconName_FAQ=������ ��������� (Online)
+el.IconName_Bugzilla=������� ��������� (Online)
+el.IconName_InstallFQ=����������� ����� ����� (online)
+el.IconComment_InstallFQ=����������� ��� perl module Finance-Quote ��� ���� ����� online. ������� ActivePerl 5.8
+el.IconName_Uninstall=������������� GnuCash
+el.IconComment_Uninstall=������������� ��� ����������� ����������� GnuCash
;; ;;;;;;;;;;;;;;;;;;;;
;; French translation
-fr.FullInstall=Installation complète
-fr.CustomInstall=Installation personnalisée
-fr.CreateDesktopIcon=Créer un icône sur le bureau
-fr.CreateMenuLink=Créer un lien dans le menu de démarrage
-fr.RunPrg=Démarrer GnuCash maintenant
-fr.AdditionalIcons=Créer les icônes suivants:
-fr.StatusMsgFirewall=Installation des règles de pare-feu de Windows
+fr.FullInstall=Installation compl�te
+fr.CustomInstall=Installation personnalis�e
+fr.CreateDesktopIcon=Cr�er un ic�ne sur le bureau
+fr.CreateMenuLink=Cr�er un lien dans le menu de d�marrage
+fr.RunPrg=D�marrer GnuCash maintenant
+fr.AdditionalIcons=Cr�er les ic�nes suivants:
+fr.StatusMsgFirewall=Installation des r�gles de pare-feu de Windows
fr.MainFiles=Programme GnuCash
-fr.TranslFiles=Traduction française
-fr.TemplFiles=Modèle de plan comptable
+fr.TranslFiles=Traduction fran�aise
+fr.TemplFiles=Mod�le de plan comptable
fr.IconComment_GnuCash=GnuCash, le gestionnaire financier OpenSource
fr.IconName_README=Afficher le LISEZMOI
@@ -353,9 +355,9 @@ fr.IconFilename_README=README-fr.win32-bin.txt
fr.IconName_FAQ=FAQ (En ligne, en anglais)
fr.IconName_Bugzilla=Envoyer un rapport d'erreur (En ligne, en anglais)
fr.IconName_InstallFQ=Installer les quotations en ligne
-fr.IconComment_InstallFQ=Installation du module Finance-Quote requis pour le téléchargement du cours des devises et actions. Le programme ActivePerl 5.8 est aussi requis
-fr.IconName_Uninstall=Dé-installer GnuCash
-fr.IconComment_Uninstall=Désinstalle le gestionnaire financier GnuCash
+fr.IconComment_InstallFQ=Installation du module Finance-Quote requis pour le t�l�chargement du cours des devises et actions. Le programme ActivePerl 5.8 est aussi requis
+fr.IconName_Uninstall=D�-installer GnuCash
+fr.IconComment_Uninstall=D�sinstalle le gestionnaire financier GnuCash
;; ;;;;;;;;;;;;;;;;;;;;;
@@ -385,29 +387,56 @@ it.IconName_Uninstall=Disinstalla GnuCash
it.IconComment_Uninstall=Disinstalla il programma di gestione delle finanze GnuCash
+;; ;;;;;;;;;;;;;;;;;
+;; Dutch translation
+
+nl.FullInstall=Volledige installatie
+nl.CustomInstall=Aangepaste installatiie
+nl.CreateDesktopIcon=Een &bureablad icoon aanmaken
+nl.CreateMenuLink=Een verwijzing in het start menu aanmaken
+nl.RunPrg=GnuCash nu starten
+nl.AdditionalIcons=Deze iconen aanmaken:
+nl.StatusMsgFirewall=Windows firewall regels installeren...
+
+nl.MainFiles=GnuCash Programma
+nl.TranslFiles=Vertalingsbestanden
+nl.TemplFiles=Grootboekrekeningssjablonen
+
+nl.IconComment_GnuCash=GnuCash Vrij Financieel Beheer
+nl.IconName_README=LEESMIJ Tonen
+nl.IconComment_README=Het LEESMIJ bestand tonen
+nl.IconFilename_README=README-nl.win32-bin.txt
+nl.IconName_FAQ=FAQ (Online)
+nl.IconName_Bugzilla=Een Bug Melden (Online)
+nl.IconName_InstallFQ=Online Koersen Opvragen installeren
+nl.IconComment_InstallFQ=De benodigde perl module Finance Quote om online koersen op te vragen installeren. Hiervoor is ActivePerl 5.8 nodig.
+nl.IconName_Uninstall=GnuCash verwijderen
+nl.IconComment_Uninstall=Het financieel beheersprogramma GnuCash verwijderen
+
+
;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Brazilian Portuguese translation
-pt_BR.FullInstall=Instalação Completa
-pt_BR.CustomInstall=Instalação Personalizada
-pt_BR.CreateDesktopIcon=Criar um ícone na Área de Trabalho
+pt_BR.FullInstall=Instala��o Completa
+pt_BR.CustomInstall=Instala��o Personalizada
+pt_BR.CreateDesktopIcon=Criar um �cone na �rea de Trabalho
pt_BR.CreateMenuLink=Criar um link no menu Iniciar
pt_BR.RunPrg=Executar o GnuCash agora
-pt_BR.AdditionalIcons=Criar estes ícones:
+pt_BR.AdditionalIcons=Criar estes �cones:
pt_BR.StatusMsgFirewall=Instalando as regras de firewall do Windows...
pt_BR.MainFiles=Programa GnuCash
-pt_BR.TranslFiles=Tradução
+pt_BR.TranslFiles=Tradu��o
pt_BR.TemplFiles=Modelos de Conta
pt_BR.IconComment_GnuCash=Gerenciador Financeiro Livre GnuCash
pt_BR.IconName_README=Mostrar LEIA-ME (README)
pt_BR.IconComment_README=Mostra o arquivo LEIA-ME (README)
pt_BR.IconFilename_README=LEIA-ME.win32-bin.txt
-pt_BR.IconName_FAQ=Perguntas Freqüentes (online, inglês)
-pt_BR.IconName_Bugzilla=Relatar um erro (online, inglês)
-pt_BR.IconName_InstallFQ=Instalar a Consulta de Preços Online
-pt_BR.IconComment_InstallFQ=Instala o módulo perl Finance-Quote, necessário para a busca de preços online. Requer ActivePerl 5.8.
+pt_BR.IconName_FAQ=Perguntas Freq�entes (online, ingl�s)
+pt_BR.IconName_Bugzilla=Relatar um erro (online, ingl�s)
+pt_BR.IconName_InstallFQ=Instalar a Consulta de Pre�os Online
+pt_BR.IconComment_InstallFQ=Instala o m�dulo perl Finance-Quote, necess�rio para a busca de pre�os online. Requer ActivePerl 5.8.
pt_BR.IconName_Uninstall=Desinstalar o GnuCash
pt_BR.IconComment_Uninstall=Desinstala o Gerenciador Financeiro GnuCash
commit 5d8f441cf1b2646794be3100c550afb9926c0fc5
Author: Christian Stimming <stimming at tuhh.de>
Date: Tue Feb 23 20:10:31 2010 +0000
Bug #610348: Add compiling our own binary of libbonoboui because the ftp.gnome.org binary still depends on the obsolete libxml2.dll.
However, we still download the erroneous binary and unpack it into $GNOME_DIR
because libgnomeui depends on libbonoboui which in turn depends on libgnome.
Hence, libbonoboui cannot be compiled before libgnome-dev is unpacked, but
libgnomeui won't report to be installed correctly before libbonoboui is
available as well. Theoretically, we would have to split the inst_gnome step
so that it first unpacks libgnome et al., then we run the inst_libbonoboui
step, then we run the second part of inst_gnome which would be something like
inst_gnomeui. I'm lazy, so I silently overwrite the libbonoboui DLL with
our hand-compiled version and that's it.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18711 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 139b592..63fad8e 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -209,8 +209,6 @@ set_default LIBGNOME_URL "$GNOME_WIN32_URL/libgnome/2.24/libgnome_2.24.1-1_win32
set_default LIBGNOME_DEV_URL "$GNOME_WIN32_URL/libgnome/2.24/libgnome-dev_2.24.1-1_win32.zip"
set_default LIBGNOMECANVAS_URL "$GNOME_WIN32_URL/libgnomecanvas/2.20/libgnomecanvas-2.20.1.zip"
set_default LIBGNOMECANVAS_DEV_URL "$GNOME_WIN32_URL/libgnomecanvas/2.20/libgnomecanvas-dev-2.20.1.zip"
-set_default LIBBONOBOUI_URL "$GNOME_WIN32_URL/libbonoboui/2.24/libbonoboui_2.24.0-1_win32.zip"
-set_default LIBBONOBOUI_DEV_URL "$GNOME_WIN32_URL/libbonoboui/2.24/libbonoboui-dev_2.24.0-1_win32.zip"
set_default LIBGNOMEUI_URL "$GNOME_WIN32_URL/libgnomeui/2.22/libgnomeui-2.22.1.zip"
set_default LIBGNOMEUI_DEV_URL "$GNOME_WIN32_URL/libgnomeui/2.22/libgnomeui-dev-2.22.1.zip"
set_default LIBGLADE_URL "$GNOME_WIN32_URL/libglade/2.6/libglade_2.6.4-1_win32.zip"
@@ -220,6 +218,12 @@ set_default GTKHTML_DEV_URL "$GNOME_WIN32_URL/gtkhtml/3.24/gtkhtml-dev_3.24.2-1_
set_default GTK_DOC_URL "$GNOME_MIRROR/sources/gtk-doc/1.13/gtk-doc-1.13.tar.bz2"
set_default GNOME_DIR $GLOBAL_DIR\\gnome
+set_default LIBBONOBOUI_URL "$GNOME_WIN32_URL/libbonoboui/2.24/libbonoboui_2.24.0-1_win32.zip"
+set_default LIBBONOBOUI_DEV_URL "$GNOME_WIN32_URL/libbonoboui/2.24/libbonoboui-dev_2.24.0-1_win32.zip"
+set_default LIBBONOBOUI_SRC_URL "$GNOME_MIRROR/sources/libbonoboui/2.24/libbonoboui-2.24.2.tar.bz2"
+set_default LIBBONOBOUI_PATCH `pwd`/libbonoboui-2.24.2.patch
+set_default LIBBONOBOUI_DIR $GLOBAL_DIR\\libbonoboui
+
set_default SWIG_URL "$SF_MIRROR/swig/swigwin-1.3.36.zip"
set_default SWIG_DIR $GLOBAL_DIR\\swig
@@ -343,6 +347,7 @@ if [ "$AQBANKING3" = "yes" ]; then
fi
add_step inst_swig
add_step inst_pcre
+add_step inst_libbonoboui
add_step inst_libgsf
if [ "$CROSS_COMPILE" != "yes" ]; then
add_step inst_hh
diff --git a/dist.sh b/dist.sh
index 043806d..b1e3eb9 100755
--- a/dist.sh
+++ b/dist.sh
@@ -28,6 +28,7 @@ function prepare() {
_EXETYPE_UDIR=`unix_path $EXETYPE_DIR`
_GNOME_UDIR=`unix_path $GNOME_DIR`
_PCRE_UDIR=`unix_path $PCRE_DIR`
+ _LIBBONOBOUI_UDIR=`unix_path $LIBBONOBOUI_DIR`
_LIBGSF_UDIR=`unix_path $LIBGSF_DIR`
_GOFFICE_UDIR=`unix_path $GOFFICE_DIR`
_OPENSP_UDIR=`unix_path $OPENSP_DIR`
@@ -126,6 +127,12 @@ function dist_pcre() {
cp -a $_PCRE_UDIR/bin/pcre3.dll $DIST_UDIR/bin
}
+function dist_libbonoboui() {
+ setup libbonoboui
+ mkdir -p $DIST_UDIR/bin
+ cp -a $_LIBBONOBOUI_UDIR/bin/libbonoboui*.dll $DIST_UDIR/bin
+}
+
function dist_libgsf() {
setup libGSF
mkdir -p $DIST_UDIR/bin
@@ -287,6 +294,7 @@ dist_autotools
dist_guile
dist_gnome
dist_pcre
+dist_libbonoboui
dist_libgsf
dist_goffice
dist_libofx
diff --git a/install.sh b/install.sh
index 0d04a82..8d42fa2 100755
--- a/install.sh
+++ b/install.sh
@@ -679,6 +679,43 @@ function inst_pcre() {
quiet ${LD} $PCRE_LDFLAGS -lpcre -o $TMP_UDIR/ofile || die "pcre not installed correctly"
}
+function inst_libbonoboui() {
+ setup libbonoboui
+ _LIBBONOBOUI_UDIR=`unix_path $LIBBONOBOUI_DIR`
+ add_to_env $_LIBBONOBOUI_UDIR/bin PATH
+ add_to_env $_LIBBONOBOUI_UDIR/lib/pkgconfig PKG_CONFIG_PATH
+ if quiet ${PKG_CONFIG} --exists --atleast-version=2.24.2 libbonoboui-2.0 && [ -f $_LIBBONOBOUI_UDIR/bin/libbonoboui*.dll ]
+ then
+ echo "libbonoboui already installed. skipping."
+ else
+ wget_unpacked $LIBBONOBOUI_SRC_URL $DOWNLOAD_DIR $TMP_DIR
+ mydir=`pwd`
+ assert_one_dir $TMP_UDIR/libbonoboui-*
+ qpushd $TMP_UDIR/libbonoboui-*
+ [ -n "$LIBBONOBOUI_PATCH" -a -f "$LIBBONOBOUI_PATCH" ] && \
+ patch -p1 < $LIBBONOBOUI_PATCH
+ #libtoolize --force
+ #aclocal ${ACLOCAL_FLAGS} -I .
+ #automake
+ #autoconf
+ ./configure ${HOST_XCOMPILE} --prefix=$_LIBBONOBOUI_UDIR \
+ POPT_LIBS="-lpopt" \
+ CPPFLAGS="${GNOME_CPPFLAGS}" \
+ LDFLAGS="${GNOME_LDFLAGS}" \
+ --enable-static=no
+ make
+ make install
+
+ # We override the $GNOME_DIR libbonoboui files because
+ # those erroneously depend on the obsolete libxml2.dll
+ cp -a $_LIBBONOBOUI_UDIR/bin/libbonoboui*.dll $_GNOME_UDIR/bin
+ cp -a $_LIBBONOBOUI_UDIR/lib/libbonoboui*.dll $_GNOME_UDIR/lib
+ qpopd
+ ${PKG_CONFIG} --exists --atleast-version=2.24.2 libbonoboui-2.0 && [ -f $_LIBBONOBOUI_UDIR/bin/libbonoboui*.dll ] || die "libbonoboui not installed correctly"
+ rm -rf ${TMP_UDIR}/libbonoboui-*
+ fi
+}
+
function inst_libgsf() {
setup libGSF
_LIBGSF_UDIR=`unix_path $LIBGSF_DIR`
diff --git a/libbonoboui-2.24.2.patch b/libbonoboui-2.24.2.patch
new file mode 100644
index 0000000..f10c5b9
--- /dev/null
+++ b/libbonoboui-2.24.2.patch
@@ -0,0 +1,223 @@
+diff -ur libbonoboui-2.24.2/configure libbonoboui-2.24.2-cs/configure
+--- libbonoboui-2.24.2/configure 2009-09-22 23:12:20 +0000
++++ libbonoboui-2.24.2-cs/configure 2010-02-23 12:25:27 +0000
+@@ -16422,219 +16422,6 @@
+
+
+ # popt
+-{ $as_echo "$as_me:$LINENO: checking for poptStrippedArgv in -lpopt" >&5
+-$as_echo_n "checking for poptStrippedArgv in -lpopt... " >&6; }
+-if test "${ac_cv_lib_popt_poptStrippedArgv+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpopt $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char poptStrippedArgv ();
+-int
+-main ()
+-{
+-return poptStrippedArgv ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- ac_cv_lib_popt_poptStrippedArgv=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_popt_poptStrippedArgv=no
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_popt_poptStrippedArgv" >&5
+-$as_echo "$ac_cv_lib_popt_poptStrippedArgv" >&6; }
+-if test "x$ac_cv_lib_popt_poptStrippedArgv" = x""yes; then
+- POPT_LIBS=-lpopt
+-else
+- { { $as_echo "$as_me:$LINENO: error: You must have popt version 1.5 or greater installed." >&5
+-$as_echo "$as_me: error: You must have popt version 1.5 or greater installed." >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+-
+-
+-if test "${ac_cv_header_popt_h+set}" = set; then
+- { $as_echo "$as_me:$LINENO: checking for popt.h" >&5
+-$as_echo_n "checking for popt.h... " >&6; }
+-if test "${ac_cv_header_popt_h+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_popt_h" >&5
+-$as_echo "$ac_cv_header_popt_h" >&6; }
+-else
+- # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking popt.h usability" >&5
+-$as_echo_n "checking popt.h usability... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-#include <popt.h>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_header_compiler=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_compiler=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
+-
+-# Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking popt.h presence" >&5
+-$as_echo_n "checking popt.h presence... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <popt.h>
+-_ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null && {
+- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- }; then
+- ac_header_preproc=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_preproc=no
+-fi
+-
+-rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
+-
+-# So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+- yes:no: )
+- { $as_echo "$as_me:$LINENO: WARNING: popt.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: popt.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: popt.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: popt.h: proceeding with the compiler's result" >&2;}
+- ac_header_preproc=yes
+- ;;
+- no:yes:* )
+- { $as_echo "$as_me:$LINENO: WARNING: popt.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: popt.h: present but cannot be compiled" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: popt.h: check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: popt.h: check for missing prerequisite headers?" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: popt.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: popt.h: see the Autoconf documentation" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: popt.h: section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: popt.h: section \"Present But Cannot Be Compiled\"" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: popt.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: popt.h: proceeding with the preprocessor's result" >&2;}
+- { $as_echo "$as_me:$LINENO: WARNING: popt.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: popt.h: in the future, the compiler will take precedence" >&2;}
+- ( cat <<\_ASBOX
+-## ------------------------------------------------------------------------------------------- ##
+-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=bonobo&component=libbonoboui ##
+-## ------------------------------------------------------------------------------------------- ##
+-_ASBOX
+- ) | sed "s/^/$as_me: WARNING: /" >&2
+- ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for popt.h" >&5
+-$as_echo_n "checking for popt.h... " >&6; }
+-if test "${ac_cv_header_popt_h+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- ac_cv_header_popt_h=$ac_header_preproc
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_popt_h" >&5
+-$as_echo "$ac_cv_header_popt_h" >&6; }
+-
+-fi
+-if test "x$ac_cv_header_popt_h" = x""yes; then
+- :
+-else
+- { { $as_echo "$as_me:$LINENO: error: Failed to find popt.h - you may have to adjust your environment" >&5
+-$as_echo "$as_me: error: Failed to find popt.h - you may have to adjust your environment" >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+
+
+
commit 4c0a6268d79458eb9b4678c3afbf0c8029c57778
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat Feb 20 13:26:19 2010 +0000
Bug #610348 missing dependencies in windows build
Update gnome-vfs to 2.24.1
Note that this means Windows 2000 is no longer supported.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18695 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 024240f..139b592 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -203,11 +203,8 @@ set_default GCONF_URL "$GNOME_WIN32_URL/GConf/2.22/GConf_2.22.0-3_win32.zip"
set_default GCONF_DEV_URL "$GNOME_WIN32_URL/GConf/2.22/GConf-dev_2.22.0-3_win32.zip"
set_default LIBBONOBO_URL "$GNOME_WIN32_URL/libbonobo/2.24/libbonobo_2.24.0-1_win32.zip"
set_default LIBBONOBO_DEV_URL "$GNOME_WIN32_URL/libbonobo/2.24/libbonobo-dev_2.24.0-1_win32.zip"
-# work-around #504261, GetVolumePathNamesForVolumeNameW missing on Win2k
-set_default GNOME_VFS_URL "$GNOME_WIN32_URL/gnome-vfs/2.14/gnome-vfs-2.14.2-no-openssl.zip"
-set_default GNOME_VFS_DEV_URL "$GNOME_WIN32_URL/gnome-vfs/2.14/gnome-vfs-dev-2.14.2-no-openssl.zip"
-#set_default GNOME_VFS_URL "$GNOME_WIN32_URL/gnome-vfs/2.24/gnome-vfs_2.24.1-1_win32.zip"
-#set_default GNOME_VFS_DEV_URL "$GNOME_WIN32_URL/gnome-vfs/2.24/gnome-vfs-dev_2.24.1-1_win32.zip"
+set_default GNOME_VFS_URL "$GNOME_WIN32_URL/gnome-vfs/2.24/gnome-vfs_2.24.1-1_win32.zip"
+set_default GNOME_VFS_DEV_URL "$GNOME_WIN32_URL/gnome-vfs/2.24/gnome-vfs-dev_2.24.1-1_win32.zip"
set_default LIBGNOME_URL "$GNOME_WIN32_URL/libgnome/2.24/libgnome_2.24.1-1_win32.zip"
set_default LIBGNOME_DEV_URL "$GNOME_WIN32_URL/libgnome/2.24/libgnome-dev_2.24.1-1_win32.zip"
set_default LIBGNOMECANVAS_URL "$GNOME_WIN32_URL/libgnomecanvas/2.20/libgnomecanvas-2.20.1.zip"
commit 4b3f25f46de44e885234c67def11b514eee3adbe
Author: Christian Stimming <stimming at tuhh.de>
Date: Fri Feb 19 22:12:28 2010 +0000
Win32: Update libxslt version, but it needs its own copy of libxml2.dll.
Apparently the gnome-provided libxml2 has the DLL filename libxml2-2.dll,
but the binary from xmlsoft.org still has the filename libxml2.dll.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18690 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 44dffa8..024240f 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -153,7 +153,8 @@ set_default MINGW_UTILS_DIR $TOOLS_DIR
set_default EXETYPE_SCRIPT `pwd`/exetype.pl
set_default EXETYPE_DIR $TOOLS_DIR
-set_default LIBXSLT_URL "http://xmlsoft.org/sources/win32/oldreleases/libxslt-1.1.23+.win32.zip"
+set_default LIBXSLT_URL "http://xmlsoft.org/sources/win32/libxslt-1.1.26.win32.zip"
+set_default LIBXSLT_LIBXML2_URL "http://xmlsoft.org/sources/win32/libxml2-2.7.6.win32.zip"
set_default LIBXSLT_DIR $GLOBAL_DIR\\libxslt
set_default LIBXML2_URL "$GNOME_WIN32_DEPS_URL/libxml2_2.7.4-1_win32.zip"
diff --git a/install.sh b/install.sh
index a78ea25..0d04a82 100755
--- a/install.sh
+++ b/install.sh
@@ -499,10 +499,14 @@ function inst_libxslt() {
else
[ "$CROSS_COMPILE" = "yes" ] && die "xsltproc unavailable"
wget_unpacked $LIBXSLT_URL $DOWNLOAD_DIR $LIBXSLT_DIR
+ wget_unpacked $LIBXSLT_LIBXML2_URL $DOWNLOAD_DIR $LIBXSLT_DIR
qpushd $_LIBXSLT_UDIR
mv libxslt-* mydir
cp -r mydir/* .
rm -rf mydir
+ mv libxml2-* mydir
+ cp -r mydir/* .
+ rm -rf mydir
qpopd
quiet which xsltproc || die "libxslt not installed correctly"
fi
commit 070dcab5007c977b0862b2434b393b64db97dc7c
Author: Christian Stimming <stimming at tuhh.de>
Date: Fri Feb 19 21:06:50 2010 +0000
Win32: And one more dependency upgrade (causes missing libxml2.dll complaints otherwise)
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18689 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 5a5e11b..44dffa8 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -198,8 +198,8 @@ set_default GAIL_URL "$GNOME_WIN32_URL/gail/1.22/gail-1.22.0.zip"
set_default GAIL_DEV_URL "$GNOME_WIN32_URL/gail/1.22/gail-dev-1.22.0.zip"
set_default POPT_URL "$GNOME_WIN32_DEPS_URL/popt-1.10.2-tml-20050828.zip"
set_default POPT_DEV_URL "$GNOME_WIN32_DEPS_URL/popt-dev-1.10.2-tml-20050828.zip"
-set_default GCONF_URL "$GNOME_WIN32_URL/GConf/2.22/GConf_2.22.0-2_win32.zip"
-set_default GCONF_DEV_URL "$GNOME_WIN32_URL/GConf/2.22/GConf-dev_2.22.0-2_win32.zip"
+set_default GCONF_URL "$GNOME_WIN32_URL/GConf/2.22/GConf_2.22.0-3_win32.zip"
+set_default GCONF_DEV_URL "$GNOME_WIN32_URL/GConf/2.22/GConf-dev_2.22.0-3_win32.zip"
set_default LIBBONOBO_URL "$GNOME_WIN32_URL/libbonobo/2.24/libbonobo_2.24.0-1_win32.zip"
set_default LIBBONOBO_DEV_URL "$GNOME_WIN32_URL/libbonobo/2.24/libbonobo-dev_2.24.0-1_win32.zip"
# work-around #504261, GetVolumePathNamesForVolumeNameW missing on Win2k
commit 752647a29ef5ab03c0cf2f4f0bd98ebbd29ae52f
Author: Christian Stimming <stimming at tuhh.de>
Date: Fri Feb 19 20:50:01 2010 +0000
More win32 dependency version updates.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18688 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 8387c90..5a5e11b 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -176,7 +176,7 @@ set_default PKG_CONFIG_URL "$GNOME_WIN32_DEPS_URL/pkg-config_0.23-3_win32.zip"
set_default PKG_CONFIG_DEV_URL "$GNOME_WIN32_DEPS_URL/pkg-config-dev_0.23-3_win32.zip"
set_default CAIRO_URL "$GNOME_WIN32_DEPS_URL/cairo_1.8.8-4_win32.zip"
set_default CAIRO_DEV_URL "$GNOME_WIN32_DEPS_URL/cairo-dev_1.8.8-4_win32.zip"
-set_default PIXMAN_URL "http://cairographics.org/releases/pixman-0.14.0.tar.gz"
+set_default PIXMAN_URL "http://cairographics.org/releases/pixman-0.17.6.tar.gz"
set_default EXPAT_URL "$GNOME_WIN32_DEPS_URL/expat_2.0.1-1_win32.zip"
set_default EXPAT_DEV_URL "$GNOME_WIN32_DEPS_URL/expat-dev_2.0.1-1_win32.zip"
set_default FONTCONFIG_URL "$GNOME_WIN32_DEPS_URL/fontconfig_2.8.0-2_win32.zip"
@@ -219,7 +219,7 @@ set_default LIBGLADE_URL "$GNOME_WIN32_URL/libglade/2.6/libglade_2.6.4-1_win32.z
set_default LIBGLADE_DEV_URL "$GNOME_WIN32_URL/libglade/2.6/libglade-dev_2.6.4-1_win32.zip"
set_default GTKHTML_URL "$GNOME_WIN32_URL/gtkhtml/3.24/gtkhtml_3.24.2-1_win32.zip"
set_default GTKHTML_DEV_URL "$GNOME_WIN32_URL/gtkhtml/3.24/gtkhtml-dev_3.24.2-1_win32.zip"
-set_default GTK_DOC_URL "$GNOME_MIRROR/sources/gtk-doc/1.11/gtk-doc-1.11.tar.bz2"
+set_default GTK_DOC_URL "$GNOME_MIRROR/sources/gtk-doc/1.13/gtk-doc-1.13.tar.bz2"
set_default GNOME_DIR $GLOBAL_DIR\\gnome
set_default SWIG_URL "$SF_MIRROR/swig/swigwin-1.3.36.zip"
diff --git a/install.sh b/install.sh
index 1b57a0e..a78ea25 100755
--- a/install.sh
+++ b/install.sh
@@ -612,6 +612,7 @@ EOF
chmod +x bin/pkg-config{.exe,-msys.sh}
sed '/Requires/s,\(.*\) enchant\(.*\) iso-codes\(.*\),\1\2\3,' lib/pkgconfig/libgtkhtml-3.14.pc > tmp
mv tmp lib/pkgconfig/libgtkhtml-3.14.pc
+ rm -rf $TMP_UDIR/gtk-doc-*
qpopd
wget_unpacked $PIXMAN_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/pixman-*
@@ -622,6 +623,7 @@ EOF
make
make install
qpopd
+ rm -rf $TMP_UDIR/pixman-*
${PKG_CONFIG} --exists pixman-1 || die "pixman not installed correctly"
quiet gconftool-2 --version &&
quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgtkhtml-3.14 &&
commit 5accb218faaf52755c2e27b59cdcc38454cf93d5
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu Feb 18 16:22:23 2010 +0000
Update libpng package dependency for win32 to 1.4.0
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18685 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 7541e67..8387c90 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -166,8 +166,8 @@ set_default GLIB_URL "$GNOME_WIN32_URL/glib/2.22/glib_2.22.4-1_win32.zip"
set_default GLIB_DEV_URL "$GNOME_WIN32_URL/glib/2.22/glib-dev_2.22.4-1_win32.zip"
set_default LIBJPEG_URL "$GNOME_WIN32_DEPS_URL/jpeg_7-1_win32.zip"
set_default LIBJPEG_DEV_URL "$GNOME_WIN32_DEPS_URL/jpeg-dev_7-1_win32.zip"
-set_default LIBPNG_URL "$GNOME_WIN32_DEPS_URL/libpng_1.2.40-1_win32.zip"
-set_default LIBPNG_DEV_URL "$GNOME_WIN32_DEPS_URL/libpng-dev_1.2.40-1_win32.zip"
+set_default LIBPNG_URL "$GNOME_WIN32_DEPS_URL/libpng_1.4.0-1_win32.zip"
+set_default LIBPNG_DEV_URL "$GNOME_WIN32_DEPS_URL/libpng-dev_1.4.0-1_win32.zip"
set_default LIBTIFF_URL "$GNOME_WIN32_DEPS_URL/libtiff_3.9.1-1_win32.zip"
set_default LIBTIFF_DEV_URL "$GNOME_WIN32_DEPS_URL/libtiff-dev_3.9.1-1_win32.zip"
set_default ZLIB_URL "$GNOME_WIN32_DEPS_URL/zlib-1.2.3.zip"
commit 9555fb921380ab4576dad19e7df676d18dc825f3
Author: Christian Stimming <stimming at tuhh.de>
Date: Thu Feb 18 05:27:17 2010 +0000
Bug #609603: Windows packing/win32/install.sh PATH fix
Patch by Yasuaki Taniguchi:
When I run /c/soft/gnucash/inst/bin/gnucash or gnucash.cmd after I finish
building win32 binary, DLL missing dialog boxes pop up.
Missing DLLs are
- libgcrypto.dll,
- libPQ.dll,
- mysql.dll, and
- ssleay32.dll.
This patch add search path to them to fix this problem.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18670 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index cdc7f3a..1b57a0e 100755
--- a/install.sh
+++ b/install.sh
@@ -1285,7 +1285,7 @@ function make_install() {
qpushd $_BUILD_UDIR/src/bin
rm gnucash-setup-env
make PATH_SEPARATOR=";" \
- bindir="${_INSTALL_UDIR}/bin:${_INSTALL_UDIR}/lib:${_INSTALL_UDIR}/lib/gnucash:${_GNUTLS_UTIR}/bin:${_GMP_UDIR}/bin:${_GOFFICE_UDIR}/bin:${_LIBGSF_UDIR}/bin:${_PCRE_UDIR}/bin:${_GNOME_UDIR}/bin:${_GUILE_UDIR}/bin:${_WEBKIT_UDIR}/bin:${_REGEX_UDIR}/bin:${_AUTOTOOLS_UDIR}/bin:${AQBANKING_UPATH}:${_LIBOFX_UDIR}/bin:${_OPENSP_UDIR}/bin:${_LIBDBI_UDIR}/bin:${_SQLITE3_UDIR}/bin" \
+ bindir="${_INSTALL_UDIR}/bin:${_INSTALL_UDIR}/lib:${_INSTALL_UDIR}/lib/gnucash:${_GNUTLS_UTIR}/bin:${_GMP_UDIR}/bin:${_GOFFICE_UDIR}/bin:${_LIBGSF_UDIR}/bin:${_PCRE_UDIR}/bin:${_GNOME_UDIR}/bin:${_GUILE_UDIR}/bin:${_WEBKIT_UDIR}/bin:${_REGEX_UDIR}/bin:${_AUTOTOOLS_UDIR}/bin:${AQBANKING_UPATH}:${_LIBOFX_UDIR}/bin:${_OPENSP_UDIR}/bin:${_LIBDBI_UDIR}/bin:${_SQLITE3_UDIR}/bin:${MYSQL_LIB_DIR}/lib:${PGSQL_DIR}/lib:${PGSQL_DIR}/bin" \
gnucash-setup-env gnucash-valgrind
qpopd
fi
@@ -1324,7 +1324,7 @@ function make_install() {
# src/bin/gnucash-setup-env.in and src/bin/gnucash-setup-env-osx.in
qpushd $_INSTALL_UDIR/bin
echo "setlocal" > gnucash.cmd
- echo "set PATH=${INSTALL_DIR}\\bin;${INSTALL_DIR}\\lib;${INSTALL_DIR}\\lib\\gnucash;${GNUTLS_DIR}\\bin;${GMP_DIR}\\bin;${GOFFICE_DIR}\\bin;${LIBGSF_DIR}\\bin;${PCRE_DIR}\\bin;${WEBKIT_DIR}\\bin;${GNOME_DIR}\\bin;${GUILE_DIR}\\bin;${REGEX_DIR}\\bin;${AUTOTOOLS_DIR}\\bin;${AQBANKING_PATH};${LIBOFX_DIR}\\bin;${OPENSP_DIR}\\bin;${LIBDBI_DIR}\\bin;${SQLITE3_DIR}\\bin;%PATH%" >> gnucash.cmd
+ echo "set PATH=${INSTALL_DIR}\\bin;${INSTALL_DIR}\\lib;${INSTALL_DIR}\\lib\\gnucash;${GNUTLS_DIR}\\bin;${GMP_DIR}\\bin;${GOFFICE_DIR}\\bin;${LIBGSF_DIR}\\bin;${PCRE_DIR}\\bin;${WEBKIT_DIR}\\bin;${GNOME_DIR}\\bin;${GUILE_DIR}\\bin;${REGEX_DIR}\\bin;${AUTOTOOLS_DIR}\\bin;${AQBANKING_PATH};${LIBOFX_DIR}\\bin;${OPENSP_DIR}\\bin;${LIBDBI_DIR}\\bin;${SQLITE3_DIR}\\bin;${MYSQL_LIB_DIR}\\lib;${PGSQL_DIR}\\lib;${PGSQL_DIR}\\bin;%PATH%" >> gnucash.cmd
echo "set GUILE_WARN_DEPRECATED=no" >> gnucash.cmd
echo "set GNC_MODULE_PATH=${INSTALL_DIR}\\lib\\gnucash" >> gnucash.cmd
echo "set GUILE_LOAD_PATH=${INSTALL_DIR}\\share\\gnucash\\guile-modules;${INSTALL_DIR}\\share\\gnucash\\scm;%GUILE_LOAD_PATH%" >> gnucash.cmd
commit 5492429e6400a09eed98749dda9a15d63d3a9088
Author: Christian Stimming <stimming at tuhh.de>
Date: Tue Feb 16 21:45:34 2010 +0000
Update gnome package versions.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18664 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 7d3e43f..7541e67 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -156,38 +156,41 @@ set_default EXETYPE_DIR $TOOLS_DIR
set_default LIBXSLT_URL "http://xmlsoft.org/sources/win32/oldreleases/libxslt-1.1.23+.win32.zip"
set_default LIBXSLT_DIR $GLOBAL_DIR\\libxslt
-set_default LIBXML2_URL "$GNOME_WIN32_DEPS_URL/libxml2-2.6.27.zip"
-set_default LIBXML2_DEV_URL "$GNOME_WIN32_DEPS_URL/libxml2-dev-2.6.27.zip"
+set_default LIBXML2_URL "$GNOME_WIN32_DEPS_URL/libxml2_2.7.4-1_win32.zip"
+set_default LIBXML2_DEV_URL "$GNOME_WIN32_DEPS_URL/libxml2-dev_2.7.4-1_win32.zip"
set_default GETTEXT_RUNTIME_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime-0.17-1.zip"
set_default GETTEXT_RUNTIME_DEV_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime-dev-0.17-1.zip"
set_default GETTEXT_TOOLS_URL "$GNOME_WIN32_DEPS_URL/gettext-tools-0.17.zip"
set_default LIBICONV_URL "$GNOME_WIN32_DEPS_URL/libiconv-1.9.1.bin.woe32.zip"
-set_default GLIB_URL "$GNOME_WIN32_URL/glib/2.18/glib_2.18.3-1_win32.zip"
-set_default GLIB_DEV_URL "$GNOME_WIN32_URL/glib/2.18/glib-dev_2.18.3-1_win32.zip"
-set_default LIBJPEG_URL "$GNOME_WIN32_DEPS_URL/libjpeg-6b-4.zip"
-set_default LIBPNG_URL "$GNOME_WIN32_DEPS_URL/libpng_1.2.32-1_win32.zip"
-set_default LIBPNG_DEV_URL "$GNOME_WIN32_DEPS_URL/libpng-dev_1.2.32-1_win32.zip"
-set_default LIBTIFF_URL "$GNOME_WIN32_DEPS_URL/libtiff-3.8.2.zip"
-set_default LIBTIFF_DEV_URL "$GNOME_WIN32_DEPS_URL/libtiff-dev-3.8.2.zip"
+set_default GLIB_URL "$GNOME_WIN32_URL/glib/2.22/glib_2.22.4-1_win32.zip"
+set_default GLIB_DEV_URL "$GNOME_WIN32_URL/glib/2.22/glib-dev_2.22.4-1_win32.zip"
+set_default LIBJPEG_URL "$GNOME_WIN32_DEPS_URL/jpeg_7-1_win32.zip"
+set_default LIBJPEG_DEV_URL "$GNOME_WIN32_DEPS_URL/jpeg-dev_7-1_win32.zip"
+set_default LIBPNG_URL "$GNOME_WIN32_DEPS_URL/libpng_1.2.40-1_win32.zip"
+set_default LIBPNG_DEV_URL "$GNOME_WIN32_DEPS_URL/libpng-dev_1.2.40-1_win32.zip"
+set_default LIBTIFF_URL "$GNOME_WIN32_DEPS_URL/libtiff_3.9.1-1_win32.zip"
+set_default LIBTIFF_DEV_URL "$GNOME_WIN32_DEPS_URL/libtiff-dev_3.9.1-1_win32.zip"
set_default ZLIB_URL "$GNOME_WIN32_DEPS_URL/zlib-1.2.3.zip"
set_default ZLIB_DEV_URL "$GNOME_WIN32_DEPS_URL/zlib-dev-1.2.3.zip"
-set_default PKG_CONFIG_URL "$GNOME_WIN32_DEPS_URL/pkg-config-0.23.zip"
-set_default CAIRO_URL "$GNOME_WIN32_DEPS_URL/cairo_1.8.6-1_win32.zip"
-set_default CAIRO_DEV_URL "$GNOME_WIN32_DEPS_URL/cairo-dev_1.8.6-1_win32.zip"
+set_default PKG_CONFIG_URL "$GNOME_WIN32_DEPS_URL/pkg-config_0.23-3_win32.zip"
+set_default PKG_CONFIG_DEV_URL "$GNOME_WIN32_DEPS_URL/pkg-config-dev_0.23-3_win32.zip"
+set_default CAIRO_URL "$GNOME_WIN32_DEPS_URL/cairo_1.8.8-4_win32.zip"
+set_default CAIRO_DEV_URL "$GNOME_WIN32_DEPS_URL/cairo-dev_1.8.8-4_win32.zip"
set_default PIXMAN_URL "http://cairographics.org/releases/pixman-0.14.0.tar.gz"
-set_default EXPAT_URL "$GNOME_WIN32_DEPS_URL/expat-2.0.0.zip"
-set_default FONTCONFIG_URL "$GNOME_WIN32_DEPS_URL/fontconfig-2.4.2-tml-20071015.zip"
-set_default FONTCONFIG_DEV_URL "$GNOME_WIN32_DEPS_URL/fontconfig-dev-2.4.2-tml-20071015.zip"
-set_default FREETYPE_URL "$GNOME_WIN32_DEPS_URL/freetype-2.3.6.zip"
-set_default FREETYPE_DEV_URL "$GNOME_WIN32_DEPS_URL/freetype-dev-2.3.6.zip"
-set_default ATK_URL "$GNOME_WIN32_URL/atk/1.24/atk_1.24.0-1_win32.zip"
-set_default ATK_DEV_URL "$GNOME_WIN32_URL/atk/1.24/atk-dev_1.24.0-1_win32.zip"
-set_default PANGO_URL "$GNOME_WIN32_URL/pango/1.22/pango_1.22.2-1_win32.zip"
-set_default PANGO_DEV_URL "$GNOME_WIN32_URL/pango/1.22/pango-dev_1.22.2-1_win32.zip"
+set_default EXPAT_URL "$GNOME_WIN32_DEPS_URL/expat_2.0.1-1_win32.zip"
+set_default EXPAT_DEV_URL "$GNOME_WIN32_DEPS_URL/expat-dev_2.0.1-1_win32.zip"
+set_default FONTCONFIG_URL "$GNOME_WIN32_DEPS_URL/fontconfig_2.8.0-2_win32.zip"
+set_default FONTCONFIG_DEV_URL "$GNOME_WIN32_DEPS_URL/fontconfig-dev_2.8.0-2_win32.zip"
+set_default FREETYPE_URL "$GNOME_WIN32_DEPS_URL/freetype_2.3.11-2_win32.zip"
+set_default FREETYPE_DEV_URL "$GNOME_WIN32_DEPS_URL/freetype-dev_2.3.11-2_win32.zip"
+set_default ATK_URL "$GNOME_WIN32_URL/atk/1.28/atk_1.28.0-1_win32.zip"
+set_default ATK_DEV_URL "$GNOME_WIN32_URL/atk/1.28/atk-dev_1.28.0-1_win32.zip"
+set_default PANGO_URL "$GNOME_WIN32_URL/pango/1.26/pango_1.26.2-1_win32.zip"
+set_default PANGO_DEV_URL "$GNOME_WIN32_URL/pango/1.26/pango-dev_1.26.2-1_win32.zip"
set_default LIBART_LGPL_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart_lgpl-2.3.20.zip"
set_default LIBART_LGPL_DEV_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart_lgpl-dev-2.3.20.zip"
-set_default GTK_URL "$GNOME_WIN32_URL/gtk+/2.14/gtk+_2.14.7-1_win32.zip"
-set_default GTK_DEV_URL "$GNOME_WIN32_URL/gtk+/2.14/gtk+-dev_2.14.7-1_win32.zip"
+set_default GTK_URL "$GNOME_WIN32_URL/gtk+/2.18/gtk+_2.18.7-1_win32.zip"
+set_default GTK_DEV_URL "$GNOME_WIN32_URL/gtk+/2.18/gtk+-dev_2.18.7-1_win32.zip"
set_default INTLTOOL_URL "$GNOME_WIN32_URL/intltool/0.40/intltool_0.40.4-1_win32.zip"
set_default ORBIT2_URL "$GNOME_WIN32_URL/ORBit2/2.14/ORBit2-2.14.13.zip"
set_default ORBIT2_DEV_URL "$GNOME_WIN32_URL/ORBit2/2.14/ORBit2-dev-2.14.13.zip"
@@ -202,8 +205,8 @@ set_default LIBBONOBO_DEV_URL "$GNOME_WIN32_URL/libbonobo/2.24/libbonobo-dev_2.2
# work-around #504261, GetVolumePathNamesForVolumeNameW missing on Win2k
set_default GNOME_VFS_URL "$GNOME_WIN32_URL/gnome-vfs/2.14/gnome-vfs-2.14.2-no-openssl.zip"
set_default GNOME_VFS_DEV_URL "$GNOME_WIN32_URL/gnome-vfs/2.14/gnome-vfs-dev-2.14.2-no-openssl.zip"
-#set_default GNOME_VFS_URL "$GNOME_WIN32_URL/gnome-vfs/2.24/gnome-vfs_2.24.0-1_win32.zip"
-#set_default GNOME_VFS_DEV_URL "$GNOME_WIN32_URL/gnome-vfs/2.24/gnome-vfs-dev_2.24.0-1_win32.zip"
+#set_default GNOME_VFS_URL "$GNOME_WIN32_URL/gnome-vfs/2.24/gnome-vfs_2.24.1-1_win32.zip"
+#set_default GNOME_VFS_DEV_URL "$GNOME_WIN32_URL/gnome-vfs/2.24/gnome-vfs-dev_2.24.1-1_win32.zip"
set_default LIBGNOME_URL "$GNOME_WIN32_URL/libgnome/2.24/libgnome_2.24.1-1_win32.zip"
set_default LIBGNOME_DEV_URL "$GNOME_WIN32_URL/libgnome/2.24/libgnome-dev_2.24.1-1_win32.zip"
set_default LIBGNOMECANVAS_URL "$GNOME_WIN32_URL/libgnomecanvas/2.20/libgnomecanvas-2.20.1.zip"
@@ -212,8 +215,8 @@ set_default LIBBONOBOUI_URL "$GNOME_WIN32_URL/libbonoboui/2.24/libbonoboui_2.24.
set_default LIBBONOBOUI_DEV_URL "$GNOME_WIN32_URL/libbonoboui/2.24/libbonoboui-dev_2.24.0-1_win32.zip"
set_default LIBGNOMEUI_URL "$GNOME_WIN32_URL/libgnomeui/2.22/libgnomeui-2.22.1.zip"
set_default LIBGNOMEUI_DEV_URL "$GNOME_WIN32_URL/libgnomeui/2.22/libgnomeui-dev-2.22.1.zip"
-set_default LIBGLADE_URL "$GNOME_WIN32_URL/libglade/2.6/libglade_2.6.3-1_win32.zip"
-set_default LIBGLADE_DEV_URL "$GNOME_WIN32_URL/libglade/2.6/libglade-dev_2.6.3-1_win32.zip"
+set_default LIBGLADE_URL "$GNOME_WIN32_URL/libglade/2.6/libglade_2.6.4-1_win32.zip"
+set_default LIBGLADE_DEV_URL "$GNOME_WIN32_URL/libglade/2.6/libglade-dev_2.6.4-1_win32.zip"
set_default GTKHTML_URL "$GNOME_WIN32_URL/gtkhtml/3.24/gtkhtml_3.24.2-1_win32.zip"
set_default GTKHTML_DEV_URL "$GNOME_WIN32_URL/gtkhtml/3.24/gtkhtml-dev_3.24.2-1_win32.zip"
set_default GTK_DOC_URL "$GNOME_MIRROR/sources/gtk-doc/1.11/gtk-doc-1.11.tar.bz2"
@@ -226,12 +229,12 @@ set_default PCRE_BIN_URL "$SF_MIRROR/gnuwin32/pcre-7.0-bin.zip"
set_default PCRE_LIB_URL "$SF_MIRROR/gnuwin32/pcre-7.0-lib.zip"
set_default PCRE_DIR $GLOBAL_DIR\\pcre
-set_default LIBGSF_URL "$GNOME_MIRROR/sources/libgsf/1.14/libgsf-1.14.11.tar.bz2"
+set_default LIBGSF_URL "$GNOME_MIRROR/sources/libgsf/1.14/libgsf-1.14.15.tar.bz2"
set_default LIBGSF_DIR $GLOBAL_DIR\\libgsf
-set_default GOFFICE_URL "$GNOME_MIRROR/sources/goffice/0.7/goffice-0.7.2.tar.bz2"
+set_default GOFFICE_URL "$GNOME_MIRROR/sources/goffice/0.7/goffice-0.7.17.tar.bz2"
set_default GOFFICE_DIR $GLOBAL_DIR\\goffice
-set_default GOFFICE_PATCH `pwd`/goffice-0.7.2-patch.diff
+#set_default GOFFICE_PATCH `pwd`/goffice-0.7.2-patch.diff
set_default GLADE_URL "$GNOME_MIRROR/sources/glade3/3.0/glade3-3.1.2.tar.bz2"
set_default GLADE_DIR $GLOBAL_DIR\\glade
diff --git a/install.sh b/install.sh
index 6b3de34..cdc7f3a 100755
--- a/install.sh
+++ b/install.sh
@@ -536,6 +536,7 @@ function inst_gnome() {
wget_unpacked $GLIB_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GLIB_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBJPEG_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $LIBJPEG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBPNG_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBPNG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBTIFF_URL $DOWNLOAD_DIR $GNOME_DIR
@@ -543,9 +544,11 @@ function inst_gnome() {
wget_unpacked $ZLIB_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $ZLIB_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $PKG_CONFIG_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $PKG_CONFIG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $CAIRO_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $CAIRO_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $EXPAT_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $EXPAT_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $FONTCONFIG_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $FONTCONFIG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $FREETYPE_URL $DOWNLOAD_DIR $GNOME_DIR
commit 2c6b0a61be12b0e417920ea7fa62357561a45799
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Feb 16 14:39:40 2010 +0000
Revert r18654.
Current GtkHtml implementation crashes the windows build whenever a report is opened.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18660 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index badc20c..7d3e43f 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -355,7 +355,7 @@ add_step inst_gwenhywfar
add_step inst_ktoblzcheck
add_step inst_aqbanking
add_step inst_libdbi
-#add_step inst_webkit
+add_step inst_webkit
##
if [ "$UPDATE_SOURCES" = "yes" ]; then
add_step svn_up
diff --git a/dist.sh b/dist.sh
index 1d056af..043806d 100755
--- a/dist.sh
+++ b/dist.sh
@@ -300,7 +300,7 @@ dist_gwenhywfar
dist_ktoblzcheck
dist_aqbanking
dist_libdbi
-#dist_webkit
+dist_webkit
dist_gnucash
finish
qpopd
diff --git a/install.sh b/install.sh
index 3a92d77..6b3de34 100755
--- a/install.sh
+++ b/install.sh
@@ -1236,7 +1236,7 @@ function inst_gnucash() {
${AQBANKING_OPTIONS} \
--enable-binreloc \
--enable-locale-specific-tax \
- --with-html-engine=gtkhtml \
+ --with-html-engine=webkit \
CPPFLAGS="${AUTOTOOLS_CPPFLAGS} ${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GUILE_CPPFLAGS} ${LIBDBI_CPPFLAGS} ${KTOBLZCHECK_CPPFLAGS} ${HH_CPPFLAGS} -D_WIN32" \
LDFLAGS="${AUTOTOOLS_LDFLAGS} ${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} ${HH_LDFLAGS}" \
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
commit 4f513bc1d92af66c89ef11e22c8cc2404fc8501d
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat Feb 13 15:56:43 2010 +0000
Use gtkhtml as html render in the Windows build
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18654 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 7d3e43f..badc20c 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -355,7 +355,7 @@ add_step inst_gwenhywfar
add_step inst_ktoblzcheck
add_step inst_aqbanking
add_step inst_libdbi
-add_step inst_webkit
+#add_step inst_webkit
##
if [ "$UPDATE_SOURCES" = "yes" ]; then
add_step svn_up
diff --git a/dist.sh b/dist.sh
index 043806d..1d056af 100755
--- a/dist.sh
+++ b/dist.sh
@@ -300,7 +300,7 @@ dist_gwenhywfar
dist_ktoblzcheck
dist_aqbanking
dist_libdbi
-dist_webkit
+#dist_webkit
dist_gnucash
finish
qpopd
diff --git a/install.sh b/install.sh
index 6b3de34..3a92d77 100755
--- a/install.sh
+++ b/install.sh
@@ -1236,7 +1236,7 @@ function inst_gnucash() {
${AQBANKING_OPTIONS} \
--enable-binreloc \
--enable-locale-specific-tax \
- --with-html-engine=webkit \
+ --with-html-engine=gtkhtml \
CPPFLAGS="${AUTOTOOLS_CPPFLAGS} ${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GUILE_CPPFLAGS} ${LIBDBI_CPPFLAGS} ${KTOBLZCHECK_CPPFLAGS} ${HH_CPPFLAGS} -D_WIN32" \
LDFLAGS="${AUTOTOOLS_LDFLAGS} ${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} ${HH_LDFLAGS}" \
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
commit 8db22f1b45bbfa4ea882ffda8ce8d5e15edc9d89
Author: Christian Stimming <stimming at tuhh.de>
Date: Wed Feb 10 19:26:06 2010 +0000
Win32: Fix building of libgoffice.
Required libgsf to not remove the build directory, hence part
of r18559 need to be reverted.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18633 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index eaab487..6b3de34 100755
--- a/install.sh
+++ b/install.sh
@@ -692,7 +692,6 @@ function inst_libgsf() {
make install
qpopd
${PKG_CONFIG} --exists libgsf-1 libgsf-gnome-1 || die "libgsf not installed correctly"
- rm -rf ${TMP_UDIR}/libgsf-*
fi
}
@@ -701,7 +700,7 @@ function inst_goffice() {
_GOFFICE_UDIR=`unix_path $GOFFICE_DIR`
add_to_env $_GOFFICE_UDIR/bin PATH
add_to_env $_GOFFICE_UDIR/lib/pkgconfig PKG_CONFIG_PATH
- if quiet ${PKG_CONFIG} --exists libgoffice-0.8 && [ -f $_GOFFICE_UDIR/bin/libgoffice*.dll ]
+ if quiet ${PKG_CONFIG} --exists libgoffice-0.8
then
echo "goffice already installed. skipping."
else
@@ -725,6 +724,7 @@ function inst_goffice() {
qpopd
${PKG_CONFIG} --exists libgoffice-0.8 && [ -f $_GOFFICE_UDIR/bin/libgoffice*.dll ] || die "goffice not installed correctly"
rm -rf ${TMP_UDIR}/goffice-*
+ rm -rf ${TMP_UDIR}/libgsf-*
fi
}
commit 5708ab03ada2a7fb165a5c962e2be29c196c8b27
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Feb 9 13:14:32 2010 +0000
Bug #609402 Add Japanese resource to Windows (inno) setup
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18629 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/Japanese-5-5.1.11.isl b/Japanese-5-5.1.11.isl
new file mode 100644
index 0000000..6982bb9
--- /dev/null
+++ b/Japanese-5-5.1.11.isl
@@ -0,0 +1,312 @@
+; *** Inno Setup version 5.1.11+ Japanese messages ***
+;
+; Translated by Ryou Minakami (ryou32jp at yahoo.co.jp)
+; Fixes and updates: Koichi Shirasuka (shirasuka at eugrid.co.jp)
+;
+; $jrsoftware: issrc/Files/Default.isl,v 1.66 2005/02/25 20:23:48 mlaan Exp $
+
+[LangOptions]
+LanguageName=Japanese
+LanguageID=$0411
+LanguageCodePage=932
+
+; If you don't need to support Windows 9x, commenting the following 4 lines gives better looking (banners not stretched).
+DialogFontName=‚l‚r ‚oƒSƒVƒbƒN
+DialogFontSize=9
+TitleFontName=‚l‚r ‚oƒSƒVƒbƒN
+TitleFontSize=29
+
+; Required for Win2K/older to display the welcome message with correct font.
+WelcomeFontName=‚l‚r ‚oƒSƒVƒbƒN
+WelcomeFontSize=12
+
+[Messages]
+
+; *** Application titles
+SetupAppTitle=ƒZƒbƒgƒAƒbƒv
+SetupWindowTitle=%1 ƒZƒbƒgƒAƒbƒv
+UninstallAppTitle=ƒAƒ“ƒCƒ“ƒXƒg[ƒ‹
+UninstallAppFullTitle=%1 ƒAƒ“ƒCƒ“ƒXƒg[ƒ‹
+
+; *** Misc. common
+InformationTitle=î•ñ
+ConfirmTitle=Šm”F
+ErrorTitle=ƒGƒ‰[
+
+; *** SetupLdr messages
+SetupLdrStartupMessage=%1 ‚ðƒCƒ“ƒXƒg[ƒ‹‚µ‚Ü‚·B‘±s‚µ‚Ü‚·‚©H
+LdrCannotCreateTemp=ˆêŽžƒtƒ@ƒCƒ‹‚ð쬂ł«‚Ü‚¹‚ñBƒZƒbƒgƒAƒbƒv‚𒆎~‚µ‚Ü‚·B
+LdrCannotExecTemp=ˆêŽžƒtƒHƒ‹ƒ_‚̃tƒ@ƒCƒ‹‚ðŽÀs‚Å‚«‚Ü‚¹‚ñBƒZƒbƒgƒAƒbƒv‚𒆎~‚µ‚Ü‚·B
+
+; *** Startup error messages
+LastErrorMessage=%1.%n%nƒGƒ‰[ %2: %3
+SetupFileMissing=ƒtƒ@ƒCƒ‹ %1 ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñB–â‘è‚ð‰ðŒˆ‚·‚é‚©V‚µ‚¢ƒZƒbƒgƒAƒbƒvƒvƒƒOƒ‰ƒ€‚ð“üŽè‚µ‚Ä‚‚¾‚³‚¢B
+SetupFileCorrupt=ƒZƒbƒgƒAƒbƒvƒtƒ@ƒCƒ‹‚ª‰ó‚ê‚Ä‚¢‚Ü‚·BV‚µ‚¢ƒZƒbƒgƒAƒbƒvƒvƒƒOƒ‰ƒ€‚ð“üŽè‚µ‚Ä‚‚¾‚³‚¢B
+SetupFileCorruptOrWrongVer=ƒZƒbƒgƒAƒbƒvƒtƒ@ƒCƒ‹‚ª‰ó‚ê‚Ä‚¢‚é‚©A‚±‚̃o[ƒWƒ‡ƒ“‚̃ZƒbƒgƒAƒbƒv‚ƌ݊·«‚ª‚ ‚è‚Ü‚¹‚ñB–â‘è‚ð‰ðŒˆ‚·‚é‚©V‚µ‚¢ƒZƒbƒgƒAƒbƒvƒvƒƒOƒ‰ƒ€‚ð“üŽè‚µ‚Ä‚‚¾‚³‚¢B
+NotOnThisPlatform=‚±‚̃vƒƒOƒ‰ƒ€‚Í %1 ‚Å‚Í“®ì‚µ‚Ü‚¹‚ñB
+OnlyOnThisPlatform=‚±‚̃vƒƒOƒ‰ƒ€‚ÌŽÀs‚É‚Í %1 ‚ª•K—v‚Å‚·B
+OnlyOnTheseArchitectures=‚±‚̃vƒƒOƒ‰ƒ€‚Í%n%n%1ƒvƒƒZƒbƒTŒü‚¯‚ÌWindows‚É‚µ‚©ƒCƒ“ƒXƒg[ƒ‹‚Å‚«‚Ü‚¹‚ñB
+MissingWOW64APIs=ŒäŽg—p’†‚Ì64-bit”ÅWindows‚É‚Í‚±‚̃vƒƒOƒ‰ƒ€‚ðƒCƒ“ƒXƒg[ƒ‹‚µA“®ì‚³‚¹‚éˆ×‚É•K—v‚È‹@”\‚ªŠÜ‚Ü‚ê‚Ä‚¢‚Ü‚¹‚ñB‚±‚Ì–â‘è‚ðC³‚·‚éˆ×‚ɂ̓T[ƒrƒXƒpƒbƒN%1‚ðƒCƒ“ƒXƒg[ƒ‹‚µ‚Ä‚‚¾‚³‚¢B
+WinVersionTooLowError=‚±‚̃vƒƒOƒ‰ƒ€‚ÌŽÀs‚É‚Í %1 %2 ˆÈ~‚ª•K—v‚Å‚·B
+WinVersionTooHighError=‚±‚̃vƒƒOƒ‰ƒ€‚Í %1 %2 ˆÈ~‚Å‚Í“®ì‚µ‚Ü‚¹‚ñB
+AdminPrivilegesRequired=‚±‚̃vƒƒOƒ‰ƒ€‚ðƒCƒ“ƒXƒg[ƒ‹‚·‚邽‚ß‚É‚ÍŠÇ—ŽÒ‚Æ‚µ‚ăƒOƒCƒ“‚·‚é•K—v‚ª‚ ‚è‚Ü‚·B
+PowerUserPrivilegesRequired=‚±‚̃vƒƒOƒ‰ƒ€‚ðƒCƒ“ƒXƒg[ƒ‹‚·‚邽‚ß‚É‚ÍŠÇ—ŽÒ‚Ü‚½‚̓pƒ[ƒ†[ƒU[‚Æ‚µ‚ăƒOƒCƒ“‚·‚é•K—v‚ª‚ ‚è‚Ü‚·B
+SetupAppRunningError=ƒZƒbƒgƒAƒbƒv‚ÍŽÀs’†‚Ì %1 ‚ðŒŸo‚µ‚Ü‚µ‚½B%n%nŠJ‚¢‚Ä‚¢‚éƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚ð‚·‚×‚Ä•Â‚¶‚Ä‚©‚çuOKv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢BuƒLƒƒƒ“ƒZƒ‹v‚ðƒNƒŠƒbƒN‚·‚é‚ÆAƒZƒbƒgƒAƒbƒv‚ðI—¹‚µ‚Ü‚·B
+UninstallAppRunningError=ƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚ÍŽÀs’†‚Ì %1 ‚ðŒŸo‚µ‚Ü‚µ‚½B%n%nŠJ‚¢‚Ä‚¢‚éƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚ð‚·‚×‚Ä•Â‚¶‚Ä‚©‚çuOKv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢BuƒLƒƒƒ“ƒZƒ‹v‚ðƒNƒŠƒbƒN‚·‚é‚ÆAƒZƒbƒgƒAƒbƒv‚ðI—¹‚µ‚Ü‚·B
+
+; *** Misc. errors
+ErrorCreatingDir=ƒfƒBƒŒƒNƒgƒŠ %1 ‚ð쬒†‚ɃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B
+ErrorTooManyFilesInDir=ƒfƒBƒŒƒNƒgƒŠ %1 ‚Ƀtƒ@ƒCƒ‹‚ð쬒†‚ɃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½Bƒtƒ@ƒCƒ‹‚Ì”‚ª‘½‚·‚¬‚Ü‚·B
+
+; *** Setup common messages
+ExitSetupTitle=ƒZƒbƒgƒAƒbƒvI—¹
+ExitSetupMessage=ƒZƒbƒgƒAƒbƒvì‹Æ‚ÍŠ®—¹‚µ‚Ä‚¢‚Ü‚¹‚ñB‚±‚±‚ŃZƒbƒgƒAƒbƒv‚𒆎~‚·‚é‚ƃvƒƒOƒ‰ƒ€‚̓Cƒ“ƒXƒg[ƒ‹‚³‚ê‚Ü‚¹‚ñB%n%n‰ü‚߂ăCƒ“ƒXƒg[ƒ‹‚·‚éꇂÍA‚à‚¤ˆê“xƒZƒbƒgƒAƒbƒv‚ðŽÀs‚µ‚Ä‚‚¾‚³‚¢B%n%nƒZƒbƒgƒAƒbƒv‚ðI—¹‚µ‚Ü‚·‚©H
+AboutSetupMenuItem=ƒZƒbƒgƒAƒbƒv‚ɂ‚¢‚Ä(&A)...
+AboutSetupTitle=ƒZƒbƒgƒAƒbƒv‚ɂ‚¢‚Ä
+AboutSetupMessage=%1 %2%n%3%n%n%1 ƒz[ƒ€ƒy[ƒW:%n%4
+AboutSetupNote=
+TranslatorNote=
+
+; *** Buttons
+ButtonBack=< –ß‚é(&B)
+ButtonNext=ŽŸ‚Ö(&N) >
+ButtonInstall=ƒCƒ“ƒXƒg[ƒ‹(&I)
+ButtonOK=OK
+ButtonCancel=ƒLƒƒƒ“ƒZƒ‹
+ButtonYes=‚Í‚¢(&Y)
+ButtonYesToAll=‚·‚ׂĂ͂¢(&A)
+ButtonNo=‚¢‚¢‚¦(&N)
+ButtonNoToAll=‚·‚ׂĂ¢‚¢‚¦(&O)
+ButtonFinish=Š®—¹(&F)
+ButtonBrowse=ŽQÆ(&B)...
+ButtonWizardBrowse=ŽQÆ(&r)
+ButtonNewFolder=V‚µ‚¢ƒtƒHƒ‹ƒ_(&M)
+
+; *** "Select Language" dialog messages
+SelectLanguageTitle=ƒZƒbƒgƒAƒbƒv‚ÉŽg—p‚·‚錾Œê‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B
+SelectLanguageLabel=ƒCƒ“ƒXƒg[ƒ‹’†‚É—˜—p‚·‚錾Œê‚ðï‚Ñ‚Ü‚·:
+
+; *** Common wizard text
+ClickNext=‘±s‚·‚é‚É‚ÍuŽŸ‚ÖvAƒZƒbƒgƒAƒbƒv‚ðI—¹‚·‚é‚É‚ÍuƒLƒƒƒ“ƒZƒ‹v‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
+BeveledLabel=
+BrowseDialogTitle=ƒtƒHƒ‹ƒ_ŽQÆ
+BrowseDialogLabel=ƒŠƒXƒg‚©‚çƒtƒHƒ‹ƒ_‚ð‘I‚ÑOK‚ð‰Ÿ‚µ‚Ä‚‚¾‚³‚¢B
+NewFolderName=V‚µ‚¢ƒtƒHƒ‹ƒ_
+
+; *** "Welcome" wizard page
+WelcomeLabel1=[name] ƒZƒbƒgƒAƒbƒvƒEƒBƒU[ƒh‚ÌŠJŽn
+WelcomeLabel2=‚±‚̃vƒƒOƒ‰ƒ€‚Í‚²Žg—p‚̃Rƒ“ƒsƒ…[ƒ^‚Ö [name/ver] ‚ðƒCƒ“ƒXƒg[ƒ‹‚µ‚Ü‚·B%n%n‘±s‚·‚é‘O‚É‘¼‚̃AƒvƒŠƒP[ƒVƒ‡ƒ“‚ð‚·‚×‚ÄI—¹‚µ‚Ä‚‚¾‚³‚¢B
+
+; *** "Password" wizard page
+WizardPassword=ƒpƒXƒ[ƒh
+PasswordLabel1=‚±‚̃Cƒ“ƒXƒg[ƒ‹ƒvƒƒOƒ‰ƒ€‚̓pƒXƒ[ƒh‚É‚æ‚Á‚ĕی삳‚ê‚Ä‚¢‚Ü‚·B
+PasswordLabel3=ƒpƒXƒ[ƒh‚ð“ü—Í‚µ‚ÄuŽŸ‚Öv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢BƒpƒXƒ[ƒh‚͑啶Žš‚Ƭ•¶Žš‚ª‹æ•Ê‚³‚ê‚Ü‚·B
+PasswordEditLabel=ƒpƒXƒ[ƒh(&P):
+IncorrectPassword=“ü—Í‚³‚ꂽƒpƒXƒ[ƒh‚ª³‚µ‚‚ ‚è‚Ü‚¹‚ñB‚à‚¤ˆê“x“ü—Í‚µ‚È‚¨‚µ‚Ä‚‚¾‚³‚¢B
+
+; *** "License Agreement" wizard page
+WizardLicense=Žg—p‹–‘øŒ_–ñ‘‚Ì“¯ˆÓ
+LicenseLabel=‘±s‚·‚é‘O‚Ɉȉº‚Ìd—v‚Èî•ñ‚ð‚¨“Ç‚Ý‚‚¾‚³‚¢B
+LicenseLabel3=ˆÈ‰º‚ÌŽg—p‹–‘øŒ_–ñ‘‚ð‚¨“Ç‚Ý‚‚¾‚³‚¢BƒCƒ“ƒXƒg[ƒ‹‚ð‘±s‚·‚é‚É‚Í‚±‚ÌŒ_–ñ‘‚É“¯ˆÓ‚·‚é•K—v‚ª‚ ‚è‚Ü‚·B
+LicenseAccepted=“¯ˆÓ‚·‚é(&A)
+LicenseNotAccepted=“¯ˆÓ‚µ‚È‚¢(&D)
+
+; *** "Information" wizard pages
+WizardInfoBefore=î•ñ
+InfoBeforeLabel=‘±s‚·‚é‘O‚Ɉȉº‚Ìd—v‚Èî•ñ‚ð‚¨“Ç‚Ý‚‚¾‚³‚¢B
+InfoBeforeClickLabel=ƒZƒbƒgƒAƒbƒv‚ð‘±s‚·‚é‚É‚ÍuŽŸ‚Öv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
+WizardInfoAfter=î•ñ
+InfoAfterLabel=‘±s‚·‚é‘O‚Ɉȉº‚Ìd—v‚Èî•ñ‚ð‚¨“Ç‚Ý‚‚¾‚³‚¢B
+InfoAfterClickLabel=ƒZƒbƒgƒAƒbƒv‚ð‘±s‚·‚é‚É‚ÍuŽŸ‚Öv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
+
+; *** "User Information" wizard page
+WizardUserInfo=ƒ†[ƒU[î•ñ
+UserInfoDesc=ƒ†[ƒU[î•ñ‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B
+UserInfoName=ƒ†[ƒU[–¼(&U):
+UserInfoOrg=‘gD(&O):
+UserInfoSerial=ƒVƒŠƒAƒ‹”Ô†(&S):
+UserInfoNameRequired=ƒ†[ƒU[–¼‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B
+
+; *** "Select Destination Location" wizard page
+WizardSelectDir=ƒCƒ“ƒXƒg[ƒ‹æ‚ÌŽw’è
+SelectDirDesc=[name] ‚̃Cƒ“ƒXƒg[ƒ‹æ‚ðŽw’肵‚Ä‚‚¾‚³‚¢B
+SelectDirLabel3=[name] ‚ðƒCƒ“ƒXƒg[ƒ‹‚·‚éƒtƒHƒ‹ƒ_‚ðŽw’肵‚ÄAuŽŸ‚Öv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
+SelectDirBrowseLabel=‘±‚¯‚é‚É‚ÍuŽŸ‚Öv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B•Ê‚̃tƒHƒ‹ƒ_‚ð‘I‘ð‚·‚é‚É‚ÍuŽQÆv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
+DiskSpaceMBLabel=‚±‚̃vƒƒOƒ‰ƒ€‚ÍÅ’á [mb] MB‚̃fƒBƒXƒN‹ó‚«—̈æ‚ð•K—v‚Æ‚µ‚Ü‚·B
+ToUNCPathname=ƒZƒbƒgƒAƒbƒv‚ÍUNCƒtƒHƒ‹ƒ_‚ɃCƒ“ƒXƒg[ƒ‹‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñBƒlƒbƒgƒ[ƒN‚ɃCƒ“ƒXƒg[ƒ‹‚·‚éꇂ̓lƒbƒgƒ[ƒNƒhƒ‰ƒCƒu‚ÉŠ„‚è“–‚Ä‚Ä‚‚¾‚³‚¢B
+InvalidPath=ƒhƒ‰ƒCƒu•¶Žš‚ðŠÜ‚ÞŠ®‘S‚ȃpƒX‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B%n%n—áFC:\APP%n%n‚Ü‚½‚ÍUNCŒ`Ž®‚̃pƒX‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B%n%n—áF\\server\share
+InvalidDrive=Žw’肵‚½ƒhƒ‰ƒCƒu‚Ü‚½‚ÍUNCƒpƒX‚ªŒ©‚‚©‚ç‚È‚¢‚©ƒAƒNƒZƒX‚Å‚«‚Ü‚¹‚ñB•Ê‚̃pƒX‚ðŽw’肵‚Ä‚‚¾‚³‚¢B
+DiskSpaceWarningTitle=ƒfƒBƒXƒN‹ó‚«—̈æ‚Ì•s‘«
+DiskSpaceWarning=ƒCƒ“ƒXƒg[ƒ‹‚É‚ÍÅ’á %1 KB‚̃fƒBƒXƒN‹ó‚«—̈悪•K—v‚Å‚·‚ªAŽw’肳‚ꂽƒhƒ‰ƒCƒu‚É‚Í %2 KB‚̋󂫗̈悵‚©‚ ‚è‚Ü‚¹‚ñB%n%n‚±‚Ì‚Ü‚Ü‘±s‚µ‚Ü‚·‚©H
+DirNameTooLong=ƒhƒ‰ƒCƒu–¼–”‚̓pƒX‚ª’·‰ß‚¬‚Ü‚·B
+InvalidDirName=ƒtƒHƒ‹ƒ_–¼‚ª–³Œø‚Å‚·B
+BadDirName32=ˆÈ‰º‚Ì•¶Žš‚ðŠÜ‚ÞƒtƒHƒ‹ƒ_–¼‚ÍŽw’è‚Å‚«‚Ü‚¹‚ñB:%n%n%1
+DirExistsTitle=Šù‘¶‚̃tƒHƒ‹ƒ_
+DirExists=ƒtƒHƒ‹ƒ_ %n%n%1%n%n‚ªŠù‚É‘¶Ý‚µ‚Ü‚·B‚±‚Ì‚Ü‚Ü‚±‚̃tƒHƒ‹ƒ_‚ÖƒCƒ“ƒXƒg[ƒ‹‚µ‚Ü‚·‚©H
+DirDoesntExistTitle=ƒtƒHƒ‹ƒ_‚ªŒ©‚‚©‚è‚Ü‚¹‚ñB
+DirDoesntExist=ƒtƒHƒ‹ƒ_ %n%n%1%n%n‚ªŒ©‚‚©‚è‚Ü‚¹‚ñBV‚µ‚¢ƒtƒHƒ‹ƒ_‚ð쬂µ‚Ü‚·‚©H
+
+; *** "Select Components" wizard page
+WizardSelectComponents=ƒRƒ“ƒ|[ƒlƒ“ƒg‚Ì‘I‘ð
+SelectComponentsDesc=ƒCƒ“ƒXƒg[ƒ‹ƒRƒ“ƒ|[ƒlƒ“ƒg‚ð‘I‘ð‚µ‚Ä‚‚¾‚³‚¢B
+SelectComponentsLabel2=ƒCƒ“ƒXƒg[ƒ‹‚·‚éƒRƒ“ƒ|[ƒlƒ“ƒg‚ð‘I‘ð‚µ‚Ä‚‚¾‚³‚¢BƒCƒ“ƒXƒg[ƒ‹‚·‚é•K—v‚Ì‚È‚¢ƒRƒ“ƒ|[ƒlƒ“ƒg‚̓`ƒFƒbƒN‚ðŠO‚µ‚Ä‚‚¾‚³‚¢B‘±s‚·‚é‚É‚ÍuŽŸ‚Öv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
+FullInstallation=ƒtƒ‹ƒCƒ“ƒXƒg[ƒ‹
+; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
+CompactInstallation=ƒRƒ“ƒpƒNƒgƒCƒ“ƒXƒg[ƒ‹
+CustomInstallation=ƒJƒXƒ^ƒ€ƒCƒ“ƒXƒg[ƒ‹
+NoUninstallWarningTitle=Šù‘¶‚̃Rƒ“ƒ|[ƒlƒ“ƒg
+NoUninstallWarning=ƒZƒbƒgƒAƒbƒv‚͈ȉº‚̃Rƒ“ƒ|[ƒlƒ“ƒg‚ªŠù‚ɃCƒ“ƒXƒg[ƒ‹‚³‚ê‚Ä‚¢‚邱‚Æ‚ðŒŸo‚µ‚Ü‚µ‚½B%n%n%1%n%n‚±‚ê‚ç‚̃Rƒ“ƒ|[ƒlƒ“ƒg‚Ì‘I‘ð‚ð‰ðœ‚µ‚Ä‚àƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚Í‚³‚ê‚Ü‚¹‚ñB%n%n‚±‚Ì‚Ü‚Ü‘±s‚µ‚Ü‚·‚©H
+ComponentSize1=%1 KB
+ComponentSize2=%1 MB
+ComponentsDiskSpaceMBLabel=Œ»Ý‚Ì‘I‘ð‚ÍÅ’á [mb] MB‚̃fƒBƒXƒN‹ó‚«—̈æ‚ð•K—v‚Æ‚µ‚Ü‚·B
+
+; *** "Select Additional Tasks" wizard page
+WizardSelectTasks=’ljÁƒ^ƒXƒN‚Ì‘I‘ð
+SelectTasksDesc=ŽÀs‚·‚é’ljÁƒ^ƒXƒN‚ð‘I‘ð‚µ‚Ä‚‚¾‚³‚¢B
+SelectTasksLabel2=[name] ƒCƒ“ƒXƒg[ƒ‹Žž‚ÉŽÀs‚·‚é’ljÁƒ^ƒXƒN‚ð‘I‘ð‚µ‚ÄAuŽŸ‚Öv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
+
+; *** "Select Start Menu Folder" wizard page
+WizardSelectProgramGroup=ƒvƒƒOƒ‰ƒ€ƒOƒ‹[ƒv‚ÌŽw’è
+SelectStartMenuFolderDesc=ƒvƒƒOƒ‰ƒ€ƒAƒCƒRƒ“‚ð쬂·‚éꊂðŽw’肵‚Ä‚‚¾‚³‚¢B
+SelectStartMenuFolderLabel3=ƒZƒbƒgƒAƒbƒv‚̓Xƒ^[ƒgƒƒjƒ…[‚ɃvƒƒOƒ‰ƒ€‚̃Vƒ‡[ƒgƒJƒbƒg‚ð쬂µ‚Ü‚·B
+SelectStartMenuFolderBrowseLabel=‘±‚¯‚é‚É‚ÍuŽŸ‚Öv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢Bˆá‚¤ƒfƒBƒŒƒNƒgƒŠ‚ð‘I‘ð‚·‚é‚É‚ÍuŽQÆv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
+MustEnterGroupName=ƒOƒ‹[ƒv–¼‚ðŽw’肵‚Ä‚‚¾‚³‚¢B
+GroupNameTooLong=ƒtƒHƒ‹ƒ_–¼–”‚̓pƒX‚ª’·‰ß‚¬‚Ü‚·B
+InvalidGroupName=ƒOƒ‹[ƒv–¼‚ª–³Œø‚Å‚·B
+BadGroupName=ˆÈ‰º‚Ì•¶Žš‚ðŠÜ‚ÞƒOƒ‹[ƒv–¼‚ÍŽw’è‚Å‚«‚Ü‚¹‚ñB:%n%n%1
+NoProgramGroupCheck2=ƒvƒƒOƒ‰ƒ€ƒOƒ‹[ƒv‚ð쬂µ‚È‚¢(&D)
+
+; *** "Ready to Install" wizard page
+WizardReady=ƒCƒ“ƒXƒg[ƒ‹€”õŠ®—¹
+ReadyLabel1=‚²Žg—p‚̃Rƒ“ƒsƒ…[ƒ^‚Ö [name] ‚ðƒCƒ“ƒXƒg[ƒ‹‚·‚途õ‚ª‚Å‚«‚Ü‚µ‚½B
+ReadyLabel2a=ƒCƒ“ƒXƒg[ƒ‹‚ð‘±s‚·‚é‚É‚ÍuƒCƒ“ƒXƒg[ƒ‹v‚ðAÝ’è‚ÌŠm”F‚â•ÏX‚ðs‚¤‚É‚Íu–ß‚év‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
+ReadyLabel2b=ƒCƒ“ƒXƒg[ƒ‹‚ð‘±s‚·‚é‚É‚ÍuƒCƒ“ƒXƒg[ƒ‹v‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
+ReadyMemoUserInfo=ƒ†[ƒU[î•ñ:
+ReadyMemoDir=ƒCƒ“ƒXƒg[ƒ‹æ:
+ReadyMemoType=ƒZƒbƒgƒAƒbƒv‚ÌŽí—Þ:
+ReadyMemoComponents=‘I‘ðƒRƒ“ƒ|[ƒlƒ“ƒg:
+ReadyMemoGroup=ƒvƒƒOƒ‰ƒ€ƒOƒ‹[ƒv:
+ReadyMemoTasks=’ljÁƒ^ƒXƒNˆê——:
+
+; *** "Preparing to Install" wizard page
+WizardPreparing=ƒCƒ“ƒXƒg[ƒ‹€”õ’†
+PreparingDesc=‚²Žg—p‚̃Rƒ“ƒsƒ…[ƒ^‚Ö [name] ‚ðƒCƒ“ƒXƒg[ƒ‹‚·‚途õ‚ð‚µ‚Ä‚¢‚Ü‚·B
+PreviousInstallNotCompleted=‘O‰ñs‚Á‚½ƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚̃Cƒ“ƒXƒg[ƒ‹‚Ü‚½‚Í휂ªŠ®—¹‚µ‚Ä‚¢‚Ü‚¹‚ñBŠ®—¹‚·‚é‚ɂ̓Rƒ“ƒsƒ…[ƒ^‚ðÄ‹N“®‚·‚é•K—v‚ª‚ ‚è‚Ü‚·B%n%n[name] ‚̃Cƒ“ƒXƒg[ƒ‹‚ðŠ®—¹‚·‚邽‚ß‚É‚ÍAÄ‹N“®Œã‚É‚à‚¤ˆê“xƒZƒbƒgƒAƒbƒv‚ðŽÀs‚µ‚Ä‚‚¾‚³‚¢B
+CannotContinue=ƒZƒbƒgƒAƒbƒv‚ð‘±s‚Å‚«‚Ü‚¹‚ñBuƒLƒƒƒ“ƒZƒ‹v‚ðƒNƒŠƒbƒN‚µ‚ăZƒbƒgƒAƒbƒv‚ðI—¹‚µ‚Ä‚‚¾‚³‚¢B
+
+; *** "Installing" wizard page
+WizardInstalling=ƒCƒ“ƒXƒg[ƒ‹ó‹µ
+InstallingLabel=‚²Žg—p‚̃Rƒ“ƒsƒ…[ƒ^‚É [name] ‚ðƒCƒ“ƒXƒg[ƒ‹‚µ‚Ä‚¢‚Ü‚·B‚µ‚΂炂¨‘Ò‚¿‚‚¾‚³‚¢B
+
+; *** "Setup Completed" wizard page
+FinishedHeadingLabel=[name] ƒZƒbƒgƒAƒbƒvƒEƒBƒU[ƒh‚ÌŠ®—¹
+FinishedLabelNoIcons=‚²Žg—p‚̃Rƒ“ƒsƒ…[ƒ^‚É [name] ‚ªƒZƒbƒgƒAƒbƒv‚³‚ê‚Ü‚µ‚½B
+FinishedLabel=‚²Žg—p‚̃Rƒ“ƒsƒ…[ƒ^‚É [name] ‚ªƒZƒbƒgƒAƒbƒv‚³‚ê‚Ü‚µ‚½BƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚ðŽÀs‚·‚é‚ɂ̓Cƒ“ƒXƒg[ƒ‹‚³‚ꂽƒAƒCƒRƒ“‚ð‘I‘ð‚µ‚Ä‚‚¾‚³‚¢B
+ClickFinish=ƒZƒbƒgƒAƒbƒv‚ðI—¹‚·‚é‚É‚ÍuŠ®—¹v‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
+FinishedRestartLabel=[name] ‚̃Cƒ“ƒXƒg[ƒ‹‚ðŠ®—¹‚·‚邽‚ß‚É‚ÍAƒRƒ“ƒsƒ…[ƒ^‚ðÄ‹N“®‚·‚é•K—v‚ª‚ ‚è‚Ü‚·B‚·‚®‚ÉÄ‹N“®‚µ‚Ü‚·‚©H
+FinishedRestartMessage=[name] ‚̃Cƒ“ƒXƒg[ƒ‹‚ðŠ®—¹‚·‚邽‚ß‚É‚ÍAƒRƒ“ƒsƒ…[ƒ^‚ðÄ‹N“®‚·‚é•K—v‚ª‚ ‚è‚Ü‚·B%n%n‚·‚®‚ÉÄ‹N“®‚µ‚Ü‚·‚©H
+ShowReadmeCheck=READMEƒtƒ@ƒCƒ‹‚ð•\Ž¦‚·‚éB
+YesRadio=‚·‚®Ä‹N“®(&Y)
+NoRadio=Œã‚ÅŽè“®‚ÅÄ‹N“®(&N)
+; used for example as 'Run MyProg.exe'
+RunEntryExec=%1 ‚ÌŽÀs
+; used for example as 'View Readme.txt'
+RunEntryShellExec=%1 ‚Ì•\Ž¦
+
+; *** "Setup Needs the Next Disk" stuff
+ChangeDiskTitle=ƒfƒBƒXƒN‚Ì‘}“ü
+SelectDiskLabel2=ƒfƒBƒXƒN %1 ‚ð‘}“ü‚µAuOKv‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B%n%n‚±‚̃fƒBƒXƒN‚̃tƒ@ƒCƒ‹‚ª‰º‚É•\Ž¦‚³‚ê‚Ä‚¢‚éƒtƒHƒ‹ƒ_ˆÈŠO‚Ìꊂɂ ‚éꇂÍA³‚µ‚¢ƒpƒX‚ð“ü—Í‚·‚é‚©uŽQÆvƒ{ƒ^ƒ“‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
+PathLabel=ƒpƒX(&P):
+FileNotInDir2=ƒtƒ@ƒCƒ‹ %1 ‚ª %2 ‚ÉŒ©‚‚©‚è‚Ü‚¹‚ñB³‚µ‚¢ƒfƒBƒXƒN‚ð‘}“ü‚·‚é‚©A•Ê‚̃tƒHƒ‹ƒ_‚ðŽw’肵‚Ä‚‚¾‚³‚¢B
+SelectDirectoryLabel=ŽŸ‚̃fƒBƒXƒN‚Ì‚ ‚éꊂðŽw’肵‚Ä‚‚¾‚³‚¢B
+
+; *** Installation phase messages
+SetupAborted=ƒZƒbƒgƒAƒbƒv‚ÍŠ®—¹‚µ‚Ä‚¢‚Ü‚¹‚ñB%n%n–â‘è‚ð‰ðŒˆ‚µ‚Ä‚©‚çA‚à‚¤ˆê“xƒZƒbƒgƒAƒbƒv‚ðŽÀs‚µ‚Ä‚‚¾‚³‚¢B
+EntryAbortRetryIgnore=‚à‚¤ˆê“x‚â‚è‚È‚¨‚·‚É‚ÍuÄŽŽsvAƒGƒ‰[‚𖳎‹‚µ‚Ä‘±s‚·‚é‚É‚Íu–³Ž‹vAƒCƒ“ƒXƒg[ƒ‹‚𒆎~‚·‚é‚É‚Íu’†Ž~v‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
+
+; *** Installation status messages
+StatusCreateDirs=ƒtƒHƒ‹ƒ_‚ð쬂µ‚Ä‚¢‚Ü‚·...
+StatusExtractFiles=ƒtƒ@ƒCƒ‹‚ð“WŠJ‚µ‚Ä‚¢‚Ü‚·...
+StatusCreateIcons=ƒVƒ‡|ƒgƒJƒbƒg‚ð쬂µ‚Ä‚¢‚Ü‚·...
+StatusCreateIniEntries=INIƒtƒ@ƒCƒ‹‚ðݒ肵‚Ä‚¢‚Ü‚·...
+StatusCreateRegistryEntries=ƒŒƒWƒXƒgƒŠ‚ðݒ肵‚Ä‚¢‚Ü‚·...
+StatusRegisterFiles=ƒtƒ@ƒCƒ‹‚ð“o˜^‚µ‚Ä‚¢‚Ü‚·...
+StatusSavingUninstall=ƒAƒ“ƒCƒ“ƒXƒg[ƒ‹î•ñ‚ð•Û‘¶‚µ‚Ä‚¢‚Ü‚·...
+StatusRunProgram=ƒCƒ“ƒXƒg[ƒ‹‚ðŠ®—¹‚µ‚Ä‚¢‚Ü‚·...
+StatusRollback=•ÏX‚ðŒ³‚É–ß‚µ‚Ä‚¢‚Ü‚·...
+
+; *** Misc. errors
+ErrorInternal2=“à•”ƒGƒ‰[: %1
+ErrorFunctionFailedNoCode=%1 ƒGƒ‰[
+ErrorFunctionFailed=%1 ƒGƒ‰[: ƒR[ƒh %2
+ErrorFunctionFailedWithMessage=%1 ƒGƒ‰[: ƒR[ƒh %2.%n%3
+ErrorExecutingProgram=ƒtƒ@ƒCƒ‹ŽÀsƒGƒ‰[:%n%1
+
+; *** Registry errors
+ErrorRegOpenKey=ƒŒƒWƒXƒgƒŠƒL[ƒI[ƒvƒ“ƒGƒ‰[:%n%1\%2
+ErrorRegCreateKey=ƒŒƒWƒXƒgƒŠƒL[쬃Gƒ‰[:%n%1\%2
+ErrorRegWriteKey=ƒŒƒWƒXƒgƒŠƒL[‘‚«ž‚݃Gƒ‰[:%n%1\%2
+
+; *** INI errors
+ErrorIniEntry=INIƒtƒ@ƒCƒ‹ƒGƒ“ƒgƒŠì¬ƒGƒ‰[: ƒtƒ@ƒCƒ‹ %1
+
+; *** File copying errors
+FileAbortRetryIgnore=‚à‚¤ˆê“x‚â‚è‚È‚¨‚·‚É‚ÍuÄŽŽsvA‚±‚̃tƒ@ƒCƒ‹‚ðƒXƒLƒbƒv‚µ‚Ä‘±s‚·‚é‚É‚Íu–³Ž‹vi„§‚³‚ê‚Ü‚¹‚ñjAƒCƒ“ƒXƒg[ƒ‹‚𒆎~‚·‚é‚É‚Íu’†Ž~v‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
+FileAbortRetryIgnore2=‚à‚¤ˆê“x‚â‚è‚È‚¨‚·‚É‚ÍuÄŽŽsvA‚±‚̃tƒ@ƒCƒ‹‚ðƒXƒLƒbƒv‚µ‚Ä‘±s‚·‚é‚É‚Íu–³Ž‹vi„§‚³‚ê‚Ü‚¹‚ñjAƒCƒ“ƒXƒg[ƒ‹‚𒆎~‚·‚é‚É‚Íu’†Ž~v‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
+SourceIsCorrupted=ƒRƒs[Œ³‚̃tƒ@ƒCƒ‹‚ª‰ó‚ê‚Ä‚¢‚Ü‚·B
+SourceDoesntExist=ƒRƒs[Œ³‚̃tƒ@ƒCƒ‹ %1 ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñB
+ExistingFileReadOnly=Šù‘¶‚̃tƒ@ƒCƒ‹‚Í“Ç‚ÝŽæ‚èê—p‚Å‚·B%n%n“Ç‚ÝŽæ‚èê—p‘®«‚ð‰ðœ‚µ‚Ä‚à‚¤ˆê“x‚â‚è‚È‚¨‚·‚É‚ÍuÄŽŽsvA‚±‚̃tƒ@ƒCƒ‹‚ðƒXƒLƒbƒv‚µ‚Ä‘±s‚·‚é‚É‚Íu–³Ž‹vAƒCƒ“ƒXƒg[ƒ‹‚𒆎~‚·‚é‚É‚Íu’†Ž~v‚ðƒNƒŠƒbƒN‚µ‚Ä‚‚¾‚³‚¢B
+ErrorReadingExistingDest=Šù‘¶‚̃tƒ@ƒCƒ‹‚ð“Ç‚Ýž‚Ý’†‚ɃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B:
+FileExists=ƒtƒ@ƒCƒ‹‚ÍŠù‚É‘¶Ý‚µ‚Ü‚·B%n%nã‘‚«‚µ‚Ü‚·‚©H
+ExistingFileNewer=ƒCƒ“ƒXƒg[ƒ‹‚µ‚悤‚Æ‚µ‚Ä‚¢‚éƒtƒ@ƒCƒ‹‚æ‚è‚àV‚µ‚¢ƒtƒ@ƒCƒ‹‚ª‘¶Ý‚µ‚Ü‚·BŠù‘¶‚̃tƒ@ƒCƒ‹‚ðŽc‚·‚±‚Æ‚ð‚¨§‚ß‚µ‚Ü‚·B%n%nŠù‘¶‚̃tƒ@ƒCƒ‹‚ðŽc‚µ‚Ü‚·‚©B
+ErrorChangingAttr=Šù‘¶ƒtƒ@ƒCƒ‹‚Ì‘®«‚ð•ÏX’†‚ɃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B:
+ErrorCreatingTemp=ƒRƒs[æ‚̃tƒHƒ‹ƒ_‚Ƀtƒ@ƒCƒ‹‚ð쬒†‚ɃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B:
+ErrorReadingSource=ƒRƒs[Œ³‚̃tƒ@ƒCƒ‹‚ð“Ç‚Ýž‚Ý’†‚ɃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B:
+ErrorCopying=ƒtƒ@ƒCƒ‹‚ðƒRƒs[’†‚ɃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B:
+ErrorReplacingExistingFile=Šù‘¶ƒtƒ@ƒCƒ‹‚ð’u‚«Š·‚¦’†‚ɃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B:
+ErrorRestartReplace=’u‚«Š·‚¦ÄŠJ’†‚ɃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B:
+ErrorRenamingTemp=ƒRƒs[æƒtƒHƒ‹ƒ_‚̃tƒ@ƒCƒ‹–¼‚ð•ÏX’†‚ɃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B:
+ErrorRegisterServer=DLL/OCX‚Ì“o˜^‚ÉŽ¸”s‚µ‚Ü‚µ‚½B: %1
+ErrorRegSvr32Failed=RegSvr32‚̓Gƒ‰[ƒR[ƒh %1 ‚É‚æ‚莸”s‚µ‚Ü‚µ‚½B
+ErrorRegisterTypeLib=ƒ^ƒCƒvƒ‰ƒCƒuƒ‰ƒŠ‚Ö‚Ì“o˜^‚ÉŽ¸”s‚µ‚Ü‚µ‚½B: %1
+
+; *** Post-installation errors
+ErrorOpeningReadme=READMEƒtƒ@ƒCƒ‹‚̃I[ƒvƒ“‚ÉŽ¸”s‚µ‚Ü‚µ‚½B
+ErrorRestartingComputer=ƒRƒ“ƒsƒ…[ƒ^‚ÌÄ‹N“®‚ÉŽ¸”s‚µ‚Ü‚µ‚½BŽè“®‚ÅÄ‹N“®‚µ‚Ä‚‚¾‚³‚¢B
+
+; *** Uninstaller messages
+UninstallNotFound=ƒtƒ@ƒCƒ‹ %1 ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñBƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚ðŽÀs‚Å‚«‚Ü‚¹‚ñB
+UninstallOpenError=ƒtƒ@ƒCƒ‹ %1 ‚ðŠJ‚¯‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñBƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚ðŽÀs‚Å‚«‚Ü‚¹‚ñB
+UninstallUnsupportedVer=ƒAƒ“ƒCƒ“ƒXƒg[ƒ‹ƒƒOƒtƒ@ƒCƒ‹ %1 ‚ÍA‚±‚̃o[ƒWƒ‡ƒ“‚̃Aƒ“ƒCƒ“ƒXƒg[ƒ‹ƒvƒƒOƒ‰ƒ€‚ª”FŽ¯‚Å‚«‚È‚¢Œ`Ž®‚Å‚·BƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚ðŽÀs‚Å‚«‚Ü‚¹‚ñB
+UninstallUnknownEntry=ƒAƒ“ƒCƒ“ƒXƒg[ƒ‹ƒƒO‚É•s–¾‚̃Gƒ“ƒgƒŠ %1 ‚ªŒ©‚‚©‚è‚Ü‚µ‚½B
+ConfirmUninstall=%1 ‚Æ‚»‚ÌŠÖ˜AƒRƒ“ƒ|[ƒlƒ“ƒg‚ð‚·‚×‚Ä휂µ‚Ü‚·B‚æ‚낵‚¢‚Å‚·‚©H
+UninstallOnlyOnWin64=‚±‚̃vƒƒOƒ‰ƒ€‚Í64-bit”ÅWindowsã‚ł̂݃Aƒ“ƒCƒ“ƒXƒg[ƒ‹‚Å‚«‰Â”\‚Å‚·B
+OnlyAdminCanUninstall=ƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚·‚邽‚ß‚É‚ÍŠÇ—ŽÒŒ ŒÀ‚ª•K—v‚Å‚·B
+UninstallStatusLabel=‚²Žg—p‚̃Rƒ“ƒsƒ…[ƒ^‚©‚ç %1 ‚ð휂µ‚Ä‚¢‚Ü‚·B‚µ‚΂炂¨‘Ò‚¿‚‚¾‚³‚¢B
+UninstalledAll=%1 ‚Í‚²Žg—p‚̃Rƒ“ƒsƒ…[ƒ^‚©‚ç³í‚É휂³‚ê‚Ü‚µ‚½B
+UninstalledMost=%1 ‚̃Aƒ“ƒCƒ“ƒXƒg[ƒ‹‚ªŠ®—¹‚µ‚Ü‚µ‚½B%n%n‚¢‚‚‚©‚Ì€–Ú‚ªíœ‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½BŽè“®‚Å휂µ‚Ä‚‚¾‚³‚¢B
+UninstalledAndNeedsRestart=%1 ‚Ìíœ‚ðŠ®—¹‚·‚邽‚ß‚É‚ÍAƒRƒ“ƒsƒ…[ƒ^‚ðÄ‹N“®‚·‚é•K—v‚ª‚ ‚è‚Ü‚·B‚·‚®‚ÉÄ‹N“®‚µ‚Ü‚·‚©H
+UninstallDataCorrupted=ƒtƒ@ƒCƒ‹ "%1" ‚ª‰ó‚ê‚Ä‚¢‚Ü‚·BƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚ðŽÀs‚Å‚«‚Ü‚¹‚ñB
+
+; *** Uninstallation phase messages
+ConfirmDeleteSharedFileTitle=‹¤—Lƒtƒ@ƒCƒ‹‚Ìíœ
+ConfirmDeleteSharedFile2=ƒVƒXƒeƒ€ã‚ÅAŽŸ‚Ì‹¤—Lƒtƒ@ƒCƒ‹‚͂ǂ̃vƒƒOƒ‰ƒ€‚Å‚àŽg—p‚³‚ê‚Ä‚¢‚Ü‚¹‚ñB‚±‚Ì‹¤—Lƒtƒ@ƒCƒ‹‚ð휂µ‚Ü‚·‚©H%n%n‘¼‚̃vƒƒOƒ‰ƒ€‚ª‚Ü‚¾‚±‚̃tƒ@ƒCƒ‹‚ðŽg—p‚·‚éê‡A휂·‚é‚ƃvƒƒOƒ‰ƒ€‚ª“®ì‚µ‚È‚‚È‚é‹°‚ꂪ‚ ‚è‚Ü‚·B‚ ‚Ü‚èŠmŽÀ‚Å‚È‚¢ê‡‚Íu‚¢‚¢‚¦v‚ð‘I‘ð‚µ‚Ä‚‚¾‚³‚¢BƒVƒXƒeƒ€‚Ƀtƒ@ƒCƒ‹‚ðŽc‚µ‚Ä‚à–â‘è‚ðˆø‚«‹N‚±‚·‚±‚Æ‚Í‚ ‚è‚Ü‚¹‚ñB
+SharedFileNameLabel=ƒtƒ@ƒCƒ‹–¼:
+SharedFileLocationLabel=êŠ:
+WizardUninstalling=ƒAƒ“ƒCƒ“ƒXƒg[ƒ‹ó‹µ
+StatusUninstalling=%1 ‚ðƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚µ‚Ä‚¢‚Ü‚·...
+
+; The custom messages below aren't used by Setup itself, but if you make
+; use of them in your scripts, you'll want to translate them.
+
+[CustomMessages]
+
+NameAndVersion=%1 ƒo[ƒWƒ‡ƒ“ %2
+AdditionalIcons=ƒAƒCƒRƒ“‚ð’ljÁ‚·‚é:
+CreateDesktopIcon=ƒfƒXƒNƒgƒbƒvã‚ɃAƒCƒRƒ“‚ð쬂·‚é(&d)
+CreateQuickLaunchIcon=&Quick Launch ƒAƒCƒRƒ“‚ð쬂·‚é
+ProgramOnTheWeb=%1 on the Web
+UninstallProgram=%1 ‚ðƒAƒ“ƒCƒ“ƒXƒg[ƒ‹‚·‚é
+LaunchProgram=%1 ‚ðŽÀs‚·‚é
+AssocFileExtension=%2 ƒtƒ@ƒCƒ‹Šg’£‚É %1‚ðŠÖ˜A•t‚¯‚Ü‚·B
+AssocingFileExtension=%2 ‚É %1‚ðŠÖ˜A•t‚¯‚Ü‚·B
diff --git a/Makefile.am b/Makefile.am
index 4509c45..e836aad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,6 +12,7 @@ EXTRA_DIST = \
opensp-1.5.2-patch.diff \
pi.sh \
Greek-4-5.1.11.isl \
+ Japanese-5-5.1.11.isl \
reset.sh
if OS_WIN32
@@ -20,6 +21,7 @@ if OS_WIN32
redirect_LDADD = $(GLIB_LIBS)
AM_CPPFLAGS = $(GLIB_CFLAGS)
pkgdata_DATA = Greek-4-5.1.11.isl
+ pkgdata_DATA += Japanese-5-5.1.11.isl
else
EXTRA_DIST += redirect.c
endif
diff --git a/gnucash.iss.in b/gnucash.iss.in
index 1d04ef5..a9954e7 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -224,11 +224,12 @@ end;
[Languages]
+Name: "en"; MessagesFile: "compiler:Default.isl"
Name: "de"; MessagesFile: "compiler:Languages\German.isl"; InfoAfterFile: "@prefix@\share\@PACKAGE@\doc\README-de.win32-bin.txt"
Name: "el"; MessagesFile: "@prefix@\share\@PACKAGE@\Greek-4-5.1.11.isl"
-Name: "en"; MessagesFile: "compiler:Default.isl"
Name: "fr"; MessagesFile: "compiler:Languages\French.isl"; InfoAfterFile: "@prefix@\share\@PACKAGE@\doc\README-fr.win32-bin.txt"
Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"; InfoAfterFile: "@prefix@\share\@PACKAGE@\doc\README-it.win32-bin.txt"
+Name: "ja"; MessagesFile: "@prefix@\share\@PACKAGE@\Japanese-5-5.1.11.isl"
Name: "pt_BR"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
;; The following language files are available as well, in alphabetical
@@ -272,6 +273,7 @@ de.LanguageCodePage=1252
el.LanguageCodePage=1253
fr.LanguageCodePage=1252
it.LanguageCodePage=1252
+ja.LanguageCodePage=932
pt_BR.LanguageCodePage=1252
commit d9ec32232a10f12f0330d0123bbd59158c94af67
Author: Christian Stimming <stimming at tuhh.de>
Date: Sun Feb 7 19:58:18 2010 +0000
Win32: Hopefully fix goffice installation.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18620 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index 1c13829..eaab487 100755
--- a/install.sh
+++ b/install.sh
@@ -701,7 +701,7 @@ function inst_goffice() {
_GOFFICE_UDIR=`unix_path $GOFFICE_DIR`
add_to_env $_GOFFICE_UDIR/bin PATH
add_to_env $_GOFFICE_UDIR/lib/pkgconfig PKG_CONFIG_PATH
- if quiet ${PKG_CONFIG} --exists libgoffice-0.8
+ if quiet ${PKG_CONFIG} --exists libgoffice-0.8 && [ -f $_GOFFICE_UDIR/bin/libgoffice*.dll ]
then
echo "goffice already installed. skipping."
else
@@ -723,7 +723,7 @@ function inst_goffice() {
make
make install
qpopd
- ${PKG_CONFIG} --exists libgoffice-0.8 || die "goffice not installed correctly"
+ ${PKG_CONFIG} --exists libgoffice-0.8 && [ -f $_GOFFICE_UDIR/bin/libgoffice*.dll ] || die "goffice not installed correctly"
rm -rf ${TMP_UDIR}/goffice-*
fi
}
commit 51c9bf5bf987946769f1f0c8e9f731de373f4c81
Author: Christian Stimming <stimming at tuhh.de>
Date: Wed Feb 3 19:19:35 2010 +0000
Remove more executable bits from data files
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18605 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/libdbi-0.8.3.patch b/libdbi-0.8.3.patch
old mode 100755
new mode 100644
diff --git a/libdbi-dbd_helper.c.patch b/libdbi-dbd_helper.c.patch
old mode 100755
new mode 100644
diff --git a/libdbi-drivers-Makefile.in.patch b/libdbi-drivers-Makefile.in.patch
old mode 100755
new mode 100644
diff --git a/libdbi-drivers-dbd_mysql.c.patch b/libdbi-drivers-dbd_mysql.c.patch
old mode 100755
new mode 100644
diff --git a/libdbi-drivers-dbd_sqlite3.c.patch b/libdbi-drivers-dbd_sqlite3.c.patch
old mode 100755
new mode 100644
commit 77de1151d4c0a64af6dc4373882fd35680260167
Author: Christian Stimming <stimming at tuhh.de>
Date: Tue Feb 2 21:35:04 2010 +0000
Fix URL of ActivePerl.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18603 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 2bbdb53..7d3e43f 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -125,7 +125,7 @@ set_default READLINE_BIN_URL "$SF_MIRROR/gnuwin32/readline-5.0-1-bin.zip"
set_default READLINE_LIB_URL "$SF_MIRROR/gnuwin32/readline-5.0-1-lib.zip"
set_default READLINE_DIR $GLOBAL_DIR\\readline
-set_default ACTIVE_PERL_URL "http://downloads.activestate.com/ActivePerl/Windows/5.10/ActivePerl-5.10.0.1004-MSWin32-x86-287188.zip"
+set_default ACTIVE_PERL_URL "http://downloads.activestate.com/ActivePerl/releases/5.10.1.1007/ActivePerl-5.10.1.1007-MSWin32-x86-291969.zip"
set_default ACTIVE_PERL_DIR $GLOBAL_DIR\\active-perl
set_default AUTOCONF_URL "http://ftp.gnu.org/gnu/autoconf/autoconf-2.63.tar.bz2"
commit 75d656f3415d9a29e93f7096e25d3e347ba7dcb9
Author: Christian Stimming <stimming at tuhh.de>
Date: Mon Jan 11 20:50:18 2010 +0000
Remove build directories of dependencies after their successful installation.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18559 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index 750efa0..1c13829 100755
--- a/install.sh
+++ b/install.sh
@@ -271,6 +271,7 @@ function inst_autotools() {
make install
qpopd
quiet autoconf --help && quiet automake --help || die "autoconf/automake not installed correctly"
+ rm -rf ${TMP_UDIR}/autoconf-* ${TMP_UDIR}/automake-*
fi
if quiet libtoolize --help
then
@@ -285,6 +286,7 @@ function inst_autotools() {
make install
qpopd
quiet libtoolize --help || die "libtool/libtoolize not installed correctly"
+ rm -rf ${TMP_UDIR}/libtool-*
fi
[ ! -d $_AUTOTOOLS_UDIR/share/aclocal ] || add_to_env "-I $_AUTOTOOLS_UDIR/share/aclocal" ACLOCAL_FLAGS
}
@@ -311,6 +313,7 @@ function inst_gmp() {
make install
qpopd
quiet ${LD} $GMP_LDFLAGS -lgmp -o $TMP_UDIR/ofile || die "Gmp not installed correctly"
+ rm -rf ${TMP_UDIR}/gmp-*
fi
}
@@ -378,6 +381,7 @@ function inst_guile() {
qpopd
guile -c '(use-modules (srfi srfi-39))' &&
guile -c "(use-modules (ice-9 slib)) (require 'printf)" || die "guile not installed correctly"
+ rm -rf ${TMP_UDIR}/guile-*
fi
if [ "$CROSS_COMPILE" = "yes" ]; then
mkdir -p $_GUILE_UDIR/bin
@@ -446,6 +450,7 @@ function inst_openssl() {
cp -a include/openssl $_OPENSSL_UDIR/include
qpopd
quiet ${LD} -L$_OPENSSL_UDIR/lib -leay32 -lssl32 -o $TMP_UDIR/ofile || die "openssl not installed correctly"
+ rm -rf ${TMP_UDIR}/openssl-*
fi
_eay32dll=$(echo $(which libeay32.dll)) # which sucks
if [ -z "$_eay32dll" ] ; then
@@ -687,6 +692,7 @@ function inst_libgsf() {
make install
qpopd
${PKG_CONFIG} --exists libgsf-1 libgsf-gnome-1 || die "libgsf not installed correctly"
+ rm -rf ${TMP_UDIR}/libgsf-*
fi
}
@@ -699,7 +705,6 @@ function inst_goffice() {
then
echo "goffice already installed. skipping."
else
- rm -rf $TMP_UDIR/goffice-*
wget_unpacked $GOFFICE_URL $DOWNLOAD_DIR $TMP_DIR
mydir=`pwd`
assert_one_dir $TMP_UDIR/goffice-*
@@ -719,6 +724,7 @@ function inst_goffice() {
make install
qpopd
${PKG_CONFIG} --exists libgoffice-0.8 || die "goffice not installed correctly"
+ rm -rf ${TMP_UDIR}/goffice-*
fi
}
@@ -739,6 +745,7 @@ function inst_glade() {
make install
qpopd
quiet glade-3 --version || die "glade not installed correctly"
+ rm -rf ${TMP_UDIR}/glade3-*
fi
}
@@ -851,6 +858,7 @@ function inst_libofx() {
make install
qpopd
quiet ${PKG_CONFIG} --exists libofx || die "Libofx not installed correctly"
+ rm -rf ${TMP_UDIR}/libofx-*
fi
}
@@ -914,6 +922,7 @@ function inst_gwenhywfar() {
make install
qpopd
${PKG_CONFIG} --exists gwenhywfar || die "Gwenhywfar not installed correctly"
+ rm -rf ${TMP_UDIR}/gwenhywfar-*
fi
[ ! -d $_GWENHYWFAR_UDIR/share/aclocal ] || add_to_env "-I $_GWENHYWFAR_UDIR/share/aclocal" ACLOCAL_FLAGS
}
@@ -941,6 +950,7 @@ function inst_ktoblzcheck() {
make install
qpopd
${PKG_CONFIG} --exists ktoblzcheck || die "Ktoblzcheck not installed correctly"
+ rm -rf ${TMP_UDIR}/ktoblzcheck-*
fi
}
@@ -1045,6 +1055,7 @@ function inst_aqbanking() {
fi
qpopd
${PKG_CONFIG} --exists aqbanking || die "AqBanking not installed correctly"
+ rm -rf ${TMP_UDIR}/aqbanking-*
fi
[ ! -d $_AQBANKING_UDIR/share/aclocal ] || add_to_env "-I $_AQBANKING_UDIR/share/aclocal" ACLOCAL_FLAGS
}
@@ -1071,6 +1082,7 @@ function inst_libdbi() {
make install
qpopd
test -f ${_SQLITE3_UDIR}/bin/libsqlite3-0.dll || die "SQLite3 not installed correctly"
+ rm -rf ${TMP_UDIR}/sqlite-*
fi
if test -f ${_MYSQL_LIB_UDIR}/lib/libmysql.dll -a \
-f ${_MYSQL_LIB_UDIR}/lib/libmysqlclient.a
@@ -1086,6 +1098,7 @@ function inst_libdbi() {
dlltool --input-def $LIBMYSQL_DEF --dllname libmysql.dll --output-lib libmysqlclient.a -k
test -f ${_MYSQL_LIB_UDIR}/lib/libmysql.dll || die "mysql not installed correctly - libmysql.dll"
test -f ${_MYSQL_LIB_UDIR}/lib/libmysqlclient.a || die "mysql not installed correctly - libmysqlclient.a"
+ rm -rf ${TMP_UDIR}/mysql*
fi
if test -f ${_PGSQL_UDIR}/lib/libpq.dll
then
@@ -1116,6 +1129,7 @@ function inst_libdbi() {
make install
qpopd
test -f ${_LIBDBI_UDIR}/bin/libdbi-0.dll || die "libdbi not installed correctly"
+ rm -rf ${TMP_UDIR}/libdbi-0*
fi
if test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdsqlite3.dll -a \
-f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdmysql.dll -a \
@@ -1151,6 +1165,7 @@ function inst_libdbi() {
test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdsqlite3.dll || die "libdbi sqlite3 driver not installed correctly"
test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdmysql.dll || die "libdbi mysql driver not installed correctly"
test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdpgsql.dll || die "libdbi pgsql driver not installed correctly"
+ rm -rf ${TMP_UDIR}/libdbi-drivers-*
fi
}
commit 41e6a3b8207136978ca942d843d54149307c264a
Author: Christian Stimming <stimming at tuhh.de>
Date: Mon Jan 4 20:18:21 2010 +0000
Update gwenhywfar/aqbanking version numbers for win32 build.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18544 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index d6c3446..2bbdb53 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -263,8 +263,8 @@ set_default AQBANKING3 yes
if [ "$AQBANKING3" != "yes" ]; then
set_default GWENHYWFAR_URL "$SF_MIRROR/gwenhywfar/gwenhywfar-2.6.2.tar.gz"
else
- set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=29&file=01&dummy=gwenhywfar-3.11.1.tar.gz"
- set_default GWENHYWFAR_PATCH `pwd`/gwenhywfar-3.11.1-patch.diff
+ set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=31&file=01&dummy=gwenhywfar-3.11.3.tar.gz"
+ #set_default GWENHYWFAR_PATCH `pwd`/gwenhywfar-3.11.1-patch.diff
fi
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
@@ -274,7 +274,7 @@ set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-1.24.tar.gz"
if [ "$AQBANKING3" != "yes" ]; then
set_default AQBANKING_URL "$SF_MIRROR/aqbanking/aqbanking-2.3.3.tar.gz"
else
- set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=47&file=01&dummy=aqbanking-4.2.1.tar.gz"
+ set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=49&file=01&dummy=aqbanking-4.2.3.tar.gz"
#set_default AQBANKING_PATCH `pwd`/aqbanking-4.1.6-patch.diff
fi
set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
commit 94ce826bdbb57ebb65c34e49c21622f6f852a104
Author: Christian Stimming <stimming at tuhh.de>
Date: Sun Dec 27 20:51:48 2009 +0000
Updated aqbanking version numbers for win32 build
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18532 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 67e4f26..d6c3446 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -268,13 +268,13 @@ else
fi
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
-set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-1.23.tar.gz"
+set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-1.24.tar.gz"
# ktoblzcheck is being installed into GWENHYWFAR_DIR
if [ "$AQBANKING3" != "yes" ]; then
set_default AQBANKING_URL "$SF_MIRROR/aqbanking/aqbanking-2.3.3.tar.gz"
else
- set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=45&file=01&dummy=aqbanking-4.1.8.tar.gz"
+ set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=47&file=01&dummy=aqbanking-4.2.1.tar.gz"
#set_default AQBANKING_PATCH `pwd`/aqbanking-4.1.6-patch.diff
fi
set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
commit 496488f0cd025200b8ccc8cfbf9ecc49e559d07f
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed Dec 16 12:23:16 2009 +0000
Fix gwenhywfar version lookup by tightening the RE used
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18505 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/dist.sh b/dist.sh
index e3d3623..043806d 100755
--- a/dist.sh
+++ b/dist.sh
@@ -229,11 +229,12 @@ function dist_gnucash() {
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 }' ${_AQBANKING_UDIR}/include/aqbanking/version.h )
- _GWENHYWFAR_SO_EFFECTIVE=$(awk '/GWENHYWFAR_SO_EFFECTIVE/ { print $3 }' ${_GWENHYWFAR_UDIR}/include/gwenhywfar3/gwenhywfar/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 }' ${_GWENHYWFAR_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"
}
commit 1e274bfaea04904a62e149b7c7430d7adfb36935
Author: Christian Stimming <stimming at tuhh.de>
Date: Tue Dec 15 21:27:22 2009 +0000
temporarily disable the gwenhywfar version lookup - there are multiple lines matching GWENHYWFAR_SO_EFFECTIVE
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18503 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/dist.sh b/dist.sh
index 826e1c7..e3d3623 100755
--- a/dist.sh
+++ b/dist.sh
@@ -234,7 +234,6 @@ function dist_gnucash() {
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"
}
commit 6d0622777e295db182c48498d1f6908777bd95b2
Author: Christian Stimming <stimming at tuhh.de>
Date: Tue Dec 15 20:30:15 2009 +0000
Really fix r18495 (#586122) to look up the so-name of gwenhywfar correctly.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18502 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/dist.sh b/dist.sh
index c2a9a8e..826e1c7 100755
--- a/dist.sh
+++ b/dist.sh
@@ -230,7 +230,7 @@ function dist_gnucash() {
_QTDIR_WIN=`echo $QTDIR | sed 's,^/\([A-Za-z]\)/,\1:/,g' `
_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 )
+ _GWENHYWFAR_SO_EFFECTIVE=$(awk '/GWENHYWFAR_SO_EFFECTIVE/ { print $3 }' ${_GWENHYWFAR_UDIR}/include/gwenhywfar3/gwenhywfar/version.h )
sed < $_BUILD_UDIR/packaging/win32/gnucash.iss \
> $_GNUCASH_UDIR/gnucash.iss \
-e "s#@-qtbindir-@#${_QTDIR_WIN}/bin#g" \
commit 517c27028e74a5f34d863a765fa7590b320ad8c5
Author: Christian Stimming <stimming at tuhh.de>
Date: Sun Dec 13 21:16:25 2009 +0000
Fix #586122 (follow-up to r18488) by using aqbanking/version.h from its installation path.
Also look up the gwenhywfar so-name accordingly.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18495 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/dist.sh b/dist.sh
index d107e5a..c2a9a8e 100755
--- a/dist.sh
+++ b/dist.sh
@@ -229,10 +229,12 @@ function dist_gnucash() {
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"
}
diff --git a/gnucash.iss.in b/gnucash.iss.in
index 5f23818..1d04ef5 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -129,7 +129,7 @@ Root: HKLM; Subkey: "Software\Gwenhywfar"; ValueType: none; Flags: uninsdeleteke
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\plugins\@-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
commit 8ac45ceb5b5f26b29f7f1a36e9781d53cdfd9421
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri Dec 11 19:57:17 2009 +0000
Bug 586122 - The AqBanking Wizard can't be loaded: plugins\20 folder to be renamed into plugins\16
The patch evaluates and configures the proper paths at build time, retrieving
the required info directly from the aqbanking source
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18488 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/dist.sh b/dist.sh
index e2dfb7b..d107e5a 100755
--- a/dist.sh
+++ b/dist.sh
@@ -229,9 +229,11 @@ function dist_gnucash() {
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 )
sed < $_BUILD_UDIR/packaging/win32/gnucash.iss \
> $_GNUCASH_UDIR/gnucash.iss \
- -e "s#@-qtbindir-@#${_QTDIR_WIN}/bin#g"
+ -e "s#@-qtbindir-@#${_QTDIR_WIN}/bin#g" \
+ -e "s#@-aqbanking_so_effective-@#${_AQBANKING_SO_EFFECTIVE}#g"
}
function finish() {
diff --git a/gnucash.iss.in b/gnucash.iss.in
index 84448b4..5f23818 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -78,7 +78,7 @@ Source: "@prefix@\..\dist\libexec\*"; DestDir: "{app}\libexec"; Flags: recursesu
Source: "@prefix@\..\dist\share\*"; DestDir: "{app}\share"; Flags: recursesubdirs; Components: main
; Additionally, we ship the Qt DLLs because the Online-Banking-Wizard
-; lib/aqbanking/plugins/16/wizards/qt3-wizard.exe needs them.
+; lib/aqbanking/plugins/@-aqbanking_so_effective-@/wizards/qt3-wizard.exe needs them.
Source: "@-qtbindir-@\QtCore4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
Source: "@-qtbindir-@\QtGui4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
Source: "@-qtbindir-@\mingwm10.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
@@ -136,15 +136,15 @@ Root: HKLM; Subkey: "Software\Gwenhywfar\Paths"; ValueType: string; ValueName: "
; And we also need some registry keys for aqbanking
Root: HKLM; Subkey: "Software\Aqbanking"; ValueType: none; Flags: uninsdeletekeyifempty
Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: none; Flags: uninsdeletekeyifempty
-Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "providerdir"; ValueData: "{app}\lib\aqbanking\plugins\16\providers"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "bankinfodir"; ValueData: "{app}\lib\aqbanking\plugins\16\bankinfo"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "importerdir"; ValueData: "{app}\lib\aqbanking\plugins\16\imexporters"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "wizarddir"; ValueData: "{app}\lib\aqbanking\plugins\16\wizards"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "providerdir"; ValueData: "{app}\lib\aqbanking\plugins\@-aqbanking_so_effective-@\providers"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "bankinfodir"; ValueData: "{app}\lib\aqbanking\plugins\@-aqbanking_so_effective-@\bankinfo"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "importerdir"; ValueData: "{app}\lib\aqbanking\plugins\@-aqbanking_so_effective-@\imexporters"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "wizarddir"; ValueData: "{app}\lib\aqbanking\plugins\@-aqbanking_so_effective-@\wizards"; Flags: uninsdeletevalue
Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "pkgdatadir"; ValueData: "{app}\share\aqbanking"; Flags: uninsdeletevalue
Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "sysconfdir"; ValueData: "{app}\etc"; Flags: uninsdeletevalue
Root: HKLM; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "localedir"; ValueData: "{app}\share\locale"; Flags: uninsdeletevalue
Root: HKLM; Subkey: "Software\AqBanking\Paths"; ValueType: string; ValueName: "xmldatadir"; ValueData: "{app}\share\aqhbci\xml"; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "Software\AqBanking\Paths"; ValueType: string; ValueName: "cfgmoduledir"; ValueData: "{app}\lib\aqbanking\plugins\16\frontends\qbanking\cfgmodules"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\AqBanking\Paths"; ValueType: string; ValueName: "cfgmoduledir"; ValueData: "{app}\lib\aqbanking\plugins\@-aqbanking_so_effective-@\frontends\qbanking\cfgmodules"; Flags: uninsdeletevalue
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
commit f09efba81a366b47f1148e167d8961b9ee95b9f6
Author: Christian Stimming <stimming at tuhh.de>
Date: Tue Dec 8 20:42:46 2009 +0000
Decrease verbosity during win32 packaging: Inno, gconftool-2, htmlhelp compiler (hhc) with less output.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18473 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/dist.sh b/dist.sh
index a1b158e..e2dfb7b 100755
--- a/dist.sh
+++ b/dist.sh
@@ -262,7 +262,7 @@ function finish() {
done
echo "Now running the Inno Setup Compiler for creating the setup.exe"
- ${_INNO_UDIR}/iscc ${_GNUCASH_UDIR}/gnucash.iss
+ ${_INNO_UDIR}/iscc //Q ${_GNUCASH_UDIR}/gnucash.iss
if [ "$BUILD_FROM_TARBALL" = "no" ]; then
# And changing output filename
diff --git a/install.sh b/install.sh
index 9138f63..750efa0 100755
--- a/install.sh
+++ b/install.sh
@@ -1293,7 +1293,7 @@ function make_install() {
for file in *.schemas; do
gconftool-2 \
--config-source=xml:merged:${_INSTALL_WFSDIR}/etc/gconf/gconf.xml.defaults \
- --install-schema-file $file
+ --install-schema-file $file >/dev/null
done
gconftool-2 --shutdown
qpopd
@@ -1342,7 +1342,7 @@ function make_chm() {
echo "[MAP]" >> htmlhelp.hhp
cat mymaps >> htmlhelp.hhp
rm mymaps
- hhc htmlhelp.hhp || true
+ hhc htmlhelp.hhp >/dev/null || true
cp -fv htmlhelp.chm $_DOCS_INST_UDIR/$_CHM_LANG/gnucash-$_CHM_TYPE.chm
cp -fv htmlhelp.hhmap $_DOCS_INST_UDIR/$_CHM_LANG/gnucash-$_CHM_TYPE.hhmap
qpopd
commit c50f0c62721f608bf9cd8e70d6be0612a6f2fd78
Author: Phil Longstaff <plongstaff at newearth.org>
Date: Sun Dec 6 18:58:17 2009 +0000
Disable it_IT help in the win32 binary
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18470 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index 2942133..9138f63 100755
--- a/install.sh
+++ b/install.sh
@@ -1375,7 +1375,7 @@ function inst_docs() {
make_chm guide it_IT
make_chm help C
make_chm help de_DE
- make_chm help it_IT
+# make_chm help it_IT
qpopd
}
commit ae41d99018dfcf222b06f720ad9aad4d60d7573b
Author: Phil Longstaff <plongstaff at newearth.org>
Date: Sun Oct 18 21:57:19 2009 +0000
Allow m4 1.4.11 and 1.4.13 as well as 1.4.7. Should really parse the version
number to ensure it is higher than some minimum value.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18385 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index a04396b..2942133 100755
--- a/install.sh
+++ b/install.sh
@@ -90,6 +90,16 @@ function prepare() {
fi
}
+function check_m4_version_ok() {
+ v=`m4 --version | grep -e '[0-9]*\.[0-9]*\.[0-9]*' | sed -e 's/[mM]4//g' -e 's/[^\.0-9]//g'`
+ if [ "$v" = "1.4.7" -o "$v" = "1.4.11" -o "$v" = "1.4.13" ];
+ then
+ return 1
+ else
+ return 0
+ fi
+}
+
function inst_wget() {
setup Wget
_WGET_UDIR=`unix_path $WGET_DIR`
@@ -108,8 +118,7 @@ function inst_wget() {
function inst_dtk() {
setup MSYS DTK
_MSYS_UDIR=`unix_path $MSYS_DIR`
- if quiet ${_MSYS_UDIR}/bin/perl --help &&
- [ "`m4 --version | sed '1!d;s,.* [Mm]4 ,,'`" = "1.4.7" ]
+ if quiet ${_MSYS_UDIR}/bin/perl --help && [ check_m4_version_ok ]
then
echo "msys dtk already installed. skipping."
else
@@ -128,7 +137,7 @@ function inst_dtk() {
wget_unpacked $M4_URL $DOWNLOAD_DIR $TMP_DIR
mv $TMP_UDIR/usr/bin/m4.exe /bin
quiet ${_MSYS_UDIR}/bin/perl --help &&
- [ "`m4 --version | sed '1!d;s,.* [Mm]4 ,,'`" = "1.4.7" ] || die "msys dtk not installed correctly"
+ [ check_m4_version_ok ] || die "msys dtk not installed correctly"
fi
}
commit 02dbc5908567c160bdda198a7b641874f4b59ad5
Author: Christian Stimming <stimming at tuhh.de>
Date: Fri Oct 16 19:53:57 2009 +0000
Win32: Assert there is only one aqbanking plugin directory before accessing the qt3-wizard.exe.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18381 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/dist.sh b/dist.sh
index 186a1f5..a1b158e 100755
--- a/dist.sh
+++ b/dist.sh
@@ -249,6 +249,7 @@ function finish() {
cp $_INSTALL_UDIR/bin/redirect.exe $DIST_UDIR/libexec/gconfd-2.exe
if [ "$AQBANKING_WITH_QT" = "yes" ]; then
+ assert_one_dir ${DIST_UDIR}/lib/aqbanking/plugins/*/wizards
_qt3_wizard_path=`ls ${DIST_UDIR}/lib/aqbanking/plugins/*/wizards/qt3-wizard.exe`
mv ${_qt3_wizard_path} $DIST_UDIR/bin
cp $_INSTALL_UDIR/bin/redirect.exe ${_qt3_wizard_path}
commit f39ec6838c81f82e8b1302724f6d0caf4e205d18
Author: Christian Stimming <stimming at tuhh.de>
Date: Tue Oct 13 19:37:18 2009 +0000
Win32: Minor version update of aqbanking.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18378 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 32f8981..67e4f26 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -274,7 +274,7 @@ set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-1.23.tar.gz"
if [ "$AQBANKING3" != "yes" ]; then
set_default AQBANKING_URL "$SF_MIRROR/aqbanking/aqbanking-2.3.3.tar.gz"
else
- set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=44&file=01&dummy=aqbanking-4.1.7.tar.gz"
+ set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=45&file=01&dummy=aqbanking-4.1.8.tar.gz"
#set_default AQBANKING_PATCH `pwd`/aqbanking-4.1.6-patch.diff
fi
set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
commit 7f14489edc99a6385827a06b39092446e8a58389
Author: Phil Longstaff <plongstaff at newearth.org>
Date: Sun Oct 4 23:31:37 2009 +0000
Retrieve new packaged pgsql binary which has msvcr71.dll included. Also, win32
packaged webkit is retrieved from sourceforge.net, not gnucash.org.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18370 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 8630c0f..32f8981 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -242,7 +242,7 @@ set_default INNO_DIR $GLOBAL_DIR\\inno
set_default HH_URL "http://download.microsoft.com/download/OfficeXPProf/Install/4.71.1015.0/W98NT42KMe/EN-US/HTMLHELP.EXE"
set_default HH_DIR $GLOBAL_DIR\\hh
-set_default WEBKIT_URL "http://www.gnucash.org/pub/gnucash/sources/unstable/2.3.x/webkit-1.1.5-win32.zip"
+set_default WEBKIT_URL "$SF_MIRROR/gnucash/webkit-1.1.5-win32.zip"
set_default WEBKIT_DIR $GLOBAL_DIR\\webkit-1.1.5
set_default SVN_URL "http://subversion.tigris.org/files/documents/15/35379/svn-1.4.2-setup.exe"
@@ -287,13 +287,13 @@ set_default SQLITE3_DIR $GLOBAL_DIR\\sqlite3
set_default MYSQL_LIB_URL "http://mirror.csclub.uwaterloo.ca/mysql/Downloads/Connector-C/mysql-connector-c-noinstall-6.0.1-win32.zip"
set_default MYSQL_LIB_DIR $GLOBAL_DIR\\mysql
set_default LIBMYSQL_DEF `pwd`/libmysql.def
-set_default PGSQL_LIB_URL "http://www.gnucash.org/pub/gnucash/sources/unstable/2.3.x/pgsql-win32.tar.gz"
+set_default PGSQL_LIB_URL "$SF_MIRROR/gnucash/pgsql-win32-2.tar.gz"
set_default PGSQL_DIR $GLOBAL_DIR\\pgsql
-set_default LIBDBI_URL "http://downloads.sourceforge.net/libdbi/libdbi-0.8.3.tar.gz"
+set_default LIBDBI_URL "$SF_MIRROR/libdbi/libdbi-0.8.3.tar.gz"
set_default LIBDBI_DIR $GLOBAL_DIR\\libdbi
set_default LIBDBI_PATCH `pwd`/libdbi-0.8.3.patch
set_default LIBDBI_PATCH2 `pwd`/libdbi-dbd_helper.c.patch
-set_default LIBDBI_DRIVERS_URL "http://downloads.sourceforge.net/libdbi-drivers/libdbi-drivers-0.8.3-1.tar.gz"
+set_default LIBDBI_DRIVERS_URL "$SF_MIRROR/libdbi-drivers/libdbi-drivers-0.8.3-1.tar.gz"
set_default LIBDBI_DRIVERS_DIR $GLOBAL_DIR\\libdbi-drivers
set_default LIBDBI_DRIVERS_PATCH `pwd`/libdbi-drivers-dbd_sqlite3.c.patch
set_default LIBDBI_DRIVERS_PATCH2 `pwd`/libdbi-drivers-Makefile.in.patch
commit bd3563aed3917005c1d3e83e6d8087108216c208
Author: Christian Stimming <stimming at tuhh.de>
Date: Sun Oct 4 20:25:43 2009 +0000
Revert r18366, "Bug #596248: Disable pgsql in libdbi build"
The current build doesn't even start. We revert this change so that
we go back to the previous behaviour where we at least started the
main window.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18369 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/dist.sh b/dist.sh
index 2b2b054..186a1f5 100755
--- a/dist.sh
+++ b/dist.sh
@@ -200,8 +200,8 @@ function dist_libdbi() {
cp -a ${_SQLITE3_UDIR}/lib/* ${DIST_UDIR}/lib
cp -a ${_MYSQL_LIB_UDIR}/bin/* ${DIST_UDIR}/bin
cp -a ${_MYSQL_LIB_UDIR}/lib/* ${DIST_UDIR}/lib
-# cp -a ${_PGSQL_UDIR}/bin/* ${DIST_UDIR}/bin
-# cp -a ${_PGSQL_UDIR}/lib/* ${DIST_UDIR}/lib
+ cp -a ${_PGSQL_UDIR}/bin/* ${DIST_UDIR}/bin
+ cp -a ${_PGSQL_UDIR}/lib/* ${DIST_UDIR}/lib
cp -a ${_LIBDBI_UDIR}/bin/* ${DIST_UDIR}/bin
cp -a ${_LIBDBI_UDIR}/lib/* ${DIST_UDIR}/lib
mkdir ${DIST_UDIR}/lib/dbd
diff --git a/install.sh b/install.sh
index f5746a1..a04396b 100755
--- a/install.sh
+++ b/install.sh
@@ -1078,14 +1078,14 @@ function inst_libdbi() {
test -f ${_MYSQL_LIB_UDIR}/lib/libmysql.dll || die "mysql not installed correctly - libmysql.dll"
test -f ${_MYSQL_LIB_UDIR}/lib/libmysqlclient.a || die "mysql not installed correctly - libmysqlclient.a"
fi
-# if test -f ${_PGSQL_UDIR}/lib/libpq.dll
-# then
-# echo "PGSQL library already installed. skipping."
-# else
-# wget_unpacked $PGSQL_LIB_URL $DOWNLOAD_DIR $TMP_DIR
-# mv $TMP_UDIR/pgsql* $PGSQL_DIR
-# test -f ${_PGSQL_UDIR}/lib/libpq.dll || die "libpq not installed correctly"
-# fi
+ if test -f ${_PGSQL_UDIR}/lib/libpq.dll
+ then
+ echo "PGSQL library already installed. skipping."
+ else
+ wget_unpacked $PGSQL_LIB_URL $DOWNLOAD_DIR $TMP_DIR
+ mv $TMP_UDIR/pgsql* $PGSQL_DIR
+ test -f ${_PGSQL_UDIR}/lib/libpq.dll || die "libpq not installed correctly"
+ fi
if test -f ${_LIBDBI_UDIR}/bin/libdbi-0.dll
then
echo "libdbi already installed. skipping."
@@ -1109,8 +1109,8 @@ function inst_libdbi() {
test -f ${_LIBDBI_UDIR}/bin/libdbi-0.dll || die "libdbi not installed correctly"
fi
if test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdsqlite3.dll -a \
- -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdmysql.dll
- #-a -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdpgsql.dll
+ -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdmysql.dll -a \
+ -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdpgsql.dll
then
echo "libdbi drivers already installed. skipping."
else
@@ -1133,15 +1133,15 @@ function inst_libdbi() {
--with-sqlite3-dir=${_SQLITE3_UDIR} \
--with-mysql \
--with-mysql-dir=${_MYSQL_LIB_UDIR} \
+ --with-pgsql \
+ --with-pgsql-dir=${_PGSQL_UDIR} \
--prefix=${_LIBDBI_DRIVERS_UDIR}
- #--with-pgsql \
- #--with-pgsql-dir=${_PGSQL_UDIR}
make
make install
qpopd
test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdsqlite3.dll || die "libdbi sqlite3 driver not installed correctly"
test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdmysql.dll || die "libdbi mysql driver not installed correctly"
- #test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdpgsql.dll || die "libdbi pgsql driver not installed correctly"
+ test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdpgsql.dll || die "libdbi pgsql driver not installed correctly"
fi
}
commit 3c8a94a806d2a44498a9cf5f1f050029d45b0dae
Author: Christian Stimming <stimming at tuhh.de>
Date: Sun Oct 4 20:25:32 2009 +0000
Partly revert r18363, "Minor windows version updates: Newer gmp, newer slib."
The newest build doesn't even start the gnucash main window (only the
splash screen). Hence, we revert the changed slib version because this might
affect that behaviour.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18368 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index a37a01d..8630c0f 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -138,7 +138,7 @@ set_default GMP_ABI 32
set_default GMP_DIR $GLOBAL_DIR\\gmp
set_default GUILE_URL "http://ftp.gnu.org/pub/gnu/guile/guile-1.6.8.tar.gz"
-set_default SLIB_URL "http://groups.csail.mit.edu/mac/ftpdir/scm/slib-3b2.zip"
+set_default SLIB_URL "http://swiss.csail.mit.edu/ftpdir/scm/OLD/slib3a3.zip"
set_default GUILE_DIR $GLOBAL_DIR\\guile
set_default OPENSSL_URL "http://www.openssl.org/source/openssl-0.9.8j.tar.gz"
commit 1a99dbc78353d576e3555ff4b27bbcb2934d4e4d
Author: Christian Stimming <stimming at tuhh.de>
Date: Sat Oct 3 20:11:46 2009 +0000
Win32: Build gwenhyfar without openssl because it doesn't need it anyway.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18367 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index 25da6d7..f5746a1 100755
--- a/install.sh
+++ b/install.sh
@@ -892,9 +892,8 @@ function inst_gwenhywfar() {
#automake
#autoconf
fi
+ # Note: gwenhywfar-3.x and higher don't use openssl anymore.
./configure ${HOST_XCOMPILE} \
- --with-openssl-includes=$_OPENSSL_UDIR/include \
- --with-openssl-libs=$_OPENSSL_UDIR/lib \
--with-libgcrypt-prefix=$_GNUTLS_UDIR \
--disable-binreloc \
--prefix=$_GWENHYWFAR_UDIR \
commit 443a90447d0a588388ab2c91b256d072e2ac17cf
Author: Christian Stimming <stimming at tuhh.de>
Date: Sat Oct 3 14:06:28 2009 +0000
Bug #596248: Disable pgsql in libdbi build because the available pgsql binaries depend on Visual Studio C runtime.
This can be enabled again as soon as we pgsql binaries available
which do not depend on MSVCR71.DLL anymore.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18366 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/dist.sh b/dist.sh
index 186a1f5..2b2b054 100755
--- a/dist.sh
+++ b/dist.sh
@@ -200,8 +200,8 @@ function dist_libdbi() {
cp -a ${_SQLITE3_UDIR}/lib/* ${DIST_UDIR}/lib
cp -a ${_MYSQL_LIB_UDIR}/bin/* ${DIST_UDIR}/bin
cp -a ${_MYSQL_LIB_UDIR}/lib/* ${DIST_UDIR}/lib
- cp -a ${_PGSQL_UDIR}/bin/* ${DIST_UDIR}/bin
- cp -a ${_PGSQL_UDIR}/lib/* ${DIST_UDIR}/lib
+# cp -a ${_PGSQL_UDIR}/bin/* ${DIST_UDIR}/bin
+# cp -a ${_PGSQL_UDIR}/lib/* ${DIST_UDIR}/lib
cp -a ${_LIBDBI_UDIR}/bin/* ${DIST_UDIR}/bin
cp -a ${_LIBDBI_UDIR}/lib/* ${DIST_UDIR}/lib
mkdir ${DIST_UDIR}/lib/dbd
diff --git a/install.sh b/install.sh
index 2b4431a..25da6d7 100755
--- a/install.sh
+++ b/install.sh
@@ -1079,14 +1079,14 @@ function inst_libdbi() {
test -f ${_MYSQL_LIB_UDIR}/lib/libmysql.dll || die "mysql not installed correctly - libmysql.dll"
test -f ${_MYSQL_LIB_UDIR}/lib/libmysqlclient.a || die "mysql not installed correctly - libmysqlclient.a"
fi
- if test -f ${_PGSQL_UDIR}/lib/libpq.dll
- then
- echo "PGSQL library already installed. skipping."
- else
- wget_unpacked $PGSQL_LIB_URL $DOWNLOAD_DIR $TMP_DIR
- mv $TMP_UDIR/pgsql* $PGSQL_DIR
- test -f ${_PGSQL_UDIR}/lib/libpq.dll || die "libpq not installed correctly"
- fi
+# if test -f ${_PGSQL_UDIR}/lib/libpq.dll
+# then
+# echo "PGSQL library already installed. skipping."
+# else
+# wget_unpacked $PGSQL_LIB_URL $DOWNLOAD_DIR $TMP_DIR
+# mv $TMP_UDIR/pgsql* $PGSQL_DIR
+# test -f ${_PGSQL_UDIR}/lib/libpq.dll || die "libpq not installed correctly"
+# fi
if test -f ${_LIBDBI_UDIR}/bin/libdbi-0.dll
then
echo "libdbi already installed. skipping."
@@ -1110,8 +1110,8 @@ function inst_libdbi() {
test -f ${_LIBDBI_UDIR}/bin/libdbi-0.dll || die "libdbi not installed correctly"
fi
if test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdsqlite3.dll -a \
- -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdmysql.dll -a \
- -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdpgsql.dll
+ -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdmysql.dll
+ #-a -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdpgsql.dll
then
echo "libdbi drivers already installed. skipping."
else
@@ -1134,15 +1134,15 @@ function inst_libdbi() {
--with-sqlite3-dir=${_SQLITE3_UDIR} \
--with-mysql \
--with-mysql-dir=${_MYSQL_LIB_UDIR} \
- --with-pgsql \
- --with-pgsql-dir=${_PGSQL_UDIR} \
--prefix=${_LIBDBI_DRIVERS_UDIR}
+ #--with-pgsql \
+ #--with-pgsql-dir=${_PGSQL_UDIR}
make
make install
qpopd
test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdsqlite3.dll || die "libdbi sqlite3 driver not installed correctly"
test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdmysql.dll || die "libdbi mysql driver not installed correctly"
- test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdpgsql.dll || die "libdbi pgsql driver not installed correctly"
+ #test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdpgsql.dll || die "libdbi pgsql driver not installed correctly"
fi
}
commit 31cf4afe14a80e556550cb69f2e1c7dcb5c7dbe2
Author: Christian Stimming <stimming at tuhh.de>
Date: Sat Oct 3 11:48:32 2009 +0000
Minor windows version updates: Newer gmp, newer slib.
(Note: The newer slib version doesn't yet fix the issue which caused r18360)
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18363 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 1186dac..a37a01d 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -133,12 +133,12 @@ set_default AUTOMAKE_URL "http://ftp.gnu.org/gnu/automake/automake-1.10.2.tar.bz
set_default LIBTOOL_URL "http://ftp.gnu.org/gnu/libtool/libtool-2.2.6a.tar.gz"
set_default AUTOTOOLS_DIR $GLOBAL_DIR\\autotools
-set_default GMP_URL "ftp://ftp.gnu.org/gnu/gmp/gmp-4.2.4.tar.bz2"
+set_default GMP_URL "ftp://ftp.gnu.org/gnu/gmp/gmp-4.3.1.tar.bz2"
set_default GMP_ABI 32
set_default GMP_DIR $GLOBAL_DIR\\gmp
set_default GUILE_URL "http://ftp.gnu.org/pub/gnu/guile/guile-1.6.8.tar.gz"
-set_default SLIB_URL "http://swiss.csail.mit.edu/ftpdir/scm/OLD/slib3a3.zip"
+set_default SLIB_URL "http://groups.csail.mit.edu/mac/ftpdir/scm/slib-3b2.zip"
set_default GUILE_DIR $GLOBAL_DIR\\guile
set_default OPENSSL_URL "http://www.openssl.org/source/openssl-0.9.8j.tar.gz"
commit 517e5ffab5a9bab8c069ea3cedc6aa2d9888a080
Author: Christian Stimming <stimming at tuhh.de>
Date: Fri Sep 25 19:43:22 2009 +0000
Win32 build: Add forgotten dist_ktoblzcheck step to dist creation.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18347 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/dist.sh b/dist.sh
index 3d73bed..186a1f5 100755
--- a/dist.sh
+++ b/dist.sh
@@ -292,6 +292,7 @@ else
dist_gmp
fi
dist_gwenhywfar
+dist_ktoblzcheck
dist_aqbanking
dist_libdbi
dist_webkit
commit a5b5114b7a9f8b44404e384707b92ed9e40a20c1
Author: Christian Stimming <stimming at tuhh.de>
Date: Thu Sep 24 20:45:21 2009 +0000
Win32 build: gwenhywfar needs another patch
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18345 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/gwenhywfar-3.11.1-patch.diff b/gwenhywfar-3.11.1-patch.diff
index 4d1fe95..0051bc5 100644
--- a/gwenhywfar-3.11.1-patch.diff
+++ b/gwenhywfar-3.11.1-patch.diff
@@ -108,6 +108,25 @@ index 363cdff..9a5e1d1 100644
p=s;
while(*p && *p!='?')
p++;
+diff --git a/plugins/configmgr/dir/cfgdir.c b/plugins/configmgr/dir/cfgdir.c
+index 7b89933..e44ac9a 100644
+--- a/plugins/configmgr/dir/cfgdir.c
++++ b/plugins/configmgr/dir/cfgdir.c
+@@ -102,8 +102,13 @@ GWEN_CONFIGMGR *GWEN_ConfigMgrDir_new(const char *url) {
+ GWEN_Buffer_AppendString(nbuf, s);
+ s=GWEN_Url_GetPath(gurl);
+ if (s) {
+- if (*s!='/' && *s!='\\')
++ /* Does this begin with a slash? If not, we add one, but only if
++ this isn't a drive letter (for windows!) */
++ if (*s!='/' && *s!='\\'
++ && !(isalpha(s[0]) && s[1] == ':'
++ && (s[2] == '/' || s[2] == '\\'))) {
+ GWEN_Buffer_AppendString(nbuf, GWEN_DIR_SEPARATOR_S);
++ }
+ GWEN_Buffer_AppendString(nbuf, s);
+ }
+ xcfg->folder=strdup(GWEN_Buffer_GetStart(nbuf));
--
1.6.1.rc3.51.g5832d
commit 2511eacc4f7cb361488dd2e019316bdd57e8d2ef
Author: Christian Stimming <stimming at tuhh.de>
Date: Thu Sep 24 20:12:41 2009 +0000
Win32 build: Fix stupid typo in aclocal call (also it is not needed ATM)
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18344 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index ff28ab5..2b4431a 100755
--- a/install.sh
+++ b/install.sh
@@ -888,9 +888,9 @@ function inst_gwenhywfar() {
else
if [ -n "$GWENHYWFAR_PATCH" -a -f "$GWENHYWFAR_PATCH" ] ; then
patch -p1 < $GWENHYWFAR_PATCH
- aclocal -I ${ACLOCAL_FLAGS} -I m4
- automake
- autoconf
+ #aclocal -I m4 ${ACLOCAL_FLAGS}
+ #automake
+ #autoconf
fi
./configure ${HOST_XCOMPILE} \
--with-openssl-includes=$_OPENSSL_UDIR/include \
commit afe0c61a466b43d6e9f639510ac414bc6b6ffae3
Author: Christian Stimming <stimming at tuhh.de>
Date: Thu Sep 24 20:06:58 2009 +0000
Gwenhywfar-3.11.1 also needs a patch to not crash at startup.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18343 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 7b3f493..1186dac 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -264,7 +264,7 @@ if [ "$AQBANKING3" != "yes" ]; then
set_default GWENHYWFAR_URL "$SF_MIRROR/gwenhywfar/gwenhywfar-2.6.2.tar.gz"
else
set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=29&file=01&dummy=gwenhywfar-3.11.1.tar.gz"
- #set_default GWENHYWFAR_PATCH `pwd`/gwenhywfar-3.11.0-patch.diff
+ set_default GWENHYWFAR_PATCH `pwd`/gwenhywfar-3.11.1-patch.diff
fi
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
diff --git a/gwenhywfar-3.11.1-patch.diff b/gwenhywfar-3.11.1-patch.diff
new file mode 100644
index 0000000..4d1fe95
--- /dev/null
+++ b/gwenhywfar-3.11.1-patch.diff
@@ -0,0 +1,113 @@
+From 1919a8e3c51e8c71f2c92a944cd07dc4e99a1265 Mon Sep 17 00:00:00 2001
+From: christian <christian at 70169cfe-8b10-0410-8925-dcb4b91034d8>
+Date: Thu, 24 Sep 2009 20:04:08 +0000
+Subject: [PATCH] Fix GWEN_Url_fromString for windows paths which include a drive letter.
+
+Also, gracefully return NULL instead of abort on unknown port number.
+Also, improve error message output. Also, confirm this to work
+without breaking anything by adding several more unittests for
+this function.
+
+git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@1601 70169cfe-8b10-0410-8925-dcb4b91034d8
+---
+ checks/check_urlfns.c | 105 +++++++++++++++++++++++++++++++++++++++++++++---
+ src/parser/urlfns.c | 33 ++++++++++++---
+ 2 files changed, 124 insertions(+), 14 deletions(-)
+
+diff --git a/src/parser/urlfns.c b/src/parser/urlfns.c
+index 363cdff..9a5e1d1 100644
+--- a/src/parser/urlfns.c
++++ b/src/parser/urlfns.c
+@@ -18,6 +18,7 @@
+ #include "url_p.h"
+ #include "urlfns.h"
+ #include <gwenhywfar/debug.h>
++#include <ctype.h> // for isalpha()
+
+
+ GWEN_URL *GWEN_Url_fromString(const char *str) {
+@@ -25,6 +26,7 @@ GWEN_URL *GWEN_Url_fromString(const char *str) {
+ GWEN_DB_NODE *dbVars;
+ const char *s;
+ const char *p;
++ int starts_with_drive_letter = 0;
+
+ url=GWEN_Url_new();
+ dbVars=GWEN_DB_Group_new("vars");
+@@ -33,8 +35,17 @@ GWEN_URL *GWEN_Url_fromString(const char *str) {
+ dbVars=0;
+
+ s=str;
++
++ /* Check for a drive letter, which occurs on windows, but this will
++ always be one single alpha character followed by a colon followed
++ by a directory separator. */
++ if (s && isalpha(s[0]) && s[1] == ':'
++ && (s[2] == '/' || s[2] == '\\')) {
++ starts_with_drive_letter = 1;
++ }
++
+ /* read protocol (if any) */
+- p=strchr(s, ':');
++ p = starts_with_drive_letter ? s : strchr(s, ':');
+ if (p) {
+ if (p[1]=='/' && p[2]=='/') {
+ char *buf;
+@@ -51,7 +62,7 @@ GWEN_URL *GWEN_Url_fromString(const char *str) {
+ }
+
+ if (!*s) {
+- DBG_ERROR(GWEN_LOGDOMAIN, "No server given");
++ DBG_ERROR(GWEN_LOGDOMAIN, "No server or path given in url \"%s\"", str);
+ GWEN_Url_free(url);
+ return 0;
+ }
+@@ -83,14 +94,21 @@ GWEN_URL *GWEN_Url_fromString(const char *str) {
+ s=p+1;
+ }
+
++ /* Do we now have a drive letter? (After the protocol?) */
++ if (!starts_with_drive_letter
++ && s && isalpha(s[0]) && s[1] == ':'
++ && (s[2] == '/' || s[2] == '\\')) {
++ starts_with_drive_letter = 1;
++ }
++
+ /* read server */
+ if (!*s) {
+- DBG_ERROR(GWEN_LOGDOMAIN, "No server given");
++ DBG_ERROR(GWEN_LOGDOMAIN, "No server given in url \"%s\"", str);
+ GWEN_Url_free(url);
+ return 0;
+ }
+ p=s;
+- while(*p && *p!=':' && *p!='/' && *p!='?')
++ while(!starts_with_drive_letter && *p && *p!=':' && *p!='/' && *p!='?')
+ p++;
+ if (p!=s) {
+ char *buf;
+@@ -120,9 +138,10 @@ GWEN_URL *GWEN_Url_fromString(const char *str) {
+ memmove(buf, s, p-s+1);
+ buf[p-s]=0;
+ if (sscanf(buf, "%d", &port)!=1) {
+- DBG_ERROR(GWEN_LOGDOMAIN, "Bad port (%s)", buf);
++ DBG_ERROR(GWEN_LOGDOMAIN, "Bad port (%s) in url \"%s\"", buf, str);
+ free(buf);
+- abort();
++ GWEN_Url_free(url);
++ return 0;
+ }
+ url->port=port;
+ free(buf);
+@@ -139,7 +158,7 @@ GWEN_URL *GWEN_Url_fromString(const char *str) {
+ }
+
+ /* get path */
+- if (*s=='/') {
++ if (starts_with_drive_letter || *s=='/') {
+ p=s;
+ while(*p && *p!='?')
+ p++;
+--
+1.6.1.rc3.51.g5832d
+
commit b07c2009359bc85045036d316ab4d5b52d22c5dc
Author: Christian Stimming <stimming at tuhh.de>
Date: Wed Sep 23 10:32:22 2009 +0000
Win32 build: Update file names with newer aqbanking version.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18340 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index 9968300..ff28ab5 100755
--- a/install.sh
+++ b/install.sh
@@ -1032,7 +1032,8 @@ function inst_aqbanking() {
exetype aqbanking-tool.exe console
exetype aqhbci-tool.exe console
else
- exetype aqhbci-tool3.exe console
+ exetype aqbanking-cli.exe console
+ exetype aqhbci-tool4.exe console
fi
qpopd
${PKG_CONFIG} --exists aqbanking || die "AqBanking not installed correctly"
commit 17c24e5e650cfb1966324148adb58cc7da55d8db
Author: Christian Stimming <stimming at tuhh.de>
Date: Wed Sep 23 09:37:17 2009 +0000
Update gwenhywfar+aqbanking packages - Martin has just released new versions including our patches.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18339 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 47d273a..7b3f493 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -263,8 +263,8 @@ set_default AQBANKING3 yes
if [ "$AQBANKING3" != "yes" ]; then
set_default GWENHYWFAR_URL "$SF_MIRROR/gwenhywfar/gwenhywfar-2.6.2.tar.gz"
else
- set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=28&file=01&dummy=gwenhywfar-3.11.0.tar.gz"
- set_default GWENHYWFAR_PATCH `pwd`/gwenhywfar-3.11.0-patch.diff
+ set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=29&file=01&dummy=gwenhywfar-3.11.1.tar.gz"
+ #set_default GWENHYWFAR_PATCH `pwd`/gwenhywfar-3.11.0-patch.diff
fi
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
@@ -274,8 +274,8 @@ set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-1.23.tar.gz"
if [ "$AQBANKING3" != "yes" ]; then
set_default AQBANKING_URL "$SF_MIRROR/aqbanking/aqbanking-2.3.3.tar.gz"
else
- set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=35&file=01&dummy=aqbanking-3.8.3.tar.gz"
- set_default AQBANKING_PATCH `pwd`/aqbanking-3.8.3-patch.diff
+ set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=44&file=01&dummy=aqbanking-4.1.7.tar.gz"
+ #set_default AQBANKING_PATCH `pwd`/aqbanking-4.1.6-patch.diff
fi
set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
set_default AQBANKING_WITH_QT yes
diff --git a/install.sh b/install.sh
index dd98c28..9968300 100755
--- a/install.sh
+++ b/install.sh
@@ -886,12 +886,12 @@ function inst_gwenhywfar() {
CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS}" \
LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} -lintl"
else
- [ -n "$GWENHYWFAR_PATCH" -a -f "$GWENHYWFAR_PATCH" ] && \
+ if [ -n "$GWENHYWFAR_PATCH" -a -f "$GWENHYWFAR_PATCH" ] ; then
patch -p1 < $GWENHYWFAR_PATCH
- # The current patch modifies configure.ac, so we need to call the autotools
- aclocal -I ${ACLOCAL_FLAGS} -I m4
- automake
- autoconf
+ aclocal -I ${ACLOCAL_FLAGS} -I m4
+ automake
+ autoconf
+ fi
./configure ${HOST_XCOMPILE} \
--with-openssl-includes=$_OPENSSL_UDIR/include \
--with-openssl-libs=$_OPENSSL_UDIR/lib \
commit ce17b69fce576906b83be87e1845cb4ae0812e36
Author: Christian Stimming <stimming at tuhh.de>
Date: Wed Sep 23 09:26:51 2009 +0000
Win32 build: Remove gwenhywfar configure option which has been removed before gwenhywfar-3.8.2.
Also, add aclocal call because the patch has modified configure.ac.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18337 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index 1a98bba..dd98c28 100755
--- a/install.sh
+++ b/install.sh
@@ -888,10 +888,13 @@ function inst_gwenhywfar() {
else
[ -n "$GWENHYWFAR_PATCH" -a -f "$GWENHYWFAR_PATCH" ] && \
patch -p1 < $GWENHYWFAR_PATCH
+ # The current patch modifies configure.ac, so we need to call the autotools
+ aclocal -I ${ACLOCAL_FLAGS} -I m4
+ automake
+ autoconf
./configure ${HOST_XCOMPILE} \
--with-openssl-includes=$_OPENSSL_UDIR/include \
--with-openssl-libs=$_OPENSSL_UDIR/lib \
- --with-libgnutls-prefix=$_GNUTLS_UDIR \
--with-libgcrypt-prefix=$_GNUTLS_UDIR \
--disable-binreloc \
--prefix=$_GWENHYWFAR_UDIR \
commit 5884076ae37201b1bd152b7bcdeb5d5cdd8602a9
Author: Christian Stimming <stimming at tuhh.de>
Date: Wed Sep 23 08:31:49 2009 +0000
Win32 build: Add patch for gwenhywfar-3.11.0 so that this compiles correctly.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18336 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/aqbanking-4.1.6-patch.diff b/aqbanking-4.1.6-patch.diff
new file mode 100644
index 0000000..667fa4e
--- /dev/null
+++ b/aqbanking-4.1.6-patch.diff
@@ -0,0 +1,28 @@
+From ba9cf4b5f7ad999381d9cfa8bf4048ec4afb4b96 Mon Sep 17 00:00:00 2001
+From: christian <christian at 5c42a225-8b10-0410-9873-89b7810ad06e>
+Date: Tue, 22 Sep 2009 19:31:39 +0000
+Subject: [PATCH] Add linking of libofxparser.la into ofx plugin again.
+
+Was probably accidentally removed in r1753.
+
+git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@1758 5c42a225-8b10-0410-9873-89b7810ad06e
+---
+ src/plugins/imexporters/ofx/Makefile.am | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/plugins/imexporters/ofx/Makefile.am b/src/plugins/imexporters/ofx/Makefile.am
+index ca89db1..5ea7496 100644
+--- a/src/plugins/imexporters/ofx/Makefile.am
++++ b/src/plugins/imexporters/ofx/Makefile.am
+@@ -18,7 +18,7 @@ imexporterplugin_LTLIBRARIES=ofx.la
+ imexporterplugin_DATA=ofx.xml
+
+ ofx_la_SOURCES=ofx.c
+-ofx_la_LIBADD=$(aqbanking_internal_libs) $(gwenhywfar_libs)
++ofx_la_LIBADD = parser/libofxparser.la $(aqbanking_internal_libs) $(gwenhywfar_libs)
+ ofx_la_LDFLAGS = -no-undefined @STRIPALL@ -module -avoid-version
+
+
+--
+1.6.1.rc3.51.g5832d
+
diff --git a/defaults.sh b/defaults.sh
index 0601554..47d273a 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -264,7 +264,7 @@ if [ "$AQBANKING3" != "yes" ]; then
set_default GWENHYWFAR_URL "$SF_MIRROR/gwenhywfar/gwenhywfar-2.6.2.tar.gz"
else
set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=28&file=01&dummy=gwenhywfar-3.11.0.tar.gz"
- #set_default GWENHYWFAR_PATCH `pwd`/gwenhywfar-3.6.0-patch.diff
+ set_default GWENHYWFAR_PATCH `pwd`/gwenhywfar-3.11.0-patch.diff
fi
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
diff --git a/gwenhywfar-3.11.0-patch.diff b/gwenhywfar-3.11.0-patch.diff
new file mode 100644
index 0000000..1fe902e
--- /dev/null
+++ b/gwenhywfar-3.11.0-patch.diff
@@ -0,0 +1,27 @@
+From a31de9bb25ddb34cc5d53736d11b58e67a0e65f8 Mon Sep 17 00:00:00 2001
+From: christian <christian at 70169cfe-8b10-0410-8925-dcb4b91034d8>
+Date: Tue, 22 Sep 2009 18:31:55 +0000
+Subject: [PATCH] Win32: Add configure check for RC executable.
+
+git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@1597 70169cfe-8b10-0410-8925-dcb4b91034d8
+---
+ configure.ac | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 38fb73f..7b00908 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -187,6 +187,9 @@ AC_PROG_INSTALL
+
+ AC_LIBTOOL_WIN32_DLL
+ AC_LIBTOOL_RC
++# Newer libtool doesn't have AC_LIBTOOL_RC anymore. Need to check for
++# $(RC) by ourselves.
++AC_CHECK_TOOL([RC], [windres], [no])
+ AC_PROG_LIBTOOL
+ AC_PROG_AWK
+ AC_CHECK_PROG(USE_DOT,dot,YES,NO)
+--
+1.6.1.rc3.51.g5832d
+
commit 7ba8dda880924b35661650fd3a7173edb2fc0689
Author: Christian Stimming <stimming at tuhh.de>
Date: Tue Sep 22 21:38:31 2009 +0000
Win32 installer: Really fix path of qt3-wizard.exe.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18332 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/dist.sh b/dist.sh
index 1948fe7..3d73bed 100755
--- a/dist.sh
+++ b/dist.sh
@@ -249,13 +249,9 @@ function finish() {
cp $_INSTALL_UDIR/bin/redirect.exe $DIST_UDIR/libexec/gconfd-2.exe
if [ "$AQBANKING_WITH_QT" = "yes" ]; then
- if [ "$AQBANKING3" != "yes" ]; then
- mv ${DIST_UDIR}/lib/aqbanking/plugins/16/wizards/qt3-wizard.exe $DIST_UDIR/bin
- cp $_INSTALL_UDIR/bin/redirect.exe $DIST_UDIR/lib/aqbanking/plugins/16/wizards/qt3-wizard.exe
- else
- mv ${DIST_UDIR}/lib/aqbanking/plugins/*/wizards/qt3-wizard.exe $DIST_UDIR/bin
- cp $_INSTALL_UDIR/bin/redirect.exe $DIST_UDIR/lib/aqbanking/plugins/*/wizards/qt3-wizard.exe
- fi
+ _qt3_wizard_path=`ls ${DIST_UDIR}/lib/aqbanking/plugins/*/wizards/qt3-wizard.exe`
+ mv ${_qt3_wizard_path} $DIST_UDIR/bin
+ cp $_INSTALL_UDIR/bin/redirect.exe ${_qt3_wizard_path}
fi
# Strip redirections in distributed libtool .la files
commit 206ef93b3df4956b42108647a3cf332d46782526
Author: Christian Stimming <stimming at tuhh.de>
Date: Tue Sep 22 21:23:59 2009 +0000
Bug #595920: Fix missing ca-bundle.crt in windows installer.
Also, fix the plugin number path of qt3-wizard.exe.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18331 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/dist.sh b/dist.sh
index e8653fd..1948fe7 100755
--- a/dist.sh
+++ b/dist.sh
@@ -172,6 +172,8 @@ function dist_gwenhywfar() {
cp -a ${_GWENHYWFAR_UDIR}/etc/* ${DIST_UDIR}/etc
fi
cp -a ${_GWENHYWFAR_UDIR}/lib/gwenhywfar ${DIST_UDIR}/lib
+ mkdir -p ${DIST_UDIR}/share/gwenhywfar
+ cp -a ${_GWENHYWFAR_UDIR}/share/gwenhywfar/ca-bundle.crt ${DIST_UDIR}/share/gwenhywfar
}
function dist_ktoblzcheck() {
@@ -251,8 +253,8 @@ function finish() {
mv ${DIST_UDIR}/lib/aqbanking/plugins/16/wizards/qt3-wizard.exe $DIST_UDIR/bin
cp $_INSTALL_UDIR/bin/redirect.exe $DIST_UDIR/lib/aqbanking/plugins/16/wizards/qt3-wizard.exe
else
- mv ${DIST_UDIR}/lib/aqbanking/plugins/20/wizards/qt3-wizard.exe $DIST_UDIR/bin
- cp $_INSTALL_UDIR/bin/redirect.exe $DIST_UDIR/lib/aqbanking/plugins/20/wizards/qt3-wizard.exe
+ mv ${DIST_UDIR}/lib/aqbanking/plugins/*/wizards/qt3-wizard.exe $DIST_UDIR/bin
+ cp $_INSTALL_UDIR/bin/redirect.exe $DIST_UDIR/lib/aqbanking/plugins/*/wizards/qt3-wizard.exe
fi
fi
commit 0313680f1b997d764925751e91672c130e9c05ba
Author: Christian Stimming <stimming at tuhh.de>
Date: Tue Sep 22 20:33:59 2009 +0000
Minor version update for online banking packages.
The libofx patch was originally intended to be committed to the libofx CVS
so that the code would be included in a potential 0.9.2 release sometime in
the future, only until I discovered that I'm a developer there but
without CVS write access. Duh!
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18330 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index d264004..0601554 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -263,12 +263,12 @@ set_default AQBANKING3 yes
if [ "$AQBANKING3" != "yes" ]; then
set_default GWENHYWFAR_URL "$SF_MIRROR/gwenhywfar/gwenhywfar-2.6.2.tar.gz"
else
- set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=17&file=01&dummy=gwenhywfar-3.6.0.tar.gz"
- set_default GWENHYWFAR_PATCH `pwd`/gwenhywfar-3.6.0-patch.diff
+ set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=28&file=01&dummy=gwenhywfar-3.11.0.tar.gz"
+ #set_default GWENHYWFAR_PATCH `pwd`/gwenhywfar-3.6.0-patch.diff
fi
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
-set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-1.20.tar.gz"
+set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-1.23.tar.gz"
# ktoblzcheck is being installed into GWENHYWFAR_DIR
if [ "$AQBANKING3" != "yes" ]; then
diff --git a/libofx-0.9.2-patch.diff b/libofx-0.9.2-patch.diff
new file mode 100644
index 0000000..1e51ead
--- /dev/null
+++ b/libofx-0.9.2-patch.diff
@@ -0,0 +1,184 @@
+Index: ChangeLog
+===================================================================
+RCS file: /cvsroot/libofx/libofx/ChangeLog,v
+retrieving revision 1.96
+diff -u -r1.96 ChangeLog
+--- ChangeLog 15 May 2009 14:11:41 -0000 1.96
++++ ChangeLog 22 Sep 2009 20:28:40 -0000
+@@ -1,3 +1,8 @@
++2009-09-22 Christian Stimming <stimming at tuhh.de>
++
++ * lib/ofx_preproc.cpp: Win32: Add gnucash patch that looks up the
++ dtd installation directory from the current executable's location.
++
+ 2009-05-09 Benoit Grégoire <benoitg at coeus.ca>
+ * Various C++ include fixes for building with recent compilers. Patch by Bill Nottingham <notting at redhat.com>
+
+Index: lib/ofx_preproc.cpp
+===================================================================
+RCS file: /cvsroot/libofx/libofx/lib/ofx_preproc.cpp,v
+retrieving revision 1.24
+diff -u -r1.24 ofx_preproc.cpp
+--- lib/ofx_preproc.cpp 6 Dec 2008 22:28:39 -0000 1.24
++++ lib/ofx_preproc.cpp 22 Sep 2009 20:28:41 -0000
+@@ -36,6 +36,9 @@
+
+ #ifdef OS_WIN32
+ # include "win32.hh"
++# include <windows.h> // for GetModuleFileName()
++# undef ERROR
++# undef DELETE
+ #endif
+
+ #define LIBOFX_DEFAULT_INPUT_ENCODING "CP1252"
+@@ -505,6 +508,31 @@
+ }
+
+
++#ifdef OS_WIN32
++static std::string get_dtd_installation_directory()
++{
++ // Partial implementation of
++ // http://developer.gnome.org/doc/API/2.0/glib/glib-Windows-Compatibility-Functions.html#g-win32-get-package-installation-directory
++ char ch_fn[MAX_PATH], *p;
++ std::string str_fn;
++
++ if (!GetModuleFileName(NULL, ch_fn, MAX_PATH)) return "";
++
++ if ((p = strrchr(ch_fn, '\\')) != NULL)
++ *p = '\0';
++
++ p = strrchr(ch_fn, '\\');
++ if (p && (_stricmp(p+1, "bin") == 0 ||
++ _stricmp(p+1, "lib") == 0))
++ *p = '\0';
++
++ str_fn = ch_fn;
++ str_fn += "\\share\\libofx\\dtd\\";
++
++ return str_fn;
++}
++#endif
++
+
+ /**
+ This function will try to find a DTD matching the requested_version and return the full path of the DTD found (or an empty string if unsuccessfull)
+@@ -513,45 +541,45 @@
+ */
+ string find_dtd(LibofxContextPtr ctx, string dtd_filename)
+ {
+- int i;
+- ifstream dtd_file;
+ string dtd_path_filename;
+- bool dtd_found=false;
+
+- dtd_path_filename=((LibofxContext*)ctx)->dtdDir();
++ dtd_path_filename = reinterpret_cast<const LibofxContext*>(ctx)->dtdDir();
+ if (!dtd_path_filename.empty()) {
+ dtd_path_filename.append(dtd_filename);
+- dtd_file.clear();
+- dtd_file.open(dtd_path_filename.c_str());
++ ifstream dtd_file(dtd_path_filename.c_str());
+ if(dtd_file){
+ message_out(STATUS,"find_dtd():DTD found: "+dtd_path_filename);
+- dtd_file.close();
+- dtd_found=true;
++ return dtd_path_filename;
+ }
+ }
+
+- if (!dtd_found) {
+- for(i=0;i<DTD_SEARCH_PATH_NUM&&dtd_found==false;i++){
++#ifdef OS_WIN32
++ dtd_path_filename = get_dtd_installation_directory();
++ if (!dtd_path_filename.empty()) {
++ dtd_path_filename.append(dtd_filename);
++ ifstream dtd_file(dtd_path_filename.c_str());
++ if(dtd_file){
++ message_out(STATUS,"find_dtd():DTD found: "+dtd_path_filename);
++ return dtd_path_filename;
++ }
++ }
++#endif
++
++ for(int i=0;i<DTD_SEARCH_PATH_NUM;i++){
+ dtd_path_filename=DTD_SEARCH_PATH[i];
+ dtd_path_filename.append(dtd_filename);
+- dtd_file.clear();
+- dtd_file.open(dtd_path_filename.c_str());
++ ifstream dtd_file(dtd_path_filename.c_str());
+ if(!dtd_file){
+ message_out(DEBUG,"find_dtd():Unable to open the file "+dtd_path_filename);
+ }
+ else{
+ message_out(STATUS,"find_dtd():DTD found: "+dtd_path_filename);
+- dtd_file.close();
+- dtd_found=true;
++ return dtd_path_filename;
+ }
+- }
+ }
+
+- if(dtd_found==false){
+- message_out(ERROR,"find_dtd():Unable to find the DTD named " + dtd_filename);
+- dtd_path_filename="";
+- }
+- return dtd_path_filename;
++ message_out(ERROR,"find_dtd():Unable to find the DTD named " + dtd_filename);
++ return "";
+ }
+
+
+Index: lib/ofx_utilities.cpp
+===================================================================
+RCS file: /cvsroot/libofx/libofx/lib/ofx_utilities.cpp,v
+retrieving revision 1.12
+diff -u -r1.12 ofx_utilities.cpp
+--- lib/ofx_utilities.cpp 15 May 2009 14:11:41 -0000 1.12
++++ lib/ofx_utilities.cpp 22 Sep 2009 20:28:41 -0000
+@@ -217,25 +217,29 @@
+ }
+
+
+-int mkTempFileName(const char *tmpl, char *buffer, unsigned int size) {
+- const char *tmp_dir;
++std::string get_tmp_dir()
++{
++ // Tries to mimic the behaviour of
++ // http://developer.gnome.org/doc/API/2.0/glib/glib-Miscellaneous-Utility-Functions.html#g-get-tmp-dir
++ char *var;
++ var = getenv("TMPDIR");
++ if (var) return var;
++ var = getenv("TMP");
++ if (var) return var;
++ var = getenv("TEMP");
++ if (var) return var;
++#ifdef OS_WIN32
++ return "C:\\";
++#else
++ return "/tmp";
++#endif
++}
+
+- tmp_dir = getenv ("TMPDIR");
+- if (!tmp_dir)
+- tmp_dir = getenv ("TMP");
+- if (!tmp_dir)
+- tmp_dir = getenv ("TEMP");
++int mkTempFileName(const char *tmpl, char *buffer, unsigned int size) {
+
+- if (!tmp_dir)
+- {
+-#ifdef OS_WIN32
+- tmp_dir = "C:\\";
+-#else
+- tmp_dir = "/tmp";
+-#endif /* !OS_WIN32 */
+- }
++ std::string tmp_dir = get_tmp_dir();
+
+- strncpy(buffer, tmp_dir, size);
++ strncpy(buffer, tmp_dir.c_str(), size);
+ assert((strlen(buffer)+strlen(tmpl)+2)<size);
+ strcat(buffer, DIRSEP);
+ strcat(buffer, tmpl);
commit 0167a4bacf3809ac639b04a8a359b7fa28628e86
Author: Phil Longstaff <plongstaff at newearth.org>
Date: Mon Sep 14 01:00:47 2009 +0000
Fix bug 589673 - need to patch libdbi source for win32 problem.
The patch exists in libdbi source, but not in 0.8.3. The problem is that "errno" is used
as a routine parameter name. The parameters are accessed incorrectly leading to a segmentation
violation.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18312 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 481460d..d264004 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -292,6 +292,7 @@ set_default PGSQL_DIR $GLOBAL_DIR\\pgsql
set_default LIBDBI_URL "http://downloads.sourceforge.net/libdbi/libdbi-0.8.3.tar.gz"
set_default LIBDBI_DIR $GLOBAL_DIR\\libdbi
set_default LIBDBI_PATCH `pwd`/libdbi-0.8.3.patch
+set_default LIBDBI_PATCH2 `pwd`/libdbi-dbd_helper.c.patch
set_default LIBDBI_DRIVERS_URL "http://downloads.sourceforge.net/libdbi-drivers/libdbi-drivers-0.8.3-1.tar.gz"
set_default LIBDBI_DRIVERS_DIR $GLOBAL_DIR\\libdbi-drivers
set_default LIBDBI_DRIVERS_PATCH `pwd`/libdbi-drivers-dbd_sqlite3.c.patch
diff --git a/install.sh b/install.sh
index 6600863..1a98bba 100755
--- a/install.sh
+++ b/install.sh
@@ -111,7 +111,7 @@ function inst_dtk() {
if quiet ${_MSYS_UDIR}/bin/perl --help &&
[ "`m4 --version | sed '1!d;s,.* [Mm]4 ,,'`" = "1.4.7" ]
then
- echo "msys dtk already installed. skipping."
+ echo "msys dtk already installed. skipping."
else
smart_wget $DTK_URL $DOWNLOAD_DIR
$LAST_FILE //SP- //SILENT //DIR="$MSYS_DIR"
@@ -1094,6 +1094,9 @@ function inst_libdbi() {
patch -p1 < $LIBDBI_PATCH
./autogen.sh
fi
+ if [ -n "$LIBDBI_PATCH2" -a -f "$LIBDBI_PATCH2" ]; then
+ patch -p1 < $LIBDBI_PATCH2
+ fi
./configure ${HOST_XCOMPILE} \
--disable-docs \
--prefix=${_LIBDBI_UDIR}
diff --git a/libdbi-dbd_helper.c.patch b/libdbi-dbd_helper.c.patch
new file mode 100755
index 0000000..439a293
--- /dev/null
+++ b/libdbi-dbd_helper.c.patch
@@ -0,0 +1,40 @@
+--- libdbi-0.8.3/src/dbd_helper.c.orig Sun Sep 13 16:34:39 2009
++++ libdbi-0.8.3/src/dbd_helper.c Sun Sep 13 16:35:02 2009
+@@ -145,7 +145,7 @@
+ return len;
+ }
+
+-void _dbd_internal_error_handler(dbi_conn_t *conn, const char *errmsg, const int errno) {
++void _dbd_internal_error_handler(dbi_conn_t *conn, const char *errmsg, const int err_no) {
+ int my_errno = DBI_ERROR_NONE;
+ int errstatus;
+ char *my_errmsg = NULL;
+@@ -154,7 +154,7 @@
+ free(conn->error_message);
+ }
+
+- if (errno == DBI_ERROR_DBD) {
++ if (err_no == DBI_ERROR_DBD) {
+ /* translate into a client-library specific error number */
+ errstatus = conn->driver->functions->geterror(conn, &my_errno, &my_errmsg);
+
+@@ -171,8 +171,8 @@
+ }
+ }
+ else if (errmsg) {
+- conn->error_flag = errno; /* legacy code may rely on this */
+- conn->error_number = errno;
++ conn->error_flag = err_no; /* legacy code may rely on this */
++ conn->error_number = err_no;
+ conn->error_message = strdup(errmsg);
+
+ if (conn->error_handler != NULL) {
+@@ -181,7 +181,7 @@
+ }
+ else {
+ /* pass internal errors to the internal libdbi handler */
+- _error_handler(conn, errno);
++ _error_handler(conn, err_no);
+ }
+
+ }
commit 3aabee8e89dce83097c3306f47fb5216c8545133
Author: Phil Longstaff <plongstaff at newearth.org>
Date: Tue Aug 18 16:49:40 2009 +0000
Fix win32 report directory startup problem on win32.
In order to help keep the various places run-time environment is created in sync, add a
comment to each place suggesting that environment changes should be reflected in all 4
places.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18263 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/gnucash.iss.in b/gnucash.iss.in
index 442f358..84448b4 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -190,6 +190,9 @@ begin
pkgdatadir := appdir + '\share\gnucash';
{ Create the gnucash.cmd file; #10 is the linefeed character and #13 CR }
+
+ { If you make any changes here, you should probably also change the equivalent sections }
+ { in packaging/win32/install.sh, src/bin/gnucash-setup-env.in and src/bin/gnucash-setup-env-osx.in }
FileName := appdir + '\bin\gnucash.cmd' ;
FileString := 'setlocal'#13#10 ;
FileString := FileString + 'chcp ' + ExpandConstant('{cm:LanguageCodePage}') + ''#13#10 ;
@@ -201,6 +204,7 @@ begin
FileString := FileString + 'set LTDL_LIBRARY_PATH=' + libdir + ''#13#10 ;
FileString := FileString + 'set QOF_LIB_DIR=' + pkglibdir + ''#13#10 ;
FileString := FileString + 'set GNC_DBD_DIR=' + libdir + '\dbd'#13#10 ;
+ FileString := FileString + 'set GNC_STANDARD_REPORTS_DIR=' + pkgdatadir + '\guile-modules\gnucash\report\standard-reports'#13#10 ;
FileString := FileString + 'set SCHEME_LIBRARY_PATH='#13#10 ;
FileString := FileString + 'start gnucash-bin %*'#13#10 ;
diff --git a/install.sh b/install.sh
index 4e444ea..6600863 100755
--- a/install.sh
+++ b/install.sh
@@ -1286,6 +1286,9 @@ function make_install() {
if [ -z $_skip_scripts ]; then
# Create a startup script that works without the msys shell
+ # If you make any changes here, you should probably also change
+ # the equivalent sections in packaging/win32/gnucash.iss.in,
+ # src/bin/gnucash-setup-env.in and src/bin/gnucash-setup-env-osx.in
qpushd $_INSTALL_UDIR/bin
echo "setlocal" > gnucash.cmd
echo "set PATH=${INSTALL_DIR}\\bin;${INSTALL_DIR}\\lib;${INSTALL_DIR}\\lib\\gnucash;${GNUTLS_DIR}\\bin;${GMP_DIR}\\bin;${GOFFICE_DIR}\\bin;${LIBGSF_DIR}\\bin;${PCRE_DIR}\\bin;${WEBKIT_DIR}\\bin;${GNOME_DIR}\\bin;${GUILE_DIR}\\bin;${REGEX_DIR}\\bin;${AUTOTOOLS_DIR}\\bin;${AQBANKING_PATH};${LIBOFX_DIR}\\bin;${OPENSP_DIR}\\bin;${LIBDBI_DIR}\\bin;${SQLITE3_DIR}\\bin;%PATH%" >> gnucash.cmd
commit e59fb6d2d26f01dffc2958cfa6163282c09760f0
Author: Phil Longstaff <plongstaff at newearth.org>
Date: Tue Aug 18 00:11:03 2009 +0000
Fix win32 gnucash.cmd creation to handle ability for reports to be dropped into the
installed report\standard-reports folder.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18260 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index ad7deda..4e444ea 100755
--- a/install.sh
+++ b/install.sh
@@ -1294,6 +1294,7 @@ function make_install() {
echo "set GUILE_LOAD_PATH=${INSTALL_DIR}\\share\\gnucash\\guile-modules;${INSTALL_DIR}\\share\\gnucash\\scm;%GUILE_LOAD_PATH%" >> gnucash.cmd
echo "set LTDL_LIBRARY_PATH=${INSTALL_DIR}\\lib" >> gnucash.cmd
echo "set GNC_DBD_DIR=${LIBDBI_DRIVERS_DIR}\\lib\\dbd" >> gnucash.cmd
+ echo "set GNC_STANDARD_REPORTS_DIR=${INSTALL_DIR}\\share\\gnucash\\guile-modules\\gnucash\\report\\standard-reports" >> gnucash.cmd
echo "set SCHEME_LIBRARY_PATH=" >> gnucash.cmd
echo "start gnucash-bin %*" >> gnucash.cmd
qpopd
commit 20acbae972b123a00ab00ae570975b371bdd639d
Author: Phil Longstaff <plongstaff at newearth.org>
Date: Sun Aug 2 03:00:28 2009 +0000
Change --enable-webkit configure option to --with-html-engine=XXX where XXX is "gtkhtml" (default)
or "webkit".
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18230 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index b8c0682..ad7deda 100755
--- a/install.sh
+++ b/install.sh
@@ -1206,7 +1206,7 @@ function inst_gnucash() {
${AQBANKING_OPTIONS} \
--enable-binreloc \
--enable-locale-specific-tax \
- --enable-webkit \
+ --with-html-engine=webkit \
CPPFLAGS="${AUTOTOOLS_CPPFLAGS} ${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GUILE_CPPFLAGS} ${LIBDBI_CPPFLAGS} ${KTOBLZCHECK_CPPFLAGS} ${HH_CPPFLAGS} -D_WIN32" \
LDFLAGS="${AUTOTOOLS_LDFLAGS} ${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} ${HH_LDFLAGS}" \
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
commit 263c88e7539cb798af9bccf22ccb356d71c83bbc
Author: Derek Atkins <derek at ihtfp.com>
Date: Tue Jul 7 02:45:46 2009 +0000
Let the trap happen.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18185 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_package.sh b/build_package.sh
index 3c15dd5..3cd1a76 100644
--- a/build_package.sh
+++ b/build_package.sh
@@ -29,6 +29,7 @@ _OUTPUT_DIR=`unix_path $OUTPUT_DIR`
LOGFILE=${_OUTPUT_DIR}/${LOGFILENAME}
mkdir -p ${_OUTPUT_DIR}
+set +e
trap on_error ERR
# Run the compile
commit 807e58c6fc4dcb67b141d102cd14446e444fdef0
Author: Phil Longstaff <plongstaff at newearth.org>
Date: Sat Jul 4 19:12:56 2009 +0000
pgsql-win32.tar.gz which provides client access to a postgresql library has been updated to add
some needed DLLs. Unfortunately, unlike mysql, postgresql does not provide a pre-built win32
package containing the client side include files and libraries. pgsql-win32.tar.gz is a set of
files taken from a full windows installation.
With the new pgsql-win32.tar.gz, to compile on win32, you will need to delete your
pgsql directory and downloads/pgsql-win32.tar.gz file i.e.:
cd /c/soft
rm downloads/pgsql-win32.tar.gz
rm -rf pgsql
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18175 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/dist.sh b/dist.sh
index 21b563d..e8653fd 100755
--- a/dist.sh
+++ b/dist.sh
@@ -198,6 +198,7 @@ function dist_libdbi() {
cp -a ${_SQLITE3_UDIR}/lib/* ${DIST_UDIR}/lib
cp -a ${_MYSQL_LIB_UDIR}/bin/* ${DIST_UDIR}/bin
cp -a ${_MYSQL_LIB_UDIR}/lib/* ${DIST_UDIR}/lib
+ cp -a ${_PGSQL_UDIR}/bin/* ${DIST_UDIR}/bin
cp -a ${_PGSQL_UDIR}/lib/* ${DIST_UDIR}/lib
cp -a ${_LIBDBI_UDIR}/bin/* ${DIST_UDIR}/bin
cp -a ${_LIBDBI_UDIR}/lib/* ${DIST_UDIR}/lib
commit 31bb98e4aa828c271c621236b5148c52c0028212
Author: Phil Longstaff <plongstaff at newearth.org>
Date: Sat Jul 4 04:14:39 2009 +0000
Fix pgsql files copied - remove pgsql/bin which doesn't exist
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18173 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/dist.sh b/dist.sh
index e8653fd..21b563d 100755
--- a/dist.sh
+++ b/dist.sh
@@ -198,7 +198,6 @@ function dist_libdbi() {
cp -a ${_SQLITE3_UDIR}/lib/* ${DIST_UDIR}/lib
cp -a ${_MYSQL_LIB_UDIR}/bin/* ${DIST_UDIR}/bin
cp -a ${_MYSQL_LIB_UDIR}/lib/* ${DIST_UDIR}/lib
- cp -a ${_PGSQL_UDIR}/bin/* ${DIST_UDIR}/bin
cp -a ${_PGSQL_UDIR}/lib/* ${DIST_UDIR}/lib
cp -a ${_LIBDBI_UDIR}/bin/* ${DIST_UDIR}/bin
cp -a ${_LIBDBI_UDIR}/lib/* ${DIST_UDIR}/lib
commit 73ae550ea50535e6ef60c4cc6a8a040cbcf95413
Author: Phil Longstaff <plongstaff at newearth.org>
Date: Fri Jul 3 16:16:11 2009 +0000
Fix (I hope) installation of libpq
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18171 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index 8aa3634..b8c0682 100755
--- a/install.sh
+++ b/install.sh
@@ -1075,12 +1075,13 @@ function inst_libdbi() {
test -f ${_MYSQL_LIB_UDIR}/lib/libmysql.dll || die "mysql not installed correctly - libmysql.dll"
test -f ${_MYSQL_LIB_UDIR}/lib/libmysqlclient.a || die "mysql not installed correctly - libmysqlclient.a"
fi
- if test -f ${_PSQL_LIB_UDIR}/lib/libpqsql.dll
+ if test -f ${_PGSQL_UDIR}/lib/libpq.dll
then
echo "PGSQL library already installed. skipping."
else
wget_unpacked $PGSQL_LIB_URL $DOWNLOAD_DIR $TMP_DIR
mv $TMP_UDIR/pgsql* $PGSQL_DIR
+ test -f ${_PGSQL_UDIR}/lib/libpq.dll || die "libpq not installed correctly"
fi
if test -f ${_LIBDBI_UDIR}/bin/libdbi-0.dll
then
commit 21caf963b0c26836443417992fca7b027bf42e8c
Author: Derek Atkins <derek at ihtfp.com>
Date: Fri Jul 3 12:57:34 2009 +0000
Make sure we copy the logfile even on error
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18170 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_package.sh b/build_package.sh
index 98e465a..3c15dd5 100644
--- a/build_package.sh
+++ b/build_package.sh
@@ -8,6 +8,13 @@
set -e
+function on_error() {
+ if [ `hostname` = "gnucash-win32" ]; then
+ scp -p ${LOGFILE} upload at code.gnucash.org:public_html/win32/trunk
+ fi
+ exit
+}
+
function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
tag="$1"
@@ -22,6 +29,8 @@ _OUTPUT_DIR=`unix_path $OUTPUT_DIR`
LOGFILE=${_OUTPUT_DIR}/${LOGFILENAME}
mkdir -p ${_OUTPUT_DIR}
+trap on_error ERR
+
# Run the compile
./install.sh 2>&1 | tee ${LOGFILE}
commit aee72bf8e1f0730b59d625b060288a06a308fe66
Author: Phil Longstaff <plongstaff at newearth.org>
Date: Wed Jul 1 12:33:56 2009 +0000
Fix URL for pgsql library stuff
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18165 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 11e60f7..481460d 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -287,7 +287,7 @@ set_default SQLITE3_DIR $GLOBAL_DIR\\sqlite3
set_default MYSQL_LIB_URL "http://mirror.csclub.uwaterloo.ca/mysql/Downloads/Connector-C/mysql-connector-c-noinstall-6.0.1-win32.zip"
set_default MYSQL_LIB_DIR $GLOBAL_DIR\\mysql
set_default LIBMYSQL_DEF `pwd`/libmysql.def
-set_default PGSQL_LIB_URL pgsql-win32.tar.gz
+set_default PGSQL_LIB_URL "http://www.gnucash.org/pub/gnucash/sources/unstable/2.3.x/pgsql-win32.tar.gz"
set_default PGSQL_DIR $GLOBAL_DIR\\pgsql
set_default LIBDBI_URL "http://downloads.sourceforge.net/libdbi/libdbi-0.8.3.tar.gz"
set_default LIBDBI_DIR $GLOBAL_DIR\\libdbi
commit a21ca09d699a859d2b0f28872f80e0bc9b249ba8
Author: Phil Longstaff <plongstaff at newearth.org>
Date: Mon Jun 29 21:10:21 2009 +0000
Build pgsql libdbi driver
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18164 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index cd03267..11e60f7 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -287,7 +287,8 @@ set_default SQLITE3_DIR $GLOBAL_DIR\\sqlite3
set_default MYSQL_LIB_URL "http://mirror.csclub.uwaterloo.ca/mysql/Downloads/Connector-C/mysql-connector-c-noinstall-6.0.1-win32.zip"
set_default MYSQL_LIB_DIR $GLOBAL_DIR\\mysql
set_default LIBMYSQL_DEF `pwd`/libmysql.def
-set_default PGSQL_LIB_DIR $GLOBAL_DIR\\pgsql
+set_default PGSQL_LIB_URL pgsql-win32.tar.gz
+set_default PGSQL_DIR $GLOBAL_DIR\\pgsql
set_default LIBDBI_URL "http://downloads.sourceforge.net/libdbi/libdbi-0.8.3.tar.gz"
set_default LIBDBI_DIR $GLOBAL_DIR\\libdbi
set_default LIBDBI_PATCH `pwd`/libdbi-0.8.3.patch
diff --git a/dist.sh b/dist.sh
index ac82473..e8653fd 100755
--- a/dist.sh
+++ b/dist.sh
@@ -38,6 +38,7 @@ function prepare() {
_AQBANKING_UDIR=`unix_path $AQBANKING_DIR`
_SQLITE3_UDIR=`unix_path ${SQLITE3_DIR}`
_MYSQL_LIB_UDIR=`unix_path ${MYSQL_LIB_DIR}`
+ _PGSQL_UDIR=`unix_path ${PGSQL_DIR}`
_LIBDBI_UDIR=`unix_path ${LIBDBI_DIR}`
_LIBDBI_DRIVERS_UDIR=`unix_path ${LIBDBI_DRIVERS_DIR}`
_LIBGDA_UDIR=`unix_path $LIBGDA_DIR`
@@ -195,8 +196,10 @@ function dist_libdbi() {
setup LibDBI
cp -a ${_SQLITE3_UDIR}/bin/* ${DIST_UDIR}/bin
cp -a ${_SQLITE3_UDIR}/lib/* ${DIST_UDIR}/lib
- cp -a ${_MYSQL_LIB_UDIR}/bin/* ${DIST_UDIR}/bin
- cp -a ${_MYSQL_LIB_UDIR}/lib/* ${DIST_UDIR}/lib
+ cp -a ${_MYSQL_LIB_UDIR}/bin/* ${DIST_UDIR}/bin
+ cp -a ${_MYSQL_LIB_UDIR}/lib/* ${DIST_UDIR}/lib
+ cp -a ${_PGSQL_UDIR}/bin/* ${DIST_UDIR}/bin
+ cp -a ${_PGSQL_UDIR}/lib/* ${DIST_UDIR}/lib
cp -a ${_LIBDBI_UDIR}/bin/* ${DIST_UDIR}/bin
cp -a ${_LIBDBI_UDIR}/lib/* ${DIST_UDIR}/lib
mkdir ${DIST_UDIR}/lib/dbd
diff --git a/install.sh b/install.sh
index 12debab..8aa3634 100755
--- a/install.sh
+++ b/install.sh
@@ -1041,6 +1041,7 @@ function inst_libdbi() {
setup LibDBI
_SQLITE3_UDIR=`unix_path ${SQLITE3_DIR}`
_MYSQL_LIB_UDIR=`unix_path ${MYSQL_LIB_DIR}`
+ _PGSQL_UDIR=`unix_path ${PGSQL_DIR}`
_LIBDBI_UDIR=`unix_path ${LIBDBI_DIR}`
_LIBDBI_DRIVERS_UDIR=`unix_path ${LIBDBI_DRIVERS_DIR}`
add_to_env -I$_LIBDBI_UDIR/include LIBDBI_CPPFLAGS
@@ -1074,6 +1075,13 @@ function inst_libdbi() {
test -f ${_MYSQL_LIB_UDIR}/lib/libmysql.dll || die "mysql not installed correctly - libmysql.dll"
test -f ${_MYSQL_LIB_UDIR}/lib/libmysqlclient.a || die "mysql not installed correctly - libmysqlclient.a"
fi
+ if test -f ${_PSQL_LIB_UDIR}/lib/libpqsql.dll
+ then
+ echo "PGSQL library already installed. skipping."
+ else
+ wget_unpacked $PGSQL_LIB_URL $DOWNLOAD_DIR $TMP_DIR
+ mv $TMP_UDIR/pgsql* $PGSQL_DIR
+ fi
if test -f ${_LIBDBI_UDIR}/bin/libdbi-0.dll
then
echo "libdbi already installed. skipping."
@@ -1093,8 +1101,9 @@ function inst_libdbi() {
qpopd
test -f ${_LIBDBI_UDIR}/bin/libdbi-0.dll || die "libdbi not installed correctly"
fi
- if test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdsqlite3.dll &&
- test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdmysql.dll
+ if test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdsqlite3.dll -a \
+ -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdmysql.dll -a \
+ -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdpgsql.dll
then
echo "libdbi drivers already installed. skipping."
else
@@ -1107,6 +1116,8 @@ function inst_libdbi() {
patch -p0 < $LIBDBI_DRIVERS_PATCH2
[ -n "$LIBDBI_DRIVERS_PATCH3" -a -f "$LIBDBI_DRIVERS_PATCH3" ] && \
patch -p0 < $LIBDBI_DRIVERS_PATCH3
+ [ -n "$LIBDBI_DRIVERS_PATCH4" -a -f "$LIBDBI_DRIVERS_PATCH4" ] && \
+ patch -p0 < $LIBDBI_DRIVERS_PATCH4
LDFLAGS=-no-undefined ./configure ${HOST_XCOMPILE} \
--disable-docs \
--with-dbi-incdir=${_LIBDBI_UDIR}/include \
@@ -1115,12 +1126,15 @@ function inst_libdbi() {
--with-sqlite3-dir=${_SQLITE3_UDIR} \
--with-mysql \
--with-mysql-dir=${_MYSQL_LIB_UDIR} \
+ --with-pgsql \
+ --with-pgsql-dir=${_PGSQL_UDIR} \
--prefix=${_LIBDBI_DRIVERS_UDIR}
make
make install
qpopd
test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdsqlite3.dll || die "libdbi sqlite3 driver not installed correctly"
test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdmysql.dll || die "libdbi mysql driver not installed correctly"
+ test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdpgsql.dll || die "libdbi pgsql driver not installed correctly"
fi
}
diff --git a/libdbi-drivers-dbd_pgsql.c.patch b/libdbi-drivers-dbd_pgsql.c.patch
new file mode 100644
index 0000000..948bab1
--- /dev/null
+++ b/libdbi-drivers-dbd_pgsql.c.patch
@@ -0,0 +1,18 @@
+--- drivers/pgsql/dbd_pgsql.c Sat Jan 26 12:39:50 2008
++++ drivers/pgsql/dbd_pgsql.c.new Tue Jun 9 21:06:14 2009
+@@ -520,11 +520,11 @@
+ return db;
+ }
+
+-int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr) {
+- /* put error number into errno, error string into errstr
+- * return 0 if error, 1 if errno filled, 2 if errstr filled, 3 if both errno and errstr filled */
++int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr) {
++ /* put error number into err_no, error string into errstr
++ * return 0 if error, 1 if err_no filled, 2 if errstr filled, 3 if both err_no and errstr filled */
+
+- *errno = 0;
++ *err_no = 0;
+ *errstr = strdup(PQerrorMessage((PGconn *)conn->connection));
+
+ return 2;
commit 63529e1ac47d31efea2fa420f61014dcfe2ad63f
Author: Phil Longstaff <plongstaff at newearth.org>
Date: Thu Jun 25 22:16:48 2009 +0000
Build mysql client library and libdbi driver properly
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18160 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index fcf7aa1..12debab 100755
--- a/install.sh
+++ b/install.sh
@@ -1059,7 +1059,8 @@ function inst_libdbi() {
qpopd
test -f ${_SQLITE3_UDIR}/bin/libsqlite3-0.dll || die "SQLite3 not installed correctly"
fi
- if test -f ${_MYSQL_LIB_UDIR}/lib/libmysql.dll
+ if test -f ${_MYSQL_LIB_UDIR}/lib/libmysql.dll -a \
+ -f ${_MYSQL_LIB_UDIR}/lib/libmysqlclient.a
then
echo "MySQL library already installed. skipping."
else
@@ -1068,7 +1069,10 @@ function inst_libdbi() {
assert_one_dir $TMP_UDIR/mysql*
cp -r $TMP_UDIR/mysql*/* $_MYSQL_LIB_UDIR
mv $TMP_UDIR/mysql*/include $_MYSQL_LIB_UDIR/include/mysql
- test -f ${_MYSQL_LIB_UDIR}/lib/libmysql.dll || die "mysql not installed correctly"
+ cd $_MYSQL_LIB_UDIR/lib
+ dlltool --input-def $LIBMYSQL_DEF --dllname libmysql.dll --output-lib libmysqlclient.a -k
+ test -f ${_MYSQL_LIB_UDIR}/lib/libmysql.dll || die "mysql not installed correctly - libmysql.dll"
+ test -f ${_MYSQL_LIB_UDIR}/lib/libmysqlclient.a || die "mysql not installed correctly - libmysqlclient.a"
fi
if test -f ${_LIBDBI_UDIR}/bin/libdbi-0.dll
then
@@ -1103,7 +1107,7 @@ function inst_libdbi() {
patch -p0 < $LIBDBI_DRIVERS_PATCH2
[ -n "$LIBDBI_DRIVERS_PATCH3" -a -f "$LIBDBI_DRIVERS_PATCH3" ] && \
patch -p0 < $LIBDBI_DRIVERS_PATCH3
- ./configure ${HOST_XCOMPILE} \
+ LDFLAGS=-no-undefined ./configure ${HOST_XCOMPILE} \
--disable-docs \
--with-dbi-incdir=${_LIBDBI_UDIR}/include \
--with-dbi-libdir=${_LIBDBI_UDIR}/lib \
@@ -1115,7 +1119,8 @@ function inst_libdbi() {
make
make install
qpopd
- test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdsqlite3.dll || die "libdbi drivers not installed correctly"
+ test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdsqlite3.dll || die "libdbi sqlite3 driver not installed correctly"
+ test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdmysql.dll || die "libdbi mysql driver not installed correctly"
fi
}
commit 3a346bda30e71483038d3e89c9346bd0b9133551
Author: Phil Longstaff <plongstaff at newearth.org>
Date: Thu Jun 25 03:58:12 2009 +0000
Add .def file to allow libmysql.dll to be built.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18159 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/libmysql.def b/libmysql.def
new file mode 100644
index 0000000..4eb5cc6
--- /dev/null
+++ b/libmysql.def
@@ -0,0 +1,106 @@
+LIBRARY LIBMYSQL.dll
+EXPORTS
+myodbc_remove_escape
+mysql_affected_rows at 4
+mysql_autocommit
+mysql_change_user
+mysql_character_set_name
+mysql_close at 4
+mysql_commit
+mysql_data_seek at 12
+mysql_debug
+mysql_dump_debug_info
+mysql_embedded
+mysql_eof
+mysql_errno at 4
+mysql_error at 4
+mysql_escape_string at 12
+mysql_fetch_field
+mysql_fetch_field_direct
+mysql_fetch_fields at 4
+mysql_fetch_lengths at 4
+mysql_fetch_row at 4
+mysql_field_count
+mysql_field_seek
+mysql_field_tell
+mysql_free_result at 4
+mysql_get_character_set_info
+mysql_get_client_info
+mysql_get_client_version
+mysql_get_host_info
+mysql_get_parameters
+mysql_get_proto_info
+mysql_get_server_info
+mysql_get_server_version
+mysql_get_ssl_cipher
+mysql_hex_string
+mysql_info
+mysql_init at 4
+mysql_insert_id at 4
+mysql_kill
+mysql_list_dbs
+mysql_list_fields
+mysql_list_processes
+mysql_list_tables
+mysql_more_results
+mysql_next_result
+mysql_num_fields at 4
+mysql_num_rows at 4
+mysql_options
+mysql_ping at 4
+mysql_query at 8
+mysql_read_query_result
+mysql_real_connect at 32
+mysql_real_escape_string at 16
+mysql_real_query at 12
+mysql_refresh
+mysql_rollback
+mysql_row_seek
+mysql_row_tell
+mysql_select_db at 8
+mysql_send_query
+mysql_server_end
+mysql_server_init
+mysql_set_character_set
+mysql_set_local_infile_default
+mysql_set_local_infile_handler
+mysql_set_server_option
+mysql_shutdown
+mysql_sqlstate
+mysql_ssl_set
+mysql_stat
+mysql_stmt_affected_rows
+mysql_stmt_attr_get
+mysql_stmt_attr_set
+mysql_stmt_bind_param
+mysql_stmt_bind_result
+mysql_stmt_close
+mysql_stmt_data_seek
+mysql_stmt_errno
+mysql_stmt_error
+mysql_stmt_execute
+mysql_stmt_fetch
+mysql_stmt_fetch_column
+mysql_stmt_field_count
+mysql_stmt_free_result
+mysql_stmt_init
+mysql_stmt_insert_id
+mysql_stmt_next_result
+mysql_stmt_num_rows
+mysql_stmt_param_count
+mysql_stmt_param_metadata
+mysql_stmt_prepare
+mysql_stmt_reset
+mysql_stmt_result_metadata
+mysql_stmt_row_seek
+mysql_stmt_row_tell
+mysql_stmt_send_long_data
+mysql_stmt_sqlstate
+mysql_stmt_store_result
+mysql_store_result at 4
+mysql_thread_end
+mysql_thread_id
+mysql_thread_init
+mysql_thread_safe
+mysql_use_result
+mysql_warning_count
commit d81979107e28b2c66964d7bc1ab5653e2d0017d9
Author: Phil Longstaff <plongstaff at newearth.org>
Date: Thu Jun 25 03:52:07 2009 +0000
Install aqbanking patch even if AQBANKING_WITH_QT is no. This allows RC to be defined properly.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18158 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index 8662683..fcf7aa1 100755
--- a/install.sh
+++ b/install.sh
@@ -1006,6 +1006,12 @@ function inst_aqbanking() {
make qt4-port
make clean
else
+ if [ -n "$AQBANKING_PATCH" -a -f "$AQBANKING_PATCH" ] ; then
+ patch -p1 < $AQBANKING_PATCH
+ automake
+ aclocal -I m4 ${ACLOCAL_FLAGS}
+ autoconf
+ fi
./configure ${HOST_XCOMPILE} \
--with-gwen-dir=${_GWENHYWFAR_UDIR} \
--with-xmlmerge=${XMLMERGE} \
commit 43124dbfde6b9484d43a9d288fefa60e029c934f
Author: Phil Longstaff <plongstaff at newearth.org>
Date: Mon Jun 22 21:29:11 2009 +0000
Patch by Daniel Harding - update install.sh to handle new gnucash-setup-env script
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18153 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index fe8cc58..8662683 100755
--- a/install.sh
+++ b/install.sh
@@ -1222,12 +1222,12 @@ function make_install() {
done
if [ -z $_skip_scripts ]; then
- # Try to fix the paths in the "gnucash" and related scripts
+ # Try to fix the paths in the gnucash-setup-env script
qpushd $_BUILD_UDIR/src/bin
- rm gnucash
+ rm gnucash-setup-env
make PATH_SEPARATOR=";" \
bindir="${_INSTALL_UDIR}/bin:${_INSTALL_UDIR}/lib:${_INSTALL_UDIR}/lib/gnucash:${_GNUTLS_UTIR}/bin:${_GMP_UDIR}/bin:${_GOFFICE_UDIR}/bin:${_LIBGSF_UDIR}/bin:${_PCRE_UDIR}/bin:${_GNOME_UDIR}/bin:${_GUILE_UDIR}/bin:${_WEBKIT_UDIR}/bin:${_REGEX_UDIR}/bin:${_AUTOTOOLS_UDIR}/bin:${AQBANKING_UPATH}:${_LIBOFX_UDIR}/bin:${_OPENSP_UDIR}/bin:${_LIBDBI_UDIR}/bin:${_SQLITE3_UDIR}/bin" \
- gnucash gnucash-gdb gnucash-valgrind
+ gnucash-setup-env gnucash-valgrind
qpopd
fi
commit dcba7e4e106e7c1f5cbafcdac0299d77fb14a285
Author: Phil Longstaff <plongstaff at newearth.org>
Date: Sun Jun 21 13:02:58 2009 +0000
Fix bug 586296 – Generated gnucash-dbg and gnucash-valgrind scripts are inconsistent with the
gnucash script - patch by Daniel Harding.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18143 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index a16e703..fe8cc58 100755
--- a/install.sh
+++ b/install.sh
@@ -1222,12 +1222,12 @@ function make_install() {
done
if [ -z $_skip_scripts ]; then
- # Try to fix the paths in the "gnucash" script
+ # Try to fix the paths in the "gnucash" and related scripts
qpushd $_BUILD_UDIR/src/bin
rm gnucash
make PATH_SEPARATOR=";" \
bindir="${_INSTALL_UDIR}/bin:${_INSTALL_UDIR}/lib:${_INSTALL_UDIR}/lib/gnucash:${_GNUTLS_UTIR}/bin:${_GMP_UDIR}/bin:${_GOFFICE_UDIR}/bin:${_LIBGSF_UDIR}/bin:${_PCRE_UDIR}/bin:${_GNOME_UDIR}/bin:${_GUILE_UDIR}/bin:${_WEBKIT_UDIR}/bin:${_REGEX_UDIR}/bin:${_AUTOTOOLS_UDIR}/bin:${AQBANKING_UPATH}:${_LIBOFX_UDIR}/bin:${_OPENSP_UDIR}/bin:${_LIBDBI_UDIR}/bin:${_SQLITE3_UDIR}/bin" \
- gnucash
+ gnucash gnucash-gdb gnucash-valgrind
qpopd
fi
commit 76c6f253ddd3914b3db2a260f2d6404cdfe51c91
Author: Phil Longstaff <plongstaff at newearth.org>
Date: Sun Jun 21 00:12:29 2009 +0000
Fix bug 586419 – Install aborts unpacking SVN .exe package
wget_unpacked doesn't handle .exe files.
Patch by Gary Bartlett
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18142 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index 879384d..a16e703 100755
--- a/install.sh
+++ b/install.sh
@@ -390,10 +390,8 @@ function inst_svn() {
then
echo "subversion already installed. skipping."
else
- wget_unpacked $SVN_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/svn-win32-*
- mkdir -p $_SVN_UDIR
- mv $TMP_UDIR/svn-win32-*/* $_SVN_UDIR
+ smart_wget $SVN_URL $DOWNLOAD_DIR
+ $LAST_FILE //SP- //SILENT //DIR="$SVN_DIR"
quiet svn --version || die "svn not installed correctly"
fi
}
commit a94fa976615238e38e3c2f1d6f76f3102ba71706
Author: Phil Longstaff <plongstaff at newearth.org>
Date: Sat Jun 20 23:44:10 2009 +0000
Fix bug 585785 – setlocal command is not included in gnucash.bat generated by Windows build
Patch by Daniel Harding
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18141 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index 0a84965..879384d 100755
--- a/install.sh
+++ b/install.sh
@@ -1264,7 +1264,7 @@ function make_install() {
# Create a startup script that works without the msys shell
qpushd $_INSTALL_UDIR/bin
echo "setlocal" > gnucash.cmd
- echo "set PATH=${INSTALL_DIR}\\bin;${INSTALL_DIR}\\lib;${INSTALL_DIR}\\lib\\gnucash;${GNUTLS_DIR}\\bin;${GMP_DIR}\\bin;${GOFFICE_DIR}\\bin;${LIBGSF_DIR}\\bin;${PCRE_DIR}\\bin;${WEBKIT_DIR}\\bin;${GNOME_DIR}\\bin;${GUILE_DIR}\\bin;${REGEX_DIR}\\bin;${AUTOTOOLS_DIR}\\bin;${AQBANKING_PATH};${LIBOFX_DIR}\\bin;${OPENSP_DIR}\\bin;${LIBDBI_DIR}\\bin;${SQLITE3_DIR}\\bin;%PATH%" > gnucash.cmd
+ echo "set PATH=${INSTALL_DIR}\\bin;${INSTALL_DIR}\\lib;${INSTALL_DIR}\\lib\\gnucash;${GNUTLS_DIR}\\bin;${GMP_DIR}\\bin;${GOFFICE_DIR}\\bin;${LIBGSF_DIR}\\bin;${PCRE_DIR}\\bin;${WEBKIT_DIR}\\bin;${GNOME_DIR}\\bin;${GUILE_DIR}\\bin;${REGEX_DIR}\\bin;${AUTOTOOLS_DIR}\\bin;${AQBANKING_PATH};${LIBOFX_DIR}\\bin;${OPENSP_DIR}\\bin;${LIBDBI_DIR}\\bin;${SQLITE3_DIR}\\bin;%PATH%" >> gnucash.cmd
echo "set GUILE_WARN_DEPRECATED=no" >> gnucash.cmd
echo "set GNC_MODULE_PATH=${INSTALL_DIR}\\lib\\gnucash" >> gnucash.cmd
echo "set GUILE_LOAD_PATH=${INSTALL_DIR}\\share\\gnucash\\guile-modules;${INSTALL_DIR}\\share\\gnucash\\scm;%GUILE_LOAD_PATH%" >> gnucash.cmd
commit 6f54eced864aeeaa0d6557b0544a1f182105d3a4
Author: Phil Longstaff <plongstaff at newearth.org>
Date: Sat Jun 20 23:39:04 2009 +0000
When installing msys dtk, when moving files out of the way, check that the source file exists
first.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18140 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index 379cff1..0a84965 100755
--- a/install.sh
+++ b/install.sh
@@ -119,6 +119,7 @@ function inst_dtk() {
/bin/{aclocal*,auto*,ifnames,libtool*,guile*} \
/share/{aclocal,aclocal-1.7,autoconf,autogen,automake-1.7,guile,libtool}
do
+ [ -f $file ] || continue
[ "${file##*.bak}" ] || continue
_dst_file=$file.bak
while [ -e $_dst_file ]; do _dst_file=$_dst_file.bak; done
commit 323be41d0e78cc27ec10db68150a55eabf758d47
Author: Phil Longstaff <plongstaff at newearth.org>
Date: Sat Jun 20 00:52:56 2009 +0000
1) Fix bug 586425 - Patch by Gary Bartlett - update version of gnutls for windows - old
version (2.7.3) is no longer available - replace by 2.8.1 - probably matches gnome odd=unstable
even=stable version numbering
2) Add some symbols used to build mysql/pgsql dbd files for win32 build
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18138 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 5893d5b..cd03267 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -144,7 +144,7 @@ set_default GUILE_DIR $GLOBAL_DIR\\guile
set_default OPENSSL_URL "http://www.openssl.org/source/openssl-0.9.8j.tar.gz"
set_default OPENSSL_DIR $GLOBAL_DIR\\openssl
-set_default GNUTLS_URL "http://josefsson.org/gnutls4win/gnutls-2.7.3.zip"
+set_default GNUTLS_URL "http://josefsson.org/gnutls4win/gnutls-2.8.1.zip"
set_default GNUTLS_DIR $GLOBAL_DIR\\gnutls
set_default MINGW_UTILS_URL "$SF_MIRROR/mingw/mingw-utils-0.3.tar.gz"
@@ -286,6 +286,8 @@ set_default SQLITE3_URL "http://sqlite.org/sqlite-amalgamation-3.6.1.tar.gz"
set_default SQLITE3_DIR $GLOBAL_DIR\\sqlite3
set_default MYSQL_LIB_URL "http://mirror.csclub.uwaterloo.ca/mysql/Downloads/Connector-C/mysql-connector-c-noinstall-6.0.1-win32.zip"
set_default MYSQL_LIB_DIR $GLOBAL_DIR\\mysql
+set_default LIBMYSQL_DEF `pwd`/libmysql.def
+set_default PGSQL_LIB_DIR $GLOBAL_DIR\\pgsql
set_default LIBDBI_URL "http://downloads.sourceforge.net/libdbi/libdbi-0.8.3.tar.gz"
set_default LIBDBI_DIR $GLOBAL_DIR\\libdbi
set_default LIBDBI_PATCH `pwd`/libdbi-0.8.3.patch
@@ -294,6 +296,7 @@ set_default LIBDBI_DRIVERS_DIR $GLOBAL_DIR\\libdbi-drivers
set_default LIBDBI_DRIVERS_PATCH `pwd`/libdbi-drivers-dbd_sqlite3.c.patch
set_default LIBDBI_DRIVERS_PATCH2 `pwd`/libdbi-drivers-Makefile.in.patch
set_default LIBDBI_DRIVERS_PATCH3 `pwd`/libdbi-drivers-dbd_mysql.c.patch
+set_default LIBDBI_DRIVERS_PATCH4 `pwd`/libdbi-drivers-dbd_pgsql.c.patch
set_default DOCBOOK_XSL_URL "$SF_MIRROR/docbook/docbook-xsl-1.72.0.zip"
set_default UPDATE_DOCS yes
commit c23cb0808ace995a2eae6b1bfc4f6ad0e2327c7c
Author: Derek Atkins <derek at ihtfp.com>
Date: Sun Jun 14 23:08:31 2009 +0000
Add the batch file for the win32 daily build.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18133 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/daily_build.bat b/daily_build.bat
new file mode 100644
index 0000000..cd73e76
--- /dev/null
+++ b/daily_build.bat
@@ -0,0 +1,7 @@
+rem This is the Windows Batch Script for the daily builds.
+rem It simply calls the actual MSYS Shell script to perform
+rem the daily build and then the tag builds.
+
+cd c:\soft\packaging
+c:\msys\1.0\bin\sh.exe --login c:\soft\packaging\daily_build.sh
+c:\msys\1.0\bin\sh.exe --login c:\soft\packaging\build_tags.sh
commit 98c12e07c30f8d27e6b04b3b89df33473188a723
Author: Derek Atkins <derek at ihtfp.com>
Date: Sun Jun 14 22:58:06 2009 +0000
Add start/stop build times.
(Useful for build logs)
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18132 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index 89826dd..379cff1 100755
--- a/install.sh
+++ b/install.sh
@@ -4,6 +4,9 @@
set -e
+echo -n "Build Starting at "
+date
+
function qpushd() { pushd "$@" >/dev/null; }
function qpopd() { popd >/dev/null; }
function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
@@ -1377,6 +1380,8 @@ for step in "${steps[@]}" ; do
done
qpopd
+echo -n "Build Finished at "
+date
### Local Variables: ***
### sh-basic-offset: 4 ***
commit 8530d4fc5db18fdd6b1e5b3846f1fc279458c901
Author: Derek Atkins <derek at ihtfp.com>
Date: Sat Jun 13 21:50:40 2009 +0000
Properly reconfigure AqBanking 3.8.3 with the updated configure.ac
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18129 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index 0bff8e8..89826dd 100755
--- a/install.sh
+++ b/install.sh
@@ -987,6 +987,8 @@ function inst_aqbanking() {
inst_qt4
if [ -n "$AQBANKING_PATCH" -a -f "$AQBANKING_PATCH" ] ; then
patch -p1 < $AQBANKING_PATCH
+ automake
+ aclocal -I m4 ${ACLOCAL_FLAGS}
autoconf
fi
./configure ${HOST_XCOMPILE} \
commit 4e61e2f8c26d9f1d41ab1970337a0f5c648f9c7a
Author: Derek Atkins <derek at ihtfp.com>
Date: Sat Jun 13 21:25:31 2009 +0000
Fix the patch name. Oops.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18128 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/aqbanking-3.8.3-.patch.diff b/aqbanking-3.8.3-patch.diff
similarity index 100%
rename from aqbanking-3.8.3-.patch.diff
rename to aqbanking-3.8.3-patch.diff
commit 340bdbe20808ed10be383933278fb2af0e67e912
Author: Derek Atkins <derek at ihtfp.com>
Date: Sat Jun 13 19:49:37 2009 +0000
Add AqB 3.8.3 patch for Win32
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18127 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/aqbanking-3.8.3-.patch.diff b/aqbanking-3.8.3-.patch.diff
new file mode 100644
index 0000000..db1d302
--- /dev/null
+++ b/aqbanking-3.8.3-.patch.diff
@@ -0,0 +1,11 @@
+--- aqbanking-3.8.3/configure.ac~ Fri May 29 14:57:00 2009
++++ aqbanking-3.8.3/configure.ac Sat Jun 13 15:45:49 2009
+@@ -476,7 +476,7 @@
+ AC_PROG_INSTALL
+
+ AC_LIBTOOL_WIN32_DLL
+-AC_LIBTOOL_RC
++AC_CHECK_TOOL([RC], [windres], [no])
+ AC_PROG_LIBTOOL
+ AC_CHECK_PROG(USE_DOT,dot,YES,NO)
+ AC_CHECK_PROG(SED,sed,sed)
diff --git a/defaults.sh b/defaults.sh
index ed8ef33..5893d5b 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -275,7 +275,7 @@ if [ "$AQBANKING3" != "yes" ]; then
set_default AQBANKING_URL "$SF_MIRROR/aqbanking/aqbanking-2.3.3.tar.gz"
else
set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=35&file=01&dummy=aqbanking-3.8.3.tar.gz"
- #set_default AQBANKING_PATCH `pwd`/aqbanking-3.8.3-patch.diff
+ set_default AQBANKING_PATCH `pwd`/aqbanking-3.8.3-patch.diff
fi
set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
set_default AQBANKING_WITH_QT yes
commit 0cff2eee98bd07e6b5cc1024e3a15c77e1aec2b4
Author: Derek Atkins <derek at ihtfp.com>
Date: Sat Jun 13 19:42:23 2009 +0000
More updates the build-tags scripts:
* fix the GLOBAL_DIR definition
* Point to the 'global' HH_DIR so we don't reinstall it
* Use the build_package script from trunk
* Don't save the environment to /etc/profile.d on the build server
* re-add the ability to have an aqbanking patch (3.8.3 doesn't build)
* add the NO_SAVE_PROFILE flag
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18126 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_tags.sh b/build_tags.sh
index d4078ea..98037df 100644
--- a/build_tags.sh
+++ b/build_tags.sh
@@ -53,7 +53,8 @@ for tag in $tags ; do
cp -p "${pkgdir}/custom.sh" ${w32pkg}/custom.sh
# Set the global directory to the tag build
- echo "GLOBAL_DIR=c:\soft\gnucash-${tag}" >> ${w32pkg}/custom.sh
+ echo -n 'GLOBAL_DIR=c:\\soft\\gnucash-' >> ${w32pkg}/custom.sh
+ echo "${tag}" >> ${w32pkg}/custom.sh
# No need to update the sources we just checked out
echo "UPDATE_SOURCES=no" >> ${w32pkg}/custom.sh
@@ -64,8 +65,13 @@ for tag in $tags ; do
# so this hack works!
echo "BUILD_FROM_TARBALL=maybe" >> ${w32pkg}/custom.sh
+ # Point HH_DIR at the global installation because we don't need to redo it
+ echo -n "HH_DIR=" >> ${w32pkg}/custom.sh
+ echo "${GLOBAL_DIR}\\hh" | sed -e 's/\\/\\\\/g' >> ${w32pkg}/custom.sh
+
# Now build the tag! (this will upload it too)
+ # Use the build_package script from trunk (cwd), not from the tag
qpushd ${w32pkg}
- ./build_package.sh ${tag}
+ ${pkgdir}/build_package.sh ${tag}
qpopd
done
diff --git a/defaults.sh b/defaults.sh
index 43770bd..ed8ef33 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -24,6 +24,7 @@
# AQBANKING_WITH_QT=no
# GLOBAL_DIR=Z:\\mydir # all directories will use this
# WGET_RATE=50k #limit download bandwith to 50KB/s
+# NO_SAVE_PROFILE=yes # don't save env settings to /etc/profile.d
# late_eval 'INSTALL_DIR=$GNUCASH_DIR\\myinst' # no need to define GNUCASH_DIR
# block_step inst_docs
# late_eval 'add_step greetings'
@@ -274,6 +275,7 @@ if [ "$AQBANKING3" != "yes" ]; then
set_default AQBANKING_URL "$SF_MIRROR/aqbanking/aqbanking-2.3.3.tar.gz"
else
set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=35&file=01&dummy=aqbanking-3.8.3.tar.gz"
+ #set_default AQBANKING_PATCH `pwd`/aqbanking-3.8.3-patch.diff
fi
set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
set_default AQBANKING_WITH_QT yes
diff --git a/install.sh b/install.sh
index e421f11..0bff8e8 100755
--- a/install.sh
+++ b/install.sh
@@ -985,6 +985,10 @@ function inst_aqbanking() {
fi
if test x$AQBANKING_WITH_QT = xyes; then
inst_qt4
+ if [ -n "$AQBANKING_PATCH" -a -f "$AQBANKING_PATCH" ] ; then
+ patch -p1 < $AQBANKING_PATCH
+ autoconf
+ fi
./configure ${HOST_XCOMPILE} \
--with-gwen-dir=${_GWENHYWFAR_UDIR} \
--with-xmlmerge=${XMLMERGE} \
@@ -1328,27 +1332,29 @@ function inst_docs() {
function finish() {
setup Finish...
- _NEW=x
- for _ENV in $ENV_VARS; do
- _ADDS=`eval echo '"\$'"${_ENV}"'_ADDS"'`
- if [ "$_ADDS" ]; then
- if [ "$_NEW" ]; then
- echo
- echo "Environment variables changed, please do the following"
- echo
- [ -d /etc/profile.d ] || echo "mkdir -p /etc/profile.d"
- _NEW=
+ if [ "$NO_SAVE_PROFILE" != "yes" ]; then
+ _NEW=x
+ for _ENV in $ENV_VARS; do
+ _ADDS=`eval echo '"\$'"${_ENV}"'_ADDS"'`
+ if [ "$_ADDS" ]; then
+ if [ "$_NEW" ]; then
+ echo
+ echo "Environment variables changed, please do the following"
+ echo
+ [ -d /etc/profile.d ] || echo "mkdir -p /etc/profile.d"
+ _NEW=
+ fi
+ _VAL=`eval echo '"$'"${_ENV}_BASE"'"'`
+ if [ "$_VAL" ]; then
+ _CHANGE="export ${_ENV}=\"${_ADDS}"'$'"${_ENV}\""
+ else
+ _CHANGE="export ${_ENV}=\"${_ADDS}\""
+ fi
+ echo $_CHANGE
+ echo echo "'${_CHANGE}' >> /etc/profile.d/installer.sh"
fi
- _VAL=`eval echo '"$'"${_ENV}_BASE"'"'`
- if [ "$_VAL" ]; then
- _CHANGE="export ${_ENV}=\"${_ADDS}"'$'"${_ENV}\""
- else
- _CHANGE="export ${_ENV}=\"${_ADDS}\""
- fi
- echo $_CHANGE
- echo echo "'${_CHANGE}' >> /etc/profile.d/installer.sh"
- fi
- done
+ done
+ fi
if [ "$CROSS_COMPILE" = "yes" ]; then
echo "You might want to create a binary tarball now as follows:"
qpushd $GLOBAL_DIR
commit b33a95d836d51928aaed55bbc01b23d0271c2c15
Author: Derek Atkins <derek at ihtfp.com>
Date: Sat Jun 13 13:42:02 2009 +0000
Handle BUILD_FROM_TARBALL special for tag builds.
(Don't put the svn # in there)
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18125 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_package.sh b/build_package.sh
index 3861082..98e465a 100644
--- a/build_package.sh
+++ b/build_package.sh
@@ -38,7 +38,14 @@ _BUILD_UDIR=`unix_path $BUILD_DIR`
_GNUCASH_UDIR=`unix_path $GNUCASH_DIR`
PKG_VERSION=`grep PACKAGE_VERSION ${_BUILD_UDIR}/config.h | cut -d" " -f3 | cut -d\" -f2 `
SVN_REV=`grep GNUCASH_SVN_REV ${_BUILD_UDIR}/src/gnome-utils/gnc-svninfo.h | cut -d" " -f3 | cut -d\" -f2 `
-SETUP_FILENAME="gnucash-${PKG_VERSION}-svn-r${SVN_REV}-setup.exe"
+
+# Choose the output filename based on our "build_from_tarball" setting
+# Make sure this logic matches the logic in dist.sh!
+if [ "$BUILD_FROM_TARBALL" = "no" ]; then
+ SETUP_FILENAME="gnucash-${PKG_VERSION}-svn-r${SVN_REV}-setup.exe"
+else
+ SETUP_FILENAME="gnucash-${PKG_VERSION}-setup.exe"
+fi
mv ${_GNUCASH_UDIR}/${SETUP_FILENAME} ${_OUTPUT_DIR}
#
diff --git a/build_tags.sh b/build_tags.sh
index 65ef08c..d4078ea 100644
--- a/build_tags.sh
+++ b/build_tags.sh
@@ -58,6 +58,12 @@ for tag in $tags ; do
# No need to update the sources we just checked out
echo "UPDATE_SOURCES=no" >> ${w32pkg}/custom.sh
+ # BUILD_FROM_TARBALL is special:
+ # in install.sh place we check !=yes, in defaults.sh =yes, in dist.sh =no
+ # We want it to look like 'no' in install and defaults, but yes in dist
+ # so this hack works!
+ echo "BUILD_FROM_TARBALL=maybe" >> ${w32pkg}/custom.sh
+
# Now build the tag! (this will upload it too)
qpushd ${w32pkg}
./build_package.sh ${tag}
commit c22e4bd79abcc6e1789319f178dd7e3c7f88d0bf
Author: Derek Atkins <derek at ihtfp.com>
Date: Sat Jun 13 04:43:36 2009 +0000
it's "tagfile"
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18124 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_tags.sh b/build_tags.sh
index 84fa90f..65ef08c 100644
--- a/build_tags.sh
+++ b/build_tags.sh
@@ -33,7 +33,7 @@ svn ls ${TAG_URL} > ${tagfile}.new
tags="`diff --suppress-common-lines ${tagfile} ${tagfile}.new | grep '^> ' | sed -e 's/^> //g' -e 's#/$##g'`"
# move the new file into place
-mv -f ${tagile}.new ${tagfile}
+mv -f ${tagfile}.new ${tagfile}
################################################################
# Now iterate over all the new tags (if any) and build a package
commit 8007a4c5b168b6b143323f762f6504877c764d87
Author: Derek Atkins <derek at ihtfp.com>
Date: Sat Jun 13 04:37:39 2009 +0000
Use pwd instead of assuming $0 is a full path.
Set URL in a variable
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18123 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/build_tags.sh b/build_tags.sh
index d41601f..84fa90f 100644
--- a/build_tags.sh
+++ b/build_tags.sh
@@ -6,11 +6,13 @@ function qpushd() { pushd "$@" >/dev/null; }
function qpopd() { popd >/dev/null; }
function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
+TAG_URL=http://svn.gnucash.org/repo/gnucash/tags
+
################################################################
# Setup our environment (we need the DOWNLOAD_DIR)
-pkgdir="$(dirname $(unix_path "$0"))"
-qpushd "${pkgdir}"
+qpushd "$(dirname $(unix_path "$0"))"
+pkgdir="`pwd`"
svn update
. functions.sh
. defaults.sh
@@ -23,11 +25,11 @@ svn update
# If we don't have a tagfile then start from 'now'
tagfile=tags
if [ ! -f ${tagfile} ] ; then
- svn ls http://svn.gnucash.org/repo/gnucash/tags > ${tagfile}
+ svn ls ${TAG_URL} > ${tagfile}
fi
# Figure out the new set of tags
-svn ls http://svn.gnucash.org/repo/gnucash/tags > ${tagfile}.new
+svn ls ${TAG_URL} > ${tagfile}.new
tags="`diff --suppress-common-lines ${tagfile} ${tagfile}.new | grep '^> ' | sed -e 's/^> //g' -e 's#/$##g'`"
# move the new file into place
@@ -46,7 +48,7 @@ for tag in $tags ; do
cp -p $(unix_path ${DOWNLOAD_DIR})/* ${tagbasedir}/downloads
# Check out the tag and setup custom.sh
- svn co -q http://svn.gnucash.org/repo/gnucash/tags/${tag} ${tagdir}/repos
+ svn co -q ${TAG_URL}/${tag} ${tagdir}/repos
w32pkg=${tagdir}/repos/packaging/win32
cp -p "${pkgdir}/custom.sh" ${w32pkg}/custom.sh
commit 1bd480024e6527493cc66923475b68dd7c55ce2f
Author: Derek Atkins <derek at ihtfp.com>
Date: Sat Jun 13 04:31:35 2009 +0000
Refactor daily_build.sh into build_package.sh
Create a build_tags.sh that will check for new tags
in the tag directory and rebuild them when they appear.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18122 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/daily_build.sh b/build_package.sh
old mode 100755
new mode 100644
similarity index 61%
copy from daily_build.sh
copy to build_package.sh
index 43e03b4..3861082
--- a/daily_build.sh
+++ b/build_package.sh
@@ -1,19 +1,22 @@
#!/bin/sh
+#
+# This assumes we're in the "packaging" directory for the correct build.
+# It could be the packaging/win32 subdir of a tag checkout, or it could
+# be the top-level daily-build packaging directory.
+#
+
set -e
-function qpushd() { pushd "$@" >/dev/null; }
-function qpopd() { popd >/dev/null; }
function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
-qpushd "$(dirname $(unix_path "$0"))"
-svn update
+tag="$1"
+
. functions.sh
. defaults.sh
set_default OUTPUT_DIR $GLOBAL_DIR\\output
-
-LOGFILENAME=build-`date +'%Y-%m-%d'`.log
+LOGFILENAME=build${tag:+-${tag}}-`date +'%Y-%m-%d'`.log
_OUTPUT_DIR=`unix_path $OUTPUT_DIR`
LOGFILE=${_OUTPUT_DIR}/${LOGFILENAME}
@@ -38,7 +41,23 @@ SVN_REV=`grep GNUCASH_SVN_REV ${_BUILD_UDIR}/src/gnome-utils/gnc-svninfo.h | cut
SETUP_FILENAME="gnucash-${PKG_VERSION}-svn-r${SVN_REV}-setup.exe"
mv ${_GNUCASH_UDIR}/${SETUP_FILENAME} ${_OUTPUT_DIR}
-# If we're running on the build server than upload the files
+#
+# Verify that PKG_VERSION == $tag, and add to the build log if it's not.
+# Note: only do this if tag exists and matches x.y.z
+#
+if [ -n "${tag}" ] ; then
+ case "${tag}" in
+ [0-9]*.[0-9]*.[0-9]*)
+ if [ "${PKG_VERSION}" != "${tag}" ] ; then
+ echo "" >> ${LOGFILE}
+ echo " *** ERROR: Package Version ${PKG_VERSION} doesn't match Tag ${tag}" >> ${LOGILE}
+ echo "" >> ${LOGFILE}
+ fi
+ ;;
+ esac
+fi
+
+# If we're running on the build server then upload the files
# Note: change this target if you're building a different branch
if [ `hostname` = "gnucash-win32" ]; then
scp -p ${LOGFILE} ${_OUTPUT_DIR}/${SETUP_FILENAME} upload at code.gnucash.org:public_html/win32/trunk
diff --git a/build_tags.sh b/build_tags.sh
new file mode 100644
index 0000000..d41601f
--- /dev/null
+++ b/build_tags.sh
@@ -0,0 +1,63 @@
+#!/bin/sh
+
+set -e
+
+function qpushd() { pushd "$@" >/dev/null; }
+function qpopd() { popd >/dev/null; }
+function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
+
+################################################################
+# Setup our environment (we need the DOWNLOAD_DIR)
+
+pkgdir="$(dirname $(unix_path "$0"))"
+qpushd "${pkgdir}"
+svn update
+. functions.sh
+. defaults.sh
+
+
+################################################################
+# determine if there are any new tags since the last time we ran
+#
+
+# If we don't have a tagfile then start from 'now'
+tagfile=tags
+if [ ! -f ${tagfile} ] ; then
+ svn ls http://svn.gnucash.org/repo/gnucash/tags > ${tagfile}
+fi
+
+# Figure out the new set of tags
+svn ls http://svn.gnucash.org/repo/gnucash/tags > ${tagfile}.new
+tags="`diff --suppress-common-lines ${tagfile} ${tagfile}.new | grep '^> ' | sed -e 's/^> //g' -e 's#/$##g'`"
+
+# move the new file into place
+mv -f ${tagile}.new ${tagfile}
+
+################################################################
+# Now iterate over all the new tags (if any) and build a package
+
+for tag in $tags ; do
+ tagbasedir=/c/soft/gnucash-${tag}
+ tagdir=${tagbasedir}/gnucash
+ mkdir -p ${tagdir}
+
+ # Copy the downloads to save time
+ mkdir -p ${tagbasedir}/downloads
+ cp -p $(unix_path ${DOWNLOAD_DIR})/* ${tagbasedir}/downloads
+
+ # Check out the tag and setup custom.sh
+ svn co -q http://svn.gnucash.org/repo/gnucash/tags/${tag} ${tagdir}/repos
+ w32pkg=${tagdir}/repos/packaging/win32
+ cp -p "${pkgdir}/custom.sh" ${w32pkg}/custom.sh
+
+ # Set the global directory to the tag build
+ echo "GLOBAL_DIR=c:\soft\gnucash-${tag}" >> ${w32pkg}/custom.sh
+
+ # No need to update the sources we just checked out
+ echo "UPDATE_SOURCES=no" >> ${w32pkg}/custom.sh
+
+ # Now build the tag! (this will upload it too)
+ qpushd ${w32pkg}
+ ./build_package.sh ${tag}
+ qpopd
+done
diff --git a/daily_build.sh b/daily_build.sh
index 43e03b4..eb05e92 100755
--- a/daily_build.sh
+++ b/daily_build.sh
@@ -8,38 +8,5 @@ function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
qpushd "$(dirname $(unix_path "$0"))"
svn update
-. functions.sh
-. defaults.sh
-
-set_default OUTPUT_DIR $GLOBAL_DIR\\output
-
-LOGFILENAME=build-`date +'%Y-%m-%d'`.log
-
-_OUTPUT_DIR=`unix_path $OUTPUT_DIR`
-LOGFILE=${_OUTPUT_DIR}/${LOGFILENAME}
-mkdir -p ${_OUTPUT_DIR}
-
-# Run the compile
-./install.sh 2>&1 | tee ${LOGFILE}
-
-# This directory needs to be removed before calling dist.sh
-DIST_DIR=${INSTALL_DIR}\\..\\dist
-_DIST_UDIR=`unix_path $DIST_DIR`
-rm -rf ${_DIST_UDIR}
-
-# Create the installer
-./dist.sh 2>&1 | tee -a ${LOGFILE}
-
-# Copy the resulting installer into the output directory
-_BUILD_UDIR=`unix_path $BUILD_DIR`
-_GNUCASH_UDIR=`unix_path $GNUCASH_DIR`
-PKG_VERSION=`grep PACKAGE_VERSION ${_BUILD_UDIR}/config.h | cut -d" " -f3 | cut -d\" -f2 `
-SVN_REV=`grep GNUCASH_SVN_REV ${_BUILD_UDIR}/src/gnome-utils/gnc-svninfo.h | cut -d" " -f3 | cut -d\" -f2 `
-SETUP_FILENAME="gnucash-${PKG_VERSION}-svn-r${SVN_REV}-setup.exe"
-mv ${_GNUCASH_UDIR}/${SETUP_FILENAME} ${_OUTPUT_DIR}
-
-# If we're running on the build server than upload the files
-# Note: change this target if you're building a different branch
-if [ `hostname` = "gnucash-win32" ]; then
- scp -p ${LOGFILE} ${_OUTPUT_DIR}/${SETUP_FILENAME} upload at code.gnucash.org:public_html/win32/trunk
-fi
+./build_package.sh
+qpopd
commit 1d6b5065428579bd037e990a4731db2a7c5225e3
Author: Phil Longstaff <plongstaff at newearth.org>
Date: Wed Jun 10 12:20:20 2009 +0000
Patch for mysql driver to fix win32 compilation issue
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18121 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/libdbi-drivers-dbd_mysql.c.patch b/libdbi-drivers-dbd_mysql.c.patch
new file mode 100755
index 0000000..643958a
--- /dev/null
+++ b/libdbi-drivers-dbd_mysql.c.patch
@@ -0,0 +1,27 @@
+Index: dbd_mysql.c
+===================================================================
+RCS file: /cvsroot/libdbi-drivers/libdbi-drivers/drivers/mysql/dbd_mysql.c,v
+retrieving revision 1.31
+diff -u -r1.31 dbd_mysql.c
+--- drivers/mysql/dbd_mysql.c 13 Aug 2008 22:56:03 -0000 1.31
++++ drivers/mysql/dbd_mysql.c 16 Aug 2008 20:23:23 -0000
+@@ -553,15 +553,15 @@
+ return db;
+ }
+
+-int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr) {
+- /* put error number into errno, error string into errstr
+- * return 0 if error, 1 if errno filled, 2 if errstr filled, 3 if both errno and errstr filled */
++int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr) {
++ /* put error number into err_no, error string into errstr
++ * return 0 if error, 1 if err_no filled, 2 if errstr filled, 3 if both err_no and errstr filled */
+
+ if (strcmp("",mysql_error((MYSQL *)conn->connection)) == 0) {
+ return -1;
+ }
+
+- *errno = mysql_errno((MYSQL *)conn->connection);
++ *err_no = mysql_errno((MYSQL *)conn->connection);
+ *errstr = strdup(mysql_error((MYSQL *)conn->connection));
+ return 3;
+ }
commit 6909db74454153dd42a05b0a781cff034040e7bd
Author: Phil Longstaff <plongstaff at newearth.org>
Date: Tue Jun 9 23:41:39 2009 +0000
Build mysql libdbi driver and include it in the win32 build
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18120 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index be57167..43770bd 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -282,6 +282,8 @@ set_default AQBANKING_WITH_QT yes
set_default SQLITE3_URL "http://sqlite.org/sqlite-amalgamation-3.6.1.tar.gz"
set_default SQLITE3_DIR $GLOBAL_DIR\\sqlite3
+set_default MYSQL_LIB_URL "http://mirror.csclub.uwaterloo.ca/mysql/Downloads/Connector-C/mysql-connector-c-noinstall-6.0.1-win32.zip"
+set_default MYSQL_LIB_DIR $GLOBAL_DIR\\mysql
set_default LIBDBI_URL "http://downloads.sourceforge.net/libdbi/libdbi-0.8.3.tar.gz"
set_default LIBDBI_DIR $GLOBAL_DIR\\libdbi
set_default LIBDBI_PATCH `pwd`/libdbi-0.8.3.patch
@@ -289,6 +291,7 @@ set_default LIBDBI_DRIVERS_URL "http://downloads.sourceforge.net/libdbi-drivers/
set_default LIBDBI_DRIVERS_DIR $GLOBAL_DIR\\libdbi-drivers
set_default LIBDBI_DRIVERS_PATCH `pwd`/libdbi-drivers-dbd_sqlite3.c.patch
set_default LIBDBI_DRIVERS_PATCH2 `pwd`/libdbi-drivers-Makefile.in.patch
+set_default LIBDBI_DRIVERS_PATCH3 `pwd`/libdbi-drivers-dbd_mysql.c.patch
set_default DOCBOOK_XSL_URL "$SF_MIRROR/docbook/docbook-xsl-1.72.0.zip"
set_default UPDATE_DOCS yes
diff --git a/dist.sh b/dist.sh
index f197607..ac82473 100755
--- a/dist.sh
+++ b/dist.sh
@@ -37,6 +37,7 @@ function prepare() {
_GWENHYWFAR_UDIR=`unix_path $GWENHYWFAR_DIR`
_AQBANKING_UDIR=`unix_path $AQBANKING_DIR`
_SQLITE3_UDIR=`unix_path ${SQLITE3_DIR}`
+ _MYSQL_LIB_UDIR=`unix_path ${MYSQL_LIB_DIR}`
_LIBDBI_UDIR=`unix_path ${LIBDBI_DIR}`
_LIBDBI_DRIVERS_UDIR=`unix_path ${LIBDBI_DRIVERS_DIR}`
_LIBGDA_UDIR=`unix_path $LIBGDA_DIR`
@@ -194,6 +195,8 @@ function dist_libdbi() {
setup LibDBI
cp -a ${_SQLITE3_UDIR}/bin/* ${DIST_UDIR}/bin
cp -a ${_SQLITE3_UDIR}/lib/* ${DIST_UDIR}/lib
+ cp -a ${_MYSQL_LIB_UDIR}/bin/* ${DIST_UDIR}/bin
+ cp -a ${_MYSQL_LIB_UDIR}/lib/* ${DIST_UDIR}/lib
cp -a ${_LIBDBI_UDIR}/bin/* ${DIST_UDIR}/bin
cp -a ${_LIBDBI_UDIR}/lib/* ${DIST_UDIR}/lib
mkdir ${DIST_UDIR}/lib/dbd
diff --git a/install.sh b/install.sh
index 71547d4..e421f11 100755
--- a/install.sh
+++ b/install.sh
@@ -1026,6 +1026,7 @@ function inst_aqbanking() {
function inst_libdbi() {
setup LibDBI
_SQLITE3_UDIR=`unix_path ${SQLITE3_DIR}`
+ _MYSQL_LIB_UDIR=`unix_path ${MYSQL_LIB_DIR}`
_LIBDBI_UDIR=`unix_path ${LIBDBI_DIR}`
_LIBDBI_DRIVERS_UDIR=`unix_path ${LIBDBI_DRIVERS_DIR}`
add_to_env -I$_LIBDBI_UDIR/include LIBDBI_CPPFLAGS
@@ -1044,6 +1045,17 @@ function inst_libdbi() {
qpopd
test -f ${_SQLITE3_UDIR}/bin/libsqlite3-0.dll || die "SQLite3 not installed correctly"
fi
+ if test -f ${_MYSQL_LIB_UDIR}/lib/libmysql.dll
+ then
+ echo "MySQL library already installed. skipping."
+ else
+ wget_unpacked $MYSQL_LIB_URL $DOWNLOAD_DIR $TMP_DIR
+ mkdir -p $_MYSQL_LIB_UDIR
+ assert_one_dir $TMP_UDIR/mysql*
+ cp -r $TMP_UDIR/mysql*/* $_MYSQL_LIB_UDIR
+ mv $TMP_UDIR/mysql*/include $_MYSQL_LIB_UDIR/include/mysql
+ test -f ${_MYSQL_LIB_UDIR}/lib/libmysql.dll || die "mysql not installed correctly"
+ fi
if test -f ${_LIBDBI_UDIR}/bin/libdbi-0.dll
then
echo "libdbi already installed. skipping."
@@ -1063,7 +1075,8 @@ function inst_libdbi() {
qpopd
test -f ${_LIBDBI_UDIR}/bin/libdbi-0.dll || die "libdbi not installed correctly"
fi
- if test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdsqlite3.dll
+ if test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdsqlite3.dll &&
+ test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdmysql.dll
then
echo "libdbi drivers already installed. skipping."
else
@@ -1074,12 +1087,16 @@ function inst_libdbi() {
patch -p0 < $LIBDBI_DRIVERS_PATCH
[ -n "$LIBDBI_DRIVERS_PATCH2" -a -f "$LIBDBI_DRIVERS_PATCH2" ] && \
patch -p0 < $LIBDBI_DRIVERS_PATCH2
+ [ -n "$LIBDBI_DRIVERS_PATCH3" -a -f "$LIBDBI_DRIVERS_PATCH3" ] && \
+ patch -p0 < $LIBDBI_DRIVERS_PATCH3
./configure ${HOST_XCOMPILE} \
--disable-docs \
--with-dbi-incdir=${_LIBDBI_UDIR}/include \
--with-dbi-libdir=${_LIBDBI_UDIR}/lib \
--with-sqlite3 \
--with-sqlite3-dir=${_SQLITE3_UDIR} \
+ --with-mysql \
+ --with-mysql-dir=${_MYSQL_LIB_UDIR} \
--prefix=${_LIBDBI_DRIVERS_UDIR}
make
make install
commit b12d8ed5a97e0ef8328695f48578c9b52ca2c64a
Author: Christian Stimming <stimming at tuhh.de>
Date: Tue Jun 2 08:04:27 2009 +0000
Update aqbanking version to 3.8.3, which means one patch isn't needed anymore.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18101 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/aqbanking-3.8.1-patch.diff b/aqbanking-3.8.1-patch.diff
deleted file mode 100644
index 1cd2577..0000000
--- a/aqbanking-3.8.1-patch.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/frontends/qbanking/lib/dialogs/qbimporter.cpp b/src/frontends/qbanking/lib/dialogs/qbimporter.cpp
-index 630df18..c1061c6 100644
---- a/src/frontends/qbanking/lib/dialogs/qbimporter.cpp
-+++ b/src/frontends/qbanking/lib/dialogs/qbimporter.cpp
-@@ -850,7 +850,9 @@ bool QBImporter::_readFile(const QString &fname){
- // conversion operator "QCString::operator const char * ()
- // const" that will correctly convert the QCString to the
- // const char*
-- fd=open(fname.local8Bit().data(), O_RDONLY);
-+ fd = ::open(fname.local8Bit().data(), O_RDONLY);
-+ // Note: We need to write ::open() to avoid an ambiguity with
-+ // QDialog::open().
- if (fd==-1) {
- qs=QWidget::tr("Could not open file \"%1\": %2")
- .arg(fname)
diff --git a/defaults.sh b/defaults.sh
index 7037bb4..be57167 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -273,8 +273,7 @@ set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-1.20.tar.gz"
if [ "$AQBANKING3" != "yes" ]; then
set_default AQBANKING_URL "$SF_MIRROR/aqbanking/aqbanking-2.3.3.tar.gz"
else
- set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=19&file=01&dummy=aqbanking-3.8.1.tar.gz"
- set_default AQBANKING_PATCH `pwd`/aqbanking-3.8.1-patch.diff
+ set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=35&file=01&dummy=aqbanking-3.8.3.tar.gz"
fi
set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
set_default AQBANKING_WITH_QT yes
diff --git a/install.sh b/install.sh
index 3e8698f..71547d4 100755
--- a/install.sh
+++ b/install.sh
@@ -985,8 +985,6 @@ function inst_aqbanking() {
fi
if test x$AQBANKING_WITH_QT = xyes; then
inst_qt4
- [ -n "$AQBANKING_PATCH" -a -f "$AQBANKING_PATCH" ] && \
- patch -p1 < $AQBANKING_PATCH
./configure ${HOST_XCOMPILE} \
--with-gwen-dir=${_GWENHYWFAR_UDIR} \
--with-xmlmerge=${XMLMERGE} \
commit 3a46c27a959d2f92ed0bbd1783e076fd90516547
Author: Phil Longstaff <plongstaff at newearth.org>
Date: Tue Jun 2 02:01:59 2009 +0000
Fix WEBKIT path so that correct DLLs will be copied to output directory
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18100 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/dist.sh b/dist.sh
index be2fcff..f197607 100755
--- a/dist.sh
+++ b/dist.sh
@@ -45,6 +45,7 @@ function prepare() {
_BUILD_UDIR=`unix_path $BUILD_DIR`
_INSTALL_UDIR=`unix_path $INSTALL_DIR`
_INNO_UDIR=`unix_path $INNO_DIR`
+ _WEBKIT_UDIR=`unix_path $WEBKIT_DIR`
add_to_env $_UNZIP_UDIR/bin PATH # unzip
add_to_env $_GNOME_UDIR/bin PATH # gconftool-2
add_to_env $_EXETYPE_UDIR/bin PATH # exetype
commit 0d58cc158366140a23dd122ad56eb9f50434243a
Author: Derek Atkins <derek at ihtfp.com>
Date: Mon Jun 1 04:29:30 2009 +0000
Upload the daily builds
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18098 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/daily_build.sh b/daily_build.sh
index 1082fb5..43e03b4 100755
--- a/daily_build.sh
+++ b/daily_build.sh
@@ -38,3 +38,8 @@ SVN_REV=`grep GNUCASH_SVN_REV ${_BUILD_UDIR}/src/gnome-utils/gnc-svninfo.h | cut
SETUP_FILENAME="gnucash-${PKG_VERSION}-svn-r${SVN_REV}-setup.exe"
mv ${_GNUCASH_UDIR}/${SETUP_FILENAME} ${_OUTPUT_DIR}
+# If we're running on the build server than upload the files
+# Note: change this target if you're building a different branch
+if [ `hostname` = "gnucash-win32" ]; then
+ scp -p ${LOGFILE} ${_OUTPUT_DIR}/${SETUP_FILENAME} upload at code.gnucash.org:public_html/win32/trunk
+fi
commit 55e904caef77ce7b00cb475acd6ead123262a5ef
Author: Christian Stimming <stimming at tuhh.de>
Date: Thu May 28 09:32:16 2009 +0000
Really final changes for daily build script.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18094 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/daily_build.sh b/daily_build.sh
index c4b3c61..1082fb5 100755
--- a/daily_build.sh
+++ b/daily_build.sh
@@ -3,11 +3,11 @@
set -e
function qpushd() { pushd "$@" >/dev/null; }
-svn update
function qpopd() { popd >/dev/null; }
function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
qpushd "$(dirname $(unix_path "$0"))"
+svn update
. functions.sh
. defaults.sh
commit 07a3289dcb1a5af83649c70cbda0d6a6bb63548b
Author: Christian Stimming <stimming at tuhh.de>
Date: Thu May 28 09:31:04 2009 +0000
Really final changes for daily build script.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18093 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/daily_build.sh b/daily_build.sh
index 5e4365f..c4b3c61 100755
--- a/daily_build.sh
+++ b/daily_build.sh
@@ -3,6 +3,7 @@
set -e
function qpushd() { pushd "$@" >/dev/null; }
+svn update
function qpopd() { popd >/dev/null; }
function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
commit ddfef1eaeee26999899b8816e0404c9205e1dcdb
Author: Christian Stimming <stimming at tuhh.de>
Date: Thu May 28 09:30:00 2009 +0000
Final changes for daily build script.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18092 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/daily_build.sh b/daily_build.sh
index 7985202..5e4365f 100755
--- a/daily_build.sh
+++ b/daily_build.sh
@@ -16,10 +16,16 @@ LOGFILENAME=build-`date +'%Y-%m-%d'`.log
_OUTPUT_DIR=`unix_path $OUTPUT_DIR`
LOGFILE=${_OUTPUT_DIR}/${LOGFILENAME}
+mkdir -p ${_OUTPUT_DIR}
# Run the compile
./install.sh 2>&1 | tee ${LOGFILE}
+# This directory needs to be removed before calling dist.sh
+DIST_DIR=${INSTALL_DIR}\\..\\dist
+_DIST_UDIR=`unix_path $DIST_DIR`
+rm -rf ${_DIST_UDIR}
+
# Create the installer
./dist.sh 2>&1 | tee -a ${LOGFILE}
commit fe4631b1ce908e67f70d9cbfbf22ba7419c0ccbc
Author: Christian Stimming <stimming at tuhh.de>
Date: Wed May 27 14:09:48 2009 +0000
Win32: Add shell script for the automated nightly build.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18091 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/daily_build.sh b/daily_build.sh
new file mode 100755
index 0000000..7985202
--- /dev/null
+++ b/daily_build.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+set -e
+
+function qpushd() { pushd "$@" >/dev/null; }
+function qpopd() { popd >/dev/null; }
+function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
+
+qpushd "$(dirname $(unix_path "$0"))"
+. functions.sh
+. defaults.sh
+
+set_default OUTPUT_DIR $GLOBAL_DIR\\output
+
+LOGFILENAME=build-`date +'%Y-%m-%d'`.log
+
+_OUTPUT_DIR=`unix_path $OUTPUT_DIR`
+LOGFILE=${_OUTPUT_DIR}/${LOGFILENAME}
+
+# Run the compile
+./install.sh 2>&1 | tee ${LOGFILE}
+
+# Create the installer
+./dist.sh 2>&1 | tee -a ${LOGFILE}
+
+# Copy the resulting installer into the output directory
+_BUILD_UDIR=`unix_path $BUILD_DIR`
+_GNUCASH_UDIR=`unix_path $GNUCASH_DIR`
+PKG_VERSION=`grep PACKAGE_VERSION ${_BUILD_UDIR}/config.h | cut -d" " -f3 | cut -d\" -f2 `
+SVN_REV=`grep GNUCASH_SVN_REV ${_BUILD_UDIR}/src/gnome-utils/gnc-svninfo.h | cut -d" " -f3 | cut -d\" -f2 `
+SETUP_FILENAME="gnucash-${PKG_VERSION}-svn-r${SVN_REV}-setup.exe"
+mv ${_GNUCASH_UDIR}/${SETUP_FILENAME} ${_OUTPUT_DIR}
+
commit fee57534fc1df02874621b8f7560b84a664a0982
Author: Christian Stimming <stimming at tuhh.de>
Date: Wed May 27 13:49:25 2009 +0000
Win32: Add aqbanking-3.8.1 patch to fix a compiler error.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18090 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/aqbanking-3.8.1-patch.diff b/aqbanking-3.8.1-patch.diff
new file mode 100644
index 0000000..1cd2577
--- /dev/null
+++ b/aqbanking-3.8.1-patch.diff
@@ -0,0 +1,15 @@
+diff --git a/src/frontends/qbanking/lib/dialogs/qbimporter.cpp b/src/frontends/qbanking/lib/dialogs/qbimporter.cpp
+index 630df18..c1061c6 100644
+--- a/src/frontends/qbanking/lib/dialogs/qbimporter.cpp
++++ b/src/frontends/qbanking/lib/dialogs/qbimporter.cpp
+@@ -850,7 +850,9 @@ bool QBImporter::_readFile(const QString &fname){
+ // conversion operator "QCString::operator const char * ()
+ // const" that will correctly convert the QCString to the
+ // const char*
+- fd=open(fname.local8Bit().data(), O_RDONLY);
++ fd = ::open(fname.local8Bit().data(), O_RDONLY);
++ // Note: We need to write ::open() to avoid an ambiguity with
++ // QDialog::open().
+ if (fd==-1) {
+ qs=QWidget::tr("Could not open file \"%1\": %2")
+ .arg(fname)
diff --git a/defaults.sh b/defaults.sh
index a332ea6..7037bb4 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -274,6 +274,7 @@ if [ "$AQBANKING3" != "yes" ]; then
set_default AQBANKING_URL "$SF_MIRROR/aqbanking/aqbanking-2.3.3.tar.gz"
else
set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=19&file=01&dummy=aqbanking-3.8.1.tar.gz"
+ set_default AQBANKING_PATCH `pwd`/aqbanking-3.8.1-patch.diff
fi
set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
set_default AQBANKING_WITH_QT yes
diff --git a/install.sh b/install.sh
index 71547d4..3e8698f 100755
--- a/install.sh
+++ b/install.sh
@@ -985,6 +985,8 @@ function inst_aqbanking() {
fi
if test x$AQBANKING_WITH_QT = xyes; then
inst_qt4
+ [ -n "$AQBANKING_PATCH" -a -f "$AQBANKING_PATCH" ] && \
+ patch -p1 < $AQBANKING_PATCH
./configure ${HOST_XCOMPILE} \
--with-gwen-dir=${_GWENHYWFAR_UDIR} \
--with-xmlmerge=${XMLMERGE} \
commit 68799d8b86fe7df6c2a93aa6c0a212b2073b2963
Author: Phil Longstaff <plongstaff at newearth.org>
Date: Wed May 20 01:26:50 2009 +0000
Fix bug #582976 – install.sh - webkit-1.1.5-win32.zip is not available for download
Fix path to URL.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18083 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 0d12d61..a332ea6 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -241,8 +241,7 @@ set_default INNO_DIR $GLOBAL_DIR\\inno
set_default HH_URL "http://download.microsoft.com/download/OfficeXPProf/Install/4.71.1015.0/W98NT42KMe/EN-US/HTMLHELP.EXE"
set_default HH_DIR $GLOBAL_DIR\\hh
-set_default WEBKIT_URL "http://webkitgtk.org/webkit-1.1.5-win32.zip"
-#set_default WEBKIT_URL "http://webkitgtk.org/webkit_1.0.1.orig.tar.gz"
+set_default WEBKIT_URL "http://www.gnucash.org/pub/gnucash/sources/unstable/2.3.x/webkit-1.1.5-win32.zip"
set_default WEBKIT_DIR $GLOBAL_DIR\\webkit-1.1.5
set_default SVN_URL "http://subversion.tigris.org/files/documents/15/35379/svn-1.4.2-setup.exe"
commit 5e81a7cecb70ee2afaad427cdc30d5988aa4f060
Author: Phil Longstaff <plongstaff at newearth.org>
Date: Thu May 14 01:30:24 2009 +0000
Fix distcheck problem
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18077 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/Makefile.am b/Makefile.am
index 4ec2ca1..4509c45 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,8 +10,6 @@ EXTRA_DIST = \
install-fq-mods.cmd \
libofx-0.8.3-patch.diff \
opensp-1.5.2-patch.diff \
- libgda-3.1.2-patch.diff \
- libgda-3.1.2-patch2.diff \
pi.sh \
Greek-4-5.1.11.isl \
reset.sh
commit 79a247a555e815a92f194b9097a5dcaba5264df5
Author: Phil Longstaff <plongstaff at newearth.org>
Date: Thu May 14 00:33:28 2009 +0000
1) Update svn:ignore for accounts/cs to ignore Makefile and Makefile.in
2) Remove obsolete patches (libgda)
3) Merge NEWS from 2.2.X and add 2.3.0 NEWS
4) Update stable version number
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18073 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/libgda-3.1.2-patch.diff b/libgda-3.1.2-patch.diff
deleted file mode 100644
index 5041be4..0000000
--- a/libgda-3.1.2-patch.diff
+++ /dev/null
@@ -1,4 +0,0 @@
-31c31
-< #include <libgnomevfs/gnome-vfs-mime.h>
----
-> #undef HAVE_GNOMEVFS
diff --git a/libgda-3.1.2-patch2.diff b/libgda-3.1.2-patch2.diff
deleted file mode 100644
index 1158b04..0000000
--- a/libgda-3.1.2-patch2.diff
+++ /dev/null
@@ -1,6 +0,0 @@
-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);
commit 770ecdf3fc177f4459651e044a3c4eebba9547a7
Author: Phil Longstaff <plongstaff at newearth.org>
Date: Wed May 13 00:58:08 2009 +0000
1) Add commands to build win32 version of gnucash using webkit.
2) Correct URLs for aqbanking
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18070 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 255b87b..0d12d61 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -173,6 +173,7 @@ set_default ZLIB_DEV_URL "$GNOME_WIN32_DEPS_URL/zlib-dev-1.2.3.zip"
set_default PKG_CONFIG_URL "$GNOME_WIN32_DEPS_URL/pkg-config-0.23.zip"
set_default CAIRO_URL "$GNOME_WIN32_DEPS_URL/cairo_1.8.6-1_win32.zip"
set_default CAIRO_DEV_URL "$GNOME_WIN32_DEPS_URL/cairo-dev_1.8.6-1_win32.zip"
+set_default PIXMAN_URL "http://cairographics.org/releases/pixman-0.14.0.tar.gz"
set_default EXPAT_URL "$GNOME_WIN32_DEPS_URL/expat-2.0.0.zip"
set_default FONTCONFIG_URL "$GNOME_WIN32_DEPS_URL/fontconfig-2.4.2-tml-20071015.zip"
set_default FONTCONFIG_DEV_URL "$GNOME_WIN32_DEPS_URL/fontconfig-dev-2.4.2-tml-20071015.zip"
@@ -240,7 +241,11 @@ set_default INNO_DIR $GLOBAL_DIR\\inno
set_default HH_URL "http://download.microsoft.com/download/OfficeXPProf/Install/4.71.1015.0/W98NT42KMe/EN-US/HTMLHELP.EXE"
set_default HH_DIR $GLOBAL_DIR\\hh
-set_default SVN_URL "http://subversion.tigris.org/files/documents/15/44582/svn-win32-1.5.5.zip"
+set_default WEBKIT_URL "http://webkitgtk.org/webkit-1.1.5-win32.zip"
+#set_default WEBKIT_URL "http://webkitgtk.org/webkit_1.0.1.orig.tar.gz"
+set_default WEBKIT_DIR $GLOBAL_DIR\\webkit-1.1.5
+
+set_default SVN_URL "http://subversion.tigris.org/files/documents/15/35379/svn-1.4.2-setup.exe"
set_default SVN_DIR $GLOBAL_DIR\\svn
# OFX import in gnucash and ofx directconnect support for aqbanking
@@ -258,7 +263,7 @@ set_default AQBANKING3 yes
if [ "$AQBANKING3" != "yes" ]; then
set_default GWENHYWFAR_URL "$SF_MIRROR/gwenhywfar/gwenhywfar-2.6.2.tar.gz"
else
- set_default GWENHYWFAR_URL "http://www.aquamaniac.de/sites/download/download.php?package=01&release=17&file=01&dummy=gwenhywfar-3.6.0.tar.gz"
+ set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=17&file=01&dummy=gwenhywfar-3.6.0.tar.gz"
set_default GWENHYWFAR_PATCH `pwd`/gwenhywfar-3.6.0-patch.diff
fi
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
@@ -269,18 +274,13 @@ set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-1.20.tar.gz"
if [ "$AQBANKING3" != "yes" ]; then
set_default AQBANKING_URL "$SF_MIRROR/aqbanking/aqbanking-2.3.3.tar.gz"
else
- set_default AQBANKING_URL "http://www.aquamaniac.de/sites/download/download.php?package=03&release=19&file=01&dummy=aqbanking-3.8.1.tar.gz"
+ set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=19&file=01&dummy=aqbanking-3.8.1.tar.gz"
fi
set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
set_default AQBANKING_WITH_QT yes
# 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 SQLITE3_URL "http://sqlite.org/sqlite-amalgamation-3.6.1.tar.gz"
set_default SQLITE3_DIR $GLOBAL_DIR\\sqlite3
set_default LIBDBI_URL "http://downloads.sourceforge.net/libdbi/libdbi-0.8.3.tar.gz"
@@ -346,6 +346,7 @@ add_step inst_gwenhywfar
add_step inst_ktoblzcheck
add_step inst_aqbanking
add_step inst_libdbi
+add_step inst_webkit
##
if [ "$UPDATE_SOURCES" = "yes" ]; then
add_step svn_up
diff --git a/dist.sh b/dist.sh
index 9104df8..be2fcff 100755
--- a/dist.sh
+++ b/dist.sh
@@ -110,6 +110,7 @@ function dist_gnome() {
wget_unpacked $LIBBONOBOUI_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBGNOMEUI_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBGLADE_URL $DOWNLOAD_DIR $DIST_DIR
+ wget_unpacked $PIXMAN_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GTKHTML_URL $DOWNLOAD_DIR $DIST_DIR
rm -rf $DIST_UDIR/etc/gconf/gconf.xml.defaults/{desktop,schemas}
cp -a $DIST_UDIR/lib/locale $DIST_UDIR/share
@@ -198,12 +199,9 @@ function dist_libdbi() {
cp -a ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/* ${DIST_UDIR}/lib/dbd
}
-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_webkit() {
+ setup WebKit
+ cp -a ${_WEBKIT_UDIR}/bin/* ${DIST_UDIR}/bin
}
function dist_gnucash() {
@@ -291,6 +289,7 @@ fi
dist_gwenhywfar
dist_aqbanking
dist_libdbi
+dist_webkit
dist_gnucash
finish
qpopd
diff --git a/install.sh b/install.sh
index 9be2a34..71547d4 100755
--- a/install.sh
+++ b/install.sh
@@ -40,6 +40,8 @@ register_env_var READLINE_CPPFLAGS " "
register_env_var READLINE_LDFLAGS " "
register_env_var REGEX_CPPFLAGS " "
register_env_var REGEX_LDFLAGS " "
+register_env_var WEBKIT_CFLAGS " "
+register_env_var WEBKIT_LIBS " "
function prepare() {
# Necessary so that intltoolize doesn't come up with some
@@ -592,6 +594,16 @@ EOF
sed '/Requires/s,\(.*\) enchant\(.*\) iso-codes\(.*\),\1\2\3,' lib/pkgconfig/libgtkhtml-3.14.pc > tmp
mv tmp lib/pkgconfig/libgtkhtml-3.14.pc
qpopd
+ wget_unpacked $PIXMAN_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/pixman-*
+ qpushd $TMP_UDIR/pixman-*
+ ./configure ${HOST_XCOMPILE} \
+ --prefix=$_GNOME_UDIR \
+ --disable-static
+ make
+ make install
+ qpopd
+ ${PKG_CONFIG} --exists pixman-1 || die "pixman not installed correctly"
quiet gconftool-2 --version &&
quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgtkhtml-3.14 &&
quiet intltoolize --version || die "gnome not installed correctly"
@@ -1076,30 +1088,20 @@ function inst_libdbi() {
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
+function inst_webkit() {
+ setup WebKit
+ _WEBKIT_UDIR=`unix_path ${WEBKIT_DIR}`
+ add_to_env ${_WEBKIT_UDIR}/bin PATH
+ add_to_env -lwebkit-1.0-2 WEBKIT_LIBS
+ add_to_env -L${_WEBKIT_UDIR}/bin WEBKIT_LIBS
+ add_to_env -I${_WEBKIT_UDIR}/include WEBKIT_CFLAGS
+ if quiet ${LD} ${WEBKIT_LIBS} -o $TMP_UDIR/ofile
then
- echo "Libgda already installed. skipping."
+ echo "webkit 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 ${HOST_XCOMPILE} \
- --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"
+ wget_unpacked $WEBKIT_URL $DOWNLOAD_DIR $WEBKIT_DIR
+ls $WEBKIT_DIR
+ quiet ${LD} ${WEBKIT_LIBS} -o $TMP_UDIR/ofile || die "webkit not installed correctly"
fi
}
@@ -1153,6 +1155,7 @@ function inst_gnucash() {
${AQBANKING_OPTIONS} \
--enable-binreloc \
--enable-locale-specific-tax \
+ --enable-webkit \
CPPFLAGS="${AUTOTOOLS_CPPFLAGS} ${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GUILE_CPPFLAGS} ${LIBDBI_CPPFLAGS} ${KTOBLZCHECK_CPPFLAGS} ${HH_CPPFLAGS} -D_WIN32" \
LDFLAGS="${AUTOTOOLS_LDFLAGS} ${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} ${HH_LDFLAGS}" \
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
@@ -1183,6 +1186,8 @@ function make_install() {
_OPENSP_UDIR=`unix_path ${OPENSP_DIR}`
_LIBDBI_UDIR=`unix_path ${LIBDBI_DIR}`
_SQLITE3_UDIR=`unix_path ${SQLITE3_DIR}`
+ _WEBKIT_UDIR=`unix_path ${WEBKIT_DIR}`
+ _GNUTLS_UDIR=`unix_path ${GNUTLS_DIR}`
AQBANKING_UPATH="${_OPENSSL_UDIR}/bin:${_GWENHYWFAR_UDIR}/bin:${_AQBANKING_UDIR}/bin"
AQBANKING_PATH="${OPENSSL_DIR}\\bin;${GWENHYWFAR_DIR}\\bin;${AQBANKING_DIR}\\bin"
@@ -1196,7 +1201,7 @@ function make_install() {
qpushd $_BUILD_UDIR/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:${_GUILE_UDIR}/bin:${_REGEX_UDIR}/bin:${_AUTOTOOLS_UDIR}/bin:${AQBANKING_UPATH}:${_LIBOFX_UDIR}/bin:${_OPENSP_UDIR}/bin:${_LIBDBI_UDIR}/bin:${_SQLITE3_UDIR}/bin" \
+ bindir="${_INSTALL_UDIR}/bin:${_INSTALL_UDIR}/lib:${_INSTALL_UDIR}/lib/gnucash:${_GNUTLS_UTIR}/bin:${_GMP_UDIR}/bin:${_GOFFICE_UDIR}/bin:${_LIBGSF_UDIR}/bin:${_PCRE_UDIR}/bin:${_GNOME_UDIR}/bin:${_GUILE_UDIR}/bin:${_WEBKIT_UDIR}/bin:${_REGEX_UDIR}/bin:${_AUTOTOOLS_UDIR}/bin:${AQBANKING_UPATH}:${_LIBOFX_UDIR}/bin:${_OPENSP_UDIR}/bin:${_LIBDBI_UDIR}/bin:${_SQLITE3_UDIR}/bin" \
gnucash
qpopd
fi
@@ -1232,7 +1237,7 @@ function make_install() {
# Create a startup script that works without the msys shell
qpushd $_INSTALL_UDIR/bin
echo "setlocal" > gnucash.cmd
- 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;${GUILE_DIR}\\bin;${REGEX_DIR}\\bin;${AUTOTOOLS_DIR}\\bin;${AQBANKING_PATH};${LIBOFX_DIR}\\bin;${OPENSP_DIR}\\bin;${LIBDBI_DIR}\\bin;${SQLITE3_DIR}\\bin;%PATH%" > gnucash.cmd
+ echo "set PATH=${INSTALL_DIR}\\bin;${INSTALL_DIR}\\lib;${INSTALL_DIR}\\lib\\gnucash;${GNUTLS_DIR}\\bin;${GMP_DIR}\\bin;${GOFFICE_DIR}\\bin;${LIBGSF_DIR}\\bin;${PCRE_DIR}\\bin;${WEBKIT_DIR}\\bin;${GNOME_DIR}\\bin;${GUILE_DIR}\\bin;${REGEX_DIR}\\bin;${AUTOTOOLS_DIR}\\bin;${AQBANKING_PATH};${LIBOFX_DIR}\\bin;${OPENSP_DIR}\\bin;${LIBDBI_DIR}\\bin;${SQLITE3_DIR}\\bin;%PATH%" > gnucash.cmd
echo "set GUILE_WARN_DEPRECATED=no" >> gnucash.cmd
echo "set GNC_MODULE_PATH=${INSTALL_DIR}\\lib\\gnucash" >> gnucash.cmd
echo "set GUILE_LOAD_PATH=${INSTALL_DIR}\\share\\gnucash\\guile-modules;${INSTALL_DIR}\\share\\gnucash\\scm;%GUILE_LOAD_PATH%" >> gnucash.cmd
commit 0030498ff58697e9a70e52badf2bdf5ac5e36afb
Author: Andreas Köhler <andi5.py at gmx.net>
Date: Mon Feb 23 20:19:03 2009 +0000
[Win32] Update EXTRA_DIST.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17948 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/Makefile.am b/Makefile.am
index e5eb502..4ec2ca1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,8 @@ EXTRA_DIST = \
dist.sh \
exetype.pl \
functions.sh \
- goffice-0.4.3-patch.diff \
+ goffice-0.7.2-patch.diff \
+ gwenhywfar-3.6.0-patch.diff \
install.sh \
install-fq-mods.cmd \
libofx-0.8.3-patch.diff \
diff --git a/aqbanking-3.7.2.patch b/aqbanking-3.7.2.patch
deleted file mode 100644
index fb413a5..0000000
--- a/aqbanking-3.7.2.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Nur aqbanking-3.7.1-old/configure.ac aqbanking-3.7.1/configure.ac
---- aqbanking-3.7.1-old/configure.ac 2008-08-16 13:36:42.000000000 +0200
-+++ aqbanking-3.7.1/configure.ac 2008-10-05 18:56:36.925980908 +0200
-@@ -476,7 +476,7 @@
- AC_PROG_INSTALL
-
- AC_LIBTOOL_WIN32_DLL
--AC_LIBTOOL_RC
-+AC_CHECK_TOOL([RC], [windres], [no])
- AC_PROG_LIBTOOL
- AC_CHECK_PROG(USE_DOT,dot,YES,NO)
- AC_CHECK_PROG(SED,sed,sed)
-@@ -511,7 +511,6 @@
- #
- # Checks for library functions.
- #
--AC_FUNC_MALLOC
- AC_FUNC_STRFTIME
- AC_CHECK_FUNCS([memmove memset strcasecmp strdup strerror snprintf])
- AC_CHECK_FUNCS([setlocale])
-diff -Nur aqbanking-3.7.1-old/src/frontends/qbanking/bin/helpbrowser/Makefile.am aqbanking-3.7.1/src/frontends/qbanking/bin/helpbrowser/Makefile.am
---- aqbanking-3.7.1-old/src/frontends/qbanking/bin/helpbrowser/Makefile.am 2008-07-31 20:13:31.000000000 +0200
-+++ aqbanking-3.7.1/src/frontends/qbanking/bin/helpbrowser/Makefile.am 2008-10-05 18:56:21.957982868 +0200
-@@ -65,7 +65,7 @@
-
- # This section is for a qt4 environment
- qt4-port:
-- for A in $(libqbhelp_la_SOURCES) $(noinst_HEADERS); do \
-+ for A in $(libqbhelp_la_SOURCES) $(noinst_HEADERS) qb_help.cpp qbhelpbrowser.cpp; do \
- $(YES) | $(QT3TO4) $$A; \
- done
- # rm $(BUILT_SOURCES)
commit ee66c00d274ec6cf791bb6f8fe67a19d544cb370
Author: Andreas Köhler <andi5.py at gmx.net>
Date: Sun Feb 15 17:23:16 2009 +0000
Bug #571220: [Win32] Unset SCHEME_LIBRARY_PATH environment variable.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17921 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/gnucash.iss.in b/gnucash.iss.in
index 8653658..442f358 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -201,6 +201,7 @@ begin
FileString := FileString + 'set LTDL_LIBRARY_PATH=' + libdir + ''#13#10 ;
FileString := FileString + 'set QOF_LIB_DIR=' + pkglibdir + ''#13#10 ;
FileString := FileString + 'set GNC_DBD_DIR=' + libdir + '\dbd'#13#10 ;
+ FileString := FileString + 'set SCHEME_LIBRARY_PATH='#13#10 ;
FileString := FileString + 'start gnucash-bin %*'#13#10 ;
{ Save the final file }
diff --git a/install.sh b/install.sh
index 885f50b..9be2a34 100755
--- a/install.sh
+++ b/install.sh
@@ -1238,6 +1238,7 @@ function make_install() {
echo "set GUILE_LOAD_PATH=${INSTALL_DIR}\\share\\gnucash\\guile-modules;${INSTALL_DIR}\\share\\gnucash\\scm;%GUILE_LOAD_PATH%" >> gnucash.cmd
echo "set LTDL_LIBRARY_PATH=${INSTALL_DIR}\\lib" >> gnucash.cmd
echo "set GNC_DBD_DIR=${LIBDBI_DRIVERS_DIR}\\lib\\dbd" >> gnucash.cmd
+ echo "set SCHEME_LIBRARY_PATH=" >> gnucash.cmd
echo "start gnucash-bin %*" >> gnucash.cmd
qpopd
fi
commit d00bb634300a86793d93d37c58351f9ad503a8c1
Author: Charles Day <cedayiv at gmail.com>
Date: Thu Feb 12 17:00:50 2009 +0000
Bug #570166: Update win32 packaging to use GTK version 2.14.7
BP
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17897 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 74a5c77..255b87b 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -184,8 +184,8 @@ set_default PANGO_URL "$GNOME_WIN32_URL/pango/1.22/pango_1.22.2-1_win32.zip"
set_default PANGO_DEV_URL "$GNOME_WIN32_URL/pango/1.22/pango-dev_1.22.2-1_win32.zip"
set_default LIBART_LGPL_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart_lgpl-2.3.20.zip"
set_default LIBART_LGPL_DEV_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart_lgpl-dev-2.3.20.zip"
-set_default GTK_URL "$GNOME_WIN32_URL/gtk+/2.14/gtk+_2.14.6-1_win32.zip"
-set_default GTK_DEV_URL "$GNOME_WIN32_URL/gtk+/2.14/gtk+-dev_2.14.6-1_win32.zip"
+set_default GTK_URL "$GNOME_WIN32_URL/gtk+/2.14/gtk+_2.14.7-1_win32.zip"
+set_default GTK_DEV_URL "$GNOME_WIN32_URL/gtk+/2.14/gtk+-dev_2.14.7-1_win32.zip"
set_default INTLTOOL_URL "$GNOME_WIN32_URL/intltool/0.40/intltool_0.40.4-1_win32.zip"
set_default ORBIT2_URL "$GNOME_WIN32_URL/ORBit2/2.14/ORBit2-2.14.13.zip"
set_default ORBIT2_DEV_URL "$GNOME_WIN32_URL/ORBit2/2.14/ORBit2-dev-2.14.13.zip"
commit 3a4710021cc91151959f3331d26705194407b0ff
Author: Andreas Köhler <andi5.py at gmx.net>
Date: Sun Feb 8 14:56:16 2009 +0000
[Win32] Bug #542382: Assign .gnucash file name extension to GnuCash.
BP
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17884 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/gnucash.iss.in b/gnucash.iss.in
index d3771ba..8653658 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -109,6 +109,12 @@ Source: "@prefix@\..\dist\share\@PACKAGE@\doc\ChangeLog"; DestDir: "{app}\doc\@P
; Define the registry keys Setup should create (HKLM = HKEY_LOCAL_MACHINE)
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
[Registry]
+Root: HKCR; Subkey: ".gnucash"; ValueType: string; ValueName: ""; ValueData: "GnuCash.Financial.Data"; Flags: uninsdeletevalue
+Root: HKCR; Subkey: ".gnucash"; ValueType: string; ValueName: "Content Type"; ValueData: "application/x-gnucash"; Flags: uninsdeletevalue
+Root: HKCR; Subkey: "GnuCash.Financial.Data"; ValueType: string; ValueName: ""; ValueData: "GnuCash Financial Data"; Flags: uninsdeletevalue
+Root: HKCR; Subkey: "GnuCash.Financial.Data\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\share\gnucash\pixmaps\gnucash-icon.ico,0"
+Root: HKCR; Subkey: "GnuCash.Financial.Data\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\bin\gnucash.cmd"" ""%1"""
+
Root: HKLM; Subkey: "Software\GnuCash"; ValueType: none; Flags: uninsdeletekeyifempty
Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: none; Flags: uninsdeletekeyifempty
Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "prefix"; ValueData: "{app}"; Flags: uninsdeletevalue
commit 36640a7db0dde3e47bed48b2b736f65e682bc36a
Author: Andreas Köhler <andi5.py at gmx.net>
Date: Sun Feb 8 13:13:48 2009 +0000
[Win32] Update gtkhtml to version 3.24.2.
BP
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17882 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 91fefe1..74a5c77 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -212,14 +212,8 @@ set_default LIBGNOMEUI_URL "$GNOME_WIN32_URL/libgnomeui/2.22/libgnomeui-2.22.1.z
set_default LIBGNOMEUI_DEV_URL "$GNOME_WIN32_URL/libgnomeui/2.22/libgnomeui-dev-2.22.1.zip"
set_default LIBGLADE_URL "$GNOME_WIN32_URL/libglade/2.6/libglade_2.6.3-1_win32.zip"
set_default LIBGLADE_DEV_URL "$GNOME_WIN32_URL/libglade/2.6/libglade-dev_2.6.3-1_win32.zip"
-#set_default LIBGNOMEPRINT_URL "$GNOME_WIN32_URL/libgnomeprint/2.12/libgnomeprint-2.12.1.zip"
-#set_default LIBGNOMEPRINT_DEV_URL "$GNOME_WIN32_URL/libgnomeprint/2.12/libgnomeprint-dev-2.12.1.zip"
-#set_default LIBGNOMEPRINTUI_URL "$GNOME_WIN32_URL/libgnomeprintui/2.12/libgnomeprintui-2.12.1.zip" # gnomeprint
-#set_default LIBGNOMEPRINTUI_DEV_URL "$GNOME_WIN32_URL/libgnomeprintui/2.12/libgnomeprintui-dev-2.12.1.zip" # gnomeprint
-#set_default GTKHTML_URL "$GNOME_WIN32_URL/gtkhtml/3.12/gtkhtml-3.12.2.zip" # gnomeprint
-#set_default GTKHTML_DEV_URL "$GNOME_WIN32_URL/gtkhtml/3.12/gtkhtml-dev-3.12.2.zip" # gnomeprint
-set_default GTKHTML_URL "$GNOME_WIN32_URL/gtkhtml/3.18/gtkhtml-3.18.2.zip" # not gnomeprint
-set_default GTKHTML_DEV_URL "$GNOME_WIN32_URL/gtkhtml/3.18/gtkhtml-dev-3.18.2.zip" # not gnomeprint
+set_default GTKHTML_URL "$GNOME_WIN32_URL/gtkhtml/3.24/gtkhtml_3.24.2-1_win32.zip"
+set_default GTKHTML_DEV_URL "$GNOME_WIN32_URL/gtkhtml/3.24/gtkhtml-dev_3.24.2-1_win32.zip"
set_default GTK_DOC_URL "$GNOME_MIRROR/sources/gtk-doc/1.11/gtk-doc-1.11.tar.bz2"
set_default GNOME_DIR $GLOBAL_DIR\\gnome
diff --git a/install.sh b/install.sh
index 1326b85..885f50b 100755
--- a/install.sh
+++ b/install.sh
@@ -589,6 +589,8 @@ fi
\${PKG_CONFIG} "\$@" | tr -d \\\\r && \$res
EOF
chmod +x bin/pkg-config{.exe,-msys.sh}
+ sed '/Requires/s,\(.*\) enchant\(.*\) iso-codes\(.*\),\1\2\3,' lib/pkgconfig/libgtkhtml-3.14.pc > tmp
+ mv tmp lib/pkgconfig/libgtkhtml-3.14.pc
qpopd
quiet gconftool-2 --version &&
quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgtkhtml-3.14 &&
commit 36618e89d2a5cf69dd7a4096d8e6d5b88c6797fb
Author: Andreas Köhler <andi5.py at gmx.net>
Date: Sun Feb 8 13:02:56 2009 +0000
[Win32] Rename *.bat to *.cmd.
BP
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17881 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/Makefile.am b/Makefile.am
index cf93d30..e5eb502 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ EXTRA_DIST = \
functions.sh \
goffice-0.4.3-patch.diff \
install.sh \
- install-fq-mods.bat \
+ install-fq-mods.cmd \
libofx-0.8.3-patch.diff \
opensp-1.5.2-patch.diff \
libgda-3.1.2-patch.diff \
diff --git a/README b/README
index 28f85ff..5758316 100644
--- a/README
+++ b/README
@@ -76,7 +76,7 @@ These steps need to be performed:
5. The content of $GNUCASH_DIR (as well as all the other binary
packages) should then be copied to a windows machine. The paths
- in $GNUCASH_DIR/bin/gnucash and/or $GNUCASH_DIR/bin/gnucash.bat
+ in $GNUCASH_DIR/bin/gnucash and/or $GNUCASH_DIR/bin/gnucash.cmd
need to be adjusted for the installation location on the
windows machine.
diff --git a/dist.sh b/dist.sh
index 7e75b7e..9104df8 100755
--- a/dist.sh
+++ b/dist.sh
@@ -219,7 +219,7 @@ function dist_gnucash() {
cp -a $_INSTALL_UDIR/libexec $DIST_UDIR
mkdir -p $DIST_UDIR/share
cp -a $_INSTALL_UDIR/share/{gnucash,locale,xml} $DIST_UDIR/share
- cp -a $_REPOS_UDIR/packaging/win32/install-fq-mods.bat $DIST_UDIR/bin
+ cp -a $_REPOS_UDIR/packaging/win32/install-fq-mods.cmd $DIST_UDIR/bin
_QTDIR_WIN=`echo $QTDIR | sed 's,^/\([A-Za-z]\)/,\1:/,g' `
sed < $_BUILD_UDIR/packaging/win32/gnucash.iss \
diff --git a/gnucash.iss.in b/gnucash.iss.in
index 448daad..d3771ba 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -41,18 +41,18 @@ Name: desktopicon; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm
Name: menuicon; Description: "{cm:CreateMenuLink}"; GroupDescription: "{cm:AdditionalIcons}"
[Icons]
-Name: "{group}\GnuCash"; Filename: "{app}\bin\gnucash.bat"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: menuicon; Flags: runminimized
+Name: "{group}\GnuCash"; Filename: "{app}\bin\gnucash.cmd"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: menuicon; Flags: runminimized
Name: "{group}\{cm:IconName_README}"; Filename: "{app}\doc\gnucash\{cm:IconFilename_README}"; Comment: "{cm:IconComment_README}"; Tasks: menuicon
Name: "{group}\{cm:IconName_FAQ}"; Filename: "http://wiki.gnucash.org/wiki/FAQ"; Tasks: menuicon
Name: "{group}\{cm:IconName_Bugzilla}"; Filename: "http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash"; Tasks: menuicon
-Name: "{group}\{cm:IconName_InstallFQ}"; Filename: "{app}\bin\install-fq-mods.bat"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_InstallFQ}"; Tasks: menuicon
+Name: "{group}\{cm:IconName_InstallFQ}"; Filename: "{app}\bin\install-fq-mods.cmd"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_InstallFQ}"; Tasks: menuicon
Name: "{group}\{cm:IconName_Uninstall}"; Filename: "{uninstallexe}"; Comment: "{cm:IconComment_Uninstall}"; Tasks: menuicon
-Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\gnucash.bat"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: desktopicon; Flags: runminimized
+Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\gnucash.cmd"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: desktopicon; Flags: runminimized
[Run]
-Filename: "{app}\bin\gnucash.bat"; Description: "{cm:RunPrg}"; WorkingDir: "{app}\bin"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent runhidden
-Filename: "{app}\bin\guile.bat"; Parameters: "-c ""(use-modules (ice-9 slib)) (require 'printf)"""; Flags: runhidden
+Filename: "{app}\bin\gnucash.cmd"; Description: "{cm:RunPrg}"; WorkingDir: "{app}\bin"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent runhidden
+Filename: "{app}\bin\guile.cmd"; Parameters: "-c ""(use-modules (ice-9 slib)) (require 'printf)"""; Flags: runhidden
;; The Windows firewall exceptions, see http://www.vincenzo.net/isxkb/index.php?title=Adding_a_rule_to_the_Windows_firewall
Filename: "{sys}\netsh.exe"; Parameters: "firewall add allowedprogram ""{app}\bin\gnucash-bin.exe"" ""GnuCash Free Finance Manager"" ENABLE ALL"; StatusMsg: "{cm:StatusMsgFirewall}"; Flags: runhidden; MinVersion: 0,5.01.2600sp2;
Filename: "{sys}\netsh.exe"; Parameters: "firewall add allowedprogram ""{app}\bin\gconfd-2.exe"" ""GConf Settings Manager"" ENABLE ALL"; StatusMsg: "{cm:StatusMsgFirewall}"; Flags: runhidden; MinVersion: 0,5.01.2600sp2;
@@ -70,7 +70,7 @@ Filename: "{sys}\netsh.exe"; Parameters: "firewall delete allowedprogram program
; The main executables and DLLs
Source: "@prefix@\..\dist\bin\*"; DestDir: "{app}\bin"; Flags: recursesubdirs ignoreversion; Components: main; AfterInstall: MyAfterInstallConfig()
; Note: The above AfterInstall function will create the
-; gnucash.bat file on-the-fly by the Pascal script below.
+; gnucash.cmd file on-the-fly by the Pascal script below.
Source: "@prefix@\..\dist\etc\*"; DestDir: "{app}\etc"; Flags: recursesubdirs; Components: main
Source: "@prefix@\..\dist\lib\*"; DestDir: "{app}\lib"; Flags: recursesubdirs; Components: main
@@ -145,8 +145,8 @@ Root: HKLM; Subkey: "Software\AqBanking\Paths"; ValueType: string; ValueName: "c
; Delete the created config script on uninstall
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
[UninstallDelete]
-Type: files; Name: "{app}\bin\gnucash.bat"
-Type: files; Name: "{app}\bin\guile.bat"
+Type: files; Name: "{app}\bin\gnucash.cmd"
+Type: files; Name: "{app}\bin\guile.cmd"
Type: files; Name: "{app}\share\guile\1.6\slibcat"
Type: filesandordirs; Name: "{app}\share\guile"
Type: filesandordirs; Name: "{app}\etc\gconf"
@@ -183,8 +183,8 @@ begin
pkglibdir := libdir + '\gnucash';
pkgdatadir := appdir + '\share\gnucash';
- { Create the gnucash.bat file; #10 is the linefeed character and #13 CR }
- FileName := appdir + '\bin\gnucash.bat' ;
+ { Create the gnucash.cmd file; #10 is the linefeed character and #13 CR }
+ FileName := appdir + '\bin\gnucash.cmd' ;
FileString := 'setlocal'#13#10 ;
FileString := FileString + 'chcp ' + ExpandConstant('{cm:LanguageCodePage}') + ''#13#10 ;
FileString := FileString + 'set PATH=' + appdir + '\bin;' + libdir + ';' + libdir + '\gnucash;%PATH%'#13#10 ;
@@ -202,7 +202,7 @@ begin
if Res = False then
MsgBox('Error on saving '+FileName+' for completing the installation', mbInformation, MB_OK);
- FileName := appdir + '\bin\guile.bat' ;
+ FileName := appdir + '\bin\guile.cmd' ;
FileString := 'set GUILE_LOAD_PATH=' + pkgdatadir + '\guile-modules;' + pkgdatadir + '\scm;' + appdir + '\share\guile\1.6;%GUILE_LOAD_PATH%'#13#10 ;
FileString := FileString + 'start guile.exe %*'#13#10 ;
Res := SaveStringToFile(FileName, FileString, False);
@@ -255,7 +255,7 @@ IconComment_InstallFQ=Install the necessary perl module Finance-Quote for online
IconName_Uninstall=Uninstall GnuCash
IconComment_Uninstall=Uninstall the Finance Manager GnuCash
-;; List of Code pages, used in gnucash.bat
+;; List of Code pages, used in gnucash.cmd
LanguageCodePage=1252
de.LanguageCodePage=1252
el.LanguageCodePage=1253
diff --git a/install-fq-mods.bat b/install-fq-mods.cmd
similarity index 95%
rename from install-fq-mods.bat
rename to install-fq-mods.cmd
index cbd76c6..6bf1775 100644
--- a/install-fq-mods.bat
+++ b/install-fq-mods.cmd
@@ -4,7 +4,7 @@ setlocal
if not exist ssleay32.dll (
echo.
echo Did not find ssleay32.dll in current directory.
- echo Please start this batch file in the bin directory created by the setup.exe.
+ echo Please start this cmd file in the bin directory created by the setup.exe.
goto error
)
diff --git a/install.sh b/install.sh
index fe0ccf3..1326b85 100755
--- a/install.sh
+++ b/install.sh
@@ -1229,14 +1229,14 @@ function make_install() {
if [ -z $_skip_scripts ]; then
# Create a startup script that works without the msys shell
qpushd $_INSTALL_UDIR/bin
- echo "setlocal" > 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;${GUILE_DIR}\\bin;${REGEX_DIR}\\bin;${AUTOTOOLS_DIR}\\bin;${AQBANKING_PATH};${LIBOFX_DIR}\\bin;${OPENSP_DIR}\\bin;${LIBDBI_DIR}\\bin;${SQLITE3_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
- echo "set LTDL_LIBRARY_PATH=${INSTALL_DIR}\\lib" >> gnucash.bat
- echo "set GNC_DBD_DIR=${LIBDBI_DRIVERS_DIR}\\lib\\dbd" >> gnucash.bat
- echo "start gnucash-bin %*" >> gnucash.bat
+ echo "setlocal" > gnucash.cmd
+ 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;${GUILE_DIR}\\bin;${REGEX_DIR}\\bin;${AUTOTOOLS_DIR}\\bin;${AQBANKING_PATH};${LIBOFX_DIR}\\bin;${OPENSP_DIR}\\bin;${LIBDBI_DIR}\\bin;${SQLITE3_DIR}\\bin;%PATH%" > gnucash.cmd
+ echo "set GUILE_WARN_DEPRECATED=no" >> gnucash.cmd
+ echo "set GNC_MODULE_PATH=${INSTALL_DIR}\\lib\\gnucash" >> gnucash.cmd
+ echo "set GUILE_LOAD_PATH=${INSTALL_DIR}\\share\\gnucash\\guile-modules;${INSTALL_DIR}\\share\\gnucash\\scm;%GUILE_LOAD_PATH%" >> gnucash.cmd
+ echo "set LTDL_LIBRARY_PATH=${INSTALL_DIR}\\lib" >> gnucash.cmd
+ echo "set GNC_DBD_DIR=${LIBDBI_DRIVERS_DIR}\\lib\\dbd" >> gnucash.cmd
+ echo "start gnucash-bin %*" >> gnucash.cmd
qpopd
fi
}
commit dd5fb811a1393ab86b415b7f31fa70b4d43bb15c
Author: Andreas Köhler <andi5.py at gmx.net>
Date: Tue Jan 13 02:14:00 2009 +0000
[Win32] Update online banking libraries.
New versions: gwenhywfar 3.6.0, ktoblzcheck 1.20, aqbanking 3.8.1. Fix path to
xmlmerge. Fix aqbanking backend list when compiling without qt (untested
though).
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17815 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 0c9ccef..91fefe1 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -264,18 +264,18 @@ set_default AQBANKING3 yes
if [ "$AQBANKING3" != "yes" ]; then
set_default GWENHYWFAR_URL "$SF_MIRROR/gwenhywfar/gwenhywfar-2.6.2.tar.gz"
else
- set_default GWENHYWFAR_URL "http://www.aquamaniac.de/sites/download/download.php?package=01&release=13&file=01&dummy=gwenhywfar-3.4.1.tar.gz"
+ set_default GWENHYWFAR_URL "http://www.aquamaniac.de/sites/download/download.php?package=01&release=17&file=01&dummy=gwenhywfar-3.6.0.tar.gz"
+ set_default GWENHYWFAR_PATCH `pwd`/gwenhywfar-3.6.0-patch.diff
fi
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
-set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-1.17.tar.gz"
+set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-1.20.tar.gz"
# ktoblzcheck is being installed into GWENHYWFAR_DIR
if [ "$AQBANKING3" != "yes" ]; then
set_default AQBANKING_URL "$SF_MIRROR/aqbanking/aqbanking-2.3.3.tar.gz"
else
- set_default AQBANKING_URL "http://www.aquamaniac.de/sites/download/download.php?package=03&release=16&file=01&dummy=aqbanking-3.7.2.tar.gz"
- set_default AQBANKING_PATCH `pwd`/aqbanking-3.7.2.patch
+ set_default AQBANKING_URL "http://www.aquamaniac.de/sites/download/download.php?package=03&release=19&file=01&dummy=aqbanking-3.8.1.tar.gz"
fi
set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
set_default AQBANKING_WITH_QT yes
diff --git a/gwenhywfar-3.6.0-patch.diff b/gwenhywfar-3.6.0-patch.diff
new file mode 100644
index 0000000..b346d45
--- /dev/null
+++ b/gwenhywfar-3.6.0-patch.diff
@@ -0,0 +1,76 @@
+--- gwenhywfar-3.6.0-old/src/cryptmsg/cryptmgrkeys.c Sun Dec 7 16:56:04 2008
++++ gwenhywfar-3.6.0/src/cryptmsg/cryptmgrkeys.c Tue Jan 13 01:05:44 2009
+@@ -74,6 +74,7 @@
+
+
+
++GWENHYWFAR_CB
+ void GWEN_CryptMgrKeys_FreeData(void *bp, void *p) {
+ GWEN_CRYPTMGR_KEYS *xcm;
+
+@@ -104,6 +105,7 @@
+
+
+
++GWENHYWFAR_CB
+ int GWEN_CryptMgrKeys_SignData(GWEN_CRYPTMGR *cm,
+ const uint8_t *pData, uint32_t lData,
+ GWEN_BUFFER *dbuf) {
+@@ -176,6 +178,7 @@
+
+
+
++GWENHYWFAR_CB
+ int GWEN_CryptMgrKeys_VerifyData(GWEN_CRYPTMGR *cm,
+ const uint8_t *pData, uint32_t lData,
+ const uint8_t *pSignature, uint32_t lSignature) {
+@@ -271,6 +274,7 @@
+
+
+
++GWENHYWFAR_CB
+ int GWEN_CryptMgrKeys_EncryptKey(GWEN_CRYPTMGR *cm,
+ const uint8_t *pData, uint32_t lData,
+ GWEN_BUFFER *dbuf) {
+@@ -322,6 +326,7 @@
+
+
+
++GWENHYWFAR_CB
+ int GWEN_CryptMgrKeys_DecryptKey(GWEN_CRYPTMGR *cm,
+ const uint8_t *pData, uint32_t lData,
+ GWEN_BUFFER *dbuf) {
+--- gwenhywfar-3.6.0-old/src/cryptmsg/cryptmgr_be.h Tue Dec 2 17:06:50 2008
++++ gwenhywfar-3.6.0/src/cryptmsg/cryptmgr_be.h Tue Jan 13 01:17:30 2009
+@@ -22,19 +22,19 @@
+ GWEN_INHERIT_FUNCTION_LIB_DEFS(GWEN_CRYPTMGR, GWENHYWFAR_API)
+
+
+-typedef int (*GWEN_CRYPTMGR_SIGNDATA_FN)(GWEN_CRYPTMGR *cm,
+- const uint8_t *pData, uint32_t lData,
+- GWEN_BUFFER *dbuf);
+-typedef int (*GWEN_CRYPTMGR_ENCRYPTKEY_FN)(GWEN_CRYPTMGR *cm,
+- const uint8_t *pData, uint32_t lData,
+- GWEN_BUFFER *dbuf);
++typedef GWENHYWFAR_CB int (*GWEN_CRYPTMGR_SIGNDATA_FN)(GWEN_CRYPTMGR *cm,
++ const uint8_t *pData, uint32_t lData,
++ GWEN_BUFFER *dbuf);
++typedef GWENHYWFAR_CB int (*GWEN_CRYPTMGR_ENCRYPTKEY_FN)(GWEN_CRYPTMGR *cm,
++ const uint8_t *pData, uint32_t lData,
++ GWEN_BUFFER *dbuf);
+
+-typedef int (*GWEN_CRYPTMGR_VERIFYDATA_FN)(GWEN_CRYPTMGR *cm,
+- const uint8_t *pData, uint32_t lData,
+- const uint8_t *pSignature, uint32_t lSignature);
+-typedef int (*GWEN_CRYPTMGR_DECRYPTKEY_FN)(GWEN_CRYPTMGR *cm,
+- const uint8_t *pData, uint32_t lData,
+- GWEN_BUFFER *dbuf);
++typedef GWENHYWFAR_CB int (*GWEN_CRYPTMGR_VERIFYDATA_FN)(GWEN_CRYPTMGR *cm,
++ const uint8_t *pData, uint32_t lData,
++ const uint8_t *pSignature, uint32_t lSignature);
++typedef GWENHYWFAR_CB int (*GWEN_CRYPTMGR_DECRYPTKEY_FN)(GWEN_CRYPTMGR *cm,
++ const uint8_t *pData, uint32_t lData,
++ GWEN_BUFFER *dbuf);
+
+
+
diff --git a/install.sh b/install.sh
index 001ec6f..fe0ccf3 100755
--- a/install.sh
+++ b/install.sh
@@ -870,6 +870,8 @@ function inst_gwenhywfar() {
CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS}" \
LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} -lintl"
else
+ [ -n "$GWENHYWFAR_PATCH" -a -f "$GWENHYWFAR_PATCH" ] && \
+ patch -p1 < $GWENHYWFAR_PATCH
./configure ${HOST_XCOMPILE} \
--with-openssl-includes=$_OPENSSL_UDIR/include \
--with-openssl-libs=$_OPENSSL_UDIR/lib \
@@ -957,14 +959,15 @@ function inst_aqbanking() {
qpushd $TMP_UDIR/aqbanking-*
_AQ_CPPFLAGS="-I${_LIBOFX_UDIR}/include ${KTOBLZCHECK_CPPFLAGS} ${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS}"
_AQ_LDFLAGS="-L${_LIBOFX_UDIR}/lib ${KTOBLZCHECK_LDFLAGS} ${GNOME_LDFLAGS} ${GNUTLS_LDFLAGS}"
- if [ -n "$AQBANKING_PATCH" -a -f "$AQBANKING_PATCH" ]; then
- patch -p1 < $AQBANKING_PATCH
- make -f Makefile.cvs
- fi
if test x$CROSS_COMPILE = xyes; then
XMLMERGE="xmlmerge"
else
- XMLMERGE="${GWENHYWFAR_UDIR}/bin/xmlmerge"
+ XMLMERGE="${_GWENHYWFAR_UDIR}/bin/xmlmerge"
+ fi
+ if test x$AQBANKING3 = xyes; then
+ _AQ_BACKENDS="aqhbci aqofxconnect"
+ else
+ _AQ_BACKENDS="aqdtaus aqhbci aqofxconnect"
fi
if test x$AQBANKING_WITH_QT = xyes; then
inst_qt4
@@ -972,7 +975,7 @@ function inst_aqbanking() {
--with-gwen-dir=${_GWENHYWFAR_UDIR} \
--with-xmlmerge=${XMLMERGE} \
--with-frontends="cbanking qbanking" \
- --with-backends="aqhbci aqofxconnect" \
+ --with-backends="${_AQ_BACKENDS}" \
CPPFLAGS="${_AQ_CPPFLAGS} ${GMP_CPPFLAGS}" \
LDFLAGS="${_AQ_LDFLAGS} ${GMP_LDFLAGS}" \
qt3_libs="-L${_QTDIR}/lib -L${_QTDIR}/bin -lQtCore4 -lQtGui4 -lQt3Support4" \
@@ -985,7 +988,7 @@ function inst_aqbanking() {
--with-gwen-dir=${_GWENHYWFAR_UDIR} \
--with-xmlmerge=${XMLMERGE} \
--with-frontends="cbanking" \
- --with-backends="aqdtaus aqhbci aqofxconnect" \
+ --with-backends="${_AQ_BACKENDS}" \
CPPFLAGS="${_AQ_CPPFLAGS} ${GMP_CPPFLAGS}" \
LDFLAGS="${_AQ_LDFLAGS} ${GMP_LDFLAGS}" \
--prefix=${_AQBANKING_UDIR}
commit 0188aed9540d36ad09f2d00f47f9b57dcbc38ff1
Author: Andreas Köhler <andi5.py at gmx.net>
Date: Sun Jan 11 18:47:34 2009 +0000
[Win32] Provide a bare variant of make_install.sh.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17811 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index 40554be..001ec6f 100755
--- a/install.sh
+++ b/install.sh
@@ -1160,6 +1160,7 @@ function inst_gnucash() {
# This function will be called by make_install.sh as well,
# so do not regard variables from inst_* functions as set
+# Parameters allowed: skip_scripts, skip_schemas
function make_install() {
_BUILD_UDIR=`unix_path $BUILD_DIR`
_INSTALL_UDIR=`unix_path $INSTALL_DIR`
@@ -1180,15 +1181,22 @@ function make_install() {
AQBANKING_UPATH="${_OPENSSL_UDIR}/bin:${_GWENHYWFAR_UDIR}/bin:${_AQBANKING_UDIR}/bin"
AQBANKING_PATH="${OPENSSL_DIR}\\bin;${GWENHYWFAR_DIR}\\bin;${AQBANKING_DIR}\\bin"
- # Try to fix the paths in the "gnucash" script
- qpushd $_BUILD_UDIR/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:${_GUILE_UDIR}/bin:${_REGEX_UDIR}/bin:${_AUTOTOOLS_UDIR}/bin:${AQBANKING_UPATH}:${_LIBOFX_UDIR}/bin:${_OPENSP_UDIR}/bin:${_LIBDBI_UDIR}/bin:${_SQLITE3_UDIR}/bin" \
- gnucash
- qpopd
+ for param in "$@"; do
+ [ "$param" = "skip_scripts" ] && _skip_scripts=1
+ [ "$param" = "skip_schemas" ] && _skip_schemas=1
+ done
-make install
+ if [ -z $_skip_scripts ]; then
+ # Try to fix the paths in the "gnucash" script
+ qpushd $_BUILD_UDIR/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:${_GUILE_UDIR}/bin:${_REGEX_UDIR}/bin:${_AUTOTOOLS_UDIR}/bin:${AQBANKING_UPATH}:${_LIBOFX_UDIR}/bin:${_OPENSP_UDIR}/bin:${_LIBDBI_UDIR}/bin:${_SQLITE3_UDIR}/bin" \
+ gnucash
+ qpopd
+ fi
+
+ make install
qpushd $_INSTALL_UDIR/lib
# Move modules that are compiled without -module to lib/gnucash and
@@ -1204,26 +1212,30 @@ make install
done
qpopd
- qpushd $_INSTALL_UDIR/etc/gconf/schemas
- for file in *.schemas; do
- gconftool-2 \
- --config-source=xml:merged:${_INSTALL_WFSDIR}/etc/gconf/gconf.xml.defaults \
- --install-schema-file $file
- done
- gconftool-2 --shutdown
- qpopd
+ if [ -z $_skip_schemas ]; then
+ qpushd $_INSTALL_UDIR/etc/gconf/schemas
+ for file in *.schemas; do
+ gconftool-2 \
+ --config-source=xml:merged:${_INSTALL_WFSDIR}/etc/gconf/gconf.xml.defaults \
+ --install-schema-file $file
+ done
+ gconftool-2 --shutdown
+ qpopd
+ fi
- # Create a startup script that works without the msys shell
- qpushd $_INSTALL_UDIR/bin
- echo "setlocal" > 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;${GUILE_DIR}\\bin;${REGEX_DIR}\\bin;${AUTOTOOLS_DIR}\\bin;${AQBANKING_PATH};${LIBOFX_DIR}\\bin;${OPENSP_DIR}\\bin;${LIBDBI_DIR}\\bin;${SQLITE3_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
- echo "set LTDL_LIBRARY_PATH=${INSTALL_DIR}\\lib" >> gnucash.bat
- echo "set GNC_DBD_DIR=${LIBDBI_DRIVERS_DIR}\\lib\\dbd" >> gnucash.bat
- echo "start gnucash-bin %*" >> gnucash.bat
- qpopd
+ if [ -z $_skip_scripts ]; then
+ # Create a startup script that works without the msys shell
+ qpushd $_INSTALL_UDIR/bin
+ echo "setlocal" > 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;${GUILE_DIR}\\bin;${REGEX_DIR}\\bin;${AUTOTOOLS_DIR}\\bin;${AQBANKING_PATH};${LIBOFX_DIR}\\bin;${OPENSP_DIR}\\bin;${LIBDBI_DIR}\\bin;${SQLITE3_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
+ echo "set LTDL_LIBRARY_PATH=${INSTALL_DIR}\\lib" >> gnucash.bat
+ echo "set GNC_DBD_DIR=${LIBDBI_DRIVERS_DIR}\\lib\\dbd" >> gnucash.bat
+ echo "start gnucash-bin %*" >> gnucash.bat
+ qpopd
+ fi
}
function make_chm() {
diff --git a/make_install.sh b/make_install.sh
index 2c67754..19fab94 100644
--- a/make_install.sh
+++ b/make_install.sh
@@ -17,4 +17,4 @@ prepare
_INSTALL_WFSDIR=`win_fs_path $INSTALL_DIR`
_INSTALL_UDIR=`unix_path $INSTALL_DIR`
-make_install
+make_install "$@"
commit 6c3515f37efd71b5da4414dbc2645b19c0afee73
Author: Andreas Köhler <andi5.py at gmx.net>
Date: Sun Jan 11 18:38:40 2009 +0000
[Win32] Minor cleanup.
* Relinking is really fast now, no need for a hack anymore
* Move the fix of the gnucash script into make_install()
* GnuCash does not install into lib/locale/ anymore
* Remove invalid LIBXML2_DIR from PATH
BP
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17810 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index 0337d4a..40554be 100755
--- a/install.sh
+++ b/install.sh
@@ -1135,8 +1135,6 @@ function inst_gnucash() {
if [ "$BUILD_FROM_TARBALL" != "yes" ]; then
./autogen.sh
fi
- # Windows DLLs don't need relinking
- grep -v "need_relink=yes" ltmain.sh > ltmain.sh.new ; mv ltmain.sh.new ltmain.sh
qpopd
qpushd $BUILD_DIR
@@ -1154,27 +1152,43 @@ function inst_gnucash() {
LDFLAGS="${AUTOTOOLS_LDFLAGS} ${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} ${HH_LDFLAGS}" \
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
- # Windows DLLs don't need relinking
- grep -v "need_relink=yes" libtool > libtool.new ; mv libtool.new libtool
-
make
- # Try to fix the paths in the "gnucash" script
- 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:${_LIBDBI_UDIR}/bin:${_SQLITE3_UDIR}/bin" \
- gnucash
- qpopd
-
make_install
qpopd
}
+# This function will be called by make_install.sh as well,
+# so do not regard variables from inst_* functions as set
function make_install() {
+ _BUILD_UDIR=`unix_path $BUILD_DIR`
+ _INSTALL_UDIR=`unix_path $INSTALL_DIR`
+ _GOFFICE_UDIR=`unix_path $GOFFICE_DIR`
+ _LIBGSF_UDIR=`unix_path $LIBGSF_DIR`
+ _PCRE_UDIR=`unix_path $PCRE_DIR`
+ _GNOME_UDIR=`unix_path $GNOME_DIR`
+ _GUILE_UDIR=`unix_path $GUILE_DIR`
+ _REGEX_UDIR=`unix_path $REGEX_DIR`
+ _AUTOTOOLS_UDIR=`unix_path $AUTOTOOLS_DIR`
+ _OPENSSL_UDIR=`unix_path $OPENSSL_DIR`
+ _GWENHYWFAR_UDIR=`unix_path ${GWENHYWFAR_DIR}`
+ _AQBANKING_UDIR=`unix_path ${AQBANKING_DIR}`
+ _LIBOFX_UDIR=`unix_path ${LIBOFX_DIR}`
+ _OPENSP_UDIR=`unix_path ${OPENSP_DIR}`
+ _LIBDBI_UDIR=`unix_path ${LIBDBI_DIR}`
+ _SQLITE3_UDIR=`unix_path ${SQLITE3_DIR}`
+ AQBANKING_UPATH="${_OPENSSL_UDIR}/bin:${_GWENHYWFAR_UDIR}/bin:${_AQBANKING_UDIR}/bin"
AQBANKING_PATH="${OPENSSL_DIR}\\bin;${GWENHYWFAR_DIR}\\bin;${AQBANKING_DIR}\\bin"
- make install
+ # Try to fix the paths in the "gnucash" script
+ qpushd $_BUILD_UDIR/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:${_GUILE_UDIR}/bin:${_REGEX_UDIR}/bin:${_AUTOTOOLS_UDIR}/bin:${AQBANKING_UPATH}:${_LIBOFX_UDIR}/bin:${_OPENSP_UDIR}/bin:${_LIBDBI_UDIR}/bin:${_SQLITE3_UDIR}/bin" \
+ gnucash
+ qpopd
+
+make install
qpushd $_INSTALL_UDIR/lib
# Move modules that are compiled without -module to lib/gnucash and
@@ -1188,10 +1202,6 @@ function make_install() {
for A in *.la; do
sed '/dependency_libs/d' $A > tmp ; mv tmp $A
done
-
- # gettext 0.17 installs translations to \share\locale, but not all
- # gnome packages have been recompiled against it
- [ -d locale ] && cp -a locale ../share && rm -rf locale
qpopd
qpushd $_INSTALL_UDIR/etc/gconf/schemas
@@ -1206,7 +1216,7 @@ function make_install() {
# Create a startup script that works without the msys shell
qpushd $_INSTALL_UDIR/bin
echo "setlocal" > 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;${LIBDBI_DIR}\\bin;${SQLITE3_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;${GUILE_DIR}\\bin;${REGEX_DIR}\\bin;${AUTOTOOLS_DIR}\\bin;${AQBANKING_PATH};${LIBOFX_DIR}\\bin;${OPENSP_DIR}\\bin;${LIBDBI_DIR}\\bin;${SQLITE3_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
commit 83fa712baf952f55daaa6321e1b3e6606af2f08e
Author: Andreas Köhler <andi5.py at gmx.net>
Date: Sun Jan 11 15:55:33 2009 +0000
[Win32] Remove a few obsolete comments.
BP
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17809 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index b5308d2..0337d4a 100755
--- a/install.sh
+++ b/install.sh
@@ -591,8 +591,7 @@ EOF
chmod +x bin/pkg-config{.exe,-msys.sh}
qpopd
quiet gconftool-2 --version &&
-# quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libgtkhtml-3.8 && # gnomeprint
- quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgtkhtml-3.14 && # not gnomeprint
+ quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgtkhtml-3.14 &&
quiet intltoolize --version || die "gnome not installed correctly"
fi
if [ "$CROSS_COMPILE" = "yes" ]; then
@@ -600,11 +599,6 @@ EOF
perl -pi.bak -e"s!^prefix=.*\$!prefix=$_GNOME_UDIR!" *.pc
#perl -pi.bak -e's!^Libs: !Libs: -L\${prefix}/bin !' *.pc
qpopd
- # Latest gnome-dev packages don't ship with *.la files
- # anymore. What do we do...?
- #qpushd $_GNOME_UDIR/bin
- # for A in *-0.dll; do ln -sf $A `echo $A|sed 's/\(.*\)-0.dll/\1.dll/'`; done
- #qpopd
fi
[ ! -d $_GNOME_UDIR/share/aclocal ] || add_to_env "-I $_GNOME_UDIR/share/aclocal" ACLOCAL_FLAGS
}
commit 50d484a674282c9f924bb27673cb1991f2504074
Author: Andreas Köhler <andi5.py at gmx.net>
Date: Sun Jan 11 15:45:31 2009 +0000
[Win32] Whitespace change.
Re-add a removed space character, no need for regressions ;-)
BP
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17807 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index 8a13c28..b5308d2 100755
--- a/install.sh
+++ b/install.sh
@@ -1145,7 +1145,7 @@ function inst_gnucash() {
grep -v "need_relink=yes" ltmain.sh > ltmain.sh.new ; mv ltmain.sh.new ltmain.sh
qpopd
- qpushd $BUILD_DIR
+ qpushd $BUILD_DIR
$_REL_REPOS_UDIR/configure ${HOST_XCOMPILE} \
--prefix=$_INSTALL_WFSDIR \
--enable-debug \
commit 1863c57eb4f3a59090c9cb654e1dd23c1a5ce22d
Author: Andreas Köhler <andi5.py at gmx.net>
Date: Sun Jan 11 15:37:26 2009 +0000
[Win32] Update a whole bunch of packages.
* MinGW tools
* Autotools (ac 2.60, am 1.10.2, lt 2.2.6a)
- libtool feels faster, needs confirmation
- compiling ac needs a newer m4 version, add that
* Gnome
- intltool needs a newer perl, so upgrade to activeperl 5.10
- new libpng, separated into libpng and libpng-dev
- newly packaged zlib (zlib-dev as well), no dlltool'ing anymore
- remove libgnomeprint (cf. goffice), gtkprint finally seems to work
-> goodbye mirrored printouts
* libxslt
- not the newest because that will be moved to oldreleases/ soon
* openssl
- watch for libeay32.dll in your Windows folder, it might be too old,
better you remove it completely
* gmp
- untested, no BP needed (yet)
* gnutls
- untested, no BP needed (yet)
* swig
* pcre
* libgsf, goffice
- goffice does not use libgnomeprint anymore, new patch necessary,
grab gtk-doc.m4 from gtk-doc tarball instead of patching goffice
- install htmlhelp earlier and add flags to link to it
* svn
- includes an own libeay32.dll, may conflict with openssl/bin/libeay32.dll
BP
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17806 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 5e753ab..0c9ccef 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -102,13 +102,14 @@ set_default GNOME_WIN32_URL "$GNOME_MIRROR/binaries/win32"
set_default GNOME_WIN32_DEPS_URL "$GNOME_WIN32_URL/dependencies"
set_default DTK_URL "$SF_MIRROR/mingw/msysDTK-1.0.1.exe"
-
-set_default BINUTILS_URL "$SF_MIRROR/mingw/binutils-2.15.91-20040904-1.tar.gz"
-set_default GCC_CORE_URL "$SF_MIRROR/mingw/gcc-core-3.4.2-20040916-1.tar.gz"
-set_default GCC_GPP_URL "$SF_MIRROR/mingw/gcc-g++-3.4.2-20040916-1.tar.gz"
-set_default MINGW_RT_URL "$SF_MIRROR/mingw/mingw-runtime-3.12.tar.gz"
-set_default W32API_URL "$SF_MIRROR/mingw/w32api-3.9.tar.gz"
-set_default MINGW_MAKE_URL "$SF_MIRROR/mingw/mingw32-make-3.81-2.tar.gz"
+set_default M4_URL "$SF_MIRROR/mingw/m4-1.4.7-MSYS.tar.bz2"
+
+set_default BINUTILS_URL "$SF_MIRROR/mingw/binutils-2.19-mingw32-bin.tar.gz"
+set_default GCC_CORE_URL "$SF_MIRROR/mingw/gcc-core-3.4.5-20060117-3.tar.gz"
+set_default GCC_GPP_URL "$SF_MIRROR/mingw/gcc-g++-3.4.5-20060117-3.tar.gz"
+set_default MINGW_RT_URL "$SF_MIRROR/mingw/mingwrt-3.15.1-mingw32.tar.gz"
+set_default W32API_URL "$SF_MIRROR/mingw/w32api-3.13-mingw32-dev.tar.gz"
+set_default MINGW_MAKE_URL "$SF_MIRROR/mingw/mingw32-make-3.81-20080326-3.tar.gz"
set_default MINGW_DIR $GLOBAL_DIR\\mingw
set_default UNZIP_URL "$SF_MIRROR/gnuwin32/unzip-5.51-1.exe"
@@ -119,19 +120,19 @@ set_default REGEX_URL "$GNOME_WIN32_DEPS_URL/libgnurx-2.5.zip"
set_default REGEX_DEV_URL "$GNOME_WIN32_DEPS_URL/libgnurx-dev-2.5.zip"
set_default REGEX_DIR $GLOBAL_DIR\\regex
-set_default READLINE_BIN_URL "$SF_MIRROR/gnuwin32/readline-5.0-bin.zip"
-set_default READLINE_LIB_URL "$SF_MIRROR/gnuwin32/readline-5.0-lib.zip"
+set_default READLINE_BIN_URL "$SF_MIRROR/gnuwin32/readline-5.0-1-bin.zip"
+set_default READLINE_LIB_URL "$SF_MIRROR/gnuwin32/readline-5.0-1-lib.zip"
set_default READLINE_DIR $GLOBAL_DIR\\readline
-set_default ACTIVE_PERL_URL "http://downloads.activestate.com/ActivePerl/Windows/5.6/ActivePerl-5.6.1.638-MSWin32-x86.zip"
+set_default ACTIVE_PERL_URL "http://downloads.activestate.com/ActivePerl/Windows/5.10/ActivePerl-5.10.0.1004-MSWin32-x86-287188.zip"
set_default ACTIVE_PERL_DIR $GLOBAL_DIR\\active-perl
-set_default AUTOCONF_URL "http://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.bz2"
-set_default AUTOMAKE_URL "http://ftp.gnu.org/gnu/automake/automake-1.9.6.tar.bz2"
-set_default LIBTOOL_URL "http://ftp.gnu.org/gnu/libtool/libtool-1.5.22.tar.gz"
+set_default AUTOCONF_URL "http://ftp.gnu.org/gnu/autoconf/autoconf-2.63.tar.bz2"
+set_default AUTOMAKE_URL "http://ftp.gnu.org/gnu/automake/automake-1.10.2.tar.bz2"
+set_default LIBTOOL_URL "http://ftp.gnu.org/gnu/libtool/libtool-2.2.6a.tar.gz"
set_default AUTOTOOLS_DIR $GLOBAL_DIR\\autotools
-set_default GMP_URL "ftp://ftp.gnu.org/gnu/gmp/gmp-4.2.3.tar.bz2"
+set_default GMP_URL "ftp://ftp.gnu.org/gnu/gmp/gmp-4.2.4.tar.bz2"
set_default GMP_ABI 32
set_default GMP_DIR $GLOBAL_DIR\\gmp
@@ -139,10 +140,10 @@ set_default GUILE_URL "http://ftp.gnu.org/pub/gnu/guile/guile-1.6.8.tar.gz"
set_default SLIB_URL "http://swiss.csail.mit.edu/ftpdir/scm/OLD/slib3a3.zip"
set_default GUILE_DIR $GLOBAL_DIR\\guile
-set_default OPENSSL_URL "http://www.openssl.org/source/openssl-0.9.8e.tar.gz"
+set_default OPENSSL_URL "http://www.openssl.org/source/openssl-0.9.8j.tar.gz"
set_default OPENSSL_DIR $GLOBAL_DIR\\openssl
-set_default GNUTLS_URL "http://josefsson.org/gnutls4win/gnutls-2.4.1.zip"
+set_default GNUTLS_URL "http://josefsson.org/gnutls4win/gnutls-2.7.3.zip"
set_default GNUTLS_DIR $GLOBAL_DIR\\gnutls
set_default MINGW_UTILS_URL "$SF_MIRROR/mingw/mingw-utils-0.3.tar.gz"
@@ -151,7 +152,7 @@ set_default MINGW_UTILS_DIR $TOOLS_DIR
set_default EXETYPE_SCRIPT `pwd`/exetype.pl
set_default EXETYPE_DIR $TOOLS_DIR
-set_default LIBXSLT_URL "http://www.zlatkovic.com/pub/libxml/oldreleases/libxslt-1.1.19.win32.zip"
+set_default LIBXSLT_URL "http://xmlsoft.org/sources/win32/oldreleases/libxslt-1.1.23+.win32.zip"
set_default LIBXSLT_DIR $GLOBAL_DIR\\libxslt
set_default LIBXML2_URL "$GNOME_WIN32_DEPS_URL/libxml2-2.6.27.zip"
@@ -160,77 +161,81 @@ set_default GETTEXT_RUNTIME_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime-0.17-1.zi
set_default GETTEXT_RUNTIME_DEV_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime-dev-0.17-1.zip"
set_default GETTEXT_TOOLS_URL "$GNOME_WIN32_DEPS_URL/gettext-tools-0.17.zip"
set_default LIBICONV_URL "$GNOME_WIN32_DEPS_URL/libiconv-1.9.1.bin.woe32.zip"
-set_default GLIB_URL "$GNOME_WIN32_URL/glib/2.14/glib-2.14.6-2.zip"
-set_default GLIB_DEV_URL "$GNOME_WIN32_URL/glib/2.14/glib-dev-2.14.6-2.zip"
+set_default GLIB_URL "$GNOME_WIN32_URL/glib/2.18/glib_2.18.3-1_win32.zip"
+set_default GLIB_DEV_URL "$GNOME_WIN32_URL/glib/2.18/glib-dev_2.18.3-1_win32.zip"
set_default LIBJPEG_URL "$GNOME_WIN32_DEPS_URL/libjpeg-6b-4.zip"
-set_default LIBPNG_URL "$GTK_MIRROR/gtk/v2.10/win32/dependencies/libpng-1.2.8-bin.zip"
-set_default LIBTIFF_URL "$GNOME_WIN32_DEPS_URL/libtiff-3.7.1.zip"
-set_default ZLIB_URL "$GTK_MIRROR/gtk/v2.10/win32/dependencies/zlib123-dll.zip"
-set_default PKG_CONFIG_URL "$GNOME_WIN32_DEPS_URL/pkg-config-0.20.zip"
-set_default CAIRO_URL "$GNOME_WIN32_DEPS_URL/cairo-1.4.14.zip"
-set_default CAIRO_DEV_URL "$GNOME_WIN32_DEPS_URL/cairo-dev-1.4.14.zip"
+set_default LIBPNG_URL "$GNOME_WIN32_DEPS_URL/libpng_1.2.32-1_win32.zip"
+set_default LIBPNG_DEV_URL "$GNOME_WIN32_DEPS_URL/libpng-dev_1.2.32-1_win32.zip"
+set_default LIBTIFF_URL "$GNOME_WIN32_DEPS_URL/libtiff-3.8.2.zip"
+set_default LIBTIFF_DEV_URL "$GNOME_WIN32_DEPS_URL/libtiff-dev-3.8.2.zip"
+set_default ZLIB_URL "$GNOME_WIN32_DEPS_URL/zlib-1.2.3.zip"
+set_default ZLIB_DEV_URL "$GNOME_WIN32_DEPS_URL/zlib-dev-1.2.3.zip"
+set_default PKG_CONFIG_URL "$GNOME_WIN32_DEPS_URL/pkg-config-0.23.zip"
+set_default CAIRO_URL "$GNOME_WIN32_DEPS_URL/cairo_1.8.6-1_win32.zip"
+set_default CAIRO_DEV_URL "$GNOME_WIN32_DEPS_URL/cairo-dev_1.8.6-1_win32.zip"
set_default EXPAT_URL "$GNOME_WIN32_DEPS_URL/expat-2.0.0.zip"
set_default FONTCONFIG_URL "$GNOME_WIN32_DEPS_URL/fontconfig-2.4.2-tml-20071015.zip"
set_default FONTCONFIG_DEV_URL "$GNOME_WIN32_DEPS_URL/fontconfig-dev-2.4.2-tml-20071015.zip"
-set_default FREETYPE_URL "$GNOME_WIN32_DEPS_URL/freetype-2.3.5.zip"
-set_default FREETYPE_DEV_URL "$GNOME_WIN32_DEPS_URL/freetype-dev-2.3.5.zip"
-set_default ATK_URL "$GNOME_WIN32_URL/atk/1.20/atk-1.20.0.zip"
-set_default ATK_DEV_URL "$GNOME_WIN32_URL/atk/1.20/atk-dev-1.20.0.zip"
-set_default PANGO_URL "$GNOME_WIN32_URL/pango/1.18/pango-1.18.4.zip"
-set_default PANGO_DEV_URL "$GNOME_WIN32_URL/pango/1.18/pango-dev-1.18.4.zip"
-set_default LIBART_LGPL_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart_lgpl-2.3.19.zip"
-set_default LIBART_LGPL_DEV_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart_lgpl-dev-2.3.19.zip"
-set_default GTK_URL "$GNOME_WIN32_URL/gtk+/2.12/gtk+-2.12.8.zip"
-set_default GTK_DEV_URL "$GNOME_WIN32_URL/gtk+/2.12/gtk+-dev-2.12.8.zip"
-set_default INTLTOOL_URL "$GNOME_WIN32_URL/intltool/0.35/intltool-0.35.5.zip"
-set_default ORBIT2_URL "$GNOME_WIN32_URL/ORBit2/2.14/ORBit2-2.14.12.zip"
-set_default ORBIT2_DEV_URL "$GNOME_WIN32_URL/ORBit2/2.14/ORBit2-dev-2.14.12.zip"
-set_default GAIL_URL "$GNOME_WIN32_URL/gail/1.20/gail-1.20.1.zip"
-set_default GAIL_DEV_URL "$GNOME_WIN32_URL/gail/1.20/gail-dev-1.20.1.zip"
+set_default FREETYPE_URL "$GNOME_WIN32_DEPS_URL/freetype-2.3.6.zip"
+set_default FREETYPE_DEV_URL "$GNOME_WIN32_DEPS_URL/freetype-dev-2.3.6.zip"
+set_default ATK_URL "$GNOME_WIN32_URL/atk/1.24/atk_1.24.0-1_win32.zip"
+set_default ATK_DEV_URL "$GNOME_WIN32_URL/atk/1.24/atk-dev_1.24.0-1_win32.zip"
+set_default PANGO_URL "$GNOME_WIN32_URL/pango/1.22/pango_1.22.2-1_win32.zip"
+set_default PANGO_DEV_URL "$GNOME_WIN32_URL/pango/1.22/pango-dev_1.22.2-1_win32.zip"
+set_default LIBART_LGPL_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart_lgpl-2.3.20.zip"
+set_default LIBART_LGPL_DEV_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart_lgpl-dev-2.3.20.zip"
+set_default GTK_URL "$GNOME_WIN32_URL/gtk+/2.14/gtk+_2.14.6-1_win32.zip"
+set_default GTK_DEV_URL "$GNOME_WIN32_URL/gtk+/2.14/gtk+-dev_2.14.6-1_win32.zip"
+set_default INTLTOOL_URL "$GNOME_WIN32_URL/intltool/0.40/intltool_0.40.4-1_win32.zip"
+set_default ORBIT2_URL "$GNOME_WIN32_URL/ORBit2/2.14/ORBit2-2.14.13.zip"
+set_default ORBIT2_DEV_URL "$GNOME_WIN32_URL/ORBit2/2.14/ORBit2-dev-2.14.13.zip"
+set_default GAIL_URL "$GNOME_WIN32_URL/gail/1.22/gail-1.22.0.zip"
+set_default GAIL_DEV_URL "$GNOME_WIN32_URL/gail/1.22/gail-dev-1.22.0.zip"
set_default POPT_URL "$GNOME_WIN32_DEPS_URL/popt-1.10.2-tml-20050828.zip"
set_default POPT_DEV_URL "$GNOME_WIN32_DEPS_URL/popt-dev-1.10.2-tml-20050828.zip"
-set_default GCONF_URL "$GNOME_WIN32_URL/GConf/2.18/GConf-2.18.0.1.zip"
-set_default GCONF_DEV_URL "$GNOME_WIN32_URL/GConf/2.18/GConf-dev-2.18.0.1.zip"
-set_default LIBBONOBO_URL "$GNOME_WIN32_URL/libbonobo/2.20/libbonobo-2.20.1.zip"
-set_default LIBBONOBO_DEV_URL "$GNOME_WIN32_URL/libbonobo/2.20/libbonobo-dev-2.20.1.zip"
+set_default GCONF_URL "$GNOME_WIN32_URL/GConf/2.22/GConf_2.22.0-2_win32.zip"
+set_default GCONF_DEV_URL "$GNOME_WIN32_URL/GConf/2.22/GConf-dev_2.22.0-2_win32.zip"
+set_default LIBBONOBO_URL "$GNOME_WIN32_URL/libbonobo/2.24/libbonobo_2.24.0-1_win32.zip"
+set_default LIBBONOBO_DEV_URL "$GNOME_WIN32_URL/libbonobo/2.24/libbonobo-dev_2.24.0-1_win32.zip"
# work-around #504261, GetVolumePathNamesForVolumeNameW missing on Win2k
set_default GNOME_VFS_URL "$GNOME_WIN32_URL/gnome-vfs/2.14/gnome-vfs-2.14.2-no-openssl.zip"
set_default GNOME_VFS_DEV_URL "$GNOME_WIN32_URL/gnome-vfs/2.14/gnome-vfs-dev-2.14.2-no-openssl.zip"
-#set_default GNOME_VFS_URL "$GNOME_WIN32_URL/gnome-vfs/2.18/gnome-vfs-2.18.0.1.zip"
-#set_default GNOME_VFS_DEV_URL "$GNOME_WIN32_URL/gnome-vfs/2.18/gnome-vfs-dev-2.18.0.1.zip"
-set_default LIBGNOME_URL "$GNOME_WIN32_URL/libgnome/2.20/libgnome-2.20.1.zip"
-set_default LIBGNOME_DEV_URL "$GNOME_WIN32_URL/libgnome/2.20/libgnome-dev-2.20.1.zip"
+#set_default GNOME_VFS_URL "$GNOME_WIN32_URL/gnome-vfs/2.24/gnome-vfs_2.24.0-1_win32.zip"
+#set_default GNOME_VFS_DEV_URL "$GNOME_WIN32_URL/gnome-vfs/2.24/gnome-vfs-dev_2.24.0-1_win32.zip"
+set_default LIBGNOME_URL "$GNOME_WIN32_URL/libgnome/2.24/libgnome_2.24.1-1_win32.zip"
+set_default LIBGNOME_DEV_URL "$GNOME_WIN32_URL/libgnome/2.24/libgnome-dev_2.24.1-1_win32.zip"
set_default LIBGNOMECANVAS_URL "$GNOME_WIN32_URL/libgnomecanvas/2.20/libgnomecanvas-2.20.1.zip"
set_default LIBGNOMECANVAS_DEV_URL "$GNOME_WIN32_URL/libgnomecanvas/2.20/libgnomecanvas-dev-2.20.1.zip"
-set_default LIBBONOBOUI_URL "$GNOME_WIN32_URL/libbonoboui/2.20/libbonoboui-2.20.0.zip"
-set_default LIBBONOBOUI_DEV_URL "$GNOME_WIN32_URL/libbonoboui/2.20/libbonoboui-dev-2.20.0.zip"
-set_default LIBGNOMEUI_URL "$GNOME_WIN32_URL/libgnomeui/2.16/libgnomeui-2.16.0.zip"
-set_default LIBGNOMEUI_DEV_URL "$GNOME_WIN32_URL/libgnomeui/2.16/libgnomeui-dev-2.16.0.zip"
-set_default LIBGLADE_URL "$GNOME_WIN32_URL/libglade/2.6/libglade-2.6.2.zip"
-set_default LIBGLADE_DEV_URL "$GNOME_WIN32_URL/libglade/2.6/libglade-dev-2.6.2.zip"
-set_default LIBGNOMEPRINT_URL "$GNOME_WIN32_URL/libgnomeprint/2.12/libgnomeprint-2.12.1.zip"
-set_default LIBGNOMEPRINT_DEV_URL "$GNOME_WIN32_URL/libgnomeprint/2.12/libgnomeprint-dev-2.12.1.zip"
-set_default LIBGNOMEPRINTUI_URL "$GNOME_WIN32_URL/libgnomeprintui/2.12/libgnomeprintui-2.12.1.zip" # gnomeprint
-set_default LIBGNOMEPRINTUI_DEV_URL "$GNOME_WIN32_URL/libgnomeprintui/2.12/libgnomeprintui-dev-2.12.1.zip" # gnomeprint
-set_default GTKHTML_URL "$GNOME_WIN32_URL/gtkhtml/3.12/gtkhtml-3.12.2.zip" # gnomeprint
-set_default GTKHTML_DEV_URL "$GNOME_WIN32_URL/gtkhtml/3.12/gtkhtml-dev-3.12.2.zip" # gnomeprint
-#set_default GTKHTML_URL "$GNOME_WIN32_URL/gtkhtml/3.14/gtkhtml-3.14.0.zip" # not gnomeprint
-#set_default GTKHTML_DEV_URL "$GNOME_WIN32_URL/gtkhtml/3.14/gtkhtml-dev-3.14.0.zip" # not gnomeprint
+set_default LIBBONOBOUI_URL "$GNOME_WIN32_URL/libbonoboui/2.24/libbonoboui_2.24.0-1_win32.zip"
+set_default LIBBONOBOUI_DEV_URL "$GNOME_WIN32_URL/libbonoboui/2.24/libbonoboui-dev_2.24.0-1_win32.zip"
+set_default LIBGNOMEUI_URL "$GNOME_WIN32_URL/libgnomeui/2.22/libgnomeui-2.22.1.zip"
+set_default LIBGNOMEUI_DEV_URL "$GNOME_WIN32_URL/libgnomeui/2.22/libgnomeui-dev-2.22.1.zip"
+set_default LIBGLADE_URL "$GNOME_WIN32_URL/libglade/2.6/libglade_2.6.3-1_win32.zip"
+set_default LIBGLADE_DEV_URL "$GNOME_WIN32_URL/libglade/2.6/libglade-dev_2.6.3-1_win32.zip"
+#set_default LIBGNOMEPRINT_URL "$GNOME_WIN32_URL/libgnomeprint/2.12/libgnomeprint-2.12.1.zip"
+#set_default LIBGNOMEPRINT_DEV_URL "$GNOME_WIN32_URL/libgnomeprint/2.12/libgnomeprint-dev-2.12.1.zip"
+#set_default LIBGNOMEPRINTUI_URL "$GNOME_WIN32_URL/libgnomeprintui/2.12/libgnomeprintui-2.12.1.zip" # gnomeprint
+#set_default LIBGNOMEPRINTUI_DEV_URL "$GNOME_WIN32_URL/libgnomeprintui/2.12/libgnomeprintui-dev-2.12.1.zip" # gnomeprint
+#set_default GTKHTML_URL "$GNOME_WIN32_URL/gtkhtml/3.12/gtkhtml-3.12.2.zip" # gnomeprint
+#set_default GTKHTML_DEV_URL "$GNOME_WIN32_URL/gtkhtml/3.12/gtkhtml-dev-3.12.2.zip" # gnomeprint
+set_default GTKHTML_URL "$GNOME_WIN32_URL/gtkhtml/3.18/gtkhtml-3.18.2.zip" # not gnomeprint
+set_default GTKHTML_DEV_URL "$GNOME_WIN32_URL/gtkhtml/3.18/gtkhtml-dev-3.18.2.zip" # not gnomeprint
+set_default GTK_DOC_URL "$GNOME_MIRROR/sources/gtk-doc/1.11/gtk-doc-1.11.tar.bz2"
set_default GNOME_DIR $GLOBAL_DIR\\gnome
-set_default SWIG_URL "$SF_MIRROR/swig/swigwin-1.3.31.zip"
+set_default SWIG_URL "$SF_MIRROR/swig/swigwin-1.3.36.zip"
set_default SWIG_DIR $GLOBAL_DIR\\swig
-set_default PCRE_BIN_URL "$SF_MIRROR/gnuwin32/pcre-6.4-1-bin.zip"
-set_default PCRE_LIB_URL "$SF_MIRROR/gnuwin32/pcre-6.4-1-lib.zip"
+set_default PCRE_BIN_URL "$SF_MIRROR/gnuwin32/pcre-7.0-bin.zip"
+set_default PCRE_LIB_URL "$SF_MIRROR/gnuwin32/pcre-7.0-lib.zip"
set_default PCRE_DIR $GLOBAL_DIR\\pcre
-set_default LIBGSF_URL "$GNOME_MIRROR/sources/libgsf/1.14/libgsf-1.14.5.tar.bz2"
+set_default LIBGSF_URL "$GNOME_MIRROR/sources/libgsf/1.14/libgsf-1.14.11.tar.bz2"
set_default LIBGSF_DIR $GLOBAL_DIR\\libgsf
-set_default GOFFICE_URL "$GNOME_MIRROR/sources/goffice/0.4/goffice-0.4.3.tar.bz2"
+set_default GOFFICE_URL "$GNOME_MIRROR/sources/goffice/0.7/goffice-0.7.2.tar.bz2"
set_default GOFFICE_DIR $GLOBAL_DIR\\goffice
-set_default GOFFICE_PATCH `pwd`/goffice-0.4.3-patch.diff
+set_default GOFFICE_PATCH `pwd`/goffice-0.7.2-patch.diff
set_default GLADE_URL "$GNOME_MIRROR/sources/glade3/3.0/glade3-3.1.2.tar.bz2"
set_default GLADE_DIR $GLOBAL_DIR\\glade
@@ -241,7 +246,7 @@ set_default INNO_DIR $GLOBAL_DIR\\inno
set_default HH_URL "http://download.microsoft.com/download/OfficeXPProf/Install/4.71.1015.0/W98NT42KMe/EN-US/HTMLHELP.EXE"
set_default HH_DIR $GLOBAL_DIR\\hh
-set_default SVN_URL "http://subversion.tigris.org/files/documents/15/35379/svn-1.4.2-setup.exe"
+set_default SVN_URL "http://subversion.tigris.org/files/documents/15/44582/svn-win32-1.5.5.zip"
set_default SVN_DIR $GLOBAL_DIR\\svn
# OFX import in gnucash and ofx directconnect support for aqbanking
@@ -335,6 +340,9 @@ fi
add_step inst_swig
add_step inst_pcre
add_step inst_libgsf
+if [ "$CROSS_COMPILE" != "yes" ]; then
+ add_step inst_hh
+fi
add_step inst_goffice
#add_step inst_glade
add_step inst_opensp
@@ -345,15 +353,14 @@ add_step inst_ktoblzcheck
add_step inst_aqbanking
add_step inst_libdbi
##
-if [ "$CROSS_COMPILE" != "yes" ]; then
- add_step inst_inno
- add_step inst_hh
-fi
if [ "$UPDATE_SOURCES" = "yes" ]; then
add_step svn_up
fi
add_step inst_gnucash
add_step inst_docs
+if [ "$CROSS_COMPILE" != "yes" ]; then
+ add_step inst_inno
+fi
add_step finish
# run commands registered with late_eval
diff --git a/dist.sh b/dist.sh
index babbb69..7e75b7e 100755
--- a/dist.sh
+++ b/dist.sh
@@ -87,11 +87,9 @@ function dist_gnome() {
unzip -q $LAST_FILE bin/iconv.dll -d $DIST_DIR
wget_unpacked $GLIB_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBJPEG_URL $DOWNLOAD_DIR $DIST_DIR
- smart_wget $LIBPNG_URL $DOWNLOAD_DIR
- unzip -q $LAST_FILE bin/libpng13.dll -d $DIST_DIR
+ wget_unpacked $LIBPNG_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBTIFF_URL $DOWNLOAD_DIR $DIST_DIR
- smart_wget $ZLIB_URL $DOWNLOAD_DIR
- unzip -q $LAST_FILE zlib1.dll -d $DIST_DIR\\bin
+ wget_unpacked $ZLIB_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $CAIRO_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $EXPAT_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $FONTCONFIG_URL $DOWNLOAD_DIR $DIST_DIR
@@ -112,8 +110,6 @@ function dist_gnome() {
wget_unpacked $LIBBONOBOUI_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBGNOMEUI_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBGLADE_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $LIBGNOMEPRINT_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $LIBGNOMEPRINTUI_URL $DOWNLOAD_DIR $DIST_DIR # gnomeprint
wget_unpacked $GTKHTML_URL $DOWNLOAD_DIR $DIST_DIR
rm -rf $DIST_UDIR/etc/gconf/gconf.xml.defaults/{desktop,schemas}
cp -a $DIST_UDIR/lib/locale $DIST_UDIR/share
diff --git a/goffice-0.4.3-patch.diff b/goffice-0.4.3-patch.diff
deleted file mode 100644
index b220a16..0000000
--- a/goffice-0.4.3-patch.diff
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -Nur goffice-0.4.3-old/goffice/Makefile.am goffice-0.4.3/goffice/Makefile.am
---- goffice-0.4.3-old/goffice/Makefile.am Sat Jul 7 00:44:32 2007
-+++ goffice-0.4.3/goffice/Makefile.am Sat Jul 21 23:24:22 2007
-@@ -24,7 +24,7 @@
- libgoffice_0_la_DEPENDENCIES = goffice.def
- libgoffice_0_la_LDFLAGS += -no-undefined -export-symbols goffice.def
- if WITH_NATIVE_WIN32
--libgoffice_0_la_LIBADD += -luuid -lhtmlhelp -lurlmon
-+libgoffice_0_la_LIBADD += -luuid
- endif
- endif
-
-diff -Nur goffice-0.4.3-old/gtk-doc.m4 goffice-0.4.3/gtk-doc.m4
---- goffice-0.4.3-old/gtk-doc.m4 Thu Jan 1 00:00:00 1970
-+++ goffice-0.4.3/gtk-doc.m4 Sat Jul 21 23:25:04 2007
-@@ -0,0 +1,53 @@
-+dnl -*- mode: autoconf -*-
-+
-+# serial 1
-+
-+dnl Usage:
-+dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
-+AC_DEFUN([GTK_DOC_CHECK],
-+[
-+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-+ dnl for overriding the documentation installation directory
-+ AC_ARG_WITH(html-dir,
-+ AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
-+ [with_html_dir='${datadir}/gtk-doc/html'])
-+ HTML_DIR="$with_html_dir"
-+ AC_SUBST(HTML_DIR)
-+
-+ dnl enable/disable documentation building
-+ AC_ARG_ENABLE(gtk-doc,
-+ AC_HELP_STRING([--enable-gtk-doc],
-+ [use gtk-doc to build documentation [default=no]]),,
-+ enable_gtk_doc=no)
-+
-+ have_gtk_doc=no
-+ if test x$enable_gtk_doc = xyes; then
-+ if test -z "$PKG_CONFIG"; then
-+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+ fi
-+ if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
-+ have_gtk_doc=yes
-+ fi
-+
-+ dnl do we want to do a version check?
-+ifelse([$1],[],,
-+ [gtk_doc_min_version=$1
-+ if test "$have_gtk_doc" = yes; then
-+ AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
-+ if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
-+ AC_MSG_RESULT(yes)
-+ else
-+ AC_MSG_RESULT(no)
-+ have_gtk_doc=no
-+ fi
-+ fi
-+])
-+ if test "$have_gtk_doc" != yes; then
-+ enable_gtk_doc=no
-+ fi
-+ fi
-+
-+ AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
-+ AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
-+])
diff --git a/goffice-0.7.2-patch.diff b/goffice-0.7.2-patch.diff
new file mode 100644
index 0000000..ebf1988
--- /dev/null
+++ b/goffice-0.7.2-patch.diff
@@ -0,0 +1,86 @@
+--- goffice-0.7.2-old/goffice/Makefile.am Fri Dec 28 22:55:15 2007
++++ goffice-0.7.2/goffice/Makefile.am Sat Jan 10 21:50:04 2009
+@@ -27,7 +27,6 @@
+ if WITH_NATIVE_WIN32
+ # libtool thinks there are undefined refs in libhtmlhelp, by pass libtool
+ libgoffice_ at GOFFICE_API_VER@_la_LDFLAGS += -Wl,-lhtmlhelp
+-libgoffice_ at GOFFICE_API_VER@_la_LIBADD += -lurlmon
+ endif
+ endif
+
+--- goffice-0.7.2-old/goffice/utils/go-file.c Tue Oct 14 10:52:48 2008
++++ goffice-0.7.2/goffice/utils/go-file.c Sat Jan 10 20:33:58 2009
+@@ -31,11 +31,11 @@
+ #include <glib/gi18n-lib.h>
+ #include <gsf/gsf-input-gio.h>
+ #include <gsf/gsf-output-gio.h>
+-#ifdef GOFFICE_WITH_GNOME
++#ifdef G_OS_WIN32
++#include <windows.h>
++/*#include <io.h>*/
++#elif defined GOFFICE_WITH_GNOME
+ #include <libgnome/gnome-url.h>
+-#elif defined G_OS_WIN32
+-#include <urlmon.h>
+-#include <io.h>
+ #endif
+
+ #include <string.h>
+@@ -1065,6 +1065,7 @@
+ go_get_mime_type (gchar const *uri)
+ {
+ #if defined(G_OS_WIN32)
++#if defined(FindMimeFromData)
+ /* Do we really need that? */
+ LPWSTR wuri, mime_type;
+
+@@ -1079,6 +1080,7 @@
+ }
+
+ g_free (wuri);
++#endif
+
+ /* We try to determine mime using FindMimeFromData().
+ * However, we are not sure whether the functions will know about
+@@ -1117,6 +1119,7 @@
+ go_get_mime_type_for_data (gconstpointer data, int data_size)
+ {
+ #if defined(G_OS_WIN32)
++#if defined(FindMimeFromData)
+ /* Do we really need that? */
+ LPWSTR mime_type;
+
+@@ -1126,6 +1129,7 @@
+ {
+ return g_utf16_to_utf8 (mime_type, -1, NULL, NULL, NULL);
+ }
++#endif
+
+ /* We try to determine mime using FindMimeFromData().
+ * However, we are not sure whether the functions will know about
+--- goffice-0.7.2-old/goffice/gtk/goffice-gtk.c Sun Sep 14 11:15:14 2008
++++ goffice-0.7.2/goffice/gtk/goffice-gtk.c Sat Jan 10 20:59:39 2009
+@@ -779,11 +779,11 @@
+ char const *link;
+ } CBHelpPaths;
+
+-#ifdef GOFFICE_WITH_GNOME
+-#include <libgnome/gnome-help.h>
+-#elif defined(G_OS_WIN32)
++#ifdef G_OS_WIN32
+ #include <windows.h>
+ #include <htmlhelp.h>
++#elif defined(GOFFICE_WITH_GNOME)
++#include <libgnome/gnome-help.h>
+ #endif
+ static void
+ go_help_display (CBHelpPaths const *paths)
+@@ -837,7 +837,7 @@
+ gchar *path = g_build_filename (paths->data_dir, "doc", "C", chmfile, NULL);
+
+ g_free (chmfile);
+- if (!HtmlHelp (GetDesktopWindow (), path, HH_HELP_CONTEXT, id))
++ if (!HtmlHelpW (GetDesktopWindow (), path, HH_HELP_CONTEXT, id))
+ go_gtk_notice_dialog (NULL, GTK_MESSAGE_ERROR, "Failed to spawn HtmlHelp");
+ g_free (path);
+ }
diff --git a/install.sh b/install.sh
index a37e3e4..8a13c28 100755
--- a/install.sh
+++ b/install.sh
@@ -103,7 +103,8 @@ function inst_wget() {
function inst_dtk() {
setup MSYS DTK
_MSYS_UDIR=`unix_path $MSYS_DIR`
- if quiet ${_MSYS_UDIR}/bin/perl --help
+ if quiet ${_MSYS_UDIR}/bin/perl --help &&
+ [ "`m4 --version | sed '1!d;s,.* [Mm]4 ,,'`" = "1.4.7" ]
then
echo "msys dtk already installed. skipping."
else
@@ -118,7 +119,10 @@ function inst_dtk() {
while [ -e $_dst_file ]; do _dst_file=$_dst_file.bak; done
mv $file $_dst_file
done
- quiet ${_MSYS_UDIR}/bin/perl --help || die "msys dtk not installed correctly"
+ wget_unpacked $M4_URL $DOWNLOAD_DIR $TMP_DIR
+ mv $TMP_UDIR/usr/bin/m4.exe /bin
+ quiet ${_MSYS_UDIR}/bin/perl --help &&
+ [ "`m4 --version | sed '1!d;s,.* [Mm]4 ,,'`" = "1.4.7" ] || die "msys dtk not installed correctly"
fi
}
@@ -217,6 +221,10 @@ function inst_active_perl() {
echo "ActivePerl already installed. skipping."
else
wget_unpacked $ACTIVE_PERL_URL $DOWNLOAD_DIR $ACTIVE_PERL_DIR
+ qpushd $_ACTIVE_PERL_UDIR
+ assert_one_dir ActivePerl-*
+ mv ActivePerl-* ActivePerl
+ qpopd
quiet $INTLTOOL_PERL --help || die "ActivePerl not installed correctly"
fi
}
@@ -376,8 +384,11 @@ function inst_svn() {
then
echo "subversion already installed. skipping."
else
- smart_wget $SVN_URL $DOWNLOAD_DIR
- $LAST_FILE //SP- //SILENT //DIR="$SVN_DIR"
+ wget_unpacked $SVN_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/svn-win32-*
+ mkdir -p $_SVN_UDIR
+ mv $TMP_UDIR/svn-win32-*/* $_SVN_UDIR
+ quiet svn --version || die "svn not installed correctly"
fi
}
@@ -492,8 +503,7 @@ function inst_gnome() {
add_to_env pkg-config PKG_CONFIG
fi
if quiet gconftool-2 --version &&
- ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libgtkhtml-3.8 && # gnomeprint
-# ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgnomeprint-2.2 libgtkhtml-3.14 && # not gnomeprint
+ quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgtkhtml-3.14 &&
quiet intltoolize --version
then
echo "gnome packages installed. skipping."
@@ -509,8 +519,11 @@ function inst_gnome() {
wget_unpacked $GLIB_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBJPEG_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBPNG_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $LIBPNG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBTIFF_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $LIBTIFF_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $ZLIB_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $ZLIB_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $PKG_CONFIG_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $CAIRO_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $CAIRO_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
@@ -550,28 +563,20 @@ function inst_gnome() {
wget_unpacked $LIBGNOMEUI_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBGLADE_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBGLADE_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBGNOMEPRINT_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBGNOMEPRINT_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBGNOMEPRINTUI_URL $DOWNLOAD_DIR $GNOME_DIR # gnomeprint
- wget_unpacked $LIBGNOMEPRINTUI_DEV_URL $DOWNLOAD_DIR $GNOME_DIR # gnomeprint
wget_unpacked $GTKHTML_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GTKHTML_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+ wget_unpacked $GTK_DOC_URL $DOWNLOAD_DIR $TMP_DIR
qpushd $_GNOME_UDIR
- [ -f bin/zlib1.dll ] || mv zlib1.dll bin
- if [ ! -f lib/libz.dll.a ]; then
- qpushd bin
- ${DLLTOOL} -D zlib1.dll -d ../lib/zlib.def -l libz.dll.a
- mv libz.dll.a ../lib
- qpopd
- fi
+ assert_one_dir $TMP_UDIR/gtk-doc-*
+ mv $TMP_UDIR/gtk-doc-*/gtk-doc.m4 $_GNOME_UDIR/share/aclocal
if [ ! -f libexec/gconfd-2.console.exe ]; then
cp libexec/gconfd-2.exe libexec/gconfd-2.console.exe
fi
exetype libexec/gconfd-2.exe windows
- sed '1s,!.*perl,!/bin/perl,;s,/opt/gnu/bin/iconv,iconv,' bin/intltool-merge > tmp
- mv tmp bin/intltool-merge
-# sed 's#gtk+-unix-print-2.0 >= [0-9\.]* *##' lib/pkgconfig/libgtkhtml-3.14.pc > tmp # not gnomeprint
-# mv tmp lib/pkgconfig/libgtkhtml-3.14.pc # not gnomeprint
+ for file in bin/intltool-*; do
+ sed '1s,!.*perl,!'"$INTLTOOL_PERL"',;s,/opt/gnu/bin/iconv,iconv,' $file > tmp
+ mv tmp $file
+ done
# work around a bug in msys bash, adding 0x01 smilies
cat > bin/pkg-config-msys.sh <<EOF
#!/bin/sh
@@ -586,8 +591,8 @@ EOF
chmod +x bin/pkg-config{.exe,-msys.sh}
qpopd
quiet gconftool-2 --version &&
- ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libgtkhtml-3.8 && # gnomeprint
-# ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgnomeprint-2.2 libgtkhtml-3.14 && # not gnomeprint
+# quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libgtkhtml-3.8 && # gnomeprint
+ quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgtkhtml-3.14 && # not gnomeprint
quiet intltoolize --version || die "gnome not installed correctly"
fi
if [ "$CROSS_COMPILE" = "yes" ]; then
@@ -671,7 +676,7 @@ function inst_goffice() {
_GOFFICE_UDIR=`unix_path $GOFFICE_DIR`
add_to_env $_GOFFICE_UDIR/bin PATH
add_to_env $_GOFFICE_UDIR/lib/pkgconfig PKG_CONFIG_PATH
- if quiet ${PKG_CONFIG} --exists libgoffice-0.4
+ if quiet ${PKG_CONFIG} --exists libgoffice-0.8
then
echo "goffice already installed. skipping."
else
@@ -687,14 +692,14 @@ function inst_goffice() {
automake
autoconf
./configure ${HOST_XCOMPILE} --prefix=$_GOFFICE_UDIR \
- CPPFLAGS="${GNOME_CPPFLAGS} ${PCRE_CPPFLAGS}" \
- LDFLAGS="${GNOME_LDFLAGS} ${PCRE_LDFLAGS}"
+ CPPFLAGS="${GNOME_CPPFLAGS} ${PCRE_CPPFLAGS} ${HH_CPPFLAGS}" \
+ LDFLAGS="${GNOME_LDFLAGS} ${PCRE_LDFLAGS} ${HH_LDFLAGS}"
[ -d ../libgsf-* ] || die "We need the unpacked package $TMP_UDIR/libgsf-*; please unpack it in $TMP_UDIR"
[ -f dumpdef.pl ] || cp -p ../libgsf-*/dumpdef.pl .
make
make install
qpopd
- ${PKG_CONFIG} --exists libgoffice-0.4 || die "goffice not installed correctly"
+ ${PKG_CONFIG} --exists libgoffice-0.8 || die "goffice not installed correctly"
fi
}
@@ -1140,7 +1145,7 @@ function inst_gnucash() {
grep -v "need_relink=yes" ltmain.sh > ltmain.sh.new ; mv ltmain.sh.new ltmain.sh
qpopd
- qpushd $BUILD_DIR
+ qpushd $BUILD_DIR
$_REL_REPOS_UDIR/configure ${HOST_XCOMPILE} \
--prefix=$_INSTALL_WFSDIR \
--enable-debug \
commit 18fe3dfc7d4454962a993d733b3fad490ad50ea1
Author: Andreas Köhler <andi5.py at gmx.net>
Date: Mon Jan 5 10:40:33 2009 +0000
Add Italian translation of Win32 installer by Cristian Marchi.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17800 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/gnucash.iss.in b/gnucash.iss.in
index 89e484e..448daad 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -99,6 +99,7 @@ Source: "@prefix@\..\dist\share\@PACKAGE@\doc\README"; DestDir: "{app}\doc\@PACK
Source: "@prefix@\..\dist\share\@PACKAGE@\doc\README.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
Source: "@prefix@\..\dist\share\@PACKAGE@\doc\README-de.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
Source: "@prefix@\..\dist\share\@PACKAGE@\doc\README-fr.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@prefix@\..\dist\share\@PACKAGE@\doc\README-it.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
Source: "@prefix@\..\dist\share\@PACKAGE@\doc\COPYING"; DestDir: "{app}\doc\@PACKAGE@"; Flags: ignoreversion; Components: main
Source: "@prefix@\..\dist\share\@PACKAGE@\doc\AUTHORS"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
Source: "@prefix@\..\dist\share\@PACKAGE@\doc\ChangeLog"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
@@ -216,6 +217,7 @@ Name: "de"; MessagesFile: "compiler:Languages\German.isl"; InfoAfterFile: "@pref
Name: "el"; MessagesFile: "@prefix@\share\@PACKAGE@\Greek-4-5.1.11.isl"
Name: "en"; MessagesFile: "compiler:Default.isl"
Name: "fr"; MessagesFile: "compiler:Languages\French.isl"; InfoAfterFile: "@prefix@\share\@PACKAGE@\doc\README-fr.win32-bin.txt"
+Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"; InfoAfterFile: "@prefix@\share\@PACKAGE@\doc\README-it.win32-bin.txt"
Name: "pt_BR"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
;; The following language files are available as well, in alphabetical
@@ -258,6 +260,7 @@ LanguageCodePage=1252
de.LanguageCodePage=1252
el.LanguageCodePage=1253
fr.LanguageCodePage=1252
+it.LanguageCodePage=1252
pt_BR.LanguageCodePage=1252
@@ -288,7 +291,7 @@ de.IconName_Uninstall=Deinstallieren von GnuCash
de.IconComment_Uninstall=Die OpenSource-Finanzverwaltung GnuCash wieder deinstallieren und vom Computer löschen
-;; ;;;;;;;;;;;;;;;;;;;;
+;; ;;;;;;;;;;;;;;;;;;;
;; Greek translation
el.FullInstall=ÐëÞñçò åãêáôÜóôáóç
@@ -342,6 +345,33 @@ fr.IconName_Uninstall=D
fr.IconComment_Uninstall=Désinstalle le gestionnaire financier GnuCash
+;; ;;;;;;;;;;;;;;;;;;;;;
+;; Italian translation
+
+it.FullInstall=Installazione completa
+it.CustomInstall=Installazione personalizzata
+it.CreateDesktopIcon=Crea un'icona sul desktop
+it.CreateMenuLink=Crea un collegamento nel menu "start"
+it.RunPrg=Avvia GnuCash
+it.AdditionalIcons=Crea queste icone:
+it.StatusMsgFirewall=Installazione delle regole per il firewall di Windows...
+
+it.MainFiles=File del programma GnuCash
+it.TranslFiles=Traduzione Italiana
+it.TemplFiles=Modelli di strutture dei conti
+
+it.IconComment_GnuCash=GnuCash: gestore di finanze libero
+it.IconName_README=Mostra il file LEGGIMI
+it.IconComment_README=Mostra il file LEGGIMI
+it.IconFilename_README=README-it.win32-bin.txt
+it.IconName_FAQ=FAQ (online, in Inglese)
+it.IconName_Bugzilla=Comunicare un bug (online, in Inglese)
+it.IconName_InstallFQ=Installa la funzione di ricerca delle quotazioni online
+it.IconComment_InstallFQ=Installa il modulo di perl Finance-Quote necessario per ricevere le quotazioni online. Richiede ActivePerl 5.8
+it.IconName_Uninstall=Disinstalla GnuCash
+it.IconComment_Uninstall=Disinstalla il programma di gestione delle finanze GnuCash
+
+
;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Brazilian Portuguese translation
commit bffc3c23d2aea69e8f17a87f0c6004789ea0261d
Author: Andreas Köhler <andi5.py at gmx.net>
Date: Mon Jan 5 10:18:03 2009 +0000
Sort translations in gnucash.iss.in by language code.
BP
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17798 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/gnucash.iss.in b/gnucash.iss.in
index 7fbac10..89e484e 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -212,10 +212,10 @@ end;
[Languages]
-Name: "en"; MessagesFile: "compiler:Default.isl"
Name: "de"; MessagesFile: "compiler:Languages\German.isl"; InfoAfterFile: "@prefix@\share\@PACKAGE@\doc\README-de.win32-bin.txt"
-Name: "fr"; MessagesFile: "compiler:Languages\French.isl"; InfoAfterFile: "@prefix@\share\@PACKAGE@\doc\README-fr.win32-bin.txt"
Name: "el"; MessagesFile: "@prefix@\share\@PACKAGE@\Greek-4-5.1.11.isl"
+Name: "en"; MessagesFile: "compiler:Default.isl"
+Name: "fr"; MessagesFile: "compiler:Languages\French.isl"; InfoAfterFile: "@prefix@\share\@PACKAGE@\doc\README-fr.win32-bin.txt"
Name: "pt_BR"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
;; The following language files are available as well, in alphabetical
@@ -288,33 +288,6 @@ de.IconName_Uninstall=Deinstallieren von GnuCash
de.IconComment_Uninstall=Die OpenSource-Finanzverwaltung GnuCash wieder deinstallieren und vom Computer löschen
-;; ;;;;;;;;;;;;;;;;;;;;
-;; French translation
-
-fr.FullInstall=Installation complète
-fr.CustomInstall=Installation personnalisée
-fr.CreateDesktopIcon=Créer un icône sur le bureau
-fr.CreateMenuLink=Créer un lien dans le menu de démarrage
-fr.RunPrg=Démarrer GnuCash maintenant
-fr.AdditionalIcons=Créer les icônes suivants:
-fr.StatusMsgFirewall=Installation des règles de pare-feu de Windows
-
-fr.MainFiles=Programme GnuCash
-fr.TranslFiles=Traduction française
-fr.TemplFiles=Modèle de plan comptable
-
-fr.IconComment_GnuCash=GnuCash, le gestionnaire financier OpenSource
-fr.IconName_README=Afficher le LISEZMOI
-fr.IconComment_README=Afficher le fichier LISEZMOI
-fr.IconFilename_README=README-fr.win32-bin.txt
-fr.IconName_FAQ=FAQ (En ligne, en anglais)
-fr.IconName_Bugzilla=Envoyer un rapport d'erreur (En ligne, en anglais)
-fr.IconName_InstallFQ=Installer les quotations en ligne
-fr.IconComment_InstallFQ=Installation du module Finance-Quote requis pour le téléchargement du cours des devises et actions. Le programme ActivePerl 5.8 est aussi requis
-fr.IconName_Uninstall=Dé-installer GnuCash
-fr.IconComment_Uninstall=Désinstalle le gestionnaire financier GnuCash
-
-
;; ;;;;;;;;;;;;;;;;;;;;
;; Greek translation
@@ -342,6 +315,33 @@ el.IconName_Uninstall=
el.IconComment_Uninstall=ÁðåãêáôÜóôáóç ôïõ äéá÷åéñéóôÞ ïéêïíïìéêþí GnuCash
+;; ;;;;;;;;;;;;;;;;;;;;
+;; French translation
+
+fr.FullInstall=Installation complète
+fr.CustomInstall=Installation personnalisée
+fr.CreateDesktopIcon=Créer un icône sur le bureau
+fr.CreateMenuLink=Créer un lien dans le menu de démarrage
+fr.RunPrg=Démarrer GnuCash maintenant
+fr.AdditionalIcons=Créer les icônes suivants:
+fr.StatusMsgFirewall=Installation des règles de pare-feu de Windows
+
+fr.MainFiles=Programme GnuCash
+fr.TranslFiles=Traduction française
+fr.TemplFiles=Modèle de plan comptable
+
+fr.IconComment_GnuCash=GnuCash, le gestionnaire financier OpenSource
+fr.IconName_README=Afficher le LISEZMOI
+fr.IconComment_README=Afficher le fichier LISEZMOI
+fr.IconFilename_README=README-fr.win32-bin.txt
+fr.IconName_FAQ=FAQ (En ligne, en anglais)
+fr.IconName_Bugzilla=Envoyer un rapport d'erreur (En ligne, en anglais)
+fr.IconName_InstallFQ=Installer les quotations en ligne
+fr.IconComment_InstallFQ=Installation du module Finance-Quote requis pour le téléchargement du cours des devises et actions. Le programme ActivePerl 5.8 est aussi requis
+fr.IconName_Uninstall=Dé-installer GnuCash
+fr.IconComment_Uninstall=Désinstalle le gestionnaire financier GnuCash
+
+
;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Brazilian Portuguese translation
commit b13bfe23db9c06bc0998acec2e075d094a58addb
Author: Andreas Köhler <andi5.py at gmx.net>
Date: Mon Dec 15 23:55:47 2008 +0000
Win32: Install italian documentation.
BP
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17778 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index 3fbb987..a37e3e4 100755
--- a/install.sh
+++ b/install.sh
@@ -1267,11 +1267,13 @@ function inst_docs() {
fi
setup docs
_DOCS_INST_UDIR=`unix_path $INSTALL_DIR`/share/gnucash/help
- mkdir -p $_DOCS_INST_UDIR/{C,de_DE}
+ mkdir -p $_DOCS_INST_UDIR/{C,de_DE,it_IT}
make_chm guide C
make_chm guide de_DE
+ make_chm guide it_IT
make_chm help C
make_chm help de_DE
+ make_chm help it_IT
qpopd
}
commit e1786165dd3ec299e5689e32a17c79a464d009ed
Author: Andreas Köhler <andi5.py at gmx.net>
Date: Sun Dec 14 03:10:54 2008 +0000
Win32: In dist.sh, cp redirect.exe from installation directory instead of build dir.
BP
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17771 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/dist.sh b/dist.sh
index 21d3ee3..babbb69 100755
--- a/dist.sh
+++ b/dist.sh
@@ -243,15 +243,15 @@ function finish() {
mv $DIST_UDIR/libexec/gconfd-2.exe $DIST_UDIR/bin
exetype $DIST_UDIR/bin/gconfd-2.exe windows
- cp $_BUILD_UDIR/packaging/win32/.libs/redirect.exe $DIST_UDIR/libexec/gconfd-2.exe
+ cp $_INSTALL_UDIR/bin/redirect.exe $DIST_UDIR/libexec/gconfd-2.exe
if [ "$AQBANKING_WITH_QT" = "yes" ]; then
if [ "$AQBANKING3" != "yes" ]; then
mv ${DIST_UDIR}/lib/aqbanking/plugins/16/wizards/qt3-wizard.exe $DIST_UDIR/bin
- cp $_BUILD_UDIR/packaging/win32/redirect.exe $DIST_UDIR/lib/aqbanking/plugins/16/wizards/qt3-wizard.exe
+ cp $_INSTALL_UDIR/bin/redirect.exe $DIST_UDIR/lib/aqbanking/plugins/16/wizards/qt3-wizard.exe
else
mv ${DIST_UDIR}/lib/aqbanking/plugins/20/wizards/qt3-wizard.exe $DIST_UDIR/bin
- cp $_BUILD_UDIR/packaging/win32/redirect.exe $DIST_UDIR/lib/aqbanking/plugins/20/wizards/qt3-wizard.exe
+ cp $_INSTALL_UDIR/bin/redirect.exe $DIST_UDIR/lib/aqbanking/plugins/20/wizards/qt3-wizard.exe
fi
fi
commit b2ef5869658e2636612837b7d9e5acb73c57a6c0
Author: Christian Stimming <stimming at tuhh.de>
Date: Sat Oct 25 20:30:47 2008 +0000
Bug #514043: Use AM_CPPFLAGS instead of AM_CFLAGS.
AM_CFLAGS is passed both to the compiler (.c -> .o) and to the linker, so it
should only have flags that are appropriate for both steps. AM_CPPFLAGS is
passed only to the compiler, so flags that are only appropriate for that step
(-I and -D flags, for example), should be in _CPPFLAGS instead of _CFLAGS.
Every gnucash-2.2.3 Makefile.am that passes -I flags gets it wrong, placing
them in _CFLAGS. It's not a functional bug (the linker ignores -I flags), but a
ton of superfluous flags makes the build output pretty verbose and hard to
debug when things do go wrong.
To make matters more confusing as a developer, the FOO_CFLAGS variable set by
PKG_CHECK_MODULES(FOO) is actually for _CPPFLAGS in the Makefile.am
('pkg-config --cflags' returns the -I flags).
A related -I bug (one that *is* functionally broken) is that sometimes a local
(build dir) -I flag is passed after a global (installed dependent library) one.
If my system happens to have a header installed from some unrelated thing,
compiler will find *that* one instead of the expected one in the source
directory. Should always pass all local -I before any global ones.
Patch by andi5 plus one manual addition in src/gnome-utils/Makefile.am
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17655 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/Makefile.am b/Makefile.am
index dfccd74..cf93d30 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@ if OS_WIN32
bin_PROGRAMS = redirect
redirect_SOURCES = redirect.c
redirect_LDADD = $(GLIB_LIBS)
- AM_CFLAGS = $(GLIB_CFLAGS)
+ AM_CPPFLAGS = $(GLIB_CFLAGS)
pkgdata_DATA = Greek-4-5.1.11.isl
else
EXTRA_DIST += redirect.c
commit 1612aceca5c99813e660a948ec69cf504ad8fcde
Author: Andreas Köhler <andi5.py at gmx.net>
Date: Sun Oct 5 22:14:42 2008 +0000
Win32: LT_PROG_RC seems to be internal as well, use AC_CHECK_TOOL instead.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17621 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/aqbanking-3.7.2.patch b/aqbanking-3.7.2.patch
index 7f6082c..fb413a5 100644
--- a/aqbanking-3.7.2.patch
+++ b/aqbanking-3.7.2.patch
@@ -6,7 +6,7 @@ diff -Nur aqbanking-3.7.1-old/configure.ac aqbanking-3.7.1/configure.ac
AC_LIBTOOL_WIN32_DLL
-AC_LIBTOOL_RC
-+LT_PROG_RC
++AC_CHECK_TOOL([RC], [windres], [no])
AC_PROG_LIBTOOL
AC_CHECK_PROG(USE_DOT,dot,YES,NO)
AC_CHECK_PROG(SED,sed,sed)
commit 8e50d957fbde232fe2024bc77fa5b8ebb6e65769
Author: Andreas Köhler <andi5.py at gmx.net>
Date: Sun Oct 5 17:15:49 2008 +0000
Win32: Add AC_LIBTOOL_WIN32_DLL to libdbi.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17618 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index ff287d2..3fbb987 100755
--- a/install.sh
+++ b/install.sh
@@ -1035,8 +1035,10 @@ function inst_libdbi() {
wget_unpacked $LIBDBI_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/libdbi-0*
qpushd $TMP_UDIR/libdbi-0*
- [ -n "$LIBDBI_PATCH" -a -f "$LIBDBI_PATCH" ] && \
- patch -p0 < $LIBDBI_PATCH
+ if [ -n "$LIBDBI_PATCH" -a -f "$LIBDBI_PATCH" ]; then
+ patch -p1 < $LIBDBI_PATCH
+ ./autogen.sh
+ fi
./configure ${HOST_XCOMPILE} \
--disable-docs \
--prefix=${_LIBDBI_UDIR}
diff --git a/libdbi-0.8.3.patch b/libdbi-0.8.3.patch
index 5e65867..8f982ae 100755
--- a/libdbi-0.8.3.patch
+++ b/libdbi-0.8.3.patch
@@ -1,26 +1,32 @@
-Index: dbd.h
-===================================================================
-RCS file: /cvsroot/libdbi/libdbi/include/dbi/dbd.h,v
-retrieving revision 1.29
-diff -u -r1.29 dbd.h
---- include/dbi/dbd.h 15 Aug 2005 19:18:18 -0000 1.29
-+++ include/dbi/dbd.h 16 Aug 2008 20:20:33 -0000
-@@ -52,7 +52,7 @@
- size_t dbd_quote_binary(dbi_conn_t *conn, const unsigned char *orig, size_t from_length, unsigned char **ptr_dest);
- size_t dbd_conn_quote_string(dbi_conn_t *conn, const char *orig, char *dest);
- const char *dbd_select_db(dbi_conn_t *conn, const char *db);
--int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr);
-+int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr);
- unsigned long long dbd_get_seq_last(dbi_conn_t *conn, const char *sequence);
- unsigned long long dbd_get_seq_next(dbi_conn_t *conn, const char *sequence);
- int dbd_ping(dbi_conn_t *conn);
-@@ -63,7 +63,7 @@
- void _dbd_result_add_field(dbi_result_t *result, unsigned int fieldidx, char *name, unsigned short type, unsigned int attribs);
- dbi_row_t *_dbd_row_allocate(unsigned int numfields);
- void _dbd_row_finalize(dbi_result_t *result, dbi_row_t *row, unsigned long long rowidx);
--void _dbd_internal_error_handler(dbi_conn_t *conn, const char *errmsg, const int errno);
-+void _dbd_internal_error_handler(dbi_conn_t *conn, const char *errmsg, const int err_no);
- dbi_result_t *_dbd_result_create_from_stringarray(dbi_conn_t *conn, unsigned long long numrows_matched, const char **stringarray);
- void _dbd_register_driver_cap(dbi_driver_t *driver, const char *capname, int value);
- void _dbd_register_conn_cap(dbi_conn_t *conn, const char *capname, int value);
-
+diff -Nur libdbi-0.8.3-old/configure.in libdbi-0.8.3/configure.in
+--- libdbi-0.8.3-old/configure.in 2008-02-06 17:03:27.000000000 +0100
++++ libdbi-0.8.3/configure.in 2008-10-05 15:56:55.677983028 +0200
+@@ -26,6 +26,7 @@
+ AC_PROG_CPP
+ AC_PROG_LD
+ AC_PROG_INSTALL
++AC_LIBTOOL_WIN32_DLL
+ AC_PROG_LIBTOOL
+ AC_SUBST(LIBTOOL)
+ dnl ====================================
+diff -Nur libdbi-0.8.3-old/include/dbi/dbd.h libdbi-0.8.3/include/dbi/dbd.h
+--- libdbi-0.8.3-old/include/dbi/dbd.h 2005-08-15 21:18:18.000000000 +0200
++++ libdbi-0.8.3/include/dbi/dbd.h 2008-10-05 15:57:24.889982668 +0200
+@@ -52,7 +52,7 @@
+ size_t dbd_quote_binary(dbi_conn_t *conn, const unsigned char *orig, size_t from_length, unsigned char **ptr_dest);
+ size_t dbd_conn_quote_string(dbi_conn_t *conn, const char *orig, char *dest);
+ const char *dbd_select_db(dbi_conn_t *conn, const char *db);
+-int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr);
++int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr);
+ unsigned long long dbd_get_seq_last(dbi_conn_t *conn, const char *sequence);
+ unsigned long long dbd_get_seq_next(dbi_conn_t *conn, const char *sequence);
+ int dbd_ping(dbi_conn_t *conn);
+@@ -63,7 +63,7 @@
+ void _dbd_result_add_field(dbi_result_t *result, unsigned int fieldidx, char *name, unsigned short type, unsigned int attribs);
+ dbi_row_t *_dbd_row_allocate(unsigned int numfields);
+ void _dbd_row_finalize(dbi_result_t *result, dbi_row_t *row, unsigned long long rowidx);
+-void _dbd_internal_error_handler(dbi_conn_t *conn, const char *errmsg, const int errno);
++void _dbd_internal_error_handler(dbi_conn_t *conn, const char *errmsg, const int err_no);
+ dbi_result_t *_dbd_result_create_from_stringarray(dbi_conn_t *conn, unsigned long long numrows_matched, const char **stringarray);
+ void _dbd_register_driver_cap(dbi_driver_t *driver, const char *capname, int value);
+ void _dbd_register_conn_cap(dbi_conn_t *conn, const char *capname, int value);
commit b8e1cc750d859805a7463aafa181dc1da8e9caf8
Author: Andreas Köhler <andi5.py at gmx.net>
Date: Sun Oct 5 17:08:50 2008 +0000
Win32: Replace AC_LIBTOOL_RC by LT_PROG_RC in aqbanking's configure.ac file.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17617 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/aqbanking-3.7.2.patch b/aqbanking-3.7.2.patch
index 0c1c2de..7f6082c 100644
--- a/aqbanking-3.7.2.patch
+++ b/aqbanking-3.7.2.patch
@@ -1,6 +1,15 @@
diff -Nur aqbanking-3.7.1-old/configure.ac aqbanking-3.7.1/configure.ac
--- aqbanking-3.7.1-old/configure.ac 2008-08-16 13:36:42.000000000 +0200
-+++ aqbanking-3.7.1/configure.ac 2008-10-05 13:37:48.295980988 +0200
++++ aqbanking-3.7.1/configure.ac 2008-10-05 18:56:36.925980908 +0200
+@@ -476,7 +476,7 @@
+ AC_PROG_INSTALL
+
+ AC_LIBTOOL_WIN32_DLL
+-AC_LIBTOOL_RC
++LT_PROG_RC
+ AC_PROG_LIBTOOL
+ AC_CHECK_PROG(USE_DOT,dot,YES,NO)
+ AC_CHECK_PROG(SED,sed,sed)
@@ -511,7 +511,6 @@
#
# Checks for library functions.
@@ -11,7 +20,7 @@ diff -Nur aqbanking-3.7.1-old/configure.ac aqbanking-3.7.1/configure.ac
AC_CHECK_FUNCS([setlocale])
diff -Nur aqbanking-3.7.1-old/src/frontends/qbanking/bin/helpbrowser/Makefile.am aqbanking-3.7.1/src/frontends/qbanking/bin/helpbrowser/Makefile.am
--- aqbanking-3.7.1-old/src/frontends/qbanking/bin/helpbrowser/Makefile.am 2008-07-31 20:13:31.000000000 +0200
-+++ aqbanking-3.7.1/src/frontends/qbanking/bin/helpbrowser/Makefile.am 2008-10-05 13:37:38.257983188 +0200
++++ aqbanking-3.7.1/src/frontends/qbanking/bin/helpbrowser/Makefile.am 2008-10-05 18:56:21.957982868 +0200
@@ -65,7 +65,7 @@
# This section is for a qt4 environment
commit e95df65084c39db7c96e5dc345769c1858f6e111
Author: Andreas Köhler <andi5.py at gmx.net>
Date: Sun Oct 5 16:55:19 2008 +0000
Win32: Improve cross-compiling by making aclocal fail less often and adding a few ${HOST_XCOMPILE}.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17616 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 5bd237a..5e753ab 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -79,11 +79,8 @@ set_default RANLIB ranlib
# For cross-compiling, change this to "yes"
set_default CROSS_COMPILE "no"
-if [ "$CROSS_COMPILE" != yes ]; then
- set_default LIBTOOLIZE libtoolize
-else
+if [ "$CROSS_COMPILE" = yes ]; then
# Insert your cross-compiler mingw32 bin-directories here
- set_default LIBTOOLIZE $GLOBAL_DIR/autotools/bin/libtoolize
set_default HOST_XCOMPILE "--host=mingw32"
fi
####
diff --git a/install.sh b/install.sh
index 21607eb..ff287d2 100755
--- a/install.sh
+++ b/install.sh
@@ -227,7 +227,6 @@ function inst_autotools() {
add_to_env $_AUTOTOOLS_UDIR/bin PATH
add_to_env -I$_AUTOTOOLS_UDIR/include AUTOTOOLS_CPPFLAGS
add_to_env -L$_AUTOTOOLS_UDIR/lib AUTOTOOLS_LDFLAGS
- add_to_env "-I $_AUTOTOOLS_UDIR/share/aclocal" ACLOCAL_FLAGS
if quiet autoconf --help && quiet automake --help
then
echo "autoconf/automake already installed. skipping."
@@ -250,7 +249,7 @@ function inst_autotools() {
qpopd
quiet autoconf --help && quiet automake --help || die "autoconf/automake not installed correctly"
fi
- if quiet ${LIBTOOLIZE} --help
+ if quiet libtoolize --help
then
echo "libtool/libtoolize already installed. skipping."
else
@@ -262,8 +261,9 @@ function inst_autotools() {
make
make install
qpopd
- quiet ${LIBTOOLIZE} --help || die "libtool/libtoolize not installed correctly"
+ quiet libtoolize --help || die "libtool/libtoolize not installed correctly"
fi
+ [ ! -d $_AUTOTOOLS_UDIR/share/aclocal ] || add_to_env "-I $_AUTOTOOLS_UDIR/share/aclocal" ACLOCAL_FLAGS
}
function inst_gmp() {
@@ -364,9 +364,8 @@ function inst_guile() {
ln -sf /usr/bin/guile-config mingw32-guile-config
ln -sf /usr/bin/guile mingw32-build-guile
qpopd
- else
- add_to_env "-I $_GUILE_UDIR/share/aclocal" ACLOCAL_FLAGS
fi
+ [ ! -d $_GUILE_UDIR/share/aclocal ] || add_to_env "-I $_GUILE_UDIR/share/aclocal" ACLOCAL_FLAGS
}
function inst_svn() {
@@ -492,7 +491,6 @@ function inst_gnome() {
else
add_to_env pkg-config PKG_CONFIG
fi
- add_to_env "-I $_GNOME_UDIR/share/aclocal" ACLOCAL_FLAGS
if quiet gconftool-2 --version &&
${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libgtkhtml-3.8 && # gnomeprint
# ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgnomeprint-2.2 libgtkhtml-3.14 && # not gnomeprint
@@ -603,6 +601,7 @@ EOF
# for A in *-0.dll; do ln -sf $A `echo $A|sed 's/\(.*\)-0.dll/\1.dll/'`; done
#qpopd
fi
+ [ ! -d $_GNOME_UDIR/share/aclocal ] || add_to_env "-I $_GNOME_UDIR/share/aclocal" ACLOCAL_FLAGS
}
function inst_swig() {
@@ -683,7 +682,7 @@ function inst_goffice() {
qpushd $TMP_UDIR/goffice-*
[ -n "$GOFFICE_PATCH" -a -f "$GOFFICE_PATCH" ] && \
patch -p1 < $GOFFICE_PATCH
- ${LIBTOOLIZE} --force
+ libtoolize --force
aclocal ${ACLOCAL_FLAGS} -I .
automake
autoconf
@@ -786,6 +785,7 @@ function inst_opensp() {
qpushd $TMP_UDIR/OpenSP-*
[ -n "$OPENSP_PATCH" -a -f "$OPENSP_PATCH" ] && \
patch -p0 < $OPENSP_PATCH
+ libtoolize --force
aclocal ${ACLOCAL_FLAGS} -I m4
automake
autoconf
@@ -837,7 +837,6 @@ function inst_gnutls() {
add_to_env ${_GNUTLS_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
add_to_env "-I${_GNUTLS_UDIR}/include" GNUTLS_CPPFLAGS
add_to_env "-L${_GNUTLS_UDIR}/lib" GNUTLS_LDFLAGS
- add_to_env "-I $_GNUTLS_UDIR/share/aclocal" ACLOCAL_FLAGS
if quiet ${PKG_CONFIG} --exists gnutls
then
echo "GNUTLS already installed. skipping."
@@ -846,6 +845,7 @@ function inst_gnutls() {
rm -f $_GNUTLS_UDIR/lib/*.la
quiet ${PKG_CONFIG} --exists gnutls || die "GNUTLS not installed correctly"
fi
+ [ ! -d $_GNUTLS_UDIR/share/aclocal ] || add_to_env "-I $_GNUTLS_UDIR/share/aclocal" ACLOCAL_FLAGS
}
function inst_gwenhywfar() {
@@ -853,7 +853,6 @@ function inst_gwenhywfar() {
_GWENHYWFAR_UDIR=`unix_path ${GWENHYWFAR_DIR}`
add_to_env ${_GWENHYWFAR_UDIR}/bin PATH
add_to_env ${_GWENHYWFAR_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
- add_to_env "-I $_GWENHYWFAR_UDIR/share/aclocal" ACLOCAL_FLAGS
if quiet ${PKG_CONFIG} --exists gwenhywfar
then
echo "Gwenhywfar already installed. skipping."
@@ -888,6 +887,7 @@ function inst_gwenhywfar() {
qpopd
${PKG_CONFIG} --exists gwenhywfar || die "Gwenhywfar not installed correctly"
fi
+ [ ! -d $_GWENHYWFAR_UDIR/share/aclocal ] || add_to_env "-I $_GWENHYWFAR_UDIR/share/aclocal" ACLOCAL_FLAGS
}
function inst_ktoblzcheck() {
@@ -949,7 +949,6 @@ function inst_aqbanking() {
_AQBANKING_UDIR=`unix_path ${AQBANKING_DIR}`
add_to_env ${_AQBANKING_UDIR}/bin PATH
add_to_env ${_AQBANKING_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
- add_to_env "-I $_AQBANKING_UDIR/share/aclocal" ACLOCAL_FLAGS
if quiet ${PKG_CONFIG} --exists aqbanking
then
echo "AqBanking already installed. skipping."
@@ -1005,6 +1004,7 @@ function inst_aqbanking() {
qpopd
${PKG_CONFIG} --exists aqbanking || die "AqBanking not installed correctly"
fi
+ [ ! -d $_AQBANKING_UDIR/share/aclocal ] || add_to_env "-I $_AQBANKING_UDIR/share/aclocal" ACLOCAL_FLAGS
}
function inst_libdbi() {
@@ -1021,7 +1021,7 @@ function inst_libdbi() {
wget_unpacked $SQLITE3_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/sqlite-*
qpushd $TMP_UDIR/sqlite-*
- ./configure \
+ ./configure ${HOST_XCOMPILE} \
--prefix=${_SQLITE3_UDIR}
make
make install
@@ -1037,7 +1037,7 @@ function inst_libdbi() {
qpushd $TMP_UDIR/libdbi-0*
[ -n "$LIBDBI_PATCH" -a -f "$LIBDBI_PATCH" ] && \
patch -p0 < $LIBDBI_PATCH
- ./configure \
+ ./configure ${HOST_XCOMPILE} \
--disable-docs \
--prefix=${_LIBDBI_UDIR}
make
@@ -1056,7 +1056,7 @@ function inst_libdbi() {
patch -p0 < $LIBDBI_DRIVERS_PATCH
[ -n "$LIBDBI_DRIVERS_PATCH2" -a -f "$LIBDBI_DRIVERS_PATCH2" ] && \
patch -p0 < $LIBDBI_DRIVERS_PATCH2
- ./configure \
+ ./configure ${HOST_XCOMPILE} \
--disable-docs \
--with-dbi-incdir=${_LIBDBI_UDIR}/include \
--with-dbi-libdir=${_LIBDBI_UDIR}/lib \
@@ -1086,7 +1086,7 @@ function inst_libgda() {
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 \
+ ./configure ${HOST_XCOMPILE} \
--prefix=${_LIBGDA_UDIR} \
CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS}" \
LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} -lintl"
commit e3a66d2368058de58cb8c5bc52e5a4163d9ee0f0
Author: Andreas Köhler <andi5.py at gmx.net>
Date: Sun Oct 5 13:49:48 2008 +0000
Win32: Untabify install.sh.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17615 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index da4bf07..21607eb 100755
--- a/install.sh
+++ b/install.sh
@@ -1021,11 +1021,11 @@ function inst_libdbi() {
wget_unpacked $SQLITE3_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/sqlite-*
qpushd $TMP_UDIR/sqlite-*
- ./configure \
- --prefix=${_SQLITE3_UDIR}
- make
- make install
- qpopd
+ ./configure \
+ --prefix=${_SQLITE3_UDIR}
+ make
+ make install
+ qpopd
test -f ${_SQLITE3_UDIR}/bin/libsqlite3-0.dll || die "SQLite3 not installed correctly"
fi
if test -f ${_LIBDBI_UDIR}/bin/libdbi-0.dll
@@ -1037,11 +1037,11 @@ function inst_libdbi() {
qpushd $TMP_UDIR/libdbi-0*
[ -n "$LIBDBI_PATCH" -a -f "$LIBDBI_PATCH" ] && \
patch -p0 < $LIBDBI_PATCH
- ./configure \
- --disable-docs \
- --prefix=${_LIBDBI_UDIR}
- make
- make install
+ ./configure \
+ --disable-docs \
+ --prefix=${_LIBDBI_UDIR}
+ make
+ make install
qpopd
test -f ${_LIBDBI_UDIR}/bin/libdbi-0.dll || die "libdbi not installed correctly"
fi
@@ -1056,15 +1056,15 @@ function inst_libdbi() {
patch -p0 < $LIBDBI_DRIVERS_PATCH
[ -n "$LIBDBI_DRIVERS_PATCH2" -a -f "$LIBDBI_DRIVERS_PATCH2" ] && \
patch -p0 < $LIBDBI_DRIVERS_PATCH2
- ./configure \
- --disable-docs \
- --with-dbi-incdir=${_LIBDBI_UDIR}/include \
- --with-dbi-libdir=${_LIBDBI_UDIR}/lib \
- --with-sqlite3 \
- --with-sqlite3-dir=${_SQLITE3_UDIR} \
- --prefix=${_LIBDBI_DRIVERS_UDIR}
- make
- make install
+ ./configure \
+ --disable-docs \
+ --with-dbi-incdir=${_LIBDBI_UDIR}/include \
+ --with-dbi-libdir=${_LIBDBI_UDIR}/lib \
+ --with-sqlite3 \
+ --with-sqlite3-dir=${_SQLITE3_UDIR} \
+ --prefix=${_LIBDBI_DRIVERS_UDIR}
+ make
+ make install
qpopd
test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdsqlite3.dll || die "libdbi drivers not installed correctly"
fi
@@ -1143,8 +1143,8 @@ function inst_gnucash() {
--prefix=$_INSTALL_WFSDIR \
--enable-debug \
--enable-schemas-install=no \
- --enable-dbi \
- --with-dbi-dbd-dir=${_LIBDBI_DRIVERS_UDIR}/lib/dbd \
+ --enable-dbi \
+ --with-dbi-dbd-dir=${_LIBDBI_DRIVERS_UDIR}/lib/dbd \
${LIBOFX_OPTIONS} \
${AQBANKING_OPTIONS} \
--enable-binreloc \
@@ -1210,7 +1210,7 @@ function make_install() {
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
echo "set LTDL_LIBRARY_PATH=${INSTALL_DIR}\\lib" >> gnucash.bat
- echo "set GNC_DBD_DIR=${LIBDBI_DRIVERS_DIR}\\lib\\dbd" >> gnucash.bat
+ echo "set GNC_DBD_DIR=${LIBDBI_DRIVERS_DIR}\\lib\\dbd" >> gnucash.bat
echo "start gnucash-bin %*" >> gnucash.bat
qpopd
}
commit efe8056254273743f096091528284570e6edb160
Author: Andreas Köhler <andi5.py at gmx.net>
Date: Sun Oct 5 13:48:57 2008 +0000
Win32: Improve cross-compiling of aqbanking.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17614 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/aqbanking-3.7.2.patch b/aqbanking-3.7.2.patch
index f8e5923..0c1c2de 100644
--- a/aqbanking-3.7.2.patch
+++ b/aqbanking-3.7.2.patch
@@ -1,6 +1,17 @@
+diff -Nur aqbanking-3.7.1-old/configure.ac aqbanking-3.7.1/configure.ac
+--- aqbanking-3.7.1-old/configure.ac 2008-08-16 13:36:42.000000000 +0200
++++ aqbanking-3.7.1/configure.ac 2008-10-05 13:37:48.295980988 +0200
+@@ -511,7 +511,6 @@
+ #
+ # Checks for library functions.
+ #
+-AC_FUNC_MALLOC
+ AC_FUNC_STRFTIME
+ AC_CHECK_FUNCS([memmove memset strcasecmp strdup strerror snprintf])
+ AC_CHECK_FUNCS([setlocale])
diff -Nur aqbanking-3.7.1-old/src/frontends/qbanking/bin/helpbrowser/Makefile.am aqbanking-3.7.1/src/frontends/qbanking/bin/helpbrowser/Makefile.am
---- aqbanking-3.7.1-old/src/frontends/qbanking/bin/helpbrowser/Makefile.am Thu Jul 31 18:13:32 2008
-+++ aqbanking-3.7.1/src/frontends/qbanking/bin/helpbrowser/Makefile.am Sun Sep 28 18:54:56 2008
+--- aqbanking-3.7.1-old/src/frontends/qbanking/bin/helpbrowser/Makefile.am 2008-07-31 20:13:31.000000000 +0200
++++ aqbanking-3.7.1/src/frontends/qbanking/bin/helpbrowser/Makefile.am 2008-10-05 13:37:38.257983188 +0200
@@ -65,7 +65,7 @@
# This section is for a qt4 environment
diff --git a/defaults.sh b/defaults.sh
index b2e5333..5bd237a 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -327,13 +327,14 @@ if [ "$CROSS_COMPILE" != "yes" ]; then
add_step inst_mingwutils
if [ "$AQBANKING3" != "yes" ]; then
add_step inst_openssl
- else
- add_step inst_gnutls
fi
fi
add_step inst_exetype
add_step inst_libxslt
add_step inst_gnome
+if [ "$AQBANKING3" = "yes" ]; then
+ add_step inst_gnutls
+fi
add_step inst_swig
add_step inst_pcre
add_step inst_libgsf
diff --git a/install.sh b/install.sh
index af91865..da4bf07 100755
--- a/install.sh
+++ b/install.sh
@@ -838,13 +838,13 @@ function inst_gnutls() {
add_to_env "-I${_GNUTLS_UDIR}/include" GNUTLS_CPPFLAGS
add_to_env "-L${_GNUTLS_UDIR}/lib" GNUTLS_LDFLAGS
add_to_env "-I $_GNUTLS_UDIR/share/aclocal" ACLOCAL_FLAGS
- if quiet which gnutls-cli
+ if quiet ${PKG_CONFIG} --exists gnutls
then
echo "GNUTLS already installed. skipping."
else
wget_unpacked $GNUTLS_URL $DOWNLOAD_DIR $GNUTLS_DIR
rm -f $_GNUTLS_UDIR/lib/*.la
- quiet which gnutls-cli || die "GNUTLS not installed correctly"
+ quiet ${PKG_CONFIG} --exists gnutls || die "GNUTLS not installed correctly"
fi
}
@@ -963,10 +963,16 @@ function inst_aqbanking() {
patch -p1 < $AQBANKING_PATCH
make -f Makefile.cvs
fi
+ if test x$CROSS_COMPILE = xyes; then
+ XMLMERGE="xmlmerge"
+ else
+ XMLMERGE="${GWENHYWFAR_UDIR}/bin/xmlmerge"
+ fi
if test x$AQBANKING_WITH_QT = xyes; then
inst_qt4
- ./configure \
+ ./configure ${HOST_XCOMPILE} \
--with-gwen-dir=${_GWENHYWFAR_UDIR} \
+ --with-xmlmerge=${XMLMERGE} \
--with-frontends="cbanking qbanking" \
--with-backends="aqhbci aqofxconnect" \
CPPFLAGS="${_AQ_CPPFLAGS} ${GMP_CPPFLAGS}" \
@@ -977,8 +983,9 @@ function inst_aqbanking() {
make qt4-port
make clean
else
- ./configure \
+ ./configure ${HOST_XCOMPILE} \
--with-gwen-dir=${_GWENHYWFAR_UDIR} \
+ --with-xmlmerge=${XMLMERGE} \
--with-frontends="cbanking" \
--with-backends="aqdtaus aqhbci aqofxconnect" \
CPPFLAGS="${_AQ_CPPFLAGS} ${GMP_CPPFLAGS}" \
commit bb88d9cdc3553417472a362968e6b373c686c4ad
Author: Andreas Köhler <andi5.py at gmx.net>
Date: Tue Sep 30 21:50:11 2008 +0000
Win32: Add initial support for compiling against AqBanking v3.
Patch from Shawn Faucher with little modifications.
This still needs a lot of testing and improvements still.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17612 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/aqbanking-3.7.2.patch b/aqbanking-3.7.2.patch
new file mode 100644
index 0000000..f8e5923
--- /dev/null
+++ b/aqbanking-3.7.2.patch
@@ -0,0 +1,12 @@
+diff -Nur aqbanking-3.7.1-old/src/frontends/qbanking/bin/helpbrowser/Makefile.am aqbanking-3.7.1/src/frontends/qbanking/bin/helpbrowser/Makefile.am
+--- aqbanking-3.7.1-old/src/frontends/qbanking/bin/helpbrowser/Makefile.am Thu Jul 31 18:13:32 2008
++++ aqbanking-3.7.1/src/frontends/qbanking/bin/helpbrowser/Makefile.am Sun Sep 28 18:54:56 2008
+@@ -65,7 +65,7 @@
+
+ # This section is for a qt4 environment
+ qt4-port:
+- for A in $(libqbhelp_la_SOURCES) $(noinst_HEADERS); do \
++ for A in $(libqbhelp_la_SOURCES) $(noinst_HEADERS) qb_help.cpp qbhelpbrowser.cpp; do \
+ $(YES) | $(QT3TO4) $$A; \
+ done
+ # rm $(BUILT_SOURCES)
diff --git a/defaults.sh b/defaults.sh
index d13f5ef..b2e5333 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -134,6 +134,10 @@ set_default AUTOMAKE_URL "http://ftp.gnu.org/gnu/automake/automake-1.9.6.tar.bz2
set_default LIBTOOL_URL "http://ftp.gnu.org/gnu/libtool/libtool-1.5.22.tar.gz"
set_default AUTOTOOLS_DIR $GLOBAL_DIR\\autotools
+set_default GMP_URL "ftp://ftp.gnu.org/gnu/gmp/gmp-4.2.3.tar.bz2"
+set_default GMP_ABI 32
+set_default GMP_DIR $GLOBAL_DIR\\gmp
+
set_default GUILE_URL "http://ftp.gnu.org/pub/gnu/guile/guile-1.6.8.tar.gz"
set_default SLIB_URL "http://swiss.csail.mit.edu/ftpdir/scm/OLD/slib3a3.zip"
set_default GUILE_DIR $GLOBAL_DIR\\guile
@@ -141,6 +145,9 @@ set_default GUILE_DIR $GLOBAL_DIR\\guile
set_default OPENSSL_URL "http://www.openssl.org/source/openssl-0.9.8e.tar.gz"
set_default OPENSSL_DIR $GLOBAL_DIR\\openssl
+set_default GNUTLS_URL "http://josefsson.org/gnutls4win/gnutls-2.4.1.zip"
+set_default GNUTLS_DIR $GLOBAL_DIR\\gnutls
+
set_default MINGW_UTILS_URL "$SF_MIRROR/mingw/mingw-utils-0.3.tar.gz"
set_default MINGW_UTILS_DIR $TOOLS_DIR
@@ -250,13 +257,24 @@ set_default LIBOFX_DIR $GLOBAL_DIR\\libofx
set_default LIBOFX_PATCH `pwd`/libofx-0.8.3-patch.diff
## online banking: gwenhywfar+aqbanking
-set_default GWENHYWFAR_URL "$SF_MIRROR/gwenhywfar/gwenhywfar-2.6.2.tar.gz"
+set_default AQBANKING3 yes
+
+if [ "$AQBANKING3" != "yes" ]; then
+ set_default GWENHYWFAR_URL "$SF_MIRROR/gwenhywfar/gwenhywfar-2.6.2.tar.gz"
+else
+ set_default GWENHYWFAR_URL "http://www.aquamaniac.de/sites/download/download.php?package=01&release=13&file=01&dummy=gwenhywfar-3.4.1.tar.gz"
+fi
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-1.17.tar.gz"
# ktoblzcheck is being installed into GWENHYWFAR_DIR
-set_default AQBANKING_URL "$SF_MIRROR/aqbanking/aqbanking-2.3.3.tar.gz"
+if [ "$AQBANKING3" != "yes" ]; then
+ set_default AQBANKING_URL "$SF_MIRROR/aqbanking/aqbanking-2.3.3.tar.gz"
+else
+ set_default AQBANKING_URL "http://www.aquamaniac.de/sites/download/download.php?package=03&release=16&file=01&dummy=aqbanking-3.7.2.tar.gz"
+ set_default AQBANKING_PATCH `pwd`/aqbanking-3.7.2.patch
+fi
set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
set_default AQBANKING_WITH_QT yes
# If set to yes, download Qt from http://www.trolltech.com/developer/downloads/qt/windows,
@@ -300,11 +318,18 @@ if [ "$CROSS_COMPILE" != "yes" ]; then
add_step inst_active_perl
fi
add_step inst_autotools
+if [ "$AQBANKING3" = "yes" ]; then
+ add_step inst_gmp
+fi
add_step inst_guile
if [ "$CROSS_COMPILE" != "yes" ]; then
add_step inst_svn
add_step inst_mingwutils
- add_step inst_openssl
+ if [ "$AQBANKING3" != "yes" ]; then
+ add_step inst_openssl
+ else
+ add_step inst_gnutls
+ fi
fi
add_step inst_exetype
add_step inst_libxslt
diff --git a/dist.sh b/dist.sh
index f7576e6..21d3ee3 100755
--- a/dist.sh
+++ b/dist.sh
@@ -32,6 +32,8 @@ function prepare() {
_GOFFICE_UDIR=`unix_path $GOFFICE_DIR`
_OPENSP_UDIR=`unix_path $OPENSP_DIR`
_LIBOFX_UDIR=`unix_path $LIBOFX_DIR`
+ _GMP_UDIR=`unix_path $GMP_DIR`
+ _GNUTLS_UDIR=`unix_path $GNUTLS_DIR`
_GWENHYWFAR_UDIR=`unix_path $GWENHYWFAR_DIR`
_AQBANKING_UDIR=`unix_path $AQBANKING_DIR`
_SQLITE3_UDIR=`unix_path ${SQLITE3_DIR}`
@@ -151,11 +153,24 @@ function dist_libofx() {
cp -a ${_LIBOFX_UDIR}/share/libofx ${DIST_UDIR}/share
}
+function dist_gnutls() {
+ setup gnutls
+ cp -a ${_GNUTLS_UDIR}/bin/*.dll ${DIST_UDIR}/bin
+ cp -a ${_GNUTLS_UDIR}/bin/*.exe ${DIST_UDIR}/bin
+}
+
+function dist_gmp() {
+ setup gmp
+ cp -a ${_GMP_UDIR}/bin/*.dll ${DIST_UDIR}/bin
+}
+
function dist_gwenhywfar() {
setup gwenhywfar
cp -a ${_GWENHYWFAR_UDIR}/bin/*.dll ${DIST_UDIR}/bin
mkdir -p ${DIST_UDIR}/etc
- cp -a ${_GWENHYWFAR_UDIR}/etc/* ${DIST_UDIR}/etc
+ if [ "$AQBANKING3" != "yes" ]; then
+ cp -a ${_GWENHYWFAR_UDIR}/etc/* ${DIST_UDIR}/etc
+ fi
cp -a ${_GWENHYWFAR_UDIR}/lib/gwenhywfar ${DIST_UDIR}/lib
}
@@ -171,7 +186,9 @@ function dist_aqbanking() {
cp -a ${_AQBANKING_UDIR}/bin/*.dll ${DIST_UDIR}/bin
cp -a ${_AQBANKING_UDIR}/lib/aqbanking ${DIST_UDIR}/lib
cp -a ${_AQBANKING_UDIR}/share/aqbanking ${DIST_UDIR}/share
- cp -a ${_AQBANKING_UDIR}/share/aqhbci ${DIST_UDIR}/share
+ if [ "$AQBANKING3" != "yes" ]; then
+ cp -a ${_AQBANKING_UDIR}/share/aqhbci ${DIST_UDIR}/share
+ fi
cp -a ${_AQBANKING_UDIR}/share/locale ${DIST_UDIR}/lib
}
@@ -229,8 +246,13 @@ function finish() {
cp $_BUILD_UDIR/packaging/win32/.libs/redirect.exe $DIST_UDIR/libexec/gconfd-2.exe
if [ "$AQBANKING_WITH_QT" = "yes" ]; then
- mv ${DIST_UDIR}/lib/aqbanking/plugins/16/wizards/qt3-wizard.exe $DIST_UDIR/bin
- cp $_BUILD_UDIR/packaging/win32/.libs/redirect.exe $DIST_UDIR/lib/aqbanking/plugins/16/wizards/qt3-wizard.exe
+ if [ "$AQBANKING3" != "yes" ]; then
+ mv ${DIST_UDIR}/lib/aqbanking/plugins/16/wizards/qt3-wizard.exe $DIST_UDIR/bin
+ cp $_BUILD_UDIR/packaging/win32/redirect.exe $DIST_UDIR/lib/aqbanking/plugins/16/wizards/qt3-wizard.exe
+ else
+ mv ${DIST_UDIR}/lib/aqbanking/plugins/20/wizards/qt3-wizard.exe $DIST_UDIR/bin
+ cp $_BUILD_UDIR/packaging/win32/redirect.exe $DIST_UDIR/lib/aqbanking/plugins/20/wizards/qt3-wizard.exe
+ fi
fi
# Strip redirections in distributed libtool .la files
@@ -259,12 +281,17 @@ prepare
dist_regex
dist_autotools
dist_guile
-dist_openssl
dist_gnome
dist_pcre
dist_libgsf
dist_goffice
dist_libofx
+if [ "$AQBANKING3" != "yes" ]; then
+ dist_openssl
+else
+ dist_gnutls
+ dist_gmp
+fi
dist_gwenhywfar
dist_aqbanking
dist_libdbi
diff --git a/install.sh b/install.sh
index 58fb944..af91865 100755
--- a/install.sh
+++ b/install.sh
@@ -15,8 +15,12 @@ qpushd "$(dirname $(unix_path "$0"))"
register_env_var ACLOCAL_FLAGS " "
register_env_var AUTOTOOLS_CPPFLAGS " "
register_env_var AUTOTOOLS_LDFLAGS " "
+register_env_var GMP_CPPFLAGS " "
+register_env_var GMP_LDFLAGS " "
register_env_var GNOME_CPPFLAGS " "
register_env_var GNOME_LDFLAGS " "
+register_env_var GNUTLS_CPPFLAGS " "
+register_env_var GNUTLS_LDFLAGS " "
register_env_var GUILE_LOAD_PATH ";"
register_env_var GUILE_CPPFLAGS " "
register_env_var GUILE_LDFLAGS " "
@@ -262,6 +266,31 @@ function inst_autotools() {
fi
}
+function inst_gmp() {
+ setup Gmp
+ _GMP_UDIR=`unix_path ${GMP_DIR}`
+ add_to_env -I$_GMP_UDIR/include GMP_CPPFLAGS
+ add_to_env -L$_GMP_UDIR/lib GMP_LDFLAGS
+ add_to_env ${_GMP_UDIR}/bin PATH
+ if quiet ${LD} $GMP_LDFLAGS -lgmp -o $TMP_UDIR/ofile
+ then
+ echo "Gmp already installed. skipping."
+ else
+ wget_unpacked $GMP_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/gmp-*
+ qpushd $TMP_UDIR/gmp-*
+ ./configure ${HOST_XCOMPILE} \
+ ABI=$GMP_ABI \
+ --prefix=${_GMP_UDIR} \
+ --disable-static --enable-shared
+ make
+# [ "$CROSS_COMPILE" != "yes" ] && make check
+ make install
+ qpopd
+ quiet ${LD} $GMP_LDFLAGS -lgmp -o $TMP_UDIR/ofile || die "Gmp not installed correctly"
+ fi
+}
+
function inst_guile() {
setup Guile
_GUILE_WFSDIR=`win_fs_path $GUILE_DIR`
@@ -801,6 +830,24 @@ function inst_libofx() {
fi
}
+function inst_gnutls() {
+ setup GNUTLS
+ _GNUTLS_UDIR=`unix_path ${GNUTLS_DIR}`
+ add_to_env ${_GNUTLS_UDIR}/bin PATH
+ add_to_env ${_GNUTLS_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
+ add_to_env "-I${_GNUTLS_UDIR}/include" GNUTLS_CPPFLAGS
+ add_to_env "-L${_GNUTLS_UDIR}/lib" GNUTLS_LDFLAGS
+ add_to_env "-I $_GNUTLS_UDIR/share/aclocal" ACLOCAL_FLAGS
+ if quiet which gnutls-cli
+ then
+ echo "GNUTLS already installed. skipping."
+ else
+ wget_unpacked $GNUTLS_URL $DOWNLOAD_DIR $GNUTLS_DIR
+ rm -f $_GNUTLS_UDIR/lib/*.la
+ quiet which gnutls-cli || die "GNUTLS not installed correctly"
+ fi
+}
+
function inst_gwenhywfar() {
setup Gwenhywfar
_GWENHYWFAR_UDIR=`unix_path ${GWENHYWFAR_DIR}`
@@ -815,16 +862,28 @@ function inst_gwenhywfar() {
assert_one_dir $TMP_UDIR/gwenhywfar-*
qpushd $TMP_UDIR/gwenhywfar-*
# circumvent binreloc bug, http://trac.autopackage.org/ticket/28
- ./configure ${HOST_XCOMPILE} \
- --with-openssl-includes=$_OPENSSL_UDIR/include \
- --disable-binreloc \
- ssl_libraries="-L${_OPENSSL_UDIR}/lib" \
- ssl_lib="-leay32 -lssl32" \
- --prefix=$_GWENHYWFAR_UDIR \
- CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS}" \
- LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} -lintl"
+ if [ "$AQBANKING3" != "yes" ]; then
+ ./configure ${HOST_XCOMPILE} \
+ --with-openssl-includes=$_OPENSSL_UDIR/include \
+ --disable-binreloc \
+ ssl_libraries="-L${_OPENSSL_UDIR}/lib" \
+ ssl_lib="-leay32 -lssl32" \
+ --prefix=$_GWENHYWFAR_UDIR \
+ CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS}" \
+ LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} -lintl"
+ else
+ ./configure ${HOST_XCOMPILE} \
+ --with-openssl-includes=$_OPENSSL_UDIR/include \
+ --with-openssl-libs=$_OPENSSL_UDIR/lib \
+ --with-libgnutls-prefix=$_GNUTLS_UDIR \
+ --with-libgcrypt-prefix=$_GNUTLS_UDIR \
+ --disable-binreloc \
+ --prefix=$_GWENHYWFAR_UDIR \
+ CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS}" \
+ LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GNUTLS_LDFLAGS} -lintl"
+ fi
make
- [ "$CROSS_COMPILE" != "yes" ] && make check
+# [ "$CROSS_COMPILE" != "yes" ] && make check
make install
qpopd
${PKG_CONFIG} --exists gwenhywfar || die "Gwenhywfar not installed correctly"
@@ -850,7 +909,7 @@ function inst_ktoblzcheck() {
--disable-binreloc \
--disable-python
make
- [ "$CROSS_COMPILE" != "yes" ] && make check
+# [ "$CROSS_COMPILE" != "yes" ] && make check
make install
qpopd
${PKG_CONFIG} --exists ktoblzcheck || die "Ktoblzcheck not installed correctly"
@@ -898,16 +957,20 @@ function inst_aqbanking() {
wget_unpacked $AQBANKING_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/aqbanking-*
qpushd $TMP_UDIR/aqbanking-*
- _AQ_CPPFLAGS="-I${_LIBOFX_UDIR}/include ${KTOBLZCHECK_CPPFLAGS} ${GNOME_CPPFLAGS}"
- _AQ_LDFLAGS="-L${_LIBOFX_UDIR}/lib ${KTOBLZCHECK_LDFLAGS} ${GNOME_LDFLAGS}"
+ _AQ_CPPFLAGS="-I${_LIBOFX_UDIR}/include ${KTOBLZCHECK_CPPFLAGS} ${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS}"
+ _AQ_LDFLAGS="-L${_LIBOFX_UDIR}/lib ${KTOBLZCHECK_LDFLAGS} ${GNOME_LDFLAGS} ${GNUTLS_LDFLAGS}"
+ if [ -n "$AQBANKING_PATCH" -a -f "$AQBANKING_PATCH" ]; then
+ patch -p1 < $AQBANKING_PATCH
+ make -f Makefile.cvs
+ fi
if test x$AQBANKING_WITH_QT = xyes; then
inst_qt4
./configure \
--with-gwen-dir=${_GWENHYWFAR_UDIR} \
--with-frontends="cbanking qbanking" \
- --with-backends="aqdtaus aqhbci aqofxconnect" \
- CPPFLAGS="${_AQ_CPPFLAGS}" \
- LDFLAGS="${_AQ_LDFLAGS}" \
+ --with-backends="aqhbci aqofxconnect" \
+ CPPFLAGS="${_AQ_CPPFLAGS} ${GMP_CPPFLAGS}" \
+ LDFLAGS="${_AQ_LDFLAGS} ${GMP_LDFLAGS}" \
qt3_libs="-L${_QTDIR}/lib -L${_QTDIR}/bin -lQtCore4 -lQtGui4 -lQt3Support4" \
qt3_includes="-I${_QTDIR}/include -I${_QTDIR}/include/Qt -I${_QTDIR}/include/QtCore -I${_QTDIR}/include/QtGui -I${_QTDIR}/include/Qt3Support" \
--prefix=${_AQBANKING_UDIR}
@@ -918,16 +981,20 @@ function inst_aqbanking() {
--with-gwen-dir=${_GWENHYWFAR_UDIR} \
--with-frontends="cbanking" \
--with-backends="aqdtaus aqhbci aqofxconnect" \
- CPPFLAGS="${_AQ_CPPFLAGS}" \
- LDFLAGS="${_AQ_LDFLAGS}" \
+ CPPFLAGS="${_AQ_CPPFLAGS} ${GMP_CPPFLAGS}" \
+ LDFLAGS="${_AQ_LDFLAGS} ${GMP_LDFLAGS}" \
--prefix=${_AQBANKING_UDIR}
fi
make
make install
qpopd
qpushd ${_AQBANKING_UDIR}/bin
- exetype aqbanking-tool.exe console
- exetype aqhbci-tool.exe console
+ if [ "$AQBANKING3" != "yes" ]; then
+ exetype aqbanking-tool.exe console
+ exetype aqhbci-tool.exe console
+ else
+ exetype aqhbci-tool3.exe console
+ fi
qpopd
${PKG_CONFIG} --exists aqbanking || die "AqBanking not installed correctly"
fi
diff --git a/reset.sh b/reset.sh
index 9acc397..25b0650 100644
--- a/reset.sh
+++ b/reset.sh
@@ -76,6 +76,8 @@ function eval_all() {
eval_path $HH_DIR
eval_path $OPENSP_DIR
eval_path $LIBOFX_DIR
+ eval_path $GMP_DIR
+ eval_path $GNUTLS_DIR
eval_path $GWENHYWFAR_DIR
eval_path $AQBANKING_DIR
eval_path $LIBGDA_DIR
commit 9917ee8d9a9493aec9912d8fc0fb31db96bcfe94
Author: Andreas Köhler <andi5.py at gmx.net>
Date: Fri Sep 26 02:46:09 2008 +0000
Win32: Ship the correct redirect.exe.
BP
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17592 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/dist.sh b/dist.sh
index 74b8a5c..f7576e6 100755
--- a/dist.sh
+++ b/dist.sh
@@ -226,11 +226,11 @@ function finish() {
mv $DIST_UDIR/libexec/gconfd-2.exe $DIST_UDIR/bin
exetype $DIST_UDIR/bin/gconfd-2.exe windows
- cp $_BUILD_UDIR/packaging/win32/redirect.exe $DIST_UDIR/libexec/gconfd-2.exe
+ cp $_BUILD_UDIR/packaging/win32/.libs/redirect.exe $DIST_UDIR/libexec/gconfd-2.exe
if [ "$AQBANKING_WITH_QT" = "yes" ]; then
mv ${DIST_UDIR}/lib/aqbanking/plugins/16/wizards/qt3-wizard.exe $DIST_UDIR/bin
- cp $_BUILD_UDIR/packaging/win32/redirect.exe $DIST_UDIR/lib/aqbanking/plugins/16/wizards/qt3-wizard.exe
+ cp $_BUILD_UDIR/packaging/win32/.libs/redirect.exe $DIST_UDIR/lib/aqbanking/plugins/16/wizards/qt3-wizard.exe
fi
# Strip redirections in distributed libtool .la files
commit 1195d7f0d67b14aa82837eb7b3e111068633cc06
Author: Andreas Köhler <andi5.py at gmx.net>
Date: Thu Sep 25 23:21:50 2008 +0000
Win32: Make intltool-merge usable.
BP
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17590 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index 9bd9ca2..58fb944 100755
--- a/install.sh
+++ b/install.sh
@@ -541,6 +541,8 @@ function inst_gnome() {
cp libexec/gconfd-2.exe libexec/gconfd-2.console.exe
fi
exetype libexec/gconfd-2.exe windows
+ sed '1s,!.*perl,!/bin/perl,;s,/opt/gnu/bin/iconv,iconv,' bin/intltool-merge > tmp
+ mv tmp bin/intltool-merge
# sed 's#gtk+-unix-print-2.0 >= [0-9\.]* *##' lib/pkgconfig/libgtkhtml-3.14.pc > tmp # not gnomeprint
# mv tmp lib/pkgconfig/libgtkhtml-3.14.pc # not gnomeprint
# work around a bug in msys bash, adding 0x01 smilies
commit d8f770ccc799070c5ae1392431274f032a53be2f
Author: Andreas Köhler <andi5.py at gmx.net>
Date: Sat Sep 13 14:45:41 2008 +0000
Win32: Always try to install Date-Manip and as fallback DateManip.
It seems that the PPM repositories for ActivePerl v5.6 and v5.8 have been
changed so that DateManip cannot be found anymore. Keep it for second try
nonetheless.
BP
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17504 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-fq-mods.bat b/install-fq-mods.bat
index d245d14..cbd76c6 100644
--- a/install-fq-mods.bat
+++ b/install-fq-mods.bat
@@ -38,12 +38,11 @@ goto error
echo * Install DateManip
echo.
-if %_perlversion% == 5.10 (
- perl -x -S ppm install Date-Manip
-) else (
+perl -x -S ppm install Date-Manip
+if %errorlevel% neq 0 (
perl -x -S ppm install DateManip
+ if %errorlevel% neq 0 goto error
)
-if %errorlevel% neq 0 goto error
echo.
echo * Install Crypt-SSLeay
commit 2263521d3224b4ccc41e9d38e7e71f3fa49b0899
Author: Andreas Köhler <andi5.py at gmx.net>
Date: Wed Sep 10 16:16:50 2008 +0000
Bug #506873, Win32: Add support for Finance-Quote with ActivePerl 5.10.
BP
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17499 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install-fq-mods.bat b/install-fq-mods.bat
index 84e2041..d245d14 100644
--- a/install-fq-mods.bat
+++ b/install-fq-mods.bat
@@ -17,11 +17,8 @@ perl -e "$ver=1000*sprintf(\"%%.3f\", $]); exit(int($ver)-5000);"
set _perlminor=%errorlevel%
if %_perlmajor% equ 5 (
if %_perlminor% equ 10 (
- echo.
- echo Found ActivePerl 5.10. This version does not yet support Finance-Quote.
- echo Please install ActivePerl 5.8 (http://www.activestate.com/store/activeperl^)
- echo instead and add the bin directory to your Path environment variable.
- goto error
+ set _perlversion=5.10
+ goto ccp
)
if %_perlminor% equ 8 (
set _perlversion=5.8
@@ -41,7 +38,11 @@ goto error
echo * Install DateManip
echo.
-perl -x -S ppm install DateManip
+if %_perlversion% == 5.10 (
+ perl -x -S ppm install Date-Manip
+) else (
+ perl -x -S ppm install DateManip
+)
if %errorlevel% neq 0 goto error
echo.
@@ -49,7 +50,9 @@ echo * Install Crypt-SSLeay
echo.
set OLDPATH=%PATH%
set PATH=%CD%;%PATH%
-if %_perlversion% == 5.8 (
+if %_perlversion% == 5.10 (
+ perl -x -S ppm install Crypt-SSLeay
+) else if %_perlversion% == 5.8 (
echo anything | perl -x -S ppm install http://theoryx5.uwinnipeg.ca/ppms/Crypt-SSLeay.ppd
) else (
perl -x -S ppm install http://theoryx5.uwinnipeg.ca/ppmpackages/Crypt-SSLeay.ppd
commit 131a698c762e65dfa09dfa89c95bf5c4de435efd
Author: Charles Day <cedayiv at gmail.com>
Date: Tue Aug 26 17:09:03 2008 +0000
Win32 build: Fix a typo to get trunk working on win32/mingw again.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17479 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/install.sh b/install.sh
index 8422edc..9bd9ca2 100755
--- a/install.sh
+++ b/install.sh
@@ -1086,7 +1086,7 @@ function inst_gnucash() {
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:${_LIBDBI_UDIR}/bin;${_SQLITE3_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:${_LIBDBI_UDIR}/bin:${_SQLITE3_UDIR}/bin" \
gnucash
qpopd
commit b0323dec474527b9f017ac1c18021d01a46f79c2
Author: Phil Longstaff <plongstaff at newearth.org>
Date: Wed Aug 20 12:09:10 2008 +0000
Additional win32 packaging changes for installation (including libdbi).
Provided by Nathan Buchanan
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17474 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/dist.sh b/dist.sh
index 3c4828a..74b8a5c 100755
--- a/dist.sh
+++ b/dist.sh
@@ -34,6 +34,9 @@ function prepare() {
_LIBOFX_UDIR=`unix_path $LIBOFX_DIR`
_GWENHYWFAR_UDIR=`unix_path $GWENHYWFAR_DIR`
_AQBANKING_UDIR=`unix_path $AQBANKING_DIR`
+ _SQLITE3_UDIR=`unix_path ${SQLITE3_DIR}`
+ _LIBDBI_UDIR=`unix_path ${LIBDBI_DIR}`
+ _LIBDBI_DRIVERS_UDIR=`unix_path ${LIBDBI_DRIVERS_DIR}`
_LIBGDA_UDIR=`unix_path $LIBGDA_DIR`
_GNUCASH_UDIR=`unix_path $GNUCASH_DIR`
_REPOS_UDIR=`unix_path $REPOS_DIR`
@@ -172,6 +175,16 @@ function dist_aqbanking() {
cp -a ${_AQBANKING_UDIR}/share/locale ${DIST_UDIR}/lib
}
+function dist_libdbi() {
+ setup LibDBI
+ cp -a ${_SQLITE3_UDIR}/bin/* ${DIST_UDIR}/bin
+ cp -a ${_SQLITE3_UDIR}/lib/* ${DIST_UDIR}/lib
+ cp -a ${_LIBDBI_UDIR}/bin/* ${DIST_UDIR}/bin
+ cp -a ${_LIBDBI_UDIR}/lib/* ${DIST_UDIR}/lib
+ mkdir ${DIST_UDIR}/lib/dbd
+ cp -a ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/* ${DIST_UDIR}/lib/dbd
+}
+
function dist_libgda() {
setup Libgda
cp -a ${_LIBGDA_UDIR}/bin/* ${DIST_UDIR}/bin
@@ -254,7 +267,7 @@ dist_goffice
dist_libofx
dist_gwenhywfar
dist_aqbanking
-dist_libgda
+dist_libdbi
dist_gnucash
finish
qpopd
diff --git a/gnucash.iss.in b/gnucash.iss.in
index a867578..7fbac10 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss.in
@@ -193,6 +193,7 @@ begin
FileString := FileString + 'set GUILE_LOAD_PATH=' + pkgdatadir + '\guile-modules;' + pkgdatadir + '\scm;' + appdir + '\share\guile\1.6;%GUILE_LOAD_PATH%'#13#10 ;
FileString := FileString + 'set LTDL_LIBRARY_PATH=' + libdir + ''#13#10 ;
FileString := FileString + 'set QOF_LIB_DIR=' + pkglibdir + ''#13#10 ;
+ FileString := FileString + 'set GNC_DBD_DIR=' + libdir + '\dbd'#13#10 ;
FileString := FileString + 'start gnucash-bin %*'#13#10 ;
{ Save the final file }
diff --git a/install.sh b/install.sh
index a255d7f..8422edc 100755
--- a/install.sh
+++ b/install.sh
@@ -1068,6 +1068,7 @@ function inst_gnucash() {
--enable-debug \
--enable-schemas-install=no \
--enable-dbi \
+ --with-dbi-dbd-dir=${_LIBDBI_DRIVERS_UDIR}/lib/dbd \
${LIBOFX_OPTIONS} \
${AQBANKING_OPTIONS} \
--enable-binreloc \
@@ -1085,7 +1086,7 @@ function inst_gnucash() {
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:${LIBGDA_DIR}/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:${_LIBDBI_UDIR}/bin;${_SQLITE3_UDIR}/bin" \
gnucash
qpopd
diff --git a/reset.sh b/reset.sh
index 80704c5..9acc397 100644
--- a/reset.sh
+++ b/reset.sh
@@ -78,6 +78,10 @@ function eval_all() {
eval_path $LIBOFX_DIR
eval_path $GWENHYWFAR_DIR
eval_path $AQBANKING_DIR
+ eval_path $LIBGDA_DIR
+ eval_path $SQLITE3_DIR
+ eval_path $LIBDBI_DIR
+ eval_path $LIBDBI_DRIVERS_DIR
eval_path $BUILD_DIR
eval_path $INSTALL_DIR
eval_path $GNUCASH_DIR\\dist
commit 976a0e81f9a2cae434232b4d333f870f6b65b35e
Author: Phil Longstaff <plongstaff at newearth.org>
Date: Sun Aug 17 16:38:31 2008 +0000
Add support to build trunk with libdbi and dbi backend on win32/mingw
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17473 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/defaults.sh b/defaults.sh
index 4b6f3e1..d13f5ef 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -267,6 +267,16 @@ 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 SQLITE3_URL "http://sqlite.org/sqlite-amalgamation-3.6.1.tar.gz"
+set_default SQLITE3_DIR $GLOBAL_DIR\\sqlite3
+set_default LIBDBI_URL "http://downloads.sourceforge.net/libdbi/libdbi-0.8.3.tar.gz"
+set_default LIBDBI_DIR $GLOBAL_DIR\\libdbi
+set_default LIBDBI_PATCH `pwd`/libdbi-0.8.3.patch
+set_default LIBDBI_DRIVERS_URL "http://downloads.sourceforge.net/libdbi-drivers/libdbi-drivers-0.8.3-1.tar.gz"
+set_default LIBDBI_DRIVERS_DIR $GLOBAL_DIR\\libdbi-drivers
+set_default LIBDBI_DRIVERS_PATCH `pwd`/libdbi-drivers-dbd_sqlite3.c.patch
+set_default LIBDBI_DRIVERS_PATCH2 `pwd`/libdbi-drivers-Makefile.in.patch
+
set_default DOCBOOK_XSL_URL "$SF_MIRROR/docbook/docbook-xsl-1.72.0.zip"
set_default UPDATE_DOCS yes
set_default DOCS_REV "HEAD"
@@ -310,7 +320,7 @@ add_step inst_libofx
add_step inst_gwenhywfar
add_step inst_ktoblzcheck
add_step inst_aqbanking
-add_step inst_libgda
+add_step inst_libdbi
##
if [ "$CROSS_COMPILE" != "yes" ]; then
add_step inst_inno
diff --git a/install.sh b/install.sh
index 0dfd02b..a255d7f 100755
--- a/install.sh
+++ b/install.sh
@@ -23,6 +23,8 @@ register_env_var GUILE_LDFLAGS " "
register_env_var HH_CPPFLAGS " "
register_env_var HH_LDFLAGS " "
register_env_var INTLTOOL_PERL " "
+register_env_var LIBDBI_CPPFLAGS " "
+register_env_var LIBDBI_LDFLAGS " "
register_env_var KTOBLZCHECK_CPPFLAGS " "
register_env_var KTOBLZCHECK_LDFLAGS " "
register_env_var PATH ":"
@@ -929,6 +931,69 @@ function inst_aqbanking() {
fi
}
+function inst_libdbi() {
+ setup LibDBI
+ _SQLITE3_UDIR=`unix_path ${SQLITE3_DIR}`
+ _LIBDBI_UDIR=`unix_path ${LIBDBI_DIR}`
+ _LIBDBI_DRIVERS_UDIR=`unix_path ${LIBDBI_DRIVERS_DIR}`
+ add_to_env -I$_LIBDBI_UDIR/include LIBDBI_CPPFLAGS
+ add_to_env -L$_LIBDBI_UDIR/lib LIBDBI_LDFLAGS
+ if test -f ${_SQLITE3_UDIR}/bin/libsqlite3-0.dll
+ then
+ echo "SQLite3 already installed. skipping."
+ else
+ wget_unpacked $SQLITE3_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/sqlite-*
+ qpushd $TMP_UDIR/sqlite-*
+ ./configure \
+ --prefix=${_SQLITE3_UDIR}
+ make
+ make install
+ qpopd
+ test -f ${_SQLITE3_UDIR}/bin/libsqlite3-0.dll || die "SQLite3 not installed correctly"
+ fi
+ if test -f ${_LIBDBI_UDIR}/bin/libdbi-0.dll
+ then
+ echo "libdbi already installed. skipping."
+ else
+ wget_unpacked $LIBDBI_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/libdbi-0*
+ qpushd $TMP_UDIR/libdbi-0*
+ [ -n "$LIBDBI_PATCH" -a -f "$LIBDBI_PATCH" ] && \
+ patch -p0 < $LIBDBI_PATCH
+ ./configure \
+ --disable-docs \
+ --prefix=${_LIBDBI_UDIR}
+ make
+ make install
+ qpopd
+ test -f ${_LIBDBI_UDIR}/bin/libdbi-0.dll || die "libdbi not installed correctly"
+ fi
+ if test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdsqlite3.dll
+ then
+ echo "libdbi drivers already installed. skipping."
+ else
+ wget_unpacked $LIBDBI_DRIVERS_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/libdbi-drivers-*
+ qpushd $TMP_UDIR/libdbi-drivers*
+ [ -n "$LIBDBI_DRIVERS_PATCH" -a -f "$LIBDBI_DRIVERS_PATCH" ] && \
+ patch -p0 < $LIBDBI_DRIVERS_PATCH
+ [ -n "$LIBDBI_DRIVERS_PATCH2" -a -f "$LIBDBI_DRIVERS_PATCH2" ] && \
+ patch -p0 < $LIBDBI_DRIVERS_PATCH2
+ ./configure \
+ --disable-docs \
+ --with-dbi-incdir=${_LIBDBI_UDIR}/include \
+ --with-dbi-libdir=${_LIBDBI_UDIR}/lib \
+ --with-sqlite3 \
+ --with-sqlite3-dir=${_SQLITE3_UDIR} \
+ --prefix=${_LIBDBI_DRIVERS_UDIR}
+ make
+ make install
+ qpopd
+ test -f ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/libdbdsqlite3.dll || die "libdbi drivers not installed correctly"
+ fi
+}
+
function inst_libgda() {
setup LibGDA
_LIBGDA_UDIR=`unix_path ${LIBGDA_DIR}`
@@ -1002,12 +1067,13 @@ function inst_gnucash() {
--prefix=$_INSTALL_WFSDIR \
--enable-debug \
--enable-schemas-install=no \
+ --enable-dbi \
${LIBOFX_OPTIONS} \
${AQBANKING_OPTIONS} \
--enable-binreloc \
--enable-locale-specific-tax \
- CPPFLAGS="${AUTOTOOLS_CPPFLAGS} ${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GUILE_CPPFLAGS} ${KTOBLZCHECK_CPPFLAGS} ${HH_CPPFLAGS} -D_WIN32" \
- LDFLAGS="${AUTOTOOLS_LDFLAGS} ${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GUILE_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} ${HH_LDFLAGS}" \
+ CPPFLAGS="${AUTOTOOLS_CPPFLAGS} ${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GUILE_CPPFLAGS} ${LIBDBI_CPPFLAGS} ${KTOBLZCHECK_CPPFLAGS} ${HH_CPPFLAGS} -D_WIN32" \
+ LDFLAGS="${AUTOTOOLS_LDFLAGS} ${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} ${HH_LDFLAGS}" \
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
# Windows DLLs don't need relinking
@@ -1062,11 +1128,12 @@ function make_install() {
# Create a startup script that works without the msys shell
qpushd $_INSTALL_UDIR/bin
echo "setlocal" > 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 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;${LIBDBI_DIR}\\bin;${SQLITE3_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
echo "set LTDL_LIBRARY_PATH=${INSTALL_DIR}\\lib" >> gnucash.bat
+ echo "set GNC_DBD_DIR=${LIBDBI_DRIVERS_DIR}\\lib\\dbd" >> gnucash.bat
echo "start gnucash-bin %*" >> gnucash.bat
qpopd
}
diff --git a/libdbi-0.8.3.patch b/libdbi-0.8.3.patch
new file mode 100755
index 0000000..5e65867
--- /dev/null
+++ b/libdbi-0.8.3.patch
@@ -0,0 +1,26 @@
+Index: dbd.h
+===================================================================
+RCS file: /cvsroot/libdbi/libdbi/include/dbi/dbd.h,v
+retrieving revision 1.29
+diff -u -r1.29 dbd.h
+--- include/dbi/dbd.h 15 Aug 2005 19:18:18 -0000 1.29
++++ include/dbi/dbd.h 16 Aug 2008 20:20:33 -0000
+@@ -52,7 +52,7 @@
+ size_t dbd_quote_binary(dbi_conn_t *conn, const unsigned char *orig, size_t from_length, unsigned char **ptr_dest);
+ size_t dbd_conn_quote_string(dbi_conn_t *conn, const char *orig, char *dest);
+ const char *dbd_select_db(dbi_conn_t *conn, const char *db);
+-int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr);
++int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr);
+ unsigned long long dbd_get_seq_last(dbi_conn_t *conn, const char *sequence);
+ unsigned long long dbd_get_seq_next(dbi_conn_t *conn, const char *sequence);
+ int dbd_ping(dbi_conn_t *conn);
+@@ -63,7 +63,7 @@
+ void _dbd_result_add_field(dbi_result_t *result, unsigned int fieldidx, char *name, unsigned short type, unsigned int attribs);
+ dbi_row_t *_dbd_row_allocate(unsigned int numfields);
+ void _dbd_row_finalize(dbi_result_t *result, dbi_row_t *row, unsigned long long rowidx);
+-void _dbd_internal_error_handler(dbi_conn_t *conn, const char *errmsg, const int errno);
++void _dbd_internal_error_handler(dbi_conn_t *conn, const char *errmsg, const int err_no);
+ dbi_result_t *_dbd_result_create_from_stringarray(dbi_conn_t *conn, unsigned long long numrows_matched, const char **stringarray);
+ void _dbd_register_driver_cap(dbi_driver_t *driver, const char *capname, int value);
+ void _dbd_register_conn_cap(dbi_conn_t *conn, const char *capname, int value);
+
diff --git a/libdbi-drivers-Makefile.in.patch b/libdbi-drivers-Makefile.in.patch
new file mode 100755
index 0000000..0ed49ab
--- /dev/null
+++ b/libdbi-drivers-Makefile.in.patch
@@ -0,0 +1,11 @@
+--- drivers/sqlite3/Makefile.in.save Mon Mar 3 12:41:56 2008
++++ drivers/sqlite3/Makefile.in Sat Aug 16 17:10:11 2008
+@@ -264,7 +264,7 @@
+ @HAVE_SQLITE3_TRUE at sqlite3_sources = dbd_sqlite3.c
+ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include @DBI_INCLUDE@ @SQLITE3_INCLUDE@
+ lib_LTLIBRARIES = $(sqlite3_ltlibs)
+-libdbdsqlite3_la_LDFLAGS = $(sqlite3_ldflags) @SQLITE3_LDFLAGS@ @SQLITE3_LIBS@ @LIBADD_LIBDBI@
++libdbdsqlite3_la_LDFLAGS = $(sqlite3_ldflags) @SQLITE3_LDFLAGS@ @SQLITE3_LIBS@ @LIBADD_LIBDBI@ -no-undefined
+ libdbdsqlite3_la_SOURCES = $(sqlite3_sources)
+ libdbdsqlite3_la_DEPENDENCIES = dbd_sqlite3.h
+ EXTRA_DIST = dbd_sqlite3.c dbd_sqlite3.h AUTHORS TODO README dbd_sqlite3.sgml dbd_sqlite3.pdf dbd_sqlite3/*
diff --git a/libdbi-drivers-dbd_sqlite3.c.patch b/libdbi-drivers-dbd_sqlite3.c.patch
new file mode 100755
index 0000000..8cba5f1
--- /dev/null
+++ b/libdbi-drivers-dbd_sqlite3.c.patch
@@ -0,0 +1,24 @@
+Index: dbd_sqlite3.c
+===================================================================
+RCS file: /cvsroot/libdbi-drivers/libdbi-drivers/drivers/sqlite3/dbd_sqlite3.c,v
+retrieving revision 1.31
+diff -u -r1.31 dbd_sqlite3.c
+--- drivers/sqlite3/dbd_sqlite3.c 13 Aug 2008 22:56:03 -0000 1.31
++++ drivers/sqlite3/dbd_sqlite3.c 16 Aug 2008 20:23:23 -0000
+@@ -1369,11 +1369,11 @@
+ return db;
+ }
+
+-int dbd_geterror(dbi_conn_t *conn, int *errno, char **errstr) {
+- /* put error number into errno, error string into errstr
+- * return 0 if error, 1 if errno filled, 2 if errstr filled, 3 if both errno and errstr filled */
++int dbd_geterror(dbi_conn_t *conn, int *err_no, char **errstr) {
++ /* put error number into err_no, error string into errstr
++ * return 0 if error, 1 if err_no filled, 2 if errstr filled, 3 if both err_no and errstr filled */
+
+- *errno = sqlite3_errcode((sqlite3 *)conn->connection);
++ *err_no = sqlite3_errcode((sqlite3 *)conn->connection);
+ *errstr = strdup((char*)sqlite3_errmsg((sqlite3 *)conn->connection));
+ return 3;
+ }
+
commit e044f0fb35b705d1b3788410f916d4c2e6c60340
Author: Andreas Köhler <andi5.py at gmx.net>
Date: Sat Aug 2 12:04:06 2008 +0000
Win32: Minor change for emacs compat.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17447 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/functions.sh b/functions.sh
index dab29df..7a04580 100644
--- a/functions.sh
+++ b/functions.sh
@@ -4,7 +4,7 @@ __SOURCED_FUNCTIONS=1
function set_default() {
local _varname=$1; shift
if [ -z "`eval echo '"$'"$_varname"'"'`" ]; then
- eval "$_varname"'="'"$*"'"'
+ eval "$_varname"'="'"$*"'"' #" help emacs on windows
fi
}
commit d9c9ac894cfde1ea10b9725fca7ca1d603d3b3fc
Author: Phil Longstaff <plongstaff at newearth.org>
Date: Fri Aug 1 16:02:07 2008 +0000
Merge gda-dev2 branch into trunk.
This introduces the dbi backend and the --enable-dbi configure option.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17444 57a11ea4-9604-0410-9ed3-97b8803252fd
diff --git a/Makefile.am b/Makefile.am
index 443769d..dfccd74 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,6 +9,8 @@ EXTRA_DIST = \
install-fq-mods.bat \
libofx-0.8.3-patch.diff \
opensp-1.5.2-patch.diff \
+ libgda-3.1.2-patch.diff \
+ libgda-3.1.2-patch2.diff \
pi.sh \
Greek-4-5.1.11.isl \
reset.sh
diff --git a/defaults.sh b/defaults.sh
index fbfd776..4b6f3e1 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -262,6 +262,11 @@ set_default AQBANKING_WITH_QT yes
# 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.