diff --git a/ChangeLog b/ChangeLog index a3f304bd..10605a37 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +This file has not been not updated. See commit log at https://github.com/kubo/ruby-oci8. + 2020-12-30 Kubo Takehiro * NEWS: Add changes between 2.2.8 and 2.2.9. * lib/oci8/version.rb: Update to 2.2.9. diff --git a/NEWS b/NEWS index 0f081905..8067e807 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,12 @@ # @markup markdown +2.2.12 (2022-12-30) +=================== + +- Fix warning: undefining the allocator of T_DATA class OraNumber against Ruby 3.2.0dev. (GH-243) +- Fix warnings on tests and on compile. +- Remove code for old ruby versions. + 2.2.11 (2022-02-22) =================== diff --git a/lib/oci8/version.rb b/lib/oci8/version.rb index 0ae89d5c..1c1305e5 100644 --- a/lib/oci8/version.rb +++ b/lib/oci8/version.rb @@ -1,3 +1,3 @@ class OCI8 - VERSION = "2.2.11" + VERSION = "2.2.12" end diff --git a/mkpkg-win32.rb b/mkpkg-win32.rb index 600d3a4f..7c2fabdc 100644 --- a/mkpkg-win32.rb +++ b/mkpkg-win32.rb @@ -17,11 +17,11 @@ def run_cmd(cmd, raise_on_error = true) $ruby_base_dirs = [ - 'c:\ruby\rubyinstaller-2.5.0-1-x86', 'c:\ruby\rubyinstaller-2.6.0-1-x86', 'c:\ruby\rubyinstaller-2.7.0-1-x86', 'c:\ruby\rubyinstaller-3.0.0-1-x86', 'c:\ruby\rubyinstaller-3.1.0-1-x86', + 'c:\ruby\rubyinstaller-3.2.0-1-x86', ] $oracle_path = 'c:\oracle\instantclient_19_9-win32' @@ -29,18 +29,17 @@ def run_cmd(cmd, raise_on_error = true) $build_ruby_dirs = [ - ['c:\ruby\rubyinstaller-2.5.0-1-x86', $ridk_setup, :disable_fortify_source], ['c:\ruby\rubyinstaller-2.6.0-1-x86', $ridk_setup], ['c:\ruby\rubyinstaller-2.7.0-1-x86', $ridk_setup], ['c:\ruby\rubyinstaller-3.0.0-1-x86', $ridk_setup], ['c:\ruby\rubyinstaller-3.1.0-1-x86', $ridk_setup], + ['c:\ruby\rubyinstaller-3.2.0-1-x86', $ridk_setup], ] when 'x64-mingw32' $ruby_base_dirs = [ # RubyInstaller - 'c:\ruby\rubyinstaller-2.5.0-1-x64', 'c:\ruby\rubyinstaller-2.6.0-1-x64', 'c:\ruby\rubyinstaller-2.7.0-1-x64', 'c:\ruby\rubyinstaller-3.0.0-1-x64', @@ -51,7 +50,6 @@ def run_cmd(cmd, raise_on_error = true) $ridk_setup = 'ridk enable' $build_ruby_dirs = [ - ['c:\ruby\rubyinstaller-2.5.0-1-x64', $ridk_setup, :disable_fortify_source], ['c:\ruby\rubyinstaller-2.6.0-1-x64', $ridk_setup], ['c:\ruby\rubyinstaller-2.7.0-1-x64', $ridk_setup], ['c:\ruby\rubyinstaller-3.0.0-1-x64', $ridk_setup], @@ -63,6 +61,7 @@ def run_cmd(cmd, raise_on_error = true) [ # RubyInstaller 'c:\ruby\rubyinstaller-3.1.0-1-x64', + 'c:\ruby\rubyinstaller-3.2.0-1-x64', ] $oracle_path = 'c:\oracle\instantclient_19_9-win64' @@ -70,10 +69,12 @@ def run_cmd(cmd, raise_on_error = true) $build_ruby_dirs = [ ['c:\ruby\rubyinstaller-3.1.0-1-x64', $ridk_setup], + ['c:\ruby\rubyinstaller-3.2.0-1-x64', $ridk_setup], ] when 'all' files = File.read('dist-files').split("\n") + mkpkg_rb = File.absolute_path?($0) ? $0 : File.join('..', $0) ['x86-mingw32', 'x64-mingw32', 'x64-mingw-ucrt'].each do |platform| FileUtils.rm_rf platform files.each do |file| @@ -82,7 +83,7 @@ def run_cmd(cmd, raise_on_error = true) FileUtils.copy(file, dest) end Dir.chdir platform do - run_cmd("#{RbConfig.ruby} ../mkpkg-win32.rb #{platform}") + run_cmd("#{RbConfig.ruby} #{mkpkg_rb} #{platform}") end end exit 0