# HG changeset patch # User Doug Simon # Date 1387799714 -3600 # Node ID 4a3628c79ff973636989daf7c4ea99f6f1941c1a # Parent 108ba3e82d3a5ccbb3490c637a33b855c7d24464 separated external libs out from zipped up IDE configs diff -r 108ba3e82d3a -r 4a3628c79ff9 mxtool/mx.py --- a/mxtool/mx.py Sun Dec 22 15:12:40 2013 -0800 +++ b/mxtool/mx.py Mon Dec 23 12:55:14 2013 +0100 @@ -2879,6 +2879,7 @@ def _eclipseinit_suite(args, suite, buildProcessorJars=True, refreshOnly=False): configZip = TimeStampFile(join(suite.mxDir, 'eclipse-config.zip')) + configLibsZip = join(suite.mxDir, 'eclipse-config-libs.zip') if refreshOnly and not configZip.exists(): return @@ -2887,6 +2888,7 @@ return files = [] + libFiles = [] if buildProcessorJars: files += _processorjars_suite(suite) @@ -2952,7 +2954,7 @@ if sourcePath is not None: attributes['sourcepath'] = sourcePath out.element('classpathentry', attributes) - files.append(path) + libFiles.append(path) else: out.element('classpathentry', {'combineaccessrules' : 'false', 'exported' : 'true', 'kind' : 'src', 'path' : '/' + dep.name}) @@ -3090,6 +3092,7 @@ files.append(launchFile) _zip_files(files, suite.dir, configZip.path) + _zip_files(libFiles, suite.dir, configLibsZip) def _zip_files(files, baseDir, zipPath): fd, tmp = tempfile.mkstemp(suffix='', prefix=basename(zipPath), dir=baseDir) @@ -3336,6 +3339,7 @@ def _netbeansinit_suite(args, suite, refreshOnly=False, buildProcessorJars=True): configZip = TimeStampFile(join(suite.mxDir, 'netbeans-config.zip')) + configLibsZip = join(suite.mxDir, 'eclipse-config-libs.zip') if refreshOnly and not configZip.exists(): return @@ -3345,6 +3349,7 @@ updated = False files = [] + libFiles = [] for p in suite.projects: if p.native: continue @@ -3535,7 +3540,7 @@ path = path.replace('\\', '\\\\') ref = 'file.reference.' + dep.name + '-bin' print >> out, ref + '=' + path - files.append(path) + libFiles.append(path) else: n = dep.name.replace('.', '_') @@ -3564,6 +3569,7 @@ log(' 2. Open/create a Project Group for the directory containing the projects (File -> Project Group -> New Group... -> Folder of Projects)') _zip_files(files, suite.dir, configZip.path) + _zip_files(libFiles, suite.dir, configLibsZip) def ideclean(args): """remove all Eclipse and NetBeans project configurations"""