gnucash-on-windows master: Clean out the old build scripts and provide a new README.md.

John Ralls jralls at code.gnucash.org
Thu May 2 18:38:12 EDT 2019


Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/5ad565b4 (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/55a03187 (commit)



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 */
-



Summary of changes:
 ...s-issues-when-compiling-natively-on-MinGW.patch |  474 ------
 0002-webkit-second-MinGW.patch                     |   77 -
 CMakeLists.txt                                     |   23 -
 README                                             |  245 ---
 README.md                                          |   82 +
 aqbanking-4.2.4-r2132.patch                        |   56 -
 bootstrap_win_dev.vbs                              |  515 ------
 buildserver/README.txt                             |   94 --
 buildserver/build_package.sh                       |  135 --
 buildserver/build_periodic.bat                     |   14 -
 buildserver/build_periodic.sh                      |   83 -
 buildserver/build_tags.sh                          |  152 --
 cmake/custom.cmake                                 |   23 -
 cmake/defaults.cmake                               |  399 -----
 cmake/glib.cmake                                   |  103 --
 cmake/webkit.cmake                                 |    7 -
 create_cross_mingw.sh                              |  300 ----
 crossbuild_webkit.sh                               |  521 ------
 custom.sh.sample                                   |   20 -
 defaults.sh                                        |  412 -----
 devrc.sh                                           |   84 -
 dist-impl.sh                                       |  320 ----
 dist.sh                                            |   64 -
 functions.sh                                       |  354 ----
 get-install-path.vbs                               |   33 -
 glib-timezone.patch                                |   13 -
 goffice-enable-shared.patch                        |   11 -
 guile-1.8.patch                                    |   46 -
 gwen-4.13.1.patch                                  |  131 --
 icu-crossmingw.patch                               |   13 -
 inno_setup/gnucash.iss                             |  801 ---------
 install-impl.sh                                    | 1694 --------------------
 install.sh                                         |  146 --
 libdbi-0.8.3.patch                                 |   61 -
 libdbi-drivers-errno.patch                         |  167 --
 libmysql.def                                       |  106 --
 libofx-0.9.8.patch                                 |   34 -
 libsoup-2.48.0-bad-symbol.patch                    |   10 -
 libsoup-2.48.0-soup-server-reserved-word.patch     |   11 -
 libxslt-1.1.22.Makefile.in.patch                   |   26 -
 make_install.sh                                    |   18 -
 mingw-get.zip                                      |  Bin 325437 -> 0 bytes
 opensp-1.5.2.patch                                 |   40 -
 pi.sh                                              |  116 --
 reset.sh                                           |  141 --
 swift940-strndup.patch                             |   32 -
 webkitenumtypes.cpp                                |  248 ---
 webkitenumtypes.h                                  |   92 --
 48 files changed, 82 insertions(+), 8465 deletions(-)
 delete mode 100644 0001-Fix-various-issues-when-compiling-natively-on-MinGW.patch
 delete mode 100644 0002-webkit-second-MinGW.patch
 delete mode 100644 CMakeLists.txt
 delete mode 100644 README
 create mode 100644 README.md
 delete mode 100644 aqbanking-4.2.4-r2132.patch
 delete mode 100644 bootstrap_win_dev.vbs
 delete mode 100644 buildserver/README.txt
 delete mode 100644 buildserver/build_package.sh
 delete mode 100644 buildserver/build_periodic.bat
 delete mode 100644 buildserver/build_periodic.sh
 delete mode 100644 buildserver/build_tags.sh
 delete mode 100644 cmake/custom.cmake
 delete mode 100644 cmake/defaults.cmake
 delete mode 100644 cmake/glib.cmake
 delete mode 100644 cmake/webkit.cmake
 delete mode 100755 create_cross_mingw.sh
 delete mode 100755 crossbuild_webkit.sh
 delete mode 100644 custom.sh.sample
 delete mode 100644 defaults.sh
 delete mode 100644 devrc.sh
 delete mode 100755 dist-impl.sh
 delete mode 100755 dist.sh
 delete mode 100644 functions.sh
 delete mode 100755 get-install-path.vbs
 delete mode 100644 glib-timezone.patch
 delete mode 100644 goffice-enable-shared.patch
 delete mode 100644 guile-1.8.patch
 delete mode 100644 gwen-4.13.1.patch
 delete mode 100644 icu-crossmingw.patch
 delete mode 100644 inno_setup/gnucash.iss
 delete mode 100644 install-impl.sh
 delete mode 100644 install.sh
 delete mode 100644 libdbi-0.8.3.patch
 delete mode 100644 libdbi-drivers-errno.patch
 delete mode 100644 libmysql.def
 delete mode 100644 libofx-0.9.8.patch
 delete mode 100644 libsoup-2.48.0-bad-symbol.patch
 delete mode 100644 libsoup-2.48.0-soup-server-reserved-word.patch
 delete mode 100755 libxslt-1.1.22.Makefile.in.patch
 delete mode 100644 make_install.sh
 delete mode 100755 mingw-get.zip
 delete mode 100644 opensp-1.5.2.patch
 delete mode 100644 pi.sh
 delete mode 100644 reset.sh
 delete mode 100644 swift940-strndup.patch
 delete mode 100755 webkitenumtypes.cpp
 delete mode 100755 webkitenumtypes.h



More information about the gnucash-changes mailing list