[mapguide-commits] r4677 - in trunk/Installer: Installers/MapGuide
Installers/MapGuide/Lang Libraries/MapGuide Server
Libraries/MapGuide Web Extensions
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sat Mar 20 11:53:39 EDT 2010
Author: jng
Date: 2010-03-20 11:53:38 -0400 (Sat, 20 Mar 2010)
New Revision: 4677
Modified:
trunk/Installer/Installers/MapGuide/Lang/MapGuide_en-US.wxl
trunk/Installer/Installers/MapGuide/Lang/MapGuide_es-ES.wxl
trunk/Installer/Installers/MapGuide/MapGuide.wxs
trunk/Installer/Libraries/MapGuide Server/InstallService.wxs
trunk/Installer/Libraries/MapGuide Web Extensions/Apache.wxs
Log:
Some installer changes:
- Clean up the server configuration dialog
- Instead of hardcoding the version number in the service names, drive them off of a wix variable MG_VERSION_MAJOR_MINOR
Modified: trunk/Installer/Installers/MapGuide/Lang/MapGuide_en-US.wxl
===================================================================
--- trunk/Installer/Installers/MapGuide/Lang/MapGuide_en-US.wxl 2010-03-20 12:54:51 UTC (rev 4676)
+++ trunk/Installer/Installers/MapGuide/Lang/MapGuide_en-US.wxl 2010-03-20 15:53:38 UTC (rev 4677)
@@ -24,7 +24,8 @@
<String Id="DisabledFeaturesDialog_Instructions">If you want to use these features, click on cancel and correct the problem before proceeding with installation</String>
<String Id="ServerConfigDlg_Title">Server Port Configuration</String>
- <String Id="ServerConfigDlg_Description">MapGuide Server will be installed using the following port numbers. The Server and Web Tier configuration files will be set to use the specified port numbers below.</String>
+ <String Id="ServerConfigDlg_Description">Set up the listening ports for MapGuide Server</String>
+ <String Id="ServerConfigDlg_Prompt">MapGuide Server will be installed using the following port numbers. The Server and Web Tier configuration files will be set to use the specified port numbers below.</String>
<String Id="ServerConfigDlg_AdminPortNo">Admin Connection Port</String>
<String Id="ServerConfigDlg_ClientPortNo">Client Connection Port</String>
<String Id="ServerConfigDlg_SitePortNo">Site Connection Port</String>
Modified: trunk/Installer/Installers/MapGuide/Lang/MapGuide_es-ES.wxl
===================================================================
--- trunk/Installer/Installers/MapGuide/Lang/MapGuide_es-ES.wxl 2010-03-20 12:54:51 UTC (rev 4676)
+++ trunk/Installer/Installers/MapGuide/Lang/MapGuide_es-ES.wxl 2010-03-20 15:53:38 UTC (rev 4677)
@@ -24,7 +24,8 @@
<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="ServerConfigDlg_Title">Puerto del servidor de configuración</String>
- <String Id="ServerConfigDlg_Description">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_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>
Modified: trunk/Installer/Installers/MapGuide/MapGuide.wxs
===================================================================
--- trunk/Installer/Installers/MapGuide/MapGuide.wxs 2010-03-20 12:54:51 UTC (rev 4676)
+++ trunk/Installer/Installers/MapGuide/MapGuide.wxs 2010-03-20 15:53:38 UTC (rev 4677)
@@ -40,6 +40,7 @@
<Property Id="APACHE_PORT" Secure="yes" Value="8008" />
<Property Id="APACHE_VERSION" Secure="yes" Value="2.2.4" />
<Property Id="PHP_VERSION" Secure="yes" Value="5.2.5" />
+ <Property Id="MG_VERSION_MAJOR_MINOR" Secure="yes" Value="2.2" />
<!-- Server Port Settings -->
<Property Id="MG_ADMIN_PORT" Secure="yes" Value="2810" />
<Property Id="MG_CLIENT_PORT" Secure="yes" Value="2811" />
@@ -247,11 +248,11 @@
-->
<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="{\WixUI_Font_Title}!(loc.ServerConfigDlg_Title)" />
- <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.WebServerConfigDlg_Description)" />
+ <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.ServerConfigDlg_Description)" />
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.InstallDirDlgBannerBitmap)" />
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
- <Control Id="LblDescription" Type="Text" X="20" Y="60" Text="{\WixUI_Font_Title}!(loc.ServerConfigDlg_Description)" Width="320" Height="30" />
+ <Control Id="LblPrompt" Type="Text" X="20" Y="60" Text="!(loc.ServerConfigDlg_Prompt)" Width="320" Height="30" />
<Control Id="LblAdminPort" Type="Text" X="20" Y="100" Text="{\WixUI_Font_Title}!(loc.ServerConfigDlg_AdminPortNo)" Width="140" Height="15" />
<Control Id="NumAdminPort" Type="Edit" Property="MG_ADMIN_PORT" X="170" Y="100" Width="80" Height="15" />
Modified: trunk/Installer/Libraries/MapGuide Server/InstallService.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Server/InstallService.wxs 2010-03-20 12:54:51 UTC (rev 4676)
+++ trunk/Installer/Libraries/MapGuide Server/InstallService.wxs 2010-03-20 15:53:38 UTC (rev 4677)
@@ -7,7 +7,7 @@
Return="ignore"
Id="MgServerInstallCA"
FileKey="file_SRVBINFILES_26"
- ExeCommand="install "MapGuide Server 2.1"" />
+ ExeCommand="install "MapGuide Server [MG_VERSION_MAJOR_MINOR]"" />
<CustomAction
Execute="immediate"
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/Apache.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/Apache.wxs 2010-03-20 12:54:51 UTC (rev 4676)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/Apache.wxs 2010-03-20 15:53:38 UTC (rev 4677)
@@ -10,7 +10,7 @@
<CustomAction Id="GetApacheDir.SetValues" Property="GetApacheDir" Value="[APACHE_VERSION]" />
<CustomAction Id="GetApacheDir" Return="check" BinaryKey="ApacheActions" Execute="deferred" DllEntry="GetApacheDir" />
-->
- <CustomAction Id="RemoveApacheServiceCA" Execute="immediate" Return="ignore" FileKey="file_APACHEFILES_13" ExeCommand="-k uninstall -n "ApacheMapGuide2.1"" />
- <CustomAction Id="InstallApacheServiceCA" Execute="deferred" Return="ignore" FileKey="file_APACHEFILES_13" ExeCommand="-k install -n "ApacheMapGuide2.1"" />
+ <CustomAction Id="RemoveApacheServiceCA" Execute="immediate" Return="ignore" FileKey="file_APACHEFILES_13" ExeCommand="-k uninstall -n "ApacheMapGuide[MG_VERSION_MAJOR_MINOR]"" />
+ <CustomAction Id="InstallApacheServiceCA" Execute="deferred" Return="ignore" FileKey="file_APACHEFILES_13" ExeCommand="-k install -n "ApacheMapGuide[MG_VERSION_MAJOR_MINOR]"" />
</Fragment>
</Wix>
\ No newline at end of file
More information about the mapguide-commits
mailing list