You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ripple.apache.org by gt...@apache.org on 2013/03/11 16:11:06 UTC

[17/50] [abbrv] git commit: The `npm` build target is unnecessary.

The `npm` build target is unnecessary.

It felt consistent to have one when there was a `rim.npm` build target,
but now that is no longer needed, you can install the npm package the
usual way.

    npm install -g .


Project: http://git-wip-us.apache.org/repos/asf/incubator-ripple/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ripple/commit/a8179c93
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ripple/tree/a8179c93
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ripple/diff/a8179c93

Branch: refs/heads/master
Commit: a8179c934a150e55183391eb695e5ac3a6b2e8e1
Parents: de6bd6b
Author: Brent Lintner <br...@gmail.com>
Authored: Thu Dec 13 15:58:20 2012 -0500
Committer: Brent Lintner <br...@gmail.com>
Committed: Wed Feb 6 16:46:26 2013 -0500

----------------------------------------------------------------------
 HACKING.md           |    2 +-
 README.md            |    4 +-
 build/build.js       |    5 ----
 build/targets/npm.js |   57 ---------------------------------------------
 4 files changed, 3 insertions(+), 65 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ripple/blob/a8179c93/HACKING.md
----------------------------------------------------------------------
diff --git a/HACKING.md b/HACKING.md
index 44dbd5d..0cbad28 100644
--- a/HACKING.md
+++ b/HACKING.md
@@ -174,4 +174,4 @@ Essentially, it has its own navigation bar, and can be loaded as a static web pa
 
 You can package the `cli` and `server` components into an NPM package.
 
-`npm install -g pkg/npm` to install.
+`npm install -g .` to install.

http://git-wip-us.apache.org/repos/asf/incubator-ripple/blob/a8179c93/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index fbbf172..54c669b 100644
--- a/README.md
+++ b/README.md
@@ -77,7 +77,7 @@ Eventually, this will be available on the NPM registry. For now (to install):
     cd ripple
     ./configure
     jake
-    npm install -g pkg/npm
+    npm install -g .
 
 This will install a global script called `ripple`. To see usage, run:
 
@@ -85,7 +85,7 @@ This will install a global script called `ripple`. To see usage, run:
 
 Note: If you don't want to use NPM, you can just do this:
 
-    node pkg/npm/bin/ripple help
+    node bin/ripple help
 
 ## Contributing
 

http://git-wip-us.apache.org/repos/asf/incubator-ripple/blob/a8179c93/build/build.js
----------------------------------------------------------------------
diff --git a/build/build.js b/build/build.js
index 5dfcacf..0d3f9b8 100644
--- a/build/build.js
+++ b/build/build.js
@@ -22,7 +22,6 @@ var fs = require('fs'),
     compress = require('./compress'),
     chromeExt = require('./targets/chrome.extension'),
     rimChromeExt = require('./targets/rim.chrome.extension'),
-    npm = require('./targets/npm'),
     cordova = require('./targets/cordova'),
     web = require('./targets/web');
 
@@ -64,16 +63,12 @@ module.exports = _handle(function (ext, opts) {
     case 'rim.chrome.extension':
         build.andThen(rimChromeExt);
         break;
-    case 'npm':
-        build.andThen(npm);
-        break;
     case 'cordova':
         build.andThen(cordova);
         break;
     default:
         build.andThen(chromeExt)
              .andThen(rimChromeExt)
-             .andThen(npm)
              .andThen(web)
              .andThen(cordova);
     }

http://git-wip-us.apache.org/repos/asf/incubator-ripple/blob/a8179c93/build/targets/npm.js
----------------------------------------------------------------------
diff --git a/build/targets/npm.js b/build/targets/npm.js
deleted file mode 100644
index 55c0c56..0000000
--- a/build/targets/npm.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *  Copyright 2012 Research In Motion Limited.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-var childProcess = require('child_process'),
-    path = require('path'),
-    packageinfo = require('./../../package'),
-    jWorkflow = require('jWorkflow'),
-    _c = require('./../conf');
-
-module.exports = function (src, baton) {
-    baton.take();
-
-    var altFiles = ["package.json"],
-        order = jWorkflow.order();
-
-    order.andThen(function (prev, subbaton) {
-        subbaton.take();
-        childProcess.exec('mkdir ' + _c.DEPLOY + 'npm', function () {
-            childProcess.exec('mkdir ' + _c.DEPLOY + 'npm/thirdparty', function () {
-                childProcess.exec('mkdir ' + _c.DEPLOY + 'npm/assets', function () {
-                    childProcess.exec('mkdir ' + _c.DEPLOY + 'npm/lib', function () {
-                        subbaton.pass();
-                    });
-                });
-            });
-        });
-    });
-
-    packageinfo.files.concat(altFiles).forEach(function (p) {
-        order.andThen(function (prev, subbaton) {
-            subbaton.take();
-
-            var cmd = 'cp -r ' + path.resolve(path.join(_c.ROOT, p)) +
-                ' ' + _c.DEPLOY + 'npm/' + p;
-
-            childProcess.exec(cmd, function () {
-                subbaton.pass();
-            });
-        });
-    });
-
-    order.start(function () {
-        baton.pass(src);
-    });
-};