Skip to content

Commit 1348da3

Browse files
committed
FFmpeg / build improvements
- added PostBuild target to copy ffmpeg.exe to the build folder; - updated the installer file to remove ffmpeg.exe as it is picked from the build folder instead; - both InstallerOutput and FFmpeg folders are now created on git checkout, but their content is ignored by the version control.
1 parent c9ec1af commit 1348da3

5 files changed

Lines changed: 12 additions & 6 deletions

File tree

.gitignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,3 @@ __pycache__/
297297
*.btm.cs
298298
*.odx.cs
299299
*.xsd.cs
300-
301-
YoutubePlaylistDownloader/ffmpeg.exe
302-
/Installer Output/
303-
/FFmpeg/

FFmpeg/.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Ignore everything in this directory
2+
*
3+
# Except for this file
4+
!.gitignore

InstallerOutput/.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Ignore everything in this directory
2+
*
3+
# Except for this file
4+
!.gitignore

YPDSetup/YPDSetup.iss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ AppUpdatesURL=https://github.com/shaked6540/YoutubePlaylistDownloader
1616
DefaultDirName={commonpf}\YouTube Playlist Downloader
1717
DefaultGroupName=YouTube Playlist Downloader
1818
AllowNoIcons=yes
19-
OutputDir=..\Installer Output\1.9.25\
19+
OutputDir=..\InstallerOutput\1.9.25\
2020
OutputBaseFilename=YoutubePlaylistDownloader
2121
SetupIconFile=..\YoutubePlaylistDownloader\finalIcon.ico
2222
Compression=lzma
@@ -33,7 +33,6 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
3333

3434
[Files]
3535
Source: "..\YoutubePlaylistDownloader\bin\Release\net8.0-windows\*"; DestDir: "{app}"; Flags: ignoreversion
36-
Source: "..\FFmpeg\ffmpeg.exe"; DestDir: "{app}"; Flags: ignoreversion
3736

3837
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
3938

YoutubePlaylistDownloader/YoutubePlaylistDownloader.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,7 @@
9393
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
9494
</None>
9595
</ItemGroup>
96+
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
97+
<Exec Command="xcopy /Y /d &quot;$(SolutionDir)FFmpeg\ffmpeg.exe&quot; &quot;$(ProjectDir)bin\$(Configuration)\$(TargetFramework)\&quot;" />
98+
</Target>
9699
</Project>

0 commit comments

Comments
 (0)