Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
*.lib filter=lfs diff=lfs merge=lfs -text
*.pdb filter=lfs diff=lfs merge=lfs -text
*.a filter=lfs diff=lfs merge=lfs -text
PerforceBinaries/**/p4* filter=lfs diff=lfs merge=lfs -text
2 changes: 1 addition & 1 deletion .yamato/windows-build.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Win - Build & Test VCS plugins
agent:
type: Unity::VM
image: core-kaunas/win10-vs2010:latest
image: build-system/unity-win10-22H2-vs2022-unity:v2.4386385
flavor: b1.large

commands:
Expand Down
5 changes: 4 additions & 1 deletion P4Plugin/P4Plugin.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -101,18 +101,21 @@
<ProjectGuid>{06DFA5BA-ACFC-4170-9143-5B2D1E654180}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>P4Plugin2</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Expand Down Expand Up @@ -186,4 +189,4 @@ echo f | xcopy "$(SolutionDir)$(Configuration)\$(TargetName).pdb" "$(SolutionDir
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
3 changes: 2 additions & 1 deletion P4Plugin/Source/P4PluginVersion.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@
// 1.2.1 2024/03/15 Fix login failure license about to expire
// 2021.3.38f1, 2023.2.19f1, 6000.0.0b14
// 1.3.0 2025/07/29 P4 API 2021.2 for Perforce Cloud
// 1.4.0 build with Visual Studio 2022 and Windows 10 SDK for long path names

#define PERFORCE_PLUGIN_VERSION "1.3.0"
#define PERFORCE_PLUGIN_VERSION "1.4.0"
3 changes: 3 additions & 0 deletions P4Plugin/Source/openssl/lib/win32/libMT.pdb
Git LFS file not shown
4 changes: 2 additions & 2 deletions P4Plugin/Source/openssl/lib/win32/libeay32.lib
Git LFS file not shown
4 changes: 2 additions & 2 deletions P4Plugin/Source/openssl/lib/win32/ssleay32.lib
Git LFS file not shown
4 changes: 2 additions & 2 deletions P4Plugin/Source/p4api/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ Notes: see also download_perforce_binaries.ps1
- https://filehost.perforce.com/perforce/r21.2/bin.macosx105x86_64/p4api-openssl1.0.2.tgz

# Win32
- https://filehost.perforce.com/perforce/r21.2/bin.ntx86/p4api_vs2010_static_openssl1.0.2.zip
- https://filehost.perforce.com/perforce/r21.2/bin.ntx86/p4api_vs2010_static_vsdebug_openssl1.0.2.zip
- https://filehost.perforce.com/perforce/r21.2/bin.ntx86/p4api_vs2019_static_openssl1.0.2.zip
- https://filehost.perforce.com/perforce/r21.2/bin.ntx86/p4api_vs2019_static_vsdebug_openssl1.0.2.zip
4 changes: 2 additions & 2 deletions P4Plugin/Source/p4api/lib/win32/libclient.lib
Git LFS file not shown
4 changes: 2 additions & 2 deletions P4Plugin/Source/p4api/lib/win32/libp4api.lib
Git LFS file not shown
4 changes: 2 additions & 2 deletions P4Plugin/Source/p4api/lib/win32/libp4script.lib
Git LFS file not shown
4 changes: 2 additions & 2 deletions P4Plugin/Source/p4api/lib/win32/libp4script_c.lib
Git LFS file not shown
4 changes: 2 additions & 2 deletions P4Plugin/Source/p4api/lib/win32/libp4script_curl.lib
Git LFS file not shown
4 changes: 2 additions & 2 deletions P4Plugin/Source/p4api/lib/win32/libp4script_sqlite.lib
Git LFS file not shown
4 changes: 2 additions & 2 deletions P4Plugin/Source/p4api/lib/win32/librpc.lib
Git LFS file not shown
4 changes: 2 additions & 2 deletions P4Plugin/Source/p4api/lib/win32/libsupp.lib
Git LFS file not shown
4 changes: 2 additions & 2 deletions P4Plugin/Source/p4api/lib/win32debug/libclient.lib
Git LFS file not shown
4 changes: 2 additions & 2 deletions P4Plugin/Source/p4api/lib/win32debug/libp4api.lib
Git LFS file not shown
4 changes: 2 additions & 2 deletions P4Plugin/Source/p4api/lib/win32debug/libp4script.lib
Git LFS file not shown
4 changes: 2 additions & 2 deletions P4Plugin/Source/p4api/lib/win32debug/libp4script_c.lib
Git LFS file not shown
4 changes: 2 additions & 2 deletions P4Plugin/Source/p4api/lib/win32debug/libp4script_curl.lib
Git LFS file not shown
4 changes: 2 additions & 2 deletions P4Plugin/Source/p4api/lib/win32debug/libp4script_sqlite.lib
Git LFS file not shown
4 changes: 2 additions & 2 deletions P4Plugin/Source/p4api/lib/win32debug/librpc.lib
Git LFS file not shown
4 changes: 2 additions & 2 deletions P4Plugin/Source/p4api/lib/win32debug/libsupp.lib
Git LFS file not shown
11 changes: 9 additions & 2 deletions Test/Perforce/PerforceTest.pm
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,15 @@ sub RunTests()

if (not(-e -f -x $testserver))
{
print "Error testserver '$testserver' doesn't exist\n";
return 1;
print "\n[$suite][$count/$total] Error testserver '$testserver' doesn't exist\n\n";
if ($total > 0)
{
return $total;
}
else
{
return 1;
}
}

$cwd = getcwd();
Expand Down
2 changes: 2 additions & 0 deletions Test/TestServer/TestServer.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,14 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Expand Down
9 changes: 5 additions & 4 deletions msbuilder.cmd
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
if exist "%PROGRAMFILES%\Microsoft Visual Studio 10.0\Common7\Tools\vsvars32.bat" call "%PROGRAMFILES%\Microsoft Visual Studio 10.0\Common7\Tools\vsvars32.bat"
if exist "%ProgramFiles(x86)%\Microsoft Visual Studio 10.0\Common7\Tools\vsvars32.bat" call "%ProgramFiles(x86)%\Microsoft Visual Studio 10.0\Common7\Tools\vsvars32.bat"
if exist "%REALVSPATH%\Common7\Tools\vsvars32.bat" call "%REALVSPATH%\Common7\Tools\vsvars32.bat"
call msbuild %1 /t:Clean;%2 /p:Configuration=Release;Platform=%3
for /f "usebackq delims=" %%i in (`call "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -find VC\Auxiliary\Build\vcvarsall.bat`) do (
call "%%i" x86
)

call msbuild %1 /t:Clean;%2 /p:Configuration=Release;Platform=%3