Merge pull request #137 from mrkn/windows_ci

Set up CI for window and debug version of Ruby

Author: mrkn

.github/workflows/ci.yml

@@ -21,22 +21,29 @@ jobs:
         os:
         - ubuntu-20.04
         - macos-latest
+        - windows-latest
         ruby:
         - "3.0"
         - 2.7
         - 2.6
-        - 2.5
-        - 2.4
         python:
         - 3.x
         - 2.x
         python_architecture:
         - x64
         include:
-        - { os: ubuntu-20.04 , ruby: 2.7 , python: 3.8 }
-        - { os: ubuntu-20.04 , ruby: 2.7 , python: 3.7 }
-        - { os: ubuntu-20.04 , ruby: 2.7 , python: 3.6 }
-        - { os: ubuntu-18.04 , ruby: 2.7 , python: 3.8 }
+        - { os: ubuntu-20.04   , ruby: 2.5   , python: 3.x , python_architecture: x64 }
+        - { os: ubuntu-20.04   , ruby: 2.4   , python: 3.x , python_architecture: x64 }
+        - { os: ubuntu-20.04   , ruby: 2.5   , python: 2.x , python_architecture: x64 }
+        - { os: ubuntu-20.04   , ruby: 2.4   , python: 2.x , python_architecture: x64 }
+        - { os: ubuntu-20.04   , ruby: 2.7   , python: 3.8 , python_architecture: x64 }
+        - { os: ubuntu-20.04   , ruby: 2.7   , python: 3.7 , python_architecture: x64 }
+        - { os: ubuntu-20.04   , ruby: 2.7   , python: 3.6 , python_architecture: x64 }
+        - { os: ubuntu-18.04   , ruby: 2.7   , python: 3.8 , python_architecture: x64 }
+        - { os: ubuntu-20.04   , ruby: debug , python: 3.x , python_architecture: x64 }
+        #- { os: macos-latest   , ruby: debug , python: 3.x , python_architecture: x64 }
+        #- { os: windows-latest , ruby: mswin , python: 3.x , python_architecture: x64 }
+        #- { os: windows-latest , ruby: mingw , python: 3.x , python_architecture: x64 }
 
     steps:
     - uses: actions/checkout@v2
@@ -53,8 +60,6 @@ jobs:
         python-version: ${{ matrix.python }}
         architecture: ${{ matrix.python_architecture }}
 
-    - run: gem install bundler
-
     - run: pip install --user numpy
 
     - run: bundle install
@@ -96,8 +101,6 @@ jobs:
       with:
         python-version: ${{ matrix.python }}
 
-    - run: gem install bundler
-
     - run: conda install numpy
 
     - run: bundle install

Rakefile

@@ -13,6 +13,26 @@ def run_extconf(build_dir, extension_dir, *arguments)
   end
 end
 
+def make_command
+  if RUBY_PLATFORM =~ /mswin/
+    "nmake"
+  else
+    ENV["MAKE"] || find_make
+  end
+end
+
+def find_make
+  candidates = ["gmake", "make"]
+  paths = ENV.fetch("PATH", "").split(File::PATH_SEPARATOR)
+  exeext = RbConfig::CONFIG["EXEEXT"]
+  candidates.each do |candidate|
+    paths.each do |path|
+      cmd = File.join(path, "#{candidate}#{exeext}")
+      return cmd if File.executable?(cmd)
+    end
+  end
+end
+
 Dir[File.expand_path('../tasks/**/*.rake', __FILE__)].each {|f| load f }
 
 spec.extensions.each do |extension|
@@ -39,13 +59,13 @@ spec.extensions.each do |extension|
   desc "Compile"
   task compile: makefile do
     cd(build_dir) do
-      sh("make")
+      sh(make_command)
     end
   end
 
   task :clean do
     cd(build_dir) do
-      sh("make", "clean") if File.exist?("Makefile")
+      sh(make_command, "clean") if File.exist?("Makefile")
     end
   end
 end

appveyor.yml

@@ -663,7 +663,7 @@ Py_ssize_t pycall_python_hexversion(void);
 
 void pycall_Py_DecRef(PyObject *);
 
-RUBY_EXTERN const rb_data_type_t pycall_pyptr_data_type;
+extern const rb_data_type_t pycall_pyptr_data_type;
 size_t pycall_pyptr_memsize(void const *);
 void pycall_pyptr_free(void *);
 

ext/pycall/pycall_internal.h

@@ -356,11 +356,16 @@ PyRuby_getattro_with_gvl(PyRubyObject *pyro, PyObject *pyobj_name)
 
 VALUE cPyRubyPtr;
 
-const rb_data_type_t pycall_pyrubyptr_data_type = {
+static rb_data_type_t pycall_pyrubyptr_data_type = {
   "PyCall::PyRubyPtr",
   { 0, pycall_pyptr_free, pycall_pyptr_memsize, },
 #ifdef RUBY_TYPED_FREE_IMMEDIATELY
-  &pycall_pyptr_data_type, 0, RUBY_TYPED_FREE_IMMEDIATELY
+# if defined  _WIN32 && !defined __CYGWIN__
+  0,
+# else
+  &pycall_pyptr_data_type,
+# endif
+  0, RUBY_TYPED_FREE_IMMEDIATELY
 #endif
 };
 
@@ -462,6 +467,10 @@ pycall_init_ruby_wrapper(void)
 
   /* PyCall::PyRubyPtr */
 
+#if defined _WIN32 && !defined __CYGWIN__
+  pycall_pyrubyptr_data_type.parent = &pycall_pyptr_data_type;
+#endif
+
   cPyRubyPtr = rb_define_class_under(mPyCall, "PyRubyPtr", cPyPtr);
   rb_define_alloc_func(cPyRubyPtr, pycall_pyruby_allocate);
   rb_define_method(cPyRubyPtr, "__ruby_object_id__", pycall_pyruby_get_ruby_object_id, 0);