Merge pull request #67 from outfoxx/task/update-libfyaml

Update libfyaml to v0.9
outfoxx · May 16, 2024 · fe101f9 · fe101f9
2 parents e88b0a3 + 2314340
commit fe101f9
Show file tree

Hide file tree

Showing 141 changed files with 61,313 additions and 24,937 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,12 +17,11 @@ jobs:
 
     - name: Install Tools
       run: |
-        brew tap a7ex/homebrew-formulae
-        brew install xcbeautify sonar-scanner findsimulator 
+        brew install sonar-scanner 
       env:
         HOMEBREW_NO_INSTALL_CLEANUP: 1
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
@@ -58,14 +57,7 @@ jobs:
 
     steps:
 
-    - name: Install Tools
-      run: |
-        brew tap a7ex/homebrew-formulae
-        brew install xcbeautify findsimulator 
-      env:
-        HOMEBREW_NO_INSTALL_CLEANUP: 1
-
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Select Xcode
       run: sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer
@@ -75,7 +67,7 @@ jobs:
 
     - name: Report Test Results
       uses: kishikawakatsumi/xcresulttool@v1
-      if: always()
+      if: success() || failure()
       with:
           title: Test Results ${{ matrix.platform }}
           path: ./TestResults/${{ matrix.platform }}.xcresult
@@ -88,17 +80,17 @@ jobs:
 
     steps:
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Setup Swift
-      uses: swift-actions/setup-swift@v1
+      uses: swift-actions/setup-swift@v2
 
     - name: Build/Test
       run: swift test --parallel --xunit-output test-results.xml
 
     - name: Report Test Results
       uses: dorny/test-reporter@v1
-      if: always()
+      if: success() || failure()
       with:
         name: Test Results linux
         path: test-results.xml

diff --git a/.github/workflows/publish-docs.yaml b/.github/workflows/publish-docs.yaml
@@ -15,13 +15,13 @@ jobs:
 
   build:
 
-    runs-on: macos-12
+    runs-on: macos-13
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Select Xcode
-      run: sudo xcode-select -s /Applications/Xcode_14.1.app/Contents/Developer
+      run: sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer
 
     - run: |
         mkdir -p docs
@@ -49,7 +49,7 @@ jobs:
       run: tar -czf docs.tar.gz docs
 
     - name: Upload Docs Archive
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: docs-${{ github.ref_name }}
         path: docs.tar.gz
@@ -60,10 +60,10 @@ jobs:
     needs: [ build ]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Download Docs Archive
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: docs-${{ github.ref_name }}
         path: '.'

diff --git a/.github/workflows/publish-release.yaml b/.github/workflows/publish-release.yaml
@@ -15,13 +15,13 @@ jobs:
 
   build:
 
-    runs-on: macos-12
+    runs-on: macos-13
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Select Xcode
-      run: sudo xcode-select -s /Applications/Xcode_14.1.app/Contents/Developer
+      run: sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer
 
     - run: |
         mkdir -p docs
@@ -49,7 +49,7 @@ jobs:
       run: tar -czf docs.tar.gz docs
 
     - name: Upload Docs Archive
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: docs-${{ github.ref_name }}
         path: docs.tar.gz
@@ -60,10 +60,10 @@ jobs:
     needs: [ build ]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Download Docs Archive
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: docs-${{ github.ref_name }}
         path: '.'
@@ -79,15 +79,16 @@ jobs:
 
     - name: Check Version Format in Tag
       id: version
-      uses: nowsprinting/check-version-format-action@v3
+      uses: nowsprinting/check-version-format-action@v4
 
     - name: Create GitHub Release
-      uses: softprops/action-gh-release@v1
+      uses: softprops/action-gh-release@v2
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         name: 🚀 v${{ github.ref_name }}
         tag_name: ${{ github.ref_name }}
         generate_release_notes: true
         prerelease: ${{ steps.version.outputs.is_stable != 'true' }}
+        make_latest: ${{ steps.version.outputs.is_stable == 'true' }}
         draft: false
diff --git a/Makefile b/Makefile
@@ -5,12 +5,10 @@ comma:=,
 build-test-all: clean build-test-macos build-test-ios build-test-watchos build-test-tvos
 
 check-tools:
-	@which findsimulator || (echo "findsimulator is required. run 'make install-tools'" && exit 1)
 	@which xcbeautify || (echo "xcbeautify is required. run 'make install-tools'" && exit 1)
 
 install-tools:
-	brew tap a7ex/homebrew-formulae
-	brew install xcbeautify findsimulator
+	brew install xcbeautify
 
 clean:
 	@rm -rf TestResults
@@ -58,6 +56,8 @@ update-fyaml:
 	cd Sources/Cfyaml && ./bootstrap.sh
 	cd Sources/Cfyaml && ./configure
 	cd Sources/Cfyaml && sed -i '' 's/HAVE_LIBYAML 1/HAVE_LIBYAML 0/g' config.h
+	echo '\n#pragma clang diagnostic ignored "-Wconversion"' >> Sources/Cfyaml/config.h
+
 
 doc-symbol-graphs:
 	rm -rf .build/all-symbol-graphs || 0

diff --git a/Package.swift b/Package.swift
@@ -81,12 +81,14 @@ let package = Package(
       name: "Cfyaml",
       sources: [
         "src/lib/",
+        "src/util/",
         "src/xxhash/"
       ],
       cSettings: [
         .headerSearchPath("."),
         .headerSearchPath("include"),
         .headerSearchPath("src/lib"),
+        .headerSearchPath("src/util"),
         .headerSearchPath("src/valgrind"),
         .headerSearchPath("src/xxhash"),
         .define("HAVE_CONFIG_H")

diff --git a/Sources/Cfyaml/.libtool-version b/Sources/Cfyaml/.libtool-version
@@ -1 +1 @@
-1:2:0
+1:4:2
diff --git a/Sources/Cfyaml/.tarball-version b/Sources/Cfyaml/.tarball-version
@@ -1 +1 @@
-0.7.12
+0.9
diff --git a/Sources/Cfyaml/Makefile b/Sources/Cfyaml/Makefile
@@ -86,8 +86,9 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = aarch64-apple-darwin22.2.0
-host_triplet = aarch64-apple-darwin22.2.0
+build_triplet = aarch64-apple-darwin23.4.0
+host_triplet = aarch64-apple-darwin23.4.0
+target_triplet = aarch64-apple-darwin23.4.0
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_enable_debug.m4 \
@@ -259,30 +260,33 @@ AM_DEFAULT_VERBOSITY = 1
 AM_MAKEFLAGS = `test -z $V && echo -s`
 AR = ar
 AS = as
+ASAN_CFLAGS = 
+ASAN_LIBS = 
 AUTOCONF = ${SHELL} '/Users/kdubb/Projects/outfoxx/PotentCodables/Sources/Cfyaml/build-aux/missing' autoconf
 AUTOHEADER = ${SHELL} '/Users/kdubb/Projects/outfoxx/PotentCodables/Sources/Cfyaml/build-aux/missing' autoheader
 AUTOMAKE = ${SHELL} '/Users/kdubb/Projects/outfoxx/PotentCodables/Sources/Cfyaml/build-aux/missing' automake-1.16
 AWK = awk
 CC = /bin/sh /Users/kdubb/Projects/outfoxx/PotentCodables/Sources/Cfyaml/build-aux/shave cc gcc
-CCAS = /bin/sh /Users/kdubb/Projects/outfoxx/PotentCodables/Sources/Cfyaml/build-aux/shave ccas 
+CCAS = /bin/sh /Users/kdubb/Projects/outfoxx/PotentCodables/Sources/Cfyaml/build-aux/shave ccas gcc
+CCASDEPMODE = depmode=gcc3
+CCASFLAGS = 
 CCDEPMODE = depmode=gcc3
-CFLAGS =  -Wall -Wsign-compare -O2
+CFLAGS = -D_THREAD_SAFE -pthread -Wall -Wsign-compare -fvisibility=hidden -O2
 CHECK_CFLAGS = 
 CHECK_LDFLAGS = 
 CHECK_LIBS = 
-CPP = gcc -E
 CPPFLAGS = 
 CSCOPE = cscope
 CTAGS = ctags
-CXX = /bin/sh /Users/kdubb/Projects/outfoxx/PotentCodables/Sources/Cfyaml/build-aux/shave cxx g++
-CXXCPP = g++ -E
+CXX = /bin/sh /Users/kdubb/Projects/outfoxx/PotentCodables/Sources/Cfyaml/build-aux/shave cxx g++ -std=gnu++11
+CXXCPP = g++ -std=gnu++11 -E
 CXXDEPMODE = depmode=gcc3
 CXXFLAGS = 
 CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
-DLLTOOL = dlltool
-DOCKER = /usr/local/bin/docker
+DLLTOOL = false
+DOCKER = /Users/kdubb/.rd/bin/docker
 DSYMUTIL = dsymutil
 DUMPBIN = 
 ECHO_C = \c
@@ -296,16 +300,19 @@ F77 = /bin/sh /Users/kdubb/Projects/outfoxx/PotentCodables/Sources/Cfyaml/build-
 FC = /bin/sh /Users/kdubb/Projects/outfoxx/PotentCodables/Sources/Cfyaml/build-aux/shave fc 
 FGREP = /usr/bin/grep -F
 FILECMD = file
-GIT = /opt/homebrew/bin/git
+GIT = /usr/bin/git
 GREP = /usr/bin/grep
+HAVE_ASAN = 0
 HAVE_CHECK = 0
 HAVE_COMPATIBLE_CHECK = 0
 HAVE_DEVMODE = 1
+HAVE_LIBCLANG = 0
 HAVE_LIBYAML = 1
 HAVE_NETWORK = 1
+HAVE_PORTABLE_TARGET = 0
 HAVE_QSORT_R = 1
-INCLTDL = -I$(top_srcdir)/libltdl
-INSTALL = /usr/bin/install -c
+HAVE_STATIC = 1
+INSTALL = /opt/homebrew/bin/ginstall -c
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
@@ -316,17 +323,21 @@ JSONTESTSUITEURL = https://github.com/nst/JSONTestSuite
 LD = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld
 LDFLAGS = 
 LEX = /bin/sh /Users/kdubb/Projects/outfoxx/PotentCodables/Sources/Cfyaml/build-aux/shave lex 
-LIBLTDL = $(top_build_prefix)libltdl/libltdl.la
+LIBCLANG_CFLAGS = 
+LIBCLANG_CPPFLAGS = 
+LIBCLANG_LDFLAGS = 
+LIBCLANG_LIBS = 
+LIBLTDL = 
 LIBOBJS = 
-LIBS = 
+LIBS =  -lpthread
 LIBTOOL = /bin/sh /Users/kdubb/Projects/outfoxx/PotentCodables/Sources/Cfyaml/build-aux/shave-libtool '$(SHELL) $(top_builddir)/libtool'
-LIBTOOL_VERSION = 1:2:0
+LIBTOOL_VERSION = 1:4:2
 LIBYAML_CFLAGS = -I/opt/homebrew/Cellar/libyaml/0.2.5/include
 LIBYAML_LIBS = -L/opt/homebrew/Cellar/libyaml/0.2.5/lib -lyaml
 LIPO = lipo
+LLVM_CONFIG = 
 LN_S = ln -s
-LTDLDEPS = $(top_build_prefix)libltdl/libltdl.la
-LTDLINCL = -I$(top_srcdir)/libltdl
+LTDLINCL = 
 LTLIBOBJS = 
 LT_SYS_LIBRARY_PATH = 
 M4 = /usr/bin/m4
@@ -335,8 +346,8 @@ MAKEFLAGS = -s
 MAKEINFO = ${SHELL} '/Users/kdubb/Projects/outfoxx/PotentCodables/Sources/Cfyaml/build-aux/missing' makeinfo
 MANIFEST_TOOL = :
 MCS = /bin/sh /Users/kdubb/Projects/outfoxx/PotentCodables/Sources/Cfyaml/build-aux/shave mcs 
-MINOR = 7
-MKDIR_P = ./build-aux/install-sh -c -d
+MINOR = 9
+MKDIR_P = /opt/homebrew/bin/gmkdir -p
 NM = /usr/bin/nm -B
 NMEDIT = nmedit
 OBJC = /bin/sh /Users/kdubb/Projects/outfoxx/PotentCodables/Sources/Cfyaml/build-aux/shave objc 
@@ -347,19 +358,19 @@ OTOOL64 = :
 PACKAGE = libfyaml
 PACKAGE_BUGREPORT = pantelis.antoniou@konsulko.com
 PACKAGE_NAME = libfyaml
-PACKAGE_STRING = libfyaml 0.7.12
+PACKAGE_STRING = libfyaml 0.9
 PACKAGE_TARNAME = libfyaml
 PACKAGE_URL = 
-PACKAGE_VERSION = 0.7.12
-PATCH = 12
+PACKAGE_VERSION = 0.9
+PATCH = 
 PATH_SEPARATOR = :
 PIP3 = 
 PKG_CONFIG = /opt/homebrew/bin/pkg-config
 PKG_CONFIG_LIBDIR = 
 PKG_CONFIG_PATH = 
 PTHREAD_CC = gcc
 PTHREAD_CFLAGS = -D_THREAD_SAFE -pthread
-PTHREAD_LIBS = 
+PTHREAD_LIBS = -lpthread
 Q = $(V:1=)
 RANLIB = ranlib
 SED = /usr/bin/sed
@@ -370,7 +381,7 @@ STRIP = strip
 TESTSUITECHECKOUT = 6e6c296ae9c9d2d5c4134b4b64d01b29ac19ff6f
 TESTSUITEURL = https://github.com/yaml/yaml-test-suite
 V = @
-VERSION = 0.7.12
+VERSION = 0.9
 YACC = /bin/sh /Users/kdubb/Projects/outfoxx/PotentCodables/Sources/Cfyaml/build-aux/shave yacc 
 abs_builddir = /Users/kdubb/Projects/outfoxx/PotentCodables/Sources/Cfyaml
 abs_srcdir = /Users/kdubb/Projects/outfoxx/PotentCodables/Sources/Cfyaml
@@ -387,21 +398,21 @@ am__tar = $${TAR-tar} chof - "$$tardir"
 am__untar = $${TAR-tar} xf -
 ax_pthread_config = 
 bindir = ${exec_prefix}/bin
-build = aarch64-apple-darwin22.2.0
+build = aarch64-apple-darwin23.4.0
 build_alias = 
 build_cpu = aarch64
-build_os = darwin22.2.0
+build_os = darwin23.4.0
 build_vendor = apple
 builddir = .
 datadir = ${datarootdir}
 datarootdir = ${prefix}/share
 docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
-host = aarch64-apple-darwin22.2.0
+host = aarch64-apple-darwin23.4.0
 host_alias = 
 host_cpu = aarch64
-host_os = darwin22.2.0
+host_os = darwin23.4.0
 host_vendor = apple
 htmldir = ${docdir}
 includedir = ${prefix}/include
@@ -425,7 +436,11 @@ shavedir = /Users/kdubb/Projects/outfoxx/PotentCodables/Sources/Cfyaml/build-aux
 srcdir = .
 subdirs =  libltdl
 sysconfdir = ${prefix}/etc
+target = aarch64-apple-darwin23.4.0
 target_alias = 
+target_cpu = aarch64
+target_os = darwin23.4.0
+target_vendor = apple
 top_build_prefix = 
 top_builddir = .
 top_srcdir = .
@@ -1044,7 +1059,7 @@ maintainer-clean-local:
 	@rm -rf install artifacts
 
 docker: Dockerfile
-	/usr/local/bin/docker build -t libfyaml:$(VERSION) $(top_srcdir)
+	/Users/kdubb/.rd/bin/docker build -t libfyaml:$(VERSION) $(top_srcdir)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.