[Winmerge-svn] SF.net SVN: winmerge:[7321] trunk/Tools/Scripts/ToolSettings.py
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ki...@us...> - 2010-10-20 15:34:42
|
Revision: 7321 http://winmerge.svn.sourceforge.net/winmerge/?rev=7321&view=rev Author: kimmov Date: 2010-10-20 15:34:36 +0000 (Wed, 20 Oct 2010) Log Message: ----------- Scripts: Support VS2010 in VS project conversion. Modified Paths: -------------- trunk/Tools/Scripts/ToolSettings.py Modified: trunk/Tools/Scripts/ToolSettings.py =================================================================== --- trunk/Tools/Scripts/ToolSettings.py 2010-10-20 06:04:07 UTC (rev 7320) +++ trunk/Tools/Scripts/ToolSettings.py 2010-10-20 15:34:36 UTC (rev 7321) @@ -1,6 +1,6 @@ # # The MIT License -# Copyright (c) 2007-2009 Kimmo Varis +# Copyright (c) 2007-2010 Kimmo Varis # Copyright (c) 2008 Matthias Mayer # # Permission is hereby granted, free of charge, to any person obtaining @@ -39,7 +39,9 @@ self.vs_path7 = r'C:\Program Files\Microsoft Visual Studio .NET 2003' self.vs_path8 = r'C:\Program Files\Microsoft Visual Studio 8' self.vs_path9 = r'C:\Program Files\Microsoft Visual Studio 9.0' + self.vs_path10 = r'C:\Program Files\Microsoft Visual Studio 10.0' self.innosetup_path = r'C:\Program Files\Inno Setup 5' + self.nsis_path = r'C:\Program Files\NSIS' # Checkout sources from local workspace or from SVN server (give URL) self.source = 'workspace' self.vs_version = 2005 @@ -65,8 +67,12 @@ config.set(sect, 'vs_path8', self.vs_path8) if not config.has_option(sect, 'vs_path9'): config.set(sect, 'vs_path9', self.vs_path9) + if not config.has_option(sect, 'vs_path10'): + config.set(sect, 'vs_path10', self.vs_path10) if not config.has_option(sect, 'innosetup_path'): config.set(sect, 'innosetup_path', self.innosetup_path) + if not config.has_option(sect, 'nsis_path'): + config.set(sect, 'nsis_path', self.nsis_path) # Writing our configuration file to 'Tools.ini' with open(filename, 'w') as configfile: @@ -88,7 +94,9 @@ self.vs_path7 = config.get('RUNTIME', 'vs_path7') self.vs_path8 = config.get('RUNTIME', 'vs_path8') self.vs_path9 = config.get('RUNTIME', 'vs_path9') + self.vs_path10 = config.get('RUNTIME', 'vs_path10') self.innosetup_path = config.get('RUNTIME', 'innosetup_path') + self.nsis_path = config.get('RUNTIME', 'nsis_path') self.source = config.get('RUNTIME', 'Source') self.vs_version = config.getint('RUNTIME', 'VSStudio') @@ -98,3 +106,5 @@ self.vs_path = self.vs_path8 elif self.vs_version == 2008: self.vs_path = self.vs_path9 + elif self.vs_version == 2010: + self.vs_path = self.vs_path10 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |