diff --git a/android/res/drawable/itoopie_notification_icon.png b/android/res/drawable/itoopie_notification_icon.png index d055bc8f..fa99e7fc 100644 Binary files a/android/res/drawable/itoopie_notification_icon.png and b/android/res/drawable/itoopie_notification_icon.png differ diff --git a/contrib/.gitignore b/contrib/.gitignore new file mode 100644 index 00000000..d736e035 --- /dev/null +++ b/contrib/.gitignore @@ -0,0 +1,2 @@ +i2pd*.zip +build*.log \ No newline at end of file diff --git a/contrib/build_mingw.cmd b/contrib/build_mingw.cmd new file mode 100644 index 00000000..b5ac0d69 --- /dev/null +++ b/contrib/build_mingw.cmd @@ -0,0 +1,22 @@ +@echo off +title ઠ i2pd + +set "WD=C:\msys64" +set CHERE_INVOKING=enabled_from_arguments +set MSYSCON=mintty.exe + +echo ઠ i2pd win32. Enter ᫥ 砭 樨... +set "MSYSTEM=MINGW32" +set "CONTITLE=MinGW x32" +start "%CONTITLE%" /WAIT C:\msys64\usr\bin\mintty.exe -i /msys2.ico /usr/bin/bash --login build_mingw.sh +pause + +echo ઠ i2pd win64. Enter ᫥ 砭 樨... +set "MSYSTEM=MINGW64" +set "CONTITLE=MinGW x64" +start "%CONTITLE%" /WAIT C:\msys64\usr\bin\mintty.exe -i /msys2.ico /usr/bin/bash --login build_mingw.sh +pause + +echo ઠ 襭... +pause +exit /b 0 \ No newline at end of file diff --git a/contrib/build_mingw.sh b/contrib/build_mingw.sh index 564c8a79..ec4b975b 100644 --- a/contrib/build_mingw.sh +++ b/contrib/build_mingw.sh @@ -8,7 +8,7 @@ elif [ $MSYSTEM == MINGW32 ]; then else echo "Не могу понять, какая у вас архитектура, используемая для сборки."; echo "Вы точно запустили скрипт в оболочке MSYS2 MinGW [64/32]-bit ?"; - echo "Обычно его можно запустить выполнив c:\msys64\mingw64.exe или c:\msys64\mingw32.exe"; + echo "Обычно её можно запустить выполнив c:\msys64\mingw64.exe или c:\msys64\mingw32.exe"; exit 1; fi; @@ -38,39 +38,46 @@ fi; # Получаем версию приложения export version=$(grep -E "I2PD_VERSION_(MAJOR|MINOR|MICRO)\ " version.h | grep -oE '[^ ]+$' | tr '\n' '.'|head -c -1) +# Получаем количество ядер, и уменьшаем количество потоков на 1 от количества ядер (если их больше чем 1). +if [ $NUMBER_OF_PROCESSORS -ge 2 ]; then + export threads=$(( $NUMBER_OF_PROCESSORS - 1 )) +else + export threads=$NUMBER_OF_PROCESSORS +fi; + echo "Собираем i2pd ${version} (коммит ${commit}) для ${arch}."; # Собираем приложение с разными параметрами, и архивируем в zip архивы. -make USE_UPNP=yes USE_AVX=1 USE_AESNI=1 -j $NUMBER_OF_PROCESSORS > ${contrib}/build_avx_aesni.log 2>&1 +make USE_UPNP=yes USE_AVX=1 USE_AESNI=1 -j ${threads} > ${contrib}/build_avx_aesni.log 2>&1 if [ "$?" != 0 ]; then echo "Сборка не удалась. Смотрите в build_avx_aesni.log"; exit 1; fi; -zip -9 ${contrib}/i2pd_${version}_${commit}_${arch}_mingw_avx_aesni.zip i2pd.exe +zip -9 ${contrib}/i2pd_${version}_${commit}_${arch}_mingw_avx_aesni.zip i2pd.exe >> /dev/null make clean >> /dev/null -make USE_UPNP=yes USE_AVX=1 -j $NUMBER_OF_PROCESSORS > ${contrib}/build_avx.log 2>&1 +make USE_UPNP=yes USE_AVX=1 -j ${threads} > ${contrib}/build_avx.log 2>&1 if [ "$?" != 0 ]; then echo "Сборка не удалась. Смотрите в build_avx.log."; exit 1; fi; -zip -9 ${contrib}/i2pd_${version}_${commit}_${arch}_mingw_avx.zip i2pd.exe +zip -9 ${contrib}/i2pd_${version}_${commit}_${arch}_mingw_avx.zip i2pd.exe >> /dev/null make clean >> /dev/null -make USE_UPNP=yes USE_AESNI=1 -j $NUMBER_OF_PROCESSORS > ${contrib}/build_aesni.log 2>&1 +make USE_UPNP=yes USE_AESNI=1 -j ${threads} > ${contrib}/build_aesni.log 2>&1 if [ "$?" != 0 ]; then echo "Сборка не удалась. Смотрите в build_aesni.log"; exit 1; fi; -zip -9 ${contrib}/i2pd_${version}_${commit}_${arch}_mingw_aesni.zip i2pd.exe +zip -9 ${contrib}/i2pd_${version}_${commit}_${arch}_mingw_aesni.zip i2pd.exe >> /dev/null make clean >> /dev/null -make USE_UPNP=yes -j $NUMBER_OF_PROCESSORS > ${contrib}/build.log 2>&1 +make USE_UPNP=yes -j ${threads} > ${contrib}/build.log 2>&1 if [ "$?" != 0 ]; then echo "Сборка не удалась. Смотрите в build.log"; exit 1; fi; -zip -9 ${contrib}/i2pd_${version}_${commit}_${arch}_mingw.zip i2pd.exe +zip -9 ${contrib}/i2pd_${version}_${commit}_${arch}_mingw.zip i2pd.exe >> /dev/null make clean >> /dev/null echo "Сборка i2pd ${version} для ${arch} завершена."; diff --git a/contrib/debian/README b/contrib/debian/README index 077d7b96..cccbc4de 100644 --- a/contrib/debian/README +++ b/contrib/debian/README @@ -1,2 +1,2 @@ This forder contain systemd unit files. -To use systemd daemon control, place files from this directory to debian folder. +To use systemd daemon control, place files from this directory to debian folder before building package. diff --git a/qt/i2pd_qt/android/res/drawable-hdpi/icon.png b/qt/i2pd_qt/android/res/drawable-hdpi/icon.png index a5dc7b68..9a2f7404 100644 Binary files a/qt/i2pd_qt/android/res/drawable-hdpi/icon.png and b/qt/i2pd_qt/android/res/drawable-hdpi/icon.png differ diff --git a/qt/i2pd_qt/android/res/drawable/itoopie_notification_icon.png b/qt/i2pd_qt/android/res/drawable/itoopie_notification_icon.png index 8fbe2468..fa99e7fc 100644 Binary files a/qt/i2pd_qt/android/res/drawable/itoopie_notification_icon.png and b/qt/i2pd_qt/android/res/drawable/itoopie_notification_icon.png differ