Use fastzip

cvent · Nov 3, 2016 · 79bcbaa · 79bcbaa
1 parent 1b334b9
commit 79bcbaa
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/omnibus/config/projects/workup.rb b/omnibus/config/projects/workup.rb
@@ -33,7 +33,7 @@
 
 project_location_dir = name
 package :msi do
-  fast_msi false
+  fast_msi true
   upgrade_code '769d8737-c798-49d1-bab0-0a31da3ee7df'.capitalize
   parameters ProjectLocationDir: project_location_dir
 end
diff --git a/omnibus/resources/workup/msi/source.wxs.erb b/omnibus/resources/workup/msi/source.wxs.erb
@@ -71,13 +71,15 @@
 
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="WINDOWSVOLUME">
-        <Directory Id="PROJECTLOCATION" Name="$(var.ProjectLocationDir)" >
-          <Directory Id="PROJECTLOCATIONBIN" Name="bin" >
-            <Component Id="WorkupPath" Guid="{6AA58B6A-148B-4C4D-8879-A29359AD0BA7}" >
-              <CreateFolder />
-              <Environment Id="WorkupPathEnvironment"
-                           Name="PATH" Action="set" Part="last" System="yes" Value="[PROJECTLOCATIONBIN]" />
-            </Component>
+        <Directory Id="INSTALLLOCATION" Name="cvent">
+          <Directory Id="PROJECTLOCATION" Name="$(var.ProjectLocationDir)">
+            <Directory Id="PROJECTLOCATIONBIN" Name="bin">
+              <Component Id="WorkupPath" Guid="{6AA58B6A-148B-4C4D-8879-A29359AD0BA7}">
+                <CreateFolder />
+                <Environment Id="WorkupPathEnvironment"
+                             Name="PATH" Action="set" Part="last" System="yes" Value="[PROJECTLOCATIONBIN]" />
+              </Component>
+            </Directory>
           </Directory>
         </Directory>
       </Directory>

diff --git a/omnibus/workup_build/test/integration/default/workup_spec.rb b/omnibus/workup_build/test/integration/default/workup_spec.rb
@@ -13,7 +13,7 @@ def env(cmd, **options)
 
 case os.family
 when 'windows'
- workup_bin = 'C:/workup/bin/workup.bat'
+ workup_bin = 'C:/cvent/workup/bin/workup.bat'
  policyfile_git = '${env:USERPROFILE}/.workup/Policyfile_git.rb'
 else
  workup_bin = '/usr/local/bin/workup'