Revision: 130526 https://trac.macports.org/changeset/130526 Author: kimuraw@macports.org Date: 2014-12-31 06:53:05 -0800 (Wed, 31 Dec 2014) Log Message: ----------- _resources/port1.0/group/ruby-1.0.tcl: support ruby-2.2 (port:ruby22) Modified Paths: -------------- trunk/dports/_resources/port1.0/group/ruby-1.0.tcl Modified: trunk/dports/_resources/port1.0/group/ruby-1.0.tcl =================================================================== --- trunk/dports/_resources/port1.0/group/ruby-1.0.tcl 2014-12-31 08:23:02 UTC (rev 130525) +++ trunk/dports/_resources/port1.0/group/ruby-1.0.tcl 2014-12-31 14:53:05 UTC (rev 130526) @@ -36,17 +36,17 @@ # 1. use ruby.setup # # PortGroup ruby 1.0 -# ruby.setup module version type {} ruby19 +# ruby.setup module version type {} ruby22 # # 2. use ruby.branch # # PortGroup ruby 1.0 -# ruby.branch 1.9 +# ruby.branch 2.2 # depends_lib port:ruby${ruby.suffix} # build.cmd ${ruby.bin} # options: -# ruby.branch: select ruby version. 1.8, 1.9, 2.0 or 2.1. +# ruby.branch: select ruby version. 2.2, 2.1, 2.0, 1.9 or 1.8. # ruby.link_binaries: whether generate suffixed symlink under ${prefix}/bin # or not. # values: @@ -55,9 +55,9 @@ # port:rb${ruby.suffix}-foo. # ruby.bindir: install location of commands without suffix from rb-foo. # ruby.gemdir: install location of rubygems. -# such as "${prefix}/lib/ruby1.9/gems/1.9.1". +# such as "${prefix}/lib/ruby2.2/gems/2.2.0". # ruby.link_binaries_suffix: suffix of commands from rb-foo under -# ${prefix}/bin. such as "-1.8" or "-1.9". +# ${prefix}/bin. such as "-2.2" or "-2.1". # (obsoleted values) # ruby.prog_suffix: use ruby.branch. # ruby.version: use ruby.api_version. @@ -102,10 +102,11 @@ } # switch -exact ${ruby.branch} { + 2.2 {set ruby.api_version 2.2.0} + 2.1 {set ruby.api_version 2.1.0} + 2.0 {set ruby.api_version 2.0.0} + 1.9 {set ruby.api_version 1.9.1} 1.8 {set ruby.api_version 1.8} - 1.9 {set ruby.api_version 1.9.1} - 2.0 {set ruby.api_version 2.0.0} - 2.1 {set ruby.api_version 2.1.0} } set ruby.gemdir ${prefix}/lib/ruby${ruby.prog_suffix}/gems/${ruby.api_version} # define installation libraries as vendor location @@ -160,12 +161,13 @@ global ruby.config_rubyprog_name switch ${implementation} { + ruby22 { ruby.branch 2.2 } ruby21 { ruby.branch 2.1 } ruby20 { ruby.branch 2.0 } ruby19 { ruby.branch 1.9 } ruby { ruby.branch 1.8 } default { - ui_error "ruby.setup: unknown implementation '${implementation}' specified (ruby, ruby19, ruby20, ruby21 possible)" + ui_error "ruby.setup: unknown implementation '${implementation}' specified (ruby22, ruby21, ruby20, ruby19 or ruby possible)" return -code error "ruby.setup failed" } }