Browse Source

Some last minute cleanup for 0.4 release.

Eric Day 16 years ago
parent
commit
2229d11d47
10 changed files with 30 additions and 15 deletions
  1. 1 0
      .bzrignore
  2. 13 0
      ChangeLog
  3. 2 2
      Makefile.am
  4. 1 1
      benchmark/Makefile.am
  5. 2 2
      benchmark/blobslap_client.c
  6. 2 2
      benchmark/blobslap_worker.c
  7. 1 1
      bin/Makefile.am
  8. 2 2
      bin/gearman.c
  9. 5 4
      configure.ac
  10. 1 1
      examples/Makefile.am

+ 1 - 0
.bzrignore

@@ -44,3 +44,4 @@ benchmark/blobslap_client
 benchmark/blobslap_worker
 bin/gearman
 tests/cpp_test
+scripts/gearmand-init

+ 13 - 0
ChangeLog

@@ -1,3 +1,16 @@
+0.4 - 2009-03-30
+ * New protocol additions such as UNIQ grab and assign for workers.
+ * Support for high priority background jobs (Brian Moon).
+ * Support for low priority jobs.
+ * New priority queue in server to support new protocol options.
+ * Reworked the unique ID checking in server.
+ * Added hooks to aid in client memory cleanup.
+ * Added gearman command line utility to allow you to use clients and
+   workers from the shell.
+ * Build fixes (Monty Taylor).
+ * Basic init script added.
+ * Fixed getopt bugs with variable type and EOF.
+
 0.3 - 2009-02-05
  * Fixed I/O wait bug in packet parse.
  * Switched to different autoconf library detection method.

+ 2 - 2
Makefile.am

@@ -7,11 +7,11 @@
 
 ACLOCAL_AMFLAGS= -I m4
 
-SUBDIRS = libgearman gearmand bin tests examples support benchmark
+SUBDIRS = libgearman gearmand bin tests examples scripts support benchmark
 
 # Uncomment this when making a distribution. This is dynamically generated
 # with 'make docs'.
-#include $(top_srcdir)/docs/man_list
+include $(top_srcdir)/docs/man_list
 
 docs: all
 	${DOXYGEN} docs/Doxyfile.api

+ 1 - 1
benchmark/Makefile.am

@@ -5,7 +5,7 @@
 # Use and distribution licensed under the BSD license.  See
 # the COPYING file in the parent directory for full text.
 
-LDADD= $(LIBUUID) $(LIBEVENT) $(top_builddir)/libgearman/libgearman.la
+LDADD= $(LTLIBUUID) $(LTLIBEVENT) $(top_builddir)/libgearman/libgearman.la
 
 noinst_PROGRAMS= \
 	blobslap_client \

+ 2 - 2
benchmark/blobslap_client.c

@@ -29,7 +29,7 @@ static void _usage(char *name);
 int main(int argc, char *argv[])
 {
   gearman_benchmark_st benchmark;
-  char c;
+  int c;
   char *host= NULL;
   in_port_t port= 0;
   char *function= GEARMAN_BENCHMARK_DEFAULT_FUNCTION;
@@ -54,7 +54,7 @@ int main(int argc, char *argv[])
 
   gearman_client_set_options(&client, GEARMAN_CLIENT_UNBUFFERED_RESULT, 1);
 
-  while ((c= getopt(argc, argv, "c:f:h:m:M:n:p:s:v")) != EOF)
+  while ((c= getopt(argc, argv, "c:f:h:m:M:n:p:s:v")) != -1)
   {
     switch(c)
     {

+ 2 - 2
benchmark/blobslap_worker.c

@@ -21,7 +21,7 @@ static void usage(char *name);
 int main(int argc, char *argv[])
 {
   gearman_benchmark_st benchmark;
-  char c;
+  int c;
   char *host= NULL;
   in_port_t port= 0;
   char *function= NULL;
@@ -37,7 +37,7 @@ int main(int argc, char *argv[])
     exit(1);
   }
 
-  while ((c = getopt(argc, argv, "c:f:h:p:v")) != EOF)
+  while ((c = getopt(argc, argv, "c:f:h:p:v")) != -1)
   {
     switch(c)
     {

+ 1 - 1
bin/Makefile.am

@@ -5,7 +5,7 @@
 # Use and distribution licensed under the BSD license.  See
 # the COPYING file in the parent directory for full text.
 
-AM_LDFLAGS= $(LIBUUID) $(LIBEVENT) $(top_builddir)/libgearman/libgearman.la
+AM_LDFLAGS= $(LTLIBUUID) $(LTLIBEVENT) $(top_builddir)/libgearman/libgearman.la
 
 bin_PROGRAMS= \
 	gearman

+ 2 - 2
bin/gearman.c

@@ -106,7 +106,7 @@ static void usage(char *name);
 
 int main(int argc, char *argv[])
 {
-  char c;
+  int c;
   gearman_args_st args;
 
   memset(&args, 0, sizeof(gearman_args_st));
@@ -117,7 +117,7 @@ int main(int argc, char *argv[])
   if (args.function == NULL)
     GEARMAN_ERROR("malloc:%d", errno)
 
-  while ((c = getopt(argc, argv, "bc:f:h:HILnNp:Psu:w")) != EOF)
+  while ((c = getopt(argc, argv, "bc:f:h:HILnNp:Psu:w")) != -1)
   {
     switch(c)
     {

+ 5 - 4
configure.ac

@@ -6,13 +6,13 @@
 # the COPYING file in this directory for full text.
 
 AC_PREREQ(2.59)
-AC_INIT(gearmand, [0.3.0], [https://launchpad.net/gearmand])
+AC_INIT(gearmand, [0.4.0], [https://launchpad.net/gearmand])
 AC_CONFIG_SRCDIR(libgearman/gearman.c)
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_HEADERS([config.h])
 
 GEARMAN_MAJOR_VERSION=0
-GEARMAN_MINOR_VERSION=3
+GEARMAN_MINOR_VERSION=4
 GEARMAN_MICRO_VERSION=0
 GEARMAN_VERSION=$GEARMAN_MAJOR_VERSION.$GEARMAN_MINOR_VERSION.$GEARMAN_MICRO_VERSION
 GEARMAN_RELEASE=$GEARMAN_MAJOR_VERSION.$GEARMAN_MINOR_VERSION
@@ -351,8 +351,9 @@ AC_CHECK_PROGS([PERL], [perl])
 
 
 AC_CONFIG_FILES(Makefile libgearman/Makefile gearmand/Makefile bin/Makefile
-                tests/Makefile examples/Makefile support/Makefile
-                benchmark/Makefile support/gearmand.pc support/gearmand.spec)
+                tests/Makefile examples/Makefile scripts/Makefile
+                support/Makefile benchmark/Makefile scripts/gearmand-init
+                support/gearmand.pc support/gearmand.spec)
 
 AC_OUTPUT
 

+ 1 - 1
examples/Makefile.am

@@ -5,7 +5,7 @@
 # Use and distribution licensed under the BSD license.  See
 # the COPYING file in the parent directory for full text.
 
-LDADD= $(LIBUUID) $(LIBEVENT) $(top_builddir)/libgearman/libgearman.la
+LDADD= $(LTLIBUUID) $(LTLIBEVENT) $(top_builddir)/libgearman/libgearman.la
 
 noinst_PROGRAMS= \
 	echo_client \

Some files were not shown because too many files changed in this diff