ruby-changes:71166
From: nagachika <ko1@a...>
Date: Sun, 13 Feb 2022 14:12:03 +0900 (JST)
Subject: [ruby-changes:71166] e7f212651e (ruby_3_0): merge revision(s) ec032e86faf9ac128ac51e3394d9b4001a374b38,8acb2a9b4069f55f71a80c747fc7c6bcb686abb7:
https://git.ruby-lang.org/ruby.git/commit/?id=e7f212651e From e7f212651ebb500ed07025b94ed64c896d785386 Mon Sep 17 00:00:00 2001 From: nagachika <nagachika@r...> Date: Sun, 13 Feb 2022 14:11:35 +0900 Subject: merge revision(s) ec032e86faf9ac128ac51e3394d9b4001a374b38,8acb2a9b4069f55f71a80c747fc7c6bcb686abb7: [MinGW] Clear prefix and move the directory to DESTDIR Also the destination will be created at the installation. --- .github/workflows/mingw.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) [MinGW] Use autogen --- .github/workflows/mingw.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) --- .github/workflows/mingw.yml | 15 +++++++-------- version.h | 4 ++-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index c0366f2942..8b1e7bce1c 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -50,13 +50,12 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/mingw.yml#L50 if ($rslt.contains($e)) { Write-Host $rslt } else { Write-Host "`nCan't find $e" } } - - name: misc setup, autoreconf + + - name: autogen run: | - mkdir install - mkdir temp - cd src - sh -c "autoreconf -fi" - working-directory: + ./autogen.sh + working-directory: src + shell: sh - name: configure run: | @@ -66,7 +65,7 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/mingw.yml#L65 [Console]::InputEncoding = [System.Text.Encoding]::GetEncoding("IBM437") $config_args = "--build=$env:CHOST --host=$env:CHOST --target=$env:CHOST" Write-Host $config_args - sh -c "../src/configure --disable-install-doc --prefix=/install $config_args" + sh -c "../src/configure --disable-install-doc --prefix=/. $config_args" # Write-Host "-------------------------------------- config.log" # Get-Content ./config.log | foreach {Write-Output $_} @@ -92,7 +91,7 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/mingw.yml#L91 $PSDefaultParameterValues['*:Encoding'] = 'utf8' [Console]::OutputEncoding = [System.Text.Encoding]::GetEncoding("IBM437") [Console]::InputEncoding = [System.Text.Encoding]::GetEncoding("IBM437") - make DESTDIR=.. install-nodoc + make DESTDIR=../install install-nodoc - name: test timeout-minutes: 5 diff --git a/version.h b/version.h index 0a27f7df31..79406e84e7 100644 --- a/version.h +++ b/version.h @@ -12,11 +12,11 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L12 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 4 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 166 +#define RUBY_PATCHLEVEL 167 #define RUBY_RELEASE_YEAR 2022 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 12 +#define RUBY_RELEASE_DAY 13 #include "ruby/version.h" -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/