build: move stored_apps wscript to wscript_build

Signed-off-by: Joshua Jun <lets@throw.rocks>

Author: jplexer

stored_apps/wscript stored_apps/wscript_buildstored_apps/wscript renamed to stored_apps/wscript_build

@@ -1,16 +1,10 @@
-import os
-import time
-
-import waflib
-import waflib.Tools
 import waftools.objcopy as objcopy
 import waftools.pebble_sdk_gcc as pebble_sdk_gcc
 
 from resources.types.resource_definition import ResourceDefinition
 from resources.types.resource_object import ResourceObject
 
 from pebble_sdk_platform import pebble_platforms
-from pebble_sdk_version import set_env_sdk_version
 
 import generate_appinfo
 
@@ -19,14 +13,6 @@ import generate_appinfo
 #
 
 
-# -----------------------------------------------------------------------------------
-def configure(conf):
-    process_info = conf.path.parent.find_node('src/fw/process_management/pebble_process_info.h')
-    set_env_sdk_version(conf, process_info)
-    pebble_sdk_gcc.configure(conf)
-    conf.env.append_value('DEFINES', 'RELEASE')
-
-
 # -----------------------------------------------------------------------------------
 def build_app(bld, app_name):
     sdk_folder = bld.path.parent.get_bld().make_node('sdk').make_node(bld.env.PLATFORM_NAME)
@@ -118,16 +104,14 @@ def build_app(bld, app_name):
 
 
 # -----------------------------------------------------------------------------------
-def build(bld):
-    # When you add a new stored app, you must also do the following to include it into the
-    # system resources and register it with the launcher:
-    #  1.) Add a raw resource entry with a  name  of "STORED_APP_<appname>" to
-    #      resources/normal/resource_map.json.
-    #      The "file" field should be set to normal/raw/app_<appname>.bin
-    #  2.) Add a new entry to the INIT_STORED_APPS array in system_app_registry.h
-    apps = bld.path.ant_glob('*', dir=True, src=False)
-    for app in apps:
-        build_app(bld, app.name)
-
+# When you add a new stored app, you must also do the following to include it into the
+# system resources and register it with the launcher:
+#  1.) Add a raw resource entry with a  name  of "STORED_APP_<appname>" to
+#      resources/normal/resource_map.json.
+#      The "file" field should be set to normal/raw/app_<appname>.bin
+#  2.) Add a new entry to the INIT_STORED_APPS array in system_app_registry.h
+apps = bld.path.ant_glob('*', dir=True, src=False)
+for app in apps:
+    build_app(bld, app.name)
 
 # vim:filetype=python

wscript

@@ -31,8 +31,11 @@ sys.path.append(os.path.join(waf_dir, 'waftools'))
 import waftools.gitinfo
 import waftools.ldscript
 import waftools.openocd
+import waftools.pebble_sdk_gcc as pebble_sdk_gcc
 from waftools.pebble_sdk_locator import activate_sdk
 
+from pebble_sdk_version import set_env_sdk_version
+
 # Prefer an installed PebbleOS SDK's binaries (toolchain, QEMU, sftool) when
 # present. Done at import time so it applies to every waf invocation.
 activate_sdk(waflib.Context.run_dir or os.getcwd())
@@ -370,7 +373,9 @@ def configure(conf):
 
     Logs.pprint('CYAN', 'Configuring stored apps environment')
     conf.setenv('stored_apps', base_env)
-    conf.recurse('stored_apps')
+    process_info = conf.path.find_node('src/fw/process_management/pebble_process_info.h')
+    set_env_sdk_version(conf, process_info)
+    pebble_sdk_gcc.configure(conf)
 
     # Confirm that requirements-*.txt and requirements-osx-brew.txt have been satisfied.
     import tool_check