Merge branch 'master' of i2pgit.org:i2p-hackers/i2p.firefox into EXPERIMENTAL-debian
This commit is contained in:
idk
@@ -1 +1 @@
|
||||
https://addons.mozilla.org/firefox/downloads/file/3716461/2021.7.13/https_everywhere-2021.7.13-an+fx.xpi
|
||||
https://addons.mozilla.org/firefox/downloads/file/3809748/2021.7.13/https-everywhere-eff@eff.org.xpi
|
||||
|
||||
27
Makefile
27
Makefile
@@ -46,7 +46,7 @@ export RES_DIR="../i2p.i2p/installer/resources"
|
||||
export PKG_DIR="../i2p.i2p/pkg-temp"
|
||||
export I2P_JBIGI="../i2p.i2p/installer/lib/jbigi"
|
||||
|
||||
distclean: clean
|
||||
distclean: clean clean-extensions
|
||||
rm -rf I2P
|
||||
|
||||
I2P:
|
||||
@@ -92,7 +92,7 @@ build/licenses: build
|
||||
unix2dos build/licenses/LICENSE.index
|
||||
|
||||
clean:
|
||||
rm -rf build app-profile-*.tgz profile-*.tgz I2P-Profile-Installer-*.exe *.deb src/I2P/config *.su3
|
||||
rm -rf build app-profile-*.tgz profile-*.tgz I2P-Profile-Installer-*.exe *.deb src/I2P/config *.su3 .version
|
||||
|
||||
build:
|
||||
@echo "creating build directory"
|
||||
@@ -119,10 +119,10 @@ build/profile/bookmarks.html: build/profile src/profile/bookmarks.html
|
||||
build/profile/storage-sync.sqlite: build/profile src/profile/storage-sync.sqlite
|
||||
cp src/profile/storage-sync.sqlite build/profile/storage-sync.sqlite
|
||||
|
||||
copy-xpi: build/NoScript.xpi build/HTTPSEverywhere.xpi build/i2prhz@eyedeekay.github.io.xpi build/profile/extensions
|
||||
copy-xpi: build/NoScript.xpi build/HTTPSEverywhere.xpi build/i2ppb@eyedeekay.github.io.xpi build/profile/extensions
|
||||
cp build/NoScript.xpi "build/profile/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
|
||||
cp build/HTTPSEverywhere.xpi "build/profile/extensions/https-everywhere-eff@eff.org.xpi"
|
||||
cp build/i2prhz@eyedeekay.github.io.xpi build/profile/extensions/i2prhz@eyedeekay.github.io.xpi
|
||||
cp build/i2ppb@eyedeekay.github.io.xpi build/profile/extensions/i2ppb@eyedeekay.github.io.xpi
|
||||
|
||||
app-profile: .version build/app-profile/user.js build/app-profile/prefs.js build/app-profile/chrome/userChrome.css build/app-profile/bookmarks.html build/app-profile/storage-sync.sqlite copy-app-xpi
|
||||
|
||||
@@ -148,14 +148,14 @@ build/app-profile/bookmarks.html: build/app-profile src/app-profile/bookmarks.ht
|
||||
build/app-profile/storage-sync.sqlite: build/app-profile src/app-profile/storage-sync.sqlite
|
||||
cp src/app-profile/storage-sync.sqlite build/app-profile/storage-sync.sqlite
|
||||
|
||||
copy-app-xpi: build/NoScript.xpi build/HTTPSEverywhere.xpi build/i2prhz@eyedeekay.github.io.xpi build/app-profile/extensions
|
||||
copy-app-xpi: build/NoScript.xpi build/HTTPSEverywhere.xpi build/i2ppb@eyedeekay.github.io.xpi build/app-profile/extensions
|
||||
cp build/HTTPSEverywhere.xpi "build/app-profile/extensions/https-everywhere-eff@eff.org.xpi"
|
||||
cp build/i2prhz@eyedeekay.github.io.xpi build/app-profile/extensions/i2prhz@eyedeekay.github.io.xpi
|
||||
cp build/i2ppb@eyedeekay.github.io.xpi build/app-profile/extensions/i2ppb@eyedeekay.github.io.xpi
|
||||
|
||||
build-extensions: build/i2prhz@eyedeekay.github.io.xpi build/NoScript.xpi build/HTTPSEverywhere.xpi
|
||||
build-extensions: build/i2ppb@eyedeekay.github.io.xpi build/NoScript.xpi build/HTTPSEverywhere.xpi
|
||||
|
||||
build/i2prhz@eyedeekay.github.io.xpi: i2psetproxy.url
|
||||
curl -L `cat i2psetproxy.url` > build/i2prhz@eyedeekay.github.io.xpi
|
||||
build/i2ppb@eyedeekay.github.io.xpi: i2psetproxy.url
|
||||
curl -L `cat i2psetproxy.url` > build/i2ppb@eyedeekay.github.io.xpi
|
||||
|
||||
build/NoScript.xpi: NoScript.url
|
||||
curl -L `cat NoScript.url` > build/NoScript.xpi
|
||||
@@ -169,14 +169,15 @@ clean-extensions:
|
||||
extensions:HTTPSEverywhere.url NoScript.url i2psetproxy.url
|
||||
|
||||
HTTPSEverywhere.url:
|
||||
@echo "https://addons.mozilla.org/firefox/downloads/file/3716461/"`./amo-version.sh https-everywhere`"/https_everywhere-"`./amo-version.sh https-everywhere`"-an+fx.xpi" > HTTPSEverywhere.url
|
||||
@echo "https://addons.mozilla.org/firefox/downloads/file/3809748/"`./amo-version.sh https-everywhere`"/https-everywhere-eff@eff.org.xpi" > HTTPSEverywhere.url
|
||||
|
||||
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/3784917/"`./amo-version.sh i2pipb-rhizome-variant`"/i2prhz@eyedeekay.github.io" > 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
|
||||
|
||||
#https://addons.mozilla.org/firefox/downloads/file/3821635/i2p_in_private_browsing-0.112.1-an+fx.xpi
|
||||
#i2ppb@eyedeekay.github.io.xpi
|
||||
|
||||
build/profile/extensions: build/profile
|
||||
@@ -230,7 +231,7 @@ uninstall:
|
||||
/usr/share/applications/i2pbrowser.desktop \
|
||||
/usr/share/applications/i2pconfig.desktop
|
||||
|
||||
checkinstall: version
|
||||
checkinstall: .version
|
||||
checkinstall \
|
||||
--default \
|
||||
--install=no \
|
||||
@@ -257,7 +258,7 @@ $(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools:
|
||||
go mod vendor && go build
|
||||
|
||||
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)" -signer "$(SIGNER)" -version "$(I2P_VERSION)"
|
||||
$(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools -name "I2P-Profile-Installer-$(PROFILE_VERSION)-signed" -signer "$(SIGNER)" -version "$(I2P_VERSION)"
|
||||
|
||||
docker:
|
||||
docker build -t geti2p/i2p.firefox .
|
||||
|
||||
13
README.md
13
README.md
@@ -184,13 +184,21 @@ TODO: Add links to the respective instructions for each of these.
|
||||
ant clean pkg
|
||||
cd ..
|
||||
|
||||
7. Move into the i2p.firefox directory. Run the `./build.sh` script.
|
||||
4. Move into the i2p.firefox directory. Run the `./build.sh` script.
|
||||
|
||||
cd i2p.firefox
|
||||
./build.sh
|
||||
|
||||
5. Run `make` to build the installer.
|
||||
|
||||
Doing a Release
|
||||
---------------
|
||||
|
||||
Once you have the installer `.exe` file produced by NSIS, you're almost ready to
|
||||
do a release. As a final step, someone must sign the `.exe` file using a
|
||||
Certificate which Windows will recognize. The current signer of the Windows
|
||||
bundle is Zlatinb. Standard Windows signing tools are used.
|
||||
|
||||
Building a signed update file
|
||||
-----------------------------
|
||||
|
||||
@@ -207,6 +215,9 @@ With that dependency satisfied, you can then run:
|
||||
to build the signing tool if necessary and then package the installer in a
|
||||
signed update file.
|
||||
|
||||
It's also probably possible to do this with the Java I2P distribution and a
|
||||
`.bat` script.
|
||||
|
||||
Docker Support
|
||||
--------------
|
||||
|
||||
|
||||
@@ -1 +1 @@
|
||||
https://addons.mozilla.org/firefox/downloads/file/3784917/0.108/i2prhz@eyedeekay.github.io
|
||||
https://addons.mozilla.org/firefox/downloads/file/3821635/0.112.1/i2ppb@eyedeekay.github.io.xpi
|
||||
|
||||
16
i2pversion
16
i2pversion
@@ -3,13 +3,13 @@
|
||||
|
||||
#Comment this out to build from an alternate branch or
|
||||
# the tip of the master branch.
|
||||
#I2P_VERSION=0.9.50
|
||||
#export I2P_VERSION=0.9.50
|
||||
#VERSION=i2p-$I2P_VERSION
|
||||
#export VERSION="$VERSION"
|
||||
I2P_VERSION=1.5.0
|
||||
export I2P_VERSION=1.5.0
|
||||
VERSION=i2p-"$I2P_VERSION"
|
||||
export VERSION="$VERSION"
|
||||
|
||||
#Uncomment this to build from the tip of the master.
|
||||
I2P_VERSION=0.9.50
|
||||
export I2P_VERSION=0.9.50
|
||||
VERSION=master
|
||||
export VERSION="$VERSION"
|
||||
#I2P_VERSION=0.9.50
|
||||
#export I2P_VERSION=0.9.50
|
||||
#VERSION=master
|
||||
#export VERSION="$VERSION"
|
||||
|
||||
@@ -1 +1 @@
|
||||
0.04.0
|
||||
1.05.0
|
||||
|
||||
@@ -310,7 +310,7 @@ Section Install
|
||||
SetOutPath "$INSTDIR\firefox.profile.i2p\extensions"
|
||||
File "profile\extensions\{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
|
||||
File profile\extensions\https-everywhere-eff@eff.org.xpi
|
||||
File profile\extensions\i2prhz@eyedeekay.github.io.xpi
|
||||
File profile\extensions\i2ppb@eyedeekay.github.io.xpi
|
||||
|
||||
# Install the config profile
|
||||
createDirectory "$INSTDIR\firefox.profile.config.i2p"
|
||||
@@ -324,7 +324,7 @@ Section Install
|
||||
createDirectory "$INSTDIR\firefox.profile.config.i2p\extensions"
|
||||
SetOutPath "$INSTDIR\firefox.profile.config.i2p\extensions"
|
||||
File profile\extensions\https-everywhere-eff@eff.org.xpi
|
||||
File profile\extensions\i2prhz@eyedeekay.github.io.xpi
|
||||
File profile\extensions\i2ppb@eyedeekay.github.io.xpi
|
||||
|
||||
# Install the config userChrome
|
||||
createDirectory "$INSTDIR\firefox.profile.config.i2p\chrome"
|
||||
@@ -414,10 +414,10 @@ Section "uninstall"
|
||||
# Uninstall the extensions
|
||||
Delete "$INSTDIR\firefox.profile.i2p\extensions\{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
|
||||
Delete "$INSTDIR\firefox.profile.i2p\extensions\https-everywhere-eff@eff.org.xpi"
|
||||
Delete "$INSTDIR\firefox.profile.i2p\extensions\i2prhz@eyedeekay.github.io.xpi"
|
||||
Delete "$INSTDIR\firefox.profile.i2p\extensions\i2ppb@eyedeekay.github.io.xpi"
|
||||
|
||||
Delete "$INSTDIR\firefox.profile.config.i2p\extensions\https-everywhere-eff@eff.org.xpi"
|
||||
Delete "$INSTDIR\firefox.profile.config.i2p\extensions\i2prhz@eyedeekay.github.io.xpi"
|
||||
Delete "$INSTDIR\firefox.profile.config.i2p\extensions\i2ppb@eyedeekay.github.io.xpi"
|
||||
|
||||
Delete "$INSTDIR\firefox.profile.config.i2p\config\userChrome.css"
|
||||
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
!define VERSIONMAJOR 0
|
||||
!define VERSIONMINOR 04
|
||||
!define VERSIONMAJOR 1
|
||||
!define VERSIONMINOR 05
|
||||
!define VERSIONBUILD 0
|
||||
|
||||
@@ -1 +1 @@
|
||||
0.04.0
|
||||
1.05.0
|
||||
|
||||
Reference in New Issue
Block a user