From 16a508cdb9906d0d9a649a819721b2efe87c7b83 Mon Sep 17 00:00:00 2001 From: Badlop Date: Tue, 30 Sep 2008 16:12:05 +0000 Subject: [PATCH] * src/*/Makefile.win32: Provide explicit beam filenames because nmake does not accept wildcards (thanks to Attila Vangel)(EJAB-543) SVN Revision: 1588 --- ChangeLog | 6 ++++++ doc/guide.html | 19 +++++++++++++------ src/ejabberd_zlib/Makefile.win32 | 3 +-- src/eldap/Makefile.win32 | 3 +-- src/mod_irc/Makefile.win32 | 3 +-- src/mod_muc/Makefile.win32 | 3 +-- src/mod_proxy65/Makefile.win32 | 5 ++--- src/mod_pubsub/Makefile.win32 | 17 +++++++++++++++-- src/odbc/Makefile.win32 | 3 +-- src/stringprep/Makefile.win32 | 3 +-- src/tls/Makefile.win32 | 3 +-- src/web/Makefile.win32 | 12 ++++++++++-- 12 files changed, 53 insertions(+), 27 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3a1b05691..fd4f9503b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-09-30 Badlop + + * src/*/Makefile.win32: Provide explicit beam filenames because + nmake does not accept wildcards (thanks to Attila + Vangel)(EJAB-543) + 2008-09-24 Christophe Romain * src/mod_pubsub/mod_pubsub.erl: Allow PEP node type to be mapped with diff --git a/doc/guide.html b/doc/guide.html index 97e0f9248..648edb5f9 100644 --- a/doc/guide.html +++ b/doc/guide.html @@ -635,7 +635,7 @@ Handles c2s connections.
Handles incoming s2s connections.
Options: inet6, ip, max_stanza_size
ejabberd_service
-Interacts with external components +Interacts with an external component (as defined in the Jabber Component Protocol (XEP-0114).
Options: access, hosts, inet6, ip, shaper, service_check_from @@ -655,9 +655,10 @@ used to disable control on the from field on packets send by an external components. The option can be either true or false. The default value is true which conforms to XEP-0114.
{hosts, [Hostnames], [HostOptions]}
-This option of ejabberd_service allows to define one or more hostnames -of external Jabber components that provide a service. -In HostOptions it is possible to define the password required to those components +The external Jabber component that connects to this ejabberd_service +can serve one or more hostnames. +In HostOptions you can define options for the component; +currently the only allowed option is the password required to the component when attempt to connect to ejabberd: {password, Secret}. Note that you cannot define in a single ejabberd_service components of different services: add an ejabberd_service for each service, @@ -2055,7 +2056,9 @@ change nickname. status text in presence updates. If disallowed, the status text is stripped before broadcasting the presence update to all the room occupants. -
{anonymous, true}
Occupants are allowed to see the real JIDs of other occupants. +
{anonymous, true}
The room is anonymous: +occupants don’t see the real JIDs of other occupants. +Note that the room moderators can always see the real JIDs of the occupants.
{logging, false}
The public messages are logged using mod_muc_log.
{max_users, 200}
Maximum number of occupants in the room.
{members_by_default, true}
The occupants that enter the room are participants by default, so they have ’voice’. @@ -3184,11 +3187,15 @@ Copy ~ejabberd/.erlang.cookie file from first to second.

(alt) You can also add ‘-cookie content_of_.erlang.cookie’ option to all ‘erl’ commands below.

  • On second run the following command as the ejabberd daemon user, in the working directory of ejabberd:
    erl -sname ejabberd \
+    -mnesia dir "/var/lib/ejabberd/" \
     -mnesia extra_db_nodes "['ejabberd@first']" \
     -s mnesia

    This will start Mnesia serving the same database as ejabberd@first. You can check this by running the command ‘mnesia:info().’. You -should see a lot of remote tables and a line like the following:

    running db nodes   = [ejabberd@first, ejabberd@second]
+should see a lot of remote tables and a line like the following:
    Note: the Mnesia directory may be different in your system.
+To know where does ejabberd expect Mnesia to be installed by default,
+call 4.1 without options and it will show some help,
+including the Mnesia database spool dir.
    running db nodes   = [ejabberd@first, ejabberd@second]
  • Now run the following in the same ‘erl’ session:
    mnesia:change_table_copy_type(schema, node(), disc_copies).

    This will create local disc storage for the database.

    (alt) Change storage type of the scheme table to ‘RAM and disc copy’ on the second node via the Web Admin.

  • Now you can add replicas of various tables to this node with diff --git a/src/ejabberd_zlib/Makefile.win32 b/src/ejabberd_zlib/Makefile.win32 index bd9c9d561..c13383fa8 100644 --- a/src/ejabberd_zlib/Makefile.win32 +++ b/src/ejabberd_zlib/Makefile.win32 @@ -4,8 +4,7 @@ include ..\Makefile.inc EFLAGS = -I .. -pz .. OUTDIR = .. -SOURCES = $(wildcard *.erl) -BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam)) +BEAMS = ..\ejabberd_zlib.beam SOURCE = ejabberd_zlib_drv.c OBJECT = ejabberd_zlib_drv.o diff --git a/src/eldap/Makefile.win32 b/src/eldap/Makefile.win32 index b5bdbcf14..9733055f9 100644 --- a/src/eldap/Makefile.win32 +++ b/src/eldap/Makefile.win32 @@ -4,8 +4,7 @@ include ..\Makefile.inc EFLAGS = -I .. -pz .. OUTDIR = .. -SOURCES = $(wildcard *.erl) -BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam)) +BEAMS = ..\eldap.beam ..\eldap_filter.beam ..\eldap_pool.beam ..\eldap_utils.beam ALL : $(BEAMS) diff --git a/src/mod_irc/Makefile.win32 b/src/mod_irc/Makefile.win32 index 28fc15e9c..9c22f43f1 100644 --- a/src/mod_irc/Makefile.win32 +++ b/src/mod_irc/Makefile.win32 @@ -4,8 +4,7 @@ include ..\Makefile.inc EFLAGS = -I .. -pz .. OUTDIR = .. -SOURCES = $(wildcard *.erl) -BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam)) +BEAMS = ..\iconv.beam ..\mod_irc.beam ..\mod_irc_connection.beam SOURCE = iconv_erl.c OBJECT = iconv_erl.o diff --git a/src/mod_muc/Makefile.win32 b/src/mod_muc/Makefile.win32 index e53f9b7f5..5107b1069 100644 --- a/src/mod_muc/Makefile.win32 +++ b/src/mod_muc/Makefile.win32 @@ -4,8 +4,7 @@ include ..\Makefile.inc EFLAGS = -I .. -pz .. OUTDIR = .. -SOURCES = $(wildcard *.erl) -BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam)) +BEAMS = ..\mod_muc.beam ..\mod_muc_log.beam ..\mod_muc_room.beam ALL : $(BEAMS) diff --git a/src/mod_proxy65/Makefile.win32 b/src/mod_proxy65/Makefile.win32 index 718dd0c70..7683097d3 100644 --- a/src/mod_proxy65/Makefile.win32 +++ b/src/mod_proxy65/Makefile.win32 @@ -4,8 +4,7 @@ include ..\Makefile.inc EFLAGS = -I .. -pz .. OUTDIR = .. -SOURCES = $(wildcard *.erl) -BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam)) +BEAMS = ..\mod_proxy65.beam ..\mod_proxy65_lib.beam ..\mod_proxy65_service.beam ..\mod_proxy65_sm.beam ..\mod_proxy65_stream.beam ALL : $(BEAMS) @@ -19,7 +18,7 @@ $(OUTDIR)\mod_proxy65_service.beam : mod_proxy65_service.erl erlc -W $(EFLAGS) -o $(OUTDIR) mod_proxy65_service.erl $(OUTDIR)\mod_proxy65_sm.beam : mod_proxy65_sm.erl - erlc -W $(EFLAGS) -o $(OUTDIR) mod_mod_proxy65_sm.erl + erlc -W $(EFLAGS) -o $(OUTDIR) mod_proxy65_sm.erl $(OUTDIR)\mod_proxy65_stream.beam : mod_proxy65_stream.erl erlc -W $(EFLAGS) -o $(OUTDIR) mod_proxy65_stream.erl diff --git a/src/mod_pubsub/Makefile.win32 b/src/mod_pubsub/Makefile.win32 index f68375ccd..f981329c9 100644 --- a/src/mod_pubsub/Makefile.win32 +++ b/src/mod_pubsub/Makefile.win32 @@ -4,8 +4,7 @@ include ..\Makefile.inc EFLAGS = -I .. -pz .. OUTDIR = .. -SOURCES = $(wildcard *.erl) -BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam)) +BEAMS = ..\gen_pubsub_node.beam ..\gen_pubsub_nodetree.beam ..\mod_pubsub.beam ..\nodetree_default.beam ..\nodetree_virtual.beam ..\node_buddy.beam ..\node_club.beam ..\node_default.beam ..\node_dispatch.beam ..\node_pep.beam ..\node_private.beam ..\node_public.beam ALL : $(BEAMS) @@ -27,9 +26,23 @@ $(OUTDIR)\nodetree_default.beam : nodetree_default.erl $(OUTDIR)\nodetree_virtual.beam : nodetree_virtual.erl erlc -W $(EFLAGS) -o $(OUTDIR) nodetree_virtual.erl +$(OUTDIR)\node_buddy.beam : node_buddy.erl + erlc -W $(EFLAGS) -o $(OUTDIR) node_buddy.erl + +$(OUTDIR)\node_club.beam : node_club.erl + erlc -W $(EFLAGS) -o $(OUTDIR) node_club.erl + $(OUTDIR)\node_default.beam : node_default.erl erlc -W $(EFLAGS) -o $(OUTDIR) node_default.erl +$(OUTDIR)\node_dispatch.beam : node_dispatch.erl + erlc -W $(EFLAGS) -o $(OUTDIR) node_dispatch.erl + $(OUTDIR)\node_pep.beam : node_pep.erl erlc -W $(EFLAGS) -o $(OUTDIR) node_pep.erl +$(OUTDIR)\node_private.beam : node_private.erl + erlc -W $(EFLAGS) -o $(OUTDIR) node_private.erl + +$(OUTDIR)\node_public.beam : node_public.erl + erlc -W $(EFLAGS) -o $(OUTDIR) node_public.erl diff --git a/src/odbc/Makefile.win32 b/src/odbc/Makefile.win32 index 13b54fb2f..2775468b7 100644 --- a/src/odbc/Makefile.win32 +++ b/src/odbc/Makefile.win32 @@ -4,8 +4,7 @@ include ..\Makefile.inc EFLAGS = -I .. -pz .. OUTDIR = .. -SOURCES = $(wildcard *.erl) -BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam)) +BEAMS = ..\ejabberd_odbc.beam ..\ejabberd_odbc_sup.beam ..\odbc_queries.beam ALL : $(BEAMS) diff --git a/src/stringprep/Makefile.win32 b/src/stringprep/Makefile.win32 index 23f493ff6..60ccb416c 100644 --- a/src/stringprep/Makefile.win32 +++ b/src/stringprep/Makefile.win32 @@ -4,8 +4,7 @@ include ..\Makefile.inc EFLAGS = -I .. -pz .. OUTDIR = .. -SOURCES = $(wildcard *.erl) -BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam)) +BEAMS = ..\stringprep.beam ..\stringprep_sup.beam SOURCE = stringprep_drv.c AUXIL = uni_data.c uni_norm.c diff --git a/src/tls/Makefile.win32 b/src/tls/Makefile.win32 index 576112e20..93ec8471d 100644 --- a/src/tls/Makefile.win32 +++ b/src/tls/Makefile.win32 @@ -4,8 +4,7 @@ include ..\Makefile.inc EFLAGS = -I .. -pz .. OUTDIR = .. -SOURCES = $(wildcard *.erl) -BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam)) +BEAMS = ..\tls.beam SOURCE = tls_drv.c OBJECT = tls_drv.o diff --git a/src/web/Makefile.win32 b/src/web/Makefile.win32 index 3fc9ce2a1..411d57ce8 100644 --- a/src/web/Makefile.win32 +++ b/src/web/Makefile.win32 @@ -4,8 +4,7 @@ include ..\Makefile.inc EFLAGS = -I .. -pz .. OUTDIR = .. -SOURCES = $(wildcard *.erl) -BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam)) +BEAMS = ..\ejabberd_http.beam ..\ejabberd_http_bind.beam ..\ejabberd_http_poll.beam ..\ejabberd_web.beam ..\ejabberd_web_admin.beam ..\mod_http_bind.beam ..\mod_http_fileserver.beam ALL : $(BEAMS) @@ -21,5 +20,14 @@ $(OUTDIR)\ejabberd_web.beam : ejabberd_web.erl $(OUTDIR)\ejabberd_web_admin.beam : ejabberd_web_admin.erl erlc -W $(EFLAGS) -o $(OUTDIR) ejabberd_web_admin.erl +$(OUTDIR)\ejabberd_http_bind.beam : ejabberd_http_bind.erl + erlc -W $(EFLAGS) -o $(OUTDIR) ejabberd_http_bind.erl + $(OUTDIR)\ejabberd_http_poll.beam : ejabberd_http_poll.erl erlc -W $(EFLAGS) -o $(OUTDIR) ejabberd_http_poll.erl + +$(OUTDIR)\mod_http_bind.beam : mod_http_bind.erl + erlc -W $(EFLAGS) -o $(OUTDIR) mod_http_bind.erl + +$(OUTDIR)\mod_http_fileserver.beam : mod_http_fileserver.erl + erlc -W $(EFLAGS) -o $(OUTDIR) mod_http_fileserver.erl