@@ -754,6 +754,9 @@ def __init__(self):
754754 self ._android_api = None
755755 self ._ndk_ver = None
756756
757+ self .toolchain_prefix = None
758+ self .toolchain_version = None
759+
757760 # root of the toolchain
758761 self .setup_dirs ()
759762
@@ -812,7 +815,7 @@ class Distribution(object):
812815 the dist itself could also come from e.g. a binary download.
813816 '''
814817 ctx = None
815-
818+
816819 name = None # A name identifying the dist. May not be None.
817820 needs_build = False # Whether the dist needs compiling
818821 url = None
@@ -999,15 +1002,15 @@ def save_info(self):
9991002 fileh )
10001003
10011004 def load_info (self ):
1005+ '''Load information about the dist from the info file that p4a
1006+ automatically creates.'''
10021007 with current_directory (self .dist_dir ):
10031008 filen = 'dist_info.json'
10041009 if not exists (filen ):
10051010 return None
10061011 with open ('dist_info.json' , 'r' ) as fileh :
10071012 dist_info = json .load (fileh )
10081013 return dist_info
1009-
1010-
10111014
10121015
10131016class Bootstrap (object ):
@@ -1018,6 +1021,8 @@ class Bootstrap(object):
10181021 jni_subdir = '/jni'
10191022 ctx = None
10201023
1024+ bootstrap_dir = None
1025+
10211026 build_dir = None
10221027 dist_dir = None
10231028 dist_name = None
@@ -1032,6 +1037,7 @@ class Bootstrap(object):
10321037
10331038 @property
10341039 def dist_dir (self ):
1040+ '''The dist dir at which to place the finished distribution.'''
10351041 if self .distribution is None :
10361042 warning ('Tried to access {}.dist_dir, but {}.distribution '
10371043 'is None' .format (self , self ))
@@ -1087,6 +1093,7 @@ def run_distribute(self):
10871093
10881094 @classmethod
10891095 def list_bootstraps (cls ):
1096+ '''Find all the available bootstraps and return them.'''
10901097 forbidden_dirs = ('__pycache__' , )
10911098 bootstraps_dir = join (dirname (__file__ ), 'bootstraps' )
10921099 for name in listdir (bootstraps_dir ):
@@ -1137,19 +1144,19 @@ class Recipe(object):
11371144 '''A string giving the version of the software the recipe describes,
11381145 e.g. ``2.0.3`` or ``master``.'''
11391146
1140-
1147+
11411148 md5sum = None
11421149 '''The md5sum of the source from the :attr:`url`. Non-essential, but
11431150 you should try to include this, it is used to check that the download
11441151 finished correctly.
11451152 '''
1146-
1153+
11471154 depends = []
11481155 '''A list containing the names of any recipes that this recipe depends on.
11491156 '''
1150-
1157+
11511158 conflicts = []
1152- # AND: Not currently used
1159+ # AND: Not currently used, needs modifications to the dependency Graph
11531160 '''A list containing the names of any recipes that are known to be
11541161 incompatible with this one.'''
11551162
@@ -1158,7 +1165,7 @@ class Recipe(object):
11581165 # to be applied. By default, these are applied in prebuild_arch, so
11591166 # if you override this but want to use patches then don't forget to
11601167 # call super().
1161-
1168+
11621169 # name = None # name for the recipe dir
11631170
11641171 archs = ['armeabi' ] # will android use this?
0 commit comments