diff --git a/fdroidserver/build.py b/fdroidserver/build.py index 0549bb48..ad9c090f 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -390,7 +390,7 @@ def build_local(app, build, vcs, build_dir, output_dir, log_dir, srclib_dir, ext logging.info("Running 'sudo' commands in %s" % os.getcwd()) p = FDroidPopen(['sudo', 'DEBIAN_FRONTEND=noninteractive', - 'bash', '-x', '-c', build.sudo]) + 'bash', '-e', '-u', '-o', 'pipefail', '-x', '-c', '; '.join(build.sudo)]) if p.returncode != 0: raise BuildException("Error running sudo command for %s:%s" % (app.id, build.versionName), p.output) @@ -535,13 +535,13 @@ def build_local(app, build, vcs, build_dir, output_dir, log_dir, srclib_dir, ext # Run a build command if one is required... if build.build: logging.info("Running 'build' commands in %s" % root_dir) - cmd = common.replace_config_vars(build.build, build) + cmd = common.replace_config_vars("; ".join(build.build), build) # Substitute source library paths into commands... for name, number, libpath in srclibpaths: cmd = cmd.replace('$$' + name + '$$', os.path.join(os.getcwd(), libpath)) - p = FDroidPopen(['bash', '-x', '-c', cmd], cwd=root_dir) + p = FDroidPopen(['bash', '-e', '-u', '-o', 'pipefail', '-x', '-c', cmd], cwd=root_dir) if p.returncode != 0: raise BuildException("Error running build command for %s:%s" % diff --git a/fdroidserver/common.py b/fdroidserver/common.py index d8038cdf..a8a93cd4 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -2055,9 +2055,9 @@ def getsrclib(spec, srclib_dir, basepath=False, if prepare: if srclib["Prepare"]: - cmd = replace_config_vars(srclib["Prepare"], build) + cmd = replace_config_vars("; ".join(srclib["Prepare"]), build) - p = FDroidPopen(['bash', '-x', '-c', '--', cmd], cwd=libdir) + p = FDroidPopen(['bash', '-e', '-u', '-o', 'pipefail', '-x', '-c', '--', cmd], cwd=libdir) if p.returncode != 0: raise BuildException("Error running prepare command for srclib %s" % name, p.output) @@ -2119,10 +2119,10 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver= # Run an init command if one is required if build.init: - cmd = replace_config_vars(build.init, build) + cmd = replace_config_vars("; ".join(build.init), build) logging.info("Running 'init' commands in %s" % root_dir) - p = FDroidPopen(['bash', '-x', '-c', '--', cmd], cwd=root_dir) + p = FDroidPopen(['bash', '-e', '-u', '-o', 'pipefail', '-x', '-c', '--', cmd], cwd=root_dir) if p.returncode != 0: raise BuildException("Error running init command for %s:%s" % (app.id, build.versionName), p.output) @@ -2286,13 +2286,13 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver= if build.prebuild: logging.info("Running 'prebuild' commands in %s" % root_dir) - cmd = replace_config_vars(build.prebuild, build) + cmd = replace_config_vars("; ".join(build.prebuild), build) # Substitute source library paths into prebuild commands for name, number, libpath in srclibpaths: cmd = cmd.replace('$$' + name + '$$', os.path.join(os.getcwd(), libpath)) - p = FDroidPopen(['bash', '-x', '-c', '--', cmd], cwd=root_dir) + p = FDroidPopen(['bash', '-e', '-u', '-o', 'pipefail', '-x', '-c', '--', cmd], cwd=root_dir) if p.returncode != 0: raise BuildException("Error running prebuild command for %s:%s" % (app.id, build.versionName), p.output) diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index 43c2ca9d..64122b62 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -516,8 +516,11 @@ def parse_yaml_srclib(metadatapath): thisinfo[key] = data[key] elif data[key] is None: thisinfo[key] = [''] - elif key == 'Prepare' and isinstance(data[key], list): - thisinfo[key] = ' && '.join(data[key]) + elif key == 'Prepare' or flagtype(key) == TYPE_SCRIPT: + if isinstance(data[key], list): + thisinfo[key] = data[key] + else: + thisinfo[key] = [data[key]] if data[key] else [] else: thisinfo[key] = str(data[key] or '') @@ -847,9 +850,8 @@ def post_parse_yaml_metadata(yamldata): _flagtype = flagtype(flag) if _flagtype is TYPE_SCRIPT: - # concatenate script flags into a single string if they are stored as list - if isinstance(build[flag], list): - build[flag] = ' && '.join(build[flag]) + if isinstance(build[flag], str): + build[flag] = [build[flag]] elif _flagtype is TYPE_STRING: # things like versionNames are strings, but without quotes can be numbers if isinstance(build[flag], float) or isinstance(build[flag], int): @@ -916,12 +918,6 @@ def write_yaml(mf, app): return value[0] else: return value - else: - script_lines = value.split(' && ') - if len(script_lines) > 1: - return script_lines - else: - return value else: return value diff --git a/tests/common.TestCase b/tests/common.TestCase index bbf692de..fbf277e9 100755 --- a/tests/common.TestCase +++ b/tests/common.TestCase @@ -375,7 +375,7 @@ class CommonTest(unittest.TestCase): build = fdroidserver.metadata.Build() build.commit = 'master' build.gradle = ['yes'] - build.prebuild = 'test -d $$FakeSrcLib$$/testdirshouldexist' # actual test condition + build.prebuild = ['test -d $$FakeSrcLib$$/testdirshouldexist'] # actual test condition build.srclibs = [srclibname + '@1.2.3'] build.subdir = subdir build.versionCode = 0xCAFE diff --git a/tests/dump_internal_metadata_format.py b/tests/dump_internal_metadata_format.py index c3975902..5dade52b 100755 --- a/tests/dump_internal_metadata_format.py +++ b/tests/dump_internal_metadata_format.py @@ -40,7 +40,17 @@ import fdroidserver.metadata # noqa def _build_yaml_representer(dumper, data): """Create a YAML representation of a Build instance.""" - return dumper.represent_dict(data) + # internal representation of keys were switched + # to lists instead of strings concatenated by && + # https://gitlab.com/fdroid/fdroidserver/merge_requests/1185 + output = {} + for k, v in data.items(): + if k in ("build", "init", "prebuild", "sudo"): + output[k] = " && ".join(v) + else: + output[k] = v + + return dumper.represent_dict(output) parser = ArgumentParser() diff --git a/tests/metadata.TestCase b/tests/metadata.TestCase index 607dc92f..ef018b99 100755 --- a/tests/metadata.TestCase +++ b/tests/metadata.TestCase @@ -504,15 +504,24 @@ class MetadataTest(unittest.TestCase): { 'versionCode': 1, 'versionName': 'v0.1.0', - 'sudo': "apt-get update && " - "apt-get install -y whatever && " - "sed -i -e 's/> /a/file", - 'build': "./gradlew someSpecialTask && " - "sed -i 'd/that wrong config/' gradle.properties && " - "./gradlew compile", + 'sudo': [ + "apt-get update", + "apt-get install -y whatever", + "sed -i -e 's/> /a/file", + ], + 'build': [ + "./gradlew someSpecialTask", + "sed -i 'd/that wrong config/' gradle.properties", + "./gradlew compile", + ], } ], }, @@ -551,15 +560,23 @@ class MetadataTest(unittest.TestCase): { 'versionCode': 1, 'versionName': 'v0.1.0', - 'sudo': "apt-get update && " - "apt-get install -y whatever && " - "sed -i -e 's/> /a/file", - 'build': "./gradlew someSpecialTask && " - "sed -i 'd/that wrong config/' gradle.properties && " - "./gradlew compile", + 'sudo': [ + "apt-get update && " + "apt-get install -y whatever && " + "sed -i -e 's/> /a/file" + ], + 'build': [ + "./gradlew someSpecialTask && " + "sed -i 'd/that wrong config/' gradle.properties && " + "./gradlew compile" + ], } ], }, @@ -593,7 +610,7 @@ class MetadataTest(unittest.TestCase): { 'versionCode': 1, 'versionName': 'v0.1.0', - 'prebuild': "a && b && " "sed -i 's,a,b,'", + 'prebuild': ["a && b && " "sed -i 's,a,b,'"], } ], }, @@ -630,10 +647,10 @@ class MetadataTest(unittest.TestCase): build = fdroidserver.metadata.Build() build.versionCode = 102030 build.versionName = 'v1.2.3' - build.sudo = "chmod +rwx /opt" - build.init = "sed -i -e 'g/what/ever/' /some/file" - build.prebuild = "sed -i 'd/that wrong config/' gradle.properties" - build.build = "./gradlew compile" + build.sudo = ["chmod +rwx /opt"] + build.init = ["sed -i -e 'g/what/ever/' /some/file"] + build.prebuild = ["sed -i 'd/that wrong config/' gradle.properties"] + build.build = ["./gradlew compile"] app['Builds'].append(build) fdroidserver.metadata.write_yaml(mf, app) mf.seek(0) @@ -762,10 +779,21 @@ class MetadataTest(unittest.TestCase): build = fdroidserver.metadata.Build() build.versionCode = 102030 build.versionName = 'v1.2.3' - build.sudo = "apt-get update && apt-get install -y whatever && sed -i -e 's/> /a/file"] + build.build = [ + "./gradlew someSpecialTask", + "sed -i 'd/that wrong config/' gradle.properties", + "./gradlew compile", + ] app['Builds'].append(build) fdroidserver.metadata.write_yaml(mf, app) mf.seek(0) @@ -914,7 +942,7 @@ class MetadataTest(unittest.TestCase): 'Repo': 'https://git.host/repo.git', 'RepoType': 'git', 'Subdir': [''], - 'Prepare': '', + 'Prepare': [], }, srclib, ) @@ -943,9 +971,11 @@ class MetadataTest(unittest.TestCase): 'Repo': 'https://github.com/cketti/ckChangeLog', 'RepoType': 'git', 'Subdir': ['library', 'ckChangeLog/src/main'], - 'Prepare': "[ -f project.properties ] || echo 'source.dir=java' > " - "ant.properties && echo -e " - "'android.library=true\\ntarget=android-19' > project.properties", + 'Prepare': [ + "[ -f project.properties ] || echo 'source.dir=java' > " + "ant.properties && echo -e " + "'android.library=true\\ntarget=android-19' > project.properties" + ], }, ) @@ -993,8 +1023,10 @@ class MetadataTest(unittest.TestCase): 'You take the red pill—you stay in Wonderland', 'and I show you how deep the rabbit-hole goes.', ], - 'Prepare': 'There is a difference between knowing the path ' - 'and walking the path.', + 'Prepare': [ + 'There is a difference between knowing the path ' + 'and walking the path.' + ], } }, ) @@ -1014,14 +1046,10 @@ class MetadataTest(unittest.TestCase): Subdir: Prepare: - - The Matrix is a system, Neo. - - That system is our enemy. - - But when you're inside, you look around, what do you see? - - Businessmen, teachers, lawyers, carpenters. - - The very minds of the people we are trying to save. - - But until we do, these people are still a part of that system and that makes them our enemy. - - You have to understand, most of these people are not ready to be unplugged. - - And many of them are so inert, so hopelessly dependent on the system that they will fight to protect it. + - Many + - invalid + - commands + - here. ''' ) ) @@ -1034,14 +1062,12 @@ class MetadataTest(unittest.TestCase): 'RepoType': 'git', 'Repo': 'https://git.host/repo.git', 'Subdir': [''], - 'Prepare': 'The Matrix is a system, Neo. && ' - 'That system is our enemy. && ' - 'But when you\'re inside, you look around, what do you see? && ' - 'Businessmen, teachers, lawyers, carpenters. && ' - 'The very minds of the people we are trying to save. && ' - 'But until we do, these people are still a part of that system and that makes them our enemy. && ' - 'You have to understand, most of these people are not ready to be unplugged. && ' - 'And many of them are so inert, so hopelessly dependent on the system that they will fight to protect it.', + 'Prepare': [ + 'Many', + 'invalid', + 'commands', + 'here.', + ], } }, ) @@ -1081,7 +1107,7 @@ class MetadataTest(unittest.TestCase): 'RepoType': 'git', 'Repo': 'https://git.host/repo.git', 'Subdir': [''], - 'Prepare': '', + 'Prepare': [], }, 'simple': { 'RepoType': 'git', diff --git a/tests/metadata/dump/com.politedroid.yaml b/tests/metadata/dump/com.politedroid.yaml index aacff98c..46a5cd6b 100644 --- a/tests/metadata/dump/com.politedroid.yaml +++ b/tests/metadata/dump/com.politedroid.yaml @@ -144,7 +144,8 @@ Builds: srclibs: [] subdir: null submodules: false - sudo: echo 'this is just a test' + sudo: + - echo 'this is just a test' target: null timeout: null versionCode: 6 diff --git a/tests/metadata/dump/org.adaway.yaml b/tests/metadata/dump/org.adaway.yaml index 7fe21c4d..8972dc17 100644 --- a/tests/metadata/dump/org.adaway.yaml +++ b/tests/metadata/dump/org.adaway.yaml @@ -281,7 +281,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: android update project -p ../com_actionbarsherlock + prebuild: + - android update project -p ../com_actionbarsherlock rm: [] scandelete: [] scanignore: [] @@ -316,7 +317,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: android update project -p ../com_actionbarsherlock + prebuild: + - android update project -p ../com_actionbarsherlock rm: [] scandelete: [] scanignore: [] @@ -351,7 +353,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: android update project -p ../com_actionbarsherlock + prebuild: + - android update project -p ../com_actionbarsherlock rm: [] scandelete: [] scanignore: [] @@ -386,7 +389,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: android update project -p ../com_actionbarsherlock + prebuild: + - android update project -p ../com_actionbarsherlock rm: [] scandelete: [] scanignore: [] @@ -421,7 +425,9 @@ Builds: output: null patch: [] preassemble: [] - prebuild: android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* + prebuild: + - android update project -p ../com_actionbarsherlock + - rm -rf libs/armeabi/* rm: [] scandelete: [] scanignore: [] @@ -455,8 +461,10 @@ Builds: output: null patch: [] preassemble: [] - prebuild: android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* - && rm libs/android-support-v4.jar + prebuild: + - android update project -p ../com_actionbarsherlock + - rm -rf libs/armeabi/* + - rm libs/android-support-v4.jar rm: [] scandelete: [] scanignore: [] @@ -490,7 +498,9 @@ Builds: output: null patch: [] preassemble: [] - prebuild: android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* + prebuild: + - android update project -p ../com_actionbarsherlock + - rm -rf libs/armeabi/* rm: [] scandelete: [] scanignore: [] @@ -524,8 +534,10 @@ Builds: output: null patch: [] preassemble: [] - prebuild: android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* - && android update project -p ../org_donations + prebuild: + - android update project -p ../com_actionbarsherlock + - rm -rf libs/armeabi/* + - android update project -p ../org_donations rm: [] scandelete: [] scanignore: [] @@ -559,8 +571,10 @@ Builds: output: null patch: [] preassemble: [] - prebuild: android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* - && android update project -p ../org_donations + prebuild: + - android update project -p ../com_actionbarsherlock + - rm -rf libs/armeabi/* + - android update project -p ../org_donations rm: [] scandelete: [] scanignore: [] @@ -594,8 +608,10 @@ Builds: output: null patch: [] preassemble: [] - prebuild: android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* - && android update project -p ../org_donations + prebuild: + - android update project -p ../com_actionbarsherlock + - rm -rf libs/armeabi/* + - android update project -p ../org_donations rm: [] scandelete: [] scanignore: [] @@ -629,8 +645,10 @@ Builds: output: null patch: [] preassemble: [] - prebuild: android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* - && android update project -p ../org_donations + prebuild: + - android update project -p ../com_actionbarsherlock + - rm -rf libs/armeabi/* + - android update project -p ../org_donations rm: [] scandelete: [] scanignore: [] @@ -662,8 +680,9 @@ Builds: forceversion: false gradle: [] gradleprops: [] - init: rm android-libs/Donations/custom_rules.xml && git clone https://github.com/dschuermann/HtmlSpanner - android-libs/HtmlSpanner + init: + - rm android-libs/Donations/custom_rules.xml + - git clone https://github.com/dschuermann/HtmlSpanner android-libs/HtmlSpanner maven: false ndk: null novcheck: false @@ -671,12 +690,13 @@ Builds: output: null patch: [] preassemble: [] - prebuild: rm -rf ../update_zip libs/root-commands-1.2.jar libs/htmlspanner-0.2-fork.jar - && cp -f libs/htmlcleaner-2.2.jar android-libs/HtmlSpanner/htmlspanner/libs/ && - echo "android.library.reference.3=$$RootCommands$$" >> project.properties && echo - "android.library.reference.4=android-libs/HtmlSpanner/htmlspanner" >> project.properties - && find . -type f -print0 | xargs -0 sed -i 's/org.rootcommands/org.sufficientlysecure.rootcommands/g' - && cp android-libs/Donations/ant-templates/other/DonationsConfig.java android-libs/Donations/src/org/donations/ + prebuild: + - rm -rf ../update_zip libs/root-commands-1.2.jar libs/htmlspanner-0.2-fork.jar + - cp -f libs/htmlcleaner-2.2.jar android-libs/HtmlSpanner/htmlspanner/libs/ + - echo "android.library.reference.3=$$RootCommands$$" >> project.properties + - echo "android.library.reference.4=android-libs/HtmlSpanner/htmlspanner" >> project.properties + - find . -type f -print0 | xargs -0 sed -i 's/org.rootcommands/org.sufficientlysecure.rootcommands/g' + - cp android-libs/Donations/ant-templates/other/DonationsConfig.java android-libs/Donations/src/org/donations/ rm: [] scandelete: [] scanignore: [] @@ -709,8 +729,9 @@ Builds: forceversion: false gradle: [] gradleprops: [] - init: rm android-libs/Donations/custom_rules.xml && git clone https://github.com/dschuermann/HtmlSpanner - android-libs/HtmlSpanner + init: + - rm android-libs/Donations/custom_rules.xml + - git clone https://github.com/dschuermann/HtmlSpanner android-libs/HtmlSpanner maven: false ndk: null novcheck: false @@ -718,12 +739,13 @@ Builds: output: null patch: [] preassemble: [] - prebuild: rm -rf ../update_zip libs/root-commands-1.2.jar libs/htmlspanner-0.2-fork.jar - && cp -f libs/htmlcleaner-2.2.jar android-libs/HtmlSpanner/htmlspanner/libs/ && - echo "android.library.reference.3=$$RootCommands$$" >> project.properties && echo - "android.library.reference.4=android-libs/HtmlSpanner/htmlspanner" >> project.properties - && find . -type f -print0 | xargs -0 sed -i 's/org.rootcommands/org.sufficientlysecure.rootcommands/g' - && cp android-libs/Donations/ant-templates/other/DonationsConfig.java android-libs/Donations/src/org/donations/ + prebuild: + - rm -rf ../update_zip libs/root-commands-1.2.jar libs/htmlspanner-0.2-fork.jar + - cp -f libs/htmlcleaner-2.2.jar android-libs/HtmlSpanner/htmlspanner/libs/ + - echo "android.library.reference.3=$$RootCommands$$" >> project.properties + - echo "android.library.reference.4=android-libs/HtmlSpanner/htmlspanner" >> project.properties + - find . -type f -print0 | xargs -0 sed -i 's/org.rootcommands/org.sufficientlysecure.rootcommands/g' + - cp android-libs/Donations/ant-templates/other/DonationsConfig.java android-libs/Donations/src/org/donations/ rm: [] scandelete: [] scanignore: [] diff --git a/tests/metadata/dump/org.smssecure.smssecure.yaml b/tests/metadata/dump/org.smssecure.smssecure.yaml index b010502b..3c20d20a 100644 --- a/tests/metadata/dump/org.smssecure.smssecure.yaml +++ b/tests/metadata/dump/org.smssecure.smssecure.yaml @@ -32,13 +32,27 @@ Builds: output: null patch: [] preassemble: [] - prebuild: touch signing.properties && pushd $$GradleWitness$$ && gradle jar && popd - && cp $$GradleWitness$$/build/libs/GradleWitness.jar libs/gradle-witness.jar && - sed -i -e '20,22d' build.gradle && pushd $$PreferenceFragment$$ && gradle uploadArchives - && popd && sed -i -e '/5470f5872514a6226fa1fc6f4e000991f38805691c534cf0bd2778911fc773ad/d' - build.gradle && mkdir smil && pushd smil && wget -c http://www.w3.org/TR/smil-boston-dom/java-binding.zip - && unzip java-binding.zip && popd && cp -fR smil/java/org src/ && rm -fR smil - && sed -i -e '/org.w3c.smil/d' build.gradle && cp -fR $$AospMms$$/src/org src/ + prebuild: + - touch signing.properties + - pushd $$GradleWitness$$ + - gradle jar + - popd + - cp $$GradleWitness$$/build/libs/GradleWitness.jar libs/gradle-witness.jar + - sed -i -e '20,22d' build.gradle + - pushd $$PreferenceFragment$$ + - gradle uploadArchives + - popd + - sed -i -e '/5470f5872514a6226fa1fc6f4e000991f38805691c534cf0bd2778911fc773ad/d' + build.gradle + - mkdir smil + - pushd smil + - wget -c http://www.w3.org/TR/smil-boston-dom/java-binding.zip + - unzip java-binding.zip + - popd + - cp -fR smil/java/org src/ + - rm -fR smil + - sed -i -e '/org.w3c.smil/d' build.gradle + - cp -fR $$AospMms$$/src/org src/ rm: - libs/* scandelete: [] @@ -78,8 +92,12 @@ Builds: output: null patch: [] preassemble: [] - prebuild: touch signing.properties && pushd $$GradleWitness$$ && gradle jar && popd - && cp $$GradleWitness$$/build/libs/GradleWitness.jar libs/gradle-witness.jar + prebuild: + - touch signing.properties + - pushd $$GradleWitness$$ + - gradle jar + - popd + - cp $$GradleWitness$$/build/libs/GradleWitness.jar libs/gradle-witness.jar rm: - libs/*.jar scandelete: [] @@ -116,8 +134,11 @@ Builds: output: null patch: [] preassemble: [] - prebuild: touch signing.properties && ./build-witness.sh && rm -rf libs/gradle-witness/build - && echo "org.gradle.jvmargs=-Xms512m -Xmx512m -XX:MaxPermSize=512m" >> gradle.properties + prebuild: + - touch signing.properties + - ./build-witness.sh + - rm -rf libs/gradle-witness/build + - echo "org.gradle.jvmargs=-Xms512m -Xmx512m -XX:MaxPermSize=512m" >> gradle.properties rm: - libs/*.jar scandelete: [] @@ -153,8 +174,11 @@ Builds: output: null patch: [] preassemble: [] - prebuild: touch signing.properties && ./build-witness.sh && rm -rf libs/gradle-witness/build - && echo "org.gradle.jvmargs=-Xms512m -Xmx512m -XX:MaxPermSize=512m" >> gradle.properties + prebuild: + - touch signing.properties + - ./build-witness.sh + - rm -rf libs/gradle-witness/build + - echo "org.gradle.jvmargs=-Xms512m -Xmx512m -XX:MaxPermSize=512m" >> gradle.properties rm: - libs/*.jar scandelete: [] @@ -190,7 +214,10 @@ Builds: output: null patch: [] preassemble: [] - prebuild: touch signing.properties && ./scripts/build-witness.sh && rm -rf libs/gradle-witness/build + prebuild: + - touch signing.properties + - ./scripts/build-witness.sh + - rm -rf libs/gradle-witness/build rm: - libs/*.jar scandelete: [] @@ -226,7 +253,10 @@ Builds: output: null patch: [] preassemble: [] - prebuild: touch signing.properties && ./scripts/build-witness.sh && rm -rf libs/gradle-witness/build + prebuild: + - touch signing.properties + - ./scripts/build-witness.sh + - rm -rf libs/gradle-witness/build rm: - libs/*.jar scandelete: [] @@ -262,7 +292,10 @@ Builds: output: null patch: [] preassemble: [] - prebuild: touch signing.properties && ./scripts/build-witness.sh && rm -rf libs/gradle-witness/build + prebuild: + - touch signing.properties + - ./scripts/build-witness.sh + - rm -rf libs/gradle-witness/build rm: - libs/*.jar scandelete: [] @@ -298,7 +331,10 @@ Builds: output: null patch: [] preassemble: [] - prebuild: touch signing.properties && ./scripts/build-witness.sh && rm -rf libs/gradle-witness/build + prebuild: + - touch signing.properties + - ./scripts/build-witness.sh + - rm -rf libs/gradle-witness/build rm: - libs/*.jar scandelete: [] diff --git a/tests/metadata/dump/org.videolan.vlc.yaml b/tests/metadata/dump/org.videolan.vlc.yaml index 569724d8..ef25d9a8 100644 --- a/tests/metadata/dump/org.videolan.vlc.yaml +++ b/tests/metadata/dump/org.videolan.vlc.yaml @@ -15,7 +15,8 @@ Builds: - ../java-libs/ActionBarSherlock antcommands: [] antifeatures: [] - build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release + build: + - cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: [] buildozer: false commit: 0.0.11 @@ -34,7 +35,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i '48d' ../Makefile + prebuild: + - sed -i '48d' ../Makefile rm: [] scandelete: [] scanignore: [] @@ -52,7 +54,8 @@ Builds: - ../java-libs/ActionBarSherlock antcommands: [] antifeatures: [] - build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release + build: + - cd ../ && ANDROID_ABI=armeabi ./compile.sh release buildjni: [] buildozer: false commit: 0.0.11 @@ -71,7 +74,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i '48d' ../Makefile + prebuild: + - sed -i '48d' ../Makefile rm: [] scandelete: [] scanignore: [] @@ -89,7 +93,8 @@ Builds: - ../java-libs/ActionBarSherlock antcommands: [] antifeatures: [] - build: cd ../ && ANDROID_ABI=x86 ./compile.sh release + build: + - cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: [] buildozer: false commit: unknown - see disabled @@ -108,7 +113,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i '48d' ../Makefile + prebuild: + - sed -i '48d' ../Makefile rm: [] scandelete: [] scanignore: [] @@ -126,7 +132,8 @@ Builds: - ../java-libs/ActionBarSherlock antcommands: [] antifeatures: [] - build: cd ../ && ANDROID_ABI=mips ./compile.sh release + build: + - cd ../ && ANDROID_ABI=mips ./compile.sh release buildjni: [] buildozer: false commit: 0.0.11 @@ -145,7 +152,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i '48d' ../Makefile + prebuild: + - sed -i '48d' ../Makefile rm: [] scandelete: [] scanignore: [] @@ -160,7 +168,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ANDROID_ABI=mips ./compile.sh release + build: + - cd ../ && ANDROID_ABI=mips ./compile.sh release buildjni: [] buildozer: false commit: 0.1.3 @@ -180,7 +189,8 @@ Builds: patch: - ndkr9.patch preassemble: [] - prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc + prebuild: + - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc rm: [] scandelete: [] scanignore: [] @@ -196,7 +206,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ANDROID_ABI=x86 ./compile.sh release + build: + - cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: [] buildozer: false commit: 0.1.3 @@ -216,7 +227,8 @@ Builds: patch: - ndkr9.patch preassemble: [] - prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc + prebuild: + - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc rm: [] scandelete: [] scanignore: [] @@ -232,7 +244,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release + build: + - cd ../ && ANDROID_ABI=armeabi ./compile.sh release buildjni: [] buildozer: false commit: 0.1.3 @@ -252,7 +265,8 @@ Builds: patch: - ndkr9.patch preassemble: [] - prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc + prebuild: + - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc rm: [] scandelete: [] scanignore: [] @@ -268,7 +282,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release + build: + - cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: [] buildozer: false commit: 0.1.3 @@ -288,7 +303,8 @@ Builds: patch: - ndkr9.patch preassemble: [] - prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc + prebuild: + - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc rm: [] scandelete: [] scanignore: [] @@ -304,7 +320,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ANDROID_ABI=x86 ./compile.sh release + build: + - cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: [] buildozer: false commit: 0.9.0 @@ -323,7 +340,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc + prebuild: + - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc rm: [] scandelete: [] scanignore: [] @@ -339,7 +357,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release + build: + - cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: [] buildozer: false commit: 0.9.0 @@ -358,7 +377,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc + prebuild: + - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc rm: [] scandelete: [] scanignore: [] @@ -374,7 +394,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ANDROID_ABI=x86 ./compile.sh release + build: + - cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: [] buildozer: false commit: 0.9.1 @@ -393,7 +414,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc + prebuild: + - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc rm: [] scandelete: [] scanignore: [] @@ -409,7 +431,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release + build: + - cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: [] buildozer: false commit: 0.9.1 @@ -428,7 +451,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc + prebuild: + - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc rm: [] scandelete: [] scanignore: [] @@ -444,7 +468,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ANDROID_ABI=x86 ./compile.sh release + build: + - cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: [] buildozer: false commit: 0.9.5 @@ -463,7 +488,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc + prebuild: + - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc rm: [] scandelete: [] scanignore: [] @@ -479,7 +505,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release + build: + - cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: [] buildozer: false commit: 0.9.5 @@ -498,7 +525,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc + prebuild: + - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc rm: [] scandelete: [] scanignore: [] @@ -514,7 +542,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ANDROID_ABI=x86 ./compile.sh release + build: + - cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: [] buildozer: false commit: 0.9.6 @@ -533,7 +562,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: + - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc rm: [] scandelete: [] scanignore: [] @@ -549,7 +579,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release + build: + - cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: [] buildozer: false commit: 0.9.6 @@ -568,7 +599,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: + - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc rm: [] scandelete: [] scanignore: [] @@ -584,7 +616,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ANDROID_ABI=x86 ./compile.sh release + build: + - cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: [] buildozer: false commit: 0.9.7 @@ -603,7 +636,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: + - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc rm: [] scandelete: [] scanignore: [] @@ -619,7 +653,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release + build: + - cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: [] buildozer: false commit: 0.9.7 @@ -638,7 +673,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: + - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc rm: [] scandelete: [] scanignore: [] @@ -654,7 +690,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ANDROID_ABI=mips ./compile.sh release + build: + - cd ../ && ANDROID_ABI=mips ./compile.sh release buildjni: [] buildozer: false commit: 0.9.7.1 @@ -673,7 +710,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: + - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc rm: [] scandelete: [] scanignore: [] @@ -689,7 +727,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ANDROID_ABI=x86 ./compile.sh release + build: + - cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: [] buildozer: false commit: 0.9.7.1 @@ -708,7 +747,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: + - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc rm: [] scandelete: [] scanignore: [] @@ -724,7 +764,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release + build: + - cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: [] buildozer: false commit: 0.9.7.1 @@ -743,7 +784,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: + - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc rm: [] scandelete: [] scanignore: [] @@ -759,7 +801,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ANDROID_ABI=x86 ./compile.sh release + build: + - cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: [] buildozer: false commit: 0.9.8 @@ -778,7 +821,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: + - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc rm: [] scandelete: [] scanignore: [] @@ -794,7 +838,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release + build: + - cd ../ && ANDROID_ABI=armeabi ./compile.sh release buildjni: [] buildozer: false commit: 0.9.8 @@ -813,7 +858,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: + - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc rm: [] scandelete: [] scanignore: [] @@ -829,7 +875,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release + build: + - cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: [] buildozer: false commit: 0.9.8 @@ -848,7 +895,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: + - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc rm: [] scandelete: [] scanignore: [] @@ -864,7 +912,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ANDROID_ABI=x86 ./compile.sh release + build: + - cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: [] buildozer: false commit: 0.9.9 @@ -883,7 +932,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: + - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc rm: [] scandelete: [] scanignore: [] @@ -899,7 +949,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release + build: + - cd ../ && ANDROID_ABI=armeabi ./compile.sh release buildjni: [] buildozer: false commit: 0.9.9 @@ -918,7 +969,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: + - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc rm: [] scandelete: [] scanignore: [] @@ -934,7 +986,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release + build: + - cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: [] buildozer: false commit: 0.9.9 @@ -953,7 +1006,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: + - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc rm: [] scandelete: [] scanignore: [] @@ -969,7 +1023,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ANDROID_ABI=x86 ./compile.sh release + build: + - cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: [] buildozer: false commit: 0.9.10 @@ -988,7 +1043,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: + - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc rm: [] scandelete: [] scanignore: [] @@ -1004,7 +1060,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release + build: + - cd ../ && ANDROID_ABI=armeabi ./compile.sh release buildjni: [] buildozer: false commit: 0.9.10 @@ -1023,7 +1080,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: + - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc rm: [] scandelete: [] scanignore: [] @@ -1039,7 +1097,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release + build: + - cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: [] buildozer: false commit: 0.9.10 @@ -1058,7 +1117,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: + - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc rm: [] scandelete: [] scanignore: [] @@ -1074,7 +1134,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ANDROID_ABI=x86 ./compile.sh release + build: + - cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: [] buildozer: false commit: 1.0.0 @@ -1093,7 +1154,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: + - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc rm: [] scandelete: [] scanignore: [] @@ -1109,7 +1171,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release + build: + - cd ../ && ANDROID_ABI=armeabi ./compile.sh release buildjni: [] buildozer: false commit: 1.0.0 @@ -1128,7 +1191,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: + - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc rm: [] scandelete: [] scanignore: [] @@ -1144,7 +1208,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release + build: + - cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: [] buildozer: false commit: 1.0.0 @@ -1163,7 +1228,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: + - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc rm: [] scandelete: [] scanignore: [] @@ -1179,7 +1245,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ANDROID_ABI=x86 ./compile.sh release + build: + - cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: [] buildozer: false commit: 1.0.1 @@ -1198,7 +1265,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: + - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc rm: [] scandelete: [] scanignore: [] @@ -1214,7 +1282,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release + build: + - cd ../ && ANDROID_ABI=armeabi ./compile.sh release buildjni: [] buildozer: false commit: 1.0.1 @@ -1233,7 +1302,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: + - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc rm: [] scandelete: [] scanignore: [] @@ -1249,7 +1319,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release + build: + - cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: [] buildozer: false commit: 1.0.1 @@ -1268,7 +1339,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: + - sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc rm: [] scandelete: [] scanignore: [] @@ -1284,7 +1356,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ./compile.sh -a "armeabi" --release + build: + - cd ../ && ./compile.sh -a "armeabi" --release buildjni: [] buildozer: false commit: 1.1.3 @@ -1304,7 +1377,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh + prebuild: + - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc rm: [] scandelete: [] @@ -1321,7 +1395,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ./compile.sh -a "armeabi-v7a" --release + build: + - cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: [] buildozer: false commit: 1.1.3 @@ -1341,7 +1416,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh + prebuild: + - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc rm: [] scandelete: [] @@ -1358,7 +1434,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ./compile.sh -a "x86" --release + build: + - cd ../ && ./compile.sh -a "x86" --release buildjni: [] buildozer: false commit: 1.1.3 @@ -1378,7 +1455,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh + prebuild: + - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc rm: [] scandelete: [] @@ -1395,7 +1473,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ./compile.sh -a "armeabi" --release + build: + - cd ../ && ./compile.sh -a "armeabi" --release buildjni: [] buildozer: false commit: 1.1.5 @@ -1415,7 +1494,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh + prebuild: + - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc rm: [] scandelete: [] @@ -1432,7 +1512,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ./compile.sh -a "armeabi-v7a" --release + build: + - cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: [] buildozer: false commit: 1.1.5 @@ -1452,7 +1533,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh + prebuild: + - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc rm: [] scandelete: [] @@ -1469,7 +1551,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ./compile.sh -a "x86" --release + build: + - cd ../ && ./compile.sh -a "x86" --release buildjni: [] buildozer: false commit: 1.1.5 @@ -1489,7 +1572,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh + prebuild: + - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc rm: [] scandelete: [] @@ -1506,7 +1590,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ./compile.sh -a "armeabi" --release + build: + - cd ../ && ./compile.sh -a "armeabi" --release buildjni: [] buildozer: false commit: 1.1.6 @@ -1526,7 +1611,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh + prebuild: + - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc rm: [] scandelete: [] @@ -1543,7 +1629,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ./compile.sh -a "armeabi-v7a" --release + build: + - cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: [] buildozer: false commit: 1.1.6 @@ -1563,7 +1650,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh + prebuild: + - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc rm: [] scandelete: [] @@ -1580,7 +1668,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ./compile.sh -a "x86" --release + build: + - cd ../ && ./compile.sh -a "x86" --release buildjni: [] buildozer: false commit: 1.1.6 @@ -1600,7 +1689,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh + prebuild: + - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc rm: [] scandelete: [] @@ -1617,7 +1707,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ./compile.sh -a "armeabi" --release + build: + - cd ../ && ./compile.sh -a "armeabi" --release buildjni: [] buildozer: false commit: 1.2.0 @@ -1637,7 +1728,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh + prebuild: + - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc rm: [] scandelete: [] @@ -1654,7 +1746,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ./compile.sh -a "armeabi-v7a" --release + build: + - cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: [] buildozer: false commit: 1.2.0 @@ -1674,7 +1767,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh + prebuild: + - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc rm: [] scandelete: [] @@ -1691,7 +1785,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ./compile.sh -a "x86" --release + build: + - cd ../ && ./compile.sh -a "x86" --release buildjni: [] buildozer: false commit: 1.2.0 @@ -1711,7 +1806,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh + prebuild: + - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc rm: [] scandelete: [] @@ -1728,7 +1824,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ./compile.sh -a "armeabi" --release + build: + - cd ../ && ./compile.sh -a "armeabi" --release buildjni: [] buildozer: false commit: 1.2.1 @@ -1748,7 +1845,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh + prebuild: + - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc rm: [] scandelete: [] @@ -1765,7 +1863,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ./compile.sh -a "armeabi-v7a" --release + build: + - cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: [] buildozer: false commit: 1.2.1 @@ -1785,7 +1884,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh + prebuild: + - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc rm: [] scandelete: [] @@ -1802,7 +1902,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ./compile.sh -a "x86" --release + build: + - cd ../ && ./compile.sh -a "x86" --release buildjni: [] buildozer: false commit: 1.2.1 @@ -1822,7 +1923,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh + prebuild: + - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc rm: [] scandelete: [] @@ -1839,7 +1941,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ./compile.sh -a "armeabi" --release + build: + - cd ../ && ./compile.sh -a "armeabi" --release buildjni: [] buildozer: false commit: 1.2.2 @@ -1859,7 +1962,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh + prebuild: + - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc rm: [] scandelete: [] @@ -1876,7 +1980,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ./compile.sh -a "armeabi-v7a" --release + build: + - cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: [] buildozer: false commit: 1.2.2 @@ -1896,7 +2001,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh + prebuild: + - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc rm: [] scandelete: [] @@ -1913,7 +2019,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ./compile.sh -a "x86" --release + build: + - cd ../ && ./compile.sh -a "x86" --release buildjni: [] buildozer: false commit: 1.2.2 @@ -1933,7 +2040,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh + prebuild: + - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc rm: [] scandelete: [] @@ -1950,7 +2058,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ./compile.sh -a "armeabi" --release + build: + - cd ../ && ./compile.sh -a "armeabi" --release buildjni: [] buildozer: false commit: 1.2.3 @@ -1970,7 +2079,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh + prebuild: + - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc rm: [] scandelete: [] @@ -1987,7 +2097,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ./compile.sh -a "armeabi-v7a" --release + build: + - cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: [] buildozer: false commit: 1.2.3 @@ -2007,7 +2118,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh + prebuild: + - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc rm: [] scandelete: [] @@ -2024,7 +2136,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ./compile.sh -a "x86" --release + build: + - cd ../ && ./compile.sh -a "x86" --release buildjni: [] buildozer: false commit: 1.2.3 @@ -2044,7 +2157,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh + prebuild: + - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc rm: [] scandelete: [] @@ -2061,7 +2175,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ./compile.sh -a "armeabi" --release + build: + - cd ../ && ./compile.sh -a "armeabi" --release buildjni: [] buildozer: false commit: 1.2.4 @@ -2081,7 +2196,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh + prebuild: + - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc rm: [] scandelete: [] @@ -2098,7 +2214,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ./compile.sh -a "armeabi-v7a" --release + build: + - cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: [] buildozer: false commit: 1.2.4 @@ -2118,7 +2235,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh + prebuild: + - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc rm: [] scandelete: [] @@ -2135,7 +2253,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ./compile.sh -a "x86" --release + build: + - cd ../ && ./compile.sh -a "x86" --release buildjni: [] buildozer: false commit: 1.2.4 @@ -2155,7 +2274,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh + prebuild: + - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc rm: [] scandelete: [] @@ -2172,7 +2292,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ./compile.sh -a "armeabi" --release + build: + - cd ../ && ./compile.sh -a "armeabi" --release buildjni: [] buildozer: false commit: 1.2.5 @@ -2192,7 +2313,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh + prebuild: + - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc rm: [] scandelete: [] @@ -2209,7 +2331,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ./compile.sh -a "armeabi-v7a" --release + build: + - cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: [] buildozer: false commit: 1.2.5 @@ -2229,7 +2352,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh + prebuild: + - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc rm: [] scandelete: [] @@ -2246,7 +2370,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ./compile.sh -a "x86" --release + build: + - cd ../ && ./compile.sh -a "x86" --release buildjni: [] buildozer: false commit: 1.2.5 @@ -2266,7 +2391,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh + prebuild: + - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc rm: [] scandelete: [] @@ -2283,7 +2409,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ./compile.sh -a "armeabi" --release + build: + - cd ../ && ./compile.sh -a "armeabi" --release buildjni: [] buildozer: false commit: 1.2.6 @@ -2303,7 +2430,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh + prebuild: + - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc rm: [] scandelete: [] @@ -2320,7 +2448,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ./compile.sh -a "armeabi-v7a" --release + build: + - cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: [] buildozer: false commit: 1.2.6 @@ -2340,7 +2469,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh + prebuild: + - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc rm: [] scandelete: [] @@ -2357,7 +2487,8 @@ Builds: - androidupdate: [] antcommands: [] antifeatures: [] - build: cd ../ && ./compile.sh -a "x86" --release + build: + - cd ../ && ./compile.sh -a "x86" --release buildjni: [] buildozer: false commit: 1.2.6 @@ -2377,7 +2508,8 @@ Builds: output: null patch: [] preassemble: [] - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh + prebuild: + - sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc rm: [] scandelete: []