summaryrefslogtreecommitdiff
path: root/win
diff options
context:
space:
mode:
authorunknown <iggy@amd64.(none)>2007-08-03 14:43:12 -0400
committerunknown <iggy@amd64.(none)>2007-08-03 14:43:12 -0400
commitc6c57ed783eabf5d9c99a3c1fd4f5ea5518c069c (patch)
tree743ce671890386580cfb5fe72e9393a21c9f567f /win
parent6f88aa45dbc129751890421b13e8c4e13b8bd888 (diff)
downloadmariadb-git-c6c57ed783eabf5d9c99a3c1fd4f5ea5518c069c.tar.gz
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.
Diffstat (limited to 'win')
-rw-r--r--win/README15
1 files changed, 15 insertions, 0 deletions
diff --git a/win/README b/win/README
index afa4bd65163..d4b6ee1e3df 100644
--- a/win/README
+++ b/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.
+