From e5b1e44a8ae8c593456f4b4734f05c9065f6f07b Mon Sep 17 00:00:00 2001
From: Hanna Mendes Levitin <hanna@anomaly-3.(none)>
Date: Thu, 2 Dec 2010 22:38:45 -0500
Subject: side reorder, home link, template mod to add rel bar links

---
 docs/source/_templates/layout.html | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 docs/source/_templates/layout.html

(limited to 'docs/source/_templates')

diff --git a/docs/source/_templates/layout.html b/docs/source/_templates/layout.html
new file mode 100644
index 0000000..98b3d82
--- /dev/null
+++ b/docs/source/_templates/layout.html
@@ -0,0 +1,6 @@
+{% extends "!layout.html" %}
+{% block rootrellink %}
+    <li><a href="http://leaflabs.com">LeafLabs</a> |</li>
+    <li><a href="home.html">Docs Home</a> |</li>
+    {{ super() }}
+{% endblock %}      
\ No newline at end of file
-- 
cgit v1.2.3


From 07fa40623307ea474a775d6f9be5ce8afd783f23 Mon Sep 17 00:00:00 2001
From: Marti Bolivar <mbolivar@mit.edu>
Date: Wed, 15 Dec 2010 19:17:55 -0500
Subject: 0.0.9 release.

Made some changes to Servo to get it to compile from within the IDE.

Also fixed a lurking broken link in the docs.
---
 docs/source/_templates/layout.html |  4 ++--
 libraries/Servo/Servo.cpp          |  4 ++--
 libraries/Servo/Servo.h            |  2 +-
 support/scripts/copy-to-ide        | 34 +++++++++++++++++++++++++---------
 4 files changed, 30 insertions(+), 14 deletions(-)

(limited to 'docs/source/_templates')

diff --git a/docs/source/_templates/layout.html b/docs/source/_templates/layout.html
index 98b3d82..bf05832 100644
--- a/docs/source/_templates/layout.html
+++ b/docs/source/_templates/layout.html
@@ -1,6 +1,6 @@
 {% extends "!layout.html" %}
 {% block rootrellink %}
     <li><a href="http://leaflabs.com">LeafLabs</a> |</li>
-    <li><a href="home.html">Docs Home</a> |</li>
+    <li><a href="index.html">Docs Home</a> |</li>
     {{ super() }}
-{% endblock %}      
\ No newline at end of file
+{% endblock %}      
diff --git a/libraries/Servo/Servo.cpp b/libraries/Servo/Servo.cpp
index 4f60fbe..ae87b63 100644
--- a/libraries/Servo/Servo.cpp
+++ b/libraries/Servo/Servo.cpp
@@ -22,13 +22,13 @@
  * THE SOFTWARE.
  *****************************************************************************/
 
+#include "Servo.h"
+
 #include "boards.h"
 #include "io.h"
 #include "pwm.h"
 #include "wirish_math.h"
 
-#include "Servo.h"
-
 // Configure prescaler and overflow for a 20msec period (could just
 // use HardwareTimer::setPeriod(), but this lets conversions below
 // happen more statically, in combination with an inlined map() -- a
diff --git a/libraries/Servo/Servo.h b/libraries/Servo/Servo.h
index d35572a..1c75618 100644
--- a/libraries/Servo/Servo.h
+++ b/libraries/Servo/Servo.h
@@ -27,7 +27,7 @@
 
 #include <stdint.h>
 
-#include "HardwareTimer.h"
+#include "wirish.h"             /* hack for IDE compile */
 
 /* Note on Arduino compatibility:
 
diff --git a/support/scripts/copy-to-ide b/support/scripts/copy-to-ide
index c6b4c16..6f8d5f3 100755
--- a/support/scripts/copy-to-ide
+++ b/support/scripts/copy-to-ide
@@ -1,14 +1,17 @@
 #!/bin/sh
 
-# This hackish script copies the necessary library files into the Maple IDE
+# This hack copies the necessary library files into the Maple IDE
 # repository.
 
-# Change this
-DEST=`pwd`/../maple-ide-java/hardware/leaflabs/cores/maple
+DEST=$1
 
-FILES="LICENSE
+DEST_REF=$DEST/build/shared/reference
+DEST_CORES=$DEST/hardware/leaflabs/cores/maple
+
+LMAPLE_SRC="LICENSE
     ./libmaple/*.h
     ./libmaple/*.c
+    ./libmaple/*.S
     ./libmaple/usb/*.h
     ./libmaple/usb/*.c
     ./libmaple/usb/usb_lib/*.h
@@ -24,6 +27,8 @@ FILES="LICENSE
     ./support/ld/libcs3-lanchon-stm32.a
     ./support/ld/names.inc"
 
+LMAPLE_DOCS=./docs
+LMAPLE_DOCS_BUILD=$LMAPLE_DOCS/build/html
 
 echo "First make sure DEST exists: $DEST"
 if !(test -d $DEST)
@@ -32,9 +37,20 @@ then
     exit -1
 fi
 
-echo "\nThen delete the old files..."
-rm -r $DEST/*.c $DEST/*.cpp $DEST/*.h $DEST/*.cxx $DEST/*.inc $DEST/*.a $DEST/maple $DEST/maple_native
+# source
+echo Handling libmaple source
+rm -r $DEST_CORES/*.c $DEST_CORES/*.cpp $DEST_CORES/*.h $DEST_CORES/*.cxx $DEST_CORES/*.inc $DEST_CORES/*.a $DEST_CORES/*.S $DEST_CORES/maple $DEST_CORES/maple_native
+cp -R $LMAPLE_SRC $DEST_CORES
+
+# docs
+echo Deleting old reference directory contents
+rm -r $DEST_REF/*
+
+# echo "\nRebuilding documentation"
+# (cd $LMAPLE_DOCS; doxygen 2>/dev/null 1>/dev/null && make clean 2>/dev/null 1>/dev/null && make html 2>&1 1>/dev/null)
+
+echo Copying over documentation
+cp -R $LMAPLE_DOCS_BUILD/* $DEST_REF
 
-echo "\nFinally copy the new source files!"
-cp -R $FILES $DEST
-echo "Done."
+echo
+echo "Done.  Handle libraries manually!"
-- 
cgit v1.2.3