diff options
| author | Mark Donszelmann <duns@ubuntu.(none)> | 2009-10-09 02:55:56 -0700 |
|---|---|---|
| committer | Mark Donszelmann <duns@ubuntu.(none)> | 2009-10-09 02:55:56 -0700 |
| commit | 3e89726b2b1bb1f5d08e8360250ba12efcf3dacf (patch) | |
| tree | 307bd56cb65db1877efb47203632722a0411c5db | |
| parent | ab7af4989295ee834ed3aad9ef3c022c4a80967e (diff) | |
| download | maven-nar-plugin-3e89726b2b1bb1f5d08e8360250ba12efcf3dacf.tar.gz maven-nar-plugin-3e89726b2b1bb1f5d08e8360250ba12efcf3dacf.tar.bz2 maven-nar-plugin-3e89726b2b1bb1f5d08e8360250ba12efcf3dacf.tar.xz maven-nar-plugin-3e89726b2b1bb1f5d08e8360250ba12efcf3dacf.zip | |
Added binaries for amd64-Linux-g++; added -fPIC to compilers on amd64; Fixed order of it tests in pom
| -rw-r--r-- | pom.xml | 5 | ||||
| -rwxr-xr-x | src/it/it0006-jni-3rdparty/src/nar/resources/aol/amd64-Linux-g++/lib/libit0003-jni-1.0-SNAPSHOT.so | bin | 0 -> 9507 bytes | |||
| -rw-r--r-- | src/it/it0006-jni-3rdparty/src/nar/resources/aol/amd64-Linux-g++/share/it0003-jni-1.0-SNAPSHOT.jar | bin | 0 -> 4114 bytes | |||
| -rw-r--r-- | src/main/resources/org/apache/maven/plugin/nar/aol.properties | 4 |
4 files changed, 7 insertions, 2 deletions
@@ -135,6 +135,11 @@ <!-- FAILS to run, see ReleaseNotes <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo> --> + <setupIncludes> + <setupInclude>it0003-jni/pom.xml</setupInclude> + <setupInclude>it0007-lib-shared/pom.xml</setupInclude> + <setupInclude>it0010-lib-static/pom.xml</setupInclude> + </setupIncludes> <pomExcludes> <pomExclude>it-parent/**</pomExclude> </pomExcludes> 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 Binary files differnew file mode 100755 index 0000000..2a1b595 --- /dev/null +++ b/src/it/it0006-jni-3rdparty/src/nar/resources/aol/amd64-Linux-g++/lib/libit0003-jni-1.0-SNAPSHOT.so 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 Binary files differnew file mode 100644 index 0000000..ae6fa9d --- /dev/null +++ b/src/it/it0006-jni-3rdparty/src/nar/resources/aol/amd64-Linux-g++/share/it0003-jni-1.0-SNAPSHOT.jar 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= |