libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

fix bug in vs.py(use the env not the group to get information) 

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2419 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
goprife@gmail.com 2012-11-16 07:13:27 +00:00
parent cabee09a32
commit 9a89567e8f
1 changed files with 29 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
tools/vs.py
View File

@ -33,10 +33,6 @@ def VSProject(target, script):
out = file(target, 'wb') out = file(target, 'wb')
out.write('<?xml version="1.0" encoding="UTF-8"?>\r\n') out.write('<?xml version="1.0" encoding="UTF-8"?>\r\n')
CPPPATH = []
CPPDEFINES = []
LINKFLAGS = ''
CCFLAGS = ''
ProjectFiles = [] ProjectFiles = []
# add group # add group
@ -48,58 +44,42 @@ def VSProject(target, script):
for group in script: for group in script:
group_xml = VS_AddGroup(ProjectFiles, elem, group['name'], group['src'], project_path) group_xml = VS_AddGroup(ProjectFiles, elem, group['name'], group['src'], project_path)
# get each include path # write head include path
if group.has_key('CPPPATH') and group['CPPPATH']: if building.Env.has_key('CPPPATH'):
if CPPPATH: cpp_path = building.Env['CPPPATH']
CPPPATH += group['CPPPATH'] paths = set()
else: for path in cpp_path:
CPPPATH += group['CPPPATH'] inc = _make_path_relative(project_path, os.path.normpath(path))
paths.add(inc) #.replace('\\', '/')
# get each group's definitions paths = [i for i in paths]
if group.has_key('CPPDEFINES') and group['CPPDEFINES']: paths.sort()
if CPPDEFINES: cpp_path = ';'.join(paths)
CPPDEFINES += group['CPPDEFINES']
else:
CPPDEFINES += group['CPPDEFINES']
# get each group's link flags # write include path, definitions
if group.has_key('LINKFLAGS') and group['LINKFLAGS']: for elem in tree.iter(tag='Tool'):
if LINKFLAGS: if elem.attrib['Name'] == 'VCCLCompilerTool':
LINKFLAGS += ' ' + group['LINKFLAGS'] #print elem.tag, elem.attrib
else: break
LINKFLAGS += group['LINKFLAGS'] elem.set('AdditionalIncludeDirectories', cpp_path)
# remove repeat path # write cppdefinitons flags
paths = set() if building.Env.has_key('CPPDEFINES'):
for path in CPPPATH: definitions = ';'.join(building.Env['CPPDEFINES'])
inc = _make_path_relative(project_path, os.path.normpath(path)) elem.set('PreprocessorDefinitions', definitions)
paths.add(inc) #.replace('\\', '/')
paths = [i for i in paths]
paths.sort()
CPPPATH = string.join(paths, ';')
# write include path, definitions
for elem in tree.iter(tag='Tool'):
if elem.attrib['Name'] == 'VCCLCompilerTool':
#print elem.tag, elem.attrib
break
elem.set('AdditionalIncludeDirectories', CPPPATH)
definitions = ';'.join(building.Env['CPPDEFINES'])
elem.set('PreprocessorDefinitions', definitions)
# write link flags # write link flags
# write lib dependence # write lib dependence
for elem in tree.iter(tag='Tool'): if building.Env.has_key('LIBS'):
if elem.attrib['Name'] == 'VCLinkerTool': for elem in tree.iter(tag='Tool'):
break if elem.attrib['Name'] == 'VCLinkerTool':
libs_with_extention = [i+'.lib' for i in building.Env['LIBS']] break
libs = ' '.join(libs_with_extention) libs_with_extention = [i+'.lib' for i in building.Env['LIBS']]
elem.set('AdditionalDependencies', libs) libs = ' '.join(libs_with_extention)
elem.set('AdditionalDependencies', libs)
# write lib include path
if building.Env.has_key('LIBPATH'): if building.Env.has_key('LIBPATH'):
#if building.Env['LIBPATH']:
lib_path = building.Env['LIBPATH'] lib_path = building.Env['LIBPATH']
paths = set() paths = set()
for path in lib_path: for path in lib_path: