You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by dl...@apache.org on 2016/12/14 19:24:32 UTC
[42/50] [abbrv] incubator-edgent git commit: release build fixes
release build fixes
Add "incubator" to release bundle names
Exclude KEYS from source bundle
Add CONTRIBUTORS to the binary bundle
Remove test.classes/*.APPS.TEST.jar from source bundle
Build *.APPS.TEST.jar under gradle "build" tree
Add cleanup of old ant build artifacts to cleanAll
Cleanup intermediate classes.{in,out} created by retro7 processing
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/bead295b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/bead295b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/bead295b
Branch: refs/heads/master
Commit: bead295b9a7495d43400fa96ef1d70050f61fc32
Parents: 73539fa
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Mon Nov 21 18:02:36 2016 -0500
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Mon Nov 21 18:02:36 2016 -0500
----------------------------------------------------------------------
api/topology/build.gradle | 2 +-
build.gradle | 16 +++++++++-------
build.xml | 6 +++---
platform/java7/build.xml | 3 +++
.../providers/direct/appservice/AppServiceTest.java | 2 +-
.../edgent/test/fvt/iot/IotAppServiceTest.java | 2 +-
6 files changed, 18 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/bead295b/api/topology/build.gradle
----------------------------------------------------------------------
diff --git a/api/topology/build.gradle b/api/topology/build.gradle
index 42ef0e3..ac33fc3 100644
--- a/api/topology/build.gradle
+++ b/api/topology/build.gradle
@@ -29,7 +29,7 @@ dependencies {
//Build a jar file containing the applications to test the ApplicationService
task testApplicationJar{
doLast{
- ant.jar(destfile: "test.classes/edgent.api.topology.APPS.TEST.jar") {
+ ant.jar(destfile: "${buildDir}/lib/test/edgent.api.topology.APPS.TEST.jar") {
service(type: 'org.apache.edgent.topology.services.TopologyBuilder') {
provider(classname: 'org.apache.edgent.test.topology.services.TestApplications$AppOne')
provider(classname: 'org.apache.edgent.test.topology.services.TestApplications$AppTwo')
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/bead295b/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index db757a6..1843999 100644
--- a/build.gradle
+++ b/build.gradle
@@ -705,7 +705,7 @@ task addVersionDotTxt {
task releaseTarGz(type: Tar) {
description = 'Create binary release tgz in target_dir'
- archiveName = "apache-${build_name}-${build_version}${snapshotId}-bin.tgz"
+ archiveName = "apache-${build_name}-${build_version}-incubating-${snapshotId}-bin.tgz"
compression = Compression.GZIP
destinationDir = new File("${target_dir}/../release-edgent")
duplicatesStrategy 'exclude'
@@ -716,7 +716,7 @@ task releaseTarGz(type: Tar) {
into ('licenses') { from 'licenses' }
from 'DISCLAIMER', 'JAVA_SUPPORT.md'
from rootProject.file('binary-release/README')
- from 'RELEASE_NOTES'
+ from 'RELEASE_NOTES', 'CONTRIBUTORS'
from "$target_dir/version.txt"
from target_dir
exclude '**/test/svt/'
@@ -730,7 +730,7 @@ task releaseTarGz(type: Tar) {
task srcReleaseTarGz(type: Tar) {
description = 'Create source release tgz in target_dir'
- archiveName = "apache-${build_name}-${build_version}${snapshotId}-src.tgz"
+ archiveName = "apache-${build_name}-${build_version}-incubating-${snapshotId}-src.tgz"
compression = Compression.GZIP
destinationDir = new File("${target_dir}/../release-edgent")
duplicatesStrategy 'exclude'
@@ -743,15 +743,12 @@ task srcReleaseTarGz(type: Tar) {
exclude 'README.md'
from 'DEVELOPMENT.md'
from '.'
+ exclude 'KEYS'
exclude '.git', '.gradle', '.settings'
exclude '**/build/' // gradle generated artifacts
exclude '**/externalJars/' // gradle generated artifacts for eclipse
exclude '**/bin/' // eclipse generated artifacts
- exclude '**/classes/' // old ant generated artifacts
- exclude '**/classes.in/' // our retrolambda processing cruft
- exclude '**/classes.out/' // our retrolambda processing cruft
exclude '**/*.class' // final backstop just in case
- exclude 'target/**' // old ant generated artifacts
exclude 'connectors/jdbc/derby.log' // test cruft
exclude 'connectors/jdbc/JdbcStreamsTestDb' // test cruft
doLast {
@@ -826,6 +823,11 @@ task all(dependsOn: assemble) {
task cleanAll {
description = 'clean aggregator' // "release dependsOn clean" only does top-level clean
dependsOn clean, filteredSubprojects*.clean
+ // purge old ant build artifacts
+ delete fileTree('target')
+ delete fileTree('reports')
+ delete fileTree(dir: '.', includes:['**/classes/**', '**/test.classes/**'])
+ delete fileTree(dir: '.', includes:['**/classes.in/**', '**/classes.out/**'])
}
task release {
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/bead295b/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 01feb84..937366e 100644
--- a/build.xml
+++ b/build.xml
@@ -34,7 +34,7 @@
<fail message="The ant tooling is no longer functional. See README."/>
</target>
- <target name="all" depends="init,suball,copy,docs"
+ <target name="all" depends="DoNotUseAnt,init,suball,copy,docs"
description="Build the code and Javadoc into target. Requires Java 8"
/>
@@ -289,11 +289,11 @@
</jacoco:report>
</target>
- <target name="reports" depends="junit.report,coverage.report"
+ <target name="reports" depends="DoNotUseAnt,junit.report,coverage.report"
description="Produce test and coverage reports under reports after executing the test target"
/>
- <target name="docs">
+ <target name="docs" depends="DoNotUseAnt">
<mkdir dir="${javadoc.dir}"/>
<javadoc
destdir="${javadoc.dir}"
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/bead295b/platform/java7/build.xml
----------------------------------------------------------------------
diff --git a/platform/java7/build.xml b/platform/java7/build.xml
index 3d3062b..d94d40b 100644
--- a/platform/java7/build.xml
+++ b/platform/java7/build.xml
@@ -87,6 +87,9 @@
>
<fileset dir="${output.dir}"/>
</jar>
+
+ <delete dir="${input.dir}"/>
+ <delete dir="${output.dir}"/>
</sequential>
</macrodef>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/bead295b/providers/direct/src/test/java/org/apache/edgent/test/providers/direct/appservice/AppServiceTest.java
----------------------------------------------------------------------
diff --git a/providers/direct/src/test/java/org/apache/edgent/test/providers/direct/appservice/AppServiceTest.java b/providers/direct/src/test/java/org/apache/edgent/test/providers/direct/appservice/AppServiceTest.java
index e246983..81b3ca8 100644
--- a/providers/direct/src/test/java/org/apache/edgent/test/providers/direct/appservice/AppServiceTest.java
+++ b/providers/direct/src/test/java/org/apache/edgent/test/providers/direct/appservice/AppServiceTest.java
@@ -57,7 +57,7 @@ public class AppServiceTest {
String qd = System.getProperty("edgent.test.root.dir");
assertNotNull(qd);
- File testAppsJar = new File(qd, "api/topology/test.classes/edgent.api.topology.APPS.TEST.jar");
+ File testAppsJar = new File(qd, "api/topology/build/lib/test/edgent.api.topology.APPS.TEST.jar");
assertTrue(testAppsJar.exists());
URL testAppsJarURL = testAppsJar.toURI().toURL();
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/bead295b/test/fvtiot/src/test/java/org/apache/edgent/test/fvt/iot/IotAppServiceTest.java
----------------------------------------------------------------------
diff --git a/test/fvtiot/src/test/java/org/apache/edgent/test/fvt/iot/IotAppServiceTest.java b/test/fvtiot/src/test/java/org/apache/edgent/test/fvt/iot/IotAppServiceTest.java
index 463f361..b1ba247 100644
--- a/test/fvtiot/src/test/java/org/apache/edgent/test/fvt/iot/IotAppServiceTest.java
+++ b/test/fvtiot/src/test/java/org/apache/edgent/test/fvt/iot/IotAppServiceTest.java
@@ -70,7 +70,7 @@ public class IotAppServiceTest {
AppService.createAndRegister(provider, provider);
String qd = System.getProperty("edgent.test.root.dir");
assertNotNull(qd);
- File testAppsJar = new File(qd, "api/topology/test.classes/edgent.api.topology.APPS.TEST.jar");
+ File testAppsJar = new File(qd, "api/topology/build/lib/test/edgent.api.topology.APPS.TEST.jar");
assertTrue(testAppsJar.exists());
URL testAppsJarURL = testAppsJar.toURI().toURL();