make use of travis languages, build java jar too.
https://github.com/assimp/assimp/pull/505#issuecomment-84198261pull/505/head
parent
54dcc64d33
commit
f3ed79ab41
|
@ -43,4 +43,4 @@ script:
|
|||
- echo "=========================================================="
|
||||
# - echo "REGRESSION TEST FAILS (results/run_regression_suite_failures.csv)"
|
||||
# - cat ../results/run_regression_suite_failures.csv
|
||||
- if [ $ANDROID ]; then ant -v -Dbasedir=${TRAVIS_BUILD_DIR} -f ${TRAVIS_BUILD_DIR}/port/jassimp/build.xml ndk-jni ; fi
|
||||
- if [ $ANDROID ]; then ant -v -Dmy.dir=${TRAVIS_BUILD_DIR} -f ${TRAVIS_BUILD_DIR}/port/jassimp/build.xml ndk-jni ; fi
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
<property name="doc.dir" value="doc" />
|
||||
<property environment="env"/>
|
||||
<property name="ndk.dir" value="${env.NDK_HOME}" />
|
||||
<property name="my.dir" value="${env.PWD}" />
|
||||
|
||||
<path id="classpath">
|
||||
</path>
|
||||
|
@ -29,9 +30,9 @@
|
|||
</javah>
|
||||
</target>
|
||||
|
||||
<target name="ndk-jni">
|
||||
<target name="ndk-jni" depends="package">
|
||||
<exec executable="${ndk.dir}/ndk-build">
|
||||
<arg line="all NDK_PROJECT_PATH=workspaces/Android-NDK"/>
|
||||
<arg line="all NDK_PROJECT_PATH=${my.dir}/workspaces/Android-NDK"/>
|
||||
</exec>
|
||||
</target>
|
||||
|
||||
|
|
|
@ -1,11 +1,8 @@
|
|||
# NDK_TOOLCHAIN_VERSION=clang # fails on IFCBoolean.cpp and GEOColorTable.h ???
|
||||
#NDK_TOOLCHAIN_VERSION=4.8
|
||||
#NDK_TOOLCHAIN_VERSION=4.7
|
||||
#NDK_TOOLCHAIN_VERSION=4.6
|
||||
ifeq ($(TRAVIS_LANGUAGE),clang)
|
||||
NDK_TOOLCHAIN_VERSION := $(TRAVIS_LANGUAGE)
|
||||
$(info "Use llvm Compiler")
|
||||
endif
|
||||
|
||||
APP_ABI := all
|
||||
APP_ABI := x86
|
||||
APP_ABI := armeabi-v7a
|
||||
|
||||
APP_STL := stlport_static
|
||||
|
||||
#NDK_APP_OUT := /home/Video-HD/C-Backups/arris69_assimp.git/JassimpLibrary
|
||||
|
|
Loading…
Reference in New Issue