Updates to make things work on Linux.

Author: jadudm

build/build-linux.sh

@@ -5,35 +5,40 @@ rm -rf ${DEST}
 mkdir -p ${DEST}
 
 pushd ${SRC}
+  echo Building the Flow executable.
   raco exe --gui -o ${BASE} gui.rkt
+  echo Sleeping
   sleep 2
+  echo Readying for Distribution
   raco distribute ${DEST} ${BASE}
-	sleep 2
-	chmod 755 ${DEST}/${BASE}
+  echo Sleeping
+  sleep 2
+  echo Setting executable mode.
+  chmod 755 ${DEST}/bin/${BASE}
 popd
 
-cp -R ../bin/unix/ ${DEST}/bin/unix/
+echo Moving files around
 sleep 2
+cp -R ../bin/unix/ ${DEST}/bin/unix/
 cp -R ../config/ ${DEST}/config/
-sleep 2
 cp -R ../interface/ ${DEST}/interface/
-sleep 2
 cp -R ../occam/ ${DEST}/occam/
-sleep 2
 mkdir -p ${DEST}/temp
-sleep 2
 # Hopefully eliminating the "not found" errors
 # that happen... for reasons unknown.
 mkdir -p ${DEST}/conf
 touch ${DEST}/conf/not-found.html
 
+echo Going up one level
 pushd ..
-tar cvzf Flow.tgz Flow/
+  echo Zipping.
+  tar cvzf Flow.tgz Flow/
 
-if [ "${USER}" == "reynoldsm" ]; then
+  echo If the first command line argument was "upload"...
+  if [ "$1" = "upload" ]; then
+        echo Uploading
 	scp -i ~/.ssh/jadudm-rsa ${BASE}.tgz [email protected]:/srv/www/org/transterpreter.download/files/flow/
-fi
-
+  fi
 popd
 
 

server/gui.rkt

@@ -274,6 +274,7 @@
                           (open-input-file (build-port (get-data 'port)) #:mode 'binary))
 
                (let loop ()
+                 (when (port? (get-data 'SERIALP))
                  (let ([line (read-line (get-data 'SERIALP))]
                        [txt (send
                              (send serial-editor get-editor)
@@ -288,7 +289,7 @@
                       (set! c 0)]
                      [else 
                       (send serial-editor set-value txt)])
-                     )
+                     ))
 
                  (loop))
                )))
@@ -308,8 +309,8 @@
                            (thread (λ () (serve))))
 
                      (send serial-f show true)
-                     (set! serial-thread-id
-                           (thread (get-data 'serial-thread)))
+                     ;; (set! serial-thread-id
+                     ;;      (thread (get-data 'serial-thread)))
                      )))))
 
 (define quit

server/system.rkt

@@ -244,7 +244,11 @@
   ;; Racket nicely cleans up after us, so we kill the thread
   ;; and the open serial port goes away.
   (when (get-data 'serial-thread-id)
-    (kill-thread (get-data 'serial-thread-id)))
+    (when (port? (get-data 'SERIALP))
+      (close-input-port (get-data 'SERIALP)))
+    (sleep 1)
+    (kill-thread (get-data 'serial-thread-id))
+    (sleep 1))
 
   (when-file (tbc-file)
              (report 'BIN-TO-HEX " ")
@@ -293,4 +297,4 @@
           (avrdude-cmd ARDUINO-PORT path))))
 
     (report 'FIRMWARE cmd)
-    (exe cmd)))
+    (exe cmd)))