List:Commits« Previous MessageNext Message »
From:Vladislav Vaintroub Date:November 24 2010 8:23pm
Subject:bzr commit into mysql-5.5-bugteam branch (vvaintroub:3139) Bug#58411
View as plain text  
#At file:///H:/bzr/mysql-5.5-bugteam/ based on revid:tor.didriksen@stripped

 3139 Vladislav Vaintroub	2010-11-24
      Bug #58411 :wixca project fails to build when using Express Edition of VS:
      
      The problem was MFC header file includes into the resource definition file (CustomAction.rc)
      afxres.h is not available with VS Express.
      
      The fix is to remove resource file from compilation and souce code repository. version of
      custom action dll is of no interest for anyone, it is internal dll kept inside the MSI.

    removed:
      packaging/WiX/ca/CustomAction.rc
    modified:
      packaging/WiX/ca/CMakeLists.txt
=== modified file 'packaging/WiX/ca/CMakeLists.txt'
=== modified file 'packaging/WiX/ca/CMakeLists.txt'
--- a/packaging/WiX/ca/CMakeLists.txt	2010-04-30 11:30:32 +0000
+++ b/packaging/WiX/ca/CMakeLists.txt	2010-11-24 20:23:41 +0000
@@ -16,7 +16,7 @@
 INCLUDE_DIRECTORIES(${WIX_DIR}/../SDK/inc)
 LINK_DIRECTORIES(${WIX_DIR}/../SDK/lib)
 
-SET(WIXCA_SOURCES CustomAction.cpp CustomAction.rc CustomAction.def)
+SET(WIXCA_SOURCES CustomAction.cpp CustomAction.def)
 
 IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
 	LINK_LIBRARIES(wcautil_x64 dutil_x64 msi version)

=== removed file 'packaging/WiX/ca/CustomAction.rc'
--- a/packaging/WiX/ca/CustomAction.rc	2010-04-30 11:30:32 +0000
+++ b/packaging/WiX/ca/CustomAction.rc	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-#include "afxres.h"
-#undef APSTUDIO_READONLY_SYMBOLS
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x0L
- FILESUBTYPE 0x0L
-BEGIN
-END
-


Attachment: [text/bzr-bundle] bzr/vvaintroub@mysql.com-20101124202341-1a7ut6m1sonnkurz.bundle
Thread
bzr commit into mysql-5.5-bugteam branch (vvaintroub:3139) Bug#58411Vladislav Vaintroub24 Nov