Browse Source

get rid of scons stuff...messing with imports it seems

Chris Mullins 8 years ago
parent
commit
ac844931d5
2 changed files with 8 additions and 5 deletions
  1. 2 2
      .build_web.py
  2. 6 3
      platformio.ini

+ 2 - 2
.build_web.py

@@ -15,7 +15,7 @@ def is_tool(name):
     except:
         return False;
 
-def pre_build(source, target, env):
+def build_web():
     if is_tool("npm"):
         os.chdir("web")
         print("Attempting to build webpage...")
@@ -31,4 +31,4 @@ def pre_build(source, target, env):
         finally:
             os.chdir("..");
 
-env.Execute(pre_build)
+build_web()

+ 6 - 3
platformio.ini

@@ -20,8 +20,8 @@ lib_deps_external =
   https://github.com/ratkins/RGBConverter
   Hash
   WebSockets
-extra_script =
-  .build_web.py
+extra_scripts =
+  pre:.build_web.py
 build_flags = !python .get_version.py -DMQTT_MAX_PACKET_SIZE=200 -Idist
 # -D DEBUG_PRINTF
 # -D MQTT_DEBUG
@@ -33,7 +33,7 @@ framework = arduino
 board = nodemcuv2
 upload_speed = 115200
 build_flags = ${common.build_flags} -Wl,-Tesp8266.flash.4m1m.ld -D FIRMWARE_VARIANT=nodemcuv2
-extra_script = ${common.extra_script}
+extra_scripts = ${common.extra_scripts}
 lib_deps =
   ${common.lib_deps_builtin}
   ${common.lib_deps_external}
@@ -43,6 +43,7 @@ platform = espressif8266
 framework = arduino
 board = d1_mini
 build_flags = ${common.build_flags} -Wl,-Tesp8266.flash.4m1m.ld -D FIRMWARE_VARIANT=d1_mini
+extra_scripts = ${common.extra_scripts}
 lib_deps =
   ${common.lib_deps_builtin}
   ${common.lib_deps_external}
@@ -52,6 +53,7 @@ platform = espressif8266
 board = esp12e
 framework = arduino
 build_flags = ${common.build_flags} -Wl,-Tesp8266.flash.4m1m.ld -D FIRMWARE_VARIANT=esp12
+extra_scripts = ${common.extra_scripts}
 lib_deps =
   ${common.lib_deps_builtin}
   ${common.lib_deps_external}
@@ -61,6 +63,7 @@ platform = espressif8266
 board = esp07
 framework = arduino
 build_flags = ${common.build_flags} -Wl,-Tesp8266.flash.1m64.ld -D FIRMWARE_VARIANT=esp07
+extra_scripts = ${common.extra_scripts}
 lib_deps =
   ${common.lib_deps_builtin}
   ${common.lib_deps_external}