You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by dr...@apache.org on 2013/10/15 20:39:51 UTC
[10/31] git commit: fix loggin of android, fix deploy of ios
fix loggin of android, fix deploy of ios
Project: http://git-wip-us.apache.org/repos/asf/cordova-medic/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-medic/commit/97831bc1
Tree: http://git-wip-us.apache.org/repos/asf/cordova-medic/tree/97831bc1
Diff: http://git-wip-us.apache.org/repos/asf/cordova-medic/diff/97831bc1
Branch: refs/heads/master
Commit: 97831bc17dedce5074a9df722bc480cee9c99bfa
Parents: a316f61
Author: David Kemp <dr...@google.com>
Authored: Thu Aug 22 11:53:00 2013 -0400
Committer: David Kemp <dr...@chromium.org>
Committed: Tue Oct 15 14:11:32 2013 -0400
----------------------------------------------------------------------
src/build/makers/android/deploy.js | 5 +++--
src/build/makers/ios.js | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/97831bc1/src/build/makers/android/deploy.js
----------------------------------------------------------------------
diff --git a/src/build/makers/android/deploy.js b/src/build/makers/android/deploy.js
index 8b7968d..5ba8958 100644
--- a/src/build/makers/android/deploy.js
+++ b/src/build/makers/android/deploy.js
@@ -97,8 +97,9 @@ module.exports = function deploy(sha, devices, path, id, callback) {
clearTimeout(timer);
logcat.kill();
end(true);
- } else if(buf.indexOf('Test Results URL')>-1) {
- console.log(buf);
+ } else if(buf.indexOf('Test Results URL')>-1 && buf.indexOf('<<<end test result>>>')>-1) {
+ var msg=buf.slice(buf.indexOf('Test Results URL'), buf.indexOf('<<<end test result>>>'))
+ console.log(msg);
}
});
}
http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/97831bc1/src/build/makers/ios.js
----------------------------------------------------------------------
diff --git a/src/build/makers/ios.js b/src/build/makers/ios.js
index 076d331..05eeef5 100644
--- a/src/build/makers/ios.js
+++ b/src/build/makers/ios.js
@@ -54,7 +54,7 @@ module.exports = function(output,lib_location,test_dir, sha, devices, entry_poin
// modify configuration to Release mode, i386 to armv7 and sdk to iphoneos6.0 so we can use it with fruitstrap
// TODO: expose which target sdk to build for
var debugScript = path.join(output, 'cordova', 'build');
- fs.writeFileSync(debugScript, fs.readFileSync(debugScript, 'utf-8').replace(/configuration Debug/, 'configuration Release').replace(/i386/g,'armv7').replace(/SDK=`.*`/, 'SDK="iphoneos6.1"'), 'utf-8');
+ fs.writeFileSync(debugScript, fs.readFileSync(debugScript, 'utf-8').replace(/configuration Debug/, 'configuration Release').replace(/i386/g,'armv7').replace(/iphonesimulator/, 'iphoneos'), 'utf-8');
} catch(e) {
error_writer('ios', sha, 'Exception thrown modifying mobile spec application for iOS.', e.message);
callback(true);
@@ -75,7 +75,7 @@ module.exports = function(output,lib_location,test_dir, sha, devices, entry_poin
error_writer('ios', sha, devices, 'No further details dude.');
callback(true);
} else {
- var bundle = path.join(output, 'build', 'mobilespec.app'),
+ var bundle = path.join(output, 'build', 'device', 'mobilespec.app'),
bundleId = 'org.apache.mobilespec';
deploy(sha, devices, bundle, bundleId, callback);
}