p4ruby 2015.2.1313860-x64-mingw32 → 2020.1.2056123-x64-mingw32

data/ext/P4/extconf.rb

@@ -6,10 +6,19 @@ require 'mkmf'
 require 'net/ftp'
 require 'P4/version'
 require 'rbconfig'
+require 'openssl'
 
 # Set this to the main version directory we look up in ftp.perforce.com for the P4API
 # This is ignored if you specify the version on the command line.
-P4API_VERSION_DIR = 'r15.2'
+# Changed the hardcoded string so that the version is now derived from version.rb file
+#P4API_VERSION_DIR = 'r19.1'
+def p4api_version_dir
+        ver=P4::Version.split(".")
+        p4_major = ver[0].chars.last(2).join
+        p4_minor = ver[1]
+        dir = "r" + p4_major + "." + p4_minor
+end
+
 
 #==============================================================================
 # Provide platform variables in P4-specific format
@@ -102,6 +111,15 @@ def calculate_p4osver
   return ver
 end
 
+def gcc
+  @gcc ||= calculate_gcc
+end
+
+def calculate_gcc
+  gcc = RbConfig::CONFIG["GCC"]
+  return gcc
+end
+
 def uname_platform
   @uname_platform ||= calculate_uname_platform
 end
@@ -155,6 +173,13 @@ def set_platform_opts
   end
 end
 
+def set_platform_cxxflags
+  if (p4osname == 'LINUX') && (gcc == 'yes')
+    $CXXFLAGS += " -std=c++11 "
+  end
+end
+
+
 def set_platform_cppflags
   $CPPFLAGS += "-DOS_#{p4osname} "
   $CPPFLAGS += "-DOS_#{p4osname}#{p4osver} "
@@ -214,6 +239,7 @@ def set_platform_libs
         $LDFLAGS += ' -framework CoreFoundation -framework Foundation'
       end
     when 'LINUX', 'MINGW32'
+      $LDFLAGS += ' -Wl,--allow-multiple-definition'
       have_library('supc++')
   end
 end
@@ -445,13 +471,34 @@ def ftp_download_dir(version)
 end
 
 def filename
+  openssl_number = OpenSSL::OPENSSL_VERSION.split(' ')[1].to_s
+  openssl_number = openssl_number.slice(0, (openssl_number.rindex('.')))
+
   if RbConfig::CONFIG['target_os'].downcase =~ /nt|mswin|mingw/
-    'p4api.zip'
+    filename = 'p4api.zip'
+    if !openssl_number.to_s.empty?
+        case openssl_number.to_s
+            when /1.1/
+                filename = 'p4api-openssl1.1.1.zip'
+            when /1.0/
+                filename = 'p4api-openssl1.0.2.zip'
+             end
+    end
   else
-    'p4api.tgz'
+    filename = 'p4api.tgz'
+    if !openssl_number.to_s.empty?
+        case openssl_number.to_s
+            when /1.1/
+                filename = 'p4api-glibc2.3-openssl1.1.1.tgz'
+            when /1.0/
+                filename = 'p4api-glibc2.3-openssl1.0.2.tgz'
+        end
+    end
   end
+  return filename
 end
 
+
 def remote_files_matching(ftp, dir, regex)
   ftp.ls(dir.to_s).map { |entry|
     if match = entry.match(regex)
@@ -499,9 +546,8 @@ def download_api_via_ftp
   # At one point, we allowed the gem build to just find the most recent p4api build.
   # P4Ruby probably shouldn't do that by default.
   #version_dir = find_latest_version_dir(ftp)
-  version_dir = P4API_VERSION_DIR
 
-  dir = ftp_download_dir(version_dir)
+  dir = ftp_download_dir(p4api_version_dir)
   ftp.chdir(dir)
 
   puts "downloading #{filename} from #{dir} on ftp.perforce.com"
@@ -536,9 +582,11 @@ set_platform_opts
 # based solely on platform detection.
 set_platform_cppflags
 set_platform_cflags
+set_platform_cxxflags
 
 puts "$CPPFLAGS #{$CPPFLAGS}"
 puts "$CFLAGS #{$CFLAGS}"
+puts "$CXXFLAGS #{$CXXFLAGS}"
 
 # Setup additional system library definitions based on platform type before
 # we setup other libraries, in order to preserve linking order
@@ -554,15 +602,17 @@ resolve_ssl_dirs
 # If we happen to need SSL on Windows, we also need gdi32
 if RbConfig::CONFIG['target_os'].downcase =~ /mingw/
   have_library('gdi32') or raise
+  have_library('ole32') or raise
+  have_library('crypt32') or raise
 end
 
-do_ssl = have_library('crypto') and have_library('ssl')
-
-unless do_ssl
-  have_library('p4sslstub') or raise
-end
-
+have_library('crypto') or raise
+have_library('ssl') or raise
 have_library('supp') or raise
+have_library('p4script_sqlite') or raise
+have_library('p4script_curl') or raise
+have_library('p4script') or raise
+have_library('p4script_c') or raise
 have_library('rpc') or raise
 have_library('client') or raise
 
@@ -577,4 +627,4 @@ create_p4rubyconf_header(version_info, $libs)
 # don't believe we need to rely on actually.
 create_header
 
-create_makefile('P4')
+create_makefile('P4')

data/ext/P4/p4.cpp

@@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Author	: Tony Smith <tony@perforce.com> or <tony@smee.org>
  *
- * Description	: Ruby bindings for the Perforce API. 
+ * Description	: Ruby bindings for the Perforce API.
  *
  * vim:ts=8:sw=4
  ******************************************************************************/
@@ -160,7 +160,7 @@ static VALUE p4_run_tagged( VALUE self, VALUE tagged )
 	flag = 0;
     else
 	flag = NUM2INT( tagged ) ? 1 : 0;
-    
+
     int old_value = p4->IsTagged();
     p4->Tagged( flag );
 
@@ -196,7 +196,7 @@ static VALUE p4_set_tagged( VALUE self, VALUE toggle )
 	flag = 0;
     else
 	flag = NUM2INT( toggle ) ? 1 : 0;
-    
+
     p4->Tagged( flag );
     return flag ? Qtrue : Qfalse;	// Seems to be ignored...
 }
@@ -489,6 +489,21 @@ static VALUE p4_set_ticket_file( VALUE self, VALUE path )
     return Qtrue;
 }
 
+static VALUE p4_get_trust_file( VALUE self )
+{
+    P4ClientApi *p4;
+    Data_Get_Struct( self, P4ClientApi, p4 );
+    return P4Utils::ruby_string( p4->GetTrustFile().Text() );
+}
+
+static VALUE p4_set_trust_file( VALUE self, VALUE path )
+{
+    P4ClientApi *p4;
+    Data_Get_Struct( self, P4ClientApi, p4 );
+    p4->SetTrustFile( StringValuePtr( path ) );
+    return Qtrue;
+}
+
 static VALUE p4_get_user( VALUE self )
 {
     P4ClientApi	*p4;
@@ -541,7 +556,7 @@ static VALUE p4_set_track( VALUE self, VALUE toggle )
 	flag = 0;
     else
 	flag = NUM2INT( toggle ) ? 1 : 0;
-    
+
     p4->SetTrack( flag );
     return flag ? Qtrue : Qfalse;	// Seems to be ignored...
 }
@@ -567,11 +582,37 @@ static VALUE p4_set_streams( VALUE self, VALUE toggle )
 	flag = 0;
     else
 	flag = NUM2INT( toggle ) ? 1 : 0;
-    
+
     p4->SetStreams( flag );
     return flag ? Qtrue : Qfalse;	// Seems to be ignored...
 }
 
+static VALUE p4_get_graph( VALUE self )
+{
+    P4ClientApi *p4;
+    Data_Get_Struct( self, P4ClientApi, p4 );
+    return p4->IsGraph() ? Qtrue : Qfalse;
+}
+
+static VALUE p4_set_graph( VALUE self, VALUE toggle )
+{
+    P4ClientApi *p4;
+    Data_Get_Struct( self, P4ClientApi, p4 );
+
+    // The user might have passed an integer, or it might be a boolean,
+    // we convert to int for consistency.
+    int     flag = 0;
+    if( toggle == Qtrue )
+    flag = 1;
+    else if( toggle == Qfalse )
+    flag = 0;
+    else
+    flag = NUM2INT( toggle ) ? 1 : 0;
+
+    p4->SetGraph( flag );
+    return flag ? Qtrue : Qfalse;   // Seems to be ignored...
+}
+
 /*******************************************************************************
  * Running commands.  General purpose Run method and method for supplying
  * input to "p4 xxx -i" commands
@@ -599,7 +640,7 @@ static VALUE p4_run( VALUE self, VALUE args )
     char *cmd = StringValuePtr( v );
     argc = NUM2INT( rb_funcall( flatArgs, idLength, 0 ) );
 
-    // Allocate storage on the stack so it's automatically reclaimed 
+    // Allocate storage on the stack so it's automatically reclaimed
     // when we exit.
     char **p4args = ALLOCA_N( char *, argc + 1 );
 
@@ -917,7 +958,7 @@ static VALUE p4map_new( int argc, VALUE *argv, VALUE pClass )
 
     // First arg is the class
     // pClass = argv[ 0 ];
- 
+
     // Now instantiate the new object.
     self = Data_Wrap_Struct( pClass, 0, p4map_free, m );
     rb_obj_call_init( self, 0, argv );
@@ -1066,7 +1107,7 @@ static VALUE p4map_reverse( VALUE self )
     return rval;
 }
 
-// 
+//
 // P4::Map#translate( string, fwd=true )
 //
 static VALUE p4map_trans( int argc, VALUE *argv, VALUE self )
@@ -1076,7 +1117,7 @@ static VALUE p4map_trans( int argc, VALUE *argv, VALUE self )
     VALUE		string;
 
     if( argc < 1 || argc > 2 )
-	rb_raise( rb_eArgError, 
+	rb_raise( rb_eArgError,
 		"Invalid arguments to P4::Map#translate. "
 		"Pass the string you wish to translate, and an optional "
 		"boolean to indicate whether translation should be in "
@@ -1155,6 +1196,14 @@ static VALUE p4msg_get_text( VALUE self )
     return e->GetText();
 }
 
+static VALUE p4msg_get_dict( VALUE self )
+{
+    P4Error *   e = 0;
+
+    Data_Get_Struct( self, P4Error, e );
+    return e->GetDict();
+}
+
 static VALUE p4msg_get_id( VALUE self )
 {
     P4Error *	e = 0;
@@ -1197,6 +1246,8 @@ void	Init_P4()
     rb_define_method( cP4, "tagged=",	RUBY_METHOD_FUNC(p4_set_tagged), 1 );
     rb_define_method( cP4, "track?", 	RUBY_METHOD_FUNC(p4_get_track)   , 0 );
     rb_define_method( cP4, "track=", 	RUBY_METHOD_FUNC(p4_set_track)   , 1 );
+    rb_define_method( cP4, "graph?",  RUBY_METHOD_FUNC(p4_get_graph) , 0 );
+    rb_define_method( cP4, "graph=",  RUBY_METHOD_FUNC(p4_set_graph) , 1 );
 
 
     // Perforce client settings.
@@ -1228,6 +1279,8 @@ void	Init_P4()
     rb_define_method( cP4, "protocol", 	RUBY_METHOD_FUNC(p4_set_protocol), 2 );
     rb_define_method( cP4, "ticket_file", RUBY_METHOD_FUNC(p4_get_ticket_file), 0 );
     rb_define_method( cP4, "ticket_file=", RUBY_METHOD_FUNC(p4_set_ticket_file), 1 );
+    rb_define_method( cP4, "trust_file", RUBY_METHOD_FUNC(p4_get_trust_file), 0 );
+    rb_define_method( cP4, "trust_file=", RUBY_METHOD_FUNC(p4_set_trust_file), 1 );
     rb_define_method( cP4, "user", 	RUBY_METHOD_FUNC(p4_get_user)    , 0 );
     rb_define_method( cP4, "user=", 	RUBY_METHOD_FUNC(p4_set_user)    , 1 );
     rb_define_method( cP4, "version", 	RUBY_METHOD_FUNC(p4_get_version) , 0 );
@@ -1327,6 +1380,7 @@ void	Init_P4()
     rb_define_method( cP4Msg, "msgid", RUBY_METHOD_FUNC(p4msg_get_id), 0);
     rb_define_method( cP4Msg, "severity", RUBY_METHOD_FUNC(p4msg_get_severity), 0);
     rb_define_method( cP4Msg, "generic", RUBY_METHOD_FUNC(p4msg_get_generic), 0);
+    rb_define_method( cP4Msg, "dictionary", RUBY_METHOD_FUNC(p4msg_get_dict), 0);
     rb_define_method( cP4Msg, "to_s", RUBY_METHOD_FUNC(p4msg_get_text), 0);
 
     //	P4::Progress class.

data/ext/P4/p4clientapi.cpp

@@ -92,9 +92,19 @@ P4ClientApi::P4ClientApi() : ui( &specMgr )
     const char *t;
 
     henv.GetTicketFile( ticketFile );
-    
+
+    if( (t = enviro->Get("P4TICKETS")) )
+	   ticketFile = t;
+
+    //
+    // Load the current trust file. Start with the default, and then
+    // override it if P4TRUST is set.
+    //
+
+    henv.GetTrustFile( trustFile );
+
     if( (t = enviro->Get("P4TICKETS")) )
-	ticketFile = t;
+        trustFile = t;
 
     //
     // Load the current P4CHARSET if set.
@@ -132,7 +142,7 @@ P4ClientApi::GetEnviroFile()
     return enviro->GetEnviroFile();
 }
 
-void 
+void
 P4ClientApi::SetApiLevel( int level )
 {
     StrBuf	b;
@@ -192,7 +202,14 @@ P4ClientApi::SetTicketFile( const char *p )
     ticketFile = p;
 }
 
-void 
+void
+P4ClientApi::SetTrustFile( const char *p )
+{
+    client.SetTrustFile( p );
+    trustFile = p;
+}
+
+void
 P4ClientApi::SetDebug( int d )
 {
     debug = d;
@@ -241,7 +258,7 @@ P4ClientApi::SetEnv( const char *var, const char *val )
 // connect to the Perforce server.
 //
 
-VALUE 
+VALUE
 P4ClientApi::Connect()
 {
     if ( P4RDB_COMMANDS )
@@ -288,7 +305,7 @@ P4ClientApi::ConnectOrReconnect()
 //
 // Disconnect session
 //
-VALUE 
+VALUE
 P4ClientApi::Disconnect()
 {
     if ( P4RDB_COMMANDS )
@@ -306,6 +323,9 @@ P4ClientApi::Disconnect()
     // Clear the specdef cache.
     specMgr.Reset();
 
+    // Clear out any results from the last command
+    ui.Reset();
+
     return Qtrue;
 }
 
@@ -322,7 +342,7 @@ P4ClientApi::Connected()
     return Qfalse;
 }
 
-void 
+void
 P4ClientApi::Tagged( int enable )
 {
     if( enable )
@@ -359,6 +379,14 @@ void P4ClientApi::SetStreams( int enable )
        ClearStreamsMode();
 }
 
+void P4ClientApi::SetGraph( int enable )
+{
+    if ( enable )
+       SetGraphMode();
+    else
+       ClearGraphMode();
+}
+
 int
 P4ClientApi::GetServerLevel()
 {
@@ -410,7 +438,7 @@ P4ClientApi::IsIgnored( const char *path )
 // is raised.
 //
 
-VALUE 
+VALUE
 P4ClientApi::Run( const char *cmd, int argc, char * const *argv )
 {
     // Save the entire command string for our error messages. Makes it
@@ -480,6 +508,9 @@ P4ClientApi::RunCmd( const char *cmd, ClientUser *ui, int argc, char * const *ar
     if ( IsStreams() && apiLevel > 69 )
 	client.SetVar( "enableStreams", "" );
 
+    if ( IsGraph() && apiLevel > 81 )
+    client.SetVar( "enableGraph", "" );
+
     // If maxresults or maxscanrows is set, enforce them now
     if( maxResults  )	client.SetVar( "maxResults",  maxResults  );
     if( maxScanRows )	client.SetVar( "maxScanRows", maxScanRows );
@@ -512,7 +543,7 @@ P4ClientApi::RunCmd( const char *cmd, ClientUser *ui, int argc, char * const *ar
 
 //
 // Parses a string supplied by the user into a hash. To do this we need
-// the specstring from the server. We try to cache those as we see them, 
+// the specstring from the server. We try to cache those as we see them,
 // but the user may not have executed any commands to allow us to cache
 // them so we may have to fetch the spec first.
 //
@@ -540,7 +571,7 @@ P4ClientApi::ParseSpec( const char * type, const char *form )
     Error e;
     VALUE v;
     v = specMgr.StringToSpec( type, form, &e );
-    
+
     if ( e.Test() )
     {
 	if( exceptionLevel )
@@ -551,7 +582,7 @@ P4ClientApi::ParseSpec( const char * type, const char *form )
 
     return v;
 }
-    
+
 
 //
 // Converts a hash supplied by the user into a string using the specstring
@@ -577,14 +608,14 @@ P4ClientApi::FormatSpec( const char * type, VALUE hash )
 	}
     }
 
-    // Got a specdef so now we can attempt to convert. 
+    // Got a specdef so now we can attempt to convert.
     StrBuf	buf;
     Error	e;
 
     specMgr.SpecToString( type, hash, buf, &e );
     if( !e.Test() )
 	return P4Utils::ruby_string( buf.Text() );
-    
+
     if( exceptionLevel )
     {
 	StrBuf m;
@@ -620,7 +651,7 @@ P4ClientApi::SpecFields( const char * type )
 
     return specMgr.SpecFields( type );
 }
-    
+
 //
 // Raises an exception or returns Qfalse on bad input
 //
@@ -686,13 +717,13 @@ P4ClientApi::Except( const char *func, const char *msg )
     StrBuf	errors;
     StrBuf	warnings;
     int		terminate = 0;
-    
+
     m << "[" << func << "] " << msg;
 
     // Now append any errors and warnings to the text
     ui.GetResults().FmtErrors( errors );
     ui.GetResults().FmtWarnings( warnings );
-    
+
     if( errors.Length() )
     {
 	m << "\n" << errors;
@@ -729,4 +760,3 @@ P4ClientApi::Except( const char *func, Error *e )
     e->Fmt( &m );
     Except( func, m.Text() );
 }
-