More installer and packaging fixes.

CMakeModules/CompleteBundleWin.cmake.in

@@ -3,7 +3,7 @@ set(PROJECT_SOURCE_DIR @PROJECT_SOURCE_DIR@)
 execute_process(COMMAND @QTROOT@/bin/windeployqt.exe --verbose 9 --qmldir @SOURCE_ROOT@/src/ui ${CMAKE_INSTALL_PREFIX}/JellyfinMediaPlayer.exe)
 
 # on windows windeployqt doesnt install non qt libraries, let cmake do that
-include(BundleUtilities)
+# include(BundleUtilities)
 
 foreach(d @CMAKE_FIND_ROOT_PATH@)
   list(APPEND SEARCHDIRS ${d}/bin)
@@ -13,8 +13,9 @@ endforeach()
 get_filename_component(CEC_DIR @CEC_LIBRARY@ DIRECTORY)
 list(APPEND SEARCHDIRS ${CEC_DIR})
 
-fixup_bundle("${CMAKE_INSTALL_PREFIX}/JellyfinMediaPlayer.exe" "" "${SEARCHDIRS}") 
-install(PROGRAMS ${VCREDIST_DIR}/vc_redist_2015_x64.exe DESTINATION .)
+# fixup_bundle("${CMAKE_INSTALL_PREFIX}/JellyfinMediaPlayer.exe" "" "${SEARCHDIRS}") 
+#install(PROGRAMS ${VCREDIST_DIR}/vcredist_msvc2017_x64.exe DESTINATION .)
+file(INSTALL @MPV_LIBRARY@ DESTINATION "${CMAKE_INSTALL_PREFIX}")
 
 if(@DO_ENABLE_ANGLE_DEP@)
   message(STATUS "Deploying separate ANGLE deps")

CMakeModules/VersionConfiguration.cmake

@@ -26,14 +26,8 @@ set(VERSION_NANO 0)
 
 option(UPGRADE_DEBUG "" OFF)
 
-if(UPGRADE_DEBUG)
-  set(VERSION_STRING "1.0.4.177-195ef65f")
-  set(VERSION_STRING_SHORT "1.0.4")
-  set(CANONICAL_VERSION_STRING "1.0.4-195ef65f")
-else()
-  set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_NANO}.${VERSION_BUILD}-${GIT_REVISION}")
-  set(VERSION_STRING_SHORT "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_NANO}")
-  set(CANONICAL_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_NANO}-${GIT_REVISION}")
-endif()
+set(VERSION_STRING "1.0.0")
+set(VERSION_STRING_SHORT "1.0.0")
+set(CANONICAL_VERSION_STRING "1.0.0")
 
 configure_file(src/core/Version.cpp.in src/core/Version.cpp)

README.md

@@ -53,6 +53,7 @@ Please install:
    - Place the contents in the build directory, in a subfolder called `mpv`.
    - Move the contents of the `include` folder to an `mpv` folder inside the `include` folder.
    - Move the `mpv-1.dll` to `mpv.dll`.
+ - [WIX](https://wixtoolset.org/releases/v3.11.2/stable)
 
 You need to run these commands in git bash.
 
@@ -67,8 +68,9 @@ unzip dist.zip
 Open the "x86_x64 Cross Tools Command Prompt for VS 2017". `cd` to the `build` directory. Run:
 
 ```
-cmake -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=output -DCMAKE_MAKE_PROGRAM=ninja.exe -DQTROOT=C:\Qt\Qt5.9.9\5.9.9\msvc2017_64 -DMPV_INCLUDE_DIR=mpv\include -DMPV_LIBRARY=mpv\mpv.dll -DVCREDIST_DIR=C:\Qt\Qt5.9.9\vcredist -DCMAKE_INSTALL_PREFIX=output ..
-lib /def:mpv\mpv.def /out:mpv\mpv-1.lib /MACHINE:X64
+set PATH=%PATH%;C:\Program Files (x86)\WiX Toolset v3.11\bin
+cmake -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=output -DCMAKE_MAKE_PROGRAM=ninja.exe -DQTROOT=C:/Qt/Qt5.9.9/5.9.9/msvc2017_64 -DMPV_INCLUDE_DIR=mpv/include -DMPV_LIBRARY=mpv/mpv.dll -DCMAKE_INSTALL_PREFIX=output ..
+lib /def:mpv\mpv.def /out:mpv\mpv.dll.lib /MACHINE:X64
 ninja
 ninja windows_package
 ```

bundle/win/Bundle.wxs

@@ -244,7 +244,7 @@
         <MsiProperty Name="WINDOWSTYPE" Value="[WinRegInstallationType]" />
       </MsiPackage>
       <ExePackage Id="vcredist_repair"
-                  SourceFile="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\1033\vcredist_x64.exe"
+                  SourceFile="C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Redist\MSVC\14.16.27012\vcredist_x64.exe"
                   Name="vcredist_x64.exe"
                   InstallCommand="/repair /quiet /norestart"
                   InstallCondition="Bad_VCRedist"
@@ -254,7 +254,7 @@
         <ExitCode Value="1638" Behavior="success"/>
       </ExePackage>
       <ExePackage Id="vcredist"
-                  SourceFile="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\1033\vcredist_x64.exe"
+                  SourceFile="C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Redist\MSVC\14.16.27012\vcredist_x64.exe"
                   Name="vcredist_x64.exe"
                   InstallCommand="/install /quiet /norestart"
                   InstallCondition="NOT Bad_VCRedist"

bundle/win/JMP.wxs

@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" 
-     xmlns:fire="http://schemas.microsoft.com/wix/FirewallExtension">
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
 
   <?include Global.wxi ?>
   <?include Version.wxi ?>
 
 
-  <?define FirstProductVersion=1.0.0 ?>
+  <?define FirstProductVersion=0.0.0 ?>
   <?define JellyfinMediaPlayerRegistryKey=Software\Jellyfin\Jellyfin Media Player?>
 
     <!-- To keep things simple, the installer considers each new release
@@ -102,11 +101,7 @@
         <RegistryKey Root="HKCU" Key="Software\Jellyfin\Jellyfin Media Player">
           <RegistryValue Name="InstallFolder" Type="string" Value="[INSTALLLOCATION]" Action="write" KeyPath="no" />
         </RegistryKey>
-        
-                <!-- Firewall Exceptions -->
-        <!-- These should probably go in their own component, but it's easier just to put them here -->
-        <fire:FirewallException Id="FWX1" Name="Jellyfin Media Player" Program="[INSTALLLOCATION]JellyfinMediaPlayer.exe" Scope="any" IgnoreFailure="yes" />
-                  
+                          
         <RemoveFolder Id="JellyfinStartMenuFolder" On="uninstall" />
       </Component>
     </DirectoryRef>

bundle/win/pmstheme.xml

@@ -6,7 +6,7 @@
   <Font Id="2" Height="-22" Weight="500" Foreground="666666">Segoe UI</Font>
   <Font Id="3" Height="-12" Weight="500" Foreground="FFFFFF" Background="1F1F1F">Segoe UI</Font>
   <Font Id="4" Height="-12" Weight="500" Foreground="ff0000" Background="1F1F1F" Underline="yes">Segoe UI</Font>
-  <Font Id="5" Height="-24" Weight="500" Foreground="197BCC">Segoe UI</Font>
+  <Font Id="5" Height="-24" Weight="500" Foreground="a75dc3">Segoe UI</Font>
   
   <Text X="11" Y="26" Width="-11" Height="30" FontId="5" Visible="yes" DisablePrefix="yes" Center="yes">#(loc.Title)</Text>
   <Image X="200" Y="75" Width="85" Height="85" ImageFile="jellyfin-chevron-85.png" Visible="yes" />

src/ui/webview.qml

@@ -213,7 +213,7 @@ KonvergoWindow
     z: 5
     anchors.centerIn: parent
     color: "#999999"
-    linkColor: "#cc7b19"
+    linkColor: "#a85dc3"
     text: "Generic error"
     font.pixelSize: 32
     font.bold: true