Annotate

squishy @ 156:ab0f0326b2b4

Merge with Zash
author Matthew Wild <mwild1@gmail.com>
date Sat, 20 Nov 2010 16:33:34 +0000
parent 154:a4dc96890729
parent 155:9c9af7a196ed
child 157:7c47e5639c00
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
26
6c5fab6c11cf Rename verse2 -> verse
Matthew Wild <mwild1@gmail.com>
parents: 24
diff changeset
1 Output "verse.lua"
0
caf260adc453 Beginning of new verse
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
2
caf260adc453 Beginning of new verse
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
3 -- Verse-specific versions of libraries
caf260adc453 Beginning of new verse
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
4 Module "util.encodings" "libs/encodings.lua"
131
1c30dd51ca6b squishy: Add util.hashes [libs/hashes.lua]
Matthew Wild <mwild1@gmail.com>
parents: 123
diff changeset
5 Module "util.hashes" "libs/hashes.lua"
0
caf260adc453 Beginning of new verse
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
6 Module "util.logger" "libs/logger.lua"
136
3a85c62f544c squishy: Re-organise and add net.dns, net.adns and util.ztact
Matthew Wild <mwild1@gmail.com>
parents: 134
diff changeset
7 Module "util.sha1" "util/sha1.lua"
3a85c62f544c squishy: Re-organise and add net.dns, net.adns and util.ztact
Matthew Wild <mwild1@gmail.com>
parents: 134
diff changeset
8 Module "lib.adhoc" "libs/adhoc.lib.lua"
0
caf260adc453 Beginning of new verse
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
9
caf260adc453 Beginning of new verse
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
10 -- Prosody libraries
caf260adc453 Beginning of new verse
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
11 AutoFetchURL "http://prosody.im/tip/?"
caf260adc453 Beginning of new verse
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
12
caf260adc453 Beginning of new verse
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
13 Module "util.stanza" "util/stanza.lua"
18
f15de643f502 squishy: Add util.timer
Matthew Wild <mwild1@gmail.com>
parents: 14
diff changeset
14 Module "util.timer" "util/timer.lua"
0
caf260adc453 Beginning of new verse
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
15 Module "util.termcolours" "util/termcolours.lua"
24
db0ed736785a squishy: Add util.uuid dependency
Matthew Wild <mwild1@gmail.com>
parents: 19
diff changeset
16 Module "util.uuid" "util/uuid.lua"
136
3a85c62f544c squishy: Re-organise and add net.dns, net.adns and util.ztact
Matthew Wild <mwild1@gmail.com>
parents: 134
diff changeset
17 Module "net.dns" "net/dns.lua"
3a85c62f544c squishy: Re-organise and add net.dns, net.adns and util.ztact
Matthew Wild <mwild1@gmail.com>
parents: 134
diff changeset
18 Module "net.adns" "net/adns.lua"
30
9c96318913f7 Revert module names throughout to their Prosody equivalents
Matthew Wild <mwild1@gmail.com>
parents: 26
diff changeset
19 Module "net.server" "net/server_select.lua"
47
3ebffb4fc48c verse.client, squishy: Rename "xmlhandlers" to "core.xmlhandlers" in line with Prosody's structure
Matthew Wild <mwild1@gmail.com>
parents: 35
diff changeset
20 Module "core.xmlhandlers" "core/xmlhandlers.lua"
30
9c96318913f7 Revert module names throughout to their Prosody equivalents
Matthew Wild <mwild1@gmail.com>
parents: 26
diff changeset
21 Module "util.jid" "util/jid.lua"
9c96318913f7 Revert module names throughout to their Prosody equivalents
Matthew Wild <mwild1@gmail.com>
parents: 26
diff changeset
22 Module "util.events" "util/events.lua"
123
8a079aa70b84 util.dataforms, squishy: Add util.dataforms library
Matthew Wild <mwild1@gmail.com>
parents: 116
diff changeset
23 Module "util.dataforms" "util/dataforms.lua"
136
3a85c62f544c squishy: Re-organise and add net.dns, net.adns and util.ztact
Matthew Wild <mwild1@gmail.com>
parents: 134
diff changeset
24 Module "util.ztact" "util/ztact.lua"
116
151c8cc776df verse.plugins.adhoc: XEP-0050 Ad-hoc commands plugin
Matthew Wild <mwild1@gmail.com>
parents: 114
diff changeset
25
14
53246b2b933b squish: Add plugins
Matthew Wild <mwild1@gmail.com>
parents: 7
diff changeset
26 -- Verse plugins
71
5b74d155036d verse.plugins.compression: Support for stream compression (requires brimworks lua-zlib)
Matthew Wild <mwild1@gmail.com>
parents: 61
diff changeset
27 Module "verse.plugins.tls" "plugins/tls.lua"
5b74d155036d verse.plugins.compression: Support for stream compression (requires brimworks lua-zlib)
Matthew Wild <mwild1@gmail.com>
parents: 61
diff changeset
28 Module "verse.plugins.sasl" "plugins/sasl.lua"
5b74d155036d verse.plugins.compression: Support for stream compression (requires brimworks lua-zlib)
Matthew Wild <mwild1@gmail.com>
parents: 61
diff changeset
29 Module "verse.plugins.bind" "plugins/bind.lua"
153
f7c705485a2a squishy: Add legacy plugin
Matthew Wild <mwild1@gmail.com>
parents: 147
diff changeset
30 Module "verse.plugins.legacy" "plugins/legacy.lua"
154
a4dc96890729 plugins.pubsub, squishy: New pubsub plugin (basic)
Matthew Wild <mwild1@gmail.com>
parents: 153
diff changeset
31 Module "verse.plugins.pubsub" "plugins/pubsub.lua"
71
5b74d155036d verse.plugins.compression: Support for stream compression (requires brimworks lua-zlib)
Matthew Wild <mwild1@gmail.com>
parents: 61
diff changeset
32 Module "verse.plugins.version" "plugins/version.lua"
5b74d155036d verse.plugins.compression: Support for stream compression (requires brimworks lua-zlib)
Matthew Wild <mwild1@gmail.com>
parents: 61
diff changeset
33 Module "verse.plugins.ping" "plugins/ping.lua"
5b74d155036d verse.plugins.compression: Support for stream compression (requires brimworks lua-zlib)
Matthew Wild <mwild1@gmail.com>
parents: 61
diff changeset
34 Module "verse.plugins.session" "plugins/session.lua"
5b74d155036d verse.plugins.compression: Support for stream compression (requires brimworks lua-zlib)
Matthew Wild <mwild1@gmail.com>
parents: 61
diff changeset
35 Module "verse.plugins.compression" "plugins/compression.lua"
80
336864e83991 verse.plugins.blocking, squishy: New plugin for XEP-0191: Simple Communications Blocking
Matthew Wild <mwild1@gmail.com>
parents: 71
diff changeset
36 Module "verse.plugins.blocking" "plugins/blocking.lua"
106
7d293830f4a4 squishy: Add proxy65, jingle, jingle_ft, jingle_s5b, disco plugins
Matthew Wild <mwild1@gmail.com>
parents: 92
diff changeset
37 Module "verse.plugins.proxy65" "plugins/proxy65.lua"
7d293830f4a4 squishy: Add proxy65, jingle, jingle_ft, jingle_s5b, disco plugins
Matthew Wild <mwild1@gmail.com>
parents: 92
diff changeset
38 Module "verse.plugins.jingle" "plugins/jingle.lua"
7d293830f4a4 squishy: Add proxy65, jingle, jingle_ft, jingle_s5b, disco plugins
Matthew Wild <mwild1@gmail.com>
parents: 92
diff changeset
39 Module "verse.plugins.jingle_ft" "plugins/jingle_ft.lua"
7d293830f4a4 squishy: Add proxy65, jingle, jingle_ft, jingle_s5b, disco plugins
Matthew Wild <mwild1@gmail.com>
parents: 92
diff changeset
40 Module "verse.plugins.jingle_s5b" "plugins/jingle_s5b.lua"
7d293830f4a4 squishy: Add proxy65, jingle, jingle_ft, jingle_s5b, disco plugins
Matthew Wild <mwild1@gmail.com>
parents: 92
diff changeset
41 Module "verse.plugins.disco" "plugins/disco.lua"
114
37f5966cff15 verse.plugins.pep: New plugin to add an API for sending and catching PEP events
Matthew Wild <mwild1@gmail.com>
parents: 106
diff changeset
42 Module "verse.plugins.pep" "plugins/pep.lua"
116
151c8cc776df verse.plugins.adhoc: XEP-0050 Ad-hoc commands plugin
Matthew Wild <mwild1@gmail.com>
parents: 114
diff changeset
43 Module "verse.plugins.adhoc" "plugins/adhoc.lua"
155
9c9af7a196ed plugins.private, squishy: Allow setting the storage node, and not just child(s). And add to squishy.
Kim Alvefur <zash@zash.se>
parents: 153
diff changeset
44 Module "verse.plugins.private" "plugins/private.lua"
14
53246b2b933b squish: Add plugins
Matthew Wild <mwild1@gmail.com>
parents: 7
diff changeset
45
92
dcccef33f0eb squishy: Build in BOSH and HTTP by default, --no-bosh to disable
Matthew Wild <mwild1@gmail.com>
parents: 90
diff changeset
46 if GetOption "bosh" ~= false then
90
aa0b78053cec squishy: Add --with-bosh option to squish with verse.bosh and necessarylibraries
Matthew Wild <mwild1@gmail.com>
parents: 80
diff changeset
47 Module "net.httpclient_listener" "net/httpclient_listener.lua"
aa0b78053cec squishy: Add --with-bosh option to squish with verse.bosh and necessarylibraries
Matthew Wild <mwild1@gmail.com>
parents: 80
diff changeset
48 Module "net.connlisteners" "net/connlisteners.lua"
aa0b78053cec squishy: Add --with-bosh option to squish with verse.bosh and necessarylibraries
Matthew Wild <mwild1@gmail.com>
parents: 80
diff changeset
49 Module "net.http" "net/http.lua"
aa0b78053cec squishy: Add --with-bosh option to squish with verse.bosh and necessarylibraries
Matthew Wild <mwild1@gmail.com>
parents: 80
diff changeset
50
aa0b78053cec squishy: Add --with-bosh option to squish with verse.bosh and necessarylibraries
Matthew Wild <mwild1@gmail.com>
parents: 80
diff changeset
51 Module "verse.bosh" "bosh.lua"
aa0b78053cec squishy: Add --with-bosh option to squish with verse.bosh and necessarylibraries
Matthew Wild <mwild1@gmail.com>
parents: 80
diff changeset
52 end
aa0b78053cec squishy: Add --with-bosh option to squish with verse.bosh and necessarylibraries
Matthew Wild <mwild1@gmail.com>
parents: 80
diff changeset
53
134
2101acbb27c4 squishy: Use --internal-bit-module to squish with the pure-Lua bit library
Matthew Wild <mwild1@gmail.com>
parents: 131
diff changeset
54 if GetOption "internal-bit-module" then
2101acbb27c4 squishy: Use --internal-bit-module to squish with the pure-Lua bit library
Matthew Wild <mwild1@gmail.com>
parents: 131
diff changeset
55 Module "bit" "libs/bit.lua"
2101acbb27c4 squishy: Use --internal-bit-module to squish with the pure-Lua bit library
Matthew Wild <mwild1@gmail.com>
parents: 131
diff changeset
56 end
2101acbb27c4 squishy: Use --internal-bit-module to squish with the pure-Lua bit library
Matthew Wild <mwild1@gmail.com>
parents: 131
diff changeset
57
26
6c5fab6c11cf Rename verse2 -> verse
Matthew Wild <mwild1@gmail.com>
parents: 24
diff changeset
58 Module "verse.client" "client.lua"
138
35971523c8fc squishy: Add verse.component
Matthew Wild <mwild1@gmail.com>
parents: 136
diff changeset
59 Module "verse.component" "component.lua"
0
caf260adc453 Beginning of new verse
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
60
caf260adc453 Beginning of new verse
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
61 -- Main verse file
caf260adc453 Beginning of new verse
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
62 Main "init.lua"