You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2018/03/15 12:43:15 UTC
[incubator-servicecomb-saga] branch master updated: SCB-404 Use
different base folder for source and binary package
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git
The following commit(s) were added to refs/heads/master by this push:
new 708eec0 SCB-404 Use different base folder for source and binary package
708eec0 is described below
commit 708eec092988dfd4a5960ca5f232fb7421d5fbdd
Author: Yang Bo <ya...@huawei.com>
AuthorDate: Thu Mar 15 15:16:21 2018 +0800
SCB-404 Use different base folder for source and binary package
---
saga-distribution/src/assembly/bin.xml | 15 ++++++++-------
saga-distribution/src/assembly/src.xml | 2 ++
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/saga-distribution/src/assembly/bin.xml b/saga-distribution/src/assembly/bin.xml
index c785815..d51514a 100644
--- a/saga-distribution/src/assembly/bin.xml
+++ b/saga-distribution/src/assembly/bin.xml
@@ -17,7 +17,8 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
- <includeBaseDirectory>false</includeBaseDirectory>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <baseDirectory>${project.build.finalName}-bin</baseDirectory>
<id>bin</id>
<formats>
<format>zip</format>
@@ -25,7 +26,7 @@
<fileSets>
<fileSet>
<directory>../saga-demo</directory>
- <outputDirectory>apache-servicecomb-incubating-saga-distribution-${project.version}/saga-demo</outputDirectory>
+ <outputDirectory>/saga-demo</outputDirectory>
<excludes>
<exclude>**/*.iml</exclude>
<exclude>**/eclipse-classes/**</exclude>
@@ -39,11 +40,11 @@
</fileSet>
<fileSet>
<directory>../docs</directory>
- <outputDirectory>apache-servicecomb-incubating-saga-distribution-${project.version}/docs</outputDirectory>
+ <outputDirectory>/docs</outputDirectory>
</fileSet>
<fileSet>
<directory>../</directory>
- <outputDirectory>apache-servicecomb-incubating-saga-distribution-${project.version}</outputDirectory>
+ <outputDirectory>/</outputDirectory>
<includes>
<include>DISCLAIMER</include>
@@ -54,7 +55,7 @@
<!-- include the NOTICE and LICENSE file from release directory -->
<fileSet>
<directory>src/release</directory>
- <outputDirectory>apache-servicecomb-incubating-saga-distribution-${project.version}</outputDirectory>
+ <outputDirectory>/</outputDirectory>
<includes>
<include>NOTICE</include>
<include>LICENSE</include>
@@ -64,7 +65,7 @@
<!-- include alpha server exec into bin directory -->
<fileSet>
<directory>../alpha/alpha-server/target/saga/</directory>
- <outputDirectory>apache-servicecomb-incubating-saga-distribution-${project.version}</outputDirectory>
+ <outputDirectory>/</outputDirectory>
<includes>
<include>alpha-server-${project.version}-exec.jar</include>
</includes>
@@ -75,7 +76,7 @@
<dependencySet>
<useProjectArtifact>true</useProjectArtifact>
<unpack>false</unpack>
- <outputDirectory>apache-servicecomb-incubating-saga-distribution-${project.version}/libs</outputDirectory>
+ <outputDirectory>/libs</outputDirectory>
<scope>runtime</scope>
</dependencySet>
</dependencySets>
diff --git a/saga-distribution/src/assembly/src.xml b/saga-distribution/src/assembly/src.xml
index 717fdf6..305712f 100644
--- a/saga-distribution/src/assembly/src.xml
+++ b/saga-distribution/src/assembly/src.xml
@@ -22,6 +22,8 @@
<formats>
<format>zip</format>
</formats>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <baseDirectory>${project.build.finalName}-src</baseDirectory>
<fileSets>
<!-- Binary Files -->
<fileSet>
--
To stop receiving notification emails like this one, please contact
ningjiang@apache.org.