Fixed file generation on Windows platfrom. Added support for .cpp files. Refactored argument parsing.

This commit is contained in:
Petr Hodina 2017-10-17 08:20:59 +02:00
parent 1016115be1
commit 38a23235c9
2 changed files with 21 additions and 17 deletions

View File

@ -60,7 +60,7 @@ class CMake (object):
cmake['ass']=[]
for file in self.project['srcs']:
if file.endswith('.c') or file.endswith('.h'):
if file.endswith('.c') or file.endswith('.h') or file.endswith('.cpp'):
cmake['files'].append({'path': file,'var':'SRC_FILE' + str(i)})
i = i+1
@ -92,9 +92,10 @@ class CMake (object):
self.context['cmake'] = cmake
self.generateFile('CMakeLists.txt',os.path.join(self.path,'CMakeLists.txt'))
abspath = os.path.abspath(os.path.join(self.path,'CMakeLists.txt'))
self.generateFile('CMakeLists.txt', abspath)
print ('Created file CMakeLists.txt')
print ('Created file CMakeLists.txt [{}]'.format(abspath))
# def generateFile (self, pathSrc, pathDst='', author='Pegasus', version='v1.0.0', licence='licence.txt', template_dir='../PegasusTemplates'):
def generateFile (self, pathSrc, pathDst='', author='Pegasus', version='v1.0.0', licence='licence.txt', template_dir='.'):
@ -113,15 +114,15 @@ class CMake (object):
generated_code = template.render(self.context)
if platform.system() == 'Window':
if platform.system() == 'Windows':
with open(pathDst, 'wb') as f:
with open(pathDst, 'w') as f:
f.write(generated_code)
elif platform.system() == 'Linux':
with open(pathDst, 'wb') as f:
f.write(str.encode(generated_code))
with open(pathDst, 'w') as f:
f.write(generated_code)
else:
# Different OS than Windows or Linux
pass
@ -141,15 +142,15 @@ class CMake (object):
generated_code = template.render(self.context)
if platform.system() == 'Window':
if platform.system() == 'Windows':
with open(pathDst, 'wb') as f:
with open(pathDst, 'w') as f:
f.write(generated_code)
elif platform.system() == 'Linux':
with open(pathDst, 'wb') as f:
f.write(str.encode(generated_code))
with open(pathDst, 'w') as f:
f.write(generated_code)
else:
# Different OS than Windows or Linux
pass

View File

@ -27,13 +27,14 @@ if __name__ == '__main__':
""" Parses params and calls the right conversion"""
parser = argparse.ArgumentParser()
parser.add_argument("format", choices=("ewp", "uvprojx"))
parser.add_argument("path", type=str, help="Root directory of project")
parser.add_argument("--ewp", help="Search for *.EWP file in project structure", action='store_true')
parser.add_argument("--uvprojx", help="Search for *.UPROJX file in project structure", action='store_true')
#"--ewp", help="Search for *.EWP file in project structure", action='store_true')
#parser.add_argument("--uvprojx", help="Search for *.UPROJX file in project structure", action='store_true')
args = parser.parse_args()
if os.path.isdir(args.path):
if args.ewp:
if args.format == 'ewp':
print('Looking for *.ewp file in ' + args.path)
filename = find_file(args.path, '.ewp')
if len(filename):
@ -45,7 +46,7 @@ if __name__ == '__main__':
cmakefile.populateCMake()
else:
print('No project *.ewp file found')
elif args.uvprojx:
elif args.format == 'uvprojx':
print('Looking for *.uvprojx file in ' + args.path)
filename = find_file(args.path, '.uvprojx')
if len(filename):
@ -58,5 +59,7 @@ if __name__ == '__main__':
cmakefile.populateCMake()
else:
print('No project *.uvprojx file found')
else:
print ('No format specified')
else:
print('Not a valid file path')