extpp 0.0.4 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c37906ea8ea871e171e387ce61d68bc162cdc7d45aa94c85e9a080c1565b4a1
-  data.tar.gz: c1f54dea942fa0329b8e275bdb296e880d1b1731ec16eff59ef663509bad2fbc
+  metadata.gz: 3ad1ded05bdc3f935efd716bf7efca2248ff163e32ead6ad7fd2207d9c49e883
+  data.tar.gz: b8439db5e84748907e4f4e744ee3916e96ab70b1284a6f63a376678a6d3669fb
 SHA512:
-  metadata.gz: 0dd33cc753814d03f1d2f1177a4ff74138a1c52808ee4bccfd3f4d8c52f8667e35f310d7d9afd3b64c3f0233d6549e2e0977b80a8d6947f3297f4188b4c5f089
-  data.tar.gz: 92f0058fb4af4f2da3702a0af37a4afb3095cb7fc3e5891b7500e29458a3fe21f4a7cf4c17c82553a916603643eb871fd921df3cf354336fb903d0ddf184756f
+  metadata.gz: d55f0224494159be0b951787bcf5e28990f7cbd2b5a17aabdce821dcc390ca9309c8f4eb7d04db755c1bd3defb6c45807592cfb672a41af45c060de7c497fccd
+  data.tar.gz: 3f9fb2d6a8e80e7087e5f45b8713fad57166fcfbd29e43c03c16bea3db62865def8413ea815022f02f7e08d896eebf40f5b9b6add4cb4d4f55ce334d3a8a54f2

data/README.md

@@ -90,12 +90,12 @@ Build this extension:
 Now, you can use this extension:
 
 ```console
-% ruby -r ./hello -e 'p Hello.new("me").greet'
+% ruby -r extpp/setup -r ./hello -e 'p Hello.new("me").greet'
 "Hello me"
 ```
 
 ## License
 
-Copyright (C) 2017-2018 Kouhei Sutou
+Copyright (C) 2017-2019 Kouhei Sutou
 
 The 2-Clause BSD License. See [LICENSE.txt](LICENSE.txt) for details.

data/doc/text/news.md

@@ -1,5 +1,67 @@
 # News
 
+## 0.0.9 - 2020-11-03
+
+### Improvements
+
+  * Improved `clang++` version detection.
+    [GitHub#10][Patch by Alex Neill]
+
+  * Improved `g++` version detection.
+
+### Thanks
+
+  * Alex Neill
+
+## 0.0.8 - 2019-09-25
+
+### Improvements
+
+  * Changed to use `RbConfig::CONFIG["SOEXT"]`.
+    [Suggested by Nobuyoshi Nakada]
+
+  * Added `ExtpPP::Platform#shared_library_extension`.
+
+  * Added support for macOS Majave.
+    [GitHub#8][Patch by Josh Huckabee]
+
+### Thanks
+
+  * Nobuyoshi Nakada
+
+  * Josh Huckabee
+
+## 0.0.7 - 2019-03-21
+
+### Improvements
+
+  * Added support for Windows.
+
+## 0.0.6 - 2019-02-25
+
+### Improvements
+
+  * Suppressed warnings by `register`.
+    [GitHub#6][Patch by Kenta Murata]
+
+  * Added `noreturn` attribute to suppress warning.
+    [GitHub#7][Patch by Kenta Murata]
+
+### Thanks
+
+  * Kenta Murata
+
+## 0.0.5 - 2019-02-25
+
+### Improvements
+
+  * Added support for Xcode 10.
+    [GitHub#4][Reported by Kenta Murata]
+
+### Thanks
+
+  * Kenta Murata
+
 ## 0.0.4 - 2019-02-16
 
 ### Improvements

data/ext/extpp/extconf.rb

@@ -53,7 +53,7 @@ HEADERS = #{headers.collect(&:quote).join(" ")}
 
 INCLUDE_DIR = #{include_dir.quote}
 
-CXX = #{RbConfig::CONFIG["CXX"].quote}
+CXX = #{RbConfig.expand("$(CXX)")}
 
 RUBY = #{RbConfig.ruby.quote}
 RUBY_HEADER_DIR = #{RbConfig::CONFIG["rubyhdrdir"].quote}
@@ -75,7 +75,7 @@ INCLUDEFLAGS = \
 	-I$(INCLUDE_DIR) \
 	-I$(RUBY_HEADER_DIR) \
 	-I$(RUBY_ARCH_HEADER_DIR)
-CPPFLAGS = #{RbConfig::CONFIG["CPPFLAGS"]}
+CPPFLAGS = #{RbConfig::CONFIG["CPPFLAGS"]} -DRB_EXTPP_COMPILATION
 CXXFLAGS = $(CCDLFLAGS) #{cxxflags}
 
 all: $(LIBRARY)

data/ext/extpp/object.cpp

@@ -1,4 +1,4 @@
-#include <ruby/object.hpp>
+#include <ruby.hpp>
 
 namespace {
   VALUE call_block(RB_BLOCK_CALL_FUNC_ARGLIST(rb_data, rb_block)) {

data/ext/extpp/protect.cpp

@@ -1,4 +1,4 @@
-#include <ruby/protect.hpp>
+#include <ruby.hpp>
 
 namespace rb {
   VALUE protect(RawCallback callback, VALUE callback_data) {

data/include/ruby.hpp

@@ -5,6 +5,16 @@
 #define RB_BEGIN_DECLS extern "C" {
 #define RB_END_DECLS }
 
+#ifdef _WIN32
+#  ifdef RB_EXTPP_COMPILATION
+#    define RB_EXTPP_EXPORT __declspec(dllexport)
+#  else
+#    define RB_EXTPP_EXPORT __declspec(dllimport)
+#  endif
+#else
+#  define RB_EXTPP_EXPORT __attribute__((visibility("default")))
+#endif
+
 #include <ruby/cast.hpp>
 #include <ruby/class.hpp>
 #include <ruby/object.hpp>

data/include/ruby/cast.hpp

@@ -36,12 +36,12 @@ namespace rb {
 
   template <>
   inline int64_t cast<int64_t, Object>(const Object& rb_object) {
-    return NUM2LONG(rb_object);
+    return NUM2LL(rb_object);
   }
 
   template <>
   inline Object cast<Object, int64_t>(const int64_t& n) {
-    return Object(LONG2NUM(n));
+    return Object(LL2NUM(n));
   }
 
 
@@ -58,12 +58,12 @@ namespace rb {
 
   template <>
   inline uint64_t cast<uint64_t, Object>(const Object& rb_object) {
-    return NUM2ULONG(rb_object);
+    return NUM2ULL(rb_object);
   }
 
   template <>
   inline Object cast<Object, uint64_t>(const uint64_t& n) {
-    return Object(ULONG2NUM(n));
+    return Object(ULL2NUM(n));
   }
 
 

data/include/ruby/class.hpp

@@ -3,7 +3,7 @@
 #include <ruby/object.hpp>
 
 namespace rb {
-  class Class: public Object {
+  class RB_EXTPP_EXPORT Class: public Object {
   public:
     Class(const char *name);
     Class(const char *name, VALUE parent);

data/include/ruby/object.hpp

@@ -5,7 +5,7 @@
 #include <initializer_list>
 
 namespace rb {
-  class Object {
+  class RB_EXTPP_EXPORT Object {
   public:
     explicit Object(VALUE rb_object=Qnil) :
       rb_object_(rb_object),

data/include/ruby/protect.hpp

@@ -3,13 +3,13 @@
 #include <ruby/type.hpp>
 
 namespace rb {
-  class State {
+  class RB_EXTPP_EXPORT State {
   public:
     explicit State(int state) :
       state_(state) {
     }
 
-    inline void jump() {
+    [[noreturn]] inline void jump() {
       rb_jump_tag(state_);
     }
 
@@ -17,15 +17,15 @@ namespace rb {
     int state_;
   };
 
-  VALUE protect(RawCallback callback, VALUE callback_data);
+  RB_EXTPP_EXPORT VALUE protect(RawCallback callback, VALUE callback_data);
 
-  template <typename CALLBACK>
-  VALUE protect(const CALLBACK& callback) {
+  template <typename NoArgumentCallback>
+  VALUE protect(const NoArgumentCallback& callback) {
     struct Data {
-      Data(const CALLBACK& callback) :
+      Data(const NoArgumentCallback& callback) :
         callback_(callback) {
       }
-      const CALLBACK& callback_;
+      const NoArgumentCallback& callback_;
     } data(callback);
     auto callback_data = reinterpret_cast<VALUE>(&data);
     return protect([](VALUE callback_data) -> VALUE {

data/lib/extpp/compiler.rb

@@ -13,6 +13,7 @@ module ExtPP
 
     def check
       check_debug_build
+      check_cxx
       check_version
       check_warning_flags
     end
@@ -45,6 +46,12 @@ module ExtPP
       end
     end
 
+    def check_cxx
+      checking_for(checking_message("C++ compiler"), "%s") do
+        RbConfig.expand("$(CXX)")
+      end
+    end
+
     def check_version
       return unless gcc?
 
@@ -53,28 +60,31 @@ module ExtPP
         std = nil
 
         case `#{RbConfig.expand("$(CXX) --version")}`
-        when /\Ag\+\+ .+ (\d\.\d)\.\d/
+        when /g\+\+.+ (\d+\.\d+)\.\d/
           version = Float($1)
           if version < 5.1
             std = "gnu++11"
           elsif version < 6.1
             std = "gnu++14"
+          else
+            std = "gnu++17"
           end
-        when /\A.+ clang version (\d\.\d)\.\d/
+        when /\AApple (?:LLVM|clang) version (\d+\.\d+)\.\d/
           version = Float($1)
-          if version < 3.5
+          # TODO: Is it right?
+          if version < 9.0
             std = "gnu++11"
-          elsif version < 5
+          elsif version < 9.1
             std = "gnu++14"
           else
             std = "gnu++17"
           end
-        when /\AApple LLVM version (\d\.\d)\.\d/
+          cxx_flags = "-Wno-deprecated-register"
+        when /clang version (\d+\.\d+)\.\d/
           version = Float($1)
-          # TODO: Is it right?
-          if version < 9.0
+          if version < 3.5
             std = "gnu++11"
-          elsif version < 9.1
+          elsif version < 5
             std = "gnu++14"
           else
             std = "gnu++17"
@@ -82,7 +92,14 @@ module ExtPP
         end
 
         if std
+          if std == "gnu++17"
+            # ruby/intern.h doesn't adapt to C++17. Because it uses
+            # "register" for "rb_mem_clear(register VALUE *mem,
+            # register long size)".  C++17 removes "register" keyword.
+            std = "gnu++14"
+          end
           @cxx_flags += " -std=#{std}"
+          @cxx_flags += " #{cxx_flags}" if cxx_flags
           [version, " (#{std})"]
         else
           [version, ""]
@@ -120,7 +137,12 @@ module ExtPP
           flags << warning_flag
         end
       end
-      @cxx_flags = Shellwords.join(flags)
+      case RUBY_PLATFORM
+      when /windows/, /mingw/
+        @cxx_flags = flags.join(" ")
+      else
+        @cxx_flags = Shellwords.join(flags)
+      end
     end
   end
 end

data/lib/extpp/platform.rb

@@ -1,14 +1,8 @@
 module ExtPP
   class Platform
     def dynamic_library_extension
-      case RUBY_PLATFORM
-      when /windows/, /mingw/
-        "dll"
-      when /darwin/
-        "dylib"
-      else
-        RbConfig::CONFIG["DLEXT"]
-      end
+      RbConfig::CONFIG["SOEXT"]
     end
+    alias_method :shared_library_extension, :dynamic_library_extension
   end
 end

data/lib/extpp/setup.rb

@@ -0,0 +1,4 @@
+if Object.const_defined?(:RubyInstaller)
+  ext_dir = File.expand_path(File.join(__dir__, "..", "..", "ext", "extpp"))
+  RubyInstaller::Runtime.add_dll_directory(ext_dir)
+end

data/lib/extpp/version.rb

@@ -1,3 +1,3 @@
 module ExtPP
-  VERSION = "0.0.4"
+  VERSION = "0.0.9"
 end

data/sample/hello/Rakefile

@@ -1,4 +1,9 @@
-task :default => :build
+task :default => :run
+
+desc "Run"
+task :run => :build do
+  ruby("hello.rb")
+end
 
 desc "Build"
 task :build => "hello.so"

data/test/fixtures/cast/mkmf.log

@@ -2,7 +2,11 @@ check_debug_build: checking --enable-debug-build option... --------------------
 
 --------------------
 
-check_version: checking g++ version... -------------------- 8.2
+check_cxx: checking C++ compiler... -------------------- g++
+
+--------------------
+
+check_version: checking g++ version... -------------------- 8.3
 
 --------------------
 

data/test/fixtures/class/mkmf.log

@@ -2,7 +2,11 @@ check_debug_build: checking --enable-debug-build option... --------------------
 
 --------------------
 
-check_version: checking g++ version... -------------------- 8.2
+check_cxx: checking C++ compiler... -------------------- g++
+
+--------------------
+
+check_version: checking g++ version... -------------------- 8.3
 
 --------------------
 

data/test/fixtures/object/mkmf.log

@@ -2,7 +2,11 @@ check_debug_build: checking --enable-debug-build option... --------------------
 
 --------------------
 
-check_version: checking g++ version... -------------------- 8.2
+check_cxx: checking C++ compiler... -------------------- g++
+
+--------------------
+
+check_version: checking g++ version... -------------------- 8.3
 
 --------------------
 

data/test/fixtures/protect/mkmf.log

@@ -2,7 +2,11 @@ check_debug_build: checking --enable-debug-build option... --------------------
 
 --------------------
 
-check_version: checking g++ version... -------------------- 8.2
+check_cxx: checking C++ compiler... -------------------- g++
+
+--------------------
+
+check_version: checking g++ version... -------------------- 8.3
 
 --------------------
 

data/test/helper.rb

@@ -1,5 +1,7 @@
 require "test-unit"
 
+require "extpp/setup"
+
 module Helper
   module Fixture
     def fixture_path(*components)

data/test/run-test.rb

@@ -10,9 +10,17 @@ ext_dir = base_dir + "ext" + "extpp"
 lib_dir = base_dir + "lib"
 test_dir = base_dir + "test"
 
-Dir.chdir(ext_dir.to_s) do
-  if File.exist?("Makefile")
-    system("make > /dev/null") or exit(false)
+make = nil
+if system("which gmake > #{File::NULL} 2>&1")
+  make = "gmake"
+elsif system("which make > #{File::NULL} 2>&1")
+  make = "make"
+end
+if make
+  Dir.chdir(ext_dir.to_s) do
+    if File.exist?("Makefile")
+      system("#{make} > #{File::NULL}") or exit(false)
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: extpp
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.9
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-15 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,6 +81,7 @@ files:
 - lib/extpp.rb
 - lib/extpp/compiler.rb
 - lib/extpp/platform.rb
+- lib/extpp/setup.rb
 - lib/extpp/version.rb
 - sample/hello/Rakefile
 - sample/hello/extconf.rb
@@ -134,39 +135,38 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.2.0.rc.2
 signing_key: 
 specification_version: 4
 summary: Ext++ is a Ruby extension that provides C++ API for writing Ruby extension.
 test_files:
-- test/test-object.rb
-- test/test-protect.rb
-- test/test-class.rb
-- test/fixtures/class/class.so
-- test/fixtures/class/mkmf.log
-- test/fixtures/class/class.cpp
-- test/fixtures/class/class.o
-- test/fixtures/class/Makefile
-- test/fixtures/class/extconf.rb
-- test/fixtures/protect/mkmf.log
-- test/fixtures/protect/protect.so
-- test/fixtures/protect/protect.cpp
-- test/fixtures/protect/Makefile
-- test/fixtures/protect/protect.o
-- test/fixtures/protect/extconf.rb
-- test/fixtures/cast/mkmf.log
-- test/fixtures/cast/cast.cpp
-- test/fixtures/cast/cast.so
 - test/fixtures/cast/Makefile
+- test/fixtures/cast/cast.cpp
 - test/fixtures/cast/cast.o
+- test/fixtures/cast/cast.so
 - test/fixtures/cast/extconf.rb
-- test/fixtures/object/mkmf.log
-- test/fixtures/object/object.so
+- test/fixtures/cast/mkmf.log
+- test/fixtures/class/Makefile
+- test/fixtures/class/class.cpp
+- test/fixtures/class/class.o
+- test/fixtures/class/class.so
+- test/fixtures/class/extconf.rb
+- test/fixtures/class/mkmf.log
 - test/fixtures/object/Makefile
+- test/fixtures/object/extconf.rb
+- test/fixtures/object/mkmf.log
 - test/fixtures/object/object.cpp
 - test/fixtures/object/object.o
-- test/fixtures/object/extconf.rb
+- test/fixtures/object/object.so
+- test/fixtures/protect/Makefile
+- test/fixtures/protect/extconf.rb
+- test/fixtures/protect/mkmf.log
+- test/fixtures/protect/protect.cpp
+- test/fixtures/protect/protect.o
+- test/fixtures/protect/protect.so
 - test/helper.rb
 - test/run-test.rb
 - test/test-cast.rb
+- test/test-class.rb
+- test/test-object.rb
+- test/test-protect.rb