xot 0.2.1 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3699d7ae604c3bc0d96a0ebacf3c3a22115e1ba338c9178ebaaf064ad93ca282
-  data.tar.gz: 810dc619b0d9bf7c0bae8ab97118a3f6170bd864b9872c0efbbce0973a4ea8e1
+  metadata.gz: 7d11136d38c0cd9cd9dcca16148115795071e958e05ef3d5b307bd385905c1f6
+  data.tar.gz: 7af44d2bcd37badd34c4d5493bc21c5357fcde972b89d9a1833b1e70f5fe12d7
 SHA512:
-  metadata.gz: 6fc79411d29fe6a9a26c08e6aeb0979db6a8806c4c1a1361028f0aa402a30612ffa3ca1483bb7b78ae007e9b4d6f7a92139d95dcc57b9e5e290df1a93762c34e
-  data.tar.gz: 261e370e9c80c9606c44bfd621677381f3c528d9387419c418a18a54ec5dbb53ecf43ce16f3b5f027010ea6e4f39974abf42ddd535d13a40ffc7d4a1e8f8653d
+  metadata.gz: ca6c659c661dd12179e968b8a832951cb6a812e0f4155ebb29d807147cae2ba6960c51d823f68a47bc070db4a8070441ba22285f67975686ee31928fa1e8cb90
+  data.tar.gz: 9c640bcc810ff7c6143f63936f753bb544f0b939f1c15c4e685b420e614db7e8d8bdcf9b0d105089b727585d9712991dcd0a4f8fd3d183994ae368c1e66ea569

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

@@ -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/test.yml

@@ -24,6 +24,9 @@ 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
 

data/ChangeLog.md

@@ -1,6 +1,11 @@
 # xot ChangeLog
 
 
+## [v0.3] - 2024-07-06
+
+- Support Windows
+
+
 ## [v0.2.1] - 2024-07-05
 
 - Add xot/util.rb

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3

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

@@ -29,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
@@ -45,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

@@ -55,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()
@@ -170,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
 
@@ -192,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/

data/lib/xot/rake.rb

@@ -276,7 +276,7 @@ module Xot
       desc "install packages"
       task :packages do
         case
-        when osx?   && osx.size > 0
+        when osx? && osx.size > 0
           sh %( brew install #{osx.join ' '} )
         when win32? && win32.size > 0
           prefix   = 'MINGW_PACKAGE_PREFIX'
@@ -359,6 +359,9 @@ module Xot
     end
 
     def define_placeholder_tasks()
+      desc "install all external packages"
+      alias_task :packages
+
       desc "setup all external libraries"
       alias_task :vendor
 

data/src/exception.cpp

@@ -1,9 +1,7 @@
 #include "xot/exception.h"
 
 
-#ifdef WIN32
-	#include <windows.h>
-#endif
+#include "xot/windows.h"
 
 
 namespace Xot

data/src/string.cpp

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xot
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: '0.3'
 platform: ruby
 authors:
 - xordog
@@ -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