From 512ab8c6aae2bdd5c33c16737601d9762480f19c Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Mon, 18 Feb 2019 22:06:06 -0500 Subject: [PATCH 1/4] Remove unneeded Linux builds --- deployment/debian-x64/build.sh | 7 ------- deployment/debian-x64/clean.sh | 7 ------- deployment/debian-x64/dependencies.txt | 1 - deployment/debian-x64/package.sh | 7 ------- deployment/ubuntu-x64/build.sh | 7 ------- deployment/ubuntu-x64/clean.sh | 7 ------- deployment/ubuntu-x64/dependencies.txt | 1 - deployment/ubuntu-x64/package.sh | 7 ------- 8 files changed, 44 deletions(-) delete mode 100755 deployment/debian-x64/build.sh delete mode 100755 deployment/debian-x64/clean.sh delete mode 100644 deployment/debian-x64/dependencies.txt delete mode 100755 deployment/debian-x64/package.sh delete mode 100755 deployment/ubuntu-x64/build.sh delete mode 100755 deployment/ubuntu-x64/clean.sh delete mode 100644 deployment/ubuntu-x64/dependencies.txt delete mode 100755 deployment/ubuntu-x64/package.sh 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/debian-x64/clean.sh b/deployment/debian-x64/clean.sh deleted file mode 100755 index 3df2d7796e..0000000000 --- a/deployment/debian-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/debian-x64/dependencies.txt b/deployment/debian-x64/dependencies.txt deleted file mode 100644 index 3d25d1bdf4..0000000000 --- a/deployment/debian-x64/dependencies.txt +++ /dev/null @@ -1 +0,0 @@ -dotnet diff --git a/deployment/debian-x64/package.sh b/deployment/debian-x64/package.sh deleted file mode 100755 index 13b943ea8f..0000000000 --- a/deployment/debian-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/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} From 24574d4964f3d79114ab8d5c7f8fad54fd59e46b Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Mon, 18 Feb 2019 22:06:44 -0500 Subject: [PATCH 2/4] Rename MacOS build --- deployment/{osx-x64 => macos}/build.sh | 0 deployment/{osx-x64 => macos}/clean.sh | 0 deployment/{osx-x64 => macos}/dependencies.txt | 0 deployment/{osx-x64 => macos}/package.sh | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename deployment/{osx-x64 => macos}/build.sh (100%) rename deployment/{osx-x64 => macos}/clean.sh (100%) rename deployment/{osx-x64 => macos}/dependencies.txt (100%) rename deployment/{osx-x64 => macos}/package.sh (100%) diff --git a/deployment/osx-x64/build.sh b/deployment/macos/build.sh similarity index 100% rename from deployment/osx-x64/build.sh rename to deployment/macos/build.sh diff --git a/deployment/osx-x64/clean.sh b/deployment/macos/clean.sh similarity index 100% rename from deployment/osx-x64/clean.sh rename to deployment/macos/clean.sh diff --git a/deployment/osx-x64/dependencies.txt b/deployment/macos/dependencies.txt similarity index 100% rename from deployment/osx-x64/dependencies.txt rename to deployment/macos/dependencies.txt diff --git a/deployment/osx-x64/package.sh b/deployment/macos/package.sh similarity index 100% rename from deployment/osx-x64/package.sh rename to deployment/macos/package.sh From 3ecfd1fdd15af6735118c3fdf92b8c7e3bbd0a94 Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Mon, 18 Feb 2019 22:07:12 -0500 Subject: [PATCH 3/4] Rename framework to portable --- deployment/{framework => portable}/build.sh | 0 deployment/{framework => portable}/clean.sh | 0 deployment/{framework => portable}/package.sh | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename deployment/{framework => portable}/build.sh (100%) rename deployment/{framework => portable}/clean.sh (100%) rename deployment/{framework => portable}/package.sh (100%) diff --git a/deployment/framework/build.sh b/deployment/portable/build.sh similarity index 100% rename from deployment/framework/build.sh rename to deployment/portable/build.sh diff --git a/deployment/framework/clean.sh b/deployment/portable/clean.sh similarity index 100% rename from deployment/framework/clean.sh rename to deployment/portable/clean.sh diff --git a/deployment/framework/package.sh b/deployment/portable/package.sh similarity index 100% rename from deployment/framework/package.sh rename to deployment/portable/package.sh From 3ed9d32f6885cf877ae91a3bc2008367619f4da2 Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Mon, 18 Feb 2019 22:07:53 -0500 Subject: [PATCH 4/4] Rename Windows scripts folder --- deployment/{win-generic => windows}/build-jellyfin.ps1 | 0 deployment/{win-generic => windows}/dependencies.txt | 0 deployment/{win-generic => windows}/install-jellyfin.ps1 | 0 deployment/{win-generic => windows}/install.bat | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename deployment/{win-generic => windows}/build-jellyfin.ps1 (100%) rename deployment/{win-generic => windows}/dependencies.txt (100%) rename deployment/{win-generic => windows}/install-jellyfin.ps1 (100%) rename deployment/{win-generic => windows}/install.bat (100%) diff --git a/deployment/win-generic/build-jellyfin.ps1 b/deployment/windows/build-jellyfin.ps1 similarity index 100% rename from deployment/win-generic/build-jellyfin.ps1 rename to deployment/windows/build-jellyfin.ps1 diff --git a/deployment/win-generic/dependencies.txt b/deployment/windows/dependencies.txt similarity index 100% rename from deployment/win-generic/dependencies.txt rename to deployment/windows/dependencies.txt diff --git a/deployment/win-generic/install-jellyfin.ps1 b/deployment/windows/install-jellyfin.ps1 similarity index 100% rename from deployment/win-generic/install-jellyfin.ps1 rename to deployment/windows/install-jellyfin.ps1 diff --git a/deployment/win-generic/install.bat b/deployment/windows/install.bat similarity index 100% rename from deployment/win-generic/install.bat rename to deployment/windows/install.bat