[macruby-changes] [311] MacRuby/trunk

[source_changes at macosforge.org]

Revision: 311
          http://trac.macosforge.org/projects/ruby/changeset/311
Author:   lsansonetti at apple.com
Date:     2008-07-06 15:09:00 -0700 (Sun, 06 Jul 2008)
Log Message:
-----------
fix for #93

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

Modified: MacRuby/trunk/Rakefile
===================================================================
--- MacRuby/trunk/Rakefile	2008-07-06 03:49:19 UTC (rev 310)
+++ MacRuby/trunk/Rakefile	2008-07-06 22:09:00 UTC (rev 311)
@@ -20,6 +20,7 @@
 FRAMEWORK_INSTDIR = do_option('framework_instdir', '/Library/Frameworks')
 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' }
 
 # TODO: we should find a way to document these options in rake's --help
 
@@ -413,6 +414,7 @@
   CONFIG["SOLIBS"] = ""
   CONFIG["DLDLIBS"] = ""
   CONFIG["ENABLE_SHARED"] = "yes"
+  CONFIG["ENABLE_STATIC"] = "#{ENABLE_STATIC_LIBRARY}"
   CONFIG["MAINLIBS"] = ""
   CONFIG["COMMON_LIBS"] = ""
   CONFIG["COMMON_MACROS"] = ""

Modified: MacRuby/trunk/instruby.rb
===================================================================
--- MacRuby/trunk/instruby.rb	2008-07-06 03:49:19 UTC (rev 310)
+++ MacRuby/trunk/instruby.rb	2008-07-06 22:09:00 UTC (rev 311)
@@ -221,6 +221,7 @@
 mandir = File.join(CONFIG["mandir"], "man")
 configure_args = Shellwords.shellwords(CONFIG["configure_args"])
 enable_shared = CONFIG["ENABLE_SHARED"] == 'yes'
+enable_static = CONFIG["ENABLE_STATIC"] == 'yes'
 dll = CONFIG["LIBRUBY_SO"]
 lib = CONFIG["LIBRUBY"]
 arc = CONFIG["LIBRUBY_A"]
@@ -241,7 +242,7 @@
     install dll, bindir, :mode => $prog_mode
   end
   install lib, libdir, :mode => $prog_mode unless lib == arc
-  install arc, libdir, :mode => $data_mode
+  install arc, libdir, :mode => $data_mode if enable_static
   install "rbconfig.rb", archlibdir, :mode => $data_mode
   if CONFIG["ARCHFILE"]
     for file in CONFIG["ARCHFILE"].split
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macruby-changes/attachments/20080706/fd2c3b6b/attachment.html