From fd47c7d115191c8a6bce2c781ffee41e179530f2 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Mon, 25 Jul 2022 08:56:27 -0400 Subject: [PATCH] Prep for 3.3.1 release. --- configure | 33 +++++++++++++++++++++++++++++++-- configure.ac | 19 ++++++++++++++++--- doc/body.md | 2 +- doc/mxml.3 | 2 +- doc/mxml.epub | Bin 718134 -> 718135 bytes doc/mxml.html | 4 ++-- 6 files changed, 51 insertions(+), 9 deletions(-) diff --git a/configure b/configure index 9ef9427..07a0cd1 100755 --- a/configure +++ b/configure @@ -2824,7 +2824,14 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac host_os_name=`echo $host_os | sed -e '1,$s/[0-9.]*$//g'` -host_os_version=`echo $host_os | sed -e '1,$s/^[^0-9.]*//g'` +host_os_version="$(echo $host_os | sed -e '1,$s/^[^0-9.]*//g' | awk -F. '{print $1 $2}')" +# Linux often does not yield an OS version we can use... +if test "x$host_os_version" = x +then : + + host_os_version="0" + +fi ac_config_headers="$ac_config_headers config.h" @@ -2867,7 +2874,29 @@ then : else $as_nop - ARCHFLAGS="" + case "$host_os_name" in #( + darwin*) : + + if test "$host_os_version" -ge 200 -a x$enable_debug != xyes +then : + + # macOS 11.0 and higher support the Apple Silicon (arm64) CPUs + ARCHFLAGS="-mmacosx-version-min=10.14 -arch x86_64 -arch arm64" + +elif test x$enable_debug != xyes +then : + + ARCHFLAGS="-mmacosx-version-min=10.14 -arch x86_64" + +fi + ;; #( + *) : + + ARCHFLAGS="" + ;; #( + *) : + ;; +esac fi diff --git a/configure.ac b/configure.ac index 1b4b3ae..5b7ec04 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Configuration script for Mini-XML, a small XML file parsing library. dnl dnl https://www.msweet.org/mxml dnl -dnl Copyright © 2003-2021 by Michael R Sweet. +dnl Copyright © 2003-2022 by Michael R Sweet. dnl dnl Licensed under Apache License v2.0. See the file "LICENSE" for more dnl information. @@ -28,7 +28,11 @@ AC_CANONICAL_BUILD AC_CANONICAL_HOST [host_os_name=`echo $host_os | sed -e '1,$s/[0-9.]*$//g'`] -[host_os_version=`echo $host_os | sed -e '1,$s/^[^0-9.]*//g'`] +[host_os_version="$(echo $host_os | sed -e '1,$s/^[^0-9.]*//g' | awk -F. '{print $1 $2}')"] +# Linux often does not yield an OS version we can use... +AS_IF([test "x$host_os_version" = x], [ + host_os_version="0" +]) dnl Set the name of the config header file... @@ -60,7 +64,16 @@ AC_ARG_WITH([ansi], AS_HELP_STRING([--with-ansi], [set full ANSI C mode, default AC_ARG_WITH([archflags], AS_HELP_STRING([--with-archflags], [set additional architecture flags, default=none]), [ ARCHFLAGS="$withval" ], [ - ARCHFLAGS="" + AS_CASE(["$host_os_name"], [darwin*], [ + AS_IF([test "$host_os_version" -ge 200 -a x$enable_debug != xyes], [ + # macOS 11.0 and higher support the Apple Silicon (arm64) CPUs + ARCHFLAGS="-mmacosx-version-min=10.14 -arch x86_64 -arch arm64" + ], [test x$enable_debug != xyes], [ + ARCHFLAGS="-mmacosx-version-min=10.14 -arch x86_64" + ]) + ], [*], [ + ARCHFLAGS="" + ]) ]) AC_SUBST([ARCHFLAGS]) diff --git a/doc/body.md b/doc/body.md index 4d06e31..04391b6 100644 --- a/doc/body.md +++ b/doc/body.md @@ -1,7 +1,7 @@ --- title: Mini-XML 3.3 Programming Manual author: Michael R Sweet -copyright: Copyright © 2003-2021, All Rights Reserved. +copyright: Copyright © 2003-2022, All Rights Reserved. version: 3.3 ... diff --git a/doc/mxml.3 b/doc/mxml.3 index 6b83004..119bad7 100644 --- a/doc/mxml.3 +++ b/doc/mxml.3 @@ -1,4 +1,4 @@ -.TH mxml 3 "Mini-XML API" "2021-10-26" "Mini-XML API" +.TH mxml 3 "Mini-XML API" "2022-07-25" "Mini-XML API" .SH NAME mxml \- Mini-XML API .SH INCLUDE FILE diff --git a/doc/mxml.epub b/doc/mxml.epub index 8a3a377fae388a4e914a72d4afa1df296d1f368d..4d062b843a7fad0686db0a24889abfb9407436eb 100644 GIT binary patch delta 902 zcmdn?N_+b&ZN30+W)=|!5ZK}LGh`y484H;9P=?U?x54yeKSl*kkc65vPm$c_a>h_b z#=n!#GHqfn;{VsIx~FDy8}k(omafLTpEt+y#Mpv0HShIo-|NW;#7scU48$xz%nHP8 zK+F!r96-#ueXl3ix`p*1(}SYdrGH^$VEE6>z#s^8lE14{K(Ky6Vsdt3da7Q2L0a$R z^L?`o1dhG0W&wJ#)QJ(*{BW%i}Qk8|s{J4`ThcHJ!y zbMVH?60fNxzFD=WKfV3d7kNFvNa|~Hi;Jg$qbXO7tEt+hv#&Ng&#!X!SgBZWl6gOe zc+i?#d0%R;Ol@-Hm)goUZK>qq+1%Y>|20yI9QZZ67C7;Ljgy>ObF*GycZs`Q)$OWv zre?)2=@zv;EE^AI!twd7SV>Mg!JnP@YY!O3NMzIer}7K?n@9|h}Hh%oMv^MBMP&9_6+W+0tvHaH^6~TP9rHhb z)s#pR{I>kd!Bd|X+0OkR|0jQ~_}^HSWR22gwJRmGCB+V(mdT6KXJ5{9XT@R>sWqnS zJdMLQ{mfryzMm12N|_iqz^Qcmq_oL`n&q*sua9^lQ$B*!em0J9!F zm4dVa6D`A%#-!=zzi=tYgKUsIIWK%ND+9wZIR>~55Jj!i`Mz=~vAKTc0_p((>~?~b delta 901 zcmdn~N_*QYZN30+W)=|!5ZKZj6+Ds8j0H@4C`0J{+hBUKAEN>%NJ46!Ifv}#a>h_b z#=VozGHqfPn)bd({$KUxHs&iF%##|wZjR%Lu?6dC-sjoA&yx{|nShuXh*^M`6^Pk@ zm>q~YfS7apK2NT73+q9KGsdsZ_`=A*@SmB1K@jL7e^;k~VEux`5n+gY;tSI))dHwA(+IbuE?&_A?P zWc9Y$e*{XGCKxoht)2KZ^W2MPhZbG6=d!e3&@Pf1kl2v6yvIwfT>hll-AVrU%I0PF z_D+&D7naxBHYt12hXc)DXJ}Q`^D*yK=XY-qxcKxot6jO%ob7xy7FR>M7~=Yu9t(WL zp_1FR=EP(h@2>0fyVvO4o4WqfdQt1;v2WS(c5yzx)8M(!#$~$c7N@wPT2N5;8(c3!sPi{tGrwMS#J)SSKL=v+i}HoSJUGy|Jmx5 zOw5(LUkJq?eBCRo`rJGJ+<6vtx!`q2-rnH39uS;ZXs;o7jiu$;cbCkZc|u~>TXlaI zMat!ca6b-e;99VF{X=%ID*jxXW&X7XtUB0MRtWj=t=&=FEM)V*Xw#3Mu6NG={3X(} znd5hGRsPe=i+1z>$N$M+oBlUeC0V0%S@k*zZAr1ir)Bb@*1Ij|xwB%ih}0U>b)LrI z8-M2KneAtUBvK{@4sasfKKU)zK2~rVn;!a^%Lu~i{>)_zVIBI+`dB-`os zU${(TKnYEJuY6bQLM{dn<_9N!2(hGby(cW$CFhr=7U>n_r3ZL3GRZNEFu<%wPo*HO vz(mWiq%m>&g)dwR@*o=|PtFUU%*w!UOpXC=14L2FbpEegN^CBlxqx~Aut{}5 diff --git a/doc/mxml.html b/doc/mxml.html index 5bee11d..105ff1e 100644 --- a/doc/mxml.html +++ b/doc/mxml.html @@ -6,7 +6,7 @@ - +