2024.2 Patch 1 release code drop

Author: hjain-perforce

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2024, Perforce Software, Inc. All rights reserved.
+Copyright (c) 2025, Perforce Software, Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without 
 modification, are permitted provided that the following conditions are met:
@@ -32,7 +32,7 @@ this program.
 
 P4/P4API License
 -----------------------
-Copyright (c) 1995-2024, Perforce Software, Inc.
+Copyright (c) 1995-2025, Perforce Software, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

RELNOTES.txt

@@ -24,6 +24,15 @@ Introduction
     P4API it has been built with, issue the following command:
         ruby -rP4 -e "puts P4.identify"
 
+
+--------------------------------------------------------------------------
+
+Important End-of-Life Notice
+
+    This release of P4Ruby would be the last to support and test against 
+    Ruby 3.1 which is in EOL status. This is part of our commitment to 
+    focus on supported technology platforms.
+
 --------------------------------------------------------------------------
 
 Installation
@@ -74,8 +83,8 @@ Compatibility Statements
 
     Ruby Compatibility
 
-      This release of P4Ruby is supported on Ruby versions 3.1, 3.2 
-      and 3.3
+      This release of P4Ruby is supported on Ruby versions 3.1, 3.2, 3.3 
+      and 3.4
 
       For detailed compatibility, please check the following table:
 
@@ -84,6 +93,7 @@ Compatibility Statements
              3.1     | 2022.1 or later
              3.2     | 2023.1 or later
              3.3     | 2024.2 or later
+             3.4     | 2024.2.1 or later
 
     OpenSSL Compatibility
 
@@ -142,6 +152,23 @@ Key to symbols used in change notes below.
 --------------------------------------------------------------------------
 --------------------------------------------------------------------------
 
+New functionality in 2024.2 Patch 1 (2024.2/2736761) (2025/03/19)
+
+    #2733739 #2736249 (Job #124477) *
+        Added support for Ruby 3.4
+
+Bugs fixed in 2024.2 Patch 1 (2024.2/2736761) (2025/03/19)
+
+    #2733739 (Job #123477) *
+        Fixed windows build issues for ruby versions > 3.3.0
+
+    #2724187 (Job #123781) *
+        Updated the retrieval mechanism to handle OpenSSL 3.* properly, 
+        ensuring p4api can be fetched successfully.
+
+--------------------------------------------------------------------------
+--------------------------------------------------------------------------
+
 New functionality in 2024.2 (2024.2/2682777) (2024/11/15)
 
     #2678428 (Job #122585) * ** ***

ext/P4/extconf.rb

@@ -454,7 +454,7 @@ def p4_platform_label
       # There are too many permutations of Windows p4api, to automate.
       raise 'Automatic fetching of p4api from perforce FTP is not supported on Windows'
     when /darwin19|darwin[2-9][0-9]/
-      "macosx1015#{p4_cpu(:darwin)}"
+      "macosx12#{p4_cpu(:darwin)}"
     when /darwin/      
       "darwin90#{p4_cpu(:darwin)}"
     when /solaris/
@@ -484,7 +484,7 @@ def filename
                 filename = 'p4api-openssl1.1.1.zip'
             when /1.0/
                 filename = 'p4api-openssl1.0.2.zip'
-            when /3.0/
+            when /3.*/
                 filename = 'p4api-openssl3.zip'
         end
     end
@@ -493,7 +493,7 @@ def filename
       case openssl_number.to_s
           when /1.1/
               filename = 'p4api-openssl1.1.1.tgz'
-          when /3.0/
+          when /3.*/
               filename = 'p4api-openssl3.tgz'
       end
     end
@@ -505,7 +505,7 @@ def filename
                 filename = 'p4api-glibc2.3-openssl1.1.1.tgz'
             when /1.0/
                 filename = 'p4api-glibc2.3-openssl1.0.2.tgz'
-            when /3.0/
+            when /3.*/
                 filename = 'p4api-glibc2.3-openssl3.tgz'
         end
     end

ext/P4/p4.cpp

@@ -333,6 +333,14 @@ static VALUE p4_set_evar( VALUE self, VALUE var, VALUE val )
     return Qtrue;
 }
 
+static VALUE p4_set_var( VALUE self, VALUE var, VALUE val )
+{
+    P4ClientApi *p4;
+    Data_Get_Struct( self, P4ClientApi, p4 );
+    p4->SetVar( StringValuePtr( var ), StringValuePtr( val ) );
+    return Qtrue;
+}
+
 static VALUE p4_get_host( VALUE self )
 {
     P4ClientApi	*p4;
@@ -1366,6 +1374,7 @@ void	Init_P4()
     rb_define_method( cP4, "enviro_file=", RUBY_METHOD_FUNC(p4_set_enviro_file), 1);
     rb_define_method( cP4, "evar", 	RUBY_METHOD_FUNC(p4_get_evar)     , 1 );
     rb_define_method( cP4, "set_evar", 	RUBY_METHOD_FUNC(p4_set_evar)     , 2 );
+    rb_define_method( cP4, "set_var", 	RUBY_METHOD_FUNC(p4_set_var)     , 2 );
     rb_define_method( cP4, "host", 	RUBY_METHOD_FUNC(p4_get_host)    , 0 );
     rb_define_method( cP4, "host=", 	RUBY_METHOD_FUNC(p4_set_host)    , 1 );
     rb_define_method( cP4, "ignore_file",RUBY_METHOD_FUNC(p4_get_ignore) , 0 );

ext/P4/p4clientapi.cpp

@@ -151,6 +151,14 @@ P4ClientApi::SetEVar( const char *var, const char *val )
     client.SetEVar( sVar, sVal );
 }
 
+void
+P4ClientApi::SetVar( const char *var, const char *val )
+{
+    StrRef sVar( var );
+    StrRef sVal( val );
+    client.SetVar( sVar, sVal );
+}
+
 const StrPtr *
 P4ClientApi::GetEVar( const char *var )
 {

ext/P4/p4clientapi.h

@@ -74,6 +74,7 @@ class P4ClientApi
     void SetCwd( const char *c );
     void SetEnviroFile( const char *c );
     void SetEVar( const char *var, const char *val );
+    void SetVar( const char *var, const char *val );
     void SetHost( const char *h )	{ client.SetHost( h );		}
     void SetIgnoreFile( const char *f )	{ client.SetIgnoreFile( f );	}
     void SetMaxResults( int v )		{ maxResults = v;		}

lib/P4.rb

@@ -33,6 +33,32 @@
 #*******************************************************************************
 
 require 'P4/version'
+require 'fiddle'
+
+#
+# Ruby 3.4 introduced a change affecting DLL loading behavior, which impacts 
+# how dependent DLLs are resolved. Specifically, libwinpthread-1.dll is no 
+# longer automatically loaded from ruby_builtin_dlls, causing potential failures 
+# in extensions relying on it.
+#
+# To address this, we must explicitly define the DLL path for libwinpthread-1.dll 
+# before loading dependent libraries in windows. 
+#
+if Gem.win_platform?
+  dll_path = File.join(RbConfig::CONFIG['bindir'], 'ruby_builtin_dlls', 'libwinpthread-1.dll')
+
+  if File.exist?(dll_path)
+    begin
+      Fiddle.dlopen(dll_path)
+    rescue Fiddle::DLError => e
+      puts "Failed to load #{dll_path}: #{e.message}"
+      exit 1
+    end
+  else
+    puts "Error: DLL not found at #{dll_path}"
+    exit 1
+  end
+end
 
 #
 # Get the bulk of the definition of the P4 class from the API interface.