fix build error with scons-4.4.0 version which is based on python3

Change-Id: I45f689b2d084651286c8cca7ae02812069aa85b8
Signed-off-by: biao716.wang <biao716.wang@samsung.com>

diff --git a/SConstruct b/SConstruct
index d48dc4d..9523c59 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -16,7 +16,7 @@ elif 'msvc' in env['TOOLS']:
 else:
        options_file = "posix"
 
-opts = Options(["config_"+options_file+".py", "custom.py", "custom_"+options_file+".py"], ARGUMENTS)
+opts = Variables(["config_"+options_file+".py", "custom.py", "custom_"+options_file+".py"], args=ARGUMENTS)
 opts.Add('CC', 'The C compiler.')
 opts.Add('CXX', 'The C++ compiler (for the tests)')
 opts.Add('CCFLAGS', 'Flags for the compiler.', ['-O2', '-Wall'])
@@ -50,9 +50,9 @@ env['TOLUAPP_BOOTSTRAP'] = env['tolua_bin']+"_bootstrap"+env['PROGSUFFIX']
 env['build_dev'] = int(env['build_dev'])
 
 ## detecting the install directory on win32
-if 'msvc' in env['TOOLS'] and not (env.has_key('prefix') or env['prefix']):
+if 'msvc' in env['TOOLS'] and not ('prefix' in env or env['prefix']):
 
-       if env['MSVS'].has_key('PLATFORMSDKDIR'):
+       if 'PLATFORMSDKDIR' in env['MSVS']:
                env['prefix'] = env['MSVS']['PLATFORMSDKDIR']
 
 
@@ -66,7 +66,7 @@ def pkg_scan_dep(self, target, source):
        ## TODO: detectar si el archivo existe antes de abrirlo asi nomas
        pkg = open(source, "rt")
 
-       for linea in pkg.xreadlines():
+       for linea in pkg:
                dep = re.search("^[\t\w]*\$[cphl]file\s*\"([^\"]+)\"", linea)
                if dep:
                        self.Depends(target, '#' + dep.groups()[0]);
@@ -89,7 +89,7 @@ def make_tolua_code(self, target, source, pkgname = None, bootstrap = False, use
                        tolua = 'bin\\'+self['TOLUAPP_BOOTSTRAP']
                else:
                        tolua = 'bin/'+self['TOLUAPP_BOOTSTRAP']
-               print("********* tolua is ", tolua)
+               print(("********* tolua is ", tolua))
        else:
                if use_own:
                        if 'msvc' in self['TOOLS']:

diff --git a/config_posix.py b/config_posix.py
index 2bb696c..1549ab7 100644 (file)
--- a/config_posix.py
+++ b/config_posix.py
@@ -16,8 +16,10 @@ CCFLAGS = ['-O2', '-ansi', '-Wall']
 prefix = '/usr/local'
 
 # libraries
-LIBS = ['lua', 'lualib', 'm']
-
+#LIBS = ['lua', 'lualib', 'm']
+#with scons-4.4.0, it will use this config file, but on tizen, there is no
+#lualib library.
+LIBS = ['lua', 'm']
 
 
 import os

diff --git a/packaging/tolua++.spec b/packaging/tolua++.spec
index b53fb26..67bfcbc 100644 (file)
--- a/packaging/tolua++.spec
+++ b/packaging/tolua++.spec
@@ -7,7 +7,7 @@ Source1001:     tolua++.manifest
 Url:            http://www.codenix.com/~tolua/
 Group:          Development/Libraries
 License:        MIT
-BuildRequires:  python
+BuildRequires:  python3
 BuildRequires:  scons
 BuildRequires:  lua-devel
 BuildRequires:  gcc-c++

diff --git a/src/tests/SCsub b/src/tests/SCsub
index 2a2fb26..0379cc9 100644 (file)
--- a/src/tests/SCsub
+++ b/src/tests/SCsub
@@ -1,5 +1,5 @@
 Import('env')
-env_tests = env.Copy()
+env_tests = env.Clone()
 
 env_tests.LuaBinding('tclassbind.cpp', 'tclass.pkg', 'tclass', use_own=1, use_typeid=1)