Changeset 2509 for code/branches/buildsystem2/src/tolua/lua/doit.lua

Timestamp:

Dec 17, 2008, 8:59:48 PM (16 years ago)

Author:

rgrieder

Message:

Merged revisions 1875-2278 of the buildsystem branch to buildsystem2.

Location:

code/branches/buildsystem2

Files:

• . (modified) (2 props)
• src/tolua/lua/doit.lua (modified) (1 diff)

code/branches/buildsystem2/src/tolua/lua/doit.lua

@@ -14 +14 @@
 function parse_extra()
 
-        for k,v in ipairs(_extra_parameters or {}) do
-                
-                local b,e,name,value = string.find(v, "^([^=])=(.*)$")
-                if b then
-                        _extra_parameters[name] = value
-                else
-                        _extra_parameters[v] = true
-                end
-        end
+    for k,v in ipairs(_extra_parameters or {}) do
+        
+        local b,e,name,value = string.find(v, "^([^=])=(.*)$")
+        if b then
+            _extra_parameters[name] = value
+        else
+            _extra_parameters[v] = true
+        end
+    end
 end
 
 function doit ()
-        -- define package name, if not provided
-        if not flags.n then
-                if flags.f then
-                        flags.n = gsub(flags.f,"%..*$","")
-                        _,_,flags.n = string.find(flags.n, "([^/\\]*)$")
-                else
-                        error("#no package name nor input file provided")
-                end
-        end
+    -- define package name, if not provided
+    if not flags.n then
+        if flags.f then
+            flags.n = gsub(flags.f,"%..*$","")
+            _,_,flags.n = string.find(flags.n, "([^/\\]*)$")
+        else
+            error("#no package name nor input file provided")
+        end
+    end
 
-        -- parse table with extra paramters
-        parse_extra()
+    -- parse table with extra paramters
+    parse_extra()
 
-        -- do this after setting the package name
-        if flags['L'] then
-                dofile(flags['L'])
-        end
+    -- get potential working directory
+    if not flags.w then
+        flags.w = ''
+    end
 
-        -- add cppstring
-        if not flags['S'] then
-                _basic['string'] = 'cppstring'
-                _basic['std::string'] = 'cppstring'
-                _basic_ctype.cppstring = 'const char*'
-        end
+    -- do this after setting the package name
+    if flags.L then
+        if string.sub(flags.L, 1, 1) == '/' or string.sub(flags.L, 1, 1) == '\\' then
+            dofile(flags.L)
+        else
+            dofile(flags.w..'/'..flags.L)
+        end
+    end
 
-        -- proccess package
-        local p  = Package(flags.n,flags.f)
+    -- add cppstring
+    if not flags.S then
+        _basic['string'] = 'cppstring'
+        _basic['std::string'] = 'cppstring'
+        _basic_ctype.cppstring = 'const char*'
+    end
 
-        if flags.p then
-                return        -- only parse
-        end
+    -- proccess package
+    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 p  = Package(flags.n, file)
 
-        if flags.o then
-                local st,msg = writeto(flags.o)
-                if not st then
-                        error('#'..msg)
-                end
-        end
+    if flags.p then
+        return        -- only parse
+    end
 
-        p:decltype()
-        if flags.P then
-                p:print()
-        else
-                p:preamble()
-                p:supcode()
-                p:register()
-                push(p)
-                post_output_hook(p)
-                pop()
-        end
+    if flags.o then
+        local file
+        if string.sub(flags.o, 1, 1) == '/' or string.sub(flags.o, 1, 1) == '\\' then
+            file = flags.o
+        else
+            file = flags.w..'/'..flags.o
+        end
+        local st,msg = writeto(file)
+        if not st then
+            error('#'..msg)
+        end
+    end
 
-        if flags.o then
-                writeto()
-        end
+    p:decltype()
+    if flags.P then
+        p:print()
+    else
+        p:preamble()
+        p:supcode()
+        p:register()
+        push(p)
+        post_output_hook(p)
+        pop()
+    end
 
-        -- write header file
-        if not flags.P then
-                if flags.H then
-                        local st,msg = writeto(flags.H)
-                        if not st then
-                                error('#'..msg)
-                        end
-                        p:header()
-                        writeto()
-                end
-        end
+    if flags.o then
+        writeto()
+    end
+
+    -- write header file
+    if not flags.P then
+        if flags.H then
+            local file
+            if string.sub(flags.H, 1, 1) == '/' or string.sub(flags.H, 1, 1) == '\\' then
+                file = flags.H
+            else
+                file = flags.w..'/'..flags.H
+            end
+            local st,msg = writeto(file)
+            if not st then
+                error('#'..msg)
+            end
+            p:header()
+            writeto()
+        end
+    end
 end