[android-platform-tools-base] 07/30: Refresh build scripts
Kai-Chung Yan
seamlik-guest at moszumanska.debian.org
Fri Jul 22 10:33:52 UTC 2016
This is an automated email from the git hooks/post-receive script.
seamlik-guest pushed a commit to branch master
in repository android-platform-tools-base.
commit d4165d1be2eb4a69671efcf378926a671aa5f0e3
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date: Thu Jul 21 15:11:51 2016 +0800
Refresh build scripts
---
debian/android-platform-tools-base.install | 34 +-------
debian/android-platform-tools-base.links | 3 +
debian/control | 2 +
debian/debian.gradle | 0
debian/libandroid-tools-annotations-java.poms | 2 +-
debian/libandroid-tools-common-java.poms | 2 +-
debian/maven.rules | 1 +
debian/patches/build.gradle.patch | 119 ++++++++++++++++++++++----
debian/patches/disable_jacoco.patch | 43 ++++++++++
debian/patches/exclude_instant-run.patch | 27 ++++++
debian/patches/series | 2 +
debian/rules | 4 +-
debian/settings.gradle | 62 ++++++++++++++
debian/version.gradle | 5 ++
14 files changed, 253 insertions(+), 53 deletions(-)
diff --git a/debian/android-platform-tools-base.install b/debian/android-platform-tools-base.install
index df5250c..dbb13b4 100644
--- a/debian/android-platform-tools-base.install
+++ b/debian/android-platform-tools-base.install
@@ -1,31 +1,3 @@
-out/build/base/asset-studio/build/libs/asset-studio-24.5.0.jar usr/share/android-platform-tools-base
-out/build/base/testutils/build/libs/testutils-24.5.0.jar usr/share/android-platform-tools-base
-out/build/base/google-services/build/libs/google-services-1.5.0.jar usr/share/android-platform-tools-base
-out/build/base/layoutlib-api/build/libs/layoutlib-api-24.5.0.jar usr/share/android-platform-tools-base
-out/build/base/sdklib-test/build/libs/sdklib-test-24.5.0.jar usr/share/android-platform-tools-base
-out/build/base/archquery/build/libs/archquery-24.5.0.jar usr/share/android-platform-tools-base
-out/build/base/draw9patch/build/libs/draw9patch-24.5.0.jar usr/share/android-platform-tools-base
-out/build/base/builder-test-api/build/libs/builder-test-api-1.5.0.jar usr/share/android-platform-tools-base
-out/build/base/perflib/build/libs/perflib-24.5.0.jar usr/share/android-platform-tools-base
-out/build/base/screenshot2/build/libs/screenshot2-24.5.0.jar usr/share/android-platform-tools-base
-out/build/base/profile/build/libs/profile.jar usr/share/android-platform-tools-base
-out/build/base/ant-tasks/build/libs/ant-tasks-24.5.0.jar usr/share/android-platform-tools-base
-out/build/base/sdklib/build/libs/sdklib-24.5.0.jar usr/share/android-platform-tools-base
-out/build/base/builder-model/build/libs/builder-model-1.5.0.jar usr/share/android-platform-tools-base
-out/build/base/builder/build/libs/builder-1.5.0.jar usr/share/android-platform-tools-base
-out/build/base/gradle-core/build/libs/gradle-core-1.5.0.jar usr/share/android-platform-tools-base
-out/build/base/jack/jack-api/build/libs/jack-api-0.9.0.jar usr/share/android-platform-tools-base
-out/build/base/jack/jill-api/build/libs/jill-api-0.9.0.jar usr/share/android-platform-tools-base
-out/build/base/gradle/build/libs/gradle-1.5.0.jar usr/share/android-platform-tools-base
-out/build/base/dvlib/build/libs/dvlib-24.5.0.jar usr/share/android-platform-tools-base
-out/build/base/manifest-merger/build/libs/manifest-merger-24.5.0.jar usr/share/android-platform-tools-base
-out/build/base/ninepatch/build/libs/ninepatch-24.5.0.jar usr/share/android-platform-tools-base
-out/build/base/chartlib/build/libs/chartlib-24.5.0.jar usr/share/android-platform-tools-base
-out/build/base/sdk-common/build/libs/sdk-common-24.5.0.jar usr/share/android-platform-tools-base
-out/build/base/rule-api/build/libs/rule-api-24.5.0.jar usr/share/android-platform-tools-base
-out/build/base/api-generator/build/libs/api-generator.jar usr/share/android-platform-tools-base
-out/build/base/ddmlib/build/libs/ddmlib-24.5.0.jar usr/share/android-platform-tools-base
-out/build/base/lint/build/libs/lint-24.5.0.jar usr/share/android-platform-tools-base
-out/build/base/lint-api/build/libs/lint-api-24.5.0.jar usr/share/android-platform-tools-base
-out/build/base/lint-tests/build/libs/lint-tests-24.5.0.jar usr/share/android-platform-tools-base
-out/build/base/lint-checks/build/libs/lint-checks-24.5.0.jar usr/share/android-platform-tools-base
+draw9patch/etc/draw9patch usr/lib/android-sdk/tools
+lint/cli/etc/lint usr/lib/android-sdk/tools
+misc/screenshot2/etc/screenshot2 usr/lib/android-sdk/tools
\ No newline at end of file
diff --git a/debian/android-platform-tools-base.links b/debian/android-platform-tools-base.links
new file mode 100644
index 0000000..a5c426e
--- /dev/null
+++ b/debian/android-platform-tools-base.links
@@ -0,0 +1,3 @@
+usr/lib/android-sdk/tools/draw9patch usr/bin/draw9patch
+usr/lib/android-sdk/tools/lint usr/bin/lint
+usr/lib/android-sdk/tools/screenshot2 usr/bin/screenshot2
\ No newline at end of file
diff --git a/debian/control b/debian/control
index 49b1e3c..a31a722 100644
--- a/debian/control
+++ b/debian/control
@@ -5,11 +5,13 @@ Maintainer: Android Tools Maintainer <android-tools-devel at lists.alioth.debian.or
Uploaders:
Markus Koschany <apo at debian.org>
Build-Depends:
+ antlr3,
debhelper (>= 9),
default-jdk,
gradle-debian-helper,
groovy,
junit4,
+ libandroid-databinding-java,
libandroid-tools-annotations-java,
libandroid-tools-common-java,
libasm4-java,
diff --git a/debian/debian.gradle b/debian/debian.gradle
new file mode 100644
index 0000000..e69de29
diff --git a/debian/libandroid-tools-annotations-java.poms b/debian/libandroid-tools-annotations-java.poms
index 83133eb..b4f469c 100644
--- a/debian/libandroid-tools-annotations-java.poms
+++ b/debian/libandroid-tools-annotations-java.poms
@@ -1 +1 @@
-debian/poms/android-tools-annotations-pom.xml --java-lib --no-parent --usj-name=com.android.tools.annotations --artifact=com.android.tools.annotations.jar
+debian/poms/android-tools-annotations-pom.xml --java-lib --usj-name=com.android.tools.annotations --artifact=annotations/build/libs/*.jar
diff --git a/debian/libandroid-tools-common-java.poms b/debian/libandroid-tools-common-java.poms
index 2b72663..a1993c2 100644
--- a/debian/libandroid-tools-common-java.poms
+++ b/debian/libandroid-tools-common-java.poms
@@ -1 +1 @@
-debian/poms/android-tools-common-pom.xml --java-lib --no-parent --usj-name=com.android.tools.common --artifact=com.android.tools.common.jar
+debian/poms/android-tools-common-pom.xml --java-lib --usj-name=com.android.tools.common --artifact=common/build/libs/*.jar
diff --git a/debian/maven.rules b/debian/maven.rules
index 31bf657..197ccd6 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -10,3 +10,4 @@ org.gradle s/messaging/gradle-messaging/ * s/.*/debian/ * *
org.gradle s/core/gradle-core/ * s/.*/debian/ * *
org.gradle s/wrapper/gradle-wrapper/ * s/.*/debian/ * *
org.gradle s/baseServices/gradle-base-services/ * s/.*/debian/ * *
+org.antlr antlr * s/.*/3.x/ * *
\ No newline at end of file
diff --git a/debian/patches/build.gradle.patch b/debian/patches/build.gradle.patch
index 4c0a7a6..4777209 100644
--- a/debian/patches/build.gradle.patch
+++ b/debian/patches/build.gradle.patch
@@ -1,8 +1,9 @@
Author: Markus Koschany <apo at debian.org>
Kai-Chung Yan <seamlikok at gmail.com>
Last-Update: 2016-07-19
-Description: Patch upstream's build system for Debian.
Forwarded: not-needed
+Description: Patch upstream's build system for Debian.
+ This patch also removes unsed test projects
--- a/annotations/build.gradle
+++ b/annotations/build.gradle
@@ -1,5 +1,4 @@
@@ -143,13 +144,39 @@ Forwarded: not-needed
exclude "**/internal/**"
--- a/build-system/gradle-core/build.gradle
+++ b/build-system/gradle-core/build.gradle
-@@ -1,6 +1,4 @@
+@@ -1,6 +1,5 @@
apply plugin: 'groovy'
--apply plugin: 'jacoco'
+ apply plugin: 'jacoco'
-apply plugin: 'clone-artifacts'
apply plugin: 'antlr'
configurations {
+@@ -34,7 +33,7 @@
+ // TODO: Switch to remote dependency once the empty deprecated transform-api is published
+ compile project(':base:transform-api')
+ compile project(':base:gradle-api')
+- compile project(':dataBinding:compilerCommon')
++ compile 'com.android.databinding:compilerCommon:debian'
+ compile 'org.ow2.asm:asm:5.0.3'
+ compile 'org.ow2.asm:asm-commons:5.0.3'
+ compile "net.sf.proguard:proguard-gradle:${project.ext.proguardVersion}"
+@@ -47,6 +46,7 @@
+ // not exposed as a runtime dependency.
+ provided gradleApi()
+ testCompile gradleApi()
++ compile localGroovy()
+
+ includeInJar project(':base:instant-run:instant-run-server')
+
+@@ -66,8 +66,6 @@
+ }
+ }
+
+-tasks.compileJava.dependsOn ":setupGradleInIde"
+-
+ group = 'com.android.tools.build'
+ archivesBaseName = 'gradle-core'
+ version = rootProject.ext.buildVersion
@@ -75,8 +73,6 @@
project.ext.pomName = 'Core Library for Android Gradle Plug-in'
project.ext.pomDesc = 'Core library to build Android Gradle plugin.'
@@ -617,20 +644,6 @@ Forwarded: not-needed
-apply from: "$rootDir/buildSrc/base/bintray.gradle"
-apply from: "$rootDir/buildSrc/base/javadoc.gradle"
---- a/templates/build.gradle
-+++ b/templates/build.gradle
-@@ -1,10 +0,0 @@
--apply plugin: 'sdk-files'
--
--sdk {
-- common {
-- item('eclipse/projects') { into 'templates/projects' }
-- item('eclipse/activities') { into 'templates/activities' }
-- item('eclipse/gradle') { into 'templates/gradle' }
-- item('eclipse/other') { into 'templates/other' }
-- }
--}
-\ No newline at end of file
--- a/testutils/build.gradle
+++ b/testutils/build.gradle
@@ -19,6 +19,3 @@
@@ -640,3 +653,75 @@ Forwarded: not-needed
-apply from: "$rootDir/buildSrc/base/publish.gradle"
-apply from: "$rootDir/buildSrc/base/bintray.gradle"
-apply from: "$rootDir/buildSrc/base/javadoc.gradle"
+--- a/build.gradle
++++ b/build.gradle
+@@ -1,3 +1,5 @@
++apply from: 'debian/version.gradle'
++
+ subprojects { Project project ->
+ // only configure leaf projects.
+ if (!project.getSubprojects().isEmpty()) return
+@@ -5,6 +7,6 @@
+ // exclude aar projects.
+ if ("fdr".equals(project.name)) return
+
+- apply from: "$rootDir/buildSrc/base/baseJava.gradle"
++ apply from: "$rootDir/debian/debian.gradle"
+ }
+
+--- a/build-system/gradle-api/build.gradle
++++ b/build-system/gradle-api/build.gradle
+@@ -1,6 +1,4 @@
+ apply plugin: 'java'
+-apply plugin: 'jacoco'
+-apply plugin: 'clone-artifacts'
+
+ configurations {
+ provided
+@@ -41,9 +39,4 @@
+ version = rootProject.ext.buildVersion
+
+ project.ext.pomName = 'Android Gradle API'
+-project.ext.pomDesc = 'APIs to customize Android Gradle Builds'
+-
+-apply from: "$rootDir/buildSrc/base/publish.gradle"
+-apply from: "$rootDir/buildSrc/base/bintray.gradle"
+-apply from: "$rootDir/buildSrc/base/javadoc.gradle"
+-
++project.ext.pomDesc = 'APIs to customize Android Gradle Builds'
+\ No newline at end of file
+--- a/repository/build.gradle
++++ b/repository/build.gradle
+@@ -1,6 +1,5 @@
+ apply plugin: 'java'
+ apply plugin: 'jacoco'
+-apply plugin: 'sdk-java-lib'
+
+ group = 'com.android.tools'
+ archivesBaseName = 'repository'
+@@ -27,9 +26,4 @@
+ }
+
+ project.ext.pomName = 'Android Tools repository'
+-project.ext.pomDesc = 'A library for downloading and managing package repositories'
+-
+-apply from: "$rootDir/buildSrc/base/publish.gradle"
+-apply from: "$rootDir/buildSrc/base/bintray.gradle"
+-apply from: "$rootDir/buildSrc/base/javadoc.gradle"
+-
++project.ext.pomDesc = 'A library for downloading and managing package repositories'
+\ No newline at end of file
+--- a/build-system/transform-api/build.gradle
++++ b/build-system/transform-api/build.gradle
+@@ -21,9 +21,4 @@
+ version ='2.0.0-deprecated-use-gradle-api'
+
+ project.ext.pomName = 'Android Transform API'
+-project.ext.pomDesc = 'Deprecated, use gradle-api'
+-
+-apply from: "$rootDir/buildSrc/base/publish.gradle"
+-apply from: "$rootDir/buildSrc/base/bintray.gradle"
+-apply from: "$rootDir/buildSrc/base/javadoc.gradle"
+-
++project.ext.pomDesc = 'Deprecated, use gradle-api'
+\ No newline at end of file
diff --git a/debian/patches/disable_jacoco.patch b/debian/patches/disable_jacoco.patch
new file mode 100644
index 0000000..567482e
--- /dev/null
+++ b/debian/patches/disable_jacoco.patch
@@ -0,0 +1,43 @@
+--- a/build-system/gradle-core/build.gradle
++++ b/build-system/gradle-core/build.gradle
+@@ -15,6 +15,7 @@
+ sourceSets {
+ main {
+ groovy.srcDirs = ['src/main/groovy', 'src/fromGradle/groovy']
++ groovy.exclude '**/JacocoTransform.java'
+ resources.srcDirs = ['src/main/resources', 'src/fromGradle/resources']
+ compileClasspath += configurations.provided
+ }
+@@ -37,7 +38,7 @@
+ compile 'org.ow2.asm:asm:5.0.3'
+ compile 'org.ow2.asm:asm-commons:5.0.3'
+ compile "net.sf.proguard:proguard-gradle:${project.ext.proguardVersion}"
+- compile "org.jacoco:org.jacoco.core:0.7.4.201502262128"
++ //compile "org.jacoco:org.jacoco.core:0.7.4.201502262128"
+ //testCompile project(':base:instant-run:instant-run-annotations')
+ //testCompile project(':base:instant-run:instant-run-runtime')
+
+--- a/build-system/gradle-core/src/main/groovy/com/android/build/gradle/internal/TaskManager.java
++++ b/build-system/gradle-core/src/main/groovy/com/android/build/gradle/internal/TaskManager.java
+@@ -96,7 +96,6 @@
+ import com.android.build.gradle.internal.transforms.InstantRunSlicer;
+ import com.android.build.gradle.internal.transforms.InstantRunTransform;
+ import com.android.build.gradle.internal.transforms.InstantRunVerifierTransform;
+-import com.android.build.gradle.internal.transforms.JacocoTransform;
+ import com.android.build.gradle.internal.transforms.JarMergingTransform;
+ import com.android.build.gradle.internal.transforms.NoChangesVerifierTransform;
+ import com.android.build.gradle.internal.transforms.MergeJavaResourcesTransform;
+@@ -2291,12 +2290,7 @@
+ public void createJacocoTransform(
+ @NonNull TaskFactory taskFactory,
+ @NonNull final VariantScope variantScope) {
+-
+- AndroidTask<?> task = variantScope.getTransformManager().addTransform(taskFactory,
+- variantScope, new JacocoTransform(project.getConfigurations()));
+-
+- Copy agentTask = getJacocoAgentTask();
+- task.dependsOn(taskFactory, agentTask);
++ throw new UnsupportedOperationException("JaCoCo is not in Debian yet.");
+ }
+
+ public void createJackTask(
diff --git a/debian/patches/exclude_instant-run.patch b/debian/patches/exclude_instant-run.patch
new file mode 100644
index 0000000..a4ca203
--- /dev/null
+++ b/debian/patches/exclude_instant-run.patch
@@ -0,0 +1,27 @@
+Author: Kai-Chung Yan <seamlikok at gmail.com>
+Last-Update: 2016-07-20
+Description: Exclude instant-run libraries from gradle-core
+ Building instant-run-server needs Android Platform "android.jar" which is not
+ available yet, so let's excluded it for now.
+--- a/build-system/gradle-core/build.gradle
++++ b/build-system/gradle-core/build.gradle
+@@ -38,8 +38,8 @@
+ compile 'org.ow2.asm:asm-commons:5.0.3'
+ compile "net.sf.proguard:proguard-gradle:${project.ext.proguardVersion}"
+ compile "org.jacoco:org.jacoco.core:0.7.4.201502262128"
+- testCompile project(':base:instant-run:instant-run-annotations')
+- testCompile project(':base:instant-run:instant-run-runtime')
++ //testCompile project(':base:instant-run:instant-run-annotations')
++ //testCompile project(':base:instant-run:instant-run-runtime')
+
+
+ // Add gradleApi to classpath for compilation, but use provided configuration so that groovy is
+@@ -48,7 +48,7 @@
+ testCompile gradleApi()
+ compile localGroovy()
+
+- includeInJar project(':base:instant-run:instant-run-server')
++ //includeInJar project(':base:instant-run:instant-run-server')
+
+ antlr 'org.antlr:antlr:3.5.2'
+
diff --git a/debian/patches/series b/debian/patches/series
index 68a2803..9a84697 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,5 @@ SdkTestCase.patch
project-test-lib.patch
trove3.patch
libhttpcore-java-ThreadSafe.patch
+exclude_instant-run.patch
+disable_jacoco.patch
diff --git a/debian/rules b/debian/rules
index 6959f24..c0071b8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,9 +7,7 @@ export JAVA_HOME=/usr/lib/jvm/default-java
dh $@ --parallel --with maven_repo_helper --buildsystem=gradle
override_dh_auto_build:
- dh_auto_build -- -x test assemble
- mv out/build/base/common/build/libs/common-24.5.0.jar com.android.tools.common.jar
- mv out/build/base/annotations/build/libs/annotations-24.5.0.jar com.android.tools.annotations.jar
+ dh_auto_build -- -x test --project-prop release=true --settings-file debian/settings.gradle assemble
get-orig-source: gradle_$(DEB_VERSION_UPSTREAM).tar.gz
mk-origtargz --repack --compression xz $<
diff --git a/debian/settings.gradle b/debian/settings.gradle
new file mode 100644
index 0000000..e30f5e1
--- /dev/null
+++ b/debian/settings.gradle
@@ -0,0 +1,62 @@
+rootProject.projectDir = file("${rootDir}/..")
+
+include ':base'
+project(':base').projectDir = rootDir
+
+//include ':base:gradle-experimental'
+//include ':base:jobb'
+include ':base:annotations'
+include ':base:ant-tasks'
+include ':base:archquery'
+include ':base:asset-studio'
+include ':base:builder-model'
+include ':base:builder-test-api'
+include ':base:builder'
+include ':base:common'
+include ':base:ddmlib'
+include ':base:draw9patch'
+include ':base:dvlib'
+include ':base:google-services'
+include ':base:gradle-api'
+include ':base:gradle-core'
+include ':base:gradle'
+//include ':base:instant-run:instant-run-annotations'
+//include ':base:instant-run:instant-run-client'
+//include ':base:instant-run:instant-run-common'
+//include ':base:instant-run:instant-run-runtime'
+//include ':base:instant-run:instant-run-server'
+include ':base:jack:jack-api'
+include ':base:jack:jill-api'
+include ':base:layoutlib-api'
+include ':base:lint-api'
+include ':base:lint-checks'
+include ':base:lint'
+include ':base:manifest-merger'
+include ':base:ninepatch'
+include ':base:profile'
+include ':base:rule-api'
+include ':base:repository'
+include ':base:screenshot2'
+include ':base:sdk-common'
+include ':base:sdklib'
+include ':base:testutils'
+include ':base:transform-api'
+
+project(':base:ant-tasks' ).projectDir = new File(rootDir, 'legacy/ant-tasks')
+project(':base:archquery' ).projectDir = new File(rootDir, 'legacy/archquery')
+project(':base:builder-model' ).projectDir = new File(rootDir, 'build-system/builder-model')
+project(':base:builder-test-api').projectDir = new File(rootDir, 'build-system/builder-test-api')
+project(':base:builder' ).projectDir = new File(rootDir, 'build-system/builder')
+project(':base:dvlib' ).projectDir = new File(rootDir, 'device_validator/dvlib')
+project(':base:google-services' ).projectDir = new File(rootDir, 'build-system/google-services')
+project(':base:gradle-api' ).projectDir = new File(rootDir, 'build-system/gradle-api')
+project(':base:gradle-core' ).projectDir = new File(rootDir, 'build-system/gradle-core')
+project(':base:gradle' ).projectDir = new File(rootDir, 'build-system/gradle')
+project(':base:layoutlib-api' ).projectDir = new File(rootDir, 'layoutlib-api')
+project(':base:lint-api' ).projectDir = new File(rootDir, 'lint/libs/lint-api')
+project(':base:lint-checks' ).projectDir = new File(rootDir, 'lint/libs/lint-checks')
+project(':base:lint' ).projectDir = new File(rootDir, 'lint/cli')
+project(':base:manifest-merger' ).projectDir = new File(rootDir, 'build-system/manifest-merger')
+project(':base:profile' ).projectDir = new File(rootDir, 'build-system/profile')
+project(':base:screenshot2' ).projectDir = new File(rootDir, 'misc/screenshot2')
+project(':base:transform-api' ).projectDir = new File(rootDir, 'build-system/transform-api')
\ No newline at end of file
diff --git a/debian/version.gradle b/debian/version.gradle
new file mode 100644
index 0000000..dbad714
--- /dev/null
+++ b/debian/version.gradle
@@ -0,0 +1,5 @@
+project.ext.apiVersion = 3
+project.ext.baseVersion = '25.0.0'
+project.ext.buildVersion = '2.0.0'
+project.ext.experimentalVersion = '0.6.0'
+project.ext.nativeApiVersion = 0
\ No newline at end of file
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/android-platform-tools-base.git
More information about the pkg-java-commits
mailing list