cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kam...@apache.org
Subject git commit: folder_contents() now ignores .svn folders
Date Wed, 18 Jun 2014 21:38:07 GMT
Repository: cordova-lib
Updated Branches:
  refs/heads/master f802efd1e -> 27bfd651b


folder_contents() now ignores .svn folders

.svn folders should not be referenced in the jsproj file. They are already
correctly ignored when copying the www folder, and this causes the build to
fail (since the jsproj references files that cannot be found in www).

github: close #33


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

Branch: refs/heads/master
Commit: 27bfd651b7c0bc806da3776b0013b2427cc1fc00
Parents: f802efd
Author: strille <strille@strille.net>
Authored: Wed Jun 18 15:10:16 2014 +0200
Committer: Mark Koudritsky <kamrik@gmail.com>
Committed: Wed Jun 18 17:35:39 2014 -0400

----------------------------------------------------------------------
 cordova-lib/src/cordova/metadata/windows8_parser.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/27bfd651/cordova-lib/src/cordova/metadata/windows8_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/windows8_parser.js b/cordova-lib/src/cordova/metadata/windows8_parser.js
index 5114da8..e6eb068 100644
--- a/cordova-lib/src/cordova/metadata/windows8_parser.js
+++ b/cordova-lib/src/cordova/metadata/windows8_parser.js
@@ -248,15 +248,13 @@ module.exports.prototype = {
         var folder_dir = fs.readdirSync(dir);
         for(item in folder_dir) {
             var stat = fs.statSync(path.join(dir, folder_dir[item]));
-
-            if(stat.isDirectory()) {
+            // Add all subfolder item paths if it's not a .svn dir.
+            if( stat.isDirectory() && (folder_dir[item] !== '.svn') ) {
                 var sub_dir = this.folder_contents(path.join(name, folder_dir[item]), path.join(dir,
folder_dir[item]));
-                //Add all subfolder item paths
                 for(sub_item in sub_dir) {
                     results.push(sub_dir[sub_item]);
                 }
-            }
-            else if(stat.isFile()) {
+            } else if(stat.isFile()) {
                 results.push(path.join(name, folder_dir[item]));
             }
             // else { it is a FIFO, or a Socket, Symbolic Link or something ... }


Mime
View raw message