Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Windows: Update version gen script and add scripts to VS filters #14602

Merged
merged 2 commits into from Sep 2, 2023
Merged

Windows: Update version gen script and add scripts to VS filters #14602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6284855
VS: Add scripts to filters
Megamouse Sep 2, 2023
6ca1956
Windows: update some comments and echos in git-version-gen.cmd
Megamouse Sep 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 2 additions & 3 deletions Utilities/git-version-gen.cmd
View file
Open in desktop
Expand Up @@ -90,7 +90,6 @@ rem // Get commit count from (unshallowed) HEAD
for /F %%I IN ('call %GIT% rev-list HEAD --count') do set COMMIT_COUNT=%%I

rem // Check if the current build system sets the git branch and version.
rem // The name is misleading. This is also used for master builds.
if defined BUILD_SOURCEBRANCHNAME (

rem // This must be a CI build
Expand Down Expand Up @@ -143,8 +142,8 @@ if defined BUILD_SOURCEBRANCHNAME (
)

) else (
rem // The name is misleading. This is also used for master builds.
echo SYSTEM_PULLREQUEST_SOURCEBRANCH undefined
echo BUILD_SOURCEBRANCHNAME undefined
echo Assuming local build

rem // Make GIT_VERSION the last commit (shortened); Don't include commit count on non-release builds
for /F %%I IN ('call %GIT% rev-parse --short^=8 HEAD') do set GIT_VERSION=%%I
Expand Down
15 changes: 15 additions & 0 deletions rpcs3/rpcs3.vcxproj
View file
Open in desktop
Expand Up @@ -1893,6 +1893,20 @@
</CustomBuild>
</ItemGroup>
<ItemGroup>
<None Include="..\.cirrus.yml" />
<None Include="..\.ci\build-freebsd.sh" />
<None Include="..\.ci\build-linux.sh" />
<None Include="..\.ci\build-mac.sh" />
<None Include="..\.ci\deploy-linux.sh" />
<None Include="..\.ci\deploy-mac.sh" />
<None Include="..\.ci\deploy-windows.sh" />
<None Include="..\.ci\export-azure-vars.sh" />
<None Include="..\.ci\export-cirrus-vars.sh" />
<None Include="..\.ci\get_keys-windows.sh" />
<None Include="..\.ci\github-upload.sh" />
<None Include="..\.ci\install-freebsd.sh" />
<None Include="..\.ci\setup-windows.sh" />
<None Include="..\azure-pipelines.yml" />
<None Include="..\bin\GuiConfigs\Classic (Bright).qss" />
<None Include="..\bin\GuiConfigs\Darker Style by TheMitoSan.qss" />
<None Include="..\bin\GuiConfigs\Envy.qss" />
Expand All @@ -1902,6 +1916,7 @@
<None Include="..\bin\GuiConfigs\Skyline (Nightfall).qss" />
<None Include="..\bin\GuiConfigs\Skyline.qss" />
<None Include="..\bin\GuiConfigs\YoRHa by Ani.qss" />
<None Include="..\Utilities\git-version-gen.cmd" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" />
Expand Down
51 changes: 51 additions & 0 deletions rpcs3/rpcs3.vcxproj.filters
View file
Open in desktop
Expand Up @@ -160,6 +160,12 @@
<Filter Include="StyleSheets">
<UniqueIdentifier>{b927140a-5214-4628-a648-8380ae793179}</UniqueIdentifier>
</Filter>
<Filter Include="Scripts">
<UniqueIdentifier>{f4ff05a1-e8c9-44f8-ba05-2c731919a878}</UniqueIdentifier>
</Filter>
<Filter Include="CI">
<UniqueIdentifier>{b3bba7ee-4f23-41b6-8ddf-e40f848015de}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="main.cpp">
Expand Down Expand Up @@ -1554,5 +1560,50 @@
<None Include="..\bin\GuiConfigs\Envy.qss">
<Filter>StyleSheets</Filter>
</None>
<None Include="..\Utilities\git-version-gen.cmd">
<Filter>Scripts</Filter>
</None>
<None Include="..\.cirrus.yml">
<Filter>CI</Filter>
</None>
<None Include="..\azure-pipelines.yml">
<Filter>CI</Filter>
</None>
<None Include="..\.ci\build-freebsd.sh">
<Filter>CI</Filter>
</None>
<None Include="..\.ci\build-linux.sh">
<Filter>CI</Filter>
</None>
<None Include="..\.ci\build-mac.sh">
<Filter>CI</Filter>
</None>
<None Include="..\.ci\deploy-linux.sh">
<Filter>CI</Filter>
</None>
<None Include="..\.ci\deploy-mac.sh">
<Filter>CI</Filter>
</None>
<None Include="..\.ci\deploy-windows.sh">
<Filter>CI</Filter>
</None>
<None Include="..\.ci\export-azure-vars.sh">
<Filter>CI</Filter>
</None>
<None Include="..\.ci\export-cirrus-vars.sh">
<Filter>CI</Filter>
</None>
<None Include="..\.ci\get_keys-windows.sh">
<Filter>CI</Filter>
</None>
<None Include="..\.ci\github-upload.sh">
<Filter>CI</Filter>
</None>
<None Include="..\.ci\setup-windows.sh">
<Filter>CI</Filter>
</None>
<None Include="..\.ci\install-freebsd.sh">
<Filter>CI</Filter>
</None>
</ItemGroup>
</Project>