Merge pull request #30 from Unity-Technologies/update-p4api-24.1-macos-arm64

Update p4api 24.1 & openssl 3 for macOS arm64, keeping the old 21.2 for Windows and Linux

Author: SRombautsU

.gitignore

@@ -37,3 +37,9 @@ server.pid
 
 # JetBrains IDEs files
 .idea/
+
+# macOS file information
+**.DS_Store
+
+# Object files
+***.o

.yamato/osx-build.yml

@@ -1,20 +1,22 @@
 name: Mac - Build & Test VCS plugins
 agent:
   type: Unity::VM::osx
-  image: desktop/unity-macos-10.15-xcode-12.2:stable
-  flavor: b1.large
+  image: build-system/unity-macos-13-arm64-unity:v2.4499056
+  flavor: b1.xlarge
+  model: M1
 
 commands:
   # Build PerforcePlugin and TestServer
   - perl build.pl
 
   # Perforce CLI and server
-  - chmod +x PerforceBinaries/OSX/p4 PerforceBinaries/OSX/p4d
+  - chmod +x PerforceBinaries/OSX/arm64/p4 PerforceBinaries/OSX/arm64/p4d
+  - chmod +x PerforceBinaries/OSX/x86_64/p4 PerforceBinaries/OSX/x86_64/p4d
 
   # Run Perforce integration tests with the TestServer
   - perl build.pl -test
 
 artifacts:
   builds:
     paths:
-      - "Build/OSXx64/PerforcePlugin"
+      - "Build/OSX/PerforcePlugin"

.yamato/zipVCSPlugins.yml

@@ -1,29 +1,30 @@
 name: Zip VCS plugins
 agent:
   type: Unity::VM
-  image: core-kaunas/win10-vs2010:latest
+  image: slough-ops/ubuntu-22.04-base:latest
   flavor: b1.small
 
-interpreter: powershell
 commands:
   - mkdir linux64
-  - mkdir OSXx64
+  - cp Build/linux64/* linux64
+
+  - mkdir OSX
+  - cp Build/OSX/* OSX
+
   - mkdir Win32
-  - Copy-Item Build/linux64/* linux64 -Recurse
-  - Copy-Item Build/OSXx64/* OSXx64 -Recurse
-  - Copy-Item Build/Win32/*  Win32 -Recurse
+  - cp Build/Win32/*  Win32
 
 artifacts:
   builds:
     paths:
       - "linux64/**"
-      - "OSXx64/**"
+      - "OSX/**"
       - "Win32/**"
 
 dependencies:
-  - .yamato/windows-build.yml
   - .yamato/linux-build.yml
   - .yamato/osx-build.yml
+  - .yamato/windows-build.yml
 
 triggers:
   branches:

Makefile.gnu

@@ -8,7 +8,7 @@ GTK3_INCLUDE = -I/usr/include/gtk-3.0 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-
 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
 
 CFLAGS += -O3 -g -fPIC -fexceptions -fvisibility=hidden -DLINUX
-CXXFLAGS += $(CFLAGS) -fpermissive -Wno-deprecated-declarations $(GTK3_INCLUDE) $(P4PLUGIN_INCLUDE)
+CXXFLAGS += $(CFLAGS) -fpermissive -Wno-deprecated-declarations $(GTK3_INCLUDE) $(P4PLUGIN_INCLUDE_OLD)
 LDFLAGS += -g -pthread
 LIBRARIES += -lstdc++ -lrt $(GTK3_LIBRARIES)
 PLATFORM = linux64
@@ -45,7 +45,7 @@ Test/Source/%.o : Test/Source/%.cpp $(TESTSERVER_INCLS)
 	$(CXX) $(CXXFLAGS) $(TESTSERVER_INCLUDE) -c $< -o $@
 
 P4Plugin/Source/%.o : P4Plugin/Source/%.cpp $(COMMON_INCLS) $(P4PLUGIN_INCLS)
-	$(CXX) $(CXXFLAGS) $(P4PLUGIN_INCLUDE) -D_LINUX -c $< -o $@
+	$(CXX) $(CXXFLAGS) $(P4PLUGIN_INCLUDE_OLD) -D_LINUX -c $< -o $@
 
 $(TESTSERVER_TARGET): $(COMMON_MODULES) $(TESTSERVER_MODULES)
 	$(CXX) -g $(LDFLAGS) -o $@ $^

Makefile.osx

@@ -1,12 +1,18 @@
 include Makefile.srcs
 
-CC = gcc
-CXX = g++
+CC = clang
+CXX = clang
 AR = ar
 
-CXXFLAGS = -O2 -arch x86_64 -mmacosx-version-min=10.11
-LDFLAGS = -arch x86_64 -lstdc++ -mmacosx-version-min=10.11
-PLATFORM = OSXx64
+ifeq ($(BUILD_TARGET),P4PluginX64)
+	PLATFORM = OSXx64
+	CXXFLAGS = -O2 -arch x86_64 -mmacosx-version-min=10.11
+	LDFLAGS = -L./P4Plugin/Source/p4api/lib/osx64 -L./P4Plugin/Source/openssl/lib/osx64 -arch x86_64 -lstdc++ -mmacosx-version-min=10.11
+else
+	PLATFORM = OSXarm64
+	CXXFLAGS = -O2 -arch arm64 -mmacosx-version-min=11.0 
+	LDFLAGS = -L./P4Plugin/Source/p4api/lib/osxarm64 -L./P4Plugin/Source/openssl/lib/osxarm64 -arch arm64 -lstdc++ -mmacosx-version-min=11.0
+endif
 
 COMMON_MODULES = $(COMMON_SRCS:.c=.o)
 COMMON_MODULES := $(COMMON_MODULES:.cpp=.o)
@@ -53,7 +59,10 @@ $(TESTSERVER_TARGET): $(COMMON_MODULES) $(TESTSERVER_MODULES)
 	$(CXX) -g $(LDFLAGS) -o $@ $^
 
 $(P4PLUGIN_TARGET): $(COMMON_MODULES) $(P4PLUGIN_MODULES)
-	$(CXX) $(LDFLAGS) -o $@ -framework Cocoa -framework Security $^ -L./P4Plugin/Source/p4api/lib/osx64 -L./P4Plugin/Source/openssl/lib/osx64 $(P4PLUGIN_LINK)
+	$(CXX) $(LDFLAGS) -o $@ -framework Cocoa -framework Security $^ $(P4PLUGIN_LINK)
+
+clean-objs:
+	rm -f $(COMMON_MODULES) $(P4PLUGIN_MODULES) $(TESTSERVER_MODULES)
 
 clean:
 	rm -f Build/*.* $(COMMON_MODULES) $(P4PLUGIN_MODULES) $(TESTSERVER_MODULES)

Makefile.srcs

@@ -79,3 +79,6 @@ P4PLUGIN_INCLS = ./P4Plugin/Source/P4Command.h \
 
 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
+
+# Temporarily use the old include_r21.2 for Linux build until we can find the time to update it to the newest API and validate it fully
+P4PLUGIN_INCLUDE_OLD = -I./Common -I./P4Plugin/Source/p4api/include_r21.2/p4 -I./P4Plugin/Source

P4Plugin/P4Plugin.vcxproj

@@ -146,7 +146,7 @@
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NODEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;
 _SCL_SECURE_NO_DEPRECATE
 ;_SECURE_SCL=0;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\Common;$(ProjectDir)Source\;$(ProjectDir)Source\p4api\include\P4;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\Common;$(ProjectDir)Source\;$(ProjectDir)Source\p4api\include_r21.2\P4;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -170,7 +170,7 @@ _SCL_SECURE_NO_DEPRECATE
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NODEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;
 _SCL_SECURE_NO_DEPRECATE
 ;_SECURE_SCL=0;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\Common;$(ProjectDir)Source\;$(ProjectDir)Source\p4api\include\P4;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\Common;$(ProjectDir)Source\;$(ProjectDir)Source\p4api\include_r21.2\P4;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>

P4Plugin/Source/P4PluginVersion.h

@@ -13,5 +13,6 @@
 //       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
+//       add support for macOS arm64 using P4 API 2024.1 (for macOS only)
 
 #define PERFORCE_PLUGIN_VERSION "1.4.0"

P4Plugin/Source/openssl/lib/osx64/libcrypto.a

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b01905a3a24fdafd6b0f7f77aa32a436521e4ff40c39b8f4e95fd281332ff7d1
-size 3153152
+oid sha256:f2d1b7f6b4ea2853b3925c9959f17057ea675d91c206e77e41e0df3c0fa9bd12
+size 8622264

P4Plugin/Source/openssl/lib/osx64/libssl.a

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e61a50ceea2648f74c1122075cb628e3489cc7b3ab18c193b8144ea2dbe2b94a
-size 510136
+oid sha256:c38b0e7228dac81cbb3e4787cb0d47021f24954bc5747851574e64ab64f73990
+size 1419904