Fixed some bugs with the tinyos-tools that have crept in due to incompatibilities...

diff --git a/support/make/Makerules b/support/make/Makerules
index 6850fb1376b36c179da878bc4452a0f29c4eab1b..ae3b9d3e47b21f39d07d30f4b23215618d5040a9 100644 (file)
--- a/support/make/Makerules
+++ b/support/make/Makerules
@@ -187,6 +187,9 @@ endef
 $(error $(USAGE)Thank you)
 endif
 
+$(COMPONENT).nc:
+       @echo "ERROR: You need to create a top level file called $(COMPONENT).nc, or modify your local Makefile to point to the real name of your top level component."
+       @false
 
 .PHONY: FORCE
 

diff --git a/support/make/avr/avr.rules b/support/make/avr/avr.rules
index a8c5d025884e010d877fcdd857d93649df303bba..11e3b6d43c16beb0de8d5f7eeb2350bfa4b9b0d3 100644 (file)
--- a/support/make/avr/avr.rules
+++ b/support/make/avr/avr.rules
@@ -100,7 +100,7 @@ $(if $(PROGRAM),,$(call TOSMake_include,avr/$(DEFAULT_PROGRAM).extra))
 ifneq ($(wildcard $(VOLUMEFILE)), )
 build_storage: $(BUILDDIR)/StorageVolumes.h
 
-exe0: build_storage
+exe0: build_storage 
 
 VOLUME_ALLOCATOR_FLAGS ?= 
 $(BUILDDIR)/StorageVolumes.h: $(VOLUMEFILE)
@@ -140,7 +140,7 @@ ihex: exe FORCE
 exe: exe0 bytes FORCE
        @:
 
-exe0: builddir $(BUILD_EXTRA_DEPS) FORCE
+exe0: builddir $(BUILD_EXTRA_DEPS) $(COMPONENT).nc FORCE
        @echo "    compiling $(COMPONENT) to a $(PLATFORM) binary"
        $(NCC) -o $(MAIN_EXE) $(NCC_SAFE_TINYOS_FLAGS) $(OPTFLAGS) $(PFLAGS) $(CFLAGS) $(WIRING_CHECK_FLAGS) $(COMPONENT).nc $(LIBS) $(LDFLAGS)
 ifdef WIRING_CHECK_FILE

diff --git a/support/make/m16c62p/m16c62p.rules b/support/make/m16c62p/m16c62p.rules
index 05e6601d4161157907ff5666b3292d2e6dd69cdd..9fb993728afb002bd3ad8a4c97069140e5edba43 100755 (executable)
--- a/support/make/m16c62p/m16c62p.rules
+++ b/support/make/m16c62p/m16c62p.rules
@@ -72,7 +72,7 @@ $(if $(PROGRAM),,$(call TOSMake_include,$(THIS_FOLDER)/$(DEFAULT_PROGRAM).extra)
 ifneq ($(wildcard $(VOLUMEFILE)), )
 build_storage: $(BUILDDIR)/StorageVolumes.h
 
-exe0: build_storage
+exe0: build_storage 
 
 VOLUME_ALLOCATOR_FLAGS ?= 
 $(BUILDDIR)/StorageVolumes.h: $(VOLUMEFILE)
@@ -114,7 +114,7 @@ exe: exe0 FORCE bytes
        @:
 
 
-exe0: builddir $(BUILD_EXTRA_DEPS) FORCE
+exe0: builddir $(BUILD_EXTRA_DEPS) $(COMPONENT).nc FORCE
        @echo "    compiling $(COMPONENT) to a $(PLATFORM) binary"
        $(NCC) -o $(MAIN_EXE) $(NCC_SAFE_TINYOS_FLAGS) $(OPTFLAGS) $(PFLAGS) $(CFLAGS) $(WIRING_CHECK_FLAGS) $(COMPONENT).nc $(LIBS) $(LDFLAGS)
 ifdef WIRING_CHECK_FILE

diff --git a/support/make/msp/msp.rules b/support/make/msp/msp.rules
index 0bab085a81954165c4f39898ddd819c51846fef6..84e1132b863abd68b6a53b20bbe8276245828cab 100644 (file)
--- a/support/make/msp/msp.rules
+++ b/support/make/msp/msp.rules
@@ -70,7 +70,7 @@ $(if $(PROGRAM),,$(call TOSMake_include,msp/$(DEFAULT_PROGRAM).extra))
 ifneq ($(wildcard $(VOLUME_FILE)), )
 build_storage: $(BUILDDIR)/StorageVolumes.h
 
-exe0: build_storage
+exe0: build_storage 
 
 VOLUME_ALLOCATOR_FLAGS ?= 
 $(BUILDDIR)/StorageVolumes.h: $(VOLUME_FILE)
@@ -104,7 +104,7 @@ ihex: exe FORCE
 exe: exe0 bytes FORCE
        @:
 
-exe0: builddir $(BUILD_EXTRA_DEPS) FORCE
+exe0: builddir $(BUILD_EXTRA_DEPS) $(COMPONENT).nc FORCE
        @echo "    compiling $(COMPONENT) to a $(PLATFORM) binary"
        $(NCC) -o $(MAIN_EXE) $(NCC_SAFE_TINYOS_FLAGS) $(OPTFLAGS) $(PFLAGS) $(CFLAGS) $(WIRING_CHECK_FLAGS) $(COMPONENT).nc $(LIBS) $(LDFLAGS)
 ifdef WIRING_CHECK_FILE

diff --git a/support/make/null/null.rules b/support/make/null/null.rules
index 6514cec517a410a14bff1d9f179648a4c5cc5606..0682c26b97eab8f3eb97565415d9c5b38aff7ddb 100644 (file)
--- a/support/make/null/null.rules
+++ b/support/make/null/null.rules
@@ -45,7 +45,7 @@ BUILDLESS_DEPS += bytes
 ifneq ($(wildcard $(VOLUMEFILE)), )
 build_storage: $(BUILDDIR)/StorageVolumes.h
 
-exe0: build_storage
+exe0: build_storage 
 
 $(BUILDDIR)/StorageVolumes.h: $(VOLUMEFILE)
        $(VOLUME_ALLOCATOR) $(VOLUME_ALLOCATOR_FLAGS) <$(VOLUMEFILE) >$@
@@ -66,7 +66,7 @@ endif
 exe: exe0 bytes FORCE
        @:
 
-exe0: builddir $(BUILD_EXTRA_DEPS) FORCE
+exe0: builddir $(BUILD_EXTRA_DEPS) $(COMPONENT).nc FORCE
        @echo "    compiling $(COMPONENT) to a $(PLATFORM) binary"
        $(NCC) -o $(MAIN_EXE) $(OPTFLAGS) $(PFLAGS) $(CFLAGS) $(COMPONENT).nc $(LIBS) $(LDFLAGS)
        @echo "    compiled $(COMPONENT) to $(MAIN_EXE)"

diff --git a/support/make/pxa27x/pxa27x.rules b/support/make/pxa27x/pxa27x.rules
index 7ceabce7f3e7375030caa76eb8718d9b6ddda24c..5bfda862cb5878de2e0b2ce15fab2f5fcb7489fe 100644 (file)
--- a/support/make/pxa27x/pxa27x.rules
+++ b/support/make/pxa27x/pxa27x.rules
@@ -58,7 +58,7 @@ $(if $(PROGRAM),,$(call TOSMake_include,pxa27x/$(DEFAULT_PROGRAM).extra))
 ifneq ($(wildcard $(VOLUME_FILE)), )
 build_storage: $(BUILDDIR)/StorageVolumes.h
 
-exe0: build_storage
+exe0: build_storage 
 
 VOLUME_ALLOCATOR_FLAGS ?= 
 $(BUILDDIR)/StorageVolumes.h: $(VOLUME_FILE)
@@ -87,7 +87,7 @@ bin: exe FORCE
 exe: exe0 bytes FORCE
        @:
 
-exe0: builddir asms $(BUILD_EXTRA_DEPS) FORCE
+exe0: builddir asms $(BUILD_EXTRA_DEPS) $(COMPONENT).nc FORCE
        @echo "    compiling $(COMPONENT) to a $(PLATFORM) binary"
        $(NCC) -o $(MAIN_EXE) $(OPTFLAGS) $(PFLAGS) $(CFLAGS) $(WIRING_CHECK_FLAGS) $(COMPONENT).nc $(LIBS) $(LDFLAGS) $(ASSEMBLY_OBJS) $(LIBRARY_OBJS)
 ifdef WIRING_CHECK_FILE

diff --git a/tools/platforms/msp430/pybsl/tos-bsl.in b/tools/platforms/msp430/pybsl/tos-bsl.in
index ee0d4152ddbdeaa1124b34f4d397f484da91101a..5b371d5b7f249b4d7d685f8bae5bd089301844cc 100644 (file)
--- a/tools/platforms/msp430/pybsl/tos-bsl.in
+++ b/tools/platforms/msp430/pybsl/tos-bsl.in
@@ -1335,7 +1335,7 @@ def main():
 
     try:
         opts, args = getopt.getopt(sys.argv[1:],
-            "hc:P:wf:m:eEpvrg:UDudsxbITNB:S:V14",
+            "hc:P:wf:m:eEpvrg:UDu:ds:xbITNB:S:V14",
             ["help", "comport=", "password=", "wait", "framesize=",
              "erasecycles=", "masserase", "erasecheck", "program",
              "verify", "reset", "go=", "unpatched", "debug",

diff --git a/tools/tinyos/misc/tos-locate-jre b/tools/tinyos/misc/tos-locate-jre
index 4f93dd7945e3a886b459460fd9ab8d07f06bb694..de04978b0a9c4e4e562cf56989044552cea736b4 100755 (executable)
--- a/tools/tinyos/misc/tos-locate-jre
+++ b/tools/tinyos/misc/tos-locate-jre
@@ -38,7 +38,7 @@ pathlocate () {
 case `uname` in
     CYGWIN*)
     # Hopefully this will always work on cygwin with Sun's Java
-    jversion=`regtool -q get '\\HKLM\\SOFTWARE\\JavaSoft\\Java Development Kit\\CurrentVersion'`
+       jversion=`regtool -q -w get '\\HKLM\\SOFTWARE\\JavaSoft\\Java Development Kit\\CurrentVersion'`
     if [ $? != 0 ]; then
        exit 1
     fi