mirror of
https://github.com/processone/ejabberd.git
synced 2024-10-29 15:12:12 +01:00
* doc/guide.tex: Updated Windows compilation instructions.
* src/configure.erl: Likewise. * doc/ejabberd.hrl: Preparing ejabberd 2.0.0 beta release. * doc/version.tex: Likewise. SVN Revision: 1009
This commit is contained in:
parent
43e31b1bf0
commit
71c7879b48
@ -370,12 +370,12 @@ The command to compile ejabberd in BSD systems is:
|
|||||||
To compile \ejabberd{} on a Microsoft Windows system, you need:
|
To compile \ejabberd{} on a Microsoft Windows system, you need:
|
||||||
\begin{itemize}
|
\begin{itemize}
|
||||||
\item MS Visual C++ 6.0 Compiler
|
\item MS Visual C++ 6.0 Compiler
|
||||||
\item \footahref{http://erlang.org/download.html}{Erlang/OTP R9C-2 or higher}
|
\item \footahref{http://erlang.org/download.html}{Erlang/OTP R11B-5 or higher}
|
||||||
\item \footahref{http://sourceforge.net/project/showfiles.php?group\_id=10127\&package\_id=11277}{Expat 1.95.7 or higher}
|
\item \footahref{http://sourceforge.net/project/showfiles.php?group\_id=10127\&package\_id=11277}{Expat 2.0.0 or higher}
|
||||||
\item
|
\item
|
||||||
\footahref{http://www.gnu.org/software/libiconv/}{GNU Iconv 1.9.1}
|
\footahref{http://www.gnu.org/software/libiconv/}{GNU Iconv 1.9.2}
|
||||||
(optional)
|
(optional)
|
||||||
\item \footahref{http://www.slproweb.com/products/Win32OpenSSL.html}{Shining Light OpenSSL}
|
\item \footahref{http://www.slproweb.com/products/Win32OpenSSL.html}{Shining Light OpenSSL 0.9.8d or higher}
|
||||||
(to enable SSL connections)
|
(to enable SSL connections)
|
||||||
\item \footahref{http://www.zlib.net/}{Zlib 1.2.3 or higher}
|
\item \footahref{http://www.zlib.net/}{Zlib 1.2.3 or higher}
|
||||||
\end{itemize}
|
\end{itemize}
|
||||||
@ -384,26 +384,33 @@ To compile \ejabberd{} on a Microsoft Windows system, you need:
|
|||||||
\subsubsection{Compilation}
|
\subsubsection{Compilation}
|
||||||
\label{windowscom}
|
\label{windowscom}
|
||||||
|
|
||||||
|
We assume that we will try to put as much library as possible into \verb|C:\sdk\| to make it easier to track what is install for ejabberd.
|
||||||
|
|
||||||
\begin{enumerate}
|
\begin{enumerate}
|
||||||
\item Install Erlang emulator (for example, into \verb|C:\Program Files\erl5.3|).
|
\item Install Erlang emulator (for example, into \verb|C:\sdk\erl5.5.5|).
|
||||||
\item Install Expat library into \verb|C:\Program Files\Expat-1.95.7|
|
\item Install Expat library into \verb|C:\sdk\Expat-2.0.0|
|
||||||
directory.
|
directory.
|
||||||
|
|
||||||
Copy file \verb|C:\Program Files\Expat-1.95.7\Libs\libexpat.dll|
|
Copy file \verb|C:\sdk\Expat-2.0.0\Libs\libexpat.dll|
|
||||||
to your Windows system directory (for example, \verb|C:\WINNT| or
|
to your Windows system directory (for example, \verb|C:\WINNT| or
|
||||||
\verb|C:\WINNT\System32|)
|
\verb|C:\WINNT\System32|)
|
||||||
\item Build and install the Iconv library into the directory
|
\item Build and install the Iconv library into the directory
|
||||||
\verb|C:\Program Files\iconv-1.9.1|.
|
\verb|C:\sdk\GnuWin32|.
|
||||||
|
|
||||||
Copy file \verb|C:\Program Files\iconv-1.9.1\bin\iconv.dll| to your
|
Copy file \verb|C:\sdk\GnuWin32\bin\lib*.dll| to your
|
||||||
Windows system directory (more installation instructions can be found in the
|
Windows system directory (more installation instructions can be found in the
|
||||||
file README.woe32 in the iconv distribution).
|
file README.woe32 in the iconv distribution).
|
||||||
|
|
||||||
Note: instead of copying libexpat.dll and iconv.dll to the Windows
|
Note: instead of copying libexpat.dll and iconv.dll to the Windows
|
||||||
directory, you can add the directories
|
directory, you can add the directories
|
||||||
\verb|C:\Program Files\Expat-1.95.7\Libs| and
|
\verb|C:\sdk\Expat-2.0.0\Libs| and
|
||||||
\verb|C:\Program Files\iconv-1.9.1\bin| to the \verb|PATH| environment
|
\verb|C:\sdk\GnuWin32\bin| to the \verb|PATH| environment
|
||||||
variable.
|
variable.
|
||||||
|
\item Install OpenSSL in \verb|C:\sdk\OpenSSL| and add \verb|C:\sdk\OpenSSL\lib\VC| to your path or copy the binaries to your system directory.
|
||||||
|
\item Install ZLib in \verb|C:\sdk\gnuWin32|. Copy
|
||||||
|
\verb|C:\sdk\GnuWin32\bin\zlib1.dll| to your system directory. If you change your path it should already be set after libiconv install.
|
||||||
|
\item Make sure the you can access Erlang binaries from your path. For example: \verb|set PATH=%PATH%;"C:\sdk\erl5.5.5\bin"|
|
||||||
|
\item Depending on how you end up actually installing the library you might need to check and tweak the paths in the file configure.erl.
|
||||||
\item While in the directory \verb|ejabberd\src| run:
|
\item While in the directory \verb|ejabberd\src| run:
|
||||||
\begin{verbatim}
|
\begin{verbatim}
|
||||||
configure.bat
|
configure.bat
|
||||||
|
@ -1,2 +1,3 @@
|
|||||||
% ejabberd version (automatically generated).
|
% ejabberd version (automatically generated).
|
||||||
\newcommand{\version}{2.0.0 beta}
|
|
||||||
|
ewcommand{ersion}{2.0.0b1}
|
||||||
|
@ -27,25 +27,25 @@ start() ->
|
|||||||
true ->
|
true ->
|
||||||
ExpatLib = "EXPAT_LIB = $(EXPAT_DIR)\\StaticLibs\\libexpatMT.lib\n",
|
ExpatLib = "EXPAT_LIB = $(EXPAT_DIR)\\StaticLibs\\libexpatMT.lib\n",
|
||||||
ExpatFlag = "EXPAT_FLAG = -DXML_STATIC\n",
|
ExpatFlag = "EXPAT_FLAG = -DXML_STATIC\n",
|
||||||
IconvDir = "ICONV_DIR = c:\\progra~1\\libiconv-1.9.1-static\n",
|
IconvDir = "ICONV_DIR = c:\\sdk\\GnuWin32\n",
|
||||||
IconvLib = "ICONV_LIB = $(ICONV_DIR)\\lib\\iconv.lib\n",
|
IconvLib = "ICONV_LIB = $(ICONV_DIR)\\lib\\libiconv.lib\n",
|
||||||
ZlibDir = "ZLIB_DIR = c:\\progra~1\\zlib-1.2.3\n",
|
ZlibDir = "ZLIB_DIR = c:\\sdk\\GnuWin32\n",
|
||||||
ZlibLib = "ZLIB_LIB = $(ZLIB_DIR)\\lib\\zlib.lib\n";
|
ZlibLib = "ZLIB_LIB = $(ZLIB_DIR)\\lib\\zlib.lib\n";
|
||||||
false ->
|
false ->
|
||||||
ExpatLib = "EXPAT_LIB = $(EXPAT_DIR)\\Libs\\libexpat.lib\n",
|
ExpatLib = "EXPAT_LIB = $(EXPAT_DIR)\\Libs\\libexpat.lib\n",
|
||||||
ExpatFlag = "",
|
ExpatFlag = "",
|
||||||
IconvDir = "ICONV_DIR = c:\\progra~1\\libiconv-1.9.1\n",
|
IconvDir = "ICONV_DIR = c:\\sdk\\GnuWin32\n",
|
||||||
IconvLib = "ICONV_LIB = $(ICONV_DIR)\\lib\\iconv.lib\n",
|
IconvLib = "ICONV_LIB = $(ICONV_DIR)\\lib\\libiconv.lib\n",
|
||||||
ZlibDir = "ZLIB_DIR = c:\\progra~1\\zlib-1.2.3\n",
|
ZlibDir = "ZLIB_DIR = c:\\sdk\\GnuWin32\n",
|
||||||
ZlibLib = "ZLIB_LIB = $(ZLIB_DIR)\\lib\\zlib1.lib\n"
|
ZlibLib = "ZLIB_LIB = $(ZLIB_DIR)\\lib\\zlib.lib\n"
|
||||||
end,
|
end,
|
||||||
|
|
||||||
EVersion = "ERLANG_VERSION = " ++ erlang:system_info(version) ++ "\n",
|
EVersion = "ERLANG_VERSION = " ++ erlang:system_info(version) ++ "\n",
|
||||||
EIDirS = "EI_DIR = " ++ code:lib_dir("erl_interface") ++ "\n",
|
EIDirS = "EI_DIR = " ++ code:lib_dir("erl_interface") ++ "\n",
|
||||||
RootDirS = "ERLANG_DIR = " ++ code:root_dir() ++ "\n",
|
RootDirS = "ERLANG_DIR = " ++ code:root_dir() ++ "\n",
|
||||||
Version = "EJABBERD_VERSION = " ++ ?VERSION ++ "\n",
|
Version = "EJABBERD_VERSION = " ++ ?VERSION ++ "\n",
|
||||||
ExpatDir = "EXPAT_DIR = c:\\progra~1\\expat-1.95.7\n",
|
ExpatDir = "EXPAT_DIR = c:\\sdk\\Expat-2.0.0\n",
|
||||||
OpenSSLDir = "OPENSSL_DIR = c:\\progra~1\\OpenSSL\n",
|
OpenSSLDir = "OPENSSL_DIR = c:\\sdk\\OpenSSL\n",
|
||||||
DBType = "DBTYPE = generic\n", %% 'generic' or 'mssql'
|
DBType = "DBTYPE = generic\n", %% 'generic' or 'mssql'
|
||||||
|
|
||||||
SSLDir = "SSLDIR = " ++ code:lib_dir("ssl") ++ "\n",
|
SSLDir = "SSLDIR = " ++ code:lib_dir("ssl") ++ "\n",
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
%-define(ejabberd_debug, true).
|
%-define(ejabberd_debug, true).
|
||||||
%-define(DBGFSM, true).
|
%-define(DBGFSM, true).
|
||||||
|
|
||||||
-define(VERSION, "1.1.2").
|
-define(VERSION, "2.0.0b1").
|
||||||
|
|
||||||
%% ---------------------------------
|
%% ---------------------------------
|
||||||
%% Logging mechanism
|
%% Logging mechanism
|
||||||
|
Loading…
Reference in New Issue
Block a user