Module: xenomai-forge
Branch: next
Commit: fca4280f21d30ee9f10b603e8a32afa83b3c6970
URL:    
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=fca4280f21d30ee9f10b603e8a32afa83b3c6970

Author: Philippe Gerum <r...@xenomai.org>
Date:   Tue Jul  1 12:55:26 2014 +0200

scripts/xeno-config: use version program to get complete stamp

---

 scripts/xeno-config-cobalt.in  |   17 +++++++++++------
 scripts/xeno-config-mercury.in |   13 ++++++++-----
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/scripts/xeno-config-cobalt.in b/scripts/xeno-config-cobalt.in
index cc15b90..516d59e 100644
--- a/scripts/xeno-config-cobalt.in
+++ b/scripts/xeno-config-cobalt.in
@@ -9,7 +9,6 @@ datadir="@datadir@"
 pkgdatadir="${datadir}/@PACKAGE@"
 includedir="@includedir@"
 
-XENO_VERSION="@PACKAGE_VERSION@"
 XENO_PREFIX="${staging}${prefix}"
 XENO_CC="@CC@"
 XENO_TARGET_ARCH="@XENO_TARGET_ARCH@"
@@ -21,6 +20,12 @@ LD_FILE_OPTION="@LD_FILE_OPTION@"
 WRAP_MAIN_OPT="-Wl,--wrap=main 
-Wl,--dynamic-list=${XENO_LIBRARY_DIR}/dynlist.ld"
 WRAP_MAIN="$WRAP_MAIN_OPT"
 
+if test -x $XENO_PREFIX/sbin/version; then
+    XENO_VERSION=`$XENO_PREFIX/sbin/version`
+else
+    XENO_VERSION="built as @PACKAGE_VERSION@"
+fi
+
 unset prefix exec_prefix libdir datadir datarootdir pkgdatadir includedir 
skin_list
 
 dump_wrappers()
@@ -66,19 +71,19 @@ EOF
 
 dump_info ()
 {
+    echo "Xenomai version: ${XENO_VERSION}"
     if test -r /proc/ipipe/version; then
-       uname -a 2>/dev/null || echo "cannot determine system information 
(uname?)"
+       uname -a 2>/dev/null || echo "Cannot determine system information 
(uname?)"
        echo "Kernel parameters: `cat /proc/cmdline`"
        echo "I-pipe release #`cat /proc/ipipe/version` detected"
        if test -r /proc/xenomai/version; then
-           echo "Xenomai/cobalt `cat /proc/xenomai/version` detected"
+           echo "Cobalt core `cat /proc/xenomai/version` detected"
        else
-           echo "Xenomai/cobalt disabled on this system"
+           echo "Cobalt core disabled on this system"
        fi
     else
-           echo "Xenomai/cobalt is NOT present on this system"
+           echo "Cobalt core is NOT present on this system"
     fi
-
     eval echo "Configure args: @XENO_CONFIG_ARGS@"
     exit 0
 }
diff --git a/scripts/xeno-config-mercury.in b/scripts/xeno-config-mercury.in
index 9ff0dc2..188b33f 100644
--- a/scripts/xeno-config-mercury.in
+++ b/scripts/xeno-config-mercury.in
@@ -9,7 +9,6 @@ datadir="@datadir@"
 pkgdatadir="${datadir}/@PACKAGE@"
 includedir="@includedir@"
 
-XENO_VERSION="@PACKAGE_VERSION@"
 XENO_PREFIX="${staging}${prefix}"
 XENO_CC="@CC@"
 XENO_TARGET_ARCH="@XENO_BUILD_STRING@"
@@ -20,6 +19,12 @@ XENO_LIBRARY_DIR="${staging}${libdir}"
 WRAP_MAIN_OPT="-Wl,--wrap=main 
-Wl,--dynamic-list=${XENO_LIBRARY_DIR}/dynlist.ld"
 WRAP_MAIN="$WRAP_MAIN_OPT"
 
+if test -x $XENO_PREFIX/sbin/version; then
+    XENO_VERSION=`$XENO_PREFIX/sbin/version`
+else
+    XENO_VERSION="built as @PACKAGE_VERSION@"
+fi
+
 unset prefix exec_prefix libdir datadir datarootdir pkgdatadir includedir 
skin_list
 
 usage ()
@@ -60,11 +65,9 @@ verbose ()
 
 dump_info ()
 {
-    uname -a 2>/dev/null || echo "cannot determine system information (uname?)"
+    echo "Xenomai version: ${XENO_VERSION}"
+    uname -a 2>/dev/null || echo "Cannot determine system information (uname?)"
     echo "Kernel parameters: `cat /proc/cmdline`"
-    if test -r /mnt/xenomai/system/version; then
-       echo "Xenomai/mercury `cat /mnt/xenomai/system/version` detected"
-    fi
     eval echo "Configure args: @XENO_CONFIG_ARGS@"
 }
 


_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git

Reply via email to