gnucash-on-windows master: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Sat Jul 29 14:56:56 EDT 2017
Updated via https://github.com/Gnucash/gnucash-on-windows/commit/6a521864 (commit)
via https://github.com/Gnucash/gnucash-on-windows/commit/0959f562 (commit)
via https://github.com/Gnucash/gnucash-on-windows/commit/c3f1da3e (commit)
from https://github.com/Gnucash/gnucash-on-windows/commit/c2e01c1f (commit)
commit 6a52186450c6367d6d2640eab6dde12d56c3ddb8
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jul 29 11:55:22 2017 -0700
Package build script.
This is the one to put in scheduled tasks.
Note that the transfer instructions to code are disabled.
diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
new file mode 100644
index 0000000..c7363ab
--- /dev/null
+++ b/buildserver/build_package.ps1
@@ -0,0 +1,98 @@
+# build_package.ps1: Powershell Script to build gnucash with MinGW64
+# Copyright 2017 John Ralls <jralls at ceridwen.us>
+#
+# 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
+
+<#
+.SYNOPSIS
+
+Builds a gnucash installer and copies it to code.gnucash.org.
+
+.DESCRIPTION
+
+Updates gnucash-on-windows from origin, updates the MinGW-w64
+installation, builds gnucash and dependencies with jhbuild, makes an
+installer with bundle-mingw64.ps1, and secure-copies the installer and
+session transcript to the download server.
+
+This script must not be moved from the gnucash-on-windows.git working
+directory.
+
+You may need to allow running scripts on your computer and depending
+on where the target_dir is you may need to run the script with
+Administrator privileges.
+
+.PARAMETER target_dir
+
+Optional. The root path to the build environment. Defaults to the root of the script's path, e.g. if the script's path is C:\gcdev64\src\gnucash-on-windows.git\bundle-mingw64.ps1 the default target_dir will be C:\gcdev64.
+
+#>
+
+[CmdletBinding()]
+Param([Parameter()] [string]$target_dir)
+
+$script_dir = Split-Path $script:MyInvocation.MyCommand.Path | Split-Path
+$root_dir = Split-Path $script_dir | Split-Path
+$package = "gnucash"
+if (!$target_dir) {
+ $target_dir = $root_dir
+}
+
+$progressPreference = 'silentlyContinue'
+
+function bash-command() {
+ param ([string]$command = "")
+ if (!(test-path -path $target_dir\msys2\usr\bin\bash.exe)) {
+ write-host "Shell program not found, aborting."
+ return
+ }
+ #write-host "Running bash command ""$command"""
+ Start-Process -FilePath "$target_dir\msys2\usr\bin\bash.exe" -ArgumentList "-c ""export PATH=/usr/bin; $command""" -NoNewWindow -Wait
+}
+
+function make-unixpath([string]$path) {
+ $path -replace "^([A-Z]):", '/$1' -replace "\\", '/'
+}
+$script_unix = make-unixpath -path $script_dir
+$target_unix = make-unixpath -path $target_dir
+
+$hostname = "upload at code.gnucash.org:public_html/win32"
+$log_dir = "build-logs"
+
+#Make sure that there's no running transcript, then start one:
+$start_time = get-date -format "yyyy-MM-dd-hh-mm-ss"
+$time_stamp = get-date -format "Build Begun yyyy-MM-dd hh:mm:ss"
+$log_file = "$target_dir\gnucash-build-log-$start_time.log"
+$log_unix = make-unixpath -path $log_file
+bash-command -command "echo $time_stamp > $log_unix"
+#copy the file to the download server so that everyone can see we've started
+#bash-command -command "scp $target_unix/$log_file $hostname/$log_dir/"
+
+# Update MinGW-w64
+bash-command -command "pacman -Su --noconfirm >> $log_unix 2>&1"
+
+# Update the gnucash-on-windows repository
+#bash-command -command "cd $script_unix && git reset --hard && git pull --rebase"
+# Build the latest GnuCash and all dependencies not installed via mingw64
+bash-command -command "jhbuild -f $script_unix/jhbuildrc build gnucash >> $log_unix 2>&1"
+#Build the installer
+& $script_dir\bundle-mingw64.ps1 -target_dir $target_dir 2>&1 | Out-File -FilePath $log_file -Append -Encoding UTF8
+$time_stamp = get-date -format "Build Ended yyyy-MM-dd hh:mm:ss"
+bash-command -command "echo $time_stamp >> $log_unix"
+# Copy the transcript and installer to the download server and delete them.
+#bash-command "scp $log_unix $hostname/$log_dir/"
+#bash-command "scp $target_unix/gnucash*setup.exe $hostname/master"
\ No newline at end of file
commit 0959f5627f3c221a364dfe14b0fc219ab325d674
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jul 29 11:53:10 2017 -0700
Use jhbuildrc's current directory to find gnucash.modules.
diff --git a/jhbuildrc.in b/jhbuildrc.in
index 316e496..2135ac3 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -31,8 +31,8 @@ def add_to_path_var(var, path):
os.environ[var] = os.environ[var] + ":" + path
_basedir = "@-BASE_DIR-@"
-_downloaddir = "@-DOWNLOAD_DIR-@"
-_config_dir = os.path.join(_basedir, 'src', 'gnucash-on-windows.git')
+_download_dir = "@-DOWNLOAD_DIR-@"
+_config_dir = os.path.dirname(os.path.realpath(__file__))
prefix = os.path.join(_basedir, 'inst')
checkoutroot = os.path.join(_basedir, 'src')
buildroot = os.path.join(_basedir, 'build')
commit c3f1da3ee613aa0546490e1c80336a6533de0bfa
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jul 29 10:20:52 2017 -0700
Generalize libicu version to avoid problems when MinGW64 updates to new version.
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index b49a30a..5f7c2cf 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -148,9 +148,9 @@ Source: "@MINGW_DIR@\bin\libharfbuzz-0.dll"; DestDir: "{app}\bin"; Components: m
Source: "@MINGW_DIR@\bin\libharfbuzz-icu-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libhogweed-4.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libiconv-2.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\libicudt57.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\libicuin57.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\libicuuc57.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libicudt*.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libicuin*.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libicuuc*.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libidn-11.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libintl-8.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libjavascriptcoregtk-3.0-0.dll"; DestDir: "{app}\bin"; Components: main
Summary of changes:
buildserver/build_package.ps1 | 98 ++++++++++++++++++++++++++++++++++++++++++
inno_setup/gnucash-mingw64.iss | 6 +--
jhbuildrc.in | 4 +-
3 files changed, 103 insertions(+), 5 deletions(-)
create mode 100644 buildserver/build_package.ps1
More information about the gnucash-changes
mailing list