add CMake support

.appveyor.yml

@@ -1,35 +1,28 @@
-version: 0.5.4-build-{build}
+version: 0.6-build-{build}
 pull_requests:
   do_not_increment_build_number: true
 image:
-- Visual Studio 2015
 - Visual Studio 2017
 - Visual Studio 2019
 install:
 - cmd: >-
-    set tests=1
+    if /i "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" (call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86) & (set QTDIR=C:\Qt\5.13\msvc2017)
 
-    if /i "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" (call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86) & (set QTDIR=C:\Qt\5.9\msvc2015)
-
-    if /i "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" (call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64) & (set QTDIR=C:\Qt\5.12\msvc2017_64)
-
-    if /i "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2019" (call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64) & (set QTDIR=C:\Qt\5.15\msvc2019_64) & set CFLAGS=/arch:AVX2
+    if /i "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2019" (call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64) & (set QTDIR=C:\Qt\6.1\msvc2019_64)
 
     set path=%PATH%;%QTDIR%\bin
 build_script:
 - cmd: >-
-    nmake -f Makefile.nmake -nologo CFLAGS="%CFLAGS% -W3 -Os -MDd"
+    nmake -f Makefile.nmake -nologo CFLAGS="-W3 -Os -MDd"
 
     cd tests
 
-    if /i "%tests%"=="1" qmake CONFIG-=release CONFIG+=debug
+    qmake CONFIG-=release CONFIG+=debug
 
-    if /i "%tests%"=="1" nmake -nologo -s
+    nmake -nologo -s
 test_script:
 - cmd: >-
-    if /i "%tests%"=="1" nmake -s -nologo TESTARGS=-silent check
-
-    if /i "%tests%"=="0" echo Tests skipped.
+    nmake -s -nologo TESTARGS=-silent check
 artifacts:
 - path: lib\tinycbor.lib
 deploy: off

.gitignore

@@ -79,3 +79,5 @@ src/cjson
 src/doxygen.log
 !/Makefile
 .config
+build/
+.vscode/

.travis.yml

@@ -2,8 +2,8 @@ env:
   - BUILD_DOCS=false
 jobs:
   include:
-    - # only build docs on master
-      if: branch = master
+    - # only build docs on main
+      if: branch = main
       env: BUILD_DOCS=true
 
 language: cpp
@@ -75,7 +75,7 @@ script:
   - make -s -f Makefile.configure configure | tee .config
   - make -k
         CFLAGS="$CFLAGS -march=native -g1 -Wall -Wextra -Werror"
-        CPPFLAGS="-DNDEBUG"
+        CPPFLAGS="-DNDEBUG -DCBOR_ENCODER_WRITER_CONTROL=-1 -DCBOR_PARSER_READER_CONTROL=-1"
         lib/libtinycbor.a
   - size lib/libtinycbor.a | tee sizes
   - make -s clean

CMakeLists.txt

@@ -0,0 +1,55 @@
+# /****************************************************************************
+# **
+# ** Copyright (C) 2015 Intel Corporation
+# **
+# ** Permission is hereby granted, free of charge, to any person obtaining a copy
+# ** of this software and associated documentation files (the "Software"), to deal
+# ** in the Software without restriction, including without limitation the rights
+# ** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# ** copies of the Software, and to permit persons to whom the Software is
+# ** furnished to do so, subject to the following conditions:
+# **
+# ** The above copyright notice and this permission notice shall be included in
+# ** all copies or substantial portions of the Software.
+# **
+# ** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# ** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# ** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# ** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# ** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# ** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# ** THE SOFTWARE.
+# **
+# ****************************************************************************/
+
+project(intel_tinycbor LANGUAGES C)
+
+cmake_minimum_required(VERSION 3.10)
+
+option(build_tools "Build the cbor tools. Note: This will install the cjson library as a dependency" OFF)
+
+add_library(tinycbor
+    ${CMAKE_CURRENT_LIST_DIR}/src/cborencoder.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/cborencoder_close_container_checked.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/cborerrorstrings.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/cborparser.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/cborparser_dup_string.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/cborpretty.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/cborpretty_stdio.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/cbortojson.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/cborvalidation.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/open_memstream.c
+)
+
+target_include_directories(tinycbor
+    PUBLIC
+        ${CMAKE_CURRENT_LIST_DIR}/src
+)
+
+add_library(intel::tinycbor ALIAS tinycbor)
+
+add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/examples)
+
+if(${build_tools})
+    add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/tools)
+endif()

Makefile

@@ -26,7 +26,9 @@ TINYCBOR_FREESTANDING_SOURCES = \
 	src/cborerrorstrings.c \
 	src/cborencoder.c \
 	src/cborencoder_close_container_checked.c \
+	src/cborencoder_float.c \
 	src/cborparser.c \
+	src/cborparser_float.c \
 	src/cborpretty.c \
 #
 CBORDUMP_SOURCES = tools/cbordump/cbordump.c
@@ -234,7 +236,10 @@ tag: distcheck
 .SECONDARY:
 
 cflags := $(CPPFLAGS) -I$(SRCDIR)src
-cflags += -std=gnu99 $(CFLAGS)
+cflags += -std=gnu99 $(CFLAGS) \
+	-Werror=incompatible-pointer-types \
+	-Werror=implicit-function-declaration \
+	-Werror=int-conversion
 %.o: %.c
 	@test -d $(@D) || $(MKDIR) $(@D)
 	$(CC) $(cflags) $($(basename $(notdir $@))_CCFLAGS) -c -o $@ $<

Makefile.nmake

@@ -5,17 +5,21 @@ TINYCBOR_SOURCES = \
 	src\cborerrorstrings.c \
 	src\cborencoder.c \
 	src\cborencoder_close_container_checked.c \
+	src\cborencoder_float.c \
 	src\cborparser.c \
 	src\cborparser_dup_string.c \
+	src\cborparser_float.c \
 	src\cborpretty.c \
 	src\cborpretty_stdio.c \
 	src\cborvalidation.c
 TINYCBOR_OBJS = \
 	src\cborerrorstrings.obj \
 	src\cborencoder.obj \
 	src\cborencoder_close_container_checked.obj \
+	src\cborencoder_float.obj \
 	src\cborparser.obj \
 	src\cborparser_dup_string.obj \
+	src\cborparser_float.obj \
 	src\cborpretty.obj \
 	src\cborpretty_stdio.obj \
 	src\cborvalidation.obj

README → README.md

@@ -3,11 +3,23 @@ Concise Binary Object Representation (CBOR) Library
 
 To build TinyCBOR:
 
-  make
+```bash
+make
+```
 
 If you want to change the compiler or pass extra compiler flags:
 
-  make CC=clang CFLAGS="-m32 -Oz" LDFLAGS="-m32"
+```bash
+make CC=clang CFLAGS="-m32 -Oz" LDFLAGS="-m32"
+```
 
-Documentation: https://intel.github.io/tinycbor/current/
+You may also use CMake to build and integrate with your project:
+
+```bash
+mkdir build
+cd build
+cmake ..
+cmake --build .
+```
 
+Documentation: https://intel.github.io/tinycbor/current/

VERSION

@@ -1 +1 @@
-0.5.4
+0.6.0

examples/CMakeLists.txt

@@ -0,0 +1,34 @@
+# /****************************************************************************
+# **
+# ** Copyright (C) 2015 Intel Corporation
+# **
+# ** Permission is hereby granted, free of charge, to any person obtaining a copy
+# ** of this software and associated documentation files (the "Software"), to deal
+# ** in the Software without restriction, including without limitation the rights
+# ** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# ** copies of the Software, and to permit persons to whom the Software is
+# ** furnished to do so, subject to the following conditions:
+# **
+# ** The above copyright notice and this permission notice shall be included in
+# ** all copies or substantial portions of the Software.
+# **
+# ** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# ** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# ** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# ** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# ** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# ** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# ** THE SOFTWARE.
+# **
+# ****************************************************************************/
+
+cmake_minimum_required(VERSION 3.10)
+
+add_executable(simplereader
+    ${CMAKE_CURRENT_LIST_DIR}/simplereader.c
+)
+
+target_link_libraries(simplereader
+    PRIVATE
+        intel::tinycbor
+)

examples/README.md

@@ -0,0 +1,15 @@
+# tinyCBOR Example
+
+This directory has sample CBOR data (`testcbor`) that can be used with the example. The CBOR data resembles the following CBOR (based on [cbor.me diagnostic notation](http://cbor.me/)):
+
+```
+[ 1, [2, 3, 4]]
+```
+
+To run the example, be sure the test data is in the same directory as the example executable and add `testcbor` as an argument to the executable.
+
+Example:
+
+```bash
+./examples/simplereader testcbor
+```

scripts/update-docs.sh

@@ -1,7 +1,7 @@
 #!/bin/sh -ex
 tuple="$TRAVIS_BRANCH${TRAVIS_TAG:+tag:$TRAVIS_TAG},$TRAVIS_PULL_REQUEST"
 case "$tuple" in
-    dev,false|master,false|tag:*)
+    dev,false|main,false|tag:*)
         ;;
     *)
         exit 0