zstdlib 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc77452adc27bcf151d2e4e04a1193f5f525933c6b3842c4e3b0293648d689f1
-  data.tar.gz: f239569b0b434d39302b3fdd6b44134e94b753ec17b94a2a82c2241adb7a3506
+  metadata.gz: 2976ec1d48890e3d065192896c2322912e61eb88c2d1aa445c19ddd7536de81f
+  data.tar.gz: 6ca5cfeb403df3cc60609bd9acfd225364e2d247ea9095d8727c9b539de2a10b
 SHA512:
-  metadata.gz: 4cfbaae9358026f4e647e2c43bb84e541f5bceda3fbfd821a295dd5d70982f036e9b44c5dccbcb78da3623137466fae48c7c94d5bbaaff39e8d6c7ba3c498167
-  data.tar.gz: e6463c0b88f77df500ff770b85850fc31f8567eee0b78abbffa0dd555306612d3b4f4103a590bdf25022f748f31317b67e6b59a8d79c27ef113828f11d7aec1c
+  metadata.gz: 4cdaaa65adb75bf14513e5dea37801d0fe6c11e9c39e7964e46e72fe9a604fc7e8aca0d66e8d7d1d696d0bb697f161e435419aab758b5dc04841daed60f4dd30
+  data.tar.gz: 4995f810d803aa6a9d468b431e0a0acea7ab9dd5a07245c5769dd1b44722cd08c029036c76bb84d9923fed26ec16abb3c159a212378b5fcb5c4186fa6104b1e5

data/CHANGES.md

@@ -1,3 +1,13 @@
+# 0.9.0
+
+Updated Zstd to `1.5.2`
+
+Added support for MRI Ruby versions `3.0-3.1`
+
+Upgraded rake-compiler-dock to `1.2.0`
+
+Implemented deployment of system-specific compiled gems for for x32/x64 Windows and x64/ARM64 MacOS platforms
+
 # 0.8.0
 
 Zstd version update to `1.5.0`

data/README.md

@@ -77,7 +77,13 @@ The `BEST_SPEED` constant remains unchanged.
 
 _zstdlib_ home page on [GitHub](https://github.com/okhlybov/zstdlib).
 
-Source code and Windows-specific multi-versioned binary gems can be obtained from [rubygems.org](https://rubygems.org/gems/zstdlib).
+Source code and system-specific compiled gems can be obtained from [rubygems.org](https://rubygems.org/gems/zstdlib).
+
+The system-specific gems are currently provided for x32/x64 Windows and x64/ARM64 MacOS platforms.
+
+Note that these gems are built with the [rake-compiler-dock](https://github.com/rake-compiler/rake-compiler-dock)
+infrastructure the minimum supported Ruby version is raised to 2.4.
+All other installations including Linux will use the source gem and hence require the compilation step with locally installed development tools.
 
 ## Release history
 

data/Rakefile

@@ -1,18 +1,49 @@
 require 'rake/testtask'
 require 'bundler/gem_tasks'
 require 'rake/extensiontask'
+require 'rake_compiler_dock'
 
 
 spec = Gem::Specification.load('zstdlib.gemspec')
 
 
-Rake::ExtensionTask.new('zstdlib', spec) do |t|
+platforms = %w[x86-mingw32 x64-mingw-ucrt x64-mingw32 x86_64-darwin arm64-darwin]
+
+
+Rake::ExtensionTask.new('zstdlib_c', spec) do |t|
   t.cross_compile = true
-  t.cross_platform = %w(x86-mingw32 x64-mingw32)
+  t.cross_platform = platforms
+  t.cross_config_options << '--enable-cross-build'
 end
 
 
-Gem::PackageTask.new(spec)
+namespace "gem" do
+  platforms.each do |platform|
+    desc "build native gem for #{platform}"
+    # This runs on a host
+    task platform do
+      RakeCompilerDock.sh(<<~EOF, platform: platform)
+        gem install bundler --no-document &&
+        bundle &&
+        bundle exec rake gem:#{platform}:buildit
+      EOF
+    end
+
+    namespace platform do
+      # This runs in the rake-compiler-dock docker container
+      task "buildit" do
+        # Use Task#invoke because the pkg/*gem task is defined at runtime
+        Rake::Task["native:#{platform}"].invoke
+        Rake::Task["pkg/#{spec.full_name}-#{Gem::Platform.new(platform)}.gem"].invoke
+      end
+    end
+  end
+
+  #
+  desc "build native gem for all platforms"
+  multitask 'all' => platforms
+
+end
 
 
 Rake::TestTask.new(:test) do |t|
@@ -22,8 +53,7 @@ Rake::TestTask.new(:test) do |t|
 end
 
 
-task :fat do
-  require 'rake_compiler_dock'
-  sh 'bundle package'
-  RakeCompilerDock.sh 'gem install bundle && bundle --local && rake cross native gem'
-end
+Gem::PackageTask.new(spec)
+
+
+# Build system explained: https://github.com/flavorjones/ruby-c-extensions-explained/tree/main/precompiled

data/ext/{zstdlib → zstdlib_c}/extconf.rb

@@ -6,10 +6,15 @@ require 'fileutils'
 include RbConfig
 include FileUtils
 
-ZSTD_VERSION = '1.5.0'
+ZSTD_VERSION = '1.5.2'
 ZLIB_VERSION = '1.2.11'
+
 RB_VERSION = CONFIG['MAJOR']+'.'+CONFIG['MINOR']
-ZMOD_VERSION = RB_VERSION >= '2.3' ? '2.7' : RB_VERSION # Review requirements with every new zlib module release!
+ZMOD_VERSION = RB_VERSION >= '2.3' ? '3.1' : RB_VERSION # Review requirements with every new zlib module release!
+
+ # For cross compiling
+ENV['CC'] = RbConfig::CONFIG['CC']
+ENV['LD'] = RbConfig::CONFIG['LD']
 
 root = File.dirname(__FILE__)
 
@@ -23,16 +28,16 @@ cp "#{zmod}/zstdlib.c", 'zstdlib.c'
 $srcs = ['zstdlib.c']
 
 $CFLAGS += ' -fomit-frame-pointer -ffast-math -O3'
-$CPPFLAGS += " -I#{zlib} -I#{zlibwrapper} -I#{zstd} -DZWRAP_USE_ZSTD=1 -DGZIP_SUPPORT=0"
+$CPPFLAGS += " -I#{zlib} -I#{zlibwrapper} -I#{zstd} -DZWRAP_USE_ZSTD=1 -DGZIP_SUPPORT=1"
 $LDFLAGS += ' -s'
 $LOCAL_LIBS += ' libzlibwrapper.a libz.a libzstd.a'
 
-create_makefile('zstdlib')
+create_makefile('zstdlib_c')
 
 File.open('Makefile', 'a') do |file|
 file << %~
 
-export CC AR CFLAGS CPPFLAGS
+export CC LD AR CFLAGS CPPFLAGS
 
 $(DLLIB) : libz.a libzstd.a libzlibwrapper.a
 

data/ext/{zstdlib → zstdlib_c}/ruby/zlib-2.2/zstdlib.c

@@ -293,7 +293,7 @@ static VALUE rb_gzreader_readlines(int, VALUE*, VALUE);
  *   - Zstdlib::GzipFile::NoFooter
  *
  */
-void Init_zstdlib(void);
+void Init_zstdlib_c(void);
 
 /*--------- Exceptions --------*/
 
@@ -4250,7 +4250,7 @@ rb_gzreader_readlines(int argc, VALUE *argv, VALUE obj)
 #endif /* GZIP_SUPPORT */
 
 void
-Init_zstdlib(void)
+Init_zstdlib_c(void)
 {
     VALUE mZlib, cZStream, cDeflate, cInflate;
 #if GZIP_SUPPORT

data/ext/{zstdlib → zstdlib_c}/ruby/zlib-2.3/zstdlib.c

@@ -293,7 +293,7 @@ static VALUE rb_gzreader_readlines(int, VALUE*, VALUE);
  *   - Zstdlib::GzipFile::NoFooter
  *
  */
-void Init_zstdlib(void);
+void Init_zstdlib_c(void);
 
 /*--------- Exceptions --------*/
 
@@ -4276,7 +4276,7 @@ rb_gzreader_external_encoding(VALUE self)
 #endif /* GZIP_SUPPORT */
 
 void
-Init_zstdlib(void)
+Init_zstdlib_c(void)
 {
     VALUE mZlib, cZStream, cDeflate, cInflate;
 #if GZIP_SUPPORT

data/ext/{zstdlib → zstdlib_c}/ruby/zlib-2.4/zstdlib.c

@@ -292,7 +292,7 @@ static VALUE rb_gzreader_readlines(int, VALUE*, VALUE);
  *   - Zstdlib::GzipFile::NoFooter
  *
  */
-void Init_zstdlib(void);
+void Init_zstdlib_c(void);
 
 /*--------- Exceptions --------*/
 
@@ -4428,7 +4428,7 @@ zlib_gunzip_run(VALUE arg)
 #endif /* GZIP_SUPPORT */
 
 void
-Init_zstdlib(void)
+Init_zstdlib_c(void)
 {
     VALUE mZlib, cZStream, cDeflate, cInflate;
 #if GZIP_SUPPORT

data/ext/{zstdlib → zstdlib_c}/ruby/zlib-2.5/zstdlib.c

@@ -292,7 +292,7 @@ static VALUE rb_gzreader_readlines(int, VALUE*, VALUE);
  *   - Zstdlib::GzipFile::NoFooter
  *
  */
-void Init_zstdlib(void);
+void Init_zstdlib_c(void);
 
 /*--------- Exceptions --------*/
 
@@ -4433,7 +4433,7 @@ zlib_gunzip_run(VALUE arg)
 #endif /* GZIP_SUPPORT */
 
 void
-Init_zstdlib(void)
+Init_zstdlib_c(void)
 {
     VALUE mZlib, cZStream, cDeflate, cInflate;
 #if GZIP_SUPPORT

data/ext/{zstdlib → zstdlib_c}/ruby/zlib-2.6/zstdlib.c

@@ -292,7 +292,7 @@ static VALUE rb_gzreader_readlines(int, VALUE*, VALUE);
  *   - Zstdlib::GzipFile::NoFooter
  *
  */
-void Init_zstdlib(void);
+void Init_zstdlib_c(void);
 
 /*--------- Exceptions --------*/
 
@@ -4474,7 +4474,7 @@ zlib_gunzip_run(VALUE arg)
 #endif /* GZIP_SUPPORT */
 
 void
-Init_zstdlib(void)
+Init_zstdlib_c(void)
 {
 #undef rb_intern
     VALUE mZlib, cZStream, cDeflate, cInflate;

data/ext/{zstdlib → zstdlib_c}/ruby/zlib-2.7/zstdlib.c

@@ -297,7 +297,7 @@ static VALUE rb_gzreader_readlines(int, VALUE*, VALUE);
  *   - Zstdlib::GzipFile::NoFooter
  *
  */
-void Init_zstdlib(void);
+void Init_zstdlib_c(void);
 
 /*--------- Exceptions --------*/
 
@@ -4465,7 +4465,7 @@ zlib_gunzip_run(VALUE arg)
 #endif /* GZIP_SUPPORT */
 
 void
-Init_zstdlib(void)
+Init_zstdlib_c(void)
 {
 #undef rb_intern
     VALUE mZlib, cZStream, cDeflate, cInflate;

data/ext/{zstdlib → zstdlib_c}/ruby/zlib-3.0/zstdlib.c

@@ -300,7 +300,7 @@ static VALUE rb_gzreader_readlines(int, VALUE*, VALUE);
  *   - Zstdlib::GzipFile::NoFooter
  *
  */
-void Init_zstdlib(void);
+void Init_zstdlib_c(void);
 
 /*--------- Exceptions --------*/
 
@@ -4560,7 +4560,7 @@ zlib_gunzip_run(VALUE arg)
 #endif /* GZIP_SUPPORT */
 
 void
-Init_zstdlib(void)
+Init_zstdlib_c(void)
 {
 #if HAVE_RB_EXT_RACTOR_SAFE
     rb_ext_ractor_safe(true);