Changeset 2236 for code/branches/buildsystem/src/tolua/lua

Timestamp:

Nov 20, 2008, 8:51:44 PM (16 years ago)

Author:

rgrieder

Message:

• Changed working directory for tolua generator to library_output_path. That resolves windows issues with dlls.
• Removed the need to create a second tolua application. There is only one now called toluaexe_orxonox.
• 'w' (working directory) option of tolua extends to -L, pkg-file, -o and -H if of course -w is present
• 's' option added to tolua: Tells which file contains the bindfile generator. In our case this is src/tolua/all.lua all.lua replaces tolua-5.1.pkg. We can still choose that file from CMake (TOLUA_PARSER_SOURCE)
• Generator dependencies are declared in src/tolua/CMakeLists.txt and used in UseTolua.cmake (PARENT_SCOPE)
• Fixed a bug when writing the header file inclusion in package.lua

Location:

code/branches/buildsystem/src/tolua/lua

Files:

• doit.lua (modified) (4 diffs)
• package.lua (modified) (2 diffs)

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

@@ -39 +39 @@
     parse_extra()
 
+    -- get potential working directory
+    if not flags.w then
+        flags.w = ''
+    end
+
     -- do this after setting the package name
-    if flags['L'] then
-        dofile(flags['L'])
+    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
 
     -- add cppstring
-    if not flags['S'] then
+    if not flags.S then
         _basic['string'] = 'cppstring'
         _basic['std::string'] = 'cppstring'
@@ -52 +61 @@
 
     -- proccess package
-    local p  = Package(flags.n,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 p  = Package(flags.n, file)
 
     if flags.p then
@@ -59 +78 @@
 
     if flags.o then
-        local st,msg = writeto(flags.o)
+            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)
@@ -84 +109 @@
     if not flags.P then
         if flags.H then
-            local st,msg = writeto(flags.H)
+                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)

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

@@ -124 +124 @@
     output('#endif\n')
     output('#include "string.h"\n\n')
-    output('#include "tolua/tolua++.h"\n\n')
-
-    if not flags.h then
-        --  local temp = string.reverse(flags.H)
-        --  local start1, end1 = string.find(temp, '/')
-        --  local start2, end2 = string.find(temp, '\\')
-        --  local res
-        --  if not start1 == nil then
-        --   if not start2 == nil then
-        --    if start1 > start2 then
-        --     res = string.sub(temp, 1, start2)
-        --    else
-        --     res = string.sub(temp, 1, start1)
-        --    end
-        --   else
-        --    res = string.sub(temp, 1, start1)
-        --   end
-        --  elseif not start2 == nil then
-        --   res = string.sub(temp, 1, start2)
-        --  end
-        --  res = string.reverse(res)
-        output('#include "tolua_bind.h"')
-        output('\n')
+    output('#include "tolua++.h"\n\n')
+
+    if flags.H then
+        local header = gsub(flags.H, '^.-([%w_]*%.[%w_]*)$', '%1')
+        output('#include "'..header..'"\n')
     end
 
@@ -220 +202 @@
     output('*/\n\n')
 
-    if not flags.h then
+    if flags.H then
         output('#include "'..self.name..'Prereqs.h"\n')
         output('/* Exported function */')
-        output('_'..self.name..'Export int  tolua_'..self.name..'_open (lua_State* tolua_S);')
+        output('_'..self.name..'Export')
+        output('int  tolua_'..self.name..'_open (lua_State* tolua_S);')
         output('\n')
     end