re-enable cross building for Windows from Linux using a nightly as a base

This commit is contained in:
idk
2023-01-23 21:13:04 +00:00
parent 57fa862f01
commit 6e3fcd3285
3 changed files with 30 additions and 10 deletions

View File

@ -17,8 +17,9 @@ if [ -f config_overide.sh ]; then
fi
"$SCRIPT_DIR"/buildscripts/version.sh
echo "version set"
"$SCRIPT_DIR"/buildscripts/licenses.sh
echo "licenses generated"
. "$HOME/github-release-config.sh"
if [ -z $TODAYSDATE ]; then
@ -29,17 +30,36 @@ if [ ! -f I2P.zip ]; then
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"
fi
unzip -FF -l I2P.zip; true
for file in *\\*; do target="${file//\\//}"; mkdir -p "${target%/*}"; mv -v "$file" "$target"; done
unzip -FF I2P.zip || true
echo "unzipped prebuilt router"
sleep 3
"$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"
cd "$SCRIPT_DIR"
export I2P_PKG="$SCRIPT_DIR/../i2p.i2p.jpackage-build/pkg-temp"
export RES_DIR="$SCRIPT_DIR/../i2p.i2p.jpackage-build/installer/resources"
export I2P_JARS="$I2P_PKG/lib"
export I2P_JBIGI="$SCRIPT_DIR/../i2p.i2p.jpackage-build/installer/lib/jbigi"
export I2P_JBIGI_JAR="$SCRIPT_DIR/../i2p.i2p.jpackage-build/build/jbigi.jar"
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"
cp -v "$RES_DIR/clients.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
cat router.config > "$SCRIPT_DIR/src/I2P/config/router.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 -r "$RES_DIR/certificates" "$SCRIPT_DIR/src/I2P/config/certificates"
cp -r "$RES_DIR/eepsite" "$SCRIPT_DIR/src/I2P/config/eepsite"
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 -r "$I2P_PKG/webapps" "$SCRIPT_DIR/src/I2P/config/webapps"
cd "$SCRIPT_DIR/src/I2P/config/geoip" && gunzip GeoLite2-Country.mmdb.gz; cd "$SCRIPT_DIR"
mkdir -p "$SCRIPT_DIR"/build/I2P
cp -rv "$SCRIPT_DIR"/I2P/* "$SCRIPT_DIR"/build/I2P
cp -rv src/I2P/config build/I2P/config
cp -rv "$SCRIPT_DIR"/src/I2P/config "$SCRIPT_DIR"/build/I2P/config

View File

@ -16,8 +16,8 @@ if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
fi
mkdir -p "$SCRIPT_DIR"/build/licenses
cp license/* "$SCRIPT_DIR"/build/licenses
cp LICENSE.md "$SCRIPT_DIR"/build/licenses/MIT.txt
cp "$SCRIPT_DIR"/license/* "$SCRIPT_DIR"/build/licenses
cp "$SCRIPT_DIR"/LICENSE.md "$SCRIPT_DIR"/build/licenses/MIT.txt
cat "$SCRIPT_DIR"/build/licenses/LICENSE.index \
"$SCRIPT_DIR"/build/licenses/EPL.txt \
"$SCRIPT_DIR"/build/licenses/GPL+CLASSPATH.txt \

View File

@ -23,4 +23,4 @@ echo "!define I2P_VERSION $PROFILE_VERSION" > "$SCRIPT_DIR"/src/nsis/i2pbrowser-
mkdir -p "$SCRIPT_DIR"/build
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' "$SCRIPT_DIR"/src/nsis/i2pbrowser-version.nsi | sed 's| |=|g' > .version