6daba0
From 4fc1be3af3f58621bb751c9e63c208b15c0e8d16 Mon Sep 17 00:00:00 2001
6daba0
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
6daba0
Date: Tue, 31 Mar 2015 16:21:04 +0200
6daba0
Subject: [PATCH 1/4] Use ruby_version_dir_name for versioned directories.
6daba0
6daba0
This disallows changing the ruby_version constant by --with-ruby-version
6daba0
configuration options. The two places version numbers are disallowed as
6daba0
well, since there are a lot of places which cannot handle this format
6daba0
properly.
6daba0
6daba0
ruby_version_dir_name now specifies custom version string for versioned
6daba0
directories, e.g. instead of default X.Y.Z, you can specify whatever
6daba0
string.
6daba0
---
6daba0
 configure.ac        | 64 ++++++++++++++++++++++++---------------------
6daba0
 template/ruby.pc.in |  1 +
6daba0
 2 files changed, 35 insertions(+), 30 deletions(-)
6daba0
6daba0
diff --git a/configure.ac b/configure.ac
6daba0
index 80b137e380..63cd3b4f8b 100644
6daba0
--- a/configure.ac
6daba0
+++ b/configure.ac
6daba0
@@ -3832,9 +3832,6 @@ AS_CASE(["$target_os"],
6daba0
     rubyw_install_name='$(RUBYW_INSTALL_NAME)'
6daba0
     ])
6daba0
 
6daba0
-rubylibdir='${rubylibprefix}/${ruby_version}'
6daba0
-rubyarchdir=${multiarch+'${rubyarchprefix}/${ruby_version}'}${multiarch-'${rubylibdir}/${arch}'}
6daba0
-
6daba0
 rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'}
6daba0
 AC_ARG_WITH(rubyarchprefix,
6daba0
 	    AS_HELP_STRING([--with-rubyarchprefix=DIR],
6daba0
@@ -3857,56 +3854,62 @@ AC_ARG_WITH(ridir,
6daba0
 AC_SUBST(ridir)
6daba0
 AC_SUBST(RI_BASE_NAME)
6daba0
 
6daba0
-AC_ARG_WITH(ruby-version,
6daba0
-	    AS_HELP_STRING([--with-ruby-version=STR], [ruby version string for version specific directories [[full]] (full|minor|STR)]),
6daba0
-            [ruby_version=$withval],
6daba0
-            [ruby_version=full])
6daba0
 unset RUBY_LIB_VERSION
6daba0
-unset RUBY_LIB_VERSION_STYLE
6daba0
-AS_CASE(["$ruby_version"],
6daba0
-  [full],  [RUBY_LIB_VERSION_STYLE='3	/* full */'],
6daba0
-  [minor], [RUBY_LIB_VERSION_STYLE='2	/* minor */'])
6daba0
-AS_IF([test ${RUBY_LIB_VERSION_STYLE+set}], [
6daba0
-    {
6daba0
-    echo "#define RUBY_LIB_VERSION_STYLE $RUBY_LIB_VERSION_STYLE"
6daba0
-    echo '#define STRINGIZE(x) x'
6daba0
-    test -f revision.h -o -f "${srcdir}/revision.h" || echo '#define RUBY_REVISION 0'
6daba0
-    echo '#include "version.h"'
6daba0
-    echo 'ruby_version=RUBY_LIB_VERSION'
6daba0
-    } > conftest.c
6daba0
-    ruby_version="`$CPP -I. -I"${srcdir}" -I"${srcdir}/include" conftest.c | sed '/^ruby_version=/!d;s/ //g'`"
6daba0
-    eval $ruby_version
6daba0
-], [test -z "${ruby_version}"], [
6daba0
-    AC_MSG_ERROR([No ruby version, No place for bundled libraries])
6daba0
-], [
6daba0
-    RUBY_LIB_VERSION="${ruby_version}"
6daba0
-])
6daba0
+RUBY_LIB_VERSION_STYLE='3	/* full */'
6daba0
+{
6daba0
+echo "#define RUBY_LIB_VERSION_STYLE $RUBY_LIB_VERSION_STYLE"
6daba0
+echo '#define STRINGIZE(x) x'
6daba0
+test -f revision.h -o -f "${srcdir}/revision.h" || echo '#define RUBY_REVISION 0'
6daba0
+echo '#include "version.h"'
6daba0
+echo 'ruby_version=RUBY_LIB_VERSION'
6daba0
+} > conftest.c
6daba0
+ruby_version="`$CPP -I. -I"${srcdir}" -I"${srcdir}/include" conftest.c | sed '/^ruby_version=/!d;s/ //g'`"
6daba0
+eval $ruby_version
6daba0
+
6daba0
+RUBY_LIB_VERSION="${ruby_version}"
6daba0
+
6daba0
 AC_SUBST(RUBY_LIB_VERSION_STYLE)
6daba0
 AC_SUBST(RUBY_LIB_VERSION)
6daba0
 
6daba0
+AC_ARG_WITH(ruby-version,
6daba0
+	    AS_HELP_STRING([--with-ruby-version=STR], [ruby version string for version specific directories [[full]] (full|STR)]),
6daba0
+            [ruby_version_dir_name=$withval],
6daba0
+            [ruby_version_dir_name=full])
6daba0
+AS_CASE(["$ruby_version_dir_name"],
6daba0
+  [full], [ruby_version_dir_name='${ruby_version}'])
6daba0
+
6daba0
+ruby_version_dir=/'${ruby_version_dir_name}'
6daba0
+
6daba0
+if test -z "${ruby_version_dir_name}"; then
6daba0
+    AC_MSG_ERROR([No ruby version, No place for bundled libraries])
6daba0
+fi
6daba0
+
6daba0
+rubylibdir='${rubylibprefix}'${ruby_version_dir}
6daba0
+rubyarchdir=${multiarch+'${rubyarchprefix}'${ruby_version_dir}}${multiarch-'${rubylibdir}/${arch}'}
6daba0
+
6daba0
 AC_ARG_WITH(sitedir,
6daba0
 	    AS_HELP_STRING([--with-sitedir=DIR], [site libraries in DIR [[RUBY_LIB_PREFIX/site_ruby]], "no" to disable site directory]),
6daba0
             [sitedir=$withval],
6daba0
             [sitedir='${rubylibprefix}/site_ruby'])
6daba0
-sitelibdir='${sitedir}/${ruby_version}'
6daba0
+sitelibdir='${sitedir}'${ruby_version_dir}
6daba0
 
6daba0
 AC_ARG_WITH(sitearchdir,
6daba0
 	    AS_HELP_STRING([--with-sitearchdir=DIR],
6daba0
 			   [architecture dependent site libraries in DIR [[SITEDIR/SITEARCH]], "no" to disable site directory]),
6daba0
             [sitearchdir=$withval],
6daba0
-            [sitearchdir=${multiarch+'${rubysitearchprefix}/site_ruby/${ruby_version}'}${multiarch-'${sitelibdir}/${sitearch}'}])
6daba0
+            [sitearchdir=${multiarch+'${rubysitearchprefix}/site_ruby'${ruby_version_dir}}${multiarch-'${sitelibdir}/${sitearch}'}])
6daba0
 
6daba0
 AC_ARG_WITH(vendordir,
6daba0
 	    AS_HELP_STRING([--with-vendordir=DIR], [vendor libraries in DIR [[RUBY_LIB_PREFIX/vendor_ruby]], "no" to disable vendor directory]),
6daba0
             [vendordir=$withval],
6daba0
             [vendordir='${rubylibprefix}/vendor_ruby'])
6daba0
-vendorlibdir='${vendordir}/${ruby_version}'
6daba0
+vendorlibdir='${vendordir}'${ruby_version_dir}
6daba0
 
6daba0
 AC_ARG_WITH(vendorarchdir,
6daba0
 	    AS_HELP_STRING([--with-vendorarchdir=DIR],
6daba0
 			   [architecture dependent vendor libraries in DIR [[VENDORDIR/SITEARCH]], "no" to disable vendor directory]),
6daba0
             [vendorarchdir=$withval],
6daba0
-            [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby/${ruby_version}'}${multiarch-'${vendorlibdir}/${sitearch}'}])
6daba0
+            [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby'${ruby_version_dir}}${multiarch-'${vendorlibdir}/${sitearch}'}])
6daba0
 
6daba0
 AS_IF([test "${LOAD_RELATIVE+set}"], [
6daba0
     AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
6daba0
@@ -3923,6 +3926,7 @@ AC_SUBST(sitearchincludedir)dnl
6daba0
 AC_SUBST(arch)dnl
6daba0
 AC_SUBST(sitearch)dnl
6daba0
 AC_SUBST(ruby_version)dnl
6daba0
+AC_SUBST(ruby_version_dir_name)dnl
6daba0
 AC_SUBST(rubylibdir)dnl
6daba0
 AC_SUBST(rubyarchdir)dnl
6daba0
 AC_SUBST(sitedir)dnl
6daba0
diff --git a/template/ruby.pc.in b/template/ruby.pc.in
6daba0
index 8a2c066..c81b211 100644
6daba0
--- a/template/ruby.pc.in
6daba0
+++ b/template/ruby.pc.in
6daba0
@@ -9,6 +9,7 @@ MAJOR=@MAJOR@
6daba0
 MINOR=@MINOR@
6daba0
 TEENY=@TEENY@
6daba0
 ruby_version=@ruby_version@
6daba0
+ruby_version_dir_name=@ruby_version_dir_name@
6daba0
 RUBY_API_VERSION=@RUBY_API_VERSION@
6daba0
 RUBY_PROGRAM_VERSION=@RUBY_PROGRAM_VERSION@
6daba0
 RUBY_BASE_NAME=@RUBY_BASE_NAME@
6daba0
-- 
6daba0
2.1.0
6daba0
6daba0
6daba0
From 518850aba6eee76de7715aae8d37330e34b01983 Mon Sep 17 00:00:00 2001
6daba0
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
6daba0
Date: Tue, 31 Mar 2015 16:37:26 +0200
6daba0
Subject: [PATCH 2/4] Add ruby_version_dir_name support for RDoc.
6daba0
6daba0
---
6daba0
 lib/rdoc/ri/paths.rb | 2 +-
6daba0
 tool/rbinstall.rb    | 2 +-
6daba0
 2 files changed, 2 insertions(+), 2 deletions(-)
6daba0
6daba0
diff --git a/lib/rdoc/ri/paths.rb b/lib/rdoc/ri/paths.rb
6daba0
index 970cb91..5bf8230 100644
6daba0
--- a/lib/rdoc/ri/paths.rb
6daba0
+++ b/lib/rdoc/ri/paths.rb
6daba0
@@ -10,7 +10,7 @@ module RDoc::RI::Paths
6daba0
   #:stopdoc:
6daba0
   require 'rbconfig'
6daba0
 
6daba0
-  version = RbConfig::CONFIG['ruby_version']
6daba0
+  version = RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
6daba0
 
6daba0
   BASE    = File.join RbConfig::CONFIG['ridir'], version
6daba0
 
6daba0
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
6daba0
index d4c110e..d39c9a6 100755
6daba0
--- a/tool/rbinstall.rb
6daba0
+++ b/tool/rbinstall.rb
6daba0
@@ -439,7 +439,7 @@ def CONFIG.[](name, mandatory = false)
6daba0
 
6daba0
 install?(:doc, :rdoc) do
6daba0
   if $rdocdir
6daba0
-    ridatadir = File.join(CONFIG['ridir'], CONFIG['ruby_version'], "system")
6daba0
+    ridatadir = File.join(CONFIG['ridir'], CONFIG['ruby_version_dir_name'] || CONFIG['ruby_version'], "system")
6daba0
     prepare "rdoc", ridatadir
6daba0
     install_recursive($rdocdir, ridatadir, :no_install => rdoc_noinst, :mode => $data_mode)
6daba0
   end
6daba0
-- 
6daba0
2.23.0
6daba0
6daba0
6daba0
From 9f0ec0233f618cbb862629816b22491c3df79578 Mon Sep 17 00:00:00 2001
6daba0
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
6daba0
Date: Tue, 31 Mar 2015 16:37:44 +0200
6daba0
Subject: [PATCH 3/4] Add ruby_version_dir_name support for RubyGems.
6daba0
6daba0
---
6daba0
 lib/rubygems/defaults.rb  | 9 +++++----
6daba0
 test/rubygems/test_gem.rb | 5 +++--
6daba0
 2 files changed, 8 insertions(+), 6 deletions(-)
6daba0
6daba0
diff --git a/lib/rubygems/defaults.rb b/lib/rubygems/defaults.rb
6daba0
index d4ff4a262c..3f9a5bf590 100644
6daba0
--- a/lib/rubygems/defaults.rb
6daba0
+++ b/lib/rubygems/defaults.rb
6daba0
@@ -38,13 +38,13 @@ def self.default_dir
6daba0
              [
6daba0
                File.dirname(RbConfig::CONFIG['sitedir']),
6daba0
                'Gems',
6daba0
-               RbConfig::CONFIG['ruby_version'],
6daba0
+               RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
6daba0
              ]
6daba0
            else
6daba0
              [
6daba0
                RbConfig::CONFIG['rubylibprefix'],
6daba0
                'gems',
6daba0
-               RbConfig::CONFIG['ruby_version'],
6daba0
+               RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
6daba0
              ]
6daba0
            end
6daba0
 
6daba0
@@ -117,7 +117,8 @@ def self.user_dir
6daba0
     gem_dir = File.join(Gem.user_home, ".gem")
6daba0
     gem_dir = File.join(Gem.data_home, "gem") unless File.exist?(gem_dir)
6daba0
     parts = [gem_dir, ruby_engine]
6daba0
-    parts << RbConfig::CONFIG['ruby_version'] unless RbConfig::CONFIG['ruby_version'].empty?
6daba0
+    ruby_version_dir_name = RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
6daba0
+    parts << ruby_version_dir_name unless ruby_version_dir_name.empty?
6daba0
     File.join parts
6daba0
   end
6daba0
 
6daba0
@@ -252,7 +253,7 @@ def self.vendor_dir # :nodoc:
6daba0
     return nil unless RbConfig::CONFIG.key? 'vendordir'
6daba0
 
6daba0
     File.join RbConfig::CONFIG['vendordir'], 'gems',
6daba0
-              RbConfig::CONFIG['ruby_version']
6daba0
+              RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
6daba0
   end
6daba0
 
6daba0
   ##
6daba0
diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
6daba0
index b25068405d..e9fef4a311 100644
6daba0
--- a/test/rubygems/test_gem.rb
6daba0
+++ b/test/rubygems/test_gem.rb
6daba0
@@ -1440,7 +1440,8 @@ def test_self_use_paths
6daba0
 
6daba0
   def test_self_user_dir
6daba0
     parts = [@userhome, '.gem', Gem.ruby_engine]
6daba0
-    parts << RbConfig::CONFIG['ruby_version'] unless RbConfig::CONFIG['ruby_version'].empty?
6daba0
+    ruby_version_dir_name = RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
6daba0
+    parts << ruby_version_dir_name unless ruby_version_dir_name.empty?
6daba0
 
6daba0
     FileUtils.mkdir_p File.join(parts)
6daba0
 
6daba0
@@ -1516,7 +1517,7 @@ def test_self_vendor_dir
6daba0
     vendordir(File.join(@tempdir, 'vendor')) do
6daba0
       expected =
6daba0
         File.join RbConfig::CONFIG['vendordir'], 'gems',
6daba0
-                  RbConfig::CONFIG['ruby_version']
6daba0
+                  RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
6daba0
 
6daba0
       assert_equal expected, Gem.vendor_dir
6daba0
     end
6daba0
-- 
6daba0
2.1.0
6daba0
6daba0
6daba0
From 88c38a030c22dbf9422ece847bdfbf87d6659313 Mon Sep 17 00:00:00 2001
6daba0
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
6daba0
Date: Wed, 1 Apr 2015 14:55:37 +0200
6daba0
Subject: [PATCH 4/4] Let headers directories follow the configured version
6daba0
 name.
6daba0
6daba0
---
6daba0
 configure.ac | 2 +-
6daba0
 1 file changed, 1 insertion(+), 1 deletion(-)
6daba0
6daba0
diff --git a/configure.ac b/configure.ac
6daba0
index a00f2b6776..999e2d6d5d 100644
6daba0
--- a/configure.ac
6daba0
+++ b/configure.ac
6daba0
@@ -107,7 +107,7 @@ RUBY_BASE_NAME=`echo ruby | sed "$program_transform_name"`
6daba0
 RUBYW_BASE_NAME=`echo rubyw | sed "$program_transform_name"`
6daba0
 AC_SUBST(RUBY_BASE_NAME)
6daba0
 AC_SUBST(RUBYW_BASE_NAME)
6daba0
-AC_SUBST(RUBY_VERSION_NAME, '${RUBY_BASE_NAME}-${ruby_version}')
6daba0
+AC_SUBST(RUBY_VERSION_NAME, '${RUBY_BASE_NAME}-${ruby_version_dir_name}')
6daba0
 
6daba0
 dnl checks for alternative programs
6daba0
 AC_CANONICAL_BUILD
6daba0
-- 
6daba0
2.1.0
6daba0