xezat 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44f20fb8c8d53290ca2aa712f0305df3a64fa92b5fd495e74d9c251cea4bd38c
-  data.tar.gz: 43aa81a90789ba5ab3d9c64b7b8aa4b93bf04d96cde0c51ceba7a35238623771
+  metadata.gz: 19e1eef962e59cf81c84a69ea321838d0b0542952073b429cb0f9af0d8cd7dd3
+  data.tar.gz: 88a9a875473d8e11ab01651393740b06af772b9c1f7ce18e9e3fc74909971b1b
 SHA512:
-  metadata.gz: fde0d1e68848308d416fe1e06749bfcaec89a558a40454fc8924a0038103ddbbc07db8900894d48b825a21633e112c83ce72899e40133b8766f082749a3a2f12
-  data.tar.gz: 0cbca3957598e70390bdb6c87bddfe94585d5d1afe85b97057158b23dae17a2ab1555c7b63410595417cf996382124e42907dd42f1aa1e43831710f26295184d
+  metadata.gz: cf83fa1fbc96dfd22a07d64c974fc3d279cd00a3021315d18948011d44354624d8e426c88bdd654bd63c27a63b01ece6f47a842ed9cba54fb77cf50fa1d754d2
+  data.tar.gz: b4132baf3892fccce8e9b19f6701751878be50a74e08551cc601c921a1ccfe25f3b29f7730d160a7cda93c51306a95ba47e4234ce99a84754b40b4849a50f5e6

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

@@ -14,8 +14,10 @@ module Xezat
         additional_path = candidate_files.map do |file|
           File.dirname(file)
         end.sort.uniq.join(':')
+        Xezat.logger.debug("    Additional PATH = #{additional_path.gsub(Regexp.new(variables[:D]), '')}")
         command = ['bash', File.expand_path(File.join(DATA_DIR, 'cygport_dep.sh')), cygport]
-        result, error, status = Open3.capture3({ 'PATH' => "#{ENV.fetch('PATH')}:#{additional_path}" }, command.join(' '))
+        result, error, status = Open3.capture3({ 'PATH' => "#{additional_path}:#{ENV.fetch('PATH')}" }, command.join(' '))
+        Xezat.logger.warn("    Stderr = #{error}") unless error.empty?
         raise CygportProcessError, error unless status.success?
 
         result

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

@@ -13,12 +13,29 @@ module Xezat
         runtime_packages = result.gsub(/^.*\*\*\*.*$/, '').split($INPUT_RECORD_SEPARATOR).map(&:lstrip)
         build_requires = variables[:BUILD_REQUIRES].nil? ? [] : variables[:BUILD_REQUIRES].split.map(&:to_sym)
         runtime_packages.delete(pkgs[:'libssl-devel']) if build_requires.include?(:'libssl1.0-devel')
-        runtime_packages.map! { |pkg| pkg == 'python3' ? pkgs[:python39] : pkg }
+        runtime_packages.map! do |pkg|
+          resolve_pseudo(pkg, pkgs)
+        end
         variables[:REQUIRES]&.split&.each do |req|
           runtime_packages << pkgs[req.to_sym]
         end
         runtime_packages.sort.uniq
       end
+
+      private
+
+      def resolve_pseudo(pkg, pkgs)
+        case pkg
+        when 'python3'
+          pkgs[:python39]
+        when 'perl5_036'
+          pkgs[:perl_base]
+        when 'ruby_32'
+          pkgs[:ruby]
+        else
+          pkg
+        end
+      end
     end
   end
 end

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

@@ -9,9 +9,9 @@ module Xezat
       def get_src_uri(variables, cygclasses = CygclassManager.new)
         Xezat.logger.debug('  Collect SRC_URI')
         cygclasses.vcs.each do |vcs|
-          next unless variables.key?("_#{vcs}_CYGCLASS_".intern)
+          next unless variables.key?(:"_#{vcs}_CYGCLASS_")
 
-          src_uri_key = "#{vcs.to_s.upcase}_URI".intern
+          src_uri_key = :"#{vcs.to_s.upcase}_URI"
           return variables[src_uri_key].split if variables.key?(src_uri_key)
         end
         variables[:SRC_URI].split

data/lib/xezat/command/generate.rb

@@ -13,6 +13,15 @@ module Xezat
         require 'xezat/generator/pkgconfig'
         Generator::Pkgconfig.new(options, cygport).generate
       end
+
+      desc 'cmake cygport', 'Generate CMakeLists.txt'
+      option :overwrite, type: :boolean, aliases: '-o', desc: 'overwrite CMakeLists.txt'
+      option :srcdir, type: :string, aliases: '-s', desc: 'relative path to CMakeLists.txt'
+
+      def cmake(cygport)
+        require 'xezat/generator/cmake'
+        Generator::CMake.new(options, cygport).generate
+      end
     end
   end
 end

data/lib/xezat/command/init.rb

@@ -65,7 +65,7 @@ module Xezat
           vcs_class = cygclass
         end
         vcs_prefix = vcs_class.to_s.upcase if vcs_class
-        vcs_uri = "#{vcs_prefix}_URI".intern
+        vcs_uri = :"#{vcs_prefix}_URI"
         {
           :HOMEPAGE => original_template_variables[:HOMEPAGE],
           vcs_uri => original_template_variables[vcs_uri]

data/lib/xezat/command/validate/config.rb

@@ -7,24 +7,18 @@ module Xezat
   module Command
     class Validate
       def validate_config(variables, gcc_version)
-        configs = Dir.glob(File.join(variables[:D], '/usr/bin/*-config'))
-        configs.each do |config|
-          basename = File.basename(config)
-          Xezat.logger.debug("    #{basename} found")
+        Dir.glob(File.join(variables[:D], '/usr/bin/*-config')).each do |config|
+          Xezat.logger.debug("    #{File.basename(config)} found")
 
-          result, _, status = Open3.capture3("#{config} --cflags")
-          if status.success?
-            Xezat.logger.debug("      cflags = #{result.strip}")
-          else
-            Xezat.logger.warn('       cflags not supported')
+          begin
+            executable?(config)
+          rescue StandardError
+            next
           end
 
-          result, _, status = Open3.capture3("#{config} --cxxflags")
-          if status.success?
-            Xezat.logger.debug("      cxxflags = #{result.strip}")
-          else
-            Xezat.logger.warn('       cxxflags not supported')
-          end
+          validate_modversion(config, variables)
+          validate_cflags(config)
+          validate_cxxflags(config)
 
           result, _, status = Open3.capture3("#{config} --libs")
           if status.success?
@@ -35,6 +29,45 @@ module Xezat
           end
         end
       end
+
+      private
+
+      def executable?(config)
+        Open3.capture3(config.to_s)
+      rescue StandardError => e
+        Xezat.logger.warn("       #{config} not executable: #{e}")
+        raise e
+      end
+
+      def validate_modversion(config, variables)
+        result, _, status = Open3.capture3("#{config} --version")
+        if status.success?
+          modversion = result.strip
+          Xezat.logger.debug("      modversion = #{modversion}")
+          pv = variables[:PV][0].gsub(/\+.+$/, '')
+          Xezat.logger.error("        modversion differs from $PN = #{pv}") unless modversion == pv
+        else
+          Xezat.logger.warn('       modversion not supported')
+        end
+      end
+
+      def validate_cflags(config)
+        result, _, status = Open3.capture3("#{config} --cflags")
+        if status.success?
+          Xezat.logger.debug("      cflags = #{result.strip}")
+        else
+          Xezat.logger.warn('       cflags not supported')
+        end
+      end
+
+      def validate_cxxflags(config)
+        result, _, status = Open3.capture3("#{config} --cxxflags")
+        if status.success?
+          Xezat.logger.debug("      cxxflags = #{result.strip}")
+        else
+          Xezat.logger.warn('       cxxflags not supported')
+        end
+      end
     end
   end
 end

data/lib/xezat/command/validate/license.rb

@@ -19,6 +19,9 @@ module Xezat
         license_uri = vars[:LICENSE_URI]
         if license_uri.nil? || license_uri.empty?
           Xezat.logger.warn('     LICENSE_URI is not defined')
+        elsif license_uri.start_with?('https://', 'http://')
+          Xezat.logger.debug("    LICENSE_URI = #{license_uri}")
+          livecheck(license_uri)
         elsif File.exist?(File.join(vars[:S], license_uri))
           Xezat.logger.debug("    LICENSE_URI = #{license_uri}")
         else

data/lib/xezat/command/validate.rb

@@ -63,17 +63,8 @@ module Xezat
       end
 
       def validate_homepage(homepage)
-        response = Net::HTTP.get_response(URI.parse(homepage))
-        code = response.code
-        if code == '200'
-          Xezat.logger.debug("    code = #{code}")
-        else
-          Xezat.logger.error("    code = #{code}")
-        end
-      rescue OpenSSL::SSL::SSLError => e
-        raise e unless @options[:ignore]
-
-        Xezat.logger.warn('    Ignore SSLError')
+        Xezat.logger.debug("    HOMEPAGE = #{homepage}")
+        livecheck(homepage)
       end
 
       def validate_build_requires(build_requires, pkgs)
@@ -113,6 +104,22 @@ module Xezat
           end
         end
       end
+
+      private
+
+      def livecheck(url)
+        response = Net::HTTP.get_response(URI.parse(url))
+        code = response.code
+        if code == '200'
+          Xezat.logger.debug("      code = #{code}")
+        else
+          Xezat.logger.error("      code = #{code}")
+        end
+      rescue OpenSSL::SSL::SSLError => e
+        raise e unless @options[:ignore]
+
+        Xezat.logger.warn('      Ignore SSLError')
+      end
     end
   end
 end

data/lib/xezat/detector/asciidoc.rb

@@ -5,7 +5,7 @@ require 'find'
 module Xezat
   module Detector
     class Asciidoc
-      def detect(variables)
+      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/autoconf-archive.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Xezat
+  module Detector
+    class AutoconfArchive
+      def detect?(variables)
+        return false unless variables.keys.index do |key|
+          %i[_cmake_CYGCLASS_ _meson_CYGCLASS_ _ninja_CYGCLASS_].include?(key)
+        end.nil?
+
+        autoconf_archive_file = File.expand_path(File.join(DATA_DIR, 'autoconf-archive.yml'))
+        autoconf_archive_macros = YAML.safe_load(File.open(autoconf_archive_file), symbolize_names: true, permitted_classes: [Symbol])
+
+        Find.find(variables[:S]) do |file|
+          next unless file.end_with?("#{File::SEPARATOR}configure.ac", "#{File::SEPARATOR}configure.in")
+
+          autoconf_archive_macros.each do |macro|
+            File.foreach(file) do |line|
+              return true if line.scrub.strip.start_with?(macro)
+            end
+          end
+        end
+        false
+      end
+    end
+  end
+end

data/lib/xezat/detector/autoconf.rb

@@ -5,7 +5,7 @@ require 'find'
 module Xezat
   module Detector
     class Autoconf
-      def detect(variables)
+      def detect?(variables)
         return false unless variables.keys.index do |key|
           %i[_cmake_CYGCLASS_ _meson_CYGCLASS_ _ninja_CYGCLASS_].include?(key)
         end.nil?

data/lib/xezat/detector/automake.rb

@@ -5,28 +5,15 @@ require 'find'
 module Xezat
   module Detector
     class Automake
-      def detect(variables)
+      def detect?(variables)
         return false unless variables.keys.index do |key|
           %i[_cmake_CYGCLASS_ _meson_CYGCLASS_ _ninja_CYGCLASS_].include?(key)
         end.nil?
 
-        cygautoreconf = false
-        File.foreach(File.join(variables[:top], variables[:cygportfile])) do |line|
-          if line.index('cygautoreconf')
-            cygautoreconf = true
-            return true
-          end
-        end
-
-        unless cygautoreconf
-          File.foreach(File.join(variables[:top], variables[:cygportfile])) do |line|
-            return false if line.index('src_compile')
-          end
-        end
-
         Find.find(variables[:S]) do |file|
           return true if file.end_with?('.am')
         end
+
         false
       end
     end

data/lib/xezat/detector/boost.m4.rb

@@ -5,7 +5,7 @@ require 'find'
 module Xezat
   module Detector
     class BoostM4
-      def detect(variables)
+      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/cmake.rb

@@ -5,7 +5,7 @@ require 'find'
 module Xezat
   module Detector
     class Cmake
-      def detect(variables)
+      def detect?(variables)
         variables.key?(:_cmake_CYGCLASS_)
       end
     end

data/lib/xezat/detector/docbook2X.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'find'
+
+module Xezat
+  module Detector
+    class Docbook2x
+      def detect?(variables)
+        Find.find(variables[:S]) do |file|
+          next unless file.end_with?("#{File::SEPARATOR}configure.ac", "#{File::SEPARATOR}configure.in")
+
+          File.foreach(file) do |line|
+            return true if line.include?('docbook2x-man')
+          end
+        end
+        false
+      end
+    end
+  end
+end

data/lib/xezat/detector/font-util.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'find'
+
+module Xezat
+  module Detector
+    class FontUtil
+      def detect?(variables)
+        Find.find(variables[:S]) do |file|
+          next unless file.end_with?("#{File::SEPARATOR}configure.ac", "#{File::SEPARATOR}configure.in")
+
+          File.foreach(file) do |line|
+            return true if line.start_with?('XORG_FONT_MACROS_VERSION')
+          end
+        end
+        false
+      end
+    end
+  end
+end

data/lib/xezat/detector/gengetopt.rb

@@ -5,7 +5,7 @@ require 'find'
 module Xezat
   module Detector
     class Gengetopt
-      def detect(variables)
+      def detect?(variables)
         Find.find(variables[:S]) do |file|
           return true if file.end_with?('.ggo', '.ggo.in')
         end

data/lib/xezat/detector/gettext-devel.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Xezat
+  module Detector
+    class GettextDevel
+      def detect?(variables)
+        Find.find(variables[:S]) do |file|
+          next unless file.end_with?("#{File::SEPARATOR}configure.ac", "#{File::SEPARATOR}configure.in")
+
+          File.foreach(file) do |line|
+            return true if /AM_GNU_GETTEXT|AM_ICONV|AC_GGZ_INTL/.match?(line.scrub.lstrip)
+          end
+        end
+        false
+      end
+    end
+  end
+end

data/lib/xezat/detector/gnulib.rb

@@ -5,7 +5,7 @@ require 'find'
 module Xezat
   module Detector
     class Gnulib
-      def detect(variables)
+      def detect?(variables)
         File.foreach(File.join(variables[:top], variables[:cygportfile])) do |line|
           return true if line.index('gnulib-tools')
         end

data/lib/xezat/detector/gobject-introspection.rb

@@ -5,7 +5,7 @@ require 'find'
 module Xezat
   module Detector
     class GobjectIntrospection
-      def detect(variables)
+      def detect?(variables)
         File.directory?(File.join(variables[:D], 'usr', 'lib', 'girepository-1.0'))
       end
     end

data/lib/xezat/detector/halibut.rb

@@ -5,7 +5,7 @@ require 'find'
 module Xezat
   module Detector
     class Halibut
-      def detect(variables)
+      def detect?(variables)
         Find.find(variables[:S]) do |file|
           return true if file.end_with?('.but')
         end

data/lib/xezat/detector/libQt5Core-devel.rb

@@ -3,7 +3,7 @@
 module Xezat
   module Detector
     class Libqt5coreDevel
-      def detect(variables)
+      def detect?(variables)
         variables.key?(:_qt5_qmake_CYGCLASS_)
       end
     end

data/lib/xezat/detector/libtool.rb

@@ -5,7 +5,7 @@ require 'find'
 module Xezat
   module Detector
     class Libtool
-      def detect(variables)
+      def detect?(variables)
         Find.find(variables[:S]) do |file|
           return true if file.end_with?("#{File::SEPARATOR}ltmain.sh")
         end

data/lib/xezat/detector/make.rb

@@ -5,7 +5,7 @@ require 'find'
 module Xezat
   module Detector
     class Make
-      def detect(variables)
+      def detect?(variables)
         Find.find(variables[:B]) do |file|
           return true if file.end_with?("#{File::SEPARATOR}Makefile", "#{File::SEPARATOR}makefile")
         end

data/lib/xezat/detector/meson.rb

@@ -3,7 +3,7 @@
 module Xezat
   module Detector
     class Meson
-      def detect(variables)
+      def detect?(variables)
         variables.key?(:_meson_CYGCLASS_)
       end
     end

data/lib/xezat/detector/nasm.rb

@@ -3,7 +3,7 @@
 module Xezat
   module Detector
     class Nasm
-      def detect(variables)
+      def detect?(variables)
         if variables.key?(:_meson_CYGCLASS_)
           File.foreach(File.join(variables[:S], 'meson.build')) do |line|
             return true if line.include?("find_program('nasm')")

data/lib/xezat/detector/ninja.rb

@@ -5,7 +5,7 @@ require 'find'
 module Xezat
   module Detector
     class Ninja
-      def detect(variables)
+      def detect?(variables)
         return true if variables.key?(:_meson_CYGCLASS_)
 
         Find.find(variables[:B]) do |file|

data/lib/xezat/detector/python27.rb

@@ -5,7 +5,7 @@ require 'find'
 module Xezat
   module Detector
     class Python27
-      def detect(variables)
+      def detect?(variables)
         return true if File.directory?(File.join(variables[:D], 'usr', 'lib', 'python2.7'))
 
         Find.find(variables[:D]) do |file|

data/lib/xezat/detector/python36.rb

@@ -5,7 +5,7 @@ require 'find'
 module Xezat
   module Detector
     class Python36
-      def detect(variables)
+      def detect?(variables)
         return true if File.directory?(File.join(variables[:D], 'usr', 'lib', 'python3.6'))
 
         Find.find(variables[:D]) do |file|

data/lib/xezat/detector/python37.rb

@@ -5,7 +5,7 @@ require 'find'
 module Xezat
   module Detector
     class Python37
-      def detect(variables)
+      def detect?(variables)
         return true if File.directory?(File.join(variables[:D], 'usr', 'lib', 'python3.7'))
 
         Find.find(variables[:D]) do |file|

data/lib/xezat/detector/python38.rb

@@ -5,7 +5,7 @@ require 'find'
 module Xezat
   module Detector
     class Python38
-      def detect(variables)
+      def detect?(variables)
         return true if File.directory?(File.join(variables[:D], 'usr', 'lib', 'python3.8'))
 
         Find.find(variables[:D]) do |file|

data/lib/xezat/detector/python39-docutils.rb

@@ -5,12 +5,12 @@ require 'find'
 module Xezat
   module Detector
     class Python39Docutils
-      def detect(variables)
+      def detect?(variables)
         Find.find(variables[:S]) do |file|
           next unless file.end_with?("#{File::SEPARATOR}configure.ac", "#{File::SEPARATOR}configure.in")
 
           File.foreach(file) do |line|
-            return true if line.strip.start_with?('AC_CHECK_PROG') && line.index('rst2man').is_a?(Integer)
+            return true if line.scrub.strip.start_with?('AC_CHECK_PROG') && line.index('rst2man').is_a?(Integer)
           end
         end
         if variables.key?(:_meson_CYGCLASS_)

data/lib/xezat/detector/python39.rb

@@ -5,7 +5,7 @@ require 'find'
 module Xezat
   module Detector
     class Python39
-      def detect(variables)
+      def detect?(variables)
         return true if File.directory?(File.join(variables[:D], 'usr', 'lib', 'python3.9'))
 
         Find.find(variables[:D]) do |file|

data/lib/xezat/detector/roundup.rb

@@ -5,7 +5,7 @@ require 'find'
 module Xezat
   module Detector
     class Roundup
-      def detect(variables)
+      def detect?(variables)
         File.foreach(File.join(variables[:top], variables[:cygportfile])) do |line|
           return true if line.index('roundup')
         end

data/lib/xezat/detector/waf.rb

@@ -3,7 +3,7 @@
 module Xezat
   module Detector
     class Waf
-      def detect(variables)
+      def detect?(variables)
         if variables.key?(:_waf_CYGCLASS_)
           Find.find(variables[:S]) do |file|
             return false if file.end_with?("#{File::SEPARATOR}waf")

data/lib/xezat/detector/xorg-util-macros.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'find'
+
+module Xezat
+  module Detector
+    class XorgUtilMacros
+      def detect?(variables)
+        Find.find(variables[:S]) do |file|
+          next unless file.end_with?("#{File::SEPARATOR}configure.ac", "#{File::SEPARATOR}configure.in")
+
+          File.foreach(file) do |line|
+            return true if line.start_with?('XORG_MACROS_VERSION')
+          end
+        end
+        false
+      end
+    end
+  end
+end

data/lib/xezat/detectors.rb

@@ -20,7 +20,7 @@ module Xezat
       @detectors.each do |name, detector|
         if variables[:PN].intern == name
           Xezat.logger.debug("      #{name} ... no (self)")
-        elsif detector.detect(variables)
+        elsif detector.detect?(variables)
           tools << name
           Xezat.logger.debug("      #{name} ... yes")
         else

data/lib/xezat/generator/cmake.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'xezat/generator'
+require 'xezat/variables'
+
+module Xezat
+  module Generator
+    class CMake
+      include Xezat
+
+      def initialize(options, cygport)
+        @options = options
+        @cygport = cygport
+      end
+
+      def generate
+        Xezat.logger.debug('Start CMakeLists.txt generation')
+        vars = variables(@cygport)
+        generate_cmakelists(vars, @options)
+        Xezat.logger.debug('End CMakeLists.txt generation')
+      end
+
+      def generate_cmakelists(variables, options)
+        srcdir = variables[:CYGCONF_SOURCE] || variables[:CYGCMAKE_SOURCE] || variables[:S]
+        srcdir = File.expand_path(File.join(variables[:S], options['srcdir'])) if options['srcdir']
+        Xezat.logger.debug("  srcdir = #{srcdir}")
+
+        cmakelists = File.expand_path(File.join(srcdir, 'CMakeLists.txt'))
+        raise UnregeneratableConfigurationError, 'CMakeLists.txt already exists' if File.exist?(cmakelists) && !options['overwrite']
+
+        Xezat.logger.debug('  Generate CMakeLists.txt')
+
+        File.atomic_write(cmakelists) do |f|
+          f.write(get_cmakelists(variables))
+        end
+      end
+
+      def get_cmakelists(variables)
+        erb = File.expand_path(File.join(TEMPLATE_DIR, 'cmake', 'cmake.erb'))
+        ERB.new(File.readlines(erb).join(nil), trim_mode: '%-').result(binding)
+      end
+    end
+  end
+end