Merge branch 'master' into logging

[fdroidserver.git] / fdroidserver / metadata.py

diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index 9fa473b96879dddad90aa6949e132bb7744d01b8..3bc55c9b9546a3642e16e3151f015abe0aba0a03 100644 (file)
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -471,6 +471,8 @@ def parse_metadata(metafile):
         for t in ['maven', 'gradle', 'kivy']:
             if build.get(t, 'no') != 'no':
                 return t
+        if 'output' in build:
+            return 'raw'
         return 'ant'
 
     thisinfo = {}
@@ -699,7 +701,7 @@ def write_metadata(dest, app):
         # This defines the preferred order for the build items - as in the
         # manual, they're roughly in order of application.
         keyorder = ['disable', 'commit', 'subdir', 'submodules', 'init',
-                    'gradle', 'maven', 'oldsdkloc', 'target',
+                    'gradle', 'maven', 'output', 'oldsdkloc', 'target',
                     'update', 'encoding', 'forceversion', 'forcevercode', 'rm',
                     'fixtrans', 'fixapos', 'extlibs', 'srclibs', 'patch',
                     'prebuild', 'scanignore', 'scandelete', 'build', 'buildjni',