+2016-05-03 Keith Marshall <keithmarshall@users.sourceforge.net>
+
+ Enforce consistent specification of package version.
+
+ * include/_mingw.h: Rename as...
+ * include/_mingw.h.in: ...this build-time template file.
+ (__MINGW32_VERSION): Redefine it, in terms of...
+ (%PACKAGE_VERSION_LONG%): ...this substitution template.
+ (__MINGW32_MAJOR_VERSION, __MINGW32_MINOR_VERSION)
+ (__MINGW32_PATCHLEVEL): Likewise, redefine them in terms of...
+ (%PACKAGE_VERSION_MAJOR%, %PACKAGE_VERSION_MINOR%)
+ (%PACKAGE_VERSION_PATCH%): ...these.
+
+ * configure.ac (AC_CONFIG_SRCDIR): Adjust for renamed file.
+ (MINGW_AC_CONFIG_EXTRA_SRCDIR): Likewise, for similarly renamed
+ w32api/include/w32api.h.in file.
+
+ * Makefile.in (all-mingwrt-stage-1-only): Add dependency on...
+ (_mingw.h, w32api.h): ...these; add rule to generate them, using...
+ (PACKAGE_VERSION_SCRIPT, PACKAGE_VERSION_FORMAT): ...these new macros;
+ they apply appropriate substitutions to the renamed template files.
+ (install-mingwrt-headers): Explicitly add _mingwrt.h
+
2016-04-30 Keith Marshall <keithmarshall@users.sourceforge.net>
Make strnlen() available for all MSVCRT.DLL versions.
PACKAGE_VERSION := @PACKAGE_VERSION@
# Written by Keith Marshall <keithmarshall@users.sourceforge.net>
-# Copyright (C) 2014, 2015, MinGW.org Project
+# Copyright (C) 2014-2016, MinGW.org Project
#
#
# Permission is hereby granted, free of charge, to any person obtaining a
NM = @NM@
all: @DEFAULT_MAKECMDGOALS@
+all-mingwrt-stage-1-only: _mingw.h w32api.h
all-mingwrt-stage-1-only: all-mingwrt-objects all-mingwrt-libs
all-mingwrt-stage-1-and-2: all-mingwrt-stage-1-only all-mingwrt-dll
all-mingwrt: all-mingwrt-stage-1-and-2
configure: configure.ac aclocal.m4
cd ${top_srcdir}; autoconf
+# Propagate package version, as configured, consistently throughout
+# the package build.
+#
+vpath _mingw.h.in ${top_srcdir}/include
+vpath w32api.h.in ${w32api_srcdir}/include
+
+_mingw.h w32api.h: configure.ac
+
+PACKAGE_VERSION_SCRIPT = sed \
+ -e s"`$(call PACKAGE_VERSION_FORMAT,LONG,%d,$$3+1000*($$2+1000*$$1))`" \
+ -e s"`$(call PACKAGE_VERSION_FORMAT,MAJOR,%7d,$$1)`" \
+ -e s"`$(call PACKAGE_VERSION_FORMAT,MINOR,%7d,$$2)`" \
+ -e s"`$(call PACKAGE_VERSION_FORMAT,PATCH,%7d,$$3)`"
+
+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,
SUB_HEADERS_PRESENT = echo $1/include/$2/*.h | grep -v '[*]' > /dev/null
INSTALL_SUB_HEADERS = $(call INSTALL_DATA,$1/include/$2/*.h,${includedir}/$2)
-install-mingwrt-headers: mingwrt-includedirs
+install-mingwrt-headers: _mingw.h mingwrt-includedirs
+ $(call INSTALL_DATA,_mingw.h,${includedir})
$(call INSTALL_DATA,${mingwrt_srcdir}/include/*.h,${includedir})
for dir in $(mingwrt_include_subdirs); do \
if $(call SUB_HEADERS_PRESENT,${mingwrt_srcdir},$$dir); then \
# $Id$
#
# Written by Keith Marshall <keithmarshall@users.sourceforge.net>
-# Copyright (C) 2014, 2015, MinGW.org Project
+# Copyright (C) 2014-2016, MinGW.org Project
#
#
# Permission is hereby granted, free of charge, to any person obtaining a
# DEALINGS IN THE SOFTWARE.
#
AC_PREREQ([2.64])
- AC_INIT([MinGW Runtime],[3.21.1],[http://mingw.org/Reporting_Bugs],[mingwrt])
+ AC_INIT([MinGW C Runtime],[3.21.2],[http://mingw.org/Reporting_Bugs],[mingwrt])
AC_PREFIX_DEFAULT([/mingw])
- AC_CONFIG_SRCDIR([include/_mingw.h])
- MINGW_AC_CONFIG_EXTRA_SRCDIR([w32api],[include/w32api.h])
+ AC_CONFIG_SRCDIR([include/_mingw.h.in])
+ MINGW_AC_CONFIG_EXTRA_SRCDIR([w32api],[include/w32api.h.in])
MINGW_AC_PROG_CC_COMPILE_ONLY
MINGW_AC_PROG_COMPILE_SX
* which encodes the version as a long integer value, expressing:
*
* __MINGW32_VERSION = 1,000,000 * major + 1,000 * minor + patch
+ *
+ * DO NOT EDIT these package version assignments manually; they are
+ * derived from the package version specification within configure.ac,
+ * whence they are propagated automatically, at package build time.
*/
-#define __MINGW32_VERSION 3021001L
-#define __MINGW32_MAJOR_VERSION 3
-#define __MINGW32_MINOR_VERSION 21
-#define __MINGW32_PATCHLEVEL 1
+#define __MINGW32_VERSION %PACKAGE_VERSION_LONG%L
+#define __MINGW32_MAJOR_VERSION %PACKAGE_VERSION_MAJOR%
+#define __MINGW32_MINOR_VERSION %PACKAGE_VERSION_MINOR%
+#define __MINGW32_PATCHLEVEL %PACKAGE_VERSION_PATCH%
#if __GNUC__ >= 3 && ! defined __PCC__
#pragma GCC system_header
+2016-05-03 Keith Marshall <keithmarshall@users.sourceforge.net>
+
+ Enforce consistent specification of package version.
+
+ * include/w32api.h: Rename as...
+ * include/w32api.h.in: ...this build-time template file.
+ (__W32API_VERSION): Redefine it, in terms of...
+ (%PACKAGE_VERSION_LONG%): ...this substitution template.
+ (__W32API_MAJOR_VERSION, __W32API_MINOR_VERSION)
+ (__W32API_PATCHLEVEL): Likewise, redefine them in terms of...
+ (%PACKAGE_VERSION_MAJOR%, %PACKAGE_VERSION_MINOR%)
+ (%PACKAGE_VERSION_PATCH%): ...these.
+
+ * configure.ac (AC_CONFIG_SRCDIR): Adjust for renamed file.
+ (MINGW_AC_CONFIG_EXTRA_SRCDIR): Likewise, for similarly renamed
+ mingwrt/include/_mingw.h.in file.
+
+ * Makefile.in (all-w32api-libs): Add dependency on...
+ (w32api.h, _mingw.h): ...these; add rule to generate them, using...
+ (PACKAGE_VERSION_SCRIPT, PACKAGE_VERSION_FORMAT): ...these new macros;
+ they apply appropriate substitutions to the renamed template files.
+ (install-w32api-headers): Explicitly add w32api.h
+
2015-11-14 Keith Marshall <keithmarshall@users.sourceforge.net>
Refactor for Windows DDK synchronization; fix MinGW-Bug [#1954].
PACKAGE_VERSION := @PACKAGE_VERSION@
# Written by Keith Marshall <keithmarshall@users.sourceforge.net>
-# Copyright (C) 2014, 2015, MinGW.org Project
+# Copyright (C) 2014-2016, MinGW.org Project
#
#
# Permission is hereby granted, free of charge, to any person obtaining a
configure: configure.ac aclocal.m4
cd ${top_srcdir}; autoconf
+# Propagate package version, as configured, consistently throughout
+# the package build.
+#
+vpath w32api.h.in ${top_srcdir}/include
+vpath _mingw.h.in ${mingwrt_srcdir}/include
+
+w32api.h _mingw.h: configure.ac
+
+PACKAGE_VERSION_SCRIPT = sed \
+ -e s"`$(call PACKAGE_VERSION_FORMAT,LONG,%d,$$3+1000*($$2+1000*$$1))`" \
+ -e s"`$(call PACKAGE_VERSION_FORMAT,MAJOR,%7d,$$1)`" \
+ -e s"`$(call PACKAGE_VERSION_FORMAT,MINOR,%7d,$$2)`" \
+ -e s"`$(call PACKAGE_VERSION_FORMAT,PATCH,%7d,$$3)`"
+
+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,
implibfiles = $(addprefix lib,$(subst .def,.a,$(call deffiles,$1)))
all: all-w32api-libs
+all-w32api-libs: w32api.h _mingw.h
all-w32api-libs install-w32api-libs: $(call implibfiles,${srcdir}/lib)
all-w32api-libs install-w32api-libs: $(call implibfiles,${srcdir}/lib/directx)
all-w32api-libs install-w32api-libs: $(call implibfiles,${srcdir}/lib/ddk)
w32api-lib-dirs: libdir
install-headers: install-w32api-headers
-install-w32api-headers: w32api-include-dirs
- $(call INSTALL_DATA,${srcdir}/include/*.h,${includedir})
+install-w32api-headers: w32api.h w32api-include-dirs
+ $(call INSTALL_DATA,w32api.h ${srcdir}/include/*.h,${includedir})
for dir in $(w32api_extra_include_dirs); do \
$(call INSTALL_DATA,${srcdir}/include/$$dir/*.h,${includedir}); \
done
# $Id$
#
# Written by Keith Marshall <keithmarshall@users.sourceforge.net>
-# Copyright (C) 2015, MinGW.org Project
+# Copyright (C) 2015, 2016, MinGW.org Project
#
#
# Permission is hereby granted, free of charge, to any person obtaining a
# DEALINGS IN THE SOFTWARE.
#
AC_PREREQ([2.64])
- AC_INIT([Win32 API],[3.18],[http://mingw.org/Reporting_Bugs],[w32api])
+ AC_INIT([MinGW Win32 API],[3.18],[http://mingw.org/Reporting_Bugs],[w32api])
AC_PREFIX_DEFAULT([/mingw])
- AC_CONFIG_SRCDIR([include/w32api.h])
- MINGW_AC_CONFIG_EXTRA_SRCDIR([mingwrt],[include/_mingw.h])
+ AC_CONFIG_SRCDIR([include/w32api.h.in])
+ MINGW_AC_CONFIG_EXTRA_SRCDIR([mingwrt],[include/_mingw.h.in])
MINGW_AC_PROG_CC_COMPILE_ONLY
* $Id$
*
* Written by Earnie Boyd <earnie@users.sourceforge.net>
- * Copyright (C) 2001-2011, 2015, MinGW.org Project
+ * Copyright (C) 2001-2011, 2015, 2016, MinGW.org Project
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* expressing:
*
* __W32API_VERSION = 1,000,000 * major + 1,000 * minor + patch
+ *
+ * DO NOT EDIT these package version assignments manually; they are
+ * derived from the package version specification within configure.ac,
+ * whence they are propagated automatically, at package build time.
*/
-#define __W32API_VERSION 3017000L
-#define __W32API_MAJOR_VERSION 3
-#define __W32API_MINOR_VERSION 17
-#define __W32API_PATCH_LEVEL 0
+#define __W32API_VERSION %PACKAGE_VERSION_LONG%L
+#define __W32API_MAJOR_VERSION %PACKAGE_VERSION_MAJOR%
+#define __W32API_MINOR_VERSION %PACKAGE_VERSION_MINOR%
+#define __W32API_PATCHLEVEL %PACKAGE_VERSION_PATCH%
/* The underlying operating system platform version, and its
* identifying macros for application support, are established by:
OSDN Git Service
