Changeset 2234 for code

Timestamp:

Nov 19, 2008, 9:18:42 PM (16 years ago)

Author:

rgrieder

Message:

Modified package.lua to automatically remove all _LibExport macros to avoid class name conflicts.
Also adjusted hacky code in CommandExecutor, Script and GUIManager.

Location:

code/branches/buildsystem/src

Files:

• core/CommandExecutor.h (modified) (1 diff)
• core/Script.h (modified) (1 diff)
• orxonox/gui/GUIManager.h (modified) (1 diff)
• tolua/lua/package.lua (modified) (1 diff)

code/branches/buildsystem/src/core/CommandExecutor.h

@@ -36 +36 @@
 #include "CommandEvaluation.h"
 
-namespace orxonox // tolua_export
-{ // tolua_export
+// tolua_begin
+namespace orxonox
+{
     class _CoreExport CommandExecutor
-    /*
-    class CommandExecutor { // tolua_export
-    */
     {
+// tolua_end
         public:
             static bool execute(const std::string& command, bool useTcl = true); // tolua_export

code/branches/buildsystem/src/core/Script.h

@@ -45 +45 @@
 #include <string>
 
-namespace orxonox // tolua_export
-{ // tolua_export
+// tolua_begin
+namespace orxonox
+{
   class _CoreExport Script
-  /*
-  class Script { // tolua_export
-  */
   {
+// tolua_end
     struct LoadS {
       const char *s;

code/branches/buildsystem/src/orxonox/gui/GUIManager.h

@@ -42 +42 @@
 #include "core/input/InputInterfaces.h"
 
-namespace orxonox // tolua_export
-{ // tolua_export
+// tolua_begin
+namespace orxonox
+{
     /**
     @brief
         Provides a simple interface to CEGUI with tolua methods and console commands
     */
-    class _OrxonoxExport GUIManager : public KeyHandler, public MouseHandler
-    /*
-    class GUIManager { // tolua_export
-    */
-    {
+    class _OrxonoxExport GUIManager
+// tolua_end
+                : public KeyHandler, public MouseHandler
+    { // tolua_export
     public:
         enum State

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

@@ -239 +239 @@
     local code = '\n$#include "'..fn..'"\n'
     s= "\n" .. s .. "\n" -- add blank lines as sentinels
+
+    -- eliminate export macro problems in class declarations
+    s = gsub(s, ' _%w*Export ', ' ')
+
     local _,e,c,t = strfind(s, "\n([^\n]-)[Tt][Oo][Ll][Uu][Aa]_([^%s]*)[^\n]*\n")
     while e do