Repository: incubator-edgent Updated Branches: refs/heads/master b3248718a -> 49c9989da
Edgent-281 Misc build changes for "release" add "apache" to tgz names add SNAPSHOT and <DATE>-<TIME> to build tgz name when appropriate make src tgz extract to different dir than binary tgz update current snapshot build version id fix URL in source release README remove version Id in edgent_overview.html (additional maintenance and it's already present on the javadoc page that the overview is incorporated into). Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/49c9989d Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/49c9989d Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/49c9989d Branch: refs/heads/master Commit: 49c9989daca954072ee8bf713402704a1b13aa10 Parents: b324871 Author: Dale LaBossiere <dlab...@us.ibm.com> Authored: Thu Oct 20 15:48:43 2016 -0400 Committer: Dale LaBossiere <dlab...@us.ibm.com> Committed: Thu Oct 20 15:48:43 2016 -0400 ---------------------------------------------------------------------- DEVELOPMENT.md | 2 +- build.gradle | 13 +++++++++---- edgent_overview.html | 2 +- gradle.properties | 2 +- legal/source-release-readme | 4 ++-- 5 files changed, 14 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/49c9989d/DEVELOPMENT.md ---------------------------------------------------------------------- diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index 63cd1a2..7a8fadd 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -87,7 +87,7 @@ unique tasks: * `reports` : Generate JUnit and Code Coverage reports in `build\distributions\reports`. Use after executing the `test` target. * `reports\tests\overview-summary.html` - JUnit test report * `reports\coverage\index.html` - Code coverage report -* `release` : Build release bundles in `build/release-edgent`, that includes subsets of the Edgent jars that run on Java 7 (`build/distributions/java7`) and Android (`build/distributions/android`). +* `release` : Build release bundles in `build/release-edgent`, that includes subsets of the Edgent jars that run on Java 7 (`build/distributions/java7`) and Android (`build/distributions/android`). By default SNAPSHOT bundles are created. Specify `-Dedgent.snapshotId=""` to create bundles for a formal release. * `signAll` : Sign the release bundles in `build/release-edgent` (first run `release`). You will be promoted for your PGP code signing key's Id, the location of the keyring file, and the secret key password. Default response values may be set with environment variables: * `GPG_ID` - the code signing key's id (e.g., D0F56CAD) * `GPG_SECRING` - path to the secret key's keyring file http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/49c9989d/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index b94d50a..72653a6 100644 --- a/build.gradle +++ b/build.gradle @@ -51,6 +51,11 @@ ext { now = new Date() DSTAMP = String.format('%tY%<tm%<td', now) TSTAMP = String.format('%tH%<tM', now) + + snapshotId = "-SNAPSHOT-${DSTAMP}-${TSTAMP}" + if (System.properties['edgent.snapshotId'] != null) { + snapshotId = System.properties['edgent.snapshotId'] + } external_jars_dir = "$rootProject.projectDir/externalJars/java8" @@ -687,11 +692,11 @@ task addVersionDotTxt { task releaseTarGz(type: Tar) { description = 'Create binary release tgz in target_dir' - archiveName = "${build_name}-${build_version}-${DSTAMP}-${TSTAMP}-bin.tgz" + archiveName = "apache-${build_name}-${build_version}${snapshotId}-bin.tgz" compression = Compression.GZIP destinationDir = new File("${target_dir}/../release-edgent") duplicatesStrategy 'exclude' - into "${build_name}" + into "${build_name}-${build_version}${snapshotId}" // make some things first in the tgz with copySpec { rename { 'LICENSE' } @@ -723,11 +728,11 @@ task releaseTarGz(type: Tar) { task srcReleaseTarGz(type: Tar) { description = 'Create source release tgz in target_dir' - archiveName = "${build_name}-${build_version}-${DSTAMP}-${TSTAMP}-src.tgz" + archiveName = "apache-${build_name}-${build_version}${snapshotId}-src.tgz" compression = Compression.GZIP destinationDir = new File("${target_dir}/../release-edgent") duplicatesStrategy 'exclude' - into "${build_name}" + into "${build_name}-${build_version}${snapshotId}-src" // make some things first in the tgz from 'LICENSE', 'NOTICE' from 'DISCLAIMER', 'JAVA_SUPPORT.md' http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/49c9989d/edgent_overview.html ---------------------------------------------------------------------- diff --git a/edgent_overview.html b/edgent_overview.html index e2ad756..215ec19 100644 --- a/edgent_overview.html +++ b/edgent_overview.html @@ -25,7 +25,7 @@ analytics at the <i>edge</i>. Apache Edgent is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by Apache Incubator PMC. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF. </em> </P> -<H1>Edgent v0.4</H1> +<H1>Edgent</H1> <OL> <LI><a href="#overview">Overview</A></LI> <LI><a href="#model">Programming Model</A></LI> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/49c9989d/gradle.properties ---------------------------------------------------------------------- diff --git a/gradle.properties b/gradle.properties index 203e52a..004d9d8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,5 +16,5 @@ # under the License. build_group: org.apache.edgent build_name: edgent -build_version: 0.4.1 +build_version: 1.0.0 build_vendor: Apache Software Foundation http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/49c9989d/legal/source-release-readme ---------------------------------------------------------------------- diff --git a/legal/source-release-readme b/legal/source-release-readme index 2991db5..615b5e8 100644 --- a/legal/source-release-readme +++ b/legal/source-release-readme @@ -21,5 +21,5 @@ See Getting Started https://edgent.apache.org/docs/edgent-getting-started For more information about the Edgent sources, testing, and contributing to Edgent runtime development see DEVELOPMENT.md in the source tree -or in the github repository http://www.apache.org/dist/incubator/edgent - +or in the ASF git repository https://git-wip-us.apache.org/repos/asf/incubator-edgent.git +or in the repository mirror at github https://github.com/apache/incubator-edgent. \ No newline at end of file
