Ticket #1882: dylib.path

Index: build/script/bob.rb
===================================================================
--- build/script/bob.rb (revision 5403)
+++ build/script/bob.rb (working copy)
@@ -104,7 +104,7 @@
 end
 
 class FileFilter
-   VERSION = 1.1
+   VERSION = 1.2
    @@builders = {}
    
    def initialize (args)
@@ -131,6 +131,8 @@
        exclude("tango/core/rt/compiler/ldc");
        exclude("tango/core/vendor")
        
+       exclude("tango/core/rt/util/darwin")
+       
        include("tango/core/rt/compiler/" + args.target)
        include("tango/core/vendor/" + args.target)
    end
@@ -197,12 +199,20 @@
        
        file = File.join(@args.objs, obj)
        
-       @libs << file << eol if File.exists?(file)
+       @libs << file << eol if File.exists?(file) && file !~ /cmain/
    end
    
    def makeLib
-       exec("ar -r " + @args.lib + " " + @libs.string) if (@libs.length > 0)
-   end 
+       if @args.dynamic
+           if (@libs.length > 0)
+               options = "-dynamiclib -install_name @rpath/#{File.basename(@args.lib)} -Xlinker -headerpad_max_install_names" if DARWIN
+               
+               exec("gcc #{options} -o #{@args.lib} #{@libs.string} -lz -lbz2")
+           end
+       else
+           exec("ar -r #{@args.lib} #{@libs.string}") if (@libs.length > 0)
+       end
+   end
    
    def exec (cmd)
        exec2(cmd, nil, nil)
@@ -275,6 +285,7 @@
    def initialize (args, os, dmd, ldc, gdc)
        super(args)
        include("tango/sys/" + os)
+       include("tango/core/rt/util/darwin") if os == "darwin"
        FileFilter.register(os, "dmd", :dmd, self)
        FileFilter.register(os, "ldc", :ldc, self)
        FileFilter.register(os, "gdc", :gdc, self)
@@ -370,7 +381,8 @@
 end
 
 Args = Struct.new(:verbose, :inhibit, :include, :target, :compiler, 
-                 :flags, :lib, :os, :core, :root, :filter, :quick, :objs) do
+                 :flags, :lib, :os, :core, :root, :filter, :quick,
+                 :objs, :dynamic) do
                    
    def initialize
        self.verbose = false
@@ -388,6 +400,7 @@
        self.filter = false
        self.quick = false
        self.objs = File.expand_path("objs")
+       self.dynamic = false
        
        self.os = ""
        self.os = "darwin" if DARWIN
@@ -434,12 +447,20 @@
            options.compiler = opt
        end
        
+       opts.on("-d", "--dynamic", "Build Tango as a dynamic/shared library") do |opt|
+           if DARWIN
+               options.dynamic = true
+           else
+               die "Building Tango as a dynamic/shared library is currently not supported on this platform."
+           end
+       end
+       
        opts.on("-o", "--options OPTIONS", "Specify D compiler options") do |opt|
            options.flags = opt
        end
        
        opts.on("-l", "--library NAME", "Specify library name (sans .ext)") do |opt|
-           options.lib = opt + libext
+           options.lib = opt
        end
        
        opts.on(nil, "--objs PATH", "Specify the path where to place temporary object files (defaults to ./objs)") do |opt|
@@ -476,8 +497,18 @@
                die "No package filter given" unless options.filter
            end
            
-           options.lib += ".lib" if WINDOWS
-           options.lib += ".a" unless WINDOWS
+           if options.dynamic
+               if DARWIN
+                   options.lib += ".dylib"
+               elsif WINDOWS
+                   options.lib += ".dll"
+               else
+                   options.lib += ".so"
+               end
+           else
+               options.lib += ".lib" if WINDOWS
+               options.lib += ".a" unless WINDOWS
+           end
            
            options.root = File.expand_path(args[0])
        end
Index: tango/text/locale/Win32.d
===================================================================
--- tango/text/locale/Win32.d   (revision 5403)
+++ tango/text/locale/Win32.d   (working copy)
@@ -12,6 +12,8 @@
 
 module tango.text.locale.Win32;
 
+version (Windows):
+
 alias tango.text.locale.Win32 nativeMethods;
 
 extern (Windows)
Index: tango/core/rt/compiler/dmd/object_.d
===================================================================
--- tango/core/rt/compiler/dmd/object_.d    (revision 5403)
+++ tango/core/rt/compiler/dmd/object_.d    (working copy)
@@ -48,6 +48,9 @@
     import rt.compiler.dmd.rt.aaA;
     debug(PRINTF) import tango.stdc.stdio: printf;
     extern (C) Object _d_newclass(ClassInfo ci);
+    
+    version (darwin)
+        import rt.compiler.util.darwin.Image;
 }
 
 // NOTE: For some reason, this declaration method doesn't work
@@ -1220,15 +1223,6 @@
     extern (C) ModuleReference *_Dmodule_ref;   // start of linked list 
 }
 
-version( OSX )
-{
-    extern (C)
-    {
-    extern void* _minfo_beg;
-    extern void* _minfo_end;
-    }
-}
-
 ModuleInfo[] _moduleinfo_dtors;
 uint         _moduleinfo_dtors_i;
 
@@ -1280,9 +1274,14 @@
      * and __minfo_end. The variables _minfo_beg and _minfo_end
      * are of zero size and are in the two bracketing segments,
      * respectively.
+     * 
+     * The __minfo_beg and __minfo_end sections are not put into
+     * dynamic libraries therefore we cannot use them or the
+     * _minfo_beg and _minfo_end variables. Instead we loop through
+     * all the loaded images (executables and dynamic libraries) and
+     * collect all the ModuleInfo references.
      */
-        size_t length = cast(ModuleInfo*)&_minfo_end - cast(ModuleInfo*)&_minfo_beg;
-        _moduleinfo_array = (cast(ModuleInfo*)&_minfo_beg)[0 .. length];
+        _moduleinfo_array = getSectionData!(ModuleInfo, "__DATA", "__minfodata");        
         debug(PRINTF) printf("moduleinfo: ptr = %p, length = %d\n", _moduleinfo_array.ptr, _moduleinfo_array.length);
 
         debug(PRINTF) foreach (m; _moduleinfo_array)
Index: tango/core/rt/compiler/dmd/dynamic_lib_fixes.c
===================================================================
--- tango/core/rt/compiler/dmd/dynamic_lib_fixes.c  (revision 0)
+++ tango/core/rt/compiler/dmd/dynamic_lib_fixes.c  (revision 0)
@@ -0,0 +1 @@
+void* _Dmain __attribute__ ((weak));
\ No newline at end of file
Index: tango/core/rt/compiler/dmd/posix/deh.d
===================================================================
--- tango/core/rt/compiler/dmd/posix/deh.d  (revision 5403)
+++ tango/core/rt/compiler/dmd/posix/deh.d  (working copy)
@@ -29,10 +29,18 @@
 import tango.stdc.stdio : printf;
 import tango.stdc.stdlib : exit;
 
+version (darwin)
+    import rt.compiler.util.darwin.Image;
+
 extern (C)
 {
-    extern void* _deh_beg;
-    extern void* _deh_end;
+    version (darwin) {}
+    
+    else
+    {
+        extern void* _deh_beg;
+        extern void* _deh_end;
+    }
 
     int _d_isbaseof(ClassInfo oc, ClassInfo c);
 }
@@ -99,26 +107,49 @@
 
 DHandlerTable *__eh_finddata(void *address)
 {
-    FuncTable *ft;
-
-//    debug printf("__eh_finddata(address = x%x)\n", address);
-//    debug printf("_deh_beg = x%x, _deh_end = x%x\n", &_deh_beg, &_deh_end);
-    for (ft = cast(FuncTable *)&_deh_beg;
-         ft < cast(FuncTable *)&_deh_end;
-         ft++)
+    version (darwin)
     {
-//      debug printf("\tfptr = x%x, fsize = x%03x, handlertable = x%x\n",
-//              ft.fptr, ft.fsize, ft.handlertable);
+        static FuncTable[] functionTables;
+        static bool hasFunctionTables;
+        
+        if (!hasFunctionTables)
+        {
+            functionTables = getSectionData!(FuncTable, "__DATA", "__deh_eh");
+            hasFunctionTables = true;
+        }
+        
+        foreach (ft ; functionTables)
+        {
+            if (ft.fptr <= address && address < cast(void *)(cast(char *)ft.fptr + ft.fsize))
+                return ft.handlertable;
+        }
+                
+        return null;
+    }
+    
+    else
+    {
+        FuncTable *ft;
 
-        if (ft.fptr <= address &&
-            address < cast(void *)(cast(char *)ft.fptr + ft.fsize))
+    //      debug printf("__eh_finddata(address = x%x)\n", address);
+    //    debug printf("_deh_beg = x%x, _deh_end = x%x\n", &_deh_beg, &_deh_end);
+        for (ft = cast(FuncTable *)&_deh_beg;
+             ft < cast(FuncTable *)&_deh_end;
+             ft++)
         {
-//          debug printf("\tfound handler table\n");
-            return ft.handlertable;
+    //      debug printf("\tfptr = x%x, fsize = x%03x, handlertable = x%x\n",
+    //              ft.fptr, ft.fsize, ft.handlertable);
+
+            if (ft.fptr <= address &&
+                address < cast(void *)(cast(char *)ft.fptr + ft.fsize))
+            {
+    //          debug printf("\tfound handler table\n");
+                return ft.handlertable;
+            }
         }
+    //    debug printf("\tnot found\n");
+        return null;
     }
-//    debug printf("\tnot found\n");
-    return null;
 }
 
 
Index: tango/core/rt/compiler/util/darwin/getsect.d
===================================================================
--- tango/core/rt/compiler/util/darwin/getsect.d    (revision 0)
+++ tango/core/rt/compiler/util/darwin/getsect.d    (revision 0)
@@ -0,0 +1,16 @@
+/**
+ * Copyright: Copyright (c) 2010 Jacob Carlborg. All rights reserved.
+ * Authors: Jacob Carlborg
+ * Version: Initial created: Mar 16, 2010
+ * License: BSD style: $(LICENSE)
+ */
+module rt.compiler.util.darwin.getsect;
+
+version (darwin):
+
+import rt.compiler.util.darwin.loader;
+
+extern (C):
+
+section* getsectbynamefromheader (in mach_header* mhp, in char* segname, in char* sectname);
+section_64* getsectbynamefromheader_64 (mach_header_64* mhp, in char* segname, in char* sectname);
\ No newline at end of file
Index: tango/core/rt/compiler/util/darwin/Image.d
===================================================================
--- tango/core/rt/compiler/util/darwin/Image.d  (revision 0)
+++ tango/core/rt/compiler/util/darwin/Image.d  (revision 0)
@@ -0,0 +1,144 @@
+/**
+ * Copyright: Copyright (c) 2010 Jacob Carlborg. All rights reserved.
+ * Authors: Jacob Carlborg
+ * Version: Initial created: Feb 23, 2010
+ * License: BSD style: $(LICENSE)
+ */
+module rt.compiler.util.darwin.Image;
+
+version (darwin):
+
+import rt.compiler.util.darwin.dyld;
+import rt.compiler.util.darwin.loader;
+import rt.compiler.util.darwin.getsect;
+
+struct Image
+{
+   private mach_header* header_;
+   private uint index_;
+   
+   static Image opCall (uint index)
+   {
+       Image image;
+       image.header_ = _dyld_get_image_header(index);
+       image.index_ = index;
+       
+       return image;
+   }
+   
+   static uint numberOfImages ()
+   {
+       return _dyld_image_count;
+   }
+   
+   static int opApply (int delegate(ref Image) dg)
+   {
+       int result;
+       
+       for (size_t i = 0; i < numberOfImages; i++)
+       {
+           result = dg(Image(i));
+           
+           if (result)
+               break;
+       }
+       
+       return result;
+   }
+   
+   static int opApplyReverse (int delegate(ref Image) dg)
+   {
+       int result;
+       
+       for (int i = numberOfImages - 1; i >= 0; i--)
+       {
+           result = dg(Image(i));
+           
+           if (result)
+               break;
+       }
+       
+       return result;
+   }
+   
+   mach_header* header ()
+   {
+       return header_;
+   }
+   
+   mach_header_64* header64 ()
+   {
+       return cast(mach_header_64*) header_;
+   }
+   
+   CPU cpu ()
+   {
+       return CPU(header_);
+   }
+}
+
+struct CPU
+{
+   private mach_header* header;
+   
+   static CPU opCall (mach_header* header)
+   {
+       CPU cpu;
+       cpu.header = header;
+       
+       return cpu;
+   }
+   
+   bool is32bit ()
+   {       
+       return (header.magic & MH_MAGIC) != 0;
+   }
+
+   bool is64bit ()
+   {
+       return (header.magic & MH_MAGIC_64) != 0;
+   }
+}
+
+T[] getSectionData (T, char[] segmentName, char[] sectionName) ()
+{
+    T[] array;
+    
+    const c_segmentName = segmentName.ptr;
+    const c_sectionName = sectionName.ptr;    
+    
+    void* start;
+    void* end;
+    
+    foreach_reverse (image ; Image)
+    {            
+        if (image.cpu.is32bit)
+        {
+            auto header = image.header;
+            section* sect = getsectbynamefromheader(header, c_segmentName, c_sectionName);
+            
+            if (sect is null || sect.size == 0)
+                continue;
+
+            start = cast(void*) (cast(byte*) header + sect.offset);
+           end = cast(void*) (cast(byte*) start + sect.size);
+        }
+        
+        else
+        {
+            auto header = image.header64;
+            section_64* sect = getsectbynamefromheader_64(header, c_segmentName, c_sectionName);
+            
+            if (sect is null || sect.size == 0)
+                continue;
+
+            start = cast(void*) (cast(byte*) header + sect.offset);
+           end = cast(void*) (cast(byte*) start + sect.size);
+        }
+       
+       size_t len = cast(T*)end - cast(T*)start;
+       array ~= (cast(T*)start)[0 .. len];
+    }
+    
+    return array;
+}
\ No newline at end of file
Index: tango/core/rt/compiler/util/darwin/loader.d
===================================================================
--- tango/core/rt/compiler/util/darwin/loader.d (revision 0)
+++ tango/core/rt/compiler/util/darwin/loader.d (revision 0)
@@ -0,0 +1,71 @@
+/**
+ * Copyright: Copyright (c) 2010 Jacob Carlborg. All rights reserved.
+ * Authors: Jacob Carlborg
+ * Version: Initial created: Feb 20, 2010
+ * License: BSD style: $(LICENSE)
+ */
+module rt.compiler.util.darwin.loader;
+
+version (darwin):
+
+struct mach_header
+{
+   uint magic;
+   int cputype;
+   int cpusubtype;
+   uint filetype;
+   uint ncmds;
+   uint sizeofcmds;
+   uint flags;
+}
+
+struct mach_header_64
+{
+   uint magic;
+   int cputype;
+   int cpusubtype;
+   uint filetype;
+   uint ncmds;
+   uint sizeofcmds;
+   uint flags;
+   uint reserved;
+}
+
+enum : uint
+{
+   MH_MAGIC = 0xfeedface,
+   MH_CIGAM = 0xcefaedfe,
+   MH_MAGIC_64 = 0xfeedfacf,
+   MH_CIGAM_64 = 0xcffaedfe,
+}
+
+struct section
+{
+   char[16] sectname;
+   char[16] segname;
+   uint addr;
+   uint size;
+   uint offset;
+   uint align_;
+   uint reloff;
+   uint nreloc;
+   uint flags;
+   uint reserved1;
+   uint reserved2;
+}
+
+struct section_64
+{
+   char[16] sectname;
+   char[16] segname;
+   long addr;
+   long size;
+   uint offset;
+   uint align_;
+   uint reloff;
+   uint nreloc;
+   uint flags;
+   uint reserved1;
+   uint reserved2;
+   uint reserved3;
+}
\ No newline at end of file
Index: tango/core/rt/compiler/util/darwin/dyld.d
===================================================================
--- tango/core/rt/compiler/util/darwin/dyld.d   (revision 0)
+++ tango/core/rt/compiler/util/darwin/dyld.d   (revision 0)
@@ -0,0 +1,16 @@
+/**
+ * Copyright: Copyright (c) 2010 Jacob Carlborg.
+ * Authors: Jacob Carlborg
+ * Version: Initial created: Feb 20, 2010
+ * License: $(LINK2 http://www.boost.org/LICENSE_1_0.txt, Boost Software License 1.0)
+ */
+module rt.compiler.util.darwin.dyld;
+
+version (darwin):
+
+import rt.compiler.util.darwin.loader;
+
+extern (C):
+
+uint _dyld_image_count ();
+mach_header* _dyld_get_image_header (uint image_index);
\ No newline at end of file