Since this is only run on GH Actions, this will take a bit of trial and

error
This commit is contained in:
Christoph Stahl 2025-02-15 19:59:06 +01:00
parent 3c78ff5ad4
commit 3acb64e6aa
2 changed files with 15 additions and 15 deletions

View file

@ -79,10 +79,10 @@ jobs:
run: pip install -r requirements.txt run: pip install -r requirements.txt
working-directory: ./work working-directory: ./work
- name: Bundle Syng (portable) # - name: Bundle Syng (portable)
run: # run:
pyinstaller -n "syng-${{ env.VERSION }}" -F -w -i'.\syng.ico' --add-data='.\syng.ico;.' --add-data='.\background.png;.' --add-data='.\background20perc.png;.' --add-binary '.\libmpv-2.dll;.' --add-binary '.\ffmpeg.exe;.' syng/main.py # pyinstaller -n "syng-${{ env.VERSION }}" -F -w -i'.\syng.ico' --add-data='.\syng.ico;.' --add-data='.\background.png;.' --add-data='.\background20perc.png;.' --add-binary '.\libmpv-2.dll;.' --add-binary '.\ffmpeg.exe;.' syng/main.py
working-directory: ./work/portable # working-directory: ./work/portable
- name: Bundle Syng (install) - name: Bundle Syng (install)
run: run:
@ -99,11 +99,11 @@ jobs:
working-directory: ./work/install working-directory: ./work/install
- name: Upload artifact (portable) # - name: Upload artifact (portable)
uses: actions/upload-artifact@v4 # uses: actions/upload-artifact@v4
with: # with:
name: Syng Version ${{ env.VERSION }} portable # name: Syng Version ${{ env.VERSION }} portable
path: work/portable/dist/syng-${{ env.VERSION }}.exe # path: work/portable/dist/syng-${{ env.VERSION }}.exe
- name: Upload artifact (install) - name: Upload artifact (install)
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<Package Language="1033" <Package Language="1033"
Manufacturer="Syng Rocks" Manufacturer="Syng.Rocks!"
Name="Syng" Name="Syng"
Scope="perUserOrMachine" Scope="perUserOrMachine"
UpgradeCode="092e7e0b-5042-47a1-9673-544d9722f8df" UpgradeCode="092e7e0b-5042-47a1-9673-544d9722f8df"
@ -10,10 +10,10 @@
<Icon Id="syng.ico" SourceFile="syng.ico"/> <Icon Id="syng.ico" SourceFile="syng.ico"/>
<Property Id="ARPPRODUCTICON" Value="syng.ico" /> <Property Id="ARPPRODUCTICON" Value="syng.ico" />
<StandardDirectory Id="TARGETDIR"> <StandardDirectory Id="TARGETDIR">
<Directory Id="ProgramFilesFolder"> <StandardDirectory Id="ProgramFilesFolder">
<Directory Id="INSTALLFOLDER" Name="syng"> <Directory Id="INSTALLFOLDER" Name="syng">
<Component Id="ProductComponent"> <Component Id="ProductComponent">
<File KeyPath="yes" Source="dist\syng.exe" Name="syng.exe"></File> <File KeyPath="yes" Source="dist\syng\syng.exe" Name="syng.exe"></File>
<Shortcut Id="startmenuShortcut" <Shortcut Id="startmenuShortcut"
Directory="ProgramMenuDir" Directory="ProgramMenuDir"
Name="syng" Name="syng"
@ -30,13 +30,13 @@
Advertise="yes" /> Advertise="yes" />
</Component> </Component>
<Directory Name="data"> <Directory Name="data">
<Files Include="dist\data\**"> <Files Include="dist\syng\data\**">
</Files> </Files>
</Directory> </Directory>
</Directory> </Directory>
</Directory> </Directory>
</StandardDirectory> </StandardDirectory>
<Directory Id="ProgramMenuFolder" Name="Programs"> <StandardDirectory Id="ProgramMenuFolder" Name="Programs">
<Directory Id="ProgramMenuDir" Name="syng"/> <Directory Id="ProgramMenuDir" Name="syng"/>
</Directory> </Directory>
<StandardDirectory Id="DesktopFolder"/> <StandardDirectory Id="DesktopFolder"/>