diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-11-26 23:07:53 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-11-26 23:07:53 +0100 |
| commit | 64e308e28d2b0fb4cd005e23189e3639912bcd60 (patch) | |
| tree | 07aa8c5d623328ff0288dba79634ec3e2a9ed5e3 /win | |
| parent | 6be24a771a27a077d58d21a4a1f8db3fbd14cac4 (diff) | |
| download | mariadb-git-64e308e28d2b0fb4cd005e23189e3639912bcd60.tar.gz | |
Fix build and packaging on Windows:
- build executables we have in 5.3 (mysql_install_db.exe, mysq_upgrade_service.exe, upgrade wizard), and MSI
- add some missing headers to windows specific source files.
This needs to be done since 5.5 is using WIN32_LEAN_AND_MEAN preprocessor constant thus windows.h
no more includes whiole Windows
- do not deliver perl scripts (mysql_install_db.pl & friends) -they do not work, are not documented, and we
have native executables for this functionality. do not pack echo.exe, replace.exe into MSI, they
are not needed. Do not build resolveip on Windows, it is not used.
- precache results of of system checks in cmake/os/WindowsCache.cmake (like it is alreay done for majority of tests
to speed up cmake run with VS)
- make feedback plugin DEFAULT on Windows (so MSI works if user enables plugin),
fix null pointer access in PSI_register
Diffstat (limited to 'win')
| -rw-r--r-- | win/packaging/CPackWixConfig.cmake | 2 | ||||
| -rw-r--r-- | win/packaging/ca/CustomAction.cpp | 4 | ||||
| -rw-r--r-- | win/packaging/create_msi.cmake.in | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/win/packaging/CPackWixConfig.cmake b/win/packaging/CPackWixConfig.cmake index 34f661b393e..0722ecbbccb 100644 --- a/win/packaging/CPackWixConfig.cmake +++ b/win/packaging/CPackWixConfig.cmake @@ -9,7 +9,7 @@ IF(ESSENTIALS) ENDIF()
ELSE()
SET(CPACK_COMPONENTS_USED
- "Server;Client;Development;SharedLibraries;Embedded;Debuginfo;Documentation;IniFiles;Readme;Server_Scripts;scripts;DebugBinaries")
+ "Server;Client;Development;SharedLibraries;Embedded;Documentation;IniFiles;Readme;Debuginfo")
ENDIF()
SET( WIX_FEATURE_MySQLServer_EXTRA_FEATURES "DBInstance;SharedClientServerComponents")
diff --git a/win/packaging/ca/CustomAction.cpp b/win/packaging/ca/CustomAction.cpp index 81c9f7eea92..ed26dd45a94 100644 --- a/win/packaging/ca/CustomAction.cpp +++ b/win/packaging/ca/CustomAction.cpp @@ -17,6 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #define UNICODE #endif +#include <winsock2.h> #include <windows.h> #include <winreg.h> #include <msi.h> @@ -26,7 +27,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <string.h> #include <strsafe.h> #include <assert.h> - +#include <shellapi.h> +#include <stdlib.h> #include <winservice.h> #define ONE_MB 1048576 diff --git a/win/packaging/create_msi.cmake.in b/win/packaging/create_msi.cmake.in index d291d06161c..d02791d3b9f 100644 --- a/win/packaging/create_msi.cmake.in +++ b/win/packaging/create_msi.cmake.in @@ -7,7 +7,7 @@ SET(CMAKE_CFG_INTDIR "@CMAKE_CFG_INTDIR@") SET(VERSION "@VERSION@") SET(MAJOR_VERSION "@MAJOR_VERSION@") SET(MINOR_VERSION "@MINOR_VERSION@") -SET(PATCH_VERSION "@PATCH@") +SET(PATCH_VERSION "@PATCH_VERSION@") SET(CMAKE_SIZEOF_VOID_P @CMAKE_SIZEOF_VOID_P@) SET(MANUFACTURER "@MANUFACTURER@") SET(WIXCA_LOCATION "@WIXCA_LOCATION@") |