Changeset 2236 for code/branches/buildsystem/src/tolua/tolua.c

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

File:

• code/branches/buildsystem/src/tolua/tolua.c (modified) (5 diffs)

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

@@ -5 +5 @@
 ** Aug 2003
 ** $Id:$
+** Extension by Orxonox (Reto Grieder) to support working directory
+** and direct usage of lua files. (2008)
 */
 
@@ -34 +36 @@
          "  -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"
+         "  -w  directory : set working directory; default is location of package file.\n"
+         "  -s  file : specify source lua code for the parser; all.lua is default.\n"
          "  -p       : parse only.\n"
          "  -P       : parse and print structure information (for debug).\n"
@@ -99 +102 @@
  lua_pushstring(L,LUA_VERSION); lua_setglobal(L,"TOLUA_LUA_VERSION");
 
+ char* working_directory = "";
+ char* lua_source = "";
+
  if (argc==1)
  {
@@ -126 +132 @@
      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 'w':
+      working_directory = argv[++i];
+      setfield(L,t,"w",argv[i]);
+      break;
+     case 's':
+      lua_source = argv[++i];
+      setfield(L,t,"s",argv[i]);
+      break;
      case 'S': setfield(L,t,"S",""); break;
      case '1': setfield(L,t,"1",""); break;
@@ -146 +159 @@
   lua_pop(L,1);
  }
-/* #define TOLUA_SCRIPT_RUN */
-#ifndef TOLUA_SCRIPT_RUN
+
  {
-  int tolua_tolua_open (lua_State* L);
-  tolua_tolua_open(L);
+  char path[BUFSIZ];
+  char file[BUFSIZ];
+
+  if (lua_source[0] == '/' || lua_source[0] == '\\')
+  {
+   strcpy(path, lua_source);
+   char* p = strrchr(path, '/');
+   if (p == NULL)
+    p = strrchr(path, '\\');
+   p = (p == NULL) ? path : p + 1;
+   strcpy(file, p);
+   *p = '\0';
+  }
+  else
+  {
+   strcpy(path, working_directory);
+   strcpy(file, "all.lua");
+
+   if (strlen(path) > 0)
+   {
+    char last = path[strlen(path) - 1];
+    if (last != '\\' && last != '/')
+     strcat(path, "/");
+   }
+  }
+
+  lua_pushstring(L, path);
+  lua_setglobal(L, "path");
+  strcat(path, file);
+  lua_dofile(L, path);
  }
-#else
- {
-  char* p;
-  char  path[BUFSIZ];
-  strcpy(path,argv[0]);
-  p = strrchr(path,'/');
-  if (p==NULL) p = strrchr(path,'\\');
-  p = (p==NULL) ? path : p+1;
-  sprintf(p,"%s","../src/bin/lua/");
-  lua_pushstring(L,path); lua_setglobal(L,"path");
-                strcat(path,"all.lua");
-  lua_dofile(L,path);
- }
-#endif
  return 0;
 }