Changeset 38683 for trunk/base/src

Timestamp:

07/28/08 14:21:33 (4 months ago)

Author:

febeling@…

Message:

Support for ruby19 ports in the ruby port group.

The command ruby.setup accepts an new optional
parameter "implementation", which is ruby18 by
default, and can also be ruby19. (As more ruby
implementations appear these may be added as
well.) Unit tests are in the new sub-directory
tests/.

Location:

trunk/base/src/port1.0/resources/group

Files:

• Makefile (modified) (1 diff)
• ruby-1.0.tcl (modified) (6 diffs)
• tests (added)
• tests/ruby-1.0.tcl (added)

trunk/base/src/port1.0/resources/group/Makefile

@@ -13 +13 @@
 
 test:
+        ${TCLSH} tests/ruby-1.0.tcl
 
 install:

trunk/base/src/port1.0/resources/group/ruby-1.0.tcl

@@ -32 +32 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# Set some variables.
-set ruby.bin    ${prefix}/bin/ruby
-set ruby.rdoc   ${prefix}/bin/rdoc
+
+# Define these variables assuming ruby1.8 to make them accessible in
+# the portfile after port group declaration. They can be modified by
+# ruby.setup, e.g. to use another ruby than 1.8.
+set ruby.bin            ${prefix}/bin/ruby
+set ruby.rdoc           ${prefix}/bin/rdoc
+set ruby.gem            ${prefix}/bin/gem
 
 proc ruby.extract_config {var {default ""}} {
@@ -52 +55 @@
 set ruby.archlib        [ruby.extract_config vendorarchdir ${ruby.lib}/${ruby.arch}]
 
-# define these empty initially, they are set by ruby.setup arguments
 set ruby.module         ""
 set ruby.filename       ""
@@ -59 +61 @@
 set ruby.srcdir         ""
 
-# ruby group setup procedure
-proc ruby.setup {module vers {type "install.rb"} {docs {}} {source "custom"}} {
-        global destroot prefix worksrcpath
-        global ruby.bin ruby.lib
-        global ruby.module ruby.project ruby.filename ruby.docs ruby.srcdir
+# ruby group setup procedure; optional for ruby 1.8 if you want only
+# basic variables, like ruby.lib and ruby.archlib.
+proc ruby.setup {module vers {type "install.rb"} {docs {}} {source "custom"} {implementation "ruby"}} {
+        global destroot prefix worksrcpath os.platform
+        global ruby.bin ruby.rdoc ruby.gem
+        global ruby.version 
+        global ruby.lib ruby.archlib
+        global ruby.module ruby.filename ruby.project ruby.docs ruby.srcdir
+
+        if {${implementation} eq "ruby19"} {
+                set ruby.bin    ${prefix}/bin/ruby1.9
+                set ruby.rdoc   ${prefix}/bin/rdoc1.9
+                set ruby.gem    ${prefix}/bin/gem1.9
+                set ruby.port_prefix rb19
+        } elseif {${implementation} eq "ruby"} {
+                # ruby.bin, ruby.rdoc, and ruby.gem set to 1.8 by default
+                set ruby.port_prefix rb
+        } else {
+                ui_error "ruby.setup: unknown implementation '${implementation}' specified (ruby, ruby19 possible)"
+                return -code error "ruby.setup failed"
+        }
+
+        # re-define variables to pick up possible implemantation change
+        set ruby.version        [ruby.extract_config ruby_version]
+        set ruby.arch           [ruby.extract_config arch ${os.platform}]
+        set ruby.lib            [ruby.extract_config vendorlibdir ${prefix}/lib/ruby/vendor_ruby/${ruby.version}]
+        set ruby.archlib        [ruby.extract_config vendorarchdir ${ruby.lib}/${ruby.arch}]
 
         # define ruby global names and lists
@@ -81 +105 @@
         set ruby.docs   ${docs}
 
-        name                    rb-[string tolower ${ruby.module}]
+        name                    ${ruby.port_prefix}-[string tolower ${ruby.module}]
         version                 ${vers}
         categories              ruby
@@ -132 +156 @@
         dist_subdir             ruby
 
-        depends_lib             path:${ruby.bin}:ruby
+        depends_lib             port:${implementation}
 
         post-extract {
@@ -276 +300 @@
                         
                         destroot {
-                          system "cd ${worksrcpath} && ${prefix}/bin/gem install --local --force --install-dir ${destroot}${prefix}/lib/ruby/gems/${ruby.version} ${distpath}/${distname}"
+                          system "cd ${worksrcpath} && ${ruby.gem} install --local --force --install-dir ${destroot}${prefix}/lib/ruby/gems/${ruby.version} ${distpath}/${distname}"
                         
                                 set binDir ${destroot}${prefix}/lib/ruby/gems/${ruby.version}/bin