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

Use newest (unreleased) otr.js so that we can specify paths ourselves

Browse Source
This commit is contained in:
JC Brand 2013-10-03 10:18:07 +02:00
parent e85eb66771
commit 8f14c32b48
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gruntfile.js
View File

@ -96,7 +96,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', exec('./node_modules/.bin/bower update && cd ./components/strophe && make normal && cd ../otr && npm install && make build',
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);

2
bower.json
View File

@ -17,7 +17,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": "~0.2.5", "otr": "https://github.com/arlolra/otr.git#e6cc5c247569df1118de8dd86ee57c2d1b3ce91e",
"crypto-js": "~3.1.2", "crypto-js": "~3.1.2",
"almond": "~0.2.6" "almond": "~0.2.6"
}, },

2
converse.js
View File

@ -13,7 +13,7 @@
} }
if (typeof define === 'function' && define.amd) { if (typeof define === 'function' && define.amd) {
define("converse", [ define("converse", [
"components/otr/build/otr", "otr",
"crypto.aes", "crypto.aes",
"locales", "locales",
"backbone.localStorage", "backbone.localStorage",

5
main.js
View File

@ -11,6 +11,11 @@ require.config({
"strophe.roster": "components/strophe.roster/index", "strophe.roster": "components/strophe.roster/index",
"strophe.vcard": "components/strophe.vcard/index", "strophe.vcard": "components/strophe.vcard/index",
"strophe.disco": "components/strophe.disco/index", "strophe.disco": "components/strophe.disco/index",
"otr": "components/otr/build/otr",
"bigint": "components/otr/build/dep/bigint",
"crypto": "components/otr/build/dep/crypto",
"eventemitter": "components/otr/build/dep/eventemitter",
"salsa20": "components/otr/build/dep/salsa20",
"crypto.aes": "components/crypto-js/build/rollups/aes" "crypto.aes": "components/crypto-js/build/rollups/aes"
}, },