Bump version to 3.3, add NuGet files for VS.

3 years ago · 7ea46c9965
parent 19941798d8
commit 7ea46c9965
10 changed files with 81 additions and 15 deletions
--- a/CHANGES.md
+++ b/CHANGES.md
@ -1,4 +1,4 @@
-# Changes in Mini-XML 3.2.1
+# Changes in Mini-XML 3.3

 - Cleaned up usage of `free` throughout the library (Issue #276)
 - Added more error handling to the library (Issue #277)
--- a/20
+++ b/20
@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for Mini-XML 3.2.1.
+# Generated by GNU Autoconf 2.71 for Mini-XML 3.3.
 #
 # Report bugs to <https://github.com/michaelrsweet/mxml/issues>.
 #
@ -610,8 +610,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Mini-XML'
 PACKAGE_TARNAME='mxml'
-PACKAGE_VERSION='3.2.1'
-PACKAGE_STRING='Mini-XML 3.2.1'
+PACKAGE_VERSION='3.3'
+PACKAGE_STRING='Mini-XML 3.3'
 PACKAGE_BUGREPORT='https://github.com/michaelrsweet/mxml/issues'
 PACKAGE_URL='https://www.msweet.org/mxml'

@ -1301,7 +1301,7 @@ if test "$ac_init_help" = "long"; then
  # Omit some internal or obsolete options to make the list less imposing.
  # This message is too long to be a string in the A/UX 3.1 sh.
  cat <<_ACEOF
-\`configure' configures Mini-XML 3.2.1 to adapt to many kinds of systems.
+\`configure' configures Mini-XML 3.3 to adapt to many kinds of systems.

 Usage: $0 [OPTION]... [VAR=VALUE]...

@ -1367,7 +1367,7 @@ fi

 if test -n "$ac_init_help"; then
  case $ac_init_help in
-     short | recursive ) echo "Configuration of Mini-XML 3.2.1:";;
+     short | recursive ) echo "Configuration of Mini-XML 3.3:";;
   esac
  cat <<\_ACEOF

@ -1470,7 +1470,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-Mini-XML configure 3.2.1
+Mini-XML configure 3.3
 generated by GNU Autoconf 2.71

 Copyright (C) 2021 Free Software Foundation, Inc.
@ -1727,7 +1727,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.

-It was created by Mini-XML $as_me 3.2.1, which was
+It was created by Mini-XML $as_me 3.3, which was
 generated by GNU Autoconf 2.71.  Invocation command line was

  $ $0$ac_configure_args_raw
@ -2788,7 +2788,7 @@ ac_config_headers="$ac_config_headers config.h"



-VERSION="3.2.1"
+VERSION="3.3"

 printf "%s\n" "#define MXML_VERSION \"Mini-XML v$VERSION\"" >>confdefs.h

@ -5895,7 +5895,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Mini-XML $as_me 3.2.1, which was
+This file was extended by Mini-XML $as_me 3.3, which was
 generated by GNU Autoconf 2.71.  Invocation command line was

  CONFIG_FILES    = $CONFIG_FILES
@ -5960,7 +5960,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-Mini-XML config.status 3.2.1
+Mini-XML config.status 3.3
 configured by $0, generated by GNU Autoconf 2.71,
  with options \\"\$ac_cs_config\\"

--- a/configure.ac
+++ b/configure.ac
@ -14,7 +14,7 @@ AC_PREREQ([2.70])


 dnl Package name and version...
-AC_INIT([Mini-XML], [3.2.1], [https://github.com/michaelrsweet/mxml/issues], [mxml], [https://www.msweet.org/mxml])
+AC_INIT([Mini-XML], [3.3], [https://github.com/michaelrsweet/mxml/issues], [mxml], [https://www.msweet.org/mxml])


 dnl This line is provided to ensure that you don't run the autoheader program
--- a/doc/mxml-128.png
+++ b/doc/mxml-128.png
--- a/doc/mxml.opacity
+++ b/doc/mxml.opacity
--- a/vcnet/config.h
+++ b/vcnet/config.h
@ -63,7 +63,7 @@
 * Version number...
 */

-#define MXML_VERSION "Mini-XML v3.2.1"
+#define MXML_VERSION "Mini-XML v3.3"


 /*
--- a/vcnet/libmxml1_native.nuspec
+++ b/vcnet/libmxml1_native.nuspec
@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+    <metadata>
+        <id>libmxml1_native</id>
+        <title>Small XML File Parsing Library for VS2019+</title>
+        <version>3.3.0</version>
+        <authors>Michael R Sweet</authors>
+        <owners>michaelrsweet</owners>
+        <projectUrl>https://github.com/michaelrsweet/mxml</projectUrl>
+        <license type="expression">Apache-2.0</license>
+        <icon>build/native/mxml-128.png</icon>
+	<readme>build/native/README.md</readme>
+        <requireLicenseAcceptance>false</requireLicenseAcceptance>
+        <description>Small XML File Parsing Library</description>
+        <summary>Mini-XML is a small XML parsing library that you can use to read XML data files or strings in your application without requiring large non-standard libraries.</summary>
+        <copyright>Copyright © 2003-2021 by Michael R Sweet</copyright>
+        <tags>xml</tags>
+	<dependencies>
+	    <dependency id="libmxml1_native.redist" version="3.3.0" />
+	</dependencies>
+    </metadata>
+    <files>
+        <file src="..\doc\mxml-128.png" target="build\native" />
+        <file src="..\README.md" target="build\native" />
+        <file src="libmxml1_native.props" target="build\native" />
+        <file src="..\mxml.h" target="build\native\include" />
+        <!--<file src="Win32\**\libmxml1.lib" target="build\native\lib\Win32" />-->
+        <file src="x64\**\libmxml1.lib" target="build\native\lib\x64" />
+    </files>
+</package>
--- a/vcnet/libmxml1_native.props
+++ b/vcnet/libmxml1_native.props
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)\include</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(MSBuildThisFileDirectory)\lib\$(Platform)\$(Configuration)\libmxml1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+</Project>
--- a/vcnet/libmxml1_native.redist.nuspec
+++ b/vcnet/libmxml1_native.redist.nuspec
@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+    <metadata>
+        <id>libmxml1_native.redist</id>
+        <title>Small XML File Parsing Library for VS2019+ Redist</title>
+        <version>3.3.0</version>
+        <authors>Michael R Sweet</authors>
+        <owners>michaelrsweet</owners>
+        <projectUrl>https://github.com/michaelrsweet/mxml</projectUrl>
+        <license type="expression">Apache-2.0</license>
+        <icon>build/native/mxml-128.png</icon>
+	<readme>build/native/README.md</readme>
+        <requireLicenseAcceptance>false</requireLicenseAcceptance>
+        <description>Redistributable components for package 'libmxml1_native'. This package should only be installed as a dependency.</description>
+        <summary>Mini-XML is a small XML parsing library that you can use to read XML data files or strings in your application without requiring large non-standard libraries. This package provides the redistributable content for Mini-XML.</summary>
+        <copyright>Copyright © 2003-2021 by Michael R Sweet</copyright>
+        <tags>xml</tags>
+    </metadata>
+    <files>
+        <file src="..\doc\mxml-128.png" target="build\native" />
+        <file src="..\README.md" target="build\native" />
+        <!--<file src="Win32\**\libmxml1.dll" target="build\native\bin\Win32" />-->
+        <file src="x64\**\libmxml1.dll" target="build\native\bin\x64" />
+    </files>
+</package>
--- a/xcode/config.h
+++ b/xcode/config.h
@ -3,7 +3,7 @@
 *
 * https://www.msweet.org/mxml
 *
- * Copyright © 2003-2020 by Michael R Sweet.
+ * Copyright © 2003-2021 by Michael R Sweet.
 *
 * Licensed under Apache License v2.0.  See the file "LICENSE" for more
 * information.
@ -24,7 +24,7 @@
 * Version number...
 */

-#define MXML_VERSION "Mini-XML v3.2"
+#define MXML_VERSION "Mini-XML v3.3"


 /*