Merge lp:~michel-slm/lunatic-python/trunk into lp:lunatic-python

[Michel Lind]

[Michel Lind (michel-slm)]

I created two separate changes, and committed them separately for easy merging:
revno 8: make setup.py use pkg-config. I defaulted to using lua.pc, as that is the upstream name,
  but this is overridden by setting the environment variable LUAPCNAME
revno 9: switch fully to the Lua 5.1 API; drop lua_open.

Looks like some other branches have diverged even further; I will look into what they are doing next. Would be nice to merge in some lunit tests.

[lp:~michel-slm/lunatic-python/trunk]

10. By Michel Lind on 2011-03-30

Merge niemeyer's revision 8: fix number conversion

[Gustavo Niemeyer (niemeyer)]

Thanks for the changes. The modifications about lua_open look good.

The changes to use pkg-config add boilerplate and in the end
turn setup.py into something that actually doesn't work out of
the box unless an environment variable is set.

I'm happy to integrate the former, but I'd like to keep the
latter simple as it currently is if you don't mind.

Can you please separate it out?

review: Needs Fixing

Unmerged revisions

10. By Michel Lind on 2011-03-30

Merge niemeyer's revision 8: fix number conversion

9. By Michel Lind on 2009-09-18

luainpython.c:
  fully switch to Lua 5.1 API; drop deprecated lua_open

8. By Michel Lind on 2009-09-18

setup.py:
  use pkg-config to discover Lua installation if possible
  fallback to upstream Lua's defaults
.bzrignore:
  ignore build directory and common temporary files

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2011-03-30 23:06:50 +0000
@@ -0,0 +1,3 @@
+./build
+*#*#
+*~

=== modified file 'setup.py'
--- setup.py	2008-05-28 15:48:32 +0000
+++ setup.py	2011-03-30 23:06:50 +0000
@@ -1,8 +1,8 @@
 #!/usr/bin/python
 from distutils.core import setup, Extension
 from distutils.sysconfig import get_python_lib, get_python_version
-import glob
 import os
+import commands
 
 if os.path.isfile("MANIFEST"):
     os.unlink("MANIFEST")
@@ -10,10 +10,21 @@
 # You may have to change these
 PYLIBS = ["python"+get_python_version(), "pthread", "util"]
 PYLIBDIR = [get_python_lib(standard_lib=True)+"/config"]
-#LUALIBS = ["lua", "lualib"]
-LUALIBS = ["lua5.1"]
+LUAPCNAME = os.getenv("LUAPCNAME")
+LUALIBS=["lua"]
 LUALIBDIR = []
-LUAINCDIR = glob.glob("/usr/include/lua*")
+LUAINCDIR=["/usr/include"]
+if not LUAPCNAME:
+    PKGBASE='pkg-config lua '
+else:
+    PKGBASE='pkg-config %s ' % (LUAPCNAME,)
+status, output = commands.getstatusoutput(PKGBASE + '--exists')
+if status == 0:
+    LUALIBS = [os.popen(PKGBASE + '--libs').readline().split()[0][2:]]
+    LUALIBDIR = [os.popen(PKGBASE + '--variable=libdir').readline().strip()]
+    LUAINCDIR = [os.popen(PKGBASE + '--variable=includedir').readline().strip()]
+else:
+    print "*** WARN *** lua .pc file not found -- using defaults"
 
 setup(name="lunatic-python",
       version = "1.0",

=== modified file 'src/luainpython.c'
--- src/luainpython.c	2010-03-29 21:13:32 +0000
+++ src/luainpython.c	2011-03-30 23:06:50 +0000
@@ -486,10 +486,9 @@
 	m = Py_InitModule("lua", lua_methods);
 
 	if (!L) {
-		L = lua_open();
-		luaopen_base(L);
+		L = luaL_newstate();
+		luaL_openlibs(L);
 		luaopen_python(L);
-		luaL_openlibs(L);
 		lua_settop(L, 0);
 	}
 }