Skip to content

Commit f6e9d55

Browse files
cfsmp3cfsmp3
authored
fix(release): Update Flutter GUI files and add versioned filenames
2 parents 45ee03a + 07cc78c commit f6e9d55

2 files changed

Lines changed: 45 additions & 6 deletions

File tree

‎.github/workflows/release.yml‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ jobs:
2626
# Extract version from tag, strip 'v' prefix and everything after first dash
2727
VERSION=${GITHUB_REF/refs\/tags\/v/}
2828
VERSION=${VERSION%%-*}
29+
# Save display version for filenames (e.g., 0.96.1)
30+
echo ::set-output name=DISPLAY_VERSION::$VERSION
2931
# Count dots to determine version format
3032
DOTS="${VERSION//[^.]}"
3133
PART_COUNT=$((${#DOTS} + 1))
@@ -96,26 +98,32 @@ jobs:
9698
run: Get-ChildItem -Recurse ./installer
9799
working-directory: ./windows
98100
- name: Create portable zip
99-
run: Compress-Archive -Path ./installer/* -DestinationPath ./CCExtractor_win_portable.zip
101+
run: Compress-Archive -Path ./installer/* -DestinationPath ./CCExtractor.${{ steps.get_version.outputs.DISPLAY_VERSION }}_win_portable.zip
100102
working-directory: ./windows
101103
- name: Build installer
102-
run: wix build -ext WixToolset.UI.wixext -d "AppVersion=${{ steps.get_version.outputs.VERSION }}" -o CCExtractor.msi installer.wxs CustomUI.wxs
104+
run: wix build -ext WixToolset.UI.wixext -d "AppVersion=${{ steps.get_version.outputs.VERSION }}" -o CCExtractor.${{ steps.get_version.outputs.DISPLAY_VERSION }}.msi installer.wxs CustomUI.wxs
103105
working-directory: ./windows
104106
- name: Upload as asset
105107
uses: AButler/upload-release-assets@v3.0
106108
with:
107-
files: './windows/CCExtractor.msi;./windows/CCExtractor_win_portable.zip'
109+
files: './windows/CCExtractor.${{ steps.get_version.outputs.DISPLAY_VERSION }}.msi;./windows/CCExtractor.${{ steps.get_version.outputs.DISPLAY_VERSION }}_win_portable.zip'
108110
repo-token: ${{ secrets.GITHUB_TOKEN }}
109111
create_linux_package:
110112
runs-on: ubuntu-latest
111113
steps:
112114
- uses: actions/checkout@v6
113115
with:
114116
path: ./ccextractor
117+
- name: Get the version
118+
id: get_version
119+
run: |
120+
VERSION=${GITHUB_REF/refs\/tags\/v/}
121+
VERSION=${VERSION%%-*}
122+
echo ::set-output name=DISPLAY_VERSION::$VERSION
115123
- name: Create .tar.gz without git and windows folders
116-
run: tar -pczf ./ccextractor_minimal.tar.gz --exclude "ccextractor/windows" --exclude "ccextractor/.git" ccextractor
124+
run: tar -pczf ./ccextractor.${{ steps.get_version.outputs.DISPLAY_VERSION }}.tar.gz --exclude "ccextractor/windows" --exclude "ccextractor/.git" ccextractor
117125
- name: Upload as asset
118126
uses: AButler/upload-release-assets@v3.0
119127
with:
120-
files: './ccextractor_minimal.tar.gz'
128+
files: './ccextractor.${{ steps.get_version.outputs.DISPLAY_VERSION }}.tar.gz'
121129
repo-token: ${{ secrets.GITHUB_TOKEN }}

‎windows/installer.wxs‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
<ComponentGroupRef Id="CCX_Components_MainFolder_data_flutter_assets"/>
99
<ComponentGroupRef Id="CCX_Components_MainFolder_data_flutter_assets_assets"/>
1010
<ComponentGroupRef Id="CCX_Components_MainFolder_data_flutter_assets_fonts"/>
11+
<ComponentGroupRef Id="CCX_Components_MainFolder_data_flutter_assets_shaders"/>
1112
<ComponentGroupRef Id="CCX_Components_MainFolder_data_flutter_assets_cupertino"/>
13+
<ComponentGroupRef Id="CCX_Components_MainFolder_data_flutter_assets_window_manager"/>
1214
<ComponentRef Id="ApplicationShortcutDesktop"/>
1315
</Feature>
1416
<Icon Id="ccxgui.exe" SourceFile="./installer/ccxgui.exe"/>
@@ -42,10 +44,14 @@
4244
<Directory Id="CCX_data_flutter_assets" Name="flutter_assets">
4345
<Directory Id="CCX_data_flutter_assets_assets" Name="assets"/>
4446
<Directory Id="CCX_data_flutter_assets_fonts" Name="fonts"/>
47+
<Directory Id="CCX_data_flutter_assets_shaders" Name="shaders"/>
4548
<Directory Id="dirEE44DD2D485FE70BEAFB55755745AB6E" Name="packages">
4649
<Directory Id="dir382F01892F72FB688A688BE6E01B93A3" Name="cupertino_icons">
4750
<Directory Id="CCX_data_flutter_assets_cupertino" Name="assets"/>
4851
</Directory>
52+
<Directory Id="dirWindowManager" Name="window_manager">
53+
<Directory Id="dirWindowManagerImages" Name="images"/>
54+
</Directory>
4955
</Directory>
5056
</Directory>
5157
</Directory>
@@ -113,7 +119,10 @@
113119
<File Source="./installer/desktop_drop_plugin.dll" KeyPath="yes"/>
114120
</Component>
115121
<Component Guid="{BE7FE765-EBA8-4FAB-8864-8561C50D39CF}">
116-
<File Source="./installer/window_size_plugin.dll" KeyPath="yes"/>
122+
<File Source="./installer/screen_retriever_plugin.dll" KeyPath="yes"/>
123+
</Component>
124+
<Component Guid="{29012345-6789-0123-2345-789012345678}">
125+
<File Source="./installer/window_manager_plugin.dll" KeyPath="yes"/>
117126
</Component>
118127
<!-- VC++ Runtime -->
119128
<Component Guid="{32F0A64B-0C07-4807-A48C-714B2533A03C}">
@@ -135,6 +144,9 @@
135144
</Component>
136145
</ComponentGroup>
137146
<ComponentGroup Id="CCX_Components_MainFolder_data_flutter_assets" Directory="CCX_data_flutter_assets">
147+
<Component Id="cmpAssetManifestBin" Guid="{3A012345-6789-0123-3456-890123456789}">
148+
<File Id="filAssetManifestBin" KeyPath="yes" Source="./installer/data/flutter_assets/AssetManifest.bin"/>
149+
</Component>
138150
<Component Id="cmp1C63471C238EEA92D0AE37BC7DF9E605" Guid="{DEAF277D-3D05-4B37-A732-9514B503B74A}">
139151
<File Id="fil3F43BEEF0A85EE6619E4674CA43CB616" KeyPath="yes" Source="./installer/data/flutter_assets/AssetManifest.json"/>
140152
</Component>
@@ -163,6 +175,25 @@
163175
<File Id="fil341334402AF57DB92DF3F7C92E983317" KeyPath="yes" Source="./installer/data/flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf"/>
164176
</Component>
165177
</ComponentGroup>
178+
<ComponentGroup Id="CCX_Components_MainFolder_data_flutter_assets_shaders" Directory="CCX_data_flutter_assets_shaders">
179+
<Component Id="cmpInkSparkleFrag" Guid="{4B012345-6789-0123-4567-901234567890}">
180+
<File Id="filInkSparkleFrag" KeyPath="yes" Source="./installer/data/flutter_assets/shaders/ink_sparkle.frag"/>
181+
</Component>
182+
</ComponentGroup>
183+
<ComponentGroup Id="CCX_Components_MainFolder_data_flutter_assets_window_manager" Directory="dirWindowManagerImages">
184+
<Component Id="cmpWmClose" Guid="{5C012345-6789-0123-5678-012345678901}">
185+
<File Id="filWmClose" KeyPath="yes" Source="./installer/data/flutter_assets/packages/window_manager/images/ic_chrome_close.png"/>
186+
</Component>
187+
<Component Id="cmpWmMaximize" Guid="{6D012345-6789-0123-6789-123456789012}">
188+
<File Id="filWmMaximize" KeyPath="yes" Source="./installer/data/flutter_assets/packages/window_manager/images/ic_chrome_maximize.png"/>
189+
</Component>
190+
<Component Id="cmpWmMinimize" Guid="{7E012345-6789-0123-7890-234567890123}">
191+
<File Id="filWmMinimize" KeyPath="yes" Source="./installer/data/flutter_assets/packages/window_manager/images/ic_chrome_minimize.png"/>
192+
</Component>
193+
<Component Id="cmpWmUnmaximize" Guid="{8F012345-6789-0123-8901-345678901234}">
194+
<File Id="filWmUnmaximize" KeyPath="yes" Source="./installer/data/flutter_assets/packages/window_manager/images/ic_chrome_unmaximize.png"/>
195+
</Component>
196+
</ComponentGroup>
166197
</Fragment>
167198
</Wix>
168199

0 commit comments

Comments
 (0)