From: lottaviano Date: Tue, 12 Apr 2011 05:15:01 +0000 (+0000) Subject: wizard: generate custom Makefile variables with the right prefix X-Git-Tag: 2.7.0~112 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=ee5a9b47c8ef2db3110ef29a9e1ec9a7170a838f;hp=f577109a57297270df091cef9c2565a74d0a4b29;p=bertos.git wizard: generate custom Makefile variables with the right prefix This fixes the bug where custom Makefile variables are not correctly defined if the project is not in a directory which name is the name of the project. Signed-off-by: Nicolas Dandrimont git-svn-id: https://src.develer.com/svnoss/bertos/trunk@4854 38d2e660-2303-0410-9eaa-f027e97ec537 --- diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py index 204c4fe4..522e651e 100644 --- a/wizard/bertos_utils.py +++ b/wizard/bertos_utils.py @@ -283,7 +283,7 @@ def csrcGenerator(project_info): cxxsrc = " \\\n\t".join(cxxsrc) + " \\" asrc = set(asrc) asrc = " \\\n\t".join(asrc) + " \\" - constants = "\n".join([os.path.basename(project_info.info("PROJECT_PATH")) + "_" + key + " = " + unicode(value) for key, value in constants.items()]) + constants = "\n".join([project_info.info("PROJECT_NAME") + "_" + key + " = " + unicode(value) for key, value in constants.items()]) return csrc, pcsrc, cppasrc, cxxsrc, asrc, constants def findModuleFiles(module, project_info):