expose optparse API publicly

configure.ac

@@ -180,6 +180,7 @@ AC_CONFIG_FILES( \
  src/common/libflux/Makefile \
  src/common/libsubprocess/Makefile \
  src/common/libcompat/Makefile \
+ src/common/liboptparse/Makefile \
  src/lib/Makefile \
  src/lib/libpmi/Makefile \
  src/bindings/Makefile \

etc/flux-core.pc.in

@@ -6,5 +6,5 @@ includedir=@includedir@
 Name: flux-core
 Description: Flux Resource Manager Framework Core
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lflux-jsc -lflux-live -lflux-kvs -lflux-barrier -lflux-core
+Libs: -L${libdir} -lflux-jsc -lflux-live -lflux-kvs -lflux-barrier -lflux-core -lflux-optparse
 Cflags: -I${includedir}

src/Makefile.am

@@ -6,4 +6,6 @@ SUBDIRS = common modules lib broker connectors bindings cmd test
 
 check-local: all
 
-noinst_HEADERS = include/flux/core.h
+noinst_HEADERS = \
+ include/flux/core.h \
+ include/flux/optparse.h

src/cmd/Makefile.am

@@ -12,6 +12,7 @@ AM_CPPFLAGS = \
 fluxcmd_ldadd = \
  $(top_builddir)/src/common/libflux-internal.la \
  $(top_builddir)/src/common/libflux-core.la \
+ $(top_builddir)/src/common/libflux-optparse.la \
  $(top_builddir)/src/modules/kvs/libflux-kvs.la \
  $(top_builddir)/src/modules/live/libflux-live.la \
  $(JSON_LIBS) $(ZMQ_LIBS) $(LIBMUNGE) $(LIBPTHREAD) $(LIBDL)

src/cmd/builtin.h

@@ -23,9 +23,9 @@
 \*****************************************************************************/
 
 #include <flux/core.h>
+#include <flux/optparse.h>
 #include "src/common/libutil/xzmalloc.h"
 #include "src/common/libutil/log.h"
-#include "src/common/libutil/optparse.h"
 
 typedef int (*register_cmd_f) (optparse_t *p);
 

src/cmd/flux-event.c

@@ -30,9 +30,9 @@
 #include <json.h>
 #include <argz.h>
 #include <flux/core.h>
+#include <flux/optparse.h>
 
 #include "src/common/libutil/log.h"
-#include "src/common/libutil/optparse.h"
 
 
 static int event_pub (optparse_t *p, int argc, char **argv);

src/cmd/flux-start.c

@@ -31,12 +31,12 @@
 #include <libgen.h>
 #include <argz.h>
 #include <flux/core.h>
+#include <flux/optparse.h>
 #include <czmq.h>
 
 #include "src/common/libutil/xzmalloc.h"
 #include "src/common/libutil/log.h"
 #include "src/common/libutil/oom.h"
-#include "src/common/libutil/optparse.h"
 #include "src/common/libutil/cleanup.h"
 #include "src/common/libpmi-server/simple.h"
 #include "src/common/libsubprocess/subprocess.h"

src/cmd/flux.c

@@ -36,12 +36,12 @@
 #include <glob.h>
 #include <assert.h>
 #include <flux/core.h>
+#include <flux/optparse.h>
 #include <pwd.h>
 
 #include "src/common/libutil/log.h"
 #include "src/common/libutil/xzmalloc.h"
 #include "src/common/libutil/shortjson.h"
-#include "src/common/libutil/optparse.h"
 #include "src/common/libutil/environment.h"
 
 #include "cmdhelp.h"

src/common/Makefile.am

@@ -1,5 +1,5 @@
 SUBDIRS = libtap libev libsophia libminilzo libpmi-client libpmi-server \
- liblsd libutil libflux libsubprocess libcompat
+ liblsd libutil libflux libsubprocess libcompat liboptparse
 
 AM_CFLAGS = @GCCWARN@ $(CODE_COVERAGE_CFLAGS)
 AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS)
@@ -23,14 +23,25 @@ libflux_internal_la_LIBADD = \
  $(LIBDL) $(LIBRT)
 libflux_internal_la_LDFLAGS = -Wl,--no-undefined
 
-lib_LTLIBRARIES = libflux-core.la
+lib_LTLIBRARIES = libflux-core.la libflux-optparse.la
+
 libflux_core_la_SOURCES =
 libflux_core_la_LIBADD = \
  $(builddir)/libflux/libflux.la \
  libflux-internal.la
+libflux_core_la_LDFLAGS = \
+ -Wl,--version-script=$(srcdir)/libflux-core.map \
+ -shared -export-dynamic --disable-static \
+ -Wl,--no-undefined
 
-libflux_core_la_LDFLAGS = -Wl,--version-script=$(srcdir)/version.map \
- -shared -export-dynamic --disable-static \
- -Wl,--no-undefined
+libflux_optparse_la_SOURCES =
+libflux_optparse_la_LIBADD = \
+ $(builddir)/liboptparse/liboptparse.la \
+ $(builddir)/liblsd/liblsd.la \
+ $(ZMQ_LIBS) $(LIBPTHREAD)
+libflux_optparse_la_LDFLAGS = \
+ -Wl,--version-script=$(srcdir)/libflux-optparse.map \
+ -shared -export-dynamic --disable-static \
+ -Wl,--no-undefined
 
-EXTRA_DIST = version.map
+EXTRA_DIST = libflux-core.map libflux-optparse.map

src/common/libflux-optparse.map

@@ -0,0 +1,5 @@
+{ global:
+ optparse_*;
+ local: *;
+};
+

src/common/liboptparse/Makefile.am

@@ -0,0 +1,38 @@
+AM_CFLAGS = \
+ @GCCWARN@ \
+ $(CODE_COVERAGE_CFLAGS)
+
+AM_LDFLAGS = \
+ $(CODE_COVERAGE_LDFLAGS)
+
+AM_CPPFLAGS = \
+ -I$(top_srcdir) -I$(top_srcdir)/src/include \
+ $(ZMQ_CFLAGS)
+
+noinst_LTLIBRARIES = liboptparse.la
+fluxinclude_HEADERS = optparse.h
+liboptparse_la_SOURCES = optparse.c
+
+liboptparse_la_CPPFLAGS = \
+ $(AM_CPPFLAGS)
+liboptparse_la_LDFLAGS = \
+ -avoid-version -module -shared -export-dynamic \
+ $(AM_LDFLAGS)
+
+
+TESTS = test_optparse.t
+
+check_PROGRAMS = $(TESTS)
+
+TEST_EXTENSIONS = .t
+T_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
+ $(top_srcdir)/config/tap-driver.sh
+
+test_optparse_t_SOURCES = test/optparse.c
+test_optparse_t_CPPFLAGS = $(AM_CPPFLAGS)
+test_optparse_t_LDADD = \
+ $(top_builddir)/src/common/libtap/libtap.la \
+ $(top_builddir)/src/common/liboptparse/liboptparse.la \
+ $(top_builddir)/src/common/liblsd/liblsd.la \
+ $(top_builddir)/src/common/libutil/libutil.la \
+ $(ZMQ_LIBS) $(LIBPTHREAD)

src/common/libutil/test/optparse.c → src/common/liboptparse/test/optparse.c

@@ -1,5 +1,5 @@
 #include "src/common/libtap/tap.h"
-#include "src/common/libutil/optparse.h"
+#include "src/common/liboptparse/optparse.h"
 #include "src/common/libutil/sds.h"
 
 static void *myfatal_h = NULL;

src/common/libutil/Makefile.am

@@ -27,8 +27,6 @@ libutil_la_SOURCES = \
  monotime.h \
  setenvf.c \
  setenvf.h \
- optparse.c \
- optparse.h \
  tstat.c \
  tstat.h \
  veb.c \
@@ -80,7 +78,6 @@ libutil_la_SOURCES = \
 EXTRA_DIST = veb_mach.c
 
 TESTS = test_nodeset.t \
- test_optparse.t \
  test_ev.t \
  test_coproc.t \
  test_base64.t \
@@ -119,10 +116,6 @@ test_nodeset_t_SOURCES = test/nodeset.c
 test_nodeset_t_CPPFLAGS = $(test_cppflags)
 test_nodeset_t_LDADD = $(test_ldadd)
 
-test_optparse_t_SOURCES = test/optparse.c
-test_optparse_t_CPPFLAGS = $(test_cppflags)
-test_optparse_t_LDADD = $(test_ldadd)
-
 test_ev_t_SOURCES = test/ev.c
 test_ev_t_CPPFLAGS = $(test_cppflags)
 test_ev_t_LDADD = $(test_ldadd)

src/include/flux/optparse.h

@@ -0,0 +1,4 @@
+/* Allow in-tree programs to #include <flux/optparse.h> like out-of-tree would.
+ */
+
+#include "src/common/liboptparse/optparse.h"

src/modules/live/Makefile.am

@@ -18,6 +18,7 @@ live_la_SOURCES = live.c
 live_la_LDFLAGS = $(fluxmod_ldflags) -module
 live_la_LIBADD = $(top_builddir)/src/common/libflux-internal.la \
  $(top_builddir)/src/common/libflux-core.la \
+ $(top_builddir)/src/common/libflux-optparse.la \
  $(top_builddir)/src/modules/kvs/libflux-kvs.la \
  $(top_builddir)/src/modules/barrier/libflux-barrier.la \
  $(JSON_LIBS) $(ZMQ_LIBS)

src/modules/live/live.c

@@ -82,6 +82,7 @@
 #include <sys/time.h>
 #include <ctype.h>
 #include <flux/core.h>
+#include <flux/optparse.h>
 #include <czmq.h>
 
 #include "src/modules/kvs/kvs_deprecated.h"
@@ -90,7 +91,6 @@
 #include "src/common/libutil/log.h"
 #include "src/common/libutil/shortjson.h"
 #include "src/common/libutil/nodeset.h"
-#include "src/common/libutil/optparse.h"
 
 
 typedef enum { CS_OK, CS_SLOW, CS_FAIL, CS_UNKNOWN } cstate_t;

src/modules/wreck/Makefile.am

@@ -50,6 +50,7 @@ wrexecd_libs = \
  $(top_builddir)/src/bindings/lua/libfluxlua.la \
  $(top_builddir)/src/common/libflux-internal.la \
  $(top_builddir)/src/common/libflux-core.la \
+ $(top_builddir)/src/common/libflux-optparse.la \
  $(top_builddir)/src/modules/libkz/libkz.la \
  $(top_builddir)/src/modules/kvs/libflux-kvs.la
 

src/modules/wreck/wrexecd.c

@@ -43,7 +43,7 @@
 
 #include <flux/core.h>
 
-#include "src/common/libutil/optparse.h"
+#include "src/common/liboptparse/optparse.h"
 #include "src/common/libutil/xzmalloc.h"
 #include "src/common/libutil/sds.h"
 #include "src/common/libutil/fdwalk.h"