From 0c5698b76fbb2f87b2bf14911ffd5239c9f864e2 Mon Sep 17 00:00:00 2001
From: Mihaela Stoica <mihaela.stoica@citrix.com>
Date: Thu, 4 Feb 2016 12:41:20 +0000
Subject: [PATCH] CP-15405: Copy all DotNetInstaller files to the local folder
 before building the installer

- Fixes build error "build-installers.sh: line 134: ./InstallerLinker.exe: Accessing a corrupted shared library"

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
---
 mk/archive-unsigned.sh | 5 -----
 mk/xenadmin-build.sh   | 5 +++--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/mk/archive-unsigned.sh b/mk/archive-unsigned.sh
index 93785f493..8ba6bf124 100644
--- a/mk/archive-unsigned.sh
+++ b/mk/archive-unsigned.sh
@@ -34,11 +34,6 @@ set -eu
 
 ZIP="zip -q"
 
-#copy all dotNetInstaller files
-DOTNETINSTALLER_FILEPATH="$(which dotNetInstaller.exe)"
-DOTNETINSTALLER_DIRPATH=${DOTNETINSTALLER_FILEPATH%/*}
-cp -R "${DOTNETINSTALLER_DIRPATH}"/* ${DOTNETINST}
-
 #archive unsigned artifacts 
 mkdir_clean ${OUTPUT_DIR}/XenAdminUnsigned
 cp -R ${REPO}/* ${OUTPUT_DIR}/XenAdminUnsigned
diff --git a/mk/xenadmin-build.sh b/mk/xenadmin-build.sh
index 396c6340a..bbdaacd03 100755
--- a/mk/xenadmin-build.sh
+++ b/mk/xenadmin-build.sh
@@ -166,8 +166,9 @@ version_vnccontrol_installer ${WIX}/vnccontrol.wxs
 #copy dotNetInstaller files
 DOTNETINST=${REPO}/dotNetInstaller
 cp ${MICROSOFT_DOTNET_FRAMEWORK_INSTALLER_DIR}/NDP452-KB2901954-Web.exe ${DOTNETINST}
-cp "$(which dotNetInstaller.exe)" ${DOTNETINST}
-cp "$(which InstallerLinker.exe)" ${DOTNETINST}
+DOTNETINSTALLER_FILEPATH="$(which dotNetInstaller.exe)"
+DOTNETINSTALLER_DIRPATH=${DOTNETINSTALLER_FILEPATH%/*}
+cp -R "${DOTNETINSTALLER_DIRPATH}"/* ${DOTNETINST}
 
 # Collect the unsigned files, if the COLLECT_UNSIGNED_FILES is defined 
 # (the variable can be set from the jenkins ui by putting "export COLLECT_UNSIGNED_FILES=1" above the call for build script)