From: klueska <klueska>
Date: Thu, 22 May 2008 23:56:08 +0000 (+0000)
Subject: added one more level of redirection for building the StorageVolume.h file.  This... 
X-Git-Tag: release_tinyos_2_1_0_0~378
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=409a3bb13dabe16fbe0600a8127358e7e6b1b7a3

added one more level of redirection for building the StorageVolume.h file.  This is done in preperation to support dynamic threads that need to ahve this file built, but bypass the normal 'exe' target built for a platform.  Also remove, via the 'clean' target, a VolumeMapC.nc file that is now generated when linking the sorage abstractions used by dynamic threads to the <storage-chip>.xml file in the application directory
---

diff --git a/support/make/avr/avr.rules b/support/make/avr/avr.rules
index 7d18ede8..f00e0ff8 100644
--- a/support/make/avr/avr.rules
+++ b/support/make/avr/avr.rules
@@ -94,12 +94,19 @@ $(if $(PROGRAM),,$(call TOSMake_include,avr/$(DEFAULT_PROGRAM).extra))
 
 # Build storage file if volumes.xml present
 ifneq ($(wildcard $(VOLUMEFILE)), )
-exe0: $(BUILDDIR)/StorageVolumes.h
+build_storage: $(BUILDDIR)/StorageVolumes.h
 
+exe0: build_storage
+
+VOLUME_ALLOCATOR_FLAGS ?= 
 $(BUILDDIR)/StorageVolumes.h: $(VOLUMEFILE)
 	$(VOLUME_ALLOCATOR) $(VOLUME_ALLOCATOR_FLAGS) $(PLATFORMDIR) <$(VOLUMEFILE) >$@ || rm -f $@
 
 PFLAGS += -I$(BUILDDIR)
+else
+
+build_storage:
+
 endif
 
 ifndef BUILD_DEPS
diff --git a/support/make/clean.target b/support/make/clean.target
index d6a3b39b..13479580 100644
--- a/support/make/clean.target
+++ b/support/make/clean.target
@@ -3,4 +3,5 @@
 
 clean: FORCE
 	rm -rf build $(CLEAN_EXTRA) pp
-	rm -rf _TOSSIMmodule.so TOSSIM.pyc TOSSIM.py
+	rm -rf _TOSSIMmodule.so TOSSIM.pyc TOSSIM.py app.xml simbuild
+	rm -rf VolumeMapC.nc
diff --git a/support/make/msp/msp.rules b/support/make/msp/msp.rules
index f1d4e6ae..d283faf5 100644
--- a/support/make/msp/msp.rules
+++ b/support/make/msp/msp.rules
@@ -64,13 +64,19 @@ $(if $(PROGRAM),,$(call TOSMake_include,msp/$(DEFAULT_PROGRAM).extra))
 
 # Build storage file if volumes.xml present
 ifneq ($(wildcard $(VOLUME_FILE)), )
-exe0: $(BUILDDIR)/StorageVolumes.h
+build_storage: $(BUILDDIR)/StorageVolumes.h
+
+exe0: build_storage
 
 VOLUME_ALLOCATOR_FLAGS ?= 
 $(BUILDDIR)/StorageVolumes.h: $(VOLUME_FILE)
 	$(VOLUME_ALLOCATOR) $(VOLUME_ALLOCATOR_FLAGS) $(PLATFORMDIR) <$(VOLUME_FILE) >$@ || rm -f $@
 
 PFLAGS += -I$(BUILDDIR)
+else
+
+build_storage:
+
 endif
 
 ifndef BUILD_DEPS
diff --git a/support/make/null/null.rules b/support/make/null/null.rules
index 685ed657..58632258 100644
--- a/support/make/null/null.rules
+++ b/support/make/null/null.rules
@@ -37,12 +37,18 @@ BUILDLESS_DEPS += bytes
 # Build storage file if volumes.xml present
 # We "steal" the at45db storage spec
 ifneq ($(wildcard $(VOLUMEFILE)), )
-exe0: $(BUILDDIR)/StorageVolumes.h
+build_storage: $(BUILDDIR)/StorageVolumes.h
+
+exe0: build_storage
 
 $(BUILDDIR)/StorageVolumes.h: $(VOLUMEFILE)
 	$(VOLUME_ALLOCATOR) $(VOLUME_ALLOCATOR_FLAGS) <$(VOLUMEFILE) >$@
 
 PFLAGS += -I$(BUILDDIR)
+else
+
+build_storage: 
+
 endif
 
 ifndef BUILD_DEPS
diff --git a/support/make/pxa27x/pxa27x.rules b/support/make/pxa27x/pxa27x.rules
index eea096cb..c40d39d1 100644
--- a/support/make/pxa27x/pxa27x.rules
+++ b/support/make/pxa27x/pxa27x.rules
@@ -54,12 +54,19 @@ $(if $(PROGRAM),,$(call TOSMake_include,pxa27x/$(DEFAULT_PROGRAM).extra))
 
 # Build storage file if volumes.xml present
 ifneq ($(wildcard $(VOLUME_FILE)), )
-exe0: $(BUILDDIR)/StorageVolumes.h
+build_storage: $(BUILDDIR)/StorageVolumes.h
 
-$(BUILDDIR)/StorageVolumes.h: $(VOLUME_FILE)
-	$(VOLUME_ALLOCATOR) <$(VOLUME_FILE) >$@
+exe0: build_storage
+
+VOLUME_ALLOCATOR_FLAGS ?= 
+$(BUILDDIR)/StorageVolumes.h: $(VOLUMEFILE)
+	$(VOLUME_ALLOCATOR) $(VOLUME_ALLOCATOR_FLAGS) $(PLATFORMDIR) <$(VOLUMEFILE) >$@ || rm -f $@
 
 PFLAGS += -I$(BUILDDIR)
+else
+
+build_storage: 
+
 endif
 
 ifndef BUILD_DEPS