| Revisión | 4b32b9ccd7fa804f6cb6923baa6df58490916d98 (tree) |
|---|---|
| Tiempo | 2020-06-12 02:07:39 |
| Autor |  Keith Marshall <keith@user...> |
| Commiter | Keith Marshall |
Discontinue formal use of the build-aux submodule.
.gitignore (diff) .gitmodules .hgignore (diff) ChangeLog (diff) Makefile.in (diff) aclocal.m4 (diff) configure.ac (diff)| @@ -1,5 +1,6 @@ | ||
| 1 | 1 | configure |
| 2 | 2 | autom4te.cache |
| 3 | +build-aux | |
| 3 | 4 | bin |
| 4 | 5 | obj |
| 5 | 6 | mingw-get.layout |
| @@ -1,3 +0,0 @@ | ||
| 1 | -[submodule "build-aux"] | |
| 2 | - path = build-aux | |
| 3 | - url = git://mingw.git.sourceforge.net/gitroot/mingw/build-aux |
| @@ -2,6 +2,7 @@ syntax: glob | ||
| 2 | 2 | CVS/ |
| 3 | 3 | .git/ |
| 4 | 4 | build/ |
| 5 | +build-aux/ | |
| 5 | 6 | autom4te.cache/ |
| 6 | 7 | configure |
| 7 | 8 | **.orig |
| @@ -1,3 +1,28 @@ | ||
| 1 | +2020-06-11 Keith Marshall <keith@users.osdn.me> | |
| 2 | + | |
| 3 | + Discontinue formal use of the build-aux submodule. | |
| 4 | + | |
| 5 | + * .gitmodules .hgsub: Files are obsolete; delete them. | |
| 6 | + * .gitignore .hgignore (build-aux): Add to SCM exclusion list. | |
| 7 | + | |
| 8 | + * aclocal.m4 (build_aux_prefix): New macro; define it. This provides | |
| 9 | + a mechanism for informally locating an external, separately maintained | |
| 10 | + implementation of the requisite "build-aux" module; use it in... | |
| 11 | + (aux_include): ...this new macro; define, and use it, to access those | |
| 12 | + "build-aux" M4 macros which are required at configure generation time. | |
| 13 | + (MINGW_AC_CONFIG_AUX_DIR, MINGW_AC_CONFIG_AUX_DIRS): New macros; | |
| 14 | + define them. Together, they implement a replacement for the standard | |
| 15 | + AC_CONFIG_AUX_DIR macro, but offering extended path search capability, | |
| 16 | + at configure run time, in addition to defining... | |
| 17 | + (buildauxdir): ...this new AC_SUBST variable. | |
| 18 | + | |
| 19 | + * configure.ac (build_alias): Define it using... | |
| 20 | + (ac_aux_dir): ...this autoconf path reference, defined by using... | |
| 21 | + (MINGW_AC_CONFIG_AUX_DIR): ...this, instead of... | |
| 22 | + (AC_CONFIG_AUX_DIR): ...this. | |
| 23 | + | |
| 24 | + * Makefile.in (buildauxdir): Use it, for M4 file references. | |
| 25 | + | |
| 1 | 26 | 2020-06-02 Keith Marshall <keith@users.osdn.me> |
| 2 | 27 | |
| 3 | 28 | Do not use .hgtags for repository tag tracking. |
| @@ -5,8 +5,8 @@ | ||
| 5 | 5 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
| 6 | 6 | PACKAGE_VERSION = @PACKAGE_VERSION@ |
| 7 | 7 | |
| 8 | -# Written by Keith Marshall <keithmarshall@users.sourceforge.net> | |
| 9 | -# Copyright (C) 2009-2013, MinGW.org Project | |
| 8 | +# Written by Keith Marshall <keith@users.osdn.me> | |
| 9 | +# Copyright (C) 2009-2013, 2020, MinGW.org Project | |
| 10 | 10 | # |
| 11 | 11 | # |
| 12 | 12 | # Makefile template for mingw-get |
| @@ -46,7 +46,7 @@ srcdir = @srcdir@ | ||
| 46 | 46 | abs_top_srcdir = @abs_top_srcdir@ |
| 47 | 47 | |
| 48 | 48 | vpath %.ico @srcdir@/icons |
| 49 | -VPATH = @top_srcdir@/src:@top_srcdir@/src/pkginfo:@top_srcdir@/tinyxml | |
| 49 | +VPATH = @top_srcdir@/src @top_srcdir@/src/pkginfo @top_srcdir@/tinyxml | |
| 50 | 50 | |
| 51 | 51 | # Identify common build tools, and set their default options. |
| 52 | 52 | # |
| @@ -252,7 +252,7 @@ execute-command: | ||
| 252 | 252 | # |
| 253 | 253 | vpath configure @top_srcdir@ |
| 254 | 254 | vpath configure.ac @top_srcdir@ |
| 255 | -vpath %.m4 @top_srcdir@:@top_srcdir@/build-aux/m4 | |
| 255 | +vpath %.m4 @top_srcdir@ @buildauxdir@/m4 | |
| 256 | 256 | vpath Makefile.in @top_srcdir@ |
| 257 | 257 | |
| 258 | 258 | Makefile: Makefile.in VERSION.m4 config.status |
| @@ -2,8 +2,8 @@ | ||
| 2 | 2 | # |
| 3 | 3 | # $Id$ |
| 4 | 4 | # |
| 5 | -# Written by Keith Marshall <keithmarshall@users.sourceforge.net> | |
| 6 | -# Copyright (C) 2009, 2010, 2013, MinGW.org Project | |
| 5 | +# Written by Keith Marshall <keith@users.osdn.me> | |
| 6 | +# Copyright (C) 2009, 2010, 2013, 2020, MinGW.org Project | |
| 7 | 7 | # |
| 8 | 8 | # |
| 9 | 9 | # Configuration script for mingw-get |
| @@ -22,8 +22,74 @@ | ||
| 22 | 22 | # MinGW Project, accept liability for any damages, however caused, |
| 23 | 23 | # arising from the use of this software. |
| 24 | 24 | # |
| 25 | -m4_include([build-aux/m4/missing.m4]) | |
| 26 | -m4_include([build-aux/m4/makeopts.m4]) | |
| 25 | + | |
| 26 | +# build_aux_prefix | |
| 27 | +# ---------------- | |
| 28 | +# Provides a mechanism for locating the build-aux file tree, (which | |
| 29 | +# is expected to furnish supplementary M4 macro files), at configure | |
| 30 | +# script generation time. This requires that the directory is named | |
| 31 | +# "build-aux", but allows for its placement directly within the top | |
| 32 | +# source directory, its immediate parent, or grandparent. | |
| 33 | +# | |
| 34 | +m4_define([build_aux_prefix],m4_esyscmd_s(dnl | |
| 35 | +[for path in "" "../" "../../" | |
| 36 | + do test -x ${path}build-aux/config.guess && echo $path && exit | |
| 37 | + done | |
| 38 | +])) | |
| 39 | + | |
| 40 | +# aux_include( macro_file_path_name ) | |
| 41 | +# Include a supplementary M4 macro file, assuming that it may be | |
| 42 | +# found in the "build-aux/m4" directory within the prefix deduced | |
| 43 | +# by the preceding "build_aux_prefix" macro. | |
| 44 | +# | |
| 45 | +m4_define([aux_include],[m4_include(build_aux_prefix[$1])]) | |
| 46 | + | |
| 47 | +# Using the above, include the supplementary M4 macro files, which | |
| 48 | +# are required by this package, at "configure" generation time. | |
| 49 | +# | |
| 50 | +aux_include([build-aux/m4/missing.m4]) | |
| 51 | +aux_include([build-aux/m4/makeopts.m4]) | |
| 52 | + | |
| 53 | + | |
| 54 | +# MINGW_AC_CONFIG_AUX_DIR( DIRNAME ) | |
| 55 | +# ---------------------------------- | |
| 56 | +# Emulate the "build-aux" location strategy of "build_aux_prefix", | |
| 57 | +# but at configure script run time, in respect of the "build-aux" | |
| 58 | +# directory named by DIRNAME; this allows for the possibility of | |
| 59 | +# relocating the "build-aux" directory, relative to $top_srcdir, | |
| 60 | +# after initial configure script generation. | |
| 61 | +# | |
| 62 | +# Note that this performs a similar function to AC_CONFIG_AUX_DIR, | |
| 63 | +# but extends the search through the parent, and the grandparent, of | |
| 64 | +# $srcdir, (in addition to $builddir, and $srcdir itself); although | |
| 65 | +# this can be achieved with AC_CONFIG_AUX_DIR, it makes an unholy | |
| 66 | +# mess of the resultant diagnostic message, in the event that the | |
| 67 | +# DIRNAME search is unsuccessful. | |
| 68 | +# | |
| 69 | +# Also note that this implementation further extends the behaviour | |
| 70 | +# of AC_CONFIG_AUX_DIR, by AC_SUBST assignment of the result of a | |
| 71 | +# successful search, to the "buildauxdir" configuration variable. | |
| 72 | +# | |
| 73 | +AC_DEFUN([MINGW_AC_CONFIG_AUX_DIR],dnl | |
| 74 | +[m4_n([ac_val=$1])MINGW_AC_CONFIG_AUX_DIRS([$1],[$ac_val])dnl | |
| 75 | + AC_SUBST([buildauxdir],[$ac_aux_dir])dnl | |
| 76 | +])# MINGW_AC_CONFIG_AUX_DIR | |
| 77 | + | |
| 78 | +# MINGW_AC_CONFIG_AUX_DIRS( DIRNAME, UNQUOTED_DIRNAME ) | |
| 79 | +# ----------------------------------------------------- | |
| 80 | +# A wrapper around the undocumented AC_CONFIG_AUX_DIRS macro, (which | |
| 81 | +# provides the actual implementation of AC_CONFIG_AUX_DIR); intended | |
| 82 | +# to be invoked by MINGW_AC_CONFIG_AUX_DIR, this serves as a conduit | |
| 83 | +# to AC_CONFIG_AUX_DIRS, passing both the verbatim DIRNAME argument, | |
| 84 | +# and its $srcdir relative alternatives derived from UNQUOTED_DIRNAME, | |
| 85 | +# stripped of one level of shell quoting, by assignment to the shell | |
| 86 | +# variable $ac_val, then each wrapped in shell quotes, to achieve a | |
| 87 | +# tidier presentation of the diagnostic message which will result | |
| 88 | +# from failure of the AC_CONFIG_AUX_DIRS search. | |
| 89 | +# | |
| 90 | +AC_DEFUN([MINGW_AC_CONFIG_AUX_DIRS],dnl | |
| 91 | +[AC_CONFIG_AUX_DIRS([$1 "$srcdir/$2" "$srcdir/../$2" "$srcdir/../../$2"])dnl | |
| 92 | +])# MINGW_AC_CONFIG_AUX_DIRS | |
| 27 | 93 | |
| 28 | 94 | # MINGW_AC_PACKAGE_DIST_URL( DOMAIN, PATH ) |
| 29 | 95 | # ----------------------------------------- |
| @@ -2,8 +2,8 @@ | ||
| 2 | 2 | # |
| 3 | 3 | # $Id$ |
| 4 | 4 | # |
| 5 | -# Written by Keith Marshall <keithmarshall@users.sourceforge.net> | |
| 6 | -# Copyright (C) 2009-2013, MinGW.org Project | |
| 5 | +# Written by Keith Marshall <keith@users.osdn.me> | |
| 6 | +# Copyright (C) 2009-2013, 2020, MinGW.org Project | |
| 7 | 7 | # |
| 8 | 8 | # |
| 9 | 9 | # Configuration script for mingw-get |
| @@ -26,7 +26,7 @@ | ||
| 26 | 26 | AC_INIT([mingw-get],__VERSION__,[http://mingw.org/Reporting_Bugs]) |
| 27 | 27 | |
| 28 | 28 | AC_SUBST([COPYRIGHT_HOLDER],["MinGW.org Project"]) |
| 29 | - AC_SUBST([YEARS_OF_ISSUE],["2009-2013"]) | |
| 29 | + AC_SUBST([YEARS_OF_ISSUE],["2009-2013, 2017, 2020"]) | |
| 30 | 30 | |
| 31 | 31 | # Specify the default internet domain and relative directory path, |
| 32 | 32 | # whence packages are to be offered for download; user may remap these |
| @@ -62,8 +62,8 @@ | ||
| 62 | 62 | # calls ${srcdir}/build-aux/config.sub, if the user specifies a short |
| 63 | 63 | # form which it cannot resolve -- e.g. "--build=linux" will fail). |
| 64 | 64 | # |
| 65 | - AC_CONFIG_AUX_DIR([build-aux]) | |
| 66 | - build_alias=`${srcdir}/build-aux/config.guess` | |
| 65 | + MINGW_AC_CONFIG_AUX_DIR([build-aux]) | |
| 66 | + build_alias=`${ac_aux_dir}/config.guess` | |
| 67 | 67 | AC_CANONICAL_HOST |
| 68 | 68 | |
| 69 | 69 | # Establish the appropriate mechanism for invoking 'make' recursively, |
Fork