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

bullet: enable upload for linux/mac

Browse Source
This commit is contained in:
Kirill Vainer 2016-12-10 14:03:47 -05:00
parent 2ec444f94e
commit 17d7134e2d
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.travis.yml
View File

@ -8,11 +8,11 @@ branches:
matrix: matrix:
include: include:
# - os: linux - os: linux
# jdk: oraclejdk8 jdk: oraclejdk8
# env: UPLOAD=true UPLOAD_NATIVE=true env: UPLOAD=true UPLOAD_NATIVE=true
# - os: linux - os: linux
# jdk: openjdk7 jdk: openjdk7
- os: osx - os: osx
env: UPLOAD_NATIVE=true env: UPLOAD_NATIVE=true

1
jme3-bullet-native/src/native/cpp/jmePhysicsSpace.cpp
View File

@ -36,7 +36,6 @@
* Author: Normen Hansen * Author: Normen Hansen
*/ */
jmePhysicsSpace::jmePhysicsSpace(JNIEnv* env, jobject javaSpace) { jmePhysicsSpace::jmePhysicsSpace(JNIEnv* env, jobject javaSpace) {
printf("hello\n");
//TODO: global ref? maybe not -> cleaning, rather callback class? //TODO: global ref? maybe not -> cleaning, rather callback class?
this->javaPhysicsSpace = env->NewWeakGlobalRef(javaSpace); this->javaPhysicsSpace = env->NewWeakGlobalRef(javaSpace);
this->env = env; this->env = env;

23
private/upload_native.sh
View File

@ -1,17 +1,22 @@
#!/bin/bash #!/bin/bash
set -euo pipefail set -euo pipefail
echo Running upload native ... echo " - Checking if natives changed in commit $TRAVIS_COMMIT.."
# NATIVE_CHANGES="$(git diff-tree --name-only "$TRAVIS_COMMIT" -- jme3-bullet-native/)" NATIVE_CHANGES="$(git diff-tree --name-only "$TRAVIS_COMMIT" -- jme3-bullet-native/)"
# if [ "$NATIVE_CHANGES" != "" ]; then if [ "$NATIVE_CHANGES" != "" ]; then
echo " - Configuring GIT user"
git config --global user.email "travis-ci" git config --global user.email "travis-ci"
git config --global user.name "travis-ci" git config --global user.name "travis-ci"
# openssl aes-256-cbc -K $encrypted_f0a0b284e2e8_key -iv $encrypted_f0a0b284e2e8_iv -in private/key.enc -out "$HOME/.ssh/id_rsa" -d echo " - Decrypting private key"
# chmod 600 "$HOME/.ssh/id_rsa" openssl aes-256-cbc -K $encrypted_f0a0b284e2e8_key -iv $encrypted_f0a0b284e2e8_iv -in private/key.enc -out "$HOME/.ssh/id_rsa" -d
ls jme3-bullet-native/build/libs/bulletjme/shared/ chmod 600 "$HOME/.ssh/id_rsa"
md5 -r jme3-bullet-native/libs/native/osx/x86/libbulletjme.dylib jme3-bullet-native/build/libs/bulletjme/shared/mac32/libbulletjme.dylib # ls 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 checkout "$TRAVIS_BRANCH"
git add -v -- jme3-bullet-native/libs/native/ git add -v -- jme3-bullet-native/libs/native/
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 pull -q --rebase git pull -q --rebase
# git push git@github.com:jMonkeyEngine/jmonkeyengine.git git push git@github.com:jMonkeyEngine/jmonkeyengine.git
# fi else
echo No native changes.
fi