xezat 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb4e15ff6a5eab549ec2a89d711b6d81ec7a4e05656ecf59524cc472746dfe6c
-  data.tar.gz: 3f2c68eee2a3699adb2c2796bac9a988708bd8395b3e83f4ecd449b09e768c1b
+  metadata.gz: 631c0baddcd33f64246b3f98a73a979d523c1c8115803baf3006a70346779b71
+  data.tar.gz: 930b2a86f48ddad910120670ebbc4b75c9e34acddff350dd99023d3c6838b003
 SHA512:
-  metadata.gz: 1750d00392ebe3232b98098803aee8ea6d45f661de0c754e63b3ee4ee149fe9fd9e6309015c7645f2e4936a26c09110139a84da41f46d9416c25c8b5978c8497
-  data.tar.gz: 508ef5825975aa6bbaa48c58d9b7f957215f190c4747f73ccdec88f6d93d09bf0fca26c24049910d14cf505aae99e4f16472c5f313eb5f8b3b2d59dbf908184c
+  metadata.gz: e536d5924cb08642b47743742c314c595887a212e87927ca9d080f1aa52997d5c25dcbb930202e031fe2289f08a24fdfb39cfe71d2e4253d6d97933f75ad9108
+  data.tar.gz: 9aae07b58ecfc7e87dc4e274ceadf9772d8c0a06161448bd2e74173c72fcc4fef103e02d4ed83c3073c5b17db15aec86e290daad7b5719ddd01b49ad7f82be4f

data/lib/xezat/command/bump/runtime_package.rb

@@ -27,7 +27,7 @@ module Xezat
       def resolve_pseudo(pkg, pkgs)
         case pkg
         when /^python3\s*/
-          pkgs[:python39]
+          pkgs[:python3]
         when /^perl5_0\d{2}$/
           pkgs[:perl_base]
         when /^ruby_\d{2}$/

data/lib/xezat/detector/{python39-docutils.rb → python3-docutils.rb}

@@ -4,7 +4,7 @@ require 'find'
 
 module Xezat
   module Detector
-    class Python39Docutils
+    class Python3Docutils
       def detect?(variables)
         Find.find(variables[:S]) do |file|
           next unless file.end_with?("#{File::SEPARATOR}configure.ac", "#{File::SEPARATOR}configure.in")

data/lib/xezat/detector/python3.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'find'
+
+module Xezat
+  module Detector
+    class Python3
+      def detect?(variables)
+        return true if Dir.glob(File.join(variables[:D], 'usr', 'lib', 'python3.*')).any? { |dir| File.directory?(dir) }
+
+        Find.find(variables[:D]) do |file|
+          next unless file.end_with?('.py')
+
+          first_line = File.readlines(file).first
+          return true if %r{^#!\s*/usr/bin/env\s*python(3(\.\d+)?)?\s*$}.match?(first_line)
+          return true if %r{^#!\s*/usr/bin/python(3(\.\d+)?)?\s*$}.match?(first_line)
+        end
+        false
+      end
+    end
+  end
+end

data/lib/xezat/detectors.rb

@@ -27,10 +27,6 @@ module Xezat
           Xezat.logger.debug("      #{name} ... no")
         end
       end
-      if tools.include?(:python27) && (tools.include?(:python36) || tools.include?(:python37))
-        Xezat.logger.debug('    Remove python27 because of detecting python3x')
-        tools.delete(:python27)
-      end
       if tools.include?(:libtool) && tools.include?(:cmake)
         Xezat.logger.debug('    Remove libtool because of detecting cmake')
         tools.delete(:libtool)

data/lib/xezat/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Xezat
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

data/share/xezat/compilers.yaml

@@ -22,8 +22,8 @@ Fortran Free Form:
   - gcc-core
 Lex:
   package: flex
-Lua:
-  package: lua
+#Lua:
+#  package: lua
 #Objective-C:
 #  package: gcc-objc
 #  dependencies:
@@ -34,11 +34,11 @@ Lua:
 #  dependencies:
 #  - binutils
 #  - gcc-core
-Protocol Buffer:
-  package: libprotobuf-devel
-Ragel:
-  package: ragel
-Vala:
-  package: vala
+#Protocol Buffer:
+#  package: libprotobuf-devel
+#Ragel:
+#  package: ragel
+#Vala:
+#  package: vala
 Yacc:
   package: bison

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xezat
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Daisuke Fujimura (fd0)
@@ -295,12 +295,8 @@ files:
 - lib/xezat/detector/meson.rb
 - lib/xezat/detector/nasm.rb
 - lib/xezat/detector/ninja.rb
-- lib/xezat/detector/python27.rb
-- lib/xezat/detector/python36.rb
-- lib/xezat/detector/python37.rb
-- lib/xezat/detector/python38.rb
-- lib/xezat/detector/python39-docutils.rb
-- lib/xezat/detector/python39.rb
+- lib/xezat/detector/python3-docutils.rb
+- lib/xezat/detector/python3.rb
 - lib/xezat/detector/roundup.rb
 - lib/xezat/detector/waf.rb
 - lib/xezat/detector/xorg-util-macros.rb

data/lib/xezat/detector/python27.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-require 'find'
-
-module Xezat
-  module Detector
-    class Python27
-      def detect?(variables)
-        return true if File.directory?(File.join(variables[:D], 'usr', 'lib', 'python2.7'))
-
-        Find.find(variables[:D]) do |file|
-          next unless file.end_with?('.py')
-
-          first_line = File.readlines(file).first
-          return true if %r{^#!\s*/usr/bin/env\s*python2\s*$}.match?(first_line)
-          return true if %r{^#!\s*/usr/bin/env\s*python2.7\s*$}.match?(first_line)
-          return true if %r{^#!\s*/usr/bin/python2\s*$}.match?(first_line)
-          return true if %r{^#!\s*/usr/bin/python2.7\s*$}.match?(first_line)
-        end
-        false
-      end
-    end
-  end
-end

data/lib/xezat/detector/python36.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require 'find'
-
-module Xezat
-  module Detector
-    class Python36
-      def detect?(variables)
-        return true if File.directory?(File.join(variables[:D], 'usr', 'lib', 'python3.6'))
-
-        Find.find(variables[:D]) do |file|
-          next unless file.end_with?('.py')
-
-          first_line = File.readlines(file).first
-          return true if %r{^#!\s*/usr/bin/env\s*python3.6\s*$}.match?(first_line)
-          return true if %r{^#!\s*/usr/bin/python3.6\s*$}.match?(first_line)
-        end
-        false
-      end
-    end
-  end
-end

data/lib/xezat/detector/python37.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require 'find'
-
-module Xezat
-  module Detector
-    class Python37
-      def detect?(variables)
-        return true if File.directory?(File.join(variables[:D], 'usr', 'lib', 'python3.7'))
-
-        Find.find(variables[:D]) do |file|
-          next unless file.end_with?('.py')
-
-          first_line = File.readlines(file).first
-          return true if %r{^#!\s*/usr/bin/env\s*python3.7\s*$}.match?(first_line)
-          return true if %r{^#!\s*/usr/bin/python3.7\s*$}.match?(first_line)
-        end
-        false
-      end
-    end
-  end
-end

data/lib/xezat/detector/python38.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require 'find'
-
-module Xezat
-  module Detector
-    class Python38
-      def detect?(variables)
-        return true if File.directory?(File.join(variables[:D], 'usr', 'lib', 'python3.8'))
-
-        Find.find(variables[:D]) do |file|
-          next unless file.end_with?('.py')
-
-          first_line = File.readlines(file).first
-          return true if %r{^#!\s*/usr/bin/env\s*python3.8\s*$}.match?(first_line)
-          return true if %r{^#!\s*/usr/bin/python3.8\s*$}.match?(first_line)
-        end
-        false
-      end
-    end
-  end
-end

data/lib/xezat/detector/python39.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-require 'find'
-
-module Xezat
-  module Detector
-    class Python39
-      def detect?(variables)
-        return true if File.directory?(File.join(variables[:D], 'usr', 'lib', 'python3.9'))
-
-        Find.find(variables[:D]) do |file|
-          next unless file.end_with?('.py')
-
-          first_line = File.readlines(file).first
-          return true if %r{^#!\s*/usr/bin/env\s*python\s*$}.match?(first_line)
-          return true if %r{^#!\s*/usr/bin/env\s*python3\s*$}.match?(first_line)
-          return true if %r{^#!\s*/usr/bin/env\s*python3.9\s*$}.match?(first_line)
-          return true if %r{^#!\s*/usr/bin/python\s*$}.match?(first_line)
-          return true if %r{^#!\s*/usr/bin/python3\s*$}.match?(first_line)
-          return true if %r{^#!\s*/usr/bin/python3.9\s*$}.match?(first_line)
-        end
-        false
-      end
-    end
-  end
-end