Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| a3da3c2ace | |||
| 5e27d8588a | |||
| 2a185f5fe3 | |||
| f0f194242b | |||
| b9c6b6db49 | |||
| c14077606b | |||
| f53a7759e4 | |||
| 0566665a24 | |||
| 9d8da8b65a | |||
| cbf693dfb3 | |||
| 2b24239267 | |||
| 706ae974bc |
1
.gitignore
vendored
1
.gitignore
vendored
@ -28,3 +28,4 @@ tlskeys
|
||||
tmp
|
||||
/.stfolder/
|
||||
/.vscode/
|
||||
*github-release-config*.sh*
|
||||
46
Dockerfile
Normal file
46
Dockerfile
Normal file
@ -0,0 +1,46 @@
|
||||
FROM debian:sid
|
||||
|
||||
## Originally found at: https://yusuke.blog/2021/10/19/3149 and updated to Java 20.
|
||||
## This does not work yet.
|
||||
|
||||
RUN dpkg --add-architecture i386
|
||||
RUN apt-get update
|
||||
RUN apt-get install -y curl fakeroot unzip gnupg dos2unix make nsis* dos2unix curl jq
|
||||
|
||||
# install JDK
|
||||
RUN curl --output /opt/java20.zip https://download.java.net/java/GA/jdk20.0.1/b4887098932d415489976708ad6d1a4b/9/GPL/openjdk-20.0.1_windows-x64_bin.zip \
|
||||
&& cd /opt/ \
|
||||
&& unzip java20.zip \
|
||||
&& rm java20.zip
|
||||
ENV JAVA_HOME /opt/jdk-20.0.1
|
||||
|
||||
# install Wine
|
||||
RUN apt-get update
|
||||
RUN apt install --install-recommends wine wine64* wine-binfmt fonts-wine -y
|
||||
RUN wine --version
|
||||
RUN wine wineboot --init
|
||||
|
||||
# install WIX TOOLSET
|
||||
RUN mkdir /opt/wix311 \
|
||||
&& cd /opt/wix311 \
|
||||
&& curl -L --output /opt/wix311/wix311.zip https://github.com/wixtoolset/wix3/releases/download/wix3112rtm/wix311-binaries.zip \
|
||||
&& unzip wix311.zip \
|
||||
&& rm wix311.zip
|
||||
|
||||
# WIX TOOLSET is requring .NET.
|
||||
RUN curl --output winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks &&\
|
||||
chmod +x winetricks && \
|
||||
mv -v winetricks /usr/local/bin
|
||||
|
||||
# DONNO why dotnet48 installation fails with "warning: exit status 5 - user selected 'Cancel' "
|
||||
# https://forum.winehq.org/viewtopic.php?f=8&t=35724
|
||||
#ENV WINEPREFIX=/dotnet-test
|
||||
#RUN /usr/local/bin/winetricks --optout -q dotnet48
|
||||
|
||||
ENV WINEPATH /opt/jdk-20.0.1/bin\;/opt/wix311
|
||||
|
||||
WORKDIR /root
|
||||
COPY . /root
|
||||
RUN echo "wine /opt/jdk-20.0.1/bin/jpackage.exe $@" > /opt/jdk-20.0.1/bin/jpackage
|
||||
RUN chmod +x /opt/jdk-20.0.1/bin/jpackage
|
||||
CMD ./buildscripts/build.sh
|
||||
54
Makefile
54
Makefile
@ -14,29 +14,19 @@ all: version install.exe
|
||||
fmt:
|
||||
find . -name '*.java' -exec clang-format -i {} \;
|
||||
|
||||
tag:
|
||||
git tag $(PROFILE_VERSION)
|
||||
|
||||
version:
|
||||
./buildscripts/version.sh
|
||||
|
||||
jpackage: version I2P build/I2P/config all
|
||||
jpackage: version I2P build/I2P all
|
||||
|
||||
help: version
|
||||
@echo "I2P-Easy-Install-Bundle-$(PROFILE_VERSION)"
|
||||
@echo "$(SIGNER)"
|
||||
@echo "$(I2P_VERSION)"
|
||||
@echo "$(MAJOR).$(MINOR).$(BUILD)"
|
||||
@echo "$(preset)"
|
||||
|
||||
prep:
|
||||
|
||||
install.exe:
|
||||
./buildscripts/nsis.sh
|
||||
|
||||
export RES_DIR="../i2p.i2p.jpackage-build/installer/resources"
|
||||
export PKG_DIR="../i2p.i2p.jpackage-build/pkg-temp"
|
||||
#export I2P_JBIGI="../i2p.i2p.jpackage-build/installer/lib/jbigi"
|
||||
./buildscripts/unsigned.sh
|
||||
|
||||
distclean: clean
|
||||
rm -rf I2P
|
||||
@ -45,10 +35,9 @@ I2P:
|
||||
./buildscripts/build.sh
|
||||
|
||||
build/I2P: I2P build
|
||||
cp -v I2P build/I2P
|
||||
|
||||
src/I2P/config:
|
||||
|
||||
build/I2P/config: src/I2P/config build/I2P
|
||||
build/I2P: build/I2P
|
||||
|
||||
#
|
||||
# Warning: a displayed license file of more than 28752 bytes
|
||||
@ -65,38 +54,3 @@ build:
|
||||
@echo "creating build directory"
|
||||
mkdir -p build
|
||||
|
||||
include makefiles/su.mk
|
||||
|
||||
include makefiles/su-unsigned.mk
|
||||
|
||||
I2P_DATE=`date +%Y-%m-%d`
|
||||
|
||||
MAGNET=`bttools torrent dumpinfo i2pwinupdate.su3.torrent | grep 'Magnet' | sed 's|Magnet: ||g' | sed 's|%3A|:|g'| sed 's|%2F|/|g'`
|
||||
MAGNET_TESTING=`bttools torrent dumpinfo i2pwinupdate-testing.su3.torrent | grep 'MagNet' | sed 's|MagNet: ||g' | sed 's|%3A|:|g'| sed 's|%2F|/|g'`
|
||||
|
||||
magnet:
|
||||
echo "$(MAGNET)"
|
||||
|
||||
BLANK=`awk '! NF { print NR; exit }' changelog.txt`
|
||||
|
||||
I2P.zip: I2P-jpackage-windows-$(I2P_VERSION).zip
|
||||
|
||||
I2P-jpackage-windows-$(I2P_VERSION).zip:
|
||||
sh -c 'powershell Compress-Archive I2P 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
|
||||
|
||||
@ -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
|
||||
|
||||
42
buildscripts/release-download.sh
Executable file
42
buildscripts/release-download.sh
Executable file
@ -0,0 +1,42 @@
|
||||
#! /usr/bin/env bash
|
||||
|
||||
SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)/..
|
||||
cd "$SCRIPT_DIR" || exit 1
|
||||
|
||||
. "$SCRIPT_DIR/i2pversion"
|
||||
|
||||
if [ -f i2pversion_override ]; then
|
||||
. "$SCRIPT_DIR/i2pversion_override"
|
||||
fi
|
||||
|
||||
mv "$SCRIPT_DIR/config_override.sh" "$SCRIPT_DIR/config_override.sh.bak"
|
||||
. "$SCRIPT_DIR/config.sh"
|
||||
|
||||
### How to set up this script:
|
||||
#
|
||||
# This script will not work unless you give it a Github API key.
|
||||
# You need to create a file in your $HOME directory, which on
|
||||
# Windows will by /c/Users/yourusername, called github-release-config.sh,
|
||||
# containing this key as the variable GITHUB_TOKEN.
|
||||
# github-release-config.sh must also contain:
|
||||
# GITHUB_USERNAME=your github username
|
||||
|
||||
. "$HOME/github-release-config.sh"
|
||||
|
||||
if [ -f ./i2pversion_override ]; then
|
||||
. ./i2pversion_override
|
||||
fi
|
||||
|
||||
|
||||
|
||||
echo github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P-Easy-Install-Bundle-$I2P_VERSION.exe" -t "$I2P_VERSION"
|
||||
github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P-Easy-Install-Bundle-$I2P_VERSION.exe" -t "$I2P_VERSION"
|
||||
|
||||
echo github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P.zip" -t "$I2P_VERSION"
|
||||
github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P.zip" -t "$I2P_VERSION"
|
||||
|
||||
echo github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "i2p.i2p.jpackage-build.tar.gz" -t "$I2P_VERSION"
|
||||
github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "i2p.i2p.jpackage-build.tar.gz" -t "$I2P_VERSION"
|
||||
|
||||
echo github-release download -u "$GITHUB_USERNAME" -r i2p -t "$I2P_VERSION" -n "./I2P-jpackage-windows-$I2P_VERSION.zip"
|
||||
github-release download -u "$GITHUB_USERNAME" -r i2p -t "$I2P_VERSION" -n "./I2P-jpackage-windows-$I2P_VERSION.zip"
|
||||
50
buildscripts/release-support.sh
Executable file
50
buildscripts/release-support.sh
Executable file
@ -0,0 +1,50 @@
|
||||
#! /usr/bin/env bash
|
||||
|
||||
SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)/..
|
||||
cd "$SCRIPT_DIR" || exit 1
|
||||
|
||||
. "$SCRIPT_DIR/i2pversion"
|
||||
|
||||
if [ -f i2pversion_override ]; then
|
||||
. "$SCRIPT_DIR/i2pversion_override"
|
||||
fi
|
||||
|
||||
mv "$SCRIPT_DIR/config_override.sh" "$SCRIPT_DIR/config_override.sh.bak"
|
||||
. "$SCRIPT_DIR/config.sh"
|
||||
|
||||
### How to set up this script:
|
||||
#
|
||||
# This script will not work unless you give it a Github API key.
|
||||
# You need to create a file in your $HOME directory, which on
|
||||
# Windows will by /c/Users/yourusername, called github-release-config.sh,
|
||||
# containing this key as the variable GITHUB_TOKEN.
|
||||
# github-release-config.sh must also contain:
|
||||
# GITHUB_USERNAME=your github username
|
||||
|
||||
. "$HOME/github-release-config.sh"
|
||||
|
||||
if [ -f ./i2pversion_override ]; then
|
||||
. ./i2pversion_override
|
||||
fi
|
||||
|
||||
echo github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "i2pwinupdate.su3" -t "$I2P_VERSION"
|
||||
github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "i2pwinupdate.su3" -t "$I2P_VERSION"
|
||||
|
||||
echo github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "i2pwinupdate.su3.torrent" -t "$I2P_VERSION"
|
||||
github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "i2pwinupdate.su3.torrent" -t "$I2P_VERSION"
|
||||
|
||||
if [ ! -z "$I2P_SNARK_DIR" ]; then
|
||||
if [ "$I2P_SNARK_DIR" = "$HOME/.i2p/i2psnark" ]; then
|
||||
cp -v "i2pwinupdate.su3" "$I2P_SNARK_DIR"
|
||||
cp -v "i2pwinupdate.su3.torrent" "$I2P_SNARK_DIR"
|
||||
fi
|
||||
if [ "$I2P_SNARK_DIR" = "$LOCALAPPDATA/i2p/i2psnark/" ]; then
|
||||
cp -v "i2pwinupdate.su3" "$I2P_SNARK_DIR"
|
||||
cp -v "i2pwinupdate.su3.torrent" "$I2P_SNARK_DIR"
|
||||
fi
|
||||
if [ "$I2P_SNARK_DIR" = "/var/lib/i2p/i2p-config/i2psnark/" ]; then
|
||||
sudo cp -v "i2pwinupdate.su3" "$I2P_SNARK_DIR"
|
||||
sudo cp -v "i2pwinupdate.su3.torrent" "$I2P_SNARK_DIR"
|
||||
sudo chown i2psvc:i2psvc "$I2P_SNARK_DIR/i2pwinupdate.su3" "$I2P_SNARK_DIR/i2pwinupdate.su3.torrent"
|
||||
fi
|
||||
fi
|
||||
44
buildscripts/release-torrent.sh
Executable file
44
buildscripts/release-torrent.sh
Executable file
@ -0,0 +1,44 @@
|
||||
#! /usr/bin/env bash
|
||||
|
||||
SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)/..
|
||||
cd "$SCRIPT_DIR" || exit 1
|
||||
|
||||
. "$SCRIPT_DIR/i2pversion"
|
||||
|
||||
if [ -f i2pversion_override ]; then
|
||||
. "$SCRIPT_DIR/i2pversion_override"
|
||||
fi
|
||||
|
||||
mv "$SCRIPT_DIR/config_override.sh" "$SCRIPT_DIR/config_override.sh.bak"
|
||||
. "$SCRIPT_DIR/config.sh"
|
||||
|
||||
### How to set up this script:
|
||||
#
|
||||
# This script will not work unless you give it a Github API key.
|
||||
# You need to create a file in your $HOME directory, which on
|
||||
# Windows will by /c/Users/yourusername, called github-release-config.sh,
|
||||
# containing this key as the variable GITHUB_TOKEN.
|
||||
# github-release-config.sh must also contain:
|
||||
# GITHUB_USERNAME=your github username
|
||||
|
||||
. "$HOME/github-release-config.sh"
|
||||
|
||||
if [ -f ./i2pversion_override ]; then
|
||||
. ./i2pversion_override
|
||||
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 \
|
||||
--announce=http://mb5ir7klpc2tj6ha3xhmrs3mseqvanauciuoiamx2mmzujvg67uq.b32.i2p/a \
|
||||
i2pwinupdate.su3
|
||||
ZIPCHECKSUM=$(sha256sum "i2pwinupdate.su3")
|
||||
echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "i2pwinupdate.su3" -l "$ZIPCHECKSUM" -t "$I2P_VERSION" -n "i2pwinupdate.su3"
|
||||
github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "i2pwinupdate.su3" -l "$ZIPCHECKSUM" -t "$I2P_VERSION" -n "i2pwinupdate.su3"
|
||||
ZIPCHECKSUM=$(sha256sum "i2pwinupdate.su3.torrent")
|
||||
echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "i2pwinupdate.su3.torrent" -l "$ZIPCHECKSUM" -t "$I2P_VERSION" -n "i2pwinupdate.su3.torrent"
|
||||
github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "i2pwinupdate.su3.torrent" -l "$ZIPCHECKSUM" -t "$I2P_VERSION" -n "i2pwinupdate.su3.torrent"
|
||||
22
buildscripts/release-upload.sh
Normal file → Executable file
22
buildscripts/release-upload.sh
Normal file → Executable file
@ -51,5 +51,23 @@ TARCHECKSUM=$(sha256sum "../i2p.i2p.jpackage-build.tar.gz")
|
||||
echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "../i2p.i2p.jpackage-build.tar.gz" -l "Upstream I2P Router source code $TARCHECKSUM" -t "$I2P_VERSION" -n "i2p.i2p.jpackage-build.tar.gz"
|
||||
github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "../i2p.i2p.jpackage-build.tar.gz" -l "Upstream I2P Router source code $TARCHECKSUM" -t "$I2P_VERSION" -n "i2p.i2p.jpackage-build.tar.gz"
|
||||
sh -c "powershell Compress-Archive I2P I2P-jpackage-windows-$I2P_VERSION.zip || zip I2P-jpackage-windows-$I2P_VERSION.zip -r I2P"
|
||||
echo github-release upload -R -u "$GITHUB_USERNAME" -r i2p -t i2p-jpackage-windows-$I2P_VERSION -n "i2p-jpackage-windows-$I2P_VERSION" -f "./I2P-jpackage-windows-$I2P_VERSION.zip"
|
||||
github-release upload -R -u "$GITHUB_USERNAME" -r i2p -t i2p-jpackage-windows-$I2P_VERSION -n "i2p-jpackage-windows-$I2P_VERSION" -f "./I2P-jpackage-windows-$I2P_VERSION.zip"
|
||||
echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "i2p-jpackage-windows-$I2P_VERSION.zip" -t "$I2P_VERSION" -f "./I2P-jpackage-windows-$I2P_VERSION.zip"
|
||||
github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "i2p-jpackage-windows-$I2P_VERSION.zip" -t "$I2P_VERSION" -f "./I2P-jpackage-windows-$I2P_VERSION.zip"
|
||||
|
||||
GITHUB_USERNAME=i2p
|
||||
echo github-release release -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$I2P_VERSION" -d "$DESCRIPTION" -t "$I2P_VERSION"
|
||||
github-release release -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$I2P_VERSION" -d "$DESCRIPTION" -t "$I2P_VERSION"
|
||||
sleep 2s;
|
||||
EXECHECKSUM=$(sha256sum "I2P-Easy-Install-Bundle-$I2P_VERSION.exe")
|
||||
echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "I2P-Easy-Install-Bundle-$I2P_VERSION.exe" -l "$EXECHECKSUM" -t "$I2P_VERSION" -n "I2P-Easy-Install-Bundle-$I2P_VERSION.exe"
|
||||
github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "I2P-Easy-Install-Bundle-$I2P_VERSION.exe" -l "$EXECHECKSUM" -t "$I2P_VERSION" -n "I2P-Easy-Install-Bundle-$I2P_VERSION.exe"
|
||||
powershell Compress-Archive -force I2P I2P.zip
|
||||
ZIPCHECKSUM=$(sha256sum "I2P.zip")
|
||||
echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "I2P.zip" -l "$ZIPCHECKSUM" -t "$I2P_VERSION" -n "I2P.zip"
|
||||
github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "I2P.zip" -l "$ZIPCHECKSUM" -t "$I2P_VERSION" -n "I2P.zip"
|
||||
TARCHECKSUM=$(sha256sum "../i2p.i2p.jpackage-build.tar.gz")
|
||||
echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "../i2p.i2p.jpackage-build.tar.gz" -l "Upstream I2P Router source code $TARCHECKSUM" -t "$I2P_VERSION" -n "i2p.i2p.jpackage-build.tar.gz"
|
||||
github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "../i2p.i2p.jpackage-build.tar.gz" -l "Upstream I2P Router source code $TARCHECKSUM" -t "$I2P_VERSION" -n "i2p.i2p.jpackage-build.tar.gz"
|
||||
sh -c "powershell Compress-Archive I2P I2P-jpackage-windows-$I2P_VERSION.zip || zip I2P-jpackage-windows-$I2P_VERSION.zip -r I2P"
|
||||
echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "i2p-jpackage-windows-$I2P_VERSION.zip" -t "$I2P_VERSION" -f "./I2P-jpackage-windows-$I2P_VERSION.zip"
|
||||
github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "i2p-jpackage-windows-$I2P_VERSION.zip" -t "$I2P_VERSION" -f "./I2P-jpackage-windows-$I2P_VERSION.zip"
|
||||
|
||||
50
config.sh
50
config.sh
@ -5,13 +5,43 @@
|
||||
|
||||
uname=$(uname)
|
||||
|
||||
# Third-party builders should always override this in config_override.sh
|
||||
if [ -z "$SIGNER" ]; then
|
||||
SIGNER=hankhill19580@gmail.com
|
||||
export SIGNER=hankhill19580@gmail.com
|
||||
fi
|
||||
|
||||
if [ -z "$I2P_LIBS" ]; then
|
||||
if [ -d "$HOME/i2p/lib/" ]; then
|
||||
I2P_LIBS="$HOME/i2p/lib/"
|
||||
fi
|
||||
if [ -d "$LOCALAPPDATA/i2p/lib/" ]; then
|
||||
I2P_LIBS="$LOCALAPPDATA/i2p/lib/"
|
||||
fi
|
||||
if [ -d "/usr/share/i2p/lib/" ]; then
|
||||
I2P_LIBS="/usr/share/i2p/lib/"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -z "$I2P_SNARK_DIR" ]; then
|
||||
if [ -d "$HOME/.i2p/i2psnark" ]; then
|
||||
I2P_SNARK_DIR="$HOME/.i2p/i2psnark"
|
||||
fi
|
||||
if [ -d "$LOCALAPPDATA/i2p/i2psnark/" ]; then
|
||||
I2P_SNARK_DIR="$LOCALAPPDATA/i2p/i2psnark/"
|
||||
fi
|
||||
if [ -d "/var/lib/i2p/i2p-config/i2psnark/" ]; then
|
||||
I2P_SNARK_DIR="/var/lib/i2p/i2p-config/i2psnark/"
|
||||
fi
|
||||
fi
|
||||
|
||||
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(){
|
||||
@ -19,7 +49,7 @@ makensisi(){
|
||||
which wsl && wsl makensis $@ && return
|
||||
}
|
||||
|
||||
make(){
|
||||
make_make(){
|
||||
which make && make $@ && return
|
||||
which wsl && wsl make $@ && return
|
||||
}
|
||||
@ -87,9 +117,17 @@ fi
|
||||
# You can also use this to temporarily add applications into the PATH that are
|
||||
# required to build this if you do not wish to edit your PATH across the entire
|
||||
# Windows session, and for setting ANT_HOME
|
||||
ANT_HOME=$(ls -d /c/apache-ant-*)
|
||||
export ANT_HOME="$ANT_HOME"
|
||||
export PATH="$PATH:$ANT_HOME/bin/"
|
||||
if [ -d "/c/apache-ant-"* ]; then
|
||||
ANT_HOME=$(ls -d /c/apache-ant-*)
|
||||
export ANT_HOME="$ANT_HOME"
|
||||
export PATH="$PATH:$ANT_HOME/bin/"
|
||||
fi
|
||||
|
||||
if [ -d "/c/mktorrent"* ]; then
|
||||
MKTORRENT_HOME=$(ls -d /c/mktorrent*)
|
||||
export MKTORRENT_HOME="$MKTORRENT_HOME"
|
||||
export PATH="$PATH:$MKTORRENT_HOME/bin/"
|
||||
fi
|
||||
|
||||
if [[ -n "$IS_WSL" || -n "$WSL_DISTRO_NAME" ]]; then
|
||||
PATH="$PATH:/c/Program Files (x86)/Windows Kits/10/App Certification Kit/"
|
||||
|
||||
@ -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=2
|
||||
VERSIONBUILD=1
|
||||
VERSIONMINOR=4
|
||||
VERSIONBUILD=0
|
||||
I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
|
||||
export I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
|
||||
VERSION=i2p-2.2.1
|
||||
export VERSION=i2p-2.2.1
|
||||
VERSION=i2p-2.4.0
|
||||
export VERSION=i2p-2.4.0
|
||||
@ -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";
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
|
||||
prepupdate-unsignedexe:
|
||||
cp -v "I2P-Profile-Installer-$(PROFILE_VERSION).su3" i2pwinupdate-unsignedexe.su3
|
||||
|
||||
su3-unsignedexe: $(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)"
|
||||
java -cp "$(HOME)/i2p/lib/*" net.i2p.crypto.SU3File sign -c ROUTER -f EXE I2P-Profile-Installer-$(PROFILE_VERSION).exe I2P-Profile-Installer-$(PROFILE_VERSION)-signed.su3 "$(HOME)/.i2p-plugin-keys/news-su3-keystore.ks" "$(I2P_VERSION)" $(SIGNER)
|
||||
|
||||
i2pwinupdate-unsignedexe.su3.torrent: prepupdate-unsignedexe su3-unsignedexe
|
||||
mktorrent \
|
||||
--announce=http://tracker2.postman.i2p/announce.php \
|
||||
--announce=http://w7tpbzncbcocrqtwwm3nezhnnsw4ozadvi2hmvzdhrqzfxfum7wa.b32.i2p/a \
|
||||
--announce=http://mb5ir7klpc2tj6ha3xhmrs3mseqvanauciuoiamx2mmzujvg67uq.b32.i2p/a \
|
||||
i2pwinupdate-unsignedexe.su3
|
||||
|
||||
torrent-unsignedexe: i2pwinupdate-unsignedexe.su3.torrent
|
||||
|
||||
testing-releases.json: torrent-unsignedexe
|
||||
mkdir -p ../i2p.newsxml/data/win/testing/
|
||||
@echo "[" | tee ../i2p.newsxml/data/win/testing/releases.json
|
||||
@echo " {" | tee -a ../i2p.newsxml/data/win/testing/releases.json
|
||||
@echo " \"date\": \"$(I2P_DATE)\"," | tee -a ../i2p.newsxml/data/win/testing/releases.json
|
||||
@echo " \"version\": \"$(I2P_VERSION)\"," | tee -a ../i2p.newsxml/data/win/testing/releases.json
|
||||
@echo " \"minVersion\": \"1.5.0\"," | tee -a ../i2p.newsxml/data/win/testing/releases.json
|
||||
@echo " \"minJavaVersion\": \"1.8\"," | tee -a ../i2p.newsxml/data/win/testing/releases.json
|
||||
@echo " \"updates\": {" | tee -a ../i2p.newsxml/data/win/testing/releases.json
|
||||
@echo " \"su3\": {" | tee -a ../i2p.newsxml/data/win/testing/releases.json
|
||||
@echo " \"torrent\": \"$(MAGNET_TESTING)\"," | tee -a ../i2p.newsxml/data/win/testing/releases.json
|
||||
@echo " \"url\": [" | tee -a ../i2p.newsxml/data/win/testing/releases.json
|
||||
@echo " \"http://ekm3fu6fr5pxudhwjmdiea5dovc3jdi66hjgop4c7z7dfaw7spca.b32.i2p/i2pwinupdate.su3\"" | tee -a ../i2p.newsxml/data/win/testing/releases.json
|
||||
@echo " ]" | tee -a ../i2p.newsxml/data/win/testing/releases.json
|
||||
@echo " }" | tee -a ../i2p.newsxml/data/win/testing/releases.json
|
||||
@echo " }" | tee -a ../i2p.newsxml/data/win/testing/releases.json
|
||||
@echo " }" | tee -a ../i2p.newsxml/data/win/testing/releases.json
|
||||
@echo "]" | tee -a ../i2p.newsxml/data/win/testing/releases.json
|
||||
@ -1,41 +0,0 @@
|
||||
GOPATH=$(HOME)/go
|
||||
|
||||
$(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools:
|
||||
git clone https://i2pgit.org/idk/su3-tools $(GOPATH)/src/i2pgit.org/idk/su3-tools; true
|
||||
git pull --all
|
||||
cd $(GOPATH)/src/i2pgit.org/idk/su3-tools && \
|
||||
go mod vendor && go build
|
||||
|
||||
prepupdate:
|
||||
cp -v "I2P-Easy-Install-Bundle-$(PROFILE_VERSION)-signed.su3" i2pwinupdate.su3
|
||||
|
||||
su3: $(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools
|
||||
$(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools -name "I2P-Easy-Install-Bundle-$(PROFILE_VERSION)-signed" -signer "$(SIGNER)" -version "$(PROFILE_VERSION)"
|
||||
java -cp "$(HOME)/i2p/lib/*" net.i2p.crypto.SU3File sign -c ROUTER -f EXE I2P-Easy-Install-Bundle-$(PROFILE_VERSION)-signed.exe I2P-Easy-Install-Bundle-$(PROFILE_VERSION)-signed.su3 "$(HOME)/.i2p-plugin-keys/news-su3-keystore.ks" $(PROFILE_VERSION) $(SIGNER)
|
||||
|
||||
i2pwinupdate.su3.torrent: prepupdate 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
|
||||
|
||||
releases.json:
|
||||
@echo "[" | tee ../i2p.newsxml/data/win/beta/releases.json
|
||||
@echo " {" | tee -a ../i2p.newsxml/data/win/beta/releases.json
|
||||
@echo " \"date\": \"$(I2P_DATE)\"," | tee -a ../i2p.newsxml/data/win/beta/releases.json
|
||||
@echo " \"version\": \"$(PROFILE_VERSION)\"," | tee -a ../i2p.newsxml/data/win/beta/releases.json
|
||||
@echo " \"minVersion\": \"1.5.0\"," | tee -a ../i2p.newsxml/data/win/beta/releases.json
|
||||
@echo " \"minJavaVersion\": \"1.8\"," | tee -a ../i2p.newsxml/data/win/beta/releases.json
|
||||
@echo " \"updates\": {" | tee -a ../i2p.newsxml/data/win/beta/releases.json
|
||||
@echo " \"su3\": {" | tee -a ../i2p.newsxml/data/win/beta/releases.json
|
||||
@echo " \"torrent\": \"$(MAGNET)\"," | tee -a ../i2p.newsxml/data/win/beta/releases.json
|
||||
@echo " \"url\": [" | tee -a ../i2p.newsxml/data/win/beta/releases.json
|
||||
@echo " \"http://ekm3fu6fr5pxudhwjmdiea5dovc3jdi66hjgop4c7z7dfaw7spca.b32.i2p/i2pwinupdate.su3\"" | tee -a ../i2p.newsxml/data/win/beta/releases.json
|
||||
@echo " ]" | tee -a ../i2p.newsxml/data/win/beta/releases.json
|
||||
@echo " }" | tee -a ../i2p.newsxml/data/win/beta/releases.json
|
||||
@echo " }" | tee -a ../i2p.newsxml/data/win/beta/releases.json
|
||||
@echo " }" | tee -a ../i2p.newsxml/data/win/beta/releases.json
|
||||
@echo "]" | tee -a ../i2p.newsxml/data/win/beta/releases.json
|
||||
@ -1,3 +1,3 @@
|
||||
!define VERSIONMAJOR 2
|
||||
!define VERSIONMINOR 2
|
||||
!define VERSIONBUILD 1
|
||||
!define VERSIONMINOR 4
|
||||
!define VERSIONBUILD 0
|
||||
|
||||
Reference in New Issue
Block a user