v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make use of travis languages, build java jar too. 

https://github.com/assimp/assimp/pull/505#issuecomment-84198261
pull/505/head
Ser Lev Arris 2015-03-21 10:32:15 +01:00
parent 54dcc64d33
commit f3ed79ab41
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -43,4 +43,4 @@ script:
- echo "==========================================================" - echo "=========================================================="
# - echo "REGRESSION TEST FAILS (results/run_regression_suite_failures.csv)" # - echo "REGRESSION TEST FAILS (results/run_regression_suite_failures.csv)"
# - cat ../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

5
port/jassimp/build.xml
View File

@ -7,6 +7,7 @@
<property name="doc.dir" value="doc" /> <property name="doc.dir" value="doc" />
<property environment="env"/> <property environment="env"/>
<property name="ndk.dir" value="${env.NDK_HOME}" /> <property name="ndk.dir" value="${env.NDK_HOME}" />
<property name="my.dir" value="${env.PWD}" />
<path id="classpath"> <path id="classpath">
</path> </path>
@ -29,9 +30,9 @@
</javah> </javah>
</target> </target>
<target name="ndk-jni"> <target name="ndk-jni" depends="package">
<exec executable="${ndk.dir}/ndk-build"> <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> </exec>
</target> </target>

13
workspaces/Android-NDK/jni/Application.mk
View File

@ -1,11 +1,8 @@
# NDK_TOOLCHAIN_VERSION=clang # fails on IFCBoolean.cpp and GEOColorTable.h ??? ifeq ($(TRAVIS_LANGUAGE),clang)
#NDK_TOOLCHAIN_VERSION=4.8 NDK_TOOLCHAIN_VERSION := $(TRAVIS_LANGUAGE)
#NDK_TOOLCHAIN_VERSION=4.7 $(info "Use llvm Compiler")
#NDK_TOOLCHAIN_VERSION=4.6 endif
APP_ABI := all APP_ABI := armeabi-v7a
APP_ABI := x86
APP_STL := stlport_static APP_STL := stlport_static
#NDK_APP_OUT := /home/Video-HD/C-Backups/arris69_assimp.git/JassimpLibrary