Revert 157716 - [Chromoting] Build Chromoting Host installation in two steps: (binaries & .wxs) -> .zip -> .msi.

The two step process is needed so that we could take the produced .zip and use it to sign the binaries and installation on a separate machine. Decompiling .msi using dark proved to be a bad idea due to bugs in dark.exe.

BUG=146863


Review URL: https://chromiumcodereview.appspot.com/10948050

TBR=alexeypa@chromium.org
Review URL: https://codereview.chromium.org/10956010

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

2 files changed, 19 insertions, 28 deletions

diff --git a/remoting/host/win/chromoting.wxs b/remoting/host/win/chromoting.wxs
index 63e8008..7f21eef 100644
--- a/remoting/host/win/chromoting.wxs
+++ b/remoting/host/win/chromoting.wxs
@@ -47,6 +47,18 @@
     <?error ControllerClsid must be defined ?>
   <?endif?>
 
+  <?ifndef FileSource ?>
+    <?error FileSource must be defined ?>
+  <?endif?>
+
+  <?ifndef IconPath ?>
+    <?error IconPath must be defined ?>
+  <?endif?>
+
+  <?ifndef SasDllPath ?>
+    <?error SasDllPath must be defined ?>
+  <?endif?>
+
   <?ifndef Version ?>
     <?error Version must be defined ?>
   <?endif?>
@@ -99,7 +111,7 @@
 
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="ProgramFilesFolder">
-        <?if $(var.OfficialBuild) != 0 ?>
+        <?ifdef OfficialBuild ?>
           <Directory Id="program_files_google" Name="Google">
             <Directory Id="chromoting" Name="Chrome Remote Desktop">
               <Directory Id="binaries" Name="$(var.Version)"/>
@@ -112,7 +124,7 @@
         <?endif?>
       </Directory>
       <Directory Id="CommonAppDataFolder">
-        <?if $(var.OfficialBuild) != 0 ?>
+        <?ifdef OfficialBuild ?>
           <Directory Id="common_app_data_google" Name="Google">
             <Directory Id="config_files" Name="Chrome Remote Desktop"/>
           </Directory>
@@ -122,11 +134,12 @@
       </Directory>
     </Directory>
 
-    <DirectoryRef Id="binaries">
+    <DirectoryRef Id="binaries" FileSource="$(var.FileSource)">
       <Component Id="sas" Guid="*">
         <File Id="sas.dll"
               DiskId="1"
               Name="sas.dll"
+              Source="$(var.SasDllPath)"
               Vital="yes"/>
       </Component>
 
@@ -189,7 +202,7 @@
                                 Scope="any" />
       </Component>
 
-      <?if $(var.OfficialBuild) != 0 ?>
+      <?ifdef OfficialBuild ?>
         <Component Id="omaha_registration" Guid="*">
           <RegistryKey Id="omaha_client_key"
                        Root="HKLM"
@@ -403,7 +416,7 @@
     <UIRef Id="WixUI_ErrorProgressText" />
 
     <Feature Id="chromoting_host" Level="1" Title="$(var.ChromotingHost)">
-      <?if $(var.OfficialBuild) != 0 ?>
+      <?ifdef OfficialBuild ?>
         <ComponentRef Id="omaha_registration"/>
       <?endif?>
       <ComponentRef Id="remoting_controller"/>
@@ -416,7 +429,7 @@
     </Feature>
 
     <!-- Set the icon shown in Add/Remove Programs. -->
-    <Icon Id="chromoting.ico" SourceFile="chromoting.ico"/>
+    <Icon Id="chromoting.ico" SourceFile="$(var.IconPath)"/>
     <Property Id="ARPPRODUCTICON" Value="chromoting.ico" />
 
     <InstallExecuteSequence>
diff --git a/remoting/host/win/parameters.json b/remoting/host/win/parameters.json
deleted file mode 100644
index 9a2deda..0000000
--- a/remoting/host/win/parameters.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "defines": {
-    "Branding": "@@BRANDING@@",
-    "OfficialBuild": "@@OFFICIAL_BUILD@@",
-    "RemotingMultiProcess" : "@@REMOTING_MULTI_PROCESS@@",
-    "ControllerClsid": "@@CONTROLLER_CLSID@@",
-    "Version": "@@VERSION@@"
-  },
-  "extensions": [
-    "WixFirewallExtension.dll",
-    "WixUIExtension.dll",
-    "WixUtilExtension.dll"
-  ],
-  "source": "chromoting.wxs",
-  "bind_path": "files",
-  "light": {
-    "switches": [
-      "-cultures:en-us",
-      "-sw1076"
-    ]
-  }
-}
\ No newline at end of file