ovirt-engine-sdk 4.0.1 → 4.4.1

data/ext/ovirtsdk4c/extconf.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby
 
 #
-# Copyright (c) 2015-2016 Red Hat, Inc.
+# Copyright (c) 2015-2017 Red Hat, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,11 +18,37 @@
 
 require 'mkmf'
 
-# Check that "libxml2" is available:
-unless find_executable('xml2-config')
+# Check if "libxml2" is available:
+xml2_config = find_executable('xml2-config')
+if xml2_config
+  cflags = `#{xml2_config} --cflags`.strip
+  libs = `#{xml2_config} --libs`.strip
+  $CPPFLAGS = "#{cflags} #{$CPPFLAGS}"
+  $LDFLAGS = "#{libs} #{$LDFLAGS}"
+elsif !pkg_config('libxml2')
   raise 'The "libxml2" package isn\'t available.'
 end
-$CPPFLAGS = "#{`xml2-config --cflags`.strip} #{$CPPFLAGS}"
-$LDFLAGS = "#{`xml2-config --libs`.strip} #{$LDFLAGS}"
 
+# Check if "libcurl" is available:
+curl_config = find_executable('curl-config')
+if curl_config
+  cflags = `#{curl_config} --cflags`.strip
+  libs = `#{curl_config} --libs`.strip
+  $CPPFLAGS = "#{cflags} #{$CPPFLAGS}"
+  $LDFLAGS = "#{libs} #{$LDFLAGS}"
+elsif !pkg_config('libcurl')
+  raise 'The "libcurl" package isn\'t available.'
+end
+
+# When installing the SDK as a plugin in Vagrant there is an issue with
+# some versions of Vagrant that embed "libxml2" and "libcurl", but using
+# an incorrect directory. To avoid that we need to explicitly fix the
+# Vagrant path.
+def fix_vagrant_prefix(flags)
+  flags.gsub!('/vagrant-substrate/staging', '/opt/vagrant')
+end
+fix_vagrant_prefix($CPPFLAGS)
+fix_vagrant_prefix($LDFLAGS)
+
+# Create the Makefile:
 create_makefile 'ovirtsdk4c'

data/ext/ovirtsdk4c/ov_error.c

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-2016 Red Hat, Inc.
+Copyright (c) 2015-2017 Red Hat, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -19,9 +19,16 @@ limitations under the License.
 #include "ov_module.h"
 #include "ov_error.h"
 
-/* Class: */
+/* Classes: */
 VALUE ov_error_class;
+VALUE ov_connection_error_class;
+VALUE ov_timeout_error_class;
 
 void ov_error_define(void) {
+    /* Define the base error class: */
     ov_error_class = rb_define_class_under(ov_module, "Error", rb_eStandardError);
+
+    /* Define the specialized error classes: */
+    ov_connection_error_class = rb_define_class_under(ov_module, "ConnectionError", ov_error_class);
+    ov_timeout_error_class = rb_define_class_under(ov_module, "TimeoutError", ov_error_class);
 }

data/ext/ovirtsdk4c/ov_error.h

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-2016 Red Hat, Inc.
+Copyright (c) 2015-2017 Red Hat, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -19,6 +19,8 @@ limitations under the License.
 
 // Classes:
 extern VALUE ov_error_class;
+extern VALUE ov_connection_error_class;
+extern VALUE ov_timeout_error_class;
 
 // Initialization function:
 extern void ov_error_define(void);