From ea4920d3056938c3318c4e1a346e9822dba53029 Mon Sep 17 00:00:00 2001 From: MeFisto94 Date: Thu, 19 Jan 2017 22:50:49 +0100 Subject: [PATCH] Try to debug the native build issues --- .../com_jme3_bullet_collision_PhysicsCollisionEvent.cpp | 2 ++ private/upload_native.sh | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/jme3-bullet-native/src/native/cpp/com_jme3_bullet_collision_PhysicsCollisionEvent.cpp b/jme3-bullet-native/src/native/cpp/com_jme3_bullet_collision_PhysicsCollisionEvent.cpp index 0705e8519..473b84175 100644 --- a/jme3-bullet-native/src/native/cpp/com_jme3_bullet_collision_PhysicsCollisionEvent.cpp +++ b/jme3-bullet-native/src/native/cpp/com_jme3_bullet_collision_PhysicsCollisionEvent.cpp @@ -34,6 +34,8 @@ #include "BulletCollision/NarrowPhaseCollision/btManifoldPoint.h" #include "com_jme3_bullet_collision_PhysicsCollisionEvent.h" +// Change to trigger build... + /* * Class: com_jme3_bullet_collision_PhysicsCollisionEvent * Method: getAppliedImpulse diff --git a/private/upload_native.sh b/private/upload_native.sh index 94d5afdc6..6ecde041b 100755 --- a/private/upload_native.sh +++ b/private/upload_native.sh @@ -9,14 +9,19 @@ if [ "$NATIVE_CHANGES" != "" ]; then 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 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 echo " - Pushing natives onto branch $TRAVIS_BRANCH" git checkout "$TRAVIS_BRANCH" + git status -v git add -v -- jme3-bullet-native/libs/native/ + git status -v git commit -v -m "[ci skip] bullet: update $TRAVIS_OS_NAME natives" + git status -v git pull -q --rebase - git push git@github.com:jMonkeyEngine/jmonkeyengine.git + git status -v + #git push git@github.com:jMonkeyEngine/jmonkeyengine.git else echo No native changes. fi