Updated package to exec-helper commit f1c9bf9cac6c8bf503ba64c16aacb62f5e22c762

3 files changed, 61 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ccf3ed1cc691..214a6f03f7f7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,14 @@
 pkgbase = exec-helper
 	pkgdesc = How To Get Coffee In Peace: a shell meta-wrapper
-	pkgver = 0.4.0_0_gde0cb04
+	pkgver = 0.4.1_0_g00a582a
 	pkgrel = 1
 	url = https://github.com/bverhagen/exec-helper
 	changelog = exec-helper.changelog
 	arch = i686
 	arch = x86_64
 	license = GPL3
+	checkdepends = catch2
+	checkdepends = rapidcheck
 	makedepends = cmake
 	makedepends = boost
 	makedepends = make
@@ -14,11 +16,11 @@ pkgbase = exec-helper
 	makedepends = graphviz
 	makedepends = git
 	makedepends = pkg-config
-	makedepends = microsoft-gsl-git
+	makedepends = microsoft-gsl
 	makedepends = lsb-release
 	depends = yaml-cpp
 	depends = boost-libs
-	source = exec-helper::git+https://github.com/bverhagen/exec-helper.git#commit=de0cb04beee38af0ffef7d9988d56727e14bc0d4
+	source = exec-helper::git+https://github.com/bverhagen/exec-helper.git#commit=00a582a51caf832ec57bb1422a8c6acaf2e8de0a
 	md5sums = SKIP
 
 pkgname = exec-helper
diff --git a/PKGBUILD b/PKGBUILD
index a2da29a2e122..0b08b68e132e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Bart Verhagen <barrie.verhagen@gmail.com>
 pkgname=('exec-helper' 'exec-helper-docs')
 pkgbase='exec-helper'
-pkgver=0.4.0_0_gde0cb04
+pkgver=0.4.1_0_g00a582a
 pkgrel=1
 epoch=
 pkgdesc="How To Get Coffee In Peace: a shell meta-wrapper"
@@ -10,8 +10,8 @@ url="https://github.com/bverhagen/exec-helper"
 license=('GPL3')
 groups=()
 depends=(yaml-cpp boost-libs)
-makedepends=(cmake boost make doxygen graphviz git pkg-config microsoft-gsl-git lsb-release)
-checkdepends=()
+makedepends=(cmake boost make doxygen graphviz git pkg-config microsoft-gsl lsb-release)
+checkdepends=(catch2 rapidcheck)
 optdepends=()
 provides=()
 conflicts=()
@@ -20,31 +20,45 @@ backup=()
 options=()
 install=
 changelog=exec-helper.changelog
-source=('exec-helper::git+https://github.com/bverhagen/exec-helper.git#commit=de0cb04beee38af0ffef7d9988d56727e14bc0d4')
+source=('exec-helper::git+https://github.com/bverhagen/exec-helper.git#commit=00a582a51caf832ec57bb1422a8c6acaf2e8de0a')
 noextract=()
 validpgpkeys=()
 
 _build_dir='build'
 
+_nb_of_cores=$(grep -c ^processor /proc/cpuinfo)
+
 pkgver() {
     printf "%s" $pkgver
 }
 
 build() {
     _system_description=$(lsb_release --description --short | sed 's/"//g')
-    _source_version=0.4.0_0_gde0cb04
+    _source_version=0.4.1_0_g00a582a
     _release_version="($_system_description) $_source_version"
     _copyright="Copyright (c) $(date +'%Y') Bart Verhagen"
 
-    _git_dir='exec-helper'
+    _git_dir="exec-helper"
     _exec_helper_build_targets=('exec-helper' 'docs-man')
     _exec_helper_docs_build_targets=('docs-html')
 
-    cmake -G "Unix Makefiles" -H"$_git_dir" -B"$_build_dir" -DCMAKE_BUILD_TYPE=Release -DUSE_SYSTEM_YAML_CPP=ON -DUSE_SYSTEM_GSL=ON -DBUILD_HTML_DOCUMENTATION=ON -DBUILD_MAN_DOCUMENTATION=ON -DENABLE_TESTING=OFF -DENABLE_WERROR=OFF -DVERSION="$_release_version" -DCOPYRIGHT="$_copyright"
-    _nb_of_cores=$(grep -c ^processor /proc/cpuinfo)
+    cmake -G "Unix Makefiles" -H"$_git_dir" -B"$_build_dir" -DCMAKE_INSTALL_PREFIX="$pkgdir/usr/" -DCMAKE_BUILD_TYPE=Release -DUSE_SYSTEM_YAML_CPP=ON -DUSE_SYSTEM_GSL=ON -DBUILD_HTML_DOCUMENTATION=ON -DBUILD_MAN_DOCUMENTATION=ON -DENABLE_TESTING=OFF -DENABLE_WERROR=OFF -DVERSION="$_release_version" -DCOPYRIGHT="$_copyright"
     make --directory "$_build_dir" --jobs ${_nb_of_cores} ${_exec_helper_build_targets[@]} ${_exec_helper_docs_build_targets[@]}
 }
 
+check() {
+    # It only makes sense to run the complete 'system test suite' (called integration by exec-helper devs) here
+    _exec_helper_test_targets=('integration' 'execution-content' 'docs-man-integration')
+
+    # Only define the cmake settings on top of the ones defined in build()
+    cmake -H"$_git_dir" -B"$_build_dir" -DUSE_SYSTEM_CATCH=ON -DUSE_SYSTEM_RAPIDCHECK=ON -DENABLE_TESTING=ON -DENABLE_WERROR=OFF
+    make --directory "$_build_dir" --jobs ${_nb_of_cores} ${_exec_helper_test_targets[@]}
+
+    _install_dir="$pkgdir/usr/"
+    cd $_build_dir
+    PATH="${PWD}/src/applications:${PWD}/test/base-utils/application/:$PATH" "test/integration/exec-helper-integration-test"
+}
+
 package_exec-helper() {
     cmake -DCOMPONENT=runtime -DCMAKE_INSTALL_PREFIX="$pkgdir/usr" -P "$_build_dir/cmake_install.cmake"
     cmake -DCOMPONENT=docs-man -DCMAKE_INSTALL_PREFIX="$pkgdir/usr" -P "$_build_dir/cmake_install.cmake"
diff --git a/exec-helper.changelog b/exec-helper.changelog
index b1a9062f7f54..8531c2e15c6d 100644
--- a/exec-helper.changelog
+++ b/exec-helper.changelog
@@ -2,6 +2,40 @@ Changelog
 =========
 
 
+0.4.1 (2019-10-08)
+------------------
+
+New
+~~~
+- CI: Added CI for build + installer through AppVeyor. [Bart Verhagen]
+- Usr: Windows version now searches .windows.exec-helper in the
+  directory tree. [Bart Verhagen]
+- Usr: Building documentation can now be switched on or off anywhere.
+  Doxygen is no longer required if all documentation is switched off.
+  [Bart Verhagen]
+- Usr: Github Markdown and Doxygen share the same page sources now.
+  Added simple example to README. [Bart Verhagen]
+
+  Is should now be much easier for interested new users to understand what exec-helper does
+- Usr: Patterns are now also replaced in environment keys and values.
+  [Bart Verhagen]
+- Usr: Added feature documentation and tests on setting fixed values for
+  the environment in the configuration. [Bart Verhagen]
+- Usr: Changed microsoft-gsl-git dependency to more generic microsoft-
+  gsl one. [Bart Verhagen]
+- Usr: Added Windows build and installer. [Bart Verhagen]
+- CI: Rescheduled projects within same stage in order to optimize CI
+  throughput time. [Bart Verhagen]
+- Usr: Added feature documentation and tests for the command line help
+  and version option. [Bart Verhagen]
+- CI: Optimized build context for the jobs in the build-image stage.
+  [Bart Verhagen]
+
+Fix
+~~~
+- CI: Fixed provider for microsoft-gsl for CI. [Bart Verhagen]
+
+
 0.4.0 (2018-12-20)
 ------------------