Re: RFC: time for a new mingwrt/w32api release?
Keith Marshall <[email protected]> Mon, 16 May 2016 16:14:52 +0100
| Newsgroups | gmane.comp.gnu.mingw.devel |
|---|---|
| Organization | MinGW Project |
| Message-ID | <[email protected]> |
This is a multi-part message in MIME format.
--------------090106020908070505040106
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 15/05/16 22:50, Cesar Strauss wrote:
> Em 05-12-2016 18:40, Keith Marshall wrote:
>> To prepare for this, I'm considering:
>>
>> 1) Rename the existing "5.0-dev" branch as "5.0-deferred". 2)
>> Create a new "5.0-dev" branch, based on the tip of "legacy".
>
> Anyone who is tracking locally the old "5.0-dev" branch, and tries
> to pull, will get conflicts, as git tries to merge the two
> branches.
I know; I hoped that might provoke a reaction. It's also why I didn't
just go ahead and do it -- right now, in my hg clone, I have:
$hg bookmarks
4.0-dev 148:6878646b9e6d
4.1-dev 139:ef755022d08c
5.0-active 253:2c9a07dbfed6
5.0-deferred 81:723274c6d978
* cygwin-updates 257:f3d34694666a
legacy 252:7c13c3b4989e
master 118:821fbe0e4347
(Mercurial's bookmarks are the equivalent of git's branches; hg's
branches are altogether more concrete entities).
FWIW, the conflicts would only arise for a user who actually has a
local reference for 5.0-dev, prior to a pull; easily avoided, by a git
remote prune, (to update the remote references), and a local rename of
the offending 5.0-dev branch, *before* the pull.
> On the other hand, there is a good chance that the number of
> affected people, actively tracking the "5.0-dev" branch, is
> actually zero.
That's a metric I hope we might be able to establish, at least as it
relates to participants on this list. I'd like to think that it *is*
zero, since there seems to be no actual head branching from that
label; it appears to be no more than a place holder, currently
referring to the same location as 4.0-rc1, (which begs the question:
why was it designated as 5.0-dev in the first place?)
$ hg heads
changeset: 257:f3d34694666a
bookmark: cygwin-updates
tag: tip
...
changeset: 253:2c9a07dbfed6
bookmark: 5.0-dev
...
changeset: 148:6878646b9e6d
bookmark: 4.0-dev
tag: default/4.0-dev
...
changeset: 139:ef755022d08c
bookmark: 4.1-dev
tag: default/4.1-dev
$ hg tags
tip 257:f3d34694666a
default/legacy 252:7c13c3b4989e
mingwrt-3.21.1-release 189:283116261e25
mingwrt-3.21-release 182:e6ff0d91cb50
default/4.0-dev 148:6878646b9e6d
default/4.1-dev 139:ef755022d08c
default/master 118:821fbe0e4347
4.0.2 116:d85ed4c5f45a
4.0.1 113:2c3b39234ed9
4.0.0 112:f6babc931a5d
default/5.0-dev 81:723274c6d978
4.0-rc1 81:723274c6d978
>> 3) Implement an integrated build infrastructure, preserving the
>> existing separate package configuration, but building both
>> together, with enforced version number synchronization.
>
> Interesting. Will there be only one source tarball?
No. One common repository, but "make dist" would preserve the two
distinct source tarballs, (for now). We could consider augmenting,
(or replacing), those with an additional integrated tarball, later.
> Will "make install" create a mix of the two packages in
> $prefix/include
Yes, (if a common prefix is used for "make install" in both package
sub-directories) ... and
> and $prefix/lib, which the packager will have to untangle later?
no, "make dist" will install into two distinct staging prefixes, so
maintaining integrity of the two separate binary distributions. FWIW,
my first step in integration is specified by the attached patch.
- --
Regards,
Keith.
Public key available from keys.gnupg.net
Key fingerprint: C19E C018 1547 DE50 E1D4 8F53 C0AD 36C6 347E 5A3F
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (GNU/Linux)
iQIcBAEBAgAGBQJXOePsAAoJEMCtNsY0flo/RegP/Rq+u4tYVzi/JctdEprs8P0F
IDltja14/Lu3GNcojBJSm4Z3Ry1lp7h91GHyfaKnTJkkMpmozOUoKVkal/pwkd8E
0EeJI/ai8edeK0GY5KEslpBljIjAKjNC2aoLRBfUw968mNt9Tyj6LeOxKTcdt0am
An6IpblHOlOVBb8RgyF9XqEqcO0f9mRrsyUUmuSZkAi256UXd7DWZOVLVwrEDdX2
QP3TcoQKOUJD/CZq0LmSeK8ezj7xR1+HeZLvKQZ8b6aKC8n0eLwxdcGMO9eTgPgd
LFd6hopSnm8XvLGicAzZnhmNt5+92zjBn91j2Vi/elTBfICu3afvjviDDwwYJjcg
jk1NJfWOD16jBf3hidUQSUQOS+klbbcNOtU7f/Il5enfo4dBYuZNyP7xTVzhknrS
SF1A+pu2rxwyJ1Cgl92+UxKsxH76sc+gcNDJuksNCl7Ks9Cr37eW1UAbvEOM21X2
IYaatPnk4Tx+VzJx+WcKv1T13DJNuNmgHLkjM3/VdhlLZtihD+lLi3tz3CXUJE2M
3zV61iSjwfNMy43M7GFJInYDNEaX+BdtztRgWBSYkDVc6/YTE8bIkPiDB79v55q2
pZDc7rWJ3voE74KmoKfQ581fagMluoCTuWB1RzVhA+fRJ5JImoyIfRqpTfifFeuW
2BT/Qqd0PaHY0wsgiWJJ
=oJV8
-----END PGP SIGNATURE-----
--------------090106020908070505040106
Content-Type: text/x-patch;
name="integration.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="integration.patch"
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
+2016-05-12 Keith Marshall <[email protected]>
+
+ Integrate mingwrt and w32api build; synchronize versions.
+
+ * configure.ac Makefile.in: New files.
+
+ * VERSION.m4: New file; link it, to create and maintain an identical
+ copy of it, in each of the mingwrt and w32api sub-package directories.
+ (__VERSION__): New macro; define and initialize it, in preparation
+ for forthcoming integrated version 5.0 release.
+
+ * aclocal.m4: New file; link it, to make it an identical copy of
+ each identically named file, in each of the sub-package directories.
+ (__VERSION__): New macro; include VERSION.m4 to define it.
+ (__BUG_REPORT_URL__): New macro; define it.
+
2014-10-22 Keith Marshall <[email protected]>
Merge .hgignore from "master" branch to "legacy".
* .hgignore: New file.
diff --git a/Makefile.in b/Makefile.in
new file mode 100644
--- /dev/null
+++ b/Makefile.in
@@ -0,0 +1,114 @@
+# @configure_input@
+# $Id$
+#
+# Makefile template for MinGW.org composite System Libraries Packages
+
+PACKAGE_TARNAME := @PACKAGE_TARNAME@
+PACKAGE_VERSION := @PACKAGE_VERSION@
+
+# Written by Keith Marshall <[email protected]>
+# Copyright (C) 2016, MinGW.org Project
+#
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+
+# The default target is "all"; declare it early, to avoid any possible
+# inadvertent override from any included file.
+#
+all:
+
+# Configuration
+# -------------
+#
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+
+# Keep the configuration in a consistent state. Note that we assume
+# that configure has been run initially, (otherwise we wouldn't have
+# a Makefile to begin with); since this also creates config.status,
+# we may normally assume that it is already available ...
+#
+vpath configure ${top_srcdir}
+config.status: configure
+ $(SHELL) config.status --recheck
+
+# ... in which case, updating Makefile should be a simple matter of
+# running config.status ...
+#
+vpath Makefile.in ${top_srcdir}
+requires_existing = $(if $(wildcard $1),$1,$1.missing)
+Makefile: Makefile.in configure $(call requires_existing,config.status)
+ $(SHELL) config.status
+
+.PHONY: config.status.missing
+# ... but, in the event that this may be missing, (e.g. because it
+# has been manually removed, or removed by "make distclean"), suggest
+# running configure, and bail out.
+#
+config.status.missing:
+ $(warning *** cannot execute config.status)
+ $(error please run ${top_srcdir}/configure to regenerate it.)
+
+# If configure itself needs to be updated, we must run autoconf in the
+# top level source directory.
+#
+vpath %.m4 ${top_srcdir}
+vpath configure.ac ${top_srcdir}
+configure: configure.ac aclocal.m4 VERSION.m4
+ cd ${top_srcdir}; autoconf
+
+
+# Rules to Build and Install Both Sub-Packages
+# --------------------------------------------
+#
+all install install-headers uninstall: %: %-subdirs
+
+subdirs = @subdirs@
+%-subdirs:; $(foreach dir,${subdirs},$(MAKE) -C ${dir} $*;)
+
+
+# Distribution
+# ------------
+#
+MKDIR_P = @MKDIR_P@
+LN = @LN@
+
+dist: dist-subdirs
+ $(RM) -r $@; $(MKDIR_P) $@
+ for file in $(addsuffix /$@/*,${subdirs}); do \
+ test -f $$file && $(LN) $$file $@; done
+
+
+# Clean-up Rules
+# --------------
+#
+clean mostlyclean distclean: %: %-subdirs
+maintainer-clean: maintainer-clean-warning maintainer-clean-local
+
+maintainer-clean-warning:
+ $(warning $(MAKE) $(@:%-warning=%))
+ $(warning This command should be used by package maintainers only;)
+ $(warning it deletes files which may require special tools to rebuild.)
+
+maintainer-clean-local: %: %-subdirs
+ $(RM) -r ${srcdir}/autom4te.cache
+
+# $RCSfile$: end of file
diff --git a/VERSION.m4 b/VERSION.m4
new file mode 100644
--- /dev/null
+++ b/VERSION.m4
@@ -0,0 +1,11 @@
+# VERSION.m4 -- vim: filetype=config
+#
+# $Id$
+#
+# Non-copyrightable material; adjust the following definition, to
+# assign a common version number to each of the mingwrt and w32api
+# MinGW System Library sub-packages.
+
+m4_define([__VERSION__],[5.0])
+
+# $RCSfile$: end of file
diff --git a/aclocal.m4 b/aclocal.m4
new file mode 100644
--- /dev/null
+++ b/aclocal.m4
@@ -0,0 +1,169 @@
+## aclocal.m4 -*- Autoconf -*- vim: filetype=config
+##
+## Autoconf macros for MinGW.org Runtime Library Package
+##
+## $Id$
+##
+## Written by Keith Marshall <[email protected]>
+## Copyright (C) 2014, 2016, MinGW.org Project
+##
+##
+m4_include([VERSION.m4])
+m4_define([__BUG_REPORT_URL__],[http://mingw.org/Reporting_Bugs])
+##
+##
+## Permission is hereby granted, free of charge, to any person obtaining a
+## copy of this software and associated documentation files (the "Software"),
+## to deal in the Software without restriction, including without limitation
+## the rights to use, copy, modify, merge, publish, distribute, sublicense,
+## and/or sell copies of the Software, and to permit persons to whom the
+## Software is furnished to do so, subject to the following conditions:
+##
+## The above copyright notice and this permission notice (including the next
+## paragraph) shall be included in all copies or substantial portions of the
+## Software.
+##
+## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+## OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+## AUTHORS OR THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+## FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+## DEALINGS IN THE SOFTWARE.
+##
+
+# MINGW_AC_CONFIG_EXTRA_SRCDIR( PACKAGE, WITNESS_FILE )
+# -----------------------------------------------------
+# Identify the top source directory for a sibling PACKAGE, which
+# provides WITNESS_FILE, and set AC_SUBST variable PACKAGE_srcdir
+# to its path relative to the build directory. Prefers a sibling
+# directory of ${srcdir} named exactly PACKAGE, but falls back to
+# PACKAGE*, and then to *PACKAGE*, if necessary.
+#
+AC_DEFUN_ONCE([MINGW_AC_CONFIG_EXTRA_SRCDIR],
+[AC_MSG_CHECKING([location of $1 source files])
+ for ac_dir in ${srcdir}/../$1 ${srcdir}/../$1* ${srcdir}/../*$1*
+ do test -f $ac_dir/$2 && { $1_srcdir=$ac_dir; break; }; done
+ AC_MSG_RESULT([$$1_srcdir])
+ AC_SUBST([$1_srcdir])dnl
+])
+
+# MINGW_AC_NO_EXECUTABLES
+# -----------------------
+# When building the runtime and W32 API libraries with only
+# a partially installed compiler, as we will be required to do
+# between the stage-1 and stage-2 phases of building GCC itself,
+# autoconf's _AC_COMPILER_EXEEXT may choke because the runtime
+# library itself is not yet available; here, we have provided
+# a redefined "do-nothing" version, which will avoid this mode
+# of failure, while retaining the original test for subsequent
+# use, after verifying that it should not fail.
+#
+AC_DEFUN_ONCE([MINGW_AC_NO_EXECUTABLES],
+[AC_BEFORE([$0],[AC_PROG_CC])dnl cannot let this use...
+ m4_rename([_AC_COMPILER_EXEEXT],[_MINGW_AC_COMPILER_EXEEXT])dnl so...
+ m4_define([_AC_COMPILER_EXEEXT])dnl move it away quickly!
+])
+
+# MINGW_AC_PROG_CC_COMPILE_ONLY
+# -----------------------------
+# A wrapper for AC_PROG_CC, ensuring that it will not succumb to
+# the failure mode described above, while still running the checks
+# provided by the original _AC_COMPILER_EXEEXT macro, when the
+# circumstances of failure do not prevail.
+#
+AC_DEFUN_ONCE([MINGW_AC_PROG_CC_COMPILE_ONLY],
+[AC_REQUIRE([MINGW_AC_NO_EXECUTABLES])dnl no need for linking
+ AC_LINK_IFELSE([AC_LANG_PROGRAM],dnl minimal 'int main(){return 0;}'
+ [_MINGW_AC_COMPILER_EXEEXT],dnl can create executables anyway!
+ [_MINGW_AC_COMPILER_NO_EXECUTABLES])dnl
+])
+
+# _MINGW_AC_COMPILER_NO_EXECUTABLES
+# ---------------------------------
+# Package specific diagnostics for the case where the compiler
+# really does succumb to the _AC_COMPILER_EXEEXT failure mode; in
+# this case, we allow the build to proceed, but we disallow the
+# building of executables and shared libraries by default.
+#
+AC_DEFUN([_MINGW_AC_COMPILER_NO_EXECUTABLES],
+[AC_MSG_CHECKING([whether the C compiler can create executables])
+ AC_MSG_RESULT([${may_enable_stage_2=no}])
+ AC_MSG_WARN([$CC compiler cannot create executables!])
+ AC_MSG_WARN([build will proceed to completion of stage-1 only;])
+ AC_MSG_WARN([no executables or shared libraries will be built.])
+])
+
+# MINGW_AC_DISABLE_STAGE_2
+# ------------------------
+# Implement the '--disable-stage-2' configure option, such that
+# it activates the non-failing _AC_COMPILER_EXEEXT behaviour, as
+# described above; default is to proceed with the stage-2 build,
+# provided the compiler is determined to be able to support it.
+#
+AC_DEFUN_ONCE([MINGW_AC_DISABLE_STAGE_2],
+[AC_ARG_ENABLE([stage-2],
+ [AS_HELP_STRING([--disable-stage-2],
+ [disable building of DLL components which require a fully installed compiler;
+ this option may be used during the compiler build process, to permit building
+ of the libraries required before commencing stage-2 of the compiler build.
+ ])dnl
+ ],[],dnl
+ [enable_stage_2=auto])dnl let compiler capability govern
+])
+
+# MINGW_AC_MAKE_COMMAND_GOALS
+# ---------------------------
+# Resolve choice of whether stage-2 should be built or not, in
+# favour of user's preference, if supported by the compiler; by
+# default prefer to build, if possible. Propagate the resolved
+# choice as a default make command goal, by assignment to the
+# AC_SUBST variable, DEFAULT_MAKECMDGOALS.
+#
+AC_DEFUN_ONCE([MINGW_AC_MAKE_COMMAND_GOALS],
+[AC_REQUIRE([MINGW_AC_DISABLE_STAGE_2])dnl
+ AC_REQUIRE([MINGW_AC_PROG_CC_COMPILE_ONLY])dnl
+ AC_MSG_CHECKING([whether to complete stage-2 build])
+ ac_val="user's choice"
+ AS_CASE([$enable_stage_2],dnl
+ [auto],[enable_stage_2=${may_enable_stage_2-yes};dnl
+ test x$enable_stage_2 = xyes && ac_val="default choice" dnl
+ || ac_val="compiler override"],dnl
+ [yes],[enable_stage_2=${may_enable_stage_2-yes};dnl
+ test x$enable_stage_2 = xyes || ac_val="compiler override"dnl
+ ])
+ AC_MSG_RESULT([$enable_stage_2 ($ac_val)])
+ test "x$enable_stage_2" = xno dnl
+ && DEFAULT_MAKECMDGOALS=all-stage-1-only dnl
+ || DEFAULT_MAKECMDGOALS=all-stage-1-and-2
+ AC_SUBST([DEFAULT_MAKECMDGOALS])
+])
+
+# MINGW_AC_PROG_COMPILE_SX
+# ------------------------
+# Determine how to invoke GCC to compile *.sx asssembly language
+# files, and provide a suitable derivative of GNU make's COMPILE.S
+# rule in AC_SUBST variable 'COMPILE_SX'. Note that GCC itself has
+# supported direct compilation of such files from version 4.3 onward,
+# (earlier versions require the '-x assembler-with-cpp' hint), but
+# GNU make does not provide a complementary built-in rule.
+#
+AC_DEFUN([MINGW_AC_PROG_COMPILE_SX],
+[AC_REQUIRE([AC_PROG_CC])dnl
+ AC_MSG_CHECKING([for $CC option to compile .sx files])
+ rm -f conftest.sx conftest.$OBJEXT; : > conftest.sx
+ ac_compile_sx='$CC -c $ASFLAGS $CPPFLAGS $ac_val conftest.sx >&5'
+ for ac_val in "" "-x assembler-with-cpp"; do
+ (eval $ac_compile_sx) 2>&5 && test -f conftest.$OBJEXT && break
+ done
+ AC_SUBST([COMPILE_SX],[`echo '$(COMPILE.S)' $ac_val`])
+ test "x$ac_val" = x && ac_val="none needed"
+ test -f conftest.$OBJEXT || ac_val="not supported"
+ AC_MSG_RESULT([$ac_val])
+ rm -f conftest.sx conftest.$OBJEXT
+ test "x$ac_val" = "xnot supported" && {
+ AC_MSG_FAILURE([$CC cannot compile .sx files])
+ }dnl
+])
+
+# $RCSfile$: end of file
diff --git a/configure.ac b/configure.ac
new file mode 100644
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,42 @@
+# configure.ac -*- Autoconf -*- vim: filetype=config
+#
+# Process this file with autoconf, to create a configure script for
+# the composite MinGW.org Runtime Library and Win32-API packages.
+#
+# $Id$
+#
+# Written by Keith Marshall <[email protected]>
+# Copyright (C) 2016, MinGW.org Project
+#
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+ AC_PREREQ([2.64])
+ AC_INIT([MinGW System Libraries],[__VERSION__],[__BUG_REPORT_URL__],[wsl])
+ AC_CONFIG_AUX_DIR([mingwrt])
+
+ AC_PROG_MKDIR_P
+ AC_PATH_PROG([LN],[ln],[ln])
+
+ AC_CONFIG_SUBDIRS([mingwrt w32api])
+ AC_CONFIG_FILES([Makefile])
+ AC_OUTPUT
+#
+# $RCSfile$: end of file
diff --git a/mingwrt/ChangeLog b/mingwrt/ChangeLog
--- a/mingwrt/ChangeLog
+++ b/mingwrt/ChangeLog
@@ -1,5 +1,24 @@
+2016-05-12 Keith Marshall <[email protected]>
+
+ Synchronize package version management with Win32-API.
+
+ * VERSION.m4: New file; link it to keep in sync with identically named
+ file in top level composite package source directory; it defines...
+ (__VERSION__): ...this new composite package version macro.
+
+ * aclocal.m4: Link it, to keep in sync with identically named files in
+ top level composite source and sibling w32api sub-package directories.
+ (__VERSION__): New macro; include VERSION.m4 to define it.
+ (__BUG_REPORT_URL__): New macro; define it.
+
+ * configure.ac (AC_INIT): Assign package version and bug report URL...
+ (__VERSION__, __BUG_REPORT_URL__): ...from these, as defined through
+ automatic inclusion of aclocal.m4
+
+ * Makefile.in (configure): Add dependency on VERSION.m4
+
2016-05-12 Keith Marshall <[email protected]>
Resolve some strnlen() implementation issues.
* mingwex/strnlen.s (__mingw_strnlen) [!NUL]: Correct termination
diff --git a/mingwrt/Makefile.in b/mingwrt/Makefile.in
--- a/mingwrt/Makefile.in
+++ b/mingwrt/Makefile.in
@@ -136,11 +136,11 @@ config.status.missing:
# If configure itself needs to be updated, we must run autoconf in the
# top level source directory.
#
vpath %.m4 ${top_srcdir}
vpath configure.ac ${top_srcdir}
-configure: configure.ac aclocal.m4
+configure: configure.ac aclocal.m4 VERSION.m4
cd ${top_srcdir}; autoconf
# Propagate package version, as configured, consistently throughout
# the package build.
#
diff --git a/mingwrt/VERSION.m4 b/mingwrt/VERSION.m4
new file mode 100644
--- /dev/null
+++ b/mingwrt/VERSION.m4
@@ -0,0 +1,11 @@
+# VERSION.m4 -- vim: filetype=config
+#
+# $Id$
+#
+# Non-copyrightable material; adjust the following definition, to
+# assign a common version number to each of the mingwrt and w32api
+# MinGW System Library sub-packages.
+
+m4_define([__VERSION__],[5.0])
+
+# $RCSfile$: end of file
diff --git a/mingwrt/aclocal.m4 b/mingwrt/aclocal.m4
--- a/mingwrt/aclocal.m4
+++ b/mingwrt/aclocal.m4
@@ -3,24 +3,28 @@
## Autoconf macros for MinGW.org Runtime Library Package
##
## $Id$
##
## Written by Keith Marshall <[email protected]>
-## Copyright (C) 2014, MinGW.org Project
+## Copyright (C) 2014, 2016, MinGW.org Project
+##
+##
+m4_include([VERSION.m4])
+m4_define([__BUG_REPORT_URL__],[http://mingw.org/Reporting_Bugs])
##
##
## Permission is hereby granted, free of charge, to any person obtaining a
## copy of this software and associated documentation files (the "Software"),
## to deal in the Software without restriction, including without limitation
## the rights to use, copy, modify, merge, publish, distribute, sublicense,
## and/or sell copies of the Software, and to permit persons to whom the
## Software is furnished to do so, subject to the following conditions:
-##
+##
## The above copyright notice and this permission notice (including the next
## paragraph) shall be included in all copies or substantial portions of the
## Software.
-##
+##
## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
## OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
## AUTHORS OR THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
@@ -113,11 +117,11 @@ AC_DEFUN_ONCE([MINGW_AC_DISABLE_STAGE_2]
# Resolve choice of whether stage-2 should be built or not, in
# favour of user's preference, if supported by the compiler; by
# default prefer to build, if possible. Propagate the resolved
# choice as a default make command goal, by assignment to the
# AC_SUBST variable, DEFAULT_MAKECMDGOALS.
-#
+#
AC_DEFUN_ONCE([MINGW_AC_MAKE_COMMAND_GOALS],
[AC_REQUIRE([MINGW_AC_DISABLE_STAGE_2])dnl
AC_REQUIRE([MINGW_AC_PROG_CC_COMPILE_ONLY])dnl
AC_MSG_CHECKING([whether to complete stage-2 build])
ac_val="user's choice"
diff --git a/mingwrt/configure.ac b/mingwrt/configure.ac
--- a/mingwrt/configure.ac
+++ b/mingwrt/configure.ac
@@ -27,11 +27,11 @@
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
#
AC_PREREQ([2.64])
- AC_INIT([MinGW C Runtime],[3.21.2],[http://mingw.org/Reporting_Bugs],[mingwrt])
+ AC_INIT([MinGW C Runtime],[__VERSION__],[__BUG_REPORT_URL__],[mingwrt])
AC_PREFIX_DEFAULT([/mingw])
AC_CONFIG_SRCDIR([include/_mingw.h.in])
MINGW_AC_CONFIG_EXTRA_SRCDIR([w32api],[include/w32api.h.in])
MINGW_AC_PROG_CC_COMPILE_ONLY
diff --git a/w32api/ChangeLog b/w32api/ChangeLog
--- a/w32api/ChangeLog
+++ b/w32api/ChangeLog
@@ -1,5 +1,24 @@
+2016-05-12 Keith Marshall <[email protected]>
+
+ Synchronize package version management with MinGW Runtime.
+
+ * VERSION.m4: New file; link it to keep in sync with identically named
+ file in top level composite package source directory; it defines...
+ (__VERSION__): ...this new composite package version macro.
+
+ * aclocal.m4: Link it, to keep in sync with identically named files in
+ top level composite source and sibling mingwrt sub-package directories.
+ (__VERSION__): New macro; include VERSION.m4 to define it.
+ (__BUG_REPORT_URL__): New macro; define it.
+
+ * configure.ac (AC_INIT): Assign package version and bug report URL...
+ (__VERSION__, __BUG_REPORT_URL__): ...from these, as defined through
+ automatic inclusion of aclocal.m4
+
+ * Makefile.in (configure): Add dependency on VERSION.m4
+
2016-05-04 Keith Marshall <[email protected]>
Eliminate redundant <parts/winioctl.h> header.
* include/parts/winioctl.h: Delete it; distribute its content...
diff --git a/w32api/Makefile.in b/w32api/Makefile.in
--- a/w32api/Makefile.in
+++ b/w32api/Makefile.in
@@ -108,11 +108,11 @@ config.status.missing:
# If configure itself needs to be updated, we must run autoconf in the
# top level source directory.
#
vpath %.m4 ${top_srcdir}
vpath configure.ac ${top_srcdir}
-configure: configure.ac aclocal.m4
+configure: configure.ac aclocal.m4 VERSION.m4
cd ${top_srcdir}; autoconf
# Propagate package version, as configured, consistently throughout
# the package build.
#
diff --git a/w32api/VERSION.m4 b/w32api/VERSION.m4
new file mode 100644
--- /dev/null
+++ b/w32api/VERSION.m4
@@ -0,0 +1,11 @@
+# VERSION.m4 -- vim: filetype=config
+#
+# $Id$
+#
+# Non-copyrightable material; adjust the following definition, to
+# assign a common version number to each of the mingwrt and w32api
+# MinGW System Library sub-packages.
+
+m4_define([__VERSION__],[5.0])
+
+# $RCSfile$: end of file
diff --git a/w32api/aclocal.m4 b/w32api/aclocal.m4
--- a/w32api/aclocal.m4
+++ b/w32api/aclocal.m4
@@ -3,24 +3,28 @@
## Autoconf macros for MinGW.org Runtime Library Package
##
## $Id$
##
## Written by Keith Marshall <[email protected]>
-## Copyright (C) 2014, MinGW.org Project
+## Copyright (C) 2014, 2016, MinGW.org Project
+##
+##
+m4_include([VERSION.m4])
+m4_define([__BUG_REPORT_URL__],[http://mingw.org/Reporting_Bugs])
##
##
## Permission is hereby granted, free of charge, to any person obtaining a
## copy of this software and associated documentation files (the "Software"),
## to deal in the Software without restriction, including without limitation
## the rights to use, copy, modify, merge, publish, distribute, sublicense,
## and/or sell copies of the Software, and to permit persons to whom the
## Software is furnished to do so, subject to the following conditions:
-##
+##
## The above copyright notice and this permission notice (including the next
## paragraph) shall be included in all copies or substantial portions of the
## Software.
-##
+##
## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
## OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
## AUTHORS OR THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
@@ -113,11 +117,11 @@ AC_DEFUN_ONCE([MINGW_AC_DISABLE_STAGE_2]
# Resolve choice of whether stage-2 should be built or not, in
# favour of user's preference, if supported by the compiler; by
# default prefer to build, if possible. Propagate the resolved
# choice as a default make command goal, by assignment to the
# AC_SUBST variable, DEFAULT_MAKECMDGOALS.
-#
+#
AC_DEFUN_ONCE([MINGW_AC_MAKE_COMMAND_GOALS],
[AC_REQUIRE([MINGW_AC_DISABLE_STAGE_2])dnl
AC_REQUIRE([MINGW_AC_PROG_CC_COMPILE_ONLY])dnl
AC_MSG_CHECKING([whether to complete stage-2 build])
ac_val="user's choice"
diff --git a/w32api/configure.ac b/w32api/configure.ac
--- a/w32api/configure.ac
+++ b/w32api/configure.ac
@@ -27,11 +27,11 @@
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
#
AC_PREREQ([2.64])
- AC_INIT([MinGW Win32 API],[3.18],[http://mingw.org/Reporting_Bugs],[w32api])
+ AC_INIT([MinGW Win32 API],[__VERSION__],[__BUG_REPORT_URL__],[w32api])
AC_PREFIX_DEFAULT([/mingw])
AC_CONFIG_SRCDIR([include/w32api.h.in])
MINGW_AC_CONFIG_EXTRA_SRCDIR([mingwrt],[include/_mingw.h.in])
--------------090106020908070505040106
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
------------------------------------------------------------------------------
Mobile security can be enabling, not merely restricting. Employees who
bring their own devices (BYOD) to work are irked by the imposition of MDM
restrictions. Mobile Device Manager Plus allows you to control only the
apps on BYO-devices by containerizing them, leaving personal data untouched!
https://ad.doubleclick.net/ddm/clk/304595813;131938128;j
--------------090106020908070505040106
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
_______________________________________________
MinGW-dvlpr mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mingw-dvlpr
--------------090106020908070505040106--