Annotate

squishy @ 122:1dfd28db10bd

Merge with MattJ
author Kim Alvefur <zash@zash.se>
date Mon, 08 Sep 2014 12:20:24 +0200
parent 120:f1166645a56c
parent 107:67ff8f55db4a
child 139:6909e479c56b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
73
1032eddcf35b squishy: see verse commit b5fd3292bdbd
Kim Alvefur <zash@zash.se>
parents: 64
diff changeset
1 local commands = {
1032eddcf35b squishy: see verse commit b5fd3292bdbd
Kim Alvefur <zash@zash.se>
parents: 64
diff changeset
2 "send";
120
f1166645a56c new sendfilecontent plugin
Marc Fauser
parents: 100
diff changeset
3 "sendfilecontent";
73
1032eddcf35b squishy: see verse commit b5fd3292bdbd
Kim Alvefur <zash@zash.se>
parents: 64
diff changeset
4 "receive";
1032eddcf35b squishy: see verse commit b5fd3292bdbd
Kim Alvefur <zash@zash.se>
parents: 64
diff changeset
5 "version";
102
16cdeb9cd879 Add clix module to send XMPP pings to JIDs
"Georg Lukas <georg@op-co.de>"
parents: 76
diff changeset
6 "ping";
73
1032eddcf35b squishy: see verse commit b5fd3292bdbd
Kim Alvefur <zash@zash.se>
parents: 64
diff changeset
7 "bounce";
1032eddcf35b squishy: see verse commit b5fd3292bdbd
Kim Alvefur <zash@zash.se>
parents: 64
diff changeset
8 "mirror";
1032eddcf35b squishy: see verse commit b5fd3292bdbd
Kim Alvefur <zash@zash.se>
parents: 64
diff changeset
9 "raw";
1032eddcf35b squishy: see verse commit b5fd3292bdbd
Kim Alvefur <zash@zash.se>
parents: 64
diff changeset
10 "roster";
1032eddcf35b squishy: see verse commit b5fd3292bdbd
Kim Alvefur <zash@zash.se>
parents: 64
diff changeset
11 "export";
1032eddcf35b squishy: see verse commit b5fd3292bdbd
Kim Alvefur <zash@zash.se>
parents: 64
diff changeset
12 "vcard";
74
4b64a556a2cd squishy: Add publish_atom and sendfile
Kim Alvefur <zash@zash.se>
parents: 73
diff changeset
13 "publish_atom";
4b64a556a2cd squishy: Add publish_atom and sendfile
Kim Alvefur <zash@zash.se>
parents: 73
diff changeset
14 "sendfile";
76
aa672fc46be1 squishy: Add clix.archive
Kim Alvefur <zash@zash.se>
parents: 74
diff changeset
15 "archive";
100
de5abce983d9 squish: Add presence command
Matthew Wild <mwild1@gmail.com>
parents: 76
diff changeset
16 "presence";
73
1032eddcf35b squishy: see verse commit b5fd3292bdbd
Kim Alvefur <zash@zash.se>
parents: 64
diff changeset
17 }
1032eddcf35b squishy: see verse commit b5fd3292bdbd
Kim Alvefur <zash@zash.se>
parents: 64
diff changeset
18
1032eddcf35b squishy: see verse commit b5fd3292bdbd
Kim Alvefur <zash@zash.se>
parents: 64
diff changeset
19 for _, cmd in ipairs(commands) do
1032eddcf35b squishy: see verse commit b5fd3292bdbd
Kim Alvefur <zash@zash.se>
parents: 64
diff changeset
20 Module("clix."..cmd)("clix/"..cmd..".lua")
1032eddcf35b squishy: see verse commit b5fd3292bdbd
Kim Alvefur <zash@zash.se>
parents: 64
diff changeset
21 end
0
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
22
26
028c5ffc6d7c squish: Add --with-verse option to allow packing verse in as well
Matthew Wild <mwild1@gmail.com>
parents: 16
diff changeset
23 if GetOption "with-verse" then
028c5ffc6d7c squish: Add --with-verse option to allow packing verse in as well
Matthew Wild <mwild1@gmail.com>
parents: 16
diff changeset
24 Module("verse")(GetOption "with-verse");
028c5ffc6d7c squish: Add --with-verse option to allow packing verse in as well
Matthew Wild <mwild1@gmail.com>
parents: 16
diff changeset
25 end
028c5ffc6d7c squish: Add --with-verse option to allow packing verse in as well
Matthew Wild <mwild1@gmail.com>
parents: 16
diff changeset
26
0
ae83411a89c9 Initial commit
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
27 Main "clix.lua"
1
58c694492459 squish: Fix name conflict with clix directory
Matthew Wild <mwild1@gmail.com>
parents: 0
diff changeset
28
58c694492459 squish: Fix name conflict with clix directory
Matthew Wild <mwild1@gmail.com>
parents: 0
diff changeset
29 Option "executable"
58c694492459 squish: Fix name conflict with clix directory
Matthew Wild <mwild1@gmail.com>
parents: 0
diff changeset
30 Output "clix.bin"