Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GPII-3620: Using 7-zip to compress most files. #54

Open
wants to merge 1 commit into
base: HST
Choose a base branch
from
Open

GPII-3620: Using 7-zip to compress most files. #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added setup/7zr.exe
View file
Open in desktop
Binary file not shown.
8 changes: 8 additions & 0 deletions setup/Product.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,17 @@
<CustomAction Id="RunTrayIcon" ExeCommand="[INSTALLFOLDER]\windows\trayicon.exe morphic-app.exe -show" Directory="INSTALLFOLDER" Return="asyncNoWait" />
<CustomAction Id="KillApp" Directory="INSTALLFOLDER" Return="ignore" ExeCommand="&quot;[SystemFolder]taskkill.exe&quot; /F /IM &quot;morphic-app.exe&quot;" />

<CustomAction Id="ExtractGPII"
BinaryKey="SevenZip"
ExeCommand='x -aoa -y -o"[INSTALLFOLDER]\windows" "[INSTALLFOLDER]\windows\resources.7z"'
Impersonate="no" Execute="deferred" Return="check" />

<Binary Id="SevenZip" SourceFile="./7zr.exe" />

<!-- Install execute sequence of custom actions -->
<InstallExecuteSequence>
<Custom Action="KillApp" Before="InstallValidate" />
<Custom Action="ExtractGPII" Before="InstallFinalize">NOT Installed OR REINSTALL</Custom>
<Custom Action="RunGPII" After="InstallFinalize">
GPII_START_AFTER_INSTALLATION="1"
</Custom>
Expand Down
7 changes: 6 additions & 1 deletion setup/setup.msbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<MsiFile>Morphic.$(Version).msi</MsiFile>
<GotFilebeat>0</GotFilebeat>
<GotFilebeat Condition="Exists('../filebeat.msm')">1</GotFilebeat>
<Compression Condition="'$(Compression)' == ''">9</Compression>
</PropertyGroup>

<!-- The list of WIX input files -->
Expand Down Expand Up @@ -46,12 +47,16 @@
</Target>

<Target Name="GPII">
<Exec Command='7zr a -mx$(Compression) -bt -sdel -r "$(TempDir)\Morphic\windows\resources.7z" "$(SourceDir)\windows\resources" "morphic-app.exe" "node.dll"'
ContinueOnError="false"
WorkingDirectory="."
/>
<MSBuild.ExtensionPack.FileSystem.RoboCopy Source="$(SourceDir)"
Destination="$(TempDir)\Morphic"
Files=""
Options="/S /E"
/>
<Exec Command='$(WixPath)heat dir "$(TempDir)\Morphic" -dr INSTALLFOLDER -ke -srd -cg GPII -var var.publishDir -gg -out "$(TempDir)\GPII.wxs"'
<Exec Command='$(WixPath)heat dir "$(TempDir)\Morphic" -dr INSTALLFOLDER -ke -srd -sreg -cg GPII -var var.publishDir -gg -out "$(TempDir)\GPII.wxs"'
ContinueOnError="false"
WorkingDirectory="."
/>
Expand Down