diff --git a/travis/linux.sh b/travis/linux.sh index edd26f8..99c008b 100644 --- a/travis/linux.sh +++ b/travis/linux.sh @@ -17,6 +17,7 @@ echo "TD_BIN_DIR=${TD_BIN_DIR}" echo "JAVA_SRC_DIR=${JAVA_SRC_DIR}" # ====== Environment setup +mkdir -p $TRAVIS_BUILD_DIR/out mkdir $TD_BUILD_DIR || true mkdir $TDNATIVES_CPP_BUILD_DIR || true @@ -37,11 +38,11 @@ echo "JAVA_INCLUDE_PATH=${JAVA_INCLUDE_PATH}" # ====== Build Td cd $TD_BUILD_DIR cmake -DCMAKE_BUILD_TYPE=Release -DTD_ENABLE_JNI=ON -DCMAKE_INSTALL_PREFIX:PATH=${TD_BIN_DIR} ${TD_SRC_DIR} -cmake --build $TD_BUILD_DIR --target install -- -j3 +cmake --build $TD_BUILD_DIR --target install -- -j2 # ====== Build TdNatives cd $TDNATIVES_CPP_BUILD_DIR cmake -DCMAKE_BUILD_TYPE=Release -DTD_BIN_DIR=${TD_BIN_DIR} -DTDNATIVES_BIN_DIR=${TDNATIVES_BIN_DIR} -DTDNATIVES_DOCS_BIN_DIR=${TDNATIVES_DOCS_BIN_DIR} -DTd_DIR=${TD_BIN_DIR}/lib/cmake/Td -DJAVA_SRC_DIR=${JAVA_SRC_DIR} -DTDNATIVES_CPP_SRC_DIR:PATH=$TDNATIVES_CPP_SRC_DIR $TDNATIVES_CPP_SRC_DIR -cmake --build $TDNATIVES_CPP_BUILD_DIR --target install -- -j3 +cmake --build $TDNATIVES_CPP_BUILD_DIR --target install -- -j2 -mv $TDNATIVES_BIN_DIR/libtdjni.so $TRAVIS_BUILD_DIR/out +mv $TDNATIVES_BIN_DIR/libtdjni.so $TRAVIS_BUILD_DIR/out/libtdjni.so diff --git a/travis/win.sh b/travis/win.sh index 705cdf6..1e5c96d 100644 --- a/travis/win.sh +++ b/travis/win.sh @@ -25,6 +25,7 @@ rm $JAVA_SRC_DIR/it/tdlight/tdnatives/TdApi.java || true rm $JAVA_SRC_DIR/it/tdlight/tdnatives/new_TdApi.java || true # ====== Environment setup +mkdir -p $TRAVIS_BUILD_DIR/out mkdir $TRAVIS_BUILD_DIR/out mkdir $TD_BUILD_DIR || true mkdir $TDNATIVES_CPP_BUILD_DIR || true @@ -52,4 +53,4 @@ cmake -A x64 -DCMAKE_BUILD_TYPE=Release -DTD_BIN_DIR=${TD_BIN_DIR} -DTDNATIVES_B cmake --build $TDNATIVES_CPP_BUILD_DIR --target install # ====== Copy output -mv $TDNATIVES_BIN_DIR/libtdjni.dll $TRAVIS_BUILD_DIR/out +mv $TDNATIVES_BIN_DIR/libtdjni.dll $TRAVIS_BUILD_DIR/out/libtdjni.dll