X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2Fcompatibility.py;h=bf2f635a78c217bec84ecd0867ae73fb85aaaade;hb=57dfb183e24175bc782647d4e6aebe31063f3881;hp=22cd4f70f4372aab06f344d1c95948d889d4d54f;hpb=c91dd2220f6f26607ddb6988db95005eafe068e0;p=bertos.git

diff --git a/wizard/compatibility.py b/wizard/compatibility.py
index 22cd4f70..bf2f635a 100644
--- a/wizard/compatibility.py
+++ b/wizard/compatibility.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # encoding: utf-8
 #
-# This file is part of slimqc.
+# This file is part of BeRTOS.
 #
 # Bertos is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,7 +28,6 @@
 #
 # Copyright 2010 Develer S.r.l. (http://www.develer.com/)
 #
-# $Id$
 #
 # Author: Lorenzo Berni <duplo@develer.com>
 #
@@ -37,22 +36,23 @@ import const
 import os
 from bertos_utils import replaceSeparators, csrcGenerator
 
-def _userMkGenerator(project_info, destination):
+def _userMkGenerator(project_info):
     makefile = open(os.path.join(const.DATA_DIR, "mktemplates/old/template.mk"), "r").read()
+    destination = os.path.join(project_info.prjdir, os.path.basename(project_info.prjdir) + ".mk")
     # Deadly performances loss was here :(
     mk_data = {}
     mk_data["$pname"] = os.path.basename(project_info.info("PROJECT_PATH"))
     mk_data["$main"] = os.path.basename(project_info.info("PROJECT_PATH")) + "/main.c"
     for key in mk_data:
-        while makefile.find(key) != -1:
-            makefile = makefile.replace(key, mk_data[key])
+        makefile = makefile.replace(key, mk_data[key])
     open(destination, "w").write(makefile)
 
-def _mkGenerator(project_info, destination):
+def _mkGenerator(project_info):
     """
     Generates the mk file for the current project.
     """
     makefile = open(os.path.join(const.DATA_DIR, "mktemplates/old/template_wiz.mk"), "r").read()
+    destination = os.path.join(project_info.prjdir, os.path.basename(project_info.prjdir) + "_wiz.mk")
     mk_data = {}
     mk_data["$pname"] = project_info.info("PROJECT_NAME")
     mk_data["$cpuclockfreq"] = project_info.info("SELECTED_FREQ")
@@ -66,18 +66,17 @@ def _mkGenerator(project_info, destination):
     mk_data["$suffix"] = replaceSeparators(project_info.info("TOOLCHAIN")["path"].split("gcc")[1])
     mk_data["$main"] = os.path.basename(project_info.info("PROJECT_PATH")) + "/main.c"
     for key in mk_data:
-        while makefile.find(key) != -1:
-            makefile = makefile.replace(key, mk_data[key])
+        makefile = makefile.replace(key, mk_data[key])
     open(destination, "w").write(makefile)
 
-def _makefileGenerator(project_info, destination):
+def _makefileGenerator(project_info):
     """
     Generate the Makefile for the current project.
     """
     makefile = open(os.path.join(const.DATA_DIR, "mktemplates/old/Makefile"), "r").read()
+    destination = os.path.join(project_info.maindir, "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", project_info.info("PROJECT_NAME"))
+    makefile = makefile.replace("$pname", project_info.info("PROJECT_NAME"))
     open(destination, "w").write(makefile)
 
 def updateProject(project_data):
@@ -98,5 +97,10 @@ def updateProject(project_data):
         bertos_utils.mkGenerator = _mkGenerator
         bertos_utils.userMkGenerator = _userMkGenerator
         bertos_utils.makefileGenerator = _makefileGenerator
+    if wizard_version < 4:
+        # Use default PROJECT_SRC_PATH_FROM_MAKEFILE and
+        # PROJECT_HW_PATH_FROM_MAKEFILE
+        project_data["PROJECT_SRC_PATH_FROM_MAKEFILE"] = project_data["PROJECT_SRC_PATH"]
+        project_data["PROJECT_HW_PATH_FROM_MAKEFILE"] = project_data["PROJECT_HW_PATH"]
     return project_data