From d7423eb595a0f8e0d0919bdf2367cd4c85e73525 Mon Sep 17 00:00:00 2001 From: idk Date: Mon, 23 Jan 2023 19:11:02 +0000 Subject: [PATCH] get rid of more makefile responsibilities --- buildscripts/clean.sh | 1 - buildscripts/experimental.sh | 2 +- buildscripts/targz.sh | 2 +- buildscripts/unsigned.sh | 2 +- buildscripts/zip.sh | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/buildscripts/clean.sh b/buildscripts/clean.sh index cc752eb..755eaf5 100755 --- a/buildscripts/clean.sh +++ b/buildscripts/clean.sh @@ -33,4 +33,3 @@ rm -rf \ *.dmg rm -rf build app-profile-*.tgz profile-*.tgz I2P-Easy-Install-Bundle-*.exe *.deb src/I2P/config *.su3 .version *.url make.log git clean -fdx src build onionkeys tlskeys i2pkeys -make clean \ No newline at end of file diff --git a/buildscripts/experimental.sh b/buildscripts/experimental.sh index ad000b6..6d82822 100755 --- a/buildscripts/experimental.sh +++ b/buildscripts/experimental.sh @@ -10,6 +10,6 @@ if [ -f "$SCRIPT_DIR/config_override.sh" ]; then fi "$SCRIPT_DIR"/buildscripts/clean.sh -wsl make distclean +wsl "$SCRIPT_DIR"/buildscripts/clean.sh "$SCRIPT_DIR"/buildscripts/build.sh wsl make \ No newline at end of file diff --git a/buildscripts/targz.sh b/buildscripts/targz.sh index 6f921e4..a5c9e98 100755 --- a/buildscripts/targz.sh +++ b/buildscripts/targz.sh @@ -10,7 +10,7 @@ if [ -f "$SCRIPT_DIR/config_override.sh" ]; then fi export machine=unix "$SCRIPT_DIR"/buildscripts/clean.sh -wsl make distclean +wsl "$SCRIPT_DIR"/buildscripts/clean.sh "$SCRIPT_DIR"/buildscripts/build.sh cd "$SCRIPT_DIR/I2P" || exit 1 diff --git a/buildscripts/unsigned.sh b/buildscripts/unsigned.sh index ad000b6..6d82822 100755 --- a/buildscripts/unsigned.sh +++ b/buildscripts/unsigned.sh @@ -10,6 +10,6 @@ if [ -f "$SCRIPT_DIR/config_override.sh" ]; then fi "$SCRIPT_DIR"/buildscripts/clean.sh -wsl make distclean +wsl "$SCRIPT_DIR"/buildscripts/clean.sh "$SCRIPT_DIR"/buildscripts/build.sh wsl make \ No newline at end of file diff --git a/buildscripts/zip.sh b/buildscripts/zip.sh index 5af9227..45a8b38 100755 --- a/buildscripts/zip.sh +++ b/buildscripts/zip.sh @@ -9,7 +9,7 @@ if [ -f "$SCRIPT_DIR/config_override.sh" ]; then . "$SCRIPT_DIR/config_override.sh" fi "$SCRIPT_DIR"/buildscripts/clean.sh -wsl make distclean +wsl "$SCRIPT_DIR"/buildscripts/clean.sh "$SCRIPT_DIR"/buildscripts/build.sh "$SCRIPT_DIR"/buildscripts/fixperms.sh cd "$SCRIPT_DIR/I2P" || exit 1