I2P_Developers/i2p.firefox
3
0
Fork 1
Code Issues 14 Pull Requests Actions 5 Packages Projects Releases Wiki Activity

update version numbers, don't have osname be static

Browse Source
This commit is contained in:
eyedeekay
2023-12-11 13:53:14 -05:00
parent 2a185f5fe3
commit 5e27d8588a
6 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
buildscripts/launcher.sh
View File

@ -95,15 +95,18 @@ mkdir -p "$SCRIPT_DIR/build"
cp "$I2P_JARS"/*.jar "$SCRIPT_DIR/build"
cp "$I2P_JBIGI_JAR" "$SCRIPT_DIR/build"
if [ ! -f "$SCRIPT_DIR/build/jna.jar" ]; then
wget "https://repo1.maven.org/maven2/net/java/dev/jna/jna/$JNA_VERSION/jna-$JNA_VERSION.jar" -O "$SCRIPT_DIR/build/jna.jar"
echo "downloading jna"
wget_download "https://repo1.maven.org/maven2/net/java/dev/jna/jna/$JNA_VERSION/jna-$JNA_VERSION.jar" -O "$SCRIPT_DIR/build/jna.jar"
fi
if [ ! -f "$SCRIPT_DIR/build/jna-platform.jar" ]; then
wget "https://repo1.maven.org/maven2/net/java/dev/jna/jna-platform/$JNA_VERSION/jna-platform-$JNA_VERSION.jar" -O "$SCRIPT_DIR/build/jna-platform.jar"
echo "downloading jna-platform"
wget_download "https://repo1.maven.org/maven2/net/java/dev/jna/jna-platform/$JNA_VERSION/jna-platform-$JNA_VERSION.jar" -O "$SCRIPT_DIR/build/jna-platform.jar"
fi
if [ ! -f "$SCRIPT_DIR/build/i2pfirefox.jar" ]; then
wget "https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/$I2PFIREFOX_VERSION/i2pfirefox.jar" -O "$SCRIPT_DIR/build/i2pfirefox.jar"
echo "downloading i2pfirefox jars"
wget_download "https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/$I2PFIREFOX_VERSION/i2pfirefox.jar" -O "$SCRIPT_DIR/build/i2pfirefox.jar"
fi
for dll in "$I2P_JBIGI/"*windows*.dll; do

1
buildscripts/release-torrent.sh
View File

@ -30,6 +30,7 @@ fi
cp -v "I2P-Easy-Install-Bundle-$I2P_VERSION.exe" "I2P-Easy-Install-Bundle-$I2P_VERSION-signed.exe"
java -cp "$I2P_LIBS/*" net.i2p.crypto.SU3File sign -c ROUTER -f EXE I2P-Easy-Install-Bundle-$I2P_VERSION-signed.exe I2P-Easy-Install-Bundle-$I2P_VERSION-signed.su3 "$HOME/.i2p-plugin-keys/news-su3-keystore.ks" $I2P_VERSION $SIGNER
rm -f i2pwinupdate.su3.torrent
cp -v I2P-Easy-Install-Bundle-$I2P_VERSION-signed.su3 i2pwinupdate.su3
mktorrent \
--announce=http://tracker2.postman.i2p/announce.php \
--announce=http://w7tpbzncbcocrqtwwm3nezhnnsw4ozadvi2hmvzdhrqzfxfum7wa.b32.i2p/a \

6
config.sh
View File

@ -39,9 +39,9 @@ NSIS_PATH="/c/Program Files (x86)/NSIS/Bin"
PATH="$NSIS_PATH:$PATH:$NSIS_PATH/"
export PATH="$NSIS_PATH:$PATH:$NSIS_PATH/"
wget(){
wget_download(){
which powershell && powershell Invoke-WebRequest $@ && return
which wget && wget $@ && return
wget $@
}
makensisi(){
@ -49,7 +49,7 @@ makensisi(){
which wsl && wsl makensis $@ && return
}
make(){
make_make(){
which make && make $@ && return
which wsl && wsl make $@ && return
}

6
i2pversion
View File

@ -7,9 +7,9 @@ export I2PFIREFOX_VERSION=1.0.9
# Comment this out to build from an alternate branch or
# the tip of the master branch.
VERSIONMAJOR=2
VERSIONMINOR=3
VERSIONMINOR=4
VERSIONBUILD=0
I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
export I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
VERSION=i2p-2.3.0
export VERSION=i2p-2.3.0
VERSION=i2p-2.4.0
export VERSION=i2p-2.4.0

2
java/net/i2p/router/WindowsServiceUtil.java
View File

@ -260,7 +260,7 @@ public class WindowsServiceUtil {
*
* @return os name in lower-case, "windows" "mac" or "linux"
*/
protected static String osName() {
protected String osName() {
String osName = System.getProperty("os.name").toLowerCase();
if (osName.contains("windows"))
return "windows";

4
src/nsis/i2pbrowser-version.nsi
View File

@ -1,3 +1,3 @@
!define VERSIONMAJOR 2
!define VERSIONMINOR 3
!define VERSIONBUILD 0
!define VERSIONMINOR 4
!define VERSIONBUILD 18