Skip to content

Commit

Permalink
Prep for 3.3.1 release.
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelrsweet committed Jul 25, 2022
1 parent d32818a commit fd47c7d
Show file tree
Hide file tree
Showing 6 changed files with 51 additions and 9 deletions.
33 changes: 31 additions & 2 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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

Expand Down
19 changes: 16 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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...
Expand Down Expand Up @@ -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])

Expand Down
2 changes: 1 addition & 1 deletion doc/body.md
Original file line number Diff line number Diff line change
@@ -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
...

Expand Down
2 changes: 1 addition & 1 deletion doc/mxml.3
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Binary file modified doc/mxml.epub
Binary file not shown.
4 changes: 2 additions & 2 deletions doc/mxml.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="generator" content="codedoc v3.7">
<meta name="author" content="Michael R Sweet">
<meta name="language" content="en-US">
<meta name="copyright" content="Copyright © 2003-2021, All Rights Reserved.">
<meta name="copyright" content="Copyright © 2003-2022, All Rights Reserved.">
<meta name="version" content="3.3">
<style type="text/css"><!--
body {
Expand Down Expand Up @@ -247,7 +247,7 @@
<p><img class="title" src="mxml-cover.png"></p>
<h1 class="title">Mini-XML 3.3 Programming Manual</h1>
<p>Michael R Sweet</p>
<p>Copyright © 2003-2021, All Rights Reserved.</p>
<p>Copyright © 2003-2022, All Rights Reserved.</p>
</div>
<div class="contents">
<h2 class="title">Contents</h2>
Expand Down

0 comments on commit fd47c7d

Please sign in to comment.