Permalink
Browse files

Adapted for latest erm_xml interface

  • Loading branch information...
1 parent 248e833 commit bc695ccd8659d788549c319c4ae66f3dbc1b644c @ermine committed Oct 20, 2012
Showing with 722 additions and 535 deletions.
  1. +2 −1 INSTALL.txt
  2. +3 −3 _oasis
  3. +5 −1 _tags
  4. +0 −1 acl.ml
  5. +3 −0 common.ml
  6. +141 −146 config.ml
  7. +53 −11 conv_xml.ml
  8. +57 −29 hooks.ml
  9. +13 −11 iq.ml
  10. +13 −15 lang.ml
  11. +31 −27 muc.ml
  12. +2 −2 muc_log.ml
  13. +4 −4 plugin_admin.ml
  14. +2 −2 plugin_admin_muc.ml
  15. +4 −3 plugin_cerberus.ml
  16. +45 −45 plugin_command.ml
  17. +17 −13 plugin_globalstats.ml
  18. +3 −3 plugin_markov_sqlite3.ml
  19. +5 −3 plugin_ping.ml
  20. +6 −4 plugin_roulette.ml
  21. +3 −3 plugin_seen.ml
  22. +3 −3 plugin_talkers.ml
  23. +2 −2 plugin_translate.ml
  24. +29 −24 plugin_userinfo.ml
  25. +24 −21 plugin_vcard.ml
  26. +87 −86 plugin_vocabulary.ml
  27. +7 −7 plugin_yandex.ml
  28. +8 −7 setup.ml
  29. +150 −58 sulci.ml
View
@@ -1,5 +1,5 @@
(* OASIS_START *)
-(* DO NOT EDIT (digest: fb03d830a2563d92b3a2e6c84bcdb06a) *)
+(* DO NOT EDIT (digest: dbce27df4f075cc086074901a643f371) *)
This is the INSTALL file for the sulci distribution.
This package uses OASIS to generate its build system. See section OASIS for
@@ -24,6 +24,7 @@ In order to compile this package, you will need:
* pcre for executable sulci
* netclient for executable sulci
* json-static for executable sulci
+* erm_treap for executable sulci
Installing
==========
View
6 _oasis
@@ -1,6 +1,6 @@
OASISFormat: 0.2
Name: sulci
-Version: 2.0
+Version: 3.0
Synopsis: An Jabber/XMPP bot
Authors: Anastasia Gornostaeva
License: BSD3
@@ -34,8 +34,8 @@ Executable sulci
BuildDepends: threads, erm_brainfuck, erm_logger, erm_dehtml,
erm_scheduler, erm_strftime, erm_xml, erm_xmpp,
text, dynlink, sqlite3, ulex, pcre, netclient, dbm,
- json-static
- DataFiles: _build/tlds/tlds.db ($datadir/$pkg_name)/tlds,
+ json-static, erm_treap
+ DataFiles: _build/tlds/tlds.db ($datadir/$pkg_name/tlds),
_build/lang/*.htbl ($datadir/$pkg_name/lang),
sulci.conf ($sysconfdir)
View
6 _tags
@@ -1,3 +1,5 @@
+true: debug
+
<sulci.{ml,byte,native}>: use_lang, use_plugins
"find_url.ml": syntax_camlp4o, use_ulex.syntax
@@ -7,7 +9,7 @@
"plugin_google.ml": syntax_camlp4o, use_json_static.syntax
# OASIS_START
-# DO NOT EDIT (digest: b3f19dd8c4dab941633c859a09fd6c2f)
+# DO NOT EDIT (digest: d1ea6a4e9b5345293d4145a326acfbb9)
# Ignore VCS directories, you can use the same kind of rule outside
# OASIS_START/STOP if you want to exclude directories that contains
# useless stuff for the build process
@@ -42,6 +44,7 @@
<sulci.{native,byte}>: pkg_netclient
<sulci.{native,byte}>: pkg_dbm
<sulci.{native,byte}>: pkg_json-static
+<sulci.{native,byte}>: pkg_erm_treap
<*.ml{,i}>: pkg_threads
<*.ml{,i}>: pkg_erm_brainfuck
<*.ml{,i}>: pkg_erm_logger
@@ -58,4 +61,5 @@
<*.ml{,i}>: pkg_netclient
<*.ml{,i}>: pkg_dbm
<*.ml{,i}>: pkg_json-static
+<*.ml{,i}>: pkg_erm_treap
# OASIS_STOP
View
1 acl.ml
@@ -3,7 +3,6 @@
*)
open JID
-open Hooks
let acls : ((JID.t * string) list) ref = ref []
View
@@ -156,3 +156,6 @@ exception DNSPrepError
let dnsprep str =
if String.contains str '.' then ()
else raise DNSPrepError
+
+let opt_try f x = try Some (f x) with Not_found -> None
+
Oops, something went wrong.

0 comments on commit bc695cc

Please sign in to comment.