Skip to content

Commit

Permalink
Simply install in contributing. Change websocket dep
Browse files Browse the repository at this point in the history
  • Loading branch information
gyeates committed Sep 12, 2014
1 parent 7fd5113 commit 0c1d82f
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 59 deletions.
18 changes: 18 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,34 @@ roslibjs Build Setup

1. Install [Node.js](http://nodejs.org/) for your environment
2. Install the build task runner, [Grunt](http://gruntjs.com/)

```sh
$ [sudo] npm install -g grunt
```

3. Install the [Cario](http://cairographics.org/) graphics library
- [System specific instaructions](https://github.com/Automattic/node-canvas/wiki/_pages)
4. Install the dependencies and build dependencies

```sh
$ cd /path/to/roslibjs/
$ [sudo] npm install
```


Easy installation for Ubuntu. `cd` to your local copy of this project.

```sh
# Install Node.js and NPM
curl -sL https://deb.nodesource.com/setup | sudo bash -
sudo apt-get install nodejs

# Install Cario
sudo apt-get install libcairo2-dev libjpeg8-dev libpango1.0-dev libgif-dev build-essential g++

# Install this projects Deps
sudo npm install
```

### Build with Grunt

Expand Down
4 changes: 2 additions & 2 deletions build/roslib.js
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,7 @@ module.exports = Param;
var Canvas = require('canvas');
var Image = Canvas.Image || global.Image;
var EventEmitter2 = require('eventemitter2').EventEmitter2;
var WebSocket = require('../util/WebSocket');
var WebSocket = require('ws');

var Service = require('./Service');
var ServiceRequest = require('./ServiceRequest');
Expand Down Expand Up @@ -987,7 +987,7 @@ Ros.prototype.decodeTypeDefs = function(defs) {

module.exports = Ros;
}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
},{"../util/WebSocket":31,"./Service":10,"./ServiceRequest":11,"canvas":32,"eventemitter2":30}],10:[function(require,module,exports){
},{"./Service":10,"./ServiceRequest":11,"canvas":32,"eventemitter2":30,"ws":31}],10:[function(require,module,exports){
/**
* @author Brandon Alexander - baalexander@gmail.com
*/
Expand Down
2 changes: 1 addition & 1 deletion build/roslib.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
"dependencies": {
"canvas": "1.1.3",
"eventemitter2": "~0.4.13",
"nodejs-websocket": "~0.1.4",
"object-assign": "^1.0.0",
"ws": "^0.4.32",
"xmlshim": "~0.0.9"
},
"browser": {
"canvas": "./src/util/shim/canvas.js",
"eventemitter2": "./src/util/shim/EventEmitter2.js",
"./src/util/WebSocket.js": "./src/util/shim/WebSocket.js",
"ws": "./src/util/shim/WebSocket.js",
"./src/util/DOMParser.js": "./src/util/shim/DOMParser.js"
},
"description": "roslibjs",
Expand Down
2 changes: 1 addition & 1 deletion src/core/Ros.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
var Canvas = require('canvas');
var Image = Canvas.Image || global.Image;
var EventEmitter2 = require('eventemitter2').EventEmitter2;
var WebSocket = require('../util/WebSocket');
var WebSocket = require('ws');

var Service = require('./Service');
var ServiceRequest = require('./ServiceRequest');
Expand Down
53 changes: 0 additions & 53 deletions src/util/WebSocket.js

This file was deleted.

0 comments on commit 0c1d82f

Please sign in to comment.