Update P4 C++ API to 2021.2/2201121 and PerforcePlugin infrastructure

.editorconfig

@@ -0,0 +1,17 @@
+[*]
+charset=utf-8
+end_of_line=lf
+trim_trailing_whitespace=true
+insert_final_newline=true
+indent_style=space
+indent_size=4
+
+[{*.json,*.yml}]
+indent_size=2
+
+[{*.vcxproj}]
+end_of_line=crlf
+indent_size=2
+
+[{*.pl,*.pm,Makefile.*}]
+indent_style=tab

.gitattributes

@@ -0,0 +1,3 @@
+*.lib filter=lfs diff=lfs merge=lfs -text
+*.a filter=lfs diff=lfs merge=lfs -text
+PerforceBinaries/**/p4* filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -1,71 +1,39 @@
-# Specific
-Build/
-PerforceBinaries/
-Library/
-*.BASE.*.cpp
-*.LOCAL.*.cpp
-*.BACKUP.*.cpp
-*.REMOTE.*.cpp
-*.orig
-Test/tmp/*
-PerforcePlugin
-SubversionPlugin
-
-# Compiled Object files
-*.slo
-*.lo
-*.o
-*.obj
-
-# Precompiled Headers
-*.gch
-*.pch
-*.ipch
-
-# Compiled Dynamic libraries
-*.so
-*.dylib
-*.dll
-
-# Fortran module files
-*.mod
-
-# Compiled Static libraries
-*.lai
-*.la
-*.a
-*.lib
-
-# Executables
-*.exe
-*.out
-*.app
-
-# Output folders
-[Dd]ebug/
-[Rr]elease/
-[Bb]in/
-[Oo]bj/
-
-# Visual Studio 2010 local files
-*.vcxproj.user
-*.opensdf
-*.sdf
-*.suo
-
-# Visual Studio 2015 local files
-.vs/
-
-# Test Ouput
-TestResults/
-
-# Sublime files
-*.sublime-project
-*.sublime-workspace
-server.pid
-
-# VI files
-*.swp
-
-# CLion files
-.idea
+# Specific
+Build/
+Library/
+*.BASE.*.cpp
+*.LOCAL.*.cpp
+*.BACKUP.*.cpp
+*.REMOTE.*.cpp
+*.orig
+Test/tmp/*
+PerforcePlugin
+
+# Output folders
+[Dd]ebug/
+[Rr]elease/
+[Bb]in/
+[Oo]bj/
+
+# Visual Studio 2010 local files
+*.vcxproj.user
+*.opensdf
+*.sdf
+*.suo
+
+# Visual Studio local files
+.vs/
+
+# Test Ouput
+TestResults/
+
+# Sublime files
+*.sublime-project
+*.sublime-workspace
+server.pid
+
+# VI files
+*.swp
+
+# JetBrains IDEs files
+.idea/

.yamato/linux-build.yml

@@ -1,18 +1,20 @@
 name: Linux - Build & Test VCS plugins
 agent:
-    type: Unity::VM
-    image: cds-ops/ubuntu-16.04-katana-agent
-    flavor: b1.large
+  type: Unity::VM
+  image: cds-ops/ubuntu-16.04-katana-agent
+  flavor: b1.large
 
 commands:
-        - hg clone --config extensions.largefiles= http://hg-mirror-slo.hq.unity3d.com/unity-extra/perforce PerforceBinaries
-        - perl build.pl | tee linux_build.txt
-        - perl build.pl -test | tee linux_test.txt
+  # Build PerforcePlugin and TestServer
+  - perl build.pl
+
+  # Perforce CLI and server
+  - chmod +x PerforceBinaries/linux64/p4 PerforceBinaries/linux64/p4d
+
+  # Run Perforce integration tests with the TestServer
+  - perl build.pl -test
+
 artifacts:
-    builds:
-      paths:
-        - "Build/linux64/PerforcePlugin"
-    logs:
-      paths:
-        - "linux_build.txt"
-        - "linux_test.txt"
+  builds:
+    paths:
+      - "Build/linux64/PerforcePlugin"

.yamato/osx-build.yml

@@ -1,19 +1,20 @@
 name: Mac - Build & Test VCS plugins
 agent:
-    type: Unity::VM::osx
-    image: desktop/unity-macos-10.15-xcode-12.2:stable
-    flavor: b1.large
+  type: Unity::VM::osx
+  image: desktop/unity-macos-10.15-xcode-12.2:stable
+  flavor: b1.large
 
 commands:
-        - hg clone --config extensions.largefiles= http://hg-mirror-slo.hq.unity3d.com/unity-extra/perforce PerforceBinaries
-        - perl build.pl | tee mac_build.txt
-        - perl build.pl -test | tee mac_test.txt
+  # Build PerforcePlugin and TestServer
+  - perl build.pl
+
+  # Perforce CLI and server
+  - chmod +x PerforceBinaries/OSX/p4 PerforceBinaries/OSX/p4d
+
+  # Run Perforce integration tests with the TestServer
+  - perl build.pl -test
 
 artifacts:
-    builds:
-      paths:
-        - "Build/OSXx64/PerforcePlugin"
-    logs:
-      paths:
-        - "mac_build.txt"
-        - "mac_test.txt"
+  builds:
+    paths:
+      - "Build/OSXx64/PerforcePlugin"

.yamato/windows-build.yml

@@ -1,21 +1,18 @@
 name: Win - Build & Test VCS plugins
 agent:
-    type: Unity::VM
-    image: core-kaunas/win10-vs2010:latest
-    flavor: b1.large
-
-interpreter: powershell    
+  type: Unity::VM
+  image: core-kaunas/win10-vs2010:latest
+  flavor: b1.large
+
 commands:
-        - perl build.pl | tee win_build.txt
-        - hg clone --config extensions.largefiles= http://hg-mirror-slo.hq.unity3d.com/unity-extra/perforce PerforceBinaries
-        - perl build.pl -test | tee win_test.txt
-
+  # Build PerforcePlugin and TestServer
+  - perl build.pl
+
+  # Run Perforce integration tests with the TestServer
+  - perl build.pl -test
+
 artifacts:
-    builds:
-      paths:
-        - "Build/Win32/PerforcePlugin.exe"
-        - "Build/Win32/PerforcePlugin.pdb"
-    logs:
-      paths:
-        - "win_build.txt"
-        - "win_test.txt"
+  builds:
+    paths:
+      - "Build/Win32/PerforcePlugin.exe"
+      - "Build/Win32/PerforcePlugin.pdb"

.yamato/zipVCSPlugins.yml

@@ -1,35 +1,31 @@
 name: Zip VCS plugins
 agent:
-    type: Unity::VM
-    image: core-kaunas/win10-vs2010:latest
-    flavor: b1.small
+  type: Unity::VM
+  image: core-kaunas/win10-vs2010:latest
+  flavor: b1.small
 
-interpreter: powershell    
+interpreter: powershell
 commands:
-        - mkdir linux64
-        - mkdir OSXx64
-        - mkdir Win32
-        - Copy-Item Build/linux64/* linux64 -Recurse
-        - Copy-Item Build/OSXx64/* OSXx64 -Recurse
-        - Copy-Item Build/Win32/*  Win32 -Recurse
-        
+  - mkdir linux64
+  - mkdir OSXx64
+  - mkdir Win32
+  - Copy-Item Build/linux64/* linux64 -Recurse
+  - Copy-Item Build/OSXx64/* OSXx64 -Recurse
+  - Copy-Item Build/Win32/*  Win32 -Recurse
+
 artifacts:
-    builds:
-      paths:
-        - "linux64/**"
-        - "OSXx64/**"
-        - "Win32/**"
-        
+  builds:
+    paths:
+      - "linux64/**"
+      - "OSXx64/**"
+      - "Win32/**"
+
 dependencies:
-    - .yamato/windows-build.yml
-    - .yamato/linux-build.yml
-    - .yamato/osx-build.yml
-    
+  - .yamato/windows-build.yml
+  - .yamato/linux-build.yml
+  - .yamato/osx-build.yml
+
 triggers:
-    branches:
-      only:
+  branches:
+    only:
       - "/.*/"
-    pull_requests:
-      - sources:
-            only:
-            - "/.*/"

Makefile.gnu

@@ -7,9 +7,11 @@ AR = ar
 GTK3_INCLUDE = -I/usr/include/gtk-3.0 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/harfbuzz
 GTK3_LIBRARIES = -lgtk-3 -lgdk-3 -lpangocairo-1.0 -lpango-1.0 -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0
 
-CXXFLAGS += -O2 -g -fpermissive -Wno-deprecated-declarations $(GTK3_INCLUDE) $(P4PLUGIN_INCLUDE)
-LDFLAGS += -g
-LIBRARIES = -lstdc++ -lrt $(GTK3_LIBRARIES)
+CFLAGS += -O3 -g -fPIC -fexceptions -fvisibility=hidden -DLINUX
+CXXFLAGS += $(CFLAGS) -fpermissive -Wno-deprecated-declarations $(GTK3_INCLUDE) $(P4PLUGIN_INCLUDE)
+LDFLAGS += -g -pthread
+LIBRARIES += -lstdc++ -lrt $(GTK3_LIBRARIES)
+PLATFORM = linux64
 
 COMMON_MODULES = $(COMMON_SRCS:.c=.o)
 COMMON_MODULES := $(COMMON_MODULES:.cpp=.o)
@@ -21,7 +23,7 @@ TESTSERVER_TARGET= Build/$(PLATFORM)/TestServer
 P4PLUGIN_MODULES = $(P4PLUGIN_SRCS:.c=.o)
 P4PLUGIN_MODULES := $(P4PLUGIN_MODULES:.cpp=.o)
 P4PLUGIN_TARGET = PerforcePlugin
-P4PLUGIN_LINK += $(LIBRARIES) -ldl -fPIC -no-pie
+P4PLUGIN_LINK += $(LIBRARIES) -ldl -no-pie
 
 default: all
 
@@ -49,7 +51,7 @@ $(TESTSERVER_TARGET): $(COMMON_MODULES) $(TESTSERVER_MODULES)
 	$(CXX) -g $(LDFLAGS) -o $@ $^
 
 $(P4PLUGIN_TARGET): $(COMMON_MODULES) $(P4PLUGIN_MODULES)
-	$(CXX) $(LDFLAGS) -o $@ $^  $(P4PLUGIN_LINK) -L./P4Plugin/Source/r19.1/lib/$(PLATFORM) 
+	$(CXX) $(LDFLAGS) -o $@ $^  $(P4PLUGIN_LINK) -L./P4Plugin/Source/p4api/lib/$(PLATFORM) -L./P4Plugin/Source/openssl/lib/$(PLATFORM)
 
 clean:
 	rm -f Build/*.* $(COMMON_MODULES) $(P4PLUGIN_MODULES) $(TESTSERVER_MODULES)

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/r19.1/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)