Changeset 1275 in Sophya for trunk/SophyaLib

Timestamp:

Nov 2, 2000, 10:20:27 AM (25 years ago)

Author:

ansari

Message:

Classe CxxCompilerLinker, compilation C++ et fabrication de shared lib au vol - Reza 2/11/2000

Location:

trunk/SophyaLib

Files:

• BaseTools/Makefile (modified) (2 diffs)
• BaseTools/objlist.list (modified) (1 diff)
• SysTools/cxxcmplnk.cc (added)
• SysTools/cxxcmplnk.h (added)
• SysTools/pdlmgr.cc (modified) (2 diffs)

trunk/SophyaLib/BaseTools/Makefile

@@ -3 +3 @@
 all: $(LIB)libSysTools.a
 clean:
-        rm -f $(OBJ)ctimer.o $(OBJ)datacards.o $(OBJ)datatype.o $(OBJ)dvlist.o $(OBJ)fiondblock.o $(OBJ)mutyv.o $(OBJ)ndatablock.o $(OBJ)pdlmgr.o $(OBJ)periodic.o $(OBJ)pexceptions.o $(OBJ)ppersist.o $(OBJ)psighand.o $(OBJ)sophyainit.o $(OBJ)strutilxx.o $(OBJ)utils.o $(OBJ)gnumd5.o $(OBJ)srandgen.o $(OBJ)strutil.o $(OBJ)timing.o
+        rm -f $(OBJ)ctimer.o $(OBJ)cxxcmplnk.o $(OBJ)datacards.o $(OBJ)datatype.o $(OBJ)dvlist.o $(OBJ)fiondblock.o $(OBJ)mutyv.o $(OBJ)ndatablock.o $(OBJ)pdlmgr.o $(OBJ)periodic.o $(OBJ)pexceptions.o $(OBJ)ppersist.o $(OBJ)psighand.o $(OBJ)sophyainit.o $(OBJ)strutilxx.o $(OBJ)utils.o $(OBJ)gnumd5.o $(OBJ)srandgen.o $(OBJ)strutil.o $(OBJ)timing.o
         rm -f $(LIB)libSysTools.a
-$(LIB)libSysTools.a : $(OBJ)ctimer.o $(OBJ)datacards.o $(OBJ)datatype.o $(OBJ)dvlist.o $(OBJ)fiondblock.o $(OBJ)gnumd5.o $(OBJ)mutyv.o $(OBJ)ndatablock.o $(OBJ)pdlmgr.o $(OBJ)periodic.o $(OBJ)pexceptions.o $(OBJ)ppersist.o $(OBJ)psighand.o $(OBJ)sophyainit.o $(OBJ)srandgen.o $(OBJ)strutil.o $(OBJ)strutilxx.o $(OBJ)timing.o $(OBJ)utils.o
+$(LIB)libSysTools.a : $(OBJ)ctimer.o $(OBJ)cxxcmplnk.o $(OBJ)datacards.o $(OBJ)datatype.o $(OBJ)dvlist.o $(OBJ)fiondblock.o $(OBJ)gnumd5.o $(OBJ)mutyv.o $(OBJ)ndatablock.o $(OBJ)pdlmgr.o $(OBJ)periodic.o $(OBJ)pexceptions.o $(OBJ)ppersist.o $(OBJ)psighand.o $(OBJ)sophyainit.o $(OBJ)srandgen.o $(OBJ)strutil.o $(OBJ)strutilxx.o $(OBJ)timing.o $(OBJ)utils.o
         $(ARCXX) $(ARCXXFLAGS) $@ $?
 ifeq ($(CXX),cxx)
@@ -12 +12 @@
  
 $(OBJ)ctimer.o: ctimer.cc $(INC)machdefs.h ctimer.h
+$(OBJ)cxxcmplnk.o: cxxcmplnk.cc pdlmgr.h \
+ $(INC)machdefs.h
 $(OBJ)datacards.o: datacards.cc $(INC)machdefs.h \
  datacards.h pexceptions.h

trunk/SophyaLib/BaseTools/objlist.list

@@ -1 +1 @@
 ctimer.o
+cxxcmplnk.o
 datacards.o
 datatype.o

trunk/SophyaLib/SysTools/pdlmgr.cc

@@ -23 +23 @@
   libraries. The present version has been adapted for different Unix 
   flavours (Linux, Compaq/Digital Unix, SGI IRIX, IBM AIX, Sun Solaris).
-  The example here the linking of shared library named "mylib.so" 
+  The example here shows the linking of shared library named "mylib.so" 
   containing a function \c double \c myfunction(double x). 
   \code
@@ -48 +48 @@
 void PDynLinkMgr::SetTmpDir(string const & path)
 {
-if ( (path.length() > 0) && (path[path.length()] != '/')  ) GetTmpDir() = path + '/';
+if ( (path.length() > 0) && (path[path.length()-1] != '/')  ) GetTmpDir() = path + '/';
 else GetTmpDir() = path;
-#if defined(OSF1) || defined(Linux) || defined(SunOS)
+#if defined(OSF1) || defined(Linux) || defined(SunOS) || defined(IRIX64)
+  char* varenv=NULL;
+#if !defined(IRIX64)
   string cmd = "LD_LIBRARY_PATH=";
-  char* varenv=NULL;
   varenv=getenv("LD_LIBRARY_PATH");
-#elif defined(IRIX64)
+#else
+#ifdef SGI_ARCH64
   string cmd = "LD_LIBRARYN32_PATH=";
-  char* varenv=NULL;
   varenv=getenv("LD_LIBRARYN32_PATH");
+#else
+  string cmd = "LD_LIBRARYN64_PATH=";
+  varenv=getenv("LD_LIBRARYN64_PATH");
+#endif
+#endif
 
   if (varenv == NULL) {