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

Move build scripts to own directory and fix up all the paths used in them

Browse Source
This commit is contained in:
idk
2023-01-23 18:25:48 +00:00
parent b67235b2a9
commit d8953824c5
14 changed files with 40 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
buildscripts/build.sh
View File

@ -25,15 +25,15 @@ if [ -z $machine ]; then
esac esac
fi fi
ICON=""$SCRIPT_DIR"/src/icons/ui2pbrowser_icon.ico" ICON="$SCRIPT_DIR/src/icons/ui2pbrowser_icon.ico"
if [ "$machine" = "Mac" ]; then if [ "$machine" = "Mac" ]; then
rm -rf I2P rm -rf I2P
./buildscripts/getprebuilt.sh "$SCRIPT_DIR"/buildscripts/getprebuilt.sh
exit 0 exit 0
elif [ "$machine" = "Linux" ]; then elif [ "$machine" = "Linux" ]; then
rm -rf I2P rm -rf I2P
./buildscripts/getprebuilt.sh "$SCRIPT_DIR"/buildscripts/getprebuilt.sh
exit 0 exit 0
elif [ "$machine" = "unix" ]; then elif [ "$machine" = "unix" ]; then
ICON="$SCRIPT_DIR"/src/icons/windowsUIToopie2.png ICON="$SCRIPT_DIR"/src/icons/windowsUIToopie2.png
@ -41,7 +41,7 @@ elif [ "$machine" = "unix" ]; then
export EXTRA=" public final static String EXTRA = \"-$EXTRACODE\";" export EXTRA=" public final static String EXTRA = \"-$EXTRACODE\";"
fi fi
. "$SCRIPT_DIR/buildscripts/launcher.sh" . "$SCRIPT_DI"$SCRIPT_DIR"/buildscripts/launcher.sh"
if [ -z $I2P_VERSION ]; then if [ -z $I2P_VERSION ]; then
I2P_VERSION=$("$JAVA_HOME"/bin/java -cp $SCRIPT_DIR/build/router.jar net.i2p.router.RouterVersion | sed "s/.*: //" | head -n 1 | sed 's|-|.|g') I2P_VERSION=$("$JAVA_HOME"/bin/java -cp $SCRIPT_DIR/build/router.jar net.i2p.router.RouterVersion | sed "s/.*: //" | head -n 1 | sed 's|-|.|g')
@ -72,4 +72,4 @@ if [ ! -d "I2P" ]; then
fi fi
cp "$I2P_PKG/licenses/"* license/ cp "$I2P_PKG/licenses/"* license/
cp "$HERE/../i2p.i2p.jpackage-build/LICENSE.txt" license/I2P.txt cp "$SCRIPT_DIR/../i2p.i2p.jpackage-build/LICENSE.txt" license/I2P.txt

2
buildscripts/daily-linux.sh
View File

@ -25,7 +25,7 @@ fi
# GITHUB_USERNAME=your github username # GITHUB_USERNAME=your github username
git clean -fd git clean -fd
git checkout . git checkout .
./buildscripts/targz.sh "$SCRIPT_DIR"/buildscripts/targz.sh
. "$HOME/github-release-config.sh" . "$HOME/github-release-config.sh"

2
buildscripts/daily-portable-windows.sh
View File

@ -46,7 +46,7 @@ fi
echo github-release release -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE" echo github-release release -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE"
github-release release -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE" github-release release -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE"
./buildscripts/zip.sh "$SCRIPT_DIR"/buildscripts/zip.sh
WINZIPCHECKSUM=$(sha256sum "I2P-windows-portable.zip") WINZIPCHECKSUM=$(sha256sum "I2P-windows-portable.zip")
echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "I2P-windows-portable.zip" -l "$WINZIPCHECKSUM" -t "$TODAYSDATE" -n "I2P-windows-portable.zip" echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "I2P-windows-portable.zip" -l "$WINZIPCHECKSUM" -t "$TODAYSDATE" -n "I2P-windows-portable.zip"
github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "I2P-windows-portable.zip" -l "$WINZIPCHECKSUM" -t "$TODAYSDATE" -n "I2P-windows-portable.zip" github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "I2P-windows-portable.zip" -l "$WINZIPCHECKSUM" -t "$TODAYSDATE" -n "I2P-windows-portable.zip"

2
buildscripts/daily-unstable.sh
View File

@ -25,7 +25,7 @@ fi
git clean -fd git clean -fd
git checkout . git checkout .
cp -v "$SCRIPT_DIR/config_override.example.sh" config_override.sh cp -v "$SCRIPT_DIR/config_override.example.sh" config_override.sh
./buildscripts/unsigned.sh "$SCRIPT_DIR"/buildscripts/unsigned.sh
. "$HOME/github-release-config.sh" . "$HOME/github-release-config.sh"

2
buildscripts/daily.sh
View File

@ -22,7 +22,7 @@ mv "$SCRIPT_DIR/config_override.sh" "$SCRIPT_DIR/config_override.sh.bak"
# GITHUB_USERNAME=your github username # GITHUB_USERNAME=your github username
git clean -fd git clean -fd
git checkout . git checkout .
./buildscripts/unsigned.sh "$SCRIPT_DIR"/buildscripts/unsigned.sh
. "$HOME/github-release-config.sh" . "$HOME/github-release-config.sh"

4
buildscripts/experimental.sh
View File

@ -9,7 +9,7 @@ if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
. "$SCRIPT_DIR/config_override.sh" . "$SCRIPT_DIR/config_override.sh"
fi fi
./buildscripts/clean.sh "$SCRIPT_DIR"/buildscripts/clean.sh
wsl make distclean wsl make distclean
./buildscripts/build.sh "$SCRIPT_DIR"/buildscripts/build.sh
wsl make wsl make

2
buildscripts/getprebuilt.sh
View File

@ -28,4 +28,4 @@ if [ ! -f I2P.zip ]; then
fi fi
unzip I2P.zip unzip I2P.zip
sleep 3 sleep 3
./buildscripts/fixperms.sh "$SCRIPT_DIR"/buildscripts/fixperms.sh

28
buildscripts/launcher.sh
View File

@ -66,20 +66,20 @@ ant jbigi
cd "$SCRIPT_DIR" cd "$SCRIPT_DIR"
mkdir -p "$SCRIPT_DIR"/src/I2P/config mkdir -p "$SCRIPT_DIR/src/I2P/config"
rm -rf ""$SCRIPT_DIR"/src/I2P/config/geoip" ""$SCRIPT_DIR"/src/I2P/config/webapps" ""$SCRIPT_DIR"/src/I2P/config/certificates" rm -rf "$SCRIPT_DIR/src/I2P/config/geoip" "$SCRIPT_DIR/src/I2P/config/webapps" "$SCRIPT_DIR/src/I2P/config/certificates"
cp -v "$RES_DIR/clients.config" ""$SCRIPT_DIR"/src/I2P/config/" cp -v "$RES_DIR/clients.config" "$SCRIPT_DIR/src/I2P/config/"
cp -v "$RES_DIR/wrapper.config" ""$SCRIPT_DIR"/src/I2P/config/" cp -v "$RES_DIR/wrapper.config" "$SCRIPT_DIR/src/I2P/config/"
#grep -v 'router.updateURL' $(RES_DIR)/router.config > "$SCRIPT_DIR"/src/I2P/config/router.config #grep -v 'router.updateURL' $(RES_DIR)/router.config > "$SCRIPT_DIR"/src/I2P/config/router.config
cat router.config > "$SCRIPT_DIR"/src/I2P/config/router.config cat router.config > "$SCRIPT_DIR/src/I2P/config/router.config"
cat i2ptunnel.config > "$SCRIPT_DIR"/src/I2P/config/i2ptunnel.config cat i2ptunnel.config > "$SCRIPT_DIR/src/I2P/config/i2ptunnel.config"
cp -v "$RES_DIR/hosts.txt" ""$SCRIPT_DIR"/src/I2P/config/hosts.txt" cp -v "$RES_DIR/hosts.txt" "$SCRIPT_DIR/src/I2P/config/hosts.txt"
cp -R "$RES_DIR/certificates" ""$SCRIPT_DIR"/src/I2P/config/certificates" cp -R "$RES_DIR/certificates" "$SCRIPT_DIR/src/I2P/config/certificates"
cp -R "$RES_DIR/eepsite" ""$SCRIPT_DIR"/src/I2P/config/eepsite" cp -R "$RES_DIR/eepsite" "$SCRIPT_DIR/src/I2P/config/eepsite"
mkdir -p "$SCRIPT_DIR"/src/I2P/config/geoip mkdir -p "$SCRIPT_DIR/src/I2P/config/geoip"
cp -v "$RES_DIR/GeoLite2-Country.mmdb.gz" ""$SCRIPT_DIR"/src/I2P/config/geoip/GeoLite2-Country.mmdb.gz" cp -v "$RES_DIR/GeoLite2-Country.mmdb.gz" "$SCRIPT_DIR/src/I2P/config/geoip/GeoLite2-Country.mmdb.gz"
cp -R "$I2P_PKG/webapps" ""$SCRIPT_DIR"/src/I2P/config/webapps" cp -R "$I2P_PKG/webapps" "$SCRIPT_DIR/src/I2P/config/webapps"
cd "$SCRIPT_DIR"/src/I2P/config/geoip && gunzip GeoLite2-Country.mmdb.gz; cd ../../.. cd "$SCRIPT_DIR/src/I2P/config/geoip" && gunzip GeoLite2-Country.mmdb.gz; cd ../../..
echo "compiling custom launcher" echo "compiling custom launcher"
mkdir -p "$SCRIPT_DIR/build" mkdir -p "$SCRIPT_DIR/build"
@ -101,7 +101,7 @@ for dll in "$I2P_JBIGI/"*windows*.dll; do
jar uf "$SCRIPT_DIR/build/jbigi.jar" "$dll" jar uf "$SCRIPT_DIR/build/jbigi.jar" "$dll"
done done
cd java cd "$SCRIPT_DIR"/java
"$JAVA_HOME"/bin/javac -d ../build -classpath "$SCRIPT_DIR/build/i2pfirefox.jar:$SCRIPT_DIR/build/jna.jar":"$SCRIPT_DIR/build/jna-platform.jar":"$SCRIPT_DIR/build/i2p.jar":"$SCRIPT_DIR/build/router.jar":"$SCRIPT_DIR/build/routerconsole.jar":"$SCRIPT_DIR/build/jbigi.jar" \ "$JAVA_HOME"/bin/javac -d ../build -classpath "$SCRIPT_DIR/build/i2pfirefox.jar:$SCRIPT_DIR/build/jna.jar":"$SCRIPT_DIR/build/jna-platform.jar":"$SCRIPT_DIR/build/i2p.jar":"$SCRIPT_DIR/build/router.jar":"$SCRIPT_DIR/build/routerconsole.jar":"$SCRIPT_DIR/build/jbigi.jar" \
net/i2p/router/CopyConfigDir.java \ net/i2p/router/CopyConfigDir.java \
net/i2p/router/Elevator.java \ net/i2p/router/Elevator.java \

2
buildscripts/msi.sh
View File

@ -8,7 +8,7 @@ cd "$SCRIPT_DIR" || exit 1
. ./config.sh . ./config.sh
. ./i2pversion . ./i2pversion
./buildscripts/build.sh "$SCRIPT_DIR"/buildscripts/build.sh
jpackage --name I2P-MSI --app-version "$I2P_VERSION" \ jpackage --name I2P-MSI --app-version "$I2P_VERSION" \
--verbose \ --verbose \
--java-options "-Xmx512m" \ --java-options "-Xmx512m" \

4
buildscripts/release.sh
View File

@ -9,5 +9,5 @@ if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
. "$SCRIPT_DIR/config_override.sh" . "$SCRIPT_DIR/config_override.sh"
fi fi
./buildscripts/unsigned.sh "$SCRIPT_DIR"/buildscripts/unsigned.sh
./buildscripts/sign.sh "$SCRIPT_DIR"/buildscripts/sign.sh

4
buildscripts/targz.sh
View File

@ -9,9 +9,9 @@ if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
. "$SCRIPT_DIR/config_override.sh" . "$SCRIPT_DIR/config_override.sh"
fi fi
export machine=unix export machine=unix
./buildscripts/clean.sh "$SCRIPT_DIR"/buildscripts/clean.sh
wsl make distclean wsl make distclean
./buildscripts/build.sh "$SCRIPT_DIR"/buildscripts/build.sh
cd "$SCRIPT_DIR/I2P" || exit 1 cd "$SCRIPT_DIR/I2P" || exit 1
TORSOCKS=$(which torsocks) TORSOCKS=$(which torsocks)

4
buildscripts/unsigned.sh
View File

@ -9,7 +9,7 @@ if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
. "$SCRIPT_DIR/config_override.sh" . "$SCRIPT_DIR/config_override.sh"
fi fi
./buildscripts/clean.sh "$SCRIPT_DIR"/buildscripts/clean.sh
wsl make distclean wsl make distclean
./buildscripts/build.sh "$SCRIPT_DIR"/buildscripts/build.sh
wsl make wsl make

6
buildscripts/zip.sh
View File

@ -8,10 +8,10 @@ cd "$SCRIPT_DIR" || exit 1
if [ -f "$SCRIPT_DIR/config_override.sh" ]; then if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
. "$SCRIPT_DIR/config_override.sh" . "$SCRIPT_DIR/config_override.sh"
fi fi
./buildscripts/clean.sh "$SCRIPT_DIR"/buildscripts/clean.sh
wsl make distclean wsl make distclean
./buildscripts/build.sh "$SCRIPT_DIR"/buildscripts/build.sh
./buildscripts/fixperms.sh "$SCRIPT_DIR"/buildscripts/fixperms.sh
cd "$SCRIPT_DIR/I2P" || exit 1 cd "$SCRIPT_DIR/I2P" || exit 1
TORSOCKS=$(which torsocks) TORSOCKS=$(which torsocks)

4
changelog.txt
View File

@ -1,3 +1,7 @@
2022-01-23 idk
* Move build scripts to their own directory and make them use correct paths when moved
* Add EXTRA to router when generating embedded router jars.
2022-09-20 idk 2022-09-20 idk
* improve compatibility with local service installs and with un-bundled installs side-by-side with bundled intalls * improve compatibility with local service installs and with un-bundled installs side-by-side with bundled intalls
* version 1.9.7 * version 1.9.7