Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-25 14:27:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #816 from MihaelaStoica/CP-15405

Browse Source 
CP-15405: Copy all DotNetInstaller files to the local folder before b…
This commit is contained in:
Gabor Apati-Nagy 2016-02-04 17:25:57 +00:00
commit 50b7132aa2
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mk/archive-unsigned.sh
View File

@ -34,11 +34,6 @@ set -eu
ZIP="zip -q" ZIP="zip -q"
#copy all dotNetInstaller files
DOTNETINSTALLER_FILEPATH="$(which dotNetInstaller.exe)"
DOTNETINSTALLER_DIRPATH=${DOTNETINSTALLER_FILEPATH%/*}
cp -R "${DOTNETINSTALLER_DIRPATH}"/* ${DOTNETINST}
#archive unsigned artifacts #archive unsigned artifacts
mkdir_clean ${OUTPUT_DIR}/XenAdminUnsigned mkdir_clean ${OUTPUT_DIR}/XenAdminUnsigned
cp -R ${REPO}/* ${OUTPUT_DIR}/XenAdminUnsigned cp -R ${REPO}/* ${OUTPUT_DIR}/XenAdminUnsigned

5
mk/xenadmin-build.sh
View File

@ -166,8 +166,9 @@ version_vnccontrol_installer ${WIX}/vnccontrol.wxs
#copy dotNetInstaller files #copy dotNetInstaller files
DOTNETINST=${REPO}/dotNetInstaller DOTNETINST=${REPO}/dotNetInstaller
cp ${MICROSOFT_DOTNET_FRAMEWORK_INSTALLER_DIR}/NDP452-KB2901954-Web.exe ${DOTNETINST} cp ${MICROSOFT_DOTNET_FRAMEWORK_INSTALLER_DIR}/NDP452-KB2901954-Web.exe ${DOTNETINST}
cp "$(which dotNetInstaller.exe)" ${DOTNETINST} DOTNETINSTALLER_FILEPATH="$(which dotNetInstaller.exe)"
cp "$(which InstallerLinker.exe)" ${DOTNETINST} DOTNETINSTALLER_DIRPATH=${DOTNETINSTALLER_FILEPATH%/*}
cp -R "${DOTNETINSTALLER_DIRPATH}"/* ${DOTNETINST}
# Collect the unsigned files, if the COLLECT_UNSIGNED_FILES is defined # 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) # (the variable can be set from the jenkins ui by putting "export COLLECT_UNSIGNED_FILES=1" above the call for build script)