From b0afd1a784bd03dca539cb40a736bc2bcb574b7e Mon Sep 17 00:00:00 2001 From: Qstick Date: Sun, 14 May 2023 09:18:49 -0500 Subject: [PATCH] Cleanup distribution files (cherry picked from commit 8b291d932f687297f18491469c44751e37e81173) --- .gitattributes | 3 +- azure-pipelines.yml | 4 +- build.sh | 6 +- debian/changelog | 5 -- debian/compat | 1 - debian/control | 12 ---- debian/copyright | 24 ------- debian/install | 1 - debian/rules | 13 ---- .../osx}/Lidarr.app/Contents/Info.plist | 0 .../Lidarr.app/Contents/Resources/lidarr.icns | Bin .../windows/setup}/lidarr.iss | 4 +- macOS/Lidarr | 62 ------------------ 13 files changed, 8 insertions(+), 127 deletions(-) delete mode 100644 debian/changelog delete mode 100644 debian/compat delete mode 100644 debian/control delete mode 100755 debian/copyright delete mode 100755 debian/install delete mode 100755 debian/rules rename {macOS => distribution/osx}/Lidarr.app/Contents/Info.plist (100%) rename {macOS => distribution/osx}/Lidarr.app/Contents/Resources/lidarr.icns (100%) rename {setup => distribution/windows/setup}/lidarr.iss (93%) delete mode 100755 macOS/Lidarr diff --git a/.gitattributes b/.gitattributes index 9c9206392..d98f8fb96 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,8 +3,7 @@ # Explicitly set bash scripts to have unix endings *.sh text eol=lf -distribution/debian/* text eol=lf -macOS/Lidarr text eol=lf +distribution/osx/Lidarr text eol=lf # Custom for Visual Studio *.cs diff=csharp diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b0a8148fa..011caf83c 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/Lidarr.*win-x64.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Lidarr.${BUILDNAME}.windows-core-x64-installer.exe - cp setup/output/Lidarr.*win-x86.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Lidarr.${BUILDNAME}.windows-core-x86-installer.exe + cp distribution/windows/setup/output/Lidarr.*win-x64.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Lidarr.${BUILDNAME}.windows-core-x64-installer.exe + cp distribution/windows/setup/output/Lidarr.*win-x86.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Lidarr.${BUILDNAME}.windows-core-x86-installer.exe displayName: Create Installers - publish: $(Build.ArtifactStagingDirectory) artifact: 'WindowsInstaller' diff --git a/build.sh b/build.sh index f04988309..ca2ab01ef 100755 --- a/build.sh +++ b/build.sh @@ -21,7 +21,7 @@ UpdateVersionNumber() echo "Updating Version Info" sed -i'' -e "s/[0-9.*]\+<\/AssemblyVersion>/$LIDARRVERSION<\/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>/$LIDARRVERSION<\/string>/g" macOS/Lidarr.app/Contents/Info.plist + sed -i'' -e "s/10.0.0.0<\/string>/$LIDARRVERSION<\/string>/g" distribution/osx/Lidarr.app/Contents/Info.plist fi } @@ -184,7 +184,7 @@ PackageMacOSApp() rm -rf $folder mkdir -p $folder - cp -r macOS/Lidarr.app $folder + cp -r distribution/osx/Lidarr.app $folder mkdir -p $folder/Lidarr.app/Contents/MacOS echo "Copying Binaries" @@ -246,7 +246,7 @@ BuildInstaller() local framework="$1" local runtime="$2" - ./_inno/ISCC.exe setup/lidarr.iss "//DFramework=$framework" "//DRuntime=$runtime" + ./_inno/ISCC.exe distribution/windows/setup/lidarr.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 34586f51d..000000000 --- a/debian/control +++ /dev/null @@ -1,12 +0,0 @@ -Section: web -Priority: optional -Maintainer: Sonarr -Source: nzbdrone -Homepage: https://lidarr.audio -Vcs-Git: git@github.com:lidarr/Lidarr.git -Vcs-Browser: https://github.com/lidarr/Lidarr - -Package: nzbdrone -Architecture: all -Depends: libmono-cil-dev (>= 3.2), sqlite3 (>= 3.7), mediainfo (>= 0.7.52) -Description: Lidarr is a music collection manager diff --git a/debian/copyright b/debian/copyright deleted file mode 100755 index b8fac1d7e..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/lidarr/Lidarr - -Files: * -Copyright: 2010-2016 Lidarr - -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 100755 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/Lidarr.app/Contents/Info.plist b/distribution/osx/Lidarr.app/Contents/Info.plist similarity index 100% rename from macOS/Lidarr.app/Contents/Info.plist rename to distribution/osx/Lidarr.app/Contents/Info.plist diff --git a/macOS/Lidarr.app/Contents/Resources/lidarr.icns b/distribution/osx/Lidarr.app/Contents/Resources/lidarr.icns similarity index 100% rename from macOS/Lidarr.app/Contents/Resources/lidarr.icns rename to distribution/osx/Lidarr.app/Contents/Resources/lidarr.icns diff --git a/setup/lidarr.iss b/distribution/windows/setup/lidarr.iss similarity index 93% rename from setup/lidarr.iss rename to distribution/windows/setup/lidarr.iss index 657e7e3ab..f5c0cf791 100644 --- a/setup/lidarr.iss +++ b/distribution/windows/setup/lidarr.iss @@ -52,8 +52,8 @@ Name: "none"; Description: "Do not start automatically"; GroupDescription: "Star Name: "{app}"; Permissions: users-modify [Files] -Source: "..\_artifacts\{#Runtime}\{#Framework}\Lidarr\Lidarr.exe"; DestDir: "{app}\bin"; Flags: ignoreversion -Source: "..\_artifacts\{#Runtime}\{#Framework}\Lidarr\*"; Excludes: "Lidarr.Update"; DestDir: "{app}\bin"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "..\..\..\_artifacts\{#Runtime}\{#Framework}\Lidarr\Lidarr.exe"; DestDir: "{app}\bin"; Flags: ignoreversion +Source: "..\..\..\_artifacts\{#Runtime}\{#Framework}\Lidarr\*"; Excludes: "Lidarr.Update"; DestDir: "{app}\bin"; Flags: ignoreversion recursesubdirs createallsubdirs ; NOTE: Don't use "Flags: ignoreversion" on any shared system files [Icons] diff --git a/macOS/Lidarr b/macOS/Lidarr deleted file mode 100755 index b18dedd25..000000000 --- a/macOS/Lidarr +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh - -#get the bundle's MacOS directory full path -DIR=$(cd "$(dirname "$0")"; pwd) - -#change these values to match your app -EXE_PATH="$DIR/Lidarr.exe" -APPNAME="Lidarr" - -#set up environment -if [[ -x '/opt/local/bin/mono' ]]; then - # Macports and mono-supplied installer path - export PATH="/opt/local/bin:$PATH" -elif [[ -x '/usr/local/bin/mono' ]]; then - # Homebrew-supplied path to mono - export PATH="/usr/local/bin:$PATH" -fi - -export DYLD_FALLBACK_LIBRARY_PATH="$DIR" - -if [ -e /Library/Frameworks/Mono.framework ]; then - MONO_FRAMEWORK_PATH=/Library/Frameworks/Mono.framework/Versions/Current - export PATH="$MONO_FRAMEWORK_PATH/bin:$PATH" - export DYLD_FALLBACK_LIBRARY_PATH="$DYLD_FALLBACK_LIBRARY_PATH:$MONO_FRAMEWORK_PATH/lib" -fi - -if [[ -f '/opt/local/lib/libsqlite3.0.dylib' ]]; then - export DYLD_FALLBACK_LIBRARY_PATH="/opt/local/lib:$DYLD_FALLBACK_LIBRARY_PATH" -fi - -export DYLD_FALLBACK_LIBRARY_PATH="$DYLD_FALLBACK_LIBRARY_PATH:$HOME/lib:/usr/local/lib:/lib:/usr/lib" - -#mono version check -REQUIRED_MAJOR=4 -REQUIRED_MINOR=6 - -VERSION_TITLE="Cannot launch $APPNAME" -VERSION_MSG="$APPNAME requires Mono Runtime Environment(MRE) $REQUIRED_MAJOR.$REQUIRED_MINOR or later." -DOWNLOAD_URL="http://www.mono-project.com/download/#download-mac" - -MONO_VERSION="$(mono --version | grep 'Mono JIT compiler version ' | cut -f5 -d\ )" -# if [[ -o DEBUG ]]; then osascript -e "display dialog \"MONO_VERSION: $MONO_VERSION\""; fi - - -MONO_VERSION_MAJOR="$(echo $MONO_VERSION | cut -f1 -d.)" -MONO_VERSION_MINOR="$(echo $MONO_VERSION | cut -f2 -d.)" -if [ -z "$MONO_VERSION" ] \ - || [ $MONO_VERSION_MAJOR -lt $REQUIRED_MAJOR ] \ - || [ $MONO_VERSION_MAJOR -eq $REQUIRED_MAJOR -a $MONO_VERSION_MINOR -lt $REQUIRED_MINOR ] -then - osascript \ - -e "set question to display dialog \"$VERSION_MSG\" with title \"$VERSION_TITLE\" buttons {\"Cancel\", \"Download...\"} default button 2" \ - -e "if button returned of question is equal to \"Download...\" then open location \"$DOWNLOAD_URL\"" - echo "$VERSION_TITLE" - echo "$VERSION_MSG" - exit 1 -fi - -MONO_EXEC="exec mono --debug" - -#run app using mono -$MONO_EXEC "$EXE_PATH"