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

fix up use of prebuilt router

Browse Source
This commit is contained in:
idk
2023-01-23 20:43:08 +00:00
parent 2225b47459
commit 57fa862f01
7 changed files with 46 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
buildscripts/build.sh
View File

@ -16,6 +16,9 @@ if [ -f config_overide.sh ]; then
. "$SCRIPT_DIR/config_override.sh" . "$SCRIPT_DIR/config_override.sh"
fi fi
"$SCRIPT_DIR"/buildscripts/version.sh
"$SCRIPT_DIR"/buildscripts/licenses.sh
if [ -z $machine ]; then if [ -z $machine ]; then
unameOut="$(uname -s)" unameOut="$(uname -s)"
case "${unameOut}" in case "${unameOut}" in

3
buildscripts/experimental.sh
View File

@ -10,6 +10,7 @@ if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
fi fi
"$SCRIPT_DIR"/buildscripts/clean.sh "$SCRIPT_DIR"/buildscripts/clean.sh
wsl "$SCRIPT_DIR"/buildscripts/clean.sh "$SCRIPT_DIR"/buildscripts/version.sh
"$SCRIPT_DIR"/buildscripts/licenses.sh
"$SCRIPT_DIR"/buildscripts/build.sh "$SCRIPT_DIR"/buildscripts/build.sh
"$SCRIPT_DIR"/buildscripts/nsis.sh "$SCRIPT_DIR"/buildscripts/nsis.sh

11
buildscripts/fixperms.sh
View File

@ -1,9 +1,12 @@
#! /usr/bin/env sh #! /usr/bin/env sh
SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)/.. SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)/..
echo "$SCRIPT_DIR"
cd "$SCRIPT_DIR" || exit 1 cd "$SCRIPT_DIR" || exit 1
find I2P -type d -exec chmod -v 755 {} \; echo "fixing permissions"
find I2P -type f -exec chmod -v +rw {} \;
find I2P -type d -exec chmod -v 755 {} \; find "$SCRIPT_DIR/I2P" -type d -exec sudo chmod -v 755 {} \;
find I2P -type f -exec chmod -v +rw {} \; find "$SCRIPT_DIR/I2P" -type f -exec sudo chmod -v +rw {} \;
find "$SCRIPT_DIR/I2P" -type d -exec sudo chmod -v 755 {} \;
find "$SCRIPT_DIR/I2P" -type f -exec sudo chmod -v +rw {} \;

18
buildscripts/getprebuilt.sh
View File

@ -16,6 +16,9 @@ if [ -f config_overide.sh ]; then
. "$SCRIPT_DIR/config_override.sh" . "$SCRIPT_DIR/config_override.sh"
fi fi
"$SCRIPT_DIR"/buildscripts/version.sh
"$SCRIPT_DIR"/buildscripts/licenses.sh
. "$HOME/github-release-config.sh" . "$HOME/github-release-config.sh"
if [ -z $TODAYSDATE ]; then if [ -z $TODAYSDATE ]; then
@ -26,6 +29,17 @@ if [ ! -f I2P.zip ]; then
echo github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P.zip" -t "$TODAYSDATE" echo github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P.zip" -t "$TODAYSDATE"
github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P.zip" -t "$TODAYSDATE" github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P.zip" -t "$TODAYSDATE"
fi fi
unzip I2P.zip unzip -FF -l I2P.zip; true
for file in *\\*; do target="${file//\\//}"; mkdir -p "${target%/*}"; mv -v "$file" "$target"; done
echo "unzipped prebuilt router"
sleep 3 sleep 3
"$SCRIPT_DIR"/buildscripts/fixperms.sh "$SCRIPT_DIR"/buildscripts/fixperms.sh
cp "$I2P_PKG/licenses/"* license/
cp "$SCRIPT_DIR/../i2p.i2p.jpackage-build/LICENSE.txt" license/I2P.txt
echo "moved prebuilt router"
mkdir -p "$SCRIPT_DIR"/build/I2P
cp -rv "$SCRIPT_DIR"/I2P/* "$SCRIPT_DIR"/build/I2P
cp -rv src/I2P/config build/I2P/config

3
buildscripts/launcher.sh
View File

@ -38,6 +38,9 @@ fi
echo "Building with: $JAVA, $JAVA_HOME" echo "Building with: $JAVA, $JAVA_HOME"
sleep 5s sleep 5s
"$SCRIPT_DIR"/buildscripts/version.sh
"$SCRIPT_DIR"/buildscripts/licenses.sh
#SCRIPT_DIR="$PWD" #SCRIPT_DIR="$PWD"
export I2P_PKG="$SCRIPT_DIR/../i2p.i2p.jpackage-build/pkg-temp" export I2P_PKG="$SCRIPT_DIR/../i2p.i2p.jpackage-build/pkg-temp"
export RES_DIR="$SCRIPT_DIR/../i2p.i2p.jpackage-build/installer/resources" export RES_DIR="$SCRIPT_DIR/../i2p.i2p.jpackage-build/installer/resources"

28
buildscripts/licenses.sh
View File

@ -15,17 +15,17 @@ if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
. "$SCRIPT_DIR/config_override.sh" . "$SCRIPT_DIR/config_override.sh"
fi fi
mkdir -p "$SCRIPT_DIR"/buildlicenses mkdir -p "$SCRIPT_DIR"/build/licenses
cp license/* "$SCRIPT_DIR"/buildlicenses cp license/* "$SCRIPT_DIR"/build/licenses
cp LICENSE.md "$SCRIPT_DIR"/buildlicenses/MIT.txt cp LICENSE.md "$SCRIPT_DIR"/build/licenses/MIT.txt
cat "$SCRIPT_DIR"/buildlicenses/LICENSE.index \ cat "$SCRIPT_DIR"/build/licenses/LICENSE.index \
"$SCRIPT_DIR"/buildlicenses/EPL.txt \ "$SCRIPT_DIR"/build/licenses/EPL.txt \
"$SCRIPT_DIR"/buildlicenses/GPL+CLASSPATH.txt \ "$SCRIPT_DIR"/build/licenses/GPL+CLASSPATH.txt \
"$SCRIPT_DIR"/buildlicenses/HTTPS-Everywhere.txt \ "$SCRIPT_DIR"/build/licenses/HTTPS-Everywhere.txt \
"$SCRIPT_DIR"/buildlicenses/LICENSE.tor \ "$SCRIPT_DIR"/build/licenses/LICENSE.tor \
"$SCRIPT_DIR"/buildlicenses/MIT.txt \ "$SCRIPT_DIR"/build/licenses/MIT.txt \
"$SCRIPT_DIR"/buildlicenses/MPL2.txt \ "$SCRIPT_DIR"/build/licenses/MPL2.txt \
"$SCRIPT_DIR"/buildlicenses/NoScript.txt \ "$SCRIPT_DIR"/build/licenses/NoScript.txt \
"$SCRIPT_DIR"/buildlicenses/NSS.txt \ "$SCRIPT_DIR"/build/licenses/NSS.txt \
"$SCRIPT_DIR"/buildlicenses/I2P.txt > "$SCRIPT_DIR"/buildlicenses/LICENSE.txt "$SCRIPT_DIR"/build/licenses/I2P.txt > "$SCRIPT_DIR"/build/licenses/LICENSE.txt
unix2dos "$SCRIPT_DIR"/buildlicenses/LICENSE.txt unix2dos "$SCRIPT_DIR"/build/licenses/LICENSE.txt

1
buildscripts/version.sh
View File

@ -20,6 +20,7 @@ echo "!define VERSIONMINOR $VERSIONMINOR" >> "$SCRIPT_DIR"/src/nsis/i2pbrowser-v
echo "!define VERSIONBUILD $VERSIONBUILD" >> "$SCRIPT_DIR"/src/nsis/i2pbrowser-version.nsi echo "!define VERSIONBUILD $VERSIONBUILD" >> "$SCRIPT_DIR"/src/nsis/i2pbrowser-version.nsi
echo "!define I2P_VERSION $PROFILE_VERSION" > "$SCRIPT_DIR"/src/nsis/i2pbrowser-jpackage.nsi echo "!define I2P_VERSION $PROFILE_VERSION" > "$SCRIPT_DIR"/src/nsis/i2pbrowser-jpackage.nsi
mkdir -p "$SCRIPT_DIR"/build
echo "$PROFILE_VERSION" > "$SCRIPT_DIR"/build/version.txt echo "$PROFILE_VERSION" > "$SCRIPT_DIR"/build/version.txt
echo "$PROFILE_VERSION" > "$SCRIPT_DIR"/build/version.txt echo "$PROFILE_VERSION" > "$SCRIPT_DIR"/build/version.txt
sed 's|!define VERSION||g' src/nsis/i2pbrowser-version.nsi | sed 's| |=|g' > .version sed 's|!define VERSION||g' src/nsis/i2pbrowser-version.nsi | sed 's| |=|g' > .version