jellyfin/jellyfin-server-windows
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-server-windows.git synced 2024-11-23 05:59:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update some file locations

Browse Source
This commit is contained in:
dkanada 2020-03-23 22:16:44 +09:00
parent 6a4d020e4a
commit 2295283592
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.ci/azure-pipelines.yml
View File

@ -54,7 +54,7 @@ jobs:
displayName: "Build NSIS Installer"
inputs:
targetType: "filePath"
filePath: ./deployment/windows/build-jellyfin.ps1
filePath: build-jellyfin.ps1
arguments: -InstallFFMPEG -InstallNSSM -MakeNSIS -InstallTrayApp -UXLocation $(Agent.TempDirectory)\jellyfin-ux -InstallLocation $(build.artifactstagingdirectory)
errorActionPreference: "stop"
workingDirectory: $(Build.SourcesDirectory)
@ -62,7 +62,7 @@ jobs:
- task: CopyFiles@2
displayName: "Copy NSIS Installer"
inputs:
sourceFolder: $(Build.SourcesDirectory)/deployment/windows/
sourceFolder: $(Build.SourcesDirectory)/nsis
contents: "jellyfin*.exe"
targetFolder: $(System.ArtifactsDirectory)/setup
cleanTargetFolder: true

4
Jellyfin.Windows.Tray.sln
View File

@ -1,9 +1,9 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26124.0
MinimumVisualStudioVersion = 15.0.26124.0
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jellyfin.Windows.Tray", "src\Jellyfin.Windows.Tray\Jellyfin.Windows.Tray.csproj", "{84B8A4C7-8BB5-48A4-8D59-BAEEF637F914}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jellyfin.Windows.Tray", "Jellyfin.Windows.Tray\Jellyfin.Windows.Tray.csproj", "{84B8A4C7-8BB5-48A4-8D59-BAEEF637F914}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution

8
build-jellyfin.ps1
View File

@ -116,11 +116,11 @@ function Make-NSIS {
$env:InstallLocation = $ResolvedInstallLocation
if($InstallNSIS.IsPresent -or ($InstallNSIS -eq $true)){
& "$tempdir/nsis/nsis-3.04/makensis.exe" /D$Architecture /DUXPATH=$ResolvedUXLocation ".\deployment\windows\jellyfin.nsi"
& "$tempdir/nsis/nsis-3.04/makensis.exe" /D$Architecture /DUXPATH=$ResolvedUXLocation ".\nsis\jellyfin.nsi"
} else {
& "makensis" /D$Architecture /DUXPATH=$ResolvedUXLocation ".\deployment\windows\jellyfin.nsi"
& "makensis" /D$Architecture /DUXPATH=$ResolvedUXLocation ".\nsis\jellyfin.nsi"
}
Copy-Item .\deployment\windows\jellyfin_*.exe $ResolvedInstallLocation\..\
Copy-Item .\nsis\jellyfin_*.exe $ResolvedInstallLocation\..\
}
@ -169,8 +169,6 @@ if($InstallTrayApp.IsPresent -or ($InstallTrayApp -eq $true)){
Write-Verbose "Downloading Windows Tray App"
Install-TrayApp $ResolvedInstallLocation $Architecture
}
#Copy-Item .\deployment\windows\install-jellyfin.ps1 $ResolvedInstallLocation\install-jellyfin.ps1
#Copy-Item .\deployment\windows\install.bat $ResolvedInstallLocation\install.bat
Copy-Item .\LICENSE $ResolvedInstallLocation\LICENSE
if($InstallNSIS.IsPresent -or ($InstallNSIS -eq $true)){
Write-Verbose "Installing NSIS"