Merge pull request #311 from klutvott123/compile-script

Compile script

Author: mikeller

bin/build.sh

@@ -16,20 +16,31 @@ if [ ${#MANIFEST[@]} -eq 0 ]; then
     exit 1
 fi
 
+SCRIPTS_LUA=obj/SCRIPTS/BF/COMPILE/scripts.lua
+
+echo 'local scripts = {' >> $SCRIPTS_LUA
+for f in ${MANIFEST[@]};
+do
+    echo '    ''"'${f/\obj/}'",' >> $SCRIPTS_LUA
+done
+echo '}' >> $SCRIPTS_LUA
+echo 'return scripts[...]' >> $SCRIPTS_LUA
+
+MANIFEST+=($SCRIPTS_LUA);
+
 for f in ${MANIFEST[@]};
 do
     SRC_NAME=$f
-    OBJ_NAME=$(dirname ${f})/$(basename ${f} .lua).luac
-    echo -e "Compiling file \e[1m${SRC_NAME}\e[21m..."
-    luac -s -o ${OBJ_NAME} ${SRC_NAME}
+    echo -e "Testing file \e[1m${SRC_NAME}\e[21m..."
+    luac -p ${SRC_NAME}
     _fail=$?
     if [[ $_fail -ne 0 ]]; then
         LAST_FAILURE=$_fail
-        echo -e "\e[1m\e[39m[\e[31mBUILD FAILED\e[39m]\e[21m Compilation error in file ${SRC_NAME}\e[1m"
+        echo -e "\e[1m\e[39m[\e[31mBUILD FAILED\e[39m]\e[21m Error in file ${SRC_NAME}\e[1m"
     fi
 done
 
 if [[ $LAST_FAILURE -eq 0 ]]; then
-    echo -e "\e[1m\e[39m[\e[32mTEST SUCCESSFUL\e[39m]\e[21m All lua files built successfully!"
+    echo -e "\e[1m\e[39m[\e[32mTEST SUCCESSFUL\e[39m]\e[21m"
 fi
 exit $LAST_FAILURE

src/SCRIPTS/BF/COMPILE/compile.lua

@@ -0,0 +1,21 @@
+local i = 1
+
+local function compile()
+    local script = assert(loadScript("COMPILE/scripts.lua"))(i)
+    collectgarbage()
+    i = i + 1
+    if script then
+        lcd.clear()
+        lcd.drawText(2, 2, "Compiling...", SMLSIZE)
+        lcd.drawText(2, 22, script, SMLSIZE)
+        assert(loadScript(script, 'c'))
+        collectgarbage()
+        return 0
+    end
+    local file = io.open("COMPILE/scripts_compiled.lua", 'w')
+    io.write(file, "return true")
+    io.close(file)
+    return 1
+end
+
+return compile

src/SCRIPTS/BF/COMPILE/scripts_compiled.lua

@@ -0,0 +1 @@
+return false

src/SCRIPTS/TOOLS/bf.lua

@@ -3,12 +3,17 @@ chdir("/SCRIPTS/BF")
 
 apiVersion = 0
 
-protocol = assert(loadScript("protocols.lua"))()
-radio = assert(loadScript("radios.lua"))()
+local run = nil
+local scriptsCompiled = assert(loadScript("COMPILE/scripts_compiled.lua"))()
 
-assert(loadScript(protocol.transport))()
-assert(loadScript("MSP/common.lua"))()
+if scriptsCompiled then
+    protocol = assert(loadScript("protocols.lua"))()
+    radio = assert(loadScript("radios.lua"))()
+    assert(loadScript(protocol.transport))()
+    assert(loadScript("MSP/common.lua"))()
+    run = assert(loadScript("ui.lua"))()
+else
+    run = assert(loadScript("COMPILE/compile.lua"))()
+end
 
-local run_ui = assert(loadScript("ui.lua"))()
-
-return { run=run_ui }
+return { run=run }