Display and control your Android device
Make the ADB dependency script Windows-specific
Romain Vimont98d2065d6d06
diff --git a/app/deps/adb.sh b/app/deps/adb_windows.shsimilarity index 79%rename from app/deps/adb.shrename to app/deps/adb_windows.shindex 25727535..d36706b0 100755--- a/app/deps/adb.sh+++ b/app/deps/adb_windows.sh@@ -3,11 +3,10 @@ set -exDEPS_DIR=$(dirname ${BASH_SOURCE[0]})cd "$DEPS_DIR". common-process_args "$@"VERSION=35.0.2FILENAME=platform-tools_r$VERSION-win.zip-PROJECT_DIR=platform-tools-$VERSION+PROJECT_DIR=platform-tools-$VERSION-windowsSHA256SUM=2975a3eac0b19182748d64195375ad056986561d994fffbdc64332a516300bb9cd "$SOURCES_DIR"@@ -28,6 +27,6 @@ elsermdir "$ZIP_PREFIX"fi-mkdir -p "$INSTALL_DIR/$HOST/bin"-cd "$INSTALL_DIR/$HOST/bin"-cp -r "$SOURCES_DIR/$PROJECT_DIR"/. "$INSTALL_DIR/$HOST/bin/"+mkdir -p "$INSTALL_DIR/adb-windows"+cd "$INSTALL_DIR/adb-windows"+cp -r "$SOURCES_DIR/$PROJECT_DIR"/. "$INSTALL_DIR/adb-windows/"diff --git a/release/build_windows.sh b/release/build_windows.shindex 74bd32fc..1b738ea3 100755--- a/release/build_windows.sh+++ b/release/build_windows.sh@@ -20,12 +20,13 @@ cd .. # root project dirWINXX_BUILD_DIR="$WORK_DIR/build-$WINXX"-app/deps/adb.sh $WINXX+app/deps/adb_windows.shapp/deps/sdl.sh $WINXXapp/deps/ffmpeg.sh $WINXXapp/deps/libusb.sh $WINXXDEPS_INSTALL_DIR="$PWD/app/deps/work/install/$WINXX"+ADB_INSTALL_DIR="$PWD/app/deps/work/install/adb-windows"rm -rf "$WINXX_BUILD_DIR"meson setup "$WINXX_BUILD_DIR" \@@ -48,4 +49,4 @@ cp app/data/scrcpy-noconsole.vbs "$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 "$DEPS_INSTALL_DIR"/bin/*.dll "$WINXX_BUILD_DIR/dist/"-cp "$DEPS_INSTALL_DIR"/bin/adb.exe "$WINXX_BUILD_DIR/dist/"+cp -r "$ADB_INSTALL_DIR"/. "$WINXX_BUILD_DIR/dist/"