xot 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9592ba7adfc21223d2bc9f0035665c4cd12c6ab194bfbb0d445510c908e56812
-  data.tar.gz: 40dd5584ff274a815e0791076216cd188df05b5e712eb156d7e52f62da20e9bb
+  metadata.gz: 7d11136d38c0cd9cd9dcca16148115795071e958e05ef3d5b307bd385905c1f6
+  data.tar.gz: 7af44d2bcd37badd34c4d5493bc21c5357fcde972b89d9a1833b1e70f5fe12d7
 SHA512:
-  metadata.gz: 8d3de874655db69b4a9e0a569de98ffb3d3bd80950602b8f27a1a6f024e673a6ebc641611067799569598373696eba1149d9359898116033b49630a8dba9915a
-  data.tar.gz: e5a5b77c96cb68ae8cd8d0c692fc4f6ccf326afb6f0827ca68d038a4dc9a5531a8b86c15aec0ec4f13f5317c590f647442c0ff7b2b98b9d25c74825535d0aede
+  metadata.gz: ca6c659c661dd12179e968b8a832951cb6a812e0f4155ebb29d807147cae2ba6960c51d823f68a47bc070db4a8070441ba22285f67975686ee31928fa1e8cb90
+  data.tar.gz: 9c640bcc810ff7c6143f63936f753bb544f0b939f1c15c4e685b420e614db7e8d8bdcf9b0d105089b727585d9712991dcd0a4f8fd3d183994ae368c1e66ea569

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

@@ -15,7 +15,7 @@ jobs:
           ruby-version: 3.2
 
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: setup gems
         run: bundle install
@@ -24,7 +24,7 @@ jobs:
         run: "ruby -I.github/workflows -rutils -e 'setup_dependencies'"
 
       - name: test
-        run: bundle exec rake quiet test
+        run: bundle exec rake quiet packages test
 
       - name: create gem
         id: gem

data/.github/workflows/tag.yml

@@ -15,7 +15,7 @@ jobs:
           ruby-version: 3.2
 
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           token: ${{ secrets.PAT }}

data/.github/workflows/test.yml

@@ -16,7 +16,7 @@ jobs:
           ruby-version: 3.2
 
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: setup gems
         run: bundle install
@@ -24,5 +24,14 @@ jobs:
       - name: setup dependencies
         run: "ruby -I.github/workflows -rutils -e 'setup_dependencies'"
 
+      - name: packages
+        run: bundle exec rake packages
+
+      - name: lib
+        run: bundle exec rake lib
+
+      - name: ext
+        run: bundle exec rake ext
+
       - name: test
         run: bundle exec rake test

data/ChangeLog.md

@@ -1,6 +1,22 @@
 # xot ChangeLog
 
 
+## [v0.3] - 2024-07-06
+
+- Support Windows
+
+
+## [v0.2.1] - 2024-07-05
+
+- Add xot/util.rb
+- Add system_error_text()
+- Add get_refc_count() for debugging
+- Add 'packages' task
+- Update workflows for test
+- Update to actions/checkout@v4
+- Fix 'github_actions?'
+
+
 ## [v0.2] - 2024-03-14
 
 - v0.2

data/Gemfile.lock

@@ -9,7 +9,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-21
-  x86_64-darwin-20
+  arm64-darwin-22
 
 DEPENDENCIES
   rake

data/VERSION

@@ -1 +1 @@
-0.2
+0.3

data/include/xot/exception.h

@@ -40,7 +40,9 @@ namespace Xot
 	};
 
 
-	String error_text (const char* file, int line, const char* str);
+	String error_text        (const char* file, int line, const char* str);
+
+	String system_error_text (const char* file, int line, const char* str);
 
 
 	namespace ErrorFunctions

data/include/xot/ref.h

@@ -71,6 +71,13 @@ namespace Xot
 				return false;
 			}
 
+			#ifdef _DEBUG
+				int get_refc_count () const
+				{
+					return refc_count;
+				}
+			#endif
+
 		protected:
 
 			RefCountable ()

data/include/xot/windows.h

@@ -0,0 +1,15 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __XOT_WINDOWS_H__
+#define __XOT_WINDOWS_H__
+
+
+#ifdef WIN32
+	#undef  _WIN32_WINNT
+	#define _WIN32_WINNT _WIN32_WINNT_WIN7
+	#include <windows.h>
+	#include <windowsx.h>
+#endif
+
+
+#endif//EOH

data/include/xot.h

@@ -15,5 +15,7 @@
 #include <xot/noncopyable.h>
 #include <xot/util.h>
 
+//#include <xot/windows.h>
+
 
 #endif//EOH

data/lib/xot/extconf.rb

@@ -1,5 +1,6 @@
-require 'xot/rake/util'
 require 'xot/block_util'
+require 'xot/util'
+require 'xot/rake/util'
 
 
 module Xot
@@ -8,6 +9,7 @@ module Xot
   class ExtConf
 
     include Xot::Rake
+    include Xot::Util
 
     attr_reader :extensions, :defs, :inc_dirs, :lib_dirs, :headers, :libs, :local_libs, :frameworks
 
@@ -27,8 +29,8 @@ module Xot
 
       extensions.each do |ext|
         name = ext.name.downcase
-        headers << "#{name}.h"
-        libs << name
+        headers    << "#{name}.h"
+        local_libs << name
       end
 
       ldflags = $LDFLAGS.dup
@@ -43,7 +45,7 @@ module Xot
       $CFLAGS   = make_cflags   $CFLAGS   + ' -x c++'
       $CXXFLAGS = make_cflags   $CXXFLAGS + ' -x c++' if $CXXFLAGS
       $LDFLAGS  = make_ldflags  ldflags, lib_dirs, frameworks
-      $LOCAL_LIBS << local_libs.map {|s| " -l#{s}"}.join
+      $LOCAL_LIBS << local_libs.reverse.map {|s| " -l#{s}"}.join
     end
 
     def create_makefile(*args)

data/lib/xot/rake/util.rb

@@ -1,5 +1,6 @@
 require 'erb'
 require 'rbconfig'
+require 'xot/util'
 
 
 module Xot
@@ -7,6 +8,8 @@ module Xot
 
   module Rake
 
+    include Xot::Util
+
     def extensions()
       env(:EXTENSIONS, []).map {|m| m::Extension}
     end
@@ -52,7 +55,10 @@ module Xot
     end
 
     def inc_dirs()
-      env_array(:INCDIRS, []) + extensions.reverse.map {|m| m.inc_dir}.flatten
+      dirs  = env_array :INCDIRS, []
+      dirs += extensions.reverse.map {|m| m.inc_dir}.flatten
+      dirs << "#{env :MINGW_PREFIX}/include" if mingw?
+      dirs
     end
 
     def src_dirs()
@@ -167,11 +173,15 @@ module Xot
 
     def make_cppflags_defs(defs = [])
       a  = defs.dup
-      a << $~[0].upcase if RUBY_PLATFORM =~ /mswin|ming|cygwin|darwin/i
       a << (debug? ? '_DEBUG' : 'NDEBUG')
-      a << 'WIN32' if win32?
-      a << 'OSX'   if osx?
-      a << 'IOS'   if ios?
+      a << target.name.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 << 'GCC'               if gcc?
+      a << 'CLANG'             if clang?
+      a << '_USE_MATH_DEFINES' if gcc?
       a
     end
 
@@ -189,11 +199,11 @@ module Xot
     end
 
     def make_cflags(flags = '')
-      warning_opts = %w[
-        no-unknown-pragmas
+      warning_opts  = %w[no-unknown-pragmas]
+      warning_opts += %w[
         no-deprecated-register
         no-reserved-user-defined-literal
-      ]
+      ] if clang?
       s  = flags.dup
       s << warning_opts.map {|s| " -W#{s}"}.join
       s << " -arch arm64" if RUBY_PLATFORM =~ /arm64-darwin/
@@ -224,46 +234,6 @@ module Xot
       env :DEBUG, false
     end
 
-    def ci?()
-      github_actions?
-    end
-
-    def github_actions?()
-      env :GITHUB_ACTIONS, false
-    end
-
-    def win32?()
-      RUBY_PLATFORM =~ /mswin|ming|cygwin/
-    end
-
-    def mswin?()
-      RUBY_PLATFORM =~ /mswin/
-    end
-
-    def ming?()
-      RUBY_PLATFORM =~ /ming/
-    end
-
-    def cygwin?()
-      RUBY_PLATFORM =~ /cygwin/
-    end
-
-    def osx?()
-      RUBY_PLATFORM =~ /darwin/
-    end
-
-    def ios?()
-      false
-    end
-
-    def gcc?()
-      RbConfig::CONFIG['CXX'] =~ /(^|\s)g\+\+/i
-    end
-
-    def clang?()
-      RbConfig::CONFIG['CXX'] =~ /(^|\s)clang/i
-    end
-
     def cxx()
       env :CXX, RbConfig::CONFIG['CXX'] || 'g++'
     end

data/lib/xot/rake.rb

@@ -12,7 +12,6 @@ module Xot
 
   module Rake
 
-
     def srcs_map()
       paths = glob("#{src_dir}/**/*.{#{src_exts.join ','}}") +
         erbs_map.values.grep(/\.(#{src_exts.join '|'})$/)
@@ -273,6 +272,20 @@ module Xot
       end
     end
 
+    def install_packages(osx: [], win32: [])
+      desc "install packages"
+      task :packages do
+        case
+        when osx? && osx.size > 0
+          sh %( brew install #{osx.join ' '} )
+        when win32? && win32.size > 0
+          prefix   = 'MINGW_PACKAGE_PREFIX'
+          packages = win32.map {|package| package.sub prefix, ENV[prefix]}
+          sh %( pacman -S --noconfirm #{packages.join ' '} )
+        end
+      end
+    end
+
     def use_external_library(
       repos, branch: nil, tag: nil, commit: nil,
       incdirs: nil, srcdirs: nil, excludes: [],
@@ -346,11 +359,14 @@ module Xot
     end
 
     def define_placeholder_tasks()
-      desc "delete temporary files"
-      alias_task :clean
+      desc "install all external packages"
+      alias_task :packages
 
-      desc "delete all generated files"
-      alias_task :clobber => :clean
+      desc "setup all external libraries"
+      alias_task :vendor
+
+      desc "convert erb files"
+      alias_task :erb
 
       desc "build native library"
       alias_task :lib
@@ -358,20 +374,20 @@ module Xot
       desc "build ruby extension"
       alias_task :ext
 
-      desc "build ruby gem"
-      alias_task :gem
+      desc "run all tests"
+      alias_task :test
 
       desc "generate documentations"
       alias_task :doc
 
-      desc "run all tests"
-      alias_task :test
+      desc "build ruby gem"
+      alias_task :gem
 
-      desc "setup all external libraries"
-      alias_task :vendor
+      desc "delete temporary files"
+      alias_task :clean
 
-      desc "convert erb files"
-      alias_task :erb
+      desc "delete all generated files"
+      alias_task :clobber => :clean
     end
 
 

data/lib/xot/test.rb

@@ -1,8 +1,13 @@
+require 'xot/util'
+
+
 module Xot
 
 
   module Test
 
+    include Util
+
     def assert_not(expression, *args)
       assert !expression, *args
     end

data/lib/xot/util.rb

@@ -0,0 +1,52 @@
+require 'rbconfig'
+
+
+module Xot
+
+
+  extend module Util
+
+    def osx?()
+      /darwin/.match? RUBY_PLATFORM
+    end
+
+    def ios?()
+      false
+    end
+
+    def win32?()
+      /mswin|ming|cygwin/.match? RUBY_PLATFORM
+    end
+
+    def mswin?()
+      /mswin/.match? RUBY_PLATFORM
+    end
+
+    def mingw?()
+      /ming/.match? RUBY_PLATFORM
+    end
+
+    def cygwin?()
+      /cygwin/.match? RUBY_PLATFORM
+    end
+
+    def gcc?()
+      /(^|\s)g\+\+/i.match? RbConfig::CONFIG['CXX']
+    end
+
+    def clang?()
+      /(^|\s)clang/i.match? RbConfig::CONFIG['CXX']
+    end
+
+    def github_actions?()
+      ENV['GITHUB_ACTIONS'] == 'true'
+    end
+
+    alias ci? github_actions?
+
+    self
+
+  end# Util
+
+
+end# Xot

data/lib/xot.rb

@@ -10,3 +10,4 @@ require 'xot/inspectable'
 require 'xot/invoker'
 require 'xot/setter'
 require 'xot/universal_accessor'
+require 'xot/util'

data/src/exception.cpp

@@ -1,6 +1,9 @@
 #include "xot/exception.h"
 
 
+#include "xot/windows.h"
+
+
 namespace Xot
 {
 
@@ -37,6 +40,34 @@ namespace Xot
 		return s;
 	}
 
+	String
+	system_error_text (const char* file, int line, const char* str)
+	{
+		String s = str;
+
+		#ifdef WIN32
+			DWORD lasterror = GetLastError();
+			if (lasterror != 0)
+			{
+				LPVOID msg = NULL;
+				DWORD flags =
+					FORMAT_MESSAGE_ALLOCATE_BUFFER |
+					FORMAT_MESSAGE_FROM_SYSTEM |
+					FORMAT_MESSAGE_IGNORE_INSERTS;
+				if (FormatMessageA(
+					flags, NULL, lasterror, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+					(LPSTR) &msg, 0, NULL))
+				{
+					String m = (LPCSTR) msg;
+					if (!m.empty()) s += ": " + m;
+				}
+				LocalFree(msg);
+			}
+		#endif
+
+		return error_text(file, line, s);
+	}
+
 
 	namespace ErrorFunctions
 	{
@@ -73,7 +104,7 @@ namespace Xot
 		system_error (const char* file, int line, const char* format, ...)
 		{
 			XOT_STRINGF(format, s);
-			throw SystemError(error_text(file, line, s));
+			throw SystemError(system_error_text(file, line, s));
 		}
 
 		void

data/src/string.cpp

@@ -2,6 +2,7 @@
 
 
 #include <stdio.h>
+#include <string.h>
 #include <algorithm>
 #include <memory>
 #include "xot/exception.h"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xot
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-13 00:00:00.000000000 Z
+date: 2024-07-05 00:00:00.000000000 Z
 dependencies: []
 description: This library include some useful utility classes and functions for development
   with C++.
@@ -41,6 +41,7 @@ files:
 - include/xot/string.h
 - include/xot/time.h
 - include/xot/util.h
+- include/xot/windows.h
 - lib/xot.rb
 - lib/xot/bit_flag.rb
 - lib/xot/bit_flag_accessor.rb
@@ -59,6 +60,7 @@ files:
 - lib/xot/setter.rb
 - lib/xot/test.rb
 - lib/xot/universal_accessor.rb
+- lib/xot/util.rb
 - src/debug.cpp
 - src/exception.cpp
 - src/string.cpp