From 3c7a9c99523c2b5b0e90a261f46338545b74fcd6 Mon Sep 17 00:00:00 2001 From: Jon Nordby Date: Sun, 31 Dec 2017 02:18:26 +0100 Subject: [PATCH] microflo: Update to 0.5.x --- Makefile | 3 +-- library.json | 5 ----- package.json | 4 ++-- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index a05aaed..8ee6d05 100644 --- a/Makefile +++ b/Makefile @@ -22,8 +22,7 @@ EMSCRIPTEN_CFLAGS:=-DMICROFLO_MESSAGE_LIMIT=200 -s NO_DYNAMIC_EXECUTION=1 -s EXP build-emscripten: rm -rf $(BUILD_DIR) mkdir -p $(BUILD_DIR) - $(MICROFLO) generate $(GRAPH) $(BUILD_DIR)/main.cpp --target emscripten ${LIBRARYOPTION} - cd $(BUILD_DIR) && echo '#include "emscripten.hpp"' >> main.cpp # HAAACK + $(MICROFLO) generate $(GRAPH) $(BUILD_DIR)/main.cpp --target emscripten --mainfile `pwd`/src/emscripten_main.hpp ${LIBRARYOPTION} cd $(BUILD_DIR) && emcc -o $(TARGET) --pre-js ${PROJECT_DIR}/src/emscripten-pre.js main.cpp $(COMMON_CFLAGS) ${EMSCRIPTEN_CFLAGS} test -e $(BUILD_DIR)/$(TARGET) node fix-nodejs-check.js dist/microflo-runtime.js diff --git a/library.json b/library.json index 0692d51..6a4e12d 100644 --- a/library.json +++ b/library.json @@ -1,13 +1,11 @@ { "components": [ "AnalogRead", - "ArduinoUno", "BooleanAnd", "BooleanOr", "BreakBeforeMake", "Constrain", "Count", - "Delimit", "DigitalRead", "DigitalWrite", "Forward", @@ -21,10 +19,7 @@ "MonitorPin", "NumberEquals", "PwmWrite", - "ReadCapacitivePin", "Route", - "SerialIn", - "SerialOut", "Split", "Timer", "ToggleBoolean", diff --git a/package.json b/package.json index b76c826..986fb4b 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "coffee-script": "^1.12.5", "fbp": "^1.5.0", "mocha": "^3.2.0", - "microflo": "^0.3.47", - "microflo-core": "^0.3.34" + "microflo": "^0.5.2", + "microflo-core": "^0.5.0" } }