Changeset 36480 for branches/eam_branches/ipp-20131211/ippTools/src

Timestamp:

Feb 6, 2014, 11:48:53 AM (12 years ago)

Author:

eugene

Message:

merging changes from trunk

Location:

branches/eam_branches/ipp-20131211

Files:

• . (modified) (1 prop)
• ippTools/src (modified) (2 props)
• ippTools/src/Makefile.am (modified) (3 diffs)
• ippTools/src/camtool.c (modified) (1 prop)
• ippTools/src/camtoolConfig.c (modified) (1 prop)
• ippTools/src/chiptool.c (modified) (2 diffs)
• ippTools/src/fftool.c (copied) (copied from trunk/ippTools/src/fftool.c )
• ippTools/src/fftool.h (copied) (copied from trunk/ippTools/src/fftool.h )
• ippTools/src/fftoolConfig.c (copied) (copied from trunk/ippTools/src/fftoolConfig.c )
• ippTools/src/magictool.c (modified) (1 prop)

branches/eam_branches/ipp-20131211/ippTools/src

@@ -47 +47 @@
 sctool
 releasetool
+fftool

@@ -47 +47 @@
 sctool
 releasetool
+fftool

branches/eam_branches/ipp-20131211/ippTools/src/Makefile.am

@@ -33 +33 @@
         vptool \
         sctool \
-        releasetool
+        releasetool \
+        fftool
 
 pkginclude_HEADERS = \
@@ -87 +88 @@
         vptool.h \
         sctool.h \
-        releasetool.h
+        releasetool.h \
+        fftool.h
 
 lib_LTLIBRARIES = libpxtools.la
@@ -332 +334 @@
     releasetoolConfig.c
 
+fftool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
+fftool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
+fftool_SOURCES = \
+    fftool.c \
+    fftoolConfig.c
+
 clean-local:
         -rm -f TAGS

branches/eam_branches/ipp-20131211/ippTools/src/chiptool.c

@@ -1255 +1255 @@
 
     psMetadata *where = psMetadataAlloc();
-    pxAddLabelSearchArgs (config, where, "-label", "label", "==");
+    pxAddLabelSearchArgs (config, where, "-label", "chipRun.label", "==");
 
     psString query = pxDataGet("chiptool_pendingcleanuprun.sql");
@@ -1269 +1269 @@
     }
     psFree(where);
+
+    psStringAppend(&query, "\nORDER BY priority DESC, chip_id");
 
     // treat limit == 0 as "no limit"

@@ -47 +47 @@
 sctool
 releasetool
+fftool