You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by mm...@apache.org on 2014/11/25 03:29:32 UTC
[1/3] cordova-browser git commit: CB-7978 Fixed launching chrome in
Linux
Repository: cordova-browser
Updated Branches:
refs/heads/master 03c6ee80d -> 86f08b8a3
CB-7978 Fixed launching chrome in Linux
- Fixed launching chrome in linux. It either launches chrome or google-chrome processes
- Reads config.xml looking for the source file to be used at the lauching of the browser. This will work for Linux, Windows and MacOs
Project: http://git-wip-us.apache.org/repos/asf/cordova-browser/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-browser/commit/87e19e2d
Tree: http://git-wip-us.apache.org/repos/asf/cordova-browser/tree/87e19e2d
Diff: http://git-wip-us.apache.org/repos/asf/cordova-browser/diff/87e19e2d
Branch: refs/heads/master
Commit: 87e19e2d69fadcc4909e9858ec94655436857ffe
Parents: 03c6ee8
Author: Victor Sosa <so...@gmail.com>
Authored: Thu Nov 6 16:13:46 2014 -0600
Committer: Victor Sosa <so...@gmail.com>
Committed: Thu Nov 6 16:13:46 2014 -0600
----------------------------------------------------------------------
bin/templates/project/cordova/run | 27 +++++++++++++++++++++++++--
1 file changed, 25 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-browser/blob/87e19e2d/bin/templates/project/cordova/run
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/run b/bin/templates/project/cordova/run
index 59a7c5c..ce57846 100755
--- a/bin/templates/project/cordova/run
+++ b/bin/templates/project/cordova/run
@@ -20,10 +20,32 @@
*/
var shell = require('shelljs'),
- spawn = require('child_process').spawn,
- project = 'file://' + shell.pwd() + '/platforms/browser/www/index.html';
+ fs = require('fs');
+
+var configFile = shell.pwd() + '/config.xml';
+var configXML = fs.readFileSync(configFile, 'utf8');
+var sourceFile = /<content[\s\S]*?src\s*=\s*"(.*?)"/i.exec(configXML);
+var spawn = require('child_process').spawn,
+ tmpDir = '/tmp/temp_chrome_user_data_dir_for_cordova_browser/',
+ out = fs.openSync(tmpDir + 'out.log', 'a'),
+ err = fs.openSync(tmpDir + 'out.log', 'a'),
+ project = 'file://' + shell.pwd() + '/platforms/browser/www/' + sourceFile[1];
switch (process.platform) {
+ case 'linux':
+ var args = ['--disable-web-security', '--user-data-dir=/tmp/temp_chrome_user_data_dir_for_cordova_browser', project];
+ var chromeProcess = spawn('chrome', args);
+
+ chromeProcess.on('close', function(code) {
+ if (code != 0) {
+ var options = {detached: true, stdio: ['ignore', out, err]};
+ var chromeProcess = spawn('google-chrome', args, options);
+ chromeProcess.unref();
+
+ }
+ });
+
+ break;
case 'darwin':
spawn('open', ['-n', '-a', 'Google\ Chrome', '--args', '--disable-web-security', '--user-data-dir=/tmp/temp_chrome_user_data_dir_for_cordova_browser', project]);
break;
@@ -34,3 +56,4 @@ switch (process.platform) {
break;
}
+
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[3/3] cordova-browser git commit: CB-7978 Cleaning code and creating
temporary dir - Using path.resolve and path.join instead of concatenating
paths - Fixing error when temporary dir already exists by using shelljs
instead of fs
Posted by mm...@apache.org.
CB-7978 Cleaning code and creating temporary dir
- Using path.resolve and path.join instead of concatenating paths
- Fixing error when temporary dir already exists by using shelljs instead of fs
Project: http://git-wip-us.apache.org/repos/asf/cordova-browser/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-browser/commit/86f08b8a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-browser/tree/86f08b8a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-browser/diff/86f08b8a
Branch: refs/heads/master
Commit: 86f08b8a3e4f2a7d019ae61e963dc2c3172cf427
Parents: 8f86509
Author: Victor Sosa <so...@gmail.com>
Authored: Mon Nov 24 16:44:13 2014 -0600
Committer: Victor Sosa <so...@gmail.com>
Committed: Mon Nov 24 16:44:13 2014 -0600
----------------------------------------------------------------------
bin/templates/project/cordova/run | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-browser/blob/86f08b8a/bin/templates/project/cordova/run
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/run b/bin/templates/project/cordova/run
index 9f9ccaf..1c2c17d 100755
--- a/bin/templates/project/cordova/run
+++ b/bin/templates/project/cordova/run
@@ -20,16 +20,18 @@
*/
var shell = require('shelljs'),
- fs = require('fs');
+ fs = require('fs'),
+ path = require('path');
-var configFile = shell.pwd() + '/config.xml';
-var configXML = fs.readFileSync(configFile, 'utf8');
-var sourceFile = /<content[\s\S]*?src\s*=\s*"(.*?)"/i.exec(configXML);
-var spawn = require('child_process').spawn,
+var configFile = path.resolve(path.join(shell.pwd(), 'config.xml')),
+ configXML = fs.readFileSync(configFile, 'utf8'),
+ sourceFile = /<content[\s\S]*?src\s*=\s*"(.*?)"/i.exec(configXML),
+ spawn = require('child_process').spawn,
tmpDir = '/tmp/temp_chrome_user_data_dir_for_cordova_browser/',
- project = 'file://' + shell.pwd() + '/platforms/browser/www/' + sourceFile[1];
+ project = 'file://' + path.resolve(path.join('platforms', 'browser', 'www', sourceFile[1]));
+
+shell.mkdir('-p', tmpDir);
-fs.mkdir(tmpDir);
switch (process.platform) {
case 'linux':
var args = ['--disable-web-security', '--user-data-dir=/tmp/temp_chrome_user_data_dir_for_cordova_browser', project];
@@ -37,6 +39,7 @@ switch (process.platform) {
chromeProcess.on('close', function(code) {
if (code != 0) {
+ console.log('chrome process failed to start. Using google-chrome instead');
var out = fs.openSync(tmpDir + 'out.log', 'a'),
err = fs.openSync(tmpDir + 'out.log', 'a'),
options = {detached: true, stdio: ['ignore', out, err]},
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/3] cordova-browser git commit: CB-7978 Cleaning code and creating
temporary dir - Cleaning code - Declaring variables only when needed -
Creating chrome for Cordova temp dir prior using it by std and err
Posted by mm...@apache.org.
CB-7978 Cleaning code and creating temporary dir
- Cleaning code
- Declaring variables only when needed
- Creating chrome for Cordova temp dir prior using it by std and err
Project: http://git-wip-us.apache.org/repos/asf/cordova-browser/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-browser/commit/8f865097
Tree: http://git-wip-us.apache.org/repos/asf/cordova-browser/tree/8f865097
Diff: http://git-wip-us.apache.org/repos/asf/cordova-browser/diff/8f865097
Branch: refs/heads/master
Commit: 8f8650977fc8504892c5e72cd6e5820de2151801
Parents: 87e19e2
Author: Victor Sosa <so...@gmail.com>
Authored: Fri Nov 7 12:23:30 2014 -0600
Committer: Victor Sosa <so...@gmail.com>
Committed: Fri Nov 7 12:23:30 2014 -0600
----------------------------------------------------------------------
bin/templates/project/cordova/run | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-browser/blob/8f865097/bin/templates/project/cordova/run
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/run b/bin/templates/project/cordova/run
index ce57846..9f9ccaf 100755
--- a/bin/templates/project/cordova/run
+++ b/bin/templates/project/cordova/run
@@ -27,10 +27,9 @@ var configXML = fs.readFileSync(configFile, 'utf8');
var sourceFile = /<content[\s\S]*?src\s*=\s*"(.*?)"/i.exec(configXML);
var spawn = require('child_process').spawn,
tmpDir = '/tmp/temp_chrome_user_data_dir_for_cordova_browser/',
- out = fs.openSync(tmpDir + 'out.log', 'a'),
- err = fs.openSync(tmpDir + 'out.log', 'a'),
project = 'file://' + shell.pwd() + '/platforms/browser/www/' + sourceFile[1];
+fs.mkdir(tmpDir);
switch (process.platform) {
case 'linux':
var args = ['--disable-web-security', '--user-data-dir=/tmp/temp_chrome_user_data_dir_for_cordova_browser', project];
@@ -38,8 +37,10 @@ switch (process.platform) {
chromeProcess.on('close', function(code) {
if (code != 0) {
- var options = {detached: true, stdio: ['ignore', out, err]};
- var chromeProcess = spawn('google-chrome', args, options);
+ var out = fs.openSync(tmpDir + 'out.log', 'a'),
+ err = fs.openSync(tmpDir + 'out.log', 'a'),
+ options = {detached: true, stdio: ['ignore', out, err]},
+ chromeProcess = spawn('google-chrome', args, options);
chromeProcess.unref();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org