Changeset 306 for trunk

Timestamp:

04/26/2008 01:08:10 (7 months ago)

Author:

slact

Message:

updated for Lua 5.1, cleaned up the Makefile, added make install

Location:

trunk/ext/lua

Files:

• INSTALL (added)
• Makefile (modified) (2 diffs)
• syck.c (moved) (moved from trunk/ext/lua/lsyck.c)
• test.lua (modified) (2 diffs)
• yaml.lua (modified) (1 diff)

trunk/ext/lua/Makefile

@@ -1 +1 @@
 # change these to reflect your Lua installation
-LUA=/usr/
-LUAINC= $(LUA)/include/lua50
-LUALIB= $(LUA)/lib
-LUABIN= $(LUA)/bin
+# Default installation prefix
+PREFIX=/home/leop/local
+
+# System's libraries directory (where binary libraries are installed)
+LUA_LIBDIR= $(PREFIX)/lib/lua/5.1
+
+# System's lua directory (where Lua libraries are installed)
+LUA_DIR= $(PREFIX)/share/lua/5.1
+
+LUAINC= $(PREFIX)/include
+LUALIB= $(PREFIX)/lib
+LUABIN= $(PREFIX)/bin
 
 CFLAGS= $(INCS) $(WARN)
 WARN= -Wall
 INCS= -I$(LUAINC)
-LIBS=-lsyck
+LIBS=-lsyck -L$(LUALIB)
 
-MYNAME= syck
-MYLIB= l$(MYNAME)
+MYNAME=syck
+OBJS= $(MYNAME).o
+T= $(MYNAME).so
 
-OBJS= $(MYLIB).o
+all:    $T test
 
-T= $(MYLIB).so
+install:
+        cp -f ./syck.so $(LUA_LIBDIR)
+        cp -f ./yaml.lua $(LUA_DIR)
 
-all:    $T
-
-test:   $T
+uninstall:
+        rm -f $(LUA_DIR)/yaml.lua
+        rm -f $(LUA_LIBDIR)/syck.so 
+        
+test: $t
         $(LUABIN)/lua test.lua 
+        @echo "built and tested successfully. run make install to install, or just move the libs manually"
 
 $T:     $(OBJS)
@@ -26 +40 @@
 
 clean:
-        rm -f $(OBJS) $T core core.* a.out
+        rm -f $(OBJS) $T core core.* a.out test.dump
+        
+ready:

trunk/ext/lua/test.lua

@@ -8 +8 @@
 
 function testcase.test_load()
-        assert_error(function() syck.load() end)
-        assert_nil(syck.load("--- "))
-        assert_true(syck.load("--- true"))
-        assert_false(syck.load("--- false"))
-        assert_equal(10, syck.load("--- 10"))
-        local t = syck.load("--- \n- 5\n- 10\n- 15")
+        assert_error(function() yaml.load() end)
+        assert_nil(yaml.load("--- "))
+        assert_true(yaml.load("--- true"))
+        assert_false(yaml.load("--- false"))
+        assert_equal(10, yaml.load("--- 10"))
+        local t = yaml.load("--- \n- 5\n- 10\n- 15")
         assert_equal(5, t[1])
         assert_equal(10, t[2])
         assert_equal(15, t[3])
-        local t = syck.load("--- \n- one\n- two\n- three")
+        local t = yaml.load("--- \n- one\n- two\n- three")
         assert_equal("one", t[1])
         assert_equal("two", t[2])
         assert_equal("three", t[3])
-        local t = syck.load("--- \nthree: 15\ntwo: 10\none: 5")
+        local t = yaml.load("--- \nthree: 15\ntwo: 10\none: 5")
         assert_equal(5, t.one)
         assert_equal(10, t.two)
         assert_equal(15, t.three)
-        local t = syck.load("--- \nints: \n  - 1\n  - 2\n  - 3\nmaps: \n  three: 3\n  two: 2\n  one: 1\nstrings: \n  - one\n  - two\n  - three")
+        local t = yaml.load("--- \nints: \n  - 1\n  - 2\n  - 3\nmaps: \n  three: 3\n  two: 2\n  one: 1\nstrings: \n  - one\n  - two\n  - three")
         assert_equal(1, t.ints[1])
         assert_equal(2, t.ints[2])
@@ -38 +38 @@
 
 function testcase.test_dump()
-        assert_equal("--- \n", syck.dump(nil))
-        assert_equal("--- hey\n", syck.dump("hey"))
-        assert_equal("--- 5\n", syck.dump(5))
-        assert_equal("--- true\n", syck.dump(true))
-        assert_equal("--- false\n", syck.dump(false))
-        assert_equal("--- \n- 5\n- 6\n- 7\n", syck.dump({5, 6, 7}))
+        assert_equal("--- \n", yaml.dump(nil))
+        assert_equal("--- hey\n", yaml.dump("hey"))
+        assert_equal("--- 5\n", yaml.dump(5))
+        assert_equal("--- true\n", yaml.dump(true))
+        assert_equal("--- false\n", yaml.dump(false))
+        assert_equal("--- \n- 5\n- 6\n- 7\n", yaml.dump({5, 6, 7}))
 
         local str = "--- \n- \n  - 1\n  - 2\n  - 3\n- \n  - 6\n  - 7\n  - 8\n"
-        assert_equal(str, syck.dump({{1, 2, 3}, {6, 7, 8}}))
+        assert_equal(str, yaml.dump({{1, 2, 3}, {6, 7, 8}}))
         local str = "--- \n- \n  - 1\n  - 2\n  - 3\n- \n  - one\n  - two\n  - three\n"
-        assert_equal(str, syck.dump({{1, 2, 3}, {"one", "two", "three"}}))
+        assert_equal(str, yaml.dump({{1, 2, 3}, {"one", "two", "three"}}))
 
         local str = "--- \none: 1\nthree: 3\ntwo: 2\n"
-        assert_equal(str, syck.dump({one=1, two=2, three=3}))
+        assert_equal(str, yaml.dump({one=1, two=2, three=3}))
 end
 

trunk/ext/lua/yaml.lua

@@ -1 +1 @@
 -- borrow from lposix
 --
-local function so(x)
-        local SOPATH= os.getenv"LUA_SOPATH" or "./"
-        assert(loadlib(SOPATH.."l"..x..".so","luaopen_"..x))()
-end
-
-so"syck"
+require "syck"
 
 yaml = {}