LBRYCommunity/buildozer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #163 from olymk2/master

Browse source 
fix build error and allow redirecting build folder
This commit is contained in:
Mathieu Virbel 2014-11-22 17:25:18 +01:00
commit c163a14417
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
buildozer/__init__.py
View file

@ -125,6 +125,7 @@ class Buildozer(object):
'buildozer', 'log_level', '1')) 'buildozer', 'log_level', '1'))
except: except:
pass pass
self.builddir = self.config.getdefault('buildozer', 'builddir', None)
self.targetname = None self.targetname = None
self.target = None self.target = None
@ -404,6 +405,9 @@ class Buildozer(object):
# create local dir # create local dir
specdir = dirname(self.specfilename) specdir = dirname(self.specfilename)
if self.builddir:
specdir = self.builddir
self.mkdir(join(specdir, '.buildozer')) self.mkdir(join(specdir, '.buildozer'))
self.mkdir(join(specdir, 'bin')) self.mkdir(join(specdir, 'bin'))
self.mkdir(self.applibs_dir) self.mkdir(self.applibs_dir)
@ -788,6 +792,8 @@ class Buildozer(object):
@property @property
def buildozer_dir(self): def buildozer_dir(self):
if self.builddir:
return join(self.builddir, '.buildozer')
return join(self.root_dir, '.buildozer') return join(self.root_dir, '.buildozer')
@property @property

4
buildozer/targets/android.py
View file

@ -323,6 +323,10 @@ class TargetAndroid(Target):
def _read_version_subdir(self, *args): def _read_version_subdir(self, *args):
versions = [] versions = []
if not os.path.exists(join(*args)):
self.buildozer.debug(
'build-tools folder not found {}'.format(join(*args)))
return [0]
for v in os.listdir(join(*args)): for v in os.listdir(join(*args)):
try: try:
versions.append(self._process_version_string(v)) versions.append(self._process_version_string(v))