extpp 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f49c10b6867050e901d6a62c1603edf59a043a1bd00adaa0406ec617ad6433c1
-  data.tar.gz: 30b74d3f1d398329f5e46a8c26e37af6a136b894e7baacadc4a721d3a762fff5
+  metadata.gz: 6c22f302ed4a23deab1073040600c6b5fa9983718a9edf01e6fef951a899800a
+  data.tar.gz: 7d112b2629ce251b7c27eaa3035181ef67943379f835def732b42042beaeed1b
 SHA512:
-  metadata.gz: 3a765bf63c05366b94f3002f3a29e03fd837db823af45205975f32d45ca0aaa1c536f5d278c22b4da61aa7b87e964966bcacb6d5c484dd52c14937af77553748
-  data.tar.gz: 4f36f5793d58b0e501f4b93ee5e35011d35c5cfb9d1abde899e746df1c959a2a4b6ca6872f79d85eccdd6a998c3c23ea36bfe258a64f65a4925643695587f0d7
+  metadata.gz: ea4a26e4e6b0ba28549c79bd3dab29da154fea5456399f6b13c754362f8616a73b14eedb252b53fac76f0c1fcd3f9ee09a5b37ad2ed1683e4be7921a7d4c8d3d
+  data.tar.gz: a609c6419db657678c4e2166d68a3d079d3f7d257a0323826a048ab9f592ae0aae02d6c46317c1ea7a1d6b18b170d5e1cfa934c355fd49fcf77c2f4bab5fc2e4

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,11 @@
 # News
 
+## 0.0.7 - 2019-03-021
+
+### Improvements
+
+  * Added support for Windows.
+
 ## 0.0.6 - 2019-02-25
 
 ### Improvements

data/ext/extpp/extconf.rb

@@ -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,7 +3,7 @@
 #include <ruby/type.hpp>
 
 namespace rb {
-  class State {
+  class RB_EXTPP_EXPORT State {
   public:
     explicit State(int state) :
       state_(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

@@ -60,12 +60,14 @@ 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/
           version = Float($1)
@@ -135,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/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.6"
+  VERSION = "0.0.7"
 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.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-25 00:00:00.000000000 Z
+date: 2019-03-20 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