You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2015/04/29 02:12:14 UTC
[2/3] accumulo git commit: ACUMULO-3757 Copy the shared object to the
root of the target directory
ACUMULO-3757 Copy the shared object to the root of the target directory
Will help downstream consumers avoid version-specific
paths
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/42588869
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/42588869
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/42588869
Branch: refs/heads/master
Commit: 42588869a411674911e7a5c5c35649dacda8433e
Parents: 7891404
Author: Josh Elser <el...@apache.org>
Authored: Tue Apr 28 20:08:52 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue Apr 28 20:08:52 2015 -0400
----------------------------------------------------------------------
server/native/pom.xml | 1 +
server/native/src/main/resources/Makefile | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/42588869/server/native/pom.xml
----------------------------------------------------------------------
diff --git a/server/native/pom.xml b/server/native/pom.xml
index aead6ed..d175093 100644
--- a/server/native/pom.xml
+++ b/server/native/pom.xml
@@ -103,6 +103,7 @@
<workingDirectory>${project.build.directory}/${project.artifactId}-${project.version}/${project.artifactId}-${project.version}</workingDirectory>
<arguments>
<argument>test</argument>
+ <argument>OUTPUT_DIR=${project.build.directory}</argument>
</arguments>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/42588869/server/native/src/main/resources/Makefile
----------------------------------------------------------------------
diff --git a/server/native/src/main/resources/Makefile b/server/native/src/main/resources/Makefile
index b9211aa..d3b2b26 100644
--- a/server/native/src/main/resources/Makefile
+++ b/server/native/src/main/resources/Makefile
@@ -48,9 +48,10 @@ test : $(NATIVE_LIB) testJavaHome runTests
testJavaHome :
@echo JAVA_HOME is $(JAVA_HOME)
-runTests : $(NATIVE_LIB) $(TESTSRCS)
+runTests : $(NATIVE_LIB) $(TESTSRCS) $(OUTPUT_DIR)
$(CXX) -g -Wall -I/System/Library/Frameworks/JavaVM.framework/Headers -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I$(JAVA_HOME)/include/darwin -InativeMap -o $@ $(TESTSRCS) $(NATIVE_LIB) $(MAVERICK_FLAGS)
LD_LIBRARY_PATH=./ ./$@ 20 20 20 20 20 20 20 20 true
+ if [ ! -z "$(OUTPUT_DIR)" ]; then cp $(NATIVE_LIB) $(OUTPUT_DIR); fi
clean :
rm -f $(NATIVE_LIB) runTests