mswin-build 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3e3caa55131f9d640fb35fadfc93c7b53562d1b6
-  data.tar.gz: fc4f25f04c6fc563025922ae88155294221d229e
+SHA256:
+  metadata.gz: 2146ebe309631bdb2f08cd166be30bd538d269c6be26927073cb42df5e199f19
+  data.tar.gz: acf59186dc2ad2fde69ff38c7e814da6b7f7f3f326f1d65bdb3e5991a1db1499
 SHA512:
-  metadata.gz: 19093b7cd32b3583125ffbd81c7feceaac6d1e7b5a79105a7e6089615da62e045d2c40102544db76c09471059599c4e6f1ebf16cc59141116630b1b4822ad2f4
-  data.tar.gz: 301321b2a7e5fa1cb32749610ac4d9805db209a0ebc47164d0e7013e17fb832a39b241807f2b7ede812dc4037ad7ebb977cc40af7c40ec5432ab7cae648c9862
+  metadata.gz: 90a52f708a1bfdb8b3df634e59eb175193c8e0e1038d750f827e22369e601670668baccc2736639fccf0d59953b1404d71d9bc489589921af237bea7756ddabb
+  data.tar.gz: a7fa6028d13c82aae1d8606e549cbcabe7fa07f3ed7e6eae6f966b063923a01109fcff501f2ccfed84f5beff1c9f16b676f6eb017466446e03f24963b3cd7348

data/.travis.yml

@@ -1,8 +1,7 @@
 language: ruby
 rvm:
-  - 2.4.1
-  - 2.3.4
-  - 2.2.7
-  - 2.1.10
+  - 2.6.3
+  - 2.5.5
+  - 2.4.6
 script:
   - bundle exec rake build

data/README.md

@@ -16,10 +16,11 @@ A low quality clone of https://github.com/akr/chkbuild for mswin.
 Requirements
 ------------
 
-* ruby 2.1 or later
+* ruby 2.4 or later
 * sed
 * bison
 * svn
+* git
 * gzip
 * and of cource, Visual C++ 6 or newer
 
@@ -33,7 +34,7 @@ Write a config file in config directory, and run `bin/build.rb`.
 License
 -------
 
-Copyright (c) 2013 NAKAMURA Usaku usa@garbagecollect.jp
+Copyright (c) 2013-2019 NAKAMURA Usaku usa@garbagecollect.jp
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

data/config/vc10-x86-trunk.yaml

@@ -1,3 +1,4 @@
 baseruby:
-repository: http://svn.ruby-lang.org/repos/ruby/trunk
+repository: https://github.com/ruby/ruby.git
+branch: trunk
 logdir: logs/vc10-x86/ruby-trunk

data/lib/mswin-build/builder.rb

@@ -22,10 +22,13 @@ module MswinBuild
       @config["baseruby"] = baseruby if baseruby
       @config["bison"] ||= "bison"
       @config["svn"] ||= "svn"
+      @config["git"] ||= "git"
       @config["gzip"] ||= "gzip"
 
       raise "baseruby not specified" unless @config["baseruby"]
       raise "repository not specified" unless @config["repository"]
+      @is_git = @config["repository"].end_with?(".git")
+      raise "branch not specified" if @is_git && @config["branch"].to_s.empty?
       raise "logdir not specfied" unless @config["logdir"]
 
       @config["azure_key"] = azure_key if azure_key
@@ -48,6 +51,7 @@ module MswinBuild
       @config["timeout"]["bison-version"] ||= @config["timeout"]["default_short"]
       @config["timeout"]["svn/ruby"] ||= @config["timeout"]["default"]
       @config["timeout"]["svn/info"] ||= @config["timeout"]["default_short"]
+      @config["timeout"]["git/ruby"] ||= @config["timeout"]["default"]
       @config["timeout"]["configure"] ||= @config["timeout"]["default"]
       @config["timeout"]["cc-version"] ||= @config["timeout"]["default_short"]
       @config["timeout"]["miniruby"] ||= @config["timeout"]["default"]
@@ -150,18 +154,26 @@ module MswinBuild
     end
 
     def get_current_revision
-      orig_lang = ENV["LANG"]
-      ENV["LANG"] = "C"
-      begin
-        if /^(?:SVN )?Last Changed Rev: (\d+)$/ =~ `#{@config['svn']} info #{@config['repository']} 2> NUL`
-          $1
-        else
+      if @is_git
+        begin
+          `#{@config['git']} ls-remote #{@config['repository']} #{@config['branch']}`.split(/ +/, 2).first
+        rescue
           nil
         end
-      rescue
-        nil
-      ensure
-        ENV["LANG"] = orig_lang
+      else
+        orig_lang = ENV["LANG"]
+        ENV["LANG"] = "C"
+        begin
+          if /^(?:SVN )?Last Changed Rev: (\d+)$/ =~ `#{@config['svn']} info #{@config['repository']} 2> NUL`
+            $1
+          else
+            nil
+          end
+        rescue
+          nil
+        ensure
+          ENV["LANG"] = orig_lang
+        end
       end
     end
 
@@ -347,16 +359,23 @@ module MswinBuild
     end
 
     define_buildmethod(:checkout) do |io, tmpdir|
-      # svn/ruby
-      Dir.chdir(tmpdir) do
-        do_command(io, "svn/ruby", "#{@config['svn']} checkout #{@config['repository']} ruby")
-      end
+      if @is_git
+        # git/ruby
+        Dir.chdir(tmpdir) do
+          do_command(io, "git/ruby", "#{@config['git']} clone -q --branch #{@config['branch']} #{@config['repository']} ruby")
+        end
+      else
+        # svn/ruby
+        Dir.chdir(tmpdir) do
+          do_command(io, "svn/ruby", "#{@config['svn']} checkout #{@config['repository']} ruby")
+        end
 
-      # svn-info/ruby
-      @builddir = File.join(tmpdir, "ruby")
-      do_command(io, "svn-info/ruby", "#{@config['svn']} info", true) do |s|
-        if /^URL: (.*)$/ =~ `#{@config['svn']} info 2> NUL`
-          @data[:svn_url] = $1
+        # svn-info/ruby
+        @builddir = File.join(tmpdir, "ruby")
+        do_command(io, "svn-info/ruby", "#{@config['svn']} info", true) do |s|
+          if /^URL: (.*)$/ =~ `#{@config['svn']} info 2> NUL`
+            @data[:svn_url] = $1
+          end
         end
       end
     end
@@ -489,7 +508,7 @@ module MswinBuild
     end
 
     define_buildmethod(:test_all) do |io, tmpdir|
-      define_failure_start_pattern(io, /\A *\d+\) (Failure|Error)/, /\A\d+ tests, \d+ assertions, [1-9]\d* failures, \d+ errors/, /\A\d+ tests, \d+ assertions, \d+ failures, [1-9]\d* errors/, /:\d+:in `/)
+      define_failure_start_pattern(io, /\A *\d+\) (Failure|Error)/, /\A\d+ tests, \d+ assertions, [1-9]\d* failures, \d+ errors/, /\A\d+ tests, \d+ assertions, \d+ failures, [1-9]\d* errors/)
       ret = do_command(io, "test-all", "nmake -l TESTS=-v RUBYOPT=-w test-all", true, false, nil)
       if !ret && !ret.nil?
         io.rewind

data/lib/mswin-build/version.rb

@@ -1,3 +1,3 @@
 module MswinBuild
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/mswin-build.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "test-unit"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: mswin-build
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - U.Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-21 00:00:00.000000000 Z
+date: 2019-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -101,8 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.1.0.pre1
 signing_key: 
 specification_version: 4
 summary: A low quality clone of https://github.com/akr/chkbuild for mswin.