tos-storage-stm25p: fix family support

[tinyos-2.x.git] / tools / tinyos / misc / tos-ident-flags.in

diff --git a/tools/tinyos/misc/tos-ident-flags.in b/tools/tinyos/misc/tos-ident-flags.in
index 730610feea8de029fa2e33d1da534d38ae85b745..de8d4d8d7ae2053a6c1c0f505c15d8b316d72c0b 100644 (file)
--- a/tools/tinyos/misc/tos-ident-flags.in
+++ b/tools/tinyos/misc/tos-ident-flags.in
@@ -16,8 +16,14 @@ my $time = sprintf( "0x%08x", `date +%s` );
 
 (my $whoami = `whoami`) =~ s/\s//g;
 (my $hostname = `hostname`) =~ s/\s//g;
-my $uidhash = `echo "$name$time$whoami$hostname" | sha1sum`;
-my $idhash = `echo "$whoami$hostname" | sha1sum`;
+my ($uidhash, $idhash);
+if( `uname` =~ /Darwin/ ) {
+  $uidhash = `echo "$name$time$whoami$hostname" | md5`;
+  $idhash = `echo "$whoami$hostname" | md5`;
+} else {
+  $uidhash = `echo "$name$time$whoami$hostname" | sha1sum`;
+  $idhash = `echo "$whoami$hostname" | sha1sum`;
+}
 my $uid = ($uidhash =~/^(.{8})/) ? "0x$1" : 0;
 my $id = ($idhash =~/^(.{8})/) ? "0x$1" : 0;
 
@@ -27,13 +33,13 @@ if( defined $name && $name !~ /^\s*$/ ) {
   ($qname = $name) =~ s/['"]//g;
   substr( $qname, $MaxNameLength-1 ) = "" if length $qname >= $MaxNameLength;
   my @bytes = unpack( "C*", $qname );
-  push( @defs, "-DIDENT_PROGRAM_NAME=\\\"$qname\\\"" );
+  push( @defs, "-DIDENT_APPNAME=\\\"$qname\\\"" );
 }
 if( defined $whoami && $whoami !~ /^\s*$/ ) {
   ($qname = $whoami) =~ s/['"]//g;
   substr( $qname, $MaxNameLength-1 ) = "" if length $qname >= $MaxNameLength;
   my @bytes = unpack( "C*", $qname );
-  push( @defs, "-DIDENT_USER_ID=\\\"$qname\\\"" );
+  push( @defs, "-DIDENT_USERNAME=\\\"$qname\\\"" );
 }
 if( defined $hostname && $hostname !~ /^\s*$/ ) {
   ($qname = $hostname) =~ s/['"]//g;
@@ -41,8 +47,8 @@ if( defined $hostname && $hostname !~ /^\s*$/ ) {
   my @bytes = unpack( "C*", $qname );
   push( @defs, "-DIDENT_HOSTNAME=\\\"$qname\\\"" );
 }
-push( @defs, "-DIDENT_USER_HASH=${id}L" );
-push( @defs, "-DIDENT_UNIX_TIME=${time}L" );
-push( @defs, "-DIDENT_UID_HASH=${uid}L" );
+push( @defs, "-DIDENT_USERHASH=${id}L" );
+push( @defs, "-DIDENT_TIMESTAMP=${time}L" );
+push( @defs, "-DIDENT_UIDHASH=${uid}L" );
 
 print join(" ",@defs) . "\n";