From ed297f476a2a5a459bb3237b70a073c5bde03005 Mon Sep 17 00:00:00 2001 From: Nathan Kerr Date: Sat, 14 Nov 2015 11:22:48 -0800 Subject: [PATCH 1/2] Need to change working directories so that the command works when called from outside the flutter directory. Removed accidental debug code. --- bin/flutter.bat | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bin/flutter.bat b/bin/flutter.bat index 4b0ebbb5d7b..4d8580e50d8 100644 --- a/bin/flutter.bat +++ b/bin/flutter.bat @@ -12,6 +12,8 @@ SET script_path=%flutter_tools_dir%\bin\flutter_tools.dart REM TODO: Don't require dart to be on the user's path SET dart=dart +REM Set current working directory to the flutter directory +PUSHD %flutter_root% REM IF doesn't have an "or". Instead, just use GOTO FOR /f %%r IN ('git rev-parse HEAD') DO SET revision=%%r IF NOT EXIST %snapshot_path% GOTO do_snapshot @@ -34,10 +36,11 @@ CALL pub.bat get CD "%flutter_root%" CALL %dart% --snapshot="%snapshot_path%" --package-root="%flutter_tools_dir%\packages" "%script_path%" "%stamp_path%" -goto :eof :after_snapshot +REM Go back to last working directory +POPD CALL %dart% "%snapshot_path%" %* IF /I "%ERRORLEVEL%" EQU "253" ( From d36af446f2c9eb36d133b1d25575c495f1654460 Mon Sep 17 00:00:00 2001 From: Nathan Kerr Date: Sat, 14 Nov 2015 11:25:29 -0800 Subject: [PATCH 2/2] Change Regex to correctly match against my device. Since we don't care about the port, just allow any characters between the spaces after the device ID and the product. Running Windows 10, running "adb devices -l" with my device attached to the computer gives: FA34MW904146 device product:cm_m7 model:One device:m7 Which wasn't being matched correctly (no info on USB port). --- packages/flutter_tools/lib/src/device.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/flutter_tools/lib/src/device.dart b/packages/flutter_tools/lib/src/device.dart index 69b24bca83b..30a693a0beb 100644 --- a/packages/flutter_tools/lib/src/device.dart +++ b/packages/flutter_tools/lib/src/device.dart @@ -509,7 +509,7 @@ class AndroidDevice extends Device { // 015d172c98400a03 device usb:340787200X product:nakasi model:Nexus_7 device:grouper RegExp deviceRegex1 = new RegExp( - r'^(\S+)\s+device\s+\S+\s+product:(\S+)\s+model:(\S+)\s+device:(\S+)$'); + r'^(\S+)\s+device\s+.*product:(\S+)\s+model:(\S+)\s+device:(\S+)$'); // 0149947A0D01500C device usb:340787200X RegExp deviceRegex2 = new RegExp(r'^(\S+)\s+device\s+\S+$');