Make adb dependency script Windows-specific

This will allow adding similar scripts for other platforms.
This commit is contained in:
Romain Vimont 2024-11-22 22:17:41 +01:00
parent 1569de761b
commit e5f480f707
2 changed files with 7 additions and 8 deletions

View File

@ -3,11 +3,10 @@ set -ex
DEPS_DIR=$(dirname ${BASH_SOURCE[0]}) DEPS_DIR=$(dirname ${BASH_SOURCE[0]})
cd "$DEPS_DIR" cd "$DEPS_DIR"
. common . common
process_args "$@"
VERSION=35.0.2 VERSION=35.0.2
FILENAME=platform-tools_r$VERSION-win.zip FILENAME=platform-tools_r$VERSION-win.zip
PROJECT_DIR=platform-tools-$VERSION PROJECT_DIR=platform-tools-$VERSION-windows
SHA256SUM=2975a3eac0b19182748d64195375ad056986561d994fffbdc64332a516300bb9 SHA256SUM=2975a3eac0b19182748d64195375ad056986561d994fffbdc64332a516300bb9
cd "$SOURCES_DIR" cd "$SOURCES_DIR"
@ -28,6 +27,6 @@ else
rmdir "$ZIP_PREFIX" rmdir "$ZIP_PREFIX"
fi fi
mkdir -p "$INSTALL_DIR/$HOST/bin" mkdir -p "$INSTALL_DIR/adb-windows"
cd "$INSTALL_DIR/$HOST/bin" cd "$INSTALL_DIR/adb-windows"
cp -r "$SOURCES_DIR/$PROJECT_DIR"/. "$INSTALL_DIR/$HOST/bin/" cp -r "$SOURCES_DIR/$PROJECT_DIR"/. "$INSTALL_DIR/adb-windows/"

View File

@ -20,12 +20,13 @@ cd .. # root project dir
WINXX_BUILD_DIR="$WORK_DIR/build-$WINXX" WINXX_BUILD_DIR="$WORK_DIR/build-$WINXX"
app/deps/adb.sh $WINXX app/deps/adb_windows.sh
app/deps/sdl.sh $WINXX app/deps/sdl.sh $WINXX
app/deps/ffmpeg.sh $WINXX app/deps/ffmpeg.sh $WINXX
app/deps/libusb.sh $WINXX app/deps/libusb.sh $WINXX
DEPS_INSTALL_DIR="$PWD/app/deps/work/install/$WINXX" DEPS_INSTALL_DIR="$PWD/app/deps/work/install/$WINXX"
ADB_INSTALL_DIR="$PWD/app/deps/work/install/adb-windows"
rm -rf "$WINXX_BUILD_DIR" rm -rf "$WINXX_BUILD_DIR"
meson setup "$WINXX_BUILD_DIR" \ meson setup "$WINXX_BUILD_DIR" \
@ -47,5 +48,4 @@ cp app/data/scrcpy-console.bat "$WINXX_BUILD_DIR/dist/"
cp app/data/scrcpy-noconsole.vbs "$WINXX_BUILD_DIR/dist/" cp app/data/scrcpy-noconsole.vbs "$WINXX_BUILD_DIR/dist/"
cp app/data/icon.png "$WINXX_BUILD_DIR/dist/" cp app/data/icon.png "$WINXX_BUILD_DIR/dist/"
cp app/data/open_a_terminal_here.bat "$WINXX_BUILD_DIR/dist/" cp app/data/open_a_terminal_here.bat "$WINXX_BUILD_DIR/dist/"
cp "$DEPS_INSTALL_DIR"/bin/*.dll "$WINXX_BUILD_DIR/dist/" cp -r "$ADB_INSTALL_DIR"/. "$WINXX_BUILD_DIR/dist/"
cp "$DEPS_INSTALL_DIR"/bin/adb.exe "$WINXX_BUILD_DIR/dist/"