truffle: mxtool/mx.py comparison

comparison mxtool/mx.py @ 4271:311d193de5a2

Fixed regressions and Windows issues in generated IDE project configurations.

author	Doug Simon <doug.simon@oracle.com>
date	Wed, 11 Jan 2012 18:25:25 +0100
parents	2158e26b50cf
children	d4906ea4255b fad6f1ebeb44

comparison

equal deleted inserted replaced

-:2158e26b50cf
+:311d193de5a2
 cp.append(self.output_dir())
 class Library(Dependency):
 def __init__(self, suite, name, path, mustExist, urls):
 Dependency.__init__(self, suite, name)
-self.path = path
+self.path = path.replace('/', os.sep)
 self.urls = urls
 self.mustExist = mustExist
 def get_path(self, resolve):
 path = self.path
 path = join(self.suite.dir, path)
 if resolve and self.mustExist and not exists(path):
 assert not len(self.urls) == 0, 'cannot find required library  ' + self.name + " " + path;
 print('Downloading ' + self.name + ' from ' + str(self.urls))
 download(path, self.urls)
 return path
 def append_to_classpath(self, cp, resolve):
 path = self.get_path(resolve)
 if exists(path) or not resolve:
 p.native = attrs.pop('native', '') == 'true'
 p.__dict__.update(attrs)
 self.projects.append(p)
 for name, attrs in libsMap.iteritems():
-path = attrs['path']
+path = attrs.pop('path')
 mustExist = attrs.pop('optional', 'false') != 'true'
 urls = pop_list(attrs, 'urls')
 l = Library(self, name, path, mustExist, urls)
 l.__dict__.update(attrs)
 self.libs.append(l)
 for name in os.listdir(eclipseSettingsDir):
 path = join(eclipseSettingsDir, name)
 if isfile(path):
 with open(join(eclipseSettingsDir, name)) as f:
 content = f.read()
-update_file(path, content)
+update_file(join(settingsDir, name), content)
 def netbeansinit(args, suite=None):
 """(re)generate NetBeans project configurations"""
 if suite is None:
 for dep in p.all_deps([], True):
 if dep == p:
 continue;
 if dep.isLibrary():
-path = dep.path
+if not dep.mustExist:
-if dep.mustExist:
+continue
-dep.get_path(resolve=True)
+path = dep.get_path(resolve=True)
-if not isabs(path):
+if os.sep == '\\':
-path = join(suite.dir, path)
+path = path.replace('\\', '\\\\')
 ref = 'file.reference.' + dep.name + '-bin'
 println(out, ref + '=' + path)
 else:
 n = dep.name.replace('.', '_')
-relDepPath = os.path.relpath(dep.dir, p.dir)
+relDepPath = os.path.relpath(dep.dir, p.dir).replace(os.sep, '/')
 ref = 'reference.' + n + '.jar'
 println(out, 'project.' + n + '=' + relDepPath)
-println(out, ref + '=' + join('${project.' + n + '}', 'dist', dep.name + '.jar'))
+println(out, ref + '=${project.' + n + '}/dist/' + dep.name + '.jar')
 javacClasspath.append('${' + ref + '}')
 println(out, 'javac.classpath=\\\n    ' + (os.pathsep + '\\\n    ').join(javacClasspath))
 if updated:
 log('If using NetBeans:')
 log('  1. Ensure that a platform named "JDK ' + java().version + '" is defined (Tools -> Java Platforms)')
 log('  2. Open/create a Project Group for the directory containing the projects (File -> Project Group -> New Group... -> Folder of Projects)')
+def ideclean(args, suite=None):
+"""remove all Eclipse and NetBeans project configurations"""
+def rm(path):
+if exists(path):
+os.remove(path)
+for p in projects():
+if p.native:
+continue
+shutil.rmtree(join(p.dir, '.settings'), ignore_errors=True)
+shutil.rmtree(join(p.dir, 'nbproject'), ignore_errors=True)
+rm(join(p.dir, '.classpath'))
+rm(join(p.dir, '.project'))
+rm(join(p.dir, 'build.xml'))
 def ideinit(args, suite=None):
 """(re)generate Eclipse and NetBeans project configurations"""
 eclipseinit(args, suite)
 netbeansinit(args, suite)
 'checkstyle': [checkstyle, ''],
 'canonicalizeprojects': [canonicalizeprojects, ''],
 'clean': [clean, ''],
 'eclipseinit': [eclipseinit, ''],
 'help': [help_, '[command]'],
+'ideclean': [ideclean, ''],
 'ideinit': [ideinit, ''],
 'javap': [javap, ''],
 'netbeansinit': [netbeansinit, ''],
 'projects': [show_projects, ''],
 }

Mercurial > hg > truffle

comparison mxtool/mx.py @ 4271:311d193de5a2