Merge pull request #42 from pebble/bugfix/wscript_sdk2-error

PBL-41326 Update convert-project to handle conversions through SDK3

Author: Katharine

pebble_tool/commands/sdk/project/convert.py

@@ -27,6 +27,7 @@ def __call__(self, args):
                 print("No conversion required")
         except OutdatedProjectException:
             self._convert_project()
+            super(PblProjectConverter, self).__call__(args)
             self._convert_to_npm()
             print("Project successfully converted!")
 
@@ -82,25 +83,20 @@ def _ignore_npm(self):
     def _convert_project(self):
         project_root = os.getcwd()
         project_template_path = os.path.join(self.get_sdk_path(), 'pebble', 'common', 'templates')
-        if not os.path.exists(project_template_path):
-            project_template_path = os.path.join(os.path.dirname(__file__), '..', '..', '..', 'sdk', 'templates')
+        tool_project_template_path = os.path.join(os.path.dirname(__file__), '..', '..', '..', 'sdk', 'templates')
 
         self._generate_appinfo_from_old_project(project_root)
 
         wscript_path = os.path.join(project_root, "wscript")
 
-        wscript2_hash = hashlib.md5(open(os.path.join(project_template_path, 'wscript_sdk2')).read()).hexdigest()
-        wscript3_hash = hashlib.md5(open(os.path.join(project_template_path, 'wscript')).read()).hexdigest()
-        with open(wscript_path, "r") as f:
-            current_hash = hashlib.md5(f.read()).hexdigest()
-
-        if wscript2_hash != current_hash and wscript3_hash != current_hash:
-            print('WARNING: You had modified your wscript and those changes will be lost.\n'
-                  'Saving your old wscript in wscript.backup.')
-            os.rename(wscript_path, wscript_path + '.backup')
+        print('Saving your old wscript in wscript.backup.')
+        os.rename(wscript_path, wscript_path + '.backup')
 
         print('Generating new 3.x wscript')
-        copy2(os.path.join(project_template_path, 'wscript'), wscript_path)
+        try:
+            copy2(os.path.join(project_template_path, 'wscript'), wscript_path)
+        except IOError:
+            copy2(os.path.join(tool_project_template_path, 'wscript'), wscript_path)
         os.system('pebble clean')
 
     @classmethod

pebble_tool/sdk/project.py

@@ -49,10 +49,14 @@ def _sanity_check(self):
                 or not os.path.exists(os.path.join(self.project_dir, 'wscript')):
             raise OutdatedProjectException("This project is very outdated, and cannot be handled by this SDK.")
 
-        if self.sdk_version != SDK_VERSION:
+        if self.sdk_version == '2.9':
             if sdk_version() != '2.9':
                 raise OutdatedProjectException("This projected is outdated (try 'pebble convert-project' or"
                                                "'pebble sdk install 2.9')")
+        elif self.sdk_version != SDK_VERSION:
+            raise PebbleProjectException("An invalid value of '{}' was found in the 'sdkVersion' field of the "
+                                         "project's package.json. The latest supported value for this field is '{}'.".
+                                         format(self.sdk_version, SDK_VERSION))
 
     def _parse_project(self):
         raise NotImplementedError

pebble_tool/sdk/templates/wscript

@@ -1,41 +1,50 @@
-
 #
-# This file is the default set of rules to compile a Pebble project.
+# This file is the default set of rules to compile a Pebble application.
 #
 # Feel free to customize this to your needs.
 #
-
 import os.path
 
 top = '.'
 out = 'build'
 
+
 def options(ctx):
     ctx.load('pebble_sdk')
 
+
 def configure(ctx):
+    """
+    This method is used to configure your build. ctx.load(`pebble_sdk`) automatically configures
+    a build for each valid platform in `targetPlatforms`. Platform-specific configuration: add your
+    change after calling ctx.load('pebble_sdk') and make sure to set the correct environment first.
+    Universal configuration: add your change prior to calling ctx.load('pebble_sdk').
+    """
     ctx.load('pebble_sdk')
 
+
 def build(ctx):
     ctx.load('pebble_sdk')
 
     build_worker = os.path.exists('worker_src')
     binaries = []
 
-    for p in ctx.env.TARGET_PLATFORMS:
-        ctx.set_env(ctx.all_envs[p])
+    cached_env = ctx.env
+    for platform in ctx.env.TARGET_PLATFORMS:
+        ctx.env = ctx.all_envs[platform]
         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)
+        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)
+            worker_elf = '{}/pebble-worker.elf'.format(ctx.env.BUILD_DIR)
+            binaries.append({'platform': platform, '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})
+            binaries.append({'platform': platform, 'app_elf': app_elf})
+    ctx.env = cached_env
 
     ctx.set_group('bundle')
-    ctx.pbl_bundle(binaries=binaries, js=ctx.path.ant_glob('src/js/**/*.js'))
+    ctx.pbl_bundle(binaries=binaries,
+                   js=ctx.path.ant_glob(['src/js/**/*.js', 'src/js/**/*.json']),
+                   js_entry_file='src/js/app.js')