diff options
| -rw-r--r-- | ChangeLog | 24 | ||||
| -rw-r--r-- | src/Makefile.win32 | 11 | ||||
| -rw-r--r-- | src/configure.erl | 1 | ||||
| -rw-r--r-- | src/win32/CheckReqs.ini | 2 | ||||
| -rw-r--r-- | src/win32/CheckReqs1.ini | 2 | ||||
| -rw-r--r-- | src/win32/CheckReqs1H.ini | 2 | ||||
| -rw-r--r-- | src/win32/ejabberd.nsh | 4 | ||||
| -rw-r--r-- | src/win32/ejabberd.nsi | 6 |
8 files changed, 36 insertions, 16 deletions
@@ -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 440fd5018..7b13d5b0b 100644 --- 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 069f19165..379cfa179 100644 --- 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 392cd8445..35875f82d 100644 --- 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 fe7ae1ff4..76b8a9009 100644 --- 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 f8cd05e01..36076640d 100644 --- 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 index 000000000..34a7189ce --- /dev/null +++ b/src/win32/ejabberd.nsh @@ -0,0 +1,4 @@ +!define OUTFILEDIR "..\..\release"
+!define TESTDIR "..\..\release\ejabberd-1.0.0"
+!define VERSION "1.0.0"
+!define HACKED_INSTALLOPTIONS 1
diff --git a/src/win32/ejabberd.nsi b/src/win32/ejabberd.nsi index 73ddb0260..8c828bda8 100644 --- 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 |