X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBProject.py;h=366e9a7525058b504d94c60c69b859df4f9b598b;hb=2654dc2eff8a397ed1dd21d0f073bae553acbb61;hp=b31c3f114fcc6e280d729e789094b918d91c4b6c;hpb=be3d03b4cf5718476516f7564855a17cfe6e4d78;p=bertos.git diff --git a/wizard/BProject.py b/wizard/BProject.py index b31c3f11..366e9a75 100644 --- a/wizard/BProject.py +++ b/wizard/BProject.py @@ -209,14 +209,14 @@ class BProject(object): _tree["info"] = self._loadPresetInfo(os.path.join(path, const.PREDEFINED_BOARD_SPEC_FILE)) _tree["info"]["filename"] = os.path.basename(path) _tree["info"]["path"] = path - _tree["children"] = [] + _tree["children"] = {} entries = set(os.listdir(path)) for entry in entries: _path = os.path.join(path, entry) if os.path.isdir(_path): sub_entries = set(os.listdir(_path)) if const.PREDEFINED_BOARD_SPEC_FILE in sub_entries: - _tree["children"].append(self._loadProjectPresetTree(_path)) + _tree["children"][_path] = self._loadProjectPresetTree(_path) # Add into the info dict the dir type (dir/project) if _tree["children"]: _tree["info"]["type"] = "dir" @@ -226,7 +226,10 @@ class BProject(object): def _loadPresetInfo(self, preset_spec_file): D = {} - execfile(preset_spec_file, {}, D) + try: + execfile(preset_spec_file, {}, D) + except IOError, e: + pass return D def loadModuleData(self, edit=False): @@ -365,10 +368,6 @@ class BProject(object): # Copyt the new *_user.mk file self._writeUserMkFileFromPreset() - if self.infos["EMPTY_MAIN"]: - # Create and empty main.c file only if the user check the box - self._writeMainFile(self.prjdir + "/main.c") - # Create project files for selected plugins self._createProjectFiles()