[Tinyos-commits] CVS: tinyos-1.x/tools/release build-rpms, 1.16, 1.17 tinyos.files, 1.16, 1.17 tinyos.spec, 1.17, 1.18

[Kristin Wright]

Update of /cvsroot/tinyos/tinyos-1.x/tools/release
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28687

Modified Files:
	build-rpms tinyos.files tinyos.spec 
Log Message:
merging 1.1.14 changes

Index: build-rpms
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/release/build-rpms,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** build-rpms	3 Jun 2005 20:32:42 -0000	1.16
--- build-rpms	5 Aug 2005 19:11:28 -0000	1.17
***************
*** 4,8 ****
  # For my cygwin: /cygdrive/c/rpmsrc
  RPMS=/cygdrive/c/rpmsrc
! TINYOS_VERSION=1.1.13May2005cvs
  VM_VERSION=1.1.1Mar2004cvs
  TINYDB_VERSION=1.1.3July2004cvs
--- 4,8 ----
  # For my cygwin: /cygdrive/c/rpmsrc
  RPMS=/cygdrive/c/rpmsrc
! TINYOS_VERSION=1.1.14Jul2005cvs
  VM_VERSION=1.1.1Mar2004cvs
  TINYDB_VERSION=1.1.3July2004cvs
***************
*** 11,15 ****
  echo "*** Building tarballs"
  #rm ../../../*.tar.gz
! sh tinyos.files
  #sh contrib/contrib.files
  #sh vm/vm.files
--- 11,15 ----
  echo "*** Building tarballs"
  #rm ../../../*.tar.gz
! #sh tinyos.files
  #sh contrib/contrib.files
  #sh vm/vm.files
***************
*** 26,30 ****
  echo "*** Installing new tarballs"
  cd $HERE/../../..
! cp tinyos-$TINYOS_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 ----
  echo "*** Installing new tarballs"
  cd $HERE/../../..
! #cp tinyos-$TINYOS_VERSION.tar.gz $RPMS/SOURCES
  #cp tinyos-vm-$VM_VERSION.tar.gz $RPMS/SOURCES
  #cp tinyos-contrib-$CONTRIB_VERSION.tar.gz $RPMS/SOURCES

Index: tinyos.files
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/release/tinyos.files,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** tinyos.files	3 Jun 2005 20:32:42 -0000	1.16
--- tinyos.files	5 Aug 2005 19:11:29 -0000	1.17
***************
*** 1,4 ****
  NAME=tinyos
! VERSION=1.1.13May2005cvs
  
  cd ../..
--- 1,4 ----
  NAME=tinyos
! VERSION=1.1.14Jul2005cvs
  
  cd ../..
***************
*** 13,16 ****
--- 13,17 ----
  !^./tools/java/net/tinyos/util/DTN
  !^./tools/java/net/tinyos/tools/TestTimeStamping.java
+ !^./tools/java/net/tinyos/xnp
  !^./tools/matlab/contrib
  !^./tools/release

Index: tinyos.spec
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/release/tinyos.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** tinyos.spec	3 Jun 2005 20:32:42 -0000	1.17
--- tinyos.spec	5 Aug 2005 19:11:29 -0000	1.18
***************
*** 2,6 ****
  Name: tinyos
  BuildArchitectures: noarch
! Version: 1.1.13May2005cvs
  Release: 1
  License: Please see source
--- 2,6 ----
  Name: tinyos
  BuildArchitectures: noarch
! Version: 1.1.14Jul2005cvs
  Release: 1
  License: Please see source