Skip to content

win: Fix MSI generation on Visual Studio != 2013 #2365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joaocgreis merged 2 commits into from
Aug 24, 2015
Merged

win: Fix MSI generation on Visual Studio != 2013 #2365

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0acc9b2
win: fix custom actions on Visual Studio != 2013
Jun 19, 2015
bce1aea
win: fix custom actions for WiX older than 3.9
joaocgreis Jul 21, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
win: fix custom actions for WiX older than 3.9 
This is a port of nodejs/node-v0.x-archive@e192f61 .

Original commit message:

  Older WiX versions included a header with extern "C" declaration,
  hence the custom action source must be C++.

  Reviewed-By: João Reis <reis@janeasystems.com>
  PR-URL: nodejs/node-v0.x-archive#25569

PR-URL: #2365
Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
  • Loading branch information
@joaocgreis
joaocgreis committed Aug 24, 2015
commit bce1aea4253b124cbeafb913395ff5db3678d225
4 changes: 2 additions & 2 deletions tools/msvs/msi/custom_actions.c → tools/msvs/msi/custom_actions.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <wcautil.h>


UINT WINAPI BroadcastEnvironmentUpdate(MSIHANDLE hInstall) {
extern "C" UINT WINAPI BroadcastEnvironmentUpdate(MSIHANDLE hInstall) {
HRESULT hr = S_OK;
UINT er = ERROR_SUCCESS;

Expand All @@ -27,7 +27,7 @@ UINT WINAPI BroadcastEnvironmentUpdate(MSIHANDLE hInstall) {
}


BOOL WINAPI DllMain(HINSTANCE hInst, ULONG ulReason, VOID* dummy) {
extern "C" BOOL WINAPI DllMain(HINSTANCE hInst, ULONG ulReason, VOID* dummy) {
switch (ulReason) {
case DLL_PROCESS_ATTACH:
WcaGlobalInitialize(hInst);
Expand Down
2 changes: 1 addition & 1 deletion tools/msvs/msi/custom_actions.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="custom_actions.c">
<ClCompile Include="custom_actions.cc">
</ClCompile>
</ItemGroup>
<ItemGroup>
Expand Down