[luabind-cvs] luabind/luabind/test Jamfile,1.17,1.18 main.cpp,1.35,1.36

[Arvid N. <ar...@us...>]

Update of /cvsroot/luabind/luabind/luabind/test
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv10361/luabind/test

Modified Files:
	Jamfile main.cpp 
Log Message:
Applied patch by Evan Wies to make it work with lua 5.1

Index: main.cpp
===================================================================
RCS file: /cvsroot/luabind/luabind/luabind/test/main.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- main.cpp	15 Apr 2005 13:46:17 -0000	1.35
+++ main.cpp	29 May 2006 18:30:41 -0000	1.36
@@ -52,7 +52,13 @@
     : m_state(lua_open())
 {
     luaopen_base(m_state);
+#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM >= 501
+	 // lua 5.1 or newer
+	 luaL_openlibs(m_state);
+#else
+	 // lua 5.0.2 or older
     lua_baselibopen(m_state);
+#endif
     m_top = lua_gettop(m_state);
     luabind::open(m_state);
 }
@@ -109,12 +115,18 @@
 
 int main()
 {
+	lua_state L;
 	try
 	{
-    	lua_state L;
 		test_main(L);
 		return tests_failure ? 1 : 0;
 	}
+	catch (luabind::error const& e)
+	{
+		std::cerr << "Terminated with exception: \"" << e.what() << "\"\n"
+			<< lua_tostring(e.state(), -1) << "\n";
+		return 1;
+	}
 	catch (std::exception const& e)
 	{
 		std::cerr << "Terminated with exception: \"" << e.what() << "\"\n";

Index: Jamfile
===================================================================
RCS file: /cvsroot/luabind/luabind/luabind/test/Jamfile,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Jamfile	16 Dec 2005 17:50:51 -0000	1.17
+++ Jamfile	29 May 2006 18:30:41 -0000	1.18
@@ -29,7 +29,7 @@
 project : default-build <link>static ;
 
 lib main-lib 
-    : main.cpp /luabind//luabind/<link>static /luabind//lua /luabind//lualib 
+    : main.cpp /luabind//luabind/<link>static /luabind//lua
     : <link>static
     ;