Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / src / smpi / smpicc.in

diff --git a/src/smpi/smpicc.in b/src/smpi/smpicc.in
index db70796..33b1391 100755 (executable)
--- a/src/smpi/smpicc.in
+++ b/src/smpi/smpicc.in
@@ -1,12 +1,13 @@
 #! /bin/sh
 
-# Copyright (c) 2007-2014. The SimGrid Team.
+# Copyright (c) 2007-2015. The SimGrid Team.
 # All rights reserved.
 
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the license (GNU LGPL) which comes with this package.
 
 SIMGRID_VERSION="@SIMGRID_VERSION_STRING@"
+SIMGRID_GITHASH="@SIMGRID_GITHASH@"
 
 CC=@CMAKE_C_COMPILER@
 
@@ -42,11 +43,20 @@ while [ $# -gt 0 ]; do
             fi
             list_add CMDARGS "${SRCFILE}"
             ;;
-        '-version' | '--version' | '-v')
-            # -e is not recognised by MS-DOS...
-            echo -e $SIMGRID_VERSION
+        '-version' | '--version')
+            printf '%b\n' "$SIMGRID_VERSION"
             exit 0
-            ;;           
+            ;;
+        "-git-version" | "--git-version")
+            printf '%b\n' "$SIMGRID_GITHASH"
+            exit 0
+            ;;
+        '-trace-call-location')
+            list_add_not_empty CMDARGS "-DTRACE_CALL_LOCATION"
+            ;;
+        '-compiler-version' | '--compiler-version')
+            ${CC} --version
+            ;;
         *)
             list_add CMDARGS "${ARG}"
             ;;