[mapguide-commits] r4611 - in trunk/Installer: Custom/iis_actions
Installers/MapGuide Libraries/MapGuide Server
Libraries/MapGuide Server/Lang
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sun Feb 28 10:08:17 EST 2010
Author: jng
Date: 2010-02-28 10:08:17 -0500 (Sun, 28 Feb 2010)
New Revision: 4611
Modified:
trunk/Installer/Custom/iis_actions/
trunk/Installer/Installers/MapGuide/MapGuide.wxs
trunk/Installer/Libraries/MapGuide Server/FDO.wxs
trunk/Installer/Libraries/MapGuide Server/Lang/MapGuideServer_en-US.wxl
trunk/Installer/Libraries/MapGuide Server/Lang/MapGuideServer_es-ES.wxl
Log:
#1279: Add support for new PostGIS provider in the installer. Also bump the FDO version number to 3.5
Property changes on: trunk/Installer/Custom/iis_actions
___________________________________________________________________
Added: svn:ignore
+ *.user
obj
Modified: trunk/Installer/Installers/MapGuide/MapGuide.wxs
===================================================================
--- trunk/Installer/Installers/MapGuide/MapGuide.wxs 2010-02-24 22:39:22 UTC (rev 4610)
+++ trunk/Installer/Installers/MapGuide/MapGuide.wxs 2010-02-28 15:08:17 UTC (rev 4611)
@@ -41,8 +41,8 @@
<Property Id="APACHE_VERSION" Secure="yes" Value="2.2.4" />
<Property Id="PHP_VERSION" Secure="yes" Value="5.2.5" />
<!-- Used by FdoRegUtil.exe -->
- <Property Id="FDO_VERSION" Secure="yes" Value="3.4.0.0" />
- <Property Id="FDO_VERSION_SMALL" Secure="yes" Value="3.4" />
+ <Property Id="FDO_VERSION" Secure="yes" Value="3.5.0.0" />
+ <Property Id="FDO_VERSION_SMALL" Secure="yes" Value="3.5" />
<!--
These are currently static, though there is opportunity in the future for these
@@ -387,6 +387,7 @@
<Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="Remove" Value="FdoKingOracleProviderFeature" Order="4">1</Publish>
<Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="Remove" Value="FdoMySqlProviderFeature" Order="5">1</Publish>
<Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="Remove" Value="FdoPostGisProviderFeature" Order="6">1</Publish>
+ <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="Remove" Value="FdoPostgreSqlProviderFeature" Order="7">1</Publish>
<!-- If Apache, or IIS and the .Net Framework is not installed, set feature default for the ASPX viewer to not install -->
<Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="Remove" Value="WebExtMapViewerASPXFeature" Order="7">(MGWEB_CONFIG="APACHE") OR (MGWEB_CONFIG="IIS" AND NOT NETFRAMEWORK20)</Publish>
<Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="NewDialog" Value="ApacheConfigDlg" Order="8">MGWEB_CONFIG="APACHE"</Publish>
@@ -611,7 +612,8 @@
<Custom Action="FdoRegGdalCmd" After="FdoRegMySqlCmd">&FdoGdalProviderFeature>2</Custom>
<Custom Action="FdoRegOgrCmd" After="FdoRegGdalCmd">&FdoOgrProviderFeature>2</Custom>
<Custom Action="FdoRegPostGisCmd" After="FdoRegOgrCmd">&FdoPostGisProviderFeature>2</Custom>
- <Custom Action="FdoRegOracleCmd" After="FdoRegPostGisCmd">&FdoKingOracleProviderFeature>2</Custom>
+ <Custom Action="FdoRegPostgreSqlCmd" After="FdoRegPostGisCmd">&FdoPostgreSqlProviderFeature>2</Custom>
+ <Custom Action="FdoRegOracleCmd" After="FdoRegPostgreSqlCmd">&FdoKingOracleProviderFeature>2</Custom>
<Custom Action="FdoRegSqlServerCmd" After="FdoRegOracleCmd">&FdoSqlServerSpatialProviderFeature>2</Custom>
<Custom Action="FdoRegSltCmd" After="FdoRegSqlServerCmd">&FdoSltProviderFeature>2</Custom>
@@ -626,7 +628,8 @@
<Custom Action="FdoRegGdal" After="FdoRegMySql">&FdoGdalProviderFeature>2</Custom>
<Custom Action="FdoRegOgr" After="FdoRegGdal">&FdoOgrProviderFeature>2</Custom>
<Custom Action="FdoRegPostGis" After="FdoRegOgr">&FdoPostGisProviderFeature>2</Custom>
- <Custom Action="FdoRegOracle" After="FdoRegPostGis">&FdoKingOracleProviderFeature>2</Custom>
+ <Custom Action="FdoRegPostgreSql" After="FdoRegPostGis">&FdoPostgreSqlProviderFeature>2</Custom>
+ <Custom Action="FdoRegOracle" After="FdoRegPostgreSql">&FdoKingOracleProviderFeature>2</Custom>
<Custom Action="FdoRegSqlServer" After="FdoRegOracle">&FdoSqlServerSpatialProviderFeature>2</Custom>
<Custom Action="FdoRegSlt" After="FdoRegSqlServer">&FdoSltProviderFeature>2</Custom>
@@ -641,7 +644,8 @@
<Custom Action="FdoUnRegGdalCmd" After="FdoUnRegMySqlCmd">&FdoGdalProviderFeature=2</Custom>
<Custom Action="FdoUnRegOgrCmd" After="FdoUnRegGdalCmd">&FdoOgrProviderFeature=2</Custom>
<Custom Action="FdoUnRegPostGisCmd" After="FdoUnRegOgrCmd">&FdoPostGisProviderFeature=2</Custom>
- <Custom Action="FdoUnRegOracleCmd" After="FdoUnRegPostGisCmd">&FdoKingOracleProviderFeature=2</Custom>
+ <Custom Action="FdoUnRegPostgreSqlCmd" After="FdoUnRegPostGisCmd">&FdoPostgreSqlProviderFeature=2</Custom>
+ <Custom Action="FdoUnRegOracleCmd" After="FdoUnRegPostgreSqlCmd">&FdoKingOracleProviderFeature=2</Custom>
<Custom Action="FdoUnRegSqlServerCmd" After="FdoUnRegOracleCmd">&FdoSqlServerSpatialProviderFeature=2</Custom>
<Custom Action="FdoUnRegSltCmd" After="FdoUnRegSqlServerCmd">&FdoSltProviderFeature=2</Custom>
@@ -656,7 +660,8 @@
<Custom Action="FdoUnRegGdal" After="FdoUnRegMySql">&FdoGdalProviderFeature=2</Custom>
<Custom Action="FdoUnRegOgr" After="FdoUnRegGdal">&FdoOgrProviderFeature=2</Custom>
<Custom Action="FdoUnRegPostGis" After="FdoUnRegOgr">&FdoPostGisProviderFeature=2</Custom>
- <Custom Action="FdoUnRegOracle" After="FdoUnRegPostGis">&FdoKingOracleProviderFeature=2</Custom>
+ <Custom Action="FdoUnRegPostgreSql" After="FdoUnRegPostGis">&FdoPostgreSqlProviderFeature=2</Custom>
+ <Custom Action="FdoUnRegOracle" After="FdoUnRegPostgreSql">&FdoKingOracleProviderFeature=2</Custom>
<Custom Action="FdoUnRegSqlServer" After="FdoUnRegOracle">&FdoSqlServerSpatialProviderFeature=2</Custom>
<Custom Action="FdoUnRegSlt" After="FdoUnRegSqlServer">&FdoSltProviderFeature=2</Custom>
Modified: trunk/Installer/Libraries/MapGuide Server/FDO.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Server/FDO.wxs 2010-02-24 22:39:22 UTC (rev 4610)
+++ trunk/Installer/Libraries/MapGuide Server/FDO.wxs 2010-02-28 15:08:17 UTC (rev 4611)
@@ -13,6 +13,7 @@
<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="FdoRegPostGisCmd" Property="FdoRegPostGis" Value="[FdoReg] -r "OSGeo.PostGIS.[FDO_VERSION_SMALL]" "!(loc.PostGisProvider)" "!(loc.PostGisProviderDesc)" "[FDO_VERSION]" "[FDO_VERSION]" ".\PostGISProvider.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"" />
@@ -27,6 +28,7 @@
<CustomAction Id="FdoRegGdal" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
<CustomAction Id="FdoRegOgr" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
<CustomAction Id="FdoRegPostGis" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
+ <CustomAction Id="FdoRegPostgreSql" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
<CustomAction Id="FdoRegOracle" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
<CustomAction Id="FdoRegSqlServer" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
<CustomAction Id="FdoRegSlt" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
@@ -41,6 +43,7 @@
<CustomAction Execute="immediate" Id="FdoUnRegGdalCmd" Property="FdoUnRegGdal" Value="[FdoReg] -u "OSGeo.Gdal.[FDO_VERSION_SMALL]"" />
<CustomAction Execute="immediate" Id="FdoUnRegOgrCmd" Property="FdoUnRegOgr" Value="[FdoReg] -u "OSGeo.OGR.[FDO_VERSION_SMALL]"" />
<CustomAction Execute="immediate" Id="FdoUnRegPostGisCmd" Property="FdoUnRegPostGis" Value="[FdoReg] -u "OSGeo.PostGIS.[FDO_VERSION_SMALL]"" />
+ <CustomAction Execute="immediate" Id="FdoUnRegPostgreSqlCmd" Property="FdoUnRegPostgresSql" Value="[FdoReg] -u "OSGeo.PostgreSQL.[FDO_VERSION_SMALL]"" />
<CustomAction Execute="immediate" Id="FdoUnRegOracleCmd" Property="FdoUnRegOracle" Value="[FdoReg] -u "King.Oracle.[FDO_VERSION_SMALL]"" />
<CustomAction Execute="immediate" Id="FdoUnRegSqlServerCmd" Property="FdoUnRegSqlServer" Value="[FdoReg] -u "OSGeo.SQLServerSpatial.[FDO_VERSION_SMALL]"" />
<CustomAction Execute="immediate" Id="FdoUnRegSltCmd" Property="FdoUnRegSlt" Value="[FdoReg] -u "OSGeo.SQLite.[FDO_VERSION_SMALL]"" />
@@ -55,6 +58,7 @@
<CustomAction Id="FdoUnRegGdal" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
<CustomAction Id="FdoUnRegOgr" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
<CustomAction Id="FdoUnRegPostGis" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
+ <CustomAction Id="FdoUnRegPostgreSql" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
<CustomAction Id="FdoUnRegOracle" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
<CustomAction Id="FdoUnRegSqlServer" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
<CustomAction Id="FdoUnRegSlt" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
@@ -132,12 +136,17 @@
<Component Id="FdoOgrProviderComponent" Guid="7FB890D4-8824-478E-83F6-E14DF2A3F949">
<File Id="OgrProvider" Checksum="yes" Source="$(var.MgSource)\Server\FDO\OGRProvider.dll" />
</Component>
- <!-- PostGIS Provider -->
+ <!-- PostGIS (legacy) Provider -->
<Component Id="FdoPostGisProviderComponent" Guid="1D51342F-3ECC-4053-8475-F70333B4B22D">
<File Id="PostGisMessage" Checksum="yes" Source="$(var.MgSource)\Server\FDO\PostGISMessage.dll" />
<File Id="PostGisOverrides" Checksum="yes" Source="$(var.MgSource)\Server\FDO\PostGISOverrides.dll" />
<File Id="PostGisProvider" Checksum="yes" Source="$(var.MgSource)\Server\FDO\PostGISProvider.dll" />
</Component>
+ <!-- PostGIS (new) Provider -->
+ <Component Id="FdoPostgreSqlProviderComponent" Guid="550B6CA0-10F8-444B-B51B-8569FF23B8C2">
+ <File Id="PostgreSqlOverrides" Checksum="yes" Source="$(var.MgSource)\Server\FDO\PostgreSQLOverrides.dll" />
+ <File Id="PostgreSqlProvider" Checksum="yes" Source="$(var.MgSource)\Server\FDO\PostgreSQLProvider.dll" />
+ </Component>
<!-- SDF Provider -->
<Component Id="FdoSdfProviderComponent" Guid="F0976038-9F62-42E7-AA6E-B37C33744C6F">
<File Id="SdfMessage" Checksum="yes" Source="$(var.MgSource)\Server\FDO\SDFMessage.dll" />
@@ -196,6 +205,9 @@
<Feature Id="FdoPostGisProviderFeature" Title="!(loc.PostGisProvider)" Level="1" Description="!(loc.PostGisProviderDesc)" AllowAdvertise="no" TypicalDefault="install" InstallDefault="local">
<ComponentRef Id="FdoPostGisProviderComponent" />
</Feature>
+ <Feature Id="FdoPostgreSqlProviderFeature" Title="!(loc.PostgreSqlProvider)" Level="1" Description="!(loc.PostgreSqlProviderDesc)" AllowAdvertise="no" TypicalDefault="install" InstallDefault="local">
+ <ComponentRef Id="FdoPostgreSqlProviderComponent" />
+ </Feature>
<Feature Id="FdoSdfProviderFeature" Title="!(loc.SdfProvider)" Level="1" Description="!(loc.SdfProviderDesc)" AllowAdvertise="no" TypicalDefault="install" InstallDefault="local">
<ComponentRef Id="FdoSdfProviderComponent" />
</Feature>
Modified: trunk/Installer/Libraries/MapGuide Server/Lang/MapGuideServer_en-US.wxl
===================================================================
--- trunk/Installer/Libraries/MapGuide Server/Lang/MapGuideServer_en-US.wxl 2010-02-24 22:39:22 UTC (rev 4610)
+++ trunk/Installer/Libraries/MapGuide Server/Lang/MapGuideServer_en-US.wxl 2010-02-28 15:08:17 UTC (rev 4611)
@@ -34,6 +34,8 @@
<String Id="OgrProviderDesc">FDO Access to OGR Data Sources</String>
<String Id="PostGisProvider">PostGIS Provider</String>
<String Id="PostGisProviderDesc">Read/write access to spatial and attribute data in a PostGIS database. (requires libpq.dll)</String>
+ <String Id="PostgreSqlProvider">PostgreSQL/PostGIS Provider</String>
+ <String Id="PostgreSqlProviderDesc">Read/write access to PostgreSQL/PostGIS-based data store. Supports spatial data types and spatial query operations.</String>
<String Id="SdfProvider">SDF Provider</String>
<String Id="SdfProviderDesc">Read/write access to Autodesk's spatial database format, a file-based personal geodatabase that supports multiple features/attributes, spatial indexing, and file-locking.</String>
<String Id="ShpProvider">SHP Provider</String>
Modified: trunk/Installer/Libraries/MapGuide Server/Lang/MapGuideServer_es-ES.wxl
===================================================================
--- trunk/Installer/Libraries/MapGuide Server/Lang/MapGuideServer_es-ES.wxl 2010-02-24 22:39:22 UTC (rev 4610)
+++ trunk/Installer/Libraries/MapGuide Server/Lang/MapGuideServer_es-ES.wxl 2010-02-28 15:08:17 UTC (rev 4611)
@@ -34,6 +34,8 @@
<String Id="OgrProviderDesc">Proveedor de OGR</String>
<String Id="PostGisProvider">PostGIS Proveedor</String>
<String Id="PostGisProviderDesc">Proveedor FDO para PostGIS (requiere libpq.dll)</String>
+ <String Id="PostgreSqlProvider">PostgreSQL/PostGIS Proveedor</String>
+ <String Id="PostgreSqlProviderDesc">De lectura / escritura de acceso a PostgreSQL / PostGIS datos basados en la tienda. Soporta los tipos de datos espaciales y las operaciones espaciales de la consulta.</String>
<String Id="SdfProvider">SDF Proveedor</String>
<String Id="SdfProviderDesc">De lectura / escritura a Autodesk espacial del formato de base de datos, un archivo basado en Geodatabase personales que soporta múltiples características y atributos, indexación espacial, y el archivo de bloqueo.</String>
<String Id="ShpProvider">SHP Proveedor</String>
More information about the mapguide-commits
mailing list