gnucash-on-windows master: Multiple changes pushed

John Ralls jralls at code.gnucash.org
Sun Apr 7 16:11:39 EDT 2019


Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/0ba3a0af (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/5d6f7db2 (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/1a89d04b (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/53b1c603 (commit)



commit 0ba3a0afa26f50f87a00e38a61eac5ebc1516877
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Apr 7 13:11:09 2019 -0700

    Update strawberry perl version to the latest recommended on the website.

diff --git a/extra_dist/getperl.vbs b/extra_dist/getperl.vbs
index 7d66c65..4e2d542 100644
--- a/extra_dist/getperl.vbs
+++ b/extra_dist/getperl.vbs
@@ -9,7 +9,7 @@ Dim fso: Set fso = CreateObject("Scripting.FileSystemObject")
 Dim tempFolder: tempFolder = fso.GetSpecialFolder(TemporaryFolder)
 
 strHDLocation = Wscript.Arguments.Item(0)
-strVersion = "5.28.0.1"
+strVersion = "5.28.1.1"
 
 ' Set your settings
     strFileURL    = "http://strawberryperl.com/download/" & strVersion & "/strawberry-perl-" & strVersion & "-32bit.msi"

commit 5d6f7db24d46e91f168855ce20308f4f42878e1d
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Apr 7 13:08:44 2019 -0700

    Bug 797178 - 3.5 install-fq-mods.cmd requires ssleay32.dll, but it's...
    
    no longer installed as part of GnuCash
    
    Because it's obsolete. Remove the check from install-fq-mods.cmd.

diff --git a/extra_dist/install-fq-mods.cmd b/extra_dist/install-fq-mods.cmd
index d704321..c007430 100644
--- a/extra_dist/install-fq-mods.cmd
+++ b/extra_dist/install-fq-mods.cmd
@@ -1,14 +1,6 @@
 @echo off
 setlocal
 
-REM ----------------------------------------------------------------------------
-if not exist ssleay32.dll (
-  echo.
-  echo Did not find ssleay32.dll in current directory.
-  echo Please start this cmd file in the bin directory created by the setup.exe.
-  goto error
-)
-
 REM ----------------------------------------------------------------------------
 echo.
 echo * Check Perl

commit 1a89d04bce64efb428462efd934b8a7555f8738c
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Mar 21 16:43:49 2019 -0700

    Use %USERDOCS% for unpack working dir instead of GetDocPath.

diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 8548578..e8c21a9 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -41,17 +41,17 @@ Name: desktopicon; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm
 Name: menuicon; Description: "{cm:CreateMenuLink}"; GroupDescription: "{cm:AdditionalIcons}"
 
 [Icons]
-Name: "{group}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "{code:GetDocPath}"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: menuicon
+Name: "{group}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "%USERDOCS%"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: menuicon
 Name: "{group}\{cm:IconName_README}"; Filename: "{app}\doc\@PACKAGE@\{cm:IconFilename_README}"; Comment: "{cm:IconComment_README}"; Tasks: menuicon
 Name: "{group}\{cm:IconName_FAQ}"; Filename: "http://wiki.gnucash.org/wiki/FAQ"; Tasks: menuicon
 Name: "{group}\{cm:IconName_Bugzilla}"; Filename: "http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash"; Tasks: menuicon
 Name: "{group}\{cm:IconName_InstallFQ}"; Filename: "{app}\bin\install-fq-mods.cmd"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_InstallFQ}"; Tasks: menuicon
 Name: "{group}\{cm:IconName_Uninstall}"; Filename: "{uninstallexe}"; Comment: "{cm:IconComment_Uninstall}"; Tasks: menuicon
 
-Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "{code:GetDocPath}"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: desktopicon
+Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\@PACKAGE at .exe"; WorkingDir: "%USERDOCS%"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\@PACKAGE@\pixmaps\gnucash-icon.ico"; Tasks: desktopicon
 
 [Run]
-Filename: "{app}\bin\@PACKAGE at .exe"; Description: "{cm:RunPrg}"; WorkingDir: "{code:GetDocPath}"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent
+Filename: "{app}\bin\@PACKAGE at .exe"; Description: "{cm:RunPrg}"; WorkingDir: "%USERDOCS%"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent
 Filename: "{app}\bin\guile.cmd"; Flags: runhidden
 
 ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index a92405f..4bb4061 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -214,6 +214,7 @@ $devel = "asciidoc autoconf autoconf2.13 autogen automake-wrapper automake1.10 a
 
 $toolchain = "binutils cmake crt-git gcc gcc-libs gdb headers-git libmangle-git libtool libwinpthread-git make pkg-config tools-git winpthreads-git"
 
+$clang_toolchain = "clang libc++ libc++abi lld libunwind clang-tools-extra compiler-rt"
 
 # Note that webkitgtk3 will pull in gtk3 automatically.
 $deps = "webkitgtk3 boost iso-codes shared-mime-info libmariadbclient postgresql ninja ncurses"



Summary of changes:
 extra_dist/getperl.vbs         | 2 +-
 extra_dist/install-fq-mods.cmd | 8 --------
 inno_setup/gnucash-mingw64.iss | 6 +++---
 setup-mingw64.ps1              | 1 +
 4 files changed, 5 insertions(+), 12 deletions(-)



More information about the gnucash-changes mailing list