Update the scripts for 2.1.

diff --git a/tools/release/build-rpms b/tools/release/build-rpms
index 95768b7b9c48c38167d315acb2401d1c70f8cc91..097a96205a41593c1dea0a1a28b93de9148823da 100755 (executable)
--- a/tools/release/build-rpms
+++ b/tools/release/build-rpms
@@ -4,10 +4,10 @@
 # For linux, change to /usr/src/redhat
 # For my cygwin: /cygdrive/c/rpmsrc
 if [ -z $RPMS ]; then #test to see if RPMS is overridden by the environment
-               RPMS=/usr/src/redhat
+               RPMS=/usr/src/rpm
 fi             
-TINYOS_VERSION=2.0.2
-TINYOS_TOOLS_VERSION=1.2.4
+TINYOS_VERSION=2.1.0
+TINYOS_TOOLS_VERSION=1.3.0
 
 echo "*** Building tarballs"
 #rm ../../../*.tar.gz

diff --git a/tools/release/tinyos-tools.files b/tools/release/tinyos-tools.files
index 0d4e86d534122b41154f7065868b72133fc8486d..d341370d6d1c858677b7e391a5ff287e88da0d89 100755 (executable)
--- a/tools/release/tinyos-tools.files
+++ b/tools/release/tinyos-tools.files
@@ -1,5 +1,5 @@
 NAME=tinyos-tools
-VERSION=1.2.4
+VERSION=1.3.0
 
 cd ../..
 rm -rf $NAME-$VERSION
@@ -9,7 +9,7 @@ tools/release/extractor $NAME-$VERSION <<'EOF' | gzip >../$NAME-$VERSION.tar.gz
 !^./support
 !^./tools/release
 !^./tos
-!^./README|overall-todo.txt
+!^./README|overall-todo.txt|release-notes.txt
 !/.cvsignore
 !/CVS/
 !/CVS$

diff --git a/tools/release/tinyos-tools.spec b/tools/release/tinyos-tools.spec
index e3beef6c015ca9b5a6398afc71b1b04e992ca089..8eb60f3b1ceb6eb28758847bf779d97047269b9c 100644 (file)
--- a/tools/release/tinyos-tools.spec
+++ b/tools/release/tinyos-tools.spec
@@ -2,8 +2,8 @@
 
 Summary: TinyOS tools 
 Name: tinyos-tools
-Version: 1.2.4
-Release: 2
+Version: 1.3.0
+Release: 1
 License: Please see source
 Group: Development/System
 URL: http://www.tinyos.net/
@@ -11,11 +11,11 @@ BuildRoot: %{_tmppath}/%{name}-root
 Source0: %{name}-%{version}.tar.gz
 # This makes cygwin happy
 Provides: /bin/sh /bin/bash
-Requires: nesc >= 1.2.7
+Requires: nesc >= 1.3
 
 %description
 Tools for use with tinyos. Includes, for example: uisp, motelist, pybsl, mig,
-ncc and nesdoc. The source for these tools is found in the TinyOS CSV
+ncc and nesdoc. The source for these tools is found in the TinyOS CVS
 repository under tinyos-2.x/tools.
 
 %prep

diff --git a/tools/release/tinyos.files b/tools/release/tinyos.files
index 746d68f77823e62110486c6ee6c13f2b6c0a9201..dc093b24734c0a81886cf68900eb21ac0f606a5c 100644 (file)
--- a/tools/release/tinyos.files
+++ b/tools/release/tinyos.files
@@ -1,10 +1,11 @@
 NAME=tinyos
-VERSION=2.0.2
+VERSION=2.1.0
 
 cd ../..
 rm -rf $NAME-$VERSION
 tools/release/extractor $NAME-$VERSION <<'EOF' | gzip >../$NAME-$VERSION.tar.gz
-!^./apps/tests/(eyesIFX|mica2|msp430|RadioStress|TestAlarm|TestAMOnOff|TestAMService|TestBroadcast|TestCollection|TestMultihopLqi|TestOscilloscopeLQI|TestPowerManager|TestPowerup|TestPrintf|TestRadioPM|TestScheduler|TestSerialBandwidth|TestSharedResource|TestSimTimers|TestSleep|TestTimerSync|TestTreeRouting|TestTrickleTimer)
+!^./apps/tests/(eyesIFX|mica2|msp430|rf230|mts300|telosb)
+!^./apps/tests/(RadioStress|TestAlarm|TestAM|TestAMOnOff|TestAMService|TestBroadcast|TestCollection|TestLocalTime|TestMultihopLqi|TestOscilloscopeLQI|TestPowerManager|TestPowerup|TestPrintf|TestRadioPM|TestScheduler|TestSerialBandwidth|TestSharedResource|TestSimTimers|TestSleep|TestTimerSync|TestTreeRouting|TestTrickleTimer|TestTymo)
 !^/apps/(BlinkAlarm|BlinkMSP430|BlinkTask|BlinkToRadio|Test|TestADC|TestArbiter|TestCC2420|TestRadio|TestSPI|TestScheduler|TestSchedulerTemp|TestSerial)
 !^./doc
 !^./overall-todo.txt
@@ -19,6 +20,8 @@ tools/release/extractor $NAME-$VERSION <<'EOF' | gzip >../$NAME-$VERSION.tar.gz
 !^./tos/lib/ByteRadio
 !^./tos/lib/deluge
 !^./tos/lib/net/collection
+!^./tos/lib/net/zigbee
+!^./tos/lib/net/tymo
 !^./tos/lib/oski
 !^./tos/platforms/btnode3
 !/.cvsignore
@@ -38,6 +41,8 @@ tools/release/extractor $NAME-$VERSION <<'EOF' | gzip >../$NAME-$VERSION.tar.gz
 ./tests/cc2420/LplBroadcastCountToLeds/RadioCountMsg.class
 ./tests/cc2420/RssiToSerial/SpecAnalyzer.class
 ./tests/cc2420/RssiToSerial/RssiSerialMsg.class
+./tests/TestSerial/TestSerialMsg.class
+./tests/TestSerial/TestSerial.class
 ./RadioCountToLeds/RadioCountMsg.class
 EOF
 rm -rf $NAME-$VERSION

diff --git a/tools/release/tinyos.spec b/tools/release/tinyos.spec
index 1a4e991b278ebd4e7a56adae44ba2271aedf532e..dfcb111435b083512911484bf8e6898506481720 100644 (file)
--- a/tools/release/tinyos.spec
+++ b/tools/release/tinyos.spec
@@ -1,8 +1,8 @@
 Summary: An event-based operating environment designed for use with embedded networked sensors.
 Name: tinyos
 BuildArchitectures: noarch
-Version: 2.0.2
-Release: 2
+Version: 2.1.0
+Release: 1
 License: Please see source
 Packager: TinyOS Group, UC Berkeley
 Group: Development/System
@@ -10,7 +10,7 @@ URL: www.tinyos.net
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-root
 Prefix: /opt
-Requires: tinyos-tools >= 1.2.4, nesc >= 1.2.7
+Requires: tinyos-tools >= 1.3, nesc >= 1.3
 
 %description
 TinyOS is an event based operating environment designed for use with