[macruby-changes] [696] MacRuby/trunk

[source_changes at macosforge.org]

Revision: 696
          http://trac.macosforge.org/projects/ruby/changeset/696
Author:   lsansonetti at apple.com
Date:     2008-11-01 21:40:33 -0700 (Sat, 01 Nov 2008)
Log Message:
-----------
more changes for the RC build system

Modified Paths:
--------------
    MacRuby/trunk/Rakefile
    MacRuby/trunk/instruby.rb

Modified: MacRuby/trunk/Rakefile
===================================================================
--- MacRuby/trunk/Rakefile	2008-11-01 01:57:37 UTC (rev 695)
+++ MacRuby/trunk/Rakefile	2008-11-02 04:40:33 UTC (rev 696)
@@ -26,6 +26,7 @@
   end
 FRAMEWORK_NAME = do_option('framework_name', 'MacRuby')
 FRAMEWORK_INSTDIR = do_option('framework_instdir', '/Library/Frameworks')
+SYM_INSTDIR = do_option('sym_instdir', '/usr/local')
 NO_WARN_BUILD = !do_option('allow_build_warnings', false)
 BUILD_AS_EMBEDDABLE = do_option('build_as_embeddable', false)
 ENABLE_STATIC_LIBRARY = do_option('enable_static_library', 'no') { 'yes' }
@@ -539,7 +540,7 @@
 INSTALLED_LIST = '.installed.list'
 SCRIPT_ARGS = "--make=\"/usr/bin/make\" --dest-dir=\"#{DESTDIR}\" --extout=\"#{EXTOUT}\" --mflags=\"\" --make-flags=\"\""
 EXTMK_ARGS = "#{SCRIPT_ARGS} --extension --extstatic"
-INSTRUBY_ARGS = "#{SCRIPT_ARGS} --data-mode=0644 --prog-mode=0755 --installed-list #{INSTALLED_LIST} --mantype=\"doc\""
+INSTRUBY_ARGS = "#{SCRIPT_ARGS} --data-mode=0644 --prog-mode=0755 --installed-list #{INSTALLED_LIST} --mantype=\"doc\" --sym-dest-dir=\"#{SYM_INSTDIR}\""
 
 desc "Build extensions"
 task :extensions => [:miniruby, "macruby:static"] do

Modified: MacRuby/trunk/instruby.rb
===================================================================
--- MacRuby/trunk/instruby.rb	2008-11-01 01:57:37 UTC (rev 695)
+++ MacRuby/trunk/instruby.rb	2008-11-02 04:40:33 UTC (rev 696)
@@ -16,7 +16,7 @@
 
 def parse_args(argv = ARGV)
   $mantype = 'doc'
-  $destdir = nil
+  $destdir = $sym_destdir = nil
   $extout = nil
   $make = 'make'
   $mflags = []
@@ -33,6 +33,7 @@
   opt = OptionParser.new
   opt.on('-n') {$dryrun = true}
   opt.on('--dest-dir=DIR') {|dir| $destdir = dir}
+  opt.on('--sym-dest-dir=DIR') {|dir| $sym_destdir = dir}
   opt.on('--extout=DIR') {|dir| $extout = (dir unless dir.empty?)}
   opt.on('--make=COMMAND') {|make| $make = make}
   opt.on('--mantype=MAN') {|man| $mantype = man}
@@ -477,7 +478,7 @@
   ln_sfh "../#{CONFIG['arch']}/ruby/config.h", 
     File.join(base, "usr/include/ruby-#{RUBY_VERSION}/ruby/config.h")
   # Installing executable links.
-  dest_bin = '/usr/local/bin'
+  dest_bin = File.join($sym_destdir, 'bin')
   mkdir_p dest_bin, :mode => 0755
   Dir.entries(with_destdir(CONFIG['bindir'])).each do |bin|
     next if bin[0] == '.'
@@ -488,7 +489,7 @@
     ln_sfh link, File.join(dest_bin, File.basename(bin))
   end
   # Installing man pages links.
-  dest_man = '/usr/local/share/man'
+  dest_man = File.join($sym_destdir, 'share', 'man')
   mkdir_p dest_man, :mode => 0755
   Dir.entries(with_destdir(CONFIG['mandir'])).each do |mandir|
     next if mandir[0] == '.'
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20081101/23aa52e5/attachment.html>