comparison mxtool/mx.py @ 14553:6fb61ad67962

Fix mx eclipseformat always adds the 'eclipse' suffix
author Gilles Duboscq <duboscq@ssw.jku.at>
date Sun, 16 Mar 2014 19:20:21 +0100
parents 47b775458982
children 4f8268dee8aa
comparison
equal deleted inserted replaced
14552:2c78ee2a890f 14553:6fb61ad67962
1892 args.eclipse_exe = os.environ.get('ECLIPSE_EXE') 1892 args.eclipse_exe = os.environ.get('ECLIPSE_EXE')
1893 if args.eclipse_exe is None: 1893 if args.eclipse_exe is None:
1894 abort('Could not find Eclipse executable. Use -e option or ensure ECLIPSE_EXE environment variable is set.') 1894 abort('Could not find Eclipse executable. Use -e option or ensure ECLIPSE_EXE environment variable is set.')
1895 1895
1896 # Maybe an Eclipse installation dir was specified - look for the executable in it 1896 # Maybe an Eclipse installation dir was specified - look for the executable in it
1897 if join(args.eclipse_exe, exe_suffix('eclipse')): 1897 if isdir(args.eclipse_exe):
1898 args.eclipse_exe = join(args.eclipse_exe, exe_suffix('eclipse')) 1898 args.eclipse_exe = join(args.eclipse_exe, exe_suffix('eclipse'))
1899 1899 warn("The eclipse-exe was a directory, now using " + args.eclipse_exe)
1900 if not os.path.isfile(args.eclipse_exe) or not os.access(args.eclipse_exe, os.X_OK): 1900
1901 if not os.path.isfile(args.eclipse_exe):
1902 abort('File does not exist: ' + args.eclipse_exe)
1903 if not os.access(args.eclipse_exe, os.X_OK):
1901 abort('Not an executable file: ' + args.eclipse_exe) 1904 abort('Not an executable file: ' + args.eclipse_exe)
1902 1905
1903 eclipseinit([], buildProcessorJars=False) 1906 eclipseinit([], buildProcessorJars=False)
1904 1907
1905 # build list of projects to be processed 1908 # build list of projects to be processed