diff --git a/.gitignore b/.gitignore index 7918afa..32259f2 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,7 @@ i2pversion_override *.p12 .stfolder *.url +.vscode +.version +*.su3 +*.su3.torrent \ No newline at end of file diff --git a/Makefile b/Makefile index ee340db..8867b55 100644 --- a/Makefile +++ b/Makefile @@ -34,12 +34,12 @@ help: .version @echo "$(MAJOR).$(MINOR).$(BUILD)" @echo "$(preset)" -prep: profile.tgz app-profile.tgz profile build/licenses build/I2P build/I2P/config launchers +prep: build/licenses profile.tgz app-profile.tgz profile build/I2P build/I2P/config launchers # cp src/nsis/*.nsi build cp src/nsis/*.nsh build cp src/icons/*.ico build -install.exe: build/licenses +install.exe: #build/licenses cd build && makensis i2pbrowser-installer.nsi && cp I2P-Profile-Installer-*.exe ../ && echo "built windows installer" export RES_DIR="../i2p.i2p.jpackage-build/installer/resources" diff --git a/changelog.txt b/changelog.txt index fdcc63e..70ede0f 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,11 @@ +2022-05-8 idk + * Add translations for Arabic, German, French, Italian, Japanes, Portuguese, Russian, + and Chinese. + * Add support for I2P+ Router Console detection. Not an endorsement of I2P+, just + a convenience reuested by a helpful user. + * The build system has been radically improved in order to be simpler to set up and + configure. + 2022-05-5 idk * Fix a bug where the I2P router detection inappropriately prioritized an easy install bundle when a non-bundled instal was in use. diff --git a/clean.sh b/clean.sh index e04c990..177179c 100755 --- a/clean.sh +++ b/clean.sh @@ -3,6 +3,8 @@ here=$(pwd) cd ../i2p.i2p.jpackage-build/ ant distclean +git checkout . +git checkout master cd "$here" rm -rf \ build \ diff --git a/config.sh b/config.sh index aaf1367..54ed67d 100644 --- a/config.sh +++ b/config.sh @@ -37,4 +37,7 @@ # required to build this if you do not wish to edit your PATH across the entire # Windows session, and for setting ANT_HOME #export ANT_HOME="/c/apache-ant-1.10.9" -#export PATH="$PATH:$ANT_HOME/bin/" \ No newline at end of file +#export PATH="$PATH:$ANT_HOME/bin/" + +# Uncomment this to add signtool to the path so you don't have to fight with Visual Studio. +#export PATH="$PATH:/c/Program Files (x86)/Windows Kits/10/App Certification Kit/" \ No newline at end of file diff --git a/src/win/common.bat b/src/win/common.bat index abb97de..eb1a6dd 100644 --- a/src/win/common.bat +++ b/src/win/common.bat @@ -1,6 +1,5 @@ SET MYPATH=%~dp0 -call %MYPATH%common.bat set "I2PPath=%ProgramFiles%\I2P\" if exist "%LocalAppData%\I2P\I2P.exe" (