Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
24
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Use new otr.js release 0.27

Browse Source
This commit is contained in:
JC Brand 2013-11-02 10:15:26 +02:00
parent 2bd27282ce
commit f9c096c061
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gruntfile.js
View File

@ -55,7 +55,7 @@ module.exports = function(grunt) {
var done = this.async(); var done = this.async();
var child_process = require('child_process'); var child_process = require('child_process');
var exec = child_process.exec; var exec = child_process.exec;
exec('./node_modules/.bin/bower update && cd ./components/strophe && make normal && cd ../otr && npm install && make build', exec('./node_modules/.bin/bower update && cd ./components/strophe && make normal',
function (err, stdout, stderr) { function (err, stdout, stderr) {
if (err) { if (err) {
grunt.log.write('build failed with error code '+err.code); grunt.log.write('build failed with error code '+err.code);

5
bower.json
View File

@ -2,7 +2,8 @@
"name": "converse", "name": "converse",
"version": "0.6.6", "version": "0.6.6",
"devDependencies": { "devDependencies": {
"jasmine": "https://github.com/jcbrand/jasmine.git#1_3_x" "jasmine": "https://github.com/jcbrand/jasmine.git#1_3_x",
"otr": "0.2.7"
}, },
"dependencies": { "dependencies": {
"requirejs": "2.1.8", "requirejs": "2.1.8",
@ -17,7 +18,7 @@
"strophe.vcard": "https://raw.github.com/jcbrand/strophejs-plugins/75c8693992bc357c699b6d615eeb396e799f5c02/vcard/strophe.vcard.js", "strophe.vcard": "https://raw.github.com/jcbrand/strophejs-plugins/75c8693992bc357c699b6d615eeb396e799f5c02/vcard/strophe.vcard.js",
"strophe.disco": "https://raw.github.com/jcbrand/strophejs-plugins/75c8693992bc357c699b6d615eeb396e799f5c02/disco/strophe.disco.js", "strophe.disco": "https://raw.github.com/jcbrand/strophejs-plugins/75c8693992bc357c699b6d615eeb396e799f5c02/disco/strophe.disco.js",
"strophe.muc": "https://raw.github.com/jcbrand/strophejs-plugins/75c8693992bc357c699b6d615eeb396e799f5c02/muc/strophe.muc.js", "strophe.muc": "https://raw.github.com/jcbrand/strophejs-plugins/75c8693992bc357c699b6d615eeb396e799f5c02/muc/strophe.muc.js",
"otr": "https://github.com/arlolra/otr.git#e6cc5c247569df1118de8dd86ee57c2d1b3ce91e", "otr": "0.2.7",
"crypto-js": "~3.1.2", "crypto-js": "~3.1.2",
"almond": "~0.2.6" "almond": "~0.2.6"
}, },