1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge bk-internal:/home/bk/mysql-5.0

Browse Source 
into  mysql.com:/data0/mysqldev/my/build-200708231546-5.0.48/mysql-5.0-release
This commit is contained in:
unknown 2007-08-27 11:24:54 +02:00
commit 478fb4a14d
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
netware/BUILD/compile-netware-END
View File

@ -29,8 +29,15 @@ fi
# configure # configure
./configure $base_configs $extra_configs ./configure $base_configs $extra_configs
# make # Ensure a clean tree
make clean bin-dist make clean
# Link NetWare specific .def files into their proper locations
# in the source tree
( cd netware && make link_sources )
# Now, do the real build
make bin-dist
# mark the build # mark the build
for file in *.tar.gz *.zip for file in *.tar.gz *.zip

12
netware/Makefile.am
View File

@ -40,6 +40,11 @@ netware_build_files = client/mysql.def client/mysqladmin.def \
sql/mysqld.def extra/mysql_waitpid.def \ sql/mysqld.def extra/mysql_waitpid.def \
extra/resolve_stack_dump.def myisam/myisam_ftdump.def extra/resolve_stack_dump.def myisam/myisam_ftdump.def
BUILT_SOURCES = link_sources init_db.sql test_db.sql
CLEANFILES = $(BUILT_SOURCES)
all: $(BUILT_SOURCES)
link_sources: link_sources:
set -x; \ set -x; \
for f in $(netware_build_files); do \ for f in $(netware_build_files); do \
@ -47,6 +52,7 @@ link_sources:
org=`basename $$f`; \ org=`basename $$f`; \
@LN_CP_F@ $(srcdir)/$$org ../$$f; \ @LN_CP_F@ $(srcdir)/$$org ../$$f; \
done done
else else
BUILT_SOURCES = libmysql.imp init_db.sql test_db.sql BUILT_SOURCES = libmysql.imp init_db.sql test_db.sql
@ -86,6 +92,8 @@ EXTRA_DIST= $(BUILT_SOURCES) comp_err.def install_test_db.ncf \
BUILD/mwasmnlm BUILD/mwccnlm BUILD/mwenv BUILD/mwldnlm \ BUILD/mwasmnlm BUILD/mwccnlm BUILD/mwenv BUILD/mwldnlm \
BUILD/nwbootstrap BUILD/openssl.imp BUILD/save-patch BUILD/nwbootstrap BUILD/openssl.imp BUILD/save-patch
endif
# Build init_db.sql from the files that contain # Build init_db.sql from the files that contain
# the system tables for this version of MySQL plus any commands # the system tables for this version of MySQL plus any commands
@ -103,9 +111,7 @@ init_db.sql: $(top_srcdir)/scripts/mysql_system_tables.sql \
test_db.sql: init_db.sql $(top_srcdir)/scripts/mysql_test_data_timezone.sql test_db.sql: init_db.sql $(top_srcdir)/scripts/mysql_test_data_timezone.sql
@echo "Building $@"; @echo "Building $@";
@cat init_db.sql \ @cat init_db.sql \
$(top_srcdir)/scripts/mysql_test_data_timezone.sql >> $@; $(top_srcdir)/scripts/mysql_test_data_timezone.sql > $@;
endif
# Don't update the files from bitkeeper # Don't update the files from bitkeeper
%::SCCS/s.% %::SCCS/s.%