Clean up CMake configuration following review.

1 files changed, 86 insertions, 28 deletions

diff --git a/win/configure.js b/win/configure.js
index 263b4fe7da0..ef90ce982a6 100644
--- a/win/configure.js
+++ b/win/configure.js
@@ -6,39 +6,69 @@ ForAppending = 8;
 
 try 
 {
-	// first we attempt to open the main configure.in file
     var fso = new ActiveXObject("Scripting.FileSystemObject");
+
+    var args = WScript.Arguments
     
-	var args = WScript.Arguments
-	
+    // read in the Unix configure.in file
+    var configureInTS = fso.OpenTextFile("configure.in", ForReading);
+    var configureIn = configureInTS.ReadAll();
+    configureInTS.Close();
+    var default_comment = "Source distribution";
+    var default_port = GetValue(configureIn, "MYSQL_TCP_PORT_DEFAULT");
+
     var configfile = fso.CreateTextFile("win\\configure.data", true);
     for (i=0; i < args.Count(); 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);
+        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__":
+            case "CYBOZU":
+                    configfile.WriteLine("SET (" + args.Item(i) + " TRUE)");
+                    break;
+            case "MYSQL_SERVER_SUFFIX":
+                    configfile.WriteLine("SET (" + parts[0] + " \""
+                                         + parts[1] + "\")");
+                    break;
+            case "COMPILATION_COMMENT":
+                    default_comment = parts[1];
+                    break;
+            case "MYSQL_TCP_PORT":
+                    default_port = parts[1];
+                    break;
+        }
     }
+
+    configfile.WriteLine("SET (COMPILATION_COMMENT \"" +
+                         default_comment + "\")");
+
+    configfile.WriteLine("SET (PROTOCOL_VERSION \"" +
+                         GetValue(configureIn, "PROTOCOL_VERSION") + "\")");
+    configfile.WriteLine("SET (DOT_FRM_VERSION \"" +
+                         GetValue(configureIn, "DOT_FRM_VERSION") + "\")");
+    configfile.WriteLine("SET (MYSQL_TCP_PORT \"" + default_port + "\")");
+    configfile.WriteLine("SET (MYSQL_UNIX_ADDR \"" +
+                         GetValue(configureIn, "MYSQL_UNIX_ADDR_DEFAULT") + "\")");
+    var version = GetVersion(configureIn);
+    configfile.WriteLine("SET (VERSION \"" + version + "\")");
+    configfile.WriteLine("SET (MYSQL_BASE_VERSION \"" +
+                         GetBaseVersion(version) + "\")");
+    configfile.WriteLine("SET (MYSQL_VERSION_ID \"" +
+                         GetVersionId(version) + "\")");
+
     configfile.Close();
     
-	fso = null;
+    //ConfigureBDB();
+
+    fso = null;
 
     WScript.Echo("done!");
 }
@@ -54,9 +84,9 @@ function GetValue(str, key)
     pos += key.length + 1;
     var end = str.indexOf("\n", pos);
     if (str.charAt(pos) == "\"")
-		pos++;
-	if (str.charAt(end-1) == "\"")
-		end--;
+        pos++;
+    if (str.charAt(end-1) == "\"")
+        end--;
     return str.substring(pos, end);    
 }
 
@@ -106,3 +136,31 @@ function GetVersionId(version)
     return id;
 }
 
+function ConfigureBDB() 
+{
+    // read in the Unix configure.in file
+    var dbIncTS = fso.OpenTextFile("..\\bdb\\dbinc\\db.in", ForReading);
+    var dbIn = dbIncTS.ReadAll();
+    dbIncTS.Close();
+
+    dbIn = dbIn.replace("@DB_VERSION_MAJOR@", "$DB_VERSION_MAJOR");
+    dbIn = dbIn.replace("@DB_VERSION_MINOR@", "$DB_VERSION_MINOR");
+    dbIn = dbIn.replace("@DB_VERSION_PATCH@", "$DB_VERSION_PATCH");
+    dbIn = dbIn.replace("@DB_VERSION_STRING@", "$DB_VERSION_STRING");
+
+    dbIn = dbIn.replace("@u_int8_decl@", "typedef unsigned char u_int8_t;");
+    dbIn = dbIn.replace("@int16_decl@", "typedef short int16_t;");
+    dbIn = dbIn.replace("@u_int16_decl@", "typedef unsigned short u_int16_t;");
+    dbIn = dbIn.replace("@int32_decl@", "typedef int int32_t;");
+    dbIn = dbIn.replace("@u_int32_decl@", "typedef unsigned int u_int32_t;");
+
+    dbIn = dbIn.replace("@u_char_decl@", "{\r\n#if !defined(_WINSOCKAPI_)\r\n" +
+        "typedef unsigned char u_char;");
+    dbIn = dbIn.replace("@u_short_decl@", "typedef unsigned short u_short;");
+    dbIn = dbIn.replace("@u_int_decl@", "typedef unsigned int u_int;");
+    dbIn = dbIn.replace("@u_long_decl@", "typedef unsigned long u_long;");
+    
+    dbIn = dbIn.replace("@ssize_t_decl@", "#endif\r\n#if defined(_WIN64)\r\n" +
+        "typedef __int64 ssize_t;\r\n#else\r\n" +
+        "typedef int ssize_t;\r\n#endif");
+}