diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 66eea558..3b008a3f 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -554,12 +554,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
bindir = os.path.join(root_dir, 'target')
else:
bindir = os.path.join(root_dir, 'bin')
- if thisbuild.get('initfun', 'no') == "yes":
- # Special case (again!) for funambol...
- src = ("funambol-android-sync-client-" +
- thisbuild['version'] + "-unsigned.apk")
- src = os.path.join(bindir, src)
- elif 'maven' in thisbuild:
+ if 'maven' in thisbuild:
m = re.match(r".*^\[INFO\] .*apkbuilder.*/([^/]*)\.apk",
p.stdout_apk, re.S|re.M)
if not m:
diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index ddf4c5a2..84577c99 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1590,85 +1590,6 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, sdk_path,
}
""")
- # Special case init functions for funambol...
- if build.get('initfun', 'no') == "yes":
-
- if subprocess.call(['sed','-i','s@' +
- '' +
- '@' +
- '' +
- '' +
- '' +
- '' +
- '' +
- '@g',
- 'build.xml'], cwd=root_dir) !=0:
- raise BuildException("Failed to amend build.xml")
-
- if subprocess.call(['sed','-i','s@' +
- '\${user.home}/funambol/build/android/build.properties' +
- '@' +
- 'build.properties' +
- '@g',
- 'build.xml'], cwd=root_dir) !=0:
- raise BuildException("Failed to amend build.xml")
-
- buildxml = os.path.join(root_dir, 'build.xml')
- f = open(buildxml, 'r')
- xml = f.read()
- f.close()
- xmlout = ""
- mode = 0
- for line in xml.splitlines():
- if mode == 0:
- if line.find("jarsigner") != -1:
- mode = 1
- else:
- xmlout += line + "\n"
- else:
- if line.find("/exec") != -1:
- mode += 1
- if mode == 3:
- mode =0
- f = open(buildxml, 'w')
- f.write(xmlout)
- f.close()
-
- if subprocess.call(['sed','-i','s@' +
- 'platforms/android-2.0' +
- '@' +
- 'platforms/android-8' +
- '@g',
- 'build.xml'], cwd=root_dir) !=0:
- raise BuildException("Failed to amend build.xml")
-
- shutil.copyfile(
- os.path.join(root_dir, "build.properties.example"),
- os.path.join(root_dir, "build.properties"))
-
- if subprocess.call(['sed','-i','s@' +
- 'javacchome=.*'+
- '@' +
- 'javacchome=' + javacc_path +
- '@g',
- 'build.properties'], cwd=root_dir) !=0:
- raise BuildException("Failed to amend build.properties")
-
- if subprocess.call(['sed','-i','s@' +
- 'sdk-folder=.*'+
- '@' +
- 'sdk-folder=' + sdk_path +
- '@g',
- 'build.properties'], cwd=root_dir) !=0:
- raise BuildException("Failed to amend build.properties")
-
- if subprocess.call(['sed','-i','s@' +
- 'android.sdk.version.*'+
- '@' +
- 'android.sdk.version=2.0' +
- '@g',
- 'build.properties'], cwd=root_dir) !=0:
- raise BuildException("Failed to amend build.properties")
return (root_dir, srclibpaths)