gnucash-on-windows master: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Thu Aug 22 07:59:57 EDT 2019
Updated via https://github.com/Gnucash/gnucash-on-windows/commit/03242a92 (commit)
via https://github.com/Gnucash/gnucash-on-windows/commit/b1a9e078 (commit)
from https://github.com/Gnucash/gnucash-on-windows/commit/5a24c7e0 (commit)
commit 03242a92e8d9cd5cf72f30068611c943a500682a
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu Aug 22 13:56:32 2019 +0200
Revert "Store build logs in subdirectories per branch and per month"
The build server currently doesn't have rsync permissions to the webhost.
This commit can be restored once the proper permissions are there.
This reverts commit 8073b34c5c1a52a6ef37dba33e1173291192b7d4.
diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index 4c85a10..2b462d3 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -99,7 +99,7 @@ bash-command -command "cd $script_unix && git pull"
bash-command -command "echo Build Started $time_stamp > $log_unix"
#copy the file to the download server so that everyone can see we've started
if ($hostname) {
- bash-command -command "$script_unix/buildserver/upload_build_log.sh $log_unix $hostname $log_dir $branch"
+ bash-command -command "scp -p $log_unix $hostname/$log_dir/"
}
# Update MinGW-w64
@@ -142,7 +142,7 @@ bash-command -command "echo Build Ended $time_stamp >> $log_unix"
# Copy the transcript and installer to the download server and delete them.
if ($hostname) {
- bash-command -command "$script_unix/buildserver/upload_build_log.sh $log_unix $hostname $log_dir $branch"
+ bash-command -command "scp -p $log_unix $hostname/$log_dir/"
if ($new_file) {
bash-command -command "scp -p $setup_file $hostname/$branch"
}
diff --git a/buildserver/upload_build_log.sh b/buildserver/upload_build_log.sh
deleted file mode 100755
index 78ff21d..0000000
--- a/buildserver/upload_build_log.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#! /bin/bash
-#
-# A function to upload build logs
-# If a branch is known it will upload to
-# build-logs/branch/yyyy-mm/logfile
-# otherwise it will upload to
-# build-logs/logfile
-
-log_file=$1
-host=$2
-log_dir=$3
-remote_branch_dir=$4
-base_dir=$(pwd) # A dummy base directory used in rsync
-
-# This function will create a remote directory
-# It will only run if $host is configured.
-# Note it assumes the parent directory exists and it won't
-# create intermediate subdirectories if that is not the case
-function create_remote_dir()
-{
- if [[ -n "$host" ]]
- then
- # For this hack $base_dir is just an arbitrary existing directory
- # It doesn't matter which one
- # No files will be copied from it anyway because of the exclude parameter
- rsync -a --exclude='*' "$base_dir"/ "$1"
- fi
-}
-
-if [[ -n "$host" ]]
-then
- echo "Uploading log file '$(basename $log_file)'"
- create_remote_dir "$host"/build-logs
- if [[ -z "$remote_branch_dir" ]]
- then
- # We don't know the build type yet, so we can't determine
- # the final remote directory to store it
- # So let's just store it in the top-level so we have a trace
- # of the build start or very early failures
- rsync -a "$log_file" "$host"/build-logs
- else
- # Now the subdirectory to store the log file is is known
- # In addition group per month to simplify navigation even more
- month_part=$(date +%Y-%m)
-
- create_remote_dir "$host"/build-logs/$remote_branch_dir
- create_remote_dir "$host"/build-logs/$remote_branch_dir/$month_part
-
- rsync -a "$log_file" "$host"/build-logs/$remote_branch_dir/$month_part
-
- # Finally remove the initially start build log uploaded earlier
- # Disable fatal error handling though to prevent the complete script from exiting
- # if no early build log exists
- echo "Removing initial startup build log uploaded earlier"
- set +ex
- rsync -rv --delete --include="$(basename $log_file)" --exclude='*' "$base_dir"/ "$host"/build-logs/
- set -ex
- fi
-fi
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 2851ff3..2b2b72a 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -234,7 +234,7 @@ bash-command -command "pacman -Syyuu --noconfirm"
# Set up aliases for the parts of msys-devtools and mingw-w64-toolchain that
# we need:
-$devel = "asciidoc autoconf autoconf2.13 autogen automake-wrapper automake1.10 automake1.11 automake1.12 automake1.13 automake1.14 automake1.15 automake1.6 automake1.7 automake1.8 automake1.9 bison diffstat diffutils dos2unix file flex gawk gettext gettext-devel gperf grep groff intltool libtool m4 make man-db pacman pactoys-git patch patchutils perl pkg-config rsync2 sed swig texinfo texinfo-tex wget xmlto git jhbuild-git texinfo"
+$devel = "asciidoc autoconf autoconf2.13 autogen automake-wrapper automake1.10 automake1.11 automake1.12 automake1.13 automake1.14 automake1.15 automake1.6 automake1.7 automake1.8 automake1.9 bison diffstat diffutils dos2unix file flex gawk gettext gettext-devel gperf grep groff intltool libtool m4 make man-db pacman pactoys-git patch patchutils perl pkg-config sed swig texinfo texinfo-tex wget xmlto git jhbuild-git texinfo"
$toolchain = "binutils cmake crt-git gcc gcc-libs gdb headers-git libmangle-git libtool libwinpthread-git make pkg-config tools-git winpthreads-git"
commit b1a9e078c4f20a3d67416c04ca2d4f1334db1c91
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu Aug 22 13:55:34 2019 +0200
Restore "Update gnucash-mingw64.iss library versions to match latest mingw64 update."
This was unintentionally reverted
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 66e3a50..a407c86 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -111,7 +111,7 @@ Source: "@INST_DIR@\share\doc\@PACKAGE at -docs\*.hhmap"; DestDir: "{app}\share\@PA
;;;; The second section retrieves the dependencies that we need from MinGW.
;; Required DLLs
;; gnucash.exe: libglib-2.0-0.dll, libgtk-3-0.dll, ligdk-3-0.dll, libatk-1.0-dll, libgobject-2.0-0.dll, libintl-8.dll, libcairo-gobject-2.dll, libcairo-2.dll, libfontconfig-1.0.dll, libfreetype-6.dll, libpixman-1-0.dll, libpng16-16.dll, zlib1.dll, libgdk-pixbuf-2.0-0.dll, libgio-2.0-0.dll, libgmodule-2.0-0.dll, libpango-1.0-0.dll, libpangocairo-1.0-0.dll, libpangowin32-1.0-0.dll, libpangoft2-1.0-0.dll, libharfbuzz-0.dll, libfribidi-0.dll, libiconv-2.dll, libwinpthread-1.dll, libsystre-0.dll, libxml2-2.dll, libxslt-1.dll, libboost_regex-mt.dll, libicuuc57.dll, libicudt57.dll, libtre-5.dll, libffi-6.dll, libgmp-10.dll, libltdl-7.dll
-;; AQBanking: libgcrypt-20.dll, libgnutls-30.dll, libwinpthread-1.0.dll, libgmp-10.dll, libhogweed-4.dll, libidn-11.dll, libintl-8.dll, libnettle-6.dll, libp11-kit-0.dll, libtasn1-6.dll, zlib1.dll, libgpg-error-0.dll, libiconv-2.dll, libintl-8.dll, libgtk-win32-2.0-0.dll
+;; AQBanking: libgcrypt-20.dll, libgnutls-30.dll, libwinpthread-1.0.dll, libgmp-10.dll, libhogweed-5.dll, libidn-11.dll, libintl-8.dll, libnettle-7.dll, libp11-kit-0.dll, libtasn1-6.dll, zlib1.dll, libgpg-error-0.dll, libiconv-2.dll, libintl-8.dll, libgtk-win32-2.0-0.dll
;; libwebkit: libenchant.dll, libgeoclue-0.dll, libgstapp-1.0-0.dll, libgstaudio-1.0-0.dll, libgstbase-1.0-0.dll, libgstfft-1.0-0.dll, libgstpbutils-1.0-0.dll, libgstpbutils-1.0-0.dll, libgstreamer-1.0-0.dll, libgstvideo-1.0-0.dll, libharfbuzz-icu-0.dll, liborc-0.4-0.dll, libgsttag-1.0-0.dll, libgraphite2.dll, libicuin57.dll, liicuuc57.dll, libicudt57.dll, libsoup-2.4-1.dll, libsqlite3-0.dll, libwebp-7.dll
;;lib/dbd/libdbdmysql.dll: mariadb.dll, libeay32.dll, ssleay32.dll
;;lib/dbd/libdbdpgsql.dll: libpq.dll, ssleay32.dll, libeay32.dll
@@ -164,7 +164,7 @@ Source: "@MINGW_DIR@\bin\libgtk-3-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libgtk-win32-2.0-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libharfbuzz-0.dll"; DestDir: "{app}\bin"; Components: main
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\libhogweed-5.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libiconv-2.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
@@ -175,7 +175,7 @@ Source: "@MINGW_DIR@\bin\libjavascriptcoregtk-3.0-0.dll"; DestDir: "{app}\bin";
Source: "@MINGW_DIR@\bin\libjpeg-8.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libltdl-7.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\liblzma-5.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\libnettle-6.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libnettle-7.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\liborc-0.4-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libp11-kit-0.dll"; DestDir: "{app}\bin"; Components: main
Source: "@MINGW_DIR@\bin\libpango-1.0-0.dll"; DestDir: "{app}\bin"; Components: main
Summary of changes:
buildserver/build_package.ps1 | 4 +--
buildserver/upload_build_log.sh | 59 -----------------------------------------
inno_setup/gnucash-mingw64.iss | 6 ++---
setup-mingw64.ps1 | 2 +-
4 files changed, 6 insertions(+), 65 deletions(-)
delete mode 100755 buildserver/upload_build_log.sh
More information about the gnucash-changes
mailing list