activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [1/4] activemq-artemis git commit: ignoring stuff from cmake / native build
Date Tue, 05 Jan 2016 14:15:09 GMT
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 2c430e597 -> 86934c91e


ignoring stuff from cmake / native build


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/34b66351
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/34b66351
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/34b66351

Branch: refs/heads/master
Commit: 34b66351fbe0cc2f1f5106181c73cefbca94f53d
Parents: 2c430e5
Author: Clebert Suconic <clebertsuconic@apache.org>
Authored: Tue Dec 29 00:30:37 2015 -0500
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Mon Jan 4 11:21:10 2016 -0500

----------------------------------------------------------------------
 .gitignore                                           |  8 ++++----
 .../src/main/assembly/source-assembly.xml            | 15 +++++++++++++++
 pom.xml                                              |  8 ++++++++
 3 files changed, 27 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/34b66351/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index ce57485..c4b0866 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,10 +11,10 @@ ratReport.txt
 .factorypath
 
 # for native build
-**/CMakeCache.txt
-**/CMakeFiles/
-**/Makefile
-**/cmake_install.cmake
+CMakeCache.txt
+CMakeFiles/
+Makefile
+cmake_install.cmake
 
 # this file is generated
 artemis-native/src/main/c/org_apache_activemq_artemis_jlibaio_LibaioContext.h

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/34b66351/artemis-distribution/src/main/assembly/source-assembly.xml
----------------------------------------------------------------------
diff --git a/artemis-distribution/src/main/assembly/source-assembly.xml b/artemis-distribution/src/main/assembly/source-assembly.xml
index acf6b11..7f0f00e 100644
--- a/artemis-distribution/src/main/assembly/source-assembly.xml
+++ b/artemis-distribution/src/main/assembly/source-assembly.xml
@@ -56,6 +56,21 @@
             <exclude>artemis_doap.rdf</exclude>
             <exclude>artemis-native/bin/</exclude>
 
+            <!-- Files generated from automake -->
+            <exclude>CMakeCache.txt</exclude>
+            <exclude>CMakeFiles/</exclude>
+            <exclude>Makefile</exclude>
+            <exclude>artemis-native/CMakeCache.txt</exclude>
+            <exclude>artemis-native/CMakeFiles/</exclude>
+            <exclude>artemis-native/Makefile</exclude>
+            <exclude>artemis-native/cmake_install.cmake</exclude>
+            <exclude>artemis-native/src/main/c/CMakeFiles/</exclude>
+            <exclude>artemis-native/src/main/c/Makefile</exclude>
+            <exclude>artemis-native/src/main/c/cmake_install.cmake</exclude>
+            <exclude>artemis-native/src/main/c/org_apache_activemq_artemis_jlibaio_LibaioContext.h</exclude>
+            <exclude>cmake_install.cmake</exclude>
+
+
             <!--  build output  -->
             <exclude>
                %regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}.*]

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/34b66351/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9a4a781..ce35540 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1096,6 +1096,14 @@
                   <exclude>**/node/**</exclude>
                   <exclude>**/node_modules/**</exclude>
                   <exclude>**/package.json</exclude>
+
+                  <!-- things from cmake on the native build -->
+                  <exclude>**/CMakeCache.txt</exclude>
+                  <exclude>**/CMakeFiles/</exclude>
+                  <exclude>**/Makefile</exclude>
+                  <exclude>**/cmake_install.cmake</exclude>
+                  <exclude>artemis-native/src/main/c/org_apache_activemq_artemis_jlibaio_LibaioContext.h</exclude>
+
                </excludes>
             </configuration>
             <executions>


Mime
View raw message