From 0b034b08c5f0ba5ebf33f894a48a9648414e117d Mon Sep 17 00:00:00 2001 From: "khee85.lee" Date: Fri, 3 May 2013 21:25:30 +0900 Subject: [PATCH] Merge from master Change-Id: Id140c365a434523f82a59f308336388ec5190c98 Signed-off-by: khee85.lee --- CMakeLists.txt | 2 +- COPYRIGHT | 33 ++++++++++++++++++++++ LICENSE | 4 --- NOTICE | 4 --- README | 30 ++++++++++++++++++++ README-5.1 | 50 ++++++++++++++++++++++++++++++++++ packaging/{tolua.spec => tolua++.spec} | 14 +++++----- 7 files changed, 121 insertions(+), 16 deletions(-) create mode 100644 COPYRIGHT delete mode 100644 LICENSE delete mode 100644 NOTICE create mode 100644 README create mode 100755 README-5.1 rename packaging/{tolua.spec => tolua++.spec} (84%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 832289d..20e7e16 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -PROJECT(tolua) +PROJECT(tolua++) INCLUDE_DIRECTORIES( /usr/include/ diff --git a/COPYRIGHT b/COPYRIGHT new file mode 100644 index 0000000..9e99e00 --- /dev/null +++ b/COPYRIGHT @@ -0,0 +1,33 @@ +tolua++ License +--------------- + +tolua++ is based on toLua (www.tecgraf.puc-rio.br/~celes/tolua), and +it's licensed under the terms of the MIT license reproduced below. +This means that Lua is free software and can be used for both academic +and commercial purposes at absolutely no cost. + +=============================================================================== + +Copyright (C) 2009 Ariel Manzur. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + +=============================================================================== + +(end of COPYRIGHT) diff --git a/LICENSE b/LICENSE deleted file mode 100644 index b1d67fc..0000000 --- a/LICENSE +++ /dev/null @@ -1,4 +0,0 @@ -This code is free software; you can redistribute it and/or modify it. -The software provided hereunder is on an "as is" basis, and -the author has no obligation to provide maintenance, support, updates, -enhancements, or modifications. diff --git a/NOTICE b/NOTICE deleted file mode 100644 index 060182c..0000000 --- a/NOTICE +++ /dev/null @@ -1,4 +0,0 @@ -Copyright (c) Waldemar Celes -This software is copied from tolua++ as-is basis. -Please, see the LICENSE file for licenses. - diff --git a/README b/README new file mode 100644 index 0000000..cee381f --- /dev/null +++ b/README @@ -0,0 +1,30 @@ +This is tolua++-1.0 + +* What is tolua++? + tolua++ is an extension of toLua, a tool to integrate C/C++ code with + Lua. tolua++ includes new features oriented to c++, such as class + templates. + + tolua is a tool that greatly simplifies the integration of C/C++ code + with Lua. Based on a "cleaned" header file, tolua automatically generates + the binding code to access C/C++ features from Lua. Using Lua-5.0 API and + metamethod facilities, the current version automatically maps C/C++ + constants, external variables, functions, namespace, classes, and methods + to Lua. It also provides facilities to create Lua modules. + +* Availability + + tolua++ is freely available for both academic and commercial purposes. + See COPYRIGHT for details. + + tolua++ can be downloaded from the sites below: + http://www.codenix.com/~tolua/ + +* Installation + See INSTALL. + +* Contacting the author + tolua has been designed and implemented by Waldemar Celes. + tolua++ is maintained by Ariel Manzur. + Send your comments, bug reports and anything else to + tolua@codenix.com diff --git a/README-5.1 b/README-5.1 new file mode 100755 index 0000000..f06f785 --- /dev/null +++ b/README-5.1 @@ -0,0 +1,50 @@ +Compiling for lua 5.1 +--------------------- + +Starting from version 1.0.8pre1, tolua++ can be compiled with both lua 5.0 and +5.1. Both versions will output the same code, and the C API (tolua++.h) is the +same. + +The build system is not yet ready to detect/decide when to compile for 5.1, +the easiest way right now is to add a file called 'custom.py' on the root of +the package, with the following: + +## BEGIN custom.py + +CCFLAGS = ['-I/usr/local/include/lua5.1', '-O2', '-ansi'] +LIBPATH = ['/usr/local/lib'] +LIBS = ['lua5.1', 'dl', 'm'] +tolua_bin = 'tolua++5.1' +tolua_lib = 'tolua++5.1' +TOLUAPP = 'tolua++5.1' + +## END custom.py + +This will build the binary as 'tolua++5.1' and the library as 'libtolua++5.1.a' +(taken from tolua_bin and tolua_lib), and take the lua headers and libraries +from /usr/local/include/lua5.1 and /usr/local/lib. It will also link with +'-llua5.1'. Modify the parameters acording to your system. + +Compatibility +------------- + +There are a couple of things to keep in mind when running code inside tolua +using the -L option: + +* `...' and arg: you can still use 'arg' on 5.1, this is done automatically by +adding the 'arg' declaration to functions on files loaded with dofile. + +For example, the line: + +function foo( ... ) + +becomes + +function foo( ... ) local arg = {n=select('#', ...), ...}; + +This lets you use the same code on both versions without having to make any +modifications. + +* keep in mind that there are slight differences on the way string.gsub works, +and the original version of the function is always kept, so it will behave +diffently depending on which version of lua you're using. diff --git a/packaging/tolua.spec b/packaging/tolua++.spec similarity index 84% rename from packaging/tolua.spec rename to packaging/tolua++.spec index 149ced9..42a94d0 100755 --- a/packaging/tolua.spec +++ b/packaging/tolua++.spec @@ -1,5 +1,5 @@ -Name: tolua -Summary: tolua package +Name: tolua++ +Summary: tolua++ package Version: 1.0.93 Release: 1 Group: TO_BE/FILLED_IN @@ -9,15 +9,15 @@ BuildRequires: liblua-devel BuildRequires: cmake %description -tolua package +tolua++ package %package devel -Summary: tolua package (devel) +Summary: tolua++ package (devel) Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel -tolua package (devel) +tolua++ package (devel) %prep %setup -q @@ -37,7 +37,7 @@ make %{?jobs:-j%jobs} %install rm -rf %{buildroot} mkdir -p %{buildroot}/usr/share/license -cp %{_builddir}/%{name}-%{version}/LICENSE %{buildroot}/usr/share/license/%{name} +cp %{_builddir}/%{name}-%{version}/COPYRIGHT %{buildroot}/usr/share/license/%{name} %{__make} DESTDIR=%{?buildroot:%{buildroot}} INSTALL_ROOT=%{?buildroot:%{buildroot}} install rm -f %{?buildroot:%{buildroot}}%{_infodir}/dir @@ -55,4 +55,4 @@ find %{?buildroot:%{buildroot}} -regex ".*\\.la$" | xargs rm -f -- %files devel %defattr(-,root,root,-) %{_includedir}/tolua++.h -%{_libdir}/libtolua.a +%{_libdir}/libtolua++.a -- 2.7.4