gnucash-on-windows master: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Wed May 7 05:32:06 EDT 2014
Updated via https://github.com/Gnucash/gnucash-on-windows/commit/b3f917a6 (commit)
via https://github.com/Gnucash/gnucash-on-windows/commit/bf9b1c9a (commit)
via https://github.com/Gnucash/gnucash-on-windows/commit/d5b73c58 (commit)
via https://github.com/Gnucash/gnucash-on-windows/commit/de3614c0 (commit)
via https://github.com/Gnucash/gnucash-on-windows/commit/cfdce452 (commit)
via https://github.com/Gnucash/gnucash-on-windows/commit/41336792 (commit)
from https://github.com/Gnucash/gnucash-on-windows/commit/39b07cdd (commit)
commit b3f917a6c61e7916c88b43712ebe81c836f3f8ad
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed May 7 11:31:01 2014 +0200
Remove obsolete source code
diff --git a/redirect.c b/redirect.c
deleted file mode 100644
index c9a495b..0000000
--- a/redirect.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * redirect.c --
- * Copyright (C) 2007 Andreas Koehler <andi5.py at gmx.net>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, contact:
- *
- * Free Software Foundation Voice: +1-617-542-5942
- * 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652
- * Boston, MA 02110-1301, USA gnu at gnu.org
- */
-
-#include "config.h"
-#include <glib.h>
-#include <windows.h>
-
-/* This program will search for an existing file in
- * .\bin\$i
- * ..\bin\$i
- * ..\..\bin\$i
- * and so on, where $i is the base name of argv[0]. Once found, that
- * program is spawned synchronously with the same parameters and its
- * exit status will be the one of this program as well.
- * To avoid recursion, do not use it in a directory ending on "bin".
- */
-
-/* __wgetmainargs() is an undocumented function to get the program's
- * argv in wide char format.
- */
-typedef struct {
- int newmode;
-} _startupinfo;
-
-extern void __wgetmainargs(int *argc,
- wchar_t ***wargv,
- wchar_t ***wenviron,
- int expand_wildcards,
- _startupinfo *startupinfo);
-
-static gboolean
-wcharv_to_utf8_charv(wchar_t **wcharv,
- gchar ***utf8_charv,
- gint *error_index)
-{
- gchar **retval = NULL;
-
- *utf8_charv = NULL;
- if (wcharv != NULL) {
- int n = 0, i;
-
- while (wcharv[n])
- n++;
- retval = g_new(gchar *, n + 1);
-
- for (i = 0; i < n; i++) {
- retval[i] = g_utf16_to_utf8 (wcharv[i], -1, NULL, NULL, NULL);
- if (retval[i] == NULL) {
- if (error_index)
- *error_index = i;
- while (i)
- g_free(retval[--i]);
- g_free (retval);
- return FALSE;
- }
- }
-
- retval[n] = NULL;
- }
- *utf8_charv = retval;
- return TRUE;
-}
-
-static gboolean
-redirect_program(gchar **argv)
-{
- gchar *orig_path, *orig_base, *dir, *path;
- gchar *index;
- gboolean retval = FALSE;
-
- g_return_val_if_fail(*argv, FALSE);
- if (g_path_is_absolute(*argv)) {
- orig_path = g_strdup(*argv);
- } else {
- gchar *cd = g_get_current_dir();
- orig_path = g_build_filename(cd, *argv, (gchar*) NULL);
- g_free(cd);
- }
-
- orig_base = g_path_get_basename(orig_path);
- dir = g_strdup(orig_path);
- while (((index = strrchr(dir, '\\')) != NULL)
- || ((index = strrchr(dir, '/')) != NULL)) {
- *index = '\0';
- path = g_build_filename(dir, "bin", orig_base, (gchar*) NULL);
- g_debug("Testing %s", path);
- if (g_file_test(path, G_FILE_TEST_EXISTS)) {
- g_free(orig_path);
- *argv = path;
- retval = TRUE;
- break;
- }
- g_free(path);
- }
-
- g_free(dir);
- g_free(orig_base);
- g_free(orig_path);
-
- return retval;
-}
-
-#ifdef __GNUC__
-# ifndef _stdcall
-# define _stdcall __attribute__((stdcall))
-# endif
-#endif
-
-int _stdcall
-WinMain(struct HINSTANCE__ *hInstance,
- struct HINSTANCE__ *hPrevInstance,
- char *lpszCmdLine,
- int nCmdShow)
-{
- int argc;
- wchar_t **wargv, **wenvp;
- _startupinfo si = { 0 };
- gint index, status;
- gchar **utf8_argv;
- GError *error = NULL;
-
- __wgetmainargs(&argc, &wargv, &wenvp, 0, &si);
- g_assert(argc == __argc);
-
- if (!wcharv_to_utf8_charv(wargv, &utf8_argv, &index)) {
- g_warning("Invalid argument at position %d", index);
- return -1;
- }
-
- if (!redirect_program(utf8_argv)) {
- g_warning("Could not find destination for %s", *utf8_argv);
- g_strfreev(utf8_argv);
- return -1;
- }
-
- if (!g_spawn_sync(NULL, utf8_argv, NULL,
- G_SPAWN_LEAVE_DESCRIPTORS_OPEN
- | G_SPAWN_CHILD_INHERITS_STDIN,
- NULL, NULL, NULL, NULL, &status, &error)) {
- g_warning("Could not spawn program: %s", error->message);
- g_error_free(error);
- g_strfreev(utf8_argv);
- return -1;
- }
-
- return status;
-}
commit bf9b1c9a9ab63450d2266f6745169004d5bc6b59
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed May 7 11:07:45 2014 +0200
Isolate inno related files
diff --git a/dist-impl.sh b/dist-impl.sh
index b8c3444..e97c131 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -239,7 +239,7 @@ function dist_gnucash() {
cp -a $_INSTALL_UDIR/lib/lib*.la $_DIST_UDIR/bin
mkdir -p $_DIST_UDIR/share
cp -a $_INSTALL_UDIR/share/{doc,gnucash,locale,glib-2.0} $_DIST_UDIR/share
- cp -a $_REPOS_UDIR/packaging/win32/{getperl.vbs,gnc-path-check,install-fq-mods.cmd} $_DIST_UDIR/bin
+ cp -a $_GC_WIN_REPOS_UDIR/{getperl.vbs,gnc-path-check,install-fq-mods.cmd} $_DIST_UDIR/bin
_QTDIR_WIN=$(unix_path $QTDIR | sed 's,^/\([A-Za-z]\)/,\1:/,g' )
# aqbanking >= 5.0.0
@@ -255,7 +255,8 @@ function dist_gnucash() {
GNUCASH_MINOR_VERSION=$(awk '/ GNUCASH_MINOR_VERSION / { print $3 }' ${GNUCASH_CONFIG_H} )
GNUCASH_MICRO_VERSION=$(awk '/ GNUCASH_MICRO_VERSION / { print $3 }' ${GNUCASH_CONFIG_H} )
DIST_WFSDIR=$(echo $DIST_DIR | sed -e 's#\\#\\\\#g')
- sed < $_GC_WIN_REPOS_UDIR/gnucash.iss \
+ GC_WIN_REPOS_WFSDIR=$(echo $GC_WIN_REPOS_DIR | sed -e 's#\\#\\\\#g')
+ sed < $_GC_WIN_REPOS_UDIR/inno_setup/gnucash.iss \
> $_GNUCASH_UDIR/gnucash.iss \
-e "s#@-qtbindir-@#${_QTDIR_WIN}/bin#g" \
-e "s#@-gwenhywfar_so_effective-@#${_GWENHYWFAR_SO_EFFECTIVE}#g" \
@@ -265,7 +266,8 @@ function dist_gnucash() {
-e "s#@GNUCASH_MAJOR_VERSION@#${GNUCASH_MAJOR_VERSION}#g" \
-e "s#@GNUCASH_MINOR_VERSION@#${GNUCASH_MINOR_VERSION}#g" \
-e "s#@GNUCASH_MICRO_VERSION@#${GNUCASH_MICRO_VERSION}#g" \
- -e "s#@DIST_DIR@#${DIST_WFSDIR}#g"
+ -e "s#@DIST_DIR@#${DIST_WFSDIR}#g" \
+ -e "s#@GC_WIN_REPOS_DIR@#${GC_WIN_REPOS_WFSDIR}#g"
}
function dist_finish() {
diff --git a/ChineseSimp-12-5.1.11.isl b/inno_setup/ChineseSimp-12-5.1.11.isl
similarity index 100%
rename from ChineseSimp-12-5.1.11.isl
rename to inno_setup/ChineseSimp-12-5.1.11.isl
diff --git a/ChineseTrad-2-5.1.11.isl b/inno_setup/ChineseTrad-2-5.1.11.isl
similarity index 100%
rename from ChineseTrad-2-5.1.11.isl
rename to inno_setup/ChineseTrad-2-5.1.11.isl
diff --git a/Greek-4-5.1.11.isl b/inno_setup/Greek-4-5.1.11.isl
similarity index 100%
rename from Greek-4-5.1.11.isl
rename to inno_setup/Greek-4-5.1.11.isl
diff --git a/Japanese-5-5.1.11.isl b/inno_setup/Japanese-5-5.1.11.isl
similarity index 100%
rename from Japanese-5-5.1.11.isl
rename to inno_setup/Japanese-5-5.1.11.isl
diff --git a/Latvian-1-5.1.11.isl b/inno_setup/Latvian-1-5.1.11.isl
similarity index 100%
rename from Latvian-1-5.1.11.isl
rename to inno_setup/Latvian-1-5.1.11.isl
diff --git a/gnucash.iss b/inno_setup/gnucash.iss
similarity index 98%
rename from gnucash.iss
rename to inno_setup/gnucash.iss
index e408467..96982c8 100644
--- a/gnucash.iss
+++ b/inno_setup/gnucash.iss
@@ -371,15 +371,15 @@ end;
[Languages]
Name: "en"; MessagesFile: "compiler:Default.isl"
Name: "de"; MessagesFile: "compiler:Languages\German.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-de.win32-bin.txt"
-Name: "el"; MessagesFile: "@DIST_DIR@\share\@PACKAGE@\Greek-4-5.1.11.isl"
+Name: "el"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Greek-4-5.1.11.isl"
Name: "fr"; MessagesFile: "compiler:Languages\French.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-fr.win32-bin.txt"
Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-it.win32-bin.txt"
-Name: "ja"; MessagesFile: "@DIST_DIR@\share\@PACKAGE@\Japanese-5-5.1.11.isl"
-Name: "lv"; MessagesFile: "@DIST_DIR@\share\@PACKAGE@\Latvian-1-5.1.11.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-lv.win32-bin.txt"
+Name: "ja"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Japanese-5-5.1.11.isl"
+Name: "lv"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\Latvian-1-5.1.11.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-lv.win32-bin.txt"
Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-nl.win32-bin.txt"
Name: "pt_BR"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
-Name: "zh_CN"; MessagesFile: "@DIST_DIR@\share\@PACKAGE@\ChineseSimp-12-5.1.11.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"
-Name: "zh_TW"; MessagesFile: "@DIST_DIR@\share\@PACKAGE@\ChineseTrad-2-5.1.11.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"
+Name: "zh_CN"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\ChineseSimp-12-5.1.11.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"
+Name: "zh_TW"; MessagesFile: "@GC_WIN_REPOS_DIR@\inno_setup\ChineseTrad-2-5.1.11.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"
;; The following language files are available as well, in alphabetical
;; order: Basque, BrazilianPortuguese, Catalan, Czech, Danish, Dutch,
commit d5b73c58194b6b30ef2aeffaf0efb88f2d0f428c
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed May 7 10:40:16 2014 +0200
Handle backslashes properly in path substitution
diff --git a/dist-impl.sh b/dist-impl.sh
index c1e1880..b8c3444 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -254,6 +254,7 @@ function dist_gnucash() {
GNUCASH_MAJOR_VERSION=$(awk '/ GNUCASH_MAJOR_VERSION / { print $3 }' ${GNUCASH_CONFIG_H} )
GNUCASH_MINOR_VERSION=$(awk '/ GNUCASH_MINOR_VERSION / { print $3 }' ${GNUCASH_CONFIG_H} )
GNUCASH_MICRO_VERSION=$(awk '/ GNUCASH_MICRO_VERSION / { print $3 }' ${GNUCASH_CONFIG_H} )
+ DIST_WFSDIR=$(echo $DIST_DIR | sed -e 's#\\#\\\\#g')
sed < $_GC_WIN_REPOS_UDIR/gnucash.iss \
> $_GNUCASH_UDIR/gnucash.iss \
-e "s#@-qtbindir-@#${_QTDIR_WIN}/bin#g" \
@@ -264,7 +265,7 @@ function dist_gnucash() {
-e "s#@GNUCASH_MAJOR_VERSION@#${GNUCASH_MAJOR_VERSION}#g" \
-e "s#@GNUCASH_MINOR_VERSION@#${GNUCASH_MINOR_VERSION}#g" \
-e "s#@GNUCASH_MICRO_VERSION@#${GNUCASH_MICRO_VERSION}#g" \
- -e "s#@DIST_DIR@#${DIST_DIR}#g"
+ -e "s#@DIST_DIR@#${DIST_WFSDIR}#g"
}
function dist_finish() {
commit de3614c0d5d0275efa58eebf6088a01f97af82be
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed May 7 10:18:35 2014 +0200
Correct some bad parameter subsitutions
diff --git a/dist-impl.sh b/dist-impl.sh
index ec8773b..c1e1880 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -264,8 +264,6 @@ function dist_gnucash() {
-e "s#@GNUCASH_MAJOR_VERSION@#${GNUCASH_MAJOR_VERSION}#g" \
-e "s#@GNUCASH_MINOR_VERSION@#${GNUCASH_MINOR_VERSION}#g" \
-e "s#@GNUCASH_MICRO_VERSION@#${GNUCASH_MICRO_VERSION}#g" \
- -e "s#@GC_WIN_REPOS_DIR@#${GC_WIN_REPOS_DIR}#g" \
- -e "s#@INSTALL_DIR@#${INSTALL_DIR}#g" \
-e "s#@DIST_DIR@#${DIST_DIR}#g"
}
diff --git a/gnucash.iss b/gnucash.iss
index de2b83b..e408467 100644
--- a/gnucash.iss
+++ b/gnucash.iss
@@ -8,24 +8,24 @@
[Setup]
; Using the name here directly because we want it capitalized
AppName=GnuCash
-AppVerName=GnuCash @VERSION@
+AppVerName=GnuCash @PACKAGE_VERSION@
AppPublisher=GnuCash Development Team
AppPublisherURL=http://www.gnucash.org
AppSupportURL=http://www.gnucash.org
AppUpdatesURL=http://www.gnucash.org
-VersionInfoVersion=@VERSION@
+VersionInfoVersion=@PACKAGE_VERSION@
DefaultDirName={pf}\@PACKAGE@
DefaultGroupName=GnuCash
-LicenseFile=@DIST_DIR\share\doc\@PACKAGE@\COPYING
+LicenseFile=@DIST_DIR@\share\doc\@PACKAGE@\COPYING
Compression=lzma
MinVersion=5.0,5.0
PrivilegesRequired=poweruser
OutputDir=.
-OutputBaseFilename=@PACKAGE at -@VERSION at -setup
+OutputBaseFilename=@PACKAGE at -@PACKAGE_VERSION at -setup
UninstallFilesDir={app}\uninstall\@PACKAGE@
-InfoAfterFile=@DIST_DIR\share\doc\@PACKAGE@\README.win32-bin.txt
-SetupIconFile=@DIST_DIR\share\@PACKAGE@\pixmaps\gnucash-icon.ico
-WizardSmallImageFile=@DIST_DIR\share\@PACKAGE@\pixmaps\gnucash-icon-48x48.bmp
+InfoAfterFile=@DIST_DIR@\share\doc\@PACKAGE@\README.win32-bin.txt
+SetupIconFile=@DIST_DIR@\share\@PACKAGE@\pixmaps\gnucash-icon.ico
+WizardSmallImageFile=@DIST_DIR@\share\@PACKAGE@\pixmaps\gnucash-icon-48x48.bmp
[Types]
Name: "full"; Description: "{cm:FullInstall}"
@@ -61,33 +61,33 @@ Filename: "{app}\bin\guile.cmd"; Flags: runhidden
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
[Files]
; The main executables and DLLs
-Source: "@DIST_DIR\bin\*"; DestDir: "{app}\bin"; Flags: recursesubdirs ignoreversion; Components: main
-Source: "@DIST_DIR\etc\*"; DestDir: "{app}\etc"; Flags: recursesubdirs; Components: main
-Source: "@DIST_DIR\etc\@PACKAGE@\environment"; DestDir: "{app}\etc\@PACKAGE@"; Components: main; AfterInstall: MyAfterInstallEnvironment()
+Source: "@DIST_DIR@\bin\*"; DestDir: "{app}\bin"; Flags: recursesubdirs ignoreversion; Components: main
+Source: "@DIST_DIR@\etc\*"; DestDir: "{app}\etc"; Flags: recursesubdirs; Components: main
+Source: "@DIST_DIR@\etc\@PACKAGE@\environment"; DestDir: "{app}\etc\@PACKAGE@"; Components: main; AfterInstall: MyAfterInstallEnvironment()
; Note: The above AfterInstall function will adapt the
; environment config file on-the-fly by the Pascal script below.
-Source: "@DIST_DIR\lib\*"; DestDir: "{app}\lib"; Flags: recursesubdirs; Components: main
+Source: "@DIST_DIR@\lib\*"; DestDir: "{app}\lib"; Flags: recursesubdirs; Components: main
;; We don't have anything in libexec anymore at the moment
-;Source: "@DIST_DIR\libexec\*"; DestDir: "{app}\libexec"; Flags: recursesubdirs; Components: main
-Source: "@DIST_DIR\share\*"; DestDir: "{app}\share"; Flags: recursesubdirs; Components: main
+;Source: "@DIST_DIR@\libexec\*"; DestDir: "{app}\libexec"; Flags: recursesubdirs; Components: main
+Source: "@DIST_DIR@\share\*"; DestDir: "{app}\share"; Flags: recursesubdirs; Components: main
;; The translations
-;Source: "@DIST_DIR\share\locale\*"; DestDir: "{app}\share\locale"; Flags: recursesubdirs; Components: translations
+;Source: "@DIST_DIR@\share\locale\*"; DestDir: "{app}\share\locale"; Flags: recursesubdirs; Components: translations
;
;; The account templates
-;Source: "@DIST_DIR\share\@PACKAGE@\accounts\*"; DestDir: "{app}\share\@PACKAGE@\accounts"; Flags: recursesubdirs; Components: templates
+;Source: "@DIST_DIR@\share\@PACKAGE@\accounts\*"; DestDir: "{app}\share\@PACKAGE@\accounts"; Flags: recursesubdirs; Components: templates
; And all the documentation
-Source: "@DIST_DIR\share\doc\@PACKAGE@\README"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@DIST_DIR\share\doc\@PACKAGE@\README.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@DIST_DIR\share\doc\@PACKAGE@\README-de.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@DIST_DIR\share\doc\@PACKAGE@\README-fr.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@DIST_DIR\share\doc\@PACKAGE@\README-it.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@DIST_DIR\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@DIST_DIR\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@DIST_DIR\share\doc\@PACKAGE@\COPYING"; DestDir: "{app}\doc\@PACKAGE@"; Flags: ignoreversion; Components: main
-Source: "@DIST_DIR\share\doc\@PACKAGE@\AUTHORS"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@DIST_DIR\share\doc\@PACKAGE@\ChangeLog"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@DIST_DIR@\share\doc\@PACKAGE@\README"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@DIST_DIR@\share\doc\@PACKAGE@\README.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@DIST_DIR@\share\doc\@PACKAGE@\README-de.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@DIST_DIR@\share\doc\@PACKAGE@\README-fr.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@DIST_DIR@\share\doc\@PACKAGE@\README-it.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@DIST_DIR@\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@DIST_DIR@\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@DIST_DIR@\share\doc\@PACKAGE@\COPYING"; DestDir: "{app}\doc\@PACKAGE@"; Flags: ignoreversion; Components: main
+Source: "@DIST_DIR@\share\doc\@PACKAGE@\AUTHORS"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@DIST_DIR@\share\doc\@PACKAGE@\ChangeLog"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -370,16 +370,16 @@ end;
[Languages]
Name: "en"; MessagesFile: "compiler:Default.isl"
-Name: "de"; MessagesFile: "compiler:Languages\German.isl"; InfoAfterFile: "@INSTALL_DIR@\share\doc\@PACKAGE@\README-de.win32-bin.txt"
-Name: "el"; MessagesFile: "@GC_WIN_REPOS_DIR@\Greek-4-5.1.11.isl"
-Name: "fr"; MessagesFile: "compiler:Languages\French.isl"; InfoAfterFile: "@INSTALL_DIR@\share\doc\@PACKAGE@\README-fr.win32-bin.txt"
-Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"; InfoAfterFile: "@INSTALL_DIR@\share\doc\@PACKAGE@\README-it.win32-bin.txt"
-Name: "ja"; MessagesFile: "@GC_WIN_REPOS_DIR@\Japanese-5-5.1.11.isl"
-Name: "lv"; MessagesFile: "@GC_WIN_REPOS_DIR@\Latvian-1-5.1.11.isl"; InfoAfterFile: "@INSTALL_DIR@\share\doc\@PACKAGE@\README-lv.win32-bin.txt"
-Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"; InfoAfterFile: "@INSTALL_DIR@\share\doc\@PACKAGE@\README-nl.win32-bin.txt"
+Name: "de"; MessagesFile: "compiler:Languages\German.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-de.win32-bin.txt"
+Name: "el"; MessagesFile: "@DIST_DIR@\share\@PACKAGE@\Greek-4-5.1.11.isl"
+Name: "fr"; MessagesFile: "compiler:Languages\French.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-fr.win32-bin.txt"
+Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-it.win32-bin.txt"
+Name: "ja"; MessagesFile: "@DIST_DIR@\share\@PACKAGE@\Japanese-5-5.1.11.isl"
+Name: "lv"; MessagesFile: "@DIST_DIR@\share\@PACKAGE@\Latvian-1-5.1.11.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-lv.win32-bin.txt"
+Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-nl.win32-bin.txt"
Name: "pt_BR"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
-Name: "zh_CN"; MessagesFile: "@GC_WIN_REPOS_DIR@\ChineseSimp-12-5.1.11.isl"; InfoAfterFile: "@INSTALL_DIR@\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"
-Name: "zh_TW"; MessagesFile: "@GC_WIN_REPOS_DIR@\ChineseTrad-2-5.1.11.isl"; InfoAfterFile: "@INSTALL_DIR@\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"
+Name: "zh_CN"; MessagesFile: "@DIST_DIR@\share\@PACKAGE@\ChineseSimp-12-5.1.11.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"
+Name: "zh_TW"; MessagesFile: "@DIST_DIR@\share\@PACKAGE@\ChineseTrad-2-5.1.11.isl"; InfoAfterFile: "@DIST_DIR@\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"
;; The following language files are available as well, in alphabetical
;; order: Basque, BrazilianPortuguese, Catalan, Czech, Danish, Dutch,
commit cfdce452ff7421ae0adafb6a7a31c152501262ff
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue May 6 22:42:53 2014 +0200
Use dist script to replace parameters in gnucash.iss
This use to be partly handled by gnucash' configure but gnucash.iss
will be removed from the gnucash repository.
diff --git a/.gitattributes b/.gitattributes
index 551dda8..d679374 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -30,6 +30,6 @@
*.isl text eol=crlf
*.vbs text eol=crlf
-gnucash.iss.in text eol=crlf
+gnucash.iss text eol=crlf
gnucash.rc.in text eol=crlf
README*win32-bin.txt text eol=crlf
diff --git a/defaults.sh b/defaults.sh
index 8730364..7604280 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -48,6 +48,7 @@ else
fi
set_default BUILD_DIR $GNUCASH_DIR\\build
set_default INSTALL_DIR $GNUCASH_DIR\\inst
+set_default DIST_DIR $GNUCASH_DIR\\dist
set_default WITH_CUTECASH no
set_default CUTECASH_BUILD_DIR $GNUCASH_DIR\\build-cutecash
diff --git a/dist-impl.sh b/dist-impl.sh
index f1605ce..ec8773b 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -4,10 +4,6 @@
#
function dist_prepare() {
- # this directory is hardcoded in gnucash.iss.in
- DIST_DIR=${INSTALL_DIR}\\..\\dist
- DIST_UDIR=`unix_path $DIST_DIR`
- DIST_WFSDIR=`win_fs_path $DIST_DIR`
TMP_UDIR=`unix_path $TMP_DIR`
if [ -x $DIST_DIR ]; then
die "Please remove ${DIST_DIR} first"
@@ -35,8 +31,10 @@ function dist_prepare() {
_LIBDBI_DRIVERS_UDIR=`unix_path ${LIBDBI_DRIVERS_DIR}`
_LIBGDA_UDIR=`unix_path $LIBGDA_DIR`
_GNUCASH_UDIR=`unix_path $GNUCASH_DIR`
+ _GC_WIN_REPOS_UDIR=`unix_path $GC_WIN_REPOS_DIR`
_REPOS_UDIR=`unix_path $REPOS_DIR`
_BUILD_UDIR=`unix_path $BUILD_DIR`
+ _DIST_UDIR=`unix_path $DIST_DIR`
_MINGW_UDIR=`unix_path $MINGW_DIR`
_INSTALL_UDIR=`unix_path $INSTALL_DIR`
_INNO_UDIR=`unix_path $INNO_DIR`
@@ -78,11 +76,11 @@ function dist_mingw() {
function dist_aqbanking() {
setup aqbanking
- cp -a ${_AQBANKING_UDIR}/bin/*.exe ${DIST_UDIR}/bin
- cp -a ${_AQBANKING_UDIR}/bin/*.dll ${DIST_UDIR}/bin
- cp -a ${_AQBANKING_UDIR}/lib/aqbanking ${DIST_UDIR}/lib
- cp -a ${_AQBANKING_UDIR}/share/aqbanking ${DIST_UDIR}/share
- cp -a ${_AQBANKING_UDIR}/share/locale ${DIST_UDIR}/share
+ cp -a ${_AQBANKING_UDIR}/bin/*.exe ${_DIST_UDIR}/bin
+ cp -a ${_AQBANKING_UDIR}/bin/*.dll ${_DIST_UDIR}/bin
+ cp -a ${_AQBANKING_UDIR}/lib/aqbanking ${_DIST_UDIR}/lib
+ cp -a ${_AQBANKING_UDIR}/share/aqbanking ${_DIST_UDIR}/share
+ cp -a ${_AQBANKING_UDIR}/share/locale ${_DIST_UDIR}/share
}
function dist_gnome() {
@@ -122,99 +120,99 @@ function dist_gnome() {
cp -a $_GNOME_UDIR/bin/libxml*.dll $DIST_DIR/bin
- if [ -d $DIST_UDIR/lib/locale ] ; then
+ if [ -d $_DIST_UDIR/lib/locale ] ; then
# Huh, is this removed in newer gtk?
- cp -a $DIST_UDIR/lib/locale $DIST_UDIR/share
- rm -rf $DIST_UDIR/lib/locale
+ cp -a $_DIST_UDIR/lib/locale $_DIST_UDIR/share
+ rm -rf $_DIST_UDIR/lib/locale
fi
}
function dist_gnutls() {
setup gnutls
- cp -a ${_GNUTLS_UDIR}/bin/*.dll ${DIST_UDIR}/bin
- cp -a ${_GNUTLS_UDIR}/bin/*.exe ${DIST_UDIR}/bin
+ cp -a ${_GNUTLS_UDIR}/bin/*.dll ${_DIST_UDIR}/bin
+ cp -a ${_GNUTLS_UDIR}/bin/*.exe ${_DIST_UDIR}/bin
}
function dist_goffice() {
setup GOffice
- mkdir -p $DIST_UDIR/bin
- cp -a $_GOFFICE_UDIR/bin/libgoffice*.dll $DIST_UDIR/bin
- mkdir -p $DIST_UDIR/lib
- cp -a $_GOFFICE_UDIR/lib/goffice $DIST_UDIR/lib
- mkdir -p $DIST_UDIR/share
- cp -a $_GOFFICE_UDIR/share/{goffice,locale,pixmaps} $DIST_UDIR/share
+ mkdir -p $_DIST_UDIR/bin
+ cp -a $_GOFFICE_UDIR/bin/libgoffice*.dll $_DIST_UDIR/bin
+ mkdir -p $_DIST_UDIR/lib
+ cp -a $_GOFFICE_UDIR/lib/goffice $_DIST_UDIR/lib
+ mkdir -p $_DIST_UDIR/share
+ cp -a $_GOFFICE_UDIR/share/{goffice,locale,pixmaps} $_DIST_UDIR/share
}
function dist_guile() {
setup Guile
- mkdir -p $DIST_UDIR/bin
- cp -a $_GUILE_UDIR/bin/libguile*.dll $DIST_UDIR/bin
- cp -a $_GUILE_UDIR/bin/guile.exe $DIST_UDIR/bin
- mkdir -p $DIST_UDIR/share
- cp -a $_GUILE_UDIR/share/guile $DIST_UDIR/share
+ mkdir -p $_DIST_UDIR/bin
+ cp -a $_GUILE_UDIR/bin/libguile*.dll $_DIST_UDIR/bin
+ cp -a $_GUILE_UDIR/bin/guile.exe $_DIST_UDIR/bin
+ mkdir -p $_DIST_UDIR/share
+ cp -a $_GUILE_UDIR/share/guile $_DIST_UDIR/share
}
function dist_gwenhywfar() {
setup gwenhywfar
- cp -a ${_GWENHYWFAR_UDIR}/bin/*.dll ${DIST_UDIR}/bin
- mkdir -p ${DIST_UDIR}/etc
- cp -a ${_GWENHYWFAR_UDIR}/lib/gwenhywfar ${DIST_UDIR}/lib
- mkdir -p ${DIST_UDIR}/share
- cp -a ${_GWENHYWFAR_UDIR}/share/gwenhywfar ${DIST_UDIR}/share
+ cp -a ${_GWENHYWFAR_UDIR}/bin/*.dll ${_DIST_UDIR}/bin
+ mkdir -p ${_DIST_UDIR}/etc
+ cp -a ${_GWENHYWFAR_UDIR}/lib/gwenhywfar ${_DIST_UDIR}/lib
+ mkdir -p ${_DIST_UDIR}/share
+ cp -a ${_GWENHYWFAR_UDIR}/share/gwenhywfar ${_DIST_UDIR}/share
}
function dist_isocodes() {
setup isocodes
- mkdir -p $DIST_UDIR/share
- cp -a $_ISOCODES_UDIR/share/{locale,xml} $DIST_UDIR/share
+ mkdir -p $_DIST_UDIR/share
+ cp -a $_ISOCODES_UDIR/share/{locale,xml} $_DIST_UDIR/share
}
function dist_ktoblzcheck() {
setup ktoblzcheck
# dll is already copied in dist_gwenhywfar
- cp -a ${_GWENHYWFAR_UDIR}/share/ktoblzcheck ${DIST_UDIR}/share
+ cp -a ${_GWENHYWFAR_UDIR}/share/ktoblzcheck ${_DIST_UDIR}/share
}
function dist_libdbi() {
setup LibDBI
- cp -a ${_SQLITE3_UDIR}/bin/* ${DIST_UDIR}/bin
- cp -a ${_MYSQL_LIB_UDIR}/bin/*.{dll,manifest} ${DIST_UDIR}/bin
- cp -a ${_MYSQL_LIB_UDIR}/lib/*.dll ${DIST_UDIR}/bin
- cp -a ${_PGSQL_UDIR}/bin/* ${DIST_UDIR}/bin
- cp -a ${_PGSQL_UDIR}/lib/*.dll ${DIST_UDIR}/bin
- cp -a ${_LIBDBI_UDIR}/bin/* ${DIST_UDIR}/bin
- mkdir ${DIST_UDIR}/lib/dbd
- cp -a ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/*.dll ${DIST_UDIR}/lib/dbd
+ cp -a ${_SQLITE3_UDIR}/bin/* ${_DIST_UDIR}/bin
+ cp -a ${_MYSQL_LIB_UDIR}/bin/*.{dll,manifest} ${_DIST_UDIR}/bin
+ cp -a ${_MYSQL_LIB_UDIR}/lib/*.dll ${_DIST_UDIR}/bin
+ cp -a ${_PGSQL_UDIR}/bin/* ${_DIST_UDIR}/bin
+ cp -a ${_PGSQL_UDIR}/lib/*.dll ${_DIST_UDIR}/bin
+ cp -a ${_LIBDBI_UDIR}/bin/* ${_DIST_UDIR}/bin
+ mkdir ${_DIST_UDIR}/lib/dbd
+ cp -a ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/*.dll ${_DIST_UDIR}/lib/dbd
}
function dist_libgsf() {
setup libGSF
- mkdir -p $DIST_UDIR/bin
- cp -a $_LIBGSF_UDIR/bin/libgsf*.dll $DIST_UDIR/bin
- mkdir -p $DIST_UDIR/share
- cp -a $_LIBGSF_UDIR/share/locale $DIST_UDIR/share
+ mkdir -p $_DIST_UDIR/bin
+ cp -a $_LIBGSF_UDIR/bin/libgsf*.dll $_DIST_UDIR/bin
+ mkdir -p $_DIST_UDIR/share
+ cp -a $_LIBGSF_UDIR/share/locale $_DIST_UDIR/share
}
function dist_libofx() {
setup OpenSP and LibOFX
- cp -a ${_OPENSP_UDIR}/bin/*.dll ${DIST_UDIR}/bin
- cp -a ${_OPENSP_UDIR}/share/OpenSP ${DIST_UDIR}/share
- cp -a ${_LIBOFX_UDIR}/bin/*.dll ${DIST_UDIR}/bin
- cp -a ${_LIBOFX_UDIR}/bin/*.exe ${DIST_UDIR}/bin
- cp -a ${_LIBOFX_UDIR}/share/libofx ${DIST_UDIR}/share
+ cp -a ${_OPENSP_UDIR}/bin/*.dll ${_DIST_UDIR}/bin
+ cp -a ${_OPENSP_UDIR}/share/OpenSP ${_DIST_UDIR}/share
+ cp -a ${_LIBOFX_UDIR}/bin/*.dll ${_DIST_UDIR}/bin
+ cp -a ${_LIBOFX_UDIR}/bin/*.exe ${_DIST_UDIR}/bin
+ cp -a ${_LIBOFX_UDIR}/share/libofx ${_DIST_UDIR}/share
}
function dist_openssl() {
setup OpenSSL
_OPENSSL_UDIR=`unix_path $OPENSSL_DIR`
- mkdir -p $DIST_UDIR/bin
- cp -a $_OPENSSL_UDIR/bin/*.dll $DIST_UDIR/bin
+ mkdir -p $_DIST_UDIR/bin
+ cp -a $_OPENSSL_UDIR/bin/*.dll $_DIST_UDIR/bin
}
function dist_pcre() {
setup pcre
- mkdir -p $DIST_UDIR/bin
- cp -a $_PCRE_UDIR/bin/pcre3.dll $DIST_UDIR/bin
+ mkdir -p $_DIST_UDIR/bin
+ cp -a $_PCRE_UDIR/bin/pcre3.dll $_DIST_UDIR/bin
}
function dist_regex() {
@@ -225,41 +223,55 @@ function dist_regex() {
function dist_webkit() {
setup WebKit
- cp -a ${_LIBSOUP_UDIR}/bin/* ${DIST_UDIR}/bin
- cp -a ${_LIBXSLT_UDIR}/bin/* ${DIST_UDIR}/bin
- cp -a ${_ENCHANT_UDIR}/bin/* ${DIST_UDIR}/bin
- cp -a ${_WEBKIT_UDIR}/bin/* ${DIST_UDIR}/bin
+ cp -a ${_LIBSOUP_UDIR}/bin/* ${_DIST_UDIR}/bin
+ cp -a ${_LIBXSLT_UDIR}/bin/* ${_DIST_UDIR}/bin
+ cp -a ${_ENCHANT_UDIR}/bin/* ${_DIST_UDIR}/bin
+ cp -a ${_WEBKIT_UDIR}/bin/* ${_DIST_UDIR}/bin
}
function dist_gnucash() {
setup GnuCash
- mkdir -p $DIST_UDIR/bin
- cp $_MINGW_UDIR/bin/pthreadGC2.dll $DIST_UDIR/bin
- cp -a $_INSTALL_UDIR/bin/* $DIST_UDIR/bin
- mkdir -p $DIST_UDIR/etc/gnucash
- cp -a $_INSTALL_UDIR/etc/gnucash/* $DIST_UDIR/etc/gnucash
- cp -a $_INSTALL_UDIR/lib/lib*.la $DIST_UDIR/bin
- mkdir -p $DIST_UDIR/share
- cp -a $_INSTALL_UDIR/share/{doc,gnucash,locale,glib-2.0} $DIST_UDIR/share
- cp -a $_REPOS_UDIR/packaging/win32/{getperl.vbs,gnc-path-check,install-fq-mods.cmd} $DIST_UDIR/bin
+ mkdir -p $_DIST_UDIR/bin
+ cp $_MINGW_UDIR/bin/pthreadGC2.dll $_DIST_UDIR/bin
+ cp -a $_INSTALL_UDIR/bin/* $_DIST_UDIR/bin
+ mkdir -p $_DIST_UDIR/etc/gnucash
+ cp -a $_INSTALL_UDIR/etc/gnucash/* $_DIST_UDIR/etc/gnucash
+ cp -a $_INSTALL_UDIR/lib/lib*.la $_DIST_UDIR/bin
+ mkdir -p $_DIST_UDIR/share
+ cp -a $_INSTALL_UDIR/share/{doc,gnucash,locale,glib-2.0} $_DIST_UDIR/share
+ cp -a $_REPOS_UDIR/packaging/win32/{getperl.vbs,gnc-path-check,install-fq-mods.cmd} $_DIST_UDIR/bin
_QTDIR_WIN=$(unix_path $QTDIR | sed 's,^/\([A-Za-z]\)/,\1:/,g' )
# aqbanking >= 5.0.0
AQBANKING_VERSION_H=${_AQBANKING_UDIR}/include/aqbanking5/aqbanking/version.h
GWENHYWFAR_VERSION_H=${_GWENHYWFAR_UDIR}/include/gwenhywfar4/gwenhywfar/version.h
+ GNUCASH_CONFIG_H=${_BUILD_UDIR}/config.h
_AQBANKING_SO_EFFECTIVE=$(awk '/AQBANKING_SO_EFFECTIVE / { print $3 }' ${AQBANKING_VERSION_H} )
_GWENHYWFAR_SO_EFFECTIVE=$(awk '/GWENHYWFAR_SO_EFFECTIVE / { print $3 }' ${GWENHYWFAR_VERSION_H} )
- sed < $_BUILD_UDIR/packaging/win32/gnucash.iss \
+ PACKAGE_VERSION=$(awk '/ PACKAGE_VERSION / { print $3 }' ${GNUCASH_CONFIG_H} | cut -d\" -f2 )
+ PACKAGE=$(awk '/ PACKAGE / { print $3 }' ${GNUCASH_CONFIG_H} | cut -d\" -f2 )
+ GNUCASH_MAJOR_VERSION=$(awk '/ GNUCASH_MAJOR_VERSION / { print $3 }' ${GNUCASH_CONFIG_H} )
+ GNUCASH_MINOR_VERSION=$(awk '/ GNUCASH_MINOR_VERSION / { print $3 }' ${GNUCASH_CONFIG_H} )
+ GNUCASH_MICRO_VERSION=$(awk '/ GNUCASH_MICRO_VERSION / { print $3 }' ${GNUCASH_CONFIG_H} )
+ sed < $_GC_WIN_REPOS_UDIR/gnucash.iss \
> $_GNUCASH_UDIR/gnucash.iss \
-e "s#@-qtbindir-@#${_QTDIR_WIN}/bin#g" \
- -e "s#@-gwenhywfar_so_effective-@#${_GWENHYWFAR_SO_EFFECTIVE}#g" \
- -e "s#@-aqbanking_so_effective-@#${_AQBANKING_SO_EFFECTIVE}#g"
+ -e "s#@-gwenhywfar_so_effective-@#${_GWENHYWFAR_SO_EFFECTIVE}#g" \
+ -e "s#@-aqbanking_so_effective-@#${_AQBANKING_SO_EFFECTIVE}#g" \
+ -e "s#@PACKAGE_VERSION@#${PACKAGE_VERSION}#g" \
+ -e "s#@PACKAGE@#${PACKAGE}#g" \
+ -e "s#@GNUCASH_MAJOR_VERSION@#${GNUCASH_MAJOR_VERSION}#g" \
+ -e "s#@GNUCASH_MINOR_VERSION@#${GNUCASH_MINOR_VERSION}#g" \
+ -e "s#@GNUCASH_MICRO_VERSION@#${GNUCASH_MICRO_VERSION}#g" \
+ -e "s#@GC_WIN_REPOS_DIR@#${GC_WIN_REPOS_DIR}#g" \
+ -e "s#@INSTALL_DIR@#${INSTALL_DIR}#g" \
+ -e "s#@DIST_DIR@#${DIST_DIR}#g"
}
function dist_finish() {
# Strip redirections in distributed libtool .la files
- for file in $DIST_UDIR/bin/*.la; do
+ for file in $_DIST_UDIR/bin/*.la; do
cat $file | sed 's,^libdir=,#libdir=,' > $file.new
mv $file.new $file
done
diff --git a/gnucash.iss.in b/gnucash.iss
similarity index 91%
rename from gnucash.iss.in
rename to gnucash.iss
index 784da42..de2b83b 100644
--- a/gnucash.iss.in
+++ b/gnucash.iss
@@ -16,16 +16,16 @@ AppUpdatesURL=http://www.gnucash.org
VersionInfoVersion=@VERSION@
DefaultDirName={pf}\@PACKAGE@
DefaultGroupName=GnuCash
-LicenseFile=@prefix@\..\dist\share\doc\@PACKAGE@\COPYING
+LicenseFile=@DIST_DIR\share\doc\@PACKAGE@\COPYING
Compression=lzma
MinVersion=5.0,5.0
PrivilegesRequired=poweruser
OutputDir=.
OutputBaseFilename=@PACKAGE at -@VERSION at -setup
UninstallFilesDir={app}\uninstall\@PACKAGE@
-InfoAfterFile=@prefix@\..\dist\share\doc\@PACKAGE@\README.win32-bin.txt
-SetupIconFile=@prefix@\..\dist\share\@PACKAGE@\pixmaps\gnucash-icon.ico
-WizardSmallImageFile=@prefix@\..\dist\share\@PACKAGE@\pixmaps\gnucash-icon-48x48.bmp
+InfoAfterFile=@DIST_DIR\share\doc\@PACKAGE@\README.win32-bin.txt
+SetupIconFile=@DIST_DIR\share\@PACKAGE@\pixmaps\gnucash-icon.ico
+WizardSmallImageFile=@DIST_DIR\share\@PACKAGE@\pixmaps\gnucash-icon-48x48.bmp
[Types]
Name: "full"; Description: "{cm:FullInstall}"
@@ -61,33 +61,33 @@ Filename: "{app}\bin\guile.cmd"; Flags: runhidden
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
[Files]
; The main executables and DLLs
-Source: "@prefix@\..\dist\bin\*"; DestDir: "{app}\bin"; Flags: recursesubdirs ignoreversion; Components: main
-Source: "@prefix@\..\dist\etc\*"; DestDir: "{app}\etc"; Flags: recursesubdirs; Components: main
-Source: "@prefix@\..\dist\etc\@PACKAGE@\environment"; DestDir: "{app}\etc\@PACKAGE@"; Components: main; AfterInstall: MyAfterInstallEnvironment()
+Source: "@DIST_DIR\bin\*"; DestDir: "{app}\bin"; Flags: recursesubdirs ignoreversion; Components: main
+Source: "@DIST_DIR\etc\*"; DestDir: "{app}\etc"; Flags: recursesubdirs; Components: main
+Source: "@DIST_DIR\etc\@PACKAGE@\environment"; DestDir: "{app}\etc\@PACKAGE@"; Components: main; AfterInstall: MyAfterInstallEnvironment()
; Note: The above AfterInstall function will adapt the
; environment config file on-the-fly by the Pascal script below.
-Source: "@prefix@\..\dist\lib\*"; DestDir: "{app}\lib"; Flags: recursesubdirs; Components: main
+Source: "@DIST_DIR\lib\*"; DestDir: "{app}\lib"; Flags: recursesubdirs; Components: main
;; We don't have anything in libexec anymore at the moment
-;Source: "@prefix@\..\dist\libexec\*"; DestDir: "{app}\libexec"; Flags: recursesubdirs; Components: main
-Source: "@prefix@\..\dist\share\*"; DestDir: "{app}\share"; Flags: recursesubdirs; Components: main
+;Source: "@DIST_DIR\libexec\*"; DestDir: "{app}\libexec"; Flags: recursesubdirs; Components: main
+Source: "@DIST_DIR\share\*"; DestDir: "{app}\share"; Flags: recursesubdirs; Components: main
;; The translations
-;Source: "@prefix@\..\dist\share\locale\*"; DestDir: "{app}\share\locale"; Flags: recursesubdirs; Components: translations
+;Source: "@DIST_DIR\share\locale\*"; DestDir: "{app}\share\locale"; Flags: recursesubdirs; Components: translations
;
;; The account templates
-;Source: "@prefix@\..\dist\share\@PACKAGE@\accounts\*"; DestDir: "{app}\share\@PACKAGE@\accounts"; Flags: recursesubdirs; Components: templates
+;Source: "@DIST_DIR\share\@PACKAGE@\accounts\*"; DestDir: "{app}\share\@PACKAGE@\accounts"; Flags: recursesubdirs; Components: templates
; And all the documentation
-Source: "@prefix@\..\dist\share\doc\@PACKAGE@\README"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@prefix@\..\dist\share\doc\@PACKAGE@\README.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@prefix@\..\dist\share\doc\@PACKAGE@\README-de.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@prefix@\..\dist\share\doc\@PACKAGE@\README-fr.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@prefix@\..\dist\share\doc\@PACKAGE@\README-it.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@prefix@\..\dist\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@prefix@\..\dist\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@prefix@\..\dist\share\doc\@PACKAGE@\COPYING"; DestDir: "{app}\doc\@PACKAGE@"; Flags: ignoreversion; Components: main
-Source: "@prefix@\..\dist\share\doc\@PACKAGE@\AUTHORS"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@prefix@\..\dist\share\doc\@PACKAGE@\ChangeLog"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@DIST_DIR\share\doc\@PACKAGE@\README"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@DIST_DIR\share\doc\@PACKAGE@\README.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@DIST_DIR\share\doc\@PACKAGE@\README-de.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@DIST_DIR\share\doc\@PACKAGE@\README-fr.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@DIST_DIR\share\doc\@PACKAGE@\README-it.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@DIST_DIR\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@DIST_DIR\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@DIST_DIR\share\doc\@PACKAGE@\COPYING"; DestDir: "{app}\doc\@PACKAGE@"; Flags: ignoreversion; Components: main
+Source: "@DIST_DIR\share\doc\@PACKAGE@\AUTHORS"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
+Source: "@DIST_DIR\share\doc\@PACKAGE@\ChangeLog"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -370,16 +370,16 @@ end;
[Languages]
Name: "en"; MessagesFile: "compiler:Default.isl"
-Name: "de"; MessagesFile: "compiler:Languages\German.isl"; InfoAfterFile: "@prefix@\share\doc\@PACKAGE@\README-de.win32-bin.txt"
-Name: "el"; MessagesFile: "@prefix@\share\@PACKAGE@\Greek-4-5.1.11.isl"
-Name: "fr"; MessagesFile: "compiler:Languages\French.isl"; InfoAfterFile: "@prefix@\share\doc\@PACKAGE@\README-fr.win32-bin.txt"
-Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"; InfoAfterFile: "@prefix@\share\doc\@PACKAGE@\README-it.win32-bin.txt"
-Name: "ja"; MessagesFile: "@prefix@\share\@PACKAGE@\Japanese-5-5.1.11.isl"
-Name: "lv"; MessagesFile: "@prefix@\share\@PACKAGE@\Latvian-1-5.1.11.isl"; InfoAfterFile: "@prefix@\share\doc\@PACKAGE@\README-lv.win32-bin.txt"
-Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"; InfoAfterFile: "@prefix@\share\doc\@PACKAGE@\README-nl.win32-bin.txt"
+Name: "de"; MessagesFile: "compiler:Languages\German.isl"; InfoAfterFile: "@INSTALL_DIR@\share\doc\@PACKAGE@\README-de.win32-bin.txt"
+Name: "el"; MessagesFile: "@GC_WIN_REPOS_DIR@\Greek-4-5.1.11.isl"
+Name: "fr"; MessagesFile: "compiler:Languages\French.isl"; InfoAfterFile: "@INSTALL_DIR@\share\doc\@PACKAGE@\README-fr.win32-bin.txt"
+Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"; InfoAfterFile: "@INSTALL_DIR@\share\doc\@PACKAGE@\README-it.win32-bin.txt"
+Name: "ja"; MessagesFile: "@GC_WIN_REPOS_DIR@\Japanese-5-5.1.11.isl"
+Name: "lv"; MessagesFile: "@GC_WIN_REPOS_DIR@\Latvian-1-5.1.11.isl"; InfoAfterFile: "@INSTALL_DIR@\share\doc\@PACKAGE@\README-lv.win32-bin.txt"
+Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"; InfoAfterFile: "@INSTALL_DIR@\share\doc\@PACKAGE@\README-nl.win32-bin.txt"
Name: "pt_BR"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
-Name: "zh_CN"; MessagesFile: "@prefix@\share\@PACKAGE@\ChineseSimp-12-5.1.11.isl"; InfoAfterFile: "@prefix@\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"
-Name: "zh_TW"; MessagesFile: "@prefix@\share\@PACKAGE@\ChineseTrad-2-5.1.11.isl"; InfoAfterFile: "@prefix@\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"
+Name: "zh_CN"; MessagesFile: "@GC_WIN_REPOS_DIR@\ChineseSimp-12-5.1.11.isl"; InfoAfterFile: "@INSTALL_DIR@\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"
+Name: "zh_TW"; MessagesFile: "@GC_WIN_REPOS_DIR@\ChineseTrad-2-5.1.11.isl"; InfoAfterFile: "@INSTALL_DIR@\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"
;; The following language files are available as well, in alphabetical
;; order: Basque, BrazilianPortuguese, Catalan, Czech, Danish, Dutch,
commit 4133679229a2bb3612e1c03944cafb8fc18b764f
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue May 6 22:40:56 2014 +0200
Use more straightforward way to define variable
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index b246e1e..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-EXTRA_DIST = \
- README \
- aqbanking-4.2.4-r2132.patch \
- defaults.sh \
- dist.sh \
- exetype.pl \
- functions.sh \
- getperl.vbs \
- gnc-path-check \
- install.sh \
- install-fq-mods.cmd \
- libmysql.def \
- opensp-1.5.2.patch \
- pi.sh \
- ChineseSimp-12-5.1.11.isl \
- ChineseTrad-2-5.1.11.isl \
- Greek-4-5.1.11.isl \
- Japanese-5-5.1.11.isl \
- Latvian-1-5.1.11.isl \
- reset.sh
-
-if OS_WIN32
- bin_PROGRAMS = redirect
- redirect_SOURCES = redirect.c
- redirect_LDADD = $(GLIB_LIBS)
- AM_CPPFLAGS = $(GLIB_CFLAGS)
- pkgdata_DATA = ChineseSimp-12-5.1.11.isl
- pkgdata_DATA += ChineseTrad-2-5.1.11.isl
- pkgdata_DATA += Greek-4-5.1.11.isl
- pkgdata_DATA += Japanese-5-5.1.11.isl
- pkgdata_DATA += Latvian-1-5.1.11.isl
-else
- EXTRA_DIST += redirect.c
-endif
diff --git a/dist-impl.sh b/dist-impl.sh
index 3eaae1e..f1605ce 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -53,7 +53,7 @@ function dist_mingw() {
setup mingw
# Prepare mingw-get to install to alternative location
- MINGWGET_DIST_DIR=${INSTALL_DIR}\\..\\mingw-get-dist
+ MINGWGET_DIST_DIR=${GNUCASH_DIR}\\mingw-get-dist
MINGWGET_DIST_UDIR=`unix_path $MINGWGET_DIST_DIR`
mkdir -p $MINGWGET_DIST_UDIR/{bin,libexec,var/lib/mingw-get/data}
cp $_MINGW_UDIR/bin/mingw-get.exe $MINGWGET_DIST_UDIR/bin/
Summary of changes:
.gitattributes | 2 +-
Makefile.am | 34 -----
defaults.sh | 1 +
dist-impl.sh | 157 ++++++++++---------
.../ChineseSimp-12-5.1.11.isl | 0
.../ChineseTrad-2-5.1.11.isl | 0
.../Greek-4-5.1.11.isl | 0
.../Japanese-5-5.1.11.isl | 0
.../Latvian-1-5.1.11.isl | 0
gnucash.iss.in => inno_setup/gnucash.iss | 68 ++++-----
redirect.c | 166 ---------------------
11 files changed, 121 insertions(+), 307 deletions(-)
delete mode 100644 Makefile.am
rename ChineseSimp-12-5.1.11.isl => inno_setup/ChineseSimp-12-5.1.11.isl (100%)
rename ChineseTrad-2-5.1.11.isl => inno_setup/ChineseTrad-2-5.1.11.isl (100%)
rename Greek-4-5.1.11.isl => inno_setup/Greek-4-5.1.11.isl (100%)
rename Japanese-5-5.1.11.isl => inno_setup/Japanese-5-5.1.11.isl (100%)
rename Latvian-1-5.1.11.isl => inno_setup/Latvian-1-5.1.11.isl (100%)
rename gnucash.iss.in => inno_setup/gnucash.iss (91%)
delete mode 100644 redirect.c
More information about the gnucash-changes
mailing list