AIR/mxml
1
0
Fork 0
mirror of https://github.com/michaelrsweet/mxml.git synced 2024-11-24 03:15:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do some cleanup and fix NuGet packages.

Browse Source
This commit is contained in:
Michael R Sweet 2024-11-18 09:48:30 -05:00
parent 880a461160
commit 8ba0e97ec2
No known key found for this signature in database
GPG Key ID: BE67C75EC81F3244
8 changed files with 37 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.md
View File

@ -5,11 +5,12 @@ Changes in Mini-XML
Changes in Mini-XML 4.0.4
-------------------------
- Added Linux-specific build files and dropped unused `long long` config tests
(Issue #335)
- Fixed an issue when reporting errors with a `NULL` options pointer
(Issue #329)
- Fixed some compiler warnings (Issue #333)
- Fixed some documentation issues (Issue #334)
- Dropped unused `long long` config tests (Issue #335)
Changes in Mini-XML 4.0.3

9
Makefile.in
View File

@ -179,8 +179,8 @@ clean:
$(RM) mxml4.lib
$(RM) libmxml4.a
$(RM) libmxml4.so
$(RM) libmxml4.so.1
$(RM) libmxml4.1.dylib
$(RM) libmxml4.so.2
$(RM) libmxml4.2.dylib
$(RM) libmxml4.dylib
@ -415,13 +415,18 @@ testmxml-vg: $(LIBOBJS) testmxml.o
testmxml.o: mxml.h
#
# Fuzz-test the library <>
#
.PHONY: afl
afl:
$(MAKE) -$(MAKEFLAGS) CC="afl-clang-fast" COMMONFLAGS="-g" clean all
test afl-output || rm -rf afl-output
afl-fuzz -x xml.dict -i afl-input -o afl-output -V 600 -e xml -t 5000 ./testmxml @@ temps.xml
#
# Analyze code with the Clang static analyzer <https://clang-analyzer.llvm.org>
#

19
linux/Makefile
View File

@ -136,14 +136,10 @@ BUILDROOT = $(DSTROOT)$(DESTDIR)
#
# Rules...
# Silent build...
#
.SILENT:
.SUFFIXES: .c .man .o
.c.o:
echo Compiling $<
$(CC) $(CFLAGS) -c -o $@ $<
#
@ -320,15 +316,6 @@ libmxml.a libmxml4.a: $(LIBOBJS)
$(RANLIB) $@
#
# libmxml2.dll
#
libmxml.dll libmxml4.dll: $(LIBOBJS)
echo Creating $@...
$(DSO) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LIBS)
#
# libmxml.so.2
#
@ -348,10 +335,6 @@ testmxml: $(LIBMXML_STATIC) testmxml.o
echo Linking $@...
$(CC) $(LDFLAGS) -o $@ testmxml.o $(LIBMXML_STATIC) $(LIBS)
testmxml-vg: $(LIBOBJS) testmxml.o
echo Linking $@...
$(CC) $(LDFLAGS) -o $@ testmxml.o $(LIBOBJS) $(LIBS)
#
# Documentation (depends on separate codedoc utility)

3
linux/config.h
View File

@ -1,6 +1,5 @@
/* config.h. Generated from config.h.in by configure. */
//
// Configuration file for Mini-XML, a small XML file parsing library.
// Linux configuration file for Mini-XML, a small XML file parsing library.
//
// https://www.msweet.org/mxml
//

15
makesrcdist
View File

@ -49,6 +49,16 @@ if ! grep -q "Version: $version" mxml.spec; then
status=1
fi
if test "$(grep MXML_VERSION linux/config.h | awk '${print $5}')" != "v$version\""; then
echo "Update MXML_VERSION in linux/config.h."
status=1
fi
if test "$(grep MXML_VERSION vcnet/config.h | awk '${print $5}')" != "v$version\""; then
echo "Update MXML_VERSION in vcnet/config.h."
status=1
fi
if ! grep -q "<version>$version</version>" vcnet/libmxml4_native.nuspec; then
echo "Update vcnet/libmxml4_native.nuspec."
status=1
@ -63,6 +73,11 @@ if ! grep -q "<version>$version</version>" vcnet/libmxml4_native.redist.nuspec;
status=1
fi
if test "$(grep MXML_VERSION xcode/config.h | awk '${print $5}')" != "v$version\""; then
echo "Update MXML_VERSION in xcode/config.h."
status=1
fi
if test $status = 1; then
exit 1
fi

12
vcnet/libmxml4_native.nuspec
View File

@ -1,9 +1,9 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>libmxml2_native</id>
<id>libmxml4_native</id>
<title>Small XML File Parsing Library for VS2019+</title>
<version>4.0.3</version>
<version>4.0.4</version>
<authors>Michael R Sweet</authors>
<owners>michaelrsweet</owners>
<projectUrl>https://github.com/michaelrsweet/mxml</projectUrl>
@ -16,15 +16,15 @@
<copyright>Copyright © 2003-2024 by Michael R Sweet</copyright>
<tags>xml</tags>
<dependencies>
<dependency id="libmxml2_native.redist" version="4.0.3" />
<dependency id="libmxml4_native.redist" version="4.0.4" />
</dependencies>
</metadata>
<files>
<file src="..\doc\mxml-128.png" target="build\native" />
<file src="..\README.md" target="build\native" />
<file src="libmxml2_native.props" target="build\native" />
<file src="libmxml4_native.props" target="build\native" />
<file src="..\mxml.h" target="build\native\include" />
<!--<file src="Win32\**\libmxml2.lib" target="build\native\lib\Win32" />-->
<file src="x64\**\libmxml2.lib" target="build\native\lib\x64" />
<!--<file src="Win32\**\mxml4.lib" target="build\native\lib\Win32" />-->
<file src="x64\**\mxml4.lib" target="build\native\lib\x64" />
</files>
</package>

2
vcnet/libmxml4_native.props
View File

@ -5,7 +5,7 @@
<AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)\include</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalDependencies>$(MSBuildThisFileDirectory)\lib\$(Platform)\$(Configuration)\libmxml2.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>$(MSBuildThisFileDirectory)\lib\$(Platform)\$(Configuration)\mxml4.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
</Project>

8
vcnet/libmxml4_native.redist.nuspec
View File

@ -1,9 +1,9 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>libmxml2_native.redist</id>
<id>libmxml4_native.redist</id>
<title>Small XML File Parsing Library for VS2019+ Redist</title>
<version>4.0.3</version>
<version>4.0.4</version>
<authors>Michael R Sweet</authors>
<owners>michaelrsweet</owners>
<projectUrl>https://github.com/michaelrsweet/mxml</projectUrl>
@ -19,7 +19,7 @@
<files>
<file src="..\doc\mxml-128.png" target="build\native" />
<file src="..\README.md" target="build\native" />
<!--<file src="Win32\**\libmxml2.dll" target="build\native\bin\Win32" />-->
<file src="x64\**\libmxml2.dll" target="build\native\bin\x64" />
<!--<file src="Win32\**\mxml4.dll" target="build\native\bin\Win32" />-->
<file src="x64\**\mxml4.dll" target="build\native\bin\x64" />
</files>
</package>