Changeset 2233

Timestamp:

Nov 19, 2008, 8:39:40 PM (16 years ago)

Author:

rgrieder

Message:

Added 'w' argument for tolua. That specifies the working directory when including files in the package.
If 'w' is not specified, the path of the package file is used. And if even that is not given, the application working directory is used.

Location:

code/branches/buildsystem

Files:

• cmake/UseTolua.cmake (modified) (1 diff)
• src/tolua/CMakeLists.txt (modified) (1 diff)
• src/tolua/lua/package.lua (modified) (2 diffs)
• src/tolua/tolua.c (modified) (2 diffs)

code/branches/buildsystem/cmake/UseTolua.cmake

@@ -44 +44 @@
   ADD_CUSTOM_COMMAND(
     OUTPUT "${_tolua_cxxfile}" "${_tolua_hfile}"
-    COMMAND "${TOLUA_EXECUTABLE}" -n "${_tolua_package}" -o "${_tolua_cxxfile}" -H "${_tolua_hfile}" "${_tolua_pkgfile}"
+    COMMAND "${TOLUA_EXECUTABLE}" -n "${_tolua_package}" -w ${CMAKE_CURRENT_SOURCE_DIR} -o "${_tolua_cxxfile}" -H "${_tolua_hfile}" "${_tolua_pkgfile}"
     DEPENDS "${_tolua_executable_name}" ${_tolua_inputfiles}
     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"

code/branches/buildsystem/src/tolua/CMakeLists.txt

@@ -24 +24 @@
 ADD_CUSTOM_COMMAND(
   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/toluabind_orxonox.c
-  COMMAND ${TOLUAGEN_EXE} -n tolua -o ${CMAKE_CURRENT_BINARY_DIR}/toluabind_orxonox.c -H ${CMAKE_CURRENT_BINARY_DIR}/toluabind_orxonox.h ${TOLUA_PACKAGE}
+  COMMAND ${TOLUAGEN_EXE} -n tolua -w ${CMAKE_CURRENT_SOURCE_DIR} -o ${CMAKE_CURRENT_BINARY_DIR}/toluabind_orxonox.c -H ${CMAKE_CURRENT_BINARY_DIR}/toluabind_orxonox.h ${TOLUA_PACKAGE}
   DEPENDS
     toluagen_orxonox

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

@@ -277 +277 @@
     end
 
+    -- prepare working directory
+    local current_path
+    if not flags.w and flags.f then
+        current_path = gsub(flags.f, '(/)[^/]*%.?[^/]*$', '%1')
+    elseif flags.w then
+        if not (string.sub(flags.w, string.len(flags.w)) == '/') then
+            current_path = flags.w..'/'
+        else
+            current_path = flags.w
+        end
+    else
+        current_path = ''
+    end
+
     -- deal with include directive
     local nsubst
@@ -283 +297 @@
             function (kind,fn,extra)
                 local _, _, ext = strfind(fn,".*%.(.*)$")
-                local fp,msg = openfile(fn,'r')
+                local fp,msg = openfile(current_path..fn,'r')
                 if not fp then
                     error('#'..msg..': '..fn)

code/branches/buildsystem/src/tolua/tolua.c

@@ -34 +34 @@
          "  -H  file : create include file.\n"
          "  -n  name : set package name; default is input file root name.\n"
+         "  -w  folder : set working directory; efault is location of package file.\n"
          "  -p       : parse only.\n"
          "  -P       : parse and print structure information (for debug).\n"
@@ -125 +126 @@
      case 'n': setfield(L,t,"n",argv[++i]); break;
      case 'H': setfield(L,t,"H",argv[++i]); break;
+     case 'w': setfield(L,t,"w",argv[++i]); break;
      case 'S': setfield(L,t,"S",""); break;
      case '1': setfield(L,t,"1",""); break;