xot 0.3.11 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d39e1f35513ab0d63cdf20e907d710f2ee955ede52fa2734b4ec8e1e2f129b0c
-  data.tar.gz: 8e998e8a7ab8afd2450c1c1c52aec4640466e9c73ea0a41e28778af065274bbf
+  metadata.gz: 95e3e82cc5f95bba59970fbe97e36e28e4f2a454e4cd4e1faf0ecf4ef1937be7
+  data.tar.gz: 84f576eaa74fbd89e6f029a31ab1fdccf3b59fc64ce4d574191051d445736047
 SHA512:
-  metadata.gz: ba04a304d6e2ff49e0af62102235720bd3057a4e7545a022de7dfdcfd8bff747a77d77aa9171dfe6cf02adc7b774e57adaaca31b2a5cdc78f824644b59d64175
-  data.tar.gz: 6a280e45f3bdf1fef6188a88097ff00de70bb1bc9900e3a159003ca232b06066b0d626fde1490084145d7dc65320755df62c30e3c657602f5962e657d0aa09b4
+  metadata.gz: ade52d927ea1a92a9a63dfa73ad98caf2868415accf4b0691328eced45aefe7bda9e9beead0ea3cf0329316f46635c7e7af1330b9a3fd2402bec2da8c05fb6a6
+  data.tar.gz: 783a40a3f5dfc1b4ce49eb578713ea74c0e1d7062b6b784914f208c1b02f20bbd89531c9ec965b1bebe194e587bbdc5d0da6c6b53606c8b5421d025e60a49c01

data/.github/workflows/release-gem.yml

@@ -4,6 +4,9 @@ on:
   push:
     tags: ['v[0-9]*']
 
+permissions:
+  contents: write
+
 jobs:
   release:
     runs-on: macos-latest

data/.github/workflows/utils.rb

@@ -1,3 +1,9 @@
+require 'shellwords'
+
+ALL_REPO        = 'xord/all'
+ALL_DIR         = '../all'
+ALL_FETCH_DEPTH = 100
+
 RENAMES = {reflex: 'reflexion'}
 
 def sh(cmd)
@@ -5,7 +11,7 @@ def sh(cmd)
   system cmd
 end
 
-def setup_dependencies(build: true, only: nil)
+def setup_dependencies(only: nil)
   gemspec_path = `git ls-files`.lines(chomp: true).find {|l| l =~ /\.gemspec$/}
   return unless gemspec_path
 
@@ -13,44 +19,109 @@ def setup_dependencies(build: true, only: nil)
   name    = File.basename gemspec_path, '.gemspec'
 
   exts = File.readlines('Rakefile')
-    .map {|l| l[%r|^\s*require\W+(\w+)/extension\W+$|, 1]}
+    .map {|l| l[%r|^\s*require\W+([\w\-\_]+)/extension\W+$|, 1]}
     .compact
     .reject {|ext| ext == name}
   exts = exts & [only].flatten.map(&:to_s) if only
+  return if exts.empty?
+
+  unless setup_dependencies_via_monorepo(exts)
+    setup_dependencies_via_each_repo_by_version(gemspec, exts)
+  end
+
+  exts.each {|ext| sh %( cd ../#{ext} && rake ext )}
+end
+
+def setup_dependencies_via_monorepo(exts)
+  return false unless checkout_monorepo
+  exts.each {|ext| sh %( ln -snf all/#{ext} ../#{ext} )}
+  true
+end
+
+def checkout_monorepo()
+  uuid = `git log -1 --format=%B`[/^\[\[([0-9a-fA-F-]+)\]\]$/, 1]
+  return false unless uuid
+
+  commit = setup_monorepo uuid
+  return false unless commit
+
+  Dir.chdir(ALL_DIR) {sh %( git checkout -q #{commit} )}
+  true
+end
+
+def setup_monorepo(uuid)
+  unless File.directory? ALL_DIR
+    url = "https://github.com/#{ALL_REPO}.git"
+    sh %( git clone --no-tags --depth #{ALL_FETCH_DEPTH} #{url} #{ALL_DIR} )
+  end
+  loop do
+    commit = find_monorepo_commit uuid
+    return commit if commit
+
+    deepened = Dir.chdir ALL_DIR do
+      before = `git rev-list --count HEAD`.to_i
+      sh %( git fetch --deepen #{ALL_FETCH_DEPTH} )
+      `git rev-list --count HEAD`.to_i > before
+    end
+    return nil unless deepened
+  end
+end
+
+def find_monorepo_commit(uuid)
+  Dir.chdir ALL_DIR do
+    out = `git log origin/HEAD -F --grep="[[#{uuid}]]" --format=%H -1`.strip
+    out.empty? ? nil : out
+  end
+end
 
+def setup_dependencies_via_each_repo_by_version(gemspec, exts)
   exts.each do |ext|
     gem   = RENAMES[ext.to_sym].then {|s| s || ext}
-    ver   = gemspec[/add_dependency.*['"]#{gem}['"].*['"]\s*>=\s*([\d\.]+)\s*['"]/, 1]
+    ver   = gemspec[/add_dependency.*['"]#{gem}['"].*['"]\s*~>\s*([\d\.]+)\s*['"]/, 1]
     opts  = '-c advice.detachedHead=false --depth 1'
     clone = "git clone #{opts} https://github.com/xord/#{ext}.git ../#{ext}"
 
     # 'rake subtree:push' pushes all subrepos, so cloning by new tag
     # often fails before tagging each new tag
     sh %( #{clone} --branch v#{ver} || #{clone} )
-    sh %( cd ../#{ext} && rake ext )
   end
 end
 
 def tag_versions()
-  tags = `git tag`.lines chomp: true
-  vers = `git log --oneline ./VERSION`
+  changes = changelogs
+  tags    = `git tag`.lines chomp: true
+  vers    = `git log --oneline ./VERSION`
     .lines(chomp: true)
     .map {|line| line.split.first[/^\w+$/]}
-    .map {|hash| [`git cat-file -p #{hash}:./VERSION 2>/dev/null`[/[\d\.]+/], hash]}
-    .select {|ver, hash| ver && hash}
+    .map {|sha| [`git cat-file -p #{sha}:./VERSION 2>/dev/null`[/[\d\.]+/], sha]}
+    .select {|ver, sha| ver && sha}
     .reverse
     .to_h
 
-  changes = File.read('ChangeLog.md')
-    .split(/^\s*##\s*\[\s*v([\d\.]+)\s*\].*$/)
-    .slice(1..-1)
-    .each_slice(2)
-    .to_h
-    .transform_values(&:strip!)
-
-  vers.to_a.reverse.each do |ver, hash|
+  vers.to_a.reverse.each do |ver, sha|
     tag = "v#{ver}"
     break if tags.include?(tag)
-    sh %( git tag -a -m \"#{changes[ver]&.gsub '"', '\\"'}\" #{tag} #{hash} )
+    sh %( git tag -a -m \"#{changes[tag]&.gsub '"', '\\"'}\" #{tag} #{sha} )
   end
 end
+
+def release(*paths)
+  tag   = ENV['GITHUB_REF']&.sub(%r|^refs/tags/|, '') || raise('GITHUB_REF tag not set')
+  notes = (changelogs[tag] || '').shellescape
+  paths = paths.flatten.join ' '
+
+  sh(%( gh release create #{tag} #{paths} --notes #{notes} )) ||
+    sh(%( gh release upload #{tag} #{paths} --clobber )) ||
+    raise('failed to upload to releases')
+end
+
+def changelogs()
+  File.read('ChangeLog.md')
+    .split(/^\s*##\s*\[\s*(v[\d\.]+)\s*\].*$/)
+    .slice(1..)
+    .each_slice(2)
+    .to_h
+    .transform_values(&:strip!)
+rescue Errno::ENOENT
+  raise 'failed to get changelogs'
+end

data/ChangeLog.md

@@ -1,6 +1,20 @@
 # xot ChangeLog
 
 
+## [v0.3.12] - 2026-05-10
+
+- Add hint_memory_usage callback for external memory GC integration
+- Add release helper that uploads to GitHub Releases via gh CLI
+- Add Extension.name(downcase) for kebab-case module naming
+- Add lib_name to Extension and use import libraries on Windows
+- Clear DEFFILE in generated Makefile on Windows
+- Resolve dependencies by monorepo commit UUID in CI
+- Remove deprecated has_rdoc= from gemspecs
+
+- Skip linking dependency native extensions to avoid duplicate symbols
+- Fix compiler and linker warnings
+
+
 ## [v0.3.11] - 2026-04-17
 
 - Invert build script default verbosity: quiet by default, add verbose option

data/VERSION

@@ -1 +1 @@
-0.3.11
+0.3.12

data/include/xot/util.h

@@ -5,6 +5,7 @@
 
 
 #include <stdint.h>
+#include <sys/types.h>
 #include <math.h>
 #include <assert.h>
 #include <xot/defs.h>
@@ -124,6 +125,13 @@ namespace Xot
 	}
 
 
+	typedef void (*HintMemoryUsageFun)(ssize_t);
+
+	void set_hint_memory_usage_fun (HintMemoryUsageFun fun);
+
+	void     hint_memory_usage (ssize_t size);
+
+
 #if defined(OSX) || defined(IOS)
 
 	void safe_cfrelease (const void* ref);

data/include/xot.h

@@ -1,7 +1,7 @@
 // -*- c++ -*-
 #pragma once
-#ifndef __XOT_H__
-#define __XOT_H__
+#ifndef __XOT_ALL_H__
+#define __XOT_ALL_H__
 
 
 #include <xot/defs.h>

data/lib/xot/extconf.rb

@@ -11,8 +11,6 @@ module Xot
     include Xot::Rake
     include Xot::Util
 
-    attr_reader :extensions, :defs, :inc_dirs, :lib_dirs, :headers, :libs, :local_libs, :frameworks
-
     def initialize(*extensions, &block)
       @extensions = extensions.map {|x| x.const_get :Extension}
       @defs, @inc_dirs, @lib_dirs, @headers, @libs, @local_libs, @frameworks =
@@ -20,6 +18,12 @@ module Xot
       Xot::BlockUtil.instance_eval_or_block_call self, &block if block
     end
 
+    attr_reader :extensions, :defs, :inc_dirs, :lib_dirs, :headers, :libs, :local_libs, :frameworks
+
+    def my_ext()
+      extensions.last
+    end
+
     def debug()
       env :DEBUG, false
     end
@@ -28,19 +32,23 @@ module Xot
       yield if block_given?
 
       extensions.each do |ext|
-        name = ext.name.downcase
-        headers    << "#{name}.h"
-        local_libs << name
+        name     = ext.name true
+        lib_name = ext == my_ext ? name : ext.lib_name
+        headers << "#{name}.h"
+        local_libs << lib_name if lib_name
       end
 
       ldflags = $LDFLAGS.dup
-      if osx?
+      case
+      when osx?
         opt = '-Wl,-undefined,dynamic_lookup'
         ldflags << " #{opt}" unless ($DLDFLAGS || '').include?(opt)
         ldflags << ' -Wl,-bind_at_load' if osx? && debug?
+      when wasm?
+        build_lib_objs_for_wasm
       end
 
-      local_libs << (clang? ? 'c++' : 'stdc++')
+      local_libs << 'stdc++' if gcc?
 
       $CPPFLAGS = make_cppflags $CPPFLAGS, defs, inc_dirs
       $CFLAGS   = make_cflags   $CFLAGS   + ' -x c++'
@@ -51,13 +59,62 @@ module Xot
 
     def create_makefile(*args)
       extensions.each do |ext|
-        dir_config ext.name.downcase, ext.inc_dir, ext.lib_dir
+        dir_config ext.name(true), ext.inc_dir, ext.lib_dir
       end
 
       exit 1 unless headers.all? {|s| have_header s}
-      exit 1 unless libs.all?    {|s| have_library s, 't'}
+      exit 1 unless libs.all?    {|s| have_library s, 't'} unless wasm?
 
       super
+
+      export_all_symbols     if mingw? || cygwin?
+      link_lib_objs_for_wasm if wasm?
+    end
+
+    def export_all_symbols()
+      name = my_ext.name true
+      opts = %W[
+        -Wl,--export-all-symbols,--whole-archive
+        -l#{name}
+        -Wl,--no-whole-archive
+      ].join ' '
+      filter_file('Makefile') {|s|
+        s.sub(/^DEFFILE\s*=.*$/, 'DEFFILE =')
+         .sub(/^(LOCAL_LIBS\s*=.*) -l#{name}\b/) {"#{$1} #{opts}"}
+      }
+    end
+
+    def build_lib_objs_for_wasm()
+      ruby_dirs = [
+        "#{ENV['extout']}/include/wasm32-emscripten",
+        "#{ENV['top_srcdir']}/include"
+      ]
+      envs      = {
+        CC:       '',
+        CXX:      '',
+        AR:       '',
+        RANLIB:   '',
+        CPPFLAGS: ' -sUSE_SDL=2 -sUSE_SDL_TTF=2',
+        CFLAGS:   ' -sUSE_SDL=2 -sUSE_SDL_TTF=2',
+        CXXFLAGS: '',
+        LDFLAGS:  ' -sUSE_SDL=2 -sUSE_SDL_TTF=2',
+        INCDIRS:  ruby_dirs.join(' ')
+      }.map {|k, v| "#{k}='#{(RbConfig::CONFIG[k.to_s] || '') + v}'"}
+
+      Dir.chdir target.root_dir do
+        cmd = "#{envs.join ' '} rake ext:lib_objs"
+        puts cmd
+        system cmd
+      end
+    end
+
+    def link_lib_objs_for_wasm()
+      lib_objs = Dir.glob "#{target.ext_dir}/**/__libobj_*.o"
+      filter_file 'Makefile' do |str|
+        str.sub(/^(\s*)(.*\$\(AR\).*)$/) {
+          "#{$1}#{$2}\n#{$1}$(Q) $(AR) r $@ #{lib_objs.join ' '}"
+        }
+      end
     end
 
   end# ExtConf

data/lib/xot/extension.rb

@@ -5,8 +5,10 @@ module Xot
 
     module_function
 
-    def name()
-      super.split('::')[-2]
+    def name(downcase = false)
+      super().split('::')[-2].then {|s|
+        downcase ? s.gsub(/([a-z])([A-Z])/) {"#{$1}-#{$2}"}.downcase : s
+      }
     end
 
     def version()
@@ -29,6 +31,10 @@ module Xot
       root_dir 'ext'
     end
 
+    def lib_name()
+      name true
+    end
+
   end# Extension
 
 

data/lib/xot/rake/util.rb

@@ -19,7 +19,7 @@ module Xot
     end
 
     def target_name()
-      get_env :EXTNAME, target.name.downcase
+      get_env :EXTNAME, target.name(true)
     end
 
     def inc_dir()
@@ -81,7 +81,7 @@ module Xot
       paths.reject! {|path| path =~ %r(/osx/)}   unless osx?
       paths.reject! {|path| path =~ %r(/ios/)}   unless ios?
       paths.reject! {|path| path =~ %r(/win32/)} unless win32?
-      paths.reject! {|path| path =~ %r(/sdl/)}   unless linux?
+      paths.reject! {|path| path =~ %r(/sdl/)}   unless linux? || wasm?
       make_path_map paths, src_ext_map
     end
 
@@ -186,12 +186,13 @@ module Xot
     def make_cppflags_defs(defs = [])
       a  = defs.dup
       a << (debug? ? '_DEBUG' : 'NDEBUG')
-      a << target.name.upcase
+      a << target_name.gsub('-', '_').upcase
       a << $~[0].upcase        if RUBY_PLATFORM =~ /mswin|mingw|cygwin|darwin/i
       a << 'WIN32'             if win32?
       a << 'OSX'               if osx?
       a << 'IOS'               if ios?
       a << 'LINUX'             if linux?
+      a << 'WASM'              if wasm?
       a << 'GCC'               if gcc?
       a << 'CLANG'             if clang?
       a << '_USE_MATH_DEFINES' if gcc?
@@ -221,7 +222,7 @@ module Xot
       s  = flags.dup
       s << warning_opts.map {|s| " -W#{s}"}.join
       s << " -arch arm64"                                          if osx? && arm64?
-      s << ' -std=c++20'                                           if gcc?
+      s << ' -std=c++20'                                           if gcc? || emcc?
       s << ' -std=c++20 -stdlib=libc++ -mmacosx-version-min=10.10' if clang?
       s << ' ' + RbConfig::CONFIG['debugflags']                    if debug?
       s.gsub!(/-O\d?\w*/, '-O0')                                   if debug?

data/lib/xot/rake.rb

@@ -104,7 +104,7 @@ module Xot
     end
 
     def build_ruby_extension(dlname: nil, dlext: nil, liboutput: true)
-      dlname = get_env :DLNAME, dlname || "#{target_name}_ext"
+      dlname = get_env :DLNAME, dlname || "#{target_name.gsub('-', '_')}_ext"
       dlext  = get_env :DLEXT,  dlext  || RbConfig::CONFIG['DLEXT'] || 'so'
 
       extconf  = File.join ext_dir, 'extconf.rb'
@@ -116,7 +116,7 @@ module Xot
       libout  = File.join lib_dir, outname
 
       srcs = FileList["#{ext_dir}/**/*.cpp"]
-      libs = extensions.map {|x| "#{x.lib_dir}/lib#{x.name.downcase}.a"}
+      libs = extensions.map {|x| "#{x.lib_dir}/lib#{x.name(true)}.a"}
 
       alias_task :ext     => (liboutput ? libout : extout)
       alias_task :clean   => 'ext:clean'
@@ -126,7 +126,7 @@ module Xot
         desc "build #{libout}"
         file libout => extout do
           libdir = File.dirname libout
-          libimp = extout.sub /\.#{dlext}$/, '.dll.a'
+          libimp = File.join File.dirname(extout), "lib#{target_name}.dll.a"
           sh %( cp #{extout} #{libdir} )
           sh %( cp #{libimp} #{libdir} ) if mingw? || cygwin?
         end
@@ -150,9 +150,17 @@ module Xot
           sh %( cd #{ext_dir} && #{cxx} -M #{cppflags} #{inc} #{src} > #{dep} )
         end
 
+        desc "compile src/**/*"
+        task :lib_objs => :lib do
+          (srcs_map.values + vendor_srcs_map.values).each do |obj|
+            to = File.join ext_dir, "__libobj_#{obj.gsub '/', '_'}"
+            sh %( cp #{obj} #{to} )
+          end
+        end
+
         task :clean do
           sh %( cd #{ext_dir} && make clean ) if File.exist? makefile
-          sh %( rm -rf #{libout} )
+          sh %( rm -rf #{libout} #{ext_dir}/__libobj_*.o )
         end
 
         task :clobber do
@@ -297,24 +305,25 @@ module Xot
           file dir do
             rake_puts "vendoring #{name}"
             q     = ::Rake.verbose ? '' : '-q'
-            opts  = "#{q} -c advice.detachedHead=false --depth 1"
+            opts  = "#{q} -c advice.detachedHead=false --depth 1 --no-tags"
             opts += " --branch #{branch || tag}" if branch || tag
-            opts += " --recursive"               if submodules.empty?
             sh %( git clone #{opts} #{repos} #{dir} )
             Dir.chdir dir do
-              sh %( git fetch #{q} --depth 1 origin #{commit} )
-              sh %( git checkout #{q} #{commit} )
-            end if commit
-            unless submodules.empty?
-              Dir.chdir dir do
-                submodules.each do |path|
-                  sh %( git submodule #{q} init #{path} )
-                end
-                sh %( git submodule #{q} update --depth=1 )
+              if commit
+                sh %( git fetch #{q} --depth 1 origin #{commit} )
+                sh %( git checkout #{q} #{commit} )
+              end
+
+              if submodules.empty?
+                sh %( git submodule #{q} update --init --recursive --depth 1 )
+              else
+                submodules.each {|path| sh %( git submodule #{q} init #{path} )}
+                sh %( git submodule #{q} update --depth 1 )
                 sh post_submodules if post_submodules
               end
+
+              after_clone_block.call if after_clone_block
             end
-            Dir.chdir(dir) {after_clone_block.call} if after_clone_block
             unless get_env :VENDOR_NOCOMPILE, false
               vendor_srcs_map(*srcdirs).each do |src, obj|
                 rake_puts "compiling #{src}"

data/lib/xot/util.rb

@@ -65,7 +65,7 @@ module Xot
     end
 
     def osx?()
-      /darwin/.match? RUBY_PLATFORM
+      !wasm? && /darwin/.match?(RUBY_PLATFORM)
     end
 
     def ios?()
@@ -73,23 +73,27 @@ module Xot
     end
 
     def win32?()
-      /mswin|ming|cygwin/.match? RUBY_PLATFORM
+      !wasm? && /mswin|ming|cygwin/.match?(RUBY_PLATFORM)
     end
 
     def mswin?()
-      /mswin/.match? RUBY_PLATFORM
+      !wasm? && /mswin/.match?(RUBY_PLATFORM)
     end
 
     def mingw?()
-      /ming/.match? RUBY_PLATFORM
+      !wasm? && /ming/.match?(RUBY_PLATFORM)
     end
 
     def cygwin?()
-      /cygwin/.match? RUBY_PLATFORM
+      !wasm? && /cygwin/.match?(RUBY_PLATFORM)
     end
 
     def linux?()
-      /linux/.match? RUBY_PLATFORM
+      !wasm? && /linux/.match?(RUBY_PLATFORM)
+    end
+
+    def wasm?()
+      emcc?
     end
 
     def gcc?()
@@ -100,6 +104,10 @@ module Xot
       /(^|\-)clang/i.match? cc
     end
 
+    def emcc?()
+      /(^|\-)emcc$/i.match? cc
+    end
+
     def github_actions?()
       ENV['GITHUB_ACTIONS'] == 'true'
     end

data/src/util.cpp

@@ -53,6 +53,22 @@ namespace Xot
 	}
 
 
+	static HintMemoryUsageFun hint_memory_usage_fun = NULL;
+
+	void
+	set_hint_memory_usage_fun (HintMemoryUsageFun fun)
+	{
+		hint_memory_usage_fun = fun;
+	}
+
+	void
+	hint_memory_usage (ssize_t size)
+	{
+		if (hint_memory_usage_fun && size != 0)
+			hint_memory_usage_fun(size);
+	}
+
+
 #if defined(OSX) || defined(IOS)
 
 	void

data/xot.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   end
 
   ext   = Xot::Extension
-  name  = ext.name.downcase
+  name  = ext.name true
   rdocs = glob.call *%w[README]
 
   s.name        = name
@@ -29,7 +29,6 @@ Gem::Specification.new do |s|
   s.executables      = s.files.grep(%r{^bin/}) {|f| File.basename f}
   s.test_files       = s.files.grep %r{^(test|spec|features)/}
   s.extra_rdoc_files = rdocs.to_a
-  s.has_rdoc         = true
 
   s.extensions << 'Rakefile'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xot
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.12
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-17 00:00:00.000000000 Z
+date: 2026-05-09 00:00:00.000000000 Z
 dependencies: []
 description: This library include some useful utility classes and functions for development
   with C++.