asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve code style of generated headers

Browse source
This commit is contained in:
Rémi Verschelde 2017-11-15 20:16:51 +01:00
parent 677e95d8d1
commit ed2b66f023
4 changed files with 25 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
SConstruct
View file

@ -386,7 +386,6 @@ if selected_platform in platform_list:
except: except:
pass pass
sys.path.remove(tmppath) sys.path.remove(tmppath)
sys.modules.pop('config') sys.modules.pop('config')

17
editor/SCsub
View file

@ -25,7 +25,7 @@ def make_certs_header(target, source, env):
g.write("static const int _certs_uncompressed_size = " + str(decomp_size) + ";\n") g.write("static const int _certs_uncompressed_size = " + str(decomp_size) + ";\n")
g.write("static const unsigned char _certs_compressed[] = {\n") g.write("static const unsigned char _certs_compressed[] = {\n")
for i in range(len(buf)): for i in range(len(buf)):
g.write(byte_to_str(buf[i]) + ",\n") g.write("\t" + byte_to_str(buf[i]) + ",\n")
g.write("};\n") g.write("};\n")
g.write("#endif") g.write("#endif")
@ -57,7 +57,7 @@ def make_doc_header(target, source, env):
g.write("static const int _doc_data_uncompressed_size = " + str(decomp_size) + ";\n") g.write("static const int _doc_data_uncompressed_size = " + str(decomp_size) + ";\n")
g.write("static const unsigned char _doc_data_compressed[] = {\n") g.write("static const unsigned char _doc_data_compressed[] = {\n")
for i in range(len(buf)): for i in range(len(buf)):
g.write(byte_to_str(buf[i]) + ",\n") g.write("\t" + byte_to_str(buf[i]) + ",\n")
g.write("};\n") g.write("};\n")
g.write("#endif") g.write("#endif")
@ -85,7 +85,7 @@ def make_fonts_header(target, source, env):
g.write("static const int _font_" + name + "_size = " + str(len(buf)) + ";\n") g.write("static const int _font_" + name + "_size = " + str(len(buf)) + ";\n")
g.write("static const unsigned char _font_" + name + "[] = {\n") g.write("static const unsigned char _font_" + name + "[] = {\n")
for i in range(len(buf)): for i in range(len(buf)):
g.write(byte_to_str(buf[i]) + ",\n") g.write("\t" + byte_to_str(buf[i]) + ",\n")
g.write("};\n") g.write("};\n")
@ -116,11 +116,9 @@ def make_translations_header(target, source, env):
buf = zlib.compress(buf) buf = zlib.compress(buf)
name = os.path.splitext(os.path.basename(sorted_paths[i]))[0] name = os.path.splitext(os.path.basename(sorted_paths[i]))[0]
#g.write("static const int _translation_"+name+"_compressed_size="+str(len(buf))+";\n")
#g.write("static const int _translation_"+name+"_uncompressed_size="+str(decomp_size)+";\n")
g.write("static const unsigned char _translation_" + name + "_compressed[] = {\n") g.write("static const unsigned char _translation_" + name + "_compressed[] = {\n")
for i in range(len(buf)): for i in range(len(buf)):
g.write(byte_to_str(buf[i]) + ",\n") g.write("\t" + byte_to_str(buf[i]) + ",\n")
g.write("};\n") g.write("};\n")
@ -396,9 +394,9 @@ def _make_doc_data_class_path(to_path):
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 sorted(env.doc_class_path):
g.write("{\""+c+"\",\""+env.doc_class_path[c]+"\"},\n") g.write("\t{\"" + c + "\", \"" + env.doc_class_path[c] + "\"},\n")
g.write("{NULL,NULL}\n") g.write("\t{NULL, NULL}\n")
g.write("};\n") g.write("};\n")
@ -423,6 +421,7 @@ if env['tools']:
_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"))
docs = sorted(docs)
env.Depends("#editor/doc_data_compressed.gen.h", docs) env.Depends("#editor/doc_data_compressed.gen.h", docs)
env.Command("#editor/doc_data_compressed.gen.h", docs, make_doc_header) env.Command("#editor/doc_data_compressed.gen.h", docs, make_doc_header)
# Certificates # Certificates

6
methods.py
View file

@ -1293,21 +1293,15 @@ def detect_modules():
// modules.cpp - THIS FILE IS GENERATED, DO NOT EDIT!!!!!!! // modules.cpp - THIS FILE IS GENERATED, DO NOT EDIT!!!!!!!
#include "register_module_types.h" #include "register_module_types.h"
""" + includes_cpp + """ """ + includes_cpp + """
void register_module_types() { void register_module_types() {
""" + register_cpp + """ """ + register_cpp + """
} }
void unregister_module_types() { void unregister_module_types() {
""" + unregister_cpp + """ """ + unregister_cpp + """
} }
""" """
f = open("modules/register_module_types.gen.cpp", "w") f = open("modules/register_module_types.gen.cpp", "w")

1
modules/SCsub
View file

@ -9,7 +9,6 @@ Export('env_modules')
env.modules_sources = [ env.modules_sources = [
"register_module_types.gen.cpp", "register_module_types.gen.cpp",
] ]
# env.add_source_files(env.modules_sources,"*.cpp")
Export('env') Export('env')
for x in env.module_list: for x in env.module_list: