sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Try to debug the native build issues

Browse Source
This commit is contained in:
MeFisto94 2017-01-19 22:50:49 +01:00
parent b0ed053472
commit ea4920d305
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jme3-bullet-native/src/native/cpp/com_jme3_bullet_collision_PhysicsCollisionEvent.cpp
View File

@ -34,6 +34,8 @@
#include "BulletCollision/NarrowPhaseCollision/btManifoldPoint.h" #include "BulletCollision/NarrowPhaseCollision/btManifoldPoint.h"
#include "com_jme3_bullet_collision_PhysicsCollisionEvent.h" #include "com_jme3_bullet_collision_PhysicsCollisionEvent.h"
// Change to trigger build...
/* /*
* Class: com_jme3_bullet_collision_PhysicsCollisionEvent * Class: com_jme3_bullet_collision_PhysicsCollisionEvent
* Method: getAppliedImpulse * Method: getAppliedImpulse

9
private/upload_native.sh
View File

@ -9,14 +9,19 @@ if [ "$NATIVE_CHANGES" != "" ]; then
echo " - Decrypting private key" echo " - Decrypting private key"
openssl aes-256-cbc -K $encrypted_f0a0b284e2e8_key -iv $encrypted_f0a0b284e2e8_iv -in private/key.enc -out "$HOME/.ssh/id_rsa" -d openssl aes-256-cbc -K $encrypted_f0a0b284e2e8_key -iv $encrypted_f0a0b284e2e8_iv -in private/key.enc -out "$HOME/.ssh/id_rsa" -d
chmod 600 "$HOME/.ssh/id_rsa" chmod 600 "$HOME/.ssh/id_rsa"
# ls jme3-bullet-native/build/libs/bulletjme/shared/ git status -v
ls -lsh jme3-bullet-native/build/libs/bulletjme/shared/
# md5 -r jme3-bullet-native/libs/native/osx/x86/libbulletjme.dylib jme3-bullet-native/build/libs/bulletjme/shared/mac32/libbulletjme.dylib # md5 -r jme3-bullet-native/libs/native/osx/x86/libbulletjme.dylib jme3-bullet-native/build/libs/bulletjme/shared/mac32/libbulletjme.dylib
echo " - Pushing natives onto branch $TRAVIS_BRANCH" echo " - Pushing natives onto branch $TRAVIS_BRANCH"
git checkout "$TRAVIS_BRANCH" git checkout "$TRAVIS_BRANCH"
git status -v
git add -v -- jme3-bullet-native/libs/native/ git add -v -- jme3-bullet-native/libs/native/
git status -v
git commit -v -m "[ci skip] bullet: update $TRAVIS_OS_NAME natives" git commit -v -m "[ci skip] bullet: update $TRAVIS_OS_NAME natives"
git status -v
git pull -q --rebase git pull -q --rebase
git push git@github.com:jMonkeyEngine/jmonkeyengine.git git status -v
#git push git@github.com:jMonkeyEngine/jmonkeyengine.git
else else
echo No native changes. echo No native changes.
fi fi