Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-23 20:36:33 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

CP-38530: Remove PuTTY from build scripts and wix installer

Browse Source 
Signed-off-by: Danilo Del Busso <Danilo.Del.Busso@citrix.com>
This commit is contained in:
Danilo Del Busso 2021-12-31 12:14:56 +00:00 committed by Konstantina Chremmou
parent 7ca120eb76
commit 6a52322035
5 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WixInstaller/XenCenter.wxs
View File

@ -62,7 +62,6 @@
<File Id="XenCenterMainEXE" Source="$(env.RepoRoot)\XenAdmin\bin\Release\$(var.BrandConsoleNoSpace)Main.exe" />
<File Id="XeEXE" Source="$(env.RepoRoot)\xe\bin\Release\xe.exe" />
<File Id="xva_verifyEXE" Source="$(env.RepoRoot)\xva_verify\bin\Release\xva_verify.exe" />
<File Id="PuTTYEXE" Source="$(env.RepoRoot)\XenAdmin\bin\Release\putty.exe" />
<!-- config -->
<File Id="XenCenterMainCONFIG" Source="$(env.RepoRoot)\XenAdmin\bin\Release\$(var.BrandConsoleNoSpace)Main.exe.config" />
<!-- DLLs -->

4
XenAdmin/XenAdmin.csproj
View File

@ -6795,8 +6795,6 @@
</Target>
-->
<PropertyGroup>
<PostBuildEvent>copy "$(ProjectDir)\ReportViewer\resource_report.rdlc" "$(TargetDir)"
copy "$(ProjectDir)\..\packages\putty.exe" "$(TargetDir)"</PostBuildEvent>
<PostBuildEvent>copy "$(ProjectDir)\ReportViewer\resource_report.rdlc" "$(TargetDir)"</PostBuildEvent>
</PropertyGroup>
</Project>

5
scripts/deps-map.json
View File

@ -5,11 +5,6 @@
"target": "xenadmin.git/packages/",
"flat": "true"
},
{
"pattern": "@REMOTE_DOTNET@/putty.exe",
"target": "xenadmin.git/packages/",
"flat": "true"
},
{
"pattern": "@REMOTE_DOTNET@/dotnet48/CookComputing.XmlRpcV2.dll",
"target": "xenadmin.git/packages/",

2
scripts/download_packages.ps1
View File

@ -65,7 +65,7 @@ foreach ($dep in $DEPS_MAP.files) {
Invoke-WebRequest -Uri $pattern -Method Get -OutFile "$PACKAGE_DIR\$symbolfile"
}
if (($filename -eq "putty.exe") -or ($filename -like "*.dll") -or (($filename -like "*.zip") -and $ZIP)) {
if (($filename -like "*.dll") -or (($filename -like "*.zip") -and $ZIP)) {
Write-Output "Downloading $filename"
Invoke-WebRequest -Uri $pattern -Method Get -OutFile "$PACKAGE_DIR\$filename"
}

1
scripts/xenadmin-build.sh
View File

@ -104,7 +104,6 @@ if [ -f "${SIGN_BAT}" ] ; then
cd ${REPO}/XenAdmin/bin/Release && ${SIGN_BAT} ICSharpCode.SharpZipLib.dll "SharpZipLib"
cd ${REPO}/XenAdmin/bin/Release && ${SIGN_BAT} DiscUtils.dll "DiscUtils"
cd ${REPO}/XenAdmin/bin/Release && ${SIGN_BAT} Ionic.Zip.dll "OSS"
cd ${REPO}/XenAdmin/bin/Release && ${SIGN_BAT} putty.exe "PuTTY"
cd ${REPO}/XenServerHealthCheck/bin/Release && ${SIGN_BAT} XenServerHealthCheck.exe "${BRANDING_BRAND_CONSOLE}"
else