[Tinyos-2-commits] CVS: tinyos-2.x/tools/release build-rpms, 1.1.2.8, 1.1.2.9 tinyos-tools.files, 1.1.2.4, 1.1.2.5 tinyos-tools.spec, 1.1.2.16, 1.1.2.17 tinyos.files, 1.1.2.8, 1.1.2.9 tinyos.spec, 1.1.2.16, 1.1.2.17

[Kristin Wright]

Update of /cvsroot/tinyos/tinyos-2.x/tools/release
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7161

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	build-rpms tinyos-tools.files tinyos-tools.spec tinyos.files 
	tinyos.spec 
Log Message:
merge beta2-rel3 changes into the devel branch

Index: build-rpms
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tools/release/Attic/build-rpms,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -C2 -d -r1.1.2.8 -r1.1.2.9
*** build-rpms	8 Feb 2006 17:52:36 -0000	1.1.2.8
--- build-rpms	6 Jul 2006 20:44:36 -0000	1.1.2.9
***************
*** 4,9 ****
  # For my cygwin: /cygdrive/c/rpmsrc
  RPMS=/cygdrive/c/rpmsrc
! TINYOS_VERSION=2.0.0beta1
! TINYOS_TOOLS_VERSION=1.2.1
  VM_VERSION=1.1.1Mar2004cvs
  TINYDB_VERSION=1.1.3July2004cvs
--- 4,9 ----
  # For my cygwin: /cygdrive/c/rpmsrc
  RPMS=/cygdrive/c/rpmsrc
! TINYOS_VERSION=2.0.0beta2
! TINYOS_TOOLS_VERSION=1.2.2
  VM_VERSION=1.1.1Mar2004cvs
  TINYDB_VERSION=1.1.3July2004cvs
***************
*** 13,17 ****
  #rm ../../../*.tar.gz
  sh tinyos.files
! sh tinyos-tools.files
  #sh contrib/contrib.files
  #sh vm/vm.files
--- 13,17 ----
  #rm ../../../*.tar.gz
  sh tinyos.files
! #sh tinyos-tools.files
  #sh contrib/contrib.files
  #sh vm/vm.files

Index: tinyos-tools.files
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tools/release/Attic/tinyos-tools.files,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** tinyos-tools.files	9 Feb 2006 19:13:11 -0000	1.1.2.4
--- tinyos-tools.files	6 Jul 2006 20:44:36 -0000	1.1.2.5
***************
*** 1,4 ****
  NAME=tinyos-tools
! VERSION=1.2.1
  
  cd ../..
--- 1,4 ----
  NAME=tinyos-tools
! VERSION=1.2.2
  
  cd ../..

Index: tinyos-tools.spec
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tools/release/Attic/tinyos-tools.spec,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -C2 -d -r1.1.2.16 -r1.1.2.17
*** tinyos-tools.spec	9 Feb 2006 20:34:55 -0000	1.1.2.16
--- tinyos-tools.spec	6 Jul 2006 20:44:36 -0000	1.1.2.17
***************
*** 3,8 ****
  Summary: TinyOS tools 
  Name: tinyos-tools
! Version: 1.2.1
! Release: 3
  License: Please see source
  Group: Development/System
--- 3,8 ----
  Summary: TinyOS tools 
  Name: tinyos-tools
! Version: 1.2.2
! Release: 1
  License: Please see source
  Group: Development/System
***************
*** 12,16 ****
  # This makes cygwin happy
  Provides: /bin/sh /bin/bash
! Requires: nesc >= 1.2.4
  
  %description
--- 12,16 ----
  # This makes cygwin happy
  Provides: /bin/sh /bin/bash
! Requires: nesc >= 1.2.7
  
  %description
***************
*** 25,29 ****
  cd tools
  ./Bootstrap
! ./configure --prefix=/usr
  make
  
--- 25,29 ----
  cd tools
  ./Bootstrap
! TOSDIR=/opt/tinyos-2.x/tos ./configure --prefix=/usr
  make
  
***************
*** 75,78 ****
--- 75,79 ----
  
  %changelog
+ * Wed Jul 5 2006 <kwright at archrock.com> 1.2.2-1
  * Thu Feb 9 2006 <david.e.gay at intel.com> 1.2.1-2
  * Sat Feb 4 2006 <kwright at cs.berkeley.edu> 1.2.1-1

Index: tinyos.files
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tools/release/Attic/tinyos.files,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -C2 -d -r1.1.2.8 -r1.1.2.9
*** tinyos.files	9 Feb 2006 19:13:11 -0000	1.1.2.8
--- tinyos.files	6 Jul 2006 20:44:36 -0000	1.1.2.9
***************
*** 1,19 ****
  NAME=tinyos
! VERSION=2.0.0beta1
  
  cd ../..
  rm -rf $NAME-$VERSION
  tools/release/extractor $NAME-$VERSION <<'EOF' | gzip >../$NAME-$VERSION.tar.gz
! !^./apps/tests/(eyesIFX|mica2|msp430|RadioStress|TestAlarm|TestAM|TestAMOnOff|TestAMService|TestBroadcast|TestPowerup|TestScheduler|TestSerial|TestSerialBandwidth|TestSleep|TestTimerSync|TestTrickleTimer)
  !^./doc
  !^./overall-todo.txt
! !^./support/make/(mica2dot.target|telosa.target)
  !^./tools
  !^./tos/chips/sht11
- !^./tos/lib/(deluge|net|oski)
- !^./tos/oski
  !^./tos/sensorboards/mts300
! !^./support/make/Makelocal
! !^./support/sdk/c
  !/.cvsignore
  !/CVS/
--- 1,19 ----
  NAME=tinyos
! VERSION=2.0.0beta2
  
  cd ../..
  rm -rf $NAME-$VERSION
  tools/release/extractor $NAME-$VERSION <<'EOF' | gzip >../$NAME-$VERSION.tar.gz
! !^./apps/tests/(eyesIFX|mica2|msp430|RadioStress|TestAlarm|TestAMService|TestBroadcast|TestCollection|TestNetwork|TestPowerManager|TestPowerup|TestSerialBandwidth|TestSleep|TestTimerSync|TestTreeRouting|TestTrickleTimer)
  !^./doc
  !^./overall-todo.txt
! !^./support/make/Makelocal
! !^./support/make/btnode3.target
! !^./support/make/telosa.target
  !^./tools
  !^./tos/chips/sht11
  !^./tos/sensorboards/mts300
! !^./tos/sensorboards/im2sb
! !^./tos/platforms/btnode3
  !/.cvsignore
  !/CVS/

Index: tinyos.spec
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tools/release/Attic/tinyos.spec,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -C2 -d -r1.1.2.16 -r1.1.2.17
*** tinyos.spec	9 Feb 2006 21:02:25 -0000	1.1.2.16
--- tinyos.spec	6 Jul 2006 20:44:36 -0000	1.1.2.17
***************
*** 2,6 ****
  Name: tinyos
  BuildArchitectures: noarch
! Version: 2.0.0beta1
  Release: 3
  License: Please see source
--- 2,6 ----
  Name: tinyos
  BuildArchitectures: noarch
! Version: 2.0.0beta2
  Release: 3
  License: Please see source
***************
*** 11,15 ****
  BuildRoot: %{_tmppath}/%{name}-root
  Prefix: /opt
! Requires: tinyos-tools >= 1.2.1, nesc >= 1.2.4
  
  %description
--- 11,15 ----
  BuildRoot: %{_tmppath}/%{name}-root
  Prefix: /opt
! Requires: tinyos-tools >= 1.2.2, nesc >= 1.2.7
  
  %description