diff options
Diffstat (limited to 'win')
| -rw-r--r-- | win/README | 6 | ||||
| -rw-r--r-- | win/build-nmake-x64.bat | 21 | ||||
| -rw-r--r-- | win/build-nmake.bat | 21 | ||||
| -rwxr-xr-x | win/configure.js | 1 | ||||
| -rwxr-xr-x | win/create_manifest.js | 2 | ||||
| -rwxr-xr-x | win/mysql_manifest.cmake | 7 |
6 files changed, 50 insertions, 8 deletions
diff --git a/win/README b/win/README index 118d619226a..cfc3cc9ef6f 100644 --- a/win/README +++ b/win/README @@ -37,7 +37,6 @@ From the root of your bk clone, execute the command: win\configure <options>. 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 @@ -51,12 +50,13 @@ The options right now are DISABLE_GRANT_OPTIONS Disables the use of --init-file and --skip-grant-tables options of mysqld.exe EMBED_MANIFESTS Embed custom manifests into final exes, otherwise VS - default will be used. + default will be used. (Note - This option should only be + used by MySQL AB.) So the command line could look like: -win\configure WITH_INNOBASE_STORAGE_ENGINE WITH_PARTITION_STORAGE_ENGINE MYSQL_SERVER_SUFFIX=-pro +win\configure WITH_INNOBASE_STORAGE_ENGINE WITH_ARCHIVE_STORAGE_ENGINE MYSQL_SERVER_SUFFIX=-my-suffix Step 5 ------ diff --git a/win/build-nmake-x64.bat b/win/build-nmake-x64.bat new file mode 100644 index 00000000000..f73574ac8de --- /dev/null +++ b/win/build-nmake-x64.bat @@ -0,0 +1,21 @@ +@echo off + +REM Copyright (C) 2006 MySQL AB +REM +REM This program is free software; you can redistribute it and/or modify +REM it under the terms of the GNU General Public License as published by +REM the Free Software Foundation; version 2 of the License. +REM +REM This program is distributed in the hope that it will be useful, +REM but WITHOUT ANY WARRANTY; without even the implied warranty of +REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +REM GNU General Public License for more details. +REM +REM You should have received a copy of the GNU General Public License +REM along with this program; if not, write to the Free Software +REM Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +if exist cmakecache.txt del cmakecache.txt +copy win\nmake_x64_cache.txt cmakecache.txt +cmake -G "NMake Makefiles" +copy cmakecache.txt win\nmake_x64_cache.txt diff --git a/win/build-nmake.bat b/win/build-nmake.bat new file mode 100644 index 00000000000..89505c08313 --- /dev/null +++ b/win/build-nmake.bat @@ -0,0 +1,21 @@ +@echo off + +REM Copyright (C) 2006 MySQL AB +REM +REM This program is free software; you can redistribute it and/or modify +REM it under the terms of the GNU General Public License as published by +REM the Free Software Foundation; version 2 of the License. +REM +REM This program is distributed in the hope that it will be useful, +REM but WITHOUT ANY WARRANTY; without even the implied warranty of +REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +REM GNU General Public License for more details. +REM +REM You should have received a copy of the GNU General Public License +REM along with this program; if not, write to the Free Software +REM Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +if exist cmakecache.txt del cmakecache.txt +copy win\nmake_cache.txt cmakecache.txt +cmake -G "NMake Makefiles" +copy cmakecache.txt win\nmake_cache.txt diff --git a/win/configure.js b/win/configure.js index 7cdf6176e50..1408dba9aea 100755 --- a/win/configure.js +++ b/win/configure.js @@ -44,7 +44,6 @@ try case "WITH_EXAMPLE_STORAGE_ENGINE": case "WITH_FEDERATED_STORAGE_ENGINE": case "WITH_INNOBASE_STORAGE_ENGINE": - case "WITH_PARTITION_STORAGE_ENGINE": case "__NT__": case "DISABLE_GRANT_OPTIONS": case "EMBED_MANIFESTS": diff --git a/win/create_manifest.js b/win/create_manifest.js index 8569bd508ff..dec8f6e62e2 100755 --- a/win/create_manifest.js +++ b/win/create_manifest.js @@ -56,7 +56,7 @@ try manifest_xml+= "\t<assemblyIdentity name=\'" + app_name + "\'"; manifest_xml+= " version=\'" + app_version + "\'"; manifest_xml+= " processorArchitecture=\'" + app_arch + "\'"; - // TOADD - Add publicKeyToken attribute once we have Authenticode key. + manifest_xml+= " publicKeyToken=\'02ad33b422233ae3\'"; manifest_xml+= " type=\'win32\' />\r\n"; // Identify the application security requirements. manifest_xml+= "\t<trustInfo xmlns=\'urn:schemas-microsoft-com:asm.v2\'>\r\n"; diff --git a/win/mysql_manifest.cmake b/win/mysql_manifest.cmake index 4c88be1d800..0d429e438d6 100755 --- a/win/mysql_manifest.cmake +++ b/win/mysql_manifest.cmake @@ -14,7 +14,8 @@ MACRO(MYSQL_EMBED_MANIFEST _target_name _required_privs) ADD_CUSTOM_COMMAND( TARGET ${_target_name} POST_BUILD - COMMAND mt.exe - ARGS -nologo -manifest $(IntDir)\\$(TargetFileName).intermediate.manifest -outputresource:$(TargetPath) - COMMENT "Embeds the manifest contents.") + COMMAND mt.exe ARGS -nologo -hashupdate -makecdfs -manifest $(IntDir)\\$(TargetFileName).intermediate.manifest -outputresource:$(TargetPath) + COMMAND makecat.exe ARGS $(IntDir)\\$(TargetFileName).intermediate.manifest.cdf + COMMAND signtool.exe ARGS sign /a /t http://timestamp.verisign.com/scripts/timstamp.dll $(TargetPath) + COMMENT "Embeds the manifest contents, creates a cryptographic catalog, signs the target with Authenticode certificate.") ENDMACRO(MYSQL_EMBED_MANIFEST) |