[mapguide-commits] r6771 - in trunk/Installer/Libraries: MapGuide Server MapGuide Web Extensions

[svn_mapguide at osgeo.org]

Author: jng
Date: 2012-06-15 07:59:11 -0700 (Fri, 15 Jun 2012)
New Revision: 6771

Modified:
   trunk/Installer/Libraries/MapGuide Server/FDO.wxs
   trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs
Log:
Final installer improvements (hopefully):
 - #2025: Set permissions for profilingmapxml directory so that the PHP-based profiler can save performance reports into it.
 - Hide the blank ArcSDE provider feature from the feature selection UI if Have_ArcSde = "no" (which will be the case for beta 1)

Modified: trunk/Installer/Libraries/MapGuide Server/FDO.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Server/FDO.wxs	2012-06-15 11:31:36 UTC (rev 6770)
+++ trunk/Installer/Libraries/MapGuide Server/FDO.wxs	2012-06-15 14:59:11 UTC (rev 6771)
@@ -195,9 +195,15 @@
         <ComponentRef Id="FdoComponent"/>
         <ComponentRef Id="FdoComComponent" />
         <ComponentRef Id="FdoCoreCompnent" />
+        <?if Have_ArcSde = "yes" ?>
         <Feature Id="FdoArcSdeProviderFeature" Title="!(loc.ArcSdeProvider)" Level="1" Description="!(loc.ArcSdeProviderDesc)" AllowAdvertise="no" TypicalDefault="install" InstallDefault="local">
-            <ComponentRef Id="FdoArcSdeComponent" />
+          <ComponentRef Id="FdoArcSdeComponent" />
         </Feature>
+        <?else ?>
+        <Feature Id="FdoArcSdeProviderFeature" Title="!(loc.ArcSdeProvider)" Display="hidden" Level="1" Description="!(loc.ArcSdeProviderDesc)" AllowAdvertise="no" TypicalDefault="install" InstallDefault="local">
+          <ComponentRef Id="FdoArcSdeComponent" />
+        </Feature>
+        <?endif ?>
         <Feature Id="FdoGdalProviderFeature" Title="!(loc.GdalProvider)" Level="1" Description="!(loc.GdalProviderDesc)" AllowAdvertise="no" TypicalDefault="install" InstallDefault="local">
             <ComponentRef Id="FdoGdalProviderComponent" />
         </Feature>

Modified: trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs	2012-06-15 11:31:36 UTC (rev 6770)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs	2012-06-15 14:59:11 UTC (rev 6771)
@@ -82,6 +82,15 @@
                     </Component>
                 </Directory>
                 <Directory Id="WEBROOTLOCATION" Name="www">
+                  <Directory Id="MAPADMINLOCATION" Name="mapadmin">
+                    <Directory Id="PROFILINGMAPXMLLOCATION" Name="profilingmapxml">
+                      <Component Id="ProfilingPermissionsComponent" Win64="$(var.Win64)" Guid="60660D36-B135-4956-A8ED-10EAF78D76AE" Feature="WebMapAdminFeature">
+                        <CreateFolder>
+                          <util:PermissionEx User="Everyone" GenericAll="yes" />
+                        </CreateFolder>
+                      </Component>
+                    </Directory>
+                  </Directory>
                   <Directory Id="HELPLOCATION" Name="help" />
                   <Component Id="WebRootComponent" Win64="$(var.Win64)" Guid="A84579E6-285D-4869-9F04-AA47FB1ACFD5" Feature="WebExtensionsFeature">
                     <CreateFolder />