Allow overriding sketchbook and Arduino library paths.

Author: peplin

plugin/vim-arduino

@@ -1,5 +1,5 @@
 #!/bin/sh
-#/ Usage: vim-arduino <pde file> [board] [serialport]
+#/ Usage: vim-arduino <pde file> [board] [serialport] [sketchbook] [arduinohome]
 #/ Invokes the Arduino IDE command line runner to compile and deploy
 #/ Arduino sketches.
 #/
@@ -13,6 +13,8 @@
 pde_file=
 board="uno"
 port=
+sketchbook=
+arduinohome=
 switch="-c"
 
 while [ $# -gt 0 ]
@@ -36,6 +38,16 @@ do
             switch="-c"
             shift
             ;;
+        -k|--sketchbook)
+            shift
+            sketchbook=$1
+            shift
+            ;;
+        -a|--arduinohome)
+            shift
+            arduinohome=$1
+            shift
+            ;;
         *)
             if [ -z "$pde_file" ]
             then pde_file="$1"
@@ -75,12 +87,9 @@ fi
 
 # echo "Compiling '$pde_file' for board $board on serial port $port"
 
-sketchbook=$(echo $HOME/Documents/Arduino)
-
 DIR="$( cd "$( dirname "$0" )" && pwd )"
 java \
-  -Djava.library.path=/Applications/Arduino.app/Contents/Resources/Java \
-  -d32 \
+  -Djava.library.path="$arduinohome" \
   -Darduino.sketchbook="$sketchbook" \
   -Djava.awt.headless=true \
   -jar "$DIR/vim-arduino-cli.jar" "$switch" "$pde_file" "$port" "$board"

plugin/vim-arduino.vim

@@ -44,6 +44,14 @@ if !exists('g:vim_arduino_auto_open_serial')
   let g:vim_arduino_auto_open_serial = 0
 endif
 
+if !exists('g:vim_arduino_sketchbook')
+  let g:vim_arduino_sketchbook = $HOME."/Documents/Arduino"
+endif
+
+if !exists('g:vim_arduino_sdk_home')
+    let g:vim_arduino_sdk_home = "/Applications/Arduino.app/Contents/Resources/Java"
+endif
+
 let s:helper_dir = expand("<sfile>:h")
 
 " Private: Get the board to deploy to
@@ -104,8 +112,10 @@ function! s:InvokeArduinoCli(deploy)
     let l:command = s:helper_dir . "/vim-arduino " .
           \ l:flag . " " .
           \ "-b " . l:board . " " .
+          \ "-a " . g:vim_arduino_sdk_home . " " .
+          \ "-k " . g:vim_arduino_sketchbook . " " .
           \ shellescape(l:f_name)
-    " echo l:command
+    echo l:command
     let l:result = system(l:command)
     call s:PrintStatus(v:shell_error)
     echo l:result