Added some prebuild toolchain and recipe methods

Author: inclement

recipes/android/__init__.py

@@ -1,12 +1,17 @@
 
-from toolchain import PythonRecipe
+from toolchain import PythonRecipe, shprint, ensure_dir
+import sh
 
 
 class AndroidRecipe(PythonRecipe):
-    name = 'android'
+    # name = 'android'
     version = None
     url = None
     depends = ['pygame']
 
+    def prebuild_armeabi(self):
+        shprint(sh.cp, '-a', self.get_recipe_dir() + '/src', self.get_build_dir('armeabi'))
+        
+
 
 recipe = AndroidRecipe()

recipes/hostpython2/__init__.py

@@ -1,5 +1,6 @@
 
-from toolchain import Recipe, shprint
+from toolchain import Recipe, shprint, get_directory
+from os.path import join
 import sh
 
 
@@ -8,5 +9,13 @@ class Hostpython2Recipe(Recipe):
     url = 'http://python.org/ftp/python/{version}/Python-{version}.tar.bz2'
     name = 'hostpython2'
 
+    def prebuild_armeabi(self):
+        # Override hostpython Setup?
+        print('Running hostpython2 prebuild')
+        shprint(sh.cp, join(self.get_recipe_dir(), 'Setup'),
+                join(self.get_build_dir('armeabi'),
+                     get_directory(self.versioned_url),
+                     'Modules', 'Setup'))
+
 
 recipe = Hostpython2Recipe()

recipes/sdl/__init__.py

@@ -1,14 +1,17 @@
-from toolchain import Recipe, shprint
+from toolchain import NDKRecipe, shprint
 import sh
 
 
 
-class LibSDLRecipe(Recipe):
+class LibSDLRecipe(NDKRecipe):
     version = "1.2.14"
     url = None  
     name = 'sdl'
     depends = ['python2']
 
+    def prebuild_armeabi(self):
+        print('Debug: sdl recipe dir is ' + self.get_build_dir())
+
     def build_arch(self, arch):
         # shprint(sh.xcodebuild,
         #         "ONLY_ACTIVE_ARCH=NO",

toolchain.py

@@ -522,7 +522,11 @@ class Recipe(object):
     # frameworks = []
     # sources = []
 
-    can_compile_standalone = True
+    @property
+    def versioned_url(self):
+        if self.url is None:
+            return None
+        return self.url.format(version=self.version)
 
     # API available for recipes
     def download_file(self, url, filename, cwd=None):
@@ -671,6 +675,10 @@ def name(self):
     def get_build_dir(self, arch):
         return join(self.ctx.build_dir, 'other_builds', self.name, arch)
 
+    def get_recipe_dir(self):
+        # AND: Redundant, an equivalent property is already set by get_recipe
+        return join(self.ctx.root_dir, 'recipes', self.name)
+
     # Public Recipe API to be subclassed if needed
 
     # def init_with_ctx(self, ctx):
@@ -701,13 +709,14 @@ def prepare_build_dir(self, ctx):
             shprint(sh.ln, '-s', user_dir, build_dir)
             return
 
+        ensure_dir(build_dir)
+
         if self.url is None:
             print('Nothing to do for {} recipe preparation'.format(self.name))
             return
 
         print('Preparing and downloading {}'.format(self.name))
 
-        shprint(sh.mkdir, '-p', join(build_dir))
         shprint(sh.mkdir, '-p', join(ctx.packages_path, self.name))
 
         print('Moving to', join(ctx.packages_path, self.name))
@@ -836,19 +845,19 @@ def custom_dir(self):
         return d
 
     # @cache_execution
-    def download(self):
-        key = "{}.archive_root".format(self.name)
-        if self.custom_dir:
-            self.ctx.state[key] = basename(self.custom_dir)
-        else:
-            src_dir = join(self.recipe_dir, self.url)
-            if exists(src_dir):
-                self.ctx.state[key] = basename(src_dir)
-                return
-            fn = self.archive_fn
-            if not exists(fn):
-                self.download_file(self.url.format(version=self.version), fn)
-            self.ctx.state[key] = self.get_archive_rootdir(self.archive_fn)
+    # def download(self):
+    #     key = "{}.archive_root".format(self.name)
+    #     if self.custom_dir:
+    #         self.ctx.state[key] = basename(self.custom_dir)
+    #     else:
+    #         src_dir = join(self.recipe_dir, self.url)
+    #         if exists(src_dir):
+    #             self.ctx.state[key] = basename(src_dir)
+    #             return
+    #         fn = self.archive_fn
+    #         if not exists(fn):
+    #             self.download_file(self.url.format(version=self.version), fn)
+    #         self.ctx.state[key] = self.get_archive_rootdir(self.archive_fn)
 
     # @cache_execution
     def extract(self):