Review URL: http://codereview.chromium.org/147089

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19215 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 25 insertions, 1 deletions

diff --git a/o3d/installer/win/build.scons b/o3d/installer/win/build.scons
index 91b4f94..29f72a8 100644
--- a/o3d/installer/win/build.scons
+++ b/o3d/installer/win/build.scons
@@ -126,6 +126,8 @@ o3d_npp_google_update_reg_component_guid = plugin_guid_generator(
 o3d_reporter_guid = plugin_guid_generator('o3d_reporter')
 o3d_driver_blacklist_guid = plugin_guid_generator(
     'o3d_driver_blacklist')
+o3d_software_renderer_guid = plugin_guid_generator(
+    'o3d_software_renderer')
 o3d_npp_google_update_guid = '{70308795-045C-42da-8F4E-D452381A7459}'
 o3d_npp_reg_key = '%s%s' % (google_update_reg_path, o3d_npp_google_update_guid)
 o3d_npp_state_reg_key = '%s%s' % (
@@ -164,8 +166,12 @@ rep_path = env.File('$ARTIFACTS_DIR/reporter.exe')
 dbl_path = env.File('$SCONSTRUCT_DIR/installer/win/driver_blacklist.txt')
 get_extras_path = env.File('$ARTIFACTS_DIR/getextras.exe')
 
+# Tell wix to include the software renderer IFF it's there.
+software_renderer_path = \
+    env.File('$SWIFTSHADER_DIR/swiftshader_d3d9.dll').abspath
+include_software_renderer = os.path.exists(software_renderer_path)
 
-# Path to custiom actions dll.
+# Path to custom actions dll.
 cactions_dll_path = env.File('$ARTIFACTS_DIR/cactions.dll')
 
 # Pass flags to the wix compiler.
@@ -176,6 +182,9 @@ env.Append(WIXCANDLEFLAGS = [
   '-dNppUpgradeCode=' + o3d_npp_upgrade_code,
   '-dNppPackageGuid=' + o3d_npp_package_guid,
   '-dNppComponentGuid=' + o3d_npp_component_guid,
+  '-dSoftwareRendererGuid=' + o3d_software_renderer_guid,
+  '-dSoftwareRendererPath=' + software_renderer_path,
+  '-dIncludeSoftwareRenderer=%s' % include_software_renderer,
   '-dNPPluginPath=' + npplugin_path.abspath,
   '-dIEPluginPath=' + ieplugin_path.abspath,
   '-dIepComponentGuid=' + o3d_iep_component_guid,
diff --git a/o3d/installer/win/o3d_plugin.wxs b/o3d/installer/win/o3d_plugin.wxs
index daaddf6a..5d3f114 100644
--- a/o3d/installer/win/o3d_plugin.wxs
+++ b/o3d/installer/win/o3d_plugin.wxs
@@ -78,6 +78,18 @@ Wix script for building o3d installer.
                     Source='$(var.NPPluginPath)' Vital='yes' />
               <Condition>NOT (ALLUSERS)</Condition>
             </Component>
+            <?if $(var.IncludeSoftwareRenderer) = True ?>
+              <Directory Id='O3DPrivateDllDir' Name='O3D'
+                  LongName='O3DExtras'>
+                <Component Id='SoftwareRenderer'
+                    Guid='$(var.SoftwareRendererGuid)'>
+                    <File Id='renderer' LongName="swiftshader_d3d9.dll"
+                        Vital='yes' DiskId='1' Name="ss_d3d9.dll"
+                        src='$(var.SoftwareRendererPath)' />
+                  <Condition>NOT (ALLUSERS)</Condition>
+                </Component>
+              </Directory>
+            <?endif ?>
           </Directory>
         </Directory>
         <Directory Id='Google' Name='Google'>
@@ -257,6 +269,9 @@ Wix script for building o3d installer.
       <ComponentRef Id='pu.UpdaterReg' />
       <ComponentRef Id='InstallReporter'/>
       <ComponentRef Id='InstallDriverBlacklist'/>
+      <?if $(var.IncludeSoftwareRenderer) = True ?>
+        <ComponentRef Id='SoftwareRenderer'/>
+      <?endif ?>
     </Feature>
 
     <!-- Identify previous versions to remove before installing.  The deprecated