Move project updating to after prebuild (and before clean+build)

With this, the legacy echos of android.library.reference... work with
update=auto again.

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index dd0682d7fe09df6a800277a66be2b8e41a302463..cc41aff2c70da26f56058ad70abda41389680309 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -907,50 +907,6 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
     if basesrclib:
         srclibpaths.append(basesrclib)
 
-    # Generate (or update) the ant build file, build.xml...
-    if updatemode != 'no' and build['type'] == 'ant':
-        parms = [os.path.join(config['sdk_path'], 'tools', 'android'), 'update']
-        lparms = parms + ['lib-project']
-        parms = parms + ['project']
-
-        if 'target' in build and build['target']:
-            parms += ['-t', build['target']]
-            lparms += ['-t', build['target']]
-        if updatemode == 'auto':
-            update_dirs = ant_subprojects(root_dir) + ['.']
-        else:
-            update_dirs = [d.strip() for d in updatemode.split(';')]
-
-        # Force build.xml update if necessary
-        if updatemode == 'force' or 'target' in build:
-            if updatemode == 'force':
-                update_dirs = ['.']
-            buildxml = os.path.join(root_dir, 'build.xml')
-            if os.path.exists(buildxml):
-                logging.info('Force-removing old build.xml')
-                os.remove(buildxml)
-
-        for d in update_dirs:
-            subdir = os.path.join(root_dir, d)
-            if d == '.':
-                logging.info("Updating main project")
-                cmd = parms + ['-p', d]
-            else:
-                logging.info("Updating subproject %s" % d)
-                cmd = lparms + ['-p', d]
-            p = FDroidPopen(cmd, cwd=root_dir)
-            # Check to see whether an error was returned without a proper exit
-            # code (this is the case for the 'no target set or target invalid'
-            # error)
-            if p.returncode != 0 or p.stdout.startswith("Error: "):
-                raise BuildException("Failed to update project at %s" % d, p.stdout)
-            # Clean update dirs via ant
-            if d == '.':
-                logging.info("Cleaning main project")
-            else:
-                logging.info("Cleaning subproject %s" % d)
-            p = FDroidPopen(['ant', 'clean'], cwd=subdir)
-
     # Update the local.properties file
     localprops = [ os.path.join(build_dir, 'local.properties') ]
     if 'subdir' in build:
@@ -1144,6 +1100,50 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
             raise BuildException("Error running prebuild command for %s:%s" %
                     (app['id'], build['version']), p.stdout)
 
+    # Generate (or update) the ant build file, build.xml...
+    if updatemode != 'no' and build['type'] == 'ant':
+        parms = [os.path.join(config['sdk_path'], 'tools', 'android'), 'update']
+        lparms = parms + ['lib-project']
+        parms = parms + ['project']
+
+        if 'target' in build and build['target']:
+            parms += ['-t', build['target']]
+            lparms += ['-t', build['target']]
+        if updatemode == 'auto':
+            update_dirs = ant_subprojects(root_dir) + ['.']
+        else:
+            update_dirs = [d.strip() for d in updatemode.split(';')]
+
+        # Force build.xml update if necessary
+        if updatemode == 'force' or 'target' in build:
+            if updatemode == 'force':
+                update_dirs = ['.']
+            buildxml = os.path.join(root_dir, 'build.xml')
+            if os.path.exists(buildxml):
+                logging.info('Force-removing old build.xml')
+                os.remove(buildxml)
+
+        for d in update_dirs:
+            subdir = os.path.join(root_dir, d)
+            if d == '.':
+                logging.info("Updating main project")
+                cmd = parms + ['-p', d]
+            else:
+                logging.info("Updating subproject %s" % d)
+                cmd = lparms + ['-p', d]
+            p = FDroidPopen(cmd, cwd=root_dir)
+            # Check to see whether an error was returned without a proper exit
+            # code (this is the case for the 'no target set or target invalid'
+            # error)
+            if p.returncode != 0 or p.stdout.startswith("Error: "):
+                raise BuildException("Failed to update project at %s" % d, p.stdout)
+            # Clean update dirs via ant
+            if d == '.':
+                logging.info("Cleaning main project")
+            else:
+                logging.info("Cleaning subproject %s" % d)
+            p = FDroidPopen(['ant', 'clean'], cwd=subdir)
+
     return (root_dir, srclibpaths)
 
 # Scan the source code in the given directory (and all subdirectories)