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

[Kristin Wright]

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

Modified Files:
      Tag: tos-1-1-13-candidate
	build-rpms tinyos.files tinyos.spec 
Log Message:
1.1.13 changes

Index: build-rpms
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/release/build-rpms,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -C2 -d -r1.15 -r1.15.2.1
*** build-rpms	26 Apr 2005 00:06:11 -0000	1.15
--- build-rpms	1 Jun 2005 21:58:39 -0000	1.15.2.1
***************
*** 4,8 ****
  # For my cygwin: /cygdrive/c/rpmsrc
  RPMS=/cygdrive/c/rpmsrc
! TINYOS_VERSION=1.1.12Apr2005cvs
  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.13May2005cvs
  VM_VERSION=1.1.1Mar2004cvs
  TINYDB_VERSION=1.1.3July2004cvs

Index: tinyos.files
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/release/tinyos.files,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -C2 -d -r1.15 -r1.15.2.1
*** tinyos.files	26 Apr 2005 00:06:11 -0000	1.15
--- tinyos.files	1 Jun 2005 21:58:39 -0000	1.15.2.1
***************
*** 1,4 ****
  NAME=tinyos
! VERSION=1.1.12Apr2005cvs
  
  cd ../..
--- 1,4 ----
  NAME=tinyos
! VERSION=1.1.13May2005cvs
  
  cd ../..

Index: tinyos.spec
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/release/tinyos.spec,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -C2 -d -r1.16 -r1.16.2.1
*** tinyos.spec	26 Apr 2005 00:06:11 -0000	1.16
--- tinyos.spec	1 Jun 2005 21:58:39 -0000	1.16.2.1
***************
*** 2,6 ****
  Name: tinyos
  BuildArchitectures: noarch
! Version: 1.1.12Apr2005cvs
  Release: 1
  License: Please see source
--- 2,6 ----
  Name: tinyos
  BuildArchitectures: noarch
! Version: 1.1.13May2005cvs
  Release: 1
  License: Please see source
***************
*** 21,25 ****
  TinyOS system, its component model, and its implications for Networked
  Sensor Architectures please see: "Architectural Directions for Networked
! Sensors" which can be found off of http://webs.cs.berkeley.edu.
  
  %prep
--- 21,25 ----
  TinyOS system, its component model, and its implications for Networked
  Sensor Architectures please see: "Architectural Directions for Networked
! Sensors" which can be found off of http://www.tinyos.net
  
  %prep
***************
*** 55,59 ****
  CLASSPATH=`$TOSROOT/tools/java/javapath`
  export CLASSPATH
- #We cannot set MAKERULES until we require make 3.8 
  MAKERULES="$TOSROOT/tools/make/Makerules"
  export MAKERULES
--- 55,58 ----
***************
*** 68,78 ****
  . /etc/profile.d/tinyos.sh
  
- # Copy patched make to /usr/bin
- mv /usr/bin/make.exe /usr/bin/make-unpatched.exe
- cp $TOSROOT/tools/make/make-patched.exe /usr/bin/make.exe
- 
  # Compile motelist 
  cd $TOSROOT/tools/src/motelist; make install
  
  if ! ( type java >/dev/null 2>/dev/null && type javac >/dev/null 2>/dev/null ); then
    echo "Cannot find java and javac - java tools not compiled" 1>&2
--- 67,74 ----
  . /etc/profile.d/tinyos.sh
  
  # Compile motelist 
  cd $TOSROOT/tools/src/motelist; make install
  
+ # Compile java tools
  if ! ( type java >/dev/null 2>/dev/null && type javac >/dev/null 2>/dev/null ); then
    echo "Cannot find java and javac - java tools not compiled" 1>&2