mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
Bug#29903 The CMake build method does not produce the embedded library.
- Changes to correct and test Windows embedded build. BitKeeper/etc/ignore: Bug#29903 The CMake build method does not produce the embedded library. - Ignore auto-generated Windows embedded resources. CMakeLists.txt: Bug#29903 The CMake build method does not produce the embedded library. - Hardcode CSV for all configurations. - Add client directory for gen_lex_hash dependency. client/CMakeLists.txt: Bug#29903 The CMake build method does not produce the embedded library. - Build the mysqlclient library and echo for the embedded solution. client/client_priv.h: Bug#29903 The CMake build method does not produce the embedded library. - Defined new option. client/mysql.cc: Bug#29903 The CMake build method does not produce the embedded library. - Add server-arg command line parameter libmysqld/CMakeLists.txt: Bug#29903 The CMake build method does not produce the embedded library. - Added auto generated resources; sql_yacc.cc, sql_yacc.h, message.rc message.h and lex_hash.h. - Link csv library to libmsyqld. libmysqld/Makefile.am: Bug#29903 The CMake build method does not produce the embedded library. - Include CMakeLists.txt in dist. libmysqld/examples/CMakeLists.txt: Bug#29903 The CMake build method does not produce the embedded library. - Follow existing naming convention. libmysqld/examples/Makefile.am: Bug#29903 The CMake build method does not produce the embedded library. - Include CMakeLists.txt in dist. mysql-test/mysql-test-run.pl: Bug#29903 The CMake build method does not produce the embedded library. - Move embedded option block earlier in the script. - Added the path to the libmysqld.dll to Windows path. win/README: Bug#29903 The CMake build method does not produce the embedded library. - Add instructions for building/testing the embedded library.
This commit is contained in:
15
win/README
15
win/README
@ -65,6 +65,8 @@ The options right now are:
|
||||
EMBED_MANIFESTS Embed custom manifests into final exes, otherwise VS
|
||||
default will be used. (Note - This option should only be
|
||||
used by MySQL AB.)
|
||||
EMBEDDED_ONLY Configure solution to produce libmysqld.dll
|
||||
default will be used.
|
||||
|
||||
|
||||
So the command line could look like:
|
||||
@ -98,3 +100,16 @@ may be necessary to clean the build tree to remove any stale objects.
|
||||
Please see this link: http://msdn.microsoft.com/vstudio/express/visualc/usingpsdk/
|
||||
At step 5 you only need to add the libraries advapi32.lib and user32.lib to
|
||||
the file "corewin_express.vsprops" in order to avoid link errors.
|
||||
|
||||
3. Testing the Windows embedded library requires a two step process. The extra
|
||||
step is necessary because the testsuite requires mysqld to run properly but both
|
||||
the embedded library and the mysqld executable cannot be built at the same time.
|
||||
Here's the process for building and testing the embedded library:
|
||||
|
||||
A. Follow steps 1 - 7 listed above to produce the Release configuration.
|
||||
B. Perform step 5 from above again adding "--EMBEDDED-ONLY" to previously
|
||||
supplied options.
|
||||
C. Complete the build steps above to produce the Release configuration. Make
|
||||
sure to Rebuild the solution so that all libraries are re-built.
|
||||
D. Run the testsuite as usual.
|
||||
|
||||
|
Reference in New Issue
Block a user