[Wxlua-commit] wxLua/bindings/wxlua wxlua_rules.lua,1.4,1.5

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/wxlua/wxLua/bindings/wxlua
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8389/wxLua/bindings/wxlua

Modified Files:
	wxlua_rules.lua 
Log Message:
FIX mistake in making wxLuaState::LuaPCall() clear the stack.
Cleanup to the *.i files, add output_single_cpp_binding_file to have only one cpp file generated.
Add wxFileSystem and it's handlers.

Index: wxlua_rules.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxlua/wxlua_rules.lua,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wxlua_rules.lua	25 Jan 2008 23:50:47 -0000	1.4
--- wxlua_rules.lua	29 Jan 2008 00:49:10 -0000	1.5
***************
*** 1,26 ****
! -------------------------------------------------------------------------------
  -- Rules to build the wxLua binding for wxLua
  --  load using : $lua -e"rulesFilename=\"rules.lua\"" genwxbind.lua
! -------------------------------------------------------------------------------

! -------------------------------------------------------------------------------
  -- Set the root directory of the wxLua distribution, used only in this file
  wxlua_dir = "../"

! --=============================================================================
! -- Set the lua namespace (lua table) that the bindings will be placed into.
! --   eg. wx.wxWindow(...)
  hook_lua_namespace = "wxlua"

! -- Set the C++ "namespace" that the bindings will be placed.
! --   i.e. cpp function names contain this to prevent duplicate function names
  hook_cpp_namespace = "wxlua"

! --=============================================================================
  -- Set the directory to output the bindings to, both C++ header and source files
  output_cpp_header_filepath = wxlua_dir.."modules/wxlua/include"
  output_cpp_filepath        = wxlua_dir.."modules/wxlua/src"

! --=============================================================================
  -- Set the DLLIMPEXP macros for compiling these bindings into a DLL
  --  Use "WXLUA_NO_DLLIMPEXP" and "WXLUA_NO_DLLIMPEXP_DATA" for no IMPEXP macros
--- 1,27 ----
! -- ----------------------------------------------------------------------------
  -- Rules to build the wxLua binding for wxLua
  --  load using : $lua -e"rulesFilename=\"rules.lua\"" genwxbind.lua
! -- ----------------------------------------------------------------------------

! -- ----------------------------------------------------------------------------
  -- Set the root directory of the wxLua distribution, used only in this file
  wxlua_dir = "../"

! -- ============================================================================
! -- Set the Lua namespace (Lua table) that the bindings will be placed into.
! --   See wxLuaBinding::GetLuaNamespace(); eg. wx.wxWindow(...)
  hook_lua_namespace = "wxlua"

! -- Set the unique C++ "namespace" for the bindings, not a real namespace, but
! --   a string used in declared C++ objects to prevent duplicate names.
! --   See wxLuaBinding::GetBindingName().
  hook_cpp_namespace = "wxlua"

! -- ============================================================================
  -- Set the directory to output the bindings to, both C++ header and source files
  output_cpp_header_filepath = wxlua_dir.."modules/wxlua/include"
  output_cpp_filepath        = wxlua_dir.."modules/wxlua/src"

! -- ============================================================================
  -- Set the DLLIMPEXP macros for compiling these bindings into a DLL
  --  Use "WXLUA_NO_DLLIMPEXP" and "WXLUA_NO_DLLIMPEXP_DATA" for no IMPEXP macros
***************
*** 29,33 ****
  output_cpp_impexpdatasymbol = "WXDLLIMPEXP_DATA_WXLUA"

! -------------------------------------------------------------------------------
  -- Set the name of the header file that will have the #includes from the
  --   bindings in it. This will be used as #include "hook_cpp_header_filename" in
--- 30,34 ----
  output_cpp_impexpdatasymbol = "WXDLLIMPEXP_DATA_WXLUA"

! -- ----------------------------------------------------------------------------
  -- Set the name of the header file that will have the #includes from the
  --   bindings in it. This will be used as #include "hook_cpp_header_filename" in
***************
*** 35,39 ****
  hook_cpp_header_filename = "wxlua/include/"..hook_cpp_namespace.."_bind.h"

! -------------------------------------------------------------------------------
  -- Set the name of the main binding file that will have the glue code for the
  --   bindings in it. This file along with the output from the *.i files will be
--- 36,40 ----
  hook_cpp_header_filename = "wxlua/include/"..hook_cpp_namespace.."_bind.h"

! -- ----------------------------------------------------------------------------
  -- Set the name of the main binding file that will have the glue code for the
  --   bindings in it. This file along with the output from the *.i files will be
***************
*** 41,49 ****
  hook_cpp_binding_filename = hook_cpp_namespace.."_bind.cpp"

! -------------------------------------------------------------------------------
  -- Set the name of the subclassed wxLuaBinding class
  hook_cpp_binding_classname = "wxLuaBinding_"..hook_cpp_namespace

! -------------------------------------------------------------------------------
  -- Set the function names that wrap the output structs of defined values,
  --   objects, events, functions, and classes.
--- 42,56 ----
  hook_cpp_binding_filename = hook_cpp_namespace.."_bind.cpp"

! -- ----------------------------------------------------------------------------
! -- Generate only a single output C++ binding source file with the name of
! --   hook_cpp_binding_filename, as opposed to generating a single cpp file
! --   for each *.i file plus the hook_cpp_binding_filename file.
! output_single_cpp_binding_file = false
! 
! -- ----------------------------------------------------------------------------
  -- Set the name of the subclassed wxLuaBinding class
  hook_cpp_binding_classname = "wxLuaBinding_"..hook_cpp_namespace

! -- ----------------------------------------------------------------------------
  -- Set the function names that wrap the output structs of defined values,
  --   objects, events, functions, and classes.
***************
*** 55,64 ****
  hook_cpp_class_funcname    = "wxLuaGetClassList_"..hook_cpp_namespace

! -------------------------------------------------------------------------------
  -- Set any #includes or other C++ code to be placed verbatim at the top of
  --   every generated cpp file or "" for none
  hook_cpp_binding_includes = ""

! -------------------------------------------------------------------------------
  -- Set any #includes or other C++ code to be placed verbatim below the
  --   #includes of every generated cpp file or "" for none
--- 62,71 ----
  hook_cpp_class_funcname    = "wxLuaGetClassList_"..hook_cpp_namespace

! -- ----------------------------------------------------------------------------
  -- Set any #includes or other C++ code to be placed verbatim at the top of
  --   every generated cpp file or "" for none
  hook_cpp_binding_includes = ""

! -- ----------------------------------------------------------------------------
  -- Set any #includes or other C++ code to be placed verbatim below the
  --   #includes of every generated cpp file or "" for none
***************
*** 68,72 ****
  "#ifdef Below\n    #undef Below\n#endif\n"

! -------------------------------------------------------------------------------
  -- Add additional include information or C++ code for the binding header file,
  --  hook_cpp_header_filename.
--- 75,79 ----
  "#ifdef Below\n    #undef Below\n#endif\n"

! -- ----------------------------------------------------------------------------
  -- Add additional include information or C++ code for the binding header file,
  --  hook_cpp_header_filename.
***************
*** 74,87 ****
  --hook_cpp_binding_header_includes =

! -------------------------------------------------------------------------------
  -- Set any #includes or other C++ code to be placed verbatim at the top of
  --   the single hook_cpp_binding_filename generated cpp file or "" for none
  hook_cpp_binding_source_includes = nil

! --=============================================================================
  -- Set the bindings directory that contains the *.i interface files
  interface_filepath = wxlua_dir.."bindings/wxlua"

! -------------------------------------------------------------------------------
  -- A list of interface files to use to make the bindings. These files will be
  --   converted into *.cpp and placed in the output_cpp_filepath directory.
--- 81,94 ----
  --hook_cpp_binding_header_includes =

! -- ----------------------------------------------------------------------------
  -- Set any #includes or other C++ code to be placed verbatim at the top of
  --   the single hook_cpp_binding_filename generated cpp file or "" for none
  hook_cpp_binding_source_includes = nil

! -- ============================================================================
  -- Set the bindings directory that contains the *.i interface files
  interface_filepath = wxlua_dir.."bindings/wxlua"

! -- ----------------------------------------------------------------------------
  -- A list of interface files to use to make the bindings. These files will be
  --   converted into *.cpp and placed in the output_cpp_filepath directory.
***************
*** 92,96 ****
  }

! -------------------------------------------------------------------------------
  -- A list of files that contain bindings that need to be overridden or empty
  --   table {} for none.
--- 99,103 ----
  }

! -- ----------------------------------------------------------------------------
  -- A list of files that contain bindings that need to be overridden or empty
  --   table {} for none.
***************
*** 98,102 ****
  override_fileTable = { "override.hpp" }

! --=============================================================================
  -- A table containing filenames of XXX_datatype.lua from other wrappers to
  --  to define classes and data types used in this wrapper
--- 105,109 ----
  override_fileTable = { "override.hpp" }

! -- ============================================================================
  -- A table containing filenames of XXX_datatype.lua from other wrappers to
  --  to define classes and data types used in this wrapper
***************
*** 108,112 ****
  datatype_cache_input_fileTable = { wxlua_dir.."bindings/wxwidgets/wxbase_datatypes.lua" }

! -------------------------------------------------------------------------------
  -- The file to output the data type cache for later use with a binding that
  --   makes use of data types (classes, enums, etc) that are declared in this
--- 115,119 ----
  datatype_cache_input_fileTable = { wxlua_dir.."bindings/wxwidgets/wxbase_datatypes.lua" }

! -- ----------------------------------------------------------------------------
  -- The file to output the data type cache for later use with a binding that
  --   makes use of data types (classes, enums, etc) that are declared in this
***************
*** 115,119 ****
  datatypes_cache_output_filename = hook_cpp_namespace.."_datatypes.lua"

! --=============================================================================
  -- Declare functions or member variables for the derived wxLuaBinding class
  --   that will be generated for this binding. The string will be copied verbatim
--- 122,126 ----
  datatypes_cache_output_filename = hook_cpp_namespace.."_datatypes.lua"

! -- ============================================================================
  -- Declare functions or member variables for the derived wxLuaBinding class
  --   that will be generated for this binding. The string will be copied verbatim
***************
*** 127,131 ****
  ]]

! -------------------------------------------------------------------------------
  -- Implement the functions or member variables for the derived wxLuaBinding
  --   class that you have declared. The string will be copied into the
--- 134,138 ----
  ]]

! -- ----------------------------------------------------------------------------
  -- Implement the functions or member variables for the derived wxLuaBinding
  --   class that you have declared. The string will be copied into the
***************
*** 149,161 ****
  ]]

! --=============================================================================
  -- Add additional conditions here
  -- example: conditions["DOXYGEN_INCLUDE"] = "defined(DOXYGEN_INCLUDE)"

! -------------------------------------------------------------------------------
  -- Add additional data types here
  -- example: AllocDataType("wxArrayInt", "class",false)

! --=============================================================================
  -- Generate comments into binding C++ code
  comment_cpp_binding_code = true
--- 156,168 ----
  ]]

! -- ============================================================================
  -- Add additional conditions here
  -- example: conditions["DOXYGEN_INCLUDE"] = "defined(DOXYGEN_INCLUDE)"

! -- ----------------------------------------------------------------------------
  -- Add additional data types here
  -- example: AllocDataType("wxArrayInt", "class",false)

! -- ============================================================================
  -- Generate comments into binding C++ code
  comment_cpp_binding_code = true