This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis-native.git
The following commit(s) were added to refs/heads/master by this push:
new 7200a17 NO-JIRA Addressing a few minor issues
7200a17 is described below
commit 7200a174e3583ea2a80ac570702b67d478d17d2a
Author: Clebert Suconic <[email protected]>
AuthorDate: Fri Mar 1 15:11:41 2019 -0500
NO-JIRA Addressing a few minor issues
---
LICENSE | 8 --------
NOTICE | 2 +-
README.md | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
pom.xml | 26 ++++++++++++++++++++++++++
4 files changed, 73 insertions(+), 13 deletions(-)
diff --git a/LICENSE b/LICENSE
index f5d288d..d645695 100644
--- a/LICENSE
+++ b/LICENSE
@@ -200,11 +200,3 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-
-===============================================================
-= For Base64.java file =
-===============================================================
-
-This file is in the public domain. For more information see:
-
-activemq-commons/src/main/java/org/apache/activemq/utils/Base64.java
diff --git a/NOTICE b/NOTICE
index bef5ce7..91a6b59 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,4 @@
-Apache ActiveMQ Artemis
+Apache ActiveMQ Artemis Native
Copyright [2014-2019] The Apache Software Foundation
This product includes software developed at
diff --git a/README.md b/README.md
index ef5f841..63b0b7d 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,34 @@ with AIO journal.
The lib AIO is a Linux-specific dependency, therefore having a relatively
modern Linux operating system is assumed for
the purpose of this documentation.
-## Dependencies
+There are two ways to build the native libraries:
+
+- Using a Docker Image created during the build phase
+- Bare Metal
+
+## Docker
+
+The only requirement needed for this compilation option is Docker.
+
+The required image will be downloaded by Docker when you build it.
+
+You can use the script ./compile-using-docker.sh and the correct image and
script should be called.
+
+```bash
+$ ./scripts/copmile-using-docker.sh
+```
+
+
+Or you could also using the -Pdocker profile on maven:
+
+
+```bash
+$ mvn install -Pdocker
+
+```
+
+
+## Bare Metal Dependencies
In order to build the package, make sure you install these packages:
@@ -36,6 +63,22 @@ Once again using Fedora Linux as an example, it would mean
that the following pa
- glibc-devel.i686
- libaio-devel.i686
+
+### Scripts on Bare Metal
+
+You can use the compile-native.sh script. This script is using cross
compilation towards 64 bits and 32 bits from a Linux environment.
+
+```bash
+$ ./scripts/compile-native.sh
+```
+
+
+Or you can use the bare-metal profile
+
+```bash
+$ mvn install -Pbare-metal
+```
+
## Lib AIO Information
The Lib AIO is the Linux' Kernel Asynchronous I/O Support Library. It is part
of the kernel project. The library makes
@@ -59,7 +102,7 @@ From the project base directory, run:
Example:
-```export JAVA_HOME=/usr/share/jdk1.7```
+```export JAVA_HOME=/usr/share/jdk1.8```
2. Call compile-native.sh. Bootstrap will call all the initial scripts you need
@@ -70,8 +113,7 @@ if you are missing any dependencies, autoconf would tell you
what you're missing
### Compiled File
-The produced file will be under the ./target/nar (example:
./target/nar/artemis-native-1.0.0-amd64-Linux-gpp-jni/lib/amd64-Linux-gpp/jni/libartemis-native-1.0.0.so)
-and you will have to rename it manually under ./bin following the appropriate
pattern.
+The generated jar will include the ./lib/
### Advanced Compilation Methods and Developer-specific Documentation
diff --git a/pom.xml b/pom.xml
index bad0afe..4c1ac93 100644
--- a/pom.xml
+++ b/pom.xml
@@ -156,6 +156,32 @@
</activation>
</profile>
<profile>
+ <id>bare-metal</id>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.6.0</version>
+ <groupId>org.codehaus.mojo</groupId>
+ <executions>
+ <execution>
+ <id>build</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>bash</executable>
+
<commandlineArgs>./scripts/compile-native.sh</commandlineArgs>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<id>docker</id>
<build>
