@@ -754,6 +754,9 @@ def __init__(self):
754
754
self ._android_api = None
755
755
self ._ndk_ver = None
756
756
757
+ self .toolchain_prefix = None
758
+ self .toolchain_version = None
759
+
757
760
# root of the toolchain
758
761
self .setup_dirs ()
759
762
@@ -812,7 +815,7 @@ class Distribution(object):
812
815
the dist itself could also come from e.g. a binary download.
813
816
'''
814
817
ctx = None
815
-
818
+
816
819
name = None # A name identifying the dist. May not be None.
817
820
needs_build = False # Whether the dist needs compiling
818
821
url = None
@@ -999,15 +1002,15 @@ def save_info(self):
999
1002
fileh )
1000
1003
1001
1004
def load_info (self ):
1005
+ '''Load information about the dist from the info file that p4a
1006
+ automatically creates.'''
1002
1007
with current_directory (self .dist_dir ):
1003
1008
filen = 'dist_info.json'
1004
1009
if not exists (filen ):
1005
1010
return None
1006
1011
with open ('dist_info.json' , 'r' ) as fileh :
1007
1012
dist_info = json .load (fileh )
1008
1013
return dist_info
1009
-
1010
-
1011
1014
1012
1015
1013
1016
class Bootstrap (object ):
@@ -1018,6 +1021,8 @@ class Bootstrap(object):
1018
1021
jni_subdir = '/jni'
1019
1022
ctx = None
1020
1023
1024
+ bootstrap_dir = None
1025
+
1021
1026
build_dir = None
1022
1027
dist_dir = None
1023
1028
dist_name = None
@@ -1032,6 +1037,7 @@ class Bootstrap(object):
1032
1037
1033
1038
@property
1034
1039
def dist_dir (self ):
1040
+ '''The dist dir at which to place the finished distribution.'''
1035
1041
if self .distribution is None :
1036
1042
warning ('Tried to access {}.dist_dir, but {}.distribution '
1037
1043
'is None' .format (self , self ))
@@ -1087,6 +1093,7 @@ def run_distribute(self):
1087
1093
1088
1094
@classmethod
1089
1095
def list_bootstraps (cls ):
1096
+ '''Find all the available bootstraps and return them.'''
1090
1097
forbidden_dirs = ('__pycache__' , )
1091
1098
bootstraps_dir = join (dirname (__file__ ), 'bootstraps' )
1092
1099
for name in listdir (bootstraps_dir ):
@@ -1137,19 +1144,19 @@ class Recipe(object):
1137
1144
'''A string giving the version of the software the recipe describes,
1138
1145
e.g. ``2.0.3`` or ``master``.'''
1139
1146
1140
-
1147
+
1141
1148
md5sum = None
1142
1149
'''The md5sum of the source from the :attr:`url`. Non-essential, but
1143
1150
you should try to include this, it is used to check that the download
1144
1151
finished correctly.
1145
1152
'''
1146
-
1153
+
1147
1154
depends = []
1148
1155
'''A list containing the names of any recipes that this recipe depends on.
1149
1156
'''
1150
-
1157
+
1151
1158
conflicts = []
1152
- # AND: Not currently used
1159
+ # AND: Not currently used, needs modifications to the dependency Graph
1153
1160
'''A list containing the names of any recipes that are known to be
1154
1161
incompatible with this one.'''
1155
1162
@@ -1158,7 +1165,7 @@ class Recipe(object):
1158
1165
# to be applied. By default, these are applied in prebuild_arch, so
1159
1166
# if you override this but want to use patches then don't forget to
1160
1167
# call super().
1161
-
1168
+
1162
1169
# name = None # name for the recipe dir
1163
1170
1164
1171
archs = ['armeabi' ] # will android use this?
0 commit comments