database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

several ndb automake changes, see respective file

Browse Source 
ndb/tools/waiter.cpp:
  Rename: ndb/test/tools/waiter.cpp -> ndb/tools/waiter.cpp
configure.in:
  added install dirs for ndb
ndb/Makefile.am:
  ndb headers for install
ndb/config/common.mk.am:
  DEFS_LOC in ndb make
ndb/config/type_ndbapi.mk.am:
  added LDADD=libNDB_API.la default for type_ndbapi
ndb/src/cw/cpcd/Makefile.am:
  changes install dir
ndb/src/kernel/blocks/backup/restore/Makefile.am:
  changes install dir
ndb/src/kernel/ndb-main/Makefile.am:
  changes install dir
ndb/src/mgmapi/Makefile.am:
  changes install dir
ndb/src/mgmclient/Makefile.am:
  changes install dir
ndb/src/mgmsrv/Makefile.am:
  changes install dir
ndb/src/ndbapi/Makefile.am:
  changes install dir
ndb/test/ndbapi/Makefile.am:
  changes install dir
ndb/test/ndbapi/bank/Makefile.am:
  changes install dir
ndb/test/tools/Makefile.am:
  changes install dir
mysql-test/ndb/install_ndbcluster.sh:
  new
mysql-test/ndb/stop_ndbcluster.sh:
  new
ndb/tools/Makefile.am:
  changes install dir
This commit is contained in:
unknown
2004-05-27 07:04:45 +00:00
parent 34e7ad059a
commit c41b0e48c9
19 changed files with 136 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
configure.in
View File

@ -2837,6 +2837,35 @@ then
CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)" CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)"
fi fi
ndbbindir_root="\$(prefix)"
ndbbindir="\$(ndbbindir_root)/ndb/bin"
AC_SUBST(ndbbindir_root)
AC_SUBST(ndbbindir)
ndbtoolsdir_root="\$(prefix)"
ndbtoolsdir="\$(ndbtoolsdir_root)/ndb/tools"
AC_SUBST(ndbtoolsdir_root)
AC_SUBST(ndbtoolsdir)
ndblibdir_root="\$(prefix)"
ndblibdir="\$(ndblibdir_root)/ndb/lib"
AC_SUBST(ndblibdir_root)
AC_SUBST(ndblibdir)
ndbtestdir_root="\$(prefix)"
ndbtestdir="\$(ndbtestdir_root)/ndb/test"
AC_SUBST(ndbtestdir_root)
AC_SUBST(ndbtestdir)
ndbincludedir_root="\$(prefix)"
ndbincludedir="\$(ndbincludedir_root)/ndb/include"
AC_SUBST(ndbincludedir_root)
AC_SUBST(ndbincludedir)
ndbapiincludedir_root="\$(prefix)"
ndbapiincludedir="\$(ndbapiincludedir_root)/ndb/include/ndbapi"
AC_SUBST(ndbapiincludedir_root)
AC_SUBST(ndbapiincludedir)
mgmapiincludedir_root="\$(prefix)"
mgmapiincludedir="\$(mgmapiincludedir_root)/ndb/include/mgmapi"
AC_SUBST(mgmapiincludedir_root)
AC_SUBST(mgmapiincludedir)
NDB_UTIL_INCLUDES="-I\$(srcdir) -I\$(top_srcdir)/include -I\$(top_srcdir)/ndb/include \ NDB_UTIL_INCLUDES="-I\$(srcdir) -I\$(top_srcdir)/include -I\$(top_srcdir)/ndb/include \
-I\$(top_srcdir)/ndb/include/util \ -I\$(top_srcdir)/ndb/include/util \
-I\$(top_srcdir)/ndb/include/portlib \ -I\$(top_srcdir)/ndb/include/portlib \
@ -2958,7 +2987,7 @@ AC_OUTPUT(Makefile extra/Makefile mysys/Makefile isam/Makefile dnl
merge/Makefile dbug/Makefile scripts/Makefile dnl merge/Makefile dbug/Makefile scripts/Makefile dnl
include/Makefile sql-bench/Makefile tools/Makefile dnl include/Makefile sql-bench/Makefile tools/Makefile dnl
tests/Makefile Docs/Makefile support-files/Makefile dnl tests/Makefile Docs/Makefile support-files/Makefile dnl
support-files/MacOSX/Makefile mysql-test/Makefile dnl support-files/MacOSX/Makefile mysql-test/Makefile mysql-test/ndb/Makefile dnl
netware/Makefile dnl netware/Makefile dnl
include/mysql_version.h dnl include/mysql_version.h dnl
cmd-line-utils/Makefile dnl cmd-line-utils/Makefile dnl

27
mysql-test/ndb/Makefile.am Normal file
View File

@ -0,0 +1,27 @@
benchdir_root= $(prefix)
testdir = $(benchdir_root)/mysql-test/ndb
test_SCRIPTS = \
install_ndbcluster \
stop_ndbcluster
EXTRA_SCRIPTS = \
install_ndbcluster.sh \
stop_ndbcluster.sh
test_DATA = ndb_config_2_node.ini
SUFFIXES = .sh
.sh:
@RM@ -f $@ $@-t
@SED@ \
-e 's!@''ndbbindir''@!$(ndbbindir)!g' \
-e 's!@''ndbtoolsdir''@!$(ndbtoolsdir)!g' \
$< > $@-t
@CHMOD@ +x $@-t
@MV@ $@-t $@
# Don't update the files from bitkeeper
%::SCCS/s.%

27
mysql-test/ndb/install_ndbcluster → mysql-test/ndb/install_ndbcluster.sh
View File

@ -9,8 +9,22 @@ port_base="22" # using ports port_base{"00","01", etc}
fsdir=`pwd` fsdir=`pwd`
# end configurable parameters # end configurable parameters
libdir=`pwd`/../ndb/lib # Are we using a source or a binary distribution?
bindir=`pwd`/../ndb/bin
if [ -d ../sql ] ; then
SOURCE_DIST=1
ndbtop=../ndb
exec_ndb=$ndbtop/src/kernel/ndb-main/ndb
exec_mgmtsrvr=$ndbtop/src/mgmsrv/mgmtsrvr
exec_waiter=$ndbtop/tools/ndbwaiter
exec_mgmtclient=$ndbtop/src/mgmclient/mgmtclient
else
BINARY_DIST=1
exec_ndb=@ndbbindir@/ndb
exec_mgmtsrvr=@ndbbindir@/mgmtsrvr
exec_waiter=@ndbtoolsdir@/waiter
exec_mgmtclient=@ndbbindir@/mgmtclient
fi
pidfile=ndbcluster.pid pidfile=ndbcluster.pid
@ -33,8 +47,6 @@ while test $# -gt 0; do
shift shift
done done
exec_ndb=$bindir/ndb
exec_mgmtsrvr=$bindir/mgmtsrvr
fs_ndb=$fsdir/ndbcluster fs_ndb=$fsdir/ndbcluster
fs_mgm_1=$fs_ndb/1.ndb_mgm fs_mgm_1=$fs_ndb/1.ndb_mgm
fs_ndb_2=$fs_ndb/2.ndb_db fs_ndb_2=$fs_ndb/2.ndb_db
@ -125,15 +137,14 @@ cat `find $fs_ndb -name 'node*.pid'` > $pidfile
# Start management client # Start management client
sleep 5 sleep 10
echo "show" | $bindir/mgmtclient $ndb_host $ndb_port echo "show" | $exec_mgmtclient $ndb_host $ndb_port
# test if Ndb Cluster starts properly # test if Ndb Cluster starts properly
NDB_ID="11" NDB_ID="11"
NDB_CONNECTSTRING=$NDB_CONNECTSTRING_BASE$NDB_ID NDB_CONNECTSTRING=$NDB_CONNECTSTRING_BASE$NDB_ID
#if ( export LD_LIBRARY_PATH=$libdir ; $bindir/list_tables ) | grep "NDBT_ProgramExit: 0 - OK"; then :; else if ( $exec_waiter ) | grep "NDBT_ProgramExit: 0 - OK"; then :; else
if ( export LD_LIBRARY_PATH=$libdir ; $bindir/waiter ) | grep "NDBT_ProgramExit: 0 - OK"; then :; else
echo "Ndbcluster startup failed" echo "Ndbcluster startup failed"
exit 1 exit 1
fi fi

12
mysql-test/ndb/stop_ndbcluster → mysql-test/ndb/stop_ndbcluster.sh
View File

@ -4,7 +4,15 @@
# This scripts stops the table handler ndbcluster # This scripts stops the table handler ndbcluster
bindir=`pwd`/../ndb/bin if [ -d ../sql ] ; then
SOURCE_DIST=1
ndbtop=../ndb
exec_mgmtclient=$ndbtop/src/mgmclient/mgmtclient
else
BINARY_DIST=1
exec_mgmtclient=@ndbbindir@/mgmtclient
fi
pidfile=ndbcluster.pid pidfile=ndbcluster.pid
cfgfile=Ndb.cfg cfgfile=Ndb.cfg
@ -36,7 +44,7 @@ ndb_port=`cat $cfgfile | sed -e "s,.*host=$ndb_host\:\([0-9]*\).*,\1,1"`
# Start management client # Start management client
exec_mgmtclient="$bindir/mgmtclient --try-reconnect=1 $ndb_host $ndb_port" exec_mgmtclient="$exec_mgmtclient --try-reconnect=1 $ndb_host $ndb_port"
echo "$exec_mgmtclient" echo "$exec_mgmtclient"
echo "all stop" | $exec_mgmtclient echo "all stop" | $exec_mgmtclient

28
ndb/Makefile.am
View File

@ -3,4 +3,32 @@
SUBDIRS = . include src test tools SUBDIRS = . include src test tools
ndbinclude_HEADERS = \
include/ndb_types.h \
include/ndb_version.h
ndbapiinclude_HEADERS = \
include/ndbapi/ndbapi_limits.h \
include/ndbapi/Ndb.hpp \
include/ndbapi/NdbApi.hpp \
include/ndbapi/NdbConnection.hpp \
include/ndbapi/NdbCursorOperation.hpp \
include/ndbapi/NdbDictionary.hpp \
include/ndbapi/NdbError.hpp \
include/ndbapi/NdbEventOperation.hpp \
include/ndbapi/NdbIndexOperation.hpp \
include/ndbapi/NdbOperation.hpp \
include/ndbapi/NdbPool.hpp \
include/ndbapi/NdbRecAttr.hpp \
include/ndbapi/NdbReceiver.hpp \
include/ndbapi/NdbResultSet.hpp \
include/ndbapi/NdbScanFilter.hpp \
include/ndbapi/NdbScanOperation.hpp \
include/ndbapi/NdbSchemaCon.hpp \
include/ndbapi/NdbSchemaOp.hpp
mgmapiinclude_HEADERS = \
include/mgmapi/mgmapi.h \
include/mgmapi/mgmapi_debug.h
noinst_HEADERS = noinst_HEADERS =

2
ndb/config/common.mk.am
View File

@ -1,7 +1,7 @@
INCLUDES = $(INCLUDES_LOC) INCLUDES = $(INCLUDES_LOC)
LDADD = $(top_srcdir)/ndb/src/common/portlib/gcc.cpp $(LDADD_LOC) LDADD = $(top_srcdir)/ndb/src/common/portlib/gcc.cpp $(LDADD_LOC)
DEFS = @DEFS@ @NDB_DEFS@ DEFS = @DEFS@ @NDB_DEFS@ $(DEFS_LOC)
# ndb cannot be compiled with -fno-implicit-templaces # ndb cannot be compiled with -fno-implicit-templaces
NDB_CXXFLAGS=-fimplicit-templates NDB_CXXFLAGS=-fimplicit-templates
##use AM_CXXFLAGS for other flags ##use AM_CXXFLAGS for other flags

1
ndb/config/type_ndbapi.mk.am
View File

@ -1,2 +1,3 @@
INCLUDES += @NDB_NDBAPI_INCLUDES@ INCLUDES += @NDB_NDBAPI_INCLUDES@
LDADD += $(top_srcdir)/ndb/src/ndbapi/libNDB_API.la

2
ndb/src/cw/cpcd/Makefile.am
View File

@ -1,5 +1,5 @@
bin_PROGRAMS = ndb_cpcd ndbtools_PROGRAMS = ndb_cpcd
ndb_cpcd_SOURCES = main.cpp CPCD.cpp Process.cpp APIService.cpp Monitor.cpp common.cpp ndb_cpcd_SOURCES = main.cpp CPCD.cpp Process.cpp APIService.cpp Monitor.cpp common.cpp

2
ndb/src/kernel/blocks/backup/restore/Makefile.am
View File

@ -1,5 +1,5 @@
bin_PROGRAMS = restore ndbtools_PROGRAMS = restore
restore_SOURCES = main.cpp Restore.cpp restore_SOURCES = main.cpp Restore.cpp

2
ndb/src/kernel/ndb-main/Makefile.am
View File

@ -1,5 +1,5 @@
bin_PROGRAMS = ndb ndbbin_PROGRAMS = ndb
ndb_SOURCES = Main.cpp SimBlockList.cpp ndb_SOURCES = Main.cpp SimBlockList.cpp

8
ndb/src/mgmapi/Makefile.am
View File

@ -1,16 +1,16 @@
noinst_LTLIBRARIES = libmgmapi.la libMGM_API.la ndblib_LTLIBRARIES = libmgmapi.la libMGM_API.la
libmgmapi_la_SOURCES_loc = mgmapi.cpp libmgmapi_la_SOURCES_loc = mgmapi.cpp
libmgmapi_la_SOURCES = $(libmgmapi_la_SOURCES_loc) libmgmapi_la_SOURCES = $(libmgmapi_la_SOURCES_loc)
libMGM_API_la_SOURCES = $(libmgmapi_la_SOURCES_loc) libMGM_API_la_SOURCES = $(libmgmapi_la_SOURCES_loc)
INCLUDES_LOC = -I$(top_srcdir)/ndb/include/mgmapi -I$(top_srcdir)/ndb/src/common/mgmcommon
DEFS_LOC = -DNO_DEBUG_MESSAGES
include $(top_srcdir)/ndb/config/common.mk.am include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_util.mk.am include $(top_srcdir)/ndb/config/type_util.mk.am
INCLUDES += -I$(top_srcdir)/ndb/include/mgmapi -I$(top_srcdir)/ndb/src/common/mgmcommon
DEFS += -DNO_DEBUG_MESSAGES
libMGM_API_la_LIBADD = \ libMGM_API_la_LIBADD = \
$(top_srcdir)/ndb/src/common/portlib/unix/libportlib.la \ $(top_srcdir)/ndb/src/common/portlib/unix/libportlib.la \

2
ndb/src/mgmclient/Makefile.am
View File

@ -1,5 +1,5 @@
bin_PROGRAMS = mgmtclient ndbbin_PROGRAMS = mgmtclient
mgmtclient_SOURCES = \ mgmtclient_SOURCES = \
main.cpp \ main.cpp \

14
ndb/src/mgmsrv/Makefile.am
View File

@ -1,5 +1,5 @@
bin_PROGRAMS = mgmtsrvr ndbbin_PROGRAMS = mgmtsrvr
mgmtsrvr_SOURCES = \ mgmtsrvr_SOURCES = \
MgmtSrvr.cpp \ MgmtSrvr.cpp \
@ -13,17 +13,15 @@ mgmtsrvr_SOURCES = \
MgmtSrvrConfig.cpp \ MgmtSrvrConfig.cpp \
CommandInterpreter.cpp CommandInterpreter.cpp
include $(top_srcdir)/ndb/config/common.mk.am INCLUDES_LOC = -I$(top_srcdir)/ndb/src/ndbapi -I$(top_srcdir)/ndb/include/mgmapi -I$(top_srcdir)/ndb/src/common/mgmcommon
include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
INCLUDES += -I$(top_srcdir)/ndb/src/ndbapi -I$(top_srcdir)/ndb/include/mgmapi -I$(top_srcdir)/ndb/src/common/mgmcommon
LDADD += \ LDADD_LOC = \
$(top_srcdir)/ndb/src/mgmapi/libmgmapi.la \ $(top_srcdir)/ndb/src/mgmapi/libmgmapi.la \
$(top_srcdir)/ndb/src/ndbapi/libNDB_API.la \
$(top_srcdir)/ndb/src/common/mgmcommon/libmgmsrvcommon.la \
$(top_srcdir)/ndb/src/common/util/libgeneral.la \
$(top_srcdir)/ndb/src/common/editline/libeditline.a \ $(top_srcdir)/ndb/src/common/editline/libeditline.a \
@TERMCAP_LIB@ @TERMCAP_LIB@
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
# Don't update the files from bitkeeper # Don't update the files from bitkeeper
%::SCCS/s.% %::SCCS/s.%

2
ndb/src/ndbapi/Makefile.am
View File

@ -1,6 +1,6 @@
#SUBDIRS = signal-sender #SUBDIRS = signal-sender
noinst_LTLIBRARIES = libndbapi.la libNDB_API.la ndblib_LTLIBRARIES = libndbapi.la libNDB_API.la
libndbapi_la_SOURCES_loc = \ libndbapi_la_SOURCES_loc = \
TransporterFacade.cpp \ TransporterFacade.cpp \

2
ndb/test/ndbapi/Makefile.am
View File

@ -1,7 +1,7 @@
SUBDIRS = bank SUBDIRS = bank
bin_PROGRAMS = \ ndbtest_PROGRAMS = \
flexBench \ flexBench \
drop_all_tabs \ drop_all_tabs \
create_all_tabs \ create_all_tabs \

2
ndb/test/ndbapi/bank/Makefile.am
View File

@ -1,5 +1,5 @@
bin_PROGRAMS = testBank bankSumAccounts bankValidateAllGLs bankMakeGL bankTransactionMaker bankCreator bankTimer ndbtest_PROGRAMS = testBank bankSumAccounts bankValidateAllGLs bankMakeGL bankTransactionMaker bankCreator bankTimer
noinst_LIBRARIES = libbank.a noinst_LIBRARIES = libbank.a

3
ndb/test/tools/Makefile.am
View File

@ -1,5 +1,5 @@
bin_PROGRAMS = waiter hugoCalculator hugoLoad hugoFill hugoLockRecords hugoPkDelete hugoPkRead hugoPkReadRecord hugoPkUpdate hugoScanRead hugoScanUpdate restart verify_index copy_tab create_index ndb_cpcc ndbtest_PROGRAMS = hugoCalculator hugoLoad hugoFill hugoLockRecords hugoPkDelete hugoPkRead hugoPkReadRecord hugoPkUpdate hugoScanRead hugoScanUpdate restart verify_index copy_tab create_index ndb_cpcc
# transproxy # transproxy
@ -14,7 +14,6 @@ hugoPkUpdate_SOURCES = hugoPkUpdate.cpp
hugoScanRead_SOURCES = hugoScanRead.cpp hugoScanRead_SOURCES = hugoScanRead.cpp
hugoScanUpdate_SOURCES = hugoScanUpdate.cpp hugoScanUpdate_SOURCES = hugoScanUpdate.cpp
restart_SOURCES = restart.cpp restart_SOURCES = restart.cpp
waiter_SOURCES = waiter.cpp
# transproxy_SOURCES = transproxy.cpp # transproxy_SOURCES = transproxy.cpp
verify_index_SOURCES = verify_index.cpp verify_index_SOURCES = verify_index.cpp
copy_tab_SOURCES = copy_tab.cpp copy_tab_SOURCES = copy_tab.cpp

3
ndb/tools/Makefile.am
View File

@ -1,6 +1,7 @@
bin_PROGRAMS = drop_tab delete_all desc drop_index list_tables select_all select_count ndbtools_PROGRAMS = ndb_waiter drop_tab delete_all desc drop_index list_tables select_all select_count
ndb_waiter_SOURCES = waiter.cpp
delete_all_SOURCES = delete_all.cpp delete_all_SOURCES = delete_all.cpp
desc_SOURCES = desc.cpp desc_SOURCES = desc.cpp
drop_index_SOURCES = drop_index.cpp drop_index_SOURCES = drop_index.cpp

0
ndb/test/tools/waiter.cpp → ndb/tools/waiter.cpp
View File