Merge lp:~clint-fewbar/gearman-interface/gearman-universal-fix into lp:gearman-interface

[Clint Byrum]

universal isn't included in the public API anymore at all, and so must be removed from the SWIG interface.

=== removed file 'interface/libgearman/universal.i'
--- interface/libgearman/universal.i	2010-06-28 23:54:20 +0000
+++ interface/libgearman/universal.i	1970-01-01 00:00:00 +0000
@@ -1,128 +0,0 @@
-/* -*- mode: c; c-basic-offset: 2; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * gearman-interface: Interface Wrappers for Gearman
- * Copyright (c) 2009 Monty Taylor
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 
- *  1. Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *  2. Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *  3. The name of the author may not be used to endorse or promote products
- *     derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-%rename(version) gearman_version;
-%rename(bugreport) gearman_bugreport;
-
-const char *gearman_version(void);
-const char *gearman_bugreport(void);
-
-
-typedef struct gearman_universal_st {} Gearman;
-
-
-%extend Gearman
-{
-
-  /* Initialize a library instance structure. */
-  Gearman()
-  {
-    return gearman_universal_create(NULL);
-  }
-
-  /* Free a library instance structure. */
-  ~Gearman()
-  {
-    gearman_universal_free($self);
-  }
-
-  /* Clone a library instance structure. */
-  Gearman *copy()
-  {
-    return gearman_universal_clone(NULL, $self);
-  }
-
-  /* Return an error string for last library error encountered. */
-  const char *error()
-  {
-    return gearman_universal_error($self);
-  }
-
-  /* Value of errno in the case of a GEARMAN_ERRNO return value. */
-  int errno()
-  {
-    return gearman_universal_errno($self);
-  }
-
-  gearman_universal_options_t options()
-  {
-    return gearman_universal_options($self);
-  }
-
-  void set_options(gearman_universal_options_t options)
-  {
-    gearman_universal_set_options($self, options);
-  }
-
-  void add_options(gearman_universal_options_t options)
-  {
-    gearman_universal_add_options($self, options);
-  }
-
-  void remove_options(gearman_universal_options_t options)
-  {
-    gearman_universal_remove_options($self, options);
-  }
-
-  int timeout()
-  {
-    return gearman_universal_timeout($self);
-  }
-
-  void set_timeout(int timeout)
-  {
-    gearman_universal_set_timeout($self, timeout);
-  }
-  
-  /**
-   * Set logging callback for gearman instance.
-   * @param gearman Gearman instance structure previously initialized with
-   *        gearman_universal_create.
-   * @param log_fn Function to call when there is a logging message.
-   * @param log_fn_arg Argument to pass into the log callback function.
-   * @param verbose Verbosity level.
-   */
-/*TODO:
-  void gearman_set_log_fn(gearman_universal_st *gearman, gearman_log_fn log_fn,
-                       void *log_fn_arg, gearman_verbose_t verbose);
-*/
-
-  /**
-   * Set custom I/O event callbacks for a gearman structure.
-   */
-/*TODO:
-  void gearman_set_event_watch_fn(gearman_universal_st *gearman,
-                               gearman_event_watch_fn *event_watch,
-                               void *event_watch_arg);
-*/
-
-
-};

=== modified file 'interface/python/libgearman.i'
--- interface/python/libgearman.i	2010-06-29 00:00:02 +0000
+++ interface/python/libgearman.i	2010-06-30 14:53:26 +0000
@@ -42,7 +42,6 @@
 
 %buffer_input(const void *workload, size_t workload_size)
 
-%include "interface/libgearman/universal.i"
 %include "interface/libgearman/client.i"
 %include "interface/libgearman/worker.i"
 %include "interface/libgearman/job.i"

=== modified file 'interface/ruby/libgearman.i'
--- interface/ruby/libgearman.i	2010-06-29 00:00:02 +0000
+++ interface/ruby/libgearman.i	2010-06-30 14:53:26 +0000
@@ -40,7 +40,7 @@
 }
 
 
-%rename(Gearman) gearman_st;
+/*%rename(Gearman) gearman_st;*/
 %rename(Client) gearman_client_st;
 %rename(Worker) gearman_worker_st;
 
@@ -49,7 +49,6 @@
 %include "interface/ruby/gearman_workload.i"
 %include "interface/ruby/job_handle_out.i"
 
-%include "interface/libgearman/universal.i"
 %include "interface/libgearman/client.i"
 %include "interface/libgearman/worker.i"
 %include "interface/libgearman/job.i"

=== modified file 'interface/xml/libgearman.i'
--- interface/xml/libgearman.i	2010-06-28 23:54:20 +0000
+++ interface/xml/libgearman.i	2010-06-30 14:53:26 +0000
@@ -33,6 +33,5 @@
 
 %include "interface/globals.i"
 
-%include "interface/libgearman/universal.i"
 %include "interface/libgearman/client.i"
 %include "interface/libgearman/worker.i"