Drop cpput, C++14, various small fixes and updates.

asherikov · Jan 22, 2025 · f58efe0 · f58efe0
1 parent 53edb8a
commit f58efe0
Show file tree

Hide file tree

Showing 60 changed files with 182 additions and 15,443 deletions.
diff --git a/.clang-format b/.clang-format
@@ -1,58 +1,56 @@
 {
-    "BasedOnStyle": "Google",
     "AccessModifierOffset": -4,
-    "ConstructorInitializerIndentWidth": 2,
     "AlignAfterOpenBracket": "AlwaysBreak",
     "AlignEscapedNewlinesLeft": false,
     "AlignTrailingComments": true,
     "AllowAllParametersOfDeclarationOnNextLine": false,
-    "AllowShortIfStatementsOnASingleLine": false,
-    "AllowShortLoopsOnASingleLine": false,
     "AllowShortFunctionsOnASingleLine": "None",
+    "AllowShortIfStatementsOnASingleLine": false,
     "AllowShortLoopsOnASingleLine": false,
-    "AlwaysBreakTemplateDeclarations": true,
     "AlwaysBreakBeforeMultilineStrings": false,
+    "AlwaysBreakTemplateDeclarations": true,
+    "BasedOnStyle": "Google",
+    "BinPackArguments": false,
+    "BinPackParameters": false,
     "BreakBeforeBinaryOperators": "NonAssignment",
+    "BreakBeforeBraces": "Allman",
     "BreakBeforeTernaryOperators": false,
     "BreakConstructorInitializersBeforeComma": true,
     "BreakStringLiterals": false,
-    "BinPackParameters": false,
-    "BinPackArguments": false,
-    "ColumnLimit":    120,
+    "ColumnLimit": 120,
     "ConstructorInitializerAllOnOneLineOrOnePerLine": true,
+    "ConstructorInitializerIndentWidth": 2,
+    "ContinuationIndentWidth": 8,
+    "Cpp11BracedListStyle": false,
+    "DerivePointerAlignment": false,
     "DerivePointerBinding": true,
     "ExperimentalAutoDetectBinPacking": false,
+    "FixNamespaceComments": true,
     "IndentCaseLabels": true,
+    "IndentFunctionDeclarationAfterType": false,
+    "IndentPPDirectives": "AfterHash",
+    "IndentWidth": 4,
+    "IndentWrappedFunctionNames": true,
     "MaxEmptyLinesToKeep": 3,
     "NamespaceIndentation": "All",
     "ObjCSpaceBeforeProtocolList": true,
     "PenaltyBreakBeforeFirstCallParameter": 19,
     "PenaltyBreakComment": 60,
-    "PenaltyBreakString": 1,
     "PenaltyBreakFirstLessLess": 1000,
+    "PenaltyBreakString": 1,
     "PenaltyExcessCharacter": 500,
     "PenaltyReturnTypeOnItsOwnLine": 1000,
+    "PointerAlignment": "Right",
     "PointerBindsToType": false,
-    "SpacesBeforeTrailingComments": 2,
-    "Cpp11BracedListStyle": false,
-    "Standard":        "Auto",
-    "IndentWidth":     4,
-    "TabWidth":        4,
-    "UseTab":          "Never",
-    "BreakBeforeBraces": "Allman",
-    "IndentFunctionDeclarationAfterType": false,
-    "SpacesInParentheses": false,
-    "SpacesInAngles":  false,
-    "SpaceInEmptyParentheses": false,
-    "SpacesInCStyleCastParentheses": false,
+    "SortIncludes": false,
     "SpaceAfterControlStatementKeyword": true,
     "SpaceBeforeAssignmentOperators": true,
-    "ContinuationIndentWidth": 8,
-    "SortIncludes": false,
-    "IndentPPDirectives": "AfterHash",
-    "DerivePointerAlignment": false,
-    "PointerAlignment": "Right",
-    "FixNamespaceComments": true,
-    "IndentWrappedFunctionNames": true,
-    "Standard": "Cpp03",
+    "SpaceInEmptyParentheses": false,
+    "SpacesBeforeTrailingComments": 2,
+    "SpacesInAngles": false,
+    "SpacesInCStyleCastParentheses": false,
+    "SpacesInParentheses": false,
+    "Standard": "c++17",
+    "TabWidth": 4,
+    "UseTab": "Never",
 }
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -11,16 +11,16 @@ env:
 
 jobs:
     cpp_octave:
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
         defaults:
             run:
                 shell: bash
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
             - run: sudo apt update
             - run: make install_deps_common
             - run: $APT libboost-all-dev libeigen3-dev octave liboctave-dev
-            - run: $APT clang-tidy-10
+            - run: $APT clang-tidy-13
             - run: make test
 
     latest_eigen:
@@ -29,7 +29,7 @@ jobs:
             run:
                 shell: bash
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
             - run: sudo apt update
             - run: make install_deps_common
             - run: $APT libboost-all-dev octave liboctave-dev
@@ -39,12 +39,12 @@ jobs:
             - run: make unit_tests OPTIONS=test
 
     dependency:
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
         defaults:
             run:
                 shell: bash
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
             - run: $APT libeigen3-dev
             - run: make build
             - run: sudo make install
@@ -57,7 +57,7 @@ jobs:
             run:
                 shell: bash
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
             - run: |
                 source /opt/ros/noetic/setup.bash
                 make catkin_test_old ROS_DISTRO=noetic UBUNTU_DISTRO=focal
@@ -69,48 +69,49 @@ jobs:
             run:
                 shell: bash
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
             - run: |
                 source /opt/ros/noetic/setup.bash
                 make catkin_test_new ROS_DISTRO=noetic UBUNTU_DISTRO=focal
 
-    prerelease:
-        runs-on: ubuntu-20.04
-        defaults:
-            run:
-                shell: bash
-        steps:
-            - uses: actions/checkout@v3
-              with:
-                  fetch-depth: 0
-            - run: make ros_prerelease ROS_DISTRO=noetic UBUNTU_DISTRO=focal BRANCH=`git branch --show-current`
-              env:
-                  CCACHE_DIR: ${GITHUB_WORKSPACE}/.ccache
+    # empy compatibility issue
+    #prerelease:
+    #    runs-on: ubuntu-20.04
+    #    defaults:
+    #        run:
+    #            shell: bash
+    #    steps:
+    #        - uses: actions/checkout@v4
+    #          with:
+    #              fetch-depth: 0
+    #        - run: make ros_prerelease ROS_DISTRO=noetic UBUNTU_DISTRO=focal BRANCH=`git branch --show-current`
+    #          env:
+    #              CCACHE_DIR: ${GITHUB_WORKSPACE}/.ccache
 
 
     jammy_scanbuild:
         runs-on: ubuntu-22.04
 
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
             - run: sudo apt update
             - run: $APT libboost-all-dev libeigen3-dev octave liboctave-dev
             - run: $APT clang-tidy-13
             - run: make clangcheck SCANBUILD=scan-build-13
 
     deb:
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
         defaults:
             run:
                 shell: bash
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
             - run: $APT libeigen3-dev
             - run: make deb_install_deps
             - run: make deb_any
             - run: sudo dpkg -i build/qpmad-*-any.deb
             - run: make test_dependency
-            - uses: actions/upload-artifact@v2
+            - uses: actions/upload-artifact@v4
               with:
                   name: deb
                   path: build/qpmad-*-any.deb
@@ -119,7 +120,7 @@ jobs:
         runs-on: windows-latest
 
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
             - uses: ilammy/msvc-dev-cmd@v1
               with:
                   arch: x64

diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml
@@ -8,9 +8,31 @@ env:
 
 jobs:
     deb_cloudsmith:
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
             - run: $APT libeigen3-dev
             - run: make deb_install_deps_cloudsmith
             - run: env CLOUDSMITH_API_KEY=${{ secrets.CLOUDSMITH_API_KEY }} make deb_cloudsmith_any
+
+
+    gh_pages:
+        runs-on: ubuntu-22.04
+
+        permissions:
+            contents: write
+
+        steps:
+            - uses: actions/checkout@v4
+              with:
+                submodules: true
+                fetch-depth: 0
+            - run: $APT doxygen
+            - run: make dox
+            - run: |
+                cd doc/gh-pages
+                git config user.name github-actions
+                git config user.email [email protected]
+                git add *
+                git commit -a -m "Automated update ${{ github.ref_name }}"
+                git push
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,6 @@
 build
 scanbuild_results
 include/qpmad/config.h
-include/qpmad/cpput*.h
 matlab_octave/make.m
 *.mex*
 *.o
diff --git a/.make/common.mk b/.make/common.mk
@@ -6,8 +6,8 @@ APT_INSTALL=sudo apt install -y --no-install-recommends
 PIP_INSTALL=sudo python3 -m pip install
 GEM_INSTALL=sudo gem install
 
-CLANG_FORMAT?=clang-format13
-SCANBUILD?=scan-build-13
+CLANG_FORMAT?=clang-format18
+SCANBUILD?=scan-build18
 
 
 help:
@@ -61,7 +61,7 @@ spell_interactive:
 # https://github.com/myint/scspell
 spell:
 	${FIND_SOURCES} \
-	    | xargs ${SPELL_XARGS_ARG} scspell --use-builtin-base-dict --override-dictionary ./qa/scspell.dict
+	    | xargs ${SPELL_XARGS_ARG} scspell --use-builtin-base-dict --override-dictionary ./.make/qa/scspell.dict
 
 clangcheck:
 	${SCANBUILD} \

diff --git a/qa/scspell.dict → .make/qa/scspell.dict b/qa/scspell.dict → .make/qa/scspell.dict
@@ -5,6 +5,7 @@ cholesky
 copysign
 cpput
 decltype
+dndebug
 downdate
 eigenut
 fstream

diff --git a/.make/qpmad.mk b/.make/qpmad.mk
@@ -1,4 +1,4 @@
-FIND_SOURCES=find ./matlab_octave ./test/ ./include/ -iname "*.h" -or -iname "*.cpp" | grep -v "cpput_"
+FIND_SOURCES=find ./matlab_octave ./test/ ./include/ -iname "*.h" -or -iname "*.cpp"
 
 OPTIONS?=default
 ROOT_DIR=../../
@@ -48,20 +48,17 @@ install_latest_eigen:
 
 
 format:
-	${FIND_SOURCES} | grep -v "cpput" | grep -v "eigenut" | xargs ${CLANG_FORMAT} -verbose -i
+	${FIND_SOURCES} | xargs ${CLANG_FORMAT} -verbose -i
 
 
 # utils
 #----------------------------------------------
 
 addutils:
 	-git remote add cmakeut https://github.com/asherikov/cmakeut --no-tags
-	-git remote add cpput https://github.com/asherikov/cpput --no-tags
 
 updateutils:
 	git fetch --all
-	git rm --ignore-unmatch -rf cpput
-	git read-tree --prefix=cpput -u cpput/master
 	git show remotes/cmakeut/master:cmake/FindEigen3.cmake                  > cmake/FindEigen3.cmake
 	git show remotes/cmakeut/master:cmake/cmakeut_compiler_flags.cmake      > cmake/cmakeut_compiler_flags.cmake
 	git show remotes/cmakeut/master:cmake/cmakeut_detect_func_macro.cmake   > cmake/cmakeut_detect_func_macro.cmake
@@ -89,10 +86,8 @@ deb-cloudsmith: deb
 
 clean: clean_common
 	rm -Rf include/qpmad/config.h
-	rm -Rf include/qpmad/cpput*.h
 	rm -Rf debian/ obj-*/
 	cd matlab_octave; ${MAKE} clean
-	cd cpput; ${MAKE} clean
 
 forceclean: clean
 	cd matlab_octave; ${MAKE} forceclean
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,15 @@
 Changelog for package ariles_ros
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+next
+----
+
+* Added QPMAD_PEDANTIC_LICENSE cmake option to address
+  https://github.com/asherikov/qpmad/issues/9
+* Require C++14.
+* Drop cpput dependency and code generation.
+
+
 1.3.0 (2022-12-10)
 ------------------
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -56,11 +56,7 @@ set (CMAKEUT_CLANG_TIDY ${QPMAD_CLANG_TIDY})
 set (CMAKEUT_CLANG_TIDY_EXTRA_IGNORES "-cert-err58-cpp,-cppcoreguidelines-avoid-non-const-global-variables")
 # Eigen issues
 set (CMAKEUT_CLANG_TIDY_EXTRA_IGNORES "${CMAKEUT_CLANG_TIDY_EXTRA_IGNORES},-clang-analyzer-core.uninitialized.Assign")
-if ("${EIGEN3_VERSION}" VERSION_GREATER "3.4.0")
-    cmakeut_compiler_flags("c++14")
-else()
-    cmakeut_compiler_flags("c++11")
-endif()
+cmakeut_compiler_flags("c++14")
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKEUT_CXX_FLAGS}")
 # --------------
 
@@ -85,18 +81,6 @@ write_basic_package_version_file(
 # --------------
 
 
-# --------------
-# Dependencies
-# --------------
-# cpput
-set(CPPUT_EMBEDDED      ON              CACHE BOOL "" FORCE)
-set(CPPUT_EMBEDDED_ID   "QPMAD_UTILS"   CACHE STRING "" FORCE)
-set(CPPUT_EMBEDDED_COPY_TO_DIR "${QPMAD_SOURCE_DIR}/${PROJECT_NAME}"  CACHE STRING "" FORCE)
-set(CPPUT_SELECT_HEADERS "config.h;exception.h"  CACHE STRING "" FORCE)
-add_subdirectory(cpput)
-# --------------
-
-
 # --------------
 # Configure headers
 # --------------

diff --git a/README.md b/README.md
@@ -80,7 +80,7 @@ Features:
 <a name="dependencies"></a>
 Dependencies:
 =============
-- C++11 compatible compiler
+- C++14 compatible compiler
 - cmake >= 3.0
 - Eigen >= 3.3.0
 - Boost (for C++ tests)
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ cholesky @@
     copysign
     cpput
     decltype
+    dndebug
     downdate
     eigenut
     fstream
@@ Expand Down @@