At http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/devel

------------------------------------------------------------ revno: 370 revision-id: mtay...@mysql.com-20071213000758-21hgs3ifa3enkxha parent: mtay...@mysql.com-20071212164324-rio2afrpnaenblb5 committer: Monty Taylor <mtay...@mysql.com> branch nick: devel timestamp: Wed 2007-12-12 22:07:58 -0200 message: Added dllmaps for cli and a signing key. added: csharp/MySql.Cluster.MgmApi.dll.config
mysql.cluster.mgmapi-20071212234342-aze5lnpi9vq1j959-1 csharp/MySql.Cluster.NdbApi.dll.config
mysql.cluster.ndbapi-20071212234342-aze5lnpi9vq1j959-2 csharp/connectors.snk
connectors.snk-20071212225251-amwwt7ppw71p2wdr-1 modified: configure.in configure.in-20070228020914-u2pk759xg7thauwf-13 csharp/Makefile.am makefile.in-20070228073157-gkwqutuh9f3nq7s2-1 perl/Makefile.am makefile.am-20070228070325-lv4v4ey3018yr147-1 === added file 'csharp/MySql.Cluster.MgmApi.dll.config' --- a/csharp/MySql.Cluster.MgmApi.dll.config 1970-01-01 00:00:00 +0000 +++ b/csharp/MySql.Cluster.MgmApi.dll.config 2007-12-13 00:07:58 +0000 @@ -0,0 +1,4 @@ +<configuration> + <dllmap dll="ndbcli" target="libndbcli.so.0"/> + <dllmap dll="mgmcli" target="libmgmcli.so.0"/> +</configuration>

=== added file 'csharp/MySql.Cluster.NdbApi.dll.config' --- a/csharp/MySql.Cluster.NdbApi.dll.config 1970-01-01 00:00:00 +0000 +++ b/csharp/MySql.Cluster.NdbApi.dll.config 2007-12-13 00:07:58 +0000 @@ -0,0 +1,4 @@ +<configuration> + <dllmap dll="ndbcli" target="libndbcli.so.0"/> + <dllmap dll="mgmcli" target="libmgmcli.so.0"/> +</configuration>

=== added file 'csharp/connectors.snk' Binary files a/csharp/connectors.snk 1970-01-01 00:00:00 +0000 and
b/csharp/connectors.snk 2007-12-13 00:07:58 +0000 differ === modified file 'configure.in' --- a/configure.in 2007-12-12 16:43:24 +0000 +++ b/configure.in 2007-12-13 00:07:58 +0000 @@ -1,4 +1,4 @@ -AC_INIT([ndb-connectors], [0.5.1.22.16]) +AC_INIT([ndb-connectors], [0.5.1.22.17]) AC_CONFIG_AUX_DIR([.]) AM_INIT_AUTOMAKE([1.9 tar-ustar]) AM_CONFIG_HEADER(config.h)

=== modified file 'csharp/Makefile.am' --- a/csharp/Makefile.am 2007-12-11 17:11:11 +0000 +++ b/csharp/Makefile.am 2007-12-13 00:07:58 +0000 @@ -2,17 +2,17 @@ MYSQL_DLL = MySql.Data.dll CLEANFILES = ndbapi.dll *exe ndbapi.cpp MySql.Cluster.NdbApi.dll ndbapi/*
mgmapi/* mgmapi.cpp MySql.Cluster.MgmApi.dll

-lib_LTLIBRARIES = libndbsharp.la libmgmsharp.la -nodist_libndbsharp_la_SOURCES = ndbapi.cpp -libndbsharp_la_LDFLAGS = -fpic -libndbsharp_la_CPPFLAGS = $(PTHREAD_CFLAGS) -libndbsharp_la_DEPENDENCIES = MySql.Cluster.NdbApi.dll -nodist_libmgmsharp_la_SOURCES = mgmapi.cpp -libmgmsharp_la_LDFLAGS = -fpic -libmgmsharp_la_CPPFLAGS = $(PTHREAD_CFLAGS) -libmgmsharp_la_DEPENDENCIES = MySql.Cluster.MgmApi.dll +lib_LTLIBRARIES = libndbcli.la libmgmcli.la +nodist_libndbcli_la_SOURCES = ndbapi.cpp +libndbcli_la_LDFLAGS = -fpic +libndbcli_la_CPPFLAGS = $(PTHREAD_CFLAGS) +libndbcli_la_DEPENDENCIES = MySql.Cluster.NdbApi.dll +nodist_libmgmcli_la_SOURCES = mgmapi.cpp +libmgmcli_la_LDFLAGS = -fpic +libmgmcli_la_CPPFLAGS = $(PTHREAD_CFLAGS) +libmgmcli_la_DEPENDENCIES = MySql.Cluster.MgmApi.dll

-EXTRA_DIST = ndbapi.i mgmapi.i NdbExceptions.cs MgmExceptions.cs NdbError.cs
test*cs +EXTRA_DIST = ndbapi.i mgmapi.i NdbExceptions.cs MgmExceptions.cs NdbError.cs
test*cs connectors.snk *.dll.config

clean-local: @rm -rf ndbapi mgmapi @@ -22,12 +22,12 @@ SUFFIXES = .exe .cs .i .cpp

.cs.exe: MySql.Cluster.NdbApi.dll ndbapi.cpp - $(MCS) -r:MySql.Cluster.NdbApi.dll -r:$(MYSQL_DLL) $< + $(MCS) -keyfile:connectors.snk -r:MySql.Cluster.NdbApi.dll -r:$(MYSQL_DLL) $<

MySql.Cluster.MgmApi.dll: - $(MCS) -target:library -out:$@ mgmapi/*.cs MgmExceptions.cs + $(MCS) -keyfile:connectors.snk -target:library -out:$@ mgmapi/*.cs
MgmExceptions.cs MySql.Cluster.NdbApi.dll: - $(MCS) -target:library -out:$@ ndbapi/*.cs NdbExceptions.cs + $(MCS) -keyfile:connectors.snk -target:library -out:$@ ndbapi/*.cs
NdbExceptions.cs

#$(CSHARP_SOURCES) #.PRECIOUS: %.cpp %.so %.dll @@ -39,11 +39,15 @@

mgmapi.cpp: mgmapi.i ${SWIG_SOURCES} @mkdir -p $* - ${SWIG} -csharp -dllimport libmgmsharp -namespace MySql.Cluster.MgmApi \ + ${SWIG} -csharp -dllimport libmgmcli -namespace MySql.Cluster.MgmApi \ -I$(top_srcdir) -I$(SWIG_DIR) $(MYSQL_INCLUDES) -outdir $* -o $@ $< ndbapi.cpp: ndbapi.i ${SWIG_SOURCES} @mkdir -p $* - ${SWIG} -csharp -dllimport libndbsharp -namespace MySql.Cluster.NdbApi \ + ${SWIG} -csharp -dllimport libndbcli -namespace MySql.Cluster.NdbApi \ -I$(top_srcdir) -I$(SWIG_DIR) $(MYSQL_INCLUDES) -outdir $* -o $@ $< #@cp NdbError.cs $*

+install-exec-local: MySql.Cluster.NdbApi.dll MySql.Cluster.MgmApi.dll + mkdir -p $(DESTDIR)$(datadir)/cli + $(INSTALL_DATA) MySql.Cluster.NdbApi.dll* $(DESTDIR)$(datadir)/cli + $(INSTALL_DATA) MySql.Cluster.MgmApi.dll* $(DESTDIR)$(datadir)/cli

=== modified file 'perl/Makefile.am' --- a/perl/Makefile.am 2007-12-10 05:53:34 +0000 +++ b/perl/Makefile.am 2007-12-13 00:07:58 +0000 @@ -23,12 +23,13 @@ $(SWIG) $(SWIG_OPTS) -o mgmapi/mgmapi_wrap.cpp mgmapi.i

$(PERL_MAKEFILE): $(srcdir)/Makefile.PL ndbapi/ndbapi_wrap.cpp
mgmapi/mgmapi_wrap.cpp lib/mysql/cluster/ndbapi.pm lib/mysql/cluster/mgmapi.pm
$(srcdir)/Makefile.am - CFLAGS="-I../.. -I../../mgmpp $(CPPFLAGS) $(CFLAGS) $(MYSQL_INCLUDES)"
LDFLAGS="$(AM_LDFLAGS) $(LDFLAGS) $(LIBS)" PREFIX="${prefix}" $(PERL)
$(srcdir)/Makefile.PL $(MAKE_PL_OPTS) PREFIX="${prefix}" + echo "$(DEB_MAKE_PL_OPT) should be INSTALLDIRS=vendor" + CFLAGS="-I../.. -I../../mgmpp $(CPPFLAGS) $(CFLAGS) $(MYSQL_INCLUDES)"
LDFLAGS="$(AM_LDFLAGS) $(LDFLAGS) $(LIBS)" $(PERL) $(srcdir)/Makefile.PL
$(MAKE_PL_OPTS) $(DEB_MAKE_PL_OPT)

-perl install-perl: $(PERL_MAKEFILE) @target=`echo $@ | sed -e 's/-perl//'`; \ echo $(MAKE) -f $(PERL_MAKEFILE) $$target; \ - DESTDIR=$(DESTDIR) $(MAKE) $(AM_MAKEFLAGS) -f $(PERL_MAKEFILE) $$target + DESTDIR=$(DESTDIR) $(MAKE) $(AM_MAKEFLAGS) -f $(PERL_MAKEFILE) $$target
PREFIX="${PREFIX}"

test-perl: $(PERL_MAKEFILE) $(RUN)$(MAKE) -f $(PERL_MAKEFILE) test