accidentally fixed building of tinyos-tools - fixed again

[tinyos-2.x.git] / tools / release / build-rpms

diff --git a/tools/release/build-rpms b/tools/release/build-rpms
index 6a9f46e3bccda8d147ebed2c08fb0892d12bb040..95768b7b9c48c38167d315acb2401d1c70f8cc91 100755 (executable)
--- a/tools/release/build-rpms
+++ b/tools/release/build-rpms
@@ -1,18 +1,18 @@
+#!/bin/bash
 ## NOTE: This is for MY rpm setup. Don't expect it to work for you...
 
 # 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
+if [ -z $RPMS ]; then #test to see if RPMS is overridden by the environment
+               RPMS=/usr/src/redhat
+fi             
+TINYOS_VERSION=2.0.2
+TINYOS_TOOLS_VERSION=1.2.4
 
 echo "*** Building tarballs"
 #rm ../../../*.tar.gz
 sh tinyos.files
-#sh tinyos-tools.files
+sh tinyos-tools.files
 #sh contrib/contrib.files
 #sh vm/vm.files
 #sh task-tinydb/task-tinydb.files
@@ -28,7 +28,7 @@ cd $RPMS
 echo "*** Installing new tarballs"
 cd $HERE/../../..
 cp tinyos-$TINYOS_VERSION.tar.gz $RPMS/SOURCES
-#cp tinyos-tools-$TINYOS_TOOLS_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
 #cp task-tinydb-$TINYDB_VERSION.tar.gz $RPMS/SOURCES
@@ -36,7 +36,7 @@ cp tinyos-$TINYOS_VERSION.tar.gz $RPMS/SOURCES
 echo "*** Creating rpms"
 cd $RPMS
 rpmbuild -bb $HERE/tinyos.spec
-#rpmbuild -bb $HERE/tinyos-tools.spec
+rpmbuild -bb $HERE/tinyos-tools.spec
 #rpmbuild -bb $HERE/task-tinydb/task-tinydb.spec
 #rpmbuild -bb $HERE/contrib/contrib.spec
 #rpmbuild -bb $HERE/vm/vm.spec