[Tinyos-2-commits] CVS: tinyos-2.x/tools/tinyos/ncc ncc.in, 1.8, 1.9

[John Regehr]

Update of /cvsroot/tinyos/tinyos-2.x/tools/tinyos/ncc
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv19766

Modified Files:
	ncc.in 
Log Message:
finally move the last of our stuff out of here

Index: ncc.in
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tools/tinyos/ncc/ncc.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ncc.in	31 May 2008 04:32:00 -0000	1.8
--- ncc.in	4 Jun 2008 04:52:58 -0000	1.9
***************
*** 83,90 ****
  	    push @includes, $file;
  	}
-         elsif (/^-safe$/) {
-             $safe = 1;
-             $_ = "-fnesc-safe";
-         }
  	elsif (/^-fnesc-cfile=(.*)/){
  	    $appfilename=$1;
--- 83,86 ----
***************
*** 140,171 ****
  }
  
- if ($safe) {
- 
-     my $safe_home = $ENV{'TOSDIR'}."/lib/safe";
- 
-     if (($target eq "mica2") or ($target eq "micaz")) {
- 	$mcu = "avr";
-     } elsif ($target eq "telosb") {
- 	$mcu = "msp430";
-     } else {
- 	print STDERR "Safe TinyOS does not (yet) support the ${target} target.\n";
- 	print STDERR "Supported targets: ";
- 	print STDERR "mica2, micaz, telosb\n";
- 	exit 2;
-     }
- 
-     push @new_args, "-fnesc-deputy";
- 
-     $failfile = "${TOSDIR}/lib/safe/${mcu}/fail.c";
- 
-     my $deputy_args = "-I${safe_home}/include " .
-                       "--FLIDs " . 
-                       "--envmachine " .
-                       "-DSAFE_TINYOS " .
-                       "--nolib";
-     push @new_args, "-fnesc-deputy-args=$deputy_args";
-     push @new_args, "$failfile";
- }
- 
  if (!defined $scheduler && !$is_tos_1) {
  	$scheduler = "TinySchedulerC,TinySchedulerC.TaskBasic,TaskBasic,TaskBasic,runTask,postTask";
--- 136,139 ----