Github user robpaveza commented on a diff in the pull request:
https://github.com/apache/cordova-windows/pull/96#discussion_r34166300
--- Diff: template/cordova/lib/package.js ---
@@ -113,16 +112,32 @@ function getPackageName(platformPath) {
// returns one of available devices which name match with provided string
// return rejected promise if device with name specified not found
-module.exports.findDevice = function (target) {
+module.exports.findDevice = function (deploymentTool, target) {
target = target.toLowerCase();
- return module.exports.listDevices().then(function(deviceList) {
+ return deploymentTool.enumerateDevices().then(function(deviceList) {
// CB-7617 since we use partial match shorter names should go
first,
// example case is ['Emulator 8.1 WVGA 4 inch 512MB', 'Emulator
8.1 WVGA 4 inch']
- var sortedList = deviceList.concat().sort(function (l, r) { return
l.length > r.length; });
- for (var idx in sortedList){
- if (sortedList[idx].toLowerCase().indexOf(target) > -1) {
- // we should return index based on original list
- return Q.resolve(deviceList.indexOf(sortedList[idx]));
+ // In CB-9283, we need to differentiate between emulator, device,
and target.
+ // So, for emulators to honor the above CB-7617, we preserve the
original behavior.
+ // Else, we choose either the target by ID (DeviceInfo.index) or
if it's just device,
+ // we choose the default (aka first) device.
+ if (target === 'emulator') {
+ var sortedList = deviceList.concat().sort(function (l, r) {
return l.toString().length > r.toString().length; });
+ for (var idx in sortedList){
--- End diff --
Yeah.... I didn't want to mess with this code and end up breaking
something downstream. It seems to have been working for us up until now.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org
For additional commands, e-mail: dev-h...@cordova.apache.org
