mirror of
https://github.com/Suwayomi/Tachidesk.git
synced 2025-12-10 06:42:07 +01:00
Automated MSI package building (#277)
* Create msi package instead of zipping stuff * Keep the zip release, Install wixl inside windows-bundler.sh * Fix mistakes * Seprate mv command * Automate versioning * Fix syntax mistake * Fix mistake
This commit is contained in:
Mahor
2
.github/workflows/build_push.yml
vendored
2
.github/workflows/build_push.yml
vendored
@@ -103,7 +103,7 @@ jobs:
|
|||||||
uses: ncipollo/release-action@v1
|
uses: ncipollo/release-action@v1
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.DEPLOY_PREVIEW_TOKEN }}
|
token: ${{ secrets.DEPLOY_PREVIEW_TOKEN }}
|
||||||
artifacts: "master/server/build/*.jar,master/server/build/*.zip,master/server/build/*.tar.gz"
|
artifacts: "master/server/build/*.jar,master/server/build/*.msi,master/server/build/*.zip,master/server/build/*.tar.gz"
|
||||||
owner: "Suwayomi"
|
owner: "Suwayomi"
|
||||||
repo: "Tachidesk-Server-preview"
|
repo: "Tachidesk-Server-preview"
|
||||||
tag: ${{ steps.GenTagName.outputs.value }}
|
tag: ${{ steps.GenTagName.outputs.value }}
|
||||||
|
|||||||
2
.github/workflows/publish.yml
vendored
2
.github/workflows/publish.yml
vendored
@@ -72,7 +72,7 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
with:
|
with:
|
||||||
file: "master/server/build/*.jar;master/server/build/*.zip;master/server/build/*.tar.gz"
|
file: "master/server/build/*.jar;master/server/build/*.msi;master/server/build/*.zip;master/server/build/*.tar.gz"
|
||||||
tags: true
|
tags: true
|
||||||
draft: true
|
draft: true
|
||||||
verbose: true
|
verbose: true
|
||||||
|
|||||||
86
scripts/Tachidesk-Server-x64.wxs
Executable file
86
scripts/Tachidesk-Server-x64.wxs
Executable file
@@ -0,0 +1,86 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
|
||||||
|
<Product Id="*" UpgradeCode="*"
|
||||||
|
Version="$(var.ProductVersion)" Language="1033" Name="Tachidesk Server" Manufacturer="Suwayomi">
|
||||||
|
<Package InstallerVersion="300" Compressed="yes" />
|
||||||
|
<Media Id="1" Cabinet="Tachidesk_Server.cab" EmbedCab="yes" />
|
||||||
|
|
||||||
|
<Condition Message="This version of Windows does not support deploying 64-bit packages.">
|
||||||
|
VersionNT64
|
||||||
|
</Condition>
|
||||||
|
|
||||||
|
<!-- Directory -->
|
||||||
|
<Directory Id="TARGETDIR" Name="SourceDir">
|
||||||
|
<Directory Id="ProgramFiles64Folder">
|
||||||
|
<Directory Id="INSTALLDIR" Name="Tachidesk-Server" >
|
||||||
|
<Directory Id="jre"/>
|
||||||
|
<Directory Id="electron"/>
|
||||||
|
</Directory>
|
||||||
|
</Directory>
|
||||||
|
<Directory Id="ProgramMenuFolder">
|
||||||
|
<Directory Id="ProgramMenuDir" Name="Tachidesk-Server">
|
||||||
|
<Component Id="ProgramMenuDir" Guid="*">
|
||||||
|
<RemoveFolder Id="ProgramMenuDir" On="uninstall"/>
|
||||||
|
<RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Type="string" Value="" KeyPath="yes"/>
|
||||||
|
</Component>
|
||||||
|
</Directory>
|
||||||
|
</Directory>
|
||||||
|
<Directory Id="DesktopFolder" />
|
||||||
|
</Directory>
|
||||||
|
|
||||||
|
<!-- Component -->
|
||||||
|
<DirectoryRef Id="INSTALLDIR">
|
||||||
|
<Component Id="TachideskJAR" Guid="*" Win64="yes">
|
||||||
|
<File Id="Tachidesk.jar" Source="$(var.SourceDir)/Tachidesk.jar" KeyPath="yes" />
|
||||||
|
</Component>
|
||||||
|
|
||||||
|
<Component Id="TachideskBrowserBAT" Guid="*" Win64="yes">
|
||||||
|
<File Id="TachideskBrowser.bat" Source="$(var.SourceDir)/Tachidesk Browser Launcher.bat" KeyPath="yes" >
|
||||||
|
<Shortcut Id="TachideskBrowser.lnk" Name="Tachidesk Browser" Directory="INSTALLDIR"
|
||||||
|
WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes" />
|
||||||
|
<Shortcut Id="DesktopTachideskBrowser.lnk" Name="Tachidesk Browser" Directory="DesktopFolder"
|
||||||
|
WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes" />
|
||||||
|
<Shortcut Id="ProgramMenuTachideskBrowser.lnk" Name="Tachidesk Browser" Directory="ProgramMenuDir"
|
||||||
|
WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes"
|
||||||
|
Description="A free and open source manga reader that runs extensions built for Tachiyomi." />
|
||||||
|
</File>
|
||||||
|
</Component>
|
||||||
|
|
||||||
|
<Component Id="TachideskDebugBAT" Guid="*" Win64="yes">
|
||||||
|
<File Id="TachideskDebug.bat" Source="$(var.SourceDir)/Tachidesk Debug Launcher.bat" KeyPath="yes">
|
||||||
|
<Shortcut Id="TachideskDebug.lnk" Name="Tachidesk Debug" Directory="INSTALLDIR"
|
||||||
|
WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes" />
|
||||||
|
<Shortcut Id="ProgramMenuTachideskDebug.lnk" Name="Tachidesk Debug" Directory="ProgramMenuDir"
|
||||||
|
WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes"
|
||||||
|
Description="Launches Tachidesk with debug logs attached. If Tachidesk doesn't work for you, running this can give you insight into why." />
|
||||||
|
</File>
|
||||||
|
</Component>
|
||||||
|
|
||||||
|
<Component Id="TachideskElectronBAT" Guid="*" Win64="yes">
|
||||||
|
<File Id="TachideskElectron.bat" Source="$(var.SourceDir)/Tachidesk Electron Launcher.bat" KeyPath="yes">
|
||||||
|
<Shortcut Id="TachideskElectron.lnk" Name="Tachidesk Electron" Directory="INSTALLDIR"
|
||||||
|
WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes" />
|
||||||
|
<Shortcut Id="DesktopTachideskElectron.lnk" Name="Tachidesk Electron" Directory="DesktopFolder"
|
||||||
|
WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes" />
|
||||||
|
<Shortcut Id="ProgramMenuTachideskElectron.lnk" Name="Tachidesk Electron" Directory="ProgramMenuDir"
|
||||||
|
WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes"
|
||||||
|
Description="Launches Tachidesk inside Electron as a desktop applicaton." />
|
||||||
|
</File>
|
||||||
|
</Component>
|
||||||
|
</DirectoryRef>
|
||||||
|
|
||||||
|
<!-- Feature -->
|
||||||
|
<Feature Id="Tachidesk_Server" Title="Tachidesk-Server" Level="1">
|
||||||
|
<ComponentGroupRef Id="jre" />
|
||||||
|
<ComponentRef Id="TachideskJAR" />
|
||||||
|
<ComponentRef Id="TachideskBrowserBAT" />
|
||||||
|
<ComponentRef Id="TachideskDebugBAT" />
|
||||||
|
<ComponentRef Id="ProgramMenuDir" />
|
||||||
|
<ComponentGroupRef Id="electron" />
|
||||||
|
<ComponentRef Id="TachideskElectronBAT" />
|
||||||
|
</Feature>
|
||||||
|
|
||||||
|
<Icon Id="Tachidesk.ico" SourceFile="../server/src/main/resources/icon/faviconlogo.ico" />
|
||||||
|
<Property Id="ARPPRODUCTICON" Value="Tachidesk.ico" /> <!-- Icon in Add/Remove Programs -->
|
||||||
|
</Product>
|
||||||
|
</Wix>
|
||||||
82
scripts/Tachidesk-Server-x86.wxs
Executable file
82
scripts/Tachidesk-Server-x86.wxs
Executable file
@@ -0,0 +1,82 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
|
||||||
|
<Product Id="*" UpgradeCode="*"
|
||||||
|
Version="$(var.ProductVersion)" Language="1033" Name="Tachidesk Server" Manufacturer="Suwayomi">
|
||||||
|
<Package InstallerVersion="300" Compressed="yes" />
|
||||||
|
<Media Id="1" Cabinet="Tachidesk_Server.cab" EmbedCab="yes" />
|
||||||
|
|
||||||
|
<!-- Directory -->
|
||||||
|
<Directory Id="TARGETDIR" Name="SourceDir">
|
||||||
|
<Directory Id="ProgramFilesFolder">
|
||||||
|
<Directory Id="INSTALLDIR" Name="Tachidesk-Server" >
|
||||||
|
<Directory Id="jre"/>
|
||||||
|
<Directory Id="electron"/>
|
||||||
|
</Directory>
|
||||||
|
</Directory>
|
||||||
|
<Directory Id="ProgramMenuFolder">
|
||||||
|
<Directory Id="ProgramMenuDir" Name="Tachidesk-Server">
|
||||||
|
<Component Id="ProgramMenuDir" Guid="*">
|
||||||
|
<RemoveFolder Id="ProgramMenuDir" On="uninstall"/>
|
||||||
|
<RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Type="string" Value="" KeyPath="yes"/>
|
||||||
|
</Component>
|
||||||
|
</Directory>
|
||||||
|
</Directory>
|
||||||
|
<Directory Id="DesktopFolder" />
|
||||||
|
</Directory>
|
||||||
|
|
||||||
|
<!-- Component -->
|
||||||
|
<DirectoryRef Id="INSTALLDIR">
|
||||||
|
<Component Id="TachideskJAR" Guid="*">
|
||||||
|
<File Id="Tachidesk.jar" Source="$(var.SourceDir)/Tachidesk.jar" KeyPath="yes" />
|
||||||
|
</Component>
|
||||||
|
|
||||||
|
<Component Id="TachideskBrowserBAT" Guid="*">
|
||||||
|
<File Id="TachideskBrowser.bat" Source="$(var.SourceDir)/Tachidesk Browser Launcher.bat" KeyPath="yes" >
|
||||||
|
<Shortcut Id="TachideskBrowser.lnk" Name="Tachidesk Browser" Directory="INSTALLDIR"
|
||||||
|
WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes" />
|
||||||
|
<Shortcut Id="DesktopTachideskBrowser.lnk" Name="Tachidesk Browser" Directory="DesktopFolder"
|
||||||
|
WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes" />
|
||||||
|
<Shortcut Id="ProgramMenuTachideskBrowser.lnk" Name="Tachidesk Browser" Directory="ProgramMenuDir"
|
||||||
|
WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes"
|
||||||
|
Description="A free and open source manga reader that runs extensions built for Tachiyomi." />
|
||||||
|
</File>
|
||||||
|
</Component>
|
||||||
|
|
||||||
|
<Component Id="TachideskDebugBAT" Guid="*">
|
||||||
|
<File Id="TachideskDebug.bat" Source="$(var.SourceDir)/Tachidesk Debug Launcher.bat" KeyPath="yes">
|
||||||
|
<Shortcut Id="TachideskDebug.lnk" Name="Tachidesk Debug" Directory="INSTALLDIR"
|
||||||
|
WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes" />
|
||||||
|
<Shortcut Id="ProgramMenuTachideskDebug.lnk" Name="Tachidesk Debug" Directory="ProgramMenuDir"
|
||||||
|
WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes"
|
||||||
|
Description="Launches Tachidesk with debug logs attached. If Tachidesk doesn't work for you, running this can give you insight into why." />
|
||||||
|
</File>
|
||||||
|
</Component>
|
||||||
|
|
||||||
|
<Component Id="TachideskElectronBAT" Guid="*">
|
||||||
|
<File Id="TachideskElectron.bat" Source="$(var.SourceDir)/Tachidesk Electron Launcher.bat" KeyPath="yes">
|
||||||
|
<Shortcut Id="TachideskElectron.lnk" Name="Tachidesk Electron" Directory="INSTALLDIR"
|
||||||
|
WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes" />
|
||||||
|
<Shortcut Id="DesktopTachideskElectron.lnk" Name="Tachidesk Electron" Directory="DesktopFolder"
|
||||||
|
WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes" />
|
||||||
|
<Shortcut Id="ProgramMenuTachideskElectron.lnk" Name="Tachidesk Electron" Directory="ProgramMenuDir"
|
||||||
|
WorkingDirectory="INSTALLDIR" Icon="Tachidesk.ico" IconIndex="0" Advertise="yes"
|
||||||
|
Description="Launches Tachidesk inside Electron as a desktop applicaton." />
|
||||||
|
</File>
|
||||||
|
</Component>
|
||||||
|
</DirectoryRef>
|
||||||
|
|
||||||
|
<!-- Feature -->
|
||||||
|
<Feature Id="Tachidesk_Server" Title="Tachidesk-Server" Level="1">
|
||||||
|
<ComponentGroupRef Id="jre" />
|
||||||
|
<ComponentRef Id="TachideskJAR" />
|
||||||
|
<ComponentRef Id="TachideskBrowserBAT" />
|
||||||
|
<ComponentRef Id="TachideskDebugBAT" />
|
||||||
|
<ComponentRef Id="ProgramMenuDir" />
|
||||||
|
<ComponentGroupRef Id="electron" />
|
||||||
|
<ComponentRef Id="TachideskElectronBAT" />
|
||||||
|
</Feature>
|
||||||
|
|
||||||
|
<Icon Id="Tachidesk.ico" SourceFile="../server/src/main/resources/icon/faviconlogo.ico" />
|
||||||
|
<Property Id="ARPPRODUCTICON" Value="Tachidesk.ico" /> <!-- Icon in Add/Remove Programs -->
|
||||||
|
</Product>
|
||||||
|
</Wix>
|
||||||
@@ -7,8 +7,8 @@
|
|||||||
# file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
# file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
||||||
|
|
||||||
electron_version="v14.0.0"
|
electron_version="v14.0.0"
|
||||||
|
arch=$1
|
||||||
if [ $1 = "win32" ]; then
|
if [ $arch = "win32" ]; then
|
||||||
jre="OpenJDK8U-jre_x86-32_windows_hotspot_8u292b10.zip"
|
jre="OpenJDK8U-jre_x86-32_windows_hotspot_8u292b10.zip"
|
||||||
jre_release="jdk8u292-b10"
|
jre_release="jdk8u292-b10"
|
||||||
jre_url="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/$jre_release/$jre"
|
jre_url="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/$jre_release/$jre"
|
||||||
@@ -29,7 +29,7 @@ echo "creating windows bundle"
|
|||||||
jar=$(ls ../server/build/*.jar | tail -n1)
|
jar=$(ls ../server/build/*.jar | tail -n1)
|
||||||
jar_name=$(echo $jar | cut -d'/' -f4)
|
jar_name=$(echo $jar | cut -d'/' -f4)
|
||||||
release_name=$(echo $jar_name | sed 's/.jar//')-$arch
|
release_name=$(echo $jar_name | sed 's/.jar//')-$arch
|
||||||
|
release_ver=$(tmp=${jar%-*} && echo ${tmp##*-} | tr -d v)
|
||||||
|
|
||||||
# make release dir
|
# make release dir
|
||||||
mkdir $release_name
|
mkdir $release_name
|
||||||
@@ -62,6 +62,7 @@ if [ $CI = true ]; then
|
|||||||
sudo add-apt-repository ppa:cybermax-dexter/sdl2-backport
|
sudo add-apt-repository ppa:cybermax-dexter/sdl2-backport
|
||||||
sudo apt-add-repository "deb https://dl.winehq.org/wine-builds/ubuntu $(lsb_release -cs) main"
|
sudo apt-add-repository "deb https://dl.winehq.org/wine-builds/ubuntu $(lsb_release -cs) main"
|
||||||
sudo apt install --install-recommends winehq-stable
|
sudo apt install --install-recommends winehq-stable
|
||||||
|
sudo apt install -y wixl
|
||||||
fi
|
fi
|
||||||
# this script assumes that wine is installed here on out
|
# this script assumes that wine is installed here on out
|
||||||
|
|
||||||
@@ -76,11 +77,26 @@ cp "resources/Tachidesk Electron Launcher.bat" $release_name
|
|||||||
zip_name=$release_name.zip
|
zip_name=$release_name.zip
|
||||||
zip -9 -r $zip_name $release_name
|
zip -9 -r $zip_name $release_name
|
||||||
|
|
||||||
|
# create msi package
|
||||||
|
msi_name=$release_name.msi
|
||||||
|
|
||||||
|
find $release_name/jre | wixl-heat --var var.SourceDir -p $release_name/ --directory-ref jre --component-group jre > jre.wxs
|
||||||
|
find $release_name/electron | wixl-heat --var var.SourceDir -p $release_name/ --directory-ref electron --component-group electron > electron.wxs
|
||||||
|
if [ $arch = "win32" ]; then
|
||||||
|
wixl -D ProductVersion=$release_ver -D SourceDir=$release_name --arch x86 Tachidesk-Server-x86.wxs jre.wxs electron.wxs -o $msi_name
|
||||||
|
else
|
||||||
|
wixl -D ProductVersion=$release_ver -D SourceDir=$release_name --arch x64 Tachidesk-Server-x64.wxs jre.wxs electron.wxs -o $msi_name
|
||||||
|
fi
|
||||||
|
|
||||||
rm -rf $release_name
|
rm -rf $release_name
|
||||||
|
|
||||||
# clean up from possible previous runs
|
# clean up from possible previous runs
|
||||||
if [ -f ../server/build/$zip_name ]; then
|
if [ -f ../server/build/$zip_name ]; then
|
||||||
rm ../server/build/$zip_name
|
rm ../server/build/$zip_name
|
||||||
fi
|
fi
|
||||||
|
if [ -f ../server/build/$msi_name ]; then
|
||||||
|
rm ../server/build/$msi_name
|
||||||
|
fi
|
||||||
|
|
||||||
mv $zip_name ../server/build/
|
mv $zip_name ../server/build/
|
||||||
|
mv $msi_name ../server/build/
|
||||||
|
|||||||
Reference in New Issue
Block a user