Commit Graph

347 Commits

Author SHA1 Message Date
Joshua M. Boniface
ed735522cf Revert "Remove old stuff"
This reverts commit b9fdd96ece.
2020-04-09 11:49:14 -04:00
Joshua M. Boniface
406d087a46 Correct ARCH var in Ubuntu Dockerfiles 2020-04-09 11:46:16 -04:00
Joshua M. Boniface
cd616746b9 Use more specific mv source glob 2020-03-24 11:17:01 -04:00
Joshua M. Boniface
b9fdd96ece Remove old stuff 2020-03-24 01:10:29 -04:00
Joshua M. Boniface
be9eb0f19e Unify dep installation and update 2020-03-23 22:51:12 -04:00
Joshua M. Boniface
e87a10235b Go back to cp-based control archive but right 2020-03-23 21:52:35 -04:00
Joshua M. Boniface
a561d4ca41 Remove arch from macos 2020-03-23 18:44:32 -04:00
Joshua M. Boniface
de66ab4d83 Use git checkout instead of file copies to clean 2020-03-23 18:41:23 -04:00
Joshua M. Boniface
0242ce5fee Add Windows build 2020-03-23 18:18:32 -04:00
Joshua M. Boniface
ab8de37080 Add .tar.gz-based builds 2020-03-23 18:01:42 -04:00
Joshua M. Boniface
6028bc0f79 Port Fedora and CentOS builds and remove web build
Simplifies a number of aspects of the RPM build, including moving
.copr/Makefile into the "fedora/" folder (and leaving a symlink),
removing the jellyfin-web build components, and renaming it
jellyfin-server like Debian did.
2020-03-23 17:32:07 -04:00
Joshua M. Boniface
eb632e4a0d Back up and restore control file 2020-03-23 16:01:25 -04:00
Joshua M. Boniface
8b1a76a32e Mount the source volume rather than copy it
Now that the build script cleans up both before and after building, this
is a viable option and will significant reduce build times by promoting
container reuse (with `-k`).
2020-03-23 15:46:08 -04:00
Joshua M. Boniface
3e7a106a95 Add Ubuntu configurations 2020-03-23 15:40:59 -04:00
Joshua M. Boniface
f72c5b7a1d Fix version output 2020-03-23 15:40:19 -04:00
Joshua M. Boniface
c4a29e537c Remove NPM install from Dockerfiles 2020-03-23 15:28:57 -04:00
Joshua M. Boniface
0365adb823 Fix deps for armhf 2020-03-23 15:24:13 -04:00
Joshua M. Boniface
9c378866e4 Add arm64 and armhf builds 2020-03-23 15:02:54 -04:00
Joshua M. Boniface
ba55ee4986 Add first proof-of-concept deployment setup 2020-03-22 16:03:14 -04:00
Joshua M. Boniface
28f7df6520 Move all old deployment stuff to a new folder 2020-03-22 16:00:52 -04:00
Joshua M. Boniface
f4c8b25698 Use NodeJS 10 on CentOS 2020-03-15 18:17:04 -04:00
Joshua M. Boniface
5c4e468035 Correct BuildRequires and NodeJS for Fedora/CentOS 2020-03-15 18:14:00 -04:00
ferferga
e36c4de9f6 Replaces uninstaller icon so it's more visible 2020-03-05 18:53:04 +01:00
artiume
7931a7a7d0
update fedora 2020-03-04 17:43:50 -05:00
David Mouse
422c440743 Fix Fedora build
Fedora builds were broken due to dotnet-sdk-3.1 and dotnet-runtime-3.1 not being available on the @dotnet-sig/dotnet repo as well as a lack of the git package (needed for yarn when installing jellyfin/jellyfin-noto per https://github.com/jellyfin/jellyfin-web/pull/735). Replaces the outdated repo with the official repo found in Microsoft's documentation.
2020-02-10 04:12:37 -05:00
dkanada
e8984ed3a9
Merge pull request #2379 from joshuaboniface/nodejs-deb
Use NodeJS 10.X for NPM builds
2020-02-05 14:06:51 +09:00
Joshua M. Boniface
e3c64b9fee Use NodeJS 10.X for NPM builds 2020-02-04 22:07:01 -05:00
Matt07211
84fbf64867 Fix broken webserver caused by dotnet publish.
This should be considered a temp fix, as it fixes the symptom and not
the actual root cause of the issue. Why this works? I *feel like* this is
a dependency issue and this change forces it to evalute dependencys in a
different order, avoiding the bug.
2020-01-28 19:37:13 +11:00
dkanada
bc4c67e6fa
Merge pull request #2287 from nyanmisaka/master
New upstream ffmpeg version 4.2.1 for windows nightly channel
2020-01-16 20:54:59 +09:00
Nyanmisaka
2ce16d4bb5
fix indentation 2020-01-16 18:47:54 +08:00
Nyanmisaka
0a7ea36c68
Update build-jellyfin.ps1 2020-01-16 18:10:14 +08:00
Nyanmisaka
e92e105c42
New upstream ffmpeg version 4.2.1 on windows 2020-01-16 17:57:19 +08:00
Nyanmisaka
ac0b30285e
New upstream ffmpeg version 4.2.1 on windows 2020-01-16 16:32:07 +08:00
Nyanmisaka
15c52867ea
New upstream ffmpeg version 4.2.1 on windows 2020-01-16 16:32:04 +08:00
Erwin de Haan
ec8baaf48d Switch around SetCompressor arguments. Hide progress bars for powershell. 2020-01-15 12:17:42 +01:00
Erwin de Haan
1ad6f01617 Switch to slightly more verbose logging. 2020-01-15 11:37:37 +01:00
Erwin de Haan
9aa870cf24 Enable /SOLID switch for compression 2020-01-15 11:36:54 +01:00
Erwin de Haan
d3bd22d7a2 Enable Unicode
ANSI targets are deprecated
2020-01-15 11:36:22 +01:00
Erwin de Haan
22f408201a Less output and lesser compression. 2020-01-15 11:20:01 +01:00
Sacha Korban
2497573b7f Update the build script to use .NET core SDK 3.1 2020-01-04 15:02:38 +11:00
Joshua M. Boniface
d79242c3c7 Remove broken Microsoft SDK image (#2158)
* Remove broken Microsoft SDK image

This was not working; for some reason the Microsoft .NET Docker image
for 3.0 still had a 2.1 binary which was wreaking havoc. Replace it with
the manual download that all the other .deb packages use.

* Install missing dependency
2019-12-15 01:55:07 -05:00
Bond_009
803ec15150 Fix ubuntu x64 docker build 2019-12-06 21:08:11 +01:00
Bond-009
50a535e6e4 Use .Net Core 3.0 in all docker images 2019-11-26 09:47:26 +01:00
Joshua M. Boniface
c0d10800ab
Merge pull request #1925 from joshuaboniface/integrate-web-build-debuntu
Integrate web build into Debuntu package build steps
2019-11-19 01:37:38 -05:00
Joshua M. Boniface
9756bdb76e
Merge pull request #1903 from anthonylavado/nsis-update
Update NSIS Installer
2019-11-03 14:36:56 -05:00
Joshua M. Boniface
5d5fa55fe5
Merge pull request #1859 from joshuaboniface/copr-fix
Fix COPR build and Fedora packaging
2019-11-03 14:05:13 -05:00
Anthony Lavado
e877ef92d7 Always download the latest tray app release 2019-11-03 02:51:29 -05:00
Joshua Boniface
fd4a9d13b7 Update path of SOS readme
Seems like this changed upstream as it's not our file.
2019-11-02 01:34:43 -04:00
Joshua Boniface
4fc2bd56ee Add master fallback for web build 2019-11-02 01:24:26 -04:00
Joshua Boniface
e40c82be88 REVERT-ME Update to .NET 3.0 2019-11-02 01:17:12 -04:00
Anthony Lavado
57cf3e24f8 Use the correct file copy operation for the icon 2019-11-01 01:55:09 -04:00
Anthony Lavado
0c003feac6 Fix an incorrect argument type in build script 2019-11-01 01:25:45 -04:00
Anthony Lavado
bde1af5def Add the tray app download to the build script, use it in the installer shortcuts
Adds the tray app download to build-jellyfin, adjusts the shortcuts in the installer, and adds the switch to the pipeline configuration.
2019-10-30 18:16:31 -04:00
Thomas Büttner
e6e9cd8ce2 Remove the SPEC edit hack, replace with proper repos (#7)
* Remove the SPEC edit hack, replace with proper repos

Signed-off-by: Thomas Büttner <thomas@vergesslicher.tech>

* Fix bad rpmbuild flag

Signed-off-by: Thomas Büttner <thomas@vergesslicher.tech>
2019-10-29 18:16:08 -04:00
Anthony Lavado
aca4f83333 Remove extra EndIf 2019-10-29 16:24:45 -04:00
LogicalPhallacy
9c65853ddd
updates win32 build script with nssm mirror 2019-10-28 22:10:36 -07:00
LogicalPhallacy
8c0580aa24
Updating win-x64 build NSSM address 2019-10-28 22:09:46 -07:00
LogicalPhallacy
fd8d4894ca
Updated build-jellyfin.ps1 to pull from my mirror
Updated it to pull from my mirror on Azure.
2019-10-28 22:07:01 -07:00
Joshua M. Boniface
53ee78170a
Merge branch 'master' into copr-fix 2019-10-27 13:52:08 -04:00
Joshua Boniface
2cdf5c203a Correct CentOS build for new Fedora spec 2019-10-27 13:51:32 -04:00
Thomas Büttner
bf11426f7d Add comments about Source URLs and remove no longer needed dependency
Signed-off-by: Thomas Büttner <thomas@vergesslicher.tech>
2019-10-26 19:24:44 +02:00
Anthony Lavado
5e90747541 More preparations for the tray app 2019-10-23 04:14:58 -04:00
Anthony Lavado
cfaf2b97fe Add the "service" argument to the service parameters
This will avoid an exception when the server cannot launch a browser process for the web interface.
2019-10-23 03:49:31 -04:00
Anthony Lavado
14a850b4a8 Change the default AppExit action to Exit
When the service should fail to launch Jellyfin, or should Jellyfin crash, the default action is changed from Restart to AppExit. This prevents the service from entering a constant restart due to a permissions issue or similar.
2019-10-23 03:34:12 -04:00
Anthony Lavado
94932ea216 Make installer shortcut check better
During an upgrade, only create shortcuts if the existing install was not a service install. Otherwise, do not create them.
2019-10-22 04:33:06 -04:00
Anthony Lavado
a278b380b6 Fix syntax errors, move order of upgrade checks, enhance folder check, fix shortcuts
Fixes a syntax error with the NoServiceUninstall section. Moves the detection of an existing Service and datadir further up, so it happens before we decide how the installation will happen. Removed a newline from a comment, and enhanced the existing directory check. Adds an existing folder check, as well as a prompt if the user wants to continue with it or not. Also adds the datadir property to shortcuts.
2019-10-22 04:16:08 -04:00
Thomas Büttner
59995c20f1 Fix buildscript failure, remove unnecessary yarn repo for Fedora build 2019-10-21 23:42:54 +02:00
Joshua Boniface
17c1de7bf2 Clean up ubuntu-armhf build steps
Installs the nodejs package via NodeSource, since the Bionic npm
package is heckin' broken.
2019-10-20 13:01:52 -04:00
Joshua Boniface
44e2d91b2f Clean up ubuntu-arm64 build steps
Installs the nodejs package via NodeSource, since the Bionic npm
package is heckin' broken.
2019-10-20 13:01:44 -04:00
Joshua Boniface
f02ab9818a Clean up ubuntu-x64 build steps
Installs the nodejs package via NodeSource, since the Bionic npm
package is heckin' broken.
2019-10-20 13:00:38 -04:00
Joshua Boniface
9a48486838 Clean up debian-armhf build steps 2019-10-20 13:00:14 -04:00
Joshua Boniface
d9f6c6f289 Clean up debian-arm64 build steps 2019-10-20 12:59:52 -04:00
Joshua Boniface
07d45e82f0 Move web-build into Debian build rules
This removes the convoluted steps in docker-build.sh in favour of
integrating the web-build sequence into the Debian rules file
explicitly. This will allow the web-build to work properly outside of
the boutique Docker container we build, thus allowing it to be build
properly directly on a target system with dpkg-buildpackage.
2019-10-20 12:58:10 -04:00
Joshua Boniface
c30866fc93 Remove web frontend build from docker-build.sh
This is now handled in the RPM spec.
2019-10-20 11:18:12 -04:00
Joshua Boniface
d57ee0b2b8 Remove spec version bump
This will be taken care of with the 10.4.1 bump in stable.
2019-10-20 11:12:45 -04:00
Brian J. Murrell
145df92265 Support buiding jellyfin-web webpack
Needs nodejs >= 8 on EL7
- from https://rpm.nodesource.com/pub_8.x/el/7/x86_64/ on EL7.
Needs yarn
- from yarnpkg.com on EL7
2019-10-17 06:22:35 -04:00
Vasily
dd83784da2
Merge pull request #1887 from joshuaboniface/bump-version
Bump version to 10.5.0 for next stable release
2019-10-16 12:40:01 +03:00
Anthony Lavado
330395e8b6 Check for the presence of AppDataLocal folder before using it 2019-10-16 03:25:39 -04:00
Anthony Lavado
6f504a246b Use the registry path for datadir, don't override it here
Removes an assumption on directory if the user has a datadir from the previous install, use that
2019-10-16 03:18:34 -04:00
Anthony Lavado
63e0bd1d61 Only create/remove shortcuts on non-service install
Should only remove shortcuts if the install type was non-service. On upgrade, check if the install type was non-service, and if so, set the variables correctly and create shortcuts.
2019-10-16 03:14:12 -04:00
Anthony Lavado
5232302532 Adds icons to shortcuts, fixes nsis warning
Adds the icon as a resource file in the program folder, and uses it for the shortcuts created.
Removes an extra section from the dialog creator file, so NSIS won't show a warning for unused code.
2019-10-16 02:29:37 -04:00
Anthony Lavado
dc46620a81 Automatically creates shortcuts for non-service installs
If the user is not installing as a service, then the installer creates a Start Menu shortcut, and a desktop shortcut. Commented out future shortcuts for a tray app.
2019-10-16 02:01:26 -04:00
Anthony Lavado
f80343bf9d Fix the Setup Type dialog titles
I had put the title and subtitle in the wrong order. This corrects the issue.
2019-10-16 01:43:53 -04:00
Anthony Lavado
9ad781324e Fix up Setup Type dialog, and add logic for basic setup
Fix up the Setup Type dialog, by removing an unused function from the page.
Adds logic to the installer to check for a basic or advanced setup choice. Ensures that the service is only installed if the "advanced" method is chosen. Note - it may be possible to remove some defaults from the .onInit, considering they get set through the program now.
2019-10-15 04:24:30 -04:00
Anthony Lavado
05fb84ba22 Make service setup an optional component, remove setuptype page config for now 2019-10-12 04:39:34 -04:00
Anthony Lavado
04c4ad731e Begin to add setup type dialog 2019-10-12 03:56:46 -04:00
Anthony Lavado
c8ffa2fb1d Set service install default to no 2019-10-12 03:03:33 -04:00
Joshua Boniface
fffc5e3a6f Bump version to 10.5.0 for next stable release 2019-10-11 20:12:52 -04:00
Joshua Boniface
f20555bf4a Use NVM to install nodejs v8 and yarn
Prevents failure of the installation of jellyfin-web dependencies due
to the NodeJS version in EPEL being too old. v8 might be a little
conservative but is the earliest compatible version. Instead of using
their repo to install Yarn, use the new nvm binary to install Yarn, thus
forcing it to use the updated NodeJS version.
2019-10-07 23:34:02 -04:00
Erwin de Haan
adde41c533
Remove /bin from ffmpeg path. 2019-10-06 22:26:17 +02:00
Erwin de Haan
3925e1dced
Fix extracted path from ffmpeg zip. 2019-10-06 22:20:49 +02:00
Erwin de Haan
c7d1206dcb
Switch to custom patched build for ffmpeg 2019-10-06 22:03:44 +02:00
Joshua Boniface
3651755984 Properly build DLL for porable 2019-09-30 01:11:11 -04:00
Joshua M. Boniface
61f2c41b76 Recursively zip Windows packages (#1809)
Without -r the directory is not properly zipped up.
2019-09-29 00:33:31 -04:00
Joshua Boniface
547a6121b0 Remove redundant yarn build command 2019-09-26 22:09:19 -04:00
Joshua Boniface
3b935d8fd0 Clean up old changelog entires from Debian package 2019-09-25 14:54:39 -04:00
Joshua Boniface
15b83f8b55 Clean up and fix Fedora/CentOS builds
This performs a lot of bugfixing and general cleanup to the
Fedora/CentOS builds, including moving the create_tarball into the
docker-build.sh script, remove some old long versions from the spec
file, correcting several bugs with the Docker environment including
splitting them into more discrete layers, and finally making sure
jellyfin-web is included properly in the RPM.
2019-09-25 14:45:15 -04:00
Joshua Boniface
56a879e148 Use redirection instead of tee 2019-09-25 14:20:49 -04:00
Joshua Boniface
4b257b7b4a Clean up web_build_dir in docker-build.sh 2019-09-25 01:36:20 -04:00
Joshua Boniface
172a81b22c Clean up deployment directory
1. Update README.md to remove some old info
2. Remove common.build.sh from all the build scripts
3. Remove common.build.sh script
4. Remove the docker folder as this isn't used at all
2019-09-25 01:28:07 -04:00