NO Python bindings - ran out of time.

This commit disables parts of the build related to Python
and notes in the README that we didn't have time to finish
Python bindings.

diff --git a/Makefile.am b/Makefile.am
index 16fe5ef..735b844 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,9 +27,10 @@ if HAVE_PERL
 SUBDIRS += perl
 endif
 
-if HAVE_PYTHON
-SUBDIRS += python
-endif
+# Not yet written.
+#if HAVE_PYTHON
+#SUBDIRS += python
+#endif
 
 EXTRA_DIST = hivex.pc hivex.pc.in README LICENSE
 

diff --git a/README b/README
index d7a6caf..ffcbb26 100644 (file)
--- a/README
+++ b/README
@@ -88,8 +88,9 @@ perl/
 
 python/
 
-       Python bindings and tests.  The bindings are generated by
-       'generator/generator.ml'.
+       NOTE: Python bindings are not yet written.  Your patches
+       are welcome (please modify generator/generator.ml to
+       add them).
 
 sh/
 

diff --git a/configure.ac b/configure.ac
index 18cbd90..d5c24a0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -190,54 +190,54 @@ fi
 AM_CONDITIONAL([HAVE_PERL],
     [test "x$PERL" != "xno" -a "x$missing_perl_modules" != "xyes"])
 
-dnl Check for Python (optional, for Python bindings).
-AC_CHECK_PROG([PYTHON],[python],[python],[no])
-
-PYTHON_PREFIX=
-PYTHON_VERSION=
-PYTHON_INCLUDEDIR=
-PYTHON_SITE_PACKAGES=
-
-if test "x$PYTHON" != "xno"; then
-    PYTHON_PREFIX=`$PYTHON -c "import sys; print sys.prefix"`
-    PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[[0:3]]"`
-    for d in \
-        $PYTHON_PREFIX/include/python$PYTHON_VERSION \
-        /usr/include/python$PYTHON_VERSION \
-        /usr/local/include/python$PYTHON_VERSION
-    do
-        AC_MSG_CHECKING([Python.h in $d])
-        if test -r "$d/Python.h"; then
-            AC_MSG_RESULT([found])
-            PYTHON_INCLUDEDIR=$d
-            break
-        fi
-        AC_MSG_RESULT([not found])
-    done
-    for d in \
-        $PYTHON_PREFIX/lib64/python$PYTHON_VERSION/site-packages \
-        $PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages \
-        /usr/lib64/python$PYTHON_VERSION/site-packages \
-        /usr/lib/python$PYTHON_VERSION/site-packages \
-        /usr/local/lib/python$PYTHON_VERSION/site-packages
-    do
-        AC_MSG_CHECKING([for $d])
-        if test -d "$d"; then
-            AC_MSG_RESULT([found])
-            PYTHON_SITE_PACKAGES=$d
-            break
-        fi
-        AC_MSG_RESULT([not found])
-    done
-fi
+dnl dnl Check for Python (optional, for Python bindings).
+dnl AC_CHECK_PROG([PYTHON],[python],[python],[no])
+
+dnl PYTHON_PREFIX=
+dnl PYTHON_VERSION=
+dnl PYTHON_INCLUDEDIR=
+dnl PYTHON_SITE_PACKAGES=
+
+dnl if test "x$PYTHON" != "xno"; then
+dnl     PYTHON_PREFIX=`$PYTHON -c "import sys; print sys.prefix"`
+dnl     PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[[0:3]]"`
+dnl     for d in \
+dnl         $PYTHON_PREFIX/include/python$PYTHON_VERSION \
+dnl         /usr/include/python$PYTHON_VERSION \
+dnl         /usr/local/include/python$PYTHON_VERSION
+dnl     do
+dnl         AC_MSG_CHECKING([Python.h in $d])
+dnl         if test -r "$d/Python.h"; then
+dnl             AC_MSG_RESULT([found])
+dnl             PYTHON_INCLUDEDIR=$d
+dnl             break
+dnl         fi
+dnl         AC_MSG_RESULT([not found])
+dnl     done
+dnl     for d in \
+dnl         $PYTHON_PREFIX/lib64/python$PYTHON_VERSION/site-packages \
+dnl         $PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages \
+dnl         /usr/lib64/python$PYTHON_VERSION/site-packages \
+dnl         /usr/lib/python$PYTHON_VERSION/site-packages \
+dnl         /usr/local/lib/python$PYTHON_VERSION/site-packages
+dnl     do
+dnl         AC_MSG_CHECKING([for $d])
+dnl         if test -d "$d"; then
+dnl             AC_MSG_RESULT([found])
+dnl             PYTHON_SITE_PACKAGES=$d
+dnl             break
+dnl         fi
+dnl         AC_MSG_RESULT([not found])
+dnl     done
+dnl fi
 
-AC_SUBST(PYTHON_PREFIX)
-AC_SUBST(PYTHON_VERSION)
-AC_SUBST(PYTHON_INCLUDEDIR)
-AC_SUBST(PYTHON_SITE_PACKAGES)
+dnl AC_SUBST(PYTHON_PREFIX)
+dnl AC_SUBST(PYTHON_VERSION)
+dnl AC_SUBST(PYTHON_INCLUDEDIR)
+dnl AC_SUBST(PYTHON_SITE_PACKAGES)
 
-AM_CONDITIONAL([HAVE_PYTHON],
-    [test "x$PYTHON_INCLUDEDIR" != "x" -a "x$PYTHON_SITE_PACKAGES" != "x"])
+dnl AM_CONDITIONAL([HAVE_PYTHON],
+dnl     [test "x$PYTHON_INCLUDEDIR" != "x" -a "x$PYTHON_SITE_PACKAGES" != "x"])
 
 dnl dnl Check for Ruby and rake (optional, for Ruby bindings).
 dnl AC_CHECK_LIB([ruby],[ruby_init],[HAVE_LIBRUBY=1],[HAVE_LIBRUBY=0])
@@ -404,7 +404,6 @@ AC_CONFIG_FILES([Makefile
                  ocaml/Makefile ocaml/META
                  perl/Makefile perl/Makefile.PL
                  po/Makefile.in
-                 python/Makefile
                  sh/Makefile
                  xml/Makefile])
 AC_OUTPUT
@@ -421,8 +420,8 @@ echo -n "OCaml bindings ...................... "
 if test "x$HAVE_OCAML_TRUE" = "x"; then echo "yes"; else echo "no"; fi
 echo -n "Perl bindings ....................... "
 if test "x$HAVE_PERL_TRUE" = "x"; then echo "yes"; else echo "no"; fi
-echo -n "Python bindings ..................... "
-if test "x$HAVE_PYTHON_TRUE" = "x"; then echo "yes"; else echo "no"; fi
+dnl echo -n "Python bindings ..................... "
+dnl if test "x$HAVE_PYTHON_TRUE" = "x"; then echo "yes"; else echo "no"; fi
 dnl echo -n "Ruby bindings ....................... "
 dnl if test "x$HAVE_RUBY_TRUE" = "x"; then echo "yes"; else echo "no"; fi
 dnl echo -n "Java bindings ....................... "

diff --git a/generator/generator.ml b/generator/generator.ml
index 830597b..1131f54 100755 (executable)
--- a/generator/generator.ml
+++ b/generator/generator.ml
@@ -2507,8 +2507,11 @@ Run it from the top source directory using the command
   output_to "perl/lib/Win/Hivex.pm" generate_perl_pm;
   output_to "perl/Hivex.xs" generate_perl_xs;
 
+(*
+  We ran out of time before we could write the Python bindings.
   output_to "python/hivex.py" generate_python_py;
   output_to "python/hivex-py.c" generate_python_c;
+*)
 
   (* Always generate this file last, and unconditionally.  It's used
    * by the Makefile to know when we must re-run the generator.

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 31ae02d..9ac55b4 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,6 +4,5 @@ ocaml/hivex_c.c
 perl/Hivex.c
 perl/blib/lib/Win/Hivex.pm
 perl/lib/Win/Hivex.pm
-python/hivex-py.c
 sh/hivexsh.c
 xml/hivexml.c