[Tinyos-2-commits] CVS: tinyos-2.x/tools/release build-rpms, 1.1.2.9, 1.1.2.10 tinyos-tools.spec, 1.1.2.17, 1.1.2.18 tinyos.spec, 1.1.2.17, 1.1.2.18

[Phil Levis]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	build-rpms tinyos-tools.spec tinyos.spec 
Log Message:
Updated build scripts.


Index: build-rpms
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tools/release/build-rpms,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -C2 -d -r1.1.2.9 -r1.1.2.10
*** build-rpms	6 Jul 2006 20:44:36 -0000	1.1.2.9
--- build-rpms	5 Nov 2006 20:12:06 -0000	1.1.2.10
***************
*** 3,17 ****
  # For linux, change to /usr/src/redhat
  # 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
! CONTRIB_VERSION=1.1.4Apr2005cvs
  
  echo "*** Building tarballs"
  #rm ../../../*.tar.gz
  sh tinyos.files
! #sh tinyos-tools.files
  #sh contrib/contrib.files
  #sh vm/vm.files
--- 3,14 ----
  # For linux, change to /usr/src/redhat
  # For my cygwin: /cygdrive/c/rpmsrc
! RPMS=/usr/src/rpm
! TINYOS_VERSION=2.0.0
! TINYOS_TOOLS_VERSION=1.2.3
  
  echo "*** Building tarballs"
  #rm ../../../*.tar.gz
  sh tinyos.files
! sh tinyos-tools.files
  #sh contrib/contrib.files
  #sh vm/vm.files
***************
*** 29,33 ****
  cd $HERE/../../..
  cp tinyos-$TINYOS_VERSION.tar.gz $RPMS/SOURCES
! #cp tinyos-tools-$TINYOS_TOOLS_VERSION.tar.gz $RPMS/SOURCES
  #cp tinyos-vm-$VM_VERSION.tar.gz $RPMS/SOURCES
  #cp tinyos-contrib-$CONTRIB_VERSION.tar.gz $RPMS/SOURCES
--- 26,30 ----
  cd $HERE/../../..
  cp tinyos-$TINYOS_VERSION.tar.gz $RPMS/SOURCES
! cp tinyos-tools-$TINYOS_TOOLS_VERSION.tar.gz $RPMS/SOURCES
  #cp tinyos-vm-$VM_VERSION.tar.gz $RPMS/SOURCES
  #cp tinyos-contrib-$CONTRIB_VERSION.tar.gz $RPMS/SOURCES
***************
*** 37,41 ****
  cd $RPMS
  rpmbuild -bb $HERE/tinyos.spec
! #rpmbuild -bb $HERE/tinyos-tools.spec
  #rpmbuild -bb $HERE/task-tinydb/task-tinydb.spec
  #rpmbuild -bb $HERE/contrib/contrib.spec
--- 34,38 ----
  cd $RPMS
  rpmbuild -bb $HERE/tinyos.spec
! rpmbuild -bb $HERE/tinyos-tools.spec
  #rpmbuild -bb $HERE/task-tinydb/task-tinydb.spec
  #rpmbuild -bb $HERE/contrib/contrib.spec

Index: tinyos-tools.spec
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tools/release/tinyos-tools.spec,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -C2 -d -r1.1.2.17 -r1.1.2.18
*** tinyos-tools.spec	6 Jul 2006 20:44:36 -0000	1.1.2.17
--- tinyos-tools.spec	5 Nov 2006 20:12:06 -0000	1.1.2.18
***************
*** 3,7 ****
  Summary: TinyOS tools 
  Name: tinyos-tools
! Version: 1.2.2
  Release: 1
  License: Please see source
--- 3,7 ----
  Summary: TinyOS tools 
  Name: tinyos-tools
! Version: 1.2.3
  Release: 1
  License: Please see source

Index: tinyos.spec
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tools/release/tinyos.spec,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -C2 -d -r1.1.2.17 -r1.1.2.18
*** tinyos.spec	6 Jul 2006 20:44:36 -0000	1.1.2.17
--- tinyos.spec	5 Nov 2006 20:12:06 -0000	1.1.2.18
***************
*** 2,7 ****
  Name: tinyos
  BuildArchitectures: noarch
! Version: 2.0.0beta2
! Release: 3
  License: Please see source
  Packager: TinyOS Group, UC Berkeley
--- 2,7 ----
  Name: tinyos
  BuildArchitectures: noarch
! Version: 2.0.0
! Release: 2
  License: Please see source
  Packager: TinyOS Group, UC Berkeley
***************
*** 11,15 ****
  BuildRoot: %{_tmppath}/%{name}-root
  Prefix: /opt
! Requires: tinyos-tools >= 1.2.2, nesc >= 1.2.7
  
  %description
--- 11,15 ----
  BuildRoot: %{_tmppath}/%{name}-root
  Prefix: /opt
! Requires: tinyos-tools >= 1.2.3, nesc >= 1.2.7
  
  %description