merge

.ccmalloc

@@ -9,7 +9,6 @@
 
 ##############################################################################
 ## (C) 1997-1998 Armin Biere, 1998 Johannes Keukelaar
-## $Id$
 ##############################################################################
 
 %%% `%' and `#' are comments !!!!!!!

.clang-tidy

@@ -0,0 +1,2 @@
+# clang-analyzer-valist.Uninitialized has a bug https://bugs.llvm.org/show_bug.cgi?id=41311.
+Checks: "-clang-analyzer-valist.Uninitialized"

.gitattributes

@@ -0,0 +1,6 @@
+# Data files used for tests.
+*.data binary
+*.input binary
+*.sig binary
+*.delta binary
+*.expect binary

.github/workflows/check.yml

@@ -0,0 +1,91 @@
+name: Check
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  check:
+    runs-on: ${{matrix.os}}
+    strategy:
+      fail-fast: false
+      matrix:
+       os: [ubuntu-latest, macos-latest, windows-latest]
+       build: [Release]
+       options: [""]
+       include:
+         - os: windows-latest
+           os_options: "-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake"
+         - os: ubuntu-latest
+           build_docs: true
+         - os: ubuntu-latest
+           build: Release
+           options: "-DBUILD_SHARED_LIBS=OFF"
+         - os: ubuntu-latest
+           build: Release
+           options: "-DBUILD_RDIFF=OFF"
+         - os: ubuntu-latest
+           build: Release
+           options: "-G Ninja -DCMAKE_C_COMPILER=clang"
+         - os: ubuntu-latest
+           build: Debug
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Install Dependencies
+      # Unfortunately available Marketplace Actions for this are in a mess, so we do it manually.
+      run: |
+        if [ "$RUNNER_OS" == "Linux" ]; then
+          sudo apt-get update -y
+          sudo apt-get install -y libpopt-dev libb2-dev doxygen graphviz ninja-build
+        elif [ "$RUNNER_OS" == "macOS" ]; then
+          brew update
+          brew install popt
+        elif [ "$RUNNER_OS" == "Windows" ]; then
+          vcpkg update
+          vcpkg --triplet x64-windows install libpopt
+        fi
+
+    - name: Configure CMake
+      # Configure CMake in a 'build' subdirectory.
+      # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
+      run: cmake -B '${{github.workspace}}/build' -DCMAKE_BUILD_TYPE=${{matrix.build}} ${{matrix.os_options}} ${{matrix.options}}
+
+    - name: Build all
+      # Build your program with the given configuration.
+      run: cmake --build '${{github.workspace}}/build' --config ${{matrix.build}}
+
+    - name: Run tests
+      working-directory: ${{github.workspace}}/build
+      # Execute tests defined by the CMake configuration.
+      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+      run: ctest -C ${{matrix.build}} --output-on-failure
+
+    - name: Build install
+      # Build your program with the given configuration.
+      run: cmake --install 'build' --config ${{matrix.build}} --prefix 'install'
+
+    - name: Build docs
+      if: ${{matrix.build_docs}}
+      run: cmake --build '${{github.workspace}}/build' --target doc
+
+    - name: Upload build
+      uses: actions/upload-artifact@v3
+      with:
+        name: build results ${{matrix.os}} ${{matrix.build}} ${{matrix.options}}
+        path: ${{github.workspace}}/build
+        if-no-files-found: error
+
+    - name: Upload install
+      uses: actions/upload-artifact@v3
+      with:
+        name: install results ${{matrix.os}} ${{matrix.build}} ${{matrix.options}}
+        path: ${{github.workspace}}/install
+        if-no-files-found: error

.github/workflows/lint.yml

@@ -0,0 +1,25 @@
+name: Lint
+
+on: [push, pull_request]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Install Dependencies
+      # Unfortunately available Marketplace Actions for this are in a mess, so we do it manually.
+      run: |
+        sudo apt-get update -y
+        sudo apt-get install -y libpopt-dev libb2-dev clang-tidy iwyu
+
+    - name: Configure CMake
+      run: cmake .
+
+    - name: clang-tidy
+      run: cmake --build . --target clang-tidy
+
+    - name: iwyu
+      run: cmake --build . --target iwyu

.gitignore

@@ -1,44 +1,75 @@
-.*.swp
-.deps
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache
-compile
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-depcomp
-doc/Doxyfile
-doc/Makefile
-doc/Makefile.in
-install-sh
-*.o
-librsync-config.h
-libtool
-ltmain.sh
-missing
-popt/Makefile
-popt/Makefile.in
-popt/libpopt.a
-prototab.c
-prototab.h
-stamp-h1
-*.Po
-test-driver
-testsuite/mutate.tmp
-testsuite/isprefix.driver
-testsuite/*.log
-testsuite/*.trs
 rdiff
+*.o
+CMakeCache.txt
+CTestTestfile.cmake
+config.h
+*.cbp
+librsync.so*
+librsync.a
+librsync*.dylib
+Makefile
+CMakeFiles
 *.lo
 .libs
 librsync.la
 librsync-[0-9]*tar.gz
 librsync-[0-9]*/
 /m4/
 tags
+*.dylib
+cmake_install.cmake
+*.la
+doc/Doxyfile
+tests/isprefix.driver
+html
+latex
+Testing
+*.user
+.cmake
+
+# CMake generated Doxygen files
+CMakeDoxyfile.in
+CMakeDoxygenDefaults.cmake
+
+# Editor temp files
+.sw?
+.*.sw?
+*~
+
+# OSX build outputs
+*.dSYM
+
+# Test binaries
+*_test
+*_test.exe
+*_test.exe.manifest
+
+# Performance benchmark binaries
+*_perf
+*_perf.exe
+*_perf.exe.manifest
+
+*.bak
+
+*.tmp
+
+# for rtags
+compile_commands.json
+
+# Cache sometimes leftover by Doxygen,
+# similar to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=758975
+doxygen_sqlite3.db
+
+# Coverage reports
+*.gcov
+
+# Optional build using http://build-ninja.org
+.ninja_deps
+.ninja_log
+build.ninja
+rules.ninja
+
+# Microsoft Visual Studio build files
+*.sln
+*.vcxproj
+*.vcxproj.filters

AUTHORS

@@ -1,3 +1,4 @@
 Martin Pool <[email protected]>
 Andrew Tridgell <[email protected]>
 Donovan Baarda <[email protected]>
+Adam Schubert <[email protected]>