* src/Makefile.win32: Updated (thanks to Sergei Golovan)

* src/configure.erl: Likewise
* src/win32/CheckReqs.ini: Likewise
* src/win32/CheckReqs1.ini: Likewise
* src/win32/CheckReqs1H.ini: Likewise
* src/win32/ejabberd.nsh: Likewise
* src/win32/ejabberd.nsi: Likewise

SVN Revision: 477

diff --git a/ChangeLog b/ChangeLog
index 4cb1c8f4ef26291a5e6a3ef175915c1683ac45f6..663041f753240b8834117e1a791a342c7931d05c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,18 +5,26 @@
 
 2005-12-22  Alexey Shchepin  <alexey@sevcom.net>
 
+       * src/Makefile.win32: Updated (thanks to Sergei Golovan)
+       * src/configure.erl: Likewise
+       * src/win32/CheckReqs.ini: Likewise
+       * src/win32/CheckReqs1.ini: Likewise
+       * src/win32/CheckReqs1H.ini: Likewise
+       * src/win32/ejabberd.nsh: Likewise
+       * src/win32/ejabberd.nsi: Likewise
+
        * src/odbc/ejabberd_odbc.erl: Bugfix
 
 2005-12-21  Mickael Remond  <mickael.remond@process-one.net>
 
-       * src/odbc/mysql.sql: Database description for MySQL Database 4.1 (Max
-       version, with Innodb)
-       * src/ejabberd_auth_odbc.erl: MySQL ODBC support.
-       * src/mod_offline_odbc.erl: likewise
-       * src/mod_vcard_odbc.erl: likewsie
-       * src/mod_roster_odbc.erl: likewise
-       * src/odbc/ejabberd_odbc.erl: likewise
-       * src/mod_last_odbc.erl: likewise
+       * src/odbc/mysql.sql: Database description for MySQL Database 4.1
+       (Max version, with Innodb)
+       * src/ejabberd_auth_odbc.erl: MySQL ODBC support
+       * src/mod_offline_odbc.erl: Likewise
+       * src/mod_vcard_odbc.erl: Likewsie
+       * src/mod_roster_odbc.erl: Likewise
+       * src/odbc/ejabberd_odbc.erl: Likewise
+       * src/mod_last_odbc.erl: Likewise
 
 2005-12-16  Mickael Remond  <mickael.remond@process-one.net>
 

diff --git a/src/Makefile.win32 b/src/Makefile.win32
index 440fd5018153ee728951da41e5db2df73bfc47b1..7b13d5b0b496a73b0c293e7d6e090e462d826fdc 100644 (file)
--- a/src/Makefile.win32
+++ b/src/Makefile.win32
@@ -69,6 +69,7 @@ release : build release_clean
        copy web\*.erl $(SRC_DIR)\web
        mkdir $(SRC_DIR)\odbc
        copy odbc\*.erl $(SRC_DIR)\odbc
+       copy odbc\*.sql $(EREL)
        mkdir $(DOC_DIR)
        copy ..\doc\*.txt $(DOC_DIR)
        copy ..\doc\*.html $(DOC_DIR)
@@ -99,8 +100,11 @@ all-recursive :
        nmake -nologo -f Makefile.win32
        cd ..
 
-compile-beam : 
-       erlc *.erl
+compile-beam : XmppAddr.hrl
+       erl -s make all report -noinput -s erlang halt
+
+XmppAddr.hrl : XmppAddr.asn1
+       erlc -bber_bin +der +compact_bit_string +optimize +noobj XmppAddr.asn1
 
 CLEAN : clean-recursive clean-local
 
@@ -110,6 +114,9 @@ clean-local :
        -@erase expat_erl.exp
        -@erase expat_erl.lib
        -@erase *.beam
+       -@erase XmppAddr.asn1db
+       -@erase XmppAddr.erl
+       -@erase XmppAddr.hrl
 
 clean-recursive :
        cd eldap

diff --git a/src/configure.erl b/src/configure.erl
index 069f191651279a44ef090510aa0afe0b31f0497b..379cfa17999428f6147ec30698eb15af059d5768 100644 (file)
--- a/src/configure.erl
+++ b/src/configure.erl
@@ -36,6 +36,7 @@ start() ->
            IconvLib  = "ICONV_LIB = $(ICONV_DIR)\\lib\\iconv.lib\n"
     end,
 
+    EVersion = "ERLANG_VERSION = " ++ erlang:system_info(version) ++ "\n",
     EIDirS   = "EI_DIR = " ++ code:lib_dir("erl_interface") ++ "\n",
     RootDirS = "ERLANG_DIR = " ++ code:root_dir() ++ "\n",
     Version  = "EJABBERD_VERSION = " ++ ?VERSION ++ "\n",

diff --git a/src/win32/CheckReqs.ini b/src/win32/CheckReqs.ini
index 392cd844534dfb254fa97401e4ca27d59267303c..35875f82d99dc5649950d7c53e70a7489375dec0 100644 (file)
--- a/src/win32/CheckReqs.ini
+++ b/src/win32/CheckReqs.ini
@@ -7,7 +7,7 @@ Left=0
 Right=-1
 Top=10
 Bottom=70
-Text="Erlang OTP R9C-1 (version 5.3.6.2) or newer is required to install Ejabberd.\r\n\r\nIt is not found on your computer.\r\n\r\nPlease install Erlang OTP R9C-1 or newer before installing Ejabberd.\r\n\r\nIts installer can be downloaded from"
+Text="Erlang OTP R10B-7 (version 5.4.9) or newer is required to install Ejabberd.\r\n\r\nIt is not found on your computer.\r\n\r\nPlease install Erlang OTP R10B-7 or newer before installing Ejabberd.\r\n\r\nIts installer can be downloaded from"
 
 [Field 2]
 Type=link

diff --git a/src/win32/CheckReqs1.ini b/src/win32/CheckReqs1.ini
index fe7ae1ff4637dd22d872d63b04639c5f70fa64a2..76b8a90098e3aebe011599a0426d256b6373b4d3 100644 (file)
--- a/src/win32/CheckReqs1.ini
+++ b/src/win32/CheckReqs1.ini
@@ -7,7 +7,7 @@ Left=0
 Right=-1
 Top=10
 Bottom=70
-Text="OpenSLL 0.9.7c or newer is not found on your computer.\r\n\r\nTo use SSL and TLS encryption you need an SSL certificate. You can create a selfsigned certificate with OpenSSL.\r\n\r\nOpenSLL installer can be downloaded from"
+Text="OpenSLL 0.9.7i or newer is not found on your computer.\r\n\r\nTo use SSL and TLS encryption you need an SSL certificate. You can create a selfsigned certificate with OpenSSL.\r\n\r\nOpenSLL installer can be downloaded from"
 
 [Field 2]
 Type=link

diff --git a/src/win32/CheckReqs1H.ini b/src/win32/CheckReqs1H.ini
index f8cd05e01e58309d7c48c0dc91d23af619b9d9f4..36076640d06c9ab36bf3d6e807d4fa14e38a1b1a 100644 (file)
--- a/src/win32/CheckReqs1H.ini
+++ b/src/win32/CheckReqs1H.ini
@@ -7,7 +7,7 @@ Left=0
 Right=-1
 Top=10
 Bottom=70
-Text="OpenSLL 0.9.7c or newer is not found on your computer.\r\n\r\nTo use SSL and TLS encryption you need an SSL certificate. You can create a selfsigned certificate with OpenSSL.\r\n\r\nOpenSLL installer can be downloaded from"
+Text="OpenSLL 0.9.7i or newer is not found on your computer.\r\n\r\nTo use SSL and TLS encryption you need an SSL certificate. You can create a selfsigned certificate with OpenSSL.\r\n\r\nOpenSLL installer can be downloaded from"
 
 [Field 2]
 Type=link

diff --git a/src/win32/ejabberd.nsh b/src/win32/ejabberd.nsh
new file mode 100644 (file)
index 0000000..34a7189
--- /dev/null
+++ b/src/win32/ejabberd.nsh
@@ -0,0 +1,4 @@
+!define OUTFILEDIR "..\..\release" \r
+!define TESTDIR "..\..\release\ejabberd-1.0.0" \r
+!define VERSION "1.0.0" \r
+!define HACKED_INSTALLOPTIONS 1\r

diff --git a/src/win32/ejabberd.nsi b/src/win32/ejabberd.nsi
index 73ddb026007f913e3da7b2aa273c60923ab097b2..8c828bda8ae790d5881cf37d83b2cbf6ff6d1c63 100644 (file)
--- a/src/win32/ejabberd.nsi
+++ b/src/win32/ejabberd.nsi
@@ -67,7 +67,7 @@
 
 Function .onInit
 
-    StrCpy $REQUIRED_ERLANG_VERSION "5.3.6.2"
+    StrCpy $REQUIRED_ERLANG_VERSION "5.4.9"
     StrCpy $REQUIRED_OPENSSL_VERSION "0.9.7c"
 
     ;Default installation folder
@@ -123,10 +123,10 @@ FunctionEnd
 
     !insertmacro MUI_PAGE_WELCOME
     !insertmacro MUI_PAGE_LICENSE "..\..\COPYING"
-    Page custom CheckUser LeaveCheckUser
-    Page custom CheckService LeaveCheckService
     Page custom CheckReqs LeaveCheckReqs
     Page custom CheckReqs1 LeaveCheckReqs1
+    Page custom CheckUser LeaveCheckUser
+    Page custom CheckService LeaveCheckService
     ;!insertmacro MUI_PAGE_COMPONENTS
     !insertmacro MUI_PAGE_DIRECTORY