make packing 7 times faster

Author: Asmod4n

.gitignore

@@ -37,4 +37,5 @@ build/
 
 /mruby/
 /build_config.rb.lock
-compile_commands.json
+compile_commands.json
+/.cache/

build_config.rb

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

mrbgem.rake

@@ -1,53 +1,47 @@
+require 'fileutils'
 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.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.authors  = File.readlines(File.join(spec.dir, 'AUTHORS')).map(&:strip)
+  spec.version  = MessagePack::VERSION
+
   spec.add_dependency 'mruby-errno'
   spec.add_dependency 'mruby-error'
   spec.add_dependency 'mruby-string-is-utf8'
-  spec.add_conflict 'mruby-msgpack'
+  spec.add_dependency 'mruby-c-ext-helpers'
+  spec.add_conflict   'mruby-msgpack'
 
-  if build.is_a?(MRuby::CrossBuild)
-    unless File.exist?("#{spec.build_dir}/lib/libmsgpack-c.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/libmsgpack-c.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
-    `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
+  include_dir = File.join(spec.build_dir, 'include')
+
+  unless File.exist?(File.join(include_dir, 'msgpack.hpp'))
+    warn 'mruby-simplemsgpack: cannot find msgpack-cxx, building it'
+
+    cmake_opts = "-DMSGPACK_USE_BOOST=OFF -DMSGPACK_INSTALL=ON " \
+                 "-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(' ')}\""
+
+    if build.is_a?(MRuby::CrossBuild)
+      cmake_opts << " -DCMAKE_SYSTEM_NAME=\"#{build.build_target}\"" \
+                    " -DCMAKE_HOST_SYSTEM_NAME=\"#{build.host_target}\""
     end
-    exitstatus += $?.exitstatus
-    unless exitstatus == 0
-      unless File.exist?("#{spec.build_dir}/lib/libmsgpack-c.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/libmsgpack-c.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"
+
+    build_dir = File.join(spec.build_dir, 'build')
+    FileUtils.mkdir_p(build_dir)
+    Dir.chdir(build_dir) do
+      sh "cmake #{cmake_opts} #{File.join(spec.dir, 'deps', 'msgpack-c')}"
+      sh "cmake --build . --target install"
     end
   end
+
+  [spec.cc, spec.cxx, build.cc, build.cxx].each { |c| c.include_paths << include_dir }
 end

mrblib/version.rb

@@ -1,3 +1,3 @@
 module MessagePack
-    VERSION="2.1"
+    VERSION="3.0"
 end