Update p4api-2019.1.2135798 to p4api-2021.2.2536545

# linux64
- https://filehost.perforce.com/perforce/r21.2/bin.linux26x86_64/p4api-glibc2.3-openssl1.0.2.tgz

# osx64
- 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

Link with the new libp4api

Keep everything else as-is for now:
- Visual Studio 2010
- OpenSSL 1.0.1 static libs
- GlibC 2.3 on Linux

Author: SRombautsU

Makefile.osx

@@ -53,7 +53,7 @@ $(TESTSERVER_TARGET): $(COMMON_MODULES) $(TESTSERVER_MODULES)
 	$(CXX) -g $(LDFLAGS) -o $@ $^
 
 $(P4PLUGIN_TARGET): $(COMMON_MODULES) $(P4PLUGIN_MODULES)
-	$(CXX) $(LDFLAGS) -o $@ -framework Cocoa $^ -L./P4Plugin/Source/p4api/lib/osx64 -L./P4Plugin/Source/openssl/lib/osx64 $(P4PLUGIN_LINK)
+	$(CXX) $(LDFLAGS) -o $@ -framework Cocoa -framework Security $^ -L./P4Plugin/Source/p4api/lib/osx64 -L./P4Plugin/Source/openssl/lib/osx64 $(P4PLUGIN_LINK)
 
 clean:
 	rm -f Build/*.* $(COMMON_MODULES) $(P4PLUGIN_MODULES) $(TESTSERVER_MODULES)

Makefile.srcs

@@ -24,7 +24,7 @@ COMMON_INCLS = ./Common/Changes.h \
 		./Common/POpen.h
 
 TESTSERVER_SRCS = ./Test/Source/ExternalProcess_Posix.cpp \
-				./Test/Source/TestServer.cpp 
+				./Test/Source/TestServer.cpp
 TESTSERVER_INCLS = ./Test/Source/ExternalProcess.h
 TESTSERVER_INCLUDE = -I./Common
 
@@ -77,5 +77,5 @@ P4PLUGIN_INCLS = ./P4Plugin/Source/P4Command.h \
 		./P4Plugin/Source/P4Task.h \
 		./P4Plugin/Source/P4Utility.h
 
-P4PLUGIN_LINK = -lclient -lrpc -lsupp -lssl -lcrypto -lp4script -lp4script_curl -lp4script_sqlite -lp4script_c
+P4PLUGIN_LINK = -lclient -lrpc -lsupp -lp4api -lp4script -lp4script_curl -lp4script_sqlite -lp4script_c -lssl -lcrypto
 P4PLUGIN_INCLUDE = -I./Common -I./P4Plugin/Source/p4api/include/p4 -I./P4Plugin/Source

P4Plugin/P4Plugin.vcxproj

@@ -150,7 +150,7 @@ _SCL_SECURE_NO_DEPRECATE
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>$(ProjectDir)Source\p4api\lib\win32debug;$(ProjectDir)Source\openssl\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libclient.lib;libeay32.lib;libp4script.lib;libp4script_c.lib;libp4script_curl.lib;libp4script_sqlite.lib;librpc.lib;libsupp.lib;ssleay32.lib;ws2_32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libclient.lib;libeay32.lib;libp4api.lib;libp4script.lib;libp4script_c.lib;libp4script_curl.lib;libp4script_sqlite.lib;librpc.lib;libsupp.lib;ssleay32.lib;ws2_32.lib;crypt32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>echo f | xcopy "$(SolutionDir)$(Configuration)\$(TargetFileName)" "$(SolutionDir)Build\Win32\$(TargetFileName)" /Y</Command>
@@ -176,7 +176,7 @@ _SCL_SECURE_NO_DEPRECATE
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>$(ProjectDir)Source\p4api\lib\win32;$(ProjectDir)Source\openssl\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libclient.lib;libeay32.lib;libp4script.lib;libp4script_c.lib;libp4script_curl.lib;libp4script_sqlite.lib;librpc.lib;libsupp.lib;ssleay32.lib;ws2_32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libclient.lib;libeay32.lib;libp4api.lib;libp4script.lib;libp4script_c.lib;libp4script_curl.lib;libp4script_sqlite.lib;librpc.lib;libsupp.lib;ssleay32.lib;ws2_32.lib;crypt32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>echo f | xcopy "$(SolutionDir)$(Configuration)\$(TargetFileName)" "$(SolutionDir)Build\Win32\$(TargetFileName)" /Y

P4Plugin/Source/p4api/README.md

@@ -1,15 +1,15 @@
 Document the links from where the P4 C++ API (include files and static libraries) where downloaded:
 
-https://filehost.perforce.com/perforce/r19.1/ p4api-2019.1.2135798
+https://filehost.perforce.com/perforce/r21.2/ p4api-2021.2.2536545
 
 Notes: see also download_perforce_binaries.ps1
 
 # linux64
-- https://filehost.perforce.com/perforce/r19.1/bin.linux26x86_64/p4api-glibc2.3-openssl1.0.2.tgz
+- https://filehost.perforce.com/perforce/r21.2/bin.linux26x86_64/p4api-glibc2.3-openssl1.0.2.tgz
 
 # osx64
-- https://filehost.perforce.com/perforce/r19.1/bin.macosx105x86_64/p4api-openssl1.0.2.tgz
+- https://filehost.perforce.com/perforce/r21.2/bin.macosx105x86_64/p4api-openssl1.0.2.tgz
 
 # Win32
-- https://filehost.perforce.com/perforce/r19.1/bin.ntx86/p4api_vs2010_static_openssl1.0.2.zip
-- https://filehost.perforce.com/perforce/r19.1/bin.ntx86/p4api_vs2010_static_vsdebug_openssl1.0.2.zip
+- 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

P4Plugin/Source/p4api/include/p4/charcvt.h

@@ -69,6 +69,8 @@ class CharSetCvt : public CharSetApi {
     static unsigned long offsetsFromUTF8[];
     static unsigned long minimumFromUTF8[];
 
+    static void Init();
+
 protected:
     friend class CharSetCvtCache;  // for the following default constructor
     CharSetCvt() : lasterr(0), linecnt(1), charcnt(0), fastbuf(0), fastsize(0){}

P4Plugin/Source/p4api/include/p4/clientapi.h

@@ -167,6 +167,8 @@ class ClientApi : public StrDict {
 	// caller's main interface
 
 			ClientApi();
+			ClientApi( Enviro *env );
+
 	virtual		~ClientApi();
 
 	void		SetTrans( int output, int content = -2,

P4Plugin/Source/p4api/include/p4/clientprog.h

@@ -36,10 +36,18 @@ class ClientProgressText : public ClientProgress
 	void	Total( long );
 	int	Update( long );
 	void	Done( int fail );
+	
+	// Track if we're already in use, multiple will overwrite
+	static bool InUse;
+
+	int	GetProgressType() const;
+
     private:
 	int	cnt;
 	long	total;
 	int	typeOfProgress;
 	int	backup;
 	StrBuf	desc;
+	bool	done;
+
 };

P4Plugin/Source/p4api/include/p4/clientresolvea.h

@@ -55,6 +55,14 @@ class ClientResolveA
 	const Error &GetTypePrompt() const { return typeP; }
 	const Error &GetUsageError() const { return error; }
 	const Error &GetHelp() const { return help; }
+	const Error &GetMoveReaddIntegConflictIgnored() const 
+	{ 
+	    return moveReaddIntegConflictIgnored; 
+	}
+	const Error &GetMoveReaddIntegConflictSkip() const 
+	{ 
+	    return moveReaddIntegConflictSkip; 
+	}
 
 	// Called by clientservice while talking to the server
 
@@ -82,6 +90,16 @@ class ClientResolveA
 	void SetHelp( const Error &msg ) { help = msg; }
 	void SetUsageError( const Error &msg ) { error = msg; }
 
+	void SetMoveReaddIntegConflictIgnored ( const Error &msg )
+	{
+	     moveReaddIntegConflictIgnored = msg; 
+	}
+
+	void SetMoveReaddIntegConflictSkip( const Error &msg )
+	{
+	     moveReaddIntegConflictSkip = msg; 
+	}
+
 	void SetAuto( MergeStatus s ) { suggest = s; }
 
     private:
@@ -108,6 +126,8 @@ class ClientResolveA
 	Error help;
 	Error prompt;
 	Error error;
+	Error moveReaddIntegConflictIgnored;
+	Error moveReaddIntegConflictSkip;
 
 	MergeStatus suggest;
 };

P4Plugin/Source/p4api/include/p4/clientscript.h

@@ -45,7 +45,8 @@ class ClientScript
 
 	    std::vector< std::unique_ptr< Extension > > exts;
 
-	    StrBuf path, pattern;
+	    std::vector< std::string > patterns;
+	    StrBuf path;
 	    Client* client;
 };
 

P4Plugin/Source/p4api/include/p4/clientuser.h

@@ -156,8 +156,10 @@ class ClientUser {
 	virtual void	Help( const char *const *help );
 
 	virtual FileSys	*File( FileSysType type );
+	virtual ClientProgress *CreateProgress( int, P4INT64 );
 	virtual ClientProgress *CreateProgress( int );
 	virtual int	ProgressIndicator();
+	virtual int	CanParallelProgress() { return 0; }
 
 	virtual void	Finished() {}