diff --git a/linux/build/build.sh b/linux/build/build.sh index 2de3456..4da2f9e 100755 --- a/linux/build/build.sh +++ b/linux/build/build.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (c) 2013-2017, The PurpleI2P Project +# Copyright (c) 2013-2018, The PurpleI2P Project # # This file is part of Purple I2P project and licensed under BSD3 # @@ -8,7 +8,7 @@ arch=$(uname -m) language=$(echo $LANG | cut -c-5 | sed s/_/-/g) -version="52.6.0esr" +version="52.7.2esr" application="firefox" ftpmirror="https://ftp.mozilla.org/pub/$application/releases/$version" diff --git a/linux/build/preferences/syspref.js b/linux/build/preferences/syspref.js index 0d8b5f8..c99e8d5 100644 --- a/linux/build/preferences/syspref.js +++ b/linux/build/preferences/syspref.js @@ -1,7 +1,7 @@ # Mozilla User preferences /* - * Copyright (c) 2013-2017, The PurpleI2P Project + * Copyright (c) 2013-2018, The PurpleI2P Project * * This file is part of Purple i2pd project and licensed under BSD3 * diff --git a/osx/.gitignore b/osx/.gitignore new file mode 100644 index 0000000..4bd4182 --- /dev/null +++ b/osx/.gitignore @@ -0,0 +1,3 @@ +./FirefoxESR.app +./i2pd +./data \ No newline at end of file diff --git a/osx/build/build.sh b/osx/build/build.sh index 2132601..502fde3 100755 --- a/osx/build/build.sh +++ b/osx/build/build.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (c) 2013-2017, The PurpleI2P Project +# Copyright (c) 2013-2018, The PurpleI2P Project # # This file is part of Purple I2P project and licensed under BSD3 # @@ -8,8 +8,10 @@ arch=$(uname -m) language=$(echo $LANG | cut -c-5 | sed s/_/-/g) -version="52.6.0esr" -ftpmirror="https://ftp.mozilla.org/pub/firefox/releases/$version" +version="52.7.2esr" +i2pdversion="2.18.0" + +ftpmirror="https://ftp.mozilla.org/pub/firefox/releases/${version}" curlfind=$(which curl) if [ -z $curlfind ]; then @@ -19,23 +21,23 @@ fi echo "This script is preparing Firefox $version for use with I2Pd" -file="Firefox\ $version.dmg" -filepath="mac/$language/$file" +file="Firefox\ ${version}.dmg" +filepath="mac/${language}/${file}" echo "Downloading $application..." -curl -L -f -# -O $ftpmirror/$filepath +curl -L -f -# -O ${ftpmirror}/${filepath} if [ $? -ne 0 ]; then # Not found error, trying to cut language variable echo "[TRY 2] I'll try downloading Firefox with shorter language code"; language=$(echo $language | cut -c-2) # re-create variable with cutted lang filepath="mac/$language/$file" - curl -L -f -# -O $ftpmirror/$filepath + curl -L -f -# -O ${ftpmirror}/${filepath} if [ $? -ne 0 ]; then # Not found error, trying to download english version echo "[TRY 3] I'll try downloading Firefox with the English language code"; language="en_US" # re-create lang variable filepath="mac/$language/$file" - curl -L -f -# -O $ftpmirror/$filepath + curl -L -f -# -O ${ftpmirror}/${filepath} if [ $? -ne 0 ]; then # After that i can say only that user haven't internet connection echo "[Error] Can't download file. Check your internet connectivity." exit 1; @@ -49,7 +51,7 @@ if [ ! -f $file ]; then fi echo "Downloading checksum file and checking SHA512 checksum" -curl -L -f -# -O $ftpmirror/SHA512SUMS +curl -L -f -# -O ${ftpmirror}/SHA512SUMS recv_sum=$(grep "$filepath" SHA512SUMS | cut -c-128) file_sum=$(sha512sum $file | cut -c-128) if [ $recv_sum != $file_sum ]; then @@ -105,5 +107,11 @@ echo 'FirefoxESR.app/Contents/MacOS/firefox -profile ../data -no-remote' >> "../ chmod +x "../i2pdbrowser-portable" +echo "Downloading i2pd..." +curl -L -f -# -O https://github.com/PurpleI2P/i2pd/releases/download/${i2pdversion}/i2pd_${i2pdversion}_osx.tar.gz +mkdir ../i2pd +tar xfz i2pd_${i2pdversion}_osx.tar.gz -C ../i2pd +mv ../i2pd/i2pd ../i2pd/i2pd-osx +cp -rf i2pd ../i2pd echo "... finished" diff --git a/osx/i2pd/addressbook/addresses.csv b/osx/build/i2pd/addressbook/addresses.csv similarity index 100% rename from osx/i2pd/addressbook/addresses.csv rename to osx/build/i2pd/addressbook/addresses.csv diff --git a/osx/i2pd/certificates/family/gostcoin.crt b/osx/build/i2pd/certificates/family/gostcoin.crt similarity index 100% rename from osx/i2pd/certificates/family/gostcoin.crt rename to osx/build/i2pd/certificates/family/gostcoin.crt diff --git a/osx/i2pd/certificates/family/i2p-dev.crt b/osx/build/i2pd/certificates/family/i2p-dev.crt similarity index 100% rename from osx/i2pd/certificates/family/i2p-dev.crt rename to osx/build/i2pd/certificates/family/i2p-dev.crt diff --git a/osx/i2pd/certificates/family/i2pd-dev.crt b/osx/build/i2pd/certificates/family/i2pd-dev.crt similarity index 100% rename from osx/i2pd/certificates/family/i2pd-dev.crt rename to osx/build/i2pd/certificates/family/i2pd-dev.crt diff --git a/osx/i2pd/certificates/family/mca2-i2p.crt b/osx/build/i2pd/certificates/family/mca2-i2p.crt similarity index 100% rename from osx/i2pd/certificates/family/mca2-i2p.crt rename to osx/build/i2pd/certificates/family/mca2-i2p.crt diff --git a/osx/i2pd/certificates/family/volatile.crt b/osx/build/i2pd/certificates/family/volatile.crt similarity index 100% rename from osx/i2pd/certificates/family/volatile.crt rename to osx/build/i2pd/certificates/family/volatile.crt diff --git a/osx/i2pd/certificates/reseed/atomike_at_mail.i2p.crt b/osx/build/i2pd/certificates/reseed/atomike_at_mail.i2p.crt similarity index 100% rename from osx/i2pd/certificates/reseed/atomike_at_mail.i2p.crt rename to osx/build/i2pd/certificates/reseed/atomike_at_mail.i2p.crt diff --git a/osx/i2pd/certificates/reseed/backup_at_mail.i2p.crt b/osx/build/i2pd/certificates/reseed/backup_at_mail.i2p.crt similarity index 100% rename from osx/i2pd/certificates/reseed/backup_at_mail.i2p.crt rename to osx/build/i2pd/certificates/reseed/backup_at_mail.i2p.crt diff --git a/osx/i2pd/certificates/reseed/bugme_at_mail.i2p.crt b/osx/build/i2pd/certificates/reseed/bugme_at_mail.i2p.crt similarity index 100% rename from osx/i2pd/certificates/reseed/bugme_at_mail.i2p.crt rename to osx/build/i2pd/certificates/reseed/bugme_at_mail.i2p.crt diff --git a/osx/i2pd/certificates/reseed/creativecowpat_at_mail.i2p.crt b/osx/build/i2pd/certificates/reseed/creativecowpat_at_mail.i2p.crt similarity index 100% rename from osx/i2pd/certificates/reseed/creativecowpat_at_mail.i2p.crt rename to osx/build/i2pd/certificates/reseed/creativecowpat_at_mail.i2p.crt diff --git a/osx/i2pd/certificates/reseed/echelon_at_mail.i2p.crt b/osx/build/i2pd/certificates/reseed/echelon_at_mail.i2p.crt similarity index 100% rename from osx/i2pd/certificates/reseed/echelon_at_mail.i2p.crt rename to osx/build/i2pd/certificates/reseed/echelon_at_mail.i2p.crt diff --git a/osx/i2pd/certificates/reseed/hottuna_at_mail.i2p.crt b/osx/build/i2pd/certificates/reseed/hottuna_at_mail.i2p.crt similarity index 100% rename from osx/i2pd/certificates/reseed/hottuna_at_mail.i2p.crt rename to osx/build/i2pd/certificates/reseed/hottuna_at_mail.i2p.crt diff --git a/osx/i2pd/certificates/reseed/igor_at_novg.net.crt b/osx/build/i2pd/certificates/reseed/igor_at_novg.net.crt similarity index 100% rename from osx/i2pd/certificates/reseed/igor_at_novg.net.crt rename to osx/build/i2pd/certificates/reseed/igor_at_novg.net.crt diff --git a/osx/i2pd/certificates/reseed/lazygravy_at_mail.i2p.crt b/osx/build/i2pd/certificates/reseed/lazygravy_at_mail.i2p.crt similarity index 100% rename from osx/i2pd/certificates/reseed/lazygravy_at_mail.i2p.crt rename to osx/build/i2pd/certificates/reseed/lazygravy_at_mail.i2p.crt diff --git a/osx/i2pd/certificates/reseed/meeh_at_mail.i2p.crt b/osx/build/i2pd/certificates/reseed/meeh_at_mail.i2p.crt similarity index 100% rename from osx/i2pd/certificates/reseed/meeh_at_mail.i2p.crt rename to osx/build/i2pd/certificates/reseed/meeh_at_mail.i2p.crt diff --git a/osx/i2pd/certificates/reseed/r4sas-reseed_at_mail.i2p.crt b/osx/build/i2pd/certificates/reseed/r4sas-reseed_at_mail.i2p.crt similarity index 100% rename from osx/i2pd/certificates/reseed/r4sas-reseed_at_mail.i2p.crt rename to osx/build/i2pd/certificates/reseed/r4sas-reseed_at_mail.i2p.crt diff --git a/osx/i2pd/certificates/reseed/r4sas_at_mail.i2p.crt b/osx/build/i2pd/certificates/reseed/r4sas_at_mail.i2p.crt similarity index 100% rename from osx/i2pd/certificates/reseed/r4sas_at_mail.i2p.crt rename to osx/build/i2pd/certificates/reseed/r4sas_at_mail.i2p.crt diff --git a/osx/i2pd/certificates/reseed/zmx_at_mail.i2p.crt b/osx/build/i2pd/certificates/reseed/zmx_at_mail.i2p.crt similarity index 100% rename from osx/i2pd/certificates/reseed/zmx_at_mail.i2p.crt rename to osx/build/i2pd/certificates/reseed/zmx_at_mail.i2p.crt diff --git a/osx/i2pd/certificates/router/orignal_at_mail.i2p.crt b/osx/build/i2pd/certificates/router/orignal_at_mail.i2p.crt similarity index 100% rename from osx/i2pd/certificates/router/orignal_at_mail.i2p.crt rename to osx/build/i2pd/certificates/router/orignal_at_mail.i2p.crt diff --git a/osx/i2pd/i2pd b/osx/build/i2pd/i2pd old mode 100755 new mode 100644 similarity index 100% rename from osx/i2pd/i2pd rename to osx/build/i2pd/i2pd diff --git a/osx/i2pd/i2pd.conf b/osx/build/i2pd/i2pd.conf similarity index 100% rename from osx/i2pd/i2pd.conf rename to osx/build/i2pd/i2pd.conf diff --git a/osx/i2pd/tunnels.conf b/osx/build/i2pd/tunnels.conf similarity index 100% rename from osx/i2pd/tunnels.conf rename to osx/build/i2pd/tunnels.conf diff --git a/osx/build/preferences/syspref.js b/osx/build/preferences/syspref.js index 0d8b5f8..c99e8d5 100644 --- a/osx/build/preferences/syspref.js +++ b/osx/build/preferences/syspref.js @@ -1,7 +1,7 @@ # Mozilla User preferences /* - * Copyright (c) 2013-2017, The PurpleI2P Project + * Copyright (c) 2013-2018, The PurpleI2P Project * * This file is part of Purple i2pd project and licensed under BSD3 * diff --git a/osx/i2pd/i2pd-osx.REMOVED.git-id b/osx/i2pd/i2pd-osx.REMOVED.git-id deleted file mode 100644 index c8606d0..0000000 --- a/osx/i2pd/i2pd-osx.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -e75a2150455e50e501a074031293bda5b6b24be6 \ No newline at end of file diff --git a/osx/i2pd/libSystem.B.dylib b/osx/i2pd/libSystem.B.dylib deleted file mode 100755 index d712bd8..0000000 Binary files a/osx/i2pd/libSystem.B.dylib and /dev/null differ diff --git a/osx/i2pd/libc++.1.dylib b/osx/i2pd/libc++.1.dylib deleted file mode 100755 index c050d6d..0000000 Binary files a/osx/i2pd/libc++.1.dylib and /dev/null differ diff --git a/osx/i2pd/libz.1.dylib b/osx/i2pd/libz.1.dylib deleted file mode 100755 index 5abd84b..0000000 Binary files a/osx/i2pd/libz.1.dylib and /dev/null differ diff --git a/windows/StartI2PdBrowser.bat b/windows/StartI2PdBrowser.bat index d0e9e98..16d0c20 100644 --- a/windows/StartI2PdBrowser.bat +++ b/windows/StartI2PdBrowser.bat @@ -1,9 +1,9 @@ @ECHO OFF -REM Copyright (c) 2013-2017, The PurpleI2P Project +REM Copyright (c) 2013-2018, The PurpleI2P Project REM This file is part of Purple i2pd project and licensed under BSD3 REM See full license text in LICENSE file at top of project tree -title Starting I2Pd Browser 1.2.6 +title Starting I2Pd Browser 1.2.7 set $pause=ping.exe 0.0.0.0 -n set $cd=%CD% ver| find "6." >nul && set $pause=timeout.exe /t diff --git a/windows/build/build.cmd b/windows/build/build.cmd index 4b0e39c..d6de7f9 100644 --- a/windows/build/build.cmd +++ b/windows/build/build.cmd @@ -1,14 +1,14 @@ @echo off -REM Copyright (c) 2013-2017, The PurpleI2P Project +REM Copyright (c) 2013-2018, The PurpleI2P Project REM This file is part of Purple i2pd project and licensed under BSD3 REM See full license text in LICENSE file at top of project tree setlocal enableextensions set CURL=%~dp0curl.exe -set FFversion=52.6.0 -set I2Pdversion=2.17.0 +set FFversion=52.7.2 +set I2Pdversion=2.18.0 call :GET_LOCALE call :GET_PROXY call :GET_ARCH @@ -132,7 +132,7 @@ goto :eof :GET_ARCH set xOS=win32 -REM if defined PROCESSOR_ARCHITEW6432 (set xOS=x64) else if "%PROCESSOR_ARCHITECTURE%"=="AMD64" set xOS=win64 +if defined PROCESSOR_ARCHITEW6432 (set xOS=x64) else if "%PROCESSOR_ARCHITECTURE%" neq "x86" (set xOS=win64) goto :eof :eof diff --git a/windows/build/preferences/syspref.js b/windows/build/preferences/syspref.js index 0d8b5f8..c99e8d5 100644 --- a/windows/build/preferences/syspref.js +++ b/windows/build/preferences/syspref.js @@ -1,7 +1,7 @@ # Mozilla User preferences /* - * Copyright (c) 2013-2017, The PurpleI2P Project + * Copyright (c) 2013-2018, The PurpleI2P Project * * This file is part of Purple i2pd project and licensed under BSD3 * diff --git a/windows_prebuilt/StartI2PdBrowser.exe b/windows_prebuilt/StartI2PdBrowser.exe deleted file mode 100644 index d4d05ea..0000000 Binary files a/windows_prebuilt/StartI2PdBrowser.exe and /dev/null differ diff --git a/windows_prebuilt/build/7zsd_LZMA2_i2pdbrowser_1.2.6.sfx b/windows_prebuilt/build/7zsd_LZMA2_i2pdbrowser_1.2.7.sfx similarity index 99% rename from windows_prebuilt/build/7zsd_LZMA2_i2pdbrowser_1.2.6.sfx rename to windows_prebuilt/build/7zsd_LZMA2_i2pdbrowser_1.2.7.sfx index 98deecf..600ac46 100644 Binary files a/windows_prebuilt/build/7zsd_LZMA2_i2pdbrowser_1.2.6.sfx and b/windows_prebuilt/build/7zsd_LZMA2_i2pdbrowser_1.2.7.sfx differ diff --git a/windows_prebuilt/build/build_7z.bat b/windows_prebuilt/build/build_7z.bat index 6888166..fc79630 100644 --- a/windows_prebuilt/build/build_7z.bat +++ b/windows_prebuilt/build/build_7z.bat @@ -6,7 +6,7 @@ REM See full license text in LICENSE file at top of project tree echo Создаем 7z архив с набором... REM На выходе получаем 7z архив, в котором будут лежать папки Firefox, I2Pd и StartI2PdBrowser.bat из папки src уровнем выше. -7z a -t7z -m0=lzma2 -mx=9 -aoa -mfb=273 -md=512m -ms=on I2PdBrowserPortable_1.2.6.7z ..\..\windows\Firefox ..\..\windows\i2pd ..\src\StartI2PdBrowser.bat +7z a -t7z -m0=lzma2 -mx=9 -aoa -mfb=273 -md=512m -ms=on I2PdBrowserPortable_1.2.7.7z ..\..\windows\Firefox ..\..\windows\i2pd ..\src\StartI2PdBrowser.bat echo Готово! pause \ No newline at end of file diff --git a/windows_prebuilt/build/build_exe.bat b/windows_prebuilt/build/build_exe.bat index 7283fb8..9d37785 100644 --- a/windows_prebuilt/build/build_exe.bat +++ b/windows_prebuilt/build/build_exe.bat @@ -1,16 +1,16 @@ @echo off -REM Copyright (c) 2013-2017 The PurpleI2P Project +REM Copyright (c) 2013-2018 The PurpleI2P Project REM This file is part of Purple i2pd project and licensed under BSD3 REM See full license text in LICENSE file at top of project tree echo Создаем 7z архив с набором... REM На выходе получаем 7z архив, в котором будут лежать папки Firefox, I2Pd, src и файл StartI2PdBrowser.exe уровнем выше. -7z a -t7z -m0=lzma2 -mx=9 -aoa -mfb=273 -md=512m -ms=on I2PdBrowserPortable.7z ..\..\windows\Firefox ..\..\windows\i2pd ..\src ..\StartI2PdBrowser.exe +7z a -t7z -m0=lzma2 -mx=9 -aoa -mfb=273 -md=512m -ms=on I2PdBrowserPortable.7z ..\..\windows\Firefox ..\..\windows\i2pd ...\src\StartI2PdBrowser.bat ..\src\browser.ico echo Создаем 7z SFX - самораспаковывающийся архив... REM На выходе получаем самораспаковывающийся архив, архив после этого удаляем. -copy /b 7zsd_LZMA2_i2pdbrowser_1.2.6.sfx + config.txt + I2PdBrowserPortable.7z I2PdBrowserPortable_1.2.6.exe >> nul +copy /b 7zsd_LZMA2_i2pdbrowser_1.2.7.sfx + config.txt + I2PdBrowserPortable.7z I2PdBrowserPortable_1.2.7.exe >> nul del I2PdBrowserPortable.7z >> nul echo Готово! diff --git a/windows_prebuilt/build/config.txt b/windows_prebuilt/build/config.txt index 2f28a63..0e64ca0 100644 --- a/windows_prebuilt/build/config.txt +++ b/windows_prebuilt/build/config.txt @@ -1,4 +1,4 @@ -; Copyright (c) 2013-2017, The PurpleI2P Project +; Copyright (c) 2013-2018, The PurpleI2P Project ; This file is part of Purple i2pd project and licensed under BSD3 ; See full license text in LICENSE file at top of project tree ;!@Install@!UTF-8! diff --git a/windows_prebuilt/src/StartI2PdBrowser.bat b/windows_prebuilt/src/StartI2PdBrowser.bat index 47e36cf..1c30786 100644 --- a/windows_prebuilt/src/StartI2PdBrowser.bat +++ b/windows_prebuilt/src/StartI2PdBrowser.bat @@ -1,26 +1,9 @@ @ECHO OFF -REM BFCPEOPTIONSTART -REM Advanced BAT to EXE Converter www.BatToExeConverter.com -REM BFCPEEXE=StartI2PdBrowser.exe -REM BFCPEICON=i2pd_browser_icon_v3.ico -REM BFCPEICONINDEX=-1 -REM BFCPEEMBEDDISPLAY=0 -REM BFCPEEMBEDDELETE=1 -REM BFCPEADMINEXE=0 -REM BFCPEINVISEXE=0 -REM BFCPEVERINCLUDE=1 -REM BFCPEVERVERSION=1.2.6.0 -REM BFCPEVERPRODUCT=I2Pd Browser Portable -REM BFCPEVERDESC=I2Pd Browser -REM BFCPEVERCOMPANY=PurpleI2P -REM BFCPEVERCOPYRIGHT=Copyright й 2013-2017 PurpleI2P Project -REM BFCPEOPTIONEND - -REM Copyright (c) 2013-2017, The PurpleI2P Project +REM Copyright (c) 2013-2018, The PurpleI2P Project REM This file is part of Purple i2pd project and licensed under BSD3 REM See full license text in LICENSE file at top of project tree -title Starting I2Pd Browser 1.2.6 +title Starting I2Pd Browser 1.2.7 set $pause=ping.exe 0.0.0.0 -n set $cd=%CD% ver| find "6." >nul && set $pause=timeout.exe /t @@ -54,15 +37,7 @@ start "" "%port%" cd %$cd% exit /b 0 -rem ========================================================================== - -rem ========================================================================== -rem ╧ЁюЎхфєЁр EchoWithoutCrLf -rem -rem %1 : ЄхъёЄ фы  т√тюфр. -rem ========================================================================== :EchoWithoutCrLf