[Tinyos-2-commits] CVS: tinyos-2.x/tools/release build-rpms, 1.8, 1.9 deputy.spec, 1.1, 1.2 tinyos.spec, 1.8, 1.9 tinyos-tools.spec, 1.7, 1.8

[Vlado Handziski]

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

Modified Files:
	build-rpms deputy.spec tinyos.spec tinyos-tools.spec 
Log Message:
* The spec files were modified to add the distribution to the name (.fc9. etc)
 * The definition of tinyoslibdir in the tinyos-tools.spec file has been fixed
 * The build-rpm script has been extended to build deputy and deputy.file has been added to create the source tarballs and patches
 * I have renamed the deputy package into deputy-tinyos or tinyos-deputy to signify that this is a tinyos specific patched version. Is this ok?

Index: build-rpms
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tools/release/build-rpms,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** build-rpms	6 Aug 2008 18:44:07 -0000	1.8
--- build-rpms	8 Aug 2008 02:46:20 -0000	1.9
***************
*** 9,17 ****
  TINYOS_VERSION=2.1.0
  TINYOS_TOOLS_VERSION=1.3.0
! 
  echo "*** Building tarballs"
  #rm ../../../*.tar.gz
  sh tinyos.files
  sh tinyos-tools.files
  #sh contrib/contrib.files
  #sh vm/vm.files
--- 9,18 ----
  TINYOS_VERSION=2.1.0
  TINYOS_TOOLS_VERSION=1.3.0
! TINYOS_DEPUTY_VERREL=1.1-1
  echo "*** Building tarballs"
  #rm ../../../*.tar.gz
  sh tinyos.files
  sh tinyos-tools.files
+ sh deputy.files
  #sh contrib/contrib.files
  #sh vm/vm.files
***************
*** 30,33 ****
--- 31,36 ----
  cp tinyos-$TINYOS_VERSION.tar.gz $RPMS/SOURCES
  cp tinyos-tools-$TINYOS_TOOLS_VERSION.tar.gz $RPMS/SOURCES
+ cp tinyos-deputy-$TINYOS_DEPUTY_VERREL.tar.gz $RPMS/SOURCES
+ cp tinyos-deputy-$TINYOS_DEPUTY_VERREL.patch $RPMS/SOURCES
  #cp tinyos-vm-$VM_VERSION.tar.gz $RPMS/SOURCES
  #cp tinyos-contrib-$CONTRIB_VERSION.tar.gz $RPMS/SOURCES
***************
*** 38,41 ****
--- 41,45 ----
  rpmbuild -bb $HERE/tinyos.spec
  rpmbuild -bb $HERE/tinyos-tools.spec
+ rpmbuild -bb $HERE/deputy.spec
  #rpmbuild -bb $HERE/task-tinydb/task-tinydb.spec
  #rpmbuild -bb $HERE/contrib/contrib.spec

Index: deputy.spec
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tools/release/deputy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** deputy.spec	7 Aug 2008 04:35:02 -0000	1.1
--- deputy.spec	8 Aug 2008 02:46:20 -0000	1.2
***************
*** 1,12 ****
! %define name deputy
! %define version 1.1
! %define release 1
  
  Summary: Deputy compiler for Safe TinyOS.
! Name: %{name}
! Version: %{version}
! Release: %{release}%{?dist}
! Source: http://deputy.cs.berkeley.edu/deputy-1.1.tar.gz
! Patch0: deputy.patch
  Vendor: Deputy
  URL: http://deputy.cs.berkeley.edu/
--- 1,12 ----
! %define deputy_name deputy
! %define tinyos_deputy_version 1.1
! %define tinyos_deputy_release 1
  
  Summary: Deputy compiler for Safe TinyOS.
! Name: tinyos-%{deputy_name}
! Version: %{tinyos_deputy_version}
! Release: %{tinyos_deputy_release}%{dist}
! Source: http://deputy.cs.berkeley.edu/%{name}-%{tinyos_deputy_version}-%{tinyos_deputy_release}.tar.gz
! Patch0: tinyos-%{deputy_name}-%{tinyos_deputy_version}-%{tinyos_deputy_release}.patch
  Vendor: Deputy
  URL: http://deputy.cs.berkeley.edu/

Index: tinyos.spec
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tools/release/tinyos.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** tinyos.spec	6 Aug 2008 18:44:07 -0000	1.8
--- tinyos.spec	8 Aug 2008 02:46:20 -0000	1.9
***************
*** 3,7 ****
  BuildArchitectures: noarch
  Version: 2.1.0
! Release: 1
  License: Please see source
  Packager: TinyOS Group, UC Berkeley
--- 3,7 ----
  BuildArchitectures: noarch
  Version: 2.1.0
! Release: 1%{dist}
  License: Please see source
  Packager: TinyOS Group, UC Berkeley

Index: tinyos-tools.spec
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tools/release/tinyos-tools.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tinyos-tools.spec	6 Aug 2008 18:44:07 -0000	1.7
--- tinyos-tools.spec	8 Aug 2008 02:46:20 -0000	1.8
***************
*** 4,8 ****
  Name: tinyos-tools
  Version: 1.3.0
! Release: 1
  License: Please see source
  Group: Development/System
--- 4,8 ----
  Name: tinyos-tools
  Version: 1.3.0
! Release: 1%{dist}
  License: Please see source
  Group: Development/System
***************
*** 61,64 ****
--- 61,65 ----
  %ifos linux
  java=`$RPM_INSTALL_PREFIX/bin/tos-locate-jre --java`
+ tinyoslibdir=$RPM_INSTALL_PREFIX/lib/tinyos
  bits=32
  if [ $? -ne 0 ]; then