Edited distribution tasks.
Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/1cf4bf77 Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/1cf4bf77 Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/1cf4bf77 Branch: refs/heads/master Commit: 1cf4bf77403a3a1c162ebbb4c51385293d1505c9 Parents: 9604950 Author: wisebaldone <[email protected]> Authored: Tue Dec 15 17:47:47 2015 +1000 Committer: wisebaldone <[email protected]> Committed: Tue Dec 15 17:47:47 2015 +1000 ---------------------------------------------------------------------- .gitignore | 3 +-- README.md | 7 ++++--- build.gradle | 39 ++++++++++++++++++++++++++++----------- wave/build.gradle | 17 ++++++++++------- 4 files changed, 43 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/1cf4bf77/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 74cbd54..be8980b 100755 --- a/.gitignore +++ b/.gitignore @@ -45,8 +45,7 @@ wave/war/WEB-INF/ wave/war/webclient/ wave/war/org* pst/build/ -apache-wave-source.zip -apache-wave-source.tar +distributions/ ### Reports reports/ ### Generated Sources http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/1cf4bf77/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index ec13599..3be1780 100644 --- a/README.md +++ b/README.md @@ -88,9 +88,10 @@ Run Tasks: Distribution Tasks: - **jar**: builds jar file for the project. - **sourcesJar**: builds a source jar file for each project. -- **createDist**: builds the zip and tar file for distribution. -- **createDistZip**: builds the zip for distribution. -- **createDistTar**: builds the tar for distribution. +- **createDist**: builds the zip and tar file for bin and source. +- **createDistBin**: builds the zip for distribution. +- **createDistBinZip**: builds the zip for distribution. +- **createDistBinTar**: builds the tar for distribution. - **createDistSource**: builds the zip and tar file for distributing the source. - **createDistSourceZip**: builds the zip for distributing the source. - **createDistSourceTar**: builds the tar for distributing the source. http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/1cf4bf77/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index 6107ebb..1b30f98 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ plugins { allprojects { apply plugin: 'eclipse'; apply plugin: 'idea'; - group = 'Apache-Wave' + group = 'apache-wave' version = '0.4' } @@ -81,13 +81,13 @@ rat.doFirst { } task createDistSourceZip(type: Zip) { - baseName = "apache-wave-source" + baseName = this.group + "-src-" + this.version + destinationDir = file('distributions') from('./') { into 'apache-wave-src' } excludes = [ - 'apache-wave-src.zip', - 'apache-wave-src.tar', + 'distributions/', '.gradle/', '.git/', '.vagrant/', @@ -98,27 +98,32 @@ task createDistSourceZip(type: Zip) { '*/*.iws', '*/*.ipr', 'reports/', + 'wave/war/WEB-INF', + 'wave/war/webclient' ] } task createDistSourceTar(type: Tar) { - baseName = "apache-wave-source" + baseName = this.group + "-src-" + this.version + destinationDir = file('distributions') from('./') { into 'apache-wave-src' } excludes = [ - 'apache-wave-src.zip', - 'apache-wave-src.tar', + 'distributions/', '.gradle/', '.git/', '.vagrant/', '*/build/*', '*/_*', '*/gwt-unitCache/', + '*.iml', '*/*.iml', - '*/*.iws', - '*/*.ipr', + '*.iws', + '*.ipr', 'reports/', + 'wave/war/WEB-INF', + 'wave/war/webclient' ] } @@ -127,10 +132,22 @@ task createDistSource() { println '' println '--------------------------------------------------------' println ' Creating Deployment Source ' - println ' Zip and Tar files available in root directory. ' println '--------------------------------------------------------' println '' } } -createDistSource.dependsOn createDistSourceZip, createDistSourceTar \ No newline at end of file +createDistSource.dependsOn createDistSourceZip, createDistSourceTar + +task createDist() { + doFirst { + println '' + println '--------------------------------------------------------' + println ' Creating Deployment Source & Binary ' + println ' Zip and Tar files available in distributions. ' + println '--------------------------------------------------------' + println '' + } +} + +createDist.dependsOn createDistSource, ":wave:createDistBin" \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/1cf4bf77/wave/build.gradle ---------------------------------------------------------------------- diff --git a/wave/build.gradle b/wave/build.gradle index 94cb5e9..ab04cd1 100644 --- a/wave/build.gradle +++ b/wave/build.gradle @@ -550,7 +550,9 @@ task createPropertiesFile(type: Copy) { ]) } -task createDistZip(type: Zip) { +task createDistBinZip(type: Zip) { + baseName = this.group + "-bin-" + destinationDir = file('../distributions') from(jar) { into 'apache-wave/bin' } @@ -577,7 +579,9 @@ task createDistZip(type: Zip) { } } -task createDistTar(type: Tar) { +task createDistBinTar(type: Tar) { + baseName = this.group + "-bin-" + destinationDir = file('../distributions') from(jar) { into 'apache-wave/bin' } @@ -604,18 +608,17 @@ task createDistTar(type: Tar) { } } -createDistZip.dependsOn jar, createPropertiesFile -createDistTar.dependsOn jar, createPropertiesFile +createDistBinZip.dependsOn jar, createPropertiesFile +createDistBinTar.dependsOn jar, createPropertiesFile -task createDist() { +task createDistBin() { doFirst { println '' println '--------------------------------------------------------' println ' Creating Deployment ' - println 'Zip and Tar files available in wave/build/distributions.' println '--------------------------------------------------------' println '' } } -createDist.dependsOn createDistZip, createDistTar \ No newline at end of file +createDistBin.dependsOn createDistBinZip, createDistBinTar \ No newline at end of file
