mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
File / directory structure change from 5.0 to 5.1:
Table handlers "bdb", "heap", "innobase", "myisam", and "myisammrg" have been moved into a common subdirectory "storage". This must be reflected in the tools for Windows: 1) When the source package is created, there is the additional level "storage". 2) The project files below "VC++Files" also get that additional directory level, to keep structures in sync. 3) Within the project files, references to/from the table handlers must cross that level. VC++Files/storage/bdb/build_win32/Berkeley_DB.dsw: mvdir VC++Files/storage/bdb/build_win32/db_archive.dsp: mvdir VC++Files/storage/bdb/build_win32/db_buildall.dsp: mvdir VC++Files/storage/bdb/build_win32/db_checkpoint.dsp: mvdir VC++Files/storage/bdb/build_win32/db_deadlock.dsp: mvdir VC++Files/storage/bdb/build_win32/db_dll.dsp: mvdir VC++Files/storage/bdb/build_win32/db_dump.dsp: mvdir VC++Files/storage/bdb/build_win32/db_java.dsp: mvdir VC++Files/storage/bdb/build_win32/db_load.dsp: mvdir VC++Files/storage/bdb/build_win32/db_printlog.dsp: mvdir VC++Files/storage/bdb/build_win32/db_recover.dsp: mvdir VC++Files/storage/bdb/build_win32/db_stat.dsp: mvdir VC++Files/storage/bdb/build_win32/db_static.dsp: mvdir VC++Files/storage/bdb/build_win32/db_static1.dsp: mvdir VC++Files/storage/bdb/build_win32/db_tcl.dsp: mvdir VC++Files/storage/bdb/build_win32/db_test.dsp: mvdir VC++Files/storage/bdb/build_win32/db_upgrade.dsp: mvdir VC++Files/storage/bdb/build_win32/db_verify.dsp: mvdir VC++Files/storage/bdb/build_win32/ex_access.dsp: mvdir VC++Files/storage/bdb/build_win32/ex_btrec.dsp: mvdir VC++Files/storage/bdb/build_win32/ex_env.dsp: mvdir VC++Files/storage/bdb/build_win32/ex_lock.dsp: mvdir VC++Files/storage/bdb/build_win32/ex_mpool.dsp: mvdir VC++Files/storage/bdb/build_win32/ex_tpcb.dsp: mvdir VC++Files/storage/bdb/build_win32/excxx_access.dsp: mvdir VC++Files/storage/bdb/build_win32/excxx_btrec.dsp: mvdir VC++Files/storage/bdb/build_win32/excxx_env.dsp: mvdir VC++Files/storage/bdb/build_win32/excxx_lock.dsp: mvdir VC++Files/storage/bdb/build_win32/excxx_mpool.dsp: mvdir VC++Files/storage/bdb/build_win32/excxx_tpcb.dsp: mvdir VC++Files/storage/bdb/build_win32/libdb.def: mvdir VC++Files/storage/bdb/build_win32/libdb_tcl.def: mvdir VC++Files/mysql.dsw: Table handlers "bdb", "heap", "innobase", "myisam", and "myisammrg" have been moved into a common subdirectory "storage". This must be reflected in the hierarchy of project files. VC++Files/mysql_ia64.dsw: Table handlers "heap", "innobase", "myisam", and "myisammrg" have been moved into a common subdirectory "storage". This must be reflected in the hierarchy of project files. VC++Files/sql/mysqld.dsp: Table handler "bdb" has been moved into a subdirectory "storage". File "myrg_rnext_same.c" belongs to project "myisammrg". VC++Files/storage/bdb/bdb.dsp: Table handler "bdb" has been moved into a subdirectory "storage", so the path to the directories keeping the libraries must point one level higher. VC++Files/storage/heap/heap.dsp: Table handler "heap" has been moved into a subdirectory "storage", so the pathes to the directories keeping the global includes and libraries must point one level higher. VC++Files/storage/heap/heap_ia64.dsp: Table handler "heap" has been moved into a subdirectory "storage", so the pathes to the directories keeping the global includes and libraries must point one level higher. scripts/make_win_src_distribution.sh: Table handlers "bdb", "heap", "innobase", "myisam", "myisammrg", and "ndb" have been moved into a common subdirectory "storage". This must be reflected when creating a source package for Windows. VC++Files/storage/innobase/innobase.dsp: Table handler "innobase" has been moved into a subdirectory "storage", so the pathes to the directories keeping the global includes and libraries must point one level higher. VC++Files/storage/innobase/innobase_ia64.dsp: Table handler "innobase" has been moved into a subdirectory "storage", so the pathes to the directories keeping the global includes and libraries must point one level higher. VC++Files/storage/myisam/myisam.dsp: Table handler "myisam" has been moved into a subdirectory "storage", so the pathes to the directories keeping the global includes and libraries must point one level higher. VC++Files/storage/myisam/myisam_ia64.dsp: Table handler "myisam" has been moved into a subdirectory "storage", so the pathes to the directories keeping the global includes and libraries must point one level higher. VC++Files/storage/myisammrg/myisammrg.dsp: Table handler "myisammrg" has been moved into a subdirectory "storage", so the pathes to the directories keeping the global includes and libraries must point one level higher. VC++Files/storage/myisammrg/myisammrg_ia64.dsp: Table handler "myisammrg" has been moved into a subdirectory "storage", so the pathes to the directories keeping the global includes and libraries must point one level higher.
This commit is contained in:
@ -184,7 +184,7 @@ rm -r -f "$BASE/share/Makefile"
|
||||
rm -r -f "$BASE/share/Makefile.in"
|
||||
rm -r -f "$BASE/share/Makefile.am"
|
||||
|
||||
mkdir $BASE/Docs $BASE/extra $BASE/include
|
||||
mkdir $BASE/Docs $BASE/extra $BASE/include $BASE/storage
|
||||
|
||||
#
|
||||
# Copy directory files
|
||||
@ -249,9 +249,9 @@ copy_dir_dirs() {
|
||||
# Input directories to be copied
|
||||
#
|
||||
|
||||
for i in client dbug extra heap include \
|
||||
libmysql libmysqld myisam \
|
||||
myisammrg mysys regex sql strings sql-common sql/examples \
|
||||
for i in client dbug extra storage/heap include \
|
||||
libmysql libmysqld storage/myisam \
|
||||
storage/myisammrg mysys regex sql strings sql-common sql/examples \
|
||||
tools vio zlib
|
||||
do
|
||||
copy_dir_files $i
|
||||
@ -260,13 +260,13 @@ done
|
||||
#
|
||||
# Create project files for ndb
|
||||
#
|
||||
make -C $SOURCE/ndb windoze
|
||||
make -C $SOURCE/storage/ndb windoze
|
||||
|
||||
#
|
||||
# Input directories to be copied recursively
|
||||
#
|
||||
|
||||
for i in bdb innobase ndb extra/yassl
|
||||
for i in storage/bdb storage/innobase storage/ndb extra/yassl
|
||||
do
|
||||
copy_dir_dirs $i
|
||||
done
|
||||
@ -275,10 +275,10 @@ done
|
||||
# Create dummy innobase configure header
|
||||
#
|
||||
|
||||
if [ -f $BASE/innobase/ib_config.h ]; then
|
||||
rm -f $BASE/innobase/ib_config.h
|
||||
if [ -f $BASE/storage/innobase/ib_config.h ]; then
|
||||
rm -f $BASE/storage/innobase/ib_config.h
|
||||
fi
|
||||
touch $BASE/innobase/ib_config.h
|
||||
touch $BASE/storage/innobase/ib_config.h
|
||||
|
||||
|
||||
#
|
||||
|
Reference in New Issue
Block a user