[incubator-openwhisk-cli] branch master updated: Separate the source directories for different files to package (#307)

[du...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dubeejw pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git


The following commit(s) were added to refs/heads/master by this push:
     new e5e8bf0  Separate the source directories for different files to package (#307)
e5e8bf0 is described below

commit e5e8bf0f26855218625926ebab335dd0043a09ef
Author: Vincent <sh...@us.ibm.com>
AuthorDate: Thu May 31 10:09:01 2018 -0400

    Separate the source directories for different files to package (#307)
    
    We need to pick up the files to package from different directories
    by specifying separately, in order to remove conflict.
---
 build.gradle | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index d666bf0..aa26756 100644
--- a/build.gradle
+++ b/build.gradle
@@ -241,11 +241,13 @@ task individualArchives(
                 if (p.goOs == 'linux') { compression = Compression.GZIP }
                 destinationDir = file(cliReleaseLocation)
                 baseName = "${p.zipFileName}-${packageVersion}-${p.owOs}-${p.goArch}"
-                from "${cliBuildLocation}/${p.goOs}-${p.goArch}/"
-                include "${buildFileName}*"
-                from "./"
-                include "LICENSE.txt", "NOTICE.txt", "README.md"
-                exclude "wski18n"
+                from("${cliBuildLocation}/${p.goOs}-${p.goArch}/") {
+                    include "${buildFileName}*"
+                }
+                from("./") {
+                    include "LICENSE.txt", "NOTICE.txt", "README.md"
+                    exclude "wski18n"
+                }
             }
     })
 

-- 
To stop receiving notification emails like this one, please contact
dubeejw@apache.org.