Changeset 8326

Timestamp:

05/17/10 12:58:40 (3 years ago)

Author:

mtmoore

Message:

Addition of src/apps/devel directory and pvfs2-display-db to give a dump of berkeley dbs in text form to assist in development/debugging. Also made configure and make changes with new build target develtools

Location:

branches/Orange-Branch

Files:

• Makefile.in (modified) (7 diffs)
• configure (modified) (2 diffs)
• configure.in (modified) (1 diff)
• src/apps/devel (added)
• src/apps/devel/module.mk.in (added)
• src/apps/devel/pvfs2-db-display.c (added)

branches/Orange-Branch/Makefile.in

@@ -6 +6 @@
 # all            default rule; builds libs, server, and test programs
 # clean          cleans up files
+# develtools     builds development related tools
 # distclean      _really_ cleans up; returns to pristine tree
 # docs           builds documentation in docs subdirectory
@@ -122 +123 @@
 #    here keeps make from accidentally doing too much work (see GNU
 #    make manual).
-.PHONY: all clean dist distclean docs docsclean publish cscope tags codecheck admintools kernapps usertools
+.PHONY: all clean develtools dist distclean docs docsclean publish cscope tags codecheck admintools kernapps usertools
 
 ################################################################
@@ -471 +472 @@
 # c files generated from state machines
 SMCGEN :=
+# DEVELSRC is source for development related tools
+DEVELSRC :=
 
 ################################################################
@@ -636 +639 @@
 DOCSCRUFT += $(patsubst %.tex,%.toc, $(filter %.tex,$(DOCSRC)))
 
+# DEVELOBJS is a list of development program objects
+DEVELOBJS := $(patsubst %.c,%.o, $(filter %.c,$(DEVELSRC)))
+# DEVELTOOLS is a list of development program executables 
+DEVELTOOLS := $(patsubst %.c,%, $(filter %.c, $(DEVELSRC)))
+# DEVELDEPENDS is a list of dependency files for development programs
+DEVELDEPENDS := $(patsubst %.c,%.d, $(filter %.c,$(DEVELSRC)))
+
 # DEPENDS is a global list of all of our dependency files.  
 # NOTE: sort is just a trick to remove duplicates; the order
@@ -670 +680 @@
 statecompgen: $(STATECOMPGEN)
 
+# target for builging development tools
+develtools: $(DEVELTOOLS)
+
 # Build linux-2.6 kernel module if requested.
 # Can't use the actual file target since we don't know how to figure out
@@ -781 +794 @@
         $(Q) "  LD              $@"
         $(E)$(LD) -o $@ $(LDFLAGS) $< $(VISMISCOBJS) $(LIBS) $(call modldflags,$<)
+
+# rule for building development tools and its objects. don't know why db isn't
+# already in libs.
+$(DEVELTOOLS): $(DEVELOBJS) $(LIBRARIES)
+        $(Q) "  LD              $@"
+        $(E)$(LD) -o $@ $(LDFLAGS) $(DEVELOBJS) $(LIBS) -ldb $(call modldflags,$<)
 
 # default rule for building executables from object files
@@ -1131 +1150 @@
 endif
 
+        # install any development tools built
+        for i in $(notdir $(DEVELTOOLS)) ; do \
+                if [ -f $(srcdir)/src/apps/devel/$$i ]; then install -m 755 $(srcdir)/src/apps/devel/$$i $(bindir); fi;\
+        done
+
         install -d $(sbindir)
 

branches/Orange-Branch/configure

@@ -20152 +20152 @@
 done
 
-ac_config_files="$ac_config_files include/pvfs2.h Makefile module.mk src/apps/admin/module.mk src/apps/admin/pvfs2-config src/apps/karma/module.mk src/apps/vis/module.mk src/apps/fuse/module.mk src/apps/kernel/linux/module.mk src/apps/user/module.mk src/io/trove/module.mk src/io/trove/trove-handle-mgmt/module.mk src/io/trove/trove-dbpf/module.mk src/common/misc/module.mk src/common/quickhash/module.mk src/common/quicklist/module.mk src/common/dotconf/module.mk src/common/id-generator/module.mk src/common/gossip/module.mk src/common/gen-locks/module.mk src/common/llist/module.mk src/common/statecomp/module.mk src/common/events/module.mk src/common/mgmt/module.mk src/io/bmi/module.mk src/io/bmi/bmi_tcp/module.mk src/io/bmi/bmi_gm/module.mk src/io/bmi/bmi_mx/module.mk src/io/bmi/bmi_ib/module.mk src/io/bmi/bmi_portals/module.mk src/io/bmi/bmi_zoid/module.mk src/io/description/module.mk src/io/flow/module.mk src/io/flow/flowproto-bmi-trove/module.mk src/io/flow/flowproto-template/module.mk src/io/flow/flowproto-dump-offsets/module.mk src/io/flow/flowproto-bmi-cache/module.mk src/io/buffer/module.mk src/io/job/module.mk src/io/dev/module.mk src/proto/module.mk src/server/module.mk src/server/request-scheduler/module.mk src/client/sysint/module.mk src/kernel/linux-2.6/Makefile src/kernel/linux-2.4/Makefile doc/module.mk doc/coding/module.mk doc/design/module.mk doc/random/module.mk examples/pvfs2-server.rc doc/doxygen/pvfs2-doxygen.conf"
+ac_config_files="$ac_config_files include/pvfs2.h Makefile module.mk src/apps/admin/module.mk src/apps/admin/pvfs2-config src/apps/devel/module.mk src/apps/karma/module.mk src/apps/vis/module.mk src/apps/fuse/module.mk src/apps/kernel/linux/module.mk src/apps/user/module.mk src/io/trove/module.mk src/io/trove/trove-handle-mgmt/module.mk src/io/trove/trove-dbpf/module.mk src/common/misc/module.mk src/common/quickhash/module.mk src/common/quicklist/module.mk src/common/dotconf/module.mk src/common/id-generator/module.mk src/common/gossip/module.mk src/common/gen-locks/module.mk src/common/llist/module.mk src/common/statecomp/module.mk src/common/events/module.mk src/common/mgmt/module.mk src/io/bmi/module.mk src/io/bmi/bmi_tcp/module.mk src/io/bmi/bmi_gm/module.mk src/io/bmi/bmi_mx/module.mk src/io/bmi/bmi_ib/module.mk src/io/bmi/bmi_portals/module.mk src/io/bmi/bmi_zoid/module.mk src/io/description/module.mk src/io/flow/module.mk src/io/flow/flowproto-bmi-trove/module.mk src/io/flow/flowproto-template/module.mk src/io/flow/flowproto-dump-offsets/module.mk src/io/flow/flowproto-bmi-cache/module.mk src/io/buffer/module.mk src/io/job/module.mk src/io/dev/module.mk src/proto/module.mk src/server/module.mk src/server/request-scheduler/module.mk src/client/sysint/module.mk src/kernel/linux-2.6/Makefile src/kernel/linux-2.4/Makefile doc/module.mk doc/coding/module.mk doc/design/module.mk doc/random/module.mk examples/pvfs2-server.rc doc/doxygen/pvfs2-doxygen.conf"
 
 cat >confcache <<\_ACEOF
@@ -20755 +20755 @@
     "src/apps/admin/module.mk") CONFIG_FILES="$CONFIG_FILES src/apps/admin/module.mk" ;;
     "src/apps/admin/pvfs2-config") CONFIG_FILES="$CONFIG_FILES src/apps/admin/pvfs2-config" ;;
+    "src/apps/devel/module.mk") CONFIG_FILES="$CONFIG_FILES src/apps/devel/module.mk" ;;
     "src/apps/karma/module.mk") CONFIG_FILES="$CONFIG_FILES src/apps/karma/module.mk" ;;
     "src/apps/vis/module.mk") CONFIG_FILES="$CONFIG_FILES src/apps/vis/module.mk" ;;

branches/Orange-Branch/configure.in

@@ -1111 +1111 @@
 src/apps/admin/module.mk
 src/apps/admin/pvfs2-config
+src/apps/devel/module.mk
 src/apps/karma/module.mk
 src/apps/vis/module.mk