Updated binary and readme

8 files changed, 50 insertions, 10 deletions

diff --git a/README.md b/README.md
index 0316ff2..37dba84 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,18 @@
-# Mario Pebble Watch Face
-_by Denis Dzyubenko, mod by Alexey Avdyukhin_
+# Mario Watchface for Pebble Classic and Pebble Time
+_by Denis Dzyubenko and Alexey Avdyukhin_
 
 Mario jumps every minute.
 
-[![Preview](https://github.com/shadone/pebble-mario/raw/master/preview.png)](https://github.com/shadone/pebble-mario/raw/master/preview.png)
+[![Preview](mario_color.gif)](mario_color.gif) [![Preview](mario_bw.gif)](mario_bw.gif)
 
-Based on a concept by Habib:
+Based on a concept by Denis Dzyubenko:
+https://github.com/shadone/pebble-mario
+
+Which based on a concept by Habib:
 http://www.mypebblefaces.com/view?fID=290&aName=Habib&pageTitle=MarioTime&auID=265
 
 Download: [mario.pbw](mario.pbw?raw=true)
 
-
 Animation:
 
 ![animation](https://github.com/shadone/pebble-mario/raw/master/screencast.gif)
diff --git a/graphics.pxi b/graphics.pxi
deleted file mode 100644
index 0a727cb..0000000
--- a/graphics.pxi
+++ /dev/null
diff --git a/mario.pbw b/mario.pbw
index 37c861f..fdd9009 100644
--- a/mario.pbw
+++ b/mario.pbw
diff --git a/mario_bw.gif b/mario_bw.gif
new file mode 100644
index 0000000..536afb9
--- /dev/null
+++ b/mario_bw.gif
diff --git a/mario_color.gif b/mario_color.gif
new file mode 100644
index 0000000..3b0575d
--- /dev/null
+++ b/mario_color.gif
diff --git a/preview.png b/preview.png
deleted file mode 100644
index 960f94b..0000000
--- a/preview.png
+++ /dev/null
diff --git a/screencast.gif b/screencast.gif
deleted file mode 100644
index d7b864e..0000000
--- a/screencast.gif
+++ /dev/null
diff --git a/wscript b/wscript
index 0554dc8..b20f58f 100644
--- a/wscript
+++ b/wscript
@@ -1,10 +1,17 @@
 
-#
+    #
 # This file is the default set of rules to compile a Pebble project.
 #
 # Feel free to customize this to your needs.
 #
 
+import os.path
+try:
+    from sh import CommandNotFound, jshint, cat, ErrorReturnCode_2
+    hint = jshint
+except (ImportError, CommandNotFound):
+    hint = None
+
 top = '.'
 out = 'build'
 
@@ -15,10 +22,41 @@ def configure(ctx):
     ctx.load('pebble_sdk')
 
 def build(ctx):
+    if False and hint is not None:
+        try:
+            hint([node.abspath() for node in ctx.path.ant_glob("src/**/*.js")], _tty_out=False) # no tty because there are none in the cloudpebble sandbox.
+        except ErrorReturnCode_2 as e:
+            ctx.fatal("\nJavaScript linting failed (you can disable this in Project Settings):\n" + e.stdout)
+
+    # Concatenate all our JS files (but not recursively), and only if any JS exists in the first place.
+    ctx.path.make_node('src/js/').mkdir()
+    js_paths = ctx.path.ant_glob(['src/*.js', 'src/**/*.js'])
+    if js_paths:
+        ctx(rule='cat ${SRC} > ${TGT}', source=js_paths, target='pebble-js-app.js')
+        has_js = True
+    else:
+        has_js = False
+
     ctx.load('pebble_sdk')
 
-    ctx.pbl_program(source=ctx.path.ant_glob('src/**/*.c'),
-                    target='pebble-app.elf')
+    build_worker = os.path.exists('worker_src')
+    binaries = []
+
+    for p in ctx.env.TARGET_PLATFORMS:
+        ctx.set_env(ctx.all_envs[p])
+        ctx.set_group(ctx.env.PLATFORM_NAME)
+        app_elf='{}/pebble-app.elf'.format(p)
+        ctx.pbl_program(source=ctx.path.ant_glob('src/**/*.c'),
+        target=app_elf)
+
+        if build_worker:
+            worker_elf='{}/pebble-worker.elf'.format(p)
+            binaries.append({'platform': p, 'app_elf': app_elf, 'worker_elf': worker_elf})
+            ctx.pbl_worker(source=ctx.path.ant_glob('worker_src/**/*.c'),
+            target=worker_elf)
+        else:
+            binaries.append({'platform': p, 'app_elf': app_elf})
 
-    ctx.pbl_bundle(elf='pebble-app.elf',
-                   js=ctx.path.ant_glob('src/js/**/*.js'))
+    ctx.set_group('bundle')
+    ctx.pbl_bundle(binaries=binaries, js='pebble-js-app.js' if has_js else [])
+    
\ No newline at end of file