gnucash-on-windows master: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Mon Jan 13 17:05:46 EST 2020
Updated via https://github.com/Gnucash/gnucash-on-windows/commit/f8b8aac1 (commit)
via https://github.com/Gnucash/gnucash-on-windows/commit/96ccab78 (commit)
via https://github.com/Gnucash/gnucash-on-windows/commit/a12203d4 (commit)
via https://github.com/Gnucash/gnucash-on-windows/commit/6a2d5dae (commit)
from https://github.com/Gnucash/gnucash-on-windows/commit/98e7d3bf (commit)
commit f8b8aac1623c1b0f89e3f70482f6e22007796c52
Merge: 98e7d3b 96ccab7
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Jan 13 13:58:57 2020 -0800
Merge Jannick's 'inno-setup-fixes' into maint.
commit 96ccab78d1be07a164dfcf1d5c59f80613ddabf0
Author: Jannick <thirdedition at gmx.net>
Date: Sat Jan 4 11:42:13 2020 +0100
inno-setup: remove 'guile.cmd' from installation
The wrapper 'guile.cmd' to be created at install-time effectively sets
the GUILE_LOAD_PATH for guile. However, the environment for GC at run-time
is implied by the file 'environment' (generated by 'environment.in' at
configure-time, see gnucash repo). So 'guile.cmd' appears to be obsolete.
Moreover, 'guile.cmd' does not appear in the installation folder, because
the procedure 'MyAfterInstallConfig' is not called at install-time. Let's
remove the procedure, too.
* inno_setup/gnucash-mingw64.iss:
- remove for 'guile.cmd' creation, run, uninstall commands
- remove procedure 'MyAfterInstallConfig'
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index d30f3d5..1d60d7f 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -52,7 +52,6 @@ Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir
[Run]
Filename: "{app}\bin\@PACKAGE at .exe"; Description: "{cm:RunPrg}"; WorkingDir: "{code:GetDocPath}"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent
-Filename: "{app}\bin\guile.cmd"; Flags: runhidden
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Here we configure the included files and the place of their
@@ -265,7 +264,6 @@ Root: HKLM; Subkey: "Software\AqBanking\Paths"; ValueType: string; ValueName: "c
; Delete the created config script on uninstall
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
[UninstallDelete]
-Type: files; Name: "{app}\bin\guile.cmd"
Type: files; Name: "{app}\etc\@PACKAGE@\environment"
Type: filesandordirs; Name: "{app}\share\guile"
Type: dirifempty; Name: "{app}\etc\@PACKAGE@"
@@ -409,30 +407,6 @@ begin
StringChange(Result, '\', '/');
end;
-procedure MyAfterInstallConfig();
-var
- FileName, FileString, appdir, libdir, pkglibdir, pkgdatadir: String;
- Res: Boolean;
-begin
-
- { Get the installation-specific paths }
- appdir := ExpandConstant('{app}');
- pkgdatadir := appdir + '\share\@PACKAGE@';
-
- { Create the guile.cmd file; #10 is the linefeed character and #13 CR }
-
- FileName := appdir + '\bin\guile.cmd' ;
- FileString := 'set GUILE_LOAD_PATH=' + pkgdatadir + '\scm;' + appdir + '\share\guile\2.2;%GUILE_LOAD_PATH%'#13#10 ;
- FileString := FileString + 'start guile.exe %*'#13#10 ;
-
- { Save the final file }
-
- Res := SaveStringToFile(FileName, FileString, False);
- if Res = False then
- MsgBox('Error on saving '+FileName+' for completing the installation', mbInformation, MB_OK);
-
-end;
-
function BackslashPath(const S: String): String;
begin
{ Convert c:\soft to c:/soft }
commit a12203d47be909269f91d73f80956bfbc1e9a823
Author: Jannick <thirdedition at gmx.net>
Date: Fri Jan 3 21:55:45 2020 +0100
inno-setup: revert changes relating to working dir of desktop link
inno_setup/gnucash-mingw64.iss:
- revert %USERDOCS%-related changes of 1a89d04.
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 336856e..d30f3d5 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -41,17 +41,17 @@ Name: desktopicon; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm
Name: menuicon; Description: "{cm:CreateMenuLink}"; GroupDescription: "{cm:AdditionalIcons}"
[Icons]
-Name: "{group}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "%USERDOCS%"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: menuicon
+Name: "{group}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "{code:GetDocPath}"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: menuicon
Name: "{group}\{cm:IconName_README}"; Filename: "{app}\doc\@PACKAGE@\{cm:IconFilename_README}"; Comment: "{cm:IconComment_README}"; Tasks: menuicon
Name: "{group}\{cm:IconName_FAQ}"; Filename: "http://wiki.gnucash.org/wiki/FAQ"; Tasks: menuicon
Name: "{group}\{cm:IconName_Bugzilla}"; Filename: "https://bugs.gnucash.org/enter_bug.cgi?product=GnuCash"; Tasks: menuicon
Name: "{group}\{cm:IconName_InstallFQ}"; Filename: "{app}\bin\install-fq-mods.cmd"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_InstallFQ}"; Tasks: menuicon
Name: "{group}\{cm:IconName_Uninstall}"; Filename: "{uninstallexe}"; Comment: "{cm:IconComment_Uninstall}"; Tasks: menuicon
-Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "%USERDOCS%"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: desktopicon
+Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "{code:GetDocPath}"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: desktopicon
[Run]
-Filename: "{app}\bin\@PACKAGE at .exe"; Description: "{cm:RunPrg}"; WorkingDir: "%USERDOCS%"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent
+Filename: "{app}\bin\@PACKAGE at .exe"; Description: "{cm:RunPrg}"; WorkingDir: "{code:GetDocPath}"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent
Filename: "{app}\bin\guile.cmd"; Flags: runhidden
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
commit 6a2d5dae2c76468dcc8ea5c270b25d245028c0fb
Author: Jannick <thirdedition at gmx.net>
Date: Fri Jan 3 06:03:30 2020 +0100
inno-setup: remove trailing white spaces
* inno_setup/gnucash-mingw64.iss: here
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 049efbd..336856e 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -220,8 +220,8 @@ Source: "@GC_WIN_REPOS_DIR@\extra_dist\*"; DestDir: "{app}\bin"; Flags: recurses
Root: HKCR; Subkey: ".gnucash"; ValueType: string; ValueName: ""; ValueData: "GnuCash.Financial.Data"; Flags: uninsdeletevalue
Root: HKCR; Subkey: ".gnucash"; ValueType: string; ValueName: "Content Type"; ValueData: "application/x-gnucash"; Flags: uninsdeletevalue
Root: HKCR; Subkey: "GnuCash.Financial.Data"; ValueType: string; ValueName: ""; ValueData: "GnuCash Financial Data"; Flags: uninsdeletevalue
-Root: HKCR; Subkey: "GnuCash.Financial.Data\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico,0"
-Root: HKCR; Subkey: "GnuCash.Financial.Data\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\bin\@PACKAGE at .exe"" ""%1"""
+Root: HKCR; Subkey: "GnuCash.Financial.Data\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico,0"
+Root: HKCR; Subkey: "GnuCash.Financial.Data\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\bin\@PACKAGE at .exe"" ""%1"""
Root: HKLM; Subkey: "Software\GnuCash"; ValueType: none; Flags: uninsdeletekeyifempty
Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: none; Flags: uninsdeletekeyifempty
@@ -454,7 +454,7 @@ begin
{ Get the installation-specific paths }
EnvFile := ExpandConstant(CurrentFileName);
- EtcDir := ExtractFileDir(EnvFile);
+ EtcDir := ExtractFileDir(EnvFile);
{ Load the current contents of the environment file }
Res := LoadStringsFromFile(EnvFile, EnvStrList);
@@ -740,7 +740,7 @@ hr.IconComment_Uninstall=Deinstaliraj raÄunovodstveni program GnuCash
;; ;;;;;;;;;;;;;;;;;;;;;
;; Italian translation
-; *** Pagina di "Selezione dei componenti"
+; *** Pagina di "Selezione dei componenti"
it.FullInstall=Installazione completa
it.CustomInstall=Installazione personalizzata
it.CreateDesktopIcon=Crea un'icona sul desktop
Summary of changes:
inno_setup/gnucash-mingw64.iss | 34 ++++------------------------------
1 file changed, 4 insertions(+), 30 deletions(-)
More information about the gnucash-changes
mailing list