MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adjust for Windows builds

Browse Source
This commit is contained in:
topjohnwu 2017-06-03 22:00:22 +08:00
parent e780c76c93
commit acd8567586
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build.py
View File

@ -68,14 +68,14 @@ def build_apk(args):
os.chdir('MagiskManager') os.chdir('MagiskManager')
if args.debug: if args.debug:
proc = subprocess.run(['gradlew', 'assembleDebug']) proc = subprocess.run('gradlew assembleDebug', shell=True)
if proc.returncode != 0: if proc.returncode != 0:
error('Build Magisk Manager failed!') error('Build Magisk Manager failed!')
else: else:
if not os.path.exists(os.path.join('..', 'release_signature.jks')): if not os.path.exists(os.path.join('..', 'release_signature.jks')):
error('Please generate a java keystore and place it in \'release_signature.jks\'') error('Please generate a java keystore and place it in \'release_signature.jks\'')
proc = subprocess.run(['gradlew', 'assembleRelease']) proc = subprocess.run('gradlew assembleRelease', shell=True)
if proc.returncode != 0: if proc.returncode != 0:
error('Build Magisk Manager failed!') error('Build Magisk Manager failed!')
@ -95,10 +95,10 @@ def build_apk(args):
if proc.returncode != 0: if proc.returncode != 0:
error('Zipalign Magisk Manager failed!') error('Zipalign Magisk Manager failed!')
proc = subprocess.run([ proc = subprocess.run('{} sign --ks {} --out {} {}'.format(
os.path.join(os.environ['ANDROID_HOME'], 'build-tools', build_tool, 'apksigner'), os.path.join(os.environ['ANDROID_HOME'], 'build-tools', build_tool, 'apksigner'),
'sign', '--ks', os.path.join('..', 'release_signature.jks'), '--out', os.path.join('..', 'release_signature.jks'),
release, aligned]) release, aligned), shell=True)
if proc.returncode != 0: if proc.returncode != 0:
error('Release sign Magisk Manager failed!') error('Release sign Magisk Manager failed!')
@ -213,12 +213,12 @@ def cleanup(args):
if 'binary' in args.target: if 'binary' in args.target:
header('* Cleaning Magisk binaries') header('* Cleaning Magisk binaries')
subprocess.run([os.path.join(os.environ['ANDROID_HOME'], 'ndk-bundle', 'ndk-build'), 'clean']) subprocess.run(os.path.join(os.environ['ANDROID_HOME'], 'ndk-bundle', 'ndk-build') + ' clean', shell=True)
if 'apk' in args.target: if 'apk' in args.target:
header('* Cleaning Magisk Manager') header('* Cleaning Magisk Manager')
os.chdir('MagiskManager') os.chdir('MagiskManager')
subprocess.run(['gradlew', 'clean']) subprocess.run('gradlew clean', shell=True)
os.chdir('..') os.chdir('..')
if 'zip' in args.target: if 'zip' in args.target: