diff --git a/.gitattributes b/.gitattributes index b4206acbb..cb00c5612 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,7 +3,7 @@ # Explicitly set bash scripts to have unix endings *.sh text eol=lf -macOS/Radarr text eol=lf +distribution/osx/Radarr text eol=lf # Custom for Visual Studio *.cs diff=csharp diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 344b3055e..f2ab823ec 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -211,8 +211,8 @@ stages: displayName: Fetch Frontend - bash: | ./build.sh --packages --installer - cp setup/output/Radarr.*win-x64.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Radarr.${BUILDNAME}.windows-core-x64-installer.exe - cp setup/output/Radarr.*win-x86.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Radarr.${BUILDNAME}.windows-core-x86-installer.exe + cp distribution/windows/setup/output/Radarr.*win-x64.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Radarr.${BUILDNAME}.windows-core-x64-installer.exe + cp distribution/windows/setup/output/Radarr.*win-x86.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Radarr.${BUILDNAME}.windows-core-x86-installer.exe displayName: Create Installers - publish: $(Build.ArtifactStagingDirectory) artifact: 'WindowsInstaller' diff --git a/build.sh b/build.sh index 1a375b6ca..f0283fa1a 100755 --- a/build.sh +++ b/build.sh @@ -21,7 +21,7 @@ UpdateVersionNumber() echo "Updating Version Info" sed -i'' -e "s/[0-9.*]\+<\/AssemblyVersion>/$RADARRVERSION<\/AssemblyVersion>/g" src/Directory.Build.props sed -i'' -e "s/[\$()A-Za-z-]\+<\/AssemblyConfiguration>/${BUILD_SOURCEBRANCHNAME}<\/AssemblyConfiguration>/g" src/Directory.Build.props - sed -i'' -e "s/10.0.0.0<\/string>/$RADARRVERSION<\/string>/g" macOS/Radarr.app/Contents/Info.plist + sed -i'' -e "s/10.0.0.0<\/string>/$RADARRVERSION<\/string>/g" distribution/osx/Radarr.app/Contents/Info.plist fi } @@ -184,7 +184,7 @@ PackageMacOSApp() rm -rf $folder mkdir -p $folder - cp -r macOS/Radarr.app $folder + cp -r distribution/osx/Radarr.app $folder mkdir -p $folder/Radarr.app/Contents/MacOS echo "Copying Binaries" @@ -246,7 +246,7 @@ BuildInstaller() local framework="$1" local runtime="$2" - ./_inno/ISCC.exe setup/radarr.iss "//DFramework=$framework" "//DRuntime=$runtime" + ./_inno/ISCC.exe distribution/windows/setup/radarr.iss "//DFramework=$framework" "//DRuntime=$runtime" } InstallInno() diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index eb8f841a6..000000000 --- a/debian/changelog +++ /dev/null @@ -1,5 +0,0 @@ -nzbdrone {version} {branch}; urgency=low - - * Automatic Release. - - -- NzbDrone Mon, 26 Aug 2013 00:00:00 -0700 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 45a4fb75d..000000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -8 diff --git a/debian/control b/debian/control deleted file mode 100644 index ba30c02ee..000000000 --- a/debian/control +++ /dev/null @@ -1,12 +0,0 @@ -Section: web -Priority: optional -Maintainer: Sonarr -Source: nzbdrone -Homepage: https://sonarr.tv -Vcs-Git: git@github.com:Sonarr/Sonarr.git -Vcs-Browser: https://github.com/Sonarr/Sonarr - -Package: nzbdrone -Architecture: all -Depends: libmono-cil-dev (>= 3.2), sqlite3 (>= 3.7), mediainfo (>= 0.7.52) -Description: Sonarr is an internet PVR diff --git a/debian/copyright b/debian/copyright deleted file mode 100755 index 666d9bf2d..000000000 --- a/debian/copyright +++ /dev/null @@ -1,24 +0,0 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: nzbdrone -Source: https://github.com/Sonarr/Sonarr - -Files: * -Copyright: 2010-2016 Sonarr - -License: GPL-3.0+ - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - . - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program. If not, see . - . - On Debian systems, the complete text of the GNU General - Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". diff --git a/debian/install b/debian/install deleted file mode 100755 index 1810b9185..000000000 --- a/debian/install +++ /dev/null @@ -1 +0,0 @@ -nzbdrone_bin/* opt/NzbDrone diff --git a/debian/rules b/debian/rules deleted file mode 100644 index b760bee7f..000000000 --- a/debian/rules +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -%: - dh $@ diff --git a/macOS/Radarr.app/Contents/Info.plist b/distribution/osx/Radarr.app/Contents/Info.plist similarity index 100% rename from macOS/Radarr.app/Contents/Info.plist rename to distribution/osx/Radarr.app/Contents/Info.plist diff --git a/macOS/Radarr.app/Contents/Resources/radarr.icns b/distribution/osx/Radarr.app/Contents/Resources/radarr.icns similarity index 100% rename from macOS/Radarr.app/Contents/Resources/radarr.icns rename to distribution/osx/Radarr.app/Contents/Resources/radarr.icns diff --git a/setup/radarr.iss b/distribution/windows/setup/radarr.iss similarity index 93% rename from setup/radarr.iss rename to distribution/windows/setup/radarr.iss index 3b5137494..ea39cedb7 100644 --- a/setup/radarr.iss +++ b/distribution/windows/setup/radarr.iss @@ -52,8 +52,8 @@ Name: "none"; Description: "Do not start automatically"; GroupDescription: "Star Name: "{app}"; Permissions: users-modify [Files] -Source: "..\_artifacts\{#Runtime}\{#Framework}\Radarr\Radarr.exe"; DestDir: "{app}\bin"; Flags: ignoreversion -Source: "..\_artifacts\{#Runtime}\{#Framework}\Radarr\*"; Excludes: "Radarr.Update"; DestDir: "{app}\bin"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "..\..\..\_artifacts\{#Runtime}\{#Framework}\Radarr\Radarr.exe"; DestDir: "{app}\bin"; Flags: ignoreversion +Source: "..\..\..\_artifacts\{#Runtime}\{#Framework}\Radarr\*"; Excludes: "Radarr.Update"; DestDir: "{app}\bin"; Flags: ignoreversion recursesubdirs createallsubdirs ; NOTE: Don't use "Flags: ignoreversion" on any shared system files [Icons]