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

[Phil Levis]

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

Modified Files:
	upgrade-tinyos.html 
Log Message:
Merge changes for cygwin installs onto trunk.


Index: upgrade-tinyos.html
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/doc/html/upgrade-tinyos.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** upgrade-tinyos.html	12 Jul 2006 16:59:36 -0000	1.2
--- upgrade-tinyos.html	13 Jul 2006 09:07:52 -0000	1.3
***************
*** 162,165 ****
--- 162,175 ----
  1.x versions must remain installed so use <code>rpm -ivh</code>. If you are 
  only installing a 2.x tree, you can use <code>rpm -Uvh</code>.
+ If you using the Cygwin version recommended
+ in these install
+ instructions, you should install the "Recommended" Windows/Cygwin
+ nesC RPM. If you t
+ to a Cygwin version incompatibility: try the "Other" Windows/Cygwin 
+ RPM (1.2.7b). Try installing it and it does not work (e.g., you
+ get strange errors when you try to execute it), this may be due
+ to a Cygwin version incompatibility: try the "Other" Windows/Cygwin 
+ RPM (1.2.7a). 
+ 
  <p>
  
***************
*** 169,173 ****
  <tbody><tr>
    <td bgcolor="#dddddd"><b>Tool</b></td>
!   <td bgcolor="#dddddd"><b>Windows/Cygwin</b></td>
    <td bgcolor="#dddddd"><b>Linux</b></td>
    <td bgcolor="#dddddd"><b>Command</b></td>
--- 179,184 ----
  <tbody><tr>
    <td bgcolor="#dddddd"><b>Tool</b></td>
!   <td bgcolor="#dddddd"><b>Recommended Windows/Cygwin</b></td>
!   <td bgcolor="#dddddd"><b>Other Windows/Cygwin</b></td>
    <td bgcolor="#dddddd"><b>Linux</b></td>
    <td bgcolor="#dddddd"><b>Command</b></td>
***************
*** 176,179 ****
--- 187,191 ----
  <tr>
    <td>NesC</td>
+   <td><a href="http://csl.stanford.edu/~pal/tinyos/nesc-1.2.7b-1.cygwin.i386.rpm">nesc-1.2.7b-1.cygwin.i386.rpm</a></td>
    <td><a href="http://www.tinyos.net/dist-1.2.0/tinyos/windows/nesc-1.2.7a-1.cygwin.i386.rpm">nesc-1.2.7a-1.cygwin.i386.rpm</a></td>
    <td><a href="http://www.tinyos.net/dist-1.2.0/tinyos/linux/nesc-1.2.7a-1.i386.rpm">nesc-1.2.7a-1.i386.rpm </a></td>
***************
*** 184,187 ****
--- 196,200 ----
    <td bgcolor="#dddddd">tinyos-tools</td>
    <td bgcolor="#dddddd"><a href="http://www.tinyos.net/dist-2.0.0/tinyos/windows/tinyos-tools-1.2.2-1.cygwin.i386.rpm">tinyos-tools-1.2.2-1.cygwin.i386.rpm</a></td>
+   <td bgcolor="#dddddd"><a href="http://www.tinyos.net/dist-2.0.0/tinyos/windows/tinyos-tools-1.2.2-1.cygwin.i386.rpm">tinyos-tools-1.2.2-1.cygwin.i386.rpm</a></td>
    <td bgcolor="#dddddd"><a href="http://www.tinyos.net/dist-2.0.0/tinyos/linux/tinyos-tools-1.2.2-1.i386.rpm">tinyos-tools-1.2.2-1.i386.rpm</a></td>
    <td bgcolor="#dddddd"><a href=""></a><code>rpm -ivh --force</code>&nbsp;(1.x tree)<br><code>rpm -Uvh</code>&nbsp;(no 1.x tree)<br></td>