Fix errors in Python 3 build
This commit is contained in:
parent
62cb43bb8d
commit
f3745a23be
2 changed files with 11 additions and 11 deletions
14
SConstruct
14
SConstruct
|
@ -367,13 +367,13 @@ if selected_platform in platform_list:
|
||||||
if (config.can_build(selected_platform)):
|
if (config.can_build(selected_platform)):
|
||||||
config.configure(env)
|
config.configure(env)
|
||||||
env.module_list.append(x)
|
env.module_list.append(x)
|
||||||
try:
|
try:
|
||||||
doc_classes = config.get_doc_classes()
|
doc_classes = config.get_doc_classes()
|
||||||
doc_path = config.get_doc_path()
|
doc_path = config.get_doc_path()
|
||||||
for c in doc_classes:
|
for c in doc_classes:
|
||||||
env.doc_class_path[c]="modules/"+x+"/"+doc_path
|
env.doc_class_path[c]="modules/"+x+"/"+doc_path
|
||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
sys.path.remove(tmppath)
|
sys.path.remove(tmppath)
|
||||||
|
|
|
@ -41,7 +41,7 @@ def make_doc_header(target, source, env):
|
||||||
src = s.srcnode().abspath
|
src = s.srcnode().abspath
|
||||||
f = open_utf8(src, "r")
|
f = open_utf8(src, "r")
|
||||||
content = f.read()
|
content = f.read()
|
||||||
buf+=content
|
buf+=content
|
||||||
|
|
||||||
buf = encode_utf8(docbegin + buf + docend)
|
buf = encode_utf8(docbegin + buf + docend)
|
||||||
decomp_size = len(buf)
|
decomp_size = len(buf)
|
||||||
|
@ -385,13 +385,13 @@ def make_license_header(target, source, env):
|
||||||
|
|
||||||
|
|
||||||
def _make_doc_data_class_path(to_path):
|
def _make_doc_data_class_path(to_path):
|
||||||
g = open_utf8(os.path.join(to_path,"doc_data_class_path.gen.h"), "wb")
|
g = open_utf8(os.path.join(to_path,"doc_data_class_path.gen.h"), "w")
|
||||||
g.write("static const int _doc_data_class_path_count="+str(len(env.doc_class_path))+";\n")
|
g.write("static const int _doc_data_class_path_count="+str(len(env.doc_class_path))+";\n")
|
||||||
g.write("struct _DocDataClassPath { const char* name; const char* path; };\n")
|
g.write("struct _DocDataClassPath { const char* name; const char* path; };\n")
|
||||||
|
|
||||||
g.write("static const _DocDataClassPath _doc_data_class_paths["+str(len(env.doc_class_path)+1)+"]={\n");
|
g.write("static const _DocDataClassPath _doc_data_class_paths["+str(len(env.doc_class_path)+1)+"]={\n");
|
||||||
for c in env.doc_class_path:
|
for c in env.doc_class_path:
|
||||||
g.write("{\""+c+"\",\""+env.doc_class_path[c]+"\"},\n")
|
g.write("{\""+c+"\",\""+env.doc_class_path[c]+"\"},\n")
|
||||||
g.write("{NULL,NULL}\n")
|
g.write("{NULL,NULL}\n")
|
||||||
g.write("};\n")
|
g.write("};\n")
|
||||||
|
|
||||||
|
@ -414,7 +414,7 @@ if (env["tools"] == "yes"):
|
||||||
docs=[]
|
docs=[]
|
||||||
print("cdir is: "+env.Dir('#').abspath)
|
print("cdir is: "+env.Dir('#').abspath)
|
||||||
for f in os.listdir(os.path.join(env.Dir('#').abspath,"doc/classes")):
|
for f in os.listdir(os.path.join(env.Dir('#').abspath,"doc/classes")):
|
||||||
docs.append("#doc/classes/"+f)
|
docs.append("#doc/classes/"+f)
|
||||||
|
|
||||||
_make_doc_data_class_path(os.path.join(env.Dir('#').abspath,"editor/doc"))
|
_make_doc_data_class_path(os.path.join(env.Dir('#').abspath,"editor/doc"))
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue