[cygport - the Cygwin packaging tool] branch master, updated. 0.37.3

[Jon Turney via Cygwin-apps-cvs]

Diff:
---
 NEWS                        |  4 ++++
 cygclass/autotools.cygclass | 17 +++++++++++++++--
 cygclass/cmake.cygclass     |  2 +-
 cygport.spec                |  2 +-
 data/gnuconfig              |  2 +-
 data/sample.cygport         |  2 +-
 meson.build                 |  2 +-
 7 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/NEWS b/NEWS
index cf8d1b46..dc6b7389 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+0.37.3:
+       * cmake: Make the default output froms src_test more useful
+       * Update gnuconfig submodule
+       * autotools: gnuconfigize: prevent downgrade of config.{guess,sub}
 0.37.2:
        * python.org: Also set SRC_DIR appropriately
 0.37.1:
diff --git a/cygclass/autotools.cygclass b/cygclass/autotools.cygclass
index 55be6709..1798725e 100644
--- a/cygclass/autotools.cygclass
+++ b/cygclass/autotools.cygclass
@@ -191,12 +191,25 @@ __parse_aclocal_amflags() {
 #****
 
 gnuconfigize() {
+       local d f ts_old ts_new
+
        (( $# >= 1 )) || error "gnuconfigize: no destinations specified"
 
        for d in $@
        do
-               [ -f $d/config.guess ] || error "gnuconfigize: $d: not a 
gnuconfig directory"
-               cp -f ${_privgnuconfigdir}/config.{guess,sub} $d/
+               for f in config.{guess,sub}
+               do
+                       [ -f ${d}/${f} ] || error "gnuconfigize: $d: not a 
gnuconfig directory"
+                       ts_old=$(sed -n "s/^timestamp='\([-0-9]*\)'.*$/\1/p" 
${d}/${f})
+                       ts_new=$(sed -n "s/^timestamp='\([-0-9]*\)'.*$/\1/p" 
${_privgnuconfigdir}/${f})
+                       if ! [ "${ts_old}" '<' "${ts_new}" ]
+                       then
+                               inform "${f}: not downgrading from '${ts_old}' 
to '${ts_new}'"
+                               continue
+                       fi
+                       cp -f ${_privgnuconfigdir}/${f} ${d}/
+                       inform "${f}: updated from '${ts_old}' to '${ts_new}'"
+               done
        done
 }
 
diff --git a/cygclass/cmake.cygclass b/cygclass/cmake.cygclass
index 216a738c..32a2e564 100644
--- a/cygclass/cmake.cygclass
+++ b/cygclass/cmake.cygclass
@@ -220,7 +220,7 @@ src_compile() {
 #  DEFINITION
 src_test() {
        cd ${B}
-       ctest
+       ctest --output-on-failure
 }
 #****
 
diff --git a/cygport.spec b/cygport.spec
index af3f7a21..89a9b14f 100644
--- a/cygport.spec
+++ b/cygport.spec
@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 
 Name:           cygport
-Version:        0.37.2
+Version:        0.37.3
 Release:        1%{?dist}
 Summary:        Cygwin package building tool
 
diff --git a/data/gnuconfig b/data/gnuconfig
index e78c96e5..a2287c30 160000
--- a/data/gnuconfig
+++ b/data/gnuconfig
@@ -1 +1 @@
-Subproject commit e78c96e5288993aaea3ec44e5c6ee755c668da79
+Subproject commit a2287c3041a3f2a204eb942e09c015eab00dc7dd
diff --git a/data/sample.cygport b/data/sample.cygport
index ce9c9eb5..838b5344 100644
--- a/data/sample.cygport
+++ b/data/sample.cygport
@@ -1,7 +1,7 @@
 inherit meson
 
 NAME="cygport"
-VERSION=0.37.2
+VERSION=0.37.3
 RELEASE=1
 CATEGORY="Devel"
 SUMMARY="Cygwin source packaging tool"
diff --git a/meson.build b/meson.build
index 17d98d8f..d9f5a098 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('cygport',
-        version: '0.37.2')
+        version: '0.37.3')
 
 bindir = join_paths(get_option('prefix'), get_option('bindir'))
 datadir = join_paths(get_option('prefix'), get_option('datadir'))