From 9982f36619684b6b089e3ed8e58739680e65ddbc Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sun, 26 Aug 2012 00:43:54 +0000
Subject: docu updates, improvements to build system

---
 TODO                                    | 10 +++----
 configure.ac                            | 10 +++++++
 doc/extractor.texi                      | 48 ++++++++++++++++++++++++++++++---
 doc/version.texi                        |  2 +-
 po/POTFILES.in                          | 21 +++++++++++++++
 src/plugins/Makefile.am                 | 28 ++++++++++---------
 src/plugins/test_lib.c                  |  4 +--
 src/plugins/thumbnailffmpeg_extractor.c |  1 +
 8 files changed, 98 insertions(+), 26 deletions(-)

diff --git a/TODO b/TODO
index 815a84c..6571cee 100644
--- a/TODO
+++ b/TODO
@@ -1,19 +1,15 @@
-* Update plugins to new API (and cleanup code):
-  - elf
-  - applefile
-  - pdf
-
-* plugins without tests:
+* tests needed:
   - gstreamer (testcase file exists, but does not test everything important)
 
-
 Desirable missing formats:
 * mbox / various e-mail formats
 * info pages (scan for 'Node: %s^?ID' - see end of .info files!)
 * sources (Java, C, C++, see doxygen!)
 * a.out (== ar?)
 * rtf
+* applefile (0.6.x-plugin exists)
 * EXE
+* ELF (linkage information, 0.6.x-plugin exists)
 * PRC (Palm module, http://web.mit.edu/tytso/www/pilot/prc-format.html)
 * KOffice
 * TGA
diff --git a/configure.ac b/configure.ac
index c4b49a4..06c4469 100644
--- a/configure.ac
+++ b/configure.ac
@@ -322,6 +322,16 @@ AC_CHECK_LIB(archive, archive_read_open,
          AM_CONDITIONAL(HAVE_ARCHIVE, false))],
          AM_CONDITIONAL(HAVE_ARCHIVE, false))
 
+# should experimental code be compiled (code that may not yet compile)?
+AC_MSG_CHECKING(whether to compile experimental code)
+AC_ARG_ENABLE([experimental],
+   [AS_HELP_STRING([--enable-experimental], [enable compiling experimental code])],
+   [enable_experimental=${enableval}],
+   [enable_experimental=no])
+AC_MSG_RESULT($enable_experimental)
+AM_CONDITIONAL([HAVE_EXPERIMENTAL], [test "x$enable_experimental" = "xyes"])
+
+
 AC_MSG_CHECKING(for ImageFactory::iptcData in -lexiv2)
 AC_LANG_PUSH(C++)
 SAVED_LDFLAGS=$LDFLAGS
diff --git a/doc/extractor.texi b/doc/extractor.texi
index 6fe55fe..3074e68 100644
--- a/doc/extractor.texi
+++ b/doc/extractor.texi
@@ -794,23 +794,65 @@ The @verb{|EXTRACTOR_meta_data_print|} is a simple function which prints the met
 
 @itemize @bullet
 @item
+ARCHIVE (using libarchive)
+@item
+DVI
+@item
 EXIV2 (using libexiv2)
 @item 
 FLAC (using libFLAC)
 @item
 GIF (using libgif)
 @item
-JPEG
+GSTREAMER (using libgstreamer)
 @item
-MIME (using libmagic)
+HTML (using libtidy)
+@item
+IT 
+@item
+JPEG (using libjpeg)
+@item
+MAN
 @item
-MP3 (ID3v1)
+MIDI (using libsmf)
+@item
+MIME (using libmagic)
 @item
 MPEG (using libmpeg2)
 @item
+NSF
+@item
+NSFE
+@item
+ODF
+@item
+OLE2 (with libgsf)
+@item
+OGG (with libogg)
+@item
 PNG
 @item
+PS
+@item
+RIFF
+@item
 RPM (using librpm)
+@item
+S3M
+@item
+SID
+@item
+ThumbnailFFMPEG (using libavformat)
+@item
+ThumbnailGtk (using libgtk)
+@item
+TIFF (with libtiff)
+@item
+WAV
+@item
+XM
+@item
+ZIP
 @end itemize
 
 @file{gzip} and @file{bzip2} compressed versions of these formats are 
diff --git a/doc/version.texi b/doc/version.texi
index 09ade0a..b7f4560 100644
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 7 August 2012
+@set UPDATED 26 August 2012
 @set UPDATED-MONTH August 2012
 @set EDITION 0.7.0
 @set VERSION 0.7.0
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1186d38..590aea9 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -20,23 +20,44 @@ src/main/getopt1.c
 src/main/getopt.c
 src/main/iconv.c
 src/main/test2_extractor.c
+src/plugins/archive_extractor.c
 src/plugins/deb_extractor.c
+src/plugins/dvi_extractor.c
 src/plugins/flac_extractor.c
 src/plugins/gif_extractor.c
+src/plugins/gstreamer_extractor.c
+src/plugins/html_extractor.c
 src/plugins/it_extractor.c
 src/plugins/jpeg_extractor.c
+src/plugins/man_extractor.c
+src/plugins/midi_extractor.c
 src/plugins/mime_extractor.c
+src/plugins/mp4_extractor.c
 src/plugins/mpeg_extractor.c
 src/plugins/nsfe_extractor.c
 src/plugins/nsf_extractor.c
 src/plugins/odf_extractor.c
 src/plugins/ogg_extractor.c
+src/plugins/old/applefile_extractor.c
+src/plugins/old/asf_extractor.c
+src/plugins/old/ebml_extractor.c
+src/plugins/old/elf_extractor.c
+src/plugins/old/flv_extractor.c
+src/plugins/old/mkv_extractor.c
+src/plugins/old/mp3_extractor.c
+src/plugins/old/qt_extractor.c
+src/plugins/old/real_extractor.c
 src/plugins/ole2_extractor.c
 src/plugins/png_extractor.c
+src/plugins/ps_extractor.c
+src/plugins/riff_extractor.c
 src/plugins/rpm_extractor.c
 src/plugins/s3m_extractor.c
 src/plugins/sid_extractor.c
 src/plugins/template_extractor.c
+src/plugins/thumbnailffmpeg_extractor.c
+src/plugins/thumbnailgtk_extractor.c
+src/plugins/tiff_extractor.c
 src/plugins/wav_extractor.c
 src/plugins/xm_extractor.c
 src/plugins/zip_extractor.c
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 3bfca47..d55b720 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -110,9 +110,11 @@ TEST_JPEG=test_jpeg
 endif
 
 if HAVE_MP4
+if HAVE_EXPERIMENTAL
 PLUGIN_MP4=libextractor_mp4.la
 TEST_MP4=test_mp4
 endif
+endif
 
 if HAVE_MPEG2
 PLUGIN_MPEG=libextractor_mpeg.la
@@ -230,6 +232,19 @@ libtest_la_LIBADD = \
   $(top_builddir)/src/main/libextractor.la
 
 
+libextractor_archive_la_SOURCES = \
+  archive_extractor.c
+libextractor_archive_la_LDFLAGS = \
+  $(PLUGINFLAGS)
+libextractor_archive_la_LIBADD = \
+  -larchive
+
+test_archive_SOURCES = \
+  test_archive.c
+test_archive_LDADD = \
+  $(top_builddir)/src/plugins/libtest.la
+
+
 libextractor_deb_la_SOURCES = \
   deb_extractor.c
 libextractor_deb_la_LDFLAGS = \
@@ -542,19 +557,6 @@ test_sid_LDADD = \
   $(top_builddir)/src/plugins/libtest.la
 
 
-libextractor_archive_la_SOURCES = \
-  archive_extractor.c
-libextractor_archive_la_LDFLAGS = \
-  $(PLUGINFLAGS)
-libextractor_archive_la_LIBADD = \
-  -larchive
-
-test_archive_SOURCES = \
-  test_archive.c
-test_archive_LDADD = \
-  $(top_builddir)/src/plugins/libtest.la
-
-
 libextractor_thumbnailffmpeg_la_SOURCES = \
   thumbnailffmpeg_extractor.c
 libextractor_thumbnailffmpeg_la_LDFLAGS = \
diff --git a/src/plugins/test_lib.c b/src/plugins/test_lib.c
index df8771a..1dec938 100644
--- a/src/plugins/test_lib.c
+++ b/src/plugins/test_lib.c
@@ -155,10 +155,10 @@ ET_main (const char *plugin_name,
     fprintf (stderr, 
 	     "Failed to update my environment, plugin loading may fail: %s\n",
 	     strerror (errno));    
-  ret = run (plugin_name, ps, EXTRACTOR_OPTION_IN_PROCESS);
+  ret = run (plugin_name, ps, EXTRACTOR_OPTION_DEFAULT_POLICY);
   if (0 != ret)
     return ret;
-  ret = run (plugin_name, ps, EXTRACTOR_OPTION_DEFAULT_POLICY);
+  ret = run (plugin_name, ps, EXTRACTOR_OPTION_IN_PROCESS);
   if (0 != ret)
     return ret;
   return 0;
diff --git a/src/plugins/thumbnailffmpeg_extractor.c b/src/plugins/thumbnailffmpeg_extractor.c
index b742431..9c52242 100644
--- a/src/plugins/thumbnailffmpeg_extractor.c
+++ b/src/plugins/thumbnailffmpeg_extractor.c
@@ -716,6 +716,7 @@ thumbnailffmpeg_lib_init (void)
     }
 }
 
+
 /**
  * Destructor for the library, cleans up.
  */
-- 
cgit v1.2.3