Browse Source

Fix compilation broken by folder structure

DricomDragon 5 years ago
parent
commit
6f384b6e72
3 changed files with 8 additions and 8 deletions
  1. 7 7
      dev-files/code_builder.py
  2. BIN
      dev-files/code_builder.pyc
  3. 1 1
      prog/1-build.py

+ 7 - 7
dev-files/code_builder.py

@@ -172,7 +172,7 @@ def buildCode (GOAL, projectDir, maxConcurrentJobs, showCommand):
   rule = makefile.Rule ([baseHeader_file], "Build base header file")
   rule.mOpenSourceOnError = False
   rule.mDependences.append ("makefile.json")
-  rule.mCommand += ["../../dev-files/build_base_header_file.py", baseHeader_file, str (CPU_MHZ), TASK_COUNT, teensyName, "1" if ASSERTION_GENERATION else "0"]
+  rule.mCommand += ["../dev-files/build_base_header_file.py", baseHeader_file, str (CPU_MHZ), TASK_COUNT, teensyName, "1" if ASSERTION_GENERATION else "0"]
   rule.mPriority = -1
   make.addRule (rule)
 #--------------------------------------------------------------------------- Build all header file
@@ -182,7 +182,7 @@ def buildCode (GOAL, projectDir, maxConcurrentJobs, showCommand):
   rule.mOpenSourceOnError = False
   rule.mDependences.append ("makefile.json")
   rule.mDependences += H_SOURCE_LIST
-  rule.mCommand += ["../../dev-files/build_all_header_file.py", allHeaders_file, allHeadersSecondaryDependenceFile]
+  rule.mCommand += ["../dev-files/build_all_header_file.py", allHeaders_file, allHeadersSecondaryDependenceFile]
   rule.mCommand += H_SOURCE_LIST
   rule.enterSecondaryDependanceFile (allHeadersSecondaryDependenceFile, make)
   rule.mPriority = -1
@@ -196,8 +196,8 @@ def buildCode (GOAL, projectDir, maxConcurrentJobs, showCommand):
   rule.mOpenSourceOnError = False
   rule.mDependences += H_SOURCE_LIST
   rule.mDependences.append ("makefile.json")
-  rule.mDependences.append ("../../dev-files/build_interrupt_handlers.py")
-  rule.mCommand += ["../../dev-files/build_interrupt_handlers.py"]
+  rule.mDependences.append ("../dev-files/build_interrupt_handlers.py")
+  rule.mCommand += ["../dev-files/build_interrupt_handlers.py"]
   rule.mCommand += [interruptHandlerCppFile]
   rule.mCommand += [interruptHandlerSFile]
   rule.mCommand += [serviceScheme]
@@ -212,7 +212,7 @@ def buildCode (GOAL, projectDir, maxConcurrentJobs, showCommand):
     rule.mOpenSourceOnError = False
     rule.mDependences += CPP_SOURCE_LIST
     rule.mDependences.append ("makefile.json")
-    rule.mCommand += ["../../dev-files/build_grouped_sources.py", allSourceFile]
+    rule.mCommand += ["../dev-files/build_grouped_sources.py", allSourceFile]
     rule.mCommand += CPP_SOURCE_LIST
     rule.mPriority = -1
     make.addRule (rule)
@@ -268,7 +268,7 @@ def buildCode (GOAL, projectDir, maxConcurrentJobs, showCommand):
     rule = makefile.Rule ([objdumpPythonFile], "Building " + source + ".objdump.py")
     rule.mDependences.append (objectFile)
     rule.mDependences.append ("makefile.json")
-    rule.mCommand += ["../../dev-files/build_objdump.py", OBJDUMP_TOOL, source, objdumpPythonFile]
+    rule.mCommand += ["../dev-files/build_objdump.py", OBJDUMP_TOOL, source, objdumpPythonFile]
     rule.mPriority = -1
     make.addRule (rule)
     allGoal.append (objdumpPythonFile)
@@ -334,7 +334,7 @@ def buildCode (GOAL, projectDir, maxConcurrentJobs, showCommand):
       asObjectFileList.append (listingFile)
 #--------------------------------------------------------------------------- Link for internal flash
   PRODUCT_INTERNAL_FLASH = PRODUCT_DIR + "/product"
-  LINKER_SCRIPT_INTERNAL_FLASH = "../../dev-files/" + linkerScript
+  LINKER_SCRIPT_INTERNAL_FLASH = "../dev-files/" + linkerScript
   allGoal.append (PRODUCT_INTERNAL_FLASH + ".elf")
 #--- Add link rule
   rule = makefile.Rule ([PRODUCT_INTERNAL_FLASH + ".elf"], "Linking " + PRODUCT_INTERNAL_FLASH + ".elf")

BIN
dev-files/code_builder.pyc


+ 1 - 1
prog/1-build.py

@@ -22,7 +22,7 @@ jsonFilePath = os.path.abspath (scriptDir + "/makefile.json")
 f = open (jsonFilePath, "r")
 dictionary = json.loads (f.read ())
 f.close ()
-sys.path.append (scriptDir + "/../../dev-files")
+sys.path.append (scriptDir + "/../dev-files")
 
 import code_builder
 code_builder.buildCode (goal, scriptDir, maxParallelJobs, maxParallelJobs == 1)