Support force update of build.xml without target, for r14

diff --git a/README b/README
index baaeaa7a30162929da56df494455f3fe12881757..d53154f8f2b7c6888f21d8250993bf0aed475904 100644 (file)
--- a/README
+++ b/README
@@ -167,9 +167,12 @@ configuration to the build. These are:
  forcevercode=yes - If specified, the package vercode in the AndroidManifest.xml is
                    replaced with the version code for the build. See also
                    forceversion.
- update=no        By default, 'android update project' is used to generate or
+ update=xxx       By default, 'android update project' is used to generate or
                    update the build.xml file. Specifying update=no bypasses
-                   that.
+                   that. Specifiying update=force forces rebuilding of the
+                  build.xml file at the same time - this is frequently needed
+                  with r14 of the Android platform tools. Be aware of any
+                  customisations in build.xml when using update=force.
  initfun=yes      Enables a selection of mad hacks to make com.funambol.android
                    build. Probably not useful for any other application.
  buildjni=yes      Enables building of native code via the ndk-build script

diff --git a/common.py b/common.py
index db0432f3edf24bc52ea9c5f9f3cc30e716cc7507..a8547ddecd6f7d9597ecd316a41f3ebd156e9be9 100644 (file)
--- a/common.py
+++ b/common.py
@@ -688,7 +688,7 @@ def prepare_source(vcs, app, build, build_dir, extlib_dir, sdk_path, ndk_path, j
             raise BuildException("Error running init command")
 
     # Generate (or update) the ant build file, build.xml...
-    if (build.get('update', 'yes') == 'yes' and
+    if (build.get('update', 'yes') != 'no' and
         not build.has_key('maven')):
         parms = [os.path.join(sdk_path, 'tools', 'android'),
                 'update', 'project', '-p', '.']
@@ -696,10 +696,8 @@ def prepare_source(vcs, app, build, build_dir, extlib_dir, sdk_path, ndk_path, j
         if build.has_key('target'):
             parms.append('-t')
             parms.append(build['target'])
-            # Newer versions of the platform tools don't replace the build.xml
-            # file as they always did previously, they spew out a nanny-like
-            # warning and tell you to do it manually. The following emulates
-            # the original behaviour...
+        # Force build.xml update if necessary...
+        if build.get('update', 'yes') == 'force' or build.has_key('target'):
             buildxml = os.path.join(root_dir, 'build.xml')
             if os.path.exists(buildxml):
                 print 'Force-removing old build.xml'

diff --git a/metadata/org.fdroid.fdroid.txt b/metadata/org.fdroid.fdroid.txt
index c910320bad977a4f2730d3b86411415410396e81..4ca3ab733f20154804c85b70e1801e9677620d9a 100644 (file)
--- a/metadata/org.fdroid.fdroid.txt
+++ b/metadata/org.fdroid.fdroid.txt
@@ -17,15 +17,15 @@ Repo:git://gitorious.org/f-droid/fdroidclient.git
 #Build Version:0.12,3,651696a49be2cd7db5ce6a2fa8185e31f9a20035
 #Build Version:0.13,4,4f677285cc2cf0b7e7feb5c9acf61791bec15fbc
 #Build Version:0.16,7,78325dad91a263437ca4ea1210bd494446c4d003
-Build Version:0.17,8,c626ce5f6d3e10ae15942f01ff028be310cc695a
-Build Version:0.18,9,a6c9ed8d06b19315df9ba9041324f78139f7d238
-Build Version:0.19,10,540b7d0522f4d67a4896697f7342e4c75b4cbf59
-Build Version:0.20,11,ddacfb856ad66c1c367e20c9cbecbfb15fe00813
-Build Version:0.21,12,49fa56aa6626a190f2d711120b69e435e9e615b1
-Build Version:0.22,13,a6a33c942495cc4c74a7cb6e968efe0e00815e68
-Build Version:0.23,14,aa58a8aad1a1c3832eafb9f1bdd6db8292d2c172
-Build Version:0.24,15,9b5fe2976443255b95027abd412f1c1e7f3d27b2
-Build Version:0.25,16,43977cc493e47a4dc841c4192ae8a40fb14b639b
+Build Version:0.17,8,c626ce5f6d3e10ae15942f01ff028be310cc695a,update=force
+Build Version:0.18,9,a6c9ed8d06b19315df9ba9041324f78139f7d238,update=force
+Build Version:0.19,10,540b7d0522f4d67a4896697f7342e4c75b4cbf59,update=force
+Build Version:0.20,11,ddacfb856ad66c1c367e20c9cbecbfb15fe00813,update=force
+Build Version:0.21,12,49fa56aa6626a190f2d711120b69e435e9e615b1,update=force
+Build Version:0.22,13,a6a33c942495cc4c74a7cb6e968efe0e00815e68,update=force
+Build Version:0.23,14,aa58a8aad1a1c3832eafb9f1bdd6db8292d2c172,update=force
+Build Version:0.24,15,9b5fe2976443255b95027abd412f1c1e7f3d27b2,update=force
+Build Version:0.25,16,43977cc493e47a4dc841c4192ae8a40fb14b639b,update=force
 
 Update Check Mode:None