* src/*/Makefile.win32: Provide explicit beam filenames because

nmake does not accept wildcards (thanks to Attila
Vangel)(EJAB-543)

SVN Revision: 1588

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  <badlop@process-one.net>
+
+	* src/*/Makefile.win32: Provide explicit beam filenames because
+	nmake does not accept wildcards (thanks to Attila
+	Vangel)(EJAB-543)
+	
 2008-09-24  Christophe Romain  <christophe.romain@process-one.net>
 
 	* 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.<BR>
 Handles incoming s2s connections.<BR>
  Options: <TT>inet6</TT>, <TT>ip</TT>, <TT>max_stanza_size</TT>
 </DD><DT CLASS="dt-description"><B><TT>ejabberd_service</TT></B></DT><DD CLASS="dd-description">
-Interacts with <A HREF="http://www.ejabberd.im/tutorials-transports">external components</A> 
+Interacts with an <A HREF="http://www.ejabberd.im/tutorials-transports">external component</A> 
 (as defined in the Jabber Component Protocol (<A HREF="http://www.xmpp.org/extensions/xep-0114.html">XEP-0114</A>).<BR>
  Options: <TT>access</TT>, <TT>hosts</TT>, <TT>inet6</TT>,
 <TT>ip</TT>, <TT>shaper</TT>, <TT>service_check_from</TT>
@@ -655,9 +655,10 @@ used to disable control on the from field on packets send by an
 external components. The option can be either <TT>true</TT> or
 <TT>false</TT>. The default value is <TT>true</TT> which conforms to <A HREF="http://www.xmpp.org/extensions/xep-0114.html">XEP-0114</A>.
 </DD><DT CLASS="dt-description"><B><TT>{hosts, [Hostnames], [HostOptions]}</TT></B></DT><DD CLASS="dd-description"> 
-This option of <TT>ejabberd_service</TT> allows to define one or more hostnames 
-of external Jabber components that provide a service.
-In <TT>HostOptions</TT> it is possible to define the password required to those components
+The external Jabber component that connects to this <TT>ejabberd_service</TT>
+can serve one or more hostnames.
+In <TT>HostOptions</TT> 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: <TT>{password, Secret}</TT>.
 Note that you cannot define in a single <TT>ejabberd_service</TT> components of
 different services: add an <TT>ejabberd_service</TT> for each service,
@@ -2055,7 +2056,9 @@ change nickname.
 status text in presence updates. If disallowed, the <TT>status</TT>
 text is stripped before broadcasting the presence update to all
 the room occupants.
-</DD><DT CLASS="dt-description"><B><TT>{anonymous, true}</TT></B></DT><DD CLASS="dd-description"> Occupants are allowed to see the real JIDs of other occupants.
+</DD><DT CLASS="dt-description"><B><TT>{anonymous, true}</TT></B></DT><DD CLASS="dd-description"> The room is anonymous:
+occupants don&#X2019;t see the real JIDs of other occupants.
+Note that the room moderators can always see the real JIDs of the occupants.
 </DD><DT CLASS="dt-description"><B><TT>{logging, false}</TT></B></DT><DD CLASS="dd-description"> The public messages are logged using <TT>mod_muc_log</TT>.
 </DD><DT CLASS="dt-description"><B><TT>{max_users, 200}</TT></B></DT><DD CLASS="dd-description"> Maximum number of occupants in the room.
 </DD><DT CLASS="dt-description"><B><TT>{members_by_default, true}</TT></B></DT><DD CLASS="dd-description"> The occupants that enter the room are participants by default, so they have &#X2019;voice&#X2019;.
@@ -3184,11 +3187,15 @@ Copy <CODE>~ejabberd/.erlang.cookie</CODE> file from <TT>first</TT> to
 <TT>second</TT>.<P>(alt) You can also add &#X2018;<CODE>-cookie content_of_.erlang.cookie</CODE>&#X2019;
 option to all &#X2018;<TT>erl</TT>&#X2019; commands below.</P></LI><LI CLASS="li-enumerate">On <TT>second</TT> run the following command as the <TT>ejabberd</TT> daemon user,
 in the working directory of <TT>ejabberd</TT>:<PRE CLASS="verbatim">erl -sname ejabberd \
+    -mnesia dir "/var/lib/ejabberd/" \
     -mnesia extra_db_nodes "['ejabberd@first']" \
     -s mnesia
 </PRE><P>This will start Mnesia serving the same database as <TT>ejabberd@first</TT>.
 You can check this by running the command &#X2018;<CODE>mnesia:info().</CODE>&#X2019;. You
-should see a lot of remote tables and a line like the following:</P><PRE CLASS="verbatim">running db nodes   = [ejabberd@first, ejabberd@second]
+should see a lot of remote tables and a line like the following:</P><P>Note: the Mnesia directory may be different in your system.
+To know where does ejabberd expect Mnesia to be installed by default,
+call <A HREF="#ejabberdctl">4.1</A> without options and it will show some help,
+including the Mnesia database spool dir.</P><PRE CLASS="verbatim">running db nodes   = [ejabberd@first, ejabberd@second]
 </PRE></LI><LI CLASS="li-enumerate">Now run the following in the same &#X2018;<TT>erl</TT>&#X2019; session:<PRE CLASS="verbatim">mnesia:change_table_copy_type(schema, node(), disc_copies).
 </PRE><P>This will create local disc storage for the database.</P><P>(alt) Change storage type of the <TT>scheme</TT> table to &#X2018;RAM and disc
 copy&#X2019; on the second node via the Web Admin.</P></LI><LI CLASS="li-enumerate">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