Changeset 1900 in Sophya

Timestamp:

Feb 15, 2002, 6:35:01 PM (24 years ago)

Author:

ansari

Message:

Portage sous Mac OS X - Reza 15/02/2002

Location:

trunk/SophyaLib

Files:

• BaseTools/ppersist.cc (modified) (2 diffs)
• BaseTools/sophyainit.cc (modified) (1 diff)
• Mgr/Makefile.h (modified) (1 diff)
• SysTools/cxxcmplnk.cc (modified) (5 diffs)
• SysTools/cxxcmplnk.h (modified) (2 diffs)
• SysTools/pdlmgr.cc (modified) (7 diffs)
• SysTools/pdlmgr.h (modified) (2 diffs)

trunk/SophyaLib/BaseTools/ppersist.cc

@@ -56 +56 @@
 ppclassNameList = new map<string, uint_8>;
 dobjclassNameList = new map<string, uint_8>;
+cout << " PIOPersist::Initialize() Starting Sophya Persistence management service " << endl;
 }
 
@@ -477 +478 @@
 
   // Find tag entries at end of file
-#if defined(Linux) &&  defined(__GNUG__)
+#if (defined(Linux) || defined(Darwin)) &&  defined(__GNUG__)
   // There seems to be a bug where seekg with ios::end under Linux  with g++
   // So, we use seek with ios::beg
+  // The bug seems to be there also with Darwin/MacOSX
   s->seekg(0, ios::end);
   int_8 tagpos = s->tellg() - (sizeof(int_8)+1);

trunk/SophyaLib/BaseTools/sophyainit.cc

@@ -33 +33 @@
 SophyaInitiator::SophyaInitiator()
 {
+#if defined(Darwin)
+  // Il semble y avoir un probleme sous MacOSX ...
+  if (FgInit == 0) 
+    cout << " SophyaInitiator::SophyaInitiator() BaseTools Init" << endl;
+#endif
   FgInit++;
   if (FgInit > 1)  return;

trunk/SophyaLib/Mgr/Makefile.h

@@ -165 +165 @@
 
 ifeq (${MACHEROS},Darwin)
-  XLDLIBS := -L/usr/X11R6/lib
-  XCFLAGS := -I/usr/X11R6/include -fno-coalesce -fkeep-inline-functions
+  XLDLIBS := -L/usr/X11R6/lib -L/sw/lib -ldl
+  XCFLAGS := -I/usr/X11R6/include -I/sw/include -fno-coalesce -fkeep-inline-functions
 endif
 

trunk/SophyaLib/SysTools/cxxcmplnk.cc

@@ -36 +36 @@
 
 /* --Methode-- */
-CxxCompilerLinker::CxxCompilerLinker()
+CxxCompilerLinker::CxxCompilerLinker(bool fglibsophya, bool fglibextsophya, bool fglibpi)
   : verbose(false)
 {
@@ -92 +92 @@
 #endif
 
+#ifndef Darwin
+  linkCmd = compCmd;
+#else
+  linkCmd = "cc -bundle -flat_namespace -undefined suppress ";
+  linkOptions = "-L/usr/lib/gcc/darwin/default -lstdc++ -lcc_dynamic -lpthread -lm";
+#endif
+
   cppFlags += " -I. ";
   compOptions += " -c ";
@@ -102 +109 @@
     if (dpcbase[dpcbase.length()-1] != '/')  dpcbase += '/';
     cppFlags += ( " -I" + dpcbase + "Include/ ");
-    linkOptions += " -L" + dpcbase + syscomp + "ShLibs/ -lextsophya -lsophya -lm "; 
+    linkOptions += " -L" + dpcbase + syscomp + "ShLibs/";
+    if (fglibsophya) linkOptions += " -lsophya ";
+    if (fglibextsophya) linkOptions += " -lextsophya ";
+    if (fglibpi) linkOptions += " -lPI ";
   }
 
@@ -151 +161 @@
 int CxxCompilerLinker::BuildSO(string const & oname, string & soname)
 {
+  //  char * soext = ".dylib"; if defined(Darwin) - pas necessaire Reza 02/2002
+  char * soext = ".so";
+
   if (soname.length() < 1) {
     size_t l,p,q;
@@ -158 +171 @@
     else p++;
     q = oname.find('.');
-    if (q < l)  soname = tmpDir + oname.substr(p, q-p) + ".so";
-    else soname = tmpDir + oname.substr(p) + ".so";
+    if (q < l)  soname = tmpDir + oname.substr(p, q-p) + soext;
+    else soname = tmpDir + oname.substr(p) + soext;
   }
   string cmd;
-  cmd = compCmd + linkOptions + "-o " + soname + " " + oname ; 
+  cmd = linkCmd + " " + oname + " " + linkOptions + " -o " + soname + " " ; 
   if (verbose)
     cout << "CxxCompilerLinker::BuildSO() - Executing \n" << cmd << endl; 

trunk/SophyaLib/SysTools/cxxcmplnk.h

@@ -16 +16 @@
 class CxxCompilerLinker {
 public:
-                        CxxCompilerLinker();  
+  CxxCompilerLinker(bool fglibsophya=true, bool fglibextsophya=true, 
+                                          bool fglibpi=false);  
   virtual               ~CxxCompilerLinker();
 
@@ -47 +48 @@
   string  tmpDir;
   string  compCmd;
+  string  linkCmd;
   string  compOptions;
   string  linkOptions;

trunk/SophyaLib/SysTools/pdlmgr.cc

@@ -15 +15 @@
 static const char* sofext = ".so";
 static const char* sofext_HPUX = ".sl";
-static const char* sofext_Darwin = ".bundle";
+// static const char* sofext_Darwin = ".dylib"; pas necessaire - Reza 02/2002
 
 // Variables et methodes static
@@ -172 +172 @@
   cmd = "ld -b -o " + fnameso + " " + fnameobj + " -lm -lc";
 #elif defined(Darwin)
-  cmd = "ld -bundle -o " + fnameso + " " + fnameobj + " -lm  -lcc_dynamic -lSystem -lbundle1.o";
+  cmd = "cc -bundle -flat_namespace -o " + fnameso + " " + fnameobj + " -lm  -lcc_dynamic -lSystem -lbundle1.o";
 #else 
   cmd = "ld -o " + fnameso + " " + fnameobj + " -lm -lc";
@@ -203 +203 @@
 #ifdef HPUX
   soname += sofext_HPUX;
-#elif defined(Darwin)
- soname += sofext_Darwin;
 #else
   soname += sofext;
@@ -230 +228 @@
 else fnameso = soname;
 copy = cp;
+ fnameso = soname;
 soName = fnameso;
 
@@ -236 +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);
@@ -265 +255 @@
 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;
@@ -286 +273 @@
 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
+#else 
+#if defined(Darwin)
+string funame = "_" + funcname;
+#else 
+string & funame = funcname;
+#endif
 if (dlhandle != NULL)  
-  f = (DlFunction)dlsym(dlhandle, funcname.c_str());
+  f = (DlFunction)dlsym(dlhandle, funame.c_str());
 if (f == NULL) cerr << "PDynLinkMgr::GetFunction(): Error linking " << funcname << endl;
 return(f);

trunk/SophyaLib/SysTools/pdlmgr.h

@@ -13 +13 @@
 #include <dl.h>
 #elif defined(Darwin)
-#include <mach-o/dyld.h>
+#include </sw/include/dlfcn.h>
 #else
 #include <dlfcn.h>
@@ -43 +43 @@
 #if defined(HPUX)
   shl_t dlhandle;
-#elif defined(Darwin)
-  NSObjectFileImage shfim;
-  NSModule          shmod;
 #else 
   void * dlhandle;