[mapguide-commits] r7728 - in trunk/Installer: . Bootstrapper Custom/apache_actions Installers/MapGuide Installers/MapGuide/Lang
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Aug 2 09:14:50 PDT 2013
Author: jng
Date: 2013-08-02 09:14:50 -0700 (Fri, 02 Aug 2013)
New Revision: 7728
Modified:
trunk/Installer/Bootstrapper/Setup.nsi
trunk/Installer/Custom/apache_actions/apache_actions.cpp
trunk/Installer/Custom/apache_actions/apache_actions.h
trunk/Installer/Installers/MapGuide/Lang/MapGuide_en-US.wxl
trunk/Installer/Installers/MapGuide/MapGuide.wxs
trunk/Installer/build.bat
Log:
#2324: Installer updates for VS2012
- Fix bad export linkage in apache_actions
- Tweak FastCGI notice
- Fix wrong CPU switch and vcredists being copied to the staging area for installer
Modified: trunk/Installer/Bootstrapper/Setup.nsi
===================================================================
--- trunk/Installer/Bootstrapper/Setup.nsi 2013-08-02 13:31:17 UTC (rev 7727)
+++ trunk/Installer/Bootstrapper/Setup.nsi 2013-08-02 16:14:50 UTC (rev 7728)
@@ -12,7 +12,7 @@
VIAddVersionKey "FileVersion" "1.0.0.0"
VIAddVersionKey "CompanyName" "Open Source Geospatial Foundation"
VIAddVersionKey "FileDescription" "Installer Bootstrapper package for MapGuide Open Source"
-VIAddVersionKey "LegalCopyright" "2010 Open Source Geospatial Foundation"
+VIAddVersionKey "LegalCopyright" "2013 Open Source Geospatial Foundation"
!ifndef CULTURE
!define CULTURE "en-us"
@@ -140,11 +140,11 @@
; Delete the MGOS installer and any other extracted after completion
Delete "$OUTDIR\${OUTNAME}.msi"
!if ${CPU} = "x64"
- ;Delete "$OUTDIR\vcredist_2008_x64.exe"
+ Delete "$OUTDIR\vcredist_2008_x64.exe"
Delete "$OUTDIR\vcredist_2010_x64.exe"
Delete "$OUTDIR\vcredist_2012_x64.exe"
!else
- ;Delete "$OUTDIR\vcredist_2008_x86.exe"
+ Delete "$OUTDIR\vcredist_2008_x86.exe"
Delete "$OUTDIR\vcredist_2010_x86.exe"
Delete "$OUTDIR\vcredist_2012_x86.exe"
!endif
Modified: trunk/Installer/Custom/apache_actions/apache_actions.cpp
===================================================================
--- trunk/Installer/Custom/apache_actions/apache_actions.cpp 2013-08-02 13:31:17 UTC (rev 7727)
+++ trunk/Installer/Custom/apache_actions/apache_actions.cpp 2013-08-02 16:14:50 UTC (rev 7728)
@@ -105,7 +105,7 @@
*
*****************************************************************************/
-UINT __declspec(dllexport) __stdcall
+UINT __stdcall
GetApacheDir(MSIHANDLE hMSI)
{
HRESULT hRes = 0;
@@ -148,7 +148,7 @@
*
*****************************************************************************/
-UINT __declspec(dllexport) __stdcall
+UINT __stdcall
UpdatePhpIni(MSIHANDLE hMSI)
{
// Method overview:
@@ -225,7 +225,7 @@
*
*****************************************************************************/
-UINT __declspec(dllexport) __stdcall
+UINT __stdcall
UpdateApacheConfig(MSIHANDLE hMSI)
{
// Method overview:
Modified: trunk/Installer/Custom/apache_actions/apache_actions.h
===================================================================
--- trunk/Installer/Custom/apache_actions/apache_actions.h 2013-08-02 13:31:17 UTC (rev 7727)
+++ trunk/Installer/Custom/apache_actions/apache_actions.h 2013-08-02 16:14:50 UTC (rev 7728)
@@ -33,8 +33,9 @@
#include "MSIQuery.h"
-__declspec(dllexport) UINT __stdcall GetApacheDir(MSIHANDLE theMSIHandle);
-__declspec(dllexport) UINT __stdcall UpdatePhpIni(MSIHANDLE theMSIHandle);
-__declspec(dllexport) UINT __stdcall UpdateApacheConfig(MSIHANDLE theMSIHandle);
+//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);
bool FileExists (const char* szFile);
Modified: trunk/Installer/Installers/MapGuide/Lang/MapGuide_en-US.wxl
===================================================================
--- trunk/Installer/Installers/MapGuide/Lang/MapGuide_en-US.wxl 2013-08-02 13:31:17 UTC (rev 7727)
+++ trunk/Installer/Installers/MapGuide/Lang/MapGuide_en-US.wxl 2013-08-02 16:14:50 UTC (rev 7728)
@@ -26,9 +26,9 @@
<String Id="FastCgiDialog_Title">FastCGI is required</String>
<String Id="FastCgiDialog_Description">FastCGI needs to be installed</String>
<String Id="FastCgiDialog_Instructions">MapGuide IIS Configuration requires FastCGI to be installed on this system</String>
- <String Id="FastCgiDialog_Instructions2">You can download FastCGI from this link</String>
- <String Id="FastCgiDialog_Link">http://www.iis.net/download/FastCGI</String>
- <String Id="FastCgiDialog_Instructions3">You can ignore this message if FastCGI for IIS is already installed. Otherwise you must cancel this installation and install FastCGI first</String>
+ <String Id="FastCgiDialog_Instructions2">You can follow the link below for more information on how to enable FastCGI</String>
+ <String Id="FastCgiDialog_Link">http://www.iis.net/fastcgi/configuration</String>
+ <String Id="FastCgiDialog_Instructions3">You can ignore this message if FastCGI for IIS is already enabled. Otherwise you must cancel this installation and enable FastCGI first</String>
<String Id="ServerConfigDlg_Title">Server Port Configuration</String>
<String Id="ServerConfigDlg_Description">Set up the listening ports for MapGuide Server</String>
Modified: trunk/Installer/Installers/MapGuide/MapGuide.wxs
===================================================================
--- trunk/Installer/Installers/MapGuide/MapGuide.wxs 2013-08-02 13:31:17 UTC (rev 7727)
+++ trunk/Installer/Installers/MapGuide/MapGuide.wxs 2013-08-02 16:14:50 UTC (rev 7728)
@@ -212,14 +212,14 @@
<Dialog Id="FastCgiWarningDlg" Width="370" Height="270" Title="!(loc.InstallerTitle)">
<!--
- MapGuide IIS Configuration requires FastCGI to be installed on this system
+ MapGuide IIS Configuration requires FastCGI to be enabled on this system
- You can download FastCGI from this link
+ You can follow the link below for more information on how to enable FastCGI
- http://www.iis.net/download/FastCGI
+ http://www.iis.net/fastcgi/configuration
- You can ignore this message if FastCGI for IIS is already installed. Otherwise
- you must cancel this installation and install FastCGI first
+ You can ignore this message if FastCGI for IIS is already enabled. Otherwise
+ you must cancel this installation and enable FastCGI first
-->
<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="{\WixUI_Font_Title}!(loc.FastCgiDialog_Title)" />
<Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.FastCgiDialog_Description)" />
Modified: trunk/Installer/build.bat
===================================================================
--- trunk/Installer/build.bat 2013-08-02 13:31:17 UTC (rev 7727)
+++ trunk/Installer/build.bat 2013-08-02 16:14:50 UTC (rev 7728)
@@ -426,9 +426,9 @@
if "%errorlevel%"=="1" goto error
pushd "%INSTALLER_DEV_BOOTSTRAP%"
echo [bootstrap]: Copying vcredist
-copy /Y vcredist_2008_x86.exe "%INSTALLER_OUTPUT%\vcredist_2008_%PLATFORM_CLR%.exe"
-copy /Y vcredist_2010_x86.exe "%INSTALLER_OUTPUT%\vcredist_2010_%PLATFORM_CLR%.exe"
-copy /Y vcredist_2012_x86.exe "%INSTALLER_OUTPUT%\vcredist_2012_%PLATFORM_CLR%.exe"
+copy /Y vcredist_2008_%PLATFORM_CLR%.exe "%INSTALLER_OUTPUT%\vcredist_2008_%PLATFORM_CLR%.exe"
+copy /Y vcredist_2010_%PLATFORM_CLR%.exe "%INSTALLER_OUTPUT%\vcredist_2010_%PLATFORM_CLR%.exe"
+copy /Y vcredist_2012_%PLATFORM_CLR%.exe "%INSTALLER_OUTPUT%\vcredist_2012_%PLATFORM_CLR%.exe"
popd
if "%errorlevel%"=="1" goto error
if "%MAX_COMPRESSION%"=="YES" goto build_max_compress
@@ -437,7 +437,7 @@
:build_min_compress
pushd "%INSTALLER_DEV_BOOTSTRAP%"
echo [bootstrap]: Create self-extracting package
-makensis /DCPU=x86 /DINSTALLER_ROOT=%INSTALLER_DEV% /DNSISDIR=%NSIS% /DOUTNAME=%INSTALLER_NAME% /DCULTURE=%CULTURE% /DMG_VERSION=%INSTALLER_VERSION% Setup.nsi
+makensis /DCPU=%PLATFORM_CLR% /DINSTALLER_ROOT=%INSTALLER_DEV% /DNSISDIR=%NSIS% /DOUTNAME=%INSTALLER_NAME% /DCULTURE=%CULTURE% /DMG_VERSION=%INSTALLER_VERSION% Setup.nsi
popd
if "%errorlevel%"=="1" goto error
echo [build]: Installer created at %INSTALLER_OUTPUT%\%INSTALLER_NAME%.exe
@@ -446,7 +446,7 @@
:build_max_compress
pushd "%INSTALLER_DEV_BOOTSTRAP%"
echo [bootstrap]: Create self-extracting package (MAX compression)
-makensis /DCPU=x86 /DINSTALLER_ROOT=%INSTALLER_DEV% /DNSISDIR=%NSIS% /DOUTNAME=%INSTALLER_NAME% /DCULTURE=%CULTURE% /DMAXCOMPRESSION /DMG_VERSION=%INSTALLER_VERSION% Setup.nsi
+makensis /DCPU=%PLATFORM_CLR% /DINSTALLER_ROOT=%INSTALLER_DEV% /DNSISDIR=%NSIS% /DOUTNAME=%INSTALLER_NAME% /DCULTURE=%CULTURE% /DMAXCOMPRESSION /DMG_VERSION=%INSTALLER_VERSION% Setup.nsi
popd
if "%errorlevel%"=="1" goto error
echo [build]: Installer created at %INSTALLER_OUTPUT%\%INSTALLER_NAME%.exe
More information about the mapguide-commits
mailing list