fix for swig-1.3.26, add lua support

diff --git a/graphviz.spec.in b/graphviz.spec.in
index 36594b9a434d135e5b24b705df31177bbfd698d6..09690ed8b6d2561aadacdf6d067cea22bf072a0b 100644 (file)
--- a/graphviz.spec.in
+++ b/graphviz.spec.in
@@ -54,6 +54,7 @@
 %{?fc5: %{expand: %%define CSHARP  1}}
 %{?fc5: %{expand: %%define GUILE   1}}
 %{?fc5: %{expand: %%define JAVA    1}}
+%{?fc5: %{expand: %%define LUA     1}}
 %{?fc5: %{expand: %%define OCAML   1}}
 %{?fc5: %{expand: %%define PERL    1}}
 %{?fc5: %{expand: %%define PHP     1}}

diff --git a/tclpkg/gv/Makefile.am b/tclpkg/gv/Makefile.am
index 5087c4bdcd3196ae7afaf5be16e3acc9559f6136..4b1a1d1f8b437bab8aecb9897ace195203e06b2c 100644 (file)
--- a/tclpkg/gv/Makefile.am
+++ b/tclpkg/gv/Makefile.am
@@ -48,13 +48,13 @@ libgv_java_la_LDFLAGS = -module
 gv_java.cpp $(JAVA_hdr): gv.i
        $(SWIG) -c++ -java -o gv_java.cpp gv.i
 
-#pkgluadir = $(pkglibdir)/lua
-#LUA_hdr = 
-#libgv_lua_la_SOURCES = $(BASESOURCES) gv_lua.cpp $(LUA_hdr)
-#libgv_lua_la_LIBADD = $(BASELIBS) @LUA_LIBS@
-#libgv_lua_la_LDFLAGS = -module
-#gv_lua.cpp $(LUA_hdr): gv.i
-#      $(SWIG) -c++ -lua -o gv_lua.cpp gv.i
+pkgluadir = $(pkglibdir)/lua
+LUA_hdr = 
+libgv_lua_la_SOURCES = $(BASESOURCES) gv_lua.cpp $(LUA_hdr)
+libgv_lua_la_LIBADD = $(BASELIBS) @LUA_LIBS@
+libgv_lua_la_LDFLAGS = -module
+gv_lua.cpp $(LUA_hdr): gv.i
+       $(SWIG) -c++ -lua -o gv_lua.cpp gv.i
 
 pkgocamldir = $(pkglibdir)/ocaml
 OCAML_hdr = gv.ml gv.mli
@@ -127,11 +127,11 @@ pkgjava_DATA = $(JAVA_hdr)
 pkgjava_LTLIBRARIES = libgv_java.la
 TESTS += test_java
 endif
-#if WITH_LUA
-#pkglua_DATA += $(LUA_hdr)
-#pkglua_LTLIBRARIES += libgv_lua.la
-#TESTS += test_lua
-#endif
+if WITH_LUA
+pkglua_DATA = $(LUA_hdr)
+pkglua_LTLIBRARIES = libgv_lua.la
+TESTS += test_lua
+endif
 if WITH_OCAML
 pkgocaml_DATA = $(OCAML_hdr)
 pkgocaml_LTLIBRARIES = libgv_ocaml.la
@@ -253,26 +253,6 @@ test_tcl: libgv_tcl.la
 
 EXTRA_DIST = demo/* gv.cpp gv.i
 
-#EXTRA_DIST = demo/* gv.cpp gv.i \
-#      gv_csharp.cpp $(CSHARP_hdr) \
-#      gv_guile.cpp $(GUILE_hdr) \
-#      gv_java.cpp $(JAVA_hdr) \
-#      gv_ocaml.cpp $(OCAML_hdr) \
-#      gv_perl.cpp $(PERL_hdr) \
-#      gv_php.cpp $(PHP_hdr) \
-#      gv_python.cpp $(PYTHON_hdr) \
-#      gv_ruby.cpp $(RUBY_hdr) \
-#      gv_tcl.cpp $(TCL_hdr)
-
-#      gv_io.cpp $(IO_hdr) \
-#      gv_lua.cpp $(LUA_hdr) \
-#
-
-#CLEANFILES = test_*/*
-
-#DISTCLEANFILES = \
-#
-
 CLEANFILES = test_*/* \
        gv_csharp.cpp $(CSHARP_hdr) \
        gv_guile.cpp $(GUILE_hdr) \

diff --git a/tclpkg/gv/gv.i b/tclpkg/gv/gv.i
index 25da815f12c43e0ae4f072af184230b271027c05..5f79fb112503033493ff03683c303922bde23022 100644 (file)
--- a/tclpkg/gv/gv.i
+++ b/tclpkg/gv/gv.i
@@ -19,6 +19,7 @@
 #include "gvc.h"
 %}
 
+%inline %{
 /* new graph objects */
 extern Agraph_t *graph(char *name);            /* new empty graph */
 extern Agraph_t *digraph(char *name);          /* new empty digraph */
@@ -145,3 +146,4 @@ extern void render(Agraph_t *g, char *format);
 extern void render(Agraph_t *g, char *format, char *filename);
 extern void render(Agraph_t *g, char *format, FILE *f);
 extern void render(Agraph_t *g, char *format, void **data);
+%}

diff --git a/tclpkg/gv/test.lua b/tclpkg/gv/test.lua
new file mode 100644 (file)
index 0000000..74a3b97
--- /dev/null
+++ b/tclpkg/gv/test.lua
@@ -0,0 +1,28 @@
+#!/usr/bin/lua
+
+-- import gv
+-- 
+-- g = gv.digraph("G")
+-- print gv.setv(g,"aaa","xxx")
+-- print gv.getv(g,"aaa")
+-- n = gv.node(g,"hello")
+-- print gv.getv(n,"label")
+-- print gv.setv(n,"aaa","xxx")
+-- print gv.getv(n,"aaa")
+-- m = gv.node(g,"world")
+-- print gv.getv(m,"aaa")
+-- e = gv.edge(n,m)
+-- print gv.setv(e,"aaa","xxx")
+-- print gv.getv(e,"aaa")
+-- gv.rm(e)
+-- gv.rm(m)
+-- gv.rm(n)
+-- gv.rm(g)
+-- 
+-- g = gv.readstring("digraph G {a->b}")
+-- gv.rm(g)
+-- 
+-- g = gv.read("hello.dot")
+-- gv.layout(g, "dot")
+-- gv.render(g, "png", "hello.png")
+-- gv.rm(g)