[mapguide-commits] r7802 - in trunk/Installer: . Libraries/MapGuide Server Libraries/MapGuide Web Extensions Libraries/MapGuide Web Extensions/Lang Support Support/Paraffin
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Aug 22 09:53:22 PDT 2013
Author: jng
Date: 2013-08-22 09:53:22 -0700 (Thu, 22 Aug 2013)
New Revision: 7802
Modified:
trunk/Installer/
trunk/Installer/Features.xml
trunk/Installer/Libraries/MapGuide Server/InstallService.wxs
trunk/Installer/Libraries/MapGuide Web Extensions/Apache.wxs
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/Paraffin.pdb
trunk/Installer/Support/
trunk/Installer/Support/Paraffin/
trunk/Installer/Support/Paraffin/Main.cs
trunk/Installer/build.bat
Log:
Installer updates:
- Update start menu entry to 2.6
- #2344: Add OL samples feature. Update build.bat to generate wix file listings for these samples
- #2343: Remove existing sample start menu links and replace them with our landing page
- #2341: Remove dependence on hard-coded file offsets
- Update Paraffin to allow us to specify special identifiers for file paths and end in a certain pattern. These identifiers are defined in Features.xml
- Replace files offsets referenced by custom actions with these special identifiers
Property changes on: trunk/Installer
___________________________________________________________________
Modified: svn:ignore
- *.suo
Output
*.ncb
*.cache
+ *.suo
Output
*.ncb
*.cache
ipch
Modified: trunk/Installer/Features.xml
===================================================================
--- trunk/Installer/Features.xml 2013-08-22 16:48:52 UTC (rev 7801)
+++ trunk/Installer/Features.xml 2013-08-22 16:53:22 UTC (rev 7802)
@@ -1,4 +1,8 @@
<?xml version="1.0" encoding="utf-8" ?>
<FeatureMap>
<DirectorySearch Name=".svn" Suffix="_SVNMETADATA" />
+ <IdentifierOverride Pattern="Server\bin\mgserver.exe" Identifier="MGSERVER_EXE" />
+ <IdentifierOverride Pattern="Apache2\bin\httpd.exe" Identifier="HTTPD_EXE" />
+ <IdentifierOverride Pattern="Tomcat\bin\service.bat" Identifier="TOMCAT_SERVICE_BAT" />
+ <IdentifierOverride Pattern="Tomcat\bin\tomcat7.exe" Identifier="TOMCAT_EXE" />
</FeatureMap>
\ No newline at end of file
Modified: trunk/Installer/Libraries/MapGuide Server/InstallService.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Server/InstallService.wxs 2013-08-22 16:48:52 UTC (rev 7801)
+++ trunk/Installer/Libraries/MapGuide Server/InstallService.wxs 2013-08-22 16:53:22 UTC (rev 7802)
@@ -1,25 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <!-- mgserver.exe -->
- <?if "$(var.MgPlatform)" = "x64" ?>
- <?define MGSERVER_MAP = "file_SRVBINFILES_26" ?>
- <?else ?>
- <?define MGSERVER_MAP = "file_SRVBINFILES_26" ?>
- <?endif ?>
+ <!--
+ MGSERVER_EXE is a special identifiers assigned by Paraffin using
+ settings defined in Features.xml
+ -->
<Fragment>
<CustomAction
Execute="deferred"
Return="ignore"
Id="MgServerInstallCA"
- FileKey="$(var.MGSERVER_MAP)"
+ FileKey="MGSERVER_EXE"
ExeCommand="install "MapGuide Server [MG_VERSION_MAJOR_MINOR]"" />
<CustomAction
Execute="immediate"
Return="ignore"
Id="MgServerUninstallCA"
- FileKey="$(var.MGSERVER_MAP)"
+ FileKey="MGSERVER_EXE"
ExeCommand="uninstall" />
</Fragment>
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/Apache.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/Apache.wxs 2013-08-22 16:48:52 UTC (rev 7801)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/Apache.wxs 2013-08-22 16:53:22 UTC (rev 7802)
@@ -1,21 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <!--
+ HTTPD_EXE, TOMCAT_EXE and TOMCAT_SERVICE_BAT are special identifiers assigned by Paraffin using
+ settings defined in Features.xml
+ -->
<?if "$(var.MgPlatform)" = "x64" ?>
- <!-- httpd.exe -->
- <?define HTTP_MAP = "file_APACHEFILES_19" ?>
- <!-- tomcat7.exe -->
- <?define TOMCAT_MAP = "file_TOMCATFILES_40" ?>
- <!-- service.bat -->
- <?define TOMCAT_BAT = "file_TOMCATFILES_30" ?>
<!-- apache_actions.dll path -->
<?define ACTION_DLL_PATH = "..\..\Custom\apache_actions\bin110_x64\apache_actions.dll" ?>
<?else ?>
- <!-- httpd.exe -->
- <?define HTTP_MAP = "file_APACHEFILES_19" ?>
- <!-- tomcat7.exe -->
- <?define TOMCAT_MAP = "file_TOMCATFILES_40" ?>
- <!-- service.bat -->
- <?define TOMCAT_BAT = "file_TOMCATFILES_30" ?>
<!-- apache_actions.dll path -->
<?define ACTION_DLL_PATH = "..\..\Custom\apache_actions\bin110_Win32\apache_actions.dll" ?>
<?endif ?>
@@ -25,11 +17,11 @@
<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="$(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]"" />
- <CustomAction Id="RemoveTomcatServiceCA" Execute="immediate" Return="ignore" FileKey="$(var.TOMCAT_MAP)" ExeCommand="//DS//TomcatMapGuide[MG_VERSION_MAJOR_MINOR]" />
- <CustomAction Id="InstallTomcatServiceCA" Execute="deferred" Return="ignore" FileKey="$(var.TOMCAT_BAT)" ExeCommand="install TomcatMapGuide[MG_VERSION_MAJOR_MINOR]" />
- <CustomAction Id="StartTomcatServiceCA" Execute="deferred" Return="ignore" FileKey="$(var.TOMCAT_MAP)" ExeCommand="//RS//TomcatMapGuide[MG_VERSION_MAJOR_MINOR]" />
+ <CustomAction Id="RemoveApacheServiceCA" Execute="immediate" Return="ignore" FileKey="HTTPD_EXE" ExeCommand="-k uninstall -n "ApacheMapGuide[MG_VERSION_MAJOR_MINOR]"" />
+ <CustomAction Id="InstallApacheServiceCA" Execute="deferred" Return="ignore" FileKey="HTTPD_EXE" ExeCommand="-k install -n "ApacheMapGuide[MG_VERSION_MAJOR_MINOR]"" />
+ <CustomAction Id="StartApacheServiceCA" Execute="deferred" Return="ignore" FileKey="HTTPD_EXE" ExeCommand="-k start -n "ApacheMapGuide[MG_VERSION_MAJOR_MINOR]"" />
+ <CustomAction Id="RemoveTomcatServiceCA" Execute="immediate" Return="ignore" FileKey="TOMCAT_EXE" ExeCommand="//DS//TomcatMapGuide[MG_VERSION_MAJOR_MINOR]" />
+ <CustomAction Id="InstallTomcatServiceCA" Execute="deferred" Return="ignore" FileKey="TOMCAT_SERVICE_BAT" ExeCommand="install TomcatMapGuide[MG_VERSION_MAJOR_MINOR]" />
+ <CustomAction Id="StartTomcatServiceCA" Execute="deferred" Return="ignore" FileKey="TOMCAT_EXE" ExeCommand="//RS//TomcatMapGuide[MG_VERSION_MAJOR_MINOR]" />
</Fragment>
</Wix>
\ No newline at end of file
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_en-US.wxl
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_en-US.wxl 2013-08-22 16:48:52 UTC (rev 7801)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_en-US.wxl 2013-08-22 16:53:22 UTC (rev 7802)
@@ -32,6 +32,8 @@
<String Id="WebExtJavaViewerSampleFeature_Description">Viewer Sample code (Java)</String>
<String Id="WebExtDotNetViewerSampleFeature">Viewer Sample (.net)</String>
<String Id="WebExtDotNetViewerSampleFeature_Description">Viewer Sample code (.net)</String>
+ <String Id="WebExtOpenLayersSampleFeature">OpenLayers Samples</String>
+ <String Id="WebExtOpenLayersSampleFeature_Description">Samples demonstrating OpenLayers integration with MapGuide</String>
<String Id="WebLocalizedFeature">Localization Files</String>
<String Id="WebLocalizedFeature_Description">Localization files for the web tier</String>
<String Id="WebFusionFeature">Fusion</String>
@@ -51,12 +53,7 @@
<String Id="Shortcut_DevGuide">MapGuide Developer's Guide</String>
<String Id="Shortcut_WebAPI">Web API Documentation</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_Samples">MapGuide Samples</String>
<String Id="Shortcut_WikiHelp">Autodesk WikiHelp</String>
<String Id="Shortcut_ViewerAPI">Viewer API Documentation</String>
<String Id="Shortcut_FusionAPI">Fusion API Documentation</String>
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/MapGuide Web Extensions.wixproj
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/MapGuide Web Extensions.wixproj 2013-08-22 16:48:52 UTC (rev 7801)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/MapGuide Web Extensions.wixproj 2013-08-22 16:53:22 UTC (rev 7802)
@@ -50,6 +50,7 @@
<Compile Include="FileIncludes\incMapViewerPhpFiles.wxs" />
<Compile Include="FileIncludes\incMapViewerSchemareportFiles.wxs" />
<Compile Include="FileIncludes\incMapViewerStdiconFiles.wxs" />
+ <Compile Include="FileIncludes\incOpenLayersSampleFiles.wxs" />
<Compile Include="FileIncludes\incPhpDevGuideFiles.wxs" />
<Compile Include="FileIncludes\incPhpFiles.wxs" />
<Compile Include="FileIncludes\incPhpViewerSampleFiles.wxs" />
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs 2013-08-22 16:48:52 UTC (rev 7801)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs 2013-08-22 16:53:22 UTC (rev 7802)
@@ -152,6 +152,8 @@
<ComponentRef Id="WebApacheShortcutComponent"/>
<ComponentRef Id="WebIISShortcutComponent"/>
<ComponentRef Id="GenericShortcutComponent"/>
+ <ComponentRef Id="WebIISSamplesShortcutComponent"/>
+ <ComponentRef Id="WebApacheSampleShortcutComponent"/>
<ComponentRef Id="WebTempComponent"/>
<Feature Id="WebExtApacheFeature" Title="!(loc.WebExtApacheFeature)" Level="1" Description="!(loc.WebExtApacheFeature_Description)" AllowAdvertise="no" TypicalDefault="install" InstallDefault="local" >
@@ -195,30 +197,25 @@
</Component>
<Feature Id="WebExtPhpDevGuideSamplesFeature" Title="!(loc.WebExtPhpDevGuideSamplesFeature)" Level="1" Description="!(loc.WebExtPhpDevGuideSamplesFeature_Description)" AllowAdvertise="no" TypicalDefault="install" InstallDefault="local">
<ComponentGroupRef Id="group_PHPDEVGUIDEFILES" />
- <ComponentRef Id="WebApachePHPDevGuideSampleShortcutComponent"/>
- <ComponentRef Id="WebIISPHPDevGuideSampleShortcutComponent"/>
</Feature>
<Feature Id="WebExtJavaDevGuideSamplesFeature" Title="!(loc.WebExtJavaDevGuideSamplesFeature)" Level="1" Description="!(loc.WebExtJavaDevGuideSamplesFeature_Description)" AllowAdvertise="no" TypicalDefault="install" InstallDefault="local">
<ComponentGroupRef Id="group_JAVADEVGUIDEFILES" />
- <ComponentRef Id="WebApacheJavaDevGuideSampleShortcutComponent"/>
</Feature>
<Feature Id="WebExtDotNetDevGuideSamplesFeature" Title="!(loc.WebExtDotNetDevGuideSamplesFeature)" Level="1" Description="!(loc.WebExtDotNetDevGuideSamplesFeature_Description)" AllowAdvertise="no" TypicalDefault="install" InstallDefault="local">
<ComponentGroupRef Id="group_DOTNETDEVGUIDEFILES" />
- <ComponentRef Id="WebIISDotNetDevGuideSampleShortcutComponent"/>
</Feature>
<Feature Id="WebExtPhpViewerSampleFeature" Title="!(loc.WebExtPhpViewerSampleFeature)" Level="1" Description="!(loc.WebExtPhpViewerSampleFeature_Description)" AllowAdvertise="no" TypicalDefault="install" InstallDefault="local">
<ComponentGroupRef Id="group_PHPVIEWERSAMPLEFILES" />
- <ComponentRef Id="WebApachePHPViewerSampleShortcutComponent" />
- <ComponentRef Id="WebIISPHPViewerSampleShortcutComponent"/>
</Feature>
<Feature Id="WebExtJavaViewerSampleFeature" Title="!(loc.WebExtJavaViewerSampleFeature)" Level="1" Description="!(loc.WebExtJavaViewerSampleFeature_Description)" AllowAdvertise="no" TypicalDefault="install" InstallDefault="local">
<ComponentGroupRef Id="group_JAVAVIEWERSAMPLEFILES" />
- <ComponentRef Id="WebApacheJavaViewerSampleShortcutComponent"/>
</Feature>
<Feature Id="WebExtDotNetViewerSampleFeature" Title="!(loc.WebExtDotNetViewerSampleFeature)" Level="1" Description="!(loc.WebExtDotNetViewerSampleFeature_Description)" AllowAdvertise="no" TypicalDefault="install" InstallDefault="local">
<ComponentGroupRef Id="group_DOTNETVIEWERSAMPLEFILES" />
- <ComponentRef Id="WebIISDotNetViewerSampleShortcutComponent"/>
</Feature>
+ <Feature Id="WebExtOpenLayersSampleFeature" Title="!(loc.WebExtOpenLayersSampleFeature)" Level="1" Description="!(loc.WebExtOpenLayersSampleFeature_Description)" AllowAdvertise="no" TypicalDefault="install" InstallDefault="local">
+ <ComponentGroupRef Id="group_OPENLAYERSSAMPLEFILES" />
+ </Feature>
</Feature>
<Feature Id="WebLocalizedFeature" Title="!(loc.WebLocalizedFeature)" Display="hidden" Level="1" Description="!(loc.WebLocalizedFeature_Description)" AllowAdvertise="no" TypicalDefault="install" InstallDefault="local">
<ComponentGroupRef Id="group_MAPVIEWERLOCALIZEDFILES" />
@@ -256,6 +253,7 @@
<ComponentGroupRef Id="incMapViewerStdiconFiles_SVNMETADATA" />
<ComponentGroupRef Id="incPhpDevGuideFiles_SVNMETADATA" />
<ComponentGroupRef Id="incPhpViewerSampleFiles_SVNMETADATA" />
+ <ComponentGroupRef Id="incOpenLayersSampleFiles_SVNMETADATA" />
</Feature>
</Feature>
</Fragment>
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs 2013-08-22 16:48:52 UTC (rev 7801)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs 2013-08-22 16:53:22 UTC (rev 7802)
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
- xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+ xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
<?if "$(var.MgPlatform)" = "x64" ?>
- <?define Win64 = "yes" ?>
- <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
+ <?define Win64 = "yes" ?>
+ <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
<?else ?>
- <?define Win64 = "no" ?>
- <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
+ <?define Win64 = "no" ?>
+ <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
<?endif ?>
<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.5">
+ <Directory Id="MapGuideOpenSourceMenuLocation" Name="MapGuide Open Source 2.6">
<Component Id="GenericShortcutComponent" Win64="$(var.Win64)" Guid="243CE0F3-D6BC-476B-910E-6F34DA54A2E2">
<CreateFolder />
<RegistryKey Root="HKCU" Key="$(var.MgRegKey)\GenericShortcut">
<RegistryValue
- Value="Installed"
- Type="string"
- KeyPath="yes" />
+ Value="Installed"
+ Type="string"
+ KeyPath="yes" />
</RegistryKey>
<RemoveFolder Id="MapGuideOpenSourceMenuLocation" On="uninstall" />
</Component>
@@ -26,288 +26,210 @@
<Condition>MGWEB_CONFIG="APACHE"</Condition>
<CreateFolder />
<util:InternetShortcut Id="ApacheWebApi"
- Directory="MapGuideOpenSourceMenuLocation"
- Name="!(loc.Shortcut_WebAPI)"
- Target="http://localhost:[APACHE_PORT]/[VIRTUALDIR]/help/webapi/index.htm" />
+ Directory="MapGuideOpenSourceMenuLocation"
+ Name="!(loc.Shortcut_WebAPI)"
+ Target="http://localhost:[APACHE_PORT]/[VIRTUALDIR]/help/webapi/index.htm" />
<RegistryKey Root="HKCU" Key="$(var.MgRegKey)\ApacheWebApiShortcut">
<RegistryValue
- Value="Installed"
- Type="string"
- KeyPath="yes" />
+ Value="Installed"
+ Type="string"
+ KeyPath="yes" />
</RegistryKey>
</Component>
<Component Id="ApacheDevGuideShortcutComponent" Win64="$(var.Win64)" Guid="4DC72C73-8CF0-49B3-8558-5E7CAFA7B6CE">
<Condition>MGWEB_CONFIG="APACHE"</Condition>
<CreateFolder />
<util:InternetShortcut Id="ApacheDevGuide"
- Directory="MapGuideOpenSourceMenuLocation"
- Name="!(loc.Shortcut_DevGuide)"
- Target="http://localhost:[APACHE_PORT]/[VIRTUALDIR]/help/devguide/index.html" />
+ Directory="MapGuideOpenSourceMenuLocation"
+ Name="!(loc.Shortcut_DevGuide)"
+ Target="http://localhost:[APACHE_PORT]/[VIRTUALDIR]/help/devguide/index.html" />
<RegistryKey Root="HKCU" Key="$(var.MgRegKey)\ApacheDevGuideShortcut">
<RegistryValue
- Value="Installed"
- Type="string"
- KeyPath="yes" />
+ Value="Installed"
+ Type="string"
+ KeyPath="yes" />
</RegistryKey>
</Component>
<Component Id="ApacheViewerApiShortcutComponent" Win64="$(var.Win64)" Guid="47CD50F1-5961-43F8-8FE8-BF1CDC8AE895">
- <Condition>MGWEB_CONFIG="APACHE"</Condition>
- <CreateFolder />
- <util:InternetShortcut Id="ApacheViewerApi"
- Directory="MapGuideOpenSourceMenuLocation"
- Name="!(loc.Shortcut_ViewerAPI)"
- Target="http://localhost:[APACHE_PORT]/[VIRTUALDIR]/help/viewerapi/index.htm" />
- <RegistryKey Root="HKCU" Key="$(var.MgRegKey)\ApacheViewerApiShortcut">
- <RegistryValue
- Value="Installed"
- Type="string"
- KeyPath="yes" />
- </RegistryKey>
+ <Condition>MGWEB_CONFIG="APACHE"</Condition>
+ <CreateFolder />
+ <util:InternetShortcut Id="ApacheViewerApi"
+ Directory="MapGuideOpenSourceMenuLocation"
+ Name="!(loc.Shortcut_ViewerAPI)"
+ Target="http://localhost:[APACHE_PORT]/[VIRTUALDIR]/help/viewerapi/index.htm" />
+ <RegistryKey Root="HKCU" Key="$(var.MgRegKey)\ApacheViewerApiShortcut">
+ <RegistryValue
+ Value="Installed"
+ Type="string"
+ KeyPath="yes" />
+ </RegistryKey>
</Component>
<Component Id="ApacheFusionApiShortcutComponent" Win64="$(var.Win64)" Guid="4AABF916-33FC-440D-9D6F-8CE95F2ADE7A">
- <Condition>MGWEB_CONFIG="APACHE"</Condition>
- <CreateFolder />
- <util:InternetShortcut Id="ApacheFusionApi"
- Directory="MapGuideOpenSourceMenuLocation"
- Name="!(loc.Shortcut_FusionAPI)"
- Target="http://localhost:[APACHE_PORT]/[VIRTUALDIR]/fusion/docs/NaturalDocs/index.html" />
- <RegistryKey Root="HKCU" Key="$(var.MgRegKey)\ApacheFusionApiShortcut">
- <RegistryValue
- Value="Installed"
- Type="string"
- KeyPath="yes" />
- </RegistryKey>
+ <Condition>MGWEB_CONFIG="APACHE"</Condition>
+ <CreateFolder />
+ <util:InternetShortcut Id="ApacheFusionApi"
+ Directory="MapGuideOpenSourceMenuLocation"
+ Name="!(loc.Shortcut_FusionAPI)"
+ Target="http://localhost:[APACHE_PORT]/[VIRTUALDIR]/fusion/docs/NaturalDocs/index.html" />
+ <RegistryKey Root="HKCU" Key="$(var.MgRegKey)\ApacheFusionApiShortcut">
+ <RegistryValue
+ Value="Installed"
+ Type="string"
+ KeyPath="yes" />
+ </RegistryKey>
</Component>
<Component Id="WebApacheShortcutComponent" Win64="$(var.Win64)" Guid="2EBC8176-07C5-40A9-97F9-C3E83836637E">
<Condition>MGWEB_CONFIG="APACHE"</Condition>
<util:InternetShortcut Id="ApacheSiteAdmin"
- Directory="MapGuideOpenSourceMenuLocation"
- Name="!(loc.Shortcut_SiteAdmin)"
- Target="http://localhost:[APACHE_PORT]/[VIRTUALDIR]/mapadmin/login.php" />
+ 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" />
+ 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)"
- Target="http://trac.osgeo.org/mapguide/wiki/maestro" />
+ Directory="MapGuideOpenSourceMenuLocation"
+ Name="!(loc.Shortcut_GetMaestro)"
+ Target="http://trac.osgeo.org/mapguide/wiki/maestro" />
<RegistryKey Root="HKCU" Key="$(var.MgRegKey)\ApacheShortcut">
<RegistryValue
- Value="Installed"
- Type="string"
- KeyPath="yes" />
+ Value="Installed"
+ Type="string"
+ KeyPath="yes" />
</RegistryKey>
</Component>
- <Component Id="WebApachePHPViewerSampleShortcutComponent" Win64="$(var.Win64)" Guid="E3D81381-6B4A-41AD-B83A-CE686455D3DC">
- <Condition>MGWEB_CONFIG="APACHE"</Condition>
- <util:InternetShortcut Id="ApachePhpViewerSampleShortcut"
- Directory="MapGuideOpenSourceMenuLocation"
- Name="!(loc.Shortcut_PhpViewerSample)"
- Target="http://localhost:[APACHE_PORT]/[VIRTUALDIR]/phpviewersample/ajaxviewersample.php" />
- <RegistryKey Root="HKCU" Key="$(var.MgRegKey)\ApachePHPViewerSampleShortcutComponent">
- <RegistryValue
- Value="Installed"
- Type="string"
- KeyPath="yes" />
- </RegistryKey>
- </Component>
- <Component Id="WebApachePHPDevGuideSampleShortcutComponent" Win64="$(var.Win64)" Guid="F2F3F90B-D033-47FA-9DDD-943E594ABE98">
- <Condition>MGWEB_CONFIG="APACHE"</Condition>
- <util:InternetShortcut Id="ApachePhpDevGuideSampleShortcut"
- Directory="MapGuideOpenSourceMenuLocation"
- Name="!(loc.Shortcut_PhpDevGuideSample)"
- Target="http://localhost:[APACHE_PORT]/[VIRTUALDIR]/phpsamples/main.php" />
- <RegistryKey Root="HKCU" Key="$(var.MgRegKey)\ApachePHPDevGuideSampleShortcutComponent">
- <RegistryValue
- Value="Installed"
- Type="string"
- KeyPath="yes" />
- </RegistryKey>
- </Component>
- <Component Id="WebApacheJavaViewerSampleShortcutComponent" Win64="$(var.Win64)" Guid="4D0D9A31-2BB5-4DE8-881A-53A5371BF93D">
- <Condition>MGWEB_CONFIG="APACHE"</Condition>
- <util:InternetShortcut Id="ApacheJavaViewerSampleShortcut"
- Directory="MapGuideOpenSourceMenuLocation"
- Name="!(loc.Shortcut_JavaViewerSample)"
- Target="http://localhost:[APACHE_PORT]/[VIRTUALDIR]/javaviewersample/ajaxviewersample.jsp" />
- <RegistryKey Root="HKCU" Key="$(var.MgRegKey)\ApacheJavaViewerSampleShortcutComponent">
- <RegistryValue
- Value="Installed"
- Type="string"
- KeyPath="yes" />
- </RegistryKey>
- </Component>
- <Component Id="WebApacheJavaDevGuideSampleShortcutComponent" Win64="$(var.Win64)" Guid="4DB97F1C-D225-4437-B2B8-69ECDE4F4168">
- <Condition>MGWEB_CONFIG="APACHE"</Condition>
- <util:InternetShortcut Id="ApacheJavaDevGuideSampleShortcut"
- Directory="MapGuideOpenSourceMenuLocation"
- Name="!(loc.Shortcut_JavaDevGuideSample)"
- Target="http://localhost:[APACHE_PORT]/[VIRTUALDIR]/javasamples/main.jsp" />
- <RegistryKey Root="HKCU" Key="$(var.MgRegKey)\ApacheJavaDevGuideSampleShortcutComponent">
- <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"
+ Directory="MapGuideOpenSourceMenuLocation"
+ Name="!(loc.Shortcut_Samples)"
+ Target="http://localhost:[APACHE_PORT]/[VIRTUALDIR]/samples.html" />
+ <RegistryKey Root="HKCU" Key="$(var.MgRegKey)\ApacheSamplesShortcutComponent">
+ <RegistryValue
+ Value="Installed"
+ Type="string"
+ KeyPath="yes" />
+ </RegistryKey>
+ </Component>
<Component Id="IISWebApiShortcutComponent" Win64="$(var.Win64)" Guid="DFA7D99A-3760-4072-9510-7EC5D658FB5F">
<Condition>MGWEB_CONFIG="IIS"</Condition>
<CreateFolder />
<util:InternetShortcut Id="IISWebApi"
- Directory="MapGuideOpenSourceMenuLocation"
- Name="!(loc.Shortcut_WebAPI)"
- Target="http://localhost/[VIRTUALDIR]/help/webapi/index.htm" />
+ Directory="MapGuideOpenSourceMenuLocation"
+ Name="!(loc.Shortcut_WebAPI)"
+ Target="http://localhost/[VIRTUALDIR]/help/webapi/index.htm" />
<RegistryKey Root="HKCU" Key="$(var.MgRegKey)\IISWebApiShortcut">
<RegistryValue
- Value="Installed"
- Type="string"
- KeyPath="yes" />
+ Value="Installed"
+ Type="string"
+ KeyPath="yes" />
</RegistryKey>
</Component>
<Component Id="IISDevGuideShortcutComponent" Win64="$(var.Win64)" Guid="BA2B2FE0-F11E-41D0-9939-D774C1D3171A">
<Condition>MGWEB_CONFIG="IIS"</Condition>
<CreateFolder />
<util:InternetShortcut Id="IISDevGuide"
- Directory="MapGuideOpenSourceMenuLocation"
- Name="!(loc.Shortcut_DevGuide)"
- Target="http://localhost/[VIRTUALDIR]/help/devguide/index.html" />
+ Directory="MapGuideOpenSourceMenuLocation"
+ Name="!(loc.Shortcut_DevGuide)"
+ Target="http://localhost/[VIRTUALDIR]/help/devguide/index.html" />
<RegistryKey Root="HKCU" Key="$(var.MgRegKey)\IISDevGuideShortcut">
<RegistryValue
- Value="Installed"
- Type="string"
- KeyPath="yes" />
+ Value="Installed"
+ Type="string"
+ KeyPath="yes" />
</RegistryKey>
</Component>
- <Component Id="IISViewerApiShortcutComponent" Win64="$(var.Win64)" Guid="F2CCA279-4C99-48CE-9F79-7465449E2B33">
- <Condition>MGWEB_CONFIG="IIS"</Condition>
- <CreateFolder />
- <util:InternetShortcut Id="IISViewerApi"
- Directory="MapGuideOpenSourceMenuLocation"
- Name="!(loc.Shortcut_ViewerAPI)"
- Target="http://localhost/[VIRTUALDIR]/help/viewerapi/index.htm" />
- <RegistryKey Root="HKCU" Key="$(var.MgRegKey)\IISViewerApiShortcut">
- <RegistryValue
- Value="Installed"
- Type="string"
- KeyPath="yes" />
- </RegistryKey>
- </Component>
- <Component Id="IISFusionApiShortcutComponent" Win64="$(var.Win64)" Guid="8F4A6B97-DEFB-4AA1-859E-3392C5DC30D2">
- <Condition>MGWEB_CONFIG="IIS"</Condition>
- <CreateFolder />
- <util:InternetShortcut Id="IISFusionApi"
- Directory="MapGuideOpenSourceMenuLocation"
- Name="!(loc.Shortcut_FusionAPI)"
- Target="http://localhost/[VIRTUALDIR]/fusion/docs/NaturalDocs/index.html" />
- <RegistryKey Root="HKCU" Key="$(var.MgRegKey)\IISFusionApiShortcut">
- <RegistryValue
- Value="Installed"
- Type="string"
- KeyPath="yes" />
- </RegistryKey>
- </Component>
- <Component Id="WebIISPHPViewerSampleShortcutComponent" Win64="$(var.Win64)" Guid="F1B2C345-52F8-4179-8CDC-34D2D3E22418">
- <Condition>MGWEB_CONFIG="IIS"</Condition>
- <util:InternetShortcut Id="IISPhpViewerSampleShortcut"
- Directory="MapGuideOpenSourceMenuLocation"
- Name="!(loc.Shortcut_PhpViewerSample)"
- Target="http://localhost/[VIRTUALDIR]/phpviewersample/ajaxviewersample.php" />
- <RegistryKey Root="HKCU" Key="$(var.MgRegKey)\IISPHPViewerSampleShortcutComponent">
- <RegistryValue
- Value="Installed"
- Type="string"
- KeyPath="yes" />
- </RegistryKey>
- </Component>
- <Component Id="WebIISPHPDevGuideSampleShortcutComponent" Win64="$(var.Win64)" Guid="EEAB8D50-3ECA-4CBF-8D80-3F02219CB797">
- <Condition>MGWEB_CONFIG="IIS"</Condition>
- <util:InternetShortcut Id="IISPhpDevGuideSampleShortcut"
- Directory="MapGuideOpenSourceMenuLocation"
- Name="!(loc.Shortcut_PhpDevGuideSample)"
- Target="http://localhost/[VIRTUALDIR]/phpsamples/main.php" />
- <RegistryKey Root="HKCU" Key="$(var.MgRegKey)\IISPHPDevGuideSampleShortcutComponent">
- <RegistryValue
- Value="Installed"
- Type="string"
- KeyPath="yes" />
- </RegistryKey>
- </Component>
- <Component Id="WebIISDotNetViewerSampleShortcutComponent" Win64="$(var.Win64)" Guid="BE2DD022-04C2-45AF-95A6-87E652BE52CA">
- <Condition>MGWEB_CONFIG="IIS"</Condition>
- <util:InternetShortcut Id="IISDotNetViewerSampleShortcut"
- Directory="MapGuideOpenSourceMenuLocation"
- Name="!(loc.Shortcut_DotNetViewerSample)"
- Target="http://localhost/[VIRTUALDIR]/dotnetviewersample/ajaxviewersample.aspx" />
- <RegistryKey Root="HKCU" Key="$(var.MgRegKey)\IISDotNetViewerSampleShortcutComponent">
- <RegistryValue
- Value="Installed"
- Type="string"
- KeyPath="yes" />
- </RegistryKey>
- </Component>
- <Component Id="WebIISDotNetDevGuideSampleShortcutComponent" Win64="$(var.Win64)" Guid="0B766EEB-FA31-4833-91F6-87C2A653FD33">
- <Condition>MGWEB_CONFIG="IIS"</Condition>
- <util:InternetShortcut Id="IISDotNetDevGuideSampleShortcut"
- Directory="MapGuideOpenSourceMenuLocation"
- Name="!(loc.Shortcut_DotNetDevGuideSample)"
- Target="http://localhost/[VIRTUALDIR]/dotnetsamples/main.aspx" />
- <RegistryKey Root="HKCU" Key="$(var.MgRegKey)\IISDotNetDevGuideSampleShortcutComponent">
- <RegistryValue
- Value="Installed"
- Type="string"
- KeyPath="yes" />
- </RegistryKey>
- </Component>
+ <Component Id="IISViewerApiShortcutComponent" Win64="$(var.Win64)" Guid="F2CCA279-4C99-48CE-9F79-7465449E2B33">
+ <Condition>MGWEB_CONFIG="IIS"</Condition>
+ <CreateFolder />
+ <util:InternetShortcut Id="IISViewerApi"
+ Directory="MapGuideOpenSourceMenuLocation"
+ Name="!(loc.Shortcut_ViewerAPI)"
+ Target="http://localhost/[VIRTUALDIR]/help/viewerapi/index.htm" />
+ <RegistryKey Root="HKCU" Key="$(var.MgRegKey)\IISViewerApiShortcut">
+ <RegistryValue
+ Value="Installed"
+ Type="string"
+ KeyPath="yes" />
+ </RegistryKey>
+ </Component>
+ <Component Id="IISFusionApiShortcutComponent" Win64="$(var.Win64)" Guid="8F4A6B97-DEFB-4AA1-859E-3392C5DC30D2">
+ <Condition>MGWEB_CONFIG="IIS"</Condition>
+ <CreateFolder />
+ <util:InternetShortcut Id="IISFusionApi"
+ Directory="MapGuideOpenSourceMenuLocation"
+ Name="!(loc.Shortcut_FusionAPI)"
+ Target="http://localhost/[VIRTUALDIR]/fusion/docs/NaturalDocs/index.html" />
+ <RegistryKey Root="HKCU" Key="$(var.MgRegKey)\IISFusionApiShortcut">
+ <RegistryValue
+ Value="Installed"
+ Type="string"
+ KeyPath="yes" />
+ </RegistryKey>
+ </Component>
+ <Component Id="WebIISSamplesShortcutComponent" Win64="$(var.Win64)" Guid="F1B2C345-52F8-4179-8CDC-34D2D3E22418">
+ <Condition>MGWEB_CONFIG="IIS"</Condition>
+ <util:InternetShortcut Id="IISSamplesShortcut"
+ Directory="MapGuideOpenSourceMenuLocation"
+ Name="!(loc.Shortcut_Samples)"
+ Target="http://localhost/[VIRTUALDIR]/samples.html" />
+ <RegistryKey Root="HKCU" Key="$(var.MgRegKey)\IISSamplesShortcutComponent">
+ <RegistryValue
+ Value="Installed"
+ Type="string"
+ KeyPath="yes" />
+ </RegistryKey>
+ </Component>
<Component Id="WebIISShortcutComponent" Win64="$(var.Win64)" Guid="F59A450A-84DE-4E2E-B942-BD416CDEBBF3">
<Condition>MGWEB_CONFIG="IIS"</Condition>
<util:InternetShortcut Id="IISSiteAdmin"
- Directory="MapGuideOpenSourceMenuLocation"
- Name="!(loc.Shortcut_SiteAdmin)"
- Target="http://localhost/[VIRTUALDIR]/mapadmin/login.php" />
+ 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" />
+ Directory="MapGuideOpenSourceMenuLocation"
+ Name="!(loc.Shortcut_MapAgent)"
+ Target="http://localhost/[VIRTUALDIR]/mapagent/index.html" />
<util:InternetShortcut Id="IISGetMaestro"
- Directory="MapGuideOpenSourceMenuLocation"
- Name="!(loc.Shortcut_GetMaestro)"
- Target="http://trac.osgeo.org/mapguide/wiki/maestro" />
+ Directory="MapGuideOpenSourceMenuLocation"
+ Name="!(loc.Shortcut_GetMaestro)"
+ Target="http://trac.osgeo.org/mapguide/wiki/maestro" />
<RegistryKey Root="HKCU" Key="$(var.MgRegKey)\IISShortcut">
<RegistryValue
- Value="Installed"
- Type="string"
- KeyPath="yes" />
+ 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 />
<util:InternetShortcut Id="MapGuideHome"
- Directory="WebResourcesLocation"
- Name="!(loc.Shortcut_MapGuide)"
- Target="http://mapguide.osgeo.org" />
+ Directory="WebResourcesLocation"
+ Name="!(loc.Shortcut_MapGuide)"
+ Target="http://mapguide.osgeo.org" />
<util:InternetShortcut Id="MapGuideTrac"
- Directory="WebResourcesLocation"
- Name="!(loc.Shortcut_Trac)"
- Target="http://trac.osgeo.org/mapguide" />
+ Directory="WebResourcesLocation"
+ Name="!(loc.Shortcut_Trac)"
+ Target="http://trac.osgeo.org/mapguide" />
<util:InternetShortcut Id="MapGuideBestPractices"
- Directory="WebResourcesLocation"
- Name="!(loc.Shortcut_BestPractices)"
- Target="http://sandbox.mapguide.com" />
+ Directory="WebResourcesLocation"
+ Name="!(loc.Shortcut_BestPractices)"
+ Target="http://sandbox.mapguide.com" />
<util:InternetShortcut Id="AutodeskWikiHelp"
- Directory="WebResourcesLocation"
- Name="!(loc.Shortcut_WikiHelp)"
- Target="http://wikihelp.autodesk.com/Infr._Map_Server/enu/2013" />
+ Directory="WebResourcesLocation"
+ Name="!(loc.Shortcut_WikiHelp)"
+ Target="http://wikihelp.autodesk.com/Infr._Map_Server/enu/2013" />
<util:InternetShortcut Id="MapGuideCentral"
- Directory="WebResourcesLocation"
- Name="!(loc.Shortcut_MapGuideCentral)"
- Target="http://ennoble.dreamhosters.com/mapguide-central" />
+ Directory="WebResourcesLocation"
+ Name="!(loc.Shortcut_MapGuideCentral)"
+ Target="http://ennoble.dreamhosters.com/mapguide-central" />
<RegistryKey Root="HKCU" Key="$(var.MgRegKey)\ProgramMenuShortcut">
<RegistryValue
- Value="Installed"
- Type="string"
- KeyPath="yes" />
+ Value="Installed"
+ Type="string"
+ KeyPath="yes" />
</RegistryKey>
<RemoveFolder Id="WebShortcutsComponent" On="uninstall" />
</Component>
Modified: trunk/Installer/Paraffin.exe
===================================================================
(Binary files differ)
Modified: trunk/Installer/Paraffin.pdb
===================================================================
(Binary files differ)
Property changes on: trunk/Installer/Support
___________________________________________________________________
Added: svn:ignore
+ Debug
Release
Property changes on: trunk/Installer/Support/Paraffin
___________________________________________________________________
Added: svn:ignore
+ obj
Paraffin.suo
Modified: trunk/Installer/Support/Paraffin/Main.cs
===================================================================
--- trunk/Installer/Support/Paraffin/Main.cs 2013-08-22 16:48:52 UTC (rev 7801)
+++ trunk/Installer/Support/Paraffin/Main.cs 2013-08-22 16:53:22 UTC (rev 7802)
@@ -223,6 +223,7 @@
return ( 0 );
}
+ private static Dictionary<string, string> _identifierOverrides = new Dictionary<string, string>();
private static Dictionary<string, string> _featureMap = new Dictionary<string, string>();
private static void LoadProcessFeatureMap()
@@ -238,6 +239,15 @@
};
foreach (var m in mappings)
_featureMap[m.Name] = m.Suffix;
+
+ var overrides = from item in doc.Descendants("IdentifierOverride")
+ select new
+ {
+ Pattern = item.Attribute("Pattern").Value,
+ Identifier = item.Attribute("Identifier").Value
+ };
+ foreach (var o in overrides)
+ _identifierOverrides[o.Pattern] = o.Identifier;
}
}
@@ -1256,9 +1266,18 @@
// Create a unique filename. In a one file per component run, this
// will mean that the file and it's parent component will have the
// same number.
- String fileId = CreateSeventyCharIdString ( "file" ,
- argValues.CustomValue ,
- componentNumber - 1 );
+ String fileId = string.Empty;
+ foreach (String pattern in _identifierOverrides.Keys)
+ {
+ if (fileName.EndsWith(pattern))
+ {
+ fileId = _identifierOverrides[pattern];
+ Console.WriteLine("Set identifier [{0}] to file [{1}]", fileId, fileName);
+ break;
+ }
+ }
+ if (String.IsNullOrEmpty(fileId))
+ fileId = CreateSeventyCharIdString("file", argValues.CustomValue, componentNumber - 1);
// If the user wanted to group all the files into a component, I
// need to bump up the componentNumber to keep everything straight.
Modified: trunk/Installer/build.bat
===================================================================
--- trunk/Installer/build.bat 2013-08-22 16:48:52 UTC (rev 7801)
+++ trunk/Installer/build.bat 2013-08-22 16:53:22 UTC (rev 7802)
@@ -292,6 +292,10 @@
%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
@@ -391,6 +395,9 @@
echo [generate]: Web - Developer's Guide Samples (DotNet)
%PARAFFIN% -dir %MG_SOURCE%\Web\www\dotnetviewersample -alias $(var.MgSource)\Web\www\dotnetviewersample -custom DOTNETVIEWERSAMPLEFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incDotNetViewerSampleFiles.wxs
+echo [generate]: Web - OpenLayers Samples
+%PARAFFIN% -dir %MG_SOURCE%\Web\www\ol2samples -alias $(var.MgSource)\Web\www\ol2samples -custom OPENLAYERSSAMPLEFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incOpenLayersSampleFiles.wxs
+
echo [generate]: Web - mapagent
%PARAFFIN% -dir %MG_SOURCE%\Web\www\mapagent -alias $(var.MgSource)\Web\www\mapagent -custom MAPAGENTFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incMapAgentFiles.wxs
More information about the mapguide-commits
mailing list