[mapguide-commits] r6194 - in trunk/Installer: .
Custom/apache_actions Custom/iis_actions FdoRegUtil
Installers/MapGuide Libraries/CS Map Libraries/MapGuide
Server Libraries/MapGuide Web Extensions Support/Web/x64
Support/Web/x64/Apache2/conf Support/Web/x64/FDO
Support/Web/x86/configs Support/Web/x86/configs/Apache2/conf
Support/Web/x86/configs/FDO
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Nov 1 02:00:35 EDT 2011
Author: jng
Date: 2011-10-31 23:00:35 -0700 (Mon, 31 Oct 2011)
New Revision: 6194
Added:
trunk/Installer/Custom/apache_actions/resource.h
trunk/Installer/Custom/apache_actions/resources.aps
trunk/Installer/Custom/apache_actions/resources.rc
trunk/Installer/Custom/iis_actions/resource.h
trunk/Installer/Custom/iis_actions/resources.aps
trunk/Installer/Custom/iis_actions/resources.rc
trunk/Installer/Support/Web/x64/FDO/
trunk/Installer/Support/Web/x64/FDO/providers.xml
trunk/Installer/Support/Web/x86/configs/FDO/
trunk/Installer/Support/Web/x86/configs/FDO/providers.xml
Modified:
trunk/Installer/Custom/apache_actions/apache_actions.cpp
trunk/Installer/Custom/apache_actions/apache_actions.vcproj
trunk/Installer/Custom/iis_actions/iis_actions.vcproj
trunk/Installer/FdoRegUtil/FdoRegUtil.cpp
trunk/Installer/FdoRegUtil/stdafx.h
trunk/Installer/Installers/MapGuide/MapGuide.wixproj
trunk/Installer/Installers/MapGuide/MapGuide.wxs
trunk/Installer/Libraries/CS Map/CS Map.wixproj
trunk/Installer/Libraries/CS Map/CSMap.wxs
trunk/Installer/Libraries/MapGuide Server/FDO.wxs
trunk/Installer/Libraries/MapGuide Server/InstallService.wxs
trunk/Installer/Libraries/MapGuide Server/MapGuide Server.wixproj
trunk/Installer/Libraries/MapGuide Web Extensions/Apache.wxs
trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs
trunk/Installer/Libraries/MapGuide Web Extensions/IIS7.wxs
trunk/Installer/Libraries/MapGuide Web Extensions/MapGuide Web Extensions.wixproj
trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs
trunk/Installer/Support/Web/x64/Apache2/conf/httpd.conf
trunk/Installer/Support/Web/x86/configs/Apache2/conf/httpd.conf
trunk/Installer/build.bat
trunk/Installer/build64.bat
Log:
#1805: Installer changes:
- Update to use WiX 3.5
- Update FdoRegUtil.exe to use registration by library path (made possible with new APIs in FDO 3.6)
- Add version resources to custom action projects (required by WiX 3.5)
- Update CS-Map installer component to write the dictionary path to serverconfig.ini and webconfig.ini instead of the MENTOR_DICTIONARY_PATH environment variable
- Update file offsets and version numbers
Modified: trunk/Installer/Custom/apache_actions/apache_actions.cpp
===================================================================
--- trunk/Installer/Custom/apache_actions/apache_actions.cpp 2011-10-29 14:06:17 UTC (rev 6193)
+++ trunk/Installer/Custom/apache_actions/apache_actions.cpp 2011-11-01 06:00:35 UTC (rev 6194)
@@ -340,6 +340,9 @@
fout.close();
}
+ //Even if the java option is not the active API, perform these substitutions
+ //anyway on these files should they get installed.
+
szFileName = szApacheDir + "\\conf\\tomcat.conf";
const char* szTomcatConf = szFileName.c_str();
@@ -365,6 +368,31 @@
fout << buffer;
fout.close();
}
+
+ szFileName = szWebExtDir + "\\Tomcat\\conf\\Catalina\\localhost\\mapguide.xml";
+ const char* szMapGuideXml = szFileName.c_str();
+
+ if (FileExists(szMapGuideXml))
+ {
+ std::ifstream fin(szTomcatConf);
+
+ std::string buffer;
+ std::string line;
+ while(!fin.eof())
+ {
+ std::getline(fin, line);
+
+ //Process this line
+ FindAndReplace(line, "%MG_WEB_ROOT%", szWebRootDir);
+
+ buffer += line + "\n";
+ }
+ fin.close();
+
+ std::ofstream fout(szMapGuideXml);
+ fout << buffer;
+ fout.close();
+ }
}
return ERROR_SUCCESS;
}
Modified: trunk/Installer/Custom/apache_actions/apache_actions.vcproj
===================================================================
--- trunk/Installer/Custom/apache_actions/apache_actions.vcproj 2011-10-29 14:06:17 UTC (rev 6193)
+++ trunk/Installer/Custom/apache_actions/apache_actions.vcproj 2011-11-01 06:00:35 UTC (rev 6194)
@@ -239,6 +239,10 @@
>
</File>
<File
+ RelativePath=".\resources.rc"
+ >
+ </File>
+ <File
RelativePath="StdAfx.cpp"
>
<FileConfiguration
@@ -269,6 +273,10 @@
>
</File>
<File
+ RelativePath=".\resource.h"
+ >
+ </File>
+ <File
RelativePath="StdAfx.h"
>
</File>
Added: trunk/Installer/Custom/apache_actions/resource.h
===================================================================
--- trunk/Installer/Custom/apache_actions/resource.h (rev 0)
+++ trunk/Installer/Custom/apache_actions/resource.h 2011-11-01 06:00:35 UTC (rev 6194)
@@ -0,0 +1,15 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by resources.rc
+//
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE 103
+#define _APS_NEXT_COMMAND_VALUE 40001
+#define _APS_NEXT_CONTROL_VALUE 1001
+#define _APS_NEXT_SYMED_VALUE 101
+#endif
+#endif
Added: trunk/Installer/Custom/apache_actions/resources.aps
===================================================================
(Binary files differ)
Property changes on: trunk/Installer/Custom/apache_actions/resources.aps
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/Installer/Custom/apache_actions/resources.rc
===================================================================
--- trunk/Installer/Custom/apache_actions/resources.rc (rev 0)
+++ trunk/Installer/Custom/apache_actions/resources.rc 2011-11-01 06:00:35 UTC (rev 6194)
@@ -0,0 +1,102 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (Australia) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENA)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_AUS
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+ "resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+ "#include ""afxres.h""\r\n"
+ "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+ "\r\n"
+ "\0"
+END
+
+#endif // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+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 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "0c0904b0"
+ BEGIN
+ VALUE "CompanyName", "OSGeo"
+ VALUE "FileDescription", "MapGuide Open Source Installer Custom Action Library"
+ VALUE "FileVersion", "1, 0, 0, 1"
+ VALUE "InternalName", "apache_actions"
+ VALUE "LegalCopyright", "Copyright (C) 2011"
+ VALUE "OriginalFilename", "apache_actions.dll"
+ VALUE "ProductName", "MapGuide Open Source Installer Custom Action Library"
+ VALUE "ProductVersion", "1, 0, 0, 1"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0xc09, 1200
+ END
+END
+
+#endif // English (Australia) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif // not APSTUDIO_INVOKED
+
Modified: trunk/Installer/Custom/iis_actions/iis_actions.vcproj
===================================================================
--- trunk/Installer/Custom/iis_actions/iis_actions.vcproj 2011-10-29 14:06:17 UTC (rev 6193)
+++ trunk/Installer/Custom/iis_actions/iis_actions.vcproj 2011-11-01 06:00:35 UTC (rev 6194)
@@ -61,7 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="msi.lib dutil.lib wcautil.lib"
+ AdditionalDependencies="version.lib msi.lib dutil_2008.lib wcautil_2008.lib"
LinkIncremental="2"
AdditionalLibraryDirectories="$(WIX)sdk\lib"
ModuleDefinitionFile="CustomAction.def"
@@ -137,7 +137,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="msi.lib dutil.lib wcautil.lib"
+ AdditionalDependencies="version.lib msi.lib dutil_2008.lib wcautil_2008.lib"
LinkIncremental="1"
AdditionalLibraryDirectories="$(WIX)sdk\lib"
ModuleDefinitionFile="CustomAction.def"
@@ -213,6 +213,10 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
+ RelativePath=".\resource.h"
+ >
+ </File>
+ <File
RelativePath=".\stdafx.h"
>
</File>
@@ -226,6 +230,10 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
+ <File
+ RelativePath=".\resources.rc"
+ >
+ </File>
</Filter>
</Files>
<Globals>
Added: trunk/Installer/Custom/iis_actions/resource.h
===================================================================
--- trunk/Installer/Custom/iis_actions/resource.h (rev 0)
+++ trunk/Installer/Custom/iis_actions/resource.h 2011-11-01 06:00:35 UTC (rev 6194)
@@ -0,0 +1,14 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by resources.rc
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE 101
+#define _APS_NEXT_COMMAND_VALUE 40001
+#define _APS_NEXT_CONTROL_VALUE 1001
+#define _APS_NEXT_SYMED_VALUE 101
+#endif
+#endif
Added: trunk/Installer/Custom/iis_actions/resources.aps
===================================================================
(Binary files differ)
Property changes on: trunk/Installer/Custom/iis_actions/resources.aps
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/Installer/Custom/iis_actions/resources.rc
===================================================================
--- trunk/Installer/Custom/iis_actions/resources.rc (rev 0)
+++ trunk/Installer/Custom/iis_actions/resources.rc 2011-11-01 06:00:35 UTC (rev 6194)
@@ -0,0 +1,101 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (Australia) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENA)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_AUS
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+ "resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+ "#include ""afxres.h""\r\n"
+ "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+ "\r\n"
+ "\0"
+END
+
+#endif // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+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 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "0c0904b0"
+ BEGIN
+ VALUE "FileDescription", "MapGuide Open Source Installer Custom Action Library"
+ VALUE "FileVersion", "1, 0, 0, 1"
+ VALUE "InternalName", "iis_actions"
+ VALUE "LegalCopyright", "Copyright (C) 2011"
+ VALUE "OriginalFilename", "iis_actions.dll"
+ VALUE "ProductName", "MapGuide Open Source Installer Custom Action Library"
+ VALUE "ProductVersion", "1, 0, 0, 1"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0xc09, 1200
+ END
+END
+
+#endif // English (Australia) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif // not APSTUDIO_INVOKED
+
Modified: trunk/Installer/FdoRegUtil/FdoRegUtil.cpp
===================================================================
--- trunk/Installer/FdoRegUtil/FdoRegUtil.cpp 2011-10-29 14:06:17 UTC (rev 6193)
+++ trunk/Installer/FdoRegUtil/FdoRegUtil.cpp 2011-11-01 06:00:35 UTC (rev 6194)
@@ -3,47 +3,50 @@
#include "stdafx.h"
-// usage: FdoRegUtil.exe [/r|/u] <provider name> <display name> <provider description> <version> <fdo version> <provider dll path>
+// usage: FdoRegUtil.exe [-r] <provider dll>
+// FdoRegUtil.exe [-u] <provider name>
int _tmain(int argc, _TCHAR* argv[])
{
int ret = 0;
if (argc == 3)
{
- if(wcscmp(argv[1], L"-u") != 0)
- goto usage;
-
- ret = Unregister(argv[2]);
- goto exit;
+ if(wcscmp(argv[1], L"-u") == 0)
+ ret = Unregister(argv[2]);
+ else if(wcscmp(argv[1], L"-r") == 0)
+ ret = Register(argv[2]);
+ else
+ Usage();
}
- else if (argc == 8)
- {
- if(wcscmp(argv[1], L"-r") != 0)
- goto usage;
-
- ret = Register(argv[2], argv[3], argv[4], argv[5], argv[6], argv[7]);
- goto exit;
- }
-usage:
- Usage();
-exit:
return ret;
}
void Usage()
{
printf("usage\n");
- printf("registering: FdoRegUtil.exe -r <provider name> <display name> <provider description> <version> <fdo version> <provider dll path>\n");
+ printf("registering: FdoRegUtil.exe -r <provider dll path>\n");
printf("unregistering: FdoRegUtil.exe -u <provider name>\n");
}
-int Register(_TCHAR* name, _TCHAR* displayName, _TCHAR* description, _TCHAR* version, _TCHAR* fdoVersion, _TCHAR* path)
+int Register(_TCHAR* path)
{
int ret = 0;
- FdoPtr<IProviderRegistry> prvReg = FdoFeatureAccessManager::GetProviderRegistry();
+ FdoPtr<IProviderRegistry> provReg = FdoFeatureAccessManager::GetProviderRegistry();
+ FdoPtr<IConnectionManager> connMgr = FdoFeatureAccessManager::GetConnectionManager();
try
{
- prvReg->RegisterProvider(name, displayName, description, version, fdoVersion, path, false);
+ //As of FDO 3.6 this supports FDO dll paths
+ FdoPtr<FdoIConnection> conn = connMgr->CreateConnection(path);
+ FdoPtr<FdoIConnectionInfo> connInfo = conn->GetConnectionInfo();
+
+ //FDO connections already have this information!
+ provReg->RegisterProvider(connInfo->GetProviderName(),
+ connInfo->GetProviderDisplayName(),
+ connInfo->GetProviderDescription(),
+ connInfo->GetProviderVersion(),
+ connInfo->GetFeatureDataObjectsVersion(),
+ path,
+ false);
}
catch(FdoException* ex)
{
Modified: trunk/Installer/FdoRegUtil/stdafx.h
===================================================================
--- trunk/Installer/FdoRegUtil/stdafx.h 2011-10-29 14:06:17 UTC (rev 6193)
+++ trunk/Installer/FdoRegUtil/stdafx.h 2011-11-01 06:00:35 UTC (rev 6194)
@@ -10,7 +10,7 @@
#include <stdio.h>
#include <tchar.h>
-int Register(_TCHAR* name, _TCHAR* displayName, _TCHAR* description, _TCHAR* version, _TCHAR* fdoVersion, _TCHAR* path);
+int Register(_TCHAR* path);
int Unregister(_TCHAR* name);
void Usage();
Modified: trunk/Installer/Installers/MapGuide/MapGuide.wixproj
===================================================================
--- trunk/Installer/Installers/MapGuide/MapGuide.wixproj 2011-10-29 14:06:17 UTC (rev 6193)
+++ trunk/Installer/Installers/MapGuide/MapGuide.wixproj 2011-11-01 06:00:35 UTC (rev 6194)
@@ -7,7 +7,7 @@
<SchemaVersion>2.0</SchemaVersion>
<OutputName Condition=" '$(OutputName)' == '' ">MapGuideOpenSource</OutputName>
<OutputType>Package</OutputType>
- <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets</WixTargetsPath>
+ <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
<Name>MapGuide</Name>
<MgCulture Condition=" '$(MgCulture)'=='' ">en-US</MgCulture>
<MgTitle Condition=" '$(MgTitle)'=='' ">MapGuide Open Source 2.1.0 Ux</MgTitle>
@@ -35,20 +35,6 @@
<Compile Include="MapGuide.wxs" />
</ItemGroup>
<ItemGroup>
- <WixExtension Include="WixIIsExtension">
- <HintPath>$(WixExtDir)\WixIIsExtension.dll</HintPath>
- </WixExtension>
- <WixExtension Include="WixNetFxExtension">
- <HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
- </WixExtension>
- <WixExtension Include="WixUtilExtension">
- <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
- </WixExtension>
- <WixExtension Include="WixUIExtension">
- <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
- </WixExtension>
- </ItemGroup>
- <ItemGroup>
<Content Include="Resources\InstallerLarge.bmp" />
<Content Include="Resources\InstallerSmall.bmp" />
<Content Include="Resources\LGPL21.rtf" />
@@ -78,6 +64,24 @@
<EmbeddedResource Include="Lang\MapGuide_en-US.wxl" />
<EmbeddedResource Include="Lang\MapGuide_es-ES.wxl" />
</ItemGroup>
+ <ItemGroup>
+ <WixExtension Include="WixUtilExtension">
+ <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
+ <Name>WixUtilExtension</Name>
+ </WixExtension>
+ <WixExtension Include="WixUIExtension">
+ <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
+ <Name>WixUIExtension</Name>
+ </WixExtension>
+ <WixExtension Include="WixNetFxExtension">
+ <HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
+ <Name>WixNetFxExtension</Name>
+ </WixExtension>
+ <WixExtension Include="WixIIsExtension">
+ <HintPath>$(WixExtDir)\WixIIsExtension.dll</HintPath>
+ <Name>WixIIsExtension</Name>
+ </WixExtension>
+ </ItemGroup>
<Import Project="$(WixTargetsPath)" />
<!--
To modify your build process, add your task inside one of the targets below and uncomment it.
Modified: trunk/Installer/Installers/MapGuide/MapGuide.wxs
===================================================================
--- trunk/Installer/Installers/MapGuide/MapGuide.wxs 2011-10-29 14:06:17 UTC (rev 6193)
+++ trunk/Installer/Installers/MapGuide/MapGuide.wxs 2011-11-01 06:00:35 UTC (rev 6194)
@@ -47,16 +47,16 @@
<Property Id="APP_POOL_NAME" Secure="yes" Value="MapGuideAppPool" />
<Property Id="MGSERVER_IP" Secure="yes" Value="127.0.0.1" />
<Property Id="APACHE_PORT" Secure="yes" Value="8008" />
- <Property Id="APACHE_VERSION" Secure="yes" Value="2.2.11" />
- <Property Id="PHP_VERSION" Secure="yes" Value="5.3.2" />
- <Property Id="MG_VERSION_MAJOR_MINOR" Secure="yes" Value="2.3" />
+ <Property Id="APACHE_VERSION" Secure="yes" Value="2.2.21" />
+ <Property Id="PHP_VERSION" Secure="yes" Value="5.3.8" />
+ <Property Id="MG_VERSION_MAJOR_MINOR" Secure="yes" Value="2.4" />
<!-- Server Port Settings -->
<Property Id="MG_ADMIN_PORT" Secure="yes" Value="2810" />
<Property Id="MG_CLIENT_PORT" Secure="yes" Value="2811" />
<Property Id="MG_SITE_PORT" Secure="yes" Value="2812" />
<!-- Used by FdoRegUtil.exe -->
- <Property Id="FDO_VERSION" Secure="yes" Value="3.6.0.0" />
- <Property Id="FDO_VERSION_SMALL" Secure="yes" Value="3.6" />
+ <Property Id="FDO_VERSION" Secure="yes" Value="3.7.0.0" />
+ <Property Id="FDO_VERSION_SMALL" Secure="yes" Value="3.7" />
<!--
These are currently static, though there is opportunity in the future for these
@@ -573,7 +573,8 @@
<InstallExecuteSequence>
<!-- IIS7 Base properties for deferred actions -->
- <Custom Action="MapGuideIIS7_I_AppCmd_Cmd" After="CostFinalize">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_CreateFastCgi_Cmd" After="CostFinalize">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_AppCmd_Cmd" After="MapGuideIIS7_I_CreateFastCgi_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
<Custom Action="MapGuideIIS7_I_CreateAppPool_Cmd" After="MapGuideIIS7_I_AppCmd_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
<Custom Action="MapGuideIIS7_I_SetAppPoolProp_Cmd" After="MapGuideIIS7_I_CreateAppPool_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
<Custom Action="MapGuideIIS7_I_UnlockSrvHandlers_Cmd" After="MapGuideIIS7_I_SetAppPoolProp_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
Modified: trunk/Installer/Libraries/CS Map/CS Map.wixproj
===================================================================
--- trunk/Installer/Libraries/CS Map/CS Map.wixproj 2011-10-29 14:06:17 UTC (rev 6193)
+++ trunk/Installer/Libraries/CS Map/CS Map.wixproj 2011-11-01 06:00:35 UTC (rev 6194)
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -7,7 +7,7 @@
<SchemaVersion>2.0</SchemaVersion>
<OutputName>CS Map</OutputName>
<OutputType>Library</OutputType>
- <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets</WixTargetsPath>
+ <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
<MgRegKey Condition=" '$(MgRegKey)' == '' ">SOFTWARE\OSGeo\MapGuide</MgRegKey>
<MgSource Condition="('$(MgSource)'=='')">$(MSBuildProjectDirectory)\..\..\..\MgDev\$(Configuration)</MgSource>
</PropertyGroup>
Modified: trunk/Installer/Libraries/CS Map/CSMap.wxs
===================================================================
--- trunk/Installer/Libraries/CS Map/CSMap.wxs 2011-10-29 14:06:17 UTC (rev 6193)
+++ trunk/Installer/Libraries/CS Map/CSMap.wxs 2011-11-01 06:00:35 UTC (rev 6194)
@@ -12,13 +12,20 @@
<Directory Id="CSMAPLOCATION" Name="CS-Map">
<Component Id="CsMapComponent" Win64="$(var.Win64)" Guid="552EAF5E-2420-4C2A-A52C-62B456EE1F64">
<CreateFolder />
- <Environment Id="CsMapEnvVar"
- Action="set"
- Part="all"
- Name="MENTOR_DICTIONARY_PATH"
- Permanent="no"
- System="yes"
- Value="[dir_Dictionaries_0]" />
+ <IniFile Id="INISETSERVERDICTPATH"
+ Action="addLine"
+ Directory="SERVERBINLOCATION"
+ Key="MentorDictionaryPath"
+ Name="serverconfig.ini"
+ Section="GeneralProperties"
+ Value="[dir_Dictionaries_0]"/>
+ <IniFile Id="INISETWEBDICTPATH"
+ Action="addLine"
+ Directory="WEBROOTLOCATION"
+ Key="MentorDictionaryPath"
+ Name="webconfig.ini"
+ Section="GeneralProperties"
+ Value="[dir_Dictionaries_0]"/>
</Component>
</Directory>
</DirectoryRef>
Modified: trunk/Installer/Libraries/MapGuide Server/FDO.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Server/FDO.wxs 2011-10-29 14:06:17 UTC (rev 6193)
+++ trunk/Installer/Libraries/MapGuide Server/FDO.wxs 2011-11-01 06:00:35 UTC (rev 6194)
@@ -10,19 +10,19 @@
<Fragment>
<CustomAction Id="FdoRegCmd" Property="FdoReg" Execute="immediate" Value=""[FDOLOCATION]FdoRegUtil.exe"" />
- <CustomAction Execute="immediate" Id="FdoRegArcSdeCmd" Property="FdoRegArcSde" Value="[FdoReg] -r "OSGeo.ArcSDE.[FDO_VERSION_SMALL]" "!(loc.ArcSdeProvider)" "!(loc.ArcSdeProviderDesc)" "[FDO_VERSION]" "[FDO_VERSION]" ".\ArcSDEProvider.dll"" />
- <CustomAction Execute="immediate" Id="FdoRegSdfCmd" Property="FdoRegSdf" Value="[FdoReg] -r "OSGeo.SDF.[FDO_VERSION_SMALL]" "!(loc.SdfProvider)" "!(loc.SdfProviderDesc)" "[FDO_VERSION]" "[FDO_VERSION]" ".\SDFProvider.dll"" />
- <CustomAction Execute="immediate" Id="FdoRegShpCmd" Property="FdoRegShp" Value="[FdoReg] -r "OSGeo.SHP.[FDO_VERSION_SMALL]" "!(loc.ShpProvider)" "!(loc.ShpProviderDesc)" "[FDO_VERSION]" "[FDO_VERSION]" ".\SHPProvider.dll"" />
- <CustomAction Execute="immediate" Id="FdoRegWfsCmd" Property="FdoRegWfs" Value="[FdoReg] -r "OSGeo.WFS.[FDO_VERSION_SMALL]" "!(loc.WfsProvider)" "!(loc.WfsProviderDesc)" "[FDO_VERSION]" "[FDO_VERSION]" ".\WFSProvider.dll"" />
- <CustomAction Execute="immediate" Id="FdoRegWmsCmd" Property="FdoRegWms" Value="[FdoReg] -r "OSGeo.WMS.[FDO_VERSION_SMALL]" "!(loc.WmsProvider)" "!(loc.WmsProviderDesc)" "[FDO_VERSION]" "[FDO_VERSION]" ".\WMSProvider.dll"" />
- <CustomAction Execute="immediate" Id="FdoRegOdbcCmd" Property="FdoRegOdbc" Value="[FdoReg] -r "OSGeo.ODBC.[FDO_VERSION_SMALL]" "!(loc.OdbcProvider)" "!(loc.OdbcProviderDesc)" "[FDO_VERSION]" "[FDO_VERSION]" ".\ODBCProvider.dll"" />
- <CustomAction Execute="immediate" Id="FdoRegMySqlCmd" Property="FdoRegMySql" Value="[FdoReg] -r "OSGeo.MySQL.[FDO_VERSION_SMALL]" "!(loc.MySqlProvider)" "!(loc.MySqlProviderDesc)" "[FDO_VERSION]" "[FDO_VERSION]" ".\MySQLProvider.dll"" />
- <CustomAction Execute="immediate" Id="FdoRegGdalCmd" Property="FdoRegGdal" Value="[FdoReg] -r "OSGeo.Gdal.[FDO_VERSION_SMALL]" "!(loc.GdalProvider)" "!(loc.GdalProviderDesc)" "[FDO_VERSION]" "[FDO_VERSION]" ".\GRFPProvider.dll"" />
- <CustomAction Execute="immediate" Id="FdoRegOgrCmd" Property="FdoRegOgr" Value="[FdoReg] -r "OSGeo.OGR.[FDO_VERSION_SMALL]" "!(loc.OgrProvider)" "!(loc.OgrProviderDesc)" "[FDO_VERSION]" "[FDO_VERSION]" ".\OGRProvider.dll"" />
- <CustomAction Execute="immediate" Id="FdoRegPostgreSqlCmd" Property="FdoRegPostgreSql" Value="[FdoReg] -r "OSGeo.PostgreSQL.[FDO_VERSION_SMALL]" "!(loc.PostgreSqlProvider)" "!(loc.PostgreSqlProviderDesc)" "[FDO_VERSION]" "[FDO_VERSION]" ".\PostgreSQLProvider.dll"" />
- <CustomAction Execute="immediate" Id="FdoRegOracleCmd" Property="FdoRegOracle" Value="[FdoReg] -r "King.Oracle.[FDO_VERSION_SMALL]" "!(loc.KingOracleProvider)" "!(loc.KingOracleProviderDesc)" "[FDO_VERSION]" "[FDO_VERSION]" ".\KingOracleProvider.dll"" />
- <CustomAction Execute="immediate" Id="FdoRegSqlServerCmd" Property="FdoRegSqlServer" Value="[FdoReg] -r "OSGeo.SQLServerSpatial.[FDO_VERSION_SMALL]" "!(loc.SqlServerProvider)" "!(loc.SqlServerProviderDesc)" "[FDO_VERSION]" "[FDO_VERSION]" ".\SQLServerSpatialProvider.dll"" />
- <CustomAction Execute="immediate" Id="FdoRegSltCmd" Property="FdoRegSlt" Value="[FdoReg] -r "OSGeo.SQLite.[FDO_VERSION_SMALL]" "!(loc.SltProvider)" "!(loc.SltProviderDesc)" "[FDO_VERSION]" "[FDO_VERSION]" ".\SQLiteProvider.dll"" />
+ <CustomAction Execute="immediate" Id="FdoRegArcSdeCmd" Property="FdoRegArcSde" Value="[FdoReg] -r ".\ArcSDEProvider.dll"" />
+ <CustomAction Execute="immediate" Id="FdoRegSdfCmd" Property="FdoRegSdf" Value="[FdoReg] -r ".\SDFProvider.dll"" />
+ <CustomAction Execute="immediate" Id="FdoRegShpCmd" Property="FdoRegShp" Value="[FdoReg] -r ".\SHPProvider.dll"" />
+ <CustomAction Execute="immediate" Id="FdoRegWfsCmd" Property="FdoRegWfs" Value="[FdoReg] -r ".\WFSProvider.dll"" />
+ <CustomAction Execute="immediate" Id="FdoRegWmsCmd" Property="FdoRegWms" Value="[FdoReg] -r ".\WMSProvider.dll"" />
+ <CustomAction Execute="immediate" Id="FdoRegOdbcCmd" Property="FdoRegOdbc" Value="[FdoReg] -r ".\ODBCProvider.dll"" />
+ <CustomAction Execute="immediate" Id="FdoRegMySqlCmd" Property="FdoRegMySql" Value="[FdoReg] -r ".\MySQLProvider.dll"" />
+ <CustomAction Execute="immediate" Id="FdoRegGdalCmd" Property="FdoRegGdal" Value="[FdoReg] -r ".\GRFPProvider.dll"" />
+ <CustomAction Execute="immediate" Id="FdoRegOgrCmd" Property="FdoRegOgr" Value="[FdoReg] -r ".\OGRProvider.dll"" />
+ <CustomAction Execute="immediate" Id="FdoRegPostgreSqlCmd" Property="FdoRegPostgreSql" Value="[FdoReg] -r ".\PostgreSQLProvider.dll"" />
+ <CustomAction Execute="immediate" Id="FdoRegOracleCmd" Property="FdoRegOracle" Value="[FdoReg] -r ".\KingOracleProvider.dll"" />
+ <CustomAction Execute="immediate" Id="FdoRegSqlServerCmd" Property="FdoRegSqlServer" Value="[FdoReg] -r ".\SQLServerSpatialProvider.dll"" />
+ <CustomAction Execute="immediate" Id="FdoRegSltCmd" Property="FdoRegSlt" Value="[FdoReg] -r ".\SQLiteProvider.dll"" />
<CustomAction Id="FdoRegArcSde" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
<CustomAction Id="FdoRegSdf" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
@@ -98,6 +98,7 @@
<File Id="FdoSpatial" Checksum="yes" Source="$(var.MgSource)\Server\FDO\FDOSpatial.dll" />
<File Id="FdoOWS" Checksum="yes" Source="$(var.MgSource)\Server\FDO\OWS.dll" />
<File Id="GdalLib" Checksum="yes" Source="$(var.MgSource)\Server\FDO\gdal17.dll" />
+ <File Id="ProvidersXml" Checksum="yes" Source="$(var.MgSource)\Server\FDO\providers.xml" />
<File Id="XalanLib" Checksum="yes" Source="$(var.MgSource)\Server\FDO\Xalan-C_1_11.dll" />
<File Id="XalanMessagesLib" Checksum="yes" Source="$(var.MgSource)\Server\FDO\XalanMessages_1_11.dll" />
<File Id="XercesLib" Checksum="yes" Source="$(var.MgSource)\Server\FDO\xerces-c_3_1.dll" />
Modified: trunk/Installer/Libraries/MapGuide Server/InstallService.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Server/InstallService.wxs 2011-10-29 14:06:17 UTC (rev 6193)
+++ trunk/Installer/Libraries/MapGuide Server/InstallService.wxs 2011-11-01 06:00:35 UTC (rev 6194)
@@ -1,19 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <!-- mgserver.exe -->
+ <?define MGSERVER_MAP = "file_SRVBINFILES_26" ?>
<Fragment>
<CustomAction
Execute="deferred"
Return="ignore"
Id="MgServerInstallCA"
- FileKey="file_SRVBINFILES_26"
+ FileKey="$(var.MGSERVER_MAP)"
ExeCommand="install "MapGuide Server [MG_VERSION_MAJOR_MINOR]"" />
<CustomAction
Execute="immediate"
Return="ignore"
Id="MgServerUninstallCA"
- FileKey="file_SRVBINFILES_26"
+ FileKey="$(var.MGSERVER_MAP)"
ExeCommand="uninstall" />
</Fragment>
Modified: trunk/Installer/Libraries/MapGuide Server/MapGuide Server.wixproj
===================================================================
--- trunk/Installer/Libraries/MapGuide Server/MapGuide Server.wixproj 2011-10-29 14:06:17 UTC (rev 6193)
+++ trunk/Installer/Libraries/MapGuide Server/MapGuide Server.wixproj 2011-11-01 06:00:35 UTC (rev 6194)
@@ -7,7 +7,7 @@
<SchemaVersion>2.0</SchemaVersion>
<OutputName>MapGuideServer</OutputName>
<OutputType>Library</OutputType>
- <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets</WixTargetsPath>
+ <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
<Name>MapGuide Server</Name>
<MgRegKey Condition=" '$(MgRegKey)' == '' ">SOFTWARE\OSGeo\MapGuide</MgRegKey>
<MgSource Condition="('$(MgSource)'=='')">$(MSBuildProjectDirectory)\..\..\..\MgDev\$(Configuration)</MgSource>
@@ -45,6 +45,7 @@
<ItemGroup>
<WixExtension Include="WixUtilExtension">
<HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
+ <Name>WixUtilExtension</Name>
</WixExtension>
</ItemGroup>
<Import Project="$(WixTargetsPath)" />
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/Apache.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/Apache.wxs 2011-10-29 14:06:17 UTC (rev 6193)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/Apache.wxs 2011-11-01 06:00:35 UTC (rev 6194)
@@ -1,13 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <!-- httpd.exe -->
+ <?define HTTP_MAP = "file_APACHEFILES_20" ?>
<Fragment>
<Binary Id="ApacheActions" SourceFile="..\..\Custom\bin\apache_actions.dll" />
<CustomAction Id="UpdateApacheConfig.SetValues" Property="UpdateApacheConfig" Value="[WEBEXTENSIONSLOCATION];[APACHE_API_TYPE];[APACHE_PORT];[APACHELOCATION];[PHPLOCATION];[WEBROOTLOCATION];[VIRTUALDIR]" />
<CustomAction Id="UpdateApacheConfig" Return="check" BinaryKey="ApacheActions" Execute="deferred" DllEntry="UpdateApacheConfig" />
<CustomAction Id="UpdatePhpIni.SetValues" Property="UpdatePhpIni" Value='[PHPLOCATION];2;[WEBTEMPLOCATION]' />
<CustomAction Id="UpdatePhpIni" Return="check" BinaryKey="ApacheActions" Execute="deferred" DllEntry="UpdatePhpIni" />
- <CustomAction Id="RemoveApacheServiceCA" Execute="immediate" Return="ignore" FileKey="file_APACHEFILES_18" ExeCommand="-k uninstall -n "ApacheMapGuide[MG_VERSION_MAJOR_MINOR]"" />
- <CustomAction Id="InstallApacheServiceCA" Execute="deferred" Return="ignore" FileKey="file_APACHEFILES_18" ExeCommand="-k install -n "ApacheMapGuide[MG_VERSION_MAJOR_MINOR]"" />
- <CustomAction Id="StartApacheServiceCA" Execute="deferred" Return="ignore" FileKey="file_APACHEFILES_18" ExeCommand="-k start -n "ApacheMapGuide[MG_VERSION_MAJOR_MINOR]"" />
+ <CustomAction Id="RemoveApacheServiceCA" Execute="immediate" Return="ignore" FileKey="$(var.HTTP_MAP)" ExeCommand="-k uninstall -n "ApacheMapGuide[MG_VERSION_MAJOR_MINOR]"" />
+ <CustomAction Id="InstallApacheServiceCA" Execute="deferred" Return="ignore" FileKey="$(var.HTTP_MAP)" ExeCommand="-k install -n "ApacheMapGuide[MG_VERSION_MAJOR_MINOR]"" />
+ <CustomAction Id="StartApacheServiceCA" Execute="deferred" Return="ignore" FileKey="$(var.HTTP_MAP)" ExeCommand="-k start -n "ApacheMapGuide[MG_VERSION_MAJOR_MINOR]"" />
</Fragment>
</Wix>
\ No newline at end of file
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs 2011-10-29 14:06:17 UTC (rev 6193)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs 2011-11-01 06:00:35 UTC (rev 6194)
@@ -12,7 +12,7 @@
<!-- isapi_MapAgent.dll -->
<?define FCGI_MAP = "[!file_MAPAGENTFILES_100]" ?>
<!-- php5isapi.dll -->
- <?define PHP_MAP = "[!file_PHPFILES_43]" ?>
+ <?define PHP_MAP = "[WindowsFolder]\system32\inetsrv\fcgiext.dll" ?>
<Fragment>
<Property Id="FRAMEWORKDIR">
<RegistrySearch
@@ -67,12 +67,15 @@
</iis:WebApplication>
<iis:WebVirtualDir Id="IIS5MapAgentVDir" Alias="mapagent" Directory="dir_mapagent_0" >
<iis:WebDirProperties Id="IIS5MapAgentProperties" DefaultDocuments="index.html" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no"/>
+ <!-- Moving to WiX 3.5 broke this. So we'll disable for now -->
+ <!--
<iis:WebError ErrorCode="401" SubCode="0" />
<iis:WebError ErrorCode="401" SubCode="1" />
<iis:WebError ErrorCode="401" SubCode="2" />
<iis:WebError ErrorCode="401" SubCode="3" />
<iis:WebError ErrorCode="401" SubCode="4" />
<iis:WebError ErrorCode="401" SubCode="5" />
+ -->
<iis:WebApplication Id="IIS5MapAgentWebApp" Name="mapagent" >
<iis:WebApplicationExtension Extension="fcgi" Script="yes" Verbs="GET,POST" CheckPath="no" Executable="$(var.FCGI_MAP)" />
<iis:WebApplicationExtension Extension="php" Script="yes" Verbs="GET,POST" CheckPath="no" Executable="$(var.PHP_MAP)" />
@@ -129,12 +132,15 @@
</iis:WebApplication>
<iis:WebVirtualDir Id="IIS6MapAgentVDir" Alias="mapagent" Directory="dir_mapagent_0" >
<iis:WebDirProperties Id="IIS6MapAgentProperties" DefaultDocuments="index.html" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />
+ <!-- Moving to WiX 3.5 broke this. So we'll disable for now -->
+ <!--
<iis:WebError ErrorCode="401" SubCode="0"/>
<iis:WebError ErrorCode="401" SubCode="1" />
<iis:WebError ErrorCode="401" SubCode="2" />
<iis:WebError ErrorCode="401" SubCode="3" />
<iis:WebError ErrorCode="401" SubCode="4" />
<iis:WebError ErrorCode="401" SubCode="5" />
+ -->
<iis:WebApplication Id="IIS6MapAgentWebApp" Name="mapagent" WebAppPool="IIS6MapGuideAppPool">
<iis:WebApplicationExtension Extension="fcgi" Script="yes" Verbs="GET,POST" CheckPath="no" Executable="$(var.FCGI_MAP)" />
<iis:WebApplicationExtension Extension="php" Script="yes" Verbs="GET,POST" CheckPath="no" Executable="$(var.PHP_MAP)" />
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/IIS7.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/IIS7.wxs 2011-10-29 14:06:17 UTC (rev 6193)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/IIS7.wxs 2011-11-01 06:00:35 UTC (rev 6194)
@@ -15,6 +15,11 @@
Value="[AppCmd] add apppool /name:"[APP_POOL_NAME]"" />
<CustomAction Id="MapGuideIIS7_I_CreateAppPool" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
+ <!-- Set up FastCGI -->
+ <CustomAction Id="MapGuideIIS7_I_CreateFastCgi_Cmd" Property="MapGuideIIS7_I_CreateFastCgi" Execute="immediate"
+ Value="[AppCmd] add apppool set config /section:system.webServer/fastCGI /+[\[]fullPath="[WEBEXTENSIONSLOCATION]Php\php-cgi.exe"[\]]" />
+ <CustomAction Id="MapGuideIIS7_I_CreateFastCgi" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
+
<!-- Set the application pool's properties -->
<CustomAction Id="MapGuideIIS7_I_SetAppPoolProp_Cmd" Property="MapGuideIIS7_I_SetAppPoolProp" Execute="immediate"
Value="[AppCmd] set config /section:applicationPools /[\[]name='[APP_POOL_NAME]'[\]].processModel.idleTimeout:00:00:00 /[\[]name='[APP_POOL_NAME]'[\]].recycling.disallowOverlappingRotation:True" />
@@ -35,9 +40,9 @@
Value="[AppCmd] add app /site.name:"[MG_WEBSITE]" /path:"/[VIRTUALDIR]" /physicalPath:"[WEBEXTENSIONSLOCATION]www"" />
<CustomAction Id="MapGuideIIS7_I_CreateMapGuideApp" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
- <!-- Set up the PHP script mapping -->
+ <!-- Set up the PHP script mapping to FastCGI -->
<CustomAction Id="MapGuideIIS7_I_CreatePhpScriptMapping_Cmd" Property="MapGuideIIS7_I_CreatePhpScriptMapping" Execute="immediate"
- Value="[AppCmd] set config "[MG_WEBSITE]/[VIRTUALDIR]" /section:handlers /+[\[]name='"PHP ISAPI handler"',path='*.php',verb='*',scriptProcessor='"[WEBEXTENSIONSLOCATION]Php\php5isapi.dll"',modules='IsapiModule',resourceType='Unspecified'[\]]" />
+ Value="[AppCmd] set config "[MG_WEBSITE]/[VIRTUALDIR]" /section:handlers /+[\[]name='"PHP_via_FastCGI"',path='*.php',verb='*',scriptProcessor='"[WEBEXTENSIONSLOCATION]Php\php-cgi.exe"',modules='FastCgiModule',resourceType='Unspecified'[\]]" />
<CustomAction Id="MapGuideIIS7_I_CreatePhpScriptMapping" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
<!-- Allow access to the PHP ISAPI -->
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/MapGuide Web Extensions.wixproj
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/MapGuide Web Extensions.wixproj 2011-10-29 14:06:17 UTC (rev 6193)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/MapGuide Web Extensions.wixproj 2011-11-01 06:00:35 UTC (rev 6194)
@@ -7,7 +7,7 @@
<SchemaVersion>2.0</SchemaVersion>
<OutputName>MapGuide Web Extensions</OutputName>
<OutputType>Library</OutputType>
- <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets</WixTargetsPath>
+ <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
<MgRegKey Condition=" '$(MgRegKey)' == '' ">SOFTWARE\OSGeo\MapGuide</MgRegKey>
<MgSource Condition="('$(MgSource)'=='')">$(MSBuildProjectDirectory)\..\..\..\MgDev\$(Configuration)</MgSource>
</PropertyGroup>
@@ -50,20 +50,23 @@
<Folder Include="Lang" />
</ItemGroup>
<ItemGroup>
+ <EmbeddedResource Include="Lang\MapGuideWebExtensions_en-US.wxl" />
+ <EmbeddedResource Include="Lang\MapGuideWebExtensions_es-ES.wxl" />
+ </ItemGroup>
+ <ItemGroup>
+ <WixExtension Include="WixUtilExtension">
+ <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
+ <Name>WixUtilExtension</Name>
+ </WixExtension>
<WixExtension Include="WixNetFxExtension">
<HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
+ <Name>WixNetFxExtension</Name>
</WixExtension>
<WixExtension Include="WixIIsExtension">
<HintPath>$(WixExtDir)\WixIIsExtension.dll</HintPath>
+ <Name>WixIIsExtension</Name>
</WixExtension>
- <WixExtension Include="WixUtilExtension">
- <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
- </WixExtension>
</ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Lang\MapGuideWebExtensions_en-US.wxl" />
- <EmbeddedResource Include="Lang\MapGuideWebExtensions_es-ES.wxl" />
- </ItemGroup>
<Import Project="$(WixTargetsPath)" />
<!--
To modify your build process, add your task inside one of the targets below and uncomment it.
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs 2011-10-29 14:06:17 UTC (rev 6193)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs 2011-11-01 06:00:35 UTC (rev 6194)
@@ -11,7 +11,7 @@
<Fragment>
<DirectoryRef Id="ProgramMenuFolder">
<!-- HACK: For some reason the MG_VERSION_MAJOR_MINOR property doesn't evaluate, so hardcode it for now -->
- <Directory Id="MapGuideOpenSourceMenuLocation" Name="MapGuide Open Source 2.2">
+ <Directory Id="MapGuideOpenSourceMenuLocation" Name="MapGuide Open Source 2.4">
<Component Id="GenericShortcutComponent" Win64="$(var.Win64)" Guid="243CE0F3-D6BC-476B-910E-6F34DA54A2E2">
<CreateFolder />
<RegistryKey Root="HKCU" Key="$(var.MgRegKey)\GenericShortcut">
Modified: trunk/Installer/Support/Web/x64/Apache2/conf/httpd.conf
===================================================================
--- trunk/Installer/Support/Web/x64/Apache2/conf/httpd.conf 2011-10-29 14:06:17 UTC (rev 6193)
+++ trunk/Installer/Support/Web/x64/Apache2/conf/httpd.conf 2011-11-01 06:00:35 UTC (rev 6194)
@@ -982,11 +982,11 @@
# MapViewer to MapViewerPhp aliases. Comment out Alias and AliasMatch for Java API.
-ScriptAlias /%MG_VIRTUAL_DIR%/mapagent/mapagent.fcgi "%MG_WEB_ROOT%mapagent/mapagent.fcgi"
-%MG_PHP_API%AliasMatch ^/%MG_VIRTUAL_DIR%/mapviewerajax/([^\?])(.*)$ "%MG_WEB_ROOT%mapviewerphp/$1$2"
-%MG_PHP_API%AliasMatch ^/%MG_VIRTUAL_DIR%/mapviewerajax/(.*)$ "%MG_WEB_ROOT%mapviewerphp/ajaxviewer.php$1"
-%MG_PHP_API%AliasMatch ^/%MG_VIRTUAL_DIR%/mapviewerdwf/([^\?])(.*)$ "%MG_WEB_ROOT%mapviewerphp/$1$2"
-%MG_PHP_API%AliasMatch ^/%MG_VIRTUAL_DIR%/mapviewerdwf/(.*)$ "%MG_WEB_ROOT%mapviewerphp/dwfviewer.php$1"
+ScriptAlias /%MG_VIRTUAL_DIR%/mapagent/mapagent.fcgi "%MG_WEB_ROOT%/mapagent/mapagent.fcgi"
+%MG_PHP_API%AliasMatch ^/%MG_VIRTUAL_DIR%/mapviewerajax/([^\?])(.*)$ "%MG_WEB_ROOT%/mapviewerphp/$1$2"
+%MG_PHP_API%AliasMatch ^/%MG_VIRTUAL_DIR%/mapviewerajax/(.*)$ "%MG_WEB_ROOT%/mapviewerphp/ajaxviewer.php$1"
+%MG_PHP_API%AliasMatch ^/%MG_VIRTUAL_DIR%/mapviewerdwf/([^\?])(.*)$ "%MG_WEB_ROOT%/mapviewerphp/$1$2"
+%MG_PHP_API%AliasMatch ^/%MG_VIRTUAL_DIR%/mapviewerdwf/(.*)$ "%MG_WEB_ROOT%/mapviewerphp/dwfviewer.php$1"
# MapViewer to MapViewerJava Redirect. Uncomment Redirect for Java API.
%MG_JAVA_API%Redirect /%MG_VIRTUAL_DIR%/mapviewerajax/ http://localhost:%MG_WEB_PORT%/%MG_VIRTUAL_DIR%/mapviewerjava/ajaxviewer.jsp
Added: trunk/Installer/Support/Web/x64/FDO/providers.xml
===================================================================
--- trunk/Installer/Support/Web/x64/FDO/providers.xml (rev 0)
+++ trunk/Installer/Support/Web/x64/FDO/providers.xml 2011-11-01 06:00:35 UTC (rev 6194)
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FeatureProviderRegistry>
+</FeatureProviderRegistry>
\ No newline at end of file
Modified: trunk/Installer/Support/Web/x86/configs/Apache2/conf/httpd.conf
===================================================================
--- trunk/Installer/Support/Web/x86/configs/Apache2/conf/httpd.conf 2011-10-29 14:06:17 UTC (rev 6193)
+++ trunk/Installer/Support/Web/x86/configs/Apache2/conf/httpd.conf 2011-11-01 06:00:35 UTC (rev 6194)
@@ -192,7 +192,7 @@
#LoadModule usertrack_module modules/mod_usertrack.so
#LoadModule vhost_alias_module modules/mod_vhost_alias.so
#LoadModule ssl_module modules/mod_ssl.so
-LoadModule php5_module modules/php5apache2_2.dll
+LoadModule php5_module "%MG_WEB_PHP%/php5apache2_2.dll"
LoadModule mgmapagent_module modules/mod_mgmapagent.so
#
@@ -982,11 +982,11 @@
# MapViewer to MapViewerPhp aliases. Comment out Alias and AliasMatch for Java API.
-ScriptAlias /%MG_VIRTUAL_DIR%/mapagent/mapagent.fcgi "%MG_WEB_ROOT%mapagent/mapagent.fcgi"
-%MG_PHP_API%AliasMatch ^/%MG_VIRTUAL_DIR%/mapviewerajax/([^\?])(.*)$ "%MG_WEB_ROOT%mapviewerphp/$1$2"
-%MG_PHP_API%AliasMatch ^/%MG_VIRTUAL_DIR%/mapviewerajax/(.*)$ "%MG_WEB_ROOT%mapviewerphp/ajaxviewer.php$1"
-%MG_PHP_API%AliasMatch ^/%MG_VIRTUAL_DIR%/mapviewerdwf/([^\?])(.*)$ "%MG_WEB_ROOT%mapviewerphp/$1$2"
-%MG_PHP_API%AliasMatch ^/%MG_VIRTUAL_DIR%/mapviewerdwf/(.*)$ "%MG_WEB_ROOT%mapviewerphp/dwfviewer.php$1"
+ScriptAlias /%MG_VIRTUAL_DIR%/mapagent/mapagent.fcgi "%MG_WEB_ROOT%/mapagent/mapagent.fcgi"
+%MG_PHP_API%AliasMatch ^/%MG_VIRTUAL_DIR%/mapviewerajax/([^\?])(.*)$ "%MG_WEB_ROOT%/mapviewerphp/$1$2"
+%MG_PHP_API%AliasMatch ^/%MG_VIRTUAL_DIR%/mapviewerajax/(.*)$ "%MG_WEB_ROOT%/mapviewerphp/ajaxviewer.php$1"
+%MG_PHP_API%AliasMatch ^/%MG_VIRTUAL_DIR%/mapviewerdwf/([^\?])(.*)$ "%MG_WEB_ROOT%/mapviewerphp/$1$2"
+%MG_PHP_API%AliasMatch ^/%MG_VIRTUAL_DIR%/mapviewerdwf/(.*)$ "%MG_WEB_ROOT%/mapviewerphp/dwfviewer.php$1"
# MapViewer to MapViewerJava Redirect. Uncomment Redirect for Java API.
%MG_JAVA_API%Redirect /%MG_VIRTUAL_DIR%/mapviewerajax/ http://localhost:%MG_WEB_PORT%/%MG_VIRTUAL_DIR%/mapviewerjava/ajaxviewer.jsp
Added: trunk/Installer/Support/Web/x86/configs/FDO/providers.xml
===================================================================
--- trunk/Installer/Support/Web/x86/configs/FDO/providers.xml (rev 0)
+++ trunk/Installer/Support/Web/x86/configs/FDO/providers.xml 2011-11-01 06:00:35 UTC (rev 6194)
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FeatureProviderRegistry>
+</FeatureProviderRegistry>
\ No newline at end of file
Modified: trunk/Installer/build.bat
===================================================================
--- trunk/Installer/build.bat 2011-10-29 14:06:17 UTC (rev 6193)
+++ trunk/Installer/build.bat 2011-11-01 06:00:35 UTC (rev 6194)
@@ -44,10 +44,11 @@
SET CPUTYPE=x86
SET TYPEBUILD=Release
SET CULTURE=en-US
-SET INSTALLER_VERSION_MAJOR_MINOR_REV=2.3.0
+SET INSTALLER_VERSION_MAJOR_MINOR=2.4
+SET INSTALLER_VERSION_MAJOR_MINOR_REV=%INSTALLER_VERSION_MAJOR_MINOR%.0
SET INSTALLER_NAME=MapGuideOpenSource-%INSTALLER_VERSION_MAJOR_MINOR_REV%-Trunk-%CULTURE%-%TYPEBUILD%-%CPUTYPE%
SET INSTALLER_VERSION=%INSTALLER_VERSION_MAJOR_MINOR_REV%.0
-SET INSTALLER_TITLE="MapGuide Open Source 2.3 Trunk (%TYPEBUILD%)"
+SET INSTALLER_TITLE="MapGuide Open Source %INSTALLER_VERSION_MAJOR_MINOR% Trunk (%TYPEBUILD%)"
SET MG_REG_KEY=Software\OSGeo\MapGuide\%INSTALLER_VERSION_MAJOR_MINOR_REV%
SET MG_SOURCE=%CD%\..\MgDev\%TYPEBUILD%
SET MG_SOURCE_INC=
@@ -212,6 +213,15 @@
%XCOPY% "%INSTALLER_DEV%\Support\Web\%CPUTYPE%\Php" "%MG_SOURCE%\Web\Php" /EXCLUDE:svn_excludes.txt
echo [prepare] Apache2
%XCOPY% "%INSTALLER_DEV%\Support\Web\%CPUTYPE%\Apache2" "%MG_SOURCE%\Web\Apache2" /EXCLUDE:svn_excludes.txt
+rem copy template configs on top
+echo [prepare] Tomcat config
+%XCOPY% "%INSTALLER_DEV%\Support\Web\%CPUTYPE%\configs\Tomcat" "%MG_SOURCE%\Web\Tomcat" /EXCLUDE:svn_excludes.txt
+echo [prepare] Php config
+%XCOPY% "%INSTALLER_DEV%\Support\Web\%CPUTYPE%\configs\Php" "%MG_SOURCE%\Web\Php" /EXCLUDE:svn_excludes.txt
+echo [prepare] Apache2 config
+%XCOPY% "%INSTALLER_DEV%\Support\Web\%CPUTYPE%\configs\Apache2" "%MG_SOURCE%\Web\Apache2" /EXCLUDE:svn_excludes.txt
+echo [prepare] FDO providers.xml
+copy /Y "%INSTALLER_DEV%\Support\Web\%CPUTYPE%\configs\FDO\providers.xml" "%MG_SOURCE%\Server\FDO\"
goto quit
Modified: trunk/Installer/build64.bat
===================================================================
--- trunk/Installer/build64.bat 2011-10-29 14:06:17 UTC (rev 6193)
+++ trunk/Installer/build64.bat 2011-11-01 06:00:35 UTC (rev 6194)
@@ -45,10 +45,11 @@
SET CONFIGURATION=Release
SET PLATFORM=x64
SET CULTURE=en-US
-SET INSTALLER_VERSION_MAJOR_MINOR_REV=2.3.0
+SET INSTALLER_VERSION_MAJOR_MINOR=2.4
+SET INSTALLER_VERSION_MAJOR_MINOR_REV=%INSTALLER_VERSION_MAJOR_MINOR%.0
SET INSTALLER_NAME=MapGuideOpenSource-%INSTALLER_VERSION_MAJOR_MINOR_REV%-Trunk-%CULTURE%-%TYPEBUILD%-%PLATFORM%
SET INSTALLER_VERSION=%INSTALLER_VERSION_MAJOR_MINOR_REV%.0
-SET INSTALLER_TITLE="MapGuide Open Source 2.3 Trunk (%TYPEBUILD%)"
+SET INSTALLER_TITLE="MapGuide Open Source %INSTALLER_VERSION_MAJOR_MINOR% Trunk (%TYPEBUILD%)"
SET MG_REG_KEY=Software\OSGeo\MapGuide\%INSTALLER_VERSION_MAJOR_MINOR_REV%
SET MG_SOURCE=%CD%\..\MgDev\%TYPEBUILD%
SET MG_SOURCE_INC=
@@ -250,6 +251,15 @@
%XCOPY% "%INSTALLER_DEV%\Support\Web\%PLATFORM%\Php" "%MG_SOURCE%\Web\Php" /EXCLUDE:svn_excludes.txt
echo [prepare] Apache2
%XCOPY% "%INSTALLER_DEV%\Support\Web\%PLATFORM%\Apache2" "%MG_SOURCE%\Web\Apache2" /EXCLUDE:svn_excludes.txt
+rem copy template configs on top
+echo [prepare] Tomcat config
+%XCOPY% "%INSTALLER_DEV%\Support\Web\%PLATFORM%\configs\Tomcat" "%MG_SOURCE%\Web\Tomcat" /EXCLUDE:svn_excludes.txt
+echo [prepare] Php config
+%XCOPY% "%INSTALLER_DEV%\Support\Web\%PLATFORM%\configs\Php" "%MG_SOURCE%\Web\Php" /EXCLUDE:svn_excludes.txt
+echo [prepare] Apache2 config
+%XCOPY% "%INSTALLER_DEV%\Support\Web\%PLATFORM%\configs\Apache2" "%MG_SOURCE%\Web\Apache2" /EXCLUDE:svn_excludes.txt
+echo [prepare] FDO providers.xml
+copy /Y "%INSTALLER_DEV%\Support\Web\%PLATFORM%\configs\FDO\providers.xml" "%MG_SOURCE%\Server\FDO\"
goto quit
More information about the mapguide-commits
mailing list