diff options
Diffstat (limited to 'win')
| -rw-r--r--[-rwxr-xr-x] | win/Makefile.am | 2 | ||||
| -rw-r--r-- | win/README | 5 | ||||
| -rw-r--r--[-rwxr-xr-x] | win/build-vs71.bat | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | win/build-vs8.bat | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | win/configure.js | 32 |
5 files changed, 3 insertions, 36 deletions
diff --git a/win/Makefile.am b/win/Makefile.am index 05c01b61360..2f4aa626a93 100755..100644 --- a/win/Makefile.am +++ b/win/Makefile.am @@ -15,7 +15,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ## Process this file with automake to create Makefile.in -EXTRA_DIST = build-vs71.bat build-vs8.bat build-vs8_x64.bat configure.js README +EXTRA_DIST = build-vs71.bat build-vs8.bat configure.js README # Don't update the files from bitkeeper %::SCCS/s.% diff --git a/win/README b/win/README index cbda33e1184..d1092c3e969 100644 --- a/win/README +++ b/win/README @@ -3,8 +3,8 @@ Windows building readme ----------------IMPORTANT---------------------------- This readme outlines the instructions for building -MySQL for Windows staring from version 5.0. -This readme does not apply to MySQL versions 5.1 +MySQL for Windows staring from version 5.1. +This readme does not apply to MySQL versions 5.0 or ealier. ----------------------------------------------------- @@ -39,7 +39,6 @@ The options right now are WITH_INNOBASE_STORAGE_ENGINE Enable particular storage engines WITH_PARTITION_STORAGE_ENGINE WITH_ARCHIVE_STORAGE_ENGINE - WITH_BERKELEY_STORAGE_ENGINE WITH_BLACKHOLE_STORAGE_ENGINE WITH_EXAMPLE_STORAGE_ENGINE WITH_FEDERATED_STORAGE_ENGINE diff --git a/win/build-vs71.bat b/win/build-vs71.bat index 959067695c5..959067695c5 100755..100644 --- a/win/build-vs71.bat +++ b/win/build-vs71.bat diff --git a/win/build-vs8.bat b/win/build-vs8.bat index d9c06241a9b..d9c06241a9b 100755..100644 --- a/win/build-vs8.bat +++ b/win/build-vs8.bat diff --git a/win/configure.js b/win/configure.js index ef90ce982a6..6f09be01b6e 100755..100644 --- a/win/configure.js +++ b/win/configure.js @@ -24,7 +24,6 @@ try 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": @@ -66,8 +65,6 @@ try configfile.Close(); - //ConfigureBDB(); - fso = null; WScript.Echo("done!"); @@ -135,32 +132,3 @@ function GetVersionId(version) id += build; 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"); -} |