From bd229b6000eaf51be5b87fcbe79bd98156bdbe5c Mon Sep 17 00:00:00 2001 From: vlahan Date: Fri, 8 Aug 2008 02:46:20 +0000 Subject: [PATCH] * 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? --- tools/release/build-rpms | 6 +++- tools/release/deputy.files | 11 ++++++ tools/release/deputy.spec | 16 ++++----- tools/release/nesc.spec | 64 +++++++++++++++++++++++++++++++++ tools/release/tinyos-tools.spec | 3 +- tools/release/tinyos.spec | 2 +- 6 files changed, 91 insertions(+), 11 deletions(-) create mode 100755 tools/release/deputy.files create mode 100644 tools/release/nesc.spec diff --git a/tools/release/build-rpms b/tools/release/build-rpms index 097a9620..1883a01f 100755 --- a/tools/release/build-rpms +++ b/tools/release/build-rpms @@ -8,11 +8,12 @@ if [ -z $RPMS ]; then #test to see if RPMS is overridden by the environment fi 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 #sh task-tinydb/task-tinydb.files @@ -29,6 +30,8 @@ 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-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 #cp task-tinydb-$TINYDB_VERSION.tar.gz $RPMS/SOURCES @@ -37,6 +40,7 @@ echo "*** Creating rpms" cd $RPMS 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 #rpmbuild -bb $HERE/vm/vm.spec diff --git a/tools/release/deputy.files b/tools/release/deputy.files new file mode 100755 index 00000000..f9753587 --- /dev/null +++ b/tools/release/deputy.files @@ -0,0 +1,11 @@ +NAME=tinyos-deputy +VERSION=1.1 +RELEASE=1 + +cd ../.. +rm -rf $NAME-$VERSION +svn checkout svn://hal.cs.berkeley.edu/home/svn/projects/trunk/deputy +mv deputy $NAME-$VERSION +tar czvf ../$NAME-$VERSION-$RELEASE.tar.gz $NAME-$VERSION +wget -O ../$NAME-$VERSION-$RELEASE.patch http://www.cs.utah.edu/~coop/safetinyos/files/deputy.patch + diff --git a/tools/release/deputy.spec b/tools/release/deputy.spec index b7c7baaa..c96f501d 100644 --- a/tools/release/deputy.spec +++ b/tools/release/deputy.spec @@ -1,13 +1,13 @@ -%define name deputy -%define version 1.1 -%define release 1 +%define deputy_name deputy +%define tinyos_deputy_version 1.1 +%define tinyos_deputy_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 +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/ License: LGPL diff --git a/tools/release/nesc.spec b/tools/release/nesc.spec new file mode 100644 index 00000000..15f065b0 --- /dev/null +++ b/tools/release/nesc.spec @@ -0,0 +1,64 @@ +%define version 1.3.0 +%define theprefix /usr + +Summary: nesC compiler +Name: nesc +Version: 1.3.0 +Release: 1%{dist} +License: GNU GPL Version 2 +Packager: TinyOS Group, UC Berkeley +Group: Development/Tools +URL: http://sourceforge.net/projects/nescc +Source0: %{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-root + +%description +nesC is a compiler for a C-based language designed to support embedded +systems including TinyOS. nesC provides several advantages for the +TinyOS compiler infrastructure: improved syntax, support for full type +safety, abundant error reporting, generic components, and Java-like +interfaces. + +%prep +%setup -q + +%build +./configure --prefix=%{theprefix} +make + +%install +rm -rf %{buildroot}%{theprefix} +make prefix=%{buildroot}%{theprefix} install + +%clean +rm -rf $RPM_BUILD_DIR/%{name}-%{version} + +%files +%defattr(-,root,root,-) +%{theprefix} +%doc + +%changelog +* Wed Aug 6 2008 1.3.0 +- Deputy support +* Tue Jul 3 2007 1.2.9 +* Wed Dec 20 2006 1.2.8a +* Fri Dec 1 2006 1.2.8 +* Thu Jul 6 2006 1.2.7a +* Wed Jun 28 2006 1.2.7 +- Version 1.2.7 +* Fri Feb 3 2006 1.2.4 +- Version 1.2.4 +* Mon Mar 14 2005 1.1.2b +- Version 1.1.2b; use buildroot +* Tue Jul 27 2004 1.1.2-1w +- Version 1.1.2 +* Fri Sep 26 2003 root 1.1-1 +- New source +* Fri Sep 19 2003 root 1.1pre4-2 +- Removed set-mote-id +* Fri Sep 12 2003 root 1.1pre4-1 +- New source +* Fri Aug 15 2003 root 1.1pre2-1 +- Initial build. + diff --git a/tools/release/tinyos-tools.spec b/tools/release/tinyos-tools.spec index 8eb60f3b..4b89b265 100644 --- a/tools/release/tinyos-tools.spec +++ b/tools/release/tinyos-tools.spec @@ -3,7 +3,7 @@ Summary: TinyOS tools Name: tinyos-tools Version: 1.3.0 -Release: 1 +Release: 1%{dist} License: Please see source Group: Development/System URL: http://www.tinyos.net/ @@ -60,6 +60,7 @@ if [ $? -ne 0 ]; then fi %ifos linux java=`$RPM_INSTALL_PREFIX/bin/tos-locate-jre --java` +tinyoslibdir=$RPM_INSTALL_PREFIX/lib/tinyos bits=32 if [ $? -ne 0 ]; then echo "java command not found - assuming 32 bits" diff --git a/tools/release/tinyos.spec b/tools/release/tinyos.spec index dfcb1114..b5ee3f65 100644 --- a/tools/release/tinyos.spec +++ b/tools/release/tinyos.spec @@ -2,7 +2,7 @@ Summary: An event-based operating environment designed for use with embedded net Name: tinyos BuildArchitectures: noarch Version: 2.1.0 -Release: 1 +Release: 1%{dist} License: Please see source Packager: TinyOS Group, UC Berkeley Group: Development/System -- 2.39.2