у меня патч из скриптов не проходит
Код: Выделить всё
git apply < src/bindings/ScriptDev2/patches/MaNGOS-2008-12-22-ScriptDev2.patch
Если у кого получилось - поделитесь опытом.
Код: Выделить всё
git apply < src/bindings/ScriptDev2/patches/MaNGOS-2008-12-22-ScriptDev2.patch
Код: Выделить всё
error: patch failed: src/bindings/Makefile.am:14
error: src/bindings/Makefile.am: patch does not apply
error: patch failed: src/mangosd/Makefile.am:33
error: src/mangosd/Makefile.am: patch does not apply
Код: Выделить всё
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|From c73015a64b7956e7456330c31f2b1070ce36ae8a Mon Sep 17 00:00:00 2001
|From: freghar <compmancz@gmail.com>
|Date: Thu, 23 Oct 2008 11:39:42 +0200
|Subject: [PATCH] ScriptDev2 patch commit
|
|Signed-off-by: freghar <compmancz@gmail.com>
|---
| configure.ac | 6 +++++-
| src/bindings/.gitignore | 12 ++++++++++++
| src/bindings/Makefile.am | 2 +-
| src/mangosd/Makefile.am | 4 ++--
| 4 files changed, 20 insertions(+), 4 deletions(-)
| create mode 100644 src/bindings/.gitignore
|
|diff --git a/configure.ac b/configure.ac
|index b193e6f..91a54bd 100644
|--- a/configure.ac
|+++ b/configure.ac
--------------------------
Patching file configure.ac using Plan A...
Hunk #1 succeeded at 312.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/src/bindings/.gitignore b/src/bindings/.gitignore
|new file mode 100644
|index 0000000..06df6e6
|--- /dev/null
|+++ b/src/bindings/.gitignore
--------------------------
Patching file .gitignore using Plan A...
Hunk #1 succeeded at 1.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/src/bindings/Makefile.am b/src/bindings/Makefile.am
|index 2cc0efd..f2dbbc7 100644
|--- a/src/bindings/Makefile.am
|+++ b/src/bindings/Makefile.am
--------------------------
Patching file Makefile.am using Plan A...
Hunk #1 succeeded at 14 with fuzz 2.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/src/mangosd/Makefile.am b/src/mangosd/Makefile.am
|index b7106cc..706d8ad 100644
|--- a/src/mangosd/Makefile.am
|+++ b/src/mangosd/Makefile.am
--------------------------
Patching file Makefile.am using Plan A...
Hunk #1 failed at 33.
1 out of 1 hunks failed--saving rejects to Makefile.am.rej
Hmm... Ignoring the trailing garbage.
done
Код: Выделить всё
sql/updates/Makefile.am:373: multiply defined in condition TRUE ...
sql/updates/Makefile.am:368: ... `' previously defined here
Makefile.am:20: SUBDIRS multiply defined in condition TRUE ...
Makefile.am:17: ... `SUBDIRS' previously defined here
autoreconf-2.62: automake failed with exit status: 1
Код: Выделить всё
> pwd
/usr/home/mangos
> cd mangos
> git diff > diff.git
Код: Выделить всё
diff --git a/configure.ac b/configure.ac
index b193e6f..91a54bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -312,7 +312,11 @@ AC_CONFIG_FILES([
src/mangosd/Makefile
src/mangosd/mangosd.conf.dist
src/bindings/Makefile
- src/bindings/universal/Makefile
+ src/bindings/ScriptDev2/Makefile
+ src/bindings/ScriptDev2/scriptdev2.conf.dist
+ src/bindings/ScriptDev2/config.h
+ src/bindings/ScriptDev2/sql/Makefile
+ src/bindings/ScriptDev2/sql/Updates/Makefile
])
## Configure ACE, if needed
diff --git a/src/bindings/Makefile.am b/src/bindings/Makefile.am
index 2cc0efd..f2dbbc7 100644
--- a/src/bindings/Makefile.am
+++ b/src/bindings/Makefile.am
@@ -14,4 +14,4 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-SUBDIRS = universal
+SUBDIRS = ScriptDev2
diff --git a/src/mangosd/Makefile.am b/src/mangosd/Makefile.am
index b7106cc..706d8ad 100644
--- a/src/mangosd/Makefile.am
+++ b/src/mangosd/Makefile.am
@@ -33,8 +33,8 @@ mangos_worldd_SOURCES = \
WorldRunnable.h
## Link world daemon against the shared library
-mangos_worldd_LDADD = ../bindings/universal/libmangosscript.la ../game/libmangosgame.a ../shared/Database/libmangosdatabase.a ../shared/Config/libmangosconfig.a ../shared/Auth/libmangosauth.a ../shared/libmangosshared.a ../shared/vmap/libmangosvmaps.a ../framework/libmangosframework.a ../../dep/src/sockets/libmangossockets.a ../../dep/src/zthread/libZThread.la ../../dep/src/g3dlite/libg3dlite.a
-mangos_worldd_LDFLAGS = -L../../dep/src/sockets -L../../dep/src/zthread -L../../dep/src/g3dlite -L../bindings/universal/ -L$(libdir) $(MANGOS_LIBS) -export-dynamic
+mangos_worldd_LDADD = ../bindings/ScriptDev2/libmangosscript.la ../game/libmangosgame.a ../shared/Database/libmangosdatabase.a ../shared/Config/libmangosconfig.a ../shared/Auth/libmangosauth.a ../shared/libmangosshared.a ../shared/vmap/libmangosvmaps.a ../framework/libmangosframework.a ../../dep/src/sockets/libmangossockets.a ../../dep/src/zthread/libZThread.la ../../dep/src/g3dlite/libg3dlite.a
+mangos_worldd_LDFLAGS = -L../../dep/src/sockets -L../../dep/src/zthread -L../../dep/src/g3dlite -L../bindings/ScriptDev2/ -L$(libdir) $(MANGOS_LIBS) -export-dynamic
## Additional files to include when running 'make dist'
# Include world daemon configuration
Код: Выделить всё
> pwd
/usr/home/mangos/mangos
>
Код: Выделить всё
% cp -R ~/mangos/src/mangos/* ~/mangos/comp
% cp -R ~/mangos/src/ScriptDev2 ~/mangos/comp/src/bindings/
% cd ~/mangos/comp
% patch < % src/bindings/ScriptDev2/patches/MaNGOS-r6491-Scriptdev2.patch
Код: Выделить всё
%chmod -R 777 ~/mangos/comp
Код: Выделить всё
>setenv HTTP_PROXY http://proxy.example.com:8080
>setenv FTP_PROXY http://proxy.example.com:8080
Код: Выделить всё
>env
Код: Выделить всё
git apply < src/bindings/ScriptDev2/patches/MaNGOS-XXXX-ScriptDev2.patch
Код: Выделить всё
patch < src/bindings/ScriptDev2/patches/MaNGOS-XXXX-ScriptDev2.patch
Код: Выделить всё
Makefile.am:20: SUBDIRS multiply defined in condition TRUE ...
Makefile.am:17: ... `SUBDIRS' previously defined here
autoreconf-2.62: automake failed with exit status: 1
Код: Выделить всё
#git apply < src/...
#autoreconf -f -l
#mkdir obj
#cd obj
#../configure ....
#gmake
#gmake install
Код: Выделить всё
apr-ipv6-gdbm-db42-1.3.8.1.3.9 Apache Portability Library
autoconf-2.13.000227_6 Automatically configure source code on many Un*x platforms
autoconf-2.62 Automatically configure source code on many Un*x platforms
autoconf-wrapper-20071109 Wrapper script for GNU autoconf
automake-1.10.1 GNU Standards-compliant Makefile generator (1.10)
automake-1.4.6_5 GNU Standards-compliant Makefile generator (1.4)
automake-1.5_5,1 GNU Standards-compliant Makefile generator (1.5)
automake-1.6.3_1 GNU Standards-compliant Makefile generator (1.6)
automake-1.7.9_2 GNU Standards-compliant Makefile generator (1.7)
automake-1.8.5_3 GNU Standards-compliant Makefile generator (1.8)
automake-1.9.6_3 GNU Standards-compliant Makefile generator (1.9)
automake-wrapper-20071109 Wrapper script for GNU automake
autotools-20080819 Autotools meta-port
ca_root_nss-3.11.9_2 The root certificate bundle from the Mozilla Project
curl-7.19.6_1 Non-interactive tool to get files from FTP, GOPHER, HTTP(S)
cvsps-2.1 Create patchset information from CVS
db42-4.2.52_5 The Berkeley DB package, revision 4.2
expat-2.0.1 XML 1.0 parser written in C
gdbm-1.8.3_3 The GNU database manager
gettext-0.17_1 GNU gettext package
git-1.6.4.3 Distributed source code management tool
glib-2.20.5 Some useful routines of C programming (current stable versi
gmake-3.81_3 GNU version of 'make' utility
gnuit-4.9.5 GNU Interactive Tools - a file system browser for UNIX syst
help2man-1.36.4_3 Automatically generating simple manual pages from program o
libiconv-1.13.1 A character set conversion library
libtool-2.2.6a Generic shared library support script
m4-1.4.13,1 GNU m4
mysql-client-5.1.39 Multithreaded SQL database (client)
mysql-server-5.1.39 Multithreaded SQL database (server)
neon28-0.28.6 An HTTP and WebDAV client library for Unix systems
p5-Error-0.17015 Perl module to provide Error/exception support for perl: Er
p5-IO-Socket-SSL-1.30 Perl5 interface to SSL sockets
p5-Net-SMTP-SSL-1.01 An SMTP client supporting SSL
p5-Net-SSLeay-1.35_2 Perl5 interface to SSL
p5-Term-ReadKey-2.30 A perl5 module for simple terminal control
p5-gettext-1.05_2 Message handling functions
p5-subversion-1.6.5 Perl bindings for Version control system
pcre-7.9 Perl Compatible Regular Expressions library
perl-5.8.9_3 Practical Extraction and Report Language
pkg-config-0.23_1 A utility to retrieve information about installed libraries
python26-2.6.2_3 An interpreted object-oriented programming language
screen-4.0.3_6 A multi-screen window manager
sqlite3-3.6.14.2 An SQL database engine in a C library
subversion-1.6.5 Version control system
Код: Выделить всё
In file included from ../../../../dep/ACE_wrappers/ace/OS_NS_netdb.h:142,
from ../../../../dep/ACE_wrappers/ace/ICMP_Socket.cpp:9:
../../../../dep/ACE_wrappers/ace/OS_NS_netdb.inl: In function 'hostent* ACE_OS::gethostbyaddr_r(const char*, int, int, hostent*, char*, int*)':
../../../../dep/ACE_wrappers/ace/OS_NS_netdb.inl:203: error: cannot convert 'int*' to 'hostent**' for argument '7' to 'int gethostbyaddr_r(const void*, socklen_t, int, hostent*, char*, size_t, hostent**, int*)'
../../../../dep/ACE_wrappers/ace/OS_NS_netdb.inl: In function 'hostent* ACE_OS::gethostbyname_r(const char*, hostent*, char*, int*)':
../../../../dep/ACE_wrappers/ace/OS_NS_netdb.inl:393: error: cannot convert 'int*' to 'hostent**' for argument '5' to 'int gethostbyname_r(const char*, hostent*, char*, size_t, hostent**, int*)'
/usr/include/netdb.h: In function 'protoent* ACE_OS::getprotobyname_r(const char*, protoent*, char*)':
/usr/include/netdb.h:271: error: too few arguments to function 'int getprotobyname_r(const char*, protoent*, char*, size_t, protoent**)'
../../../../dep/ACE_wrappers/ace/OS_NS_netdb.inl:557: error: at this point in file
/usr/include/netdb.h: In function 'protoent* ACE_OS::getprotobynumber_r(int, protoent*, char*)':
/usr/include/netdb.h:273: error: too few arguments to function 'int getprotobynumber_r(int, protoent*, char*, size_t, protoent**)'
../../../../dep/ACE_wrappers/ace/OS_NS_netdb.inl:638: error: at this point in file
/usr/include/netdb.h: In function 'servent* ACE_OS::getservbyname_r(const char*, const char*, servent*, char*)':
/usr/include/netdb.h:277: error: too few arguments to function 'int getservbyname_r(const char*, const char*, servent*, char*, size_t, servent**)'
../../../../dep/ACE_wrappers/ace/OS_NS_netdb.inl:727: error: at this point in file
gmake[6]: *** [libACE_la-ICMP_Socket.lo] Ошибка 1
gmake[6]: Leaving directory `/usr/home/ps/mangos/objdir/dep/ACE_wrappers/ace'
gmake[5]: *** [all-recursive] Ошибка 1
gmake[5]: Leaving directory `/usr/home/ps/mangos/objdir/dep/ACE_wrappers/ace'
gmake[4]: *** [all] Ошибка 2
gmake[4]: Leaving directory `/usr/home/ps/mangos/objdir/dep/ACE_wrappers/ace'
gmake[3]: *** [all-recursive] Ошибка 1
gmake[3]: Leaving directory `/usr/home/ps/mangos/objdir/dep/ACE_wrappers'
gmake[2]: *** [all-recursive] Ошибка 1
gmake[2]: Leaving directory `/usr/home/ps/mangos/objdir/dep'
gmake[1]: *** [all-recursive] Ошибка 1
gmake[1]: Leaving directory `/usr/home/ps/mangos/objdir'
gmake: *** [all] Ошибка 2
Что непонятного, он тебе четко написал в чем проблема. Не может скомпилировать ACE. И ты бы указал откуда исходники брал? А то щас много разных форков, у всех свои ошибки/очепятки есть. А вообще, что всех так пугает мангос комьюнити русское что вы боитесь там задавать свои вопросы? Если чего там даже раздел есть для новичков в котором вас пинать не будут если вы голову включаете.Resident писал(а):Люди помогите кто разбираеться качнул сорсы какие были последнии залил сконфигурировалось на ура а вот собираться отказываеться после gmake начинает компилить минуты две потом высыпает ошибки ниже на чем начинает сыпать ероры