From 684a4bbbea1ce5e6474971297907b957e4b22ab7 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 27 Mar 2006 15:19:56 -0600 Subject: removed handlerton-win.cc now using CONFIGURE_FILE and INCLUDE to generate handlerton.cc and to set the definitions based on the storage engines given on the command line BitKeeper/deleted/.del-handlerton-win.cc~322a7e59507976df: Delete: sql/handlerton-win.cc cmakelists.txt: use INCLUDE to read in the cmake file generated as part of configure comment out the setting of /wd4996 since we are using the -D flag instead sql/cmakelists.txt: include IF() blocks for every storage engine and set two vars that are used with CONFIGURE_FILE later in the script. This CONFIGURE_FILE call replaces the need for config-handlerton.js win/configure.js: write out proper cmake code instead of just the values. --- win/configure.js | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'win/configure.js') diff --git a/win/configure.js b/win/configure.js index b1c269d4eed..263b4fe7da0 100644 --- a/win/configure.js +++ b/win/configure.js @@ -14,7 +14,27 @@ try var configfile = fso.CreateTextFile("win\\configure.data", true); for (i=0; i < args.Count(); i++) { - configfile.WriteLine(args.Item(i)); + var parts = args.Item(i).split('='); + switch (parts[0]) + { + case "WITH_ARCHIVE_STORAGE_ENGINE": + case "WITH_BERKELEY_STORAGE_ENGINE": + case "WITH_BLACKHOLE_STORAGE_ENGINE": + case "WITH_EXAMPLE_STORAGE_ENGINE": + case "WITH_FEDERATED_STORAGE_ENGINE": + case "WITH_INNOBASE_STORAGE_ENGINE": + case "WITH_PARTITION_STORAGE_ENGINE": + case "__NT__": + line = "SET (" + args.Item(i) + " TRUE)"; + break; + case "MYSQL_SERVER_SUFFIX": + case "COMPILATION_COMMENT": + case "MYSQL_TCP_PORT": + line = "SET (" + parts[0] + " " + parts[1] + ")"; + break; + } + + configfile.WriteLine(line); } configfile.Close(); -- cgit v1.2.1