Skip to content

Commit

Permalink
Get existing build scripts working with updated build
Browse files Browse the repository at this point in the history
When the build was updated to use CMake, the existing build
scripts stopped working. Ideally we will remove these old
scripts, but they are still being used in a number of places.

The pom.xml now has an environment variable that is used to
specify the version and name. We now set these in the buildAll.sh
script.

Change-Id: Ia1e6974ba2092568f0918fa667907107b1d2f5ba
  • Loading branch information
irbull committed Jun 22, 2017
1 parent d339049 commit ba8c19b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions buildAll.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ set -e
tar xzf node.out-7_4_0.tar.gz

docker build -t "j2v8-linux-x64" -f docker/Dockerfile.linux $DIR
docker run -v $ROOTPATH:/build/. -v $ROOTPATH/node.out:/build/node --name j2v8.linux.x64_$DOCKER_CONTAINER_SUFFIX j2v8-linux-x64
docker run -e "env.J2V8_PLATFORM_NAME=linux" -e "env.J2V8_ARCH_NAME=x86_64" -e "env.J2V8_FULL_VERSION=4.8.0" -v $ROOTPATH:/build/. -v $ROOTPATH/node.out:/build/node --name j2v8.linux.x64_$DOCKER_CONTAINER_SUFFIX j2v8-linux-x64

docker build -t "j2v8-android-x86" -f docker/Dockerfile.android $DIR
docker run -v $ROOTPATH/node.out:/build/node --name j2v8.android.x86_$DOCKER_CONTAINER_SUFFIX j2v8-android-x86 android-gcc-toolchain x86 --api 15 --host gcc-lpthread -C sh -c "cd jni && ndk-build && /build/android-ndk-r13b/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/arm-linux-androideabi/bin/strip --strip-unneeded -R .note -R .comment /build/jni/jniLibs/armeabi-v7a/libj2v8.so && strip --strip-unneeded -R .note -R .comment /build/jni/jniLibs/x86/libj2v8.so"
docker run -e "env.J2V8_PLATFORM_NAME=linux" -e "env.J2V8_ARCH_NAME=x86_64" -e "env.J2V8_FULL_VERSION=4.8.0" -v $ROOTPATH/node.out:/build/node --name j2v8.android.x86_$DOCKER_CONTAINER_SUFFIX j2v8-android-x86 android-gcc-toolchain x86 --api 15 --host gcc-lpthread -C sh -c "cd jni && ndk-build && /build/android-ndk-r13b/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/arm-linux-androideabi/bin/strip --strip-unneeded -R .note -R .comment /build/jni/jniLibs/armeabi-v7a/libj2v8.so && strip --strip-unneeded -R .note -R .comment /build/jni/jniLibs/x86/libj2v8.so"
docker cp j2v8.android.x86_$DOCKER_CONTAINER_SUFFIX:/build/jni/jniLibs $DIR/src/main/

set +e
Expand Down

0 comments on commit ba8c19b

Please sign in to comment.