Changeset 1795 in Sophya for trunk/SophyaLib/SysTools

Timestamp:

Nov 27, 2001, 3:45:55 PM (24 years ago)

Author:

aubourg

Message:

darwin

File:

• trunk/SophyaLib/SysTools/pdlmgr.cc (modified) (10 diffs)

trunk/SophyaLib/SysTools/pdlmgr.cc

@@ -4 +4 @@
 //
 #include <machdefs.h>
-#ifndef OS_MACOSX
-// EA : gerer dylib macosx un jour...
 
 #include "pdlmgr.h"
@@ -17 +15 @@
 static const char* sofext = ".so";
 static const char* sofext_HPUX = ".sl";
+static const char* sofext_Darwin = ".bundle";
 
 // Variables et methodes static
@@ -171 +170 @@
 #elif defined(HPUX)
   cmd = "ld -b -o " + fnameso + " " + fnameobj + " -lm -lc";
+#elif defined(Darwin)
+  cmd = "ld -bundle -o " + fnameso + " " + fnameobj + " -lm -lc";
 #else 
   cmd = "ld -o " + fnameso + " " + fnameobj + " -lm -lc";
@@ -193 +194 @@
 PDynLinkMgr::PDynLinkMgr(string& soname, bool cp)
 {
+#ifndef Darwin
 dlhandle = NULL;
+#endif
 soName = "";
 
@@ -199 +202 @@
 #ifdef HPUX
   soname += sofext_HPUX;
+#elif defined(Darwin)
+ soname += sofext_Darwin;
 #else
   soname += sofext;
@@ -209 +214 @@
 #ifndef HPUX
   sprintf(buff,"pdlmgr%d%s", numSO,sofext);
+#elif defined(Darwin)
+  sprintf(buff,"pdlmgr%d%s", numSO,sofext_Darwin);
 #else
   sprintf(buff,"pdlmgr%d%s", numSO,sofext_HPUX);
@@ -228 +235 @@
 cerr << "PDynLinkMgr::PDynLinkMgr() Not yet available on HP-UX " << endl;
 return;
+#elif defined(Darwin)
+ int rc = NSCreateObjectFileImageFromFile(fnameso.c_str(), &shfim);
+ if (rc != NSObjectFileImageSuccess) {
+   cerr << "PDynLinkMgr::PDynLinkMgr(): Error opening SO " << fnameso
+        << " (" << soname << ")" << endl;
+   cerr << "Loader Error (dlerror()) :" << rc << endl;
+   return;
+ }
+ shmod = NSLinkModule(shfim, fnameso.c_str(), 0);
 #else
 dlhandle =  dlopen(fnameso.c_str(), RTLD_NOW);
@@ -248 +264 @@
 cerr << "PDynLinkMgr::~PDynLinkMgr() Not yet available on HP-UX " << endl;
 return;
+#elif defined(Darwin)
+ NSUnLinkModule(shmod, 0);
+ NSDestroyObjectFileImage(shfim);
 #else
 if (dlhandle) dlclose(dlhandle);    dlhandle = NULL;
@@ -266 +285 @@
 cerr << "PDynLinkMgr::GetFunction() Not yet available on HP-UX " << endl;
 return f;
+#elif defined(Darwin)
+ void* sym = NSLookupSymbolInModule(shmod,funcname.c_str());
+ f = (DlFunction) NSAddressOfSymbol(sym);
+ return f;
 #else
 if (dlhandle != NULL)  
@@ -274 +297 @@
 }
 
-#endif
+