From: asterix Date: Tue, 8 Jun 2010 10:27:22 +0000 (+0000) Subject: Fix main.c souce path in user makefile. X-Git-Tag: 2.5.0~19 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=833e7f9734c6c68a972f14e5f2b423acf4a709f1;p=bertos.git Fix main.c souce path in user makefile. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@3898 38d2e660-2303-0410-9eaa-f027e97ec537 --- diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py index e361b3c4..c29f9c4f 100644 --- a/wizard/bertos_utils.py +++ b/wizard/bertos_utils.py @@ -172,7 +172,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_SRC_PATH)" %project_info.info("PROJECT_NAME"), "main.c") + mk_data["$main"] = "/".join("$(%s_SRC_PATH)" %project_info.info("PROJECT_NAME"), "main.c") for key in mk_data: makefile = makefile.replace(key, mk_data[key]) open(destination, "w").write(makefile) @@ -238,7 +238,7 @@ def csrcGenerator(project_info): dependency_files = set([]) # assembly sources asm_files = set([]) - hwdir = os.path.basename(project_info.info("PROJECT_PATH")) + "/hw" + hwdir = os.path.basename(project_info.info("PROJECT_PATH")) + "/hw" if information["enabled"]: if "constants" in information: constants.update(information["constants"]) @@ -388,7 +388,7 @@ def getTagSet(cpu_info): tag_set |= set(cpu["CPU_TAGS"]) tag_set |= set([cpu["TOOLCHAIN"]]) return tag_set - + def getInfos(definition): D = {}