Changeset 2248 for code/branches/buildsystem/src/tolua/lua/package.lua

Timestamp:

Nov 22, 2008, 10:25:45 PM (15 years ago)

Author:

rgrieder

Message:

• Bugfix in tolua.c: Paths like "D:\" weren't considered absolute paths.
• Bugfix in package.lua: Package file's relativity to working directory got forgotten.

File:

• code/branches/buildsystem/src/tolua/lua/package.lua (modified) (1 diff)

code/branches/buildsystem/src/tolua/lua/package.lua

@@ -250 +250 @@
     -- open input file, if any
     if fn then
-        local st, msg = readfrom(flags.f)
+        local file
+        if flags.f then
+            if string.sub(flags.f, 1, 1) == '/' or string.sub(flags.f, 1, 1) == '\\' then
+                file = flags.f
+            else
+                file = flags.w..'/'..flags.f
+            end
+        else
+            file = flags.f
+        end
+        local st, msg = readfrom(file)
         if not st then
-            error('#'..msg)
+            error('#'..msg..' path: '..flags.f)
         end
         local _; _, _, ext = strfind(fn,".*%.(.*)$")