fix paths in moved buildscripts

2023-01-23 16:50:03 +00:00
parent 2a162fb4c1
commit c678c6eca2
14 changed files with 23 additions and 24 deletions
--- a/buildscripts/build.sh
+++ b/buildscripts/build.sh
@@ -29,11 +29,11 @@ ICON="src/icons/ui2pbrowser_icon.ico"

 if [ "$machine" = "Mac" ]; then
  rm -rf I2P
-  ./getprebuilt.sh
+  ./buildscripts/getprebuilt.sh
  exit 0
 elif [ "$machine" = "Linux" ]; then
  rm -rf I2P
-  ./getprebuilt.sh
+  ./buildscripts/getprebuilt.sh
  exit 0
 elif [ "$machine" = "unix" ]; then
  ICON=src/icons/windowsUIToopie2.png
--- a/buildscripts/daily-linux.sh
+++ b/buildscripts/daily-linux.sh
@@ -25,7 +25,7 @@ fi
 # GITHUB_USERNAME=your github username
 git clean -fd
 git checkout .
-./targz.sh
+./buildscripts/targz.sh

 . "$HOME/github-release-config.sh"

--- a/buildscripts/daily-portable-windows.sh
+++ b/buildscripts/daily-portable-windows.sh
@@ -46,7 +46,7 @@ fi
 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"

-./zip.sh
+./buildscripts/zip.sh
 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"
 github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "I2P-windows-portable.zip" -l "$WINZIPCHECKSUM" -t "$TODAYSDATE" -n "I2P-windows-portable.zip"
--- a/buildscripts/daily-unstable.sh
+++ b/buildscripts/daily-unstable.sh
@@ -25,7 +25,7 @@ fi
 git clean -fd
 git checkout .
 cp -v "$SCRIPT_DIR/config_override.example.sh" config_override.sh
-./unsigned.sh
+./buildscripts/unsigned.sh

 . "$HOME/github-release-config.sh"

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

 . "$HOME/github-release-config.sh"

--- a/buildscripts/experimental.sh
+++ b/buildscripts/experimental.sh
@@ -9,7 +9,7 @@ if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
  . "$SCRIPT_DIR/config_override.sh"
 fi

-./clean.sh
+./buildscripts/clean.sh
 wsl make distclean
-./build.sh
+./buildscripts/build.sh
 wsl make
--- a/buildscripts/getprebuilt.sh
+++ b/buildscripts/getprebuilt.sh
@@ -28,4 +28,4 @@ if [ ! -f I2P.zip ]; then
 fi
 unzip I2P.zip
 sleep 3
-./fixperms.sh
+./buildscripts/fixperms.sh
--- a/buildscripts/msi.sh
+++ b/buildscripts/msi.sh
@@ -8,7 +8,7 @@ cd "$SCRIPT_DIR" || exit 1
 . ./config.sh
 . ./i2pversion

-./build.sh
+./buildscripts/build.sh
 jpackage --name I2P-MSI --app-version "$I2P_VERSION" \
    --verbose \
    --java-options "-Xmx512m" \
--- a/buildscripts/release.sh
+++ b/buildscripts/release.sh
@@ -9,5 +9,5 @@ if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
  . "$SCRIPT_DIR/config_override.sh"
 fi

-./unsigned.sh
-./sign.sh
+./buildscripts/unsigned.sh
+./buildscripts/sign.sh
--- a/buildscripts/targz.sh
+++ b/buildscripts/targz.sh
@@ -9,9 +9,9 @@ if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
  . "$SCRIPT_DIR/config_override.sh"
 fi
 export machine=unix
-./clean.sh
+./buildscripts/clean.sh
 wsl make distclean
-./build.sh
+./buildscripts/build.sh
 cd "$SCRIPT_DIR/I2P" || exit 1

 TORSOCKS=$(which torsocks)
--- a/buildscripts/unsigned.sh
+++ b/buildscripts/unsigned.sh
@@ -9,7 +9,7 @@ if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
  . "$SCRIPT_DIR/config_override.sh"
 fi

-./clean.sh
+./buildscripts/clean.sh
 wsl make distclean
-./build.sh
+./buildscripts/build.sh
 wsl make
--- a/buildscripts/zip.sh
+++ b/buildscripts/zip.sh
@@ -8,17 +8,16 @@ cd "$SCRIPT_DIR" || exit 1
 if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
  . "$SCRIPT_DIR/config_override.sh"
 fi
-./clean.sh
+./buildscripts/clean.sh
 wsl make distclean
-./build.sh
-./fixperms.sh
+./buildscripts/build.sh
+./buildscripts/fixperms.sh
 cd "$SCRIPT_DIR/I2P" || exit 1

 TORSOCKS=$(which torsocks)
 if [ -f "${TORSOCKS}" ]; then
    . "${TORSOCKS}" on
 fi
-#./torbrowser-windows.sh
 ../src/win/torbrowser-windows.sh
 version="$(curl -s https://aus1.torproject.org/torbrowser/update_3/release/downloads.json | jq -r ".version")"
 . "${TORSOCKS}" off
--- a/src/nsis/i2pbrowser-jpackage.nsi
+++ b/src/nsis/i2pbrowser-jpackage.nsi
@@ -1 +1 @@
-!define I2P_VERSION 1.9.7
+!define I2P_VERSION 2.1.0
--- a/src/nsis/i2pbrowser-version.nsi
+++ b/src/nsis/i2pbrowser-version.nsi
@@ -1,3 +1,3 @@
-!define VERSIONMAJOR 1
-!define VERSIONMINOR 9
-!define VERSIONBUILD 7
+!define VERSIONMAJOR 2
+!define VERSIONMINOR 1
+!define VERSIONBUILD 0