You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/03/10 13:53:22 UTC
[08/13] brooklyn-dist git commit: write cli binaries to a directory
without the version name
write cli binaries to a directory without the version name
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/3d801c6b
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/3d801c6b
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/3d801c6b
Branch: refs/heads/master
Commit: 3d801c6b2fc474f994d411d97b6074f9dd47a801
Parents: d534b95
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Thu Mar 10 10:07:39 2016 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Thu Mar 10 10:07:39 2016 +0000
----------------------------------------------------------------------
dist/pom.xml | 2 +-
dist/src/main/config/build-distribution.xml | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/3d801c6b/dist/pom.xml
----------------------------------------------------------------------
diff --git a/dist/pom.xml b/dist/pom.xml
index 6cc4515..c7610f6 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -182,7 +182,7 @@
<classifier>bin</classifier>
<type>zip</type>
<version>${project.version}</version>
- <outputDirectory>${project.build.directory}/brooklyn-client-cli</outputDirectory>
+ <outputDirectory>${project.build.directory}/brooklyn-client-cli-unpacked</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/3d801c6b/dist/src/main/config/build-distribution.xml
----------------------------------------------------------------------
diff --git a/dist/src/main/config/build-distribution.xml b/dist/src/main/config/build-distribution.xml
index 9e3dfd0..af0ff4b 100644
--- a/dist/src/main/config/build-distribution.xml
+++ b/dist/src/main/config/build-distribution.xml
@@ -81,8 +81,9 @@
</excludes>
</fileSet>
<fileSet>
- <directory>${project.build.directory}/brooklyn-client-cli</directory>
- <outputDirectory>bin</outputDirectory>
+ <!-- Fortunately this preserves permissions from the CLI build -->
+ <directory>${project.build.directory}/brooklyn-client-cli-unpacked/brooklyn-client-cli-${project.version}</directory>
+ <outputDirectory>bin/brooklyn-client-cli</outputDirectory>
</fileSet>
</fileSets>
<!-- TODO include documentation -->