You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by fi...@apache.org on 2013/07/10 06:06:12 UTC

[1/2] git commit: removed a console log

Updated Branches:
  refs/heads/master a13d5f5e2 -> 9c253e1a7


removed a console log


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

Branch: refs/heads/master
Commit: f4ffadcf97cf2fea3544a43aa1a4e61fbffea2ab
Parents: a13d5f5
Author: Fil Maj <ma...@gmail.com>
Authored: Tue Jul 9 12:40:38 2013 -0700
Committer: Fil Maj <ma...@gmail.com>
Committed: Tue Jul 9 12:40:38 2013 -0700

----------------------------------------------------------------------
 spec/util/csproj.spec.js | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/f4ffadcf/spec/util/csproj.spec.js
----------------------------------------------------------------------
diff --git a/spec/util/csproj.spec.js b/spec/util/csproj.spec.js
index fb66f6c..a75b68b 100644
--- a/spec/util/csproj.spec.js
+++ b/spec/util/csproj.spec.js
@@ -39,7 +39,6 @@ describe('csproj', function() {
 
             it('should properly add .xaml files', function() {
                 test_csproj.addSourceFile(page_test);
-                console.log(test_csproj.xml.getroot().findall('.//Page'));
                 expect(test_csproj.xml.getroot().find('.//Page[@Include="src\\UI\\PageTest.xaml"]')).toBeTruthy();        
                 expect(test_csproj.xml.getroot().find('.//Page[@Include="src\\UI\\PageTest.xaml"]/Generator').text).toEqual('MSBuild:Compile');
                 expect(test_csproj.xml.getroot().find('.//Page[@Include="src\\UI\\PageTest.xaml"]/SubType').text).toEqual('Designer');


[2/2] git commit: [CB-4016] only write out cordova_plugins.js.

Posted by fi...@apache.org.
[CB-4016] only write out cordova_plugins.js.


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

Branch: refs/heads/master
Commit: 9c253e1a72156da8fcafc53e31b2852e7fdc805b
Parents: f4ffadc
Author: Fil Maj <ma...@gmail.com>
Authored: Tue Jul 9 21:06:02 2013 -0700
Committer: Fil Maj <ma...@gmail.com>
Committed: Tue Jul 9 21:06:02 2013 -0700

----------------------------------------------------------------------
 spec/prepare.spec.js | 4 ++--
 src/prepare.js       | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/9c253e1a/spec/prepare.spec.js
----------------------------------------------------------------------
diff --git a/spec/prepare.spec.js b/spec/prepare.spec.js
index 675444a..89db3b5 100644
--- a/spec/prepare.spec.js
+++ b/spec/prepare.spec.js
@@ -36,9 +36,9 @@ describe('prepare', function() {
             find:find
         });
     });
-    it('should create a cordova_plugins.json file', function() {
+    it('should NOT create a cordova_plugins.json file', function() {
         prepare(temp, 'android', plugins_dir);
-        expect(write).toHaveBeenCalledWith(json, jasmine.any(String), 'utf-8');
+        expect(write).not.toHaveBeenCalledWith(json, jasmine.any(String), 'utf-8');
     });
     it('should create a cordova_plugins.js file', function() {
         prepare(temp, 'android', plugins_dir);

http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/9c253e1a/src/prepare.js
----------------------------------------------------------------------
diff --git a/src/prepare.js b/src/prepare.js
index 4904975..f9b755c 100644
--- a/src/prepare.js
+++ b/src/prepare.js
@@ -123,9 +123,6 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir) {
         }
     });
 
-    require('../plugman').emit('log', 'Writing out cordova_plugins.json...');
-    // Write out moduleObjects as JSON to cordova_plugins.json
-    fs.writeFileSync(path.join(wwwDir, 'cordova_plugins.json'), JSON.stringify(moduleObjects), 'utf-8');
     // Write out moduleObjects as JSON wrapped in a cordova module to cordova_plugins.js
     // This is to support Windows Phone platforms that have trouble with XHR during load
     var final_contents = "cordova.define('cordova/plugin_list', function(require, exports, module) {\n";