[Tinyos-2-commits] CVS: tinyos-2.x/support/make/msp bsl.extra, 1.4, 1.5 msp.rules, 1.8, 1.9

[Kevin Klues]

Update of /cvsroot/tinyos/tinyos-2.x/support/make/msp
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14275/msp

Modified Files:
	bsl.extra msp.rules 
Log Message:
Changed bsl.exra to search for the string between the commas and not short circuiting after seeing a digit when installing to some default tty device.  Also added some more variables to the avr.rules and msp430.rules to allow more flexibility in the way the tos-storage-XXX scripts are invoked

Index: bsl.extra
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/make/msp/bsl.extra,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** bsl.extra	12 Dec 2006 18:22:59 -0000	1.4
--- bsl.extra	11 Mar 2008 08:28:54 -0000	1.5
***************
*** 21,27 ****
  
  ifeq ($(BSL),auto)
! BSLTEST = $(shell motelist -c | perl -e '<> =~ /^[^,]+,(\S+?(\d+))/; print $$1;' )
  BSLTEST_COMMENT = "using bsl,auto"
! BSL = $(shell motelist -c | perl -e '<> =~ /^[^,]+,(\S+?(\d+))/; ($$s,$$n)=($$1,$$2); if($$s=~/^com/i) { print $$n-1 } else { print $$s; };' )
  BSL_TARGETS += bsltest
  else
--- 21,27 ----
  
  ifeq ($(BSL),auto)
! BSLTEST = $(shell motelist -c | perl -e '<> =~ /^[^,]+,(\S+),/; print $$1;' )
  BSLTEST_COMMENT = "using bsl,auto"
! BSL = $(shell motelist -c | perl -e '<> =~ /^[^,]+,(\S+),/; ($$s,$$n)=($$1,$$2); if($$s=~/^com/i) { print $$n-1 } else { print $$s; };' )
  BSL_TARGETS += bsltest
  else

Index: msp.rules
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/make/msp/msp.rules,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** msp.rules	16 Feb 2008 19:49:05 -0000	1.8
--- msp.rules	11 Mar 2008 08:28:54 -0000	1.9
***************
*** 67,72 ****
  exe0: $(BUILDDIR)/StorageVolumes.h
  
  $(BUILDDIR)/StorageVolumes.h: $(VOLUME_FILE)
! 	$(VOLUME_ALLOCATOR) $(PLATFORMDIR) <$(VOLUME_FILE) >$@ || rm -f $@
  
  PFLAGS += -I$(BUILDDIR)
--- 67,73 ----
  exe0: $(BUILDDIR)/StorageVolumes.h
  
+ VOLUME_ALLOCATOR_FLAGS ?= 
  $(BUILDDIR)/StorageVolumes.h: $(VOLUME_FILE)
! 	$(VOLUME_ALLOCATOR) $(PLATFORMDIR) $(VOLUME_ALLOCATOR_FLAGS) <$(VOLUME_FILE) >$@ || rm -f $@
  
  PFLAGS += -I$(BUILDDIR)