Compare commits

..

21 Commits

Author SHA1 Message Date
idk
6128b98ece Merge branch 'master' of 127.0.0.1:i2p-hackers/i2p.firefox 2022-01-31 12:49:46 -05:00
idk
7636ab24d6 Merge branch 'EXPERIMENTAL-debian' into 'master'
Adds support for building a `.deb` package for Debian or Ubuntu using "Official" tools(debuild, etc)

Closes #5

See merge request i2p-hackers/i2p.firefox!5
2022-01-30 23:33:04 +00:00
idk
3d45bde893 Merge branch 'master' into 'EXPERIMENTAL-debian'
# Conflicts:
#   Makefile
#   debian/files
2022-01-30 23:32:48 +00:00
idk
30f24f6386 use git clean to clean up workspace in distclean target. Add todo. 2022-01-14 11:30:17 -05:00
idk
b9c7a7dffb ignore jpackage config generations error when an I2P jpackage isn't being included. 2022-01-14 10:41:56 -05:00
idk
e1e84bf0ea Un-escape the URL which comes escaped from bttools(TODO: fix issue in bttools). 2021-12-20 16:17:03 -05:00
idk
ef45bf3944 Un-escape the URL which comes escaped from bttools(TODO: fix issue in bttools). 2021-12-20 13:52:38 -05:00
idk
7ce35e0010 fix issue in torrent generation line 2021-12-09 21:54:43 -05:00
idk
22e22c8175 fix torrent generator targets 2021-12-08 23:07:12 -05:00
idk
82104baa5a set probable default path before checking list of paths in windows bat file 2021-12-08 10:33:08 -05:00
idk
57a8f6a1a0 Fix bug, bump version 2021-12-07 22:25:42 -05:00
idk
a96d33027c Update router version 2021-12-07 14:40:43 -05:00
idk
3125f13138 Sign with my Router News keys instead of my plugin keys 2021-11-07 15:14:07 -05:00
idk
d53974d5b9 bump NSIS build to 1.05.1 2021-11-06 15:49:28 -04:00
idk
4d6c1d4df1 zip should be recursive 2021-11-06 13:57:14 -04:00
idk
de6c0dfd2f Add upload targets for the jpackage zips 2021-11-06 13:49:39 -04:00
idk
187cf7dfef Add upload targets for the jpackage zips 2021-11-06 13:48:41 -04:00
idk
a9563fd763 update version in build system 2021-11-06 13:21:24 -04:00
idk
060db1cff6 update changelog entries 2021-11-01 14:26:42 -04:00
idk
28fc12d1be update the changelog 2021-11-01 14:25:26 -04:00
idk
1aba1177c2 Add flags to jpackage for plugins that use reflection to work. Add a warning if compiling with less than Java 17 and sleep longer if using less than java 17. 2021-10-30 20:38:55 -04:00
12 changed files with 103 additions and 19 deletions

3
.gitignore vendored
View File

@ -5,4 +5,5 @@ build
i2pversion_override
*.crl
*.crt
*.pem
*.pem
*.p12

View File

@ -48,6 +48,7 @@ export I2P_JBIGI="../i2p.i2p/installer/lib/jbigi"
distclean: clean clean-extensions
rm -rf I2P
git clean -fd
I2P:
./build.sh
@ -76,7 +77,8 @@ src/I2P/config:
cp -R "$(PKG_DIR)"/webapps src/I2P/config/webapps
cd src/I2P/config/geoip && gunzip GeoLite2-Country.mmdb.gz; cd ../../..
build/I2P/config: build/I2P src/I2P/config
build/I2P/config: build/I2P
make src/I2P/config; true
cp -rv src/I2P/config build/I2P/config ; true
cp -rv src/I2P/config build/I2P/.i2p ; true
@ -175,7 +177,11 @@ NoScript.url:
@echo "https://addons.mozilla.org/firefox/downloads/file/3534184/"`./amo-version.sh noscript`"/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" > NoScript.url
i2psetproxy.url:
@echo "https://addons.mozilla.org/firefox/downloads/file/3821635/"`./amo-version.sh i2p-in-private-browsing`"/i2ppb@eyedeekay.github.io.xpi" > i2psetproxy.url
@echo "https://addons.mozilla.org/firefox/downloads/file/3887295/"`./amo-version.sh i2p-in-private-browsing`"/i2ppb@eyedeekay.github.io.xpi" > i2psetproxy.url
#
# TODO: switch to the "Rhizome" variant which has extended permission to do things like set the homepage.
# @echo "https://addons.mozilla.org/firefox/downloads/file/3799074/"`./amo-version.sh i2pipb-rhizome-variant`"/i2prhz@eyedeekay.github.io.xpi" > i2psetproxy.url
#https://addons.mozilla.org/firefox/downloads/file/3821635/i2p_in_private_browsing-0.112.1-an+fx.xpi
#i2ppb@eyedeekay.github.io.xpi
@ -259,6 +265,7 @@ $(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools:
su3: $(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools
$(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools -name "I2P-Profile-Installer-$(PROFILE_VERSION)-signed" -signer "$(SIGNER)" -version "$(I2P_VERSION)"
java -cp "$(HOME)/i2p/lib/*" net.i2p.crypto.SU3File sign -c ROUTER -f EXE I2P-Profile-Installer-$(PROFILE_VERSION)-signed.exe I2P-Profile-Installer-$(PROFILE_VERSION)-signed.su3 "$(HOME)/.i2p-plugin-keys/news-su3-keystore.ks" "$(I2P_VERSION)" $(SIGNER)
docker:
docker build -t geti2p/i2p.firefox .
@ -332,14 +339,14 @@ launchpad: bionic
I2P_DATE=`date +%Y-%m-%d`
prepupdate:
cp -v "I2P-Profile-Installer-$(PROFILE_VERSION)-signed.exe" i2pwinupdate.su3
cp -v "I2P-Profile-Installer-$(PROFILE_VERSION)-signed.su3" i2pwinupdate.su3
i2pwinupdate.su3.torrent: prepupdate
mktorrent --announce=http://mb5ir7klpc2tj6ha3xhmrs3mseqvanauciuoiamx2mmzujvg67uq.b32.i2p/a i2pwinupdate.su3
mktorrent --announce=http://tracker2.postman.i2p/announce.php --announce=http://w7tpbzncbcocrqtwwm3nezhnnsw4ozadvi2hmvzdhrqzfxfum7wa.b32.i2p/a --announce=http://mb5ir7klpc2tj6ha3xhmrs3mseqvanauciuoiamx2mmzujvg67uq.b32.i2p/a i2pwinupdate.su3
torrent: i2pwinupdate.su3
torrent: i2pwinupdate.su3.torrent
MAGNET=`bttools torrent printinfo i2pwinupdate.su3.torrent | grep 'MagNet' | sed 's|MagNet: ||g'`
MAGNET=`bttools torrent printinfo i2pwinupdate.su3.torrent | grep 'MagNet' | sed 's|MagNet: ||g' | sed 's|%3A|:|g'| sed 's|%2F|/|g'`
releases.json: torrent
@echo "[" | tee ../i2p.newsxml/data/win/beta/releases.json
@ -359,3 +366,26 @@ releases.json: torrent
@echo " }" | tee -a ../i2p.newsxml/data/win/beta/releases.json
@echo "]" | tee -a ../i2p.newsxml/data/win/beta/releases.json
BLANK=`awk '! NF { print NR; exit }' changelog.txt`
I2P.zip: I2P-jpackage-windows-$(I2P_VERSION).zip
I2P-jpackage-windows-$(I2P_VERSION).zip:
zip I2P-jpackage-windows-$(I2P_VERSION).zip -r I2P
changelog:
head -n "$(BLANK)" changelog.txt
release-jpackage: I2P-jpackage-windows-$(I2P_VERSION).zip
head -n "$(BLANK)" changelog.txt | gothub release -p -u eyedeekay -r i2p -t i2p-jpackage-windows-$(I2P_VERSION) -n i2p-jpackage-windows-$(I2P_VERSION) -d -; true
update-release-jpackage:
head -n "$(BLANK)" changelog.txt | gothub edit -p -u eyedeekay -r i2p -t i2p-jpackage-windows-$(I2P_VERSION) -n i2p-jpackage-windows-$(I2P_VERSION) -d -; true
delete-release-jpackage:
gothub delete -u eyedeekay -r i2p -t i2p-jpackage-windows-$(I2P_VERSION); true
upload-release-jpackage:
gothub upload -R -u eyedeekay -r i2p -t i2p-jpackage-windows-$(I2P_VERSION) -n "i2p-jpackage-windows-$(I2P_VERSION)" -f "./I2P-jpackage-windows-$(I2P_VERSION).zip"
jpackage-release: release-jpackage upload-release-jpackage

View File

@ -13,6 +13,10 @@ if [ "$JAVA" -lt "14" ]; then
echo "Java 14+ must be used to compile with jpackage, java is $JAVA"
exit 1
fi
if [ "$JAVA" -lt "17" ]; then
echo "It is highly recommended that you use Java 17+ to build release packages"
sleep 5s
fi
sleep 2s
if [ -z "${JAVA_HOME}" ]; then
@ -55,6 +59,10 @@ echo "preparing to invoke jpackage for I2P version $I2P_VERSION"
"$JAVA_HOME"/bin/jpackage --type app-image --name I2P --app-version "$I2P_VERSION" \
--verbose \
--java-options "-Xmx512m" \
--java-options "--add-opens java.base/java.lang=ALL-UNNAMED" \
--java-options "--add-opens java.base/sun.nio.fs=ALL-UNNAMED" \
--java-options "--add-opens java.base/java.nio=ALL-UNNAMED" \
$JPACKAGE_OPTS \
--resource-dir build \
--java-options "--illegal-access=permit" \

View File

@ -1,3 +1,45 @@
2021-11-1 idk
* HTTPS Everywhere will now self-disable on some Firefox versions. This is not
an issue since HTTPS Everywhere is deprecated in favor of Firefox built-in
HTTPS enforcement features.
* .bat Script: Detect location of C:\Program Files\I2P or
C\Program Files(x86)\I2P in launcher scripts
* NSIS changes
- Make launcher scripts static artifacts instead of generating them during
the install process
- If a jpackaged I2P router is present in $checkout/I2P, include it in an
installer.
- If a running installer doesn't find an I2P router in Program Files, install
the jpackaged I2P router. Mark it as jpackaged so we can quickly determine
from other applications.
* I2P in Private Browsing changes
- bugfix for `reset()` of dynamic theme
- bugfix for erroneous redirect/contain of mis-identified I2PSnark containers
- improve support for in-I2P HTTPS
- use global CSS on pageAction panels for HTTP, HTTPS, and Bittorrent(@sadie)
- improve support for I2PSnark web handler in HTTPS tabs
- icon update(@sadie)
- contain android-incompatible features so they won't be executed on Fennec
- translate into Spanish
- visually conceal/reveal features based on whether they are enabled/configured.
* I2P Jpackage
- support for building an I2P Jpackage has been added to the build system
Note that support is platform-specific, to build a Windows jpackage one must
use a Windows OS, to build a Linux jpackage one must use a Linux OS. Only
Windows jpackages are used for a release product.
- For information about how releases are built see README.md and UPDATES.md
- The jpackaged router has the following differences from mainline I2P:
- The jars are installed to a different directory.
- The native libraries are installed to a different directory
- The wrapper script is not installed and not used, and replaced by the
browser launcher.
- The I2P executable is %programfiles%/I2P/I2P.exe, command-line flags are not
compatible but configuration files are.
- wrapper.config is unused
- The built-by entry will reflect that idk built the package
- Use flags to achieve compatibility with plugins that use Reflection on Java
17 jpackages
2021-01-17 idk
* Use Local Application Data instead of Roaming application data for router.config file
* Use Roaming Application Daya only if a clients.config.d is present, indicating that the

3
debian/files vendored
View File

@ -1 +1,2 @@
i2p-firefox-profile_1.05.0-1_source.buildinfo net optional
i2p-firefox-profile_1.05.0-1_all.deb net optional
i2p-firefox-profile_1.05.0-1_amd64.buildinfo net optional

View File

@ -3,8 +3,8 @@
#Comment this out to build from an alternate branch or
# the tip of the master branch.
I2P_VERSION=1.5.0
export I2P_VERSION=1.5.0
I2P_VERSION=1.6.1
export I2P_VERSION=1.6.1
VERSION=i2p-"$I2P_VERSION"
export VERSION="$VERSION"

View File

@ -1 +1 @@
1.05.0
1.06.1

View File

@ -1 +1 @@
!define I2P_VERSION 0.9.50
!define I2P_VERSION 1.6.1

View File

@ -1,3 +1,3 @@
!define VERSIONMAJOR 1
!define VERSIONMINOR 05
!define VERSIONBUILD 0
!define VERSIONMINOR 06
!define VERSIONBUILD 1

View File

@ -1 +1 @@
1.05.0
1.06.1

View File

@ -1,12 +1,13 @@
@echo on
set "I2PPath=%ProgramFiles%\I2P\"
if exist "%ProgramFiles%\I2P\" (
set "I2PPath=%ProgramFiles%\I2P\"
)
if exist "%ProgramFiles(x86)%\I2P" {
if exist "%ProgramFiles(x86)%\I2P" (
set "I2PPath=%ProgramFiles(x86)%\I2P"
}
)
if exist "%ProgramFiles%\I2P\jpackaged" (
start "i2p" /D "%LOCALAPPDATA%\I2P" "%I2PPath%\i2p.exe"

View File

@ -1,12 +1,13 @@
@echo on
set "I2PPath=%ProgramFiles%\I2P\"
if exist "%ProgramFiles%\I2P\" (
set "I2PPath=%ProgramFiles%\I2P\"
)
if exist "%ProgramFiles(x86)%\I2P" {
if exist "%ProgramFiles(x86)%\I2P" (
set "I2PPath=%ProgramFiles(x86)%\I2P"
}
)
if exist "%ProgramFiles%\I2P\jpackaged" (
start "i2p" /D "%LOCALAPPDATA%\I2P" "%I2PPath%\i2p.exe"