diff --git a/CHANGES.md b/CHANGES.md index 79da937..35c0956 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -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 diff --git a/Makefile.in b/Makefile.in index d6379a9..59e4ccd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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 # diff --git a/linux/Makefile b/linux/Makefile index 338e116..a97fd81 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -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) diff --git a/linux/config.h b/linux/config.h index 7c43c2b..824c310 100644 --- a/linux/config.h +++ b/linux/config.h @@ -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 // diff --git a/makesrcdist b/makesrcdist index 236c800..da2f0d8 100755 --- a/makesrcdist +++ b/makesrcdist @@ -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" vcnet/libmxml4_native.nuspec; then echo "Update vcnet/libmxml4_native.nuspec." status=1 @@ -63,6 +73,11 @@ if ! grep -q "$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 diff --git a/vcnet/libmxml4_native.nuspec b/vcnet/libmxml4_native.nuspec index 4d89b23..d10c2c5 100644 --- a/vcnet/libmxml4_native.nuspec +++ b/vcnet/libmxml4_native.nuspec @@ -1,9 +1,9 @@ - libmxml2_native + libmxml4_native Small XML File Parsing Library for VS2019+ - 4.0.3 + 4.0.4 Michael R Sweet michaelrsweet https://github.com/michaelrsweet/mxml @@ -16,15 +16,15 @@ Copyright © 2003-2024 by Michael R Sweet xml - + - + - - + + diff --git a/vcnet/libmxml4_native.props b/vcnet/libmxml4_native.props index 8172c92..fd81b35 100644 --- a/vcnet/libmxml4_native.props +++ b/vcnet/libmxml4_native.props @@ -5,7 +5,7 @@ $(MSBuildThisFileDirectory)\include - $(MSBuildThisFileDirectory)\lib\$(Platform)\$(Configuration)\libmxml2.lib;%(AdditionalDependencies) + $(MSBuildThisFileDirectory)\lib\$(Platform)\$(Configuration)\mxml4.lib;%(AdditionalDependencies) diff --git a/vcnet/libmxml4_native.redist.nuspec b/vcnet/libmxml4_native.redist.nuspec index 3798dd9..b0c91d8 100644 --- a/vcnet/libmxml4_native.redist.nuspec +++ b/vcnet/libmxml4_native.redist.nuspec @@ -1,9 +1,9 @@ - libmxml2_native.redist + libmxml4_native.redist Small XML File Parsing Library for VS2019+ Redist - 4.0.3 + 4.0.4 Michael R Sweet michaelrsweet https://github.com/michaelrsweet/mxml @@ -19,7 +19,7 @@ - - + +