mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
4 commits
Author | SHA1 | Message | Date | |
---|---|---|---|---|
unknown
|
1337c429fb |
CMakeLists.txt (many), win/README, mysql_manifest.cmake, configure.js:
Additional changes for bug#29903 - Changed to do embedded build part as normal build, when WITH_EMBEDDED_SERVER is set. - Allow both normal and debug build with embedded. - Build static embedded library by pointing out all source and compile it all, i.e. not building libraries from libraries, not portable. - Let embedded use generated files from the "sql" directory, added dependencies to make sure built before embedded. - Mark library "dbug" in TARGET_LINK_LIBRARIES() with "debug", so only linked in when debug target is used. - Removed change of target name with "mysqld${MYSQLD_EXE_SUFFIX}", as others can't depend on it, not defined at configure time. Instead set the output file name. - Created work around for bug in CMake 2.4.6 and output names, to set the "mysqld<suffix>.pdb" name to the same base name. - Set the correct manifest "name" (patch by iggy) CMakeLists.txt: Changes for embedded and Windows libmysql/CMakeLists.txt: Changes for embedded and Windows libmysqld/CMakeLists.txt: Changes for embedded and Windows libmysqld/examples/CMakeLists.txt: Changes for embedded and Windows mysys/CMakeLists.txt: Changes for embedded and Windows regex/CMakeLists.txt: Changes for embedded and Windows server-tools/instance-manager/CMakeLists.txt: Changes for embedded and Windows sql/CMakeLists.txt: Changes for embedded and Windows storage/archive/CMakeLists.txt: Changes for embedded and Windows storage/blackhole/CMakeLists.txt: Changes for embedded and Windows storage/csv/CMakeLists.txt: Changes for embedded and Windows storage/example/CMakeLists.txt: Changes for embedded and Windows storage/federated/CMakeLists.txt: Changes for embedded and Windows storage/heap/CMakeLists.txt: Changes for embedded and Windows storage/innobase/CMakeLists.txt: Changes for embedded and Windows storage/myisam/CMakeLists.txt: Changes for embedded and Windows storage/myisammrg/CMakeLists.txt: Changes for embedded and Windows strings/CMakeLists.txt: Changes for embedded and Windows vio/CMakeLists.txt: Changes for embedded and Windows win/README: Changes for embedded and Windows win/configure.js: Changes for embedded and Windows win/mysql_manifest.cmake: Changes for embedded and Windows |
||
unknown
|
a250e2b453 |
Fix a bad BitKeeper dependency structure for the "CMakeLists.txt" files.
They had been introduced in 5.1 and were only later backported to 5.0; as a consequence, the files in the 5.1 tree do not depend on the 5.0 ones, and changes in 5.0 do not propagate into the 5.1 files. To fix this, the (previous) files in 5.1 now are deleted ("bk rm"), and the previously deleted files depending on 5.0 are now moved to the respective source directories ("bk mv"). The current 5.1 contents is restored in these files. If you need the previous history of the 5.1 files ("bk revtool"), access those in "BitKeeper/deleted". Contrary to the original plan, I did not introduce the name "CMakeLists.historic" - mostly in order not to clutter the source tree. This fixes bug#29982. BitKeeper/deleted/.del-CMakeLists.txt~2eb9019b: Delete: client/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~5b8836e4: Delete: CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~93f0d646: Delete: dbug/CMakeLists.txt dbug/CMakeLists.txt: Rename: BitKeeper/deleted/.del-CMakeLists.txt~9 -> dbug/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~57492bba: Delete: extra/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~8c35983c: Delete: extra/yassl/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~c3563d5f: Delete: extra/yassl/taocrypt/CMakeLists.txt extra/yassl/CMakeLists.txt: Rename: BitKeeper/deleted/.del-CMakeLists.txt~11 -> extra/yassl/CMakeLists.txt extra/yassl/taocrypt/CMakeLists.txt: Rename: BitKeeper/deleted/.del-CMakeLists.txt~12 -> extra/yassl/taocrypt/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~99a50df6: Delete: libmysql/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~86a68ea1: Delete: mysys/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~9e206e11: Delete: regex/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~95969b72: Delete: server-tools/instance-manager/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~fdec1f01: Delete: sql/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~1960eb07: Delete: storage/innobase/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~96726c3b: Delete: storage/myisam/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~bb293bb4: Delete: storage/heap/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~5fa65a12: Delete: strings/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~fb3a3a47: Delete: storage/myisammrg/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~fc201a06: Delete: tests/CMakeLists.txt tests/CMakeLists.txt: Rename: BitKeeper/deleted/.del-CMakeLists.txt~5 -> tests/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~2a609d33: Delete: vio/CMakeLists.txt vio/CMakeLists.txt: Rename: BitKeeper/deleted/.del-CMakeLists.txt~6 -> vio/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~ef945345: Delete: zlib/CMakeLists.txt zlib/CMakeLists.txt: Rename: BitKeeper/deleted/.del-CMakeLists.txt~8 -> zlib/CMakeLists.txt CMakeLists.txt: Restore the current 5.1 contents into the 5.0-dependent file. For the previous 5.1 history of this file, see the one in "BitKeeper/deleted". client/CMakeLists.txt: Restore the current 5.1 contents into the 5.0-dependent file. For the previous 5.1 history of this file, see the one in "BitKeeper/deleted". extra/CMakeLists.txt: Restore the current 5.1 contents into the 5.0-dependent file. For the previous 5.1 history of this file, see the one in "BitKeeper/deleted". libmysql/CMakeLists.txt: Restore the current 5.1 contents into the 5.0-dependent file. For the previous 5.1 history of this file, see the one in "BitKeeper/deleted". mysys/CMakeLists.txt: Restore the current 5.1 contents into the 5.0-dependent file. For the previous 5.1 history of this file, see the one in "BitKeeper/deleted". regex/CMakeLists.txt: Restore the current 5.1 contents into the 5.0-dependent file. For the previous 5.1 history of this file, see the one in "BitKeeper/deleted". server-tools/instance-manager/CMakeLists.txt: Restore the current 5.1 contents into the 5.0-dependent file. For the previous 5.1 history of this file, see the one in "BitKeeper/deleted". sql/CMakeLists.txt: Restore the current 5.1 contents into the 5.0-dependent file. For the previous 5.1 history of this file, see the one in "BitKeeper/deleted". storage/heap/CMakeLists.txt: Restore the current 5.1 contents into the 5.0-dependent file. For the previous 5.1 history of this file, see the one in "BitKeeper/deleted". storage/innobase/CMakeLists.txt: Restore the current 5.1 contents into the 5.0-dependent file. For the previous 5.1 history of this file, see the one in "BitKeeper/deleted". storage/myisam/CMakeLists.txt: Restore the current 5.1 contents into the 5.0-dependent file. For the previous 5.1 history of this file, see the one in "BitKeeper/deleted". storage/myisammrg/CMakeLists.txt: Restore the current 5.1 contents into the 5.0-dependent file. For the previous 5.1 history of this file, see the one in "BitKeeper/deleted". strings/CMakeLists.txt: Restore the current 5.1 contents into the 5.0-dependent file. For the previous 5.1 history of this file, see the one in "BitKeeper/deleted". |
||
unknown
|
d73b5b8e83 |
Many files:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header Added GPL copyright text my_vle.h, rpl_utility.h, my_vle.c, base64-t.c, rpl_utility.cc: Changed copyright header formatting some plugin_example.c, daemon_example.c: Added "Copyright (C) 2006 MySQL AB" to GPL header CMakeLists.txt: Added GPL copyright text client/CMakeLists.txt: Added GPL copyright text dbug/CMakeLists.txt: Added GPL copyright text extra/CMakeLists.txt: Added GPL copyright text extra/yassl/CMakeLists.txt: Added GPL copyright text extra/yassl/taocrypt/CMakeLists.txt: Added GPL copyright text libmysql/CMakeLists.txt: Added GPL copyright text libmysqld/CMakeLists.txt: Added GPL copyright text libmysqld/examples/CMakeLists.txt: Added GPL copyright text mysys/CMakeLists.txt: Added GPL copyright text regex/CMakeLists.txt: Added GPL copyright text server-tools/instance-manager/CMakeLists.txt: Added GPL copyright text sql/CMakeLists.txt: Added GPL copyright text storage/archive/CMakeLists.txt: Added GPL copyright text storage/blackhole/CMakeLists.txt: Added GPL copyright text storage/csv/CMakeLists.txt: Added GPL copyright text storage/example/CMakeLists.txt: Added GPL copyright text storage/federated/CMakeLists.txt: Added GPL copyright text storage/heap/CMakeLists.txt: Added GPL copyright text storage/innobase/CMakeLists.txt: Added GPL copyright text storage/myisam/CMakeLists.txt: Added GPL copyright text storage/myisammrg/CMakeLists.txt: Added GPL copyright text strings/CMakeLists.txt: Added GPL copyright text tests/CMakeLists.txt: Added GPL copyright text vio/CMakeLists.txt: Added GPL copyright text zlib/CMakeLists.txt: Added GPL copyright text include/my_vle.h: Changed copyright header formatting some mysys/my_vle.c: Changed copyright header formatting some plugin/daemon_example/daemon_example.c: Added "Copyright (C) 2006 MySQL AB" to GPL header plugin/fulltext/plugin_example.c: Added "Copyright (C) 2006 MySQL AB" to GPL header plugin/Makefile.am: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/authors.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/contributors.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/item_xmlfunc.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/partition_element.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/partition_info.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/rpl_injector.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/rpl_injector.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/sql_binlog.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/sql_servers.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header storage/Makefile.am: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header storage/archive/Makefile.am: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header storage/blackhole/Makefile.am: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header storage/csv/Makefile.am: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header storage/example/Makefile.am: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header storage/federated/Makefile.am: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header win/Makefile.am: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/rpl_utility.cc: Changed copyright header formatting some sql/rpl_utility.h: Changed copyright header formatting some unittest/mysys/base64-t.c: Changed copyright header formatting some include/my_uctype.h: Added GPL copyright text plugin/daemon_example/Makefile.am: Added GPL copyright text plugin/fulltext/Makefile.am: Added GPL copyright text scripts/make_win_bin_dist: Added GPL copyright text server-tools/instance-manager/user_management_commands.cc: Added GPL copyright text sql/sql_builtin.cc.in: Added GPL copyright text sql/sql_show.h: Added GPL copyright text storage/archive/archive_test.c: Added GPL copyright text storage/ndb/src/kernel/blocks/dbtup/test_varpage.cpp: Added GPL copyright text storage/ndb/src/kernel/blocks/diskpage.cpp: Added GPL copyright text storage/ndb/src/kernel/vm/Rope.cpp: Added GPL copyright text storage/ndb/src/mgmsrv/ParamInfo.hpp: Added GPL copyright text strings/uctypedump.c: Added GPL copyright text unittest/Makefile.am: Added GPL copyright text unittest/examples/Makefile.am: Added GPL copyright text unittest/examples/core-t.c: Added GPL copyright text unittest/examples/no_plan-t.c: Added GPL copyright text unittest/examples/simple-t.c: Added GPL copyright text unittest/examples/skip-t.c: Added GPL copyright text unittest/examples/skip_all-t.c: Added GPL copyright text unittest/examples/todo-t.c: Added GPL copyright text unittest/mysys/Makefile.am: Added GPL copyright text unittest/mytap/Makefile.am: Added GPL copyright text unittest/mytap/t/Makefile.am: Added GPL copyright text unittest/mytap/t/basic-t.c: Added GPL copyright text unittest/unit.pl: Added GPL copyright text win/build-vs71.bat: Added GPL copyright text win/build-vs8.bat: Added GPL copyright text win/configure.js: Added GPL copyright text |
||
unknown
|
2dce7ff6f1 |
performing a set of bk mv on each CMakeLists.txt file to try and restore the mixed case filenames since this seems to be required with Cmake 2.4 beta 1.
This is being pushed to a private tree and tested before being sent to the mainline. client/CMakeLists.txt: Rename: client/cmakelists.txt.tmp -> client/CMakeLists.txt libmysql/CMakeLists.txt: Rename: libmysql/cmakelists.txt.tmp -> libmysql/CMakeLists.txt libmysqld/CMakeLists.txt: Rename: libmysqld/cmakelists.txt.tmp -> libmysqld/CMakeLists.txt sql/CMakeLists.txt: Rename: sql/cmakelists.txt.tmp -> sql/CMakeLists.txt zlib/CMakeLists.txt: Rename: zlib/cmakelists.txt.tmp -> zlib/CMakeLists.txt extra/CMakeLists.txt: Rename: extra/cmakelists.txt.tmp -> extra/CMakeLists.txt tests/CMakeLists.txt: Rename: tests/cmakelists.txt.tmp -> tests/CMakeLists.txt extra/yassl/CMakeLists.txt: Rename: extra/yassl/cmakelists.txt.tmp -> extra/yassl/CMakeLists.txt extra/yassl/taocrypt/CMakeLists.txt: Rename: extra/yassl/taocrypt/cmakelists.txt.tmp -> extra/yassl/taocrypt/CMakeLists.txt storage/heap/CMakeLists.txt: Rename: storage/heap/cmakelists.txt.tmp -> storage/heap/CMakeLists.txt storage/myisam/CMakeLists.txt: Rename: storage/myisam/cmakelists.txt.tmp -> storage/myisam/CMakeLists.txt storage/myisammrg/CMakeLists.txt: Rename: storage/myisammrg/cmakelists.txt.tmp -> storage/myisammrg/CMakeLists.txt storage/csv/CMakeLists.txt: Rename: storage/csv/cmakelists.txt.tmp -> storage/csv/CMakeLists.txt storage/innobase/CMakeLists.txt: Rename: storage/innobase/cmakelists.txt.tmp -> storage/innobase/CMakeLists.txt server-tools/instance-manager/CMakeLists.txt: Rename: server-tools/instance-manager/cmakelists.txt.tmp -> server-tools/instance-manager/CMakeLists.txt libmysqld/examples/CMakeLists.txt: Rename: libmysqld/examples/cmakelists.txt.tmp -> libmysqld/examples/CMakeLists.txt vio/CMakeLists.txt: Rename: vio/cmakelists.txt.tmp -> vio/CMakeLists.txt dbug/CMakeLists.txt: Rename: dbug/cmakelists.txt.tmp -> dbug/CMakeLists.txt strings/CMakeLists.txt: Rename: strings/cmakelists.txt.tmp -> strings/CMakeLists.txt regex/CMakeLists.txt: Rename: regex/cmakelists.txt.tmp -> regex/CMakeLists.txt mysys/CMakeLists.txt: Rename: mysys/cmakelists.txt.tmp -> mysys/CMakeLists.txt storage/archive/CMakeLists.txt: Rename: storage/archive/cmakelists.txt.tmp -> storage/archive/CMakeLists.txt storage/bdb/CMakeLists.txt: Rename: storage/bdb/cmakelists.txt.tmp -> storage/bdb/CMakeLists.txt storage/blackhole/CMakeLists.txt: Rename: storage/blackhole/cmakelists.txt.tmp -> storage/blackhole/CMakeLists.txt storage/example/CMakeLists.txt: Rename: storage/example/cmakelists.txt.tmp -> storage/example/CMakeLists.txt CMakeLists.txt: Rename: cmakelists.txt.tmp -> CMakeLists.txt |
Renamed from vio/cmakelists.txt (Browse further)