From: duplo Date: Fri, 23 Apr 2010 15:11:02 +0000 (+0000) Subject: Use PROJECT_NAME instead of os.path.basename(PROJECT_PATH) X-Git-Tag: 2.5.0~396 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=3234ec653302eb271f87197429f1f6cbd8f0bdb7;p=bertos.git Use PROJECT_NAME instead of os.path.basename(PROJECT_PATH) git-svn-id: https://src.develer.com/svnoss/bertos/trunk@3512 38d2e660-2303-0410-9eaa-f027e97ec537 --- diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py index 6327fd5e..972438df 100644 --- a/wizard/bertos_utils.py +++ b/wizard/bertos_utils.py @@ -151,7 +151,7 @@ def mkGenerator(project_info, makefile): Generates the mk file for the current project. """ mk_data = {} - mk_data["$pname"] = os.path.basename(project_info.info("PROJECT_PATH")) + mk_data["$pname"] = project_info.info("PROJECT_NAME") mk_data["$cpuclockfreq"] = project_info.info("SELECTED_FREQ") cpu_mk_parameters = [] for key, value in project_info.info("CPU_INFOS").items(): @@ -173,7 +173,7 @@ def makefileGenerator(project_info, makefile): """ # TODO write a general function that works for both the mk file and the Makefile while makefile.find("$pname") != -1: - makefile = makefile.replace("$pname", os.path.basename(project_info.info("PROJECT_PATH"))) + makefile = makefile.replace("$pname", project_info.info("PROJECT_NAME")) return makefile def csrcGenerator(project_info):