gnucash-on-windows master: Revert "Use %USERDOCS% for unpack working dir instead of GetDocPath."

John Ralls jralls at code.gnucash.org
Mon Jan 13 15:55:33 EST 2020


Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/98e7d3bf (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/f4359547 (commit)



commit 98e7d3bf65bf29b3e82d41629cee27eefb73aacd
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Jan 13 12:53:59 2020 -0800

    Revert "Use %USERDOCS% for unpack working dir instead of GetDocPath."
    
    This reverts commit 1a89d04bce64efb428462efd934b8a7555f8738c, an
    experiment that shouldn't have been published.

diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 049efbd..aa0ae41 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -41,17 +41,17 @@ Name: desktopicon; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm
 Name: menuicon; Description: "{cm:CreateMenuLink}"; GroupDescription: "{cm:AdditionalIcons}"
 
 [Icons]
-Name: "{group}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "%USERDOCS%"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: menuicon
+Name: "{group}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "{code:GetDocPath}"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: menuicon
 Name: "{group}\{cm:IconName_README}"; Filename: "{app}\doc\@PACKAGE@\{cm:IconFilename_README}"; Comment: "{cm:IconComment_README}"; Tasks: menuicon
 Name: "{group}\{cm:IconName_FAQ}"; Filename: "http://wiki.gnucash.org/wiki/FAQ"; Tasks: menuicon
 Name: "{group}\{cm:IconName_Bugzilla}"; Filename: "https://bugs.gnucash.org/enter_bug.cgi?product=GnuCash"; Tasks: menuicon
 Name: "{group}\{cm:IconName_InstallFQ}"; Filename: "{app}\bin\install-fq-mods.cmd"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_InstallFQ}"; Tasks: menuicon
 Name: "{group}\{cm:IconName_Uninstall}"; Filename: "{uninstallexe}"; Comment: "{cm:IconComment_Uninstall}"; Tasks: menuicon
 
-Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "%USERDOCS%"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: desktopicon
+Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "{code:GetDocPath}"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: desktopicon
 
 [Run]
-Filename: "{app}\bin\@PACKAGE at .exe"; Description: "{cm:RunPrg}"; WorkingDir: "%USERDOCS%"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent
+Filename: "{app}\bin\@PACKAGE at .exe"; Description: "{cm:RunPrg}"; WorkingDir: "{code:GetDocPath}"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent
 Filename: "{app}\bin\guile.cmd"; Flags: runhidden
 
 ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index dbea428..1ed3624 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -239,7 +239,6 @@ $devel = "asciidoc autoconf autoconf2.13 autogen automake-wrapper automake1.10 a
 
 $toolchain = "binutils cmake crt-git gcc gcc-libs gdb headers-git libmangle-git libtool libwinpthread-git make pkg-config tools-git winpthreads-git"
 
-$clang_toolchain = "clang libc++ libc++abi lld libunwind clang-tools-extra compiler-rt"
 
 # Install the system and toolchain:
 $msys_devel = make-pkgnames -prefix "msys/" -items $devel



Summary of changes:
 inno_setup/gnucash-mingw64.iss | 6 +++---
 setup-mingw64.ps1              | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)



More information about the gnucash-changes mailing list