From 6d1bc578ebe049a2428ad260f83c88c42ff4d8c2 Mon Sep 17 00:00:00 2001 From: klueska Date: Wed, 17 Mar 2010 00:38:04 +0000 Subject: [PATCH] Fixed some bugs with the tinyos-tools that have crept in due to incompatibilities with newer versions of some external tools (i.e. java 6) --- support/make/Makerules | 3 +++ support/make/avr/avr.rules | 4 ++-- support/make/m16c62p/m16c62p.rules | 4 ++-- support/make/msp/msp.rules | 4 ++-- support/make/null/null.rules | 4 ++-- support/make/pxa27x/pxa27x.rules | 4 ++-- tools/platforms/msp430/pybsl/tos-bsl.in | 2 +- tools/tinyos/misc/tos-locate-jre | 2 +- 8 files changed, 15 insertions(+), 12 deletions(-) diff --git a/support/make/Makerules b/support/make/Makerules index 6850fb13..ae3b9d3e 100644 --- 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 a8c5d025..11e3b6d4 100644 --- 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 05e6601d..9fb99372 100755 --- 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 0bab085a..84e1132b 100644 --- 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 6514cec5..0682c26b 100644 --- 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 7ceabce7..5bfda862 100644 --- 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 ee0d4152..5b371d5b 100644 --- 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 4f93dd79..de04978b 100755 --- 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 -- 2.39.2