Changeset 1000

Timestamp:

21/06/08 11:50:37 (4 years ago)

Author:

Freddie Akeroyd

Message:

Add new python bindings to configure. Refs #101.

Location:

trunk

Files:

• bindings/Makefile.am (modified) (1 diff)
• bindings/python/Makefile.am (added)
• bindings/swig/Makefile.am (modified) (2 diffs)
• bindings/swig/nxpython.py (deleted)
• bindings/swig/nxpython_test.py (deleted)
• configure.ac (modified) (4 diffs)

trunk/bindings/Makefile.am

@@ -42 +42 @@
 IDLSUB = idl
 endif
-SUBDIRS = $(F77SUB) $(F90SUB) $(JAVASUB) $(SWIGSUB) $(IDLSUB)
+if HAVE_PYTHON
+PYSUB = python
+endif
+SUBDIRS = $(F77SUB) $(F90SUB) $(JAVASUB) $(SWIGSUB) $(IDLSUB) $(PYSUB)

trunk/bindings/swig/Makefile.am

@@ -30 +30 @@
 AM_CPPFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/src
 lib_LTLIBRARIES=$(LIBNXTCL) $(LIBNXSCHEME) $(LIBNXGUILE) # $(LIBNXPERL)
-python_LTLIBRARIES=$(LIBNXPYTHON)
 bin_PROGRAMS=$(NXINTER) $(NXGUILE)
 
-# python wrapper
-if HAVE_SWIG
-if HAVE_PYTHON
-NXPYTHONWRAP=nxpython.py
-nodist_python_PYTHON=$(NXPYTHONWRAP)
-LIBNXPYTHON=libnxpython.la
-libnxpython_la_SOURCES=$(COMMON_SRC)
-nodist_libnxpython_la_SOURCES=$(PYTHONWRAP)
-libnxpython_la_CFLAGS=-I$(PYTHONROOT)/include/python$(PYTHON_VERSION) -I$(PYTHONROOT)/include $(CFLAGS)
-libnxpython_la_LDFLAGS=-L$(PYTHONROOT)/lib/python$(PYTHON_VERSION)/config -lpython$(PYTHON_VERSION) $(top_builddir)/src/libNeXus.la @SHARED_LDFLAGS@ $(LDFLAGS)
-PYTHONWRAP=nxpython_wrap.c
-endif
-nxpython_wrap.c: nxinter.i nxdataset.i
-        $(SWIG) -I$(srcdir) -o $@ -python -module nxpython -interface libnxpython nxinter.i 
-endif
+# old python wrapper
+#python_LTLIBRARIES=$(LIBNXPYTHON)
+#if HAVE_SWIG
+#if HAVE_PYTHON
+#NXPYTHONWRAP=nxpython.py
+#nodist_python_PYTHON=$(NXPYTHONWRAP)
+#LIBNXPYTHON=libnxpython.la
+#libnxpython_la_SOURCES=$(COMMON_SRC)
+#nodist_libnxpython_la_SOURCES=$(PYTHONWRAP)
+#libnxpython_la_CFLAGS=-I$(PYTHONROOT)/include/python$(PYTHON_VERSION) -I$(PYTHONROOT)/include $(CFLAGS)
+#libnxpython_la_LDFLAGS=-L$(PYTHONROOT)/lib/python$(PYTHON_VERSION)/config -lpython$(PYTHON_VERSION) $(top_builddir)/src/libNeXus.la @SHARED_LDFLAGS@ $(LDFLAGS)
+#PYTHONWRAP=nxpython_wrap.c
+#endif
+#nxpython_wrap.c: nxinter.i nxdataset.i
+#       $(SWIG) -I$(srcdir) -o $@ -python -module nxpython -interface libnxpython nxinter.i 
+#endif
 
 # perl wrapper (not working yet)
@@ -133 +133 @@
 swigdoc_DATA    = $(DOC_OUTPUT)
 
-EXAMPLE_FILES = nxdstest.tcl nxexam.tcl nxpython_test.py nxintertest.tcl
+EXAMPLE_FILES = nxdstest.tcl nxexam.tcl nxintertest.tcl
 swigexampledir  = $(NXEXAMPLEDIR)/swig
 swigexample_DATA = $(EXAMPLE_FILES)

trunk/configure.ac

@@ -221 +221 @@
 
 AC_ARG_WITH([swig], AC_HELP_STRING([--with-swig=swig compiler], [Specify path of swig compiler]), [with_swig=$withval], [with_swig=])
-if test x$with_python != xno -o x$with_tcl != xno -o x$with_guile != xno; then
+if test x$with_tcl != xno -o x$with_guile != xno; then
     if test x$with_swig != xyes; then
         SWIG=$with_swig
@@ -617 +617 @@
                 bindings/swig/Makefile
                 bindings/idl/Makefile
+                bindings/python/Makefile
                 contrib/Makefile
                 contrib/applications/Makefile
@@ -634 +635 @@
 JAVABINDING=`if test -n "$JAVAC" ; then echo yes ; else echo no ; fi` 
 IDLBINDING=`if test -n "$IDLROOT" ; then echo yes ; else echo no ; fi` 
+PYTHONBINDING=`if test -n "$PYTHONROOT" ; then echo yes ; else echo no ; fi` 
 if test -n "$SWIG" ; then 
     SWIGBINDING="yes ("
     test -n "$TCLROOT" && SWIGBINDING="$SWIGBINDING tcl"
     test -n "$GUILEROOT" && SWIGBINDING="$SWIGBINDING guile"
-    test -n "$PYTHONROOT" && SWIGBINDING="$SWIGBINDING python"
     SWIGBINDING="$SWIGBINDING ) SWIG=${SWIG}"
 else
@@ -666 +667 @@
                 JAVA:          ${JAVABINDING} (--with-java-home=${javaroot}, JAVA=${JAVA}, JAVAC=${JAVAC}, JAVAH=${JAVAH})
                 SWIG:          ${SWIGBINDING}
-                IDL:           ${IDLBINDING} (--with-idlroot=${IDLROOT})
+                 IDL:          ${IDLBINDING} (--with-idlroot=${IDLROOT})
+              PYTHON:          ${PYTHONBINDING}
 
 Please check whether the configuration I detected matches what you would