Skip to content

Commit

Permalink
Merge pull request #1325 from cfengine/ENT-10801/master
Browse files Browse the repository at this point in the history
ENT-10801: Moved sftp cache Wix Tools install from jenkins-vms to package-msi script
  • Loading branch information
craigcomstock committed Oct 24, 2023
2 parents 5e5cf56 + 4437ecc commit 5642cde
Showing 1 changed file with 29 additions and 0 deletions.
29 changes: 29 additions & 0 deletions build-scripts/package-msi
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,35 @@

WIXPATH="$HOME/wix"

# First see if wix tools are installed, if not, do so
if [ -f "$WIXPATH/candle.exe" ] && [ -f "$WIXPATH/light.exe" ]; then
echo "Wix Tools are installed at $WIXPATH"
else
(
# Fetch some prerequisites
cd /tmp || exit
echo '
get /export/images/windows/wix310-binaries.zip
get /export/images/windows/wine-folder.tar.xz
' | sftp -i ~/.ssh/build_artifacts_cache.id_rsa -b - [email protected]

# Install Wix tools
mkdir -p "$WIXPATH"
cd "$WIXPATH" || exit
unzip /tmp/wix310-binaries.zip
chown "$USER":"$USER" -R "$WIXPATH"

# Extract pre-installed Wine .NET tree
# This file was generated by using a fresh Wine installation and running "winetricks dotnet45".
cd "$HOME" || exit
tar -xJf /tmp/wine-folder.tar.xz
chown "$USER":"$USER" -R "$HOME"/.wine

# Prevent .exe files from auto launching with wine (breaks cross compile checks).
sudo update-binfmts --package wine --remove wine /usr/bin/wine
)
fi

# Wine can handle these tools under the following conditions:
# * You must use Wine 32-bit (wine:i386)
# * The host must have run "winetricks dotnet45" and clicked through all the
Expand Down

0 comments on commit 5642cde

Please sign in to comment.