diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-10-02 20:58:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-02 20:58:44 -0400 |
| commit | 021a24d5bb8dc54bc4496b528d821f11aa3ca745 (patch) | |
| tree | a3d8141a72ec737ddce477bd2311d8e646ce0fdc /python/servo/package_commands.py | |
| parent | 74ba683e2733ca5baa3fc70cfb33d885b40eb606 (diff) | |
| parent | 54d77886985be10e451e2a293e9b79deba3b3fea (diff) | |
| download | servo-021a24d5bb8dc54bc4496b528d821f11aa3ca745.tar.gz servo-021a24d5bb8dc54bc4496b528d821f11aa3ca745.zip | |
Auto merge of #21851 - paulrouget:maven, r=MortimerGoro
Create a Maven repository on package
This new step will go through all the *release* builds of the servoview AAR, and create a maven repo (just a tree of directories) with the relevant POM files under `target/gradle/servoview/maven`.
For example, after building for armv7 and x86, it looks like this:
```
/Users/paul/git/servo/target/gradle/servoview/maven
└── org
└── mozilla
└── servoview
├── servoview-armv7
│ ├── 0.0.1.20181002
│ │ ├── servoview-armv7-0.0.1.20181002.aar
│ │ ├── servoview-armv7-0.0.1.20181002.aar.md5
│ │ ├── servoview-armv7-0.0.1.20181002.aar.sha1
│ │ ├── servoview-armv7-0.0.1.20181002.pom
│ │ ├── servoview-armv7-0.0.1.20181002.pom.md5
│ │ └── servoview-armv7-0.0.1.20181002.pom.sha1
│ ├── maven-metadata.xml
│ ├── maven-metadata.xml.md5
│ └── maven-metadata.xml.sha1
└── servoview-x86
├── 0.0.1.20181002
│ ├── servoview-x86-0.0.1.20181002.aar
│ ├── servoview-x86-0.0.1.20181002.aar.md5
│ ├── servoview-x86-0.0.1.20181002.aar.sha1
│ ├── servoview-x86-0.0.1.20181002.pom
│ ├── servoview-x86-0.0.1.20181002.pom.md5
│ └── servoview-x86-0.0.1.20181002.pom.sha1
├── maven-metadata.xml
├── maven-metadata.xml.md5
└── maven-metadata.xml.sha1
```
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21851)
<!-- Reviewable:end -->
Diffstat (limited to 'python/servo/package_commands.py')
| -rw-r--r-- | python/servo/package_commands.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py index 288477de1f2..54505d3afd4 100644 --- a/python/servo/package_commands.py +++ b/python/servo/package_commands.py @@ -198,7 +198,12 @@ class PackageCommands(CommandBase): @CommandArgument('--flavor', '-f', default=None, help='Package using the given Gradle flavor') - def package(self, release=False, dev=False, android=None, debug=False, debugger=None, target=None, flavor=None): + @CommandArgument('--maven', + default=None, + action='store_true', + help='Create a local Maven repository') + def package(self, release=False, dev=False, android=None, debug=False, + debugger=None, target=None, flavor=None, maven=False): if android is None: android = self.config["build"]["android"] if target and android: @@ -235,9 +240,13 @@ class PackageCommands(CommandBase): variant = ":assemble" + flavor_name + build_type + build_mode apk_task_name = ":servoapp" + variant aar_task_name = ":servoview" + variant + maven_task_name = ":servoview:uploadArchive" + argv = ["./gradlew", "--no-daemon", apk_task_name, aar_task_name] + if maven: + argv.append(maven_task_name) try: with cd(path.join("support", "android", "apk")): - subprocess.check_call(["./gradlew", "--no-daemon", apk_task_name, aar_task_name], env=env) + subprocess.check_call(argv, env=env) except subprocess.CalledProcessError as e: print("Packaging Android exited with return value %d" % e.returncode) return e.returncode |