Changeset 545

Timestamp:

Jul 2, 2010, 9:57:05 AM (14 years ago)

Author:

rybkin

Message:

See C.L. 430

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (2 diffs)
• mgr/fragments/library_no_static (modified) (1 diff)
• mgr/fragments/nmake/library_no_static (modified) (1 diff)
• source/cmt_symbol.cxx (modified) (4 diffs)
• source/cmt_system.cxx (modified) (3 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+2010-07-02    <rybkin@lal.in2p3.fr> 430
+
+        * source/cmt_system.cxx: In function get_uname, use "uname" system call
+        rather than "popen". This call conforms to POSIX.1-2001, does NOT exist
+        in 4.3BSD
+        * source/cmt_symbol.cxx: In function select_first, when several alternative
+        values are specified through several tag-value pairs, select the first
+        matching condition (rather than based on conditions priorities)
+        * mgr/fragments/library_no_static: Generate <library>.stamp in addition to
+        <library>.shstamp
+        * mgr/fragments/nmake/library_no_static: idem
+        
 2010-04-05    <rybkin@lal.in2p3.fr> 429
 
@@ -47 +59 @@
         strcpy
         * source/cmt_use.cxx: In function move_to, minor simplification
-        path first, if it is specified
         
 2010-03-29    <rybkin@lal.in2p3.fr> 424

CMT/HEAD/mgr/fragments/library_no_static

@@ -33 +33 @@
 
 $(${CONSTITUENT}shstamp) :: $(${CONSTITUENT}libname).$(shlibsuffix)
-        $(lib_silent) if test -f $(${CONSTITUENT}libname).$(shlibsuffix) ; then cat /dev/null >$(${CONSTITUENT}shstamp) ; fi
+        $(lib_silent) if test -f $(${CONSTITUENT}libname).$(shlibsuffix) ; then \
+          cat /dev/null >$(${CONSTITUENT}stamp) && \
+          cat /dev/null >$(${CONSTITUENT}shstamp) ; fi
 
 ${CONSTITUENT}clean ::

CMT/HEAD/mgr/fragments/nmake/library_no_static

@@ -32 +32 @@
         $(lib_silent) link.exe /nologo /dll /out:$(bin)${CONSTITUENT}.dll $(bin)${CONSTITUENT}.exp @$(bin)${CONSTITUENT}.txt $(cpplinkflags) $(${CONSTITUENT}_shlibflags)
 !ENDIF
+        $(lib_silent) if exist $(bin)${CONSTITUENT}.dll echo "" >$(${CONSTITUENT}stamp)
         $(lib_silent) if exist $(bin)${CONSTITUENT}.dll echo "" >$(${CONSTITUENT}shstamp)
 

CMT/HEAD/source/cmt_symbol.cxx

@@ -2779 +2779 @@
         {
           if (!tag->is_selected ()) continue;
+          selected = value_number;
+          if (tag == Tag::get_default ())
+            continue;
         }
       else
@@ -2785 +2788 @@
           selected = value_number;
         }
+
+      //
+      // Only the value for the first alternative (i.e. non-default)
+      // matching tag expression is
+      // selected (which means the selection stops here)
+      //
+      break;
 
       //
@@ -2791 +2801 @@
       // of '>=')
       //
-
+      /*
       if (tag->get_priority () > priority)
         {
@@ -2797 +2807 @@
           selected = value_number;
         }
+      */
     }
 

CMT/HEAD/source/cmt_system.cxx

@@ -38 +38 @@
 #include <time.h>
 #include <dirent.h>
+#include <sys/utsname.h>
 #endif
 
@@ -1164 +1165 @@
 
   uname = "";
-
+  struct utsname buf;
+
+  if (::uname (&buf) >= 0)
+    {
+      uname = buf.sysname;
+    }
+  else
+    {
+      perror ("uname");
+    }
+
+  /*
   FILE* file;
 
@@ -1186 +1198 @@
       pclose (file);
     }
+  */
 #endif
 }