mirror of
https://github.com/f-droid/fdroidserver.git
synced 2025-11-05 06:50:29 +03:00
Some build and update system improvements, including the ability to set javac encoding
This commit is contained in:
parent
e952029859
commit
50a962db31
4 changed files with 24 additions and 11 deletions
7
build.py
7
build.py
|
|
@ -222,6 +222,9 @@ for app in apps:
|
|||
props += "\nsdk-location=" + sdkloc + "\n"
|
||||
# Add ndk location...
|
||||
props+= "\nndk.dir=" + ndk_path + "\n"
|
||||
# Add java.encoding if necessary...
|
||||
if thisbuild.has_key('encoding'):
|
||||
props += "\njava.encoding=" + thisbuild['encoding'] + "\n"
|
||||
f = open(locprops, 'w')
|
||||
f.write(props)
|
||||
f.close()
|
||||
|
|
@ -246,8 +249,8 @@ for app in apps:
|
|||
|
||||
# Run a pre-build command if one is required...
|
||||
if thisbuild.has_key('prebuild'):
|
||||
if subprocess.call(shlex.split(thisbuild['prebuild']),
|
||||
cwd=root_dir) != 0:
|
||||
if subprocess.call(thisbuild['prebuild'],
|
||||
cwd=root_dir, shell=True) != 0:
|
||||
print "Error running pre-build command"
|
||||
sys.exit(1)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue