Added the ability to expect build output in a different place

diff --git a/README b/README
index 9eb60b6a47bab865dd222f9523f704a648646d3c..8258772dc6f085fec706a6d28f701a1191974450 100644 (file)
--- a/README
+++ b/README
@@ -102,6 +102,10 @@ configuration to the build. These are:
                   building, but there is a special case for SVN repositories
                   where the URL is specified with a * at the end. See the
                   documentation for the Repo field for more information.
+ bindir=<path>   - Normally the build output (apk) is expected to be in the
+                  bin subdirectory below the ant build files. If the project
+                  is configured to put it elsewhere, that can be specified
+                  here, relative to the base of the checked out repo..
  oldsdkloc=yes   - The sdk location in the repo is in an old format
  target=<target> - Specifies a particular SDK target, when the source doesn't
  rm=<relpath>    - Specifies the relative path of file to delete before the

diff --git a/build.py b/build.py
index 5a8cb150d2eb5cb40982ecc62d925d8b643fede2..87b891490a772ba061c3530b112c56bad0013ee7 100644 (file)
--- a/build.py
+++ b/build.py
@@ -163,9 +163,13 @@ for app in apps:
                 sys.exit(1)
 
             # Find the apk name in the output...
+            if thisbuild.has_key('bindir'):
+                bindir = os.path.join(build_dir, thisbuild['bindir'])
+            else:
+                bindir = os.path.join(root_dir, 'bin')
             src = re.match(r".*^.*Creating (\S+) for release.*$.*", output,
                     re.S|re.M).group(1)
-            src = os.path.join(os.path.join(root_dir, 'bin'), src)
+            src = os.path.join(bindir, src)
 
             # By way of a sanity check, make sure the version and version
             # code in our new apk match what we expect...