This is an automated email from the ASF dual-hosted git repository.
apalumbo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mahout.git
The following commit(s) were added to refs/heads/master by this push:
new c7b92ee (NoJira) release:prepare include examples in assembly.xml
c7b92ee is described below
commit c7b92eed76c44b2a2bc3555e8229976455c60511
Author: Andrew Palumbo <[email protected]>
AuthorDate: Thu May 23 16:05:01 2019 -0700
(NoJira) release:prepare include examples in assembly.xml
---
buildtools/assembly/bin.xml | 11 +++++++++++
buildtools/assembly/src.xml | 13 ++++++++++---
2 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/buildtools/assembly/bin.xml b/buildtools/assembly/bin.xml
index 4c08156..cc2f14a 100644
--- a/buildtools/assembly/bin.xml
+++ b/buildtools/assembly/bin.xml
@@ -69,5 +69,16 @@
<fileMode>0755</fileMode>
<directoryMode>0755</directoryMode>
</fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../../examples/bin</directory>
+ <outputDirectory>examples/bin</outputDirectory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <fileMode>0755</fileMode>
+ <directoryMode>0755</directoryMode>
+ <excludes>
+ <exclude>work</exclude>
+ <exclude>work/**</exclude>
+ </excludes>
+ </fileSet>
</fileSets>
</assembly>
diff --git a/buildtools/assembly/src.xml b/buildtools/assembly/src.xml
index 6518786..33638dd 100644
--- a/buildtools/assembly/src.xml
+++ b/buildtools/assembly/src.xml
@@ -16,6 +16,13 @@
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+
+ <!--NOTE, ${project.basedir} has been overwritten due to multi module build
+ ${project.basedir} == `pwd` (in this case), ==
$MAHOUT_HOME/buildtools/assembly;
+ we cant always assume a $MAHOUT_HOME environment variable, so current
workaround
+ will use relative paths in this case we are 2 levels deep from
$MAHOUT_HOME-->
+
+
<id>src</id>
<formats>
<format>dir</format>
@@ -23,7 +30,7 @@
</formats>
<fileSets>
<fileSet>
- <directory>${project.basedir}</directory>
+ <directory>${project.basedir}/../../</directory>
<outputDirectory/>
<useDefaultExcludes>true</useDefaultExcludes>
<includes>
@@ -41,14 +48,14 @@
</excludes>
</fileSet>
<fileSet>
- <directory>${project.basedir}/bin</directory>
+ <directory>${project.basedir}/../..//bin</directory>
<outputDirectory>bin</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<fileMode>0755</fileMode>
<directoryMode>0755</directoryMode>
</fileSet>
<fileSet>
- <directory>${project.basedir}/examples/bin</directory>
+ <directory>${project.basedir}/../../examples/bin</directory>
<outputDirectory>examples/bin</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<fileMode>0755</fileMode>
