[Tinyos-commits] CVS: tinyos-1.x/tos/platform/telos .platform, 1.3, 1.4

[Cory Sharp]

Update of /cvsroot/tinyos/tinyos-1.x/tos/platform/telos
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28510/telos

Modified Files:
	.platform 
Log Message:
Pushing -I's to @opts in .platforms doesn't allow the build system to
override those includes.  Pushing them to @includes works.  However, other
similar problems may arise in the future.  Explain to me again why it's "good"
to have this stuff in two places again?  (makefiles and perl .platform's?)


Index: .platform
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/platform/telos/.platform,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** .platform	11 Jul 2005 23:38:10 -0000	1.3
--- .platform	12 Jul 2005 06:44:15 -0000	1.4
***************
*** 1,2 ****
--- 1,19 ----
+ #$Id$
+ 
+ # Includes that should take precedence come first.  Platforms come before
+ # chips because they may override files.  These must be specified as
+ # @includes instead of -I's to @opts, otherwise the %T won't be processed
+ # by ncc.  And because of that, the current platform's include directory
+ # must be specified, otherwise its search order is last instead of first.
+ 
+ push( @includes, qw(
+ 
+   %T/platform/telos
+   %T/platform/msp430
+   %T/lib/Flash/AT45DB
+   %T/lib/Flash
+ 
+ ) );
+ 
  @opts = ("-gcc=msp430-gcc",
           "-mmcu=msp430x149",
***************
*** 5,11 ****
  
  push @opts, "-mingw-gcc" if $cygwin;
- push @opts, "-I$TOSDIR/lib/Flash";
- push @opts, "-I$TOSDIR/lib/Flash/AT45DB";
  
! @commonplatforms = ("msp430");
  
--- 22,29 ----
  
  push @opts, "-mingw-gcc" if $cygwin;
  
! # Including -I's here like this means that the make system can't override them.
! # This is why it's bad to secretly stuff build logic in a place like .platform.
! #push @opts, "-I$TOSDIR/lib/Flash";
! #push @opts, "-I$TOSDIR/lib/Flash/AT45DB";