mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 11:01:52 +01:00
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
This commit is contained in:
tomas@poseidon.ndb.mysql.com
commit
adf95ea16a
393 changed files with 93 additions and 99 deletions
|
|
@ -432,6 +432,9 @@ AC_SUBST(HOSTNAME)
|
|||
AC_SUBST(PERL)
|
||||
AC_SUBST(PERL5)
|
||||
|
||||
AC_PATH_PROG(DOXYGEN, doxygen, no)
|
||||
AC_SUBST(DOXYGEN)
|
||||
|
||||
# Lock for PS
|
||||
AC_PATH_PROG(PS, ps, ps)
|
||||
AC_MSG_CHECKING("how to check if pid exists")
|
||||
|
|
@ -2907,6 +2910,7 @@ AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS)
|
|||
|
||||
# Output results
|
||||
AC_OUTPUT(Makefile extra/Makefile mysys/Makefile isam/Makefile dnl
|
||||
ndb/docs/Makefile dnl
|
||||
ndb/Makefile ndb/include/Makefile dnl
|
||||
ndb/src/Makefile ndb/src/common/Makefile dnl
|
||||
ndb/tools/Makefile dnl
|
||||
|
|
|
|||
|
|
@ -1,97 +0,0 @@
|
|||
include .defs.mk
|
||||
#
|
||||
# hack before full autoconf
|
||||
replace-targets := all clean
|
||||
first-docs: all
|
||||
|
||||
include $(NDB_TOP)/Epilogue.mk
|
||||
|
||||
all: ndbapidoc mgmapidoc
|
||||
|
||||
DOXYGEN = doxygen
|
||||
DOXYTOP = $(shell cd $(NDB_TOP); pwd)/docs
|
||||
DOXYDIR = $(DOXYTOP)/doxygen
|
||||
DOXYTMP = $(DOXYTOP)/.doxytmp
|
||||
DOXYOUT = $(DOXYTOP)/.doxyout
|
||||
|
||||
clean:
|
||||
rm -rf ndbapi.pdf ndbapi.html mgmapi.pdf mgmapi.html
|
||||
rm -rf $(DOXYTMP) $(DOXYOUT)
|
||||
|
||||
###
|
||||
#
|
||||
# NDB API Programmer's Guide
|
||||
#
|
||||
ndbapidoc: ndbapi.pdf
|
||||
|
||||
ndbapi.pdf: $(NDB_TOP)/include/ndb_version.h
|
||||
@set -x; \
|
||||
rm -rf ndbapi.pdf ndbapi.html; \
|
||||
rm -rf $(DOXYTMP) $(DOXYOUT); \
|
||||
mkdir -p $(DOXYTMP) $(DOXYOUT); \
|
||||
(cd $(NDB_TOP)/include/ndbapi && \
|
||||
find . -type f -print | \
|
||||
grep -v /SCCS | \
|
||||
cpio -pdm $(DOXYTMP)); \
|
||||
(cd $(NDB_TOP)/examples && \
|
||||
cp -p */*.[ch]pp $(DOXYTMP)); \
|
||||
$(DOXYDIR)/predoxy.pl; \
|
||||
mv footer.html $(DOXYTMP); \
|
||||
(cd $(DOXYTMP) && \
|
||||
$(DOXYGEN) $(DOXYDIR)/Doxyfile.ndbapi); \
|
||||
$(DOXYDIR)/postdoxy.pl $(DOXYOUT)/ndbapi.latex "NDB API Programmer Guide"; \
|
||||
(cd $(DOXYOUT) && \
|
||||
find ndbapi.html -print | cpio -pdm $(DOXYTOP)); \
|
||||
(cd $(DOXYOUT)/ndbapi.latex && \
|
||||
pdflatex refman.tex && makeindex refman && pdflatex refman.tex && \
|
||||
cp -p refman.pdf $(DOXYTOP)/ndbapi.pdf);
|
||||
|
||||
###
|
||||
#
|
||||
# MGM API Guide
|
||||
#
|
||||
mgmapidoc: mgmapi.pdf
|
||||
|
||||
mgmapi.pdf: $(NDB_TOP)/include/ndb_version.h
|
||||
@set -x; \
|
||||
rm -rf mgmapi.pdf mgmapi.html; \
|
||||
rm -rf $(DOXYTMP) $(DOXYOUT); \
|
||||
mkdir -p $(DOXYTMP) $(DOXYOUT); \
|
||||
(cd $(NDB_TOP)/include/mgmapi && \
|
||||
find . -type f -print | \
|
||||
grep -v /SCCS | \
|
||||
cpio -pdm $(DOXYTMP)); \
|
||||
$(DOXYDIR)/predoxy.pl; \
|
||||
mv footer.html $(DOXYTMP); \
|
||||
(cd $(DOXYTMP) && \
|
||||
$(DOXYGEN) $(DOXYDIR)/Doxyfile.mgmapi); \
|
||||
$(DOXYDIR)/postdoxy.pl $(OUTDIR)/mgmapi.latex "NDB Cluster MGM API Guide"; \
|
||||
(cd $(DOXYOUT) && \
|
||||
find mgmapi.html -print | cpio -pdm $(DOXYTOP)); \
|
||||
(cd $(DOXYOUT)/mgmapi.latex && \
|
||||
pdflatex refman.tex && makeindex refman && pdflatex refman.tex && \
|
||||
cp -p refman.pdf $(DOXYTOP)/mgmapi.pdf);
|
||||
|
||||
###
|
||||
#
|
||||
# Complete Source Browser except for
|
||||
# ndbapi odbc test tools win32 lib examples docs CVS config bin
|
||||
# include/ndbapi
|
||||
# include/newtonapi src/newtonapi
|
||||
# include/mgmapi src/mgmapi
|
||||
# src/client
|
||||
ndbdoc: DUMMY
|
||||
mkdir -p $(OUTDIR)
|
||||
cd $(NDB_TOP) ; $(DOXYGEN) $(DOXYDIR)/Doxyfile.ndb
|
||||
|
||||
###
|
||||
#
|
||||
# odbcdoc - Complete Source Browser for NDB ODBC (src/client/odbc)
|
||||
|
||||
odbcdoc: DUMMY
|
||||
mkdir -p $(OUTDIR)
|
||||
cd $(NDB_TOP) ; $(DOXYGEN) $(DOXYDIR)/Doxyfile.odbc
|
||||
|
||||
testdoc: DUMMY
|
||||
mkdir -p $(OUTDIR)
|
||||
cd $(NDB_TOP) ; $(DOXYGEN) $(DOXYDIR)/Doxyfile.test
|
||||
89
ndb/docs/Makefile.am
Normal file
89
ndb/docs/Makefile.am
Normal file
|
|
@ -0,0 +1,89 @@
|
|||
|
||||
all: do-check ndbapidoc mgmapidoc
|
||||
|
||||
DOXYDIR = doxygen
|
||||
DOXYTMP = .doxytmp
|
||||
DOXYOUT = .doxyout
|
||||
|
||||
clean:
|
||||
rm -rf ndbapi.pdf ndbapi.html mgmapi.pdf mgmapi.html
|
||||
rm -rf $(DOXYTMP) $(DOXYOUT)
|
||||
|
||||
do-check:
|
||||
@set -x; \
|
||||
if test $(PERL) = no ; then \
|
||||
echo "Perl needed to make docs"; \
|
||||
exit 1; \
|
||||
fi; \
|
||||
if test $(DOXYGEN) = no ; then \
|
||||
echo "Doxygen needed to make docs"; \
|
||||
exit 1; \
|
||||
fi;
|
||||
###
|
||||
#
|
||||
# NDB API Programmer's Guide
|
||||
#
|
||||
ndbapidoc: ndbapi.pdf
|
||||
|
||||
ndbapi.pdf: $(top_srcdir)/ndb/include/ndb_version.h
|
||||
@set -x; \
|
||||
@RM@ -f ndbapi.pdf ndbapi.html; \
|
||||
@RM@ -rf $(DOXYTMP) $(DOXYOUT); \
|
||||
@mkdir_p@ $(DOXYTMP) $(DOXYOUT); \
|
||||
@CP@ $(top_srcdir)/ndb/include/ndbapi/* $(DOXYTMP); \
|
||||
@CP@ $(top_srcdir)/ndb/examples/*/*.[ch]pp $(DOXYTMP); \
|
||||
@PERL@ $(DOXYDIR)/predoxy.pl; \
|
||||
mv footer.html $(DOXYTMP); \
|
||||
(cd $(DOXYTMP) ; @DOXYGEN@ ../$(DOXYDIR)/Doxyfile.ndbapi); \
|
||||
@PERL@ $(DOXYDIR)/postdoxy.pl $(DOXYOUT)/ndbapi.latex "NDB API Programmer Guide"; \
|
||||
(cd $(DOXYOUT) && \
|
||||
find ndbapi.html -print | cpio -pdm ..); \
|
||||
(cd $(DOXYOUT)/ndbapi.latex && \
|
||||
pdflatex refman.tex && makeindex refman && pdflatex refman.tex && \
|
||||
cp -p refman.pdf ../../ndbapi.pdf);
|
||||
|
||||
###
|
||||
#
|
||||
# MGM API Guide
|
||||
#
|
||||
mgmapidoc: mgmapi.pdf
|
||||
|
||||
mgmapi.pdf: $(top_srcdir)/ndb/include/ndb_version.h
|
||||
@set -x; \
|
||||
@RM@ -f mgmapi.pdf mgmapi.html; \
|
||||
@RM@ -rf $(DOXYTMP) $(DOXYOUT); \
|
||||
@mkdir_p@ $(DOXYTMP) $(DOXYOUT); \
|
||||
@CP@ $(top_srcdir)/ndb/include/mgmapi/* $(DOXYTMP); \
|
||||
@PERL@ $(DOXYDIR)/predoxy.pl; \
|
||||
mv footer.html $(DOXYTMP); \
|
||||
(cd $(DOXYTMP) ; @DOXYGEN@ ../$(DOXYDIR)/Doxyfile.mgmapi); \
|
||||
@PERL@ $(DOXYDIR)/postdoxy.pl $(DOXYOUT)/mgmapi.latex "NDB Cluster MGM API Guide"; \
|
||||
(cd $(DOXYOUT) && \
|
||||
find mgmapi.html -print | cpio -pdm ..); \
|
||||
(cd $(DOXYOUT)/mgmapi.latex && \
|
||||
pdflatex refman.tex && makeindex refman && pdflatex refman.tex && \
|
||||
cp -p refman.pdf ../../mgmapi.pdf);
|
||||
|
||||
###
|
||||
#
|
||||
# Complete Source Browser except for
|
||||
# ndbapi odbc test tools win32 lib examples docs CVS config bin
|
||||
# include/ndbapi
|
||||
# include/newtonapi src/newtonapi
|
||||
# include/mgmapi src/mgmapi
|
||||
# src/client
|
||||
ndbdoc: DUMMY
|
||||
mkdir -p $(OUTDIR)
|
||||
cd $(top_srcdir)/ndb ; $(DOXYGEN) $(DOXYDIR)/Doxyfile.ndb
|
||||
|
||||
###
|
||||
#
|
||||
# odbcdoc - Complete Source Browser for NDB ODBC (src/client/odbc)
|
||||
|
||||
odbcdoc: DUMMY
|
||||
mkdir -p $(OUTDIR)
|
||||
cd $(top_srcdir)/ndb ; $(DOXYGEN) $(DOXYDIR)/Doxyfile.odbc
|
||||
|
||||
testdoc: DUMMY
|
||||
mkdir -p $(OUTDIR)
|
||||
cd $(top_srcdir)/ndb ; $(DOXYGEN) $(DOXYDIR)/Doxyfile.test
|
||||
|
|
@ -1,4 +1,3 @@
|
|||
#!/usr/local/bin/perl
|
||||
#
|
||||
# Written by Lars Thalmann, lars@mysql.com, 2003.
|
||||
#
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
#!/usr/local/bin/perl
|
||||
#
|
||||
# Written by Lars Thalmann, lars@mysql.com, 2003.
|
||||
#
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue