diff options
| author | Liggy <Liggy@users.noreply.github.com> | 2019-02-20 14:24:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-20 14:24:23 +0100 |
| commit | 13bfe5093ec0d198a23d5454f0b7d8f5969a7dfb (patch) | |
| tree | 001a76a3321476095898ffc8eddf2e3e72e01dc4 /deployment | |
| parent | 5917e91447ee0d8db3055614aebf27c03ea91752 (diff) | |
| parent | 99bed9a9c3791bcff648029088d766f1dfde3a96 (diff) | |
Merge branch 'master' into populate-extras
Diffstat (limited to 'deployment')
| -rwxr-xr-x | deployment/debian-x64/build.sh | 7 | ||||
| -rwxr-xr-x | deployment/macos/build.sh (renamed from deployment/osx-x64/build.sh) | 0 | ||||
| -rwxr-xr-x | deployment/macos/clean.sh (renamed from deployment/debian-x64/clean.sh) | 0 | ||||
| -rw-r--r-- | deployment/macos/dependencies.txt (renamed from deployment/debian-x64/dependencies.txt) | 0 | ||||
| -rwxr-xr-x | deployment/macos/package.sh (renamed from deployment/debian-x64/package.sh) | 0 | ||||
| -rwxr-xr-x | deployment/osx-x64/clean.sh | 7 | ||||
| -rwxr-xr-x | deployment/osx-x64/package.sh | 7 | ||||
| -rwxr-xr-x | deployment/portable/build.sh (renamed from deployment/framework/build.sh) | 0 | ||||
| -rwxr-xr-x | deployment/portable/clean.sh (renamed from deployment/framework/clean.sh) | 0 | ||||
| -rwxr-xr-x | deployment/portable/package.sh (renamed from deployment/framework/package.sh) | 0 | ||||
| -rwxr-xr-x | deployment/ubuntu-x64/build.sh | 7 | ||||
| -rwxr-xr-x | deployment/ubuntu-x64/clean.sh | 7 | ||||
| -rw-r--r-- | deployment/ubuntu-x64/dependencies.txt | 1 | ||||
| -rwxr-xr-x | deployment/ubuntu-x64/package.sh | 7 | ||||
| -rw-r--r-- | deployment/win-generic/dependencies.txt | 1 | ||||
| -rw-r--r-- | deployment/windows/build-jellyfin.ps1 (renamed from deployment/win-generic/build-jellyfin.ps1) | 0 | ||||
| -rw-r--r-- | deployment/windows/dependencies.txt (renamed from deployment/osx-x64/dependencies.txt) | 0 | ||||
| -rw-r--r-- | deployment/windows/install-jellyfin.ps1 (renamed from deployment/win-generic/install-jellyfin.ps1) | 0 | ||||
| -rw-r--r-- | deployment/windows/install.bat (renamed from deployment/win-generic/install.bat) | 0 |
19 files changed, 0 insertions, 44 deletions
diff --git a/deployment/debian-x64/build.sh b/deployment/debian-x64/build.sh deleted file mode 100755 index 47cfb53270..0000000000 --- a/deployment/debian-x64/build.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -source ../common.build.sh - -VERSION=`get_version ../..` - -build_jellyfin ../../Jellyfin.Server Release debian-x64 `pwd`/dist/jellyfin_${VERSION} diff --git a/deployment/osx-x64/build.sh b/deployment/macos/build.sh index d6bfb9f5e3..d6bfb9f5e3 100755 --- a/deployment/osx-x64/build.sh +++ b/deployment/macos/build.sh diff --git a/deployment/debian-x64/clean.sh b/deployment/macos/clean.sh index 3df2d7796e..3df2d7796e 100755 --- a/deployment/debian-x64/clean.sh +++ b/deployment/macos/clean.sh diff --git a/deployment/debian-x64/dependencies.txt b/deployment/macos/dependencies.txt index 3d25d1bdf4..3d25d1bdf4 100644 --- a/deployment/debian-x64/dependencies.txt +++ b/deployment/macos/dependencies.txt diff --git a/deployment/debian-x64/package.sh b/deployment/macos/package.sh index 13b943ea8f..13b943ea8f 100755 --- a/deployment/debian-x64/package.sh +++ b/deployment/macos/package.sh diff --git a/deployment/osx-x64/clean.sh b/deployment/osx-x64/clean.sh deleted file mode 100755 index 3df2d7796e..0000000000 --- a/deployment/osx-x64/clean.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -source ../common.build.sh - -VERSION=`get_version ../..` - -clean_jellyfin ../.. Release `pwd`/dist/jellyfin_${VERSION} diff --git a/deployment/osx-x64/package.sh b/deployment/osx-x64/package.sh deleted file mode 100755 index 13b943ea8f..0000000000 --- a/deployment/osx-x64/package.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -source ../common.build.sh - -VERSION=`get_version ../..` - -package_portable ../.. `pwd`/dist/jellyfin_${VERSION} diff --git a/deployment/framework/build.sh b/deployment/portable/build.sh index 4f2e6363ee..4f2e6363ee 100755 --- a/deployment/framework/build.sh +++ b/deployment/portable/build.sh diff --git a/deployment/framework/clean.sh b/deployment/portable/clean.sh index 3df2d7796e..3df2d7796e 100755 --- a/deployment/framework/clean.sh +++ b/deployment/portable/clean.sh diff --git a/deployment/framework/package.sh b/deployment/portable/package.sh index 13b943ea8f..13b943ea8f 100755 --- a/deployment/framework/package.sh +++ b/deployment/portable/package.sh diff --git a/deployment/ubuntu-x64/build.sh b/deployment/ubuntu-x64/build.sh deleted file mode 100755 index 870bac7805..0000000000 --- a/deployment/ubuntu-x64/build.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -source ../common.build.sh - -VERSION=`get_version ../..` - -build_jellyfin ../../Jellyfin.Server Release ubuntu-x64 `pwd`/dist/jellyfin_${VERSION} diff --git a/deployment/ubuntu-x64/clean.sh b/deployment/ubuntu-x64/clean.sh deleted file mode 100755 index 3df2d7796e..0000000000 --- a/deployment/ubuntu-x64/clean.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -source ../common.build.sh - -VERSION=`get_version ../..` - -clean_jellyfin ../.. Release `pwd`/dist/jellyfin_${VERSION} diff --git a/deployment/ubuntu-x64/dependencies.txt b/deployment/ubuntu-x64/dependencies.txt deleted file mode 100644 index 3d25d1bdf4..0000000000 --- a/deployment/ubuntu-x64/dependencies.txt +++ /dev/null @@ -1 +0,0 @@ -dotnet diff --git a/deployment/ubuntu-x64/package.sh b/deployment/ubuntu-x64/package.sh deleted file mode 100755 index 13b943ea8f..0000000000 --- a/deployment/ubuntu-x64/package.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -source ../common.build.sh - -VERSION=`get_version ../..` - -package_portable ../.. `pwd`/dist/jellyfin_${VERSION} diff --git a/deployment/win-generic/dependencies.txt b/deployment/win-generic/dependencies.txt deleted file mode 100644 index 3d25d1bdf4..0000000000 --- a/deployment/win-generic/dependencies.txt +++ /dev/null @@ -1 +0,0 @@ -dotnet diff --git a/deployment/win-generic/build-jellyfin.ps1 b/deployment/windows/build-jellyfin.ps1 index 1121c33983..1121c33983 100644 --- a/deployment/win-generic/build-jellyfin.ps1 +++ b/deployment/windows/build-jellyfin.ps1 diff --git a/deployment/osx-x64/dependencies.txt b/deployment/windows/dependencies.txt index 3d25d1bdf4..3d25d1bdf4 100644 --- a/deployment/osx-x64/dependencies.txt +++ b/deployment/windows/dependencies.txt diff --git a/deployment/win-generic/install-jellyfin.ps1 b/deployment/windows/install-jellyfin.ps1 index b6e00e0568..b6e00e0568 100644 --- a/deployment/win-generic/install-jellyfin.ps1 +++ b/deployment/windows/install-jellyfin.ps1 diff --git a/deployment/win-generic/install.bat b/deployment/windows/install.bat index e21479a79a..e21479a79a 100644 --- a/deployment/win-generic/install.bat +++ b/deployment/windows/install.bat |
