You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2014/02/05 00:02:27 UTC

[1/2] js commit: CB-5438 Exclude local symlinks from jshint

Updated Branches:
  refs/heads/master a9d8c4b20 -> 12a6fdbb6


CB-5438 Exclude local symlinks from jshint

Both /src/test/androidexec.js and /src/test/iosexec.js are symlinks to
/src/android/exec.js and /src/ios/exec.js

Symlinks don't work on the Windows platform and are represented there as
a text file with the contents being a text description of where it
should be pointing at.

The problem is that the jshint task of the build tries to parse those
'text' files as js files, which fails for obvious reasons.

My solution is to explicitly exclude those 2 symlink files from the
jshint task. The files they point at are included in the src/**/*.js
jshint src setting, so they will get checked anyway.

Now we can succesfully run grunt build on Windows.


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

Branch: refs/heads/master
Commit: a85f693ca5d15cd5c5204f81c1542100fac13300
Parents: ba3190d
Author: Bas Bosman <sb...@mindef.nl>
Authored: Sun Jan 26 15:43:31 2014 +0100
Committer: Bas Bosman <sb...@mindef.nl>
Committed: Sun Jan 26 15:43:31 2014 +0100

----------------------------------------------------------------------
 Gruntfile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-js/blob/a85f693c/Gruntfile.js
----------------------------------------------------------------------
diff --git a/Gruntfile.js b/Gruntfile.js
index 683c9de..b1e456a 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -38,7 +38,7 @@ module.exports = function(grunt) {
             options: {
                 jshintrc: '.jshintrc',
             },
-            src: [ 'src/**/*.js' ]
+            src: ['src/**/*.js', '!src/test/androidexec.js', '!src/test/iosexec.js']
         },
     });
 


[2/2] js commit: Merge branch 'CB-5438' of https://github.com/BBosman/cordova-js

Posted by pu...@apache.org.
Merge branch 'CB-5438' of https://github.com/BBosman/cordova-js


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

Branch: refs/heads/master
Commit: 12a6fdbb62c9e37f26fd5f32dbe840b6e3aa8ccd
Parents: a9d8c4b a85f693
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Tue Feb 4 15:01:53 2014 -0800
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Tue Feb 4 15:01:53 2014 -0800

----------------------------------------------------------------------
 Gruntfile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------