cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From purplecabb...@apache.org
Subject [05/25] cordova-browser git commit: resolved merge issue
Date Thu, 25 May 2017 20:38:25 GMT
resolved merge issue


Project: http://git-wip-us.apache.org/repos/asf/cordova-browser/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-browser/commit/ea7fdc41
Tree: http://git-wip-us.apache.org/repos/asf/cordova-browser/tree/ea7fdc41
Diff: http://git-wip-us.apache.org/repos/asf/cordova-browser/diff/ea7fdc41

Branch: refs/heads/master
Commit: ea7fdc41f8d7608d2b08427aa0faa5d79000ce42
Parents: 6281ea5 606f407
Author: Jesse MacFadyen <purplecabbage@gmail.com>
Authored: Wed Apr 12 23:48:13 2017 -0700
Committer: Jesse MacFadyen <purplecabbage@gmail.com>
Committed: Wed Apr 12 23:48:13 2017 -0700

----------------------------------------------------------------------
 bin/lib/create.js | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-browser/blob/ea7fdc41/bin/lib/create.js
----------------------------------------------------------------------
diff --cc bin/lib/create.js
index a7bb099,2f77cc2..d1000ed
--- a/bin/lib/create.js
+++ b/bin/lib/create.js
@@@ -28,38 -29,6 +28,21 @@@ var fs = require('fs')
  
  module.exports.createProject = function(project_path,package_name,project_name){
  
 +    console.log("ROOT = " + ROOT);
 +    console.log("browser :: createProject",project_path,package_name,project_name);
 +
 +
 +/*
 +    // create the dest and the standard place for our api to live
 +    // platforms/platformName/cordova/Api.js
 +
-     var apiSrcPath = __dirname; // default value
-     console.log("apiSrcPath " + apiSrcPath);
-     // does options contain the info we desire?
- 
-     var projectName = config ? config.name() : "HelloCordova";
- 
-     events.emit('log', 'Creating Cordova project for cordova-platform-test:');
++    // TODO: other platforms emit log info
++    events.emit('log', 'Creating Cordova project for cordova-browser:');
 +    events.emit('log', '\tPath: ' + dest);
 +    events.emit('log', '\tName: ' + projectName);
 +
-     shell.mkdir(dest);
- 
-     // move a copy of our api to the new project
-     shell.cp('-r',apiSrcPath, dest);
- 
-     // move our node_modules
-     var srcModulePath = path.join(__dirname,'../../../node_modules');
-     console.log("srcModulePath = " + srcModulePath);
-     shell.cp('-r',srcModulePath,path.join(dest,'cordova'));
- 
-     // I promise I will return
-     return Promise.resolve(new Api(PLATFORM_NAME,dest,events));
 +*/
 +
      var VERSION = fs.readFileSync(path.join(ROOT, 'VERSION'), 'utf-8');
  
      // Set default values for path, package and name
@@@ -89,19 -55,27 +72,18 @@@
      }
  
      //copy required node_modules
 -    shjs.cp('-r', path.join(ROOT, 'node_modules'), path.join(project_path,'cordova'));
 +    shell.cp('-r', path.join(ROOT, 'node_modules'), path.join(project_path,'cordova'));
  
      //copy check_reqs file
 -    shjs.cp( path.join(ROOT, 'bin', 'lib', 'check_reqs.js'), path.join(project_path,'cordova',
'lib'));
 +    shell.cp( path.join(ROOT, 'bin/lib/check_reqs.js'), path.join(project_path,'cordova/lib'));
  
      //copy cordova js file
 -    shjs.cp('-r', path.join(ROOT, 'cordova-lib', 'cordova.js'), path.join(project_path,'www'));
 +    shell.cp('-r', path.join(ROOT, 'cordova-lib', 'cordova.js'), path.join(project_path,'www'));
  
      //copy cordova-js-src directory
 -    shjs.cp('-rf', path.join(ROOT, 'cordova-js-src'), path.join(project_path, 'platform_www'));
 +    shell.cp('-rf', path.join(ROOT, 'cordova-js-src'), path.join(project_path, 'platform_www'));
  
      //copy cordova directory
 -    shjs.cp('-r', path.join(ROOT, 'bin', 'templates', 'project', 'cordova'), project_path);
 -    [
 -        'run',
 -        'build',
 -        'clean',
 -        'version',
 -    ].forEach(function(f) {
 -         shjs.chmod(755, path.join(project_path, 'cordova', f));
 -    });
 -
 -    return Q.resolve();
 +    shell.cp('-r', path.join(ROOT, 'bin/template/cordova'), project_path);
- 
 +    return Promise.resolve();
  };


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message