From: Vladislav Vaintroub
Date: November 24 2010 8:23pm
Subject: bzr commit into mysql-5.5-bugteam branch (vvaintroub:3139) Bug#58411
List-Archive: http://lists.mysql.com/commits/124931
X-Bug: 58411
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1061008540=="

--===============1061008540==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#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
-


--===============1061008540==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/vvaintroub@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: vvaintroub@stripped
# target_branch: file:///H:/bzr/mysql-5.5-bugteam/
# testament_sha1: 6eb7608b31a1945bf50579f46602a55489361f99
# timestamp: 2010-11-24 21:23:47 +0100
# base_revision_id: tor.didriksen@stripped\
#   alplf2qce569a5br
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWT7q4FAAAaDfgAAQWGf/93sm
n8C////wUAQ6eNBYaqAANCFNPRNPQU02mIBNpNNDEaZpDaj1NDmAAmTAAmEwTCGAIwANNRGTJJtT
1PaaUyB6mgZAPJpDTQ0MOYACZMACYTBMIYAjAAkkTBTACA1MkMU8pp5MoemoaAPUmhiscfijcDWw
RbIt4WQF3KAqBZZFbr75+K55JTXqSxdwxkihWi8hsXx9PqyJSRV9/71k/JKbrDZYxFXDCrOyt1iM
fvhL8HbYmON5wNy4Py8hKEJhFXA9rkeuUiLFRqzbiQyGw+zZ98a+GwTGlheI3d67NIdinz03us20
pcrEnHJe1HstN765+hBKxmC3FkKpPQMzMnCwH3h4NCcMCK70+Cgb3yq+SqsE/zmKz4TQvKKfuOv5
zkhfGqFk0DmcPPThBpA6EX3zzQhRzPWCHVhCLI12hJVsbOGyqipBMKPB2gTTCYUTcNxUVpXImUVP
9WFQ8LflzXByqIBa6itqeV9WtVURNXpCtvHFieU0ws91YtbzPliEmpIwfkVGBziW8uOROkpT3MrV
6eU55rruwzXurFO1RZUtLja8iWVq+KcsIDb/uFuwu6I358SOWN18nLAVHlIyWGy+dJ7JEnpyyGtx
fkp5kVbsJK2Ax73ec5HgK4KlOqLJlAtKFpkDAGNLUXV6g10vNItNuHVlQmF3b1ldvGZg69PS2yGM
VtgnWXVLWLDF/sNoc3+WofzSjh+LaHYTA5c1jaEAzhmgvLOCz81bOXuUrSXgcwDr4UIRUeAwfHEk
vYX744REPZ8owzhwomJCLeFeYgH1onKWCchTIbfcdfNvCK6KySeiMzJPZrqyISImN7WUqmzq0yw8
anipeJKYqzicTWrDGJttM4L4EPGRMKclp9/WnOYa9u5z8mC+YY5eYTlAWITjbtqf27DTo6ECrLgF
3s5w0ZXpTdhxHNLJ3Hh/jjQ0sz7U41TBCwr2kWj8YS6MGLMwRTuitLV0+yaMgPNkF4JaYqN85jLU
Z6qlxKzGAuTKws4mAXYDgr87lUXcC/6fVV7U+TiKx1y3CfEvOgXVxqD1kBvylRTZmTKQdAu9+hVt
0hLhfB8uvj2JsVXwDmrRVTPQDUKwe4I+rVMjyrTh2qiUyN2r1KumJNhHYJgec1I5TKaLfPZKQ9vd
Kb0QabB1pnptm+kmYKhiLbhPFAfIZMmQMmUePVJil7TTPZ6Q5MSBdvdwFEpJXpgct7gau6IEllBr
cmZOIttUMcM/zKFIbV81YBZVtcnJkuXdWOWyKGrYtJ2cqh/TqVifLa26LngVEEWivt5QY0ap8gc7
tV51NZxr47AthWsKvEWVpzAZGwLAiup2VmuWkt6y2Cm55FvpjUXm6jidmlw+6IyiTsCKYHEGEOUn
J+3kvCtBut9eo1xtJGosMfsv7FoeCUs1LUPY9huH4fkop/E+pnmti1Dgre8B6MaOaP/i7kinChIH
3VwKAA==


--===============1061008540==--