[mapguide-commits] r6423 - in trunk/Installer: . Bootstrapper
Installers/MapGuide Libraries/MapGuide Web Extensions
Libraries/MapGuide Web Extensions/Lang
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Jan 12 07:14:46 EST 2012
Author: jng
Date: 2012-01-12 04:14:46 -0800 (Thu, 12 Jan 2012)
New Revision: 6423
Modified:
trunk/Installer/Bootstrapper/Setup.nsi
trunk/Installer/Installers/MapGuide/MapGuide.wxs
trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs
trunk/Installer/Libraries/MapGuide Web Extensions/IIS7.wxs
trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_en-US.wxl
trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_es-ES.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/build.bat
trunk/Installer/build64.bat
Log:
#1805: Installer updates
- Re-activate the maximum compression settings in the NSIS bootstrapper
- Bundle the devguide and viewer samples into the installer.
- Create mapviewernet as an IIS application. In the past, if a .net configuration is specified then only mapviewerajax is set as an IIS application, and not the directory its pointing to (mapviewernet)
- Update build scripts to call Paraffin.exe without "-direXclude .svn"
Modified: trunk/Installer/Bootstrapper/Setup.nsi
===================================================================
--- trunk/Installer/Bootstrapper/Setup.nsi 2012-01-12 11:12:55 UTC (rev 6422)
+++ trunk/Installer/Bootstrapper/Setup.nsi 2012-01-12 12:14:46 UTC (rev 6423)
@@ -1,9 +1,9 @@
!ifdef MAXCOMPRESSION
-;SetCompressor /FINAL /SOLID lzma
-;SetCompressorDictSize 64
+SetCompressor /FINAL /SOLID lzma
+SetCompressorDictSize 64
-;FileBufSize 256
+FileBufSize 256
!endif
Modified: trunk/Installer/Installers/MapGuide/MapGuide.wxs
===================================================================
--- trunk/Installer/Installers/MapGuide/MapGuide.wxs 2012-01-12 11:12:55 UTC (rev 6422)
+++ trunk/Installer/Installers/MapGuide/MapGuide.wxs 2012-01-12 12:14:46 UTC (rev 6423)
@@ -677,6 +677,18 @@
<Custom Action="MapGuideIIS7_I_SetViewerDocNet" After="MapGuideIIS7_I_CreateViewerNet">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
<Custom Action="MapGuideIIS7_I_AssignViewerAppPoolNet" After="MapGuideIIS7_I_SetViewerDocNet">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_CreateMapViewerNet" After="MapGuideIIS7_I_AssignViewerAppPoolNet">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2 AND &WebExtMapViewerASPXFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_SetMapViewerDocNet" After="MapGuideIIS7_I_CreateMapViewerNet">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2 AND &WebExtMapViewerASPXFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_AssignMapViewerAppPoolNet" After="MapGuideIIS7_I_SetMapViewerDocNet">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2 AND &WebExtMapViewerASPXFeature>2</Custom>
+
+ <Custom Action="MapGuideIIS7_I_CreateViewerSampleNet" After="MapGuideIIS7_I_AssignMapViewerAppPoolNet">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2 AND &WebExtDotNetViewerSampleFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_SetViewerDocViewerSampleNet" After="MapGuideIIS7_I_CreateViewerSampleNet">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2 AND &WebExtDotNetViewerSampleFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_AssignViewerAppPoolViewerSampleNet" After="MapGuideIIS7_I_SetViewerDocViewerSampleNet">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2 AND &WebExtDotNetViewerSampleFeature>2</Custom>
+
+ <Custom Action="MapGuideIIS7_I_CreateViewerDevGuideSamplesNet" After="MapGuideIIS7_I_AssignViewerAppPoolViewerSampleNet">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2 AND &WebExtDotNetDevGuideSamplesFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_SetViewerDocDevGuideSamplesNet" After="MapGuideIIS7_I_CreateViewerDevGuideSamplesNet">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2 AND &WebExtDotNetDevGuideSamplesFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_AssignViewerAppPoolDevGuideSamplesNet" After="MapGuideIIS7_I_SetViewerDocDevGuideSamplesNet">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2 AND &WebExtDotNetDevGuideSamplesFeature>2</Custom>
+
<!-- IIS7 UNINSTALL deferred action properties -->
<Custom Action="MapGuideIIS7_U_AppCmd_Cmd" After="InstallInitialize">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
<Custom Action="MapGuideIIS7_U_ClearMapAgentRestriction_Cmd" After="MapGuideIIS7_U_AppCmd_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs 2012-01-12 11:12:55 UTC (rev 6422)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs 2012-01-12 12:14:46 UTC (rev 6423)
@@ -115,6 +115,26 @@
</iis:WebVirtualDir>
</Component>
+ <!-- IIS5 PHP Viewer Sample component -->
+ <Component Id="IIS5PhpViewerSampleComponent" Win64="$(var.Win64)" Guid="2CB24A26-985E-4EEF-8412-A54282542B04" Directory="WEBEXTENSIONSLOCATION">
+ <Condition>MGWEB_CONFIG="IIS" AND IIS_API_TYPE="PHP" AND IISVERSIONMAJOR="#5" AND &WebExtPhpViewerSampleFeature>2</Condition>
+ <CreateFolder />
+ <iis:WebVirtualDir Id="IIS5PhpViewerSampleVDir" Alias="[VIRTUALDIR]/phpviewersample" Directory="dir_phpviewersample_0" WebSite="IISDefaultWebSite">
+ <iis:WebDirProperties Id="IIS5PhpViewerSampleDocument" DefaultDocuments="ajaxviewersample.php" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />
+ <iis:WebApplication Id="IIS5PhpViewerSampleWebApp" Name="phpviewersample" />
+ </iis:WebVirtualDir>
+ </Component>
+
+ <!-- IIS5 PHP DevGuide Sample component -->
+ <Component Id="IIS5PhpDevGuideSampleComponent" Win64="$(var.Win64)" Guid="58BB8334-650E-481D-8033-BF1C212FE57E" Directory="WEBEXTENSIONSLOCATION">
+ <Condition>MGWEB_CONFIG="IIS" AND IIS_API_TYPE="PHP" AND IISVERSIONMAJOR="#5" AND &WebExtPhpDevGuideSamplesFeature>2</Condition>
+ <CreateFolder />
+ <iis:WebVirtualDir Id="IIS5PhpDevGuideSampleVDir" Alias="[VIRTUALDIR]/phpsamples" Directory="dir_phpsamples_0" WebSite="IISDefaultWebSite">
+ <iis:WebDirProperties Id="IIS5PhpDevGuideSampleDocument" DefaultDocuments="main.php" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />
+ <iis:WebApplication Id="IIS5PhpDevGuideSampleWebApp" Name="phpsamples" />
+ </iis:WebVirtualDir>
+ </Component>
+
<!-- IIS5 DotNet MapViewer component -->
<Component Id="IIS5DotNetViewerComponent" Win64="$(var.Win64)" Guid="EC460125-D5D4-4596-BD03-B8D920F02E7F" Directory="WEBEXTENSIONSLOCATION">
<Condition>NETFRAMEWORK20 AND MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#5"</Condition>
@@ -124,6 +144,36 @@
<iis:WebApplication Id="IIS5MapViewerWebApp" Name="mapviewerajax" />
</iis:WebVirtualDir>
</Component>
+
+ <!-- IIS5 DotNet MapViewer component -->
+ <Component Id="IIS5DotNetViewerComponent2" Win64="$(var.Win64)" Guid="DAEBD87A-CAC4-45AA-A5FD-0AF8472EB13C" Directory="WEBEXTENSIONSLOCATION">
+ <Condition>NETFRAMEWORK20 AND MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#5"</Condition>
+ <CreateFolder />
+ <iis:WebVirtualDir Id="IIS5DotNetViewerVDir2" Alias="[VIRTUALDIR]/mapviewernet" Directory="dir_mapviewernet_0" WebSite="IISDefaultWebSite">
+ <iis:WebDirProperties Id="IIS5DotNetViewerDocument2" DefaultDocuments="ajaxviewer.aspx" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />
+ <iis:WebApplication Id="IIS5MapViewerWebApp2" Name="mapviewernet" />
+ </iis:WebVirtualDir>
+ </Component>
+
+ <!-- IIS5 DotNet Viewer Sample component -->
+ <Component Id="IIS5DotNetViewerSampleComponent" Win64="$(var.Win64)" Guid="81AE3F12-5CC5-48F6-AC62-5F225A9743EB" Directory="WEBEXTENSIONSLOCATION">
+ <Condition>NETFRAMEWORK20 AND MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#5" AND &WebExtDotNetViewerSampleFeature>2</Condition>
+ <CreateFolder />
+ <iis:WebVirtualDir Id="IIS5DotNetViewerSampleVDir" Alias="[VIRTUALDIR]/dotnetviewersample" Directory="dir_dotnetviewersample_0" WebSite="IISDefaultWebSite">
+ <iis:WebDirProperties Id="IIS5DotNetViewerSampleDocument" DefaultDocuments="ajaxviewersample.aspx" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />
+ <iis:WebApplication Id="IIS5DotNetViewerSampleWebApp" Name="dotnetviewersample" />
+ </iis:WebVirtualDir>
+ </Component>
+
+ <!-- IIS5 DotNet DevGuide Sample component -->
+ <Component Id="IIS5DotNetDevGuideSampleComponent" Win64="$(var.Win64)" Guid="91FA4F55-0673-4043-BEBD-19E4094A8A32" Directory="WEBEXTENSIONSLOCATION">
+ <Condition>NETFRAMEWORK20 AND MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#5" AND &WebExtDotNetDevGuideSamplesFeature>2</Condition>
+ <CreateFolder />
+ <iis:WebVirtualDir Id="IIS5DotNetDevGuideSampleVDir" Alias="[VIRTUALDIR]/dotnetsamples" Directory="dir_dotnetsamples_0" WebSite="IISDefaultWebSite">
+ <iis:WebDirProperties Id="IIS5DotNetDevGuideSampleDocument" DefaultDocuments="main.aspx" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />
+ <iis:WebApplication Id="IIS5DotNetDevGuideSampleWebApp" Name="dotnetsamples" />
+ </iis:WebVirtualDir>
+ </Component>
<!-- Trac #361 -->
<Component Id="PersistWebsiteSelection" Win64="$(var.Win64)" Guid="0C0CBB26-C99B-486a-9367-15D49AC9726B" Directory="WEBEXTENSIONSLOCATION">
@@ -180,6 +230,24 @@
</iis:WebVirtualDir>
</Component>
+ <!-- IIS6 PHP Viewer Sample component -->
+ <Component Id="IIS6PhpViewerSampleComponent" Win64="$(var.Win64)" Guid="88AACC15-76BC-47B9-B5C3-698142A3BE07" Directory="WEBEXTENSIONSLOCATION">
+ <Condition>MGWEB_CONFIG="IIS" AND IIS_API_TYPE="PHP" AND IISVERSIONMAJOR="#6" AND &WebExtPhpViewerSampleFeature>2</Condition>
+ <CreateFolder />
+ <iis:WebVirtualDir Id="IIS6PhpViewerSampleVDir" Alias="[VIRTUALDIR]/phpviewersample" Directory="dir_phpviewersample_0" WebSite="IISDefaultWebSite">
+ <iis:WebDirProperties Id="IIS6PhpViewerSampleDocument" DefaultDocuments="ajaxviewersample.php" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />
+ </iis:WebVirtualDir>
+ </Component>
+
+ <!-- IIS6 PHP DevGuide Sample component -->
+ <Component Id="IIS6PhpDevGuideSampleComponent" Win64="$(var.Win64)" Guid="EFE0BE5D-4D36-4366-A81F-F05414DE766F" Directory="WEBEXTENSIONSLOCATION">
+ <Condition>MGWEB_CONFIG="IIS" AND IIS_API_TYPE="PHP" AND IISVERSIONMAJOR="#6" AND &WebExtPhpDevGuideSamplesFeature>2</Condition>
+ <CreateFolder />
+ <iis:WebVirtualDir Id="IIS6PhpDevGuideSampleVDir" Alias="[VIRTUALDIR]/phpsamples" Directory="dir_phpsamples_0" WebSite="IISDefaultWebSite">
+ <iis:WebDirProperties Id="IIS6PhpDevGuideSampleDocument" DefaultDocuments="main.php" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />
+ </iis:WebVirtualDir>
+ </Component>
+
<!-- IIS6 DotNet MapViewer component -->
<Component Id="IIS6DotNetViewerComponent" Win64="$(var.Win64)" Guid="357E1C68-9E29-474F-A783-6F8FD8BCEAB4" Directory="WEBEXTENSIONSLOCATION">
<Condition>NETFRAMEWORK20 AND MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#6"</Condition>
@@ -189,6 +257,36 @@
<iis:WebApplication Id="IIS6MapViewerWebApp" Name="mapviewerajax" WebAppPool="IIS6MapGuideAppPool" />
</iis:WebVirtualDir>
</Component>
+
+ <!-- IIS6 DotNet MapViewer component -->
+ <Component Id="IIS6DotNetViewerComponent2" Win64="$(var.Win64)" Guid="44807D96-F0FB-4D2E-A863-335AA034ECB4" Directory="WEBEXTENSIONSLOCATION">
+ <Condition>NETFRAMEWORK20 AND MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#6"</Condition>
+ <CreateFolder />
+ <iis:WebVirtualDir Id="IIS6DotNetViewerVDir2" Alias="[VIRTUALDIR]/mapviewernet" Directory="dir_mapviewernet_0" WebSite="IISDefaultWebSite">
+ <iis:WebDirProperties Id="IIS6DotNetViewerDocument2" DefaultDocuments="ajaxviewer.aspx" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />
+ <iis:WebApplication Id="IIS6MapViewerWebApp2" Name="mapviewernet" WebAppPool="IIS6MapGuideAppPool" />
+ </iis:WebVirtualDir>
+ </Component>
+
+ <!-- IIS6 DotNet Viewer Sample component -->
+ <Component Id="IIS6DotNetViewerSampleComponent" Win64="$(var.Win64)" Guid="E2330508-5E84-4451-9D34-F813B452039D" Directory="WEBEXTENSIONSLOCATION">
+ <Condition>NETFRAMEWORK20 AND MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#6" AND &WebExtDotNetViewerSampleFeature>2</Condition>
+ <CreateFolder />
+ <iis:WebVirtualDir Id="IIS6DotNetViewerSampleVDir" Alias="[VIRTUALDIR]/dotnetviewersample" Directory="dir_dotnetviewersample_0" WebSite="IISDefaultWebSite">
+ <iis:WebDirProperties Id="IIS6DotNetViewerSampleDocument" DefaultDocuments="ajaxviewersample.aspx" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />
+ <iis:WebApplication Id="IIS6DotNetViewerSampleWebApp" Name="dotnetviewersample" WebAppPool="IIS6MapGuideAppPool" />
+ </iis:WebVirtualDir>
+ </Component>
+
+ <!-- IIS6 DotNet DevGuide Sample component -->
+ <Component Id="IIS6DotNetDevGuideSampleComponent" Win64="$(var.Win64)" Guid="71EDDC8E-A1BA-4c69-B7E3-F52E32FB3CA1" Directory="WEBEXTENSIONSLOCATION">
+ <Condition>NETFRAMEWORK20 AND MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#6" AND &WebExtDotNetDevGuideSamplesFeature>2</Condition>
+ <CreateFolder />
+ <iis:WebVirtualDir Id="IIS6DotNetDevGuideSampleVDir" Alias="[VIRTUALDIR]/dotnetsamples" Directory="dir_dotnetsamples_0" WebSite="IISDefaultWebSite">
+ <iis:WebDirProperties Id="IIS6DotNetDevGuideSampleDocument" DefaultDocuments="main.aspx" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />
+ <iis:WebApplication Id="IIS6DotNetDevGuideSampleWebApp" Name="dotnetsamples" WebAppPool="IIS6MapGuideAppPool" />
+ </iis:WebVirtualDir>
+ </Component>
</Feature>
</Fragment>
</Wix>
\ No newline at end of file
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/IIS7.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/IIS7.wxs 2012-01-12 11:12:55 UTC (rev 6422)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/IIS7.wxs 2012-01-12 12:14:46 UTC (rev 6423)
@@ -122,6 +122,11 @@
Value="[AppCmd] set app "[MG_WEBSITE]/[VIRTUALDIR]/mapviewerajax" /applicationPool:"[APP_POOL_NAME]"" />
<CustomAction Id="MapGuideIIS7_I_AssignViewerAppPoolPhp" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
+ <!--
+ PHP viewer/devguide samples fortunately do not require explicit set up in IIS7, as they should inherit
+ the parent virtual dir settings, which know how to process PHP files
+ -->
+
<!-- ************************* IIS7 ASP.Net Viewer INSTALL ***************************************** -->
<!-- Create the MapAgent application -->
@@ -139,6 +144,51 @@
Value="[AppCmd] set app "[MG_WEBSITE]/[VIRTUALDIR]/mapviewerajax" /applicationPool:"[APP_POOL_NAME]"" />
<CustomAction Id="MapGuideIIS7_I_AssignViewerAppPoolNet" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
+ <!-- Create the mapviewernet application -->
+ <CustomAction Id="MapGuideIIS7_I_CreateMapViewerNet_Cmd" Property="MapGuideIIS7_I_CreateMapViewerNet" Execute="immediate"
+ Value="[AppCmd] add app /site.name:"[MG_WEBSITE]" /path:"/[VIRTUALDIR]/mapviewernet" /physicalPath:"[WEBEXTENSIONSLOCATION]www\mapviewernet"" />
+ <CustomAction Id="MapGuideIIS7_I_CreateMapViewerNet" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
+
+ <!-- Set the default document for mapviewernet to ajaxviewer.aspx -->
+ <CustomAction Id="MapGuideIIS7_I_SetMapViewerDocNet_Cmd" Property="MapGuideIIS7_I_SetMapViewerDocNet" Execute="immediate"
+ Value="[AppCmd] set config "[MG_WEBSITE]/[VIRTUALDIR]/mapviewernet" /section:defaultDocument /+files.[\[]value='ajaxviewer.aspx'[\]]" />
+ <CustomAction Id="MapGuideIIS7_I_SetMapViewerDocNet" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
+
+ <!-- Make the mapviewernet application run in the MapGuide app pool -->
+ <CustomAction Id="MapGuideIIS7_I_AssignMapViewerAppPoolNet_Cmd" Property="MapGuideIIS7_I_AssignMapViewerAppPoolNet" Execute="immediate"
+ Value="[AppCmd] set app "[MG_WEBSITE]/[VIRTUALDIR]/mapviewernet" /applicationPool:"[APP_POOL_NAME]"" />
+ <CustomAction Id="MapGuideIIS7_I_AssignMapViewerAppPoolNet" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
+
+ <!-- Create the dotnetviewersample application -->
+ <CustomAction Id="MapGuideIIS7_I_CreateViewerSampleNet_Cmd" Property="MapGuideIIS7_I_CreateViewerSampleNet" Execute="immediate"
+ Value="[AppCmd] add app /site.name:"[MG_WEBSITE]" /path:"/[VIRTUALDIR]/dotnetviewersample" /physicalPath:"[WEBEXTENSIONSLOCATION]www\dotnetviewersample"" />
+ <CustomAction Id="MapGuideIIS7_I_CreateViewerSampleNet" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
+
+ <!-- Set the default document for dotnetviewersample to ajaxviewersample.aspx -->
+ <CustomAction Id="MapGuideIIS7_I_SetViewerDocViewerSampleNet_Cmd" Property="MapGuideIIS7_I_SetViewerDocViewerSampleNet" Execute="immediate"
+ Value="[AppCmd] set config "[MG_WEBSITE]/[VIRTUALDIR]/dotnetviewersample" /section:defaultDocument /+files.[\[]value='ajaxviewersample.aspx'[\]]" />
+ <CustomAction Id="MapGuideIIS7_I_SetViewerDocViewerSampleNet" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
+
+ <!-- Make the dotnetviewersample application run in the MapGuide app pool -->
+ <CustomAction Id="MapGuideIIS7_I_AssignViewerAppPoolViewerSampleNet_Cmd" Property="MapGuideIIS7_I_AssignViewerAppPoolViewerSampleNet" Execute="immediate"
+ Value="[AppCmd] set app "[MG_WEBSITE]/[VIRTUALDIR]/dotnetviewersample" /applicationPool:"[APP_POOL_NAME]"" />
+ <CustomAction Id="MapGuideIIS7_I_AssignViewerAppPoolViewerSampleNet" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
+
+ <!-- Create the dotnetsamples application -->
+ <CustomAction Id="MapGuideIIS7_I_CreateViewerDevGuideSamplesNet_Cmd" Property="MapGuideIIS7_I_CreateViewerDevGuideSamplesNet" Execute="immediate"
+ Value="[AppCmd] add app /site.name:"[MG_WEBSITE]" /path:"/[VIRTUALDIR]/dotnetsamples" /physicalPath:"[WEBEXTENSIONSLOCATION]www\dotnetsamples"" />
+ <CustomAction Id="MapGuideIIS7_I_CreateViewerDevGuideSamplesNet" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
+
+ <!-- Set the default document for dotnetsamples to main.aspx -->
+ <CustomAction Id="MapGuideIIS7_I_SetViewerDocDevGuideSamplesNet_Cmd" Property="MapGuideIIS7_I_SetViewerDocDevGuideSamplesNet" Execute="immediate"
+ Value="[AppCmd] set config "[MG_WEBSITE]/[VIRTUALDIR]/dotnetsamples" /section:defaultDocument /+files.[\[]value='main.aspx'[\]]" />
+ <CustomAction Id="MapGuideIIS7_I_SetViewerDocDevGuideSamplesNet" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
+
+ <!-- Make the dotnetsamples application run in the MapGuide app pool -->
+ <CustomAction Id="MapGuideIIS7_I_AssignViewerAppPoolDevGuideSamplesNet_Cmd" Property="MapGuideIIS7_I_AssignViewerAppPoolDevGuideSamplesNet" Execute="immediate"
+ Value="[AppCmd] set app "[MG_WEBSITE]/[VIRTUALDIR]/dotnetsamples" /applicationPool:"[APP_POOL_NAME]"" />
+ <CustomAction Id="MapGuideIIS7_I_AssignViewerAppPoolDevGuideSamplesNet" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
+
<!-- ************************* IIS7 All Features UNINSTALL ***************************************** -->
<CustomAction Id="MapGuideIIS7_U_AppCmd_Cmd" Property="AppCmd" Execute="immediate" Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE"" />
@@ -153,6 +203,16 @@
Value="[AppCmd] delete app "[MG_WEBSITE]/[VIRTUALDIR]/mapviewerajax"" />
<CustomAction Id="MapGuideIIS7_U_RemoveViewer" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
+ <!-- Remove dotnetsamples application -->
+ <CustomAction Id="MapGuideIIS7_U_RemoveDotNetSamples_Cmd" Property="MapGuideIIS7_U_RemoveDotNetSamples" Execute="immediate"
+ Value="[AppCmd] delete app "[MG_WEBSITE]/[VIRTUALDIR]/dotnetsamples"" />
+ <CustomAction Id="MapGuideIIS7_U_RemoveDotNetSamples" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
+
+ <!-- Remove dotnetviewersample application -->
+ <CustomAction Id="MapGuideIIS7_U_RemoveDotNetViewerSample_Cmd" Property="MapGuideIIS7_U_RemoveDotNetViewerSample" Execute="immediate"
+ Value="[AppCmd] delete app "[MG_WEBSITE]/[VIRTUALDIR]/dotnetviewersample"" />
+ <CustomAction Id="MapGuideIIS7_U_RemoveDotNetViewerSample" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
+
<!-- Remove MapAgent application -->
<CustomAction Id="MapGuideIIS7_U_RemoveMapAgent_Cmd" Property="MapGuideIIS7_U_RemoveMapAgent" Execute="immediate"
Value="[AppCmd] delete app "[MG_WEBSITE]/[VIRTUALDIR]/mapagent"" />
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_en-US.wxl
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_en-US.wxl 2012-01-12 11:12:55 UTC (rev 6422)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_en-US.wxl 2012-01-12 12:14:46 UTC (rev 6423)
@@ -20,8 +20,18 @@
<String Id="WebExtMapViewerASPXFeature_Description">The .NET version of the map viewer.</String>
<String Id="WebExtSamplesFeature">Samples</String>
<String Id="WebExtSamplesFeature_Description">Sample code and data</String>
- <String Id="WebExtDevGuideSamplesFeature">Developer's Guide Sample Code</String>
- <String Id="WebExtDevGuideSamplesFeature_Description">PHP sample code from the MapGuide Developer's Guide. This requires the Sheboygan sample data.</String>
+ <String Id="WebExtPhpDevGuideSamplesFeature">Developer's Guide Sample Code (PHP)</String>
+ <String Id="WebExtPhpDevGuideSamplesFeature_Description">PHP sample code from the MapGuide Developer's Guide. This requires the Sheboygan sample data.</String>
+ <String Id="WebExtJavaDevGuideSamplesFeature">Developer's Guide Sample Code (Java)</String>
+ <String Id="WebExtJavaDevGuideSamplesFeature_Description">Java sample code from the MapGuide Developer's Guide. This requires the Sheboygan sample data.</String>
+ <String Id="WebExtDotNetDevGuideSamplesFeature">Developer's Guide Sample Code (.net)</String>
+ <String Id="WebExtDotNetDevGuideSamplesFeature_Description">.net sample code from the MapGuide Developer's Guide. This requires the Sheboygan sample data.</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 (.net)</String>
+ <String Id="WebExtDotNetViewerSampleFeature_Description">Viewer Sample code (.net)</String>
<String Id="WebLocalizedFeature">Localization Files</String>
<String Id="WebLocalizedFeature_Description">Localization files for the web tier</String>
<String Id="WebFusionFeature">Fusion</String>
@@ -38,6 +48,13 @@
<String Id="WebTempFeature_Description">You may choose a location where MapGuide will store temporary files.</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_WikiHelp">Autodesk WikiHelp</String>
<String Id="Shortcut_ViewerAPI">Viewer API Documentation</String>
<String Id="Shortcut_SiteAdmin">MapGuide Site Administrator</String>
<String Id="Shortcut_MapAgent">MapAgent Test Pages</String>
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_es-ES.wxl
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_es-ES.wxl 2012-01-12 11:12:55 UTC (rev 6422)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_es-ES.wxl 2012-01-12 12:14:46 UTC (rev 6423)
@@ -20,8 +20,18 @@
<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="WebExtDevGuideSamplesFeature">Developer's Guide Código de muestra</String>
- <String Id="WebExtDevGuideSamplesFeature_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="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>
@@ -38,6 +48,13 @@
<String Id="WebTempFeature_Description">Usted puede elegir un lugar donde MapGuide almacenará los archivos temporales</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_SiteAdmin">MapGuide administrador del sitio</String>
<String Id="Shortcut_MapAgent">MapAgent Páginas de prueba</String>
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/MapGuide Web Extensions.wixproj
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/MapGuide Web Extensions.wixproj 2012-01-12 11:12:55 UTC (rev 6422)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/MapGuide Web Extensions.wixproj 2012-01-12 12:14:46 UTC (rev 6423)
@@ -24,9 +24,12 @@
<ItemGroup>
<Compile Include="Apache.wxs" />
<Compile Include="FileIncludes\incApacheFiles.wxs" />
- <Compile Include="FileIncludes\incDevGuideFiles.wxs" />
+ <Compile Include="FileIncludes\incDotNetDevGuideFiles.wxs" />
+ <Compile Include="FileIncludes\incDotNetViewerSampleFiles.wxs" />
<Compile Include="FileIncludes\incFusionFiles.wxs" />
<Compile Include="FileIncludes\incHelpFiles.wxs" />
+ <Compile Include="FileIncludes\incJavaDevGuideFiles.wxs" />
+ <Compile Include="FileIncludes\incJavaViewerSampleFiles.wxs" />
<Compile Include="FileIncludes\incMapAgentFiles.wxs" />
<Compile Include="FileIncludes\incMapViewerAspxFiles.wxs" />
<Compile Include="FileIncludes\incMapViewerFiles.wxs" />
@@ -36,7 +39,9 @@
<Compile Include="FileIncludes\incMapViewerPhpFiles.wxs" />
<Compile Include="FileIncludes\incMapViewerSchemareportFiles.wxs" />
<Compile Include="FileIncludes\incMapViewerStdiconFiles.wxs" />
+ <Compile Include="FileIncludes\incPhpDevGuideFiles.wxs" />
<Compile Include="FileIncludes\incPhpFiles.wxs" />
+ <Compile Include="FileIncludes\incPhpViewerSampleFiles.wxs" />
<Compile Include="FileIncludes\incTomcatFiles.wxs" />
<Compile Include="FileIncludes\incWebInfFiles.wxs" />
<Compile Include="FileIncludes\incWebRootFiles.wxs" />
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs 2012-01-12 11:12:55 UTC (rev 6422)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs 2012-01-12 12:14:46 UTC (rev 6423)
@@ -176,9 +176,32 @@
<!-- This is required because a UI bug displays the feature as network-installable if there are no folders or files. -->
<CreateFolder />
</Component>
- <Feature Id="WebExtDevGuideSamplesFeature" Title="!(loc.WebExtDevGuideSamplesFeature)" Level="1" Description="!(loc.WebExtDevGuideSamplesFeature_Description)" AllowAdvertise="no" TypicalDefault="install" InstallDefault="local">
- <ComponentGroupRef Id="group_DEVGUIDEFILES" />
+ <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>
<Feature Id="WebLocalizedFeature" Title="!(loc.WebLocalizedFeature)" Display="hidden" Level="1" Description="!(loc.WebLocalizedFeature_Description)" AllowAdvertise="no" TypicalDefault="install" InstallDefault="local">
<ComponentGroupRef Id="group_MAPVIEWERLOCALIZEDFILES" />
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs 2012-01-12 11:12:55 UTC (rev 6422)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs 2012-01-12 12:14:46 UTC (rev 6423)
@@ -71,6 +71,58 @@
KeyPath="yes" />
</RegistryKey>
</Component>
+ <Component Id="WebApachePHPViewerSampleShortcutComponent" Win64="$(var.Win64)" Guid="E3D81381-6B4A-41AD-B83A-CE686455D3DC">
+ <Condition>MGWEB_CONFIG="APACHE" AND &WebExtPhpViewerSampleFeature>2</Condition>
+ <util:InternetShortcut Id="ApachePhpViewerSampleShortcut"
+ Directory="MapGuideOpenSourceMenuLocation"
+ Name="!(loc.Shortcut_PhpViewerSample)"
+ Target="http://localhost:[APACHE_PORT]/[VIRTUALDIR]/phpviewersample/ajaxviewer.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" AND &WebExtPhpDevGuideSamplesFeature>2</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" AND &WebExtJavaViewerSampleFeature>2</Condition>
+ <util:InternetShortcut Id="ApacheJavaViewerSampleShortcut"
+ Directory="MapGuideOpenSourceMenuLocation"
+ Name="!(loc.Shortcut_JavaViewerSample)"
+ Target="http://localhost:[APACHE_PORT]/[VIRTUALDIR]/javaviewersample/ajaxviewer.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" AND &WebExtJavaDevGuideSamplesFeature>2</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="IISWebApiShortcutComponent" Win64="$(var.Win64)" Guid="DFA7D99A-3760-4072-9510-7EC5D658FB5F">
<Condition>MGWEB_CONFIG="IIS"</Condition>
<CreateFolder />
@@ -99,6 +151,58 @@
KeyPath="yes" />
</RegistryKey>
</Component>
+ <Component Id="WebIISPHPViewerSampleShortcutComponent" Win64="$(var.Win64)" Guid="F1B2C345-52F8-4179-8CDC-34D2D3E22418">
+ <Condition>MGWEB_CONFIG="IIS" AND &WebExtPhpViewerSampleFeature>2</Condition>
+ <util:InternetShortcut Id="IISPhpViewerSampleShortcut"
+ Directory="MapGuideOpenSourceMenuLocation"
+ Name="!(loc.Shortcut_PhpViewerSample)"
+ Target="http://localhost/[VIRTUALDIR]/phpviewersample/ajaxviewer.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" AND &WebExtPhpDevGuideSamplesFeature>2</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" AND &WebExtDotNetViewerSampleFeature>2</Condition>
+ <util:InternetShortcut Id="IISDotNetViewerSampleShortcut"
+ Directory="MapGuideOpenSourceMenuLocation"
+ Name="!(loc.Shortcut_DotNetViewerSample)"
+ Target="http://localhost/[VIRTUALDIR]/dotnetviewersample/ajaxviewer.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" AND &WebExtDotNetDevGuideSamplesFeature>2</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="WebIISShortcutComponent" Win64="$(var.Win64)" Guid="F59A450A-84DE-4E2E-B942-BD416CDEBBF3">
<Condition>MGWEB_CONFIG="IIS"</Condition>
<util:InternetShortcut Id="IISSiteAdmin"
@@ -130,11 +234,15 @@
<util:InternetShortcut Id="MapGuideTrac"
Directory="WebResourcesLocation"
Name="!(loc.Shortcut_Trac)"
- Target="http://trac.osgeo.org" />
+ Target="http://trac.osgeo.org/mapguide" />
<util:InternetShortcut Id="MapGuideBestPractices"
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/2012" />
<util:InternetShortcut Id="MapGuideCentral"
Directory="WebResourcesLocation"
Name="!(loc.Shortcut_MapGuideCentral)"
Modified: trunk/Installer/build.bat
===================================================================
--- trunk/Installer/build.bat 2012-01-12 11:12:55 UTC (rev 6422)
+++ trunk/Installer/build.bat 2012-01-12 12:14:46 UTC (rev 6423)
@@ -8,7 +8,7 @@
rem value of INSTALLER_OUTPUT defined in this file
rem
rem Requirements:
-rem 1. Wix 3.0 (latest beta) (http://wix.sourceforge.net)
+rem 1. Wix 3.0 (http://wix.codeplex.com)
rem 2. Paraffin (http://www.wintellect.com/CS/blogs/jrobbins/archive/2008/12/22/paraffin-3-0-now-with-full-wix-3-0-support.aspx)
rem
rem Usage:
@@ -313,10 +313,30 @@
%PARAFFIN% %WIX_INC_WEB%\incHelpFiles.wxs
move /Y %WIX_INC_WEB%\incHelpFiles.PARAFFIN %WIX_INC_WEB%\incHelpFiles.wxs
-echo [regen]: Web - devguide
-%PARAFFIN% %WIX_INC_WEB%\incDevGuideFiles.wxs
-move /Y %WIX_INC_WEB%\incDevGuideFiles.PARAFFIN %WIX_INC_WEB%\incDevGuideFiles.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 - mapagent
%PARAFFIN% %WIX_INC_WEB%\incMapAgentFiles.wxs
move /Y %WIX_INC_WEB%\incMapAgentFiles.PARAFFIN %WIX_INC_WEB%\incMapAgentFiles.wxs
@@ -358,7 +378,7 @@
:generate
echo [generate]: MapGuide Installer
-SET PARAFFIN=paraffin.exe -guids -direXclude .svn
+SET PARAFFIN=paraffin.exe -guids
SET WIX_INC_SERVER="%INSTALLER_DEV%\Libraries\MapGuide Server\FileIncludes"
SET WIX_INC_WEB="%INSTALLER_DEV%\Libraries\MapGuide Web Extensions\FileIncludes"
@@ -400,9 +420,24 @@
echo [generate]: Web - Help
%PARAFFIN% -dir %MG_SOURCE%\Web\www\help -alias $(var.MgSource)\Web\www\help -custom HELPFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incHelpFiles.wxs
-echo [generate]: Web - Developer's Guide Samples
-%PARAFFIN% -dir %MG_SOURCE%\Web\www\phpsamples -alias $(var.MgSource)\Web\www\phpsamples -custom DEVGUIDEFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incDevGuideFiles.wxs
+echo [generate]: Web - Developer's Guide Samples (PHP)
+%PARAFFIN% -dir %MG_SOURCE%\Web\www\phpsamples -alias $(var.MgSource)\Web\www\phpsamples -custom PHPDEVGUIDEFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incPhpDevGuideFiles.wxs
+echo [generate]: Web - Developer's Guide Samples (Java)
+%PARAFFIN% -dir %MG_SOURCE%\Web\www\javasamples -alias $(var.MgSource)\Web\www\javasamples -custom JAVADEVGUIDEFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incJavaDevGuideFiles.wxs
+
+echo [generate]: Web - Developer's Guide Samples (DotNet)
+%PARAFFIN% -dir %MG_SOURCE%\Web\www\dotnetsamples -alias $(var.MgSource)\Web\www\dotnetsamples -custom DOTNETDEVGUIDEFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incDotNetDevGuideFiles.wxs
+
+echo [generate]: Web - Developer's Guide Samples (PHP)
+%PARAFFIN% -dir %MG_SOURCE%\Web\www\phpviewersample -alias $(var.MgSource)\Web\www\phpviewersample -custom PHPVIEWERSAMPLEFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incPhpViewerSampleFiles.wxs
+
+echo [generate]: Web - Developer's Guide Samples (Java)
+%PARAFFIN% -dir %MG_SOURCE%\Web\www\javaviewersample -alias $(var.MgSource)\Web\www\javaviewersample -custom JAVAVIEWERSAMPLEFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incJavaViewerSampleFiles.wxs
+
+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 - mapagent
%PARAFFIN% -dir %MG_SOURCE%\Web\www\mapagent -alias $(var.MgSource)\Web\www\mapagent -custom MAPAGENTFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incMapAgentFiles.wxs
Modified: trunk/Installer/build64.bat
===================================================================
--- trunk/Installer/build64.bat 2012-01-12 11:12:55 UTC (rev 6422)
+++ trunk/Installer/build64.bat 2012-01-12 12:14:46 UTC (rev 6423)
@@ -8,7 +8,7 @@
rem value of INSTALLER_OUTPUT defined in this file
rem
rem Requirements:
-rem 1. Wix 3.0 (latest beta) (http://wix.sourceforge.net)
+rem 1. Wix 3.5 (http://wix.codeplex.com)
rem 2. Paraffin (http://www.wintellect.com/CS/blogs/jrobbins/archive/2008/12/22/paraffin-3-0-now-with-full-wix-3-0-support.aspx)
rem
rem Usage:
@@ -361,7 +361,7 @@
:generate
echo [generate]: MapGuide Installer
-SET PARAFFIN=paraffin.exe -Win64 -guids -direXclude .svn
+SET PARAFFIN=paraffin.exe -Win64 -guids
SET WIX_INC_SERVER="%INSTALLER_DEV%\Libraries\MapGuide Server\FileIncludes"
SET WIX_INC_WEB="%INSTALLER_DEV%\Libraries\MapGuide Web Extensions\FileIncludes"
More information about the mapguide-commits
mailing list