chiark
/
gitweb
/
~ianmdlvl
/
fdroidserver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
de75211
)
Allow sdk and ndk path substitution in init command too
author
Ciaran Gultnieks
<ciaran@ciarang.com>
Sun, 8 Apr 2012 12:00:07 +0000
(13:00 +0100)
committer
Ciaran Gultnieks
<ciaran@ciarang.com>
Sun, 8 Apr 2012 12:00:07 +0000
(13:00 +0100)
fdroidserver/common.py
patch
|
blob
|
history
diff --git
a/fdroidserver/common.py
b/fdroidserver/common.py
index e0204dc2188de02e8e5e80ef8c47e6aa8e439d11..c514f6148cc662d1deb79e9875bb940b4970c4b4 100644
(file)
--- a/
fdroidserver/common.py
+++ b/
fdroidserver/common.py
@@
-720,6
+720,8
@@
def prepare_source(vcs, app, build, build_dir, extlib_dir, sdk_path, ndk_path, j
# Run an init command if one is required...
if build.has_key('init'):
init = build['init']
+ init = init.replace('$$SDK$$', sdk_path)
+ init = init.replace('$$NDK$$', ndk_path)
if verbose: print "Doing init: exec '%s' in '%s'"%(init,root_dir)
if subprocess.call(init, cwd=root_dir, shell=True) != 0:
raise BuildException("Error running init command")