From 370728b40c7eee478fe3147683b7525d025f282e Mon Sep 17 00:00:00 2001 From: Boris Kraut Date: Mon, 18 Aug 2014 14:56:36 +0200 Subject: [PATCH] Antox: Merge huge recipe. --- metadata/im.tox.antox.txt | 76 ++++++++++++++++++++++++++++++++------- srclibs/dnsjava.txt | 2 ++ srclibs/jToxcore.txt | 2 ++ srclibs/libsodium.txt | 4 +++ srclibs/toxcore.txt | 4 +++ srclibs/zxing.txt | 2 ++ 6 files changed, 77 insertions(+), 13 deletions(-) create mode 100644 srclibs/dnsjava.txt create mode 100644 srclibs/jToxcore.txt create mode 100644 srclibs/libsodium.txt create mode 100644 srclibs/toxcore.txt create mode 100644 srclibs/zxing.txt diff --git a/metadata/im.tox.antox.txt b/metadata/im.tox.antox.txt index fc7bfc74b0..abaf76d518 100644 --- a/metadata/im.tox.antox.txt +++ b/metadata/im.tox.antox.txt @@ -16,32 +16,82 @@ using their Tox ID. Once the IP is obtained, peers can initiate a secure (leveraging the NaCl library) connection with each other. Once the connection is made, peers can exchange messages, send files, start video chats, etc. using encrypted communications. + +INFORMATION: Use at your own risk. This is a pre-release build not intended +for general use. It might brake or not get updated. . Repo Type:git Repo:https://github.com/Astonex/Antox.git -Build:0.9.1,19 - disable=see notes - commit=v0.9.1-alpha +Build:0.12.0,28 + disable=builds but needs testing and cleaning + commit=9e33d57974ae564e263703dd0b4a84e0d3b6b9d5 subdir=app gradle=yes - srclibs=JSoup@jsoup-1.7.3 - rm=app/libs/jsoup-1.7.3.jar + srclibs=dnsjava@1692,zxing@zxing-3.1.0,JSoup@jsoup-1.7.3,libsodium@0.6.1,toxcore@9a74e5d0581e2ce954e365aec470551785dbb844,jToxcore@e95246c0d06ea4fe472ec88c22c014b844d9f05c + rm=app/libs/jsoup-1.7.3.jar,app/libs/core.jar,app/libs/dnsjava-2.1.6.jar,app/libs/wearable-preview-support.jar + scanignore=app/src/main/jniLibs/*/*.so,android-toolchain/*,sysroot/*,build-toxcore/*,build-sodium/* prebuild=pushd $$JSoup$$ && \ $$MVN3$$ package && \ popd && \ - cp $$JSoup$$/target/jsoup-1.7.3.jar libs/ + cp $$JSoup$$/target/jsoup-1.7.3.jar libs/ && \ + pushd $$dnsjava$$ && \ + ant jar && \ + popd && \ + pushd $$zxing$$/core && \ + $$MVN3$$ package -Dmaven.test.skip=true && \ + popd && \ + pushd .. && \ + SYSROOT=`pwd`/sysroot && \ + PATH=`pwd`/android-toolchain/bin:$PATH && \ + $$NDK$$/build/tools/make-standalone-toolchain.sh --arch=arm --ndk-dir=$$NDK$$ --toolchain=arm-linux-androideabi-4.6 --install-dir=android-toolchain --platform=android-9 --system=linux-x86_64 && \ + mkdir -p build-sodium && \ + cd build-sodium && \ + $$libsodium$$/configure --host="arm-linux-androideabi" \ + --prefix=$SYSROOT/usr \ + --with-sysroot=$SYSROOT \ + --disable-soname-versions && \ + make -j4 && \ + make install && \ + popd && \ + pushd .. && \ + mkdir -p build-toxcore && \ + cd build-toxcore && \ + $$toxcore$$/configure --host="arm-linux-androideabi" \ + --prefix=$SYSROOT/usr \ + --with-sysroot=$SYSROOT \ + --with-libsodium-headers=$SYSROOT/usr/include \ + --with-libsodium-libs=$SYSROOT/usr/lib \ + --disable-soname-versions \ + --disable-av \ + --disable-rt \ + --disable-ntox \ + --disable-daemon \ + --disable-phone && \ + make -j4 && \ + make install && \ + popd && \ + pushd $$jToxcore$$ && \ + echo -e "SET(CMAKE_SYSTEM_NAME Linux)\n SET(CMAKE_C_COMPILER arm-linux-androideabi-gcc)\n SET(CMAKE_CXX_COMPILER arm-linux-androideabi-g++)\n SET(CMAKE_FIND_ROOT_PATH $SYSROOT)\n SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)\n SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)\n SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)\n add_definitions(-DANDROID)\n" > toolchain.cmake && \ + cmake . -DCMAKE_TOOLCHAIN_FILE=toolchain.cmake -DJNI_H=$SYSROOT/usr/include -DNEED_JNI_MD=n && \ + make -j4 && \ + popd && \ + cp $$zxing$$/android/libs/core-3.1.0.jar libs/core.jar && \ + cp $$dnsjava$$/dnsjava-2.1.6.jar libs/ && \ + cp $$JSoup$$/target/jsoup-1.7.3.jar libs/ && \ + cp $$jToxcore$$/src/jToxcore.jar libs/ && \ + mkdir -p src/main/jniLibs/armeabi-v7a && \ + cp $SYSROOT/usr/lib/*.so src/main/jniLibs/armeabi-v7a/ && \ + cp $$jToxcore$$/jni/libjtoxcore.so src/main/jniLibs/armeabi-v7a/ Maintainer Notes: -TODO: Cannot verify wearable-preview-support.jar, see http://developer.android.com/wear/preview/start.html -TODO: Cannot build jni libs (app/src/main/jniLibs/armeabi) -TODO: dnsjava-2.1.6.jar -TODO: core.jar +* Removed wearable-preview-support.jar since it seems to be usused, and I cant + find source. +* TODO: build for other architectures than armv7a . Auto Update Mode:None Update Check Mode:Static -Current Version:0.9.1 -Current Version Code:19 - +Current Version:0.12.0 +Current Version Code:28 diff --git a/srclibs/dnsjava.txt b/srclibs/dnsjava.txt new file mode 100644 index 0000000000..ff29c2a75a --- /dev/null +++ b/srclibs/dnsjava.txt @@ -0,0 +1,2 @@ +Repo Type:git-svn +Repo:https://svn.code.sf.net/p/dnsjava/code/trunk diff --git a/srclibs/jToxcore.txt b/srclibs/jToxcore.txt new file mode 100644 index 0000000000..e8f5c64b8e --- /dev/null +++ b/srclibs/jToxcore.txt @@ -0,0 +1,2 @@ +Repo Type:git +Repo:https://github.com/Tox/jToxcore diff --git a/srclibs/libsodium.txt b/srclibs/libsodium.txt new file mode 100644 index 0000000000..d3913b7fc7 --- /dev/null +++ b/srclibs/libsodium.txt @@ -0,0 +1,4 @@ +Repo Type:git +Repo:https://github.com/jedisct1/libsodium + +Prepare:./autogen.sh diff --git a/srclibs/toxcore.txt b/srclibs/toxcore.txt new file mode 100644 index 0000000000..7dc23d0b99 --- /dev/null +++ b/srclibs/toxcore.txt @@ -0,0 +1,4 @@ +Repo Type:git +Repo:https://github.com/irungentoo/toxcore + +Prepare:./autogen.sh diff --git a/srclibs/zxing.txt b/srclibs/zxing.txt new file mode 100644 index 0000000000..368383118e --- /dev/null +++ b/srclibs/zxing.txt @@ -0,0 +1,2 @@ +Repo Type:git +Repo:https://github.com/zxing/zxing