From 76355d5fc287544e22cf1da11a707bd96a642bba Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 6 Jun 2015 22:53:47 +0300 Subject: In autogenerate script add support for update make file. Also fix some errors. --- scripts/addfile.py | 14 ++++++++------ scripts/tpl/parser.tpl | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'scripts') diff --git a/scripts/addfile.py b/scripts/addfile.py index 42d3aef..d18a4e4 100755 --- a/scripts/addfile.py +++ b/scripts/addfile.py @@ -65,23 +65,23 @@ else: word1 = nodeName[0 : len(nodeName) - suffixSize] word2 = nodeName[- suffixSize:] -nodeInclude = "" if dirName != "": fileName = word1 + "_" + word2 guardHeader = (dirName + "_" + nodeName).upper() baseName = dirName baseTypeName = firstBigLetter(dirName) nodeInclude = dirName + "/" + fileName - nodeFileName = "../src/nodes/{0}/{1}.h".format(dirName, fileName) - parserFileName = "../src/parsers/{0}/{1}.cpp".format(dirName, fileName) + enumValue = (word1 + "_" + word2).upper() else: fileName = word1 guardHeader = nodeName.upper() baseName = "node" baseTypeName = "" nodeInclude = fileName - nodeFileName = "../src/nodes/{0}.h".format(fileName) - parserFileName = "../src/parsers/{0}.cpp".format(fileName) + enumValue = word1.upper() + +nodeFileName = "../src/nodes/{0}.h".format(nodeInclude) +parserFileName = "../src/parsers/{0}.cpp".format(nodeInclude) writeFile(nodeFileName, nodeTemplate.format(guardHeader, baseName, typeName, baseTypeName)) @@ -90,6 +90,8 @@ writeFile(parserFileName, writeFile("../src/includes/nodeincludes.h", "#include \"nodes/{0}.h\"\n".format(nodeInclude), "a"); writeFile("../src/includes/nodeshandling.inc", - "handleNodeType({0}, {1})\n".format(guardHeader, typeName), "a"); + "handleNodeType({0}, {1})\n".format(enumValue, typeName), "a"); writeFile("../src/includes/parserdefines.inc", "parserDefine({0});\n".format(typeName), "a"); +writeFile("../src/Makefile.files", + " \\\n nodes/{0}.h \\\n parsers/{0}.cpp".format(nodeInclude, nodeInclude), "a"); diff --git a/scripts/tpl/parser.tpl b/scripts/tpl/parser.tpl index b5fb927..4936b10 100644 --- a/scripts/tpl/parser.tpl +++ b/scripts/tpl/parser.tpl @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "parsers/parserincludes.h" +#include "includes/parserincludes.h" parserDefine({0}); -- cgit v1.2.3-60-g2f50