Remove fixapos and fixtrans

These are legacy fixes for very old versions of the Android SDK tools. These
issues have been fixed in stable versions for years.

diff --git a/docs/fdroid.texi b/docs/fdroid.texi
index 7bad9d198b093a8e3bb6ed531f20e1c04445efda..b584deb73837b61c5aaf0668501b609bb319629d 100644 (file)
--- a/docs/fdroid.texi
+++ b/docs/fdroid.texi
@@ -855,11 +855,7 @@ exist, but not a good idea if it's heavily customised.
 @item update=xxx
 By default, 'android update project' is used to generate or update the
 project and all its referenced projects. Specifying update=no bypasses 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.
+Note that this only matters in ant build recipes.
 
 Default value is '@code{auto}', which uses the paths used in the
 project.properties file to find out what project paths to update.
@@ -898,17 +894,6 @@ AndroidManifest.xml.
 Multiple files/directories can be specified by separating them with ';'.
 Directories will be recursively deleted.
 
-@item fixtrans=yes
-Modifies any instances of string resources that use multiple
-formatting arguments, but don't use positional notation. For example,
-"Hello %s, %d" becomes "Hello %1$s, %2$d". Newer versions of the
-Android platform tools enforce this sensible standard. If you get
-error messages relating to that, you need to enable this.
-
-@item fixapos=yes
-Like fixtrans, but deals with an even older issue relating to
-'unescaped apostrophes' in translation strings.
-
 @item extlibs=a;b;c
 Specifies a list of external libraries (jar files) from the
 @code{build/extlib} library, which will be placed in the @code{libs} directory
@@ -937,23 +922,22 @@ the init/prebuild/build command to substitute the relative path to the library
 directory, but it could need tweaking if you've changed into another directory.
 
 @item patch=x
-Apply patch(es). 'x' names one (or more - comma-seperated)
-files within a directory below the metadata, with the same
-name as the metadata file but without the extension. Each of
-these patches is applied to the code in turn.
+Apply patch(es). 'x' names one (or more - comma-seperated) files within a
+directory below the metadata, with the same name as the metadata file but
+without the extension. Each of these patches is applied to the code in turn.
 
 @item prebuild=xxxx
-Specifies a shell command (or commands - chain with &&) to run before
-the build takes place. Backslash can be used as an escape character to
-insert literal commas, or as the last character on a line to join that
-line with the next. It has no special meaning in other contexts; in
-particular, literal backslashes should not be escaped.
+Specifies a shell command (or commands - chain with &&) to run before the
+build takes place. Backslash can be used as an escape character to insert
+literal commas, or as the last character on a line to join that line with the
+next. It has no special meaning in other contexts; in particular, literal
+backslashes should not be escaped.
 
 The command runs using bash.
 
-Note that nothing should be build during this prebuild phase - scanning
-of the code and building of the source tarball, for example, take place
-after this. For custom actions that actually build things, use 'build'
+Note that nothing should be build during this prebuild phase - scanning of the
+code and building of the source tarball, for example, take place after this.
+For custom actions that actually build things or produce binaries, use 'build'
 instead.
 
 You can use $$name$$ to substitute the path to a referenced srclib - see

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 07e5a76aacf1267f10eb4cffe42418478d59787e..6eac3d0e57dfad832bff1de99ddde06c591c96e6 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1022,56 +1022,6 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
             else:
                 logging.info("...but it didn't exist")
 
-    # Fix apostrophes translation files if necessary
-    if build['fixapos']:
-        for root, dirs, files in os.walk(os.path.join(root_dir, 'res')):
-            for filename in files:
-                if has_extension(filename, 'xml'):
-                    if subprocess.call(['sed','-i','s@' +
-                        r"\([^\\]\)'@\1\\'" +
-                        '@g',
-                        os.path.join(root, filename)]) != 0:
-                        raise BuildException("Failed to amend " + filename)
-
-    # Fix translation files if necessary
-    if build['fixtrans']:
-        for root, dirs, files in os.walk(os.path.join(root_dir, 'res')):
-            for filename in files:
-                if has_extension(filename, 'xml'):
-                    f = open(os.path.join(root, filename))
-                    changed = False
-                    outlines = []
-                    for line in f:
-                        num = 1
-                        index = 0
-                        oldline = line
-                        while True:
-                            index = line.find("%", index)
-                            if index == -1:
-                                break
-                            next = line[index+1:index+2]
-                            if next == "s" or next == "d":
-                                line = (line[:index+1] +
-                                        str(num) + "$" +
-                                        line[index+1:])
-                                num += 1
-                                index += 3
-                            else:
-                                index += 1
-                        # We only want to insert the positional arguments
-                        # when there is more than one argument
-                        if oldline != line:
-                            if num > 2:
-                                changed = True
-                            else:
-                                line = oldline
-                        outlines.append(line)
-                    f.close()
-                    if changed:
-                        f = open(os.path.join(root, filename), 'w')
-                        f.writelines(outlines)
-                        f.close()
-
     remove_signing_keys(build_dir)
 
     # Add required external libraries

diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index a1fe199b850a67217fb29da0a4fe8d2c181107db..51b2529fea8b1117ec7c1fe83c76accf1710f1d9 100644 (file)
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -66,9 +66,9 @@ ordered_flags = [
     'disable', 'commit', 'subdir', 'submodules', 'init',
     'gradle', 'maven', 'output', 'oldsdkloc', 'target',
     'update', 'encoding', 'forceversion', 'forcevercode', 'rm',
-    'fixtrans', 'fixapos', 'extlibs', 'srclibs', 'patch',
-    'prebuild', 'scanignore', 'scandelete', 'build', 'buildjni',
-    'preassemble', 'bindir', 'antcommand', 'novcheck'
+    'extlibs', 'srclibs', 'patch', 'prebuild', 'scanignore',
+    'scandelete', 'build', 'buildjni', 'preassemble', 'bindir',
+    'antcommand', 'novcheck'
 ]
 
 
@@ -152,7 +152,7 @@ valuetypes = {
         ['yes', 'no'], None,
         [ ],
         [ 'submodules', 'oldsdkloc', 'forceversion', 'forcevercode',
-            'fixtrans', 'fixapos', 'novcheck' ]),
+            'novcheck' ]),
 
     'Repo Type' : FieldType("Repo Type",
         [ 'git', 'git-svn', 'svn', 'hg', 'bzr', 'srclib' ], None,