[GitHub] brodybits closed pull request #174: Remove cordova-js branch check

[GitBox <gi...@apache.org>]

brodybits closed pull request #174: Remove cordova-js branch check
URL: https://github.com/apache/cordova-mobile-spec/pull/174
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/createmobilespec/createmobilespec.js b/createmobilespec/createmobilespec.js
index a99ffb7..81cbc6f 100755
--- a/createmobilespec/createmobilespec.js
+++ b/createmobilespec/createmobilespec.js
@@ -339,18 +339,16 @@ function verifyNpmLinkOf(linkedModule, installedModule) {
 }
 
 if (!argv.skiplink) {
-    console.log("Checking if you are using master branch of tools (js, lib, plugman, cli)");
-    // if js, lib, plugman, and cli have master checked out, should npm link.
-    var jsBranch = getBranchName("cordova-js");
+    console.log("Checking if you are using master branch of tools (lib, plugman, cli)");
+    // if lib, plugman, and cli have master checked out, should npm link.
     var libBranch = getBranchName("cordova-lib");
     var plugmanBranch = getBranchName("cordova-plugman");
     var cliBranch = getBranchName("cordova-cli");
-    if ((jsBranch == "master") && (libBranch == "master") && (plugmanBranch == "master") && (cliBranch == "master")) {
+    if ((libBranch == "master") && (plugmanBranch == "master") && (cliBranch == "master")) {
         // make sure the dependent modules are 'npm link'ed to each other,
         // so they actually get tested instead of downloading the last published
         // one from the npm registry. Fail if they are not.
         console.log("You are on master branch of tools, checking npm links");
-        //verifyNpmLinkOf("cordova-js", "cordova-lib"); TODO Clean up other cordova-js stuff above
         verifyNpmLinkOf("cordova-lib", "cordova-plugman");
         verifyNpmLinkOf("cordova-lib", "cordova-cli");
         console.log("npm links are OK");


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

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