Changeset 1277 in Sophya for trunk/SophyaLib/SysTools

Timestamp:

Nov 2, 2000, 11:54:42 AM (25 years ago)

Author:

ansari

Message:

Correction dyn linker - compiler + Gestion TMPDIR , Reza 2/11/2000

Location:

trunk/SophyaLib/SysTools

Files:

• cxxcmplnk.cc (modified) (4 diffs)
• cxxcmplnk.h (modified) (1 diff)
• pdlmgr.cc (modified) (1 diff)

trunk/SophyaLib/SysTools/cxxcmplnk.cc

@@ -99 +99 @@
     if (dpcbase[dpcbase.length()-1] != '/')  dpcbase += '/';
     cppFlags += ( " -I" + dpcbase + "Include/ ");
-    linkOptions += " -L" + dpcbase + syscomp + "ShLibs/ "; 
+    linkOptions += " -L" + dpcbase + syscomp + "ShLibs/ -lextsophya -lsophya -lm "; 
   }
 
@@ -110 +110 @@
   }
 
+  if ( (varenv=getenv("TMPDIR")) != NULL )  { 
+    tmpDir = varenv; 
+    if (tmpDir[tmpDir.length()-1] != '/') tmpDir += '/';
+  }
 }
 
@@ -118 +122 @@
 
 /* --Methode-- */
-int CxxCompilerLinker::Compile(string const & name, string & objname)
+int CxxCompilerLinker::Compile(string const & name, string & oname)
 {
-  if (objname.length() < 1) {
-    // A completer
-    objname = tmpDir + "xxx.o";
+  if (oname.length() < 1) {
+    size_t l,p,q;
+    l = name.length();
+    p = name.rfind('/');
+    if (p >= l)  p = 0;
+    else p++;
+    q = name.find('.');
+    if (q < l)  oname = tmpDir + name.substr(p, q-p) + ".o";
+    else oname = tmpDir + name.substr(p) + ".o";
   }
   string cmd;
-  cmd = compCmd + cppFlags + compOptions + "-o " + objname + " " + name ; 
+  cmd = compCmd + cppFlags + compOptions + "-o " + oname + " " + name ; 
   if (verbose)
     cout << "CxxCompilerLinker::Compile() - Executing \n" << cmd << endl; 
@@ -136 +146 @@
 
 /* --Methode-- */
-int CxxCompilerLinker::BuildSO(string const & objname, string & soname)
+int CxxCompilerLinker::BuildSO(string const & oname, string & soname)
 {
   if (soname.length() < 1) {
-    // A completer
-    soname = tmpDir + "xxx.so";
+    size_t l,p,q;
+    l = oname.length();
+    p = oname.rfind('/');
+    if (p >= l)  p = 0;
+    else p++;
+    q = oname.find('.');
+    if (q < l)  soname = tmpDir + oname.substr(p, q-p) + ".so";
+    else soname = tmpDir + oname.substr(p) + ".so";
   }
   string cmd;
-  cmd = compCmd + linkOptions + "-o " + soname + " " + objname ; 
+  cmd = compCmd + linkOptions + "-o " + soname + " " + oname ; 
   if (verbose)
     cout << "CxxCompilerLinker::BuildSO() - Executing \n" << cmd << endl; 

trunk/SophyaLib/SysTools/cxxcmplnk.h

@@ -19 +19 @@
   virtual               ~CxxCompilerLinker();
 
-  virtual int           Compile(string const & name, string & objname);
-  virtual int           BuildSO(string const & objname, string & soname);
+  virtual int           Compile(string const & name, string & oname);
+  virtual int           BuildSO(string const & oname, string & soname);
 
   inline void           AddCompileOptions(string const & opt)

trunk/SophyaLib/SysTools/pdlmgr.cc

@@ -102 +102 @@
   tmpDir = new string("");
   char* varenv;
-  if ( (varenv=getenv("SOPHYA_TMP")) != NULL )  *tmpDir = varenv; 
-  else if ( (varenv=getenv("TMPDIR")) != NULL )  *tmpDir = varenv; 
-  }
+  if ( (varenv=getenv("TMPDIR")) != NULL )  { 
+    *tmpDir = varenv; 
+    if ((*tmpDir)[tmpDir->length()-1] != '/') (*tmpDir) += '/';
+  }
+}
 return(*tmpDir);
 }