[mapguide-commits] r9715 - in trunk/Installer: . Libraries/MapGuide Web Extensions Libraries/MapGuide Web Extensions/Lang

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Fri Aug 14 05:55:52 PDT 2020 

Author: jng
Date: 2020-08-14 05:55:52 -0700 (Fri, 14 Aug 2020)
New Revision: 9715

Modified:
   trunk/Installer/Features.xml
   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/build.bat
Log:
#2811: Include MgDevHttpServer binaries in Windows installer

Modified: trunk/Installer/Features.xml
===================================================================
--- trunk/Installer/Features.xml	2020-08-14 12:07:34 UTC (rev 9714)
+++ trunk/Installer/Features.xml	2020-08-14 12:55:52 UTC (rev 9715)
@@ -8,4 +8,6 @@
   <IdentifierOverride Pattern="Apache24\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" />
+  <IdentifierOverride Pattern="DevHttpServer\MgDevHttpServer.exe" Identifier="DEV_HTTP_SERVER_EXE" />
+  <IdentifierOverride Pattern="www\webconfig.ini" Identifier="WEB_CONFIG_INI" />
 </FeatureMap>
\ 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	2020-08-14 12:07:34 UTC (rev 9714)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_en-US.wxl	2020-08-14 12:55:52 UTC (rev 9715)
@@ -8,6 +8,8 @@
     <String Id="WebExtPhpFeature_Description">A bundled version of PHP with MapGuide enabled.</String>
     <String Id="WebExtTomcatFeature">Tomcat</String>
     <String Id="WebExtTomcatFeature_Description">A bundled version of Tomcat with MapGuide enabled.</String>
+    <String Id="WebDevHttpServerFeature">Development HTTP Server</String>
+    <String Id="WebDevHttpServerFeature_Description">A simple development HTTP server to easily spin up a mapagent or static HTML/JS content for development/testing without IIS or Apache</String>
     <String Id="WebExtHelpFeature">API Help</String>
     <String Id="WebExtHelpFeature_Description">Web Extension API documentation</String>
     <String Id="WebExtMapViewerFeature">Map Viewer files</String>
@@ -62,4 +64,5 @@
     <String Id="Shortcut_GetMaestro">Get MapGuide Maestro</String>
     <String Id="Shortcut_MapGuide">MapGuide Project Home</String>
     <String Id="Shortcut_Trac">MapGuide Trac</String>
+    <String Id="Shortcut_DevHttpServer">Start MapGuide Development HTTP Server</String>
 </WixLocalization>
\ No newline at end of file

Modified: trunk/Installer/Libraries/MapGuide Web Extensions/MapGuide Web Extensions.wixproj
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/MapGuide Web Extensions.wixproj	2020-08-14 12:07:34 UTC (rev 9714)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/MapGuide Web Extensions.wixproj	2020-08-14 12:55:52 UTC (rev 9715)
@@ -55,6 +55,7 @@
     <Compile Include="FileIncludes\incPhpFiles.wxs" />
     <Compile Include="FileIncludes\incPhpViewerSampleFiles.wxs" />
     <Compile Include="FileIncludes\incTomcatFiles.wxs" />
+    <Compile Include="FileIncludes\incDevHttpServerFiles.wxs" />
     <Compile Include="FileIncludes\incWebInfFiles.wxs" />
     <Compile Include="FileIncludes\incWebRootFiles.wxs" />
     <Compile Include="IIS7.wxs" />

Modified: trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs	2020-08-14 12:07:34 UTC (rev 9714)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs	2020-08-14 12:55:52 UTC (rev 9715)
@@ -156,6 +156,7 @@
                     </Component>
                 </Directory>
                 <Directory Id="TOMCATLOCATION" Name="Tomcat" />
+                <Directory Id="DEVHTTPSERVERLOCATION" Name="DevHttpServer" />
             </Directory>
         </DirectoryRef>
         <Feature Id="WebExtensionsFeature" Title="!(loc.WebExtensionsFeature)" Level="1" Description="!(loc.WebExtensionsFeature_Description)" AllowAdvertise="no" TypicalDefault="install" InstallDefault="local">
@@ -178,6 +179,10 @@
             <Feature Id="WebExtTomcatFeature" Title="!(loc.WebExtTomcatFeature)" Level="1" Description="!(loc.WebExtTomcatFeature_Description)" AllowAdvertise="no" TypicalDefault="install" InstallDefault="local" >
               <ComponentGroupRef Id="group_TOMCATFILES"/>
             </Feature>
+            <Feature Id="WebDevHttpServerFeature" Title="!(loc.WebDevHttpServerFeature)" Level="1" Description="!(loc.WebDevHttpServerFeature_Description)" AllowAdvertise="no" TypicalDefault="install" InstallDefault="local" >
+              <ComponentGroupRef Id="group_DEVHTTPSERVER"/>
+              <ComponentRef Id="DevHttpServerShortcutComponent"/>
+            </Feature>
             <Feature Id="WebExtHelpFeature" Title="!(loc.WebExtHelpFeature)" Level="1" Description="!(loc.WebExtHelpFeature_Description)" AllowAdvertise="no" TypicalDefault="install" InstallDefault="local">
                 <ComponentGroupRef Id="group_HELPFILES" />
                 <ComponentRef Id="ApacheWebApiShortcutComponent"/>

Modified: trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs	2020-08-14 12:07:34 UTC (rev 9714)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs	2020-08-14 12:55:52 UTC (rev 9715)
@@ -220,6 +220,18 @@
               KeyPath="yes" />
           </RegistryKey>
         </Component>
+        <Component Id="DevHttpServerShortcutComponent" Win64="$(var.Win64)" Guid="3517d6df-a723-4fb0-ac21-5b5de3a5cff3">
+          <!-- 
+            HACK: I'd prefer not to use relative paths below, but the variables for the paths in question
+            area "owned" by a different component, preventing their use here
+          -->
+          <Shortcut Id="DevHttpServerShortcut" 
+                  Name="!(loc.Shortcut_DevHttpServer)"
+                  Target="[#DEV_HTTP_SERVER_EXE]"
+                  Arguments="-p 8028 -r ..\www -w ..\www\webconfig.ini"
+                  WorkingDirectory="DEVHTTPSERVERLOCATION"/>
+          <RegistryValue Root="HKCU" Key="$(var.MgRegKey)\DevHttpServerShortcut" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
+        </Component>
         <Directory Id="WebResourcesLocation" Name="Web Resources">
           <Component Id="WebShortcutsComponent" Win64="$(var.Win64)" Guid="7D2E24E9-533B-4119-A6D1-E48A33BF34C3">
             <CreateFolder />

Modified: trunk/Installer/build.bat
===================================================================
--- trunk/Installer/build.bat	2020-08-14 12:07:34 UTC (rev 9714)
+++ trunk/Installer/build.bat	2020-08-14 12:55:52 UTC (rev 9715)
@@ -261,6 +261,9 @@
 echo [generate]: Web - Tomcat
 %PARAFFIN% -dir %MG_SOURCE%\Web\Tomcat -alias $(var.MgSource)\Web\Tomcat -custom TOMCATFILES -dirref WEBEXTENSIONSLOCATION %WIX_INC_WEB%\incTomcatFiles.wxs
 
+echo [generate]: Web - DevHttpServer
+%PARAFFIN% -dir %MG_SOURCE%\Web\DevHttpServer -alias $(var.MgSource)\Web\DevHttpServer -custom DEVHTTPSERVER -dirref WEBEXTENSIONSLOCATION %WIX_INC_WEB%\incDevHttpServerFiles.wxs
+
 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

More information about the mapguide-commits mailing list