Menu
▾
▴
[MinGW-cvs] [git push mingw-org-wsl]Repository: mingw-org-wsl branch 5.0-active updated. ddc8f81e4256cd01807ec822b8ec458143473156
|
From: Keith M. <no...@so...> - 2017-03-09 21:58:12
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Repository: mingw-org-wsl".
The branch, 5.0-active has been updated
via ddc8f81e4256cd01807ec822b8ec458143473156 (commit)
via a94ded612ec67b5e83958133350dd35f6249f461 (commit)
via bf92cdedba8242b72ad479d10cc6041c449d43a8 (commit)
from 9c8d6c73fbb29b52062b1dcdaf104a615980ef00 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://sf.net/p/mingw/mingw-org-wsl/ci/ddc8f81e4256cd01807ec822b8ec458143473156/
commit ddc8f81e4256cd01807ec822b8ec458143473156
Author: Keith Marshall <kei...@us...>
Date: Thu Mar 9 21:19:05 2017 +0000
Fix generated header file version dependencies.
diff --git a/mingwrt/ChangeLog b/mingwrt/ChangeLog
index b8ee2a7..2051e3c 100644
--- a/mingwrt/ChangeLog
+++ b/mingwrt/ChangeLog
@@ -1,5 +1,14 @@
2017-03-09 Keith Marshall <kei...@us...>
+ Fix generated header file dependencies.
+
+ * Makefile.in (_mingw.h, w32api): Make them depend on changes in...
+ [VERSION.m4]: ...this; package version changes are no longer made...
+ [configure.ac]: ...here; delete associated prerequisite reference.
+ (distclean-local): Delete them.
+
+2017-03-09 Keith Marshall <kei...@us...>
+
Strip optional DLLs, when staging for distribution.
* Makefile.in (mingwrt-%-optist): Recursively make...
diff --git a/mingwrt/Makefile.in b/mingwrt/Makefile.in
index eef0dbc..e9bcee2 100644
--- a/mingwrt/Makefile.in
+++ b/mingwrt/Makefile.in
@@ -148,7 +148,8 @@ configure: configure.ac aclocal.m4 VERSION.m4
vpath _mingw.h.in ${top_srcdir}/include
vpath w32api.h.in ${w32api_srcdir}/include
-_mingw.h w32api.h: configure.ac
+_mingw.h w32api.h: %.h: %.h.in VERSION.m4
+ $(PACKAGE_VERSION_SCRIPT) $< > $@
PACKAGE_VERSION_SCRIPT = sed \
-e s"`$(call PACKAGE_VERSION_FORMAT,LONG,%d,$$3+1000*($$2+1000*$$1))`" \
@@ -160,9 +161,6 @@ PACKAGE_VERSION_FORMAT = echo $(PACKAGE_VERSION).0.0 | awk -F. '{ \
printf ",%%PACKAGE_VERSION_$1%%,$2,", $3; \
}'
-_mingw.h w32api.h: %.h: %.h.in
- $(PACKAGE_VERSION_SCRIPT) $< > $@
-
# Capture dependencies conveyed within source files, ensuring that
# header files are taken from our working source tree, and not from
# the build-time compiler's installation path. (Note: we use -MD,
@@ -1045,7 +1043,7 @@ mostlyclean-local:
$(RM) *.d *.$(OBJEXT) Makefile.stub *.libimpl
distclean-local: clean-local
- $(RM) config.log config.status libm_dummy.c
+ $(RM) config.log config.status libm_dummy.c _mingw.h w32api.h
maintainer-clean-warning:
$(warning $(MAKE) $(@:%-warning=%))
diff --git a/w32api/ChangeLog b/w32api/ChangeLog
index 718daa7..fd2bc27 100644
--- a/w32api/ChangeLog
+++ b/w32api/ChangeLog
@@ -1,3 +1,12 @@
+2017-03-09 Keith Marshall <kei...@us...>
+
+ Fix generated header file dependencies.
+
+ * Makefile.in (_mingw.h, w32api): Make them depend on changes in...
+ [VERSION.m4]: ...this; package version changes are no longer made...
+ [configure.ac]: ...here; delete associated prerequisite reference.
+ (distclean-local): Delete them.
+
2017-03-08 Keith Marshall <kei...@us...>
Prepare and tag for release of w32api-5.0 package set.
diff --git a/w32api/Makefile.in b/w32api/Makefile.in
index b6d7b83..2ee7204 100644
--- a/w32api/Makefile.in
+++ b/w32api/Makefile.in
@@ -119,7 +119,8 @@ configure: configure.ac aclocal.m4 VERSION.m4
#
vpath %.h.in ${top_srcdir}/include ${mingwrt_srcdir}/include
-w32api.h _mingw.h: configure.ac
+w32api.h _mingw.h: %.h: %.h.in VERSION.m4
+ $(PACKAGE_VERSION_SCRIPT) $< > $@
PACKAGE_VERSION_SCRIPT = sed \
-e s"`$(call PACKAGE_VERSION_FORMAT,LONG,%d,$$3+1000*($$2+1000*$$1))`" \
@@ -131,9 +132,6 @@ PACKAGE_VERSION_FORMAT = echo $(PACKAGE_VERSION).0.0 | awk -F. '{ \
printf ",%%PACKAGE_VERSION_$1%%,$2,", $3; \
}'
-w32api.h _mingw.h: %.h: %.h.in
- $(PACKAGE_VERSION_SCRIPT) $< > $@
-
# Capture dependencies conveyed within source files, ensuring that
# header files are taken from our working source tree, and not from
# the build-time compiler's installation path. (Note: we use -MD,
@@ -395,7 +393,7 @@ mostlyclean-local:
$(RM) *.d *.$(OBJEXT)
distclean-local: clean-local
- $(RM) config.log config.status
+ $(RM) config.log config.status _mingw.h w32api.h
maintainer-clean-warning:
$(warning $(MAKE) $(@:%-warning=%))
https://sf.net/p/mingw/mingw-org-wsl/ci/a94ded612ec67b5e83958133350dd35f6249f461/
commit a94ded612ec67b5e83958133350dd35f6249f461
Author: Keith Marshall <kei...@us...>
Date: Thu Mar 9 09:46:34 2017 +0000
Strip optional DLLs, when staging for distribution.
diff --git a/mingwrt/ChangeLog b/mingwrt/ChangeLog
index b3e201b..b8ee2a7 100644
--- a/mingwrt/ChangeLog
+++ b/mingwrt/ChangeLog
@@ -1,3 +1,11 @@
+2017-03-09 Keith Marshall <kei...@us...>
+
+ Strip optional DLLs, when staging for distribution.
+
+ * Makefile.in (mingwrt-%-optist): Recursively make...
+ (install-strip-$*-optional-dll): ...this internal target, not...
+ (install-$*-optional-dll): ...this.
+
2017-03-08 Keith Marshall <kei...@us...>
Prepare and tag for release of mingwrt-5.0 package set.
diff --git a/mingwrt/Makefile.in b/mingwrt/Makefile.in
index c6ad956..eef0dbc 100644
--- a/mingwrt/Makefile.in
+++ b/mingwrt/Makefile.in
@@ -971,7 +971,7 @@ optional_dll_package = $(shell echo '$2' | sed s,^[^:]*,mingwrt-$1-optdist)
mingwrt-%-optdist:
$(RM) -r tmp
- $(MAKE) --no-print-directory prefix=`pwd`/tmp install-$*-optional-dll
+ $(MAKE) --no-print-directory prefix=`pwd`/tmp install-strip-$*-optional-dll
cd tmp && tar chf - --hard-dereference bin | \
xz -c > ../dist/$*-$(PACKAGE_RELEASE_TAG)-dll-$(dllsuffix).tar.xz
cd tmp && tar chf - --hard-dereference lib | \
https://sf.net/p/mingw/mingw-org-wsl/ci/bf92cdedba8242b72ad479d10cc6041c449d43a8/
commit bf92cdedba8242b72ad479d10cc6041c449d43a8
Author: Keith Marshall <kei...@us...>
Date: Thu Mar 9 09:26:38 2017 +0000
MinGW.org WSL-5.0 released; update repository version.
diff --git a/ChangeLog b/ChangeLog
index 55f1f6b..ccc46c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-03-09 Keith Marshall <kei...@us...>
+
+ MinGW.org WSL-5.0 released; update repository version.
+
+ * VERSION.m4 (__VERSION__): Increment it to 5.0.1, anticipating a
+ possible patch release prior to WSL-5.1
+
2017-03-08 Keith Marshall <kei...@us...>
Prepare and tag for release of MinGW.org WSL-5.0
diff --git a/VERSION.m4 b/VERSION.m4
index 4e412b8..98c127a 100644
--- a/VERSION.m4
+++ b/VERSION.m4
@@ -6,7 +6,7 @@
# assign a common version number to each of the mingwrt and w32api
# MinGW System Library sub-packages.
#
-m4_define([__VERSION__],[5.0])
+m4_define([__VERSION__],[5.0.1])
# This is also a convenient place to specify the import library
# associations, and DLLVERSION information for each DLL which may
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 7 +++++++
VERSION.m4 | 2 +-
mingwrt/ChangeLog | 17 +++++++++++++++++
mingwrt/Makefile.in | 10 ++++------
w32api/ChangeLog | 9 +++++++++
w32api/Makefile.in | 8 +++-----
6 files changed, 41 insertions(+), 12 deletions(-)
hooks/post-receive
--
Repository: mingw-org-wsl
|
