[mapguide-commits] r7729 - trunk/Installer/Custom/apache_actions
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sun Aug 4 05:38:37 PDT 2013
Author: jng
Date: 2013-08-04 05:38:37 -0700 (Sun, 04 Aug 2013)
New Revision: 7729
Added:
trunk/Installer/Custom/apache_actions/apache_actions.def
Modified:
trunk/Installer/Custom/apache_actions/apache_actions.h
trunk/Installer/Custom/apache_actions/apache_actions.vcxproj
trunk/Installer/Custom/apache_actions/apache_actions.vcxproj.filters
Log:
#2324: Re-instate apache_actions.def. Symbols we're being mangled in x86 despite the extern "C". Rather than waste time figuring out why, let's just restore what was working before.
Added: trunk/Installer/Custom/apache_actions/apache_actions.def
===================================================================
--- trunk/Installer/Custom/apache_actions/apache_actions.def (rev 0)
+++ trunk/Installer/Custom/apache_actions/apache_actions.def 2013-08-04 12:38:37 UTC (rev 7729)
@@ -0,0 +1,8 @@
+; apache_actions.def : Declares the module parameters for the DLL.
+
+LIBRARY "apache_actions"
+
+EXPORTS
+GetApacheDir @2
+UpdatePhpIni @3
+UpdateApacheConfig @4
Modified: trunk/Installer/Custom/apache_actions/apache_actions.h
===================================================================
--- trunk/Installer/Custom/apache_actions/apache_actions.h 2013-08-02 16:14:50 UTC (rev 7728)
+++ trunk/Installer/Custom/apache_actions/apache_actions.h 2013-08-04 12:38:37 UTC (rev 7729)
@@ -33,9 +33,8 @@
#include "MSIQuery.h"
-//Need to use C linkage because wix CA reference unmangled symbols
-extern "C" __declspec(dllexport) UINT __stdcall GetApacheDir(MSIHANDLE theMSIHandle);
-extern "C" __declspec(dllexport) UINT __stdcall UpdatePhpIni(MSIHANDLE theMSIHandle);
-extern "C" __declspec(dllexport) UINT __stdcall UpdateApacheConfig(MSIHANDLE theMSIHandle);
+__declspec(dllexport) UINT __stdcall GetApacheDir(MSIHANDLE theMSIHandle);
+__declspec(dllexport) UINT __stdcall UpdatePhpIni(MSIHANDLE theMSIHandle);
+__declspec(dllexport) UINT __stdcall UpdateApacheConfig(MSIHANDLE theMSIHandle);
bool FileExists (const char* szFile);
Modified: trunk/Installer/Custom/apache_actions/apache_actions.vcxproj
===================================================================
--- trunk/Installer/Custom/apache_actions/apache_actions.vcxproj 2013-08-02 16:14:50 UTC (rev 7728)
+++ trunk/Installer/Custom/apache_actions/apache_actions.vcxproj 2013-08-04 12:38:37 UTC (rev 7729)
@@ -116,8 +116,7 @@
<AdditionalDependencies>msi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
+ <ModuleDefinitionFile>.\apache_actions.def</ModuleDefinitionFile>
<ProgramDatabaseFile>.\bin$(PlatformToolsetVersion)_$(Platform)\apache_actions.pdb</ProgramDatabaseFile>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -164,8 +163,7 @@
<AdditionalDependencies>msi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
+ <ModuleDefinitionFile>.\apache_actions.def</ModuleDefinitionFile>
<ProgramDatabaseFile>.\bin$(PlatformToolsetVersion)_$(Platform)\apache_actions.pdb</ProgramDatabaseFile>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -211,8 +209,7 @@
<AdditionalDependencies>odbc32.lib;odbccp32.lib;msi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>.\Debug$(PlatformToolsetVersion)_$(Platform)\apache_actions.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
+ <ModuleDefinitionFile>.\apache_actions.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\Debug$(PlatformToolsetVersion)_$(Platform)\apache_actions.pdb</ProgramDatabaseFile>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -258,8 +255,7 @@
<AdditionalDependencies>odbc32.lib;odbccp32.lib;msi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>.\Debug$(PlatformToolsetVersion)_$(Platform)\apache_actions.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>
- </ModuleDefinitionFile>
+ <ModuleDefinitionFile>.\apache_actions.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\Debug$(PlatformToolsetVersion)_$(Platform)\apache_actions.pdb</ProgramDatabaseFile>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -296,6 +292,9 @@
<ClInclude Include="resource.h" />
<ClInclude Include="StdAfx.h" />
</ItemGroup>
+ <ItemGroup>
+ <None Include="apache_actions.def" />
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
Modified: trunk/Installer/Custom/apache_actions/apache_actions.vcxproj.filters
===================================================================
--- trunk/Installer/Custom/apache_actions/apache_actions.vcxproj.filters 2013-08-02 16:14:50 UTC (rev 7728)
+++ trunk/Installer/Custom/apache_actions/apache_actions.vcxproj.filters 2013-08-04 12:38:37 UTC (rev 7729)
@@ -38,4 +38,9 @@
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
+ <ItemGroup>
+ <None Include="apache_actions.def">
+ <Filter>Source Files</Filter>
+ </None>
+ </ItemGroup>
</Project>
\ No newline at end of file
More information about the mapguide-commits
mailing list