[mapguide-commits] r8093 - in trunk/Installer: . Installers/MapGuide Installers/MapGuide/Lang Libraries/CS Map Libraries/CS Map/Lang Libraries/MapGuide Server Libraries/MapGuide Server/Lang Libraries/MapGuide Web Extensions Libraries/MapGuide Web Extensions/Lang Support/Paraffin
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed Apr 30 09:28:56 PDT 2014
Author: jng
Date: 2014-04-30 09:28:55 -0700 (Wed, 30 Apr 2014)
New Revision: 8093
Removed:
trunk/Installer/Installers/MapGuide/Lang/MapGuide_es-ES.wxl
trunk/Installer/Libraries/CS Map/Lang/CSMap_es-ES.wxl
trunk/Installer/Libraries/MapGuide Server/Lang/MapGuideServer_es-ES.wxl
trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_es-ES.wxl
trunk/Installer/Paraffin.pdb
Modified:
trunk/Installer/Features.xml
trunk/Installer/Installers/MapGuide/MapGuide.wixproj
trunk/Installer/Libraries/CS Map/CS Map.wixproj
trunk/Installer/Libraries/MapGuide Server/MapGuide Server.wixproj
trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_en-US.wxl
trunk/Installer/Libraries/MapGuide Web Extensions/MapGuide Web Extensions.wixproj
trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs
trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs
trunk/Installer/Paraffin.exe
trunk/Installer/Support/Paraffin/Constants.Designer.cs
trunk/Installer/Support/Paraffin/Main.cs
trunk/Installer/Support/Paraffin/Paraffin.csproj
trunk/Installer/Support/Paraffin/Paraffin.sln
trunk/Installer/build.bat
Log:
#2437, #995: Merge r8091 from 2.6
Modified: trunk/Installer/Features.xml
===================================================================
--- trunk/Installer/Features.xml 2014-04-30 16:14:32 UTC (rev 8092)
+++ trunk/Installer/Features.xml 2014-04-30 16:28:55 UTC (rev 8093)
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="utf-8" ?>
<FeatureMap>
- <DirectorySearch Name=".svn" Suffix="_SVNMETADATA" />
+ <FeaturePattern Pattern="www\\mapagent\\(.*\.html|.*\.php|.*\.js)" Feature="WebExtMapAgentTestPagesFeature" />
+ <FeaturePattern Pattern="www\\mapviewernet\\serveradminhelper.aspx" Feature="WebExtMapAgentTestPagesFeature" />
+ <FeaturePattern Pattern="www\\mapviewernet\\serveradminhelper.php" Feature="WebExtMapAgentTestPagesFeature" />
+ <FeaturePattern Pattern="www\\mapviewernet\\serveradminhelper.jsp" Feature="WebExtMapAgentTestPagesFeature" />
<IdentifierOverride Pattern="Server\bin\mgserver.exe" Identifier="MGSERVER_EXE" />
<IdentifierOverride Pattern="Apache24\bin\httpd.exe" Identifier="HTTPD_EXE" />
<IdentifierOverride Pattern="Tomcat\bin\service.bat" Identifier="TOMCAT_SERVICE_BAT" />
Deleted: trunk/Installer/Installers/MapGuide/Lang/MapGuide_es-ES.wxl
===================================================================
--- trunk/Installer/Installers/MapGuide/Lang/MapGuide_es-ES.wxl 2014-04-30 16:14:32 UTC (rev 8092)
+++ trunk/Installer/Installers/MapGuide/Lang/MapGuide_es-ES.wxl 2014-04-30 16:28:55 UTC (rev 8093)
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="es-ES" xmlns="http://schemas.microsoft.com/wix/2006/localization">
- <!--
- Use this link to get the culture id
- http://msdn.microsoft.com/en-us/library/system.globalization.cultureinfo(vs.80).aspx
- -->
- <String Id="LANG">3082</String>
- <String Id="ProductName">MapGuide Open Source 2.4</String>
- <String Id="ProductManufacturer">Open Source Geospatial Foundation</String>
-
- <String Id="InstallerTitle">Instalación de [ProductName]</String>
-
- <String Id="MapGuideFeature">MapGuide</String>
- <String Id="MapGuideFeature_Description">Ubicación de instalación MapGuide</String>
-
- <String Id="NextButtonText">Siguiente</String>
- <String Id="BackButtonText">Anterior</String>
- <String Id="CancelButtonText">Cancelar</String>
-
- <String Id="DisabledFeaturesDialog_Title">Características de los discapacitados</String>
- <String Id="DisabledFeaturesDialog_Description">Algunas funciones no estarán disponibles</String>
- <String Id="DisabledFeaturesDialog_IIS">IIS no está instalado, por lo que no estará disponible como una opción de instalación</String>
- <String Id="DisabledFeaturesDialog_DotNet">Dot Net Framework 4.0 no se ha encontrado, por lo que el Asp.Net Web Extensiones no estará disponible</String>
- <String Id="DisabledFeaturesDialog_Instructions">Si desea utilizar estas funciones, haga clic en cancelar y corregir el problema antes de proceder con la instalación</String>
-
- <String Id="FastCgiDialog_Title">FastCGI es necesario</String>
- <String Id="FastCgiDialog_Description">FastCGI es necesario instalar</String>
- <String Id="FastCgiDialog_Instructions">MapGuide de configuración de IIS FastCGI requiere ser instalado en este sistema</String>
- <String Id="FastCgiDialog_Instructions2">Usted puede descargar desde este enlace FastCGI</String>
- <String Id="FastCgiDialog_Link">http://www.iis.net/download/FastCGI</String>
- <String Id="FastCgiDialog_Instructions3">Puede ignorar este mensaje si FastCGI para IIS ya está instalado. De lo contrario, debe cancelar la instalación e instalar FastCGI primero</String>
-
- <String Id="ServerConfigDlg_Title">Puerto del servidor de configuración</String>
- <String Id="ServerConfigDlg_Description">Configurar los puertos de escucha para MapGuide Server</String>
- <String Id="ServerConfigDlg_Prompt">MapGuide Server se instala utilizando los números de puerto siguiente. El servidor de Web y los archivos de configuración de nivel se establece para utilizar los números de puerto se especifica a continuación.</String>
- <String Id="ServerConfigDlg_AdminPortNo">Administrador de Puerto de conexión</String>
- <String Id="ServerConfigDlg_ClientPortNo">Puerto de conexión de cliente</String>
- <String Id="ServerConfigDlg_SitePortNo">Sitio Puerto de conexión</String>
-
- <String Id="WebServerConfigDlg_Title">Seleccione el tipo de configuración</String>
- <String Id="WebServerConfigDlg_Description">Seleccione el tipo de configuración del servidor Web que desea</String>
- <String Id="WebServerConfigDlg_Apache">Paquete de configuración</String>
- <String Id="WebServerConfigDlg_IIS">Configuración de IIS</String>
- <String Id="WebServerConfigDlg_Manual">Configuración manual</String>
- <String Id="WebServerConfigDlg_Apache_Tooltip">Instalar y configurar Apache, PHP y Tomcat</String>
- <String Id="WebServerConfigDlg_IIS_Tooltip">Instalar PHP y de auto-configuración de IIS</String>
- <String Id="WebServerConfigDlg_Manual_Tooltip">Instalar manual los componentes.</String>
-
- <String Id="ApacheConfigDlg_Title">Paquete de ajustes de configuración</String>
- <String Id="ApacheConfigDlg_Description">Configure el entorno de desarrollo</String>
- <String Id="ApacheConfigDlg_PortNo">número de puerto del servidor web</String>
- <String Id="ApacheConfigDlg_DevEnv">Entorno de desarrollo</String>
- <String Id="ApacheConfigDlg_VDirName">Nombre del directorio virtual</String>
-
- <String Id="IISLangConfigDlg_Title">Ajustes de configuración de IIS</String>
- <String Id="IISLangConfigDlg_Description">Configure el entorno de desarrollo</String>
- <String Id="IISLangConfigDlg_DevEnv">Entorno de desarrollo</String>
- <String Id="IISLangConfigDlg_VDirName">Nombre del directorio virtual</String>
-
- <String Id="IIS6ConfigDlg_Title">Configuración de IIS 6.0</String>
- <String Id="IIS6ConfigDlg_Description">Configurar IIS 6.0 Configuración</String>
- <String Id="IIS6ConfigDlg_InstallTo">Instalación de extensiones Web de sitio web la siguiente</String>
- <String Id="IIS6ConfigDlg_AppPool">Crear un grupo de aplicaciones</String>
- <String Id="IIS6ConfigDlg_AppPoolDescription">Un grupo de aplicaciones MapGuide permite a las aplicaciones ser aislado de otras aplicaciones que se ejecutan en el servidor web</String>
-
- <String Id="NoIISDlg_Title">IIS no se encuentra</String>
- <String Id="NoIISDlg_Description">IIS no se encuentra</String>
- <String Id="NoIISDlg_Text">IIS no se pudo encontrar en su sistema. Por favor, volver atrás y elegir una configuración diferente web o instalar IIS.</String>
-
- <String Id="IPConfigDlg_Title">Dirección IP del servidor</String>
- <String Id="IPConfigDlg_Description">Introduzca el servidor de sitio MapGuide dirección IP del servidor</String>
- <String Id="IPConfigDlg_IPAddress">Introduzca el servidor de sitio MapGuide dirección IP del servidor:</String>
- <String Id="IPConfigDlg_Note">La dirección IP del servidor web por defecto es localhost (127.0.0.1)</String>
-
- <String Id="UpdateApacheConfig">Ajuste los valores de httpd.conf</String>
- <String Id="UpdatePhpIni">Ajuste los valores de php.ini</String>
- <String Id="InstallApacheServiceCA">Servicio de Instalación de Apache</String>
- <String Id="MgServerInstallCA">Servicio de Instalación de MapGuide</String>
- <String Id="MgServerUninstallCA">Extracción de MapGuide Servicio</String>
- <String Id="RemoveApacheServiceCA">Servicio de eliminación de Apache</String>
-
-</WixLocalization>
\ No newline at end of file
Modified: trunk/Installer/Installers/MapGuide/MapGuide.wixproj
===================================================================
--- trunk/Installer/Installers/MapGuide/MapGuide.wixproj 2014-04-30 16:14:32 UTC (rev 8092)
+++ trunk/Installer/Installers/MapGuide/MapGuide.wixproj 2014-04-30 16:28:55 UTC (rev 8093)
@@ -79,7 +79,6 @@
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Lang\MapGuide_en-US.wxl" />
- <EmbeddedResource Include="Lang\MapGuide_es-ES.wxl" />
</ItemGroup>
<ItemGroup>
<WixExtension Include="WixUtilExtension">
Modified: trunk/Installer/Libraries/CS Map/CS Map.wixproj
===================================================================
--- trunk/Installer/Libraries/CS Map/CS Map.wixproj 2014-04-30 16:14:32 UTC (rev 8092)
+++ trunk/Installer/Libraries/CS Map/CS Map.wixproj 2014-04-30 16:28:55 UTC (rev 8093)
@@ -42,7 +42,6 @@
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Lang\CSMap_en-US.wxl" />
- <EmbeddedResource Include="Lang\CSMap_es-ES.wxl" />
</ItemGroup>
<Import Project="$(WixTargetsPath)" />
<!--
Deleted: trunk/Installer/Libraries/CS Map/Lang/CSMap_es-ES.wxl
===================================================================
--- trunk/Installer/Libraries/CS Map/Lang/CSMap_es-ES.wxl 2014-04-30 16:14:32 UTC (rev 8092)
+++ trunk/Installer/Libraries/CS Map/Lang/CSMap_es-ES.wxl 2014-04-30 16:28:55 UTC (rev 8093)
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="es-ES" xmlns="http://schemas.microsoft.com/wix/2006/localization">
- <String Id="CSMapFeature">CS-Map</String>
- <String Id="CSMapFeature_Description">CS-Map es un componente requerido para MapGuide MapGuide Web Server y Extensiones.</String>
-</WixLocalization>
\ No newline at end of file
Deleted: trunk/Installer/Libraries/MapGuide Server/Lang/MapGuideServer_es-ES.wxl
===================================================================
--- trunk/Installer/Libraries/MapGuide Server/Lang/MapGuideServer_es-ES.wxl 2014-04-30 16:14:32 UTC (rev 8092)
+++ trunk/Installer/Libraries/MapGuide Server/Lang/MapGuideServer_es-ES.wxl 2014-04-30 16:28:55 UTC (rev 8093)
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="es-ES" xmlns="http://schemas.microsoft.com/wix/2006/localization">
- <String Id="ServerFeature">Servidor</String>
- <String Id="ServerFeature_Description">MapGuide Servidor proporciona análisis geográfico y la prestación de servicios.</String>
- <String Id="ServerLogsFeature">Archivos de registro</String>
- <String Id="ServerLogsFeature_Description">Usted puede elegir una ubicación para colocar los archivos de registro del servidor.</String>
- <String Id="ServerPackagesFeature">Paquetes</String>
- <String Id="ServerPackagesFeature_Description">Usted puede elegir un lugar donde el servidor de acceso Paquetes (*. mgp).</String>
- <String Id="ServerRepositoriesFeature">Repositorios</String>
- <String Id="ServerRepositoriesFeature_Description">Usted puede elegir uno de los padres para la ubicación del servidor repositorios.</String>
- <String Id="ServerRepositoriesLibraryFeature">Biblioteca Repositorio</String>
- <String Id="ServerRepositoriesLibraryFeature_Description">Usted puede elegir una ubicación para la Biblioteca de repositorios.</String>
- <String Id="ServerRepositoriesSessionFeature">Período de sesiones de repositorios</String>
- <String Id="ServerRepositoriesSessionFeature_Description">Usted puede elegir una ubicación para la reunión de repositorios.</String>
- <String Id="ServerRepositoriesSiteFeature">Sitio Repositorio</String>
- <String Id="ServerRepositoriesSiteFeature_Description">Usted puede elegir una ubicación para el sitio de repositorios.</String>
- <String Id="ServerRepositoriesTileCacheFeature">Azulejos caché Repositorio</String>
- <String Id="ServerRepositoriesTileCacheFeature_Description">You may choose a location for the Tile Cache repository.</String>
- <String Id="ServerTempFeature">Archivos temporales</String>
- <String Id="ServerTempFeature_Description">Usted puede elegir un lugar donde MapGuide almacenará los archivos temporales</String>
- <!-- FDO -->
- <String Id="FdoDescription">FDO (objetos de datos de características) permite el acceso al resumen diferentes fuentes de datos.</String>
- <String Id="ArcSdeProvider">ArcSDE Proveedor</String>
- <String Id="ArcSdeProviderDesc">De lectura / escritura a una basada en ArcSDE de ESRI almacén de datos utilizando Oracle y SQL Server. (Requiere exteriores ArcSDE dlls)</String>
- <String Id="GdalProvider">GDAL Proveedor</String>
- <String Id="GdalProviderDesc">Raster Proveedor FDO para GDAL</String>
- <String Id="KingOracleProvider">Proveedor de King Oracle</String>
- <String Id="KingOracleProviderDesc">De lectura / escritura a los datos espaciales y de atributos en una de Oracle Spatial. (requiere Oracle Instant Cliente bibliotecas)</String>
- <String Id="MySqlProvider">Proveedor de MySQL </String>
- <String Id="MySqlProviderDesc">Proveedor FDO para MySQL (requiere libmysql.dll)</String>
- <String Id="OdbcProvider">Proveedor FDO para ODBC</String>
- <String Id="OdbcProviderDesc">The ODBC Provider</String>
- <String Id="OgrProvider">Proveedor FDO para OGR</String>
- <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>
- <String Id="ShpProviderDesc">De lectura / escritura a los datos espaciales y de atributos en un archivo de ESRI SHP.</String>
- <String Id="SltProvider">SQLite Proveedor</String>
- <String Id="SltProviderDesc">Proveedor de SQLite</String>
- <String Id="SqlServerProvider">SQL Server Proveedor espacial </String>
- <String Id="SqlServerProviderDesc">Leer / Escribir el acceso a la función de los datos en un servidor de MS SQL del almacén de datos habilitada espacialmente. Apoya geoespaciales y no de datos geoespaciales y de esquema.</String>
- <String Id="WfsProvider">WFS Proveedor</String>
- <String Id="WfsProviderDesc">Acceso de lectura a OGC WFS-basado almacén de datos.</String>
- <String Id="WmsProvider">WMS Proveedor</String>
- <String Id="WmsProviderDesc">Acceso de lectura a OGC WMS-basado almacén de datos.</String>
-</WixLocalization>
\ No newline at end of file
Modified: trunk/Installer/Libraries/MapGuide Server/MapGuide Server.wixproj
===================================================================
--- trunk/Installer/Libraries/MapGuide Server/MapGuide Server.wixproj 2014-04-30 16:14:32 UTC (rev 8092)
+++ trunk/Installer/Libraries/MapGuide Server/MapGuide Server.wixproj 2014-04-30 16:28:55 UTC (rev 8093)
@@ -52,7 +52,6 @@
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Lang\MapGuideServer_en-US.wxl" />
- <EmbeddedResource Include="Lang\MapGuideServer_es-ES.wxl" />
</ItemGroup>
<ItemGroup>
<WixExtension Include="WixUtilExtension">
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_en-US.wxl
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_en-US.wxl 2014-04-30 16:14:32 UTC (rev 8092)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_en-US.wxl 2014-04-30 16:28:55 UTC (rev 8093)
@@ -48,8 +48,8 @@
<String Id="WebStdIconsFeature_Description">Icons for the AJAX viewer</String>
<String Id="WebTempFeature">Temp Directory</String>
<String Id="WebTempFeature_Description">You may choose a location where MapGuide will store temporary files.</String>
- <String Id="SvnMetadataFeature">SVN Metadata</String>
- <String Id="SvnMetadataFeature_Description">Includes SVN metadata for web application files allowing the user to pull down fixes and updates using a Subversion client</String>
+ <String Id="WebExtMapAgentTestPagesFeature">mapagent test pages</String>
+ <String Id="WebExtMapAgentTestPagesFeature_Description">mapagent test harness web pages and scripts</String>
<String Id="Shortcut_DevGuide">MapGuide Developer's Guide</String>
<String Id="Shortcut_WebAPI">Web API Documentation</String>
Deleted: trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_es-ES.wxl
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_es-ES.wxl 2014-04-30 16:14:32 UTC (rev 8092)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_es-ES.wxl 2014-04-30 16:28:55 UTC (rev 8093)
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="es-ES" xmlns="http://schemas.microsoft.com/wix/2006/localization">
- <String Id="WebExtensionsFeature">Web</String>
- <String Id="WebExtensionsFeature_Description">MapGuide Web proporciona los componentes necesarios para servir MapGuide recursos a través de Internet</String>
- <String Id="WebExtApacheFeature">Servidor web Apache</String>
- <String Id="WebExtApacheFeature_Description">Un paquete de la versión de Apache con MapGuide habilitado, corriendo en el puerto [APACHE_PORT].</String>
- <String Id="WebExtPhpFeature">PHP</String>
- <String Id="WebExtPhpFeature_Description">Un paquete de la versión de PHP con MapGuide habilitado.</String>
- <String Id="WebExtTomcatFeature">Tomcat</String>
- <String Id="WebExtTomcatFeature_Description">Un paquete de la versión de Tomcat con MapGuide habilitado.</String>
- <String Id="WebExtHelpFeature">Documentación de la API</String>
- <String Id="WebExtHelpFeature_Description">Extensión web documentación de la API</String>
- <String Id="WebExtMapViewerFeature">Visor de mapa</String>
- <String Id="WebExtMapViewerFeature_Description">Los archivos de soporte para el visualizador de mapas, idioma independiente.</String>
- <String Id="WebExtMapViewerPHPFeature">Visor de mapas PHP</String>
- <String Id="WebExtMapViewerPHPFeature_Description">La versión de PHP del visualizador de mapas.</String>
- <String Id="WebExtMapViewerJSPFeature">Visor de mapas JSP</String>
- <String Id="WebExtMapViewerJSPFeature_Description">La versión de la JSP visualizador de mapas.</String>
- <String Id="WebExtMapViewerASPXFeature">Visor de mapas .NET</String>
- <String Id="WebExtMapViewerASPXFeature_Description">.NET versión del visualizador de mapas.</String>
- <String Id="WebExtSamplesFeature">Muestras</String>
- <String Id="WebExtSamplesFeature_Description">Muestra el código y los datos</String>
- <String Id="WebExtPhpDevGuideSamplesFeature">Developer's Guide Código de muestra (PHP)</String>
- <String Id="WebExtPhpDevGuideSamplesFeature_Description">Ejemplo de código de PHP a partir de la MapGuide Developer's Guide. Esto requiere la muestra de datos Sheboygan.</String>
- <String Id="WebExtJavaDevGuideSamplesFeature">Developer's Guide Código de muestra (Java)</String>
- <String Id="WebExtJavaDevGuideSamplesFeature_Description">Ejemplo de código de Java a partir de la MapGuide Developer's Guide. Esto requiere la muestra de datos Sheboygan.</String>
- <String Id="WebExtDotNetDevGuideSamplesFeature">Developer's Guide Código de muestra (.net)</String>
- <String Id="WebExtDotNetDevGuideSamplesFeature_Description">Ejemplo de código de .net a partir de la MapGuide Developer's Guide. Esto requiere la muestra de datos Sheboygan.</String>
- <String Id="WebExtPhpViewerSampleFeature">Viewer Sample (PHP)</String>
- <String Id="WebExtPhpViewerSampleFeature_Description">Viewer Sample code (PHP)</String>
- <String Id="WebExtJavaViewerSampleFeature">Viewer Sample (Java)</String>
- <String Id="WebExtJavaViewerSampleFeature_Description">Viewer Sample code (Java)</String>
- <String Id="WebExtDotNetViewerSampleFeature">Viewer Sample (DotNet)</String>
- <String Id="WebExtDotNetViewerSampleFeature_Description">Viewer Sample code (DotNet)</String>
- <String Id="WebLocalizedFeature">Localización de archivos</String>
- <String Id="WebLocalizedFeature_Description">Localización de archivos para el nivel Web</String>
- <String Id="WebFusionFeature">Fusion</String>
- <String Id="WebFusionFeature_Description">Fusion es una aplicación web de la cartografía marco, no espaciales permiten a los desarrolladores web crear ricas aplicaciones de mapeo rápida y fácilmente</String>
- <String Id="WebMapAdminFeature">MapGuide administrador del sitio</String>
- <String Id="WebMapAdminFeature_Description">MapGuide el administrador del sitio es una base administrativa front-end para el servidor MapGuide</String>
- <String Id="WebMapAgentFeature">Mapa de agente</String>
- <String Id="WebMapAgentFeature_Description">El mapa permite agente aplicaciones cliente para comunicarse con MapGuide a través de HTTP</String>
- <String Id="WebSchemaReportFeature">Informe de esquema</String>
- <String Id="WebSchemaReportFeature_Description">El esquema permite que el usuario informe para describir MapGuide característica de vista previa y Fuentes</String>
- <String Id="WebStdIconsFeature">Norma iconos</String>
- <String Id="WebStdIconsFeature_Description">Iconos para el visor de AJAX</String>
- <String Id="WebTempFeature">Archivos temporales</String>
- <String Id="WebTempFeature_Description">Usted puede elegir un lugar donde MapGuide almacenará los archivos temporales</String>
-
- <String Id="Shortcut_DevGuide">MapGuide Developer's Guide</String>
- <String Id="Shortcut_WebAPI">Web de documentación de la API</String>
- <String Id="Shortcut_WikiHelp">Autodesk WikiHelp</String>
- <String Id="Shortcut_PhpViewerSample">PHP Viewer Sample</String>
- <String Id="Shortcut_PhpDevGuideSample">PHP Developer's Guide Samples</String>
- <String Id="Shortcut_DotNetViewerSample">.net Viewer Sample</String>
- <String Id="Shortcut_DotNetDevGuideSample">.net Developer's Guide Samples</String>
- <String Id="Shortcut_JavaViewerSample">Java Viewer Sample</String>
- <String Id="Shortcut_JavaDevGuideSample">Java Developer's Guide Samples</String>
- <String Id="Shortcut_ViewerAPI">Visor de Documentación de la API</String>
- <String Id="Shortcut_FusionAPI">Fusion de Documentación de la API</String>
- <String Id="Shortcut_SiteAdmin">MapGuide administrador del sitio</String>
- <String Id="Shortcut_MapAgent">MapAgent Páginas de prueba</String>
- <String Id="Shortcut_GetMaestro">Obtener MapGuide Maestro</String>
- <String Id="Shortcut_MapGuide">Inicio del proyecto MapGuide</String>
- <String Id="Shortcut_Trac">MapGuide Trac</String>
- <String Id="Shortcut_BestPractices">MapGuide Mejores Prácticas</String>
- <String Id="Shortcut_MapGuideCentral">MapGuide Central</String>
-</WixLocalization>
\ No newline at end of file
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/MapGuide Web Extensions.wixproj
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/MapGuide Web Extensions.wixproj 2014-04-30 16:14:32 UTC (rev 8092)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/MapGuide Web Extensions.wixproj 2014-04-30 16:28:55 UTC (rev 8093)
@@ -67,7 +67,6 @@
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Lang\MapGuideWebExtensions_en-US.wxl" />
- <EmbeddedResource Include="Lang\MapGuideWebExtensions_es-ES.wxl" />
</ItemGroup>
<ItemGroup>
<WixExtension Include="WixUtilExtension">
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs 2014-04-30 16:14:32 UTC (rev 8092)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs 2014-04-30 16:28:55 UTC (rev 8093)
@@ -235,25 +235,9 @@
<Feature Id="WebStdIconsFeature" Title="!(loc.WebStdIconsFeature)" Display="hidden" Level="1" Description="!(loc.WebStdIconsFeature_Description)" AllowAdvertise="no" TypicalDefault="install" InstallDefault="local">
<ComponentGroupRef Id="group_MAPVIEWERSTDICONFILES" />
</Feature>
- <Feature Id="SvnMetadataFeature" Title="!(loc.SvnMetadataFeature)" Level="1" Description="!(loc.SvnMetadataFeature_Description)" AllowAdvertise="no" TypicalDefault="install" InstallDefault="local">
- <ComponentGroupRef Id="incDotNetDevGuideFiles_SVNMETADATA" />
- <ComponentGroupRef Id="incDotNetViewerSampleFiles_SVNMETADATA" />
- <ComponentGroupRef Id="incFusionFiles_SVNMETADATA" />
- <ComponentGroupRef Id="incHelpFiles_SVNMETADATA" />
- <ComponentGroupRef Id="incJavaDevGuideFiles_SVNMETADATA" />
- <ComponentGroupRef Id="incJavaViewerSampleFiles_SVNMETADATA" />
- <ComponentGroupRef Id="incMapAgentFiles_SVNMETADATA" />
- <ComponentGroupRef Id="incMapViewerAspxFiles_SVNMETADATA" />
- <ComponentGroupRef Id="incMapViewerFiles_SVNMETADATA" />
- <ComponentGroupRef Id="incMapViewerJspFiles_SVNMETADATA" />
- <ComponentGroupRef Id="incMapViewerLocalizedFiles_SVNMETADATA" />
- <ComponentGroupRef Id="incMapViewerMapAdminFiles_SVNMETADATA" />
- <ComponentGroupRef Id="incMapViewerPhpFiles_SVNMETADATA" />
- <ComponentGroupRef Id="incMapViewerSchemareportFiles_SVNMETADATA" />
- <ComponentGroupRef Id="incMapViewerStdiconFiles_SVNMETADATA" />
- <ComponentGroupRef Id="incPhpDevGuideFiles_SVNMETADATA" />
- <ComponentGroupRef Id="incPhpViewerSampleFiles_SVNMETADATA" />
- <ComponentGroupRef Id="incOpenLayersSampleFiles_SVNMETADATA" />
+ <Feature Id="WebExtMapAgentTestPagesFeature" Title="!(loc.WebExtMapAgentTestPagesFeature)" Level="1" Description="!(loc.WebExtMapAgentTestPagesFeature_Description)" AllowAdvertise="no" TypicalDefault="install" InstallDefault="local" >
+ <ComponentRef Id="WebApacheMapAgentShortcutComponent" />
+ <ComponentRef Id="WebIISMapAgentShortcutComponent" />
</Feature>
</Feature>
</Fragment>
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs 2014-04-30 16:14:32 UTC (rev 8092)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs 2014-04-30 16:28:55 UTC (rev 8093)
@@ -84,10 +84,6 @@
Directory="MapGuideOpenSourceMenuLocation"
Name="!(loc.Shortcut_SiteAdmin)"
Target="http://localhost:[APACHE_PORT]/[VIRTUALDIR]/mapadmin/login.php" />
- <util:InternetShortcut Id="ApacheMapAgent"
- Directory="MapGuideOpenSourceMenuLocation"
- Name="!(loc.Shortcut_MapAgent)"
- Target="http://localhost:[APACHE_PORT]/[VIRTUALDIR]/mapagent/index.html" />
<util:InternetShortcut Id="ApacheGetMaestro"
Directory="MapGuideOpenSourceMenuLocation"
Name="!(loc.Shortcut_GetMaestro)"
@@ -99,6 +95,19 @@
KeyPath="yes" />
</RegistryKey>
</Component>
+ <Component Id="WebApacheMapAgentShortcutComponent" Win64="$(var.Win64)" Guid="BB57DB3F-73E3-4DAD-8899-33A4DC398579">
+ <Condition>MGWEB_CONFIG="APACHE"</Condition>
+ <util:InternetShortcut Id="ApacheMapAgent"
+ Directory="MapGuideOpenSourceMenuLocation"
+ Name="!(loc.Shortcut_MapAgent)"
+ Target="http://localhost:[APACHE_PORT]/[VIRTUALDIR]/mapagent/index.html" />
+ <RegistryKey Root="HKCU" Key="$(var.MgRegKey)\ApacheMapAgentShortcut">
+ <RegistryValue
+ Value="Installed"
+ Type="string"
+ KeyPath="yes" />
+ </RegistryKey>
+ </Component>
<Component Id="WebApacheSampleShortcutComponent" Win64="$(var.Win64)" Guid="E3D81381-6B4A-41AD-B83A-CE686455D3DC">
<Condition>MGWEB_CONFIG="APACHE"</Condition>
<util:InternetShortcut Id="ApacheSamplesShortcut"
@@ -187,10 +196,6 @@
Directory="MapGuideOpenSourceMenuLocation"
Name="!(loc.Shortcut_SiteAdmin)"
Target="http://localhost/[VIRTUALDIR]/mapadmin/login.php" />
- <util:InternetShortcut Id="IISMapAgent"
- Directory="MapGuideOpenSourceMenuLocation"
- Name="!(loc.Shortcut_MapAgent)"
- Target="http://localhost/[VIRTUALDIR]/mapagent/index.html" />
<util:InternetShortcut Id="IISGetMaestro"
Directory="MapGuideOpenSourceMenuLocation"
Name="!(loc.Shortcut_GetMaestro)"
@@ -202,6 +207,19 @@
KeyPath="yes" />
</RegistryKey>
</Component>
+ <Component Id="WebIISMapAgentShortcutComponent" Win64="$(var.Win64)" Guid="BEB5E02C-8D04-46FB-91E4-6EDB033414F3">
+ <Condition>MGWEB_CONFIG="IIS"</Condition>
+ <util:InternetShortcut Id="IISMapAgent"
+ Directory="MapGuideOpenSourceMenuLocation"
+ Name="!(loc.Shortcut_MapAgent)"
+ Target="http://localhost/[VIRTUALDIR]/mapagent/index.html" />
+ <RegistryKey Root="HKCU" Key="$(var.MgRegKey)\IISMapAgentShortcut">
+ <RegistryValue
+ Value="Installed"
+ Type="string"
+ KeyPath="yes" />
+ </RegistryKey>
+ </Component>
<Directory Id="WebResourcesLocation" Name="Web Resources">
<Component Id="WebShortcutsComponent" Win64="$(var.Win64)" Guid="7D2E24E9-533B-4119-A6D1-E48A33BF34C3">
<CreateFolder />
Modified: trunk/Installer/Paraffin.exe
===================================================================
(Binary files differ)
Deleted: trunk/Installer/Paraffin.pdb
===================================================================
(Binary files differ)
Modified: trunk/Installer/Support/Paraffin/Constants.Designer.cs
===================================================================
--- trunk/Installer/Support/Paraffin/Constants.Designer.cs 2014-04-30 16:14:32 UTC (rev 8092)
+++ trunk/Installer/Support/Paraffin/Constants.Designer.cs 2014-04-30 16:28:55 UTC (rev 8093)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.3053
+// Runtime Version:4.0.30319.18444
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -19,7 +19,7 @@
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Constants {
Modified: trunk/Installer/Support/Paraffin/Main.cs
===================================================================
--- trunk/Installer/Support/Paraffin/Main.cs 2014-04-30 16:14:32 UTC (rev 8092)
+++ trunk/Installer/Support/Paraffin/Main.cs 2014-04-30 16:28:55 UTC (rev 8093)
@@ -129,41 +129,48 @@
internal static Int32 Main ( string [] args )
{
- LoadProcessFeatureMap();
-
- directoryNumber = 0;
- componentNumber = 0;
- errorMessage = String.Empty;
-
// Think positive that everything will run completely.
Int32 returnValue = 0;
- argValues = new ParaffinArgParser ( );
- if ( args.Length > 0 )
+ try
{
- Boolean parsed = argValues.Parse ( args );
- if ( true == parsed )
+ LoadProcessFeatureMap();
+
+ directoryNumber = 0;
+ componentNumber = 0;
+ errorMessage = String.Empty;
+
+ argValues = new ParaffinArgParser();
+ if (args.Length > 0)
{
- if ( true == argValues.Update )
+ Boolean parsed = argValues.Parse(args);
+ if (true == parsed)
{
- returnValue = UpdateExistingFile ( );
+ if (true == argValues.Update)
+ {
+ returnValue = UpdateExistingFile();
+ }
+ else
+ {
+ returnValue = CreateNewFile();
+ }
}
- else
- {
- returnValue = CreateNewFile ( );
- }
}
+ else
+ {
+ argValues.OnUsage(String.Empty);
+ returnValue = 1;
+ }
+
+ if (false == String.IsNullOrEmpty(errorMessage))
+ {
+ Console.WriteLine(errorMessage);
+ }
}
- else
+ catch (Exception ex)
{
- argValues.OnUsage ( String.Empty );
- returnValue = 1;
+ Console.WriteLine(ex.ToString());
+ returnValue = -1;
}
-
- if ( false == String.IsNullOrEmpty ( errorMessage ) )
- {
- Console.WriteLine ( errorMessage );
- }
-
return ( returnValue );
}
@@ -216,7 +223,7 @@
ProcessFeatureMap(doc, Path.GetFileNameWithoutExtension(argValues.FileName) );
- GenerateCreateFolderElements(doc, ".svn", argValues.Win64);
+ ProcessFeaturePatternMap(doc);
// We're done, save it!
doc.Save ( argValues.FileName );
@@ -225,6 +232,7 @@
private static Dictionary<string, string> _identifierOverrides = new Dictionary<string, string>();
private static Dictionary<string, string> _featureMap = new Dictionary<string, string>();
+ private static Dictionary<Regex, string> _featurePatternMap = new Dictionary<Regex, string>();
private static void LoadProcessFeatureMap()
{
@@ -240,6 +248,15 @@
foreach (var m in mappings)
_featureMap[m.Name] = m.Suffix;
+ var patterns = from item in doc.Descendants("FeaturePattern")
+ select new
+ {
+ Pattern = item.Attribute("Pattern").Value,
+ Feature = item.Attribute("Feature").Value
+ };
+ foreach (var m in patterns)
+ _featurePatternMap[new Regex(m.Pattern)] = m.Feature;
+
var overrides = from item in doc.Descendants("IdentifierOverride")
select new
{
@@ -251,40 +268,7 @@
}
}
- static int createEmptyFolderCounter = 1;
-
/// <summary>
- /// Generates <CreateFolder/> elements for all empty directory elements under the specified name
- /// </summary>
- /// <param name="doc"></param>
- /// <param name="rootDirName"></param>
- private static void GenerateCreateFolderElements(XDocument doc, string rootDirName, bool win64)
- {
- var matches = doc.Descendants("{" + nsWiX3 + "}Directory").Where(x => x.Attribute("Name").Value == rootDirName);
- foreach (var dir in matches)
- {
- int count = 0;
- Console.WriteLine("\tChecking Directory (Id=" + dir.Attribute("Id") + ") for empty directories");
- foreach (var emptyDir in dir.Descendants("{" + nsWiX3 + "}Directory").Where(x => !x.HasElements))
- {
- //If you just so happen to have a component named CreateEmptyFolderComponent, well ... too bad :P
- var componentId = (emptyDir.Attribute("Id").Value + "CreateEmptyFolderComponent" + createEmptyFolderCounter).Replace(" ", string.Empty);
- var el = new XElement("{" + nsWiX3 + "}Component",
- new XAttribute("Id", componentId),
- new XAttribute("Win64", win64 ? "yes" : "no"),
- new XAttribute("Feature", "SvnMetadataFeature"),
- new XAttribute("Guid", Guid.NewGuid().ToString()),
- new XElement("{" + nsWiX3 + "}CreateFolder")
- );
- emptyDir.Add(el);
- createEmptyFolderCounter++;
- count++;
- }
- Console.WriteLine(count + " CreateFolder elements generated");
- }
- }
-
- /// <summary>
/// Performs a search through the given XDocument for Directory fragments
/// whose name matches the specified items in the FeatureMap, for each matching
/// directory, all of its child elements will be assigned to the specified feature
@@ -349,9 +333,71 @@
{
el.Remove();
}
- Console.WriteLine("Moved {0} elements to new ComponentGroup. Removed {1} elements from original ComponentGroup", moved, remove.Count);
+ if (moved > 0 || remove.Count > 0)
+ Console.WriteLine("Moved {0} elements to new ComponentGroup. Removed {1} elements from original ComponentGroup", moved, remove.Count);
}
+ private static void ProcessFeaturePatternMap(XDocument doc)
+ {
+ Dictionary<string, HashSet<string>> componentMaps = new Dictionary<string, HashSet<string>>();
+
+ foreach (var pattern in _featurePatternMap.Keys)
+ {
+ var featureName = _featurePatternMap[pattern];
+ if (!componentMaps.ContainsKey(featureName))
+ componentMaps[featureName] = new HashSet<string>();
+ //Console.WriteLine("Checking if any elements match: " + pattern);
+ var directories = doc.Descendants("{" + nsWiX3 + "}Directory");
+ foreach (var dir in directories)
+ {
+ //Console.WriteLine("\tProcessing Directory (Id=" + dir.Attribute("Id") + ")");
+ foreach (var comp in dir.Descendants("{" + nsWiX3 + "}Component"))
+ {
+ var fileDesc = comp.Descendants("{" + nsWiX3 + "}File").FirstOrDefault();
+ if (fileDesc != null)
+ {
+ string source = fileDesc.Attribute("Source").Value;
+ var matches = pattern.Matches(source);
+ if (matches.Count >= 1)
+ {
+ //Console.WriteLine("{0} matched {1}", source, pattern);
+ Console.WriteLine("Set Component Feature (" + comp.Attribute("Id") + ") to use feature (" + featureName + ")");
+ componentMaps[featureName].Add(comp.Attribute("Id").Value);
+ comp.SetAttributeValue("Feature", featureName);
+ }
+ }
+ }
+ }
+ }
+
+ //Remove these collected ids from the existing component group
+ var currentGroup = doc.Descendants("{" + nsWiX3 + "}ComponentGroup").First();
+ var remove = new List<XElement>();
+
+ int removed = 0;
+ //Remove these components from the component grup
+ foreach (var pattern in _featurePatternMap.Keys)
+ {
+ var featureName = _featurePatternMap[pattern];
+ if (componentMaps[featureName].Count > 0)
+ {
+ foreach (var cid in componentMaps[featureName])
+ {
+ //Console.WriteLine("Removing component id {0} from ComponentGroup", cid);
+ var matches = currentGroup.Descendants("{" + nsWiX3 + "}ComponentRef").Where(x => x.Attribute("Id").Value == cid).ToArray();
+ foreach (var r in matches)
+ {
+ r.Remove();
+ removed++;
+ }
+ }
+ }
+ }
+ if (removed > 0)
+ Console.WriteLine("{0} elements detached from ComponentGroup", removed);
+ //Console.WriteLine("Moved {0} elements to new ComponentGroup. Removed {1} elements from original ComponentGroup", moved, remove.Count);
+ }
+
/// <summary>
/// Takes an existing .WXS file and generates an updated version, which
/// is saved to a .PARAFFIN extension.
@@ -430,7 +476,7 @@
ProcessFeatureMap(outputDoc, Path.GetFileNameWithoutExtension(outputFile));
- GenerateCreateFolderElements(outputDoc, ".svn", argValues.Win64);
+ ProcessFeaturePatternMap(outputDoc);
// All OK, Jumpmaster!
outputDoc.Save ( outputFile );
Modified: trunk/Installer/Support/Paraffin/Paraffin.csproj
===================================================================
--- trunk/Installer/Support/Paraffin/Paraffin.csproj 2014-04-30 16:14:32 UTC (rev 8092)
+++ trunk/Installer/Support/Paraffin/Paraffin.csproj 2014-04-30 16:28:55 UTC (rev 8093)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Wintellect.Paraffin</RootNamespace>
<AssemblyName>Paraffin</AssemblyName>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Wintellect.SNK</AssemblyOriginatorKeyFile>
@@ -29,6 +29,11 @@
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ <OldToolsVersion>3.5</OldToolsVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Modified: trunk/Installer/Support/Paraffin/Paraffin.sln
===================================================================
--- trunk/Installer/Support/Paraffin/Paraffin.sln 2014-04-30 16:14:32 UTC (rev 8092)
+++ trunk/Installer/Support/Paraffin/Paraffin.sln 2014-04-30 16:28:55 UTC (rev 8093)
@@ -1,6 +1,6 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Express 2012 for Windows Desktop
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Paraffin", "Paraffin.csproj", "{69CEBB42-4C4B-4546-9DEE-A5183E989214}"
EndProject
Global
Modified: trunk/Installer/build.bat
===================================================================
--- trunk/Installer/build.bat 2014-04-30 16:14:32 UTC (rev 8092)
+++ trunk/Installer/build.bat 2014-04-30 16:28:55 UTC (rev 8093)
@@ -23,7 +23,7 @@
rem [-name=MapGuideInstallerFilename]
rem [-title=MapGuideInstallerTitle]
rem
-rem Action: build(default), clean, regen, prepare, generate (only use generate when creating new GIDs)
+rem Action: build(default), clean, prepare, generate (only use generate when creating new GIDs)
rem SourceDirectory: The directory that was used for MapGuide build output
rem MapGuideVersion: The version associated with the installer in the format 2.1.0.0
rem MapGuideInstallerFilename: File name of output .exe in the format MapGuideOpenSource-2.1.0-Something
@@ -138,7 +138,6 @@
SET TYPEACTION=%2
if "%2"=="build" goto next_param
if "%2"=="clean" goto next_param
-if "%2"=="regen" goto next_param
if "%2"=="generate" goto next_param
if "%2"=="prepare" goto next_param
SET ERRORMSG=Unrecognised action: %2
@@ -161,7 +160,6 @@
if "%TYPEACTION%"=="prepare" goto prepare
if "%TYPEACTION%"=="clean" goto clean
if "%TYPEACTION%"=="generate" goto generate
-if "%TYPEACTION%"=="regen" goto regen
:clean
echo [clean]: Installer Pre-Reqs
@@ -223,126 +221,6 @@
goto quit
-:regen
-echo [regen]: MapGuide Installer
-
-SET PARAFFIN=paraffin.exe -update
-IF "%PLATFORM_CLR%" == "x64" SET PARAFFIN=paraffin.exe -update -Win64
-
-SET WIX_INC_SERVER="%INSTALLER_DEV%\Libraries\MapGuide Server\FileIncludes"
-SET WIX_INC_WEB="%INSTALLER_DEV%\Libraries\MapGuide Web Extensions\FileIncludes"
-SET WIX_INC_CSMAP="%INSTALLER_DEV%\Libraries\CS Map\FileIncludes"
-
-echo [regen]: Server - binaries
-%PARAFFIN% %WIX_INC_SERVER%\incBinFiles.wxs
-move /Y %WIX_INC_SERVER%\incBinFiles.PARAFFIN %WIX_INC_SERVER%\incBinFiles.wxs
-
-echo [regen]: Server - RepositoryAdmin
-%PARAFFIN% %WIX_INC_SERVER%\incRepositoryAdminFiles.wxs
-move /Y %WIX_INC_SERVER%\incRepositoryAdminFiles.PARAFFIN %WIX_INC_SERVER%\incRepositoryAdminFiles.wxs
-
-echo [regen]: Server - resources
-%PARAFFIN% %WIX_INC_SERVER%\incResourcesFiles.wxs
-move /Y %WIX_INC_SERVER%\incResourcesFiles.PARAFFIN %WIX_INC_SERVER%\incResourcesFiles.wxs
-
-echo [regen]: Server - schema
-%PARAFFIN% %WIX_INC_SERVER%\incSchemaFiles.wxs
-move /Y %WIX_INC_SERVER%\incSchemaFiles.PARAFFIN %WIX_INC_SERVER%\incSchemaFiles.wxs
-
-echo [regen]: Server - WMS
-%PARAFFIN% %WIX_INC_SERVER%\incWmsFiles.wxs
-move /Y %WIX_INC_SERVER%\incWmsFiles.PARAFFIN %WIX_INC_SERVER%\incWmsFiles.wxs
-
-echo [regen]: Server - WFS
-%PARAFFIN% %WIX_INC_SERVER%\incWfsFiles.wxs
-move /Y %WIX_INC_SERVER%\incWfsFiles.PARAFFIN %WIX_INC_SERVER%\incWfsFiles.wxs
-
-echo [regen]: CS-Map - dictionaries
-%PARAFFIN% %WIX_INC_CSMAP%\incCSMapDictionaryFiles.wxs
-move /Y %WIX_INC_CSMAP%\incCSMapDictionaryFiles.PARAFFIN %WIX_INC_CSMAP%\incCSMapDictionaryFiles.wxs
-
-echo [regen]: Web - Apache
-%PARAFFIN% %WIX_INC_WEB%\incApacheFiles.wxs
-move /Y %WIX_INC_WEB%\incApacheFiles.PARAFFIN %WIX_INC_WEB%\incApacheFiles.wxs
-
-echo [regen]: Web - Php
-%PARAFFIN% %WIX_INC_WEB%\incPhpFiles.wxs
-move /Y %WIX_INC_WEB%\incPhpFiles.PARAFFIN %WIX_INC_WEB%\incPhpFiles.wxs
-
-echo [regen]: Web - Tomcat
-%PARAFFIN% %WIX_INC_WEB%\incTomcatFiles.wxs
-move /Y %WIX_INC_WEB%\incTomcatFiles.PARAFFIN %WIX_INC_WEB%\incTomcatFiles.wxs
-
-echo [regen]: Web - Help
-%PARAFFIN% %WIX_INC_WEB%\incHelpFiles.wxs
-move /Y %WIX_INC_WEB%\incHelpFiles.PARAFFIN %WIX_INC_WEB%\incHelpFiles.wxs
-
-echo [regen]: Web - devguide PHP
-%PARAFFIN% %WIX_INC_WEB%\incPhpDevGuideFiles.wxs
-move /Y %WIX_INC_WEB%\incPhpDevGuideFiles.PARAFFIN %WIX_INC_WEB%\incPhpDevGuideFiles.wxs
-
-echo [regen]: Web - devguide Java
-%PARAFFIN% %WIX_INC_WEB%\incJavaDevGuideFiles.wxs
-move /Y %WIX_INC_WEB%\incJavaDevGuideFiles.PARAFFIN %WIX_INC_WEB%\incJavaDevGuideFiles.wxs
-
-echo [regen]: Web - devguide DotNet
-%PARAFFIN% %WIX_INC_WEB%\incDotNetDevGuideFiles.wxs
-move /Y %WIX_INC_WEB%\incDotNetDevGuideFiles.PARAFFIN %WIX_INC_WEB%\incDotNetDevGuideFiles.wxs
-
-echo [regen]: Web - viewer sample PHP
-%PARAFFIN% %WIX_INC_WEB%\incPhpViewerSampleFiles.wxs
-move /Y %WIX_INC_WEB%\incPhpViewerSampleFiles.PARAFFIN %WIX_INC_WEB%\incPhpViewerSampleFiles.wxs
-
-echo [regen]: Web - viewer sample Java
-%PARAFFIN% %WIX_INC_WEB%\incJavaViewerSampleFiles.wxs
-move /Y %WIX_INC_WEB%\incJavaViewerSampleFiles.PARAFFIN %WIX_INC_WEB%\incJavaViewerSampleFiles.wxs
-
-echo [regen]: Web - viewer sample DotNet
-%PARAFFIN% %WIX_INC_WEB%\incDotNetViewerSampleFiles.wxs
-move /Y %WIX_INC_WEB%\incDotNetViewerSampleFiles.PARAFFIN %WIX_INC_WEB%\incDotNetViewerSampleFiles.wxs
-
-echo [regen]: Web - OpenLayers samples
-%PARAFFIN% %WIX_INC_WEB%\incOpenLayersSampleFiles.wxs
-move /Y %WIX_INC_WEB%\incOpenLayersSampleFiles.PARAFFIN %WIX_INC_WEB%\incOpenLayersSampleFiles.wxs
-
-echo [regen]: Web - mapagent
-%PARAFFIN% %WIX_INC_WEB%\incMapAgentFiles.wxs
-move /Y %WIX_INC_WEB%\incMapAgentFiles.PARAFFIN %WIX_INC_WEB%\incMapAgentFiles.wxs
-
-echo [regen]: Web - mapviewernet
-%PARAFFIN% %WIX_INC_WEB%\incMapViewerAspxFiles.wxs
-move /Y %WIX_INC_WEB%\incMapViewerAspxFiles.PARAFFIN %WIX_INC_WEB%\incMapViewerAspxFiles.wxs
-
-echo [regen]: Web - mapviewerphp
-%PARAFFIN% %WIX_INC_WEB%\incMapViewerPhpFiles.wxs
-move /Y %WIX_INC_WEB%\incMapViewerPhpFiles.PARAFFIN %WIX_INC_WEB%\incMapViewerPhpFiles.wxs
-
-echo [regen]: Web - mapviewerjava
-%PARAFFIN% %WIX_INC_WEB%\incMapViewerJspFiles.wxs
-move /Y %WIX_INC_WEB%\incMapViewerJspFiles.PARAFFIN %WIX_INC_WEB%\incMapViewerJspFiles.wxs
-
-echo [regen]: Web - fusion
-%PARAFFIN% %WIX_INC_WEB%\incFusionFiles.wxs
-move /Y %WIX_INC_WEB%\incFusionFiles.PARAFFIN %WIX_INC_WEB%\incFusionFiles.wxs
-
-echo [regen]: Web - misc web root
-%PARAFFIN% %WIX_INC_WEB%\incWebRootFiles.wxs
-move /Y %WIX_INC_WEB%\incWebRootFiles.PARAFFIN %WIX_INC_WEB%\incWebRootFiles.wxs
-%PARAFFIN% %WIX_INC_WEB%\incMapViewerFiles.wxs
-move /Y %WIX_INC_WEB%\incMapViewerFiles.PARAFFIN %WIX_INC_WEB%\incMapViewerFiles.wxs
-%PARAFFIN% %WIX_INC_WEB%\incMapViewerStdiconFiles.wxs
-move /Y %WIX_INC_WEB%\incMapViewerStdiconFiles.PARAFFIN %WIX_INC_WEB%\incMapViewerStdiconFiles.wxs
-%PARAFFIN% %WIX_INC_WEB%\incMapViewerSchemareportFiles.wxs
-move /Y %WIX_INC_WEB%\incMapViewerSchemareportFiles.PARAFFIN %WIX_INC_WEB%\incMapViewerSchemareportFiles.wxs
-%PARAFFIN% %WIX_INC_WEB%\incMapViewerMapAdminFiles.wxs
-move /Y %WIX_INC_WEB%\incMapViewerMapAdminFiles.PARAFFIN %WIX_INC_WEB%\incMapViewerMapAdminFiles.wxs
-%PARAFFIN% %WIX_INC_WEB%\incMapViewerLocalizedFiles.wxs
-move /Y %WIX_INC_WEB%\incMapViewerLocalizedFiles.PARAFFIN %WIX_INC_WEB%\incMapViewerLocalizedFiles.wxs
-%PARAFFIN% %WIX_INC_WEB%\incWebInfFiles.wxs
-move /Y %WIX_INC_WEB%\incWebInfFiles.PARAFFIN %WIX_INC_WEB%\incWebInfFiles.wxs
-
-goto quit
-
:generate
echo [generate]: MapGuide Installer
@@ -375,7 +253,7 @@
%PARAFFIN% -dir %MG_SOURCE%\CS-Map\Dictionaries -alias $(var.MgSource)\CS-Map\Dictionaries -custom CSMAPDICTFILES -dirref CSMAPLOCATION -ext ASC -ext C -ext CNT -ext GID -ext HLP -ext MAK -ext NMK -ext VCPROJ -ext USER %WIX_INC_CSMAP%\incCSMapDictionaryFiles.wxs
echo [generate]: Web - Apache
-%PARAFFIN% -dir %MG_SOURCE%\Web\Apache24 -alias $(var.MgSource)\Web\Apache24 -custom APACHEFILES -dirref WEBEXTENSIONSLOCATION %WIX_INC_WEB%\incApacheFiles.wxs
+%PARAFFIN% -dir %MG_SOURCE%\Web\Apache24 -alias $(var.MgSource)\Web\Apache24 -custom APACHEFILES -dirref WEBEXTENSIONSLOCATION -dirExclude .svn %WIX_INC_WEB%\incApacheFiles.wxs
echo [generate]: Web - Php TS
%PARAFFIN% -dir %MG_SOURCE%\Web\Php -alias $(var.MgSource)\Web\Php -custom PHPFILES -dirref WEBEXTENSIONSLOCATION %WIX_INC_WEB%\incPhpFiles.wxs
@@ -447,8 +325,9 @@
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
-goto build_min_compress
+rem if "%MAX_COMPRESSION%"=="YES" goto build_max_compress
+rem goto build_min_compress
+goto quit
:build_min_compress
pushd "%INSTALLER_DEV_BOOTSTRAP%"
@@ -504,7 +383,7 @@
echo [-title=MapGuideInstallerTitle]
echo
echo Help: -h
-echo Action: build(default), clean, regen, prepare, generate (only use generate for creating new GIDs, or if not installing from ..\MgDev\Release)
+echo Action: build(default), clean, prepare, generate (only use generate for creating new GIDs, or if not installing from ..\MgDev\Release)
echo SourceDirectory: The directory that the MapGuide build process installed the source files into
echo MapGuideVersion: The version associated with the installer in the format 2.1.0.0
echo MapGuideInstallerFilename: File name of output .exe in the format MapGuideOpenSource-2.1.0-Something (such as Beta, RC1, Final, etc)
More information about the mapguide-commits
mailing list