From: batt Date: Tue, 27 Apr 2010 14:40:54 +0000 (+0000) Subject: Shorten variable name. X-Git-Tag: 2.5.0~360 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=35aeb5229a132f6555b1eff44ba2a00596003f22;p=bertos.git Shorten variable name. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@3548 38d2e660-2303-0410-9eaa-f027e97ec537 --- diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py index 37e80d3d..8d4b6449 100644 --- a/wizard/bertos_utils.py +++ b/wizard/bertos_utils.py @@ -147,7 +147,7 @@ def userMkGenerator(project_info): mk_data = {} mk_data["$pname"] = os.path.basename(project_info.info("PROJECT_PATH")) mk_data["$ppath"] = relpath.relpath(project_info.info("PROJECT_SRC_PATH"), project_info.info("PROJECT_PATH")) - mk_data["$main"] = os.path.join("$(%s_PROJECT_SRC_PATH)" %project_info.info("PROJECT_NAME"), "main.c") + mk_data["$main"] = os.path.join("$(%s_SRC_PATH)" %project_info.info("PROJECT_NAME"), "main.c") for key in mk_data: while makefile.find(key) != -1: makefile = makefile.replace(key, mk_data[key]) diff --git a/wizard/mktemplates/template.mk b/wizard/mktemplates/template.mk index 5b866cd9..801fa511 100644 --- a/wizard/mktemplates/template.mk +++ b/wizard/mktemplates/template.mk @@ -13,7 +13,7 @@ $pname_PREFIX = "$prefix" $pname_SUFFIX = "$suffix" -$pname_PROJECT_SRC_PATH = "$ppath" +$pname_SRC_PATH = $ppath # Files automatically generated by the wizard. DO NOT EDIT, USE $pname_USER_CSRC INSTEAD! $pname_WIZARD_CSRC = \