new major release, Version 2.

Author: Asmod4n

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "msgpack-c"]
-	path = msgpack-c
+[submodule "deps/msgpack-c"]
+	path = deps/msgpack-c
 	url = https://github.com/msgpack/msgpack-c

README.md

@@ -3,6 +3,10 @@
 mruby-simplemsgpack
 ===================
 
+Breaking changes
+================
+Starting with Release 2.0 only mruby-3 is supported, if you are on an older version check out a commit from before 2021.
+
 Installation
 ============
 First get a working copy of [mruby](https://github.com/mruby/mruby) then add
@@ -11,8 +15,10 @@ First get a working copy of [mruby](https://github.com/mruby/mruby) then add
 ```
 to the build_conf.rb of the mruby directory
 
-mruby-simplemsgpack searches for msgpack-c on your system, if it can find it it links against it, there is also a bundled version of msgpack-c included if you don't have it installed in your system.
-You need at least msgpack-c 1.
+mruby-simplemsgpack searches for msgpack-c on your system, if it can find it it links against it, otherwise it builds against msgpack-c from source.
+You need at least msgpack-c 1 and depending on your system also pkg-config.
+
+For building from source you need to have cmake installed on your system, take a look at https://github.com/msgpack/msgpack-c/blob/c_master/QUICKSTART-C.md#install-with-source-code for more information.
 
 Example
 -------
@@ -47,17 +53,17 @@ unpacked # => ['bye', { a: 'hash', with: [1, 'embedded', 'array'] }]
 ```
 
 When using `MessagePack.unpack` with a block and passing it a incomplete packed Message
-it returns the number of bytes it was able to unpack, if it was able to unpack the howl Message it returns self.
+it returns the position of the first offending byte, if it was able to unpack the whole Message it returns self.
 This is helpful if the given data contains an incomplete
 last object and we want to continue unpacking after we have more data.
 
 ```ruby
 packed = packed_string + packed_hash.slice(0, packed_hash.length/2)
 unpacked = []
-unpacked_length = MessagePack.unpack(packed) do |result|
+offending_byte = MessagePack.unpack(packed) do |result|
   unpacked << result
 end
-unpacked_length # => 4 (length of packed_string)
+offending_byte # => 19 (length of packed)
 unpacked # => ['bye']
 ```
 

build_config.rb

@@ -1,7 +1,9 @@
 MRuby::Build.new do |conf|
-  conf.cc.defines << 'MRB_USE_ETEXT_EDATA'
   toolchain :gcc
   enable_debug
+  conf.enable_sanitizer "address,undefined,leak"
+  conf.cc.flags << '-fno-omit-frame-pointer' << '-g' << '-ggdb'
+  conf.enable_debug
   conf.enable_test
   conf.gembox 'full-core'
   conf.gem File.expand_path(File.dirname(__FILE__))

build_config.rb.lock

@@ -0,0 +1,12 @@
+---
+mruby:
+  version: 3.0.0
+  release_no: 30000
+  git_commit: 01a21085f6348b1f1b070f2c64a6ed71b6d5afce
+builds:
+  host:
+    https://github.com/iij/mruby-errno.git:
+      url: https://github.com/iij/mruby-errno.git
+      branch: HEAD
+      commit: b4415207ff6ea62360619c89a1cff83259dc4db0
+      version: 0.0.0

deps/msgpack-c

@@ -1,32 +1,51 @@
+require_relative 'mrblib/version'
+
 MRuby::Gem::Specification.new('mruby-simplemsgpack') do |spec|
   spec.license = 'Apache-2'
   spec.summary = 'msgpack for mruby including extension types'
   spec.homepage = 'https://github.com/Asmod4n/mruby-simplemsgpack'
   spec.authors = File.readlines("#{spec.dir}/AUTHORS").map(&:strip)
+  spec.version = MessagePack::VERSION
   spec.add_dependency 'mruby-errno'
   spec.add_conflict 'mruby-msgpack'
 
-  if build.is_a?(MRuby::CrossBuild)
-    msgpackc = "#{spec.dir}/msgpack-c"
-    spec.cc.include_paths << "#{msgpackc}/include"
-    spec.objs += %W(
-      #{msgpackc}/src/unpack.c
-      #{msgpackc}/src/version.c
-      #{msgpackc}/src/zone.c
-    ).map { |f| f.relative_path_from(dir).pathmap("#{build_dir}/%X#{spec.exts.object}" ) }
+  if build.is_a?(MRuby::CrossBuild)  
+    unless File.exists?("#{spec.build_dir}/lib/libmsgpackc.a")
+      cmake_opts = "-DCMAKE_SYSTEM_NAME=\"#{build.build_target}\" -DCMAKE_HOST_SYSTEM_NAME=\"#{build.host_target}\" -DCMAKE_INSTALL_PREFIX=\"#{spec.build_dir}\" -DCMAKE_CXX_COMPILER=\"#{spec.cxx.command}\" -DCMAKE_CXX_COMPILER_AR=\"#{spec.archiver.command}\" -DCMAKE_CXX_FLAGS=\"#{spec.cxx.flags.join(' ')}\" -DCMAKE_C_COMPILER=\"#{spec.cc.command}\" -DCMAKE_C_COMPILER_AR=\"#{spec.archiver.command}\" -DCMAKE_C_FLAGS=\"#{spec.cc.flags.join(' ')}\" -DCMAKE_LINKER=\"#{spec.linker.command}\" -DCMAKE_MODULE_LINKER_FLAGS=\"#{spec.linker.flags.join(' ')}\""
+      sh "mkdir -p #{spec.build_dir}/build && cd #{spec.build_dir}/build && cmake #{cmake_opts} #{spec.dir}/deps/msgpack-c/ && cmake --build . && cmake --build . --target install"
+    end
+    spec.linker.flags_before_libraries << "\"#{spec.build_dir}/lib/libmsgpackc.a\""
+    spec.cc.include_paths << "#{spec.build_dir}/include"
+    spec.cxx.include_paths << "#{spec.build_dir}/include"
+    build.cc.include_paths << "#{spec.build_dir}/include"
+    build.cxx.include_paths << "#{spec.build_dir}/include"
   elsif spec.cc.search_header_path('msgpack.h') && spec.cc.search_header_path('msgpack/version_master.h')
     if spec.build.toolchains.include? 'visualcpp'
       spec.linker.libraries << 'libmsgpackc'
     else
       spec.linker.libraries << 'msgpackc'
     end
   else
-    msgpackc = "#{spec.dir}/msgpack-c"
-    spec.cc.include_paths << "#{msgpackc}/include"
-    spec.objs += %W(
-      #{msgpackc}/src/unpack.c
-      #{msgpackc}/src/version.c
-      #{msgpackc}/src/zone.c
-    ).map { |f| f.relative_path_from(dir).pathmap("#{build_dir}/%X#{spec.exts.object}" ) }
+    `pkg-config --cflags msgpack 2>/dev/null`.split("\s").each do |cflag|
+      spec.cxx.flags << cflag
+      spec.cc.flags << cflag
+    end
+    exitstatus = $?.exitstatus
+    `pkg-config --libs msgpack 2>/dev/null`.split("\s").each do |lib|
+      spec.linker.flags_before_libraries << lib
+    end
+    exitstatus += $?.exitstatus
+    unless exitstatus == 0
+      unless File.exists?("#{spec.build_dir}/lib/libmsgpackc.a")
+        warn "mruby-simplemsgpack: cannot find libmsgpackc, building it"
+        cmake_opts = "-DCMAKE_INSTALL_PREFIX=\"#{spec.build_dir}\" -DCMAKE_CXX_COMPILER=\"#{spec.cxx.command}\" -DCMAKE_CXX_COMPILER_AR=\"#{spec.archiver.command}\" -DCMAKE_CXX_FLAGS=\"#{spec.cxx.flags.join(' ')}\" -DCMAKE_C_COMPILER=\"#{spec.cc.command}\" -DCMAKE_C_COMPILER_AR=\"#{spec.archiver.command}\" -DCMAKE_C_FLAGS=\"#{spec.cc.flags.join(' ')}\" -DCMAKE_LINKER=\"#{spec.linker.command}\" -DCMAKE_MODULE_LINKER_FLAGS=\"#{spec.linker.flags.join(' ')}\""
+        sh "mkdir -p #{spec.build_dir}/build && cd #{spec.build_dir}/build && cmake #{cmake_opts} #{spec.dir}/deps/msgpack-c/ && cmake --build . && cmake --build . --target install"
+      end
+      spec.linker.flags_before_libraries << "\"#{spec.build_dir}/lib/libmsgpackc.a\""
+      spec.cc.include_paths << "#{spec.build_dir}/include"
+      spec.cxx.include_paths << "#{spec.build_dir}/include"
+      build.cc.include_paths << "#{spec.build_dir}/include"
+      build.cxx.include_paths << "#{spec.build_dir}/include"
+    end
   end
 end

mrbgem.rake

@@ -0,0 +1,3 @@
+module MessagePack
+    VERSION="2.0"
+end