Changeset 29528 for trunk/ippTools

Timestamp:

Oct 22, 2010, 4:25:03 PM (16 years ago)

Author:

heather

Message:

minidvodbcopy merge to trunk

Location:

trunk/ippTools

Files:

• . (modified) (1 prop)
• share/Makefile.am (modified) (1 diff)
• share/minidvodbtool_find_minidvodb_id_dvo.sql (copied) (copied from branches/haf_branches/ipp.rsync.20101015/ippTools/share/minidvodbtool_find_minidvodb_id_dvo.sql )
• share/minidvodbtool_find_minidvodbcopy.sql (copied) (copied from branches/haf_branches/ipp.rsync.20101015/ippTools/share/minidvodbtool_find_minidvodbcopy.sql )
• share/minidvodbtool_queue_minidvodb_id.sql (copied) (copied from branches/haf_branches/ipp.rsync.20101015/ippTools/share/minidvodbtool_queue_minidvodb_id.sql )
• share/minidvodbtool_revertminidvodbcopy.sql (copied) (copied from branches/haf_branches/ipp.rsync.20101015/ippTools/share/minidvodbtool_revertminidvodbcopy.sql )
• src/Makefile.am (modified) (5 diffs)
• src/minidvodbtool.c (copied) (copied from branches/haf_branches/ipp.rsync.20101015/ippTools/src/minidvodbtool.c )
• src/minidvodbtool.h (copied) (copied from branches/haf_branches/ipp.rsync.20101015/ippTools/src/minidvodbtool.h )
• src/minidvodbtoolConfig.c (copied) (copied from branches/haf_branches/ipp.rsync.20101015/ippTools/src/minidvodbtoolConfig.c )
• src/pxminidvodb.c (copied) (copied from branches/haf_branches/ipp.rsync.20101015/ippTools/src/pxminidvodb.c )
• src/pxminidvodb.h (copied) (copied from branches/haf_branches/ipp.rsync.20101015/ippTools/src/pxminidvodb.h )

trunk/ippTools/share/Makefile.am

@@ -264 +264 @@
         magicdstool_torevert_warp.sql \
         magicdstool_torevert_diff.sql \
+        minidvodbtool_find_minidvodb_id_dvo.sql \
+        minidvodbtool_find_minidvodbcopy.sql \
+        minidvodbtool_revertminidvodbcopy.sql \
         pstamptool_completedreq.sql \
         pstamptool_datastore.sql \

trunk/ippTools/src/Makefile.am

@@ -27 +27 @@
         receivetool \
         pubtool \
-        diffphottool
+        diffphottool \
+        minidvodbtool
 
 pkginclude_HEADERS = \
@@ -39 +40 @@
         pxdqstats.h
         pxmagic.h \
+        pxminidvodb.h \
         pxregister.h \
         pxspace.h \
@@ -73 +75 @@
         warptool.h \
         pubtool.h \
-        diffphottool.h
+        diffphottool.h \
+        minidvodbtool.h
 
 lib_LTLIBRARIES = libpxtools.la
@@ -90 +93 @@
         pxdqstats.c \
         pxmagic.c \
+        pxminidvodb.c \
         pxregister.c \
         pxspace.c \
@@ -280 +284 @@
     diffphottoolConfig.c
 
+minidvodbtool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
+minidvodbtool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
+minidvodbtool_SOURCES = \
+    minidvodbtool.c \
+    minidvodbtoolConfig.c
+
 clean-local:
         -rm -f TAGS