From 3e89726b2b1bb1f5d08e8360250ba12efcf3dacf Mon Sep 17 00:00:00 2001 From: Mark Donszelmann Date: Fri, 9 Oct 2009 02:55:56 -0700 Subject: Added binaries for amd64-Linux-g++; added -fPIC to compilers on amd64; Fixed order of it tests in pom --- pom.xml | 5 +++++ .../amd64-Linux-g++/lib/libit0003-jni-1.0-SNAPSHOT.so | Bin 0 -> 9507 bytes .../amd64-Linux-g++/share/it0003-jni-1.0-SNAPSHOT.jar | Bin 0 -> 4114 bytes .../resources/org/apache/maven/plugin/nar/aol.properties | 4 ++-- 4 files changed, 7 insertions(+), 2 deletions(-) create mode 100755 src/it/it0006-jni-3rdparty/src/nar/resources/aol/amd64-Linux-g++/lib/libit0003-jni-1.0-SNAPSHOT.so create mode 100644 src/it/it0006-jni-3rdparty/src/nar/resources/aol/amd64-Linux-g++/share/it0003-jni-1.0-SNAPSHOT.jar diff --git a/pom.xml b/pom.xml index 3c81a99..4fa87dc 100644 --- a/pom.xml +++ b/pom.xml @@ -135,6 +135,11 @@ + + it0003-jni/pom.xml + it0007-lib-shared/pom.xml + it0010-lib-static/pom.xml + it-parent/** diff --git a/src/it/it0006-jni-3rdparty/src/nar/resources/aol/amd64-Linux-g++/lib/libit0003-jni-1.0-SNAPSHOT.so b/src/it/it0006-jni-3rdparty/src/nar/resources/aol/amd64-Linux-g++/lib/libit0003-jni-1.0-SNAPSHOT.so new file mode 100755 index 0000000..2a1b595 Binary files /dev/null and b/src/it/it0006-jni-3rdparty/src/nar/resources/aol/amd64-Linux-g++/lib/libit0003-jni-1.0-SNAPSHOT.so differ diff --git a/src/it/it0006-jni-3rdparty/src/nar/resources/aol/amd64-Linux-g++/share/it0003-jni-1.0-SNAPSHOT.jar b/src/it/it0006-jni-3rdparty/src/nar/resources/aol/amd64-Linux-g++/share/it0003-jni-1.0-SNAPSHOT.jar new file mode 100644 index 0000000..ae6fa9d Binary files /dev/null and b/src/it/it0006-jni-3rdparty/src/nar/resources/aol/amd64-Linux-g++/share/it0003-jni-1.0-SNAPSHOT.jar differ diff --git a/src/main/resources/org/apache/maven/plugin/nar/aol.properties b/src/main/resources/org/apache/maven/plugin/nar/aol.properties index 642ecac..30837aa 100644 --- a/src/main/resources/org/apache/maven/plugin/nar/aol.properties +++ b/src/main/resources/org/apache/maven/plugin/nar/aol.properties @@ -277,13 +277,13 @@ amd64.Linux.linker=g++ amd64.Linux.g++.cpp.compiler=g++ amd64.Linux.g++.cpp.defines=Linux GNU_GCC f2cFortran -amd64.Linux.g++.cpp.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion +amd64.Linux.g++.cpp.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion -fPIC amd64.Linux.g++.cpp.includes=**/*.cc **/*.cpp **/*.cxx amd64.Linux.g++.cpp.excludes= amd64.Linux.g++.c.compiler=gcc amd64.Linux.g++.c.defines=Linux GNU_GCC f2cFortran -amd64.Linux.g++.c.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion +amd64.Linux.g++.c.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion -fPIC amd64.Linux.g++.c.includes=**/*.c amd64.Linux.g++.c.excludes= -- cgit v1.2.3