diff --git a/swig/build-macos-arm64.sh b/swig/build-macos-arm64.sh index 5b7eb2df..69f31967 100755 --- a/swig/build-macos-arm64.sh +++ b/swig/build-macos-arm64.sh @@ -21,7 +21,7 @@ export run_objcopy="echo dummy run_objcopy for ${os_build} ${os_arch}" export run_strip="strip -S -x bin/release/${os_build}/${os_arch}/${SHARED_LIB}" export run_native_jar="./gradlew nativeMacOSArm64Jar" create_folder_if_it_doesnt_exist ${SRC} -prompt_msg "About to prepare BOOST ${BOOST_VERSION}" +prompt_msg "$0:About to prepare BOOST ${BOOST_VERSION}" press_any_to_continue prepare_boost prepare_openssl diff --git a/swig/build-macos-x86_64.sh b/swig/build-macos-x86_64.sh index aa65f476..06411697 100755 --- a/swig/build-macos-x86_64.sh +++ b/swig/build-macos-x86_64.sh @@ -21,7 +21,7 @@ export run_objcopy="echo dummy run_objcopy for ${os_build} ${os_arch}" export run_strip="strip -S -x bin/release/${os_build}/${os_arch}/${SHARED_LIB}" export run_native_jar="./gradlew nativeMacOSX86_64Jar" create_folder_if_it_doesnt_exist ${SRC} -prompt_msg "About to prepare BOOST ${BOOST_VERSION}" +prompt_msg "$0:About to prepare BOOST ${BOOST_VERSION}" press_any_to_continue prepare_boost prepare_openssl diff --git a/swig/build-macos.sh b/swig/build-macos.sh index e664c011..0b46222b 100755 --- a/swig/build-macos.sh +++ b/swig/build-macos.sh @@ -1,2 +1,6 @@ #!/bin/bash -./build-macos-$(arch).sh +if [ $(arch) == 'i386' ]; then + ./build-macos-x86_64.sh +else + ./build-macos-arm64.sh +fi diff --git a/swig/build-utils.shinc b/swig/build-utils.shinc index 931f5008..721c5933 100755 --- a/swig/build-utils.shinc +++ b/swig/build-utils.shinc @@ -57,7 +57,7 @@ export LIBRARY_NAME=jlibtorrent # In order to make sure a cherry-picked commit is checkout on the RC_1_2 branch # I create a tag for it on the github.com/gubatron/libtorrent/commits/RC_1_2 branch # The tag name format is 'RC_1_2_' + -export LIBTORRENT_REVISION=RC_1_2_e22621a # Clean up compile flags for msvc +export LIBTORRENT_REVISION=e22621a1883fb1a7ca416dc9aa134518e04f0644 # Clean up compile flags for msvc export OPENSSL_VERSION="1.1.1m" export BOOST_VERSION="78" export BOOST_MAJOR="1" diff --git a/swig/libtorrent_jni.cpp b/swig/libtorrent_jni.cpp index a8366951..f201309e 100644 --- a/swig/libtorrent_jni.cpp +++ b/swig/libtorrent_jni.cpp @@ -23741,7 +23741,7 @@ SWIGEXPORT jint JNICALL Java_com_frostwire_jlibtorrent_swig_libtorrent_1jni_LIBT (void)jenv; (void)jcls; - result = (int)(14); + result = (int)(15); jresult = (jint)result; return jresult; } @@ -23753,7 +23753,7 @@ SWIGEXPORT jint JNICALL Java_com_frostwire_jlibtorrent_swig_libtorrent_1jni_LIBT (void)jenv; (void)jcls; - result = (int)(((1*10000) +(2*100) +14)); + result = (int)(((1*10000) +(2*100) +15)); jresult = (jint)result; return jresult; } @@ -23765,7 +23765,7 @@ SWIGEXPORT jstring JNICALL Java_com_frostwire_jlibtorrent_swig_libtorrent_1jni_L (void)jenv; (void)jcls; - result = (char *)("1.2.14.0"); + result = (char *)("1.2.15.0"); if (result) jresult = jenv->NewStringUTF((const char *)result); return jresult; } @@ -23777,7 +23777,7 @@ SWIGEXPORT jstring JNICALL Java_com_frostwire_jlibtorrent_swig_libtorrent_1jni_L (void)jenv; (void)jcls; - result = (char *)("2b4776a90"); + result = (char *)("0facda852"); if (result) jresult = jenv->NewStringUTF((const char *)result); return jresult; }