[Tinyos-2-commits] CVS: tinyos-2.x/doc/html upgrade-tinyos.html, 1.15, 1.16

Jan Beutel beutel at users.sourceforge.net
Wed Aug 15 11:31:57 PDT 2007


Update of /cvsroot/tinyos/tinyos-2.x/doc/html
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29168/doc/html

Modified Files:
	upgrade-tinyos.html 
Log Message:
corrected html

Index: upgrade-tinyos.html
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/doc/html/upgrade-tinyos.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** upgrade-tinyos.html	31 Jul 2007 07:11:16 -0000	1.15
--- upgrade-tinyos.html	15 Aug 2007 18:31:54 -0000	1.16
***************
*** 1,8 ****
! <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
! <html>
    <head>
  
    <title>Installing TinyOS 2.0.2</title>
!   <link href="../stylesheets/tutorial.css" rel="stylesheet" type="text/css">
  </head>
    <body>
--- 1,9 ----
! <?xml version="1.0" encoding="utf-8" ?>
! <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
! <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
    <head>
  
    <title>Installing TinyOS 2.0.2</title>
!   <link href="../stylesheets/tutorial.css" rel="stylesheet" type="text/css"/>
  </head>
    <body>
***************
*** 25,51 ****
  so switching back and forth requires only a few variable changes. You
  can find those directions <a href="#tinyos1">at the bottom of the page</a>.
! </p><p>
  There are 3 steps to upgrading from 1.x to 2.x:
! </p><ol>
!   <li> <a href="#external-tools">Upgrade your external tools (compilers). </a>
!   </li><li> <a href="#tinyos-tools">Upgrade your Tinyos-specific tools. </a>
!   </li><li> <a href="#tinyos2">Install the Tinyos 2.x source tree. </a>
! </li></ol>
  
! <a name="external-tools"><h1> Step 1: Upgrade your external tools. </h1></a>
  The 1.2 toolset uses the same Java JDK and ATT Graphviz versions, so 
  those do not need to be upgraded. What does need to be upgraded are
  your compiler tools. Install the appropriate version of the following 
! (Windows or Linux) with the rpm command 'rpm -Uvh <rpm>'.
! </rpm><p>
  At this time, we have available compiler toolsets for Atmel AVR and 
  TI MSP430 platforms. 
! </p><p>
  All of the tools are in the <code>http://www.tinyos.net/dist-1.2.0/</code>
  and the <code>http://www.tinyos.net/dist-2.0.0</code>
  distribution trees, but are linked below for convenience.
  
! <!----- AVR external tools -------->
! </p><p><b><em>Atmel AVR Tools</em></b>
  <table border="0">
  <tbody><tr>
--- 26,56 ----
  so switching back and forth requires only a few variable changes. You
  can find those directions <a href="#tinyos1">at the bottom of the page</a>.
! </p>
! <p>
  There are 3 steps to upgrading from 1.x to 2.x:
! </p>
! <ol>
!   <li> <a href="#external-tools">Upgrade your external tools (compilers). </a></li>
!   <li> <a href="#tinyos-tools">Upgrade your Tinyos-specific tools. </a></li>
!   <li> <a href="#tinyos2">Install the Tinyos 2.x source tree. </a></li>
! </ol>
  
! 
! <h1><a name="external-tools">Step 1: Upgrade your external tools.</a></h1>
  The 1.2 toolset uses the same Java JDK and ATT Graphviz versions, so 
  those do not need to be upgraded. What does need to be upgraded are
  your compiler tools. Install the appropriate version of the following 
! (Windows or Linux) with the rpm command 'rpm -Uvh <i>rpm</i>'.
! <p>
  At this time, we have available compiler toolsets for Atmel AVR and 
  TI MSP430 platforms. 
! </p>
! <p>
  All of the tools are in the <code>http://www.tinyos.net/dist-1.2.0/</code>
  and the <code>http://www.tinyos.net/dist-2.0.0</code>
  distribution trees, but are linked below for convenience.
+ </p>
  
! <b><em>Atmel AVR Tools</em></b>
  <table border="0">
  <tbody><tr>
***************
*** 88,93 ****
  <i><font color="red">&#8224;</font>If you receive an rpm error that indicates that you have a newer version already installed, try <code>rpm -Uvh --force</code></i>
  
! <!----- MSP external tools -------->
! </p><p><b><em>TI MSP430 Tools</em></b>
  <table border="0">
  <tbody><tr>
--- 93,98 ----
  <i><font color="red">&#8224;</font>If you receive an rpm error that indicates that you have a newer version already installed, try <code>rpm -Uvh --force</code></i>
  
! <p></p>
! <b><em>TI MSP430 Tools</em></b>
  <table border="0">
  <tbody><tr>
***************
*** 136,140 ****
  <tr>
    <td>gdb</td>
- <!--  <td><a href="http://www.tinyos.net/dist-2.0.0/tools/windows/msp430tools-gdb-6.0-20050609.cygwin.i386.rpm">msp430tools-gdb-6.0-20050609.cygwin.i386.rpm</a></td> -->
    <td><a href="http://www.tinyos.net/dist-2.0.0/tools/windows/"></a>Not yet available</td>
    <td><a href="http://www.tinyos.net/dist-2.0.0/tools/linux/msp430tools-gdb-6.0-20050609.i386.rpm">msp430tools-gdb-6.0-20050609.i386.rpm</a></td>
--- 141,144 ----
***************
*** 143,149 ****
  </tbody></table>
  
! </p>
! <a name="tinyos-tools"><h1> Step 2: Upgrade your TinyOS-specific tools. </h1></a>
  
  The TinyOS-specific tools are the NesC compiler and a set of tools
  developed in the tinyos-2.x/tools source code repository. They are
--- 147,153 ----
  </tbody></table>
  
! <h1><a name="tinyos-tools">Step 2: Upgrade your TinyOS-specific tools.</a></h1>
  
+ <p>
  The TinyOS-specific tools are the NesC compiler and a set of tools
  developed in the tinyos-2.x/tools source code repository. They are
***************
*** 167,177 ****
  causes an error that the RPM was built for Cygwin, add the <tt>--ignoreos</tt>
  option.
  
! 
! 
! <p>
! 
! <!----- tinyos-2.x/tinyos rpms  -------->
! </p><p><b><em>TinyOS-specific Tools</em></b>
  <table border="0">
  <tbody><tr>
--- 171,177 ----
  causes an error that the RPM was built for Cygwin, add the <tt>--ignoreos</tt>
  option.
+ </p>
  
! <b><em>TinyOS-specific Tools</em></b>
  <table border="0">
  <tbody><tr>
***************
*** 188,194 ****
    <td><a href="http://www.tinyos.net/dist-1.2.0/tinyos/windows/nesc-1.2.8b-1.cygwin.i386.rpm">nesc-1.2.8b-1.cygwin.i386.rpm</a></td>
    <td><a href="http://www.tinyos.net/dist-1.2.0/tinyos/linux/nesc-1.2.8a-1.i386.rpm">nesc-1.2.8a-1.i386.rpm </a></td>
!   <td><a href=""></a><code>rpm -Uvh</code><br><code>rpm -Uvh --ignoreos</code> (if Cygwin complains)</td>
  </tr>
! <tr></tr>
  <tr>
    <td bgcolor="#dddddd"><b>Tool</b></td>
--- 188,194 ----
    <td><a href="http://www.tinyos.net/dist-1.2.0/tinyos/windows/nesc-1.2.8b-1.cygwin.i386.rpm">nesc-1.2.8b-1.cygwin.i386.rpm</a></td>
    <td><a href="http://www.tinyos.net/dist-1.2.0/tinyos/linux/nesc-1.2.8a-1.i386.rpm">nesc-1.2.8a-1.i386.rpm </a></td>
!   <td><a href=""></a><code>rpm -Uvh</code><br/><code>rpm -Uvh --ignoreos</code> (if Cygwin complains)</td>
  </tr>
! 
  <tr>
    <td bgcolor="#dddddd"><b>Tool</b></td>
***************
*** 198,201 ****
--- 198,202 ----
    <td bgcolor="#dddddd"><b>Command</b></td>
  </tr>
+ 
  <tr>
    <td>tinyos-tools</td>
***************
*** 203,213 ****
    <td><a href="http://www.tinyos.net/dist-2.0.0/tinyos/linux/tinyos-tools-1.2.4-2.i386.rpm">tinyos-tools-1.2.4-2.i386.rpm</a></td>
    <td><a href="http://www.tinyos.net/dist-2.0.0/tinyos/linux/tinyos-tools-1.2.4-2.i686.rpm">tinyos-tools-1.2.4-2.i686.rpm</a></td>
!   <td><a href=""></a><code>rpm -ivh --force</code>&nbsp;(1.x tree)<br><code>rpm -Uvh</code>&nbsp;(no 1.x tree)<br></td>
  </tr>
  
  </tbody></table>
  
! </p>
! <a name="tinyos2"><h1> Step 3: Install the TinyOS 2.x source tree. </h1></a>
  
  Now that the tools are installed, you need only install the tinyos 2.x 
--- 204,213 ----
    <td><a href="http://www.tinyos.net/dist-2.0.0/tinyos/linux/tinyos-tools-1.2.4-2.i386.rpm">tinyos-tools-1.2.4-2.i386.rpm</a></td>
    <td><a href="http://www.tinyos.net/dist-2.0.0/tinyos/linux/tinyos-tools-1.2.4-2.i686.rpm">tinyos-tools-1.2.4-2.i686.rpm</a></td>
!   <td><a href=""></a><code>rpm -ivh --force</code>&nbsp;(1.x tree)<br/><code>rpm -Uvh</code>&nbsp;(no 1.x tree)<br/></td>
  </tr>
  
  </tbody></table>
  
! <h1><a name="tinyos2">Step 3: Install the TinyOS 2.x source tree.</a></h1>
  
  Now that the tools are installed, you need only install the tinyos 2.x 
***************
*** 216,221 ****
  <ul>
  <li> Install tinyos-2.x
- <p>
- <!----- TinyOS  -------->
  
  <p>If you have an existing 1.x tree, we strongly recommend that you use
--- 216,219 ----
***************
*** 234,238 ****
  recommend removing it before installing the new one with a forced install.</p>
  
! </p><p><b><em>TinyOS 2.x</em></b>
  <table border="0">
  <tbody><tr>
--- 232,236 ----
  recommend removing it before installing the new one with a forced install.</p>
  
! <b><em>TinyOS 2.x</em></b>
  <table border="0">
  <tbody><tr>
***************
*** 247,258 ****
    <td><a href="http://www.tinyos.net/dist-2.0.0/tinyos/windows/tinyos-2.0.2-2.cygwin.noarch.rpm">tinyos-2.0.2-2.cygwin.noarch.rpm</a></td>
    <td><a href="http://www.tinyos.net/dist-2.0.0/tinyos/linux/tinyos-2.0.2-2.noarch.rpm">tinyos-2.0.2-2.noarch.rpm</a></td>
!   <td><tt>rpm -Uvh</tt> (to upgrade)<br>
!       <tt>rpm -ivh</tt> (to install)<br>
!       <tt>rpm -ivh --force</tt> (to force install)<br>
    </td>      
  </tr>
  
! </tbody></table>
! </p></li><li> Configure your environment
  <p>
  In TinyOS 1.x, much of your environment was set by the rpm installation process
--- 245,257 ----
    <td><a href="http://www.tinyos.net/dist-2.0.0/tinyos/windows/tinyos-2.0.2-2.cygwin.noarch.rpm">tinyos-2.0.2-2.cygwin.noarch.rpm</a></td>
    <td><a href="http://www.tinyos.net/dist-2.0.0/tinyos/linux/tinyos-2.0.2-2.noarch.rpm">tinyos-2.0.2-2.noarch.rpm</a></td>
!   <td><tt>rpm -Uvh</tt> (to upgrade)<br/>
!       <tt>rpm -ivh</tt> (to install)<br/>
!       <tt>rpm -ivh --force</tt> (to force install)<br/>
    </td>      
  </tr>
  
! </tbody></table></li>
! 
! <li> Configure your environment
  <p>
  In TinyOS 1.x, much of your environment was set by the rpm installation process
***************
*** 262,269 ****
  put them in a shell script that will run when your shell starts, but you needn't 
  put such a script under /etc/profile.d. 
! </p><p>
  <i>Please take note of the current settings since you'll need those if you want
  to work in your current 1.x tree sometime in the future. </i>
! </p><p>
  The example
  settings below assume that the tinyos-2.x installation is in /opt/tinyos-2.x.
--- 261,270 ----
  put them in a shell script that will run when your shell starts, but you needn't 
  put such a script under /etc/profile.d. 
! </p>
! <p>
  <i>Please take note of the current settings since you'll need those if you want
  to work in your current 1.x tree sometime in the future. </i>
! </p>
! <p>
  The example
  settings below assume that the tinyos-2.x installation is in /opt/tinyos-2.x.
***************
*** 271,279 ****
  that the windows CLASSPATH must be a windows-style path, not a cygwin path. You can 
  generate a windows style path from a cygwin-style path using 'cygpath -w'. For example:
! </p><pre>export CLASSPATH=`cygpath -w $TOSROOT/support/sdk/java/tinyos.jar`
  export CLASSPATH="$CLASSPATH;."
  </pre>
  
! <p><b><em>TinyOS 2.x</em></b>
  <table border="0">
  <tbody><tr>
--- 272,281 ----
  that the windows CLASSPATH must be a windows-style path, not a cygwin path. You can 
  generate a windows style path from a cygwin-style path using 'cygpath -w'. For example:
! </p>
! <pre>export CLASSPATH=`cygpath -w $TOSROOT/support/sdk/java/tinyos.jar`
  export CLASSPATH="$CLASSPATH;."
  </pre>
  
! <p></p><b><em>TinyOS 2.x</em></b>
  <table border="0">
  <tbody><tr>
***************
*** 317,334 ****
  <i><font color="red">&#8224;</font>Only necessary if you're using the MSP430 platform/tools.</i>
  
! </p><p>
  In addition to the above environment variables, do the following on Linux machines:
! </p><ol>
  <li> Change the ownership on your /opt/tinyos-2.x files: <code>chown -R&nbsp;&lt;your uid&gt;&nbsp;/opt/tinyos-2.x
! </code></li><li> Change the permissions on any serial (/dev/ttyS&lt;N&gt;), usb
  (/dev/tts/usb&lt;N&gt;, /dev/ttyUSB&lt;N&gt;), or parallel (/dev/parport) devices you
! are going to use: <code>chmod 666 /dev/&lt;devicename&gt;<code>
! <!-- 
! <li> Add any users who will be using TinyOS to the uucp, lp, and lock 
! groups: </li>
! -->
! </code></code></li></ol>
  <li><p>Finally, if you have installed TinyOS 2.0.1, there is a bug in TOSSIM (which will be fixed in 2.0.2).
! The bug is in file <tt>tos/chips/atm128/sim/atm128_sim.h</tt>. Change these lines 22 and 23 from:
  
  <pre>
--- 319,338 ----
  <i><font color="red">&#8224;</font>Only necessary if you're using the MSP430 platform/tools.</i>
  
! <p>
  In addition to the above environment variables, do the following on Linux machines:
! </p>
! 
! <ol>
  <li> Change the ownership on your /opt/tinyos-2.x files: <code>chown -R&nbsp;&lt;your uid&gt;&nbsp;/opt/tinyos-2.x
! </code></li>
! <li> Change the permissions on any serial (/dev/ttyS&lt;N&gt;), usb
  (/dev/tts/usb&lt;N&gt;, /dev/ttyUSB&lt;N&gt;), or parallel (/dev/parport) devices you
! are going to use: <code>chmod 666 /dev/&lt;devicename&gt;</code></li>
! </ol></li>
! </ul>
! 
! <ul>
  <li><p>Finally, if you have installed TinyOS 2.0.1, there is a bug in TOSSIM (which will be fixed in 2.0.2).
! The bug is in file <tt>tos/chips/atm128/sim/atm128_sim.h</tt>. Change these lines 22 and 23 from:</p>
  
  <pre>
***************
*** 337,341 ****
  </pre>
  
! to
  
  <pre>
--- 341,345 ----
  </pre>
  
! <p>to</p>
  
  <pre>
***************
*** 344,356 ****
  </pre>
  
! If you do not do this, then timers will not work correctly.
  
! </li></ul>
! <a name="tinyos1"><h1>Switching back to a TinyOS 1.x tree</h1></a>
! Since the tools are backwardly compatible, you need only change
  your environment variables to point to the 1.x settings. Assuming 
  that your old tree was in /opt/tinyos-1.x, you would use the following 
  values:
! <p><b><em>TinyOS 1.x</em></b>
  <table border="0">
  <tbody><tr>
--- 348,363 ----
  </pre>
  
! <p>If you do not do this, then timers will not work correctly.</p>
! </li>
! </ul>
  
! <h1><a name="tinyos1">Switching back to a TinyOS 1.x tree</a></h1>
! <p>Since the tools are backwardly compatible, you need only change
  your environment variables to point to the 1.x settings. Assuming 
  that your old tree was in /opt/tinyos-1.x, you would use the following 
  values:
! </p>
! 
! <b><em>TinyOS 1.x</em></b>
  <table border="0">
  <tbody><tr>
***************
*** 385,389 ****
  
  </td></tr></tbody></table>
- </p>
  
  <p>Switching between the two should require switching only these environment
--- 392,395 ----



More information about the Tinyos-2-commits mailing list