diff options
| author | Siva Velusamy <vsiva@google.com> | 2014-06-12 21:31:19 -0700 |
|---|---|---|
| committer | Siva Velusamy <vsiva@google.com> | 2014-06-12 21:31:19 -0700 |
| commit | 5920008833704e9b6665dfca2b72250e2eddf24f (patch) | |
| tree | 98de723b8ffd53a755bf6dcfe04e5c7021c6e821 | |
| parent | 7267eaf12dd48d391480481f1966a86fdba50534 (diff) | |
| download | sdk-5920008833704e9b6665dfca2b72250e2eddf24f.zip sdk-5920008833704e9b6665dfca2b72250e2eddf24f.tar.gz sdk-5920008833704e9b6665dfca2b72250e2eddf24f.tar.bz2 | |
Use build number as context qualifier for Eclipse plugins
Change-Id: I22b5c0127c7534dadcb6f0c6f7543ba64592b420
| -rw-r--r-- | eclipse/build.gradle | 7 | ||||
| -rwxr-xr-x | eclipse/scripts/build_adt.sh | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/eclipse/build.gradle b/eclipse/build.gradle index 46405a9..8671690 100644 --- a/eclipse/build.gradle +++ b/eclipse/build.gradle @@ -29,6 +29,11 @@ ext { "pde" : new File(eclipseBuildDeps, "pde/org.eclipse.pde-3.8.zip"), "egit" : new File(eclipseBuildDeps, "egit/org.eclipse.egit.repository-2.2.0.201212191850-r.zip"), ] + + buildNumber = System.getenv("BUILD_NUMBER") + if (buildNumber == null) { + buildNumber = "SNAPSHOT" + } } // a mapping from the library names as used inside the plugin's MANIFEST.MF to the Maven artifact id @@ -141,7 +146,7 @@ task buildEclipse(type: Exec, dependsOn: unzipTargetPlatform) { def androidOut = new File(projectDir, "../../out").getCanonicalPath() environment("M2_HOME", maven.getParentFile().getParentFile().getCanonicalPath()) workingDir projectDir - commandLine maven.getCanonicalPath(), "-s", "settings.xml", "-DforceContextQualifier=M01", "-DANDROID_OUT=$androidOut", "package" + commandLine maven.getCanonicalPath(), "-s", "settings.xml", "-DforceContextQualifier=$project.buildNumber", "-DANDROID_OUT=$androidOut", "package" } private File getArtifact(ResolvedDependency dependency) { diff --git a/eclipse/scripts/build_adt.sh b/eclipse/scripts/build_adt.sh index d668aad..0e0f161 100755 --- a/eclipse/scripts/build_adt.sh +++ b/eclipse/scripts/build_adt.sh @@ -43,7 +43,7 @@ cd "$ANDROID_SRC" # 3. Launch Tycho build echo Launching Tycho to build ADT plugins and bundle -./tools/gradlew -i -b sdk/eclipse/build.gradle --no-daemon buildEclipse +( set -x ; BUILD_NUMBER="$BNUM" ./tools/gradlew -i -b sdk/eclipse/build.gradle --no-daemon buildEclipse) echo Copying ADT plugins and bundle into destination folder cd "$ANDROID_SRC" |