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

Europython sprint: put internally provided ant into os-path

Browse source
This commit is contained in:
Fabian Kreutz 2013-07-06 17:10:46 +03:00
parent fb7950bef8
commit 6a698c6596
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
buildozer/targets/android.py
View file

@ -88,23 +88,28 @@ class TargetAndroid(Target):
except: except:
traceback.print_exc() traceback.print_exc()
self.android_cmd = join(self.android_sdk_dir, 'tools', 'android.bat') self.android_cmd = join(self.android_sdk_dir, 'tools', 'android.bat')
self.ant_cmd = join(self.apache_ant_dir, 'bin', 'ant.bat')
self.adb_cmd = join(self.android_sdk_dir, 'platform-tools', 'adb.exe') self.adb_cmd = join(self.android_sdk_dir, 'platform-tools', 'adb.exe')
self.javac_cmd = self._locate_java('javac.exe') self.javac_cmd = self._locate_java('javac.exe')
self.keytool_cmd = self._locate_java('keytool.exe') self.keytool_cmd = self._locate_java('keytool.exe')
elif platform in ('darwin', ): elif platform in ('darwin', ):
self.android_cmd = join(self.android_sdk_dir, 'tools', 'android') self.android_cmd = join(self.android_sdk_dir, 'tools', 'android')
self.ant_cmd = join(self.apache_ant_dir, 'bin', 'ant')
self.adb_cmd = join(self.android_sdk_dir, 'platform-tools', 'adb') self.adb_cmd = join(self.android_sdk_dir, 'platform-tools', 'adb')
self.javac_cmd = self._locate_java('javac') self.javac_cmd = self._locate_java('javac')
self.keytool_cmd = self._locate_java('keytool') self.keytool_cmd = self._locate_java('keytool')
else: else:
self.android_cmd = join(self.android_sdk_dir, 'tools', 'android') self.android_cmd = join(self.android_sdk_dir, 'tools', 'android')
self.ant_cmd = join(self.apache_ant_dir, 'bin', 'ant')
self.adb_cmd = join(self.android_sdk_dir, 'platform-tools', 'adb') self.adb_cmd = join(self.android_sdk_dir, 'platform-tools', 'adb')
self.javac_cmd = self._locate_java('javac') self.javac_cmd = self._locate_java('javac')
self.keytool_cmd = self._locate_java('keytool') self.keytool_cmd = self._locate_java('keytool')
# Need to add internally installed ant to path for external tools
# like adb to use
path = [join(self.apache_ant_dir, 'bin')]
if 'PATH' in self.buildozer.environ:
path.append(self.buildozer.environ['PATH'])
else:
path.append(os.environ['PATH'])
self.buildozer.environ['PATH'] = ':'.join(path)
checkbin = self.buildozer.checkbin checkbin = self.buildozer.checkbin
checkbin('Git git', 'git') checkbin('Git git', 'git')
checkbin('Cython cython', 'cython') checkbin('Cython cython', 'cython')