Updated Build Information

.gitignore

+build
+.DS_Store
+.lock-waf_darwin_build

appinfo.json

 {
-    "appKeys": {
-        "MSG_KEY_ARTIST": 102,
-        "MSG_KEY_CMD": 0,
-        "MSG_KEY_CMD_DATA": 1,
-        "MSG_KEY_MUTED": 104,
-        "MSG_KEY_PLAY_STATE": 103,
-        "MSG_KEY_TITLE": 101,
-        "MSG_KEY_VOLUME": 100
-    },
-    "capabilities": [
-        "configurable"
-    ],
-    "companyName": "Douglas Otwell",
-    "longName": "Rockodi",
-    "projectType": "native",
-    "resources": {
-        "media": [
-            {
-                "file": "images/ff.png",
-                "name": "ICON_FF",
-                "type": "png"
-            },
-            {
-                "file": "images/rev.png",
-                "name": "ICON_REV",
-                "type": "png"
-            },
-            {
-                "file": "images/rockodi.png",
-                "menuIcon": true,
-                "name": "ICON_ROCKODI",
-                "type": "png"
-            },
-            {
-                "file": "images/play.png",
-                "name": "ICON_PLAY",
-                "type": "png"
-            },
-            {
-                "file": "images/down.png",
-                "name": "ICON_DOWN",
-                "type": "png"
-            },
-            {
-                "file": "images/up.png",
-                "name": "ICON_UP",
-                "type": "png"
-            },
-            {
-                "file": "images/check.png",
-                "name": "ICON_CHECK",
-                "type": "png"
-            },
-            {
-                "file": "images/cursor_down.png",
-                "name": "ICON_CURSOR_DOWN",
-                "type": "png"
-            },
-            {
-                "file": "images/cursor_up.png",
-                "name": "ICON_CURSOR_UP",
-                "type": "png"
-            },
-            {
-                "file": "images/pause.png",
-                "name": "ICON_PAUSE",
-                "type": "png"
-            },
-            {
-                "file": "images/speaker.png",
-                "name": "ICON_SPEAKER",
-                "type": "png"
-            },
-            {
-                "file": "images/addons.png",
-                "name": "ICON_ADDONS",
-                "type": "png"
-            },
-            {
-                "file": "images/remote.png",
-                "name": "ICON_REMOTE",
-                "type": "png"
-            },
-            {
-                "file": "images/player.png",
-                "name": "ICON_PLAYER",
-                "type": "png"
-            },
-            {
-                "file": "images/power.png",
-                "name": "ICON_POWER",
-                "type": "png"
-            },
-            {
-                "file": "images/vol_dn.png",
-                "name": "ICON_VOL_DN",
-                "type": "png"
-            },
-            {
-                "file": "images/vol_up.png",
-                "name": "ICON_VOL_UP",
-                "type": "png"
-            },
-            {
-                "file": "images/button.png",
-                "name": "ICON_BUTTON",
-                "type": "png"
-            },
-            {
-                "file": "images/list.png",
-                "name": "ICON_LIST",
-                "type": "png"
-            },
-            {
-                "file": "images/goto.png",
-                "name": "ICON_GOTO",
-                "type": "png"
-            },
-            {
-                "file": "images/full.png",
-                "name": "ICON_FULL",
-                "type": "png"
-            },
-            {
-                "file": "images/home.png",
-                "name": "ICON_HOME",
-                "type": "png"
-            },
-            {
-                "file": "images/video.png",
-                "name": "ICON_VIDEO",
-                "type": "png"
-            },
-            {
-                "file": "images/weather.png",
-                "name": "ICON_WEATHER",
-                "type": "png"
-            },
-            {
-                "file": "images/info.png",
-                "name": "ICON_INFO",
-                "type": "png"
-            },
-            {
-                "file": "images/pics.png",
-                "name": "ICON_PICS",
-                "type": "png"
-            }
-        ]
-    },
-    "sdkVersion": "2",
-    "shortName": "Rockodi",
-    "uuid": "77495959-66fe-4db1-ab4b-368369babb00",
-    "versionCode": 1,
-    "versionLabel": "0.1",
-    "watchapp": {
-        "watchface": false
-    }
-}
+  "appKeys": {
+    "MSG_KEY_ARTIST": 102,
+    "MSG_KEY_CMD": 0,
+    "MSG_KEY_CMD_DATA": 1,
+    "MSG_KEY_MUTED": 104,
+    "MSG_KEY_PLAY_STATE": 103,
+    "MSG_KEY_TITLE": 101,
+    "MSG_KEY_VOLUME": 100
+  },
+  "capabilities": [
+    "configurable"
+  ],
+  "companyName": "Douglas Otwell",
+  "longName": "Rockodi",
+  "projectType": "native",
+  "resources": {
+    "media": [
+      {
+        "file": "images/ff.png",
+        "name": "ICON_FF",
+        "type": "png"
+      },
+      {
+        "file": "images/rev.png",
+        "name": "ICON_REV",
+        "type": "png"
+      },
+      {
+        "file": "images/rockodi.png",
+        "menuIcon": true,
+        "name": "ICON_ROCKODI",
+        "type": "png"
+      },
+      {
+        "file": "images/play.png",
+        "name": "ICON_PLAY",
+        "type": "png"
+      },
+      {
+        "file": "images/down.png",
+        "name": "ICON_DOWN",
+        "type": "png"
+      },
+      {
+        "file": "images/up.png",
+        "name": "ICON_UP",
+        "type": "png"
+      },
+      {
+        "file": "images/check.png",
+        "name": "ICON_CHECK",
+        "type": "png"
+      },
+      {
+        "file": "images/cursor_down.png",
+        "name": "ICON_CURSOR_DOWN",
+        "type": "png"
+      },
+      {
+        "file": "images/cursor_up.png",
+        "name": "ICON_CURSOR_UP",
+        "type": "png"
+      },
+      {
+        "file": "images/pause.png",
+        "name": "ICON_PAUSE",
+        "type": "png"
+      },
+      {
+        "file": "images/speaker.png",
+        "name": "ICON_SPEAKER",
+        "type": "png"
+      },
+      {
+        "file": "images/addons.png",
+        "name": "ICON_ADDONS",
+        "type": "png"
+      },
+      {
+        "file": "images/remote.png",
+        "name": "ICON_REMOTE",
+        "type": "png"
+      },
+      {
+        "file": "images/player.png",
+        "name": "ICON_PLAYER",
+        "type": "png"
+      },
+      {
+        "file": "images/player_alpha.png",
+        "name": "ICON_PLAYER_ALPHA",
+        "type": "png"
+      },
+      {
+        "file": "images/power.png",
+        "name": "ICON_POWER",
+        "type": "png"
+      },
+      {
+        "file": "images/vol_dn.png",
+        "name": "ICON_VOL_DN",
+        "type": "png"
+      },
+      {
+        "file": "images/vol_up.png",
+        "name": "ICON_VOL_UP",
+        "type": "png"
+      },
+      {
+        "file": "images/button.png",
+        "name": "ICON_BUTTON",
+        "type": "png"
+      },
+      {
+        "file": "images/list.png",
+        "name": "ICON_LIST",
+        "type": "png"
+      },
+      {
+        "file": "images/goto.png",
+        "name": "ICON_GOTO",
+        "type": "png"
+      },
+      {
+        "file": "images/full.png",
+        "name": "ICON_FULL",
+        "type": "png"
+      },
+      {
+        "file": "images/home.png",
+        "name": "ICON_HOME",
+        "type": "png"
+      },
+      {
+        "file": "images/video.png",
+        "name": "ICON_VIDEO",
+        "type": "png"
+      },
+      {
+        "file": "images/weather.png",
+        "name": "ICON_WEATHER",
+        "type": "png"
+      },
+      {
+        "file": "images/info.png",
+        "name": "ICON_INFO",
+        "type": "png"
+      },
+      {
+        "file": "images/pics.png",
+        "name": "ICON_PICS",
+        "type": "png"
+      }
+    ]
+  },
+  "sdkVersion": "3",
+  "shortName": "Rockodi",
+  "uuid": "77495959-66fe-4db1-ab4b-368369babb00",
+  "versionCode": 1,
+  "versionLabel": "0.1",
+  "watchapp": {
+    "watchface": false
+  },
+  "targetPlatforms": [
+    "aplite",
+    "basalt"
+  ]
+}
\ No newline at end of file

wscript

@@ -6,11 +6,6 @@
 #
 
 import os.path
-try:
-    from sh import CommandNotFound, jshint, cat, ErrorReturnCode_2
-    hint = jshint
-except (ImportError, CommandNotFound):
-    hint = None
 
 top = '.'
 out = 'build'
@@ -20,38 +15,27 @@ def options(ctx):
 
 def configure(ctx):
     ctx.load('pebble_sdk')
-    global hint
-    if hint is not None:
-        hint = hint.bake(['--config', 'pebble-jshintrc'])
 
 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')
-
-    if os.path.exists('worker_src'):
-        ctx.pbl_worker(source=ctx.path.ant_glob('worker_src/**/*.c'),
-                        target='pebble-worker.elf')
-        ctx.pbl_bundle(elf='pebble-app.elf',
-                        worker_elf='pebble-worker.elf',
-                        js='pebble-js-app.js' if has_js else [])
-    else:
-        ctx.pbl_bundle(elf='pebble-app.elf',
-                       js='pebble-js-app.js' if has_js else [])
-
+    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(ctx.env.BUILD_DIR)
+        ctx.pbl_program(source=ctx.path.ant_glob('src/**/*.c'),
+        target=app_elf)
+
+        if build_worker:
+            worker_elf='{}/pebble-worker.elf'.format(ctx.env.BUILD_DIR)
+            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.set_group('bundle')
+    ctx.pbl_bundle(binaries=binaries, js=ctx.path.ant_glob('src/js/**/*.js'))

wscript.backup

+
+#
+# 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'
+
+def options(ctx):
+    ctx.load('pebble_sdk')
+
+def configure(ctx):
+    ctx.load('pebble_sdk')
+    global hint
+    if hint is not None:
+        hint = hint.bake(['--config', 'pebble-jshintrc'])
+
+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')
+
+    if os.path.exists('worker_src'):
+        ctx.pbl_worker(source=ctx.path.ant_glob('worker_src/**/*.c'),
+                        target='pebble-worker.elf')
+        ctx.pbl_bundle(elf='pebble-app.elf',
+                        worker_elf='pebble-worker.elf',
+                        js='pebble-js-app.js' if has_js else [])
+    else:
+        ctx.pbl_bundle(elf='pebble-app.elf',
+                       js='pebble-js-app.js' if has_js else [])
+